summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc86
-rw-r--r--data/scripts/contest_hall.inc160
-rw-r--r--data/scripts/day_care.inc303
-rw-r--r--data/scripts/mystery_event_club.inc8
-rw-r--r--data/scripts/players_house.inc2
-rw-r--r--data/scripts/pokeblocks.inc4
-rw-r--r--data/scripts/trainer_battle.inc4
7 files changed, 285 insertions, 282 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index eeecf2d75..8e49c982f 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -99,7 +99,7 @@ MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE
OldaleTown_PokemonCenter_2F_EventScript_276BAE:: @ 8276BAE
compare VAR_0x8007, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD
- turnobject VAR_0x8007, 3
+ turnobject VAR_0x8007, DIR_WEST
OldaleTown_PokemonCenter_2F_EventScript_276BBD:: @ 8276BBD
end
@@ -344,22 +344,22 @@ OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22
OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30
setvar VAR_0x8004, 0
goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_276E75
- multichoice 0, 0, 74, 0
+ multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2
case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7
case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_276E75:: @ 8276E75
- multichoice 0, 0, 76, 0
+ multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2
case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7
case 2, OldaleTown_PokemonCenter_2F_EventScript_2771DB
case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_276EB7:: @ 8276EB7
@@ -370,14 +370,14 @@ OldaleTown_PokemonCenter_2F_EventScript_276EB7:: @ 8276EB7
OldaleTown_PokemonCenter_2F_EventScript_276EC2:: @ 8276EC2
message OldaleTown_PokemonCenter_2F_Text_2790BE
waitmessage
- multichoice 0, 0, 18, 0
+ multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_276F23
case 1, OldaleTown_PokemonCenter_2F_EventScript_276F2E
case 2, OldaleTown_PokemonCenter_2F_EventScript_276F55
case 3, OldaleTown_PokemonCenter_2F_EventScript_276F15
case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_276F15:: @ 8276F15
@@ -392,7 +392,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23
OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E
special HasEnoughMonsForDoubleBattle
- compare VAR_RESULT, 0
+ compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47
setvar VAR_0x8004, 2
goto OldaleTown_PokemonCenter_2F_EventScript_276F60
@@ -978,7 +978,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B
faceplayer
setvar VAR_FRONTIER_FACILITY, 8
goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335
- specialvar VAR_RESULT, sub_813990C
+ specialvar VAR_RESULT, IsBadEggInParty
compare VAR_RESULT, 1
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B
copyvar VAR_0x8007, VAR_LAST_TALKED
@@ -991,12 +991,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B
end
OldaleTown_PokemonCenter_2F_EventScript_27755C:: @ 827755C
- multichoice 17, 6, 17, 0
+ multichoice 17, 6, MULTI_YESNOINFO, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27759F
case 1, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 2, OldaleTown_PokemonCenter_2F_EventScript_277593
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593
@@ -1086,7 +1086,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4
faceplayer
setvar VAR_FRONTIER_FACILITY, 9
goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335
- specialvar VAR_RESULT, sub_813990C
+ specialvar VAR_RESULT, IsBadEggInParty
compare VAR_RESULT, 1
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B
specialvar VAR_RESULT, IsWirelessAdapterConnected
@@ -1103,44 +1103,44 @@ OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27778B
goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_27773E
- multichoice 0, 0, 78, 0
+ multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B
case 2, OldaleTown_PokemonCenter_2F_EventScript_2778F7
case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E
- multichoice 0, 0, 79, 0
+ multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B
case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9
case 3, OldaleTown_PokemonCenter_2F_EventScript_2778F7
case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B
goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_2777CB
- multichoice 0, 0, 75, 0
+ multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B
case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB
- multichoice 0, 0, 77, 0
+ multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B
case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9
case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D
@@ -1157,14 +1157,14 @@ OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D
OldaleTown_PokemonCenter_2F_EventScript_27783B:: @ 827783B
message OldaleTown_PokemonCenter_2F_Text_2790BE
waitmessage
- multichoice 0, 0, 18, 0
+ multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27788E
case 1, OldaleTown_PokemonCenter_2F_EventScript_277899
case 2, OldaleTown_PokemonCenter_2F_EventScript_2778C0
case 3, OldaleTown_PokemonCenter_2F_EventScript_2778CB
case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E
@@ -1174,7 +1174,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E
OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899
special HasEnoughMonsForDoubleBattle
- compare VAR_RESULT, 0
+ compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2
setvar VAR_0x8004, 1
goto OldaleTown_PokemonCenter_2F_EventScript_277931
@@ -1235,12 +1235,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931
OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989
message OldaleTown_PokemonCenter_2F_Text_2792CD
waitmessage
- multichoice 16, 6, 81, 0
+ multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_2779EE
case 1, OldaleTown_PokemonCenter_2F_EventScript_2779C6
case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6
@@ -1268,12 +1268,12 @@ OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE
OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16
message OldaleTown_PokemonCenter_2F_Text_279334
waitmessage
- multichoice 16, 6, 81, 0
+ multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_277A7B
case 1, OldaleTown_PokemonCenter_2F_EventScript_277A53
case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53
@@ -1301,12 +1301,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B
OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3
message OldaleTown_PokemonCenter_2F_Text_2793A3
waitmessage
- multichoice 16, 6, 81, 0
+ multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_277B08
case 1, OldaleTown_PokemonCenter_2F_EventScript_277AE0
case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC
- case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
+ case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0
@@ -1445,12 +1445,12 @@ MossdeepCity_GameCorner_1F_EventScript_277C34:: @ 8277C34
faceplayer
message MossdeepCity_GameCorner_1F_Text_278A7D
waitmessage
- multichoice 0, 0, 80, 0
+ multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_277C73
case 1, MossdeepCity_GameCorner_1F_EventScript_277C7D
case 2, MossdeepCity_GameCorner_1F_EventScript_277C87
- case 127, MossdeepCity_GameCorner_1F_EventScript_277C87
+ case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_277C87
end
MossdeepCity_GameCorner_1F_EventScript_277C73:: @ 8277C73
@@ -1479,12 +1479,12 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91
delay 60
message MossdeepCity_GameCorner_1F_Text_278DAD
waitmessage
- multichoice 0, 0, 80, 0
+ multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_277CE9
case 1, MossdeepCity_GameCorner_1F_EventScript_277D35
case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9
- case 127, MossdeepCity_GameCorner_1F_EventScript_2772F9
+ case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9
end
MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9
@@ -1528,12 +1528,12 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35
MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81
message MossdeepCity_GameCorner_1F_Text_2793A3
waitmessage
- multichoice 16, 6, 81, 0
+ multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_277DE6
case 1, MossdeepCity_GameCorner_1F_EventScript_277DBE
case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9
- case 127, MossdeepCity_GameCorner_1F_EventScript_2772F9
+ case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9
end
MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE
@@ -1626,15 +1626,15 @@ OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1
.string "Which of our services do you wish\n"
.string "to use?$"
-OldaleTown_PokemonCenter_2F_Text_277F1B:: @ 8277F1B
+CableClub_Text_TradeUsingLinkCable:: @ 8277F1B
.string "Trade POKéMON with another player\n"
.string "using a GBA Game Link cable.$"
-OldaleTown_PokemonCenter_2F_Text_277F5A:: @ 8277F5A
+CableClub_Text_BattleUsingLinkCable:: @ 8277F5A
.string "You may battle another TRAINER\n"
.string "using a GBA Game Link cable.$"
-OldaleTown_PokemonCenter_2F_Text_277F96:: @ 8277F96
+CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96
.string "You can use the RECORD CORNER with\n"
.string "others using a GBA Game Link cable.$"
@@ -1804,19 +1804,19 @@ OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B
OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792
.string "Please wait.$"
-OldaleTown_PokemonCenter_2F_Text_27879F:: @ 827879F
+CableClub_Text_YouMayTradeHere:: @ 827879F
.string "You may trade your POKéMON here\n"
.string "with another TRAINER.$"
-OldaleTown_PokemonCenter_2F_Text_2787D5:: @ 82787D5
+CableClub_Text_YouMayBattleHere:: @ 82787D5
.string "You may battle with your friends\n"
.string "here.$"
-OldaleTown_PokemonCenter_2F_Text_2787FC:: @ 82787FC
+CableClub_Text_CanMakeBerryPowder:: @ 82787FC
.string "Two to five TRAINERS can make\n"
.string "BERRY POWDER together.$"
-OldaleTown_PokemonCenter_2F_Text_278831:: @ 8278831
+CableClub_Text_CanMixRecords:: @ 8278831
.string "The records of two to four players\n"
.string "can be mixed together.$"
@@ -1824,7 +1824,7 @@ OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B
.string "A guide to the WIRELESS CLUB's\n"
.string "various services.$"
-OldaleTown_PokemonCenter_2F_Text_27889C:: @ 827889C
+CableClub_Text_CancelSelectedItem:: @ 827889C
.string "Cancels the selected MENU item.$"
OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 6c19cdc0c..03863eb40 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -43,24 +43,24 @@ LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B
LilycoveCity_ContestLobby_EventScript_279D5A:: @ 8279D5A
message LilycoveCity_ContestLobby_Text_27AF28
waitmessage
- multichoice 0, 0, 2, 0
+ multichoice 0, 0, MULTI_ENTERINFO, 0
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_279E62
case 1, LilycoveCity_ContestLobby_EventScript_279D97
case 2, LilycoveCity_ContestLobby_EventScript_279E09
- case 127, LilycoveCity_ContestLobby_EventScript_279E09
+ case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
end
LilycoveCity_ContestLobby_EventScript_279D97:: @ 8279D97
message LilycoveCity_ContestLobby_Text_27AF5E
waitmessage
- multichoice 0, 0, 3, 0
+ multichoice 0, 0, MULTI_CONTEST_INFO, 0
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_279DDF
case 1, LilycoveCity_ContestLobby_EventScript_279DED
case 2, LilycoveCity_ContestLobby_EventScript_279DFB
case 3, LilycoveCity_ContestLobby_EventScript_279D5A
- case 127, LilycoveCity_ContestLobby_EventScript_279D5A
+ case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279D5A
end
LilycoveCity_ContestLobby_EventScript_279DDF:: @ 8279DDF
@@ -104,14 +104,14 @@ LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13
LilycoveCity_ContestLobby_EventScript_279E62:: @ 8279E62
message LilycoveCity_ContestLobby_Text_27B3FF
waitmessage
- multichoice 0, 0, 82, 0
+ multichoice 0, 0, MULTI_CONTEST_RANK, 0
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_279EB5
case 1, LilycoveCity_ContestLobby_EventScript_279EC0
case 2, LilycoveCity_ContestLobby_EventScript_279ECB
case 3, LilycoveCity_ContestLobby_EventScript_279ED6
case 4, LilycoveCity_ContestLobby_EventScript_279E09
- case 127, LilycoveCity_ContestLobby_EventScript_279E09
+ case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
end
LilycoveCity_ContestLobby_EventScript_279EB5:: @ 8279EB5
@@ -137,10 +137,10 @@ LilycoveCity_ContestLobby_EventScript_279ED6:: @ 8279ED6
LilycoveCity_ContestLobby_EventScript_279EE1:: @ 8279EE1
message LilycoveCity_ContestLobby_Text_27B423
waitmessage
- multichoice 0, 0, 4, 0
+ multichoice 0, 0, MULTI_CONTEST_TYPE, 0
switch VAR_RESULT
case 5, LilycoveCity_ContestLobby_EventScript_279E09
- case 127, LilycoveCity_ContestLobby_EventScript_279E09
+ case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
copyvar VAR_CONTEST_CATEGORY, VAR_RESULT
goto LilycoveCity_ContestLobby_EventScript_279E13
end
@@ -216,19 +216,19 @@ LinkContestRoom1_EventScript_279FF2:: @ 8279FF2
return
LinkContestRoom1_EventScript_27A024:: @ 827A024
- setvar VAR_0x8009, 5
+ setvar VAR_0x8009, STDSTRING_NORMAL
return
LinkContestRoom1_EventScript_27A02A:: @ 827A02A
- setvar VAR_0x8009, 6
+ setvar VAR_0x8009, STDSTRING_SUPER
return
LinkContestRoom1_EventScript_27A030:: @ 827A030
- setvar VAR_0x8009, 7
+ setvar VAR_0x8009, STDSTRING_HYPER
return
LinkContestRoom1_EventScript_27A036:: @ 827A036
- setvar VAR_0x8009, 8
+ setvar VAR_0x8009, STDSTRING_MASTER
return
LinkContestRoom1_EventScript_27A03C:: @ 827A03C
@@ -241,27 +241,27 @@ LinkContestRoom1_EventScript_27A03C:: @ 827A03C
return
LinkContestRoom1_EventScript_27A079:: @ 827A079
- setvar VAR_0x8008, 0
+ setvar VAR_0x8008, CONTEST_CATEGORY_COOL
return
LinkContestRoom1_EventScript_27A07F:: @ 827A07F
- setvar VAR_0x8008, 1
+ setvar VAR_0x8008, CONTEST_CATEGORY_BEAUTY
return
LinkContestRoom1_EventScript_27A085:: @ 827A085
- setvar VAR_0x8008, 2
+ setvar VAR_0x8008, CONTEST_CATEGORY_CUTE
return
LinkContestRoom1_EventScript_27A08B:: @ 827A08B
- setvar VAR_0x8008, 3
+ setvar VAR_0x8008, CONTEST_CATEGORY_SMART
return
LinkContestRoom1_EventScript_27A091:: @ 827A091
- setvar VAR_0x8008, 4
+ setvar VAR_0x8008, CONTEST_CATEGORY_TOUGH
return
LinkContestRoom1_EventScript_27A097:: @ 827A097
- buffercontesttypestring 1, 32776
+ buffercontesttypestring 1, VAR_0x8008
bufferstdstring 2, VAR_0x8009
call LinkContestRoom1_EventScript_27A0B1
lockall
@@ -1012,71 +1012,71 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B
return
LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F
- turnvobject 0, 1
- turnvobject 2, 1
- turnvobject 4, 4
- turnvobject 6, 1
- turnvobject 8, 1
- turnvobject 10, 1
- turnvobject 12, 1
- turnvobject 14, 1
- turnvobject 16, 1
- turnvobject 18, 1
- turnvobject 20, 4
- turnvobject 22, 4
- turnvobject 25, 4
- turnvobject 27, 3
- turnvobject 28, 4
+ turnvobject 0, DIR_SOUTH
+ turnvobject 2, DIR_SOUTH
+ turnvobject 4, DIR_EAST
+ turnvobject 6, DIR_SOUTH
+ turnvobject 8, DIR_SOUTH
+ turnvobject 10, DIR_SOUTH
+ turnvobject 12, DIR_SOUTH
+ turnvobject 14, DIR_SOUTH
+ turnvobject 16, DIR_SOUTH
+ turnvobject 18, DIR_SOUTH
+ turnvobject 20, DIR_EAST
+ turnvobject 22, DIR_EAST
+ turnvobject 25, DIR_EAST
+ turnvobject 27, DIR_WEST
+ turnvobject 28, DIR_EAST
delay 10
- turnvobject 0, 4
- turnvobject 2, 4
- turnvobject 4, 4
- turnvobject 6, 4
- turnvobject 8, 4
- turnvobject 10, 3
- turnvobject 12, 3
- turnvobject 14, 3
- turnvobject 16, 3
- turnvobject 18, 3
- turnvobject 20, 1
- turnvobject 22, 1
- turnvobject 25, 2
- turnvobject 27, 2
- turnvobject 28, 2
+ turnvobject 0, DIR_EAST
+ turnvobject 2, DIR_EAST
+ turnvobject 4, DIR_EAST
+ turnvobject 6, DIR_EAST
+ turnvobject 8, DIR_EAST
+ turnvobject 10, DIR_WEST
+ turnvobject 12, DIR_WEST
+ turnvobject 14, DIR_WEST
+ turnvobject 16, DIR_WEST
+ turnvobject 18, DIR_WEST
+ turnvobject 20, DIR_SOUTH
+ turnvobject 22, DIR_SOUTH
+ turnvobject 25, DIR_NORTH
+ turnvobject 27, DIR_NORTH
+ turnvobject 28, DIR_NORTH
delay 10
- turnvobject 1, 2
- turnvobject 3, 2
- turnvobject 5, 2
- turnvobject 7, 2
- turnvobject 9, 4
- turnvobject 11, 2
- turnvobject 15, 2
- turnvobject 13, 2
- turnvobject 17, 2
- turnvobject 19, 2
- turnvobject 21, 3
- turnvobject 23, 3
- turnvobject 24, 3
- turnvobject 26, 4
- turnvobject 29, 3
- turnvobject 30, 3
+ turnvobject 1, DIR_NORTH
+ turnvobject 3, DIR_NORTH
+ turnvobject 5, DIR_NORTH
+ turnvobject 7, DIR_NORTH
+ turnvobject 9, DIR_EAST
+ turnvobject 11, DIR_NORTH
+ turnvobject 15, DIR_NORTH
+ turnvobject 13, DIR_NORTH
+ turnvobject 17, DIR_NORTH
+ turnvobject 19, DIR_NORTH
+ turnvobject 21, DIR_WEST
+ turnvobject 23, DIR_WEST
+ turnvobject 24, DIR_WEST
+ turnvobject 26, DIR_EAST
+ turnvobject 29, DIR_WEST
+ turnvobject 30, DIR_WEST
delay 10
- turnvobject 1, 4
- turnvobject 3, 4
- turnvobject 5, 4
- turnvobject 7, 4
- turnvobject 9, 4
- turnvobject 11, 3
- turnvobject 15, 3
- turnvobject 13, 3
- turnvobject 17, 3
- turnvobject 19, 3
- turnvobject 21, 1
- turnvobject 23, 1
- turnvobject 24, 1
- turnvobject 26, 2
- turnvobject 29, 2
- turnvobject 30, 2
+ turnvobject 1, DIR_EAST
+ turnvobject 3, DIR_EAST
+ turnvobject 5, DIR_EAST
+ turnvobject 7, DIR_EAST
+ turnvobject 9, DIR_EAST
+ turnvobject 11, DIR_WEST
+ turnvobject 15, DIR_WEST
+ turnvobject 13, DIR_WEST
+ turnvobject 17, DIR_WEST
+ turnvobject 19, DIR_WEST
+ turnvobject 21, DIR_SOUTH
+ turnvobject 23, DIR_SOUTH
+ turnvobject 24, DIR_SOUTH
+ turnvobject 26, DIR_NORTH
+ turnvobject 29, DIR_NORTH
+ turnvobject 30, DIR_NORTH
delay 10
return
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 057a2fa07..062fd9f5a 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -1,245 +1,245 @@
-Route117_EventScript_291C18:: @ 8291C18
+Route117_EventScript_DaycareMan:: @ 8291C18
lock
faceplayer
special GetDaycareMonNicknames
specialvar VAR_RESULT, GetDaycareState
- compare VAR_RESULT, 1
- goto_if_eq Route117_EventScript_291C4D
- compare VAR_RESULT, 2
- goto_if_eq Route117_EventScript_291CD1
- compare VAR_RESULT, 3
- goto_if_eq Route117_EventScript_291CE8
- msgbox Route117_Text_291FCF, MSGBOX_DEFAULT
+ compare VAR_RESULT, DAYCARE_EGG_WAITING
+ goto_if_eq Route117_EventScript_DaycareEggWaiting
+ compare VAR_RESULT, DAYCARE_ONE_MON
+ goto_if_eq Route117_EventScript_CheckOnOneMon
+ compare VAR_RESULT, DAYCARE_TWO_MONS
+ goto_if_eq Route117_EventScript_CheckOnTwoMons
+ msgbox Route117_Text_SeeWifeIfYoudLikeMeToRaiseMon, MSGBOX_DEFAULT
release
end
-Route117_EventScript_291C4D:: @ 8291C4D
- msgbox Route117_Text_29205D, MSGBOX_YESNO
+Route117_EventScript_DaycareEggWaiting:: @ 8291C4D
+ msgbox Route117_Text_DoYouWantEgg, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq Route117_EventScript_291C83
- msgbox Route117_Text_2922C6, MSGBOX_YESNO
+ goto_if_eq Route117_EventScript_DaycareAcceptEgg
+ msgbox Route117_Text_IWillKeepDoYouWantIt, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq Route117_EventScript_291C83
- msgbox Route117_Text_292149, MSGBOX_DEFAULT
+ goto_if_eq Route117_EventScript_DaycareAcceptEgg
+ msgbox Route117_Text_IllKeepIt, MSGBOX_DEFAULT
clearflag FLAG_PENDING_DAYCARE_EGG
special RejectEggFromDayCare
release
end
-Route117_EventScript_291C83:: @ 8291C83
+Route117_EventScript_DaycareAcceptEgg:: @ 8291C83
specialvar VAR_RESULT, CalculatePlayerPartyCount
- compare VAR_RESULT, 6
- goto_if_ne Route117_EventScript_291C9D
- msgbox Route117_Text_29216A, MSGBOX_DEFAULT
+ compare VAR_RESULT, PARTY_SIZE
+ goto_if_ne Route117_EventScript_DaycareReceiveEgg
+ msgbox Route117_Text_YouHaveNoRoomForIt, MSGBOX_DEFAULT
release
end
-Route117_EventScript_291C9D:: @ 8291C9D
- message Route117_Text_2921A4
+Route117_EventScript_DaycareReceiveEgg:: @ 8291C9D
+ message Route117_Text_ReceivedEgg
playfanfare MUS_FANFA1
waitfanfare
waitbuttonpress
- msgbox Route117_Text_2921CF, MSGBOX_DEFAULT
+ msgbox Route117_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT
special GiveEggFromDaycare
clearflag FLAG_PENDING_DAYCARE_EGG
release
end
-Route117_EventScript_291CB7:: @ 8291CB7
- specialvar VAR_RESULT, sub_8071614
+Route117_EventScript_CheckMonReceivedMail:: @ 8291CB7
+ specialvar VAR_RESULT, CheckDaycareMonReceivedMail
compare VAR_RESULT, 1
- call_if_eq Route117_EventScript_291CC8
+ call_if_eq Route117_EventScript_MonReceivedMail
return
-Route117_EventScript_291CC8:: @ 8291CC8
- msgbox Route117_Text_2921E5, MSGBOX_DEFAULT
+Route117_EventScript_MonReceivedMail:: @ 8291CC8
+ msgbox Route117_Text_FriendlyWithOtherTrainersMon, MSGBOX_DEFAULT
return
-Route117_EventScript_291CD1:: @ 8291CD1
+Route117_EventScript_CheckOnOneMon:: @ 8291CD1
special GetDaycareMonNicknames
- msgbox Route117_Text_292114, MSGBOX_DEFAULT
+ msgbox Route117_Text_YourMonIsDoingFine, MSGBOX_DEFAULT
setvar VAR_0x8004, 0
- call Route117_EventScript_291CB7
+ call Route117_EventScript_CheckMonReceivedMail
release
end
-Route117_EventScript_291CE8:: @ 8291CE8
+Route117_EventScript_CheckOnTwoMons:: @ 8291CE8
special GetDaycareMonNicknames
- msgbox Route117_Text_292299, MSGBOX_DEFAULT
+ msgbox Route117_Text_YourMonsAreDoingFine, MSGBOX_DEFAULT
special SetDaycareCompatibilityString
special ShowFieldMessageStringVar4
waitmessage
waitbuttonpress
setvar VAR_0x8004, 0
- call Route117_EventScript_291CB7
+ call Route117_EventScript_CheckMonReceivedMail
setvar VAR_0x8004, 1
- call Route117_EventScript_291CB7
+ call Route117_EventScript_CheckMonReceivedMail
release
end
-Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11
+Route117_PokemonDayCare_EventScript_DaycareWoman:: @ 8291D11
lock
faceplayer
specialvar VAR_RESULT, GetDaycareState
+ compare VAR_RESULT, DAYCARE_EGG_WAITING
+ goto_if_eq Route117_PokemonDayCare_EventScript_EggWaiting
+ compare VAR_RESULT, DAYCARE_ONE_MON
+ goto_if_eq Route117_PokemonDayCare_EventScript_OneMonInDaycare
+ compare VAR_RESULT, DAYCARE_TWO_MONS
+ goto_if_eq Route117_PokemonDayCare_EventScript_TwoMonsInDaycare
+ msgbox Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq Route117_PokemonDayCare_EventScript_291E0B
- compare VAR_RESULT, 2
- goto_if_eq Route117_PokemonDayCare_EventScript_291E2F
- compare VAR_RESULT, 3
- goto_if_eq Route117_PokemonDayCare_EventScript_291F5C
- msgbox Route117_PokemonDayCare_Text_2922F4, MSGBOX_YESNO
- compare VAR_RESULT, 1
- goto_if_eq Route117_PokemonDayCare_EventScript_291D56
+ goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT
release
end
-Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
+Route117_PokemonDayCare_EventScript_GiveMonToRaise:: @ 8291D56
specialvar VAR_RESULT, CountPartyNonEggMons
compare VAR_RESULT, 1
- goto_if_eq Route117_PokemonDayCare_EventScript_291DED
- specialvar VAR_RESULT, sub_80722E0
+ goto_if_eq Route117_PokemonDayCare_EventScript_OnlyOneMon
+ specialvar VAR_RESULT, CountPartyAliveNonEggMons
compare VAR_RESULT, 2
- goto_if_eq Route117_PokemonDayCare_EventScript_291E01
- msgbox Route117_PokemonDayCare_Text_292349, MSGBOX_DEFAULT
+ goto_if_eq Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons
+ msgbox Route117_PokemonDayCare_Text_WhichMonShouldWeRaise, MSGBOX_DEFAULT
fadescreen 1
special ChooseSendDaycareMon
waitstate
compare VAR_0x8004, 255
- goto_if_eq Route117_PokemonDayCare_EventScript_291DCA
+ goto_if_eq Route117_PokemonDayCare_EventScript_ComeAgain
specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
compare VAR_RESULT, 0
- goto_if_eq Route117_PokemonDayCare_EventScript_291DF7
- specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
+ goto_if_eq Route117_PokemonDayCare_EventScript_OnlyOneAliveMon
+ specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies
waitse
playmoncry VAR_0x8005, 0
- msgbox Route117_PokemonDayCare_Text_292370, MSGBOX_DEFAULT
+ msgbox Route117_PokemonDayCare_Text_WellRaiseYourMon, MSGBOX_DEFAULT
waitmoncry
special StoreSelectedPokemonInDaycare
- incrementgamestat 47
+ incrementgamestat GAME_STAT_USED_DAYCARE
specialvar VAR_RESULT, GetDaycareState
- compare VAR_RESULT, 2
- goto_if_eq Route117_PokemonDayCare_EventScript_291DD4
+ compare VAR_RESULT, DAYCARE_ONE_MON
+ goto_if_eq Route117_PokemonDayCare_EventScript_CanRaiseOneMore
release
end
-Route117_PokemonDayCare_EventScript_291DCA:: @ 8291DCA
- msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT
+Route117_PokemonDayCare_EventScript_ComeAgain:: @ 8291DCA
+ msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT
release
end
-Route117_PokemonDayCare_EventScript_291DD4:: @ 8291DD4
- msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO
+Route117_PokemonDayCare_EventScript_CanRaiseOneMore:: @ 8291DD4
+ msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq Route117_PokemonDayCare_EventScript_291D56
- goto Route117_PokemonDayCare_EventScript_291DCA
+ goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
+ goto Route117_PokemonDayCare_EventScript_ComeAgain
end
-Route117_PokemonDayCare_EventScript_291DED:: @ 8291DED
- msgbox Route117_PokemonDayCare_Text_2925BB, MSGBOX_DEFAULT
+Route117_PokemonDayCare_EventScript_OnlyOneMon:: @ 8291DED
+ msgbox Route117_PokemonDayCare_Text_YouHaveJustOneMon, MSGBOX_DEFAULT
release
end
-Route117_PokemonDayCare_EventScript_291DF7:: @ 8291DF7
- msgbox Route117_PokemonDayCare_Text_292617, MSGBOX_DEFAULT
+Route117_PokemonDayCare_EventScript_OnlyOneAliveMon:: @ 8291DF7
+ msgbox Route117_PokemonDayCare_Text_WhatWillYouBattleWith, MSGBOX_DEFAULT
release
end
-Route117_PokemonDayCare_EventScript_291E01:: @ 8291E01
- msgbox Route117_PokemonDayCare_Text_29266D, MSGBOX_DEFAULT
+Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons:: @ 8291E01
+ msgbox Route117_PokemonDayCare_Text_YoullBeLeftWithJustOne, MSGBOX_DEFAULT
release
end
-Route117_PokemonDayCare_EventScript_291E0B:: @ 8291E0B
- msgbox Route117_PokemonDayCare_Text_2923F6, MSGBOX_DEFAULT
+Route117_PokemonDayCare_EventScript_EggWaiting:: @ 8291E0B
+ msgbox Route117_PokemonDayCare_Text_HusbandWasLookingForYou, MSGBOX_DEFAULT
release
end
-Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15
- msgbox Route117_PokemonDayCare_Text_2924CC, MSGBOX_DEFAULT
+Route117_PokemonDayCare_EventScript_YourMonHasGrownXLevels:: @ 8291E15
+ msgbox Route117_PokemonDayCare_Text_YourMonHasGrownXLevels, MSGBOX_DEFAULT
return
-Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E
+Route117_PokemonDayCare_EventScript_DisplayLevelsGained:: @ 8291E1E
specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
compare VAR_RESULT, 0
- call_if_ne Route117_PokemonDayCare_EventScript_291E15
+ call_if_ne Route117_PokemonDayCare_EventScript_YourMonHasGrownXLevels
return
-Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F
- msgbox Route117_PokemonDayCare_Text_292488, MSGBOX_DEFAULT
+Route117_PokemonDayCare_EventScript_OneMonInDaycare:: @ 8291E2F
+ msgbox Route117_PokemonDayCare_Text_GoodToSeeYou, MSGBOX_DEFAULT
setvar VAR_0x8004, 0
- call Route117_PokemonDayCare_EventScript_291E1E
- msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO
+ call Route117_PokemonDayCare_EventScript_DisplayLevelsGained
+ msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq Route117_PokemonDayCare_EventScript_291D56
- msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO
+ goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
+ msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq Route117_PokemonDayCare_EventScript_291E6D
- goto Route117_PokemonDayCare_EventScript_291DCA
+ goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
+ goto Route117_PokemonDayCare_EventScript_ComeAgain
end
-Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D
+Route117_PokemonDayCare_EventScript_TryRetrieveMon:: @ 8291E6D
specialvar VAR_RESULT, CalculatePlayerPartyCount
- compare VAR_RESULT, 6
- goto_if_eq Route117_PokemonDayCare_EventScript_291F3D
+ compare VAR_RESULT, PARTY_SIZE
+ goto_if_eq Route117_PokemonDayCare_EventScript_NoRoom
specialvar VAR_RESULT, GetDaycareState
setvar VAR_0x8004, 0
- compare VAR_RESULT, 2
- goto_if_eq Route117_PokemonDayCare_EventScript_291EAC
+ compare VAR_RESULT, DAYCARE_ONE_MON
+ goto_if_eq Route117_PokemonDayCare_EventScript_CostPrompt
special ShowDaycareLevelMenu
waitstate
copyvar VAR_0x8004, VAR_RESULT
- compare VAR_RESULT, 2
- goto_if_eq Route117_PokemonDayCare_EventScript_291DCA
- goto Route117_PokemonDayCare_EventScript_291EAC
+ compare VAR_RESULT, DAYCARE_EXITED_LEVEL_MENU
+ goto_if_eq Route117_PokemonDayCare_EventScript_ComeAgain
+ goto Route117_PokemonDayCare_EventScript_CostPrompt
end
-Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC
+Route117_PokemonDayCare_EventScript_CostPrompt:: @ 8291EAC
special GetDaycareCost
- msgbox Route117_PokemonDayCare_Text_292549, MSGBOX_YESNO
+ msgbox Route117_PokemonDayCare_Text_ItWillCostX, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq Route117_PokemonDayCare_EventScript_291EC8
- goto Route117_PokemonDayCare_EventScript_291DCA
+ goto_if_eq Route117_PokemonDayCare_EventScript_CheckEnoughMoney
+ goto Route117_PokemonDayCare_EventScript_ComeAgain
end
-Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8
+Route117_PokemonDayCare_EventScript_CheckEnoughMoney:: @ 8291EC8
specialvar VAR_RESULT, IsEnoughForCostInVar0x8005
compare VAR_RESULT, 1
- goto_if_eq Route117_PokemonDayCare_EventScript_291EE2
- msgbox Route117_PokemonDayCare_Text_292432, MSGBOX_DEFAULT
+ goto_if_eq Route117_PokemonDayCare_EventScript_RetrieveMon
+ msgbox Route117_PokemonDayCare_Text_NotEnoughMoney, MSGBOX_DEFAULT
release
end
-Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2
- applymovement 1, Route117_PokemonDayCare_Movement_291F47
+Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2
+ applymovement 1, Route117_PokemonDayCare_Movement_RetrieveDaycareMon
waitmovement 0
specialvar VAR_RESULT, TakePokemonFromDaycare
special SubtractMoneyFromVar0x8005
playse SE_REGI
- msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT
+ msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT
waitse
playmoncry VAR_RESULT, 0
- msgbox Route117_PokemonDayCare_Text_292593, MSGBOX_DEFAULT
+ msgbox Route117_PokemonDayCare_Text_TookBackMon, MSGBOX_DEFAULT
waitmoncry
specialvar VAR_RESULT, GetDaycareState
- compare VAR_RESULT, 2
- goto_if_eq Route117_PokemonDayCare_EventScript_291F24
- goto Route117_PokemonDayCare_EventScript_291DCA
+ compare VAR_RESULT, DAYCARE_ONE_MON
+ goto_if_eq Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon
+ goto Route117_PokemonDayCare_EventScript_ComeAgain
end
-Route117_PokemonDayCare_EventScript_291F24:: @ 8291F24
- msgbox Route117_PokemonDayCare_Text_29244F, MSGBOX_YESNO
+Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon:: @ 8291F24
+ msgbox Route117_PokemonDayCare_Text_TakeOtherOneBackToo, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq Route117_PokemonDayCare_EventScript_291E6D
- goto Route117_PokemonDayCare_EventScript_291DCA
+ goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
+ goto Route117_PokemonDayCare_EventScript_ComeAgain
end
-Route117_PokemonDayCare_EventScript_291F3D:: @ 8291F3D
- msgbox Route117_PokemonDayCare_Text_2924EF, MSGBOX_DEFAULT
+Route117_PokemonDayCare_EventScript_NoRoom:: @ 8291F3D
+ msgbox Route117_PokemonDayCare_Text_YourTeamIsFull, MSGBOX_DEFAULT
release
end
-Route117_PokemonDayCare_Movement_291F47: @ 8291F47
+Route117_PokemonDayCare_Movement_RetrieveDaycareMon: @ 8291F47
delay_16
delay_16
face_left
@@ -261,50 +261,52 @@ Route117_PokemonDayCare_Movement_291F47: @ 8291F47
walk_slow_down
step_end
+@ Unused. Possibly a commented script, or a typo end added to the above Movement script
Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B
end
-Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C
- msgbox Route117_PokemonDayCare_Text_292488, MSGBOX_DEFAULT
+Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
+ msgbox Route117_PokemonDayCare_Text_GoodToSeeYou, MSGBOX_DEFAULT
setvar VAR_0x8004, 0
- call Route117_PokemonDayCare_EventScript_291E1E
+ call Route117_PokemonDayCare_EventScript_DisplayLevelsGained
setvar VAR_0x8004, 1
- call Route117_PokemonDayCare_EventScript_291E1E
- msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO
+ call Route117_PokemonDayCare_EventScript_DisplayLevelsGained
+ msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq Route117_PokemonDayCare_EventScript_291E6D
- msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT
+ goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
+ msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT
release
end
+@ Unused
Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
special ShowDaycareLevelMenu
waitstate
compare VAR_RESULT, 2
- goto_if_eq Route117_PokemonDayCare_EventScript_291DCA
+ goto_if_eq Route117_PokemonDayCare_EventScript_ComeAgain
copyvar VAR_0x8004, VAR_RESULT
specialvar VAR_RESULT, TakePokemonFromDaycare
- msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT
- msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT
+ msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT
+ msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT
release
end
EventScript_EggHatch:: @ 8291FC0
lockall
- msgbox Text_292668, MSGBOX_DEFAULT
+ msgbox Text_EggHatchHuh, MSGBOX_DEFAULT
special EggHatch
waitstate
releaseall
end
-Route117_Text_291FCF: @ 8291FCF
+Route117_Text_SeeWifeIfYoudLikeMeToRaiseMon: @ 8291FCF
.string "I'm the DAY-CARE MAN.\p"
.string "I help take care of the precious\n"
.string "POKéMON of TRAINERS.\p"
.string "If you'd like me to raise your POKéMON,\n"
.string "have a word with my wife.$"
-Route117_Text_29205D: @ 829205D
+Route117_Text_DoYouWantEgg: @ 829205D
.string "Ah, it's you!\p"
.string "We were raising your POKéMON,\n"
.string "and my goodness, were we surprised!\p"
@@ -313,124 +315,125 @@ Route117_Text_29205D: @ 829205D
.string "but your POKéMON had it.\p"
.string "You do want it, yes?$"
-Route117_Text_292114: @ 8292114
+Route117_Text_YourMonIsDoingFine: @ 8292114
.string "Ah, it's you! Good to see you.\n"
.string "Your {STR_VAR_1}'s doing fine.$"
-Route117_Text_292149: @ 8292149
+Route117_Text_IllKeepIt: @ 8292149
.string "Well then, I'll keep it.\n"
.string "Thanks!$"
-Route117_Text_29216A: @ 829216A
+Route117_Text_YouHaveNoRoomForIt: @ 829216A
.string "You have no room for it…\n"
.string "Come back when you've made room.$"
-Route117_Text_2921A4: @ 82921A4
+Route117_Text_ReceivedEgg: @ 82921A4
.string "{PLAYER} received the EGG from\n"
.string "the DAY-CARE MAN.$"
-Route117_Text_2921CF: @ 82921CF
+Route117_Text_TakeGoodCareOfIt: @ 82921CF
.string "Take good care of it.$"
-Route117_Text_2921E5: @ 82921E5
+Route117_Text_FriendlyWithOtherTrainersMon: @ 82921E5
.string "By the way, about your {STR_VAR_1},\n"
.string "it seemed to be friendly with\l"
.string "{STR_VAR_2}'s {STR_VAR_3}.\p"
.string "I may even have seen it receiving\n"
.string "a piece of MAIL.$"
-Route117_Text_29225A: @ 829225A
+@ Unused
+Route117_Text_SeeWifeIfYouWantToPickUpMon: @ 829225A
.string "If you want to pick up your POKéMON,\n"
.string "have a word with my wife.$"
-Route117_Text_292299: @ 8292299
+Route117_Text_YourMonsAreDoingFine: @ 8292299
.string "Ah, it's you! Your {STR_VAR_1} and\n"
.string "{STR_VAR_2} are doing fine.$"
-Route117_Text_2922C6: @ 82922C6
+Route117_Text_IWillKeepDoYouWantIt: @ 82922C6
.string "I really will keep it.\n"
.string "You do want this, yes?$"
-Route117_PokemonDayCare_Text_2922F4: @ 82922F4
+Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon: @ 82922F4
.string "I'm the DAY-CARE LADY.\p"
.string "We can raise POKéMON for you.\p"
.string "Would you like us to raise one?$"
-Route117_PokemonDayCare_Text_292349: @ 8292349
+Route117_PokemonDayCare_Text_WhichMonShouldWeRaise: @ 8292349
.string "Which POKéMON should we raise for\n"
.string "you?$"
-Route117_PokemonDayCare_Text_292370: @ 8292370
+Route117_PokemonDayCare_Text_WellRaiseYourMon: @ 8292370
.string "Fine, we'll raise your {STR_VAR_1}\n"
.string "for a while.\p"
.string "Come back for it later.$"
-Route117_PokemonDayCare_Text_2923AF: @ 82923AF
+Route117_PokemonDayCare_Text_WeCanRaiseOneMore: @ 82923AF
.string "We can raise two of your POKéMON.\n"
.string "Would you like us to raise one more?$"
-Route117_PokemonDayCare_Text_2923F6: @ 82923F6
+Route117_PokemonDayCare_Text_HusbandWasLookingForYou: @ 82923F6
.string "My husband was looking for you.$"
Route117_PokemonDayCare_Text_292416: @ 8292416
.string "Oh, fine, then.\n"
.string "Come again.$"
-Route117_PokemonDayCare_Text_292432: @ 8292432
+Route117_PokemonDayCare_Text_NotEnoughMoney: @ 8292432
.string "You don't have enough money…$"
-Route117_PokemonDayCare_Text_29244F: @ 829244F
+Route117_PokemonDayCare_Text_TakeOtherOneBackToo: @ 829244F
.string "Will you take back the other one,\n"
.string "too?$"
-Route117_PokemonDayCare_Text_292476: @ 8292476
+Route117_PokemonDayCare_Text_ComeAgain: @ 8292476
.string "Fine.\n"
.string "Come again.$"
-Route117_PokemonDayCare_Text_292488: @ 8292488
+Route117_PokemonDayCare_Text_GoodToSeeYou: @ 8292488
.string "Ah, it's you! Good to see you.\n"
.string "Your POKéMON can only be doing good!$"
-Route117_PokemonDayCare_Text_2924CC: @ 82924CC
+Route117_PokemonDayCare_Text_YourMonHasGrownXLevels: @ 82924CC
.string "By level, your {STR_VAR_1} has\n"
.string "grown by {STR_VAR_2}.$"
-Route117_PokemonDayCare_Text_2924EF: @ 82924EF
+Route117_PokemonDayCare_Text_YourTeamIsFull: @ 82924EF
.string "Your POKéMON team is full.\n"
.string "Make room, then come see me.$"
Route117_PokemonDayCare_Text_292527: @ 8292527
.string "Which POKéMON will you take back?$"
-Route117_PokemonDayCare_Text_292549: @ 8292549
+Route117_PokemonDayCare_Text_ItWillCostX: @ 8292549
.string "If you want your {STR_VAR_1} back,\n"
.string "it will cost ¥{STR_VAR_2}.$"
-Route117_PokemonDayCare_Text_292575: @ 8292575
+Route117_PokemonDayCare_Text_HeresYourMon: @ 8292575
.string "Perfect!\n"
.string "Here's your POKéMON.$"
-Route117_PokemonDayCare_Text_292593: @ 8292593
+Route117_PokemonDayCare_Text_TookBackMon: @ 8292593
.string "{PLAYER} took back {STR_VAR_1} from\n"
.string "the DAY-CARE LADY.$"
-Route117_PokemonDayCare_Text_2925BB: @ 82925BB
+Route117_PokemonDayCare_Text_YouHaveJustOneMon: @ 82925BB
.string "Oh? But you have just one\n"
.string "POKéMON.\p"
.string "Come back another time.$"
-Route117_PokemonDayCare_Text_2925F6: @ 82925F6
+Route117_PokemonDayCare_Text_TakeYourMonBack: @ 82925F6
.string "Will you take your POKéMON back?$"
-Route117_PokemonDayCare_Text_292617: @ 8292617
+Route117_PokemonDayCare_Text_WhatWillYouBattleWith: @ 8292617
.string "If you leave me that POKéMON,\n"
.string "what will you battle with?\p"
.string "Come back another time.$"
-Text_292668: @ 8292668
+Text_EggHatchHuh: @ 8292668
.string "Huh?$"
-Route117_PokemonDayCare_Text_29266D: @ 829266D
+Route117_PokemonDayCare_Text_YoullBeLeftWithJustOne: @ 829266D
.string "Huh?\n"
.string "Now, now.\p"
.string "If you leave that POKéMON with\n"
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index cc189a96b..c8cb84107 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -8,12 +8,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539
PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552
msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, MSGBOX_DEFAULT
- multichoice 17, 6, 20, 0
+ multichoice 17, 6, MULTI_YESNOINFO_2, 0
switch VAR_RESULT
case 0, PetalburgCity_PokemonCenter_1F_EventScript_29159F
case 1, PetalburgCity_PokemonCenter_1F_EventScript_2915EB
case 2, PetalburgCity_PokemonCenter_1F_EventScript_291591
- case 127, PetalburgCity_PokemonCenter_1F_EventScript_2915EB
+ case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_2915EB
end
PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591
@@ -60,12 +60,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_2915F5:: @ 82915F5
PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603
msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, MSGBOX_DEFAULT
- multichoice 17, 6, 20, 0
+ multichoice 17, 6, MULTI_YESNOINFO_2, 0
switch VAR_RESULT
case 0, PetalburgCity_PokemonCenter_1F_EventScript_291650
case 1, PetalburgCity_PokemonCenter_1F_EventScript_29167C
case 2, PetalburgCity_PokemonCenter_1F_EventScript_291642
- case 127, PetalburgCity_PokemonCenter_1F_EventScript_29167C
+ case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_29167C
end
PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index c4a5ffe86..855c5eac2 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -507,7 +507,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
compare VAR_0x8008, 1
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D9D
msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT
- multichoice 22, 8, 108, 1
+ multichoice 22, 8, MULTI_TV_LATI, 1
copyvar VAR_0x8004, VAR_RESULT
special InitRoamer
copyvar VAR_ROAMER_POKEMON, VAR_RESULT
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index a26ecb4c9..7b3932341 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -714,12 +714,12 @@ LilycoveCity_ContestLobby_EventScript_2941ED: @ 82941ED
EventScript_PblocLink_DecideLeader: @ 82941F8
message Text_DecideLinkLeader
waitmessage
- multichoice 16, 6, 81, 0
+ multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
case 0, EventScript_PblocLink_TryJoinGroup
case 1, EventScript_PblocLink_TryBecomeLeader
case 2, EventScript_PblocLink_CloseLink
- case 127, EventScript_PblocLink_CloseLink
+ case MULTI_B_PRESSED, EventScript_PblocLink_CloseLink
end
EventScript_PblocLink_TryBecomeLeader: @ 8294235
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc
index c205a9d22..21ba0d6d3 100644
--- a/data/scripts/trainer_battle.inc
+++ b/data/scripts/trainer_battle.inc
@@ -26,7 +26,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A
compare VAR_RESULT, 0
goto_if_ne EventScript_NoDoubleTrainerBattle
special HasEnoughMonsForDoubleBattle
- compare VAR_RESULT, 0
+ compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_NotEnoughMonsForDoubleBattle
special SetUpTrainerEncounterMusic
special SetUpTrainerMovement
@@ -69,7 +69,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8
compare VAR_RESULT, 0
goto_if_eq EventScript_NoDoubleRematchTrainerBattle
special HasEnoughMonsForDoubleBattle
- compare VAR_RESULT, 0
+ compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle
special SetUpTrainerEncounterMusic
special SetUpTrainerMovement
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 09:40:44 +0000