diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/contest.s | 6 | ||||
| -rw-r--r-- | asm/decoration_inventory.s | 8 | ||||
| -rw-r--r-- | asm/easy_chat.s | 6 | ||||
| -rw-r--r-- | asm/field_specials.s | 6 | ||||
| -rw-r--r-- | asm/item_menu.s | 6 | ||||
| -rw-r--r-- | asm/pokeblock.s | 10 | ||||
| -rw-r--r-- | asm/pokemon_storage_system.s | 6 | ||||
| -rw-r--r-- | asm/secret_base.s | 18 | ||||
| -rw-r--r-- | asm/tv.s | 12 |
9 files changed, 39 insertions, 39 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} @@ -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 |