Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flat Merge Friday (Weekly merge) #2286

Merged
Merged
Changes from 2 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
59f89bd
Misc cleanup
AsparagusEduardo Aug 18, 2022
3bc2cf9
Sync src/battle_controllers.c with pokefirered
AsparagusEduardo Aug 8, 2022
11b4958
Incorporate commented bug fixes in contest AI scripts
GriffinRichards Aug 19, 2022
76d2d92
Merge branch 'pretmaster' into pret_clean2
AsparagusEduardo Aug 20, 2022
261b0ff
Standardize judgement vs judgment spelling
GriffinRichards Aug 21, 2022
8aead3b
Merge pull request #1747 from GriffinRichards/contest-ai-bug
GriffinRichards Aug 27, 2022
481210b
Missing uses of MAX_SPRITES
AsparagusEduardo Aug 27, 2022
0a34d47
Merge remote-tracking branch 'pret/master' into pret_clean2
AsparagusEduardo Aug 27, 2022
6c457f4
Corrected uses of GetBattlerSide
AsparagusEduardo Aug 27, 2022
15d611b
Usage of BATTLE_PARTNER
AsparagusEduardo Aug 27, 2022
1f0a952
Usage of BATTLE_OPPOSITE
AsparagusEduardo Aug 27, 2022
866d916
SpriteTemplate formatting
AsparagusEduardo Aug 27, 2022
99fbad9
IS_BATTLER_OF_TYPE
AsparagusEduardo Aug 27, 2022
1c8d3a4
Removed unnecessary parenthesis
AsparagusEduardo Aug 27, 2022
0a2ac61
Merge pull request #1757 from AsparagusEduardo/pret_clean2
GriffinRichards Aug 27, 2022
e02b33e
Automatized the contents of some sideof in src/item.c
LOuroboros Sep 1, 2022
ea345f9
Picked the correct pointers for correctness' sake
LOuroboros Sep 1, 2022
b66de1f
Merge pull request #1759 from LOuroboros/pyramidSchemes
GriffinRichards Sep 1, 2022
5d346fd
Updated a couple more sizeofs
LOuroboros Sep 1, 2022
d211adb
Merge pull request #1760 from LOuroboros/bermuda
GriffinRichards Sep 1, 2022
a28fbbc
Merge pull request #1748 from GriffinRichards/fix-judgement
GriffinRichards Sep 1, 2022
c7fc2e1
Renamed TM flags to keep consistency with the rest of the repo
AsparagusEduardo Sep 2, 2022
ff53a55
Merge pull request #1761 from AsparagusEduardo/pret/tmFlagNames
GriffinRichards Sep 2, 2022
5403cd0
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_2022…
AsparagusEduardo Sep 3, 2022
03498d7
Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER
AsparagusEduardo Sep 3, 2022
790bdd6
Using GET_BATTLER_SIDE and GET_BATTLER_SIDE2
AsparagusEduardo Sep 3, 2022
41bf6bd
Removed pointless macro
AsparagusEduardo Sep 3, 2022
797aa08
Merge pull request #1764 from AsparagusEduardo/pret/battlerMacros
GriffinRichards Sep 3, 2022
dbd56ef
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_2022…
AsparagusEduardo Sep 5, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions data/contest_ai_scripts.s
Original file line number Diff line number Diff line change
@@ -435,11 +435,15 @@ AI_CGM_BetterWhenAudienceExcited:
AI_CGM_BetterWhenAudienceExcited_1stUp:
@ BUG: Should be if_appeal_num_eq 0
@ 1st up on 1st appeal excitement will always be 0
if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_Not1stAppeal
.ifdef BUGFIX
if_appeal_num_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
.else
if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
.endif
if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax
if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax
end
AI_CGM_BetterWhenAudienceExcited_Not1stAppeal:
AI_CGM_BetterWhenAudienceExcited_1stAppeal:
if_random_less_than 125, AI_CGM_End
score -15
end
@@ -542,7 +546,11 @@ AI_CGM_TargetMonWithJudgesAttention:
end
AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.ifdef BUGFIX
if_not_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.else
if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.endif
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
score +2
if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
@@ -551,7 +559,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
if_user_order_eq MON_2, AI_CGM_End
if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.ifdef BUGFIX
if_not_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.else
if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.endif
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
score +2
if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
@@ -560,7 +572,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
AI_CGM_TargetMonWithJudgesAttention_CheckMon3:
if_user_order_eq MON_3, AI_CGM_End
if_cannot_participate MON_3, AI_CGM_End
.ifdef BUGFIX
if_not_used_combo_starter MON_3, AI_CGM_End
.else
if_used_combo_starter MON_3, AI_CGM_End
.endif
if_random_less_than 125, AI_CGM_End
score +2
if_not_completed_combo MON_3, AI_CGM_End