summaryrefslogtreecommitdiff
path: root/maps/CeladonMansion3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeladonMansion3F.asm')
-rw-r--r--maps/CeladonMansion3F.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index dfa41c582..5274b5b38 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -195,24 +195,24 @@ CeladonMansion3F_MapEventHeader:
.Warps:
db 4
- warp_def $0, $0, 1, CELADON_MANSION_ROOF
- warp_def $0, $1, 2, CELADON_MANSION_2F
- warp_def $0, $6, 3, CELADON_MANSION_2F
- warp_def $0, $7, 2, CELADON_MANSION_ROOF
+ warp_def 0, 0, 1, CELADON_MANSION_ROOF
+ warp_def 1, 0, 2, CELADON_MANSION_2F
+ warp_def 6, 0, 3, CELADON_MANSION_2F
+ warp_def 7, 0, 2, CELADON_MANSION_ROOF
.CoordEvents:
db 0
.BGEvents:
db 4
- bg_event 8, 5, BGEVENT_UP, MapCeladonMansion3FSignpost0Script
- bg_event 3, 4, BGEVENT_UP, MapCeladonMansion3FSignpost1Script
- bg_event 6, 1, BGEVENT_UP, MapCeladonMansion3FSignpost2Script
- bg_event 3, 1, BGEVENT_UP, MapCeladonMansion3FSignpost3Script
+ bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script
+ bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script
+ bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script
+ bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script
.ObjectEvents:
db 4
- object_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
- object_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
- object_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
- object_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1
+ object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
+ object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
+ object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
+ object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1