3289 Commits

Author SHA1 Message Date
Ariel Antonitis
783149bd3f Fixed bug where moving truck had a shadow. 2021-07-20 19:38:32 -04:00
ghoulslash
45d4cee243 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-07-18 11:11:03 -06:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower
Clean up Mirage Tower
2021-07-10 23:26:41 -04:00
ultima-soul
ad8cfda831 Add and rearrange Key Items. 2021-07-06 17:03:46 -07: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
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07: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
10886a586b Clean up mirage tower 2021-07-01 23:46:15 -04:00
ghoulslash
53e6ba1c48 Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav 2021-06-27 07:43:02 -06:00
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -06:00
TheXaman
defd7d9e07 Added Sound menu for SE and MUS 2021-06-22 12:38:00 +02:00
GriffinR
810b51f96c Clarify contest heart tiles 2021-06-21 13:48:03 -04:00
ultima-soul
9e0b866f09 Rearranged Poke Ball item ids. 2021-06-18 21:46:20 -07:00
BuffelSaft
4c18cb7fe7 Remove EFFECT_THAW_HIT 2021-06-19 11:49:00 +12:00
ghoulslash
608dd9ddc5 add shiny chaining 2021-06-17 11:15:53 -06:00
Xhyzi
c2bd046ea6 Shell Trap 2021-06-15 20:22:50 +02:00
Xhyzi
155e9b6332 Court Change 2021-06-15 20:14:10 +02:00
Xhyzi
271f19e6cb Terrain Pulse 2021-06-15 20:01:57 +02:00
Xhyzi
0202b75822 Beak Blast 2021-06-15 19:57:21 +02:00
Xhyzi
7799e49e3a Corrosive Gas 2021-06-15 19:45:24 +02:00
Xhyzi
e7ec4df70b Rising Voltage 2021-06-15 17:51:59 +02:00
Xhyzi
ee3f3eb78f Meteor Beam 2021-06-15 17:06:21 +02:00
Xhyzi
62525516a4 Scale Shot 2021-06-15 16:50:19 +02:00
Xhyzi
60ce39543e Expanding Force 2021-06-15 16:29:06 +02:00
Xhyzi
5a094a3033 Snap Trap 2021-06-15 16:22:42 +02:00
MissingNoL
721dbe9178 Implemented all PLG effects 2021-06-12 18:01:35 -07:00
MissingNoL
610b18bfdb Implemented Double Iron Bash's effect 2021-06-12 14:27:50 -07:00
MissingNoL
beb126b534 Implemented Zippy Zap's effect 2021-06-12 13:58:54 -07:00
ultima-soul
bca67ac683 Refactor Poke Ball code to not rely on Master Ball being the first item internally. 2021-06-11 18:22:50 -07:00
ultima-soul
b7706f1b99 Remove ball catch rate modifier effects. 2021-06-10 21:59:13 -07:00
ExpoSeed
c8fc141287 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-06-10 11:54:20 -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
ultima-soul
425746763a Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 20:08:43 -07:00
ultima-soul
f3f4d8e608 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 19:52:20 -07:00
ultima-soul
0a87adad1a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 18:05:52 -07:00
ultima-soul
d30ab7760f Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-06-07 13:52:08 -07:00
ultima-soul
cf19635a80 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-06-07 13:15:46 -07:00
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
MissingNoL
bfc66a21cc gBattlescriptCurrInstr[3] is not reading species parameter 2021-06-06 19:14:11 -07:00
MissingNoL
9cd522d254
Merge branch 'battle_engine' into Photon_Geyser 2021-06-05 16:46:28 -07:00
MissingNoL
921b80de7c
Update battle_script_commands.h
Properly aligned the list of number IDs
2021-06-05 16:40:03 -07:00
Ariel Antonitis
e4b9bb75e2 Merge branch 'master' into romhack 2021-06-04 23:36:21 -04:00
Ariel Antonitis
e9d01b4808 Added a non-RNG, PID-preserving way to modify pokemon nature.
(wip) Preserve shiny value when changing nature.

(WIP) Preserve shiny value.

(WIP) Preserve nature.

(WIP) Removed some debugging statements.

(WIP) Removed more debugging statements.

(WIP) Nature changing now supports Unown.
2021-06-04 22:49:20 -04:00
ultima-soul
3448e19275
Merge pull request #1459 from ExpoSeed/BE/rename-flags
Rename flags
2021-06-04 19:33:45 -07:00
ExpoSeed
4bb33367df Newline 2021-06-04 19:35:16 -05:00