dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1138 from GriffinRichards/doc-contest

Browse Source 
Document contest
This commit is contained in:
GriffinR
2020-08-20 16:03:47 -04:00
committed by GitHub
parent fadb72696f fa29ff98a3
commit 6c34effda9
76 changed files with 4369 additions and 4251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
data/contest_ai_scripts.s
View File

@@ -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
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_score1_081DC27F:
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

4
data/maps/ContestHall/scripts.inc
View File

@@ -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

2
data/scripts/contest_hall.inc
View File

@@ -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

6
data/specials.inc
View File

@@ -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

66
data/text/tv.inc
View File

@@ -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"