diff --git a/titles/pokken/base.py b/titles/pokken/base.py
index 0b849b3..56d8412 100644
--- a/titles/pokken/base.py
+++ b/titles/pokken/base.py
@@ -157,7 +157,6 @@ class PokkenBase:
         support_set_3
         aid_skill_list
         achievement_flag
-        pokemon_data
         event_achievement_flag
         event_achievement_param
         """
@@ -200,7 +199,7 @@ class PokkenBase:
         load_usr.home_loc_name = profile_dict.get("home_loc_name", "")
         load_usr.pref_code = profile_dict.get("pref_code", 0)
         load_usr.trainer_name = profile_dict.get(
-            "trainer_name", "Newb" + str(random.randint(1111, 999999))
+            "trainer_name", f"Newb{str(user_id).zfill(4)}"
         )
         load_usr.trainer_rank_point = profile_dict.get("trainer_rank_point", 0)
         load_usr.wallet = profile_dict.get("wallet", 0)
@@ -262,6 +261,29 @@ class PokkenBase:
         load_usr.sp_bonus_key_value_2 = profile_dict.get("sp_bonus_key_value_2", 0)
         load_usr.last_play_event_id = profile_dict.get("last_play_event_id", 0)
 
+        if pokemon_data is not None:
+            for pkmn in pokemon_data:
+                pkmn_d = pkmn._asdict()
+                pkm = jackal_pb2.LoadUserResponseData.PokemonData()
+
+                pkm.char_id = pkmn_d.get('char_id', 0)
+                pkm.illustration_book_no = pkmn_d.get('illustration_book_no', 0)
+                pkm.pokemon_exp = pkmn_d.get('pokemon_exp', 0)
+                pkm.battle_num_vs_wan = pkmn_d.get('battle_num_vs_wan', 0)
+                pkm.win_vs_wan = pkmn_d.get('win_vs_wan', 0)
+                pkm.battle_num_vs_lan = pkmn_d.get('battle_num_vs_lan', 0)
+                pkm.win_vs_lan = pkmn_d.get('win_vs_lan', 0)
+                pkm.battle_num_vs_cpu = pkmn_d.get('battle_num_vs_cpu', 0)
+                pkm.win_cpu = pkmn_d.get('win_cpu', 0)
+                pkm.battle_all_num_tutorial = pkmn_d.get('battle_all_num_tutorial', 0)
+                pkm.battle_num_tutorial = pkmn_d.get('battle_num_tutorial', 0)
+                pkm.bp_point_atk = pkmn_d.get('bp_point_atk', 0)
+                pkm.bp_point_res = pkmn_d.get('bp_point_res', 0)
+                pkm.bp_point_def = pkmn_d.get('bp_point_def', 0)
+                pkm.bp_point_sp = pkmn_d.get('bp_point_sp', 0)
+
+                load_usr.pokemon_data.append(pkm)
+
         res.load_user.CopyFrom(load_usr)
         return res.SerializeToString()
 
diff --git a/titles/pokken/schema/profile.py b/titles/pokken/schema/profile.py
index 3429f7f..3605b0a 100644
--- a/titles/pokken/schema/profile.py
+++ b/titles/pokken/schema/profile.py
@@ -257,18 +257,27 @@ class PokkenProfileData(BaseData):
             user=user_id,
             char_id=pokemon_id,
             illustration_book_no=illust_no,
-            bp_point_atk=atk,
-            bp_point_res=res,
-            bp_point_def=defe,
-            bp_point_sp=sp,
+            pokemon_exp=0,
+            battle_num_vs_wan=0,
+            win_vs_wan=0,
+            battle_num_vs_lan=0,
+            win_vs_lan=0,
+            battle_num_vs_cpu=0,
+            win_cpu=0,
+            battle_all_num_tutorial=0,
+            battle_num_tutorial=0,
+            bp_point_atk=1+atk,
+            bp_point_res=1+res,
+            bp_point_def=1+defe,
+            bp_point_sp=1+sp,
         )
 
         conflict = sql.on_duplicate_key_update(
             illustration_book_no=illust_no,
-            bp_point_atk=atk,
-            bp_point_res=res,
-            bp_point_def=defe,
-            bp_point_sp=sp,
+            bp_point_atk=pokemon_data.c.bp_point_atk + atk,
+            bp_point_res=pokemon_data.c.bp_point_res + res,
+            bp_point_def=pokemon_data.c.bp_point_def + defe,
+            bp_point_sp=pokemon_data.c.bp_point_sp + sp,
         )
 
         result = self.execute(conflict)
@@ -295,7 +304,11 @@ class PokkenProfileData(BaseData):
         pass
 
     def get_all_pokemon_data(self, user_id: int) -> Optional[List[Row]]:
-        pass
+        sql = pokemon_data.select(pokemon_data.c.user == user_id)
+        result = self.execute(sql)
+        if result is None:
+            return None
+        return result.fetchall()
 
     def put_pokemon_battle_result(
         self, user_id: int, pokemon_id: int, match_type: PokkenConstants.BATTLE_TYPE, match_result: PokkenConstants.BATTLE_RESULT