diff options
Diffstat (limited to 'maps/Route27SandstormHouse.asm')
| -rw-r--r-- | maps/Route27SandstormHouse.asm | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 629af1536..886e7aa26 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,22 +1,20 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE27SANDSTORMHOUSE_GRANNY Route27SandstormHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SandstormHouseWoman: faceplayer opentext checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext SandstormHouseWomanText1 buttonsound - if_greater_than 150 - 1, .Loyal + ifgreater 150 - 1, .Loyal jump .Disloyal .Loyal: @@ -94,22 +92,17 @@ SandstormHouseWomanDisloyalText: done Route27SandstormHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_27 - warp_def 3, 7, 1, ROUTE_27 + db 2 ; warp events + warp_event 2, 7, ROUTE_27, 1 + warp_event 3, 7, ROUTE_27, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf - bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf + bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1 + db 1 ; object events + object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1 |