name more functions

2026-09-13 13:36:57 -05:00 · 2017-05-09 01:56:49 -07:00
parent 60cf06ccca
commit 3ee2e8ce97
11 changed files with 73 additions and 73 deletions
--- a/asm/decoration_inventory.s
+++ b/asm/decoration_inventory.s
@@ -6,8 +6,8 @@

 	.text
 	
-	thumb_func_start ClearDecorations
-ClearDecorations: @ 8133F4C
+	thumb_func_start ClearDecorationInventory
+ClearDecorationInventory: @ 8133F4C
 	push {r4,r5,lr}
 	lsls r0, 24
 	movs r3, 0
@@ -36,15 +36,15 @@ _08133F76:
 	bx r0
 	.align 2, 0
 _08133F7C: .4byte gDecorationInventories
-	thumb_func_end ClearDecorations
+	thumb_func_end ClearDecorationInventory

-	thumb_func_start sub_8133F80
-sub_8133F80: @ 8133F80
+	thumb_func_start ClearDecorationInventories
+ClearDecorationInventories: @ 8133F80
 	push {r4,lr}
 	movs r4, 0
 _08133F84:
 	adds r0, r4, 0
-	bl ClearDecorations
+	bl ClearDecorationInventory
 	adds r0, r4, 0x1
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -53,7 +53,7 @@ _08133F84:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8133F80
+	thumb_func_end ClearDecorationInventories

 	thumb_func_start sub_8133F9C
 sub_8133F9C: @ 8133F9C
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -33,8 +33,8 @@ ResetSSTidalFlag: @ 810D9A0
 _0810D9AC: .4byte 0x0000082d
 	thumb_func_end ResetSSTidalFlag

-	thumb_func_start sub_810D9B0
-sub_810D9B0: @ 810D9B0
+	thumb_func_start CountSSTidalStep
+CountSSTidalStep: @ 810D9B0
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -64,10 +64,10 @@ _0810D9E6:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_810D9B0
+	thumb_func_end CountSSTidalStep

-	thumb_func_start sub_810D9EC
-sub_810D9EC: @ 810D9EC
+	thumb_func_start GetSSTidalLocation
+GetSSTidalLocation: @ 810D9EC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -179,7 +179,7 @@ _0810DABE:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_810D9EC
+	thumb_func_end GetSSTidalLocation

 	thumb_func_start GetLinkPartnerNames
 GetLinkPartnerNames: @ 810DAC8
@@ -231,8 +231,8 @@ _0810DB20: .4byte gUnknown_083D1464
 _0810DB24: .4byte gLinkPlayers + 0x8
 	thumb_func_end GetLinkPartnerNames

-	thumb_func_start sub_810DB28
-sub_810DB28: @ 810DB28
+	thumb_func_start SpawnBerryBlenderLinkPlayerSprites
+SpawnBerryBlenderLinkPlayerSprites: @ 810DB28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -403,10 +403,10 @@ _0810DC5C:
 	.align 2, 0
 _0810DC74: .4byte gLinkPlayers
 _0810DC78: .4byte gSpecialVar_0x8004
-	thumb_func_end sub_810DB28
+	thumb_func_end SpawnBerryBlenderLinkPlayerSprites

-	thumb_func_start sub_810DC7C
-sub_810DC7C: @ 810DC7C
+	thumb_func_start MauvilleGymSpecial1
+MauvilleGymSpecial1: @ 810DC7C
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, _0810DC9C @ =gUnknown_083F8364
@@ -444,10 +444,10 @@ _0810DCB6:
 	bx r0
 	.align 2, 0
 _0810DCC8: .4byte 0x00000205
-	thumb_func_end sub_810DC7C
+	thumb_func_end MauvilleGymSpecial1

-	thumb_func_start sub_810DCCC
-sub_810DCCC: @ 810DCCC
+	thumb_func_start MauvilleGymSpecial2
+MauvilleGymSpecial2: @ 810DCCC
 	push {r4-r6,lr}
 	movs r5, 0xC
 _0810DCD0:
@@ -681,10 +681,10 @@ _0810DED0:
 	bx r0
 	.align 2, 0
 _0810DED8: .4byte 0x00000251
-	thumb_func_end sub_810DCCC
+	thumb_func_end MauvilleGymSpecial2

-	thumb_func_start sub_810DEDC
-sub_810DEDC: @ 810DEDC
+	thumb_func_start MauvilleGymSpecial3
+MauvilleGymSpecial3: @ 810DEDC
 	push {r4-r6,lr}
 	ldr r4, _0810DF18 @ =gUnknown_083F8364
 	movs r5, 0x2
@@ -850,10 +850,10 @@ _0810E066:
 	bx r0
 	.align 2, 0
 _0810E06C: .4byte 0x00000251
-	thumb_func_end sub_810DEDC
+	thumb_func_end MauvilleGymSpecial3

-	thumb_func_start sub_810E070
-sub_810E070: @ 810E070
+	thumb_func_start PetalburgGymSpecial1
+PetalburgGymSpecial1: @ 810E070
 	push {lr}
 	ldr r0, _0810E090 @ =gUnknown_02039258
 	movs r1, 0
@@ -862,7 +862,7 @@ sub_810E070: @ 810E070
 	strb r1, [r0]
 	movs r0, 0x2C
 	bl PlaySE
-	ldr r0, _0810E098 @ =sub_810E09C
+	ldr r0, _0810E098 @ =Task_PetalburgGym
 	movs r1, 0x8
 	bl CreateTask
 	pop {r0}
@@ -870,11 +870,11 @@ sub_810E070: @ 810E070
 	.align 2, 0
 _0810E090: .4byte gUnknown_02039258
 _0810E094: .4byte gUnknown_02039259
-_0810E098: .4byte sub_810E09C
-	thumb_func_end sub_810E070
+_0810E098: .4byte Task_PetalburgGym
+	thumb_func_end PetalburgGymSpecial1

-	thumb_func_start sub_810E09C
-sub_810E09C: @ 810E09C
+	thumb_func_start Task_PetalburgGym
+Task_PetalburgGym: @ 810E09C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -893,7 +893,7 @@ sub_810E09C: @ 810E09C
 	lsls r1, 1
 	adds r1, r2
 	ldrh r1, [r1]
-	bl sub_810E104
+	bl PetalburgGymFunc
 	movs r0, 0
 	strb r0, [r4]
 	ldrb r0, [r5]
@@ -920,10 +920,10 @@ _0810E0FC:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_810E09C
+	thumb_func_end Task_PetalburgGym

-	thumb_func_start sub_810E104
-sub_810E104: @ 810E104
+	thumb_func_start PetalburgGymFunc
+PetalburgGymFunc: @ 810E104
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -1078,22 +1078,22 @@ _0810E21E:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_810E104
+	thumb_func_end PetalburgGymFunc

-	thumb_func_start sub_810E230
-sub_810E230: @ 810E230
+	thumb_func_start PetalburgGymSpecial2
+PetalburgGymSpecial2: @ 810E230
 	push {lr}
 	ldr r0, _0810E244 @ =gSpecialVar_0x8004
 	ldrb r0, [r0]
 	ldr r1, _0810E248 @ =gUnknown_083F8376
 	ldrh r1, [r1, 0x8]
-	bl sub_810E104
+	bl PetalburgGymFunc
 	pop {r0}
 	bx r0
 	.align 2, 0
 _0810E244: .4byte gSpecialVar_0x8004
 _0810E248: .4byte gUnknown_083F8376
-	thumb_func_end sub_810E230
+	thumb_func_end PetalburgGymSpecial2

 	thumb_func_start ShowFieldMessageStringVar4
 ShowFieldMessageStringVar4: @ 810E24C
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -709,8 +709,8 @@ _080A370A:
 	bx r0
 	thumb_func_end sub_80A36B8

