Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,156 Commits 1 Branch 0 Tags
Commit Graph

12991 Commits

Author SHA1 Message Date
GriffinR
81ef818f61
Merge pull request #1731 from GriffinRichards/missing-tag 
Move party menu data constants
 2022-08-20 22:43:52 -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
6fed961ed6 Write palette IDs in hex 2022-08-19 15:29:35 +01:00
Blackforest92
2b512a8e03 Fix Voltorb and Exeggutor' form species table 2022-08-19 18:14:11 +07:00
Blackforest92
346f3b7f4c Fix PLA's base_stats.h (rename .item2 to .itemRare) 2022-08-19 18:01:28 +07: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
Ariel A
0b1c81af66 Merge branch 'romhack' into lighting 2022-08-17 19:59:58 -04:00
Ariel A
d846b9c781 Added dynamic palette support for virtual objects. 
Added flag to hide follower on certain maps.
 2022-08-17 19:58:46 -04:00
Ariel A
16babe87fc Follower pokemon now disappears when teleporting. 
Fixed GF's incorrect GFX id on Route 123.
 2022-08-17 19:50:22 -04:00
GriffinR
936ebbd973 Fix phaseShit typo 2022-08-17 11:47:00 -04:00
Ariel A
7edb7bbc23 Added battle slide-in animation for Pokemon follower. 2022-08-16 19:52:38 -04:00
Eduardo Quezada
5933c42439 Synced Route 4 and 10's MapSec labels 2022-08-16 18:23:37 -04:00
GriffinR
2ec8f27811 Add missing usage of SOUND_PAN_* 2022-08-16 13:04:00 -04:00
Eduardo Quezada
7b0c8ec972 Revert style changes 2022-08-15 20:41:12 -04:00
Eduardo Quezada
44b26cc8aa From pokefirered 2022-08-15 18:27:37 -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
Ct11217
bb978764f3 Fixed recommended changes 
Added additional double battle logic for yawn
 2022-08-13 00:39:44 -06:00
GriffinR
5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
Ct11217
7378d1099b Removed AI_GetAbility 
Misc cleanup
 2022-08-12 15:21:25 -06:00
AgustinGDLV
a5e742afcd implemented review changes 2022-08-12 12:00:05 -07: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
Eduardo Quezada D'Ottone
3d94ada041
Merge pull request #2166 from Sneed69/fix_tm_compat 
Fix tm/hm compatibility
 2022-08-11 10:07:03 -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
WhenGryphonsFly
475658116e Fix BUGFIX return statement in battle_dome.c 2022-08-10 20:00:16 -05:00
WhenGryphonsFly
86881b12ef Use PARTY_SIZE for Pokerus Nurse Conversation 2022-08-10 19:09:59 -05:00
GriffinR
e06ba39751 Use button constants in Task_HandleChooseMonInput 2022-08-10 15:14:35 -04:00
GriffinR
f534e8e44a Move party menu data constants 2022-08-10 14:30:01 -04:00
GriffinR
bfdbbad468 Split naming screen palettes/graphics, use correct image palettes, clean up 2022-08-09 09:27:28 -04:00
ghoulslash
eb0cc91dce
Merge pull request #2224 from AsparagusEduardo/BE_cosntantsZmove 
B_WIN constants in battle_z_move.c
 2022-08-08 21:13:23 -04:00
Eduardo Quezada
4b08a511c3 Cleanup from https://github.com/pret/pokefirered/pull/532 2022-08-07 22:40:15 -04:00
LOuroboros
80057fc990
Update battle_z_move.c 2022-08-07 10:19:03 -03:00
Greenphx9
19bca193c5 Disable rematches if FREE_MATCH_CALL is enabled 2022-08-07 20:55:31 +10:00
GriffinR
079b1762ac Update special save sector size checks 2022-08-05 12:11:33 -04:00
GriffinR
2487ddb128 Sector security -> signature 2022-08-05 10:42:31 -04:00
ghoulslash
a5773a41a8 fix function names to match pret 2022-08-04 19:38:54 -04:00
ghoulslash
c7c7a76608 Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav 2022-08-04 19:06:29 -04:00
Eduardo Quezada D'Ottone
08f08ece98 B_WIN constants in battle_z_move.c 2022-08-04 15:35:08 -04:00