summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/apprentice.inc4
-rw-r--r--data/scripts/cable_club.inc188
-rw-r--r--data/scripts/contest_hall.inc56
-rw-r--r--data/scripts/gabby_and_ty.inc8
-rw-r--r--data/scripts/mauville_man.inc4
-rw-r--r--data/scripts/mystery_event_club.inc8
-rw-r--r--data/scripts/players_house.inc71
-rw-r--r--data/scripts/pokeblocks.inc12
-rw-r--r--data/scripts/safari_zone.inc4
-rw-r--r--data/scripts/secret_base.inc34
-rw-r--r--data/scripts/tv.inc3
11 files changed, 199 insertions, 193 deletions
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index ac4bd1979..d6713cde4 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -269,8 +269,8 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
apprentice_msg TRUE, 11
setvar VAR_0x8004, 25
special CallApprenticeFunction
- setvar VAR_0x8004, 19
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE
+ call Common_ShowEasyChatScreen
lock
faceplayer
setvar VAR_0x8004, 21
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index b73d7e1fa..1914fee4f 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -74,7 +74,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23
msgbox gUnknown_08273594, MSGBOX_DEFAULT
giveitem_std ITEM_EON_TICKET
setflag FLAG_SYS_HAS_EON_TICKET
- setvar VAR_0x403F, 0
+ setvar VAR_ALWAYS_ZERO_0x403F, 0
msgbox gUnknown_082735F2, MSGBOX_DEFAULT
release
end
@@ -101,14 +101,14 @@ RustboroCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
SlateportCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
SootopolisCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
- map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE
.2byte 0
MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE
@@ -138,21 +138,21 @@ RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
- compare VAR_0x4087, 1
+ compare VAR_CABLE_CLUB_STATE, 1
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
- compare VAR_0x4087, 2
+ compare VAR_CABLE_CLUB_STATE, 2
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
- compare VAR_0x4087, 5
+ compare VAR_CABLE_CLUB_STATE, 5
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
- compare VAR_0x4087, 3
+ compare VAR_CABLE_CLUB_STATE, 3
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D
- compare VAR_0x4087, 4
+ compare VAR_CABLE_CLUB_STATE, 4
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C23
- compare VAR_0x4087, 6
+ compare VAR_CABLE_CLUB_STATE, 6
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C29
- compare VAR_0x4087, 7
+ compare VAR_CABLE_CLUB_STATE, 7
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F
- compare VAR_0x4087, 8
+ compare VAR_CABLE_CLUB_STATE, 8
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C35
end
@@ -197,15 +197,15 @@ RustboroCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
- map_script_2 VAR_0x40CD, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0
- map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85
- map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85
- map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85
- map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7
- map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C
- map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C
- map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85
- map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D
+ map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0
+ map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85
+ map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85
+ map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85
+ map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7
+ map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C
+ map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C
+ map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85
+ map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D
.2byte 0
OldaleTown_PokemonCenter_2F_EventScript_276C85:: @ 8276C85
@@ -231,7 +231,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D
OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5
special CloseLink
- setvar VAR_0x4087, 0
+ setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D
@@ -254,7 +254,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7
OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF
special CloseLink
- setvar VAR_0x4087, 0
+ setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E
@@ -276,7 +276,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C
OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44
special CloseLink
- setvar VAR_0x4087, 0
+ setvar VAR_CABLE_CLUB_STATE, 0
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F
waitmovement 0
compare VAR_0x8007, 0
@@ -298,7 +298,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C
end
OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84
- setvar VAR_0x4087, 0
+ setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E
@@ -328,7 +328,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5
OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
lockall
- applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT
closemessage
@@ -336,7 +336,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
waitmovement 0
delay 30
msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT
- setvar VAR_0x40CD, 2
+ setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 2
releaseall
end
@@ -425,7 +425,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55
end
OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
- call OldaleTown_PokemonCenter_2F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message gText_PleaseWaitForLink
@@ -450,7 +450,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
special HealPlayerParty
special SavePlayerParty
special LoadPlayerBag
- copyvar VAR_0x4087, VAR_0x8004
+ copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197
waitmessage
call OldaleTown_PokemonCenter_2F_EventScript_277BE4
@@ -527,7 +527,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2
call OldaleTown_PokemonCenter_2F_EventScript_277199
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
- call OldaleTown_PokemonCenter_2F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message gText_PleaseWaitForLink
@@ -554,7 +554,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2
OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A
setvar VAR_0x8004, 3
- copyvar VAR_0x4087, VAR_0x8004
+ copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197
waitmessage
call OldaleTown_PokemonCenter_2F_EventScript_277BE4
@@ -602,7 +602,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD
OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
copyvar VAR_0x8007, VAR_LAST_TALKED
- call OldaleTown_PokemonCenter_2F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message gText_PleaseWaitForLink
@@ -629,7 +629,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
setvar VAR_0x8004, 4
- copyvar VAR_0x4087, VAR_0x8004
+ copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197
waitmessage
call OldaleTown_PokemonCenter_2F_EventScript_277BE4
@@ -791,116 +791,118 @@ EventScript_CableBoxResults:: @ 8277365
releaseall
end
-gUnknown_08277374:: @ 8277374
+EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374
setvar VAR_0x8005, 0
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-gUnknown_0827737E:: @ 827737E
+EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E
setvar VAR_0x8005, 1
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-gUnknown_08277388:: @ 8277388
+EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388
fadescreen 1
- special sub_80F9438
+ special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+ goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 0
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-gUnknown_082773A3:: @ 82773A3
+EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3
fadescreen 1
- special sub_80F9438
+ special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+ goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 1
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-gUnknown_082773BE:: @ 82773BE
+EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE
fadescreen 1
- special sub_80F9438
+ special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+ goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 2
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-gUnknown_082773D9:: @ 82773D9
+EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9
fadescreen 1
- special sub_80F9438
+ special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq DoubleBattleColosseum_EventScript_2773F4
+ goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
setvar VAR_0x8005, 3
- special sub_80B3968
+ special ColosseumPlayerSpotTriggered
waitstate
end
-DoubleBattleColosseum_EventScript_2773F4:: @ 82773F4
+EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4
end
-gUnknown_082773F5:: @ 82773F5
+EventScript_TradeCenter_Chair0:: @ 82773F5
setvar VAR_0x8005, 0
- special sub_80B3924
+ special PlayerEnteredTradeSeat
waitstate
end
-gUnknown_082773FF:: @ 82773FF
+EventScript_TradeCenter_Chair1:: @ 82773FF
setvar VAR_0x8005, 1
- special sub_80B3924
+ special PlayerEnteredTradeSeat
waitstate
end
-gUnknown_08277409:: @ 8277409
+/* Never used */
+EventScript_TradeCenter_Chair2:: @ 8277409
setvar VAR_0x8005, 2
- special sub_80B3924
+ special PlayerEnteredTradeSeat
waitstate
end
-gUnknown_08277413:: @ 8277413
+/* Never used */
+EventScript_TradeCenter_Chair3:: @ 8277413
setvar VAR_0x8005, 3
- special sub_80B3924
+ special PlayerEnteredTradeSeat
waitstate
end
-gUnknown_0827741D:: @ 827741D
+EventScript_RecordCenter_Spot0:: @ 827741D
setvar VAR_0x8005, 0
- special sub_80E6BE8
+ special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
-gUnknown_08277432:: @ 8277432
+EventScript_RecordCenter_Spot1:: @ 8277432
setvar VAR_0x8005, 1
- special sub_80E6BE8
+ special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
-gUnknown_08277447:: @ 8277447
+EventScript_RecordCenter_Spot2:: @ 8277447
setvar VAR_0x8005, 2
- special sub_80E6BE8
+ special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
end
-gUnknown_0827745C:: @ 827745C
+EventScript_RecordCenter_Spot3:: @ 827745C
setvar VAR_0x8005, 3
- special sub_80E6BE8
+ special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
@@ -914,21 +916,21 @@ RecordCorner_EventScript_277471:: @ 8277471
releaseall
end
-EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E
+gEventScript_TradeRoom_ReadTrainerCard_NoColor:: @ 827747E
msgbox Text_278452, MSGBOX_DEFAULT
fadescreen 1
special sp02A_crash_sound
waitstate
end
-EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D
+gEventScript_TradeRoom_ReadTrainerCard_Normal:: @ 827748D
msgbox Text_27847B, MSGBOX_DEFAULT
fadescreen 1
special sp02A_crash_sound
waitstate
end
-EventScript_TradeRoom_TooBusyToNotice:: @ 827749C
+gEventScript_TradeRoom_TooBusyToNotice:: @ 827749C
msgbox Text_27842E, MSGBOX_DEFAULT
closemessage
end
@@ -967,22 +969,22 @@ RecordCorner_EventScript_2774E0:: @ 82774E0
closemessage
end
-gUnknown_082774EF:: @ 82774EF
- msgbox Text_2783A8, MSGBOX_YESNO
+EventScript_ConfirmLeaveTradeRoom:: @ 82774EF
+ msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq gUnknown_08277509
+ goto_if_eq EventScript_TerminateLink
erasebox 0, 0, 29, 19
releaseall
end
-gUnknown_08277509:: @ 8277509
- messageautoscroll Text_2783E9
+EventScript_TerminateLink:: @ 8277509
+ messageautoscroll Text_TerminateLinkPleaseWait
waitmessage
- special sub_80B371C
+ special ExitLinkRoom
end
-EventScript_277513:: @ 8277513
- special sub_80B36EC
+EventScript_DoLinkRoomExit:: @ 8277513
+ special CleanupLinkRoomState
special sub_80AF9F8
waitstate
end
@@ -1023,14 +1025,14 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
call OldaleTown_PokemonCenter_2F_EventScript_277626
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
- call OldaleTown_PokemonCenter_2F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT
closemessage
special HealPlayerParty
setvar VAR_0x8004, 6
- copyvar VAR_0x4087, VAR_0x8004
+ copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
call OldaleTown_PokemonCenter_2F_EventScript_277BBE
special DrawWholeMapView
playse SE_TK_KASYA
@@ -1234,7 +1236,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923
end
OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931
- call OldaleTown_PokemonCenter_2F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
switch VAR_0x8004
@@ -1513,7 +1515,7 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9
waitstate
compare VAR_0x8004, 6
goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9
- call MossdeepCity_GameCorner_1F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
setvar VAR_0x8004, 4
@@ -1532,7 +1534,7 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35
waitstate
compare VAR_0x8004, 6
goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9
- call MossdeepCity_GameCorner_1F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
setvar VAR_0x8004, 6
@@ -1736,11 +1738,11 @@ OldaleTown_PokemonCenter_2F_Text_278372: @ 8278372
.string "Please confirm the number of\n"
.string "players and start again.$"
-Text_2783A8: @ 82783A8
+Text_TerminateLinkConfirmation: @ 82783A8
.string "The link will be terminated if you\n"
.string "leave the room. Is that okay?$"
-Text_2783E9: @ 82783E9
+Text_TerminateLinkPleaseWait: @ 82783E9
.string "Terminating link…\n"
.string "You will be escorted out of\l"
.string "the room. Please wait.$"
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index f85ebd3d2..6c19cdc0c 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1,7 +1,7 @@
LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5
lock
faceplayer
- compare VAR_0x408A, 0
+ compare VAR_CONTEST_PRIZE_PICKUP, 0
goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13
call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CEA
call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CF3
@@ -21,7 +21,7 @@ LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3
LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13
msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT
- switch VAR_0x408A
+ switch VAR_CONTEST_PRIZE_PICKUP
case 4, LilycoveCity_ContestLobby_EventScript_279D2C
end
@@ -29,13 +29,13 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C
giveitem_std ITEM_LUXURY_BALL
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B
- setvar VAR_0x408A, 0
+ setvar VAR_CONTEST_PRIZE_PICKUP, 0
closemessage
release
end
LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B
- call LilycoveCity_ContestLobby_EventScript_27205E
+ call Common_EventScript_BagIsFull
msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT
release
end
@@ -181,7 +181,7 @@ LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87
msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT
closemessage
releaseall
- setvar VAR_0x4086, 1
+ setvar VAR_LINK_CONTEST_ROOM_STATE, 1
return
LinkContestRoom1_EventScript_279F97:: @ 8279F97
@@ -204,7 +204,7 @@ LinkContestRoom1_EventScript_279F97:: @ 8279F97
call LinkContestRoom1_EventScript_27A9D4
call LinkContestRoom1_EventScript_27AA1B
call LinkContestRoom1_EventScript_27AB36
- setvar VAR_0x4086, 2
+ setvar VAR_LINK_CONTEST_ROOM_STATE, 2
return
LinkContestRoom1_EventScript_279FF2:: @ 8279FF2
@@ -271,7 +271,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097
return
LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A0C7
lockall
msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT
@@ -391,7 +391,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2
return
LinkContestRoom1_EventScript_27A217:: @ 827A217
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A229
message LinkContestRoom1_Text_27B815
waitmessage
@@ -419,7 +419,7 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230
return
LinkContestRoom1_EventScript_27A26C:: @ 827A26C
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A280
msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT
return
@@ -445,7 +445,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297
return
LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A2CA
message LinkContestRoom1_Text_27B8F2
return
@@ -483,15 +483,15 @@ LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5
LinkContestRoom1_EventScript_27A34F:: @ 827A34F
special sub_80F82FC
- compare VAR_0x4088, 1
+ compare VAR_CONTEST_LOCATION, 1
call_if_eq LinkContestRoom1_EventScript_27A454
- compare VAR_0x4088, 2
+ compare VAR_CONTEST_LOCATION, 2
call_if_eq LinkContestRoom1_EventScript_27A4B2
- compare VAR_0x4088, 3
+ compare VAR_CONTEST_LOCATION, 3
call_if_eq LinkContestRoom1_EventScript_27A510
- compare VAR_0x4088, 4
+ compare VAR_CONTEST_LOCATION, 4
call_if_eq LinkContestRoom1_EventScript_27A56E
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
call_if_eq LinkContestRoom1_EventScript_27A5CC
setvar VAR_TEMP_1, 9
setvar VAR_TEMP_2, 9
@@ -843,7 +843,7 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801
return
LinkContestRoom1_EventScript_27A853:: @ 827A853
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A867
msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT
return
@@ -893,7 +893,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5
return
LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A90F
msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT
return
@@ -906,7 +906,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F
return
LinkContestRoom1_EventScript_27A91E:: @ 827A91E
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A932
msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT
return
@@ -919,7 +919,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932
return
LinkContestRoom1_EventScript_27A941:: @ 827A941
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A955
msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT
return
@@ -932,7 +932,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955
return
LinkContestRoom1_EventScript_27A964:: @ 827A964
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A978
msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT
return
@@ -983,7 +983,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4
return
LinkContestRoom1_EventScript_27AA00:: @ 827AA00
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27AA14
msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT
return
@@ -996,7 +996,7 @@ LinkContestRoom1_EventScript_27AA14:: @ 827AA14
LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B
addvar VAR_TEMP_1, 1
lockall
- compare VAR_0x4088, 1
+ compare VAR_CONTEST_LOCATION, 1
call_if_gt LinkContestRoom1_EventScript_27AA6F
applymovement 9, LinkContestRoom1_Movement_27AD3B
applymovement 12, LinkContestRoom1_Movement_27AD3F
@@ -1081,7 +1081,7 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F
return
LinkContestRoom1_EventScript_27AB36:: @ 827AB36
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27ABD8
call LinkContestRoom1_EventScript_27AB9E
goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82
@@ -1135,7 +1135,7 @@ LinkContestRoom1_EventScript_27ABCE:: @ 827ABCE
return
LinkContestRoom1_EventScript_27ABD2:: @ 827ABD2
- setvar VAR_0x4099, 1
+ setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
return
LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8
@@ -1149,7 +1149,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8
return
LinkContestRoom1_EventScript_27ABF1:: @ 827ABF1
- setvar VAR_0x4099, 2
+ setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2
return
LinkContestRoom1_EventScript_27ABF7:: @ 827ABF7
@@ -1201,7 +1201,7 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E
return
LinkContestRoom1_EventScript_27AC77:: @ 827AC77
- compare VAR_0x4088, 2
+ compare VAR_CONTEST_LOCATION, 2
call_if_eq LinkContestRoom1_EventScript_27ABCE
specialvar VAR_RESULT, sub_80F7F7C
compare VAR_RESULT, 0
@@ -1215,10 +1215,10 @@ LinkContestRoom1_EventScript_27AC77:: @ 827AC77
LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8
lockall
- call LinkContestRoom1_EventScript_27205E
+ call Common_EventScript_BagIsFull
msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT
releaseall
- setvar VAR_0x408A, 4
+ setvar VAR_CONTEST_PRIZE_PICKUP, 4
return
LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 39de44ba6..31000539c 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -232,13 +232,13 @@ Route111_EventScript_28CF94:: @ 828CF94
Route111_EventScript_28CF9F:: @ 828CF9F
applymovement VAR_0x8004, Route111_Movement_28D04F
- applymovement VAR_0x8005, Route111_Movement_2725A6
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp
waitmovement 0
return
Route111_EventScript_28CFB1:: @ 828CFB1
applymovement VAR_0x8004, Route111_Movement_28D051
- applymovement VAR_0x8005, Route111_Movement_2725A4
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft
waitmovement 0
return
@@ -313,8 +313,8 @@ Route111_EventScript_28D0A7:: @ 828D0A7
compare VAR_RESULT, 0
goto_if_eq Route111_EventScript_28D0E1
msgbox Route111_Text_28B433, MSGBOX_DEFAULT
- setvar VAR_0x8004, 10
- call Route111_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 2791e5d9f..0ab47ea80 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -43,8 +43,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4
end
MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113
- setvar VAR_0x8004, 6
- call MauvilleCity_PokemonCenter_1F_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index ea805edc4..cc189a96b 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -24,8 +24,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591
PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F
msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x8004, 0
- call PetalburgCity_PokemonCenter_1F_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
@@ -76,8 +76,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642
PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650
msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x8004, 0
- call PetalburgCity_PokemonCenter_1F_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index eb29ef6e0..c4a5ffe86 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -1,12 +1,12 @@
LittlerootTown_BrendansHouse_2F_EventScript_2926FE:: @ 82926FE
LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE
- setvar VAR_0x4092, 5
+ setvar VAR_LITTLEROOT_INTRO_STATE, 5
return
LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704
LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT
- applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E
+ applymovement VAR_0x8004, Common_Movement_FacePlayer
waitmovement 0
compare VAR_0x8005, 0
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D
@@ -14,20 +14,20 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x4092, 4
+ setvar VAR_LITTLEROOT_INTRO_STATE, 4
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763
- applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
waitmovement 0
releaseall
end
LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D
- applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758
- applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
return
@@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765
LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT
closemessage
- applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0
waitmovement 0
releaseall
@@ -63,7 +63,7 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799
msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT
call LittlerootTown_BrendansHouse_2F_EventScript_292849
delay 30
- setvar VAR_0x4092, 6
+ setvar VAR_LITTLEROOT_INTRO_STATE, 6
setflag FLAG_SET_WALL_CLOCK
setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
@@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
@@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A4
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
@@ -149,12 +149,12 @@ LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862
LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866
LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866
- setvar VAR_0x4092, 7
+ setvar VAR_LITTLEROOT_INTRO_STATE, 7
releaseall
end
LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
- applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2725A8
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_29294B
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0
@@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_29296C
- applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
end
LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
- applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2725A4
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_29294B
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8
@@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_29296C
- applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -206,9 +206,9 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
LittlerootTown_BrendansHouse_1F_EventScript_29294B:: @ 829294B
LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B
playse SE_PIN
- applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_272598
+ applymovement VAR_0x8005, Common_Movement_ExclamationMark
waitmovement 0
- applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_27259A
+ applymovement VAR_0x8005, Common_Movement_Delay48
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT
closemessage
@@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B
LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C
LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C
- applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT
fadedefaultbgm
@@ -313,15 +313,15 @@ LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5
LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5
lock
faceplayer
- compare VAR_0x4082, 4
+ compare VAR_LITTLEROOT_HOUSES_STATE, 4
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F
- compare VAR_0x408C, 4
+ compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F
goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19
goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86
compare VAR_TEMP_1, 1
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94
- compare VAR_0x4092, 7
+ compare VAR_LITTLEROOT_INTRO_STATE, 7
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT
release
@@ -355,7 +355,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT
giveitem_std ITEM_AMULET_COIN
compare VAR_RESULT, 0
- goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_272054
+ goto_if_eq Common_EventScript_ShowBagIsFull
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT
setflag FLAG_MOM_SAYS_GOODBYE
release
@@ -373,7 +373,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94
LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E
closemessage
- call LittlerootTown_BrendansHouse_1F_EventScript_272083
+ call Common_EventScript_OutOfCenterPartyHeal
incrementgamestat 16
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT
release
@@ -446,12 +446,12 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08
compare VAR_0x8008, 1
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13
- applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259E
+ applymovement VAR_0x8009, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
- applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_272598
+ applymovement VAR_0x8009, Common_Movement_ExclamationMark
waitmovement 0
- applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259A
+ applymovement VAR_0x8009, Common_Movement_Delay48
waitmovement 0
delay 20
compare VAR_0x8008, 0
@@ -510,14 +510,15 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
multichoice 22, 8, 108, 1
copyvar VAR_0x8004, VAR_RESULT
special InitRoamer
- copyvar VAR_0x40D5, VAR_RESULT
+ copyvar VAR_ROAMER_POKEMON, VAR_RESULT
msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x4082, 4
- setvar VAR_0x408C, 4
+ setvar VAR_LITTLEROOT_HOUSES_STATE, 4
+ setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4
releaseall
end
+@ Never called.
LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72
setflag FLAG_SYS_TV_LATIAS_LATIOS
return
@@ -585,28 +586,28 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13
LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7
waitmovement 0
- applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+ applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE
waitmovement 0
- applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A8
+ applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
return
@@ -623,14 +624,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D
LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
return
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 05b468e23..a26ecb4c9 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -264,7 +264,7 @@ EventScript_Pblock1_No: @ 8293C70
EventScript_Pblock1_NoBerries: @ 8293C7A
msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT
- dodailyevents
+ dotimebasedevents
goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_293C92
goto LilycoveCity_ContestLobby_EventScript_293C9C
end
@@ -333,7 +333,7 @@ EventScript_Pblock1_NoPokeblock: @ 8293D43
LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D
lockall
setvar VAR_0x8009, 2
- applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2
+ applymovement 10, Common_Movement_FaceOriginalDirection
applymovement 3, LilycoveCity_ContestLobby_Movement_294053
waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO
@@ -398,8 +398,8 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E
lockall
setvar VAR_0x8008, 15
setvar VAR_0x8009, 3
- applymovement 9, LilycoveCity_ContestLobby_Movement_2725A2
- applymovement 17, LilycoveCity_ContestLobby_Movement_2725A2
+ applymovement 9, Common_Movement_FaceOriginalDirection
+ applymovement 17, Common_Movement_FaceOriginalDirection
applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053
waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO
@@ -551,7 +551,7 @@ LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_eq LilycoveCity_ContestLobby_EventScript_294028
- dodailyevents
+ dotimebasedevents
goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_294028
goto LilycoveCity_ContestLobby_EventScript_294032
end
@@ -602,7 +602,7 @@ EventScript_PblocLink_NoBerries: @ 82940B1
end
EventScript_PblocLink_TryConnect: @ 82940BB
- call LilycoveCity_ContestLobby_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq EventScript_PblocLink_End
specialvar VAR_RESULT, IsWirelessAdapterConnected
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 1fcf5d166..3539e0970 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -1,11 +1,11 @@
EventScript_2A4B4C:: @ 82A4B4C
- setvar VAR_0x40A4, 1
+ setvar VAR_SAFARI_ZONE_STATE, 1
special ExitSafariMode
setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
end
EventScript_2A4B5D:: @ 82A4B5D
- setvar VAR_0x40A4, 1
+ setvar VAR_SAFARI_ZONE_STATE, 1
special ExitSafariMode
warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
waitstate
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index db8aece85..6302a33a8 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -430,21 +430,21 @@ EventScript_275B4D:: @ 8275B4D
EventScript_275B5B:: @ 8275B5B
closemessage
playse SE_KAIDAN
- setvar VAR_0x4097, 0
+ setvar VAR_INIT_SECRET_BASE, 0
setflag FLAG_DECORATION_0
special sub_80E8E18
special sub_80E9068
setvar VAR_0x8004, 0
setvar VAR_0x8005, 0
special sub_80E933C
- setvar VAR_0x4089, 1
+ setvar VAR_SECRET_BASE_INITIALIZED, 1
waitstate
end
SecretBase_RedCave1_EventScript_275B81:: @ 8275B81
applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4
waitmovement 0
- setvar VAR_0x4097, 1
+ setvar VAR_INIT_SECRET_BASE, 1
msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq SecretBase_RedCave1_EventScript_275BAB
@@ -467,21 +467,21 @@ SecretBase_RedCave1_Movement_275BB4: @ 8275BB4
EventScript_275BB7:: @ 8275BB7
lockall
- setvar VAR_0x4097, 1
+ setvar VAR_INIT_SECRET_BASE, 1
playse SE_KAIDAN
special sub_80E9744
compare VAR_RESULT, 0
goto_if_eq EventScript_275BDB
clearflag FLAG_DECORATION_0
special sub_80E9068
- setvar VAR_0x4089, 0
+ setvar VAR_SECRET_BASE_INITIALIZED, 0
waitstate
end
EventScript_275BDB:: @ 8275BDB
setflag FLAG_DECORATION_0
special sub_80E9068
- setvar VAR_0x4089, 0
+ setvar VAR_SECRET_BASE_INITIALIZED, 0
waitstate
end
@@ -570,7 +570,7 @@ EventScript_275D0C:: @ 8275D0C
setvar VAR_0x8004, 0
setvar VAR_0x8005, 0
special sub_80E933C
- setvar VAR_0x4089, 1
+ setvar VAR_SECRET_BASE_INITIALIZED, 1
end
EventScript_275D1F:: @ 8275D1F
@@ -660,7 +660,7 @@ SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6
goto_if_eq SecretBase_RedCave1_EventScript_275E2F
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_275E2F
msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT
@@ -696,7 +696,7 @@ SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E
goto_if_eq SecretBase_RedCave1_EventScript_275EA7
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_275EA7
msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT
@@ -732,7 +732,7 @@ SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6
goto_if_eq SecretBase_RedCave1_EventScript_275F1F
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_275F1F
msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT
@@ -768,7 +768,7 @@ SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E
goto_if_eq SecretBase_RedCave1_EventScript_275F97
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_275F97
msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT
@@ -804,7 +804,7 @@ SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6
goto_if_eq SecretBase_RedCave1_EventScript_27600F
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_27600F
msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT
@@ -840,7 +840,7 @@ SecretBase_RedCave1_EventScript_27602E:: @ 827602E
goto_if_eq SecretBase_RedCave1_EventScript_276087
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_276087
msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT
@@ -876,7 +876,7 @@ SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6
goto_if_eq SecretBase_RedCave1_EventScript_2760FF
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_2760FF
msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT
@@ -912,7 +912,7 @@ SecretBase_RedCave1_EventScript_27611E:: @ 827611E
goto_if_eq SecretBase_RedCave1_EventScript_276177
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_276177
msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT
@@ -948,7 +948,7 @@ SecretBase_RedCave1_EventScript_276196:: @ 8276196
goto_if_eq SecretBase_RedCave1_EventScript_2761EF
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_2761EF
msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT
@@ -984,7 +984,7 @@ SecretBase_RedCave1_EventScript_27620E:: @ 827620E
goto_if_eq SecretBase_RedCave1_EventScript_276267
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_276267
msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index acc75f76a..4a276ffc0 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -42,6 +42,9 @@ EventScript_27EE9A:: @ 827EE9A
EventScript_27EEA4:: @ 827EEA4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT
+ @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and
+ @ It's called again when Mom actually asks for the color, overwriting
+ @ whatever it does here.
special InitRoamer
clearflag FLAG_SYS_TV_LATIAS_LATIOS
setflag FLAG_LATIOS_OR_LATIAS_ROAMING
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 12:38:52 +0000