-	thumb_func_start ClearItems
-ClearItems: @ 80A3714
+	thumb_func_start ClearBag
+ClearBag: @ 80A3714
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, _080A373C @ =gBagPockets
@@ -731,7 +731,7 @@ _080A371A:
 	bx r0
 	.align 2, 0
 _080A373C: .4byte gBagPockets
-	thumb_func_end ClearItems
+	thumb_func_end ClearBag

 	thumb_func_start sub_80A3740
 sub_80A3740: @ 80A3740
--- a/asm/pokeblock.s
+++ b/asm/pokeblock.s
@@ -2320,8 +2320,8 @@ _0810C944:
 _0810C94C: .4byte SpriteCallbackDummy
 	thumb_func_end sub_810C8D4

-	thumb_func_start ClearPokeblocks
-ClearPokeblocks: @ 810C950
+	thumb_func_start ClearPokeblock
+ClearPokeblock: @ 810C950
 	lsls r0, 24
 	ldr r1, _0810C988 @ =gSaveBlock1
 	lsrs r0, 21
@@ -2354,15 +2354,15 @@ ClearPokeblocks: @ 810C950
 _0810C988: .4byte gSaveBlock1
 _0810C98C: .4byte 0x000007f9
 _0810C990: .4byte 0x000007fe
-	thumb_func_end ClearPokeblocks
+	thumb_func_end ClearPokeblock

-	thumb_func_start sub_810C994
-sub_810C994: @ 810C994
+	thumb_func_start ClearPokeblocks
+ClearPokeblocks: @ 810C994
 	push {r4,lr}
 	movs r4, 0
 _0810C998:
 	adds r0, r4, 0
-	bl ClearPokeblocks
+	bl ClearPokeblock
 	adds r0, r4, 0x1
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2371,7 +2371,7 @@ _0810C998:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_810C994
+	thumb_func_end ClearPokeblocks

 	thumb_func_start sub_810C9B0
 sub_810C9B0: @ 810C9B0
@@ -2499,7 +2499,7 @@ sub_810CA6C: @ 810CA6C
 	cmp r0, 0
 	beq _0810CA94
 	adds r0, r2, 0
-	bl ClearPokeblocks
+	bl ClearPokeblock
 	movs r0, 0x1
 	b _0810CA96
 	.align 2, 0
--- a/asm/region_map.s
+++ b/asm/region_map.s
@@ -1759,7 +1759,7 @@ sub_80FB600: @ 80FB600
 	adds r1, r4, 0
 	adds r2, r5, 0
 	adds r3, r6, 0
-	bl sub_810D9EC
+	bl GetSSTidalLocation
 	lsls r0, 24
 	lsrs r0, 24
 	mov r10, r5
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -38,7 +38,7 @@ gSpecials::
 	.4byte sub_8083820
 	.4byte sub_8083614
 	.4byte GetLinkPartnerNames
-	.4byte sub_810DB28
+	.4byte SpawnBerryBlenderLinkPlayerSprites
 	.4byte SavePlayerParty
 	.4byte LoadPlayerParty
 	.4byte sub_80C5568
@@ -139,14 +139,14 @@ gSpecials::
 	.4byte sub_80C4C78
 	.4byte sub_80C4D50
 	.4byte ShowContestWinner
-	.4byte sub_810DCCC
-	.4byte sub_810DC7C
+	.4byte MauvilleGymSpecial2
+	.4byte MauvilleGymSpecial1
 	.4byte ShowFieldMessageStringVar4
 	.4byte DrawWholeMapView
 	.4byte StorePlayerCoordsInVars
-	.4byte sub_810DEDC
-	.4byte sub_810E070
-	.4byte sub_810E230
+	.4byte MauvilleGymSpecial3
+	.4byte PetalburgGymSpecial1
+	.4byte PetalburgGymSpecial2
 	.4byte GetPlayerTrainerIdOnesDigit
 	.4byte GetPlayerBigGuyGirlString
 	.4byte GetRivalSonDaughterString
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -245,7 +245,7 @@ void HideMapNamePopup();

 // asm/item_menu.o
 void sub_80A3684(void);
