summaryrefslogtreecommitdiff
path: root/asm/overworld.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-17 20:10:57 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-17 20:10:57 +0100
commiteb8055eb07f4ed6e3dd1d04d61e66ad9fb0d08b8 (patch)
tree52159589a202d5e28a41e45afec68d507b7e8936 /asm/overworld.s
parent224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff)
battle 1 is decompiled
Diffstat (limited to 'asm/overworld.s')
-rw-r--r--asm/overworld.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/overworld.s b/asm/overworld.s
index ea03b8a8d..4e01e7c2f 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -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()