Commit Graph

7409 Commits

Author SHA1 Message Date
Kurausukun
0bceaab046 rename variable 2021-08-08 20:34:16 -04:00
Kurausukun
b51d025f1c port cgb fakematching fixes (thanks to revo) 2021-08-08 20:33:21 -04:00
GriffinR
0e33df21b9
Merge pull request #1491 from LOuroboros/inconsFlag
Corrected inconsistent flag label spelling
2021-08-05 16:41:10 -04:00
LOuroboros
b4c4650186 Corrected inconsistent flag label spelling 2021-08-05 17:26:03 -03:00
GriffinR
3714963f0d
Merge pull request #1490 from GriffinRichards/align-marts
Add align directives to all marts
2021-08-05 14:35:45 -04:00
GriffinR
44cd9eed6b Add align directives to all marts 2021-08-04 11:50:33 -04: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
Blackforest92
72dfb281e9 Fix DUSTOX's backsprite 2021-07-31 15:01:05 +07:00
Blackforest92
3bd81d347d Add missing Gen8 icons 2021-07-31 14:48:55 +07:00
GriffinR
d391486247
Merge pull request #1484 from GriffinRichards/remove-addrcomments
Remove address comments
2021-07-27 18:08:10 -04:00
GriffinR
459b20d762
Merge pull request #1479 from PikalaxALT/flatten_sprite_pos
Flatten pos fields in struct Sprite
2021-07-27 18:02:00 -04:00
GriffinR
80c77fc120
Merge pull request #1487 from LOuroboros/hidden_item_flags
Re-ordered the hidden item flags list
2021-07-27 10:36:20 -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
GriffinR
b5bc762dc7
Merge pull request #1486 from sphericalice/pss-constant-fix
Use the correct constant for PSS page comparison
2021-07-25 12:49:35 -04:00
sphericalice
71de6ea939 Use the correct constant for PSS page comparison 2021-07-24 18:54:37 +01:00
ghoulslash
fd69375489
Merge pull request #1575 from Blackforest92/pokemon_expansion
Fix Arctozolt, Heliolisk, and Chespin
2021-07-24 07:13:16 -06:00
Blackforest92
365b578a66 Fix Arctozolt, Heliolisk, and Chespin 2021-07-24 13:46:02 +07:00
GriffinR
0e22b21b14
Merge pull request #1485 from LOuroboros/patch-3
Removed unused status ailment constants
2021-07-23 13:15:46 -04:00
LOuroboros
bfa824f761
Removed unused status ailment constants 2021-07-23 13:18:24 -03:00
GriffinR
e67729f647 Remove address comments in sound directory 2021-07-21 00:56:04 -04:00
GriffinR
06351bf63c Remove address comments 2021-07-20 15:18:31 -04:00
PikalaxALT
bea170e8e9
Merge pull request #1483 from PikalaxALT/symbols_merge_commit
Use merge commit message for symbols branch
2021-07-16 12:59:03 -04:00
PikalaxALT
52512cfbe1 Use merge commit message for symbols branch 2021-07-16 12:15:53 -04:00
ultima-soul
3fca4c82a0
Merge pull request #1572 from LOuroboros/pikachu
Assigned dummy anims to the front sprite of each Pikachu and Pichu special form
2021-07-15 10:10:05 -07:00
LOuroboros
e55fe62d59 Assigned dummy anims to the front sprite of each Pikachu and Pichu special form 2021-07-15 13:42:51 -03:00
DizzyEggg
96b0700ea9
Merge pull request #1513 from Blackforest92/pokemon_expansion
Fixes to Shroomish, Popplio, Xerneas Active and Minior Meteor
2021-07-15 11:17:06 +02:00
GriffinR
a274cc6a76
Merge branch 'master' into flatten_sprite_pos 2021-07-12 01:39:28 -04:00
GriffinR
876a89eba4
Merge pull request #1482 from cstyles/physical-macro
Use the `IS_TYPE_PHYSICAL` macro in `AddMovePoints`
2021-07-12 01:25:05 -04:00
Collin Styles
eab1d7b5b1 Use the IS_TYPE_PHYSICAL macro in AddMovePoints 2021-07-11 22:02:24 -07:00
GriffinR
01f2381e01 Add LINK_MANAGER field comments from SDK 2021-07-11 16:48:59 -04:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower
Clean up Mirage Tower
2021-07-10 23:26:41 -04:00
PikalaxALT
4419337aeb
Merge pull request #1481 from GriffinRichards/fix-symsname
Use PR title for symbols branch commits
2021-07-08 08:00:16 -04:00
GriffinR
2f1a997440 Use PR title for symbols branch commits 2021-07-08 00:49:27 -04: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
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
GriffinR
0f538102d9 Add local id constants for C 2021-07-05 13:54:43 -04:00
ultima-soul
efdc513912
Merge pull request #1559 from ExpoSeed/PE/fix-redefinition-error
Include expansion_branches.h in global.h
2021-07-04 13:42:14 -07:00
ExpoSeed
630d172393 Include expansion_branches.h in global.h 2021-07-04 12:41:21 -05:00
ghoulslash
3189cc548f
Merge pull request #1553 from ExpoSeed/PE/fix-redefinition-error
Fix redefinition error in pokemon_config.h
2021-07-04 09:32:01 -06: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
GriffinR
56b69157ef
Merge pull request #1477 from SnorlaxMonster/comment-battledome
Correct card lines in Battle Dome comments
2021-07-03 09:55:41 -04:00
SnorlaxMonster
43c5107e4d Correct card lines in Battle Dome comments
The comments regarding the lines that Trainer information is displayed
on the Battle Dome Trainer Card were off-by-one.
2021-07-03 22:41:18 +10:00
GriffinR
d2701b51ab Combine battle script labels, add EFFECT comments 2021-07-02 15:37:59 -04:00
ExpoSeed
788b9f675f Fix redefinition error in pokemon_config.h 2021-07-02 14:36:02 -05:00
GriffinR
2946342a6b
Merge pull request #1476 from luckytyphlosion/master
Fix modern builds when devkitARM is not in PATH.
2021-07-02 15:07:27 -04:00