summaryrefslogtreecommitdiff
path: root/maps/Route32.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route32.asm')
-rw-r--r--maps/Route32.asm151
1 files changed, 72 insertions, 79 deletions
diff --git a/maps/Route32.asm b/maps/Route32.asm
index afd946c2b..cbfe311cd 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -1,4 +1,4 @@
-const_value set 2
+ const_def 2 ; object constants
const ROUTE32_FISHER1
const ROUTE32_FISHER2
const ROUTE32_FISHER3
@@ -15,14 +15,12 @@ const_value set 2
const ROUTE32_POKE_BALL2
Route32_MapScripts:
-.SceneScripts:
- db 3
- scene_script .DummyScene0
- scene_script .DummyScene1
- scene_script .DummyScene2
-
-.MapCallbacks:
- db 1
+ db 3 ; scene scripts
+ scene_script .DummyScene0 ; SCENE_DEFAULT
+ scene_script .DummyScene1 ; SCENE_ROUTE32_OFFER_SLOWPOKETAIL
+ scene_script .DummyScene2 ; SCENE_ROUTE32_NOTHING
+
+ db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .Frieda
.DummyScene0:
@@ -36,7 +34,7 @@ Route32_MapScripts:
.Frieda:
checkcode VAR_WEEKDAY
- if_equal FRIDAY, .FriedaAppears
+ ifequal FRIDAY, .FriedaAppears
disappear ROUTE32_FRIEDA
return
@@ -87,8 +85,8 @@ Route32CooltrainerMContinueScene:
end
Route32CooltrainerMStopsYouScene:
- spriteface ROUTE32_COOLTRAINER_M, LEFT
- spriteface PLAYER, RIGHT
+ objectface ROUTE32_COOLTRAINER_M, LEFT
+ objectface PLAYER, RIGHT
opentext
writetext Route32CooltrainerMText_WhatsTheHurry
waitbutton
@@ -96,7 +94,7 @@ Route32CooltrainerMStopsYouScene:
follow PLAYER, ROUTE32_COOLTRAINER_M
applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet
stopfollow
- spriteface PLAYER, DOWN
+ objectface PLAYER, DOWN
scall Route32CooltrainerMContinueScene
applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1
applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2
@@ -120,14 +118,14 @@ Route32RoarTMGuyScript:
end
Route32WannaBuyASlowpokeTailScript:
- spriteface ROUTE32_FISHER4, DOWN
- spriteface PLAYER, UP
+ objectface ROUTE32_FISHER4, DOWN
+ objectface PLAYER, UP
jump _OfferToSellSlowpokeTail
SlowpokeTailSalesmanScript:
faceplayer
_OfferToSellSlowpokeTail:
- setscene 2
+ setscene SCENE_ROUTE32_NOTHING
opentext
writetext Text_MillionDollarSlowpokeTail
yesorno
@@ -144,10 +142,10 @@ _OfferToSellSlowpokeTail:
end
TrainerCamperRoland:
- trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script
+ trainer CAMPER, ROLAND, EVENT_BEAT_CAMPER_ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CamperRolandAfterText
waitbutton
@@ -155,10 +153,10 @@ TrainerCamperRoland:
end
TrainerFisherJustin:
- trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script
+ trainer FISHER, JUSTIN, EVENT_BEAT_FISHER_JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherJustinAfterText
waitbutton
@@ -166,15 +164,15 @@ TrainerFisherJustin:
end
TrainerFisherRalph1:
- trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, 0, .Script
+ trainer FISHER, RALPH1, EVENT_BEAT_FISHER_RALPH, FisherRalph1SeenText, FisherRalph1BeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_FISHER_RALPH
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_RALPH
iftrue .Rematch
- checkflag ENGINE_SPECIAL_WILDDATA
+ checkflag ENGINE_FISH_SWARM
iftrue .Swarm
checkcellnum PHONE_FISHER_RALPH
iftrue .NumberAccepted
@@ -190,8 +188,8 @@ TrainerFisherRalph1:
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_FISHER_RALPH
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext FISHER, RALPH1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -200,11 +198,11 @@ TrainerFisherRalph1:
scall .RematchStd
winlosstext FisherRalph1BeatenText, 0
copybytetovar wRalphFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight4
@@ -291,10 +289,10 @@ TrainerFisherRalph1:
end
TrainerFisherHenry:
- trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script
+ trainer FISHER, HENRY, EVENT_BEAT_FISHER_HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherHenryAfterText
waitbutton
@@ -302,11 +300,11 @@ TrainerFisherHenry:
end
TrainerPicnickerLiz1:
- trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, .Script
+ trainer PICNICKER, LIZ1, EVENT_BEAT_PICNICKER_LIZ, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_PICNICKER_LIZ
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_LIZ
iftrue .Rematch
@@ -324,8 +322,8 @@ TrainerPicnickerLiz1:
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_PICNICKER_LIZ
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext PICNICKER, LIZ1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -334,11 +332,11 @@ TrainerPicnickerLiz1:
scall .RematchStd
winlosstext PicnickerLiz1BeatenText, 0
copybytetovar wLizFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue .LoadFight4
@@ -419,10 +417,10 @@ TrainerPicnickerLiz1:
end
TrainerYoungsterAlbert:
- trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script
+ trainer YOUNGSTER, ALBERT, EVENT_BEAT_YOUNGSTER_ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext YoungsterAlbertAfterText
waitbutton
@@ -430,10 +428,10 @@ TrainerYoungsterAlbert:
end
TrainerYoungsterGordon:
- trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script
+ trainer YOUNGSTER, GORDON, EVENT_BEAT_YOUNGSTER_GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext YoungsterGordonAfterText
waitbutton
@@ -441,10 +439,10 @@ TrainerYoungsterGordon:
end
TrainerBirdKeeperPeter:
- trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script
+ trainer BIRD_KEEPER, PETER, EVENT_BEAT_BIRD_KEEPER_PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperPeterAfterText
waitbutton
@@ -457,7 +455,7 @@ FriedaScript:
checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA
iftrue .Friday
checkcode VAR_WEEKDAY
- if_not_equal FRIDAY, .NotFriday
+ ifnotequal FRIDAY, .NotFriday
checkevent EVENT_MET_FRIEDA_OF_FRIDAY
iftrue .MetFrieda
writetext MeetFriedaText
@@ -506,10 +504,10 @@ Route32PokecenterSign:
jumpstd pokecentersign
Route32HiddenGreatBall:
- hiddenitem EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL
+ hiddenitem GREAT_BALL, EVENT_ROUTE_32_HIDDEN_GREAT_BALL
Route32HiddenSuperPotion:
- hiddenitem EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION
+ hiddenitem SUPER_POTION, EVENT_ROUTE_32_HIDDEN_SUPER_POTION
Movement_Route32CooltrainerMPushesYouBackToViolet:
step UP
@@ -929,43 +927,38 @@ Route32UnionCaveSignText:
done
Route32_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 4
- warp_def 11, 73, 1, ROUTE_32_POKECENTER_1F
- warp_def 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE
- warp_def 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE
- warp_def 6, 79, 4, UNION_CAVE_1F
-
-.CoordEvents:
- db 2
- coord_event 18, 8, 0, Route32CooltrainerMStopsYouScene
- coord_event 7, 71, 1, Route32WannaBuyASlowpokeTailScript
-
-.BGEvents:
- db 6
- bg_event 13, 5, BGEVENT_READ, Route32Sign
- bg_event 9, 1, BGEVENT_READ, Route32RuinsSign
+ db 0, 0 ; filler
+
+ db 4 ; warp events
+ warp_event 11, 73, ROUTE_32_POKECENTER_1F, 1
+ warp_event 4, 2, ROUTE_32_RUINS_OF_ALPH_GATE, 3
+ warp_event 4, 3, ROUTE_32_RUINS_OF_ALPH_GATE, 4
+ warp_event 6, 79, UNION_CAVE_1F, 4
+
+ db 2 ; coord events
+ coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene
+ coord_event 7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript
+
+ db 6 ; bg events
+ bg_event 13, 5, BGEVENT_READ, Route32Sign
+ bg_event 9, 1, BGEVENT_READ, Route32RuinsSign
bg_event 10, 84, BGEVENT_READ, Route32UnionCaveSign
bg_event 12, 73, BGEVENT_READ, Route32PokecenterSign
bg_event 12, 67, BGEVENT_ITEM, Route32HiddenGreatBall
bg_event 11, 40, BGEVENT_ITEM, Route32HiddenSuperPotion
-.ObjectEvents:
- db 14
- object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1
+ db 14 ; object events
+ object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1
object_event 12, 56, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1
- object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1
+ object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1
object_event 12, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1
- object_event 4, 63, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1
- object_event 3, 45, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1
+ object_event 4, 63, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1
+ object_event 3, 45, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1
object_event 10, 30, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1
- object_event 19, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1
+ object_event 19, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1
object_event 11, 82, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPeter, -1
- object_event 7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS
- object_event 6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
+ object_event 7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS
+ object_event 6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
object_event 15, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1
object_event 12, 67, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
- object_event 3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL
+ object_event 3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 05:59:42 +0000