dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix battle transition conflicts

Browse Source
This commit is contained in:
DizzyEggg
2018-01-14 22:19:26 +01:00
parent bc1a957674 d1630d481a
commit 05aba58d5d
806 changed files with 26595 additions and 2758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/overworld.s
+6 -6
View File
@@ -50,8 +50,8 @@ flag_var_implications_of_teleport_: @ 8084660
.pool
thumb_func_end flag_var_implications_of_teleport_
thumb_func_start sub_808469C
sub_808469C: @ 808469C
thumb_func_start Overworld_ResetStateAfterTeleport
Overworld_ResetStateAfterTeleport: @ 808469C
push {lr}
bl player_avatar_init_params_reset
ldr r0, =0x0000088b
@@ -69,7 +69,7 @@ sub_808469C: @ 808469C
pop {r0}
bx r0
.pool
thumb_func_end sub_808469C
thumb_func_end Overworld_ResetStateAfterTeleport
thumb_func_start flagmods_08054D70
flagmods_08054D70: @ 80846E4
@@ -2772,8 +2772,8 @@ _08085BF0:
bx r1
thumb_func_end is_light_level_1_2_3_5_or_6
thumb_func_start is_light_level_1_2_3_or_6
is_light_level_1_2_3_or_6: @ 8085BF4
thumb_func_start Overworld_MapTypeAllowsTeleportAndFly
Overworld_MapTypeAllowsTeleportAndFly: @ 8085BF4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2793,7 +2793,7 @@ _08085C0E:
_08085C10:
pop {r1}
bx r1
thumb_func_end is_light_level_1_2_3_or_6
thumb_func_end Overworld_MapTypeAllowsTeleportAndFly
thumb_func_start is_light_level_8_or_9
is_light_level_8_or_9: @ 8085C14