8016 Commits

Author SHA1 Message Date
GriffinR
f19747d6cc
Merge pull request #1983 from LOuroboros/modernfateful
Renamed ScrCmd_setmonmodernfatefulencounter and ScrCmd_checkmonmodernfatefulencounter for consistency reasons
2024-03-21 21:28:30 -04:00
GriffinR
b08d62b615
Merge pull request #1961 from GriffinRichards/doc-camera-sprite
Document camera sprite functions
2024-03-21 21:23:53 -04:00
GriffinR
b4f92ad2e1
Merge pull request #1982 from DizzyEggg/anim_improvements
Simplify weirdly matching division/substraction code
2024-03-21 21:16:56 -04:00
LOuroboros
927f098cf5 Renamed setmodernfatefulencounter and checkmodernfatefulencounter for consistency reasons 2024-03-11 01:46:59 -03:00
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
Jaizu
ad839d0333 Lower followers gfx 2024-03-06 19:10:51 -08:00
DizzyEggg
7da5cb421e
Make sure gHeap is always aligned 2024-03-06 16:13:06 +01:00
Eduardo Quezada
ed4a291b37 Revert Object Event change from vanilla 2024-02-17 18:09:11 -05:00
Ariel A
6bceacf403 Added override table for standalone follower palettes. 2024-02-17 16:55:11 -05:00
Ariel A
4afb386ab4 Added .git-blame-ignore-revs to hide whitespace-only changes from blame. 2024-02-15 23:06:05 -05:00
Ariel A
725252905b Merge branch 'merrp/pr/style' into followers 2024-02-15 22:49:36 -05:00
Ariel A
afbb88d77a Undo (most) indentation changes. 2024-02-15 22:24:20 -05:00
Ariel A
f861504cfc Undo map.json changes. 2024-02-15 22:23:59 -05:00
Ariel A
7e2bbac2aa Updated README. 2024-02-12 20:37:09 -05:00
Ariel A
949fc48d26 Revert "Added nature colors to stats."
This reverts commit 2d9c42110f32bc1fb8211b5f265d669d1ebeba95.
2024-02-12 20:37:09 -05:00
Ariel A
1e5fd80b7e Revert "Allowed running inside buildings."
This reverts commit 4e3c2d84911614cfa917e2fa5d0fe1511fa5e41b.
2024-02-12 20:37:09 -05:00
Ariel A
c990851473 Revert "Added function to check for newer emulators/hardware."
This reverts commit c267dd6ee6e9766c70a1522adf6f0a812e337ae6.

# TODOs changed:
# -: Needs to be updated if compiling for a different processor than the GBA's: 

# TODOs changed:
# -: Needs to be updated if compiling for a different processor than the GBA's: 

# TODOs changed:
# -: Needs to be updated if compiling for a different processor than the GBA's:
2024-02-12 20:37:08 -05:00
Ariel A
915f40c654 Improved follower message system. 2024-02-12 20:37:08 -05:00
Ariel A
a407c72235 Cleaned up follower code.
Added support for asymmetrical follower pokemon.
Fixed bug with changing GraphicsInfo size.
Added follower Substitute gfx. Credit: shikashipx
2024-02-12 20:37:01 -05: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
Eduardo Quezada
ebbcb7d025 Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
Ariel A
b56158428e Added new follower pokeballs & toggle.
Credit: shikashipx
2024-01-21 17:21:33 -05: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
Ariel A
630541c56b Updated README. 2023-12-31 01:40:35 -05:00
Ariel A
7d7531f2fa Merge branch 'master' into followers 2023-12-31 01:28:27 -05:00
Ariel A
7842a8305a Fixed follower elevation/subpriority issues when player crosses elevations. 2023-12-31 01:18:39 -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
Jaizu
934a1fdd8c Remove old debug function 2023-12-25 16:06:34 -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