ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-20 10:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,642 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

3563 Commits

Author SHA1 Message Date
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
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
0ed1d29ece Include expansion_branches.h in global.h 2021-07-04 12:39:30 -05: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
ExpoSeed
fb69b65337 Fix redefinition error in battle_config.h 2021-07-02 14:36:55 -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
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -06: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
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
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
DizzyEggg
4b29ae39ad Allow one mon double battles 2021-06-08 16:40:47 +02:00
LOuroboros
588b3638d3 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus 2021-06-07 19:22:20 -03:00
LOuroboros
8726107d42 Removed BattleScript_FlinchPrevention 
Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.
 2021-06-07 19:18:15 -03: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
ultima-soul
2563bc5c83
Merge pull request #1521 from DizzyEggg/largeexp 
Allow larger exp gains
 2021-06-06 13:33:33 -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
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
ExpoSeed
ec2c140ecb Disambiguate Thousand Arrows flag from other flags 2021-06-04 19:34:37 -05:00
ExpoSeed
15914d7af8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags 2021-06-04 19:00:29 -05:00
ultima-soul
6edec5bc3d
Merge pull request #1437 from LOuroboros/oblivious 
Tweaked Oblivious
 2021-06-04 16:51:38 -07:00
ExpoSeed
0e96b47584 Review comments 2021-06-04 18:50:11 -05:00
LOuroboros
b552db7193 Tweaked the Oblivious immunities 
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
 2021-06-04 19:23:07 -03:00
DizzyEggg
4b744374c8 Allow larger exp gains 2021-06-03 23:17:44 +02:00
LOuroboros
b215b44951 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales 2021-06-03 05:09:14 -03:00
LOuroboros
6ccb493f12 Adjusted the list of item hold effects 2021-06-02 17:23:58 -03:00
BuffelSaft
2a6b989c92 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press 2021-06-02 12:41:28 +12:00
LOuroboros
d48a6e00d4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious 2021-06-01 18:15:01 -03:00