summaryrefslogtreecommitdiff
path: root/maps/VioletGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VioletGym.asm')
-rw-r--r--maps/VioletGym.asm42
1 files changed, 21 insertions, 21 deletions
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index b67784821..a40fe33db 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -5,7 +5,7 @@ const_value set 2
const VIOLETGYM_GYM_GUY
VioletGym_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -30,13 +30,13 @@ FalknerScript_0x683c2:
waitsfx
setflag ENGINE_ZEPHYRBADGE
checkcode VAR_BADGES
- scall VioletGymTriggerRockets
+ scall VioletGymActivateRockets
.FightDone:
checkevent EVENT_GOT_TM31_MUD_SLAP
iftrue .SpeechAfterTM
setevent EVENT_BEAT_BIRD_KEEPER_ROD
setevent EVENT_BEAT_BIRD_KEEPER_ABE
- domaptrigger ELMS_LAB, $2
+ setmapscene ELMS_LAB, $2
specialphonecall SPECIALCALL_ASSISTANT
writetext UnknownText_0x685c8
buttonsound
@@ -55,7 +55,7 @@ FalknerScript_0x683c2:
closetext
end
-VioletGymTriggerRockets:
+VioletGymActivateRockets:
if_equal 7, .RadioTowerRockets
if_equal 6, .GoldenrodRockets
end
@@ -67,23 +67,23 @@ VioletGymTriggerRockets:
jumpstd radiotowerrockets
TrainerBird_keeperRod:
- trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, Bird_keeperRodScript
+ trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, .Script
-Bird_keeperRodScript:
+.Script:
end_if_just_battled
opentext
- writetext UnknownText_0x68837
+ writetext Bird_keeperRodAfterBattleText
waitbutton
closetext
end
TrainerBird_keeperAbe:
- trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, Bird_keeperAbeScript
+ trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, .Script
-Bird_keeperAbeScript:
+.Script:
end_if_just_battled
opentext
- writetext UnknownText_0x688c7
+ writetext Bird_keeperAbeAfterBattleText
waitbutton
closetext
end
@@ -226,7 +226,7 @@ Bird_keeperRodBeatenText:
text "Gaaah!"
done
-UnknownText_0x68837:
+Bird_keeperRodAfterBattleText:
text "FALKNER's skills"
line "are for real!"
@@ -246,7 +246,7 @@ Bird_keeperAbeBeatenText:
line "true!"
done
-UnknownText_0x688c7:
+Bird_keeperAbeAfterBattleText:
text "This is pathetic,"
line "losing to some"
cont "rookie trainer…"
@@ -290,17 +290,17 @@ VioletGym_MapEventHeader:
warp_def $f, $4, 2, VIOLET_CITY
warp_def $f, $5, 2, VIOLET_CITY
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 2
- signpost 13, 3, SIGNPOST_READ, VioletGymStatue
- signpost 13, 6, SIGNPOST_READ, VioletGymStatue
+ bg_event 13, 3, BGEVENT_READ, VioletGymStatue
+ bg_event 13, 6, BGEVENT_READ, VioletGymStatue
-.PersonEvents:
+.ObjectEvents:
db 4
- person_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1
- person_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRod, -1
- person_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperAbe, -1
- person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, VioletGymGuyScript, -1
+ object_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1
+ object_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperRod, -1
+ object_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperAbe, -1
+ object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1