Commit Graph

6411 Commits

Author SHA1 Message Date
GriffinR
4c64863bc5
Merge pull request #1567 from LOuroboros/sBattleTerrainTable
Renamed gBattleTerrainTable
2021-11-27 23:43:22 -05:00
LOuroboros
b042eb6436 gBattleTerrainTable -> sBattleTerrainTable 2021-11-28 01:22:27 -03:00
cbt6
c59c7b0518 Use enums for jump distances 2021-11-28 12:01:29 +08:00
cbt6
b6430098d4 Rename speed parameter to distance in jump functions 2021-11-28 12:01:29 +08:00
ghoulslash
e2af9ec3b4 ice type immunity to sheer cold 2021-11-26 11:49:49 -05:00
LOuroboros
68c557fd46 Updated Light Ball's effect and improved readability 2021-11-24 19:04:15 -03:00
ghoulslash
95ad508868 baton pass status4_xx_sport 2021-11-23 21:25:03 -05:00
ghoulslash
5c52abd856 gen3 sport move functionality behind config 2021-11-23 21:20:32 -05:00
ghoulslash
b5bc8bb346 fix B_SPORT_DMG_REDUCTION 2021-11-23 18:37:27 -05:00
ghoulslash
e3ddad2d11 add sport effects back 2021-11-23 18:36:10 -05:00
BuffelSaft
62f01e89d7 Fix Burmy form change
Wasn't properly tracking if Burmy had appeared in battle; gSentPokesToOpponent is used only for exp calculation and is cleared when an opponent faints, so a new var was needed.
2021-11-23 00:46:43 +13:00
BuffelSaft
8118f3bb44 Fix Brick Break
Should remove the target's screens, not the attacker's.
2021-11-22 16:17:10 +13:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
Eduardo Quezada D'Ottone
dee7f97a8d
Merge branch 'battle_engine' into battle_ai 2021-11-21 14:46:09 -03:00
Eduardo Quezada D'Ottone
30a4ef3723
Merge pull request #1924 from ghoulslash/be/wish
Fix wish
2021-11-21 14:04:06 -03:00
ghoulslash
3404039330
Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn
Mega Evolution alters turn order
2021-11-21 08:12:21 -05:00
ghoulslash
3fb62f74c6 fix rampage cancelling 2021-11-20 18:35:56 -05:00
ghoulslash
37ab20e29c fix wish 2021-11-20 16:49:04 -05:00
kleeenexfeu
62b31aec55
syntax 2021-11-20 02:12:43 +01:00
kleeenexfeu
da20dae9c3
Only recalculate speed for battler choosing a move
Other actions have priority
2021-11-20 02:09:33 +01:00
kleeenexfeu
c1743db19a
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:30:45 +01:00
ghoulslash
fb468b6776 fix unseen fist check 2021-11-19 16:32:00 -05:00
kleeenexfeu
fa4d71817b
Spaces instead of tab 2021-11-19 22:30:30 +01:00
kleeenexfeu
03a9f3f413 Mega Evolution alters turn order 2021-11-19 22:03:10 +01:00
Eduardo Quezada D'Ottone
1696e60b9f
Merge pull request #1876 from ghoulslash/be/ai_updates
Some more CanAIFaintTarget checks and other AI updates
2021-11-19 17:33:21 -03:00
Eduardo Quezada D'Ottone
ef3f573cc2
Merge pull request #1917 from BuffelSaft/unseen_fist
Implement Unseen Fist
2021-11-19 17:29:25 -03:00
BuffelSaft
c4f27174c3 Implement Unseen Fist
Unseen Fist allows contact moves to bypass protect effects, but doesn't lift the effect.
2021-11-19 16:21:33 +13:00
GriffinR
c89dfd9f56 Finish updating macro comments 2021-11-18 01:47:58 -05:00
GriffinR
b5b5d95de6 Distinguish 'virtual object' names from object events 2021-11-17 23:40:53 -05:00
GriffinR
1b35f9adad Use specific name limits for string limit functions 2021-11-17 22:11:03 -05:00
GriffinR
b9fa18bdd4 Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros 2021-11-17 22:03:37 -05:00
GriffinR
c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR
700425ef5f Index sMapHealLocations 2021-11-17 15:52:04 -05:00
GriffinR
c1970a4bc8 Remove dead sub references 2021-11-17 15:47:47 -05:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav
Document Pokénav
2021-11-17 14:47:34 -05:00
GriffinR
eb95ac0b9c Document field_tasks 2021-11-17 14:44:42 -05:00
GriffinR
61aa9c3ba9 More updating event macro comments 2021-11-16 17:46:34 -05:00
GriffinR
d414787932 Some TV clean-up 2021-11-16 16:22:17 -05:00
GriffinR
5d9c31a610 Label slot machine ids, fix GetPriceReduction 2021-11-16 15:43:52 -05:00
GriffinR
63c5905914 Continue updating event macro comments 2021-11-16 13:10:23 -05:00
GriffinR
04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
Eduardo Quezada D'Ottone
7dbc94deef Fixed undef 2021-11-15 23:36:52 -03:00
Eduardo Quezada D'Ottone
0af63c04eb Removed redundant uses of STATUS3_GASTRO_ACID check. 2021-11-15 23:29:54 -03:00
Eduardo Quezada D'Ottone
cc833ebb59 Created macro + config for always critting when using high-crit moves 2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone
a1bd6bd52f Updated species that benefit from Leek 2021-11-15 22:30:20 -03:00
Eduardo Quezada D'Ottone
bef896c65a
Merge pull request #1908 from kleeenexfeu/kleeenexfeu-PartyBattlerShouldAvoidHazardsfix
PartyBattlerShouldAvoidHazards fix
2021-11-15 19:54:46 -03:00
GriffinR
c1130592fa Drop some overworld prefixes 2021-11-15 10:58:05 -05:00
GriffinR
65d3b58374 Add PARTY_NOTHING_CHOSEN 2021-11-15 10:57:06 -05:00
kleeenexfeu
ea34d4694d
PartyBattlerShouldAvoidHazards fix
AI was loading and modifying wrong data in the RAM
2021-11-15 16:48:44 +01:00
ghoulslash
2a1299715f merge w be 2021-11-15 10:45:59 -05:00
ghoulslash
9fdd6fffee AI_GetAbility supports hidden abilities 2021-11-15 10:45:23 -05:00
ghoulslash
0e397c43fe
Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks
Adjusted elements to simplify the conflicts between BE and IE
2021-11-15 08:27:28 -05:00
BuffelSaft
d4fa346540 Fix Dark Aura and Fairy Aura
Damage boost should be 33%, not 25%.
2021-11-15 21:40:20 +13:00
GriffinR
d98bd4dba7 Name pokenav region map structs 2021-11-15 01:37:22 -05:00
GriffinR
4275cf4b90 Rename pokenav match call files 2021-11-15 01:30:21 -05:00
GriffinR
14d78d7633 Finish match call menu doc 2021-11-15 01:20:03 -05:00
GriffinR
c779d03b3e Rename pokenav_match_call_ui 2021-11-15 00:21:40 -05:00
GriffinR
d4d4234283 Finish pokenav list ui doc 2021-11-15 00:09:02 -05:00
GriffinR
7e27a0746d Misc text clean-up 2021-11-14 22:21:17 -05:00
Wiz
927f9d27df Designate gBattleAnimBgImage_Attract and related as arrays 2021-11-14 17:08:03 -05:00
ghoulslash
8b296b97a8
Merge pull request #1887 from BuffelSaft/knock-off
Fix Knock Off, add config
2021-11-14 08:27:51 -05:00
GriffinR
f42eafc85b
Merge branch 'master' into doc-banim 2021-11-13 23:26:46 -05:00
GriffinR
159bb37bbe
Merge branch 'master' into fix_saveblock_reorder 2021-11-13 23:19:57 -05:00
GriffinR
9a932cd9c3
Merge pull request #1549 from GriffinRichards/doc-binterface
Document remaining symbols in battle_interface, palette, and save
2021-11-13 23:19:08 -05:00
Eduardo Quezada D'Ottone
5b63f53262
Merge pull request #1834 from ghoulslash/be/neutralizing_gas
Add Neutralizing Gas
2021-11-14 00:27:16 -03:00
ProjectRevoTPP
9d3345a6d6 Enforce structs to enforce save block order for modern toolchains. 2021-11-13 21:41:16 -05:00
BuffelSaft
cedc2e07bd Fix Cherrim softlock
Fix typo that caused infinite loop.
2021-11-14 13:31:06 +13:00
GriffinR
8e8b70c15c Add clarifying comment to LinkFullSave_WriteSector 2021-11-13 17:23:03 -05:00
GriffinR
4c4fa1f25e Typo fix 2021-11-13 16:56:45 -05:00
GriffinR
b14fe9dce3
Merge pull request #1547 from GriffinRichards/doc-sounddata
Clean up sound, add CRY_MODE constants
2021-11-13 15:54:40 -05:00
GriffinR
b3e593dff5 Continue pokenav list ui doc 2021-11-13 15:52:58 -05:00
GriffinR
ec05157568 Move pokenav list item union out of list struct 2021-11-13 11:27:11 -05:00
Eduardo Quezada D'Ottone
bcbdb353f5 Adjusted elements to simplify the conflicts between BE and IE 2021-11-13 12:10:20 -03:00
ghoulslash
940a165be7 merge w be 2021-11-13 09:09:15 -05:00
ghoulslash
23104a02e7
Merge pull request #1891 from AsparagusEduardo/BE_assaultVestText
Fix Assault Vest's battle message and effect on Me First
2021-11-13 09:06:12 -05:00
Eduardo Quezada D'Ottone
8f52996144
Merge pull request #1892 from ghoulslash/be/wish
wish update
2021-11-13 11:01:04 -03:00
Eduardo Quezada D'Ottone
ad393385ac Oops 2021-11-13 10:58:18 -03:00
ghoulslash
9df66f4ac1
Merge pull request #1843 from Blackforest92/battle_engine
Update Giga Impact's graphic and use fade-in battle animation.
2021-11-13 08:54:37 -05:00
ghoulslash
b68c596ce5
Update src/battle_script_commands.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-13 08:50:30 -05:00
Eduardo Quezada D'Ottone
bcb0f1b915
Merge pull request #1890 from kleeenexfeu/battle_engine
Bypassing screens and protections correctly
2021-11-13 10:11:02 -03:00
kleeenexfeu
b3b3cd2c67
IsBattlerProtected 2021-11-13 13:48:08 +01:00
kleeenexfeu
89e9b989c9
Moving isBattlerProtected 2021-11-13 13:40:19 +01:00
kleeenexfeu
90b6c7d56c
Remove unwanted check
According to bulbapedia this check shouldn't exist. It was just preventing effectiveness from being calculated when a move bypassing protection would go through king's shield
2021-11-13 13:24:30 +01:00
kleeenexfeu
10c390b9ec
Effectiveness is calculated for moves bypassing king's shield
I'm curious what this is for. Before the change it just prevented moves that bypass protections from dealing super effective/not very effective damage to an aegislash using king's shield. So I just added a check with IsBattlerProtected, but in my opinion this line should be entirely removed. Unless I'm missing something.
2021-11-13 11:53:49 +01:00
GriffinR
3b91d8fdaf Start pokenav list ui doc 2021-11-12 20:36:19 -05:00
GriffinR
da5752fd0d Start match call menu doc 2021-11-12 20:17:06 -05:00
ghoulslash
c4efe06f38 wish update 2021-11-12 17:55:05 -05:00
kleeenexfeu
fdff1ae1b6
Update src/battle_util.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-12 23:34:44 +01:00
Eduardo Quezada D'Ottone
2489023332 Fixed assault Vest restricting Me First 2021-11-12 19:24:50 -03:00
GriffinR
ffe2970e30 Rename pokenav menu handler files 2021-11-12 17:13:50 -05:00
GriffinR
baeacbe2f1 Clean up pokenav general menus, organize pokenav graphics 2021-11-12 17:08:12 -05:00
Eduardo Quezada D'Ottone
2e3aafe81b Fix Assault Vest's battle message 2021-11-12 18:53:46 -03:00
kleeenexfeu
05699884d5
Crits and Confusion bypass screens 2021-11-12 21:19:06 +01:00
ghoulslash
96fd8e696b brick break gen 4 and 5 config. clears aurora veil 2021-11-12 15:00:21 -05:00
ultima-soul
294fecd57c
Merge pull request #1888 from ghoulslash/be/contrary
Fix Contrary Animation
2021-11-12 10:19:37 -08:00
ghoulslash
cdb20e89fc
Update src/battle_script_commands.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-11-12 13:12:05 -05:00
ghoulslash
876813a418 revert old attempts 2021-11-12 13:08:23 -05:00
ghoulslash
0634d3e541
Update src/battle_script_commands.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-12 13:07:53 -05:00
ghoulslash
d5db329318
Update src/battle_script_commands.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-11-12 13:07:41 -05:00
ghoulslash
395cffa702 remove ReverseStatAnimId 2021-11-12 13:04:33 -05:00