summaryrefslogtreecommitdiff
path: root/maps/FuchsiaGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/FuchsiaGym.asm')
-rw-r--r--maps/FuchsiaGym.asm54
1 files changed, 31 insertions, 23 deletions
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index d5a739898..5498fec5e 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -1,3 +1,11 @@
+const_value set 2
+ const FUCHSIAGYM_JANINE
+ const FUCHSIAGYM_FUCHSIA_GYM_1
+ const FUCHSIAGYM_FUCHSIA_GYM_2
+ const FUCHSIAGYM_FUCHSIA_GYM_3
+ const FUCHSIAGYM_FUCHSIA_GYM_4
+ const FUCHSIAGYM_GYM_GUY
+
FuchsiaGym_MapScriptHeader:
.MapTriggers:
db 0
@@ -8,14 +16,14 @@ FuchsiaGym_MapScriptHeader:
JanineScript_0x195db9:
checkflag ENGINE_SOULBADGE
iftrue .FightDone
- applymovement $2, MovementData_0x195f27
+ applymovement FUCHSIAGYM_JANINE, MovementData_0x195f27
faceplayer
loadfont
writetext UnknownText_0x195f35
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x195fa1, 0
- loadtrainer JANINE, 1
+ scriptedtrainerdata JANINE, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_JANINE
@@ -31,7 +39,7 @@ JanineScript_0x195db9:
loadfont
writetext UnknownText_0x195feb
playsound SFX_GET_BADGE
- waitbutton
+ waitsfx
setflag ENGINE_SOULBADGE
jump UnknownScript_0x195e02
.FightDone
@@ -47,14 +55,14 @@ UnknownScript_0x195e02:
setevent EVENT_GOT_TM06_TOXIC
UnknownScript_0x195e15:
writetext UnknownText_0x196074
+ waitbutton
closetext
- loadmovesprites
end
FuschiaGym1Script_0x195e1b:
checkevent EVENT_BEAT_LASS_ALICE
iftrue UnknownScript_0x195e2c
- applymovement $3, MovementData_0x195f27
+ applymovement FUCHSIAGYM_FUCHSIA_GYM_1, MovementData_0x195f27
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS
special RunCallback_04
@@ -64,10 +72,10 @@ UnknownScript_0x195e2c:
checkevent EVENT_BEAT_LASS_ALICE
iftrue UnknownScript_0x195e4f
writetext UnknownText_0x1960e6
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x196126, 0
- loadtrainer LASS, ALICE
+ scriptedtrainerdata LASS, ALICE
startbattle
iftrue UnknownScript_0x195e4a
returnafterbattle
@@ -81,14 +89,14 @@ UnknownScript_0x195e4a:
UnknownScript_0x195e4f:
writetext UnknownText_0x196139
+ waitbutton
closetext
- loadmovesprites
end
FuschiaGym2Script_0x195e55:
checkevent EVENT_BEAT_LASS_LINDA
iftrue UnknownScript_0x195e66
- applymovement $4, MovementData_0x195f27
+ applymovement FUCHSIAGYM_FUCHSIA_GYM_2, MovementData_0x195f27
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
special RunCallback_04
@@ -98,10 +106,10 @@ UnknownScript_0x195e66:
checkevent EVENT_BEAT_LASS_LINDA
iftrue UnknownScript_0x195e89
writetext UnknownText_0x196166
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x19617b, 0
- loadtrainer LASS, LINDA
+ scriptedtrainerdata LASS, LINDA
startbattle
iftrue UnknownScript_0x195e84
returnafterbattle
@@ -115,14 +123,14 @@ UnknownScript_0x195e84:
UnknownScript_0x195e89:
writetext UnknownText_0x196199
+ waitbutton
closetext
- loadmovesprites
end
FuschiaGym3Script_0x195e8f:
checkevent EVENT_BEAT_PICNICKER_CINDY
iftrue UnknownScript_0x195ea0
- applymovement $5, MovementData_0x195f27
+ applymovement FUCHSIAGYM_FUCHSIA_GYM_3, MovementData_0x195f27
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
special RunCallback_04
@@ -132,10 +140,10 @@ UnknownScript_0x195ea0:
checkevent EVENT_BEAT_PICNICKER_CINDY
iftrue UnknownScript_0x195ec3
writetext UnknownText_0x1961bb
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x1961f1, 0
- loadtrainer PICNICKER, CINDY
+ scriptedtrainerdata PICNICKER, CINDY
startbattle
iftrue UnknownScript_0x195ebe
returnafterbattle
@@ -149,14 +157,14 @@ UnknownScript_0x195ebe:
UnknownScript_0x195ec3:
writetext UnknownText_0x19620c
+ waitbutton
closetext
- loadmovesprites
end
FuschiaGym4Script_0x195ec9:
checkevent EVENT_BEAT_CAMPER_BARRY
iftrue UnknownScript_0x195eda
- applymovement $6, MovementData_0x195f27
+ applymovement FUCHSIAGYM_FUCHSIA_GYM_4, MovementData_0x195f27
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
special RunCallback_04
@@ -166,10 +174,10 @@ UnknownScript_0x195eda:
checkevent EVENT_BEAT_CAMPER_BARRY
iftrue UnknownScript_0x195efd
writetext UnknownText_0x196228
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x19624a, 0
- loadtrainer CAMPER, BARRY
+ scriptedtrainerdata CAMPER, BARRY
startbattle
iftrue UnknownScript_0x195ef8
returnafterbattle
@@ -183,8 +191,8 @@ UnknownScript_0x195ef8:
UnknownScript_0x195efd:
writetext UnknownText_0x19626b
+ waitbutton
closetext
- loadmovesprites
end
FuchsiaGymGuyScript:
@@ -193,14 +201,14 @@ FuchsiaGymGuyScript:
checkevent EVENT_BEAT_JANINE
iftrue .FuchsiaGymGuyWinScript
writetext FuchsiaGymGuyText
+ waitbutton
closetext
- loadmovesprites
end
.FuchsiaGymGuyWinScript
writetext FuchsiaGymGuyWinText
+ waitbutton
closetext
- loadmovesprites
end
FuchsiaGymStatue: