summaryrefslogtreecommitdiff
path: root/maps/Route27SandstormHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route27SandstormHouse.asm')
-rw-r--r--maps/Route27SandstormHouse.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 561b645ba..0b05f0ec4 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -1,8 +1,8 @@
Route27SandstormHouse_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
SandstormHouseWoman:
@@ -10,7 +10,7 @@ SandstormHouseWoman:
loadfont
checkevent EVENT_GOT_TM37_SANDSTORM
iftrue .AlreadyGotItem
- special Function718d
+ special GetFirstPokemonHappiness
writetext SandstormHouseWomanText1
keeptextopen
if_greater_than $95, .Loyal
@@ -19,7 +19,7 @@ SandstormHouseWoman:
.Loyal
writetext SandstormHouseWomanLoyalText
keeptextopen
- verbosegiveitem TM_37, 1
+ verbosegiveitem TM_SANDSTORM, 1
iffalse .Done
setevent EVENT_GOT_TM37_SANDSTORM
.AlreadyGotItem
@@ -94,19 +94,19 @@ Route27SandstormHouse_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 1, GROUP_ROUTE_27, MAP_ROUTE_27
warp_def $7, $3, 1, GROUP_ROUTE_27, MAP_ROUTE_27
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 1, 0, $0, SandstormHouseBookshelf
- signpost 1, 1, $0, SandstormHouseBookshelf
+ signpost 1, 0, SIGNPOST_READ, SandstormHouseBookshelf
+ signpost 1, 1, SIGNPOST_READ, SandstormHouseBookshelf
- ; people-events
+.PersonEvents:
db 1
- person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, SandstormHouseWoman, $ffff
+ person_event SPRITE_GRANNY, 8, 6, OW_UP | $2, $0, -1, -1, $0, 0, SandstormHouseWoman, -1