diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
| commit | ad2ef517bd702c352d7a4d5b64db0e99f04721c2 (patch) | |
| tree | 540ef4c700ee35c2b177e219a9c0092a3a9aa29c /asm/overworld.s | |
| parent | 77352c7ee480fe3127692ce50a6bdd019de87291 (diff) | |
| parent | 8a60952fc01ada92e029be488481a29da32f47eb (diff) | |
option menu fix conflicts
Diffstat (limited to 'asm/overworld.s')
| -rw-r--r-- | asm/overworld.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 71a3e7ccf..b66748808 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -3055,9 +3055,9 @@ _08085E18: .pool thumb_func_end c1_overworld - thumb_func_start c2_overworld_basic -@ void c2_overworld_basic() -c2_overworld_basic: @ 8085E24 + thumb_func_start OverworldBasic +@ void OverworldBasic() +OverworldBasic: @ 8085E24 push {lr} bl ScriptContext2_RunScript bl RunTasks @@ -3070,15 +3070,15 @@ c2_overworld_basic: @ 8085E24 bl do_scheduled_bg_tilemap_copies_to_vram pop {r0} bx r0 - thumb_func_end c2_overworld_basic + thumb_func_end OverworldBasic - thumb_func_start sub_8085E50 -sub_8085E50: @ 8085E50 + thumb_func_start CB2_OverworldBasic +CB2_OverworldBasic: @ 8085E50 push {lr} - bl c2_overworld_basic + bl OverworldBasic pop {r0} bx r0 - thumb_func_end sub_8085E50 + thumb_func_end CB2_OverworldBasic thumb_func_start c2_overworld c2_overworld: @ 8085E5C @@ -3092,7 +3092,7 @@ c2_overworld: @ 8085E5C movs r0, 0 bl SetVBlankCallback _08085E70: - bl c2_overworld_basic + bl OverworldBasic cmp r4, 0 beq _08085E7C bl SetFieldVBlankCallback |