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 60e636cae..dfa41c582 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -5,7 +5,7 @@ const_value set 2
const CELADONMANSION3F_FISHER
CeladonMansion3F_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -200,19 +200,19 @@ CeladonMansion3F_MapEventHeader:
warp_def $0, $6, 3, CELADON_MANSION_2F
warp_def $0, $7, 2, CELADON_MANSION_ROOF
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 4
- signpost 8, 5, SIGNPOST_UP, MapCeladonMansion3FSignpost0Script
- signpost 3, 4, SIGNPOST_UP, MapCeladonMansion3FSignpost1Script
- signpost 6, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost2Script
- signpost 3, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost3Script
+ 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
-.PersonEvents:
+.ObjectEvents:
db 4
- person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
- person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
- person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
- person_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1
+ 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