summaryrefslogtreecommitdiff
path: root/maps/EcruteakGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/EcruteakGym.asm')
-rw-r--r--maps/EcruteakGym.asm84
1 files changed, 42 insertions, 42 deletions
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 6f54bb4bd..491aaff7b 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -392,54 +392,54 @@ EcruteakGym_MapEventHeader:
.Warps:
db 33
- warp_def $11, $4, 10, ECRUTEAK_CITY
- warp_def $11, $5, 10, ECRUTEAK_CITY
- warp_def $e, $4, 4, ECRUTEAK_GYM
- warp_def $4, $2, 3, ECRUTEAK_GYM
- warp_def $4, $3, 3, ECRUTEAK_GYM
- warp_def $4, $4, 3, ECRUTEAK_GYM
- warp_def $5, $4, 3, ECRUTEAK_GYM
- warp_def $7, $6, 3, ECRUTEAK_GYM
- warp_def $4, $7, 3, ECRUTEAK_GYM
- warp_def $6, $2, 3, ECRUTEAK_GYM
- warp_def $6, $3, 3, ECRUTEAK_GYM
- warp_def $6, $4, 3, ECRUTEAK_GYM
- warp_def $6, $5, 3, ECRUTEAK_GYM
- warp_def $6, $7, 3, ECRUTEAK_GYM
- warp_def $7, $7, 3, ECRUTEAK_GYM
- warp_def $8, $4, 3, ECRUTEAK_GYM
- warp_def $8, $5, 3, ECRUTEAK_GYM
- warp_def $8, $6, 3, ECRUTEAK_GYM
- warp_def $8, $7, 3, ECRUTEAK_GYM
- warp_def $8, $2, 3, ECRUTEAK_GYM
- warp_def $9, $2, 3, ECRUTEAK_GYM
- warp_def $a, $2, 3, ECRUTEAK_GYM
- warp_def $b, $2, 3, ECRUTEAK_GYM
- warp_def $a, $4, 3, ECRUTEAK_GYM
- warp_def $a, $5, 3, ECRUTEAK_GYM
- warp_def $c, $2, 3, ECRUTEAK_GYM
- warp_def $c, $3, 3, ECRUTEAK_GYM
- warp_def $c, $4, 3, ECRUTEAK_GYM
- warp_def $c, $5, 3, ECRUTEAK_GYM
- warp_def $a, $7, 3, ECRUTEAK_GYM
- warp_def $b, $7, 3, ECRUTEAK_GYM
- warp_def $c, $7, 3, ECRUTEAK_GYM
- warp_def $d, $7, 3, ECRUTEAK_GYM
+ warp_def 4, 17, 10, ECRUTEAK_CITY
+ warp_def 5, 17, 10, ECRUTEAK_CITY
+ warp_def 4, 14, 4, ECRUTEAK_GYM
+ warp_def 2, 4, 3, ECRUTEAK_GYM
+ warp_def 3, 4, 3, ECRUTEAK_GYM
+ warp_def 4, 4, 3, ECRUTEAK_GYM
+ warp_def 4, 5, 3, ECRUTEAK_GYM
+ warp_def 6, 7, 3, ECRUTEAK_GYM
+ warp_def 7, 4, 3, ECRUTEAK_GYM
+ warp_def 2, 6, 3, ECRUTEAK_GYM
+ warp_def 3, 6, 3, ECRUTEAK_GYM
+ warp_def 4, 6, 3, ECRUTEAK_GYM
+ warp_def 5, 6, 3, ECRUTEAK_GYM
+ warp_def 7, 6, 3, ECRUTEAK_GYM
+ warp_def 7, 7, 3, ECRUTEAK_GYM
+ warp_def 4, 8, 3, ECRUTEAK_GYM
+ warp_def 5, 8, 3, ECRUTEAK_GYM
+ warp_def 6, 8, 3, ECRUTEAK_GYM
+ warp_def 7, 8, 3, ECRUTEAK_GYM
+ warp_def 2, 8, 3, ECRUTEAK_GYM
+ warp_def 2, 9, 3, ECRUTEAK_GYM
+ warp_def 2, 10, 3, ECRUTEAK_GYM
+ warp_def 2, 11, 3, ECRUTEAK_GYM
+ warp_def 4, 10, 3, ECRUTEAK_GYM
+ warp_def 5, 10, 3, ECRUTEAK_GYM
+ warp_def 2, 12, 3, ECRUTEAK_GYM
+ warp_def 3, 12, 3, ECRUTEAK_GYM
+ warp_def 4, 12, 3, ECRUTEAK_GYM
+ warp_def 5, 12, 3, ECRUTEAK_GYM
+ warp_def 7, 10, 3, ECRUTEAK_GYM
+ warp_def 7, 11, 3, ECRUTEAK_GYM
+ warp_def 7, 12, 3, ECRUTEAK_GYM
+ warp_def 7, 13, 3, ECRUTEAK_GYM
.CoordEvents:
db 0
.BGEvents:
db 2
- bg_event 15, 3, BGEVENT_READ, EcruteakGymStatue
- bg_event 15, 6, BGEVENT_READ, EcruteakGymStatue
+ bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue
+ bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue
.ObjectEvents:
db 7
- object_event SPRITE_MORTY, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1
- object_event SPRITE_SAGE, 7, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
- object_event SPRITE_SAGE, 13, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
- object_event SPRITE_GRANNY, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
- object_event SPRITE_GRANNY, 9, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1
- object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1
- object_event SPRITE_GRAMPS, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
+ object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1
+ object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
+ object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
+ object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
+ object_event 7, 9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1
+ object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1
+ object_event 4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS