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.inc108
-rw-r--r--data/scripts/gabby_and_ty.inc4
-rw-r--r--data/scripts/mauville_man.inc4
-rw-r--r--data/scripts/mystery_event_club.inc8
-rw-r--r--data/scripts/players_house.inc3
-rw-r--r--data/scripts/secret_base.inc14
-rw-r--r--data/scripts/tv.inc3
8 files changed, 77 insertions, 71 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 0858dfabb..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
@@ -197,7 +197,7 @@ 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_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
@@ -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
@@ -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
@@ -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/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index ee0e533bc..31000539c 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -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 306157561..c4a5ffe86 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -510,7 +510,7 @@ 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_LITTLEROOT_HOUSES_STATE, 4
@@ -518,6 +518,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
releaseall
end
+@ Never called.
LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72
setflag FLAG_SYS_TV_LATIAS_LATIOS
return
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 770bc9a5b..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
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-05-20 17:28:42 +0000