summaryrefslogtreecommitdiff
path: root/maps/FuchsiaGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/FuchsiaGym.asm')
-rw-r--r--maps/FuchsiaGym.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index 360783a11..d69a3f435 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -14,7 +14,7 @@ JanineScript_0x195db9:
writetext UnknownText_0x195f35
closetext
loadmovesprites
- winlosstext UnknownText_0x195fa1, $0000
+ winlosstext UnknownText_0x195fa1, 0
loadtrainer JANINE, 1
startbattle
returnafterbattle
@@ -66,7 +66,7 @@ UnknownScript_0x195e2c:
writetext UnknownText_0x1960e6
closetext
loadmovesprites
- winlosstext UnknownText_0x196126, $0000
+ winlosstext UnknownText_0x196126, 0
loadtrainer LASS, ALICE
startbattle
iftrue UnknownScript_0x195e4a
@@ -100,7 +100,7 @@ UnknownScript_0x195e66:
writetext UnknownText_0x196166
closetext
loadmovesprites
- winlosstext UnknownText_0x19617b, $0000
+ winlosstext UnknownText_0x19617b, 0
loadtrainer LASS, LINDA
startbattle
iftrue UnknownScript_0x195e84
@@ -134,7 +134,7 @@ UnknownScript_0x195ea0:
writetext UnknownText_0x1961bb
closetext
loadmovesprites
- winlosstext UnknownText_0x1961f1, $0000
+ winlosstext UnknownText_0x1961f1, 0
loadtrainer PICNICKER, CINDY
startbattle
iftrue UnknownScript_0x195ebe
@@ -168,7 +168,7 @@ UnknownScript_0x195eda:
writetext UnknownText_0x196228
closetext
loadmovesprites
- winlosstext UnknownText_0x19624a, $0000
+ winlosstext UnknownText_0x19624a, 0
loadtrainer CAMPER, BARRY
startbattle
iftrue UnknownScript_0x195ef8
@@ -391,9 +391,9 @@ FuchsiaGym_MapEventHeader:
.PersonEvents:
db 6
- person_event SPRITE_JANINE, 10, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, JanineScript_0x195db9, -1
- person_event SPRITE_FUCHSIA_GYM_1, 7, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym1Script_0x195e1b, -1
- person_event SPRITE_FUCHSIA_GYM_2, 11, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym2Script_0x195e55, -1
- person_event SPRITE_FUCHSIA_GYM_3, 4, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym3Script_0x195e8f, -1
- person_event SPRITE_FUCHSIA_GYM_4, 2, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym4Script_0x195ec9, -1
- person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuchsiaGymGuyScript, -1
+ person_event SPRITE_JANINE, 10, 1, SPRITEMOVEDATA_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, JanineScript_0x195db9, -1
+ person_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEDATA_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym1Script_0x195e1b, -1
+ person_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEDATA_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym2Script_0x195e55, -1
+ person_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEDATA_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym3Script_0x195e8f, -1
+ person_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEDATA_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuschiaGym4Script_0x195ec9, -1
+ person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FuchsiaGymGuyScript, -1