summaryrefslogtreecommitdiff
path: root/maps/PokeCenter2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/PokeCenter2F.asm')
-rw-r--r--maps/PokeCenter2F.asm116
1 files changed, 61 insertions, 55 deletions
diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm
index b5596bb9c..87f064c61 100644
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -1,3 +1,9 @@
+const_value set 2
+ const POKECENTER2F_LINK_RECEPTIONIST1
+ const POKECENTER2F_LINK_RECEPTIONIST2
+ const POKECENTER2F_LINK_RECEPTIONIST3
+ const POKECENTER2F_OFFICER
+
PokeCenter2F_MapScriptHeader:
.MapTriggers:
db 6
@@ -45,7 +51,7 @@ PokeCenter2F_MapScriptHeader:
end
PokeCenter2F_AppearMysteryGiftDeliveryGuy:
- appear $5
+ appear POKECENTER2F_OFFICER
setevent EVENT_RECEIVED_BALLS_FROM_KURT
end
@@ -53,16 +59,16 @@ Script_TradeCenterClosed:
faceplayer
loadfont
writetext Text_TradeRoomClosed
+ waitbutton
closetext
- loadmovesprites
end
Script_BattleRoomClosed:
faceplayer
loadfont
writetext Text_BattleRoomClosed
+ waitbutton
closetext
- loadmovesprites
end
LinkReceptionistScript_Trade:
@@ -96,8 +102,8 @@ LinkReceptionistScript_Trade:
special Special_CheckBothSelectedSameRoom
iffalse .IncompatibleRooms
writetext Text_PleaseComeIn2
+ waitbutton
closetext
- loadmovesprites
scall PokeCenter2F_CheckGender
warpcheck
end
@@ -105,20 +111,20 @@ LinkReceptionistScript_Trade:
.FriendNotReady:
special Special_AbortLink
writetext Text_FriendNotReady
- loadmovesprites
+ closetext
end
.LinkedToFirstGen:
special Special_FailedLinkToPast
writetext Text_CantLinkToThePast
special Special_CloseLink
- loadmovesprites
+ closetext
end
.IncompatibleRooms:
writetext Text_IncompatibleRooms
special Special_CloseLink
- loadmovesprites
+ closetext
end
.LinkTimedOut:
@@ -130,7 +136,7 @@ LinkReceptionistScript_Trade:
.AbortLink:
special Special_AbortLink
.Cancel:
- loadmovesprites
+ closetext
end
.Mobile:
@@ -151,14 +157,14 @@ LinkReceptionistScript_Trade:
iffalse .Mobile_DidNotSave
special Function1011f1
writetext Text_PleaseComeIn2
+ waitbutton
closetext
- loadmovesprites
writebyte $0
end
.Mobile_DidNotSave:
writetext Text_PleaseComeAgain
- loadmovesprites
+ closetext
writebyte $1
end
@@ -198,8 +204,8 @@ LinkReceptionistScript_Battle:
special Special_CheckBothSelectedSameRoom
iffalse .IncompatibleRooms
writetext Text_PleaseComeIn2
+ waitbutton
closetext
- loadmovesprites
scall PokeCenter2F_CheckGender
warpcheck
end
@@ -207,20 +213,20 @@ LinkReceptionistScript_Battle:
.FriendNotReady:
special Special_AbortLink
writetext Text_FriendNotReady
- loadmovesprites
+ closetext
end
.LinkedToFirstGen:
special Special_FailedLinkToPast
writetext Text_CantLinkToThePast
special Special_CloseLink
- loadmovesprites
+ closetext
end
.IncompatibleRooms:
writetext Text_IncompatibleRooms
special Special_CloseLink
- loadmovesprites
+ closetext
end
.LinkTimedOut:
@@ -232,7 +238,7 @@ LinkReceptionistScript_Battle:
.AbortLink:
special Special_AbortLink
.Cancel:
- loadmovesprites
+ closetext
end
.Mobile:
@@ -255,14 +261,14 @@ LinkReceptionistScript_Battle:
iffalse .Mobile_DidNotSave
special Function1011f1
writetext Text_PleaseComeIn2
+ waitbutton
closetext
- loadmovesprites
writebyte $0
end
.Mobile_DidNotSave:
writetext Text_PleaseComeAgain
- loadmovesprites
+ closetext
writebyte $1
end
@@ -276,9 +282,9 @@ LinkReceptionistScript_Battle:
.Mobile_InvalidParty:
writetext Text_BrokeStadiumRules
- closetext
+ waitbutton
.Mobile_DidNotSelect:
- loadmovesprites
+ closetext
writebyte $0
end
@@ -290,8 +296,8 @@ Script_TimeCapsuleClosed:
faceplayer
loadfont
writetext Text_TimeCapsuleClosed
+ waitbutton
closetext
- loadmovesprites
end
LinkReceptionistScript_TimeCapsule:
@@ -325,14 +331,14 @@ LinkReceptionistScript_TimeCapsule:
special Special_CheckBothSelectedSameRoom
writetext Text_IncompatibleRooms
special Special_CloseLink
- loadmovesprites
+ closetext
end
.OK:
special Special_EnterTimeCapsule
writetext Text_PleaseComeIn2
+ waitbutton
closetext
- loadmovesprites
scall TimeCapsuleScript_CheckPlayerGender
warpcheck
end
@@ -340,7 +346,7 @@ LinkReceptionistScript_TimeCapsule:
.FriendNotReady:
special Special_AbortLink
writetext Text_FriendNotReady
- loadmovesprites
+ closetext
end
.LinkTimedOut:
@@ -351,22 +357,22 @@ LinkReceptionistScript_TimeCapsule:
writetext Text_PleaseComeAgain
.Cancel:
special Special_AbortLink
- loadmovesprites
+ closetext
end
.MonTooNew:
writetext Text_RejectNewMon
- loadmovesprites
+ closetext
end
.MonMoveTooNew:
writetext Text_RejectMonWithNewMove
- loadmovesprites
+ closetext
end
.MonHasMail:
writetext Text_RejectMonWithMail
- loadmovesprites
+ closetext
end
Script_LeftCableTradeCenter:
@@ -384,9 +390,9 @@ Script_LeftMobileTradeRoom:
end
Script_WalkOutOfMobileTradeRoom:
- applymovement $2, MovementData_0x192d0b
+ applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192d0b
applymovement PLAYER, MovementData_0x192d0f
- applymovement $2, MovementData_0x192d14
+ applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192d14
end
Script_LeftCableColosseum:
@@ -404,9 +410,9 @@ Script_LeftMobileBattleRoom:
end
Script_WalkOutOfMobileBattleRoom:
- applymovement $3, MovementData_0x192d0b
+ applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192d0b
applymovement PLAYER, MovementData_0x192d0f
- applymovement $3, MovementData_0x192d14
+ applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192d14
end
PokeCenter2F_CheckGender:
@@ -421,14 +427,14 @@ PokeCenter2F_CheckGender:
applymovement PLAYER, MovementData_0x192ce2
loadfont
writetext Text_OhPleaseWait
+ waitbutton
closetext
- loadmovesprites
applymovement2 MovementData_0x192cdc
spriteface PLAYER, LEFT
loadfont
writetext Text_ChangeTheLook
+ waitbutton
closetext
- loadmovesprites
playsound SFX_TINGLE
applymovement PLAYER, MovementData_0x192d17
writebyte (1 << 7) | (PAL_OW_RED << 4)
@@ -438,8 +444,8 @@ PokeCenter2F_CheckGender:
special ReplaceKrisSprite
loadfont
writetext Text_LikeTheLook
+ waitbutton
closetext
- loadmovesprites
showemote EMOTE_SHOCK, PLAYER, 15
applymovement PLAYER, MovementData_0x192ce5
end
@@ -447,13 +453,13 @@ PokeCenter2F_CheckGender:
Script_CleanUpFemaleFlagAfterTrade:
checkflag ENGINE_KRIS_IN_CABLE_CLUB
iftrue .Female
- applymovement $2, MovementData_0x192d04
+ applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192d04
applymovement PLAYER, MovementData_0x192cf5
- applymovement $2, MovementData_0x192cfe
+ applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192cfe
end
.Female:
- applymovement $2, MovementData_0x192d04
+ applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192d04
applymovement PLAYER, MovementData_0x192d28
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
@@ -463,19 +469,19 @@ Script_CleanUpFemaleFlagAfterTrade:
applymovement PLAYER, MovementData_0x192d1c
special ReplaceKrisSprite
applymovement PLAYER, MovementData_0x192d2a
- applymovement $2, MovementData_0x192cfe
+ applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192cfe
end
Script_CleanUpFemaleFlagAfterBattle:
checkflag ENGINE_KRIS_IN_CABLE_CLUB
iftrue .Female
- applymovement $3, MovementData_0x192d04
+ applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192d04
applymovement PLAYER, MovementData_0x192cf5
- applymovement $3, MovementData_0x192cfe
+ applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192cfe
end
.Female:
- applymovement $3, MovementData_0x192d04
+ applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192d04
applymovement PLAYER, MovementData_0x192d28
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
@@ -485,7 +491,7 @@ Script_CleanUpFemaleFlagAfterBattle:
applymovement PLAYER, MovementData_0x192d1c
special ReplaceKrisSprite
applymovement PLAYER, MovementData_0x192d2a
- applymovement $3, MovementData_0x192cfe
+ applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192cfe
end
TimeCapsuleScript_CheckPlayerGender:
@@ -527,28 +533,28 @@ TimeCapsuleScript_CheckPlayerGender:
.FemaleContinue:
loadfont
writetext Text_OhPleaseWait
+ waitbutton
closetext
- loadmovesprites
checkcode VAR_FACING
if_not_equal UP, .FemaleChangeApperance
spriteface PLAYER, LEFT
.FemaleChangeApperance:
loadfont
writetext Text_ChangeTheLook
+ waitbutton
closetext
- loadmovesprites
playsound SFX_TINGLE
applymovement PLAYER, MovementData_0x192d17
writebyte (1 << 7) | (PAL_OW_RED << 4)
special Special_SetPlayerPalette
applymovement PLAYER, MovementData_0x192d22
- faceperson PLAYER, $4
+ faceperson PLAYER, POKECENTER2F_LINK_RECEPTIONIST3
setflag ENGINE_KRIS_IN_CABLE_CLUB
special ReplaceKrisSprite
loadfont
writetext Text_LikeTheLook
+ waitbutton
closetext
- loadmovesprites
showemote EMOTE_SHOCK, PLAYER, 15
applymovement PLAYER, MovementData_0x192d2d
end
@@ -557,13 +563,13 @@ Script_LeftTimeCapsule:
special Special_AbortLink
checkflag ENGINE_KRIS_IN_CABLE_CLUB
iftrue .Female
- applymovement $4, MovementData_0x192d08
+ applymovement POKECENTER2F_LINK_RECEPTIONIST3, MovementData_0x192d08
applymovement PLAYER, MovementData_0x192cf9
- applymovement $4, MovementData_0x192d01
+ applymovement POKECENTER2F_LINK_RECEPTIONIST3, MovementData_0x192d01
jump .Done
.Female:
- applymovement $4, MovementData_0x192d08
+ applymovement POKECENTER2F_LINK_RECEPTIONIST3, MovementData_0x192d08
applymovement PLAYER, MovementData_0x192cfc
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
@@ -573,7 +579,7 @@ Script_LeftTimeCapsule:
applymovement PLAYER, MovementData_0x192d1c
special ReplaceKrisSprite
applymovement PLAYER, MovementData_0x192cfc
- applymovement $4, MovementData_0x192d01
+ applymovement POKECENTER2F_LINK_RECEPTIONIST3, MovementData_0x192d01
.Done:
dotrigger $0
domaptrigger TIME_CAPSULE, $0
@@ -582,7 +588,7 @@ Script_LeftTimeCapsule:
MapPokeCenter2FSignpost0Script:
refreshscreen $0
special Special_DisplayLinkRecord
- loadmovesprites
+ closetext
end
OfficerScript_0x192c9a:
@@ -595,27 +601,27 @@ OfficerScript_0x192c9a:
iffalse .RefusedGift
writetext Text_MysteryGiftDeliveryGuy_HereYouGo
keeptextopen
- waitbutton
+ waitsfx
special Special_GetMysteryGiftItem
iffalse .BagIsFull
itemnotify
setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
.AlreadyGotGift:
writetext Text_MysteryGiftDeliveryGuy_Outro
+ waitbutton
closetext
- loadmovesprites
end
.BagIsFull:
writetext Text_MysteryGiftDeliveryGuy_NoRoom
+ waitbutton
closetext
- loadmovesprites
end
.RefusedGift:
writetext Text_MysteryGiftDeliveryGuy_SaidNo
+ waitbutton
closetext
- loadmovesprites
end
MovementData_0x192cca: