SiliconA-Z
d024f47680
Merge 47a66381ba into a3c551fe21
2026-04-23 14:33:20 -04:00
Martin Griffin
a3c551fe21
Merge pull request #2238 from SiliconA-Z/patch-1
...
CI / build (push) Has been cancelled
Add gBattleOutcome == B_OUTCOME_DREW to bugfix
2026-04-23 17:48:59 +01:00
Martin Griffin
e178c18bf4
Merge pull request #2277 from SiliconA-Z/stray
...
CI / build (push) Has been cancelled
Remove stray dereference in union room chat
2026-04-21 16:40:32 +01:00
Martin Griffin
af8e0b2516
Merge pull request #2264 from SiliconA-Z/modulo
...
Fix fakematchings regarding modulo
2026-04-21 16:32:20 +01:00
Martin Griffin
f9173995c1
Merge pull request #2261 from SiliconA-Z/assertion
...
Fix fakematch in AllocateBattleResources
2026-04-21 16:31:00 +01:00
Martin Griffin
619c4a3245
Merge pull request #2258 from SiliconA-Z/DynamicPlaceholderTextUtil_Reset
...
Fix fakematch in DynamicPlaceholderTextUtil_Reset
2026-04-21 16:29:27 +01:00
Martin Griffin
98ed1a6e6e
Merge pull request #2140 from AsparagusEduardo/_pret/BtlController_EmitTwoReturnValues
...
`BtlController_EmitTwoReturnValues` cleanup
2026-04-21 16:01:35 +01:00
Martin Griffin
c314cc1e52
Merge pull request #2231 from GriffinRichards/match-call-rematch
...
Document gym leader match call texts
2026-04-21 15:57:49 +01:00
Martin Griffin
1dcb9c75b9
Merge pull request #2212 from Mitsunee/ismondisobedient-enum
...
Added enum for IsMonDisobedient
2026-04-21 15:57:06 +01:00
Martin Griffin
89ca861a3a
Merge pull request #2200 from mrgriffin/pret-implicit-waitstate
...
Implicit waitstate for special/specialvars
2026-04-21 15:54:10 +01:00
Raymond Dodge
a09b745176
Extract GiveGiftRibbonToParty from file about size records ( #2240 )
2026-04-21 15:52:51 +01:00
Raymond Dodge
31552457e0
Merge pull request #2241 from rayrobdod/compare_size_return_names
...
Name values used by CompareMonSize
2026-04-21 15:52:36 +01:00
Eduardo Quezada
288f7e4a3a
Merge pull request #2236 from AsparagusEduardo/_pret/pr/smolIgnore
...
Add smol artifacts and tools to .gitignore
2026-04-21 15:51:25 +01:00
Martin Griffin
2f46a89b15
Merge pull request #2283 from mrgriffin/pret-incgfx
...
CI / build (push) Has been cancelled
INCGFX: in-source arguments for gbagfx
2026-04-19 09:28:43 +01:00
Martin Griffin
fed3b0c81a
Migrate INCBINs to INCGFX via migrate_incgfx.py
...
The exact command used to migrate source files was:
git ls-files | grep 'src/.*\.[ch]$' | xargs grep -l INCBIN | xargs python3 migrate_incgfx.py
The Makefile rules were cleaned up manually by looking for graphics
rules and keeping only those ending with '\' (what the migration script
calls a "Multi-line rule"). You may think some of wallpaper rules could
be removed, but they're inputs for the '@cat $^ >$@' rules which are
currently unable to be migrated to 'INCGFX'.
2026-04-19 07:06:18 +01:00
Martin Griffin
df02d49e9b
INCGFX: in-source arguments for gbagfx
...
'INCGFX' is like 'INCBIN' except that it specifies the arguments to pass
to 'gbagfx' which alleviates the user-unfriendliness caused by catch-all
rules.
Specifically, users frequently forget to add to 'spritesheet_rules.mk'
when adding object event graphics, and then the built '.4bpp' file is
not invalidated when the add their rule so they have to 'touch' the
source file or similar.
The built artifacts are placed in 'build/assets'.
2026-04-19 07:06:17 +01:00
Martin Griffin
84e8d23425
Remove INCBIN_S*
...
The signed INCBINs are unused, I assume they were once for audio data
but that is handled in assembly now.
2026-04-19 07:06:17 +01:00
SiliconA-Z
47a66381ba
Fix
2026-04-09 23:37:07 -04:00
Marcus Huderle
962442a51e
Implement remaining MEMACC commands ( #2281 )
...
CI / build (push) Has been cancelled
* Implement remaining MEMACC commands
* Remove unnecessary memacc cases
2026-04-08 18:53:33 -05:00
Martin Griffin
041ff613ca
Generate '.d' files for 'maps.s' and 'map_events.s' ( #2279 )
...
CI / build (push) Has been cancelled
Previously, 'data/maps.o' and 'data/map_events.o' were not rebuilt if
any of the header files they '#include' are modified. You can verify
this via 'make' with something like:
$ make -n -W include/constants/songs.h | grep maps.o
which shows that 'data/maps.o' is not rebuilt. Or by modifying a header
included in 'data/maps.s' in a way that should break assembling it (e.g.
by removing a '#define' that is only used in 'data/maps.s').
Additionally, fixes a bug in Expansion from an interaction between
'preproc -e' generating (global) symbols and those symbols being
generated for multiple object files, and thus falling out of sync
between (e.g.) 'data/map_events.o' and 'data/event_scripts.o', resulting
in an unhelpful multiple definition error from the linker like:
arm-none-eabi-ld: data/map_events.o: in function `ITEM_TM01':
(*ABS*+0x247): multiple definition of `ITEM_TM01'
2026-04-07 09:03:44 -05:00
AZero13
81c92f708e
Remove stray dereference in union room chat
2026-04-05 19:24:50 -04:00
AZero13
9e97dbdc4b
Fix clang warnings and fakematches in palette_util
2026-04-05 19:18:55 -04:00
AZero13
897c70415a
Fix fakematchings regarding modulo
...
This is because agbcc can expand it to weird things sometimes, which is not ideal.
2026-04-05 15:38:36 -04:00
Martin Griffin
30185ea16b
Merge pull request #2272 from SiliconA-Z/fix-broken-missing-return
...
CI / build (push) Has been cancelled
Fix broken missing return.
2026-04-05 07:01:33 +01:00
AZero13
04feeffeda
Fix broken missing return.
...
We forgot the return here, but we need it or else it is UB.
2026-04-04 23:56:25 -04:00
AZero13
8502e08bd8
Update battle_util2.c
2026-03-28 17:52:29 -04:00
AZero13
e82d0df9ad
Fix fakematch in DynamicPlaceholderTextUtil_Reset
...
From pokefirered
2026-03-28 15:31:47 -04:00
SiliconA-Z
61674ecd4b
Remove ... INT_MAX from bg.c ( #2255 )
...
CI / build (push) Has been cancelled
Serves no purpose and is annoying
2026-03-26 07:00:08 +00:00
Estellar
efc1514128
Add C23's %b to DebugPrintf ( #2246 )
CI / build (push) Has been cancelled
2026-03-22 21:24:19 +00:00
AZero13
efe893388a
Add gBattleOutcome == B_OUTCOME_DREW to bugfix
...
Mirroring the change that Nintendo made when rereleasing FRLG on Switch, which addresses the Roamer BUG, they also added a check for B_OUTCOME_DREW.
2026-03-22 17:13:36 -04:00
Marcus Huderle
01677393e2
Use -E for all midis
CI / build (push) Waiting to run
2026-03-21 10:14:58 -05:00
Marcus Huderle
d731ae90d8
Convert last 3 .s files to .midi
CI / build (push) Waiting to run
2026-03-21 09:35:45 -05:00
Marcus Huderle
1b35dd881e
Convert almost all remaining sound .s files to .midi
CI / build (push) Waiting to run
2026-03-20 20:33:31 -05:00
Marky
25ffb2c12c
Add enum for Elevations ( #2233 )
CI / build (push) Has been cancelled
2026-02-20 01:17:42 -05:00
Kildemal
86a159a1eb
chore(linker): add dwarf5 line number section to ld script ( #2235 )
CI / build (push) Has been cancelled
2026-02-15 15:03:12 +00:00
Frank DeBlasio
064ca5c243
Added macro for Surf/Muddy Water's animation ( #2232 )
CI / build (push) Has been cancelled
2026-02-06 10:08:20 -05:00
GriffinR
926488b69a
Document gym leader match call texts
2026-02-01 13:36:33 -05:00
GriffinR
63390a940e
Merge pull request #2226 from fdeblasio/matchCallDocumentation
...
CI / build (push) Has been cancelled
Improved Match Call text variables
2026-02-01 13:16:34 -05:00
hedara90
f9c826ca57
Merge pull request #2228 from hedara90/fix-spaces
...
CI / build (push) Has been cancelled
Fix spaces instead of tabs in battle_anim_scripts.s
2026-01-20 11:13:48 +00:00
Martin Griffin
f0b5abe290
Merge pull request #2070 from mrgriffin/battle-anim-cmd-args
...
Partially document battle animation scripts
2026-01-19 19:14:16 +00:00
GriffinR
dc077e50d3
Merge pull request #2225 from fdeblasio/stadiumRenames
...
Renamed building and stadium palettes to be more accurate
2026-01-19 10:51:21 -05:00
Martin Griffin
22eed3f4bf
Partially document battle_anim_effects_1.c
2026-01-19 09:16:37 +00:00
Martin Griffin
0e415dde46
Document battle_anim_dragon.c
2026-01-19 09:16:37 +00:00
Martin Griffin
5d713ad9bb
Document battle_anim_dark.c
2026-01-19 09:16:37 +00:00
Martin Griffin
050a9415c7
Document battle_anim_bug.c
2026-01-19 09:16:37 +00:00
Martin Griffin
e09423fadf
Document battle_anim_normal.c
2026-01-19 09:16:37 +00:00
Frank
80db2c6aec
Renamed building and stadium palettes to be more accurate
2026-01-18 18:19:03 -05:00
Frank
902a37ef23
Added MATCH_CALL_TEXT_END define
2026-01-18 18:18:28 -05:00
Frank
294a1b88a2
Replaced two more instances of flag
2026-01-18 18:18:28 -05:00
Frank
509f652ac6
Added defines for 0xFFFF
2026-01-18 18:18:28 -05:00