diff options
Diffstat (limited to 'maps/OlivineGoodRodHouse.asm')
| -rw-r--r-- | maps/OlivineGoodRodHouse.asm | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 3f7c3eced..67acb021c 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINEGOODRODHOUSE_FISHING_GURU OlivineGoodRodHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoodRodGuru: faceplayer @@ -83,20 +81,15 @@ HaveGoodRodText: done OlivineGoodRodHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, OLIVINE_CITY - warp_def 3, 7, 6, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, OLIVINE_CITY, 6 + warp_event 3, 7, OLIVINE_CITY, 6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1 + db 1 ; object events + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1 |