18854 Commits

Author SHA1 Message Date
ghoulslash
59c16ff1cf AI_IsTerrainAffected checks 2021-07-10 16:41:41 -06: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
ultima-soul
ad8cfda831 Add and rearrange Key Items. 2021-07-06 17:03:46 -07:00
DizzyEggg
34f869ef40
Fix White Smoke affecting Shell Smash's def drop 2021-07-06 10:37:17 +02:00
ultima-soul
2d8d38f44c Add TM51 through TM100. 2021-07-05 18:11:57 -07: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
ultima-soul
cbc7963b7e
Merge pull request #1558 from ExpoSeed/IE/fix-redefinition-error
Include expansion_branches.h in global.h
2021-07-04 13:41:55 -07:00
ultima-soul
4d1c63e3d3
Merge pull request #1556 from ExpoSeed/BE/fix-redefinition-error
Include expansion_branches.h in global.h
2021-07-04 13:41:42 -07: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
ghoulslash
542f0accf5 fix updating last used ball when run out of item id 2021-07-04 10:09:57 -06:00
ghoulslash
b723015390
Merge pull request #1554 from ExpoSeed/IE/fix-redefinition-error
Fix redefinition error in item_config.h
2021-07-04 09:32:17 -06: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
ghoulslash
171329aabd
Merge pull request #1552 from ExpoSeed/BE/fix-redefinition-error
Fix redefinition error in battle_config.h
2021-07-04 09:31:46 -06:00
ghoulslash
d28ac33b0e fix throw last used ball action turn order checks 2021-07-04 09:28:59 -06:00
Kurausukun
42730a8315 Revert "remove gflib"
This reverts commit 8b59909ac5eb6e3540aeb78396943d57a9702e4d.
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
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
GriffinR
d2701b51ab Combine battle script labels, add EFFECT comments 2021-07-02 15:37:59 -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
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
luckytyphlosion
b3d66f5528 Merge branch 'master' of https://github.com/pret/pokeemerald 2021-07-02 12:53:12 -04:00
luckytyphlosion
9fd27fe855 Fix modern builds when devkitARM is not in PATH. 2021-07-02 12:52:31 -04:00
TheXaman
c9d902d722 Renamed functions for better readability 2021-07-02 12:26:15 +02:00
TheXaman
af355fcb12 added Debug to StartMenu via DEBUG_MENU option 2021-07-02 11:49:32 +02:00
GriffinR
c42b5d783a Fix 'determining' typo 2021-07-02 03:26:50 -04: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
d73b3c05c6 Label remaining hall_of_fame symbols 2021-07-02 01:02:28 -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
GriffinR
3964820a84
Merge pull request #1473 from GriffinRichards/fix-div0
Fix divide by 0 in Cmd_getexp
2021-07-01 14:26:34 -04:00
GriffinR
93188ef0a8 Fix divide by 0 in Cmd_getexp 2021-07-01 00:18:52 -04:00
TheXaman
a663742eba fixed a bug not showing hidden abilities (POKEMON_EXPANSION) if the second ability was ABILITY_NONE, thanks to Syreldar 2021-06-30 10:44:09 +02:00
GriffinR
63b93c4611
Merge pull request #1472 from garakmon/hi
fix encounter slot logic to accomodate changes
2021-06-27 21:22:53 -04:00
garakmon
d391c136d8 fix encounter slot logic to accomodate changes 2021-06-27 21:14:21 -04:00
ghoulslash
53e6ba1c48 Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav 2021-06-27 07:43:02 -06:00
ghoulslash
fbdbc33f37 fix dexnav headerId overflow issue 2021-06-27 07:42:55 -06:00
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -06:00
GriffinR
827c274979
Merge pull request #1470 from GriffinRichards/constants-ftrainerfemale
Add missing use of F_TRAINER_FEMALE
2021-06-25 12:40:22 -04:00