diff options
Diffstat (limited to 'maps/OlivineGym.asm')
| -rw-r--r-- | maps/OlivineGym.asm | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 40e2bd711..27133cc36 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINEGYM_JASMINE const OLIVINEGYM_GYM_GUY OlivineGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks JasmineScript_0x9c12f: faceplayer @@ -50,8 +48,8 @@ JasmineScript_0x9c12f: end OlivineGymActivateRockets: - if_equal 7, .RadioTowerRockets - if_equal 6, .GoldenrodRockets + ifequal 7, .RadioTowerRockets + ifequal 6, .GoldenrodRockets end .GoldenrodRockets: @@ -198,23 +196,18 @@ OlivineGymGuyPreText: done OlivineGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 15, 2, OLIVINE_CITY - warp_def 5, 15, 2, OLIVINE_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 13, BGEVENT_READ, OlivineGymStatue - bg_event 6, 13, BGEVENT_READ, OlivineGymStatue - -.ObjectEvents: - db 2 - object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 15, OLIVINE_CITY, 2 + warp_event 5, 15, OLIVINE_CITY, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 13, BGEVENT_READ, OlivineGymStatue + bg_event 6, 13, BGEVENT_READ, OlivineGymStatue + + db 2 ; object events + object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 |