summaryrefslogtreecommitdiff
path: root/maps/Route36.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-20 03:51:52 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-20 03:51:52 -0400
commitbef792f2d21ccac0127aeffd9e0838aba81f44b6 (patch)
tree22185c93e9f9dcc3937a5e96279dd71f3b24c0d8 /maps/Route36.asm
parent94129b6b451fc7770ea75ffbdcbaab4967f513bd (diff)
More label updates, moved predefs to new file
Also named most of the engine and event flag constants.
Diffstat (limited to 'maps/Route36.asm')
-rw-r--r--maps/Route36.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 87d8fc151..2946e873f 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -89,14 +89,14 @@ UnknownScript_0x19407b:
applymovement $4, MovementData_0x19424b
disappear $4
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
- special Function14209
+ special RunCallback_04
special Function14168
end
LassScript_0x19408c:
faceplayer
loadfont
- checkevent EVENT_0BA
+ checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
iftrue UnknownScript_0x1940b3
setevent EVENT_MET_FLORIA
writetext UnknownText_0x1942f1
@@ -257,7 +257,7 @@ UnknownScript_0x1941b4:
verbosegiveitem FIRE_STONE, 1
iffalse UnknownScript_0x1941c6
clearflag ENGINE_ALAN_HAS_FIRE_STONE
- setevent EVENT_101
+ setevent EVENT_ALAN_GAVE_FIRE_STONE
jump UnknownScript_0x1941d5
UnknownScript_0x1941c6: