dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finished safari_zone

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-02 11:28:48 +08:00
parent 7980c4aa07
commit 40a808351a
33 changed files with 216 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_specials.s
+4 -4
View File
@@ -268,13 +268,13 @@ _080CA7E6:
sub_80CA7EC: @ 80CA7EC
push {lr}
bl sub_8112364
ldr r1, _080CA800 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
ldr r1, _080CA800 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
movs r0, 0x1
bl sub_80BFF50
pop {r0}
bx r0
.align 2, 0
_080CA800: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_080CA800: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_80CA7EC
thumb_func_start sub_80CA804
@@ -3469,7 +3469,7 @@ ChangeBoxPokemonNickname_CB: @ 80CC064
ldrb r1, [r1]
ldr r2, _080CC084 @ =gStringVar2
bl SetBoxMonNickFromAnyBox
bl c2_exit_to_overworld_1_continue_scripts_restart_music
bl CB2_ReturnToFieldContinueScriptPlayMapMusic
pop {r0}
bx r0
.align 2, 0
@@ -3577,7 +3577,7 @@ ChangePokemonNickname_CB: @ 80CC144
ldr r2, _080CC16C @ =gStringVar2
movs r1, 0x2
bl SetMonData
bl c2_exit_to_overworld_1_continue_scripts_restart_music
bl CB2_ReturnToFieldContinueScriptPlayMapMusic
pop {r0}
bx r0
.align 2, 0