GriffinR
5be69b2713
Merge slot machine smoke SubspriteTable arrays
2024-01-30 11:46:19 -05:00
GriffinR
232eab4bee
Merge pull request #1975 from Sierraffinity/jsonproc-fix
...
jsonproc: filter out every non-alphanumeric character
2024-01-28 13:54:11 -05:00
GriffinR
f2276e14a2
Merge pull request #1976 from SBird1337/ld/malloc
...
fix(linking): link gflib/malloc.c at top of EWRAM in ld_script_modern.ld
2024-01-28 13:39:49 -05:00
sbird
e2eca97b02
fix(linking): link gflib/malloc.c at top of EWRAM in ld_script_modern.ld
2024-01-28 12:40:48 +01:00
Sierraffinity
b98e044ce9
jsonproc: filter out every non-alphanumeric character
2024-01-27 19:29:29 -08:00
GriffinR
5e47049b3c
Merge pull request #1974 from Sierraffinity/gbagfx-fix
...
gbagfx bit depth upconversion fix
2024-01-27 17:44:44 -05:00
Sierraffinity
e85750bb55
gbagfx bit depth upconversion fix
2024-01-27 14:29:31 -08:00
GriffinR
bcd5fc1481
Merge pull request #1972 from GriffinRichards/metatile-labels
...
Remove non-existent tilesets from label comments and alphabetize
2024-01-19 10:44:29 -05:00
GriffinR
1eadbc39da
Merge pull request #1973 from AsparagusEduardo/_pret/pr2/braces
...
Fixed braces style
2024-01-19 10:40:25 -05:00
Eduardo Quezada
8cab1b7094
Fixed braces style
2024-01-18 17:07:17 -03:00
GriffinR
8e8d2f5efa
Remove non-existent tilesets from label comments and alphabetize
2024-01-18 14:31:04 -05:00
GriffinR
6c96641035
Merge pull request #1969 from Kurausukun/macros
...
Safeguard SQUARE and CUBE Macro Arguments in Parentheses
2023-12-27 17:39:37 -05:00
Kurausukun
7567b0a57a
safeguard SQUARE and CUBE macro arguments in parentheses
2023-12-27 17:29:35 -05:00
GriffinR
6385f0426d
Merge pull request #1968 from Jaizu/patch-5
...
Missing constant
2023-12-20 09:03:35 -05:00
Jaizu
027dccfc95
Missing constant
2023-12-20 12:24:52 +01:00
GriffinR
0e10fc3ca5
Merge pull request #1966 from Bassoonian/pokeacutemonpret
...
Clean up pokemon/ball/dex mentions in comments
2023-12-13 13:30:32 -05:00
Bassoonian
f8a4cf9d85
Update pokedex.c
2023-12-13 09:52:04 +01:00
Bassoonian
6365431122
Add PokéNav too
2023-12-12 23:20:22 +01:00
Bassoonian
bc2a745171
Fix accidental symbol replacements
2023-12-12 23:18:35 +01:00
Bassoonian
e5ac2fe0b1
Clean up pokemon/ball/dex mentions in comments
2023-12-12 19:02:36 +01:00
GriffinR
e4149e83f8
Merge pull request #1962 from LOuroboros/patch-1
...
Updated the size of the struct InGameTrade's otName variable
2023-12-02 10:44:31 -05:00
LOuroboros
05708ace88
Updated the size of the struct InGameTrade's otName variable
2023-12-02 12:11:22 -03:00
GriffinR
15e1cd81a7
Merge pull request #1952 from Icedude907/build-linkerscript
...
[Build System Rewrite] Linkerscript now tracks RAM/ROM usage
2023-11-23 17:01:29 -05:00
Icedude907
e5ac2a103e
Incorporate review changes
2023-11-24 10:25:39 +13:00
GriffinR
2db9ab2a2f
Document camera sprite functions
2023-11-22 13:52:56 -05:00
GriffinR
b302291bd3
Merge pull request #1953 from Icedude907/move-files
...
Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin
2023-11-20 12:27:05 -05:00
GriffinR
758f7446f0
Merge pull request #1959 from SnorlaxMonster/master
...
Rename HITMARKER_IGNORE_SAFEGUARD
2023-11-18 08:43:44 -05:00
SnorlaxMonster
190e77e9c8
Rename HITMARKER_IGNORE_SAFEGUARD
...
Rename HITMARKER_IGNORE_SAFEGUARD to HITMARKER_STATUS_ABILITY_EFFECT.
This flag is used exclusively by status-inflicting Abilities,
and has 3 main functions:
- Whether the effect bypasses Shield Dust
- Whether the effect bypasses Safeguard
- Which text string to display when the status condition is inflicted
(i.e. whether it was inflicted by a move or Ability)
I believe this new name better represents what the flag actually does.
This name was structured to parallel HITMARKER_SYNCHRONISE_EFFECT.
2023-11-18 13:57:50 +11:00
Icedude907
5e4e522d92
.cfg
edits now rebuild .mid
2023-11-15 17:33:25 +13:00
Icedude907
cf1eaea7f7
Coalesced audio rules into audio.mk
2023-11-15 13:36:35 +13:00
Icedude907
85f4ca6943
All mid2agb
songs are controlled by a midi.cfg
file
2023-11-15 13:26:49 +13:00
Icedude907
4b2054c3ea
Parallel SCANINC via .d
generation.
...
Secondary expansion is redundant.
2023-11-12 16:38:32 +13:00
Icedude907
a0bf504bc1
Linkerscript now tracks RAM/ROM usage
2023-11-12 15:24:10 +13:00
Icedude907
81f397360e
Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin
2023-11-12 14:28:11 +13:00
Icedude907
2198ca31c7
Reordered makefile.
...
Added some documentation and simplified dependency scanning.
2023-11-12 13:57:44 +13:00
Icedude907
7fa9819d9a
Makefile uses make_tools, mapjson takes out dir.
...
Removed generated files (layouts.h, map_groups.h) from git.
2023-11-12 00:53:34 +13:00
GriffinR
12a64fecb4
Merge pull request #1936 from GriffinRichards/doc-datahpupdate
...
Document datahpupdate
2023-11-07 12:25:26 -05:00
GriffinR
2e1fe4c82b
Merge pull request #1940 from LOuroboros/copyMonToPC
...
Renamed SendMonToPC to CopyMonToPC instead
2023-11-07 12:22:31 -05:00
GriffinR
92e7963eff
Merge pull request #1939 from Bassoonian/noeggsdiscovered
...
Rename Undiscovered to No Eggs Discovered
2023-11-07 12:20:07 -05:00
GriffinR
973f797d95
Merge pull request #1944 from quocmanh94/master
...
Delete the redundant files generated after running build
2023-11-03 01:56:43 -04:00
quocmanh94
a093e402d5
Delete the redundant files generated after running build
2023-11-03 12:50:47 +07:00
GriffinR
959623f82e
Merge pull request #1942 from KABoissonneault/fix/dual-non-immunity
...
Added BUGFIX for "dual non-immunity" glitch.
2023-11-02 11:26:58 -04:00
kaboissonneault
5ddf3e2ee5
Fixed casing in comment on "dual non-immunity" glitch
2023-11-02 11:17:57 -04:00
kaboissonneault
3122d744f5
Added BUGFIX for "dual non-immunity" glitch. In certain AI script commands, the call to TypeCalc does not assign effectiveness flags properly, resulting in the check for immunity always failing
2023-11-02 09:48:13 -04:00
LOuroboros
d44b2a972d
Renamed SendMonToPC to CopyMonToPC instead
...
"SendMonToPC" implies that the Pokémon affected is actually sent over to the PC, but in reality the function simply copies the data of the Pokémon and then pastes it in the first available slot of the Pokémon Storage System.
2023-10-31 04:36:46 -03:00
Bassoonian
cd9ef3a566
Formatting fix
2023-10-28 16:34:11 +02:00
Bassoonian
f472d768dd
Rename Undiscovered to No Eggs Discovered
2023-10-28 16:32:55 +02:00
GriffinR
2304283c3e
Merge pull request #1935 from GriffinRichards/bugfixfix
...
Use BUGFIX in assembly files
2023-10-26 17:42:41 -04:00
GriffinR
c169b856d4
Merge pull request #1937 from kittenchilly/removewhitespace
...
Remove all trailing whitespace
2023-10-26 10:09:00 -04:00
GriffinR
3a8df46832
Merge pull request #1938 from AsparagusEduardo/pret/pr2/ndebugModern
...
Fix mini_printf encoded string -Werror=pointer-sign warning
2023-10-26 10:08:25 -04:00