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

fix pokeblock merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-20 17:16:56 +01:00
parent cb229f56e8 7e6a68a99a
commit b615af4184
35 changed files with 2910 additions and 3839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asm/overworld.s
View File

@@ -2856,8 +2856,8 @@ sav1_map_get_name: @ 8085C58
.pool
thumb_func_end sav1_map_get_name
thumb_func_start sav1_map_get_battletype
sav1_map_get_battletype: @ 8085C80
thumb_func_start GetCurrentMapBattleScene
GetCurrentMapBattleScene: @ 8085C80
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
@@ -2875,7 +2875,7 @@ sav1_map_get_battletype: @ 8085C80
pop {r1}
bx r1
.pool
thumb_func_end sav1_map_get_battletype
thumb_func_end GetCurrentMapBattleScene
thumb_func_start overworld_bg_setup
@ void overworld_bg_setup()