aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/oaks_aide.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-23 15:57:48 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-23 15:57:48 -0400
commit9da88a19beed6b713317bb446d21cbd493ab8009 (patch)
treed8d6cc4df3c3dcb00541b5bda9cae842584a7009 /engine/overworld/oaks_aide.asm
parentName some wram address refs (diff)
parentBank7 misc functions (diff)
downloadpokeyellow-9da88a19beed6b713317bb446d21cbd493ab8009.tar.gz
pokeyellow-9da88a19beed6b713317bb446d21cbd493ab8009.tar.xz
pokeyellow-9da88a19beed6b713317bb446d21cbd493ab8009.zip
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/overworld/oaks_aide.asm')
-rwxr-xr-xengine/overworld/oaks_aide.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/oaks_aide.asm b/engine/overworld/oaks_aide.asm
index 8ac456d2..d412d8ec 100755
--- a/engine/overworld/oaks_aide.asm
+++ b/engine/overworld/oaks_aide.asm
@@ -1,4 +1,4 @@
-OaksAideScript: ; 0x59035
+OaksAideScript: ; 58ecc (16:4ecc)
ld hl, OaksAideHiText
call PrintText
call YesNoChoice
@@ -45,27 +45,27 @@ OaksAideScript: ; 0x59035
ld [hOaksAideResult], a
ret
-OaksAideHiText: ; 59091 (16:5091)
+OaksAideHiText: ; 58f28 (16:4f28)
TX_FAR _OaksAideHiText
db "@"
-OaksAideUhOhText: ; 59096 (16:5096)
+OaksAideUhOhText: ; 58f2d (16:4f2d)
TX_FAR _OaksAideUhOhText
db "@"
-OaksAideComeBackText: ; 5909b (16:509b)
+OaksAideComeBackText: ; 58f32 (16:4f32)
TX_FAR _OaksAideComeBackText
db "@"
-OaksAideHereYouGoText: ; 590a0 (16:50a0)
+OaksAideHereYouGoText: ; 58f37 (16:4f37)
TX_FAR _OaksAideHereYouGoText
db "@"
-OaksAideGotItemText: ; 590a5 (16:50a5)
+OaksAideGotItemText: ; 58f3c (16:4f3c)
TX_FAR _OaksAideGotItemText
db $0b
db "@"
-OaksAideNoRoomText: ; 590ab (16:50ab)
+OaksAideNoRoomText: ; 58f41 (16:4f41)
TX_FAR _OaksAideNoRoomText
db "@"