diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/easy_chat.s | 6 | ||||
| -rw-r--r-- | asm/event_data.s | 6 | ||||
| -rw-r--r-- | asm/overworld.s | 6 | ||||
| -rw-r--r-- | asm/player_pc.s | 6 | ||||
| -rw-r--r-- | asm/pokemon_storage_system.s | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 604929f1f..ffd31bcc8 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -868,8 +868,8 @@ _080BDD2C: .4byte gUnknown_83ECED4 _080BDD30: .4byte 0x0000ffff thumb_func_end sub_80BDCB8 - thumb_func_start sub_80BDD34 -sub_80BDD34: @ 80BDD34 + thumb_func_start InitEasyChatPhrases +InitEasyChatPhrases: @ 80BDD34 push {r4-r7,lr} movs r4, 0 ldr r5, _080BDE00 @ =gSaveBlock1Ptr @@ -988,7 +988,7 @@ _080BDE18: .4byte 0x0000ffff _080BDE1C: .4byte 0x00002cc4 _080BDE20: .4byte 0x00002cd0 _080BDE24: .4byte 0x00002f10 - thumb_func_end sub_80BDD34 + thumb_func_end InitEasyChatPhrases thumb_func_start sub_80BDE28 sub_80BDE28: @ 80BDE28 diff --git a/asm/event_data.s b/asm/event_data.s index 690134c27..263bd99c3 100644 --- a/asm/event_data.s +++ b/asm/event_data.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_806E0D0 -sub_806E0D0: @ 806E0D0 + thumb_func_start InitEventData +InitEventData: @ 806E0D0 push {r4,lr} ldr r4, _0806E108 @ =gSaveBlock1Ptr ldr r0, [r4] @@ -35,7 +35,7 @@ sub_806E0D0: @ 806E0D0 .align 2, 0 _0806E108: .4byte gSaveBlock1Ptr _0806E10C: .4byte gUnknown_20370E0 - thumb_func_end sub_806E0D0 + thumb_func_end InitEventData thumb_func_start sub_806E110 sub_806E110: @ 806E110 diff --git a/asm/overworld.s b/asm/overworld.s index a443a0d10..1bf22ede1 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -289,8 +289,8 @@ sub_8054E40: @ 8054E40 _08054E64: .4byte 0x0000406e thumb_func_end sub_8054E40 - thumb_func_start sub_8054E68 -sub_8054E68: @ 8054E68 + thumb_func_start ResetGameStats +ResetGameStats: @ 8054E68 push {r4,r5,lr} movs r2, 0 ldr r5, _08054E8C @ =gSaveBlock1Ptr @@ -311,7 +311,7 @@ _08054E74: bx r0 .align 2, 0 _08054E8C: .4byte gSaveBlock1Ptr - thumb_func_end sub_8054E68 + thumb_func_end ResetGameStats thumb_func_start IncrementGameStat IncrementGameStat: @ 8054E90 diff --git a/asm/player_pc.s b/asm/player_pc.s index ca08fe3b2..fa528abb9 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80EB658 -sub_80EB658: @ 80EB658 + thumb_func_start NewGameInitPCItems +NewGameInitPCItems: @ 80EB658 push {r4-r6,lr} movs r4, 0 bl ClearPCItemSlots @@ -48,7 +48,7 @@ _080EB6A0: bx r0 .align 2, 0 _080EB6A8: .4byte gUnknown_8402220 - thumb_func_end sub_80EB658 + thumb_func_end NewGameInitPCItems thumb_func_start sub_80EB6AC sub_80EB6AC: @ 80EB6AC diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 47097a060..180ec0e5d 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1897,8 +1897,8 @@ _0808C7D8: .4byte mapldr_0808C6D8 _0808C7DC: .4byte CB2_ReturnToField thumb_func_end sub_808C7B4 - thumb_func_start sub_808C7E0 -sub_808C7E0: @ 808C7E0 + thumb_func_start ResetPokemonStorageSystem +ResetPokemonStorageSystem: @ 808C7E0 push {r4-r6,lr} movs r0, 0 bl sub_808BA00 @@ -1954,7 +1954,7 @@ _0808C832: bx r0 .align 2, 0 _0808C850: .4byte gUnknown_84186CD - thumb_func_end sub_808C7E0 + thumb_func_end ResetPokemonStorageSystem thumb_func_start sub_808C854 sub_808C854: @ 808C854 |