summaryrefslogtreecommitdiff
path: root/maps/FuchsiaGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/FuchsiaGym.asm')
-rw-r--r--maps/FuchsiaGym.asm62
1 files changed, 31 insertions, 31 deletions
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index acc1c3898..16363b003 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -1,8 +1,8 @@
FuchsiaGym_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
JanineScript_0x195db9:
@@ -23,11 +23,11 @@ JanineScript_0x195db9:
setevent EVENT_BEAT_LASS_LINDA
setevent EVENT_BEAT_PICNICKER_CINDY
setevent EVENT_BEAT_CAMPER_BARRY
- variablesprite $7, $28
- variablesprite $8, $28
- variablesprite $9, $28
- variablesprite $a, $27
- special Function14209
+ variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS
+ variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
+ variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
+ variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
+ special RunCallback_04
loadfont
writetext UnknownText_0x195feb
playsound SFX_GET_BADGE
@@ -56,8 +56,8 @@ FuschiaGym1Script_0x195e1b:
iftrue UnknownScript_0x195e2c
applymovement $3, MovementData_0x195f27
faceplayer
- variablesprite $7, $28
- special Function14209
+ variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS
+ special RunCallback_04
UnknownScript_0x195e2c:
faceplayer
loadfont
@@ -75,7 +75,7 @@ UnknownScript_0x195e2c:
end
UnknownScript_0x195e4a:
- variablesprite $7, $a
+ variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_JANINE
returnafterbattle
end
@@ -90,8 +90,8 @@ FuschiaGym2Script_0x195e55:
iftrue UnknownScript_0x195e66
applymovement $4, MovementData_0x195f27
faceplayer
- variablesprite $8, $28
- special Function14209
+ variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
+ special RunCallback_04
UnknownScript_0x195e66:
faceplayer
loadfont
@@ -109,7 +109,7 @@ UnknownScript_0x195e66:
end
UnknownScript_0x195e84:
- variablesprite $8, $a
+ variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_JANINE
returnafterbattle
end
@@ -124,8 +124,8 @@ FuschiaGym3Script_0x195e8f:
iftrue UnknownScript_0x195ea0
applymovement $5, MovementData_0x195f27
faceplayer
- variablesprite $9, $28
- special Function14209
+ variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
+ special RunCallback_04
UnknownScript_0x195ea0:
faceplayer
loadfont
@@ -143,7 +143,7 @@ UnknownScript_0x195ea0:
end
UnknownScript_0x195ebe:
- variablesprite $9, $a
+ variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_JANINE
returnafterbattle
end
@@ -158,8 +158,8 @@ FuschiaGym4Script_0x195ec9:
iftrue UnknownScript_0x195eda
applymovement $6, MovementData_0x195f27
faceplayer
- variablesprite $a, $27
- special Function14209
+ variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
+ special RunCallback_04
UnknownScript_0x195eda:
faceplayer
loadfont
@@ -177,7 +177,7 @@ UnknownScript_0x195eda:
end
UnknownScript_0x195ef8:
- variablesprite $a, $a
+ variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_JANINE
returnafterbattle
end
@@ -376,24 +376,24 @@ FuchsiaGym_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $11, $4, 3, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
warp_def $11, $5, 3, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 15, 3, $0, FuchsiaGymStatue
- signpost 15, 6, $0, FuchsiaGymStatue
+ signpost 15, 3, SIGNPOST_READ, FuchsiaGymStatue
+ signpost 15, 6, SIGNPOST_READ, FuchsiaGymStatue
- ; people-events
+.PersonEvents:
db 6
- person_event SPRITE_JANINE, 14, 5, $3, $0, 255, 255, $90, 0, JanineScript_0x195db9, -1
- person_event SPRITE_FUSCHIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, -1
- person_event SPRITE_FUSCHIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, -1
- person_event SPRITE_FUSCHIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, -1
- person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, -1
- person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, -1
+ person_event SPRITE_JANINE, 14, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, JanineScript_0x195db9, -1
+ person_event SPRITE_FUCHSIA_GYM_1, 11, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym1Script_0x195e1b, -1
+ person_event SPRITE_FUCHSIA_GYM_2, 15, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym2Script_0x195e55, -1
+ person_event SPRITE_FUCHSIA_GYM_3, 8, 13, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym3Script_0x195e8f, -1
+ person_event SPRITE_FUCHSIA_GYM_4, 6, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym4Script_0x195ec9, -1
+ person_event SPRITE_GYM_GUY, 19, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuchsiaGymGuyScript, -1