diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_specials.s | 12 | ||||
| -rw-r--r-- | asm/script_pokemon_util_80BF8FC.s | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s index cef042cf1..34b6f8b75 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -581,8 +581,8 @@ _080CAA2C: .4byte 0x0000028f _080CAA30: .4byte gSaveBlock1Ptr thumb_func_end sub_80CA9A8 - thumb_func_start SpawnScriptFieldObject -SpawnScriptFieldObject: @ 80CAA34 + thumb_func_start SpawnCameraObject +SpawnCameraObject: @ 80CAA34 push {lr} sub sp, 0x8 ldr r0, _080CAA80 @ =gSaveBlock1Ptr @@ -621,10 +621,10 @@ SpawnScriptFieldObject: @ 80CAA34 .align 2, 0 _080CAA80: .4byte gSaveBlock1Ptr _080CAA84: .4byte gMapObjects - thumb_func_end SpawnScriptFieldObject + thumb_func_end SpawnCameraObject - thumb_func_start RemoveScriptFieldObject -RemoveScriptFieldObject: @ 80CAA88 + thumb_func_start RemoveCameraObject +RemoveCameraObject: @ 80CAA88 push {lr} bl GetPlayerAvatarObjectId lsls r0, 24 @@ -640,7 +640,7 @@ RemoveScriptFieldObject: @ 80CAA88 bx r0 .align 2, 0 _080CAAA8: .4byte gSaveBlock1Ptr - thumb_func_end RemoveScriptFieldObject + thumb_func_end RemoveCameraObject thumb_func_start sub_80CAAAC sub_80CAAAC: @ 80CAAAC diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 297d09e9a..32eb732b8 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80BF8FC -sub_80BF8FC: @ 80BF8FC + thumb_func_start Special_ChooseMonToDeleteMove +Special_ChooseMonToDeleteMove: @ 80BF8FC push {lr} sub sp, 0x4 bl ScriptContext2_Enable @@ -34,7 +34,7 @@ sub_80BF8FC: @ 80BF8FC .align 2, 0 _080BF934: .4byte sub_80BF97C _080BF938: .4byte gTasks - thumb_func_end sub_80BF8FC + thumb_func_end Special_ChooseMonToDeleteMove thumb_func_start sub_80BF93C sub_80BF93C: @ 80BF93C @@ -100,8 +100,8 @@ _080BF9B4: .4byte gPaletteFade _080BF9B8: .4byte gTasks thumb_func_end sub_80BF97C - thumb_func_start sub_80BF9BC -sub_80BF9BC: @ 80BF9BC + thumb_func_start Special_ChooseMoveToDelete +Special_ChooseMoveToDelete: @ 80BF9BC push {r4,lr} sub sp, 0x4 ldr r0, _080BF9F0 @ =gPlayerParty @@ -132,7 +132,7 @@ _080BF9F8: .4byte gPlayerPartyCount _080BF9FC: .4byte CB2_ReturnToField _080BFA00: .4byte gFieldCallback _080BFA04: .4byte FieldCallback_ReturnToEventScript2 - thumb_func_end sub_80BF9BC + thumb_func_end Special_ChooseMoveToDelete thumb_func_start ScrSpecial_CountPokemonMoves ScrSpecial_CountPokemonMoves: @ 80BFA08 @@ -333,8 +333,8 @@ sub_80BFAA8: @ 80BFAA8 _080BFBA4: .4byte gPPUpGetMask thumb_func_end sub_80BFAA8 - thumb_func_start sub_80BFBA8 -sub_80BFBA8: @ 80BFBA8 + thumb_func_start Special_DeleteSelectedMove +Special_DeleteSelectedMove: @ 80BFBA8 push {r4-r6,lr} mov r6, r8 push {r6} @@ -385,7 +385,7 @@ _080BFBFC: _080BFC08: .4byte gSpecialVar_0x8004 _080BFC0C: .4byte gPlayerParty _080BFC10: .4byte gSpecialVar_0x8005 - thumb_func_end sub_80BFBA8 + thumb_func_end Special_DeleteSelectedMove thumb_func_start sub_80BFC14 sub_80BFC14: @ 80BFC14 |