-void ClearItems(void);
+void ClearBag(void);
 void sub_80A53F8(void);
 void sub_80A5B40(void);
 void sub_80A68CC();
@@ -353,7 +353,7 @@ u8 *CopyLocationName(u8 *dest, u8 location);
 void PlaySlotMachine(u8, void *);

 // asm/pokeblock.o
-void sub_810C994(void);
+void ClearPokeblocks(void);
 void sub_810CA6C(s32);
 s16 sub_810CAE4(u8, struct Pokeblock *);

@@ -365,8 +365,8 @@ u8 IsMirageIslandPresent(void);

 // asm/field_specials.o
 void ResetCyclingRoadChallengeData(void);
-bool32 sub_810D9B0(u16);
-u8 sub_810D9EC(s8 *, s8 *, s16 *, s16 *);
+bool32 CountSSTidalStep(u16);
+u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *);
 void ScriptAddElevatorMenuItem(u8, u8, u8, u8);
 void ScriptShowElevatorMenu(void);
 u8 GetLeadMonIndex(void);
@@ -410,7 +410,7 @@ u8 sub_8128124(u8 id);
 void sub_8132670(void);

 // asm/decoration_inventory.o
-void sub_8133F80(void);
+void ClearDecorationInventories(void);
 u8 sub_8133FE4(u8);
 u8 IsThereStorageSpaceForDecoration(u8);
 u8 sub_8134074(u8);
--- a/include/vars.h
+++ b/include/vars.h
@@ -3,7 +3,7 @@

 #define VAR_RECYCLE_GOODS          0x4020
 #define VAR_REPEL_STEP_COUNT       0x4021
-
+#define VAR_ICE_STEP_COUNT         0x4022
 #define VAR_FIRST_POKE             0x4023
 #define VAR_MIRAGE_RND_H           0x4024
 #define VAR_MIRAGE_RND_L           0x4025
@@ -18,9 +18,9 @@
 #define VAR_POKELOT_PRIZE          0x4045
 #define VAR_NATIONAL_DEX           0x4046
 #define VAR_SHROOMISH_SIZE_RECORD  0x4047
-
+#define VAR_ASH_GATHER_COUNT       0x4048
 #define VAR_BIRCH_STATE            0x4049
-
+#define VAR_CRUISE_STEP_COUNT      0x404A
 #define VAR_POKELOT_RND1           0x404B
 #define VAR_POKELOT_RND2           0x404C

--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -517,7 +517,7 @@ bool8 sub_8068894(void)
    }
    if (SafariZoneTakeStep() == TRUE)
        return TRUE;
-    if (sub_810D9B0(1) == TRUE)
+    if (CountSSTidalStep(1) == TRUE)
    {
        ScriptContext1_SetupScript(gUnknown_0815FD0D);
        return TRUE;
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -239,7 +239,7 @@ bool8 sub_80C7754(void)
    s8 mapGroup, mapNum;
    s16 x, y;

-    if (sub_810D9EC(&mapGroup, &mapNum, &x, &y))
+    if (GetSSTidalLocation(&mapGroup, &mapNum, &x, &y))
    {
        return FALSE;
    }
@@ -270,7 +270,7 @@ void Task_HandlePorthole(u8 taskId)
            data[1] = 1;
        if (!sub_80A212C(0xFF, location->mapNum, location->mapGroup))
            return;
-        if (sub_810D9B0(1) == TRUE)
+        if (CountSSTidalStep(1) == TRUE)
        {
            if (*var == 2)
                *var = 9;
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -139,10 +139,10 @@ void NewGameInitData(void)
    ClearRoamerData();
    ClearRoamerLocationData();
    gSaveBlock1.registeredItem = 0;
-    ClearItems();
+    ClearBag();
    NewGameInitPCItems();
-    sub_810C994();
-    sub_8133F80();
+    ClearPokeblocks();
+    ClearDecorationInventories();
    InitEasyChatPhrases();
    SetMauvilleOldMan();
    InitDewfordTrends();