GriffinR
30906762ed
Merge pull request #1740 from AsparagusEduardo/pret_stringTabs
...
Fixed inconsistent use of white space for scripts, .c files and .h files.
2022-08-20 23:03:59 -04:00
GriffinR
261b0ff118
Standardize judgement vs judgment spelling
2022-08-20 22:58:46 -04:00
GriffinR
9e175a1037
Merge pull request #1735 from GriffinRichards/arena-const
...
Add some missing battle arena constants
2022-08-20 22:54:32 -04:00
Eduardo Quezada
76d2d92abb
Merge branch 'pretmaster' into pret_clean2
2022-08-20 12:43:09 -04:00
GriffinR
1685365cd4
Merge pull request #1727 from AsparagusEduardo/pret_clean
...
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-19 21:27:55 -04:00
Martin Griffin
d57442a511
Decimal paletteNums
2022-08-19 17:05:22 +01:00
GriffinR
c2d5dd2a1f
Additional battle anim sync
2022-08-19 11:51:13 -04:00
Martin Griffin
5719a7f7bc
Use static inline instead of extern inline for modern
2022-08-19 15:47:50 +01:00
Martin Griffin
6fed961ed6
Write palette IDs in hex
2022-08-19 15:29:35 +01:00
Blackforest92
a9d09bcd17
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion
2022-08-19 17:53:01 +07:00
Blackforest92
00a827b3fb
Add PLA pokemon to Form Species Table, add Kleavor's graphics
2022-08-19 17:47:34 +07:00
Eduardo Quezada
3bc2cf921c
Sync src/battle_controllers.c with pokefirered
2022-08-18 14:30:22 -04:00
Eduardo Quezada
59f89bde9e
Misc cleanup
2022-08-18 14:23:45 -04:00
Ct11217
a4b53126f6
Added AI_FLAG_ACE_POKEMON
...
When this flag is set, the trainer will have an "Ace" pokemon that will
always be sent out last.
If this flag is set, the last Pokemon in the party will be considered the
"Ace" Pokemon.
This is similar to the gym leader functionality found in Sword & Shield.
2022-08-17 18:23:12 -06:00
Eduardo Quezada
5933c42439
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
GriffinR
26734d80f3
Merge pull request #1728 from AsparagusEduardo/pret_monDataEnum
...
Convert MON_DATA constants into enum to ease editing and addition of fields.
2022-08-15 18:51:32 -04:00
Eduardo Quezada
0149f420f9
Corrected comment
2022-08-15 17:36:55 -04:00
Eduardo Quezada
e8a05e92e4
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
tustin2121
ec73158f16
Moving documentation comments per request
...
from the discord chat.
2022-08-15 16:37:38 -04:00
tustin2121
1cb659df8c
Renaming Script Contexts
...
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -04:00
GriffinR
5515e328b2
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
GriffinR
2df6cc1820
Merge pull request #1730 from GriffinRichards/sync-naming-screen
...
Clean up naming screen graphics
2022-08-12 11:05:55 -04:00
GriffinR
574cf1ddb9
Merge pull request #1725 from GriffinRichards/security-signature
...
Sector security -> signature
2022-08-12 10:47:10 -04:00
Ct11217
b95e450cb6
Added corner case logic for AI Switching.
...
1. Refactor Perish Song
2. Yawn
3. Secondary Damage (Leech Seed, Cursed etc).
4. Added Preliminary logic to help AI be smarter against semi-invulnerable
Added AI logic regarding abilities that benefit from switching
1. Natural Cure
2. Regenerator
2022-08-11 22:48:36 -06:00
GriffinR
cf4d05e9e7
Fix typo
2022-08-11 12:09:38 -04:00
GriffinR
63468f9fcb
Add some missing battle arena constants
2022-08-11 12:02:56 -04:00
GriffinR
286a99eb1d
Merge pull request #1723 from GriffinRichards/fix-impassable
...
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
2022-08-10 21:28:14 -04:00
GriffinR
bfdbbad468
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
Eduardo Quezada
1fd1870a13
Moved enum to include/pokemon.h
2022-08-08 18:40:47 -04:00
Eduardo Quezada
75d52dc762
Convert MON_DATA constants into enum to ease editing and addition of fields.
2022-08-08 18:18:17 -04:00
Eduardo Quezada
4b08a511c3
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-07 22:40:15 -04:00
GriffinR
2487ddb128
Sector security -> signature
2022-08-05 10:42:31 -04:00
DizzyEggg
c991131b75
Change language stuff based on the french decomp
2022-08-04 11:53:16 +02:00
GriffinR
e5c36cd745
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
2022-08-03 14:21:13 -04:00
GriffinR
79384ec9f3
Merge pull request #1702 from GriffinRichards/clean-psn
...
Clean up field_poison.c
2022-08-02 13:20:49 -04:00
GriffinR
99a37b5aa5
Merge pull request #1717 from mrgriffin/trainer-party-macro
...
Macros for keeping .partyFlags, .partySize, and .party in sync
2022-08-02 13:11:43 -04:00
ExpoSeed
807c3fd17f
Delete item and ability defines in configs
2022-08-02 00:28:42 -05:00
ExpoSeed
49da2ee53f
Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION
2022-08-02 00:15:55 -05:00
GriffinR
79c5a5983e
Merge pull request #1721 from AsparagusEduardo/pret_clean2
...
Companion PR to pokefirered #525
2022-08-01 16:57:40 -04:00
Eduardo Quezada
c6cdb2a281
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-31 22:57:46 -04:00
GriffinR
5101811407
Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands
...
Further cleaning after comparing with pokefirered
2022-07-30 09:09:23 -04:00
Eduardo Quezada
40805fffc0
Space cleanup
2022-07-29 21:28:39 -04:00
Eduardo Quezada
5d4b76c0ba
Review changes from pokefirered #524
2022-07-29 17:00:07 -04:00
Eduardo Quezada
9dc64b67cd
Review changes
2022-07-29 15:38:23 -04:00
Eduardo Quezada
01558ff8f3
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
Eduardo Quezada
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada
9caca17064
Cleanup by syncing src/battle_script_commands.c with pokefirered
2022-07-29 09:43:16 -04:00
Jaizu
7a8c28ccca
Remove duplicated CB2_InitCopyrightScreenAfterBootup
2022-07-29 10:52:36 +02:00
Greenphx9
05cbd6a906
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names
2022-07-29 18:49:25 +10:00
