Commit graph

7853 commits

Author SHA1 Message Date
Ariel A
195d2bb79a Merge branch 'followers' into followers-expanded-id 2024-02-17 17:19:01 -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 2d9c42110f.
2024-02-12 20:37:09 -05:00
Ariel A
1e5fd80b7e Revert "Allowed running inside buildings."
This reverts commit 4e3c2d8491.
2024-02-12 20:37:09 -05:00
Ariel A
c990851473 Revert "Added function to check for newer emulators/hardware."
This reverts commit c267dd6ee6.

# 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
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
Ariel A
398a9ee8fa Merge branch 'followers' into followers-expanded-id 2023-12-31 01:49:56 -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
Ariel A
dcaaac92d9 Added support for compressed OW graphics.
Added CpuSmartCopy macros (Credit: luckytyphlosion)
2023-12-31 00:35:27 -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
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
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
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
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
Ariel A
f5580c4c0c Updated README. 2023-10-29 16:06:59 -04: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