diff options
Diffstat (limited to 'asm/script_pokemon_util_80F87D8.s')
| -rw-r--r-- | asm/script_pokemon_util_80F87D8.s | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s index 3a3cf4269..bf1d0e156 100644 --- a/asm/script_pokemon_util_80F87D8.s +++ b/asm/script_pokemon_util_80F87D8.s @@ -390,7 +390,7 @@ _080F8AB6: thumb_func_start sub_80F8ACC sub_80F8ACC: @ 80F8ACC push {lr} - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic bl SetMainCallback2 pop {r0} bx r0 @@ -505,10 +505,10 @@ _080F8BBA: ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 - ldr r2, =gMapObjects + ldr r2, =gEventObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -534,12 +534,12 @@ _080F8BBA: cmp r0, 0 bne _080F8C2C lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette33 + ldr r0, =gEventObjectPalette33 b _080F8C42 .pool _080F8C2C: lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette34 + ldr r0, =gEventObjectPalette34 b _080F8C42 .pool _080F8C38: @@ -547,7 +547,7 @@ _080F8C38: cmp r0, 0 bne _080F8C50 lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette8 + ldr r0, =gEventObjectPalette8 _080F8C42: movs r2, 0x20 bl LoadPalette @@ -555,7 +555,7 @@ _080F8C42: .pool _080F8C50: lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette17 + ldr r0, =gEventObjectPalette17 movs r2, 0x20 bl LoadPalette _080F8C5A: @@ -737,8 +737,8 @@ _080F8DD8: bl LoadCompressedObjectPalette adds r0, r6, 0 movs r1, 0x1 - bl sub_806A068 - ldr r0, =gUnknown_0202499C + bl SetMultiuseSpriteTemplateToPokemon + ldr r0, =gMultiuseSpriteTemplate ldrh r1, [r4, 0x4] strh r1, [r0, 0x2] mov r1, r9 @@ -1100,7 +1100,7 @@ sub_80F90DC: @ 80F90DC bl sub_800E0E8 movs r0, 0x8 movs r1, 0x8 - bl sub_800DFB4 + bl CreateWirelessStatusIndicatorSprite _080F90FE: pop {r0} bx r0 @@ -1174,8 +1174,8 @@ _080F917A: bx r1 thumb_func_end sub_80F9160 - thumb_func_start sp000_heal_pokemon -sp000_heal_pokemon: @ 80F9180 + thumb_func_start HealPlayerParty +HealPlayerParty: @ 80F9180 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1267,7 +1267,7 @@ _080F922C: pop {r0} bx r0 .pool - thumb_func_end sp000_heal_pokemon + thumb_func_end HealPlayerParty thumb_func_start ScriptGiveMon @ void ScriptGiveMon(s16 species_num, u8 level, int held_item) @@ -1359,8 +1359,8 @@ ScriptGiveEgg: @ 80F92C8 bx r1 thumb_func_end ScriptGiveEgg - thumb_func_start sub_80F92F8 -sub_80F92F8: @ 80F92F8 + thumb_func_start HasEnoughMonsForDoubleBattle +HasEnoughMonsForDoubleBattle: @ 80F92F8 push {lr} bl GetMonsStateToDoubles lsls r0, 24 @@ -1382,7 +1382,7 @@ _080F9318: pop {r0} bx r0 .pool - thumb_func_end sub_80F92F8 + thumb_func_end HasEnoughMonsForDoubleBattle thumb_func_start sub_80F9320 sub_80F9320: @ 80F9320 @@ -1559,7 +1559,7 @@ _080F9478: movs r0, 0x1 strh r0, [r1] _080F947E: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic bl SetMainCallback2 pop {r0} bx r0 @@ -1599,7 +1599,7 @@ _080F94D0: movs r0, 0x1 strh r0, [r1] _080F94D6: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic bl SetMainCallback2 pop {r0} bx r0 |