summaryrefslogtreecommitdiff
path: root/maps/FuchsiaPokeCenter1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/FuchsiaPokeCenter1F.asm')
-rw-r--r--maps/FuchsiaPokeCenter1F.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm
index 389ea1130..4dda55a23 100644
--- a/maps/FuchsiaPokeCenter1F.asm
+++ b/maps/FuchsiaPokeCenter1F.asm
@@ -1,11 +1,11 @@
FuchsiaPokeCenter1F_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 1
; triggers
dw UnknownScript_0x196458, $0000
- ; callback count
+.MapCallbacks:
db 0
UnknownScript_0x196458:
@@ -28,16 +28,16 @@ JanineImpersonatorScript_0x196462:
loadmovesprites
applymovement $5, MovementData_0x196486
faceplayer
- variablesprite $c, $a
- special Function14209
+ variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE
+ special RunCallback_04
loadfont
writetext UnknownText_0x19654e
closetext
loadmovesprites
applymovement $5, MovementData_0x196486
faceplayer
- variablesprite $c, $28
- special Function14209
+ variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
+ special RunCallback_04
end
MovementData_0x196486:
@@ -88,21 +88,21 @@ FuchsiaPokeCenter1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 3
warp_def $7, $3, 5, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
warp_def $7, $4, 5, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 4
- person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $a0, 0, NurseScript_0x196459, -1
- person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $0, 0, CooltrainerMScript_0x19645c, -1
- person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, -1
- person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, -1
+ person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, NurseScript_0x196459, -1
+ person_event SPRITE_COOLTRAINER_M, 8, 12, OW_UP | $1, $1, -1, -1, $0, 0, CooltrainerMScript_0x19645c, -1
+ person_event SPRITE_COOLTRAINER_F, 8, 5, OW_UP | $1, $1, -1, -1, $0, 0, CooltrainerFScript_0x19645f, -1
+ person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, JanineImpersonatorScript_0x196462, -1