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

Version 1.5.0 #3040

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
620 commits
Select commit Hold shift + click to select a range
e3ca217
rename IsBattlerAIControlled
Apr 10, 2023
e4656f3
Add AI_FLAG_OMNISCIENT (#2872)
AsparagusEduardo Apr 10, 2023
86242c1
MOVE_REVIVAL_BLESSING Effect (#2883)
AgustinGDLV Apr 12, 2023
eaddeab
Improve PR Template
AsparagusEduardo Apr 13, 2023
513ebcb
Improved PR Template (#2905)
mrgriffin Apr 13, 2023
7c29a24
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync2…
AsparagusEduardo Apr 13, 2023
0397a1d
pret merge 2023/04/13 (#2907)
AsparagusEduardo Apr 13, 2023
958bc34
Fixed AI not considering Hidden Abilities in its team during switchin…
AsparagusEduardo Apr 14, 2023
48fba7a
Fixed AI not considering Hidden Abilities in its team during switchin…
mrgriffin Apr 14, 2023
11beec6
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
AsparagusEduardo Apr 14, 2023
2eabcea
Battle Item Refactor (#2902)
AgustinGDLV Apr 14, 2023
dacd078
Fixed Mega Evolution script name
AsparagusEduardo Apr 14, 2023
82dc1e3
fixed dupe strings in battle item use
AgustinGDLV Apr 15, 2023
aefe582
GetSideParty/GetBattlerParty
mrgriffin Apr 14, 2023
d3a0900
added code review
AgustinGDLV Apr 15, 2023
7d4807d
fix nightmare status only being healed in doubles
u8-Salem Apr 16, 2023
73ba826
Fix Rare Candies
Jaizu Apr 16, 2023
037fd2a
Fix Rare Candies (#2918)
AsparagusEduardo Apr 16, 2023
efd7465
fix gBattleMons using party indices instead of battle indices
u8-Salem Apr 17, 2023
0531ab5
Fix Ability PopUp freeze
AlexOn1ine Apr 17, 2023
60c88d8
Update data/battle_scripts_1.s
AlexOn1ine Apr 17, 2023
61f99b4
Fix Ability PopUp freeze (#2920)
AsparagusEduardo Apr 17, 2023
afdfe15
fix several issues in BS_ItemCureStatus (#2916)
AsparagusEduardo Apr 17, 2023
9d93af2
Fixed Budew evolution method (#2928)
fdeblasio Apr 18, 2023
76d0d8a
Fix battle message strings for stats (#2927)
AlexOn1ine Apr 18, 2023
e6505bd
Fix some sprites (#2926)
Jaizu Apr 18, 2023
d5b36c7
Reusable TMs (#2903)
Bassoonian Apr 18, 2023
52ce399
Fix TM reusability shortcomings (#2930)
Bassoonian Apr 19, 2023
d3fed56
Added config to enable NEW_ROCKS_PARTICLE (#2929)
pkmnsnfrn Apr 19, 2023
216b7a4
fix dire hit and paralyze heal
u8-Salem Apr 20, 2023
115efe7
fix dire hit and paralyze heal (#2931)
Jaizu Apr 20, 2023
3aec63b
new define to restore items after battle
AlexOn1ine Apr 20, 2023
6c7f588
Add two EV-related configs (#2825)
citrusbolt Apr 20, 2023
ae80d54
Support for multi battles where Trainer has only one mon (#2670)
DizzyEggg Apr 20, 2023
76f0277
Detect memory leaks in tests
mrgriffin Apr 20, 2023
c81a985
Fix USE_ITEM explicit targets
mrgriffin Apr 20, 2023
e1e8277
batch 1
u8-Salem Apr 20, 2023
94cb569
local specialties tests
u8-Salem Apr 21, 2023
301a12f
fix battleUsage for heal powder
u8-Salem Apr 21, 2023
4a08ede
Add GetMovesArray in GetMovesArray
AlexOn1ine Apr 21, 2023
1cc28c8
X item tests
u8-Salem Apr 21, 2023
b4aee00
replace pokemon with battler in string
u8-Salem Apr 21, 2023
cbac6d0
Full Restore test
u8-Salem Apr 21, 2023
30204e9
fix wrong z-move ususage
AlexOn1ine Apr 21, 2023
38476bd
fix Full Restore not healing confusion
u8-Salem Apr 21, 2023
4bad450
Full Restore confusion test
u8-Salem Apr 21, 2023
ff609f2
healing items tests
u8-Salem Apr 21, 2023
929e474
temporarily rename test string for easier test runs
u8-Salem Apr 22, 2023
42215c9
actually working restore hp tests
u8-Salem Apr 22, 2023
727f1ac
guard spec test
u8-Salem Apr 22, 2023
18ac811
Dire Hit test
u8-Salem Apr 22, 2023
1b6bb3e
make the test fail intentionally
u8-Salem Apr 22, 2023
623e7c5
Add Frostbite status
Bassoonian Apr 22, 2023
f50bfb3
Frostbite hurts at the end of the turn and halves SpA
Bassoonian Apr 22, 2023
9c9a1fb
Allow for healing with items
Bassoonian Apr 22, 2023
a561c6d
Add config to Frostbite & allow it to be inflicted
Bassoonian Apr 22, 2023
2332c6d
Fixes status z-moves overwrting damage dealing z-moves (#2937)
ghoulslash Apr 23, 2023
594bc83
Adds define `B_RESTORE_HELD_BATTLE_ITEMS` following Gen9 (#2932)
ghoulslash Apr 23, 2023
cf17324
Fixed duplicate item strings in Bag/Party menus with battle items (#2…
ghoulslash Apr 23, 2023
909a20c
Reset battle vars and flags after player whites out (#2875)
ghoulslash Apr 23, 2023
25327b9
Adds GetMovesArray in CanTargetFaintAi (#2936)
ghoulslash Apr 23, 2023
13f6acf
General mechanics
Bassoonian Apr 23, 2023
a020001
Battle Pike functionality
Bassoonian Apr 23, 2023
6b2a873
Add comment in Ice Beam
Bassoonian Apr 23, 2023
0b8d148
Let AI take Frostbite into account
Bassoonian Apr 23, 2023
f13c39d
Thawing out for frostbite
Bassoonian Apr 23, 2023
a2bc21d
Update battle_ai_util.h
Bassoonian Apr 24, 2023
0b66cf0
remove no longer needed variable
u8-Salem Apr 24, 2023
c4497bc
revive tests
u8-Salem Apr 24, 2023
330e85b
Updates
LOuroboros Apr 24, 2023
a128192
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
LOuroboros Apr 24, 2023
19ec7e2
Added new conditions for the trainer slide-in system (#2713)
ghoulslash Apr 24, 2023
868838a
Add thunder cage case to trap anim IDs (#2941)
ghoulslash Apr 24, 2023
e0cae31
Merge branch 'battleItemFixes' into battleItemTests
u8-Salem Apr 24, 2023
5030350
Merge branch 'upcoming' into battleItemFixes
u8-Salem Apr 24, 2023
632668e
Merge branch 'battleItemFixes' into battleItemTests
u8-Salem Apr 24, 2023
f74a1b0
fix strings after update
u8-Salem Apr 24, 2023
59666a1
heal powder test
u8-Salem Apr 24, 2023
9562c7a
Added forbidden Metronome moves from PLA and SV (#2949)
fdeblasio Apr 24, 2023
60e048b
more robust status cure tests
u8-Salem Apr 25, 2023
2aa4d2d
Fix Ice Heal message
Bassoonian Apr 25, 2023
7fad0a2
add MovesWithPP macro to allow for setting pps in tests
u8-Salem Apr 25, 2023
2885ec2
Fix move descriptions
Bassoonian Apr 25, 2023
b1f7556
Merge branch 'upcoming' into rhhupcomingdev
Bassoonian Apr 25, 2023
08ec873
update MoveWithPP macro to use struct
u8-Salem Apr 25, 2023
78c4d07
Add Berserk Gene Item (#2893)
u8-Salem Apr 25, 2023
d3e9a68
restore pp item tests
u8-Salem Apr 25, 2023
0315f70
Fix thawing being triggered by every move
Bassoonian Apr 25, 2023
9f2589e
better usage of THEN over FINALLY
u8-Salem Apr 25, 2023
a2809ac
fix gChosenMovePos not being assigned correctly for battle items
u8-Salem Apr 25, 2023
4a0abc5
Merge branch 'upcoming' into rhh-get-party
mrgriffin Apr 26, 2023
a5d3915
add Max Mushroom test
u8-Salem Apr 26, 2023
5afe3f5
GetSideParty/GetBattlerParty (#2910)
ghoulslash Apr 26, 2023
e83e08f
Add time ranges to UpdateAmbientCry
GriffinRichards Apr 26, 2023
408aa30
Merge pull request #17 from AgustinGDLV/pr/castform_fix
AsparagusEduardo Apr 26, 2023
32dcea0
Fix issue with Enamorus Therian cry define order (#2956)
grunt-lucas Apr 26, 2023
36e6981
Replace some & usage with %
GriffinRichards Apr 26, 2023
d5fb13c
Fix status icons
Bassoonian Apr 26, 2023
c279830
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
Bassoonian Apr 27, 2023
f87c5e7
Merge pull request #19 from Bassoonian/formbattlechangecontribution
AsparagusEduardo Apr 27, 2023
c2dad5a
Redefine TV_SHOWS_COUNT
GriffinRichards Apr 27, 2023
854e9be
Fix move defrosting for both Freeze and Frostbite
Bassoonian Apr 28, 2023
a98da30
frostbite tests
AlexOn1ine Apr 28, 2023
bfcddff
correct first test
AlexOn1ine Apr 28, 2023
6a5947c
Merge pull request #1 from AlexOn1ine/frostbite_tests
Bassoonian Apr 28, 2023
0cbb80d
Fix grassy terrain freezing the game (#2959)
AlexOn1ine Apr 28, 2023
b53c913
Manually port daycare expansion to modern standards
Bassoonian Apr 29, 2023
c82c2c1
Integrate ghoul's review
Bassoonian Apr 29, 2023
99cbd2a
add snow weather
u8-Salem Apr 29, 2023
c7d39e5
Clarify weather function
Bassoonian Apr 29, 2023
9796984
Merge pull request #20 from Bassoonian/formbattlechangefix
AsparagusEduardo Apr 29, 2023
62ec498
spelling
u8-Salem Apr 30, 2023
b30dad3
Fix anger shell activating when fainted (#2945)
ghoulslash Apr 30, 2023
acf4529
Allow Egg Move transfer for non-eggs
Bassoonian Apr 30, 2023
21fa91b
Add ClearHatchedEggMoves per SBird's suggestion
Bassoonian Apr 30, 2023
8f75844
Add Ability inheritance
Bassoonian Apr 30, 2023
62ca66b
Refactoring Battle Form changes into the form change tables (#2411)
ghoulslash Apr 30, 2023
dc36872
remove stupidity
u8-Salem Apr 30, 2023
176c675
Set new animations as default (#2964)
AlexOn1ine Apr 30, 2023
2d6282f
Fix for Burn Up/Double Shock (#2962)
AlexOn1ine Apr 30, 2023
47cd903
update dire hit failing comment
u8-Salem Apr 30, 2023
f1d60a4
Fixed wrong generation in check
Bassoonian Apr 30, 2023
772c504
remove identifier strings
u8-Salem Apr 30, 2023
32e63d8
Don't copy opponent personality when swapping mon sprite during Mega …
Ultimate-Bob May 1, 2023
8e5347b
Fix mapjson misreporting errors when processing map_groups.json
GriffinRichards Apr 21, 2023
39b50d0
Add missing CanGetFrostbite
Bassoonian May 1, 2023
dd96ac0
Add Comatose check to AI "can be Xed" status checks
Bassoonian May 1, 2023
8cce130
Add Frostbite status (#2942)
ghoulslash May 1, 2023
445e9c4
merge w upcoming
May 1, 2023
15ce9eb
fix dire hit message mismatch
u8-Salem May 1, 2023
bdd0195
add mirror herb tests
May 1, 2023
3652e82
Apply suggestions from code review
ghoulslash May 1, 2023
63c2e8a
small mirror herb test synta fix
May 1, 2023
52cc3bb
add some snow related tests
u8-Salem May 2, 2023
d6f1510
remove duplicate stringIDs
u8-Salem May 2, 2023
76721b1
add snow weather
u8-Salem Apr 29, 2023
0bf9294
spelling
u8-Salem Apr 30, 2023
c6fbde6
remove stupidity
u8-Salem Apr 30, 2023
6758f6e
add some snow related tests
u8-Salem May 2, 2023
f6e80b0
Merge branch 'RHH/content/gen9SnowWeather' of https://github.com/Call…
u8-Salem May 2, 2023
c32d5f4
fix rebase issues
u8-Salem May 2, 2023
095422c
small ai logic fix
u8-Salem May 2, 2023
ae2d5f7
Weather related Ability tests, fix for Leaf Guard not preventing Rest…
ShaeTsuPog May 2, 2023
dd43d62
Fixes Triple Dive effect (#2947)
AlexOn1ine May 2, 2023
c5a73f5
ad suggested changes
u8-Salem May 2, 2023
a877266
Merge branch 'upcoming' into RHH/content/gen9SnowWeather
u8-Salem May 2, 2023
957ee36
Fix for Ceaseless Edge/Axe Kick visual glitch (#2969)
AlexOn1ine May 2, 2023
1068ec5
Fix Plus/Minus to only work with special moves
Bassoonian May 3, 2023
069627a
Hydra OSX support
Bassoonian May 3, 2023
74f074f
ai scoring for snow and hail relation
u8-Salem May 3, 2023
3a82994
Hydra OSX support (#2975)
mrgriffin May 3, 2023
ef348e7
Fix Plus/Minus to only work with special moves (#2974)
ghoulslash May 3, 2023
eb5b816
refactored snow into damaging weather
u8-Salem May 4, 2023
a5f28af
fixed Forecast and Flower Gift
AgustinGDLV May 5, 2023
f91abdf
Merge pull request #1882 from GriffinRichards/ambient
GriffinRichards May 5, 2023
dd65edd
Merge pull request #1883 from GriffinRichards/doc-mod
GriffinRichards May 5, 2023
488cc41
update ability descriptions
u8-Salem May 5, 2023
7e7384e
tiny test doc fix
u8-Salem May 6, 2023
bffa181
Fix incorrect HP_BAR documentation (#2982)
mrgriffin May 6, 2023
4244551
Battle Item Tests + critical fixes + new test macro (#2940)
AsparagusEduardo May 7, 2023
84aed50
Manually port daycare expansion to modern standards (#2963)
AsparagusEduardo May 7, 2023
c530eb2
Add mirror herb (#2873)
AsparagusEduardo May 7, 2023
220b60f
Detect memory leaks in tests (#2698)
AsparagusEduardo May 7, 2023
3cee3b1
Fix healthbox reappearing from B_ANIM_SWITCH_OUT_OPPONENT_MON (#2849)
AsparagusEduardo May 7, 2023
e0bed67
INVALID if FINALLY without PARAMETRIZE
mrgriffin Apr 26, 2023
9cd13cc
Fix USE_ITEM explicit targets
mrgriffin Apr 20, 2023
29fa6ba
INVALID if PASSES_RANDOMLY and results
mrgriffin Apr 26, 2023
efab893
INVALID if results without PARAMETRIZE
mrgriffin Apr 26, 2023
a2ca2aa
Report errors in estimateCost
mrgriffin Apr 27, 2023
e52e8ce
Cleanup Compound Eyes tests
mrgriffin May 7, 2023
b6722ad
Detect more invalid test cases (#2955)
AsparagusEduardo May 7, 2023
fe5e59c
Merge branch 'upcoming' into RHH/content/gen9SnowWeather
u8-Salem May 7, 2023
9081f74
Add Snow Battle Weather (#2970)
AsparagusEduardo May 8, 2023
ebc8edd
Fix shiny animation not respecting illusion mon.
Ultimate-Bob May 8, 2023
f985eef
Show Imposter abilty in popup instead of opponent's ability.
Ultimate-Bob May 8, 2023
64c2eb3
Ignore Illusion if the pokemon is the last slot in the party.
Ultimate-Bob May 8, 2023
1497719
Merge pull request #1884 from GriffinRichards/mapjson-err
GriffinRichards May 9, 2023
8b37b42
Document DrawFootprint
GriffinRichards May 10, 2023
41ac28b
Index pokemon footprint pngs
GriffinRichards May 10, 2023
8c537cc
Colorize bag select button
GriffinRichards May 10, 2023
8fc4aa9
Remove duplicate CanBePoisoned condition (#2988)
u8-Salem May 10, 2023
6fdf75b
Support plain pixel conversion, convert spinda spots to .png
GriffinRichards May 10, 2023
c05404e
Merge branch 'master' of https://github.com/pret/pokeemerald into rhh…
Bassoonian May 12, 2023
292d460
Fix ability select in debug givemon
Bassoonian May 12, 2023
a89288e
Fix Illumise pallete (#2995)
AaghatIsLive May 12, 2023
d71465d
Fix ability select in debug givemon (#2999)
ghoulslash May 12, 2023
d09072f
Updated Esper Wing's accuracy if B_UPDATED_MOVE_DATA is Gen9 (#3004)
fdeblasio May 14, 2023
15adbc8
Pret merge Friday (#2998)
AsparagusEduardo May 14, 2023
f6f0e5f
Fix for wrong mon position for scripted wild doubles (#2996)
AlexOn1ine May 14, 2023
2420134
Updated Ability Patch for Gen 9 functionality (#2989)
fdeblasio May 14, 2023
7637966
Fixed mons mot disobeying with Gen8 mechanics disabled (#2990)
SubzeroEclipse May 15, 2023
447739d
Fix shiny animation not respecting Illusion mon target and Imposter r…
AsparagusEduardo May 15, 2023
2aca823
Merge branch 'upcoming' into mega_evo_issues
AsparagusEduardo May 15, 2023
c42552a
Fix Mega Evolution issues related to battlers and turn order (#2810)
AsparagusEduardo May 15, 2023
60710f8
merge w upcoming
May 15, 2023
6458cab
use NATIVE_ARGS in various to callnative conversions
May 15, 2023
eaa44cc
fix syntax
May 15, 2023
15b122b
convert a few various to callnatives (#2465)
AsparagusEduardo May 15, 2023
49a9210
Fixed typo in include/config/battle.h
LOuroboros May 15, 2023
7c8332e
Fixed typo in include/config/battle.h (#3006)
LOuroboros May 15, 2023
37874fe
fixed revival blessing failure still showing anim (#3010)
AgustinGDLV May 16, 2023
0c18234
reworked weather form reversion + added more tests
AgustinGDLV May 16, 2023
785b100
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
AgustinGDLV May 16, 2023
b269cc6
changed gastro acid check to properly use GetBattlerAbility
AgustinGDLV May 16, 2023
7b08713
changed B_WEATHER_FORM_SUPPRESS config to preproc
AgustinGDLV May 17, 2023
d22efc9
fixed UB with unassigned variable
AgustinGDLV May 17, 2023
7a97569
Fixed testrunner UB with RandomElement. (#3013)
mrgriffin May 17, 2023
487415e
Move direct statStage boosts to use statbuffchange (#3000)
ghoulslash May 17, 2023
29d2d42
Evolution updates (#3009)
LOuroboros May 18, 2023
9506b20
Changed 999999 in MaxMoney to MAX_MONEY constant (#3015)
pkmnsnfrn May 20, 2023
a0881b8
Terrains freeze the game after player mon faints (#3016)
AlexOn1ine May 20, 2023
580a09e
Updated DebugAction_Util_CheckSaveBlock
LOuroboros May 20, 2023
17b445a
Updated DebugAction_Util_CheckSaveBlock (#3017)
ghoulslash May 20, 2023
109b4c4
Small clean up: EndTurnTerrain, BattleScript_GrassyTerrainHeals (#3018)
AlexOn1ine May 20, 2023
12022fa
Gen 4-6 Pokemon Back anims (#2954)
SonikkuA-DatH May 20, 2023
f979013
Disable Gen8+ Obedience Mechanics by default (#2980)
AsparagusEduardo May 21, 2023
2abf1c5
Use AI_PARTY->mons in SetBattlerData
AlexOn1ine May 12, 2023
0ac203f
Use AI_PARTY->mons in SetBattlerData (#2986)
ghoulslash May 22, 2023
d4c7e5e
changed B_WEATHER_FORM preproc to affect tables instead of function
AgustinGDLV May 23, 2023
34382fc
fixed revive in 1v2 battles
AgustinGDLV May 23, 2023
a9a3265
fixed player not being able to cancel partner action after item
AgustinGDLV May 23, 2023
bb10b0d
fixed GetBattlerSide, removed debug script
AgustinGDLV May 23, 2023
6a92caa
removed old B_WEATHER_FORMS use, tests now have assumptions for config
AgustinGDLV May 23, 2023
5a8715e
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
AgustinGDLV May 23, 2023
5061927
Fixed Forecast and Flower Gift (#2978)
AsparagusEduardo May 23, 2023
b972199
Battle Item Refactor Fixes (#3022)
AsparagusEduardo May 24, 2023
84d9cd0
Fixed compile issue when disabling overworld debug menu (#3024)
AsparagusEduardo May 24, 2023
de2d864
Fixed Mimikyu's Disguise not breaking
AsparagusEduardo May 24, 2023
14f7e49
Add some missing palette macro use
GriffinRichards May 23, 2023
05895c5
Fixed Frostbite icon appearing in AI Pary menu for mon without ailment
AsparagusEduardo May 21, 2023
c3527dc
Fixed Throat Spray's description
AsparagusEduardo May 26, 2023
d0e6ea7
Optimized battle gender checks (#3020)
AsparagusEduardo May 27, 2023
a929ae8
Replace launchtemplate and launchtask in battle anims (#2640)
ghoulslash May 27, 2023
890d004
Merge pull request #1886 from GriffinRichards/1bpp
GriffinRichards May 28, 2023
7edd1a4
restore items in wild battles
AlexOn1ine May 28, 2023
112636b
Fix Speed Boost animation
AlexOn1ine May 28, 2023
3ce5694
Fixes Speed Boost animation (#3033)
ghoulslash May 28, 2023
c38b51c
Fixed Throat Spray's description (#3027)
ghoulslash May 28, 2023
4cef991
restore items in wild battles (#3031)
ghoulslash May 28, 2023
5100eef
Merge pull request #1890 from GriffinRichards/pal-macro
GriffinRichards May 28, 2023
5a384f9
Fixes Triple Kick effect and Z move damage calc
AlexOn1ine May 7, 2023
837e2fb
Merge branch 'RHH/master' into RHH/pr/version/1.5.0
AsparagusEduardo May 30, 2023
2e08277
Fixes Triple Kick effect and Z move damage calc (#2983)
BuffelSaft May 31, 2023
412f6f5
Separate build directory for tests and TESTING define (#3002)
mrgriffin May 31, 2023
23b5705
Fix some compressed tilemaps
GriffinRichards Jun 1, 2023
4c57b84
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_2023…
AsparagusEduardo Jun 2, 2023
5bf040f
Missing pret improvement that was causing unmatching
AsparagusEduardo Jun 2, 2023
271bca6
Fixed Staraptor using Staravia's footprint
AsparagusEduardo Jun 2, 2023
43da48f
`CpuFastFill` for initializing, thanks SBird
AsparagusEduardo Jun 2, 2023
a1a49ce
One point five baby (pret merge 2023/06/02) (#3044)
AsparagusEduardo Jun 2, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 10 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
## Description
<!--- Describe your changes in detail -->

## Images
<!-- Please provide with relevant GIFs or images to make it easier for reviewers to accept your PR quicker.-->
<!-- If it doesn't apply, feel free to remove this section. -->

## Issue(s) that this PR fixes
<!-- Format: "Fixes #2345, fixes #4523, fixes #2222." -->
<!-- If it doesn't apply, feel free to remove this section. -->

## **Discord contact info**
<!--- formatted as name#numbers, e.g. PikalaxALT#5823 -->
<!--- Contributors must join https://discord.gg/d5dubZ3 -->
<!--- formatted as name#numbers, e.g. Lunos#4026 -->
<!--- Contributors must join https://discord.gg/6CzjAG6GZk -->
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ jobs:
run: make -j${nproc} -O all

- name: Test
env:
TEST: 1
run: |
make -j${nproc} -O pokeemerald-test.elf
make -j${nproc} check
35 changes: 27 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,16 @@ GAME_CODE := BPEE
MAKER_CODE := 01
REVISION := 0
MODERN ?= 0
TEST ?= 0

ifeq (modern,$(MAKECMDGOALS))
MODERN := 1
endif

ifeq (check,$(MAKECMDGOALS))
TEST := 1
endif

# use arm-none-eabi-cpp for macOS
# as macOS's default compiler is clang
# and clang's preprocessor will warn on \u
Expand Down Expand Up @@ -79,6 +84,7 @@ ELF = $(ROM:.gba=.elf)
MAP = $(ROM:.gba=.map)
SYM = $(ROM:.gba=.sym)

TEST_OBJ_DIR_NAME := build/test
TESTELF = $(ROM:.gba=-test.elf)
HEADLESSELF = $(ROM:.gba=-test-headless.elf)

Expand Down Expand Up @@ -119,7 +125,15 @@ LIBPATH := -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libgcc.a)
LIB := $(LIBPATH) -lc -lnosys -lgcc -L../../libagbsyscall -lagbsyscall
endif

CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN)
ifeq ($(TESTELF),$(MAKECMDGOALS))
TEST := 1
endif

ifeq ($(TEST),1)
OBJ_DIR := $(TEST_OBJ_DIR_NAME)
endif

CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN) -DTESTING=$(TEST)
ifneq ($(MODERN),1)
CPPFLAGS += -I tools/agbcc/include -I tools/agbcc -nostdinc -undef
endif
Expand All @@ -142,6 +156,7 @@ ROMTESTHYDRA := tools/mgba-rom-test-hydra/mgba-rom-test-hydra$(EXE)

PERL := perl

# Inclusive list. If you don't want a tool to be built, don't add it here.
TOOLDIRS := tools/aif2pcm tools/bin2c tools/gbafix tools/gbagfx tools/jsonproc tools/mapjson tools/mid2agb tools/preproc tools/ramscrgen tools/rsfont tools/scaninc
CHECKTOOLDIRS = tools/patchelf tools/mgba-rom-test-hydra
TOOLBASE = $(TOOLDIRS:tools/%=%)
Expand All @@ -167,7 +182,7 @@ infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst
# Disable dependency scanning for clean/tidy/tools
# Use a separate minimal makefile for speed
# Since we don't need to reload most of this makefile
ifeq (,$(filter-out all rom compare modern check libagbsyscall syms,$(MAKECMDGOALS)))
ifeq (,$(filter-out all rom compare modern check libagbsyscall syms $(TESTELF),$(MAKECMDGOALS)))
$(call infoshell, $(MAKE) -f make_tools.mk)
else
NODEP ?= 1
Expand All @@ -177,9 +192,9 @@ endif
ifeq (,$(MAKECMDGOALS))
SCAN_DEPS ?= 1
else
# clean, tidy, tools, check-tools, mostlyclean, clean-tools, clean-check-tools, $(TOOLDIRS), $(CHECKTOOLDIRS), tidymodern, tidynonmodern don't even build the ROM
# clean, tidy, tools, check-tools, mostlyclean, clean-tools, clean-check-tools, $(TOOLDIRS), $(CHECKTOOLDIRS), tidymodern, tidynonmodern, tidycheck don't even build the ROM
# libagbsyscall does its own thing
ifeq (,$(filter-out clean tidy tools mostlyclean clean-tools $(TOOLDIRS) clean-check-tools $(CHECKTOOLDIRS) tidymodern tidynonmodern libagbsyscall,$(MAKECMDGOALS)))
ifeq (,$(filter-out clean tidy tools mostlyclean clean-tools $(TOOLDIRS) clean-check-tools $(CHECKTOOLDIRS) tidymodern tidynonmodern tidycheck libagbsyscall,$(MAKECMDGOALS)))
SCAN_DEPS ?= 0
else
SCAN_DEPS ?= 1
Expand Down Expand Up @@ -256,7 +271,7 @@ clean-tools:
clean-check-tools:
@$(foreach tooldir,$(CHECKTOOLDIRS),$(MAKE) clean -C $(tooldir);)

mostlyclean: tidynonmodern tidymodern
mostlyclean: tidynonmodern tidymodern tidycheck
rm -f $(SAMPLE_SUBDIR)/*.bin
rm -f $(CRY_SUBDIR)/*.bin
rm -f $(MID_SUBDIR)/*.s
Expand All @@ -267,7 +282,7 @@ mostlyclean: tidynonmodern tidymodern
rm -f $(AUTO_GEN_TARGETS)
@$(MAKE) clean -C libagbsyscall

tidy: tidynonmodern tidymodern
tidy: tidynonmodern tidymodern tidycheck

tidynonmodern:
rm -f $(ROM_NAME) $(ELF_NAME) $(MAP_NAME)
Expand All @@ -277,6 +292,10 @@ tidymodern:
rm -f $(MODERN_ROM_NAME) $(MODERN_ELF_NAME) $(MODERN_MAP_NAME)
rm -rf $(MODERN_OBJ_DIR_NAME)

tidycheck:
rm -f $(TESTELF) $(HEADLESSELF)
rm -rf $(TEST_OBJ_DIR_NAME)

ifneq ($(MODERN),0)
$(C_BUILDDIR)/berry_crush.o: override CFLAGS += -Wno-address-of-packed-member
endif
Expand Down Expand Up @@ -464,7 +483,7 @@ LD_SCRIPT_TEST := ld_script_test.txt
$(OBJ_DIR)/ld_script_test.ld: $(LD_SCRIPT_TEST) $(LD_SCRIPT_DEPS)
cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT_TEST) > ld_script_test.ld

$(TESTELF): $(OBJ_DIR)/ld_script_test.ld $(OBJS) $(TEST_OBJS) libagbsyscall check-tools
$(TESTELF): $(OBJ_DIR)/ld_script_test.ld $(OBJS) $(TEST_OBJS) libagbsyscall tools check-tools
@echo "cd $(OBJ_DIR) && $(LD) -T ld_script_test.ld -o ../../$@ <objects> <test-objects> <lib>"
@cd $(OBJ_DIR) && $(LD) $(TESTLDFLAGS) -T ld_script_test.ld -o ../../$@ $(OBJS_REL) $(TEST_OBJS_REL) $(LIB)
$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
Expand All @@ -479,7 +498,7 @@ endif
check: $(TESTELF)
@cp $< $(HEADLESSELF)
$(PATCHELF) $(HEADLESSELF) gTestRunnerHeadless '\x01' gTestRunnerSkipIsFail "$(TEST_SKIP_IS_FAIL)"
$(ROMTESTHYDRA) $(ROMTEST) $(HEADLESSELF)
$(ROMTESTHYDRA) $(ROMTEST) $(OBJCOPY) $(HEADLESSELF)

libagbsyscall:
@$(MAKE) -C libagbsyscall TOOLCHAIN=$(TOOLCHAIN) MODERN=$(MODERN)
Expand Down
60 changes: 3 additions & 57 deletions asm/macros/battle_anim_script.inc
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
.macro stopsound
.byte 0x2f
.endm

@ same as createvisualtask except takes in battlerargindex, which is the battle anim arg index of the battler to loop through
.macro createvisualtaskontargets addr:req, priority:req, battlerargindex:req, argv:vararg
.byte 0x30
Expand All @@ -282,7 +282,7 @@
.2byte \argv
.Lcreatetask_\@_2:
.endm

@ same as createsprite except takes in battlerargindex, which is the battle anim arg index of the battler to loop through
.macro createspriteontargets template:req, anim_battler:req, subpriority_offset:req, battlerargindex:req, argv:vararg
.byte 0x31
Expand All @@ -298,7 +298,7 @@
.2byte \argv
.Lsprite_\@_2:
.endm

@ does not overwrite gBattleAnimArgs[battlerargindex], some sprite templates are too dependent on the value (e.g. heal block)
.macro createspriteontargets_onpos template:req, anim_battler:req, subpriority_offset:req, battlerargindex:req, argv:vararg
.byte 0x32
Expand Down Expand Up @@ -332,57 +332,3 @@
createvisualtask AnimTask_IsDoubleBattle, 0
jumprettrue \ptr
.endm

@ keep CFRU macros cause I'm lazy. todo: update to createsprite and createvisualtask, respectively
.macro launchtemplate launchtemplatePtr launchtemplatePriority launchtemplateArgsNo launchtemplatearg0 launchtemplatearg1 launchtemplatearg2 launchtemplatearg3 launchtemplatearg4 launchtemplatearg5 launchtemplatearg6 launchtemplatearg7 launchtemplatearg8
.byte 0x2
.word \launchtemplatePtr
.byte \launchtemplatePriority
.byte \launchtemplateArgsNo
.hword \launchtemplatearg0
.hword \launchtemplatearg1
.hword \launchtemplatearg2
.hword \launchtemplatearg3
.hword \launchtemplatearg4
.hword \launchtemplatearg5
.hword \launchtemplatearg6
.hword \launchtemplatearg7
.hword \launchtemplatearg8
.endm

.macro launchtask launchtaskPtr launchtaskPriority launchtaskArgsNo launchtaskarg0 launchtaskarg1 launchtaskarg2 launchtaskarg3 launchtaskarg4 launchtaskarg5 launchtaskarg6 launchtaskarg7 launchtaskarg8
.byte 0x3
.word \launchtaskPtr
.byte \launchtaskPriority
.byte \launchtaskArgsNo
.hword \launchtaskarg0
.hword \launchtaskarg1
.hword \launchtaskarg2
.hword \launchtaskarg3
.hword \launchtaskarg4
.hword \launchtaskarg5
.hword \launchtaskarg6
.hword \launchtaskarg7
.hword \launchtaskarg8
.endm

.macro setblends setblends_value
.byte 0xC
.hword \setblends_value
.endm

.macro launchsoundtask launchsoundtaskPtr launchsoundtaskArgsNo launchsoundtaskarg0 launchsoundtaskarg1 launchsoundtaskarg2 launchsoundtaskarg3 launchsoundtaskarg4 launchsoundtaskarg5 launchsoundtaskarg6 launchsoundtaskarg7 launchsoundtaskarg8
.byte 0x1F
.word \launchsoundtaskPtr
.byte \launchsoundtaskArgsNo
.hword \launchsoundtaskarg0
.hword \launchsoundtaskarg1
.hword \launchsoundtaskarg2
.hword \launchsoundtaskarg3
.hword \launchsoundtaskarg4
.hword \launchsoundtaskarg5
.hword \launchsoundtaskarg6
.hword \launchsoundtaskarg7
.hword \launchsoundtaskarg8
.endm

Loading