summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/contest.s6
-rw-r--r--asm/decoration_inventory.s8
-rw-r--r--asm/easy_chat.s6
-rw-r--r--asm/field_specials.s6
-rw-r--r--asm/item_menu.s6
-rw-r--r--asm/pokeblock.s10
-rw-r--r--asm/pokemon_storage_system.s6
-rw-r--r--asm/secret_base.s18
-rw-r--r--asm/tv.s12
-rw-r--r--include/asm.inc.h16
-rw-r--r--include/dewford_trend.h2
-rw-r--r--include/new_game.h2
-rw-r--r--include/pokedex.h2
-rw-r--r--src/dewford_trend.c2
-rw-r--r--src/new_game.c24
-rw-r--r--src/pokedex.c2
16 files changed, 64 insertions, 64 deletions
diff --git a/asm/contest.s b/asm/contest.s
index 3f53a31e9..214935952 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -11,15 +11,15 @@ nullsub_89: @ 80AB1AC
bx lr
thumb_func_end nullsub_89
- thumb_func_start sub_80AB1B0
-sub_80AB1B0: @ 80AB1B0
+ thumb_func_start ResetLinkContestBoolean
+ResetLinkContestBoolean: @ 80AB1B0
ldr r1, _080AB1B8 @ =gIsLinkContest
movs r0, 0
strb r0, [r1]
bx lr
.align 2, 0
_080AB1B8: .4byte gIsLinkContest
- thumb_func_end sub_80AB1B0
+ thumb_func_end ResetLinkContestBoolean
thumb_func_start sub_80AB1BC
sub_80AB1BC: @ 80AB1BC
diff --git a/asm/decoration_inventory.s b/asm/decoration_inventory.s
index e44c1abf2..54458fa26 100644
--- a/asm/decoration_inventory.s
+++ b/asm/decoration_inventory.s
@@ -6,8 +6,8 @@
.text
- thumb_func_start sub_8133F4C
-sub_8133F4C: @ 8133F4C
+ thumb_func_start ClearDecorations
+ClearDecorations: @ 8133F4C
push {r4,r5,lr}
lsls r0, 24
movs r3, 0
@@ -36,7 +36,7 @@ _08133F76:
bx r0
.align 2, 0
_08133F7C: .4byte gDecorationInventories
- thumb_func_end sub_8133F4C
+ thumb_func_end ClearDecorations
thumb_func_start sub_8133F80
sub_8133F80: @ 8133F80
@@ -44,7 +44,7 @@ sub_8133F80: @ 8133F80
movs r4, 0
_08133F84:
adds r0, r4, 0
- bl sub_8133F4C
+ bl ClearDecorations
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index b8bfaac18..b9f27b895 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -825,8 +825,8 @@ _080E675C: .4byte 0x00009da4
_080E6760: .4byte 0x00009f6e
thumb_func_end sub_80E6690
- thumb_func_start sub_80E6764
-sub_80E6764: @ 80E6764
+ thumb_func_start InitEasyChatPhrases
+InitEasyChatPhrases: @ 80E6764
push {r4-r6,lr}
movs r3, 0
ldr r4, _080E680C @ =gSaveBlock1 + 0x2B1C
@@ -926,7 +926,7 @@ _080E681C: .4byte gSaveBlock1 + 0x2B34
_080E6820: .4byte 0x0000ffff
_080E6824: .4byte gSaveBlock1 + 0x2B4C
_080E6828: .4byte gSaveBlock1 + 0x2D8C
- thumb_func_end sub_80E6764
+ thumb_func_end InitEasyChatPhrases
thumb_func_start sub_80E682C
sub_80E682C: @ 80E682C
diff --git a/asm/field_specials.s b/asm/field_specials.s
index 684ab248b..13d7898c2 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -4270,8 +4270,8 @@ _0810FA4A:
_0810FA50: .4byte gStringVar1
thumb_func_end sub_810F9AC
- thumb_func_start sub_810FA54
-sub_810FA54: @ 810FA54
+ thumb_func_start ResetFanClub
+ResetFanClub: @ 810FA54
ldr r0, _0810FA68 @ =gSaveBlock1
ldr r2, _0810FA6C @ =0x000013c2
adds r1, r0, r2
@@ -4285,7 +4285,7 @@ sub_810FA54: @ 810FA54
_0810FA68: .4byte gSaveBlock1
_0810FA6C: .4byte 0x000013c2
_0810FA70: .4byte 0x000013c4
- thumb_func_end sub_810FA54
+ thumb_func_end ResetFanClub
thumb_func_start sub_810FA74
sub_810FA74: @ 810FA74
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 449d8e38e..de8074994 100644
--- 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 sub_80A3714
-sub_80A3714: @ 80A3714
+ thumb_func_start ClearItems
+ClearItems: @ 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 sub_80A3714
+ thumb_func_end ClearItems
thumb_func_start sub_80A3740
sub_80A3740: @ 80A3740
diff --git a/asm/pokeblock.s b/asm/pokeblock.s
index 55bc29dc5..70da28101 100644
--- a/asm/pokeblock.s
+++ b/asm/pokeblock.s
@@ -2320,8 +2320,8 @@ _0810C944:
_0810C94C: .4byte SpriteCallbackDummy
thumb_func_end sub_810C8D4
- thumb_func_start sub_810C950
-sub_810C950: @ 810C950
+ thumb_func_start ClearPokeblocks
+ClearPokeblocks: @ 810C950
lsls r0, 24
ldr r1, _0810C988 @ =gSaveBlock1
lsrs r0, 21
@@ -2354,7 +2354,7 @@ sub_810C950: @ 810C950
_0810C988: .4byte gSaveBlock1
_0810C98C: .4byte 0x000007f9
_0810C990: .4byte 0x000007fe
- thumb_func_end sub_810C950
+ thumb_func_end ClearPokeblocks
thumb_func_start sub_810C994
sub_810C994: @ 810C994
@@ -2362,7 +2362,7 @@ sub_810C994: @ 810C994
movs r4, 0
_0810C998:
adds r0, r4, 0
- bl sub_810C950
+ bl ClearPokeblocks
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -2499,7 +2499,7 @@ sub_810CA6C: @ 810CA6C
cmp r0, 0
beq _0810CA94
adds r0, r2, 0
- bl sub_810C950
+ bl ClearPokeblocks
movs r0, 0x1
b _0810CA96
.align 2, 0
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index c86ad644e..cc82a2f8c 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -1186,8 +1186,8 @@ _080961D0: .4byte sub_8096130
_080961D4: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80961A8
- thumb_func_start sub_80961D8
-sub_80961D8: @ 80961D8
+ thumb_func_start ResetPokemonStorageSystem
+ResetPokemonStorageSystem: @ 80961D8
push {r4-r7,lr}
ldr r1, _08096258 @ =gPokemonStorage
movs r0, 0
@@ -1256,7 +1256,7 @@ _0809623E:
_08096258: .4byte gPokemonStorage
_0809625C: .4byte gPokemonStorage + 0x8344
_08096260: .4byte gPCText_BOX
- thumb_func_end sub_80961D8
+ thumb_func_end ResetPokemonStorageSystem
thumb_func_start sub_8096264
sub_8096264: @ 8096264
diff --git a/asm/secret_base.s b/asm/secret_base.s
index bfa0e573d..89ddc879f 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -131,8 +131,8 @@ _080BB54C:
bx r0
thumb_func_end sub_80BB4AC
- thumb_func_start sub_80BB594
-sub_80BB594: @ 80BB594
+ thumb_func_start ResetSecretBase
+ResetSecretBase: @ 80BB594
push {lr}
adds r1, r0, 0
lsls r1, 24
@@ -147,16 +147,16 @@ sub_80BB594: @ 80BB594
bx r0
.align 2, 0
_080BB5B0: .4byte gSaveBlock1 + 0x1A08
- thumb_func_end sub_80BB594
+ thumb_func_end ResetSecretBase
- thumb_func_start sub_80BB5B4
-sub_80BB5B4: @ 80BB5B4
+ thumb_func_start ResetSecretBases
+ResetSecretBases: @ 80BB5B4
push {r4,lr}
movs r4, 0
_080BB5B8:
lsls r0, r4, 24
lsrs r0, 24
- bl sub_80BB594
+ bl ResetSecretBase
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -165,7 +165,7 @@ _080BB5B8:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80BB5B4
+ thumb_func_end ResetSecretBases
thumb_func_start sub_80BB5D0
sub_80BB5D0: @ 80BB5D0
@@ -2043,7 +2043,7 @@ sub_80BC440: @ 80BC440
adds r4, r0
ldrh r5, [r4]
movs r0, 0
- bl sub_80BB594
+ bl ResetSecretBase
strh r5, [r4]
bl sub_80BC0F8
pop {r4,r5}
@@ -2155,7 +2155,7 @@ sub_80BC50C: @ 80BC50C
adds r4, r0
ldrh r5, [r4]
movs r0, 0
- bl sub_80BB594
+ bl ResetSecretBase
strh r5, [r4]
pop {r4,r5}
pop {r0}
diff --git a/asm/tv.s b/asm/tv.s
index fd5fdeeac..ca2e5e410 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -7,8 +7,8 @@
.text
- thumb_func_start sub_80BD7A8
-sub_80BD7A8: @ 80BD7A8
+ thumb_func_start ClearTVShowData
+ClearTVShowData: @ 80BD7A8
push {r4-r7,lr}
movs r3, 0
ldr r6, _080BD7F0 @ =gSaveBlock1
@@ -50,7 +50,7 @@ _080BD7F0: .4byte gSaveBlock1
_080BD7F4: .4byte 0x0000273a
_080BD7F8: .4byte 0x00002738
_080BD7FC: .4byte 0x00002739
- thumb_func_end sub_80BD7A8
+ thumb_func_end ClearTVShowData
thumb_func_start special_0x44
special_0x44: @ 80BD800
@@ -417,8 +417,8 @@ _080BDAAE:
bx r1
thumb_func_end special_0x4a
- thumb_func_start sub_80BDAB4
-sub_80BDAB4: @ 80BDAB4
+ thumb_func_start ResetGabbyAndTy
+ResetGabbyAndTy: @ 80BDAB4
push {r4,lr}
ldr r2, _080BDAF8 @ =gSaveBlock1
ldr r1, _080BDAFC @ =0x00002b10
@@ -461,7 +461,7 @@ _080BDB04: .4byte 0x00002b16
_080BDB08: .4byte 0x0000ffff
_080BDB0C: .4byte 0x00002b1b
_080BDB10: .4byte 0x00002b18
- thumb_func_end sub_80BDAB4
+ thumb_func_end ResetGabbyAndTy
thumb_func_start GabbyAndTyBeforeInterview
GabbyAndTyBeforeInterview: @ 80BDB14
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 11d4e150e..88c2f6d2f 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -218,7 +218,7 @@ void sub_808AB90(void);
u8 pokemon_order_func(u8);
// asm/pokemon_storage_system.o
-void sub_80961D8(void);
+void ResetPokemonStorageSystem(void);
// asm/pokemon_icon.o
u8 sub_809D3A4(u16 arg0, void (*)(struct Sprite *), int, u8 arg3, u32 arg4);
@@ -245,7 +245,7 @@ void HideMapNamePopup();
// asm/item_menu.o
void sub_80A3684(void);
-void sub_80A3714(void);
+void ClearItems(void);
void sub_80A53F8(void);
void sub_80A5B40(void);
void sub_80A68CC();
@@ -254,7 +254,7 @@ void sub_80A7DD4(void);
u8 sub_80A7E5C(u8);
// asm/contest.o
-void sub_80AB1B0(void);
+void ResetLinkContestBoolean(void);
void sub_80AE098(u8);
void sub_80AE398(u8, u8);
u32 sub_80AE770(u8, u8);
@@ -269,16 +269,16 @@ void CreateDecorationShop1Menu(void *);
void CreateDecorationShop2Menu(void *);
// asm/secret_base.o
-void sub_80BB5B4(void);
+void ResetSecretBases(void);
u8 sub_80BBB24(void);
void sub_80BBCCC(u8);
u8 *sub_80BCCE8(void);
void sub_80BD674(void *, u32, u8);
// asm/tv.o
-void sub_80BD7A8(void);
+void ClearTVShowData(void);
void UpdateTVScreensOnMap(u32, u32);
-void sub_80BDAB4(void);
+void ResetGabbyAndTy(void);
u8 sub_80BDEAC(u8 *);
void sub_80BE160(TVShow *);
void sub_80BE8EC(u16);
@@ -326,7 +326,7 @@ void sub_80C8EBC(u8);
void sub_80C8F34(u8);
// asm/easy_chat.o
-void sub_80E6764(void);
+void InitEasyChatPhrases(void);
u8* sub_80EB3FC(u8 *, u16);
u8 ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16);
@@ -370,7 +370,7 @@ u8 sub_810D9EC(s8 *, s8 *, s16 *, s16 *);
void ScriptAddElevatorMenuItem(u8, u8, u8, u8);
void ScriptShowElevatorMenu(void);
u8 GetLeadMonIndex(void);
-void sub_810FA54(void);
+void ResetFanClub(void);
// asm/battle_records.o
void InitLinkBattleRecords(void);
diff --git a/include/dewford_trend.h b/include/dewford_trend.h
index 713d491b6..af1b61363 100644
--- a/include/dewford_trend.h
+++ b/include/dewford_trend.h
@@ -4,7 +4,7 @@
#define ARRAY_2007800 ((struct EasyChatPair *)(unk_2000000 + 0x7800))
#define ARRAY_2007900 ((struct EasyChatPair *)(unk_2000000 + 0x7900))
-void sub_80FA17C(void);
+void InitDewfordTrends(void);
void sub_80FA4E4(void *, u32, u8);
#endif
diff --git a/include/new_game.h b/include/new_game.h
index 62e83f8f0..f59154af4 100644
--- a/include/new_game.h
+++ b/include/new_game.h
@@ -3,7 +3,7 @@
void write_word_to_mem(u32 var, u8 *dataPtr);
void copy_word_to_mem(u8 *copyTo, u8 *copyFrom);
-void set_player_trainer_id(void);
+void InitPlayerTrainerId(void);
void SetDefaultOptions(void);
void ClearPokedexFlags(void);
void sub_8052DA8(void);
diff --git a/include/pokedex.h b/include/pokedex.h
index fded1ec65..5dd44cd2f 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -55,7 +55,7 @@ struct PokedexView
u8 unk65E[8];
};
-void sub_808C02C(void);
+void ResetPokedex(void);
void sub_808C0A0(void);
void sub_808C0B8(void);
void ClearPokedexView(struct PokedexView *pokedexView);
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index b90100d90..fe9311655 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -19,7 +19,7 @@ static bool8 SB1ContainsWords(u16 *a);
static bool8 IsEasyChatPairEqual(u16 *words1, u16 *words2);
static s16 sub_80FA828(struct EasyChatPair *a, u16 b);
-void sub_80FA17C(void)
+void InitDewfordTrends(void)
{
u16 i;
diff --git a/src/new_game.c b/src/new_game.c
index ca53ff15f..8fa946748 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -47,7 +47,7 @@ void copy_word_to_mem(u8 *copyTo, u8 *copyFrom)
copyTo[i] = copyFrom[i];
}
-void set_player_trainer_id(void)
+void InitPlayerTrainerId(void)
{
write_word_to_mem((Random() << 16) | Random(), gSaveBlock2.playerTrainerId);
}
@@ -113,21 +113,21 @@ void NewGameInitData(void)
gDifferentSaveFile = 1;
ZeroPlayerPartyMons();
ZeroEnemyPartyMons();
- sub_808C02C();
+ ResetPokedex();
sub_8052DE4();
memset(&gSaveBlock1, 0, sizeof(gSaveBlock1));
ClearMailData();
gSaveBlock2.specialSaveWarp = 0;
- set_player_trainer_id();
+ InitPlayerTrainerId();
PlayTimeCounter_Reset();
ClearPokedexFlags();
InitEventData();
- sub_80BD7A8();
- sub_80BDAB4();
- sub_80BB5B4();
+ ClearTVShowData();
+ ResetGabbyAndTy();
+ ResetSecretBases();
ClearBerryTrees();
gSaveBlock1.money = 3000;
- sub_80AB1B0();
+ ResetLinkContestBoolean();
ResetGameStats();
sub_8052DA8();
InitLinkBattleRecords();
@@ -135,18 +135,18 @@ void NewGameInitData(void)
InitBarboachSizeRecord();
gPlayerPartyCount = 0;
ZeroPlayerPartyMons();
- sub_80961D8();
+ ResetPokemonStorageSystem();
ClearRoamerData();
ClearRoamerLocationData();
gSaveBlock1.registeredItem = 0;
- sub_80A3714();
+ ClearItems();
NewGameInitPCItems();
sub_810C994();
sub_8133F80();
- sub_80E6764();
+ InitEasyChatPhrases();
SetMauvilleOldMan();
- sub_80FA17C();
- sub_810FA54();
+ InitDewfordTrends();
+ ResetFanClub();
ResetLotteryCorner();
WarpToTruck();
ScriptContext2_RunNewScript(gUnknown_0819FA81);
diff --git a/src/pokedex.c b/src/pokedex.c
index 3ef1de51e..d31d649e0 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -115,7 +115,7 @@ u16 NationalPokedexNumToSpecies(u16);
// asm/pokedex_area_screen
void ShowPokedexAreaScreen(u16 species, u8 *string);
-void sub_808C02C(void)
+void ResetPokedex(void)
{
u16 i;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 17:39:16 +0000