summaryrefslogtreecommitdiff
path: root/maps/SaffronGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/SaffronGym.asm')
-rw-r--r--maps/SaffronGym.asm123
1 files changed, 58 insertions, 65 deletions
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index a2ba7497d..5f70785d2 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+ const_def 2 ; object constants
const SAFFRONGYM_SABRINA
const SAFFRONGYM_GRANNY1
const SAFFRONGYM_YOUNGSTER1
@@ -7,11 +7,9 @@ const_value set 2
const SAFFRONGYM_GYM_GUY
SaffronGym_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
SabrinaScript_0x189c2e:
faceplayer
@@ -47,10 +45,10 @@ SabrinaScript_0x189c2e:
end
TrainerMediumRebecca:
- trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script
+ trainer MEDIUM, REBECCA, EVENT_BEAT_MEDIUM_REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext MediumRebeccaAfterBattleText
waitbutton
@@ -58,10 +56,10 @@ TrainerMediumRebecca:
end
TrainerPsychicFranklin:
- trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script
+ trainer PSYCHIC_T, FRANKLIN, EVENT_BEAT_PSYCHIC_FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicFranklinAfterBattleText
waitbutton
@@ -69,10 +67,10 @@ TrainerPsychicFranklin:
end
TrainerMediumDoris:
- trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script
+ trainer MEDIUM, DORIS, EVENT_BEAT_MEDIUM_DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext MediumDorisAfterBattleText
waitbutton
@@ -80,10 +78,10 @@ TrainerMediumDoris:
end
TrainerPsychicJared:
- trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script
+ trainer PSYCHIC_T, JARED, EVENT_BEAT_PSYCHIC_JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicJaredAfterBattleText
waitbutton
@@ -291,56 +289,51 @@ SaffronGymGuyWinText:
done
SaffronGym_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 32
- warp_def 8, 17, 2, SAFFRON_CITY
- warp_def 9, 17, 2, SAFFRON_CITY
- warp_def 11, 15, 18, SAFFRON_GYM
- warp_def 19, 15, 19, SAFFRON_GYM
- warp_def 19, 11, 20, SAFFRON_GYM
- warp_def 1, 11, 21, SAFFRON_GYM
- warp_def 5, 3, 22, SAFFRON_GYM
- warp_def 11, 5, 23, SAFFRON_GYM
- warp_def 1, 15, 24, SAFFRON_GYM
- warp_def 19, 3, 25, SAFFRON_GYM
- warp_def 15, 17, 26, SAFFRON_GYM
- warp_def 5, 17, 27, SAFFRON_GYM
- warp_def 5, 9, 28, SAFFRON_GYM
- warp_def 9, 3, 29, SAFFRON_GYM
- warp_def 15, 9, 30, SAFFRON_GYM
- warp_def 15, 5, 31, SAFFRON_GYM
- warp_def 1, 5, 32, SAFFRON_GYM
- warp_def 19, 17, 3, SAFFRON_GYM
- warp_def 19, 9, 4, SAFFRON_GYM
- warp_def 1, 9, 5, SAFFRON_GYM
- warp_def 5, 5, 6, SAFFRON_GYM
- warp_def 11, 3, 7, SAFFRON_GYM
- warp_def 1, 17, 8, SAFFRON_GYM
- warp_def 19, 5, 9, SAFFRON_GYM
- warp_def 15, 15, 10, SAFFRON_GYM
- warp_def 5, 15, 11, SAFFRON_GYM
- warp_def 5, 11, 12, SAFFRON_GYM
- warp_def 9, 5, 13, SAFFRON_GYM
- warp_def 15, 11, 14, SAFFRON_GYM
- warp_def 15, 3, 15, SAFFRON_GYM
- warp_def 1, 3, 16, SAFFRON_GYM
- warp_def 11, 9, 17, SAFFRON_GYM
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 1
- bg_event 8, 15, BGEVENT_READ, SaffronGymStatue
-
-.ObjectEvents:
- db 6
- object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1
+ db 0, 0 ; filler
+
+ db 32 ; warp events
+ warp_event 8, 17, SAFFRON_CITY, 2
+ warp_event 9, 17, SAFFRON_CITY, 2
+ warp_event 11, 15, SAFFRON_GYM, 18
+ warp_event 19, 15, SAFFRON_GYM, 19
+ warp_event 19, 11, SAFFRON_GYM, 20
+ warp_event 1, 11, SAFFRON_GYM, 21
+ warp_event 5, 3, SAFFRON_GYM, 22
+ warp_event 11, 5, SAFFRON_GYM, 23
+ warp_event 1, 15, SAFFRON_GYM, 24
+ warp_event 19, 3, SAFFRON_GYM, 25
+ warp_event 15, 17, SAFFRON_GYM, 26
+ warp_event 5, 17, SAFFRON_GYM, 27
+ warp_event 5, 9, SAFFRON_GYM, 28
+ warp_event 9, 3, SAFFRON_GYM, 29
+ warp_event 15, 9, SAFFRON_GYM, 30
+ warp_event 15, 5, SAFFRON_GYM, 31
+ warp_event 1, 5, SAFFRON_GYM, 32
+ warp_event 19, 17, SAFFRON_GYM, 3
+ warp_event 19, 9, SAFFRON_GYM, 4
+ warp_event 1, 9, SAFFRON_GYM, 5
+ warp_event 5, 5, SAFFRON_GYM, 6
+ warp_event 11, 3, SAFFRON_GYM, 7
+ warp_event 1, 17, SAFFRON_GYM, 8
+ warp_event 19, 5, SAFFRON_GYM, 9
+ warp_event 15, 15, SAFFRON_GYM, 10
+ warp_event 5, 15, SAFFRON_GYM, 11
+ warp_event 5, 11, SAFFRON_GYM, 12
+ warp_event 9, 5, SAFFRON_GYM, 13
+ warp_event 15, 11, SAFFRON_GYM, 14
+ warp_event 15, 3, SAFFRON_GYM, 15
+ warp_event 1, 3, SAFFRON_GYM, 16
+ warp_event 11, 9, SAFFRON_GYM, 17
+
+ db 0 ; coord events
+
+ db 1 ; bg events
+ bg_event 8, 15, BGEVENT_READ, SaffronGymStatue
+
+ db 6 ; object events
+ object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1
object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1
- object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
- object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1
- object_event 17, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1
- object_event 9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1
+ object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
+ object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1
+ object_event 17, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1
+ object_event 9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 07:36:55 +0000