Commit graph

7772 commits

Author SHA1 Message Date
DizzyEggg
82f8636502 Simplify division in berry_crush and field weather functions 2024-03-09 20:06:58 +01:00
DizzyEggg
9e67594dce Simplify weirdly matching division/substraction code 2024-03-08 16:19:04 +01:00
GriffinR
82c3e4af14
Merge pull request #1981 from DizzyEggg/patch-3
Make sure gHeap is always aligned
2024-03-07 10:33:52 -05:00
DizzyEggg
7da5cb421e
Make sure gHeap is always aligned 2024-03-06 16:13:06 +01:00
GriffinR
954ba0a155
Merge pull request #1980 from Kurausukun/dexcry
Missing Constant in Dex Cry Screen
2024-02-10 09:38:51 -05:00
Kurausukun
3342fdafc2 add missing constant 2024-02-10 05:32:03 -05:00
GriffinR
d7a361cef1
Merge pull request #1978 from DizzyEggg/windows_overflow
Fix HideMapNamePopUpWindow possible overflow
2024-02-04 20:34:17 -05:00
GriffinR
246f47d9d0
Merge pull request #1979 from DizzyEggg/patch-2
Change Safe Div to explicitly check b != 0
2024-02-04 20:22:37 -05:00
DizzyEggg
132ca1be14
Change Safe Div to explicitly check b != 0 2024-02-02 22:57:02 +01:00
DizzyEggg
e87a69a5e7 Fix HideMapNamePopUpWindow possible overflow 2024-02-02 22:31:20 +01:00
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