ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-06 09:33:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,669 Commits 1 Branch 0 Tags 235 MiB
43e8f76338
Commit Graph

3560 Commits

Author SHA1 Message Date
ultima-soul
43e8f76338 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:55:48 -07:00
ultima-soul
4c3ed52c2f Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:39:11 -07:00
ultima-soul
988320b89a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:25:13 -07:00
ultima-soul
840e2bc3f9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-08-16 16:33:34 -07:00
ultima-soul
76a7a2720d Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-16 16:10:59 -07:00
ultima-soul
b620349da0 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-16 15:43:27 -07:00
ultima-soul
64a48800c9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-08-11 17:10:57 -07:00
ultima-soul
3f75a58137 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-11 16:55:29 -07:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2 2021-08-11 19:01:47 -04:00
GriffinR
cc51627465
Merge pull request #1489 from GriffinRichards/doc-playerpc 
Document player pc
 2021-08-11 18:59:58 -04:00
GriffinR
0bc26d9d79
Merge pull request #1488 from GriffinRichards/doc-frontierpass2 
Document frontier pass
 2021-08-11 17:40:55 -04:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
LOuroboros
b4c4650186 Corrected inconsistent flag label spelling 2021-08-05 17:26:03 -03:00
GriffinR
bd5cf07059
Merge branch 'master' into doc-playerpc 2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8 Document player pc 2021-08-02 13:58:40 -04:00
GriffinR
3e60a78406
Merge branch 'master' into doc-frontierpass2 2021-07-31 13:30:40 -04:00
GriffinR
602855ea99 Document frontier pass 2021-07-31 13:28:08 -04:00
LOuroboros
8012f4b25a Re-ordered the hidden item flags list 
Instead of sorting them by location, it makes more sense to sort them by their value.
 2021-07-26 20:18:11 -03:00
ghoulslash
e6a2d2226f
Merge pull request #1540 from DizzyEggg/rage_powder 
Rage powder updated to gen6
 2021-07-24 07:15:58 -06:00
LOuroboros
bfa824f761
Removed unused status ailment constants 2021-07-23 13:18:24 -03:00
DizzyEggg
304f3b9203
Merge pull request #1565 from BuffelSaft/disguise-fix 
Fix Disguise reverting on switch out
 2021-07-16 09:17:10 +02:00
BuffelSaft
90fdb74ccb Remove UndoFormChangeOnSwitch 
Handle switching out Mimikyu Busted in UndoFormChange.
 2021-07-16 17:56:53 +12:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower 
Clean up Mirage Tower
 2021-07-10 23:26:41 -04:00
BuffelSaft
63faa6e3a9 Fix Disguise reverting on switch out 
Make Mimikyu's disguise stay busted when it's switched out.
 2021-07-11 14:15:24 +12:00
ghoulslash
59c16ff1cf AI_IsTerrainAffected checks 2021-07-10 16:41:41 -06:00
GriffinR
32fe412755
Merge pull request #1475 from GriffinRichards/doc-minor 
Label remaining symbols in a few files
 2021-07-08 00:24:56 -04:00
GriffinR
fced9e507d
Merge pull request #1478 from Kurausukun/itemprint 
Change ItemPrintFunc to Use u32 Instead of s32
 2021-07-08 00:15:45 -04:00
GriffinR
0f538102d9 Add local id constants for C 2021-07-05 13:54:43 -04:00
ExpoSeed
de3caaccfb Include expansion_branches.h in global.h 2021-07-04 12:42:34 -05:00
ExpoSeed
630d172393 Include expansion_branches.h in global.h 2021-07-04 12:41:21 -05:00
ExpoSeed
0ed1d29ece Include expansion_branches.h in global.h 2021-07-04 12:39:30 -05:00
Kurausukun
42730a8315 Revert "remove gflib" 
This reverts commit 8b59909ac5.
 2021-07-03 17:39:33 -04:00
GriffinR
b4f66496ed
Merge pull request #1471 from GriffinRichards/fix-lock 
Fix some object lock names
 2021-07-03 11:21:10 -04:00
ExpoSeed
fb69b65337 Fix redefinition error in battle_config.h 2021-07-02 14:36:55 -05:00
ExpoSeed
788b9f675f Fix redefinition error in pokemon_config.h 2021-07-02 14:36:02 -05:00
ExpoSeed
ebe0d21c54 Fix redefinition error in item_config.h 2021-07-02 14:34:29 -05:00
GriffinR
64d06f4c8f Condense battle AI scripts, minor clean up 2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb Document smart shopper TV show 2021-07-02 01:45:23 -04:00
GriffinR
fe89a4d147 Label remaining region_map symbols 2021-07-02 00:52:36 -04:00
GriffinR
10886a586b Clean up mirage tower 2021-07-01 23:46:15 -04:00
PikalaxALT
e0b58592b2
Merge pull request #1469 from GriffinRichards/fix-contesthearts 
Clarify contest heart tiles
 2021-06-21 13:59:50 -04:00
GriffinR
810b51f96c Clarify contest heart tiles 2021-06-21 13:48:03 -04:00
BuffelSaft
4c18cb7fe7 Remove EFFECT_THAW_HIT 2021-06-19 11:49:00 +12:00
Kurausukun
10c80230c4 change printItemFunc to use u32 instead of s32 
also change a use of -2 to LIST_CANCEL
 2021-06-18 00:15:45 -04:00
Kurausukun
8b59909ac5 remove gflib 2021-06-17 22:09:48 -04:00
ExpoSeed
b6b0062bd6 Change map header flags to use a bitfield 2021-06-13 17:02:06 -05:00
ExpoSeed
3ed06c2cc2 Remove remaining grey and replace with gray 2021-06-10 11:36:10 -05:00
BuffelSaft
e6a8faec1e Fix thawing moves 
Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.
 2021-06-10 23:48:18 +12:00
DizzyEggg
f27dcab784 Rage powder has powder moves qualities when forcing a target 2021-06-10 12:55:05 +02:00