Name as many symbols as I could in trade.c

Missingmew · Apr 10, 2020 · 5f7ed93 · 5f7ed93
1 parent fc7f043
commit 5f7ed93
Show file tree

Hide file tree

Showing 13 changed files with 133 additions and 130 deletions.
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
@@ -3657,7 +3657,7 @@ sub_8136350: @ 8136350
 	ldr r1, _0813650C @ =0x000032f8
 	adds r0, r2, r1
 	ldr r1, [r0]
-	ldr r0, _08136510 @ =sub_804CF14
+	ldr r0, _08136510 @ =CB2_ReturnToTradeMenuFromSummary
 	cmp r1, r0
 	beq _081363DA
 	b _08136518
@@ -3797,7 +3797,7 @@ _08136500: .4byte 0x00003090
 _08136504: .4byte gText_Slash
 _08136508: .4byte gUnknown_203B144
 _0813650C: .4byte 0x000032f8
-_08136510: .4byte sub_804CF14
+_08136510: .4byte CB2_ReturnToTradeMenuFromSummary
 _08136514: .4byte 0x00003024
 _08136518:
 	ldr r4, _0813677C @ =gUnknown_203B140
@@ -10237,7 +10237,7 @@ sub_813995C: @ 813995C
 	ldr r1, _081399D8 @ =0x000032f8
 	adds r0, r5, r1
 	ldr r1, [r0]
-	ldr r0, _081399DC @ =sub_804CF14
+	ldr r0, _081399DC @ =CB2_ReturnToTradeMenuFromSummary
 	cmp r1, r0
 	bne _081399E8
 	ldr r1, _081399E0 @ =0x00003024
@@ -10265,7 +10265,7 @@ _081399CC: .4byte gUnknown_203B170
 _081399D0: .4byte gUnknown_203B140
 _081399D4: .4byte 0x00003290
 _081399D8: .4byte 0x000032f8
-_081399DC: .4byte sub_804CF14
+_081399DC: .4byte CB2_ReturnToTradeMenuFromSummary
 _081399E0: .4byte 0x00003024
 _081399E4: .4byte 0x0000ffff
 _081399E8:
@@ -10764,7 +10764,7 @@ sub_8139DBC: @ 8139DBC
 	ldr r1, _08139E10 @ =0x000032f8
 	adds r0, r2, r1
 	ldr r1, [r0]
-	ldr r0, _08139E14 @ =sub_804CF14
+	ldr r0, _08139E14 @ =CB2_ReturnToTradeMenuFromSummary
 	cmp r1, r0
 	bne _08139E2C
 	ldr r1, _08139E18 @ =0x00003024
@@ -10781,7 +10781,7 @@ sub_8139DBC: @ 8139DBC
 _08139E08: .4byte gUnknown_203B140
 _08139E0C: .4byte 0x00003290
 _08139E10: .4byte 0x000032f8
-_08139E14: .4byte sub_804CF14
+_08139E14: .4byte CB2_ReturnToTradeMenuFromSummary
 _08139E18: .4byte 0x00003024
 _08139E1C: .4byte SpriteCallbackDummy
 _08139E20:

diff --git a/include/battle_anim.h b/include/battle_anim.h
@@ -391,7 +391,7 @@ void InitAnimBgTilemapBuffer(u32 bgId, const void *src);
 void AnimLoadCompressedBgTilemap(u32 bgId, const u32 *src);
 u8 GetBattleBgPaletteNum(void);
 void sub_8075458(bool8 arg0);
-void sub_8075490(struct Sprite *sprite);
+void StartSpriteLinearTranslationFromCurrentPos(struct Sprite *sprite);
 void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
 void InitAnimLinearTranslation(struct Sprite *sprite);
 void StartAnimLinearTranslation(struct Sprite *sprite);

diff --git a/include/cable_club.h b/include/cable_club.h
@@ -8,7 +8,7 @@
 // Exported RAM declarations
 
 // Exported ROM declarations
-void sub_8081A90(u8 taskId);
+void Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout(u8 taskId);
 u8 CreateTask_ReestablishLinkInCableClubRoom(void);
 void CB2_ReturnFromCableClubBattle(void);
 bool32 GetSeeingLinkPlayerCardMsg(u8 who);

diff --git a/include/link_rfu.h b/include/link_rfu.h
@@ -219,7 +219,7 @@ bool32 IsRfuRecvQueueEmpty(void);
 u32 GetRfuRecvQueueLength(void);
 void LinkRfu_Shutdown(void);
 void LinkRfu_CreateIdleTask(void);
