summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/contest_ai_scripts.s91
-rw-r--r--data/maps/ContestHall/scripts.inc4
-rw-r--r--data/maps/PetalburgCity/map.json6
-rw-r--r--data/maps/PetalburgCity/scripts.inc14
-rw-r--r--data/maps/PetalburgCity_Gym/map.json2
-rw-r--r--data/maps/PetalburgCity_Gym/scripts.inc116
-rw-r--r--data/maps/PetalburgCity_WallysHouse/map.json4
-rw-r--r--data/maps/PetalburgCity_WallysHouse/scripts.inc12
-rw-r--r--data/maps/Route110/scripts.inc4
-rw-r--r--data/scripts/contest_hall.inc2
-rw-r--r--data/scripts/new_game.inc4
-rw-r--r--data/specials.inc6
-rw-r--r--data/text/tv.inc66
13 files changed, 167 insertions, 164 deletions
diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s
index 7346876d7..4a0bed817 100644
--- a/data/contest_ai_scripts.s
+++ b/data/contest_ai_scripts.s
@@ -1,3 +1,5 @@
+#include "constants/global.h"
+#include "constants/contest.h"
.include "asm/macros.inc"
.include "asm/macros/contest_ai_script.inc"
.include "constants/constants.inc"
@@ -12,13 +14,13 @@
.align 2
gContestAIChecks:: @ 82DE350
- .4byte AI_CheckForBadMove // 0x00000001
- .4byte AI_CheckForCombo // 0x00000002
- .4byte AI_CheckBoring // 0x00000004
- .4byte AI_CheckExcitement // 0x00000008
- .4byte AI_CheckOrder // 0x00000010
- .4byte AI_CheckForGoodMove // 0x00000020
- .4byte AI_Erratic // 0x00000040
+ .4byte AI_CheckForBadMove @ CONTEST_AI_CHECK_BAD_MOVE
+ .4byte AI_CheckForCombo @ CONTEST_AI_CHECK_COMBO
+ .4byte AI_CheckBoring @ CONTEST_AI_CHECK_BORING
+ .4byte AI_CheckExcitement @ CONTEST_AI_CHECK_EXCITEMENT
+ .4byte AI_CheckOrder @ CONTEST_AI_CHECK_ORDER
+ .4byte AI_CheckForGoodMove @ CONTEST_AI_CHECK_GOOD_MOVE
+ .4byte AI_Erratic @ CONTEST_AI_ERRATIC
.4byte AI_Nothing // 0x00000080
.4byte AI_Nothing // 0x00000100
.4byte AI_Nothing // 0x00000200
@@ -47,9 +49,9 @@ gContestAIChecks:: @ 82DE350
@ Unreferenced AI routine to encourage moves that improve condition on the first
-@ turn. Additionally, it checks the appeal order of the user and the effect
+@ appeal. Additionally, it checks the turn order of the user and the effect
@ type, but the code is buggy and doesn't affect the score.
- if_turn_not_eq 0, ContestUnreferenced_80
+ if_appeal_num_not_eq 0, ContestUnreferenced_80
if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, ContestUnreferenced_80
score +10
ContestUnreferenced_80:
@@ -64,11 +66,11 @@ ContestUnreferenced_end:
end
@ Unreferenced AI routine that doesn't make much sense.
- if_turn_eq 0, ContestUnreferenced_0F_1
- if_turn_eq 1, ContestUnreferenced_0F_2
- if_turn_eq 2, ContestUnreferenced_0F_3
- if_turn_eq 3, ContestUnreferenced_0F_4
- if_turn_eq 4, ContestUnreferenced_0F_5
+ if_appeal_num_eq 0, ContestUnreferenced_0F_1
+ if_appeal_num_eq 1, ContestUnreferenced_0F_2
+ if_appeal_num_eq 2, ContestUnreferenced_0F_3
+ if_appeal_num_eq 3, ContestUnreferenced_0F_4
+ if_last_appeal ContestUnreferenced_0F_5
end
ContestUnreferenced_0F_1:
if_user_order_not_eq MON_1, ContestUnreferenced_2B_1
@@ -122,25 +124,26 @@ ContestUnreferenced_score2:
end
AI_CheckBoring:
- if_effect_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_end_081DC27F
- if_move_used_count_eq 1, AI_score1_081DC27F
- if_move_used_count_eq 2, AI_score2_081DC27F
- if_move_used_count_eq 3, AI_score3_081DC27F
- if_move_used_count_eq 4, AI_score4_081DC27F
- end
-AI_score1_081DC27F:
+ if_effect_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_CheckBoring_NotBoring
+ if_move_used_count_eq 1, AI_CheckBoring_FirstRepeat
+ if_move_used_count_eq 2, AI_CheckBoring_SecondRepeat
+ if_move_used_count_eq 3, AI_CheckBoring_ThirdRepeat
+ if_move_used_count_eq 4, AI_CheckBoring_FourthRepeat
+ @ No repeats
+ end
+AI_CheckBoring_FirstRepeat:
score -5
end
-AI_score2_081DC27F:
+AI_CheckBoring_SecondRepeat:
score -15
end
-AI_score3_081DC27F:
+AI_CheckBoring_ThirdRepeat:
score -20
end
-AI_score4_081DC27F:
+AI_CheckBoring_FourthRepeat:
score -25
end
-AI_end_081DC27F:
+AI_CheckBoring_NotBoring:
end
AI_CheckExcitement:
@@ -165,7 +168,7 @@ AI_contest7D_1_081DC2AB:
end
AI_contest0F_2_081DC2AB:
if_user_order_not_eq MON_1, AI_contest7D_3_081DC2AB
- if_turn_eq 4, AI_score_081DC2AB
+ if_last_appeal AI_score_081DC2AB
AI_contest7D_2_081DC2AB:
if_random 51, AI_end_081DC2AB
score +10
@@ -221,22 +224,22 @@ AI_score_081DC348:
score +25
end
AI_contest04_1_081DC348:
- if_turn_eq 4, AI_contest7D_081DC348
+ if_last_appeal AI_contest7D_081DC348
if_random 150, AI_end_081DC348
score +10
end
AI_contest04_2_081DC348:
- if_turn_eq 4, AI_contest7D_081DC348
+ if_last_appeal AI_contest7D_081DC348
if_random 125, AI_end_081DC348
score +10
end
AI_contest04_3_081DC348:
- if_turn_eq 4, AI_contest7D_081DC348
+ if_last_appeal AI_contest7D_081DC348
if_random 50, AI_end_081DC348
score +10
end
AI_contest04_4_081DC348:
- if_turn_eq 4, AI_contest7D_081DC348
+ if_last_appeal AI_contest7D_081DC348
score +10
end
AI_contest7D_081DC348:
@@ -301,7 +304,7 @@ ContestEffect3:
if_random 50, ContestEffectEnd
score +15
end
- if_turn_eq 4, ContestEffect3_7D
+ if_last_appeal ContestEffect3_7D
if_random 220, ContestEffect3_score
score +10
end
@@ -323,8 +326,8 @@ ContestEffect38_score1:
score -10
end
ContestEffect38_contest04:
- if_turn_eq 4, ContestEffect38_score2
- if_turn_eq 0, ContestEffect38_random
+ if_last_appeal ContestEffect38_score2
+ if_appeal_num_eq 0, ContestEffect38_random
if_move_used_count_eq 1, ContestEffectEnd
if_random 125, ContestEffectEnd
score +10
@@ -341,7 +344,7 @@ ContestEffect47:
if_move_used_count_eq 1, ContestEffectEnd
if_user_order_eq MON_1, ContestEffect47_random
if_user_order_eq MON_2, ContestEffect47_random
- if_turn_not_eq 4, ContestEffectEnd
+ if_not_last_appeal ContestEffectEnd
if_user_has_exciting_move ContestEffectEnd
if_excitement_less_than 1, ContestEffectEnd
score +10
@@ -408,7 +411,7 @@ ContestEffect46:
if_user_order_more_than MON_1, ContestEffect46_score4
end
ContestEffect46_05:
- if_turn_not_eq 0, ContestEffect46_score1
+ if_appeal_num_not_eq 0, ContestEffect46_score1
if_excitement_eq 4, ContestEffect46_score2
if_excitement_eq 3, ContestEffect46_score3
end
@@ -565,7 +568,7 @@ ContestEffect_FollowingMonsNervous_CheckMon2:
end
ContestEffect18:
- if_turn_eq 4, ContestEffect18_score1
+ if_last_appeal ContestEffect18_score1
jump ContestEffect18_0E
end
ContestEffect18_score1:
@@ -599,9 +602,9 @@ ContestEffectEnd:
@ Randomly encourage moves in Cute, Smart, and Tough contests.
AI_Erratic:
- if_contest_type_eq CONTEST_CUTE, Erratic_CuteSmartTough
- if_contest_type_eq CONTEST_SMART, Erratic_CuteSmartTough
- if_contest_type_eq CONTEST_TOUGH, Erratic_CuteSmartTough
+ if_contest_type_eq CONTEST_CATEGORY_CUTE, Erratic_CuteSmartTough
+ if_contest_type_eq CONTEST_CATEGORY_SMART, Erratic_CuteSmartTough
+ if_contest_type_eq CONTEST_CATEGORY_TOUGH, Erratic_CuteSmartTough
end
Erratic_CuteSmartTough:
if_random 125, Erratic_NoScoreIncrease
@@ -762,11 +765,11 @@ ContestEffect2_4_score3:
end
ContestEffect2_2:
- if_turn_eq 0, ContestEffect2_2_score1
- if_turn_eq 1, ContestEffect2_2_score2
- if_turn_eq 2, ContestEffect2_2_score3
- if_turn_eq 3, ContestEffect2_2_score4
- if_turn_eq 4, ContestEffect2_2_score5
+ if_appeal_num_eq 0, ContestEffect2_2_score1
+ if_appeal_num_eq 1, ContestEffect2_2_score2
+ if_appeal_num_eq 2, ContestEffect2_2_score3
+ if_appeal_num_eq 3, ContestEffect2_2_score4
+ if_last_appeal ContestEffect2_2_score5
end
ContestEffect2_2_score1:
if_random 20, ContestEffectEnd2
diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc
index 33e074e8a..f9c3f4794 100644
--- a/data/maps/ContestHall/scripts.inc
+++ b/data/maps/ContestHall/scripts.inc
@@ -18,7 +18,7 @@ ContestHall_OnTransition: @ 823B79F
ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
call ContestHall_EventScript_TryWaitForLink
- special ScriptGetMultiplayerId
+ special GetContestMultiplayerId
compare VAR_RESULT, 0
call_if_eq ContestHall_EventScript_SaveContestMusicPlayer1
compare VAR_RESULT, 1
@@ -136,7 +136,7 @@ ContestHall_EventScript_SetRandomAudience7:: @ 823B8ED
ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8
setvar VAR_RESULT, 32
- special ScriptRandom
+ special GenerateContestRand
addvar VAR_RESULT, 1
switch VAR_RESULT
case 1, ContestHall_EventScript_RandomAudienceNinjaBoy
diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json
index 03c0950ca..faec3eea1 100644
--- a/data/maps/PetalburgCity/map.json
+++ b/data/maps/PetalburgCity/map.json
@@ -35,8 +35,8 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
- "script": "PetalburgCity_EventScript_WallyAunt",
- "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT"
+ "script": "PetalburgCity_EventScript_WallysMom",
+ "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM"
},
{
"graphics_id": "OBJ_EVENT_GFX_WALLY",
@@ -88,7 +88,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
- "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE"
+ "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD"
},
{
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index b7df04857..558eac64e 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -1,6 +1,6 @@
.set LOCALID_WALLY, 2
.set LOCALID_BOY, 3
-.set LOCALID_WALLYS_UNCLE, 5
+.set LOCALID_WALLYS_DAD, 5
.set LOCALID_GYM_BOY, 8
.set LOCALID_SCOTT, 9
@@ -68,17 +68,17 @@ PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E
PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390
lockall
setflag FLAG_HIDE_MAP_NAME_POPUP
- applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Movement_WalkToWallyHouseUncle
+ applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkToWallyHouseWallysDad
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer
waitmovement 0
setvar VAR_0x8004, 7
setvar VAR_0x8005, 5
opendoor VAR_0x8004, VAR_0x8005
waitdooranim
- applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Movement_WalkInsideHouseUncle
+ applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkInsideHouseWallysDad
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer
waitmovement 0
- setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
+ setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor VAR_0x8004, VAR_0x8005
waitdooranim
@@ -100,7 +100,7 @@ PetalburgCity_EventScript_Boy:: @ 81DC3E6
release
end
-PetalburgCity_EventScript_WallyAunt:: @ 81DC3FD
+PetalburgCity_EventScript_WallysMom:: @ 81DC3FD
msgbox PetalburgCity_Text_WhereIsWally, MSGBOX_NPC
end
@@ -129,7 +129,7 @@ PetalburgCity_Movement_WalkInsideHousePlayer: @ 81DC418
walk_up
step_end
-PetalburgCity_Movement_WalkToWallyHouseUncle: @ 81DC41B
+PetalburgCity_Movement_WalkToWallyHouseWallysDad: @ 81DC41B
delay_8
walk_down
walk_down
@@ -149,7 +149,7 @@ PetalburgCity_Movement_WalkToWallyHouseUncle: @ 81DC41B
walk_up
step_end
-PetalburgCity_Movement_WalkInsideHouseUncle: @ 81DC42D
+PetalburgCity_Movement_WalkInsideHouseWallysDad: @ 81DC42D
walk_up
set_invisible
step_end
diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json
index ca074547f..f38463a19 100644
--- a/data/maps/PetalburgCity_Gym/map.json
+++ b/data/maps/PetalburgCity_Gym/map.json
@@ -155,7 +155,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
- "flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE"
+ "flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD"
}
],
"warp_events": [
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index 5df31917f..c8e14a13f 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -1,6 +1,6 @@
.set LOCALID_NORMAN, 1
.set LOCALID_WALLY, 10
-.set LOCALID_WALLYS_UNCLE, 11
+.set LOCALID_WALLYS_DAD, 11
PetalburgCity_Gym_MapScripts:: @ 8204889
map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad
@@ -213,7 +213,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC
compare VAR_0x8008, 3
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyEast
removeobject LOCALID_WALLY
- setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT
+ setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM
setvar VAR_PETALBURG_GYM_STATE, 1
setvar VAR_PETALBURG_CITY_STATE, 2
clearflag FLAG_HIDE_PETALBURG_CITY_WALLY
@@ -433,11 +433,11 @@ PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B
delay 40
playse SE_DOOR
delay 10
- addobject LOCALID_WALLYS_UNCLE
+ addobject LOCALID_WALLYS_DAD
switch VAR_FACING
- case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth
- case DIR_WEST, PetalburgCity_Gym_EventScript_WallysUncleArrivesWest
- case DIR_EAST, PetalburgCity_Gym_EventScript_WallysUncleArrivesEast
+ case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysDadArrivesNorth
+ case DIR_WEST, PetalburgCity_Gym_EventScript_WallysDadArrivesWest
+ case DIR_EAST, PetalburgCity_Gym_EventScript_WallysDadArrivesEast
end
PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2
@@ -448,119 +448,119 @@ PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2
msgbox PetalburgCity_Gym_Text_ExplainFacade, MSGBOX_DEFAULT
return
-PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth:: @ 8204EF5
+PetalburgCity_Gym_EventScript_WallysDadArrivesNorth:: @ 8204EF5
setvar VAR_0x8008, 1
- goto PetalburgCity_Gym_EventScript_WallysUncleArrives
+ goto PetalburgCity_Gym_EventScript_WallysDadArrives
-PetalburgCity_Gym_EventScript_WallysUncleArrivesEast:: @ 8204EFF
+PetalburgCity_Gym_EventScript_WallysDadArrivesEast:: @ 8204EFF
setvar VAR_0x8008, 2
- goto PetalburgCity_Gym_EventScript_WallysUncleArrives
+ goto PetalburgCity_Gym_EventScript_WallysDadArrives
-PetalburgCity_Gym_EventScript_WallysUncleArrivesWest:: @ 8204F09
+PetalburgCity_Gym_EventScript_WallysDadArrivesWest:: @ 8204F09
setvar VAR_0x8008, 3
- goto PetalburgCity_Gym_EventScript_WallysUncleArrives
+ goto PetalburgCity_Gym_EventScript_WallysDadArrives
-PetalburgCity_Gym_EventScript_WallysUncleArrives:: @ 8204F13
- applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleEnterGym
+PetalburgCity_Gym_EventScript_WallysDadArrives:: @ 8204F13
+ applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadEnterGym
waitmovement 0
playse SE_PIN
- applymovement LOCALID_WALLYS_UNCLE, Common_Movement_ExclamationMark
+ applymovement LOCALID_WALLYS_DAD, Common_Movement_ExclamationMark
waitmovement 0
- applymovement LOCALID_WALLYS_UNCLE, Common_Movement_Delay48
+ applymovement LOCALID_WALLYS_DAD, Common_Movement_Delay48
waitmovement 0
delay 10
compare VAR_0x8008, 1
- call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth
+ call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth
compare VAR_0x8008, 2
- call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast
+ call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast
compare VAR_0x8008, 3
- call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest
+ call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest
msgbox PetalburgCity_Gym_Text_PleaseComeWithMe, MSGBOX_DEFAULT
closemessage
delay 20
compare VAR_0x8008, 1
- call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth
+ call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth
compare VAR_0x8008, 2
- call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast
+ call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast
compare VAR_0x8008, 3
- call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest
+ call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest
msgbox PetalburgCity_Gym_Text_LetMeBorrowPlayer, MSGBOX_DEFAULT
closemessage
setflag FLAG_DONT_TRANSITION_MUSIC
playbgm MUS_TSURETEK, 0
compare VAR_0x8008, 1
- call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth
+ call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth
compare VAR_0x8008, 2
- call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast
+ call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast
compare VAR_0x8008, 3
- call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest
- removeobject LOCALID_WALLYS_UNCLE
+ call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest
+ removeobject LOCALID_WALLYS_DAD
setvar VAR_PETALBURG_CITY_STATE, 4
- clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
+ clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
warp MAP_PETALBURG_CITY, 255, 15, 8
waitstate
release
end
-PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth:: @ 8204FCC
- applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestUp
+PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth:: @ 8204FCC
+ applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
-PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast:: @ 8204FD7
- applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestRight
+PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast:: @ 8204FD7
+ applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
-PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest:: @ 8204FE2
- applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestLeft
+PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest:: @ 8204FE2
+ applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
-PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED
- applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth
+PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth:: @ 8204FED
+ applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
-PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009
- applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast
+PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast:: @ 8205009
+ applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
-PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025
- applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest
+PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest:: @ 8205025
+ applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
-PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041
- applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitNorth
+PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth:: @ 8205041
+ applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitNorth
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
- applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth
+ applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth
waitmovement 0
return
-PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast:: @ 820505A
- applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitEast
- applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast
+PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast:: @ 820505A
+ applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitEast
+ applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast
waitmovement 0
return
-PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest:: @ 820506C
- applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitWest
- applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest
+PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest:: @ 820506C
+ applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitWest
+ applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest
waitmovement 0
return
-PetalburgCity_Gym_Movement_WallysUncleExitNorth: @ 820507E
+PetalburgCity_Gym_Movement_WallysDadExitNorth: @ 820507E
walk_down
walk_down
walk_left
@@ -573,7 +573,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitNorth: @ 820507E
set_invisible
step_end
-PetalburgCity_Gym_Movement_WallysUncleExitEast: @ 8205089
+PetalburgCity_Gym_Movement_WallysDadExitEast: @ 8205089
walk_down
walk_down
walk_left
@@ -586,7 +586,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitEast: @ 8205089
set_invisible
step_end
-PetalburgCity_Gym_Movement_WallysUncleExitWest: @ 8205094
+PetalburgCity_Gym_Movement_WallysDadExitWest: @ 8205094
walk_down
walk_down
walk_left
@@ -601,7 +601,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitWest: @ 8205094
set_invisible
step_end
-PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth: @ 82050A1
+PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth: @ 82050A1
delay_16
walk_down
walk_down
@@ -611,7 +611,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth: @ 82050A1
walk_down
step_end
-PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast: @ 82050A9
+PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast: @ 82050A9
delay_16
walk_down
walk_down
@@ -621,7 +621,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast: @ 82050A9
walk_down
step_end
-PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest: @ 82050B1
+PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest: @ 82050B1
delay_16
walk_down
walk_down
@@ -633,7 +633,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest: @ 82050B1
walk_down
step_end
-PetalburgCity_Gym_Movement_WallysUncleEnterGym: @ 82050BB
+PetalburgCity_Gym_Movement_WallysDadEnterGym: @ 82050BB
walk_up
delay_8
walk_in_place_fastest_right
@@ -643,7 +643,7 @@ PetalburgCity_Gym_Movement_WallysUncleEnterGym: @ 82050BB
walk_in_place_fastest_up
step_end
-PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth: @ 82050C3
+PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth: @ 82050C3
walk_right
walk_right
walk_up
@@ -652,7 +652,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth: @ 82050C3
walk_in_place_fastest_right
step_end
-PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast: @ 82050CA
+PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast: @ 82050CA
walk_right
walk_right
walk_up
@@ -660,7 +660,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast: @ 82050CA
walk_up
step_end
-PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest: @ 82050D0
+PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest: @ 82050D0
walk_right
walk_right
walk_up
diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json
index 172cf3e2e..c0efbeb67 100644
--- a/data/maps/PetalburgCity_WallysHouse/map.json
+++ b/data/maps/PetalburgCity_WallysHouse/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
- "script": "PetalburgCity_WallysHouse_EventScript_WallyUncle",
+ "script": "PetalburgCity_WallysHouse_EventScript_WallysDad",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
- "script": "PetalburgCity_WallysHouse_EventScript_WallyAunt",
+ "script": "PetalburgCity_WallysHouse_EventScript_WallysMom",
"flag": "0"
}
],
diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc
index a46f5d78d..1e4e75987 100644
--- a/data/maps/PetalburgCity_WallysHouse/scripts.inc
+++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc
@@ -1,4 +1,4 @@
-.set LOCALID_WALLYS_UNCLE, 1
+.set LOCALID_WALLYS_DAD, 1
PetalburgCity_WallysHouse_MapScripts:: @ 8204229
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame
@@ -6,12 +6,12 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229
.byte 0
PetalburgCity_WallysHouse_OnWarp: @ 8204234
- map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther
+ map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther
.2byte 0
-PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E
+PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther:: @ 820423E
turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST
- turnobject LOCALID_WALLYS_UNCLE, DIR_WEST
+ turnobject LOCALID_WALLYS_DAD, DIR_WEST
end
PetalburgCity_WallysHouse_OnFrame: @ 8204247
@@ -28,7 +28,7 @@ PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251
releaseall
end
-PetalburgCity_WallysHouse_EventScript_WallyUncle:: @ 8204278
+PetalburgCity_WallysHouse_EventScript_WallysDad:: @ 8204278
lock
faceplayer
goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad
@@ -54,7 +54,7 @@ PetalburgCity_WallysHouse_EventScript_PlayedWithWally:: @ 82042B6
release
end
-PetalburgCity_WallysHouse_EventScript_WallyAunt:: @ 82042C0
+PetalburgCity_WallysHouse_EventScript_WallysMom:: @ 82042C0
lock
faceplayer
goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
index 02c13f4d9..7cdb547ed 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -448,7 +448,7 @@ Route110_EventScript_MayDefeated:: @ 81EF84A
end
Route110_EventScript_BrendanBattle:: @ 81EF865
- msgbox Route110_Text_BrendayLetsBattle, MSGBOX_DEFAULT
+ msgbox Route110_Text_BrendanLetsBattle, MSGBOX_DEFAULT
switch VAR_STARTER_MON
case 0, Route110_EventScript_BrendanBattleTreecko
case 1, Route110_EventScript_BrendanBattleTorchic
@@ -814,7 +814,7 @@ Route110_Text_MayExplainItemfinder: @ 81EFD58
.string "me, but I think you should train a lot\l"
.string "harder for the next time.$"
-Route110_Text_BrendayLetsBattle: @ 81EFE3F
+Route110_Text_BrendanLetsBattle: @ 81EFE3F
.string "BRENDAN: Hey, {PLAYER}.\n"
.string "So this is where you were.\l"
.string "How's it going?\p"
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index c21488502..984e1b93b 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -542,7 +542,7 @@ ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F
ContestHall_EventScript_DisplayHearts:: @ 827A3E5
setvar VAR_RESULT, 8
- special ScriptRandom
+ special GenerateContestRand
compare VAR_RESULT, 0
call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember1
compare VAR_RESULT, 1
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index 3c68dfa13..f72337972 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -115,7 +115,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
setflag FLAG_HIDE_PETALBURG_GYM_GREETER
- setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE
+ setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
@@ -142,7 +142,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA
setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
- setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
+ setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
setflag FLAG_HIDE_PETALBURG_GYM_WALLY
setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
diff --git a/data/specials.inc b/data/specials.inc
index d7d1897d8..77e7d5c0a 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -149,7 +149,7 @@ gSpecials:: @ 81DBA64
def_special SaveMuseumContestPainting
def_special DoesContestCategoryHaveWinner
def_special CountPlayerContestPaintings
- def_special ShowContestWinner
+ def_special ShowContestWinnerPainting
def_special MauvilleGymSetDefaultBarriers
def_special MauvilleGymPressSwitch
def_special ShowFieldMessageStringVar4
@@ -336,7 +336,7 @@ gSpecials:: @ 81DBA64
def_special BattleSetup_StartLatiBattle
def_special SetRoute119Weather
def_special SetRoute123Weather
- def_special ScriptGetMultiplayerId
+ def_special GetContestMultiplayerId
def_special ScriptGetPartyMonSpecies
def_special IsSelectedMonEgg
def_special TryInitBattleTowerAwardManObjectEvent
@@ -350,7 +350,7 @@ gSpecials:: @ 81DBA64
def_special BufferLottoTicketNumber
def_special TryHideBattleTowerReporter
def_special DoesPartyHaveEnigmaBerry
- def_special ScriptRandom
+ def_special GenerateContestRand
def_special SetChampionSaveWarp
def_special TryPutTreasureInvestigatorsOnAir
def_special TryPutLotteryWinnerReportOnAir
diff --git a/data/text/tv.inc b/data/text/tv.inc
index 63a1eff65..6f678d824 100644
--- a/data/text/tv.inc
+++ b/data/text/tv.inc
@@ -2436,7 +2436,7 @@ gTVSafariFanClubText10:: @ 08289D33
.string "and make the challenge yourself!\p"
.string "Until next time, cheerio!$"
-gTVContestLiveUpdatesText00:: @ 08289DD6
+ContestLiveUpdates_Text_Intro:: @ 08289DD6
.string "“POKéMON CONTEST LIVE UPDATES!”\p"
.string "MC: Thanks for joining us!\p"
.string "We're live from the just-ended\n"
@@ -2455,117 +2455,117 @@ gTVContestLiveUpdatesText00:: @ 08289DD6
.string "MC: Let's hear what the fans have\n"
.string "to say about this CONTEST.$"
-gTVContestLiveUpdatesText01:: @ 08289F53
+ContestLiveUpdates_Text_WonBothRounds:: @ 08289F53
.string "Spectator: The {STR_VAR_2} was tops in\n"
.string "both primary and secondary judging!\p"
.string "That {STR_VAR_2} will keep winning!$"
-gTVContestLiveUpdatesText02:: @ 08289FB0
+ContestLiveUpdates_Text_BetterRound2:: @ 08289FB0
.string "Spectator: The {STR_VAR_2} didn't do\n"
.string "well in the primary judging, but it\l"
.string "cleaned up in the secondary judging!\p"
.string "It was a miraculous comeback\n"
.string "for that {STR_VAR_2}. Yippee!$"
-gTVContestLiveUpdatesText03:: @ 0828A047
+ContestLiveUpdates_Text_EqualRounds:: @ 0828A047
.string "Spectator: The {STR_VAR_2} remained\n"
.string "consistent throughout both primary\l"
.string "and secondary judging.\p"
.string "{STR_VAR_3} and the {STR_VAR_2},\n"
.string "they're no ordinary combo!$"
-gTVContestLiveUpdatesText04:: @ 0828A0C6
+ContestLiveUpdates_Text_BetterRound1:: @ 0828A0C6
.string "Spectator: In terms of being {STR_VAR_1},\n"
.string "that {STR_VAR_2} was outstanding.\p"
.string "I hope it makes better appeals\n"
.string "next time, though.$"
-gTVContestLiveUpdatesText05:: @ 0828A132
+ContestLiveUpdates_Text_GotNervous:: @ 0828A132
.string "Spectator: When the {STR_VAR_2} got\n"
.string "nervous, I couldn't stop myself from\l"
.string "shouting encouragement.\p"
.string "I'd like to say this to that\n"
.string "{STR_VAR_2}, “Congratulations!”$"
-gTVContestLiveUpdatesText06:: @ 0828A1BE
+ContestLiveUpdates_Text_StartledFoes:: @ 0828A1BE
.string "Spectator: That {STR_VAR_2}'s appeal\n"
.string "startled even me!\p"
.string "{STR_VAR_2}, you were awesome!$"
-gTVContestLiveUpdatesText07:: @ 0828A202
+ContestLiveUpdates_Text_UsedCombo:: @ 0828A202
.string "Spectator: That {STR_VAR_2}'s combo\n"
.string "appeal was stunning!\p"
.string "It's shaken me to the core!$"
-gTVContestLiveUpdatesText08:: @ 0828A24E
+ContestLiveUpdates_Text_ExcitingAppeal:: @ 0828A24E
.string "Spectator: The winning {STR_VAR_2}'s\n"
.string "appeal got my heart pounding!$"
-gTVContestLiveUpdatesText09:: @ 0828A288
+ContestLiveUpdates_Text_WasCool:: @ 0828A288
.string "{STR_VAR_2}!\n"
.string "You were cool!$"
-gTVContestLiveUpdatesText10:: @ 0828A29B
+ContestLiveUpdates_Text_WasBeautiful:: @ 0828A29B
.string "{STR_VAR_2}!\n"
.string "You were beautiful!$"
-gTVContestLiveUpdatesText11:: @ 0828A2B3
+ContestLiveUpdates_Text_WasCute:: @ 0828A2B3
.string "{STR_VAR_2}!\n"
.string "You were cute!$"
-gTVContestLiveUpdatesText12:: @ 0828A2C6
+ContestLiveUpdates_Text_WasSmart:: @ 0828A2C6
.string "{STR_VAR_2}!\n"
.string "You were smart!$"
-gTVContestLiveUpdatesText13:: @ 0828A2DA
+ContestLiveUpdates_Text_WasTough:: @ 0828A2DA
.string "{STR_VAR_2}!\n"
.string "You were tough!$"
-gTVContestLiveUpdatesText14:: @ 0828A2EE
+ContestLiveUpdates_Text_VeryExcitingAppeal:: @ 0828A2EE
.string "Spectator: The winning {STR_VAR_2}'s\n"
.string "appeal still has my heart pounding!$"
-gTVContestLiveUpdatesText15:: @ 0828A32E
+ContestLiveUpdates_Text_VeryCool:: @ 0828A32E
.string "{STR_VAR_2}!\n"
.string "You're the last word in cool!$"
-gTVContestLiveUpdatesText16:: @ 0828A350
+ContestLiveUpdates_Text_VeryBeautiful:: @ 0828A350
.string "{STR_VAR_2}!\n"
.string "You're the most beautiful!$"
-gTVContestLiveUpdatesText17:: @ 0828A36F
+ContestLiveUpdates_Text_VeryCute:: @ 0828A36F
.string "{STR_VAR_2}!\n"
.string "You're simply the cutest!$"
-gTVContestLiveUpdatesText18:: @ 0828A38D
+ContestLiveUpdates_Text_VerySmart:: @ 0828A38D
.string "{STR_VAR_2}!\n"
.string "You're the smartest among the smart!$"
-gTVContestLiveUpdatesText19:: @ 0828A3B6
+ContestLiveUpdates_Text_VeryTough:: @ 0828A3B6
.string "{STR_VAR_2}!\n"
.string "You're the toughest of the tough!$"
-gTVContestLiveUpdatesText20:: @ 0828A3DC
+ContestLiveUpdates_Text_TookBreak:: @ 0828A3DC
.string "Spectator: Even when the {STR_VAR_2}\n"
.string "took a break from making appeals,\l"
.string "I couldn't take my eyes off it.\p"
.string "I'm captivated by that {STR_VAR_2}.$"
-gTVContestLiveUpdatesText21:: @ 0828A455
+ContestLiveUpdates_Text_GotStartled:: @ 0828A455
.string "Spectator: When the {STR_VAR_2} was\n"
.string "startled by another POKéMON's appeal,\l"
.string "I was close to tears.\p"
.string "{STR_VAR_2}, you were resilient!\n"
.string "Way to go!$"
-gTVContestLiveUpdatesText22:: @ 0828A4CF
+ContestLiveUpdates_Text_MoveWonderful:: @ 0828A4CF
.string "Spectator: Oh…\n"
.string "That {STR_VAR_2}'s {STR_VAR_3}!\l"
.string "{STR_VAR_2}'s {STR_VAR_3}!\l"
.string "{STR_VAR_2}'s {STR_VAR_3}!\l"
.string "How could it be so wonderful?$"
-gTVContestLiveUpdatesText23:: @ 0828A51C
+ContestLiveUpdates_Text_TalkAboutAnotherMon:: @ 0828A51C
.string "MC: Well, there you have it. This place\n"
.string "is full of the {STR_VAR_1}'s fans!\p"
.string "I should also mention that another\n"
@@ -2573,20 +2573,20 @@ gTVContestLiveUpdatesText23:: @ 0828A51C
.string "caught my eye.\p"
.string "{STR_VAR_2}'s {STR_VAR_3}…$"
-gTVContestLiveUpdatesText24:: @ 0828A5AC
+ContestLiveUpdates_Text_FailedToAppeal:: @ 0828A5AC
.string "It failed to make a single appeal during\n"
.string "secondary judging out of nervousness.\p"
.string "Next time, I would like to see this\n"
.string "{STR_VAR_1} make even one appeal.$"
-gTVContestLiveUpdatesText25:: @ 0828A638
+ContestLiveUpdates_Text_LastInBothRounds:: @ 0828A638
.string "It came dead last in both primary\n"
.string "and secondary judging.\p"
.string "I hope that {STR_VAR_1} will retrain this\n"
.string "{STR_VAR_2} and erase the shame of\l"
.string "this undisputed last-place finish.$"
-gTVContestLiveUpdatesText26:: @ 0828A6CF
+ContestLiveUpdates_Text_NotExcitingEnough:: @ 0828A6CF
.string "It failed to take advantage of\n"
.string "the audience's excitement and make\l"
.string "an appropriate appeal.\p"
@@ -2594,7 +2594,7 @@ gTVContestLiveUpdatesText26:: @ 0828A6CF
.string "a feel for the audience and whip their\l"
.string "excitement to a fever pitch next time.$"
-gTVContestLiveUpdatesText27:: @ 0828A797
+ContestLiveUpdates_Text_LostAfterWinningRound1:: @ 0828A797
.string "While finishing first in the primary\n"
.string "judging, its appeals in the secondary\l"
.string "judging failed to click.\p"
@@ -2603,14 +2603,14 @@ gTVContestLiveUpdatesText27:: @ 0828A797
.string "I'm sure {STR_VAR_1} is studying how to\n"
.string "make more effective appeals now.$"
-gTVContestLiveUpdatesText28:: @ 0828A86D
+ContestLiveUpdates_Text_NeverExciting:: @ 0828A86D
.string "The audience never got excited by its\n"
.string "appeals during the secondary judging.\p"
.string "We hope it will stop worrying about\n"
.string "other POKéMON and learn to pitch\l"
.string "its appeals to the audience more.$"
-gTVContestLiveUpdatesText29:: @ 0828A920
+ContestLiveUpdates_Text_LostBySmallMargin:: @ 0828A920
.string "It lost to {STR_VAR_1}'s {STR_VAR_2}\n"
.string "by only a small margin.\p"
.string "It must be heartbreaking to come\n"
@@ -2618,7 +2618,7 @@ gTVContestLiveUpdatesText29:: @ 0828A920
.string "I wouldn't be surprised if {STR_VAR_3}\n"
.string "were weeping over this outcome.$"
-gTVContestLiveUpdatesText30:: @ 0828A9CC
+ContestLiveUpdates_Text_RepeatedAppeals:: @ 0828A9CC
.string "It disappointed the JUDGE by\n"
.string "repeating the same appeals.\p"
.string "It's an unforgivable error in any\n"
@@ -2626,14 +2626,14 @@ gTVContestLiveUpdatesText30:: @ 0828A9CC
.string "{STR_VAR_1} should feel guilty for\n"
.string "this sorry showing.$"
-gTVContestLiveUpdatesText31:: @ 0828AA74
+ContestLiveUpdates_Text_ValiantEffortButLost:: @ 0828AA74
.string "{STR_VAR_1} turned in a valiant effort,\n"
.string "but…\p"
.string "It was all for naught, finishing last.\p"
.string "{STR_VAR_1} should learn from this loss\n"
.string "and put the knowledge to good use.$"
-gTVContestLiveUpdatesText32:: @ 0828AB01
+ContestLiveUpdates_Text_Outro:: @ 0828AB01
.string "I'd like to end this program with our\n"
.string "usual farewell to the winners.\p"
.string "This time, it's {STR_VAR_1} and\n"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 15:02:48 +0000