-bool8 sub_80FA484(bool32 a0);
+bool8 ToggleLMANlinkRecovery(bool32 a0);
 void var_800D_set_xB(void);
 struct GFtgtGname *GetHostRFUtgtGname(void);
 void UpdateWirelessStatusIndicatorSprite(void);

diff --git a/include/strings.h b/include/strings.h
@@ -838,7 +838,7 @@ extern const u8 gText_SixIsland[];
 extern const u8 gText_SevenIsland[];
 
 // trade
-extern const u8 gUnknown_841E0A5[];
+extern const u8 gText_IsThisTradeOkay[];
 extern const u8 gText_XWillBeSentToY[];
 extern const u8 gText_ByeByeVar1[];
 extern const u8 gText_XSentOverY[];

diff --git a/include/trade.h b/include/trade.h
@@ -14,7 +14,7 @@ extern const u8 gText_GenderlessSymbol[];
 
 extern const u16 gUnknown_826601C[];
 void CB2_ReturnFromLinkTrade(void);
-s32 sub_804FB34(void);
+s32 Trade_CalcLinkPlayerCompatibilityParam(void);
 s32 CanRegisterMonForTradingBoard(struct GFtgtGnameSub rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet);
 s32 GetUnionRoomTradeMessageId(struct GFtgtGnameSub rfuPlayer, struct GFtgtGnameSub rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isObedientBitSet);
 

diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
@@ -898,7 +898,7 @@ void sub_8075458(bool8 arg0)
     }
 }
 
-void sub_8075490(struct Sprite *sprite)
+void StartSpriteLinearTranslationFromCurrentPos(struct Sprite *sprite)
 {
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;

diff --git a/src/battle_controllers.c b/src/battle_controllers.c
@@ -37,7 +37,7 @@ void HandleLinkBattleSetup(void)
             SetWirelessCommType1();
         if (!gReceivedRemoteLinkPlayers)
             OpenLink();
-        CreateTask(sub_8081A90, 0);
+        CreateTask(Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout, 0);
         CreateTasksForSendRecvLinkBuffers();
     }
 }

diff --git a/src/cable_club.c b/src/cable_club.c
@@ -532,7 +532,7 @@ static void Task_ReestablishLinkInCableClubRoom_0(u8 taskId)
     {
         OpenLink();
         ResetLinkPlayers();
-        CreateTask(sub_8081A90, 80);
+        CreateTask(Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout, 80);
     }
     else if (data[0] > 9)
         gTasks[taskId].func = Task_ReestablishLinkInCableClubRoom_1;
@@ -934,7 +934,7 @@ bool32 GetSeeingLinkPlayerCardMsg(u8 who)
     return TRUE;
 }
 
-void sub_8081A90(u8 taskId)
+void Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout(u8 taskId)
 {
     struct Task * task = &gTasks[taskId];
     task->data[0]++;

diff --git a/src/link.c b/src/link.c
@@ -809,7 +809,7 @@ u8 GetLinkPlayerDataExchangeStatusTimed(int lower, int upper)
             {
                 if (gLinkPlayers[0].linkType == 0x1133)
                 {
-                    switch (sub_804FB34())
+                    switch (Trade_CalcLinkPlayerCompatibilityParam())
                     {
                     case 0:
                         sPlayerDataExchangeStatus = EXCHANGE_COMPLETE;

diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c
@@ -1452,7 +1452,7 @@ bool32 RfuSerialNumberIsValid(u32 serialNo)
     return TRUE;
 }
 
-u8 sub_80FA484(bool32 a0)
+u8 ToggleLMANlinkRecovery(bool32 a0)
 {
     if (!a0)
         return rfu_LMAN_setLinkRecovery(0, 0);

diff --git a/src/strings.c b/src/strings.c
@@ -1205,7 +1205,7 @@ const u8 gText_UnusedLv[] = _("Lv");
 const u8 gText_UnusedDashes[] = _("---");
 const u8 gText_4Qmark[] = _("????");
 const u8 gText_UnusedEmpty2[] = _("");
-const u8 gUnknown_841E0A5[] = _("Is this trade okay?");
+const u8 gText_IsThisTradeOkay[] = _("Is this trade okay?");
 const u8 gTradeText_Cancel[] = _("CANCEL");
 const u8 gTradeText_ChooseAPokemon[] = _("Choose a POKéMON.");
 const u8 gTradeText_Summary[] = _("SUMMARY");