ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-07 18:13:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,450 Commits 1 Branch 0 Tags 235 MiB
bceccf5474
Commit Graph

6681 Commits

Author SHA1 Message Date
sphericalice
9e660b2cdf
Update src/field_specials.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-12-31 16:29:11 +00:00
sphericalice
4f6323606f
Update field_specials.c to match the style 2021-12-31 16:24:44 +00:00
GriffinR
23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
sphericalice
50522fdea4
Remove some magic numbers from TryPushBoulder 2021-12-30 12:21:47 +00:00
LOuroboros
34c6e6ca31
Update battle_ai_util.c 2021-12-30 01:48:56 -03:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles 
Multi battle updates
 2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone
ba43280a7c Refactored Instruct to use the regular forbidden move lookup table 2021-12-29 21:04:15 -03:00
GriffinR
4192a40adf
Merge pull request #1583 from GriffinRichards/renametilemaps 
Give less generic names to some tilemaps, some misc fixes
 2021-12-29 00:57:37 -05:00
GriffinR
aadab8b016 Move pokemon and easy chat constants to global, misc clean-up 2021-12-28 18:07:41 -05:00
GriffinR
aba5264260 RGB macro use in slot_machine 2021-12-28 17:46:05 -05:00
GriffinR
4fc345fff5 Rename unused frontier pass tilemap 2021-12-28 14:54:09 -05:00
GriffinR
3acf002a9c Rename generic jp contest tilemaps 2021-12-28 13:16:40 -05:00
LOuroboros
cc1a243145
Update src/battle_script_commands.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-12-28 12:18:44 -03:00
GriffinR
ee5e65d9ed Rename generic title screen tilemaps 2021-12-28 03:57:44 -05:00
W1serV1ser
e0f7e7a2d9 Updated variable name in MOVEEND_SKY_DROP_CONFUSE 2021-12-27 12:10:38 -08:00
Eduardo Quezada D'Ottone
4d6f54e8d6
Merge pull request #2007 from ghoulslash/be/roleplay 
Update Role Play
 2021-12-25 11:37:57 -03:00
LOuroboros
599ca58059
Update main_menu.c 2021-12-25 07:04:19 -03:00
Eduardo Quezada D'Ottone
7bffe6d1d5
Merge pull request #2004 from ghoulslash/be/sports 
Add sport effects back
 2021-12-24 18:59:50 -03:00
LOuroboros
03205c995d
Update battle_script_commands.c 2021-12-24 01:59:40 -03:00
Eduardo Quezada D'Ottone
2ebe427a42 Merge branch 'BattleEngine' into BE_wildNaturalEnemies 
# Conflicts:
#	src/battle_controller_opponent.c
 2021-12-23 21:19:59 -03:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine 2021-12-23 15:29:10 -08:00
W1serV1ser
58a5a9cbec Simplified skyDropTargets storage and made other minor improvements 
A lot of these changes are based on ghoulslash's version of Sky Drop.
 2021-12-23 15:27:11 -08:00
Eduardo Quezada D'Ottone
a725592a6b
Merge pull request #1999 from ghoulslash/be/moveeffect 
More battle-will-end checks on stat-changing damaging effects
 2021-12-23 20:23:16 -03:00
Eduardo Quezada D'Ottone
67697d2de3
Merge pull request #1582 from ghoulslash/smart_wild_ai 
Smart Wild AI Option
 2021-12-23 20:18:18 -03:00
ghoulslash
0a95a31ee9 fix formatting 2021-12-23 08:44:54 -05:00
ghoulslash
b6b5d862f4 update role play mechanics 2021-12-23 08:37:11 -05:00
LOuroboros
d94dae18f7 Removed more commented out addresses 
I like to help.
 2021-12-21 22:49:30 -03:00
ghoulslash
4b5c5d14fc
Merge pull request #1989 from AsparagusEduardo/BE_debugHoldEffects 
Updated AI debug hold effect name display.
 2021-12-20 14:07:29 -05:00
ghoulslash
78b42fabef
Merge pull request #2001 from AsparagusEduardo/BE_debugDoc 
Using TAG_NONE in battle debug
 2021-12-20 14:06:59 -05:00
LOuroboros
cb44de13b3 B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT 2021-12-19 20:53:57 -03:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports 2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone
a57043b589
Merge pull request #1983 from sphericalice/last_ball_refactor 
Refactor CanThrowLastUsedBall and related functions
 2021-12-19 20:21:50 -03:00
Eduardo Quezada D'Ottone
6d17156f74
Merge pull request #1934 from BuffelSaft/fix-burmy 
Fix Burmy form change
 2021-12-19 20:18:19 -03:00
LOuroboros
ffe35fbb06 Updated defeat condition on multi battles 2021-12-19 08:30:43 -03:00
Eduardo Quezada D'Ottone
4ca9f406f6
Merge pull request #1947 from LOuroboros/lightBall 
Updated Light Ball's effect and improved readability
 2021-12-18 15:03:18 -03:00
Eduardo Quezada D'Ottone
3a24bc8298
Merge branch 'battle_engine' into DizzyEggg-patch-1 2021-12-18 14:52:19 -03:00
Eduardo Quezada D'Ottone
1772997082
Merge pull request #1994 from AsparagusEduardo/BE_HPDrain 
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
 2021-12-18 13:50:05 -03:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy 2021-12-18 13:38:12 -03:00
Eduardo Quezada D'Ottone
bd75ee9688 Using TAG_NONE in battle debug 2021-12-18 10:55:04 -03:00
LOuroboros
4a74d288d4 Review corrections 2021-12-18 00:01:50 -03:00
LOuroboros
dbca24aa82 [LEAK INFORMED] Documented the unk19 item field 2021-12-17 19:41:39 -03:00
ultima-soul
84ce9745d5
Merge pull request #1990 from AsparagusEduardo/BE_debugArrows 
Improved battle debug number value changing
 2021-12-17 09:21:04 -08:00
ghoulslash
31bbc4ddde prevent stat-raising damage effects if battle will end 2021-12-17 10:24:07 -05:00
Eduardo Quezada D'Ottone
837641f304
Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:46 -03:00
Eduardo Quezada D'Ottone
8005db5040
Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:35 -03:00
Eduardo Quezada D'Ottone
3a12cdb8cb
Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:02 -03:00
ultima-soul
961710ddd9
Merge pull request #1986 from AsparagusEduardo/BE_steamEngine 
Added Steam Engine's overworld effect
 2021-12-16 16:15:58 -08:00
GriffinR
6e5520207f
Merge pull request #1573 from GriffinRichards/tilesetanim 
Clean up tileset_anims
 2021-12-15 09:47:54 -05:00
GriffinR
961dbee5e3 Clean up tileset_anims 2021-12-14 21:41:07 -05:00
LOuroboros
660a3df929
Update trade.c 2021-12-14 14:47:04 -03:00
Eduardo Quezada D'Ottone
abe9910251 Fixed speed to be more like vanilla's 2021-12-12 12:42:14 -03:00
Eduardo Quezada D'Ottone
7ca07527fa Config for HP bars moving faster for higher HP amounts. Credit to Dat.H 2021-12-12 12:33:49 -03:00
Eduardo Quezada D'Ottone
6f363b219e Improved battle debug value change 2021-12-11 16:41:04 -03:00
Eduardo Quezada D'Ottone
2773b14de5 Updated AI debug hold effect name display. 2021-12-11 00:09:47 -03:00
Eduardo Quezada D'Ottone
aa2b2e6a70
Merge pull request #1929 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-12-09 20:02:45 -03:00
ultima-soul
a5afdac0ae Resolved review suggestions for upstream Battle Engine sync. 2021-12-08 12:08:16 -08:00
DizzyEggg
0a7dd2edd6
Fix Intimidate affecting fainted mons 2021-12-07 12:19:27 +01:00
Eduardo Quezada D'Ottone
756700ff4d Added Steam Engine's overworld effect 2021-12-06 20:52:32 -03:00
DizzyEggg
dff72b97dd
Merge pull request #1971 from sphericalice/patch-2 
Remove extra spaces in battle strings
 2021-12-06 14:13:39 +01:00
DizzyEggg
97539d7443
Merge pull request #1951 from ghoulslash/be/sheercold 
Ice Types immune to Sheer Cold
 2021-12-06 14:12:06 +01:00
sphericalice
5c02facde4 Use more specific enum names for throwable Balls 2021-12-05 23:17:44 +00:00
sphericalice
3db871c49a Refactor CanThrowLastUsedBall and related functions 2021-12-05 23:10:05 +00:00
LOuroboros
a5659f3339 AI partners no longer get exp. 2021-12-04 23:00:57 -03:00
Eduardo Quezada D'Ottone
1708ac4b1b Wild mon that have a natural enemy or preys on other mon will attack them whem partnered in double wild battles. 2021-12-04 22:13:29 -03:00
kleeenexfeu
340d505116
Moxie/follow me fix 2021-12-04 17:41:31 +01:00
kleeenexfeu
e7321c22f2
Moxie spread move fix 2021-12-04 17:38:26 +01:00
ultima-soul
7369f60c06 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-12-03 17:30:45 -08:00
sphericalice
10c6630ffd
Remove extra spaces in battle strings 2021-12-03 19:34:03 +00:00
LOuroboros
ac606364e9
Removed ITEM_ENIGMA_BERRY_E_READER usage 2021-12-03 15:44:12 -03:00
ultima-soul
23bf41713c Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-12-01 20:17:08 -08:00
ghoulslash
fbf74a9988 fix protect struct reset 2021-12-01 15:30:07 -05:00
LOuroboros
19af517bbb Edited pointless or useless Primal Reversion code 
Also added an equivalent to GetMegaEvolutionSpecies and GetWishMegaEvolutionSpecies for Primal Reversion.
Also also modified how CanBattlerGetOrLoseItem checks for Primal Reversion.
Also also also rewrote the check that triggers Primal Reversion in TryDoEventsBeforeFirstTurn.
 2021-12-01 00:56:33 -03:00
LOuroboros
f2dd7bce99 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks 2021-11-30 20:39:58 -03:00
GriffinR
1a08d8fcb4 Add BUGFIX for roamer's status 2021-11-29 12:56:03 -05:00
ghoulslash
e731d93c0b update a couple gen 3 ability names 2021-11-29 12:46:14 -05:00
ghoulslash
7a7c6afc39 larger ability popup, fix ability name printing/clearing, and config for longer ability names 2021-11-29 12:42:01 -05:00
ghoulslash
d108f77aa4 revert ai item usage code 2021-11-28 13:12:56 -05:00
ultima-soul
0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
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
cca7ec8c58 Fix and rename GetMoveTargetType 
Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
 2021-11-24 12:09:54 +13:00
kleeenexfeu
1a3561bb0b space 2021-11-23 13:48:03 +01:00
kleeenexfeu
6ceffaaf3e recalculate turn order after relevant actions 2021-11-23 13:46:36 +01:00
BuffelSaft
a89ce0c38a Swapped webs don't trigger Defiant 
Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect?

Also, fix Sticky Web not activating Defiant.
 2021-11-23 22:54:30 +13:00
BuffelSaft
499fb8071d Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2021-11-23 17:12:24 +13:00
BuffelSaft
fa0b5188bb Dynamic move targeting 
Properly implement Expanding Force by replacing all  instances that read move target from gBattleMoves with a function.
 2021-11-23 16:56:11 +13:00
BuffelSaft
6b8f86c276 Snap Trap placeholder anims 
Set up animation data for Snap Trap so it can be easily replaced with a proper animation later.
 2021-11-23 11:05:36 +13:00
BuffelSaft
ff60882b29 Requested changes 2021-11-23 11:04:39 +13: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
BuffelSaft
50d0cd52e8 Clean up Corrosive Gas 
Remove code and unused move effect.
 2021-11-22 15:13:54 +13:00
BuffelSaft
d2eb5f0e61 Remove shell trap effect code 
Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.
 2021-11-22 14:46:47 +13:00
BuffelSaft
42b8f18cb1 Remove Corrosive Gas code 
This was not working at all in testing, so it can be done by a separate PR later.
 2021-11-22 14:35:01 +13:00
BuffelSaft
70f0018c08 Partially implement Shell Trap 
Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.
 2021-11-22 14:14:41 +13:00
W1serV1ser
5d1228fc2e More spacing and format fixes 2021-11-21 15:42:31 -08: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
BuffelSaft
abb67e96e8 Finish Expanding Force 
Hits both foes if the user is affected by Psychic Terrain. Modified targeting is also shown in the move selection screen.
 2021-11-21 21:49:47 +13:00
BuffelSaft
bcaa17ffb3 Finish/tidy up Court Change 
Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.
 2021-11-21 17:20:45 +13: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
W1serV1ser
844a0217f7 Fixed spacing, added braces, and reverted comment 2021-11-20 12:04:21 -08:00
W1serV1ser
c2f81cd5f5 Added Sky Drop 2021-11-20 11:44:48 -08: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
14a2e86313 Fix Scale Shot 
Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.
 2021-11-19 21:57:32 +13:00
BuffelSaft
48c91d03cd Fix terrain checks on DLC moves 
Expanding Force and Rising Voltage now boost damage correctly. Expanding Force doesn't hit both targets yet however.
 2021-11-19 20:20:16 +13:00
BuffelSaft
86efd69370 Finish/fix Beak Blast 
This was not working at all, but the basic framework was there; some small changes tidied it up and made it work.
 2021-11-19 20:19:10 +13:00
BuffelSaft
98712e576e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2021-11-19 17:48:11 +13: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
LOuroboros
5c485d9769 Fixed Fling when gLastUsedItem is 0 
Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.
 2021-11-15 14:02:33 -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
LOuroboros
de74177966 Oops 2021-11-15 12:52:05 -03:00
kleeenexfeu
ea34d4694d
PartyBattlerShouldAvoidHazards fix 
AI was loading and modifying wrong data in the RAM
 2021-11-15 16:48:44 +01:00
LOuroboros
a01fd2eb7a Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2021-11-15 12:47:26 -03: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
LOuroboros
cbb6639f8d Fling tweaks 
-Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER)
-Updated BattleScript_EffectFling following Smogon's description of Fling's effect.
-Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect
-No need to define flingPower when its value is 0
-Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes.
-Added a preproc config for Klutz.
 2021-11-15 12:40:10 -03: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
LOuroboros
2fe015e5ce Implemented Fling 2021-11-13 10:27:05 -03: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
Eduardo Quezada D'Ottone
a7870dbef0
Merge branch 'battle_engine' into magician 2021-11-12 19:40:34 -03: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
ghoulslash
2ff9c2f834 remove test code 2021-11-12 13:00:28 -05:00
ghoulslash
a26da51e9d fix contrary animations for MOVE_EFFECT_statchange 2021-11-12 12:44:45 -05:00
GriffinR
004d1cab3f Clean up pokenav conditions doc 2021-11-12 11:13:49 -05:00
GriffinR
35aeff1b6d Rename pokenav conditions files 2021-11-12 11:07:52 -05:00
GriffinR
f5152094a9 Finish pokenav conditions doc 2021-11-12 11:01:22 -05:00
ghoulslash
201a38f487 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/ai_updates 2021-11-12 08:13:21 -05:00
ghoulslash
276b454b40 primal weather checks 2021-11-12 08:13:17 -05:00
ghoulslash
6214d8b625 rename config 2021-11-12 07:47:24 -05:00
BuffelSaft
bdbdd0564f Fix Knock Off, add config 
Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.
 2021-11-12 21:05:42 +13:00
ghoulslash
adc1413d98 add kings rock serene grace boost config 2021-11-11 17:48:15 -05:00
ghoulslash
e2e43444ad
Merge pull request #1882 from kleeenexfeu/battle_engine 
Serene Grace affects King's rock
 2021-11-11 16:43:08 -05:00
ghoulslash
3336ba811f
Merge pull request #1878 from BuffelSaft/big-pecks 
Fix Big Pecks
 2021-11-11 16:36:28 -05:00
ghoulslash
3976d982ff fix AI_ShouldHeal speed check 2021-11-11 16:35:10 -05:00
ghoulslash
65cb371104 fix needing to 'run' twice 2021-11-11 16:16:46 -05:00
ghoulslash
2fac38cc83 merge w be 2021-11-11 16:16:26 -05:00
GriffinR
7efdc0902b Finish condition graph doc 2021-11-11 15:29:15 -05:00
ultima-soul
fd4d0db912 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into ball_effects 2021-11-10 18:02:00 -08:00
GriffinR
4590887359 Clean up some register constant use 2021-11-10 17:01:21 -05:00
GriffinR
343ac99049 Start pokenav conditions doc 2021-11-10 17:00:54 -05:00
kleeenexfeu
59abb0ff4e
Serene Grace affects King's rock 
according to https://bulbapedia.bulbagarden.net/wiki/King%27s_Rock
 2021-11-10 20:45:39 +01:00
GriffinR
57be596ce4 Fix calcrom partial doc becoming negative 2021-11-10 13:14:11 -05:00
GriffinR
342b7da5d3 Fix CRY_MODE_ECHO 2021-11-10 11:59:15 -05:00
BuffelSaft
e47317aa73 Fix Big Pecks 
ChangeStatBuffs was missing a check for Big Pecks.
 2021-11-10 21:24:48 +13:00
BuffelSaft
e637714e1b Requested changes 
Various bug fixes, syntax corrections etc.
 2021-11-10 21:11:15 +13:00
GriffinR
ef935f6f4a
Merge pull request #1544 from GriffinRichards/romheadergf 
Split headers from crt0.s
 2021-11-09 23:54:57 -05:00
BuffelSaft
e2599c2469 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-10 14:31:32 +13:00
GriffinR
8e424b6985
Merge branch 'master' into doc-binterface 2021-11-09 16:09:48 -05:00
GriffinR
43e942c3af Clean up pokenav ribbons 2021-11-09 12:50:35 -05:00
kleeenexfeu
d3abd20dfb
Fix heat crash/heavy slam calculation 2021-11-09 18:12:40 +01:00
ghoulslash
e635930a15 fixes 2021-11-08 21:33:00 -05:00
ghoulslash
6f6e0d6baf add recycle hp berry logic 2021-11-08 21:27:40 -05:00
GriffinR
1c82571fa0
Merge pull request #1542 from GriffinRichards/doc-menu 
Document menu
 2021-11-08 21:23:21 -05:00
GriffinR
adf773f1ed Document remainder of save.c 2021-11-08 19:45:14 -05:00
GriffinR
ab1074e629 Label unknown palette functions 2021-11-08 16:08:36 -05:00
GriffinR
684f599a44 Label remaining battle_interface symbols 2021-11-08 16:03:44 -05:00
GriffinR
e3b6337c3a Finish battle_anim_mons doc 2021-11-08 14:29:37 -05:00
ghoulslash
4566b5234f magic guard user doesnt care about rocky helmet 2021-11-08 11:56:51 -05:00
ghoulslash
01cf8e6452 add AI_MoveMakesContact, dissuade multi-hit attacks against rocky helmet 2021-11-08 11:55:06 -05:00
GriffinR
ae2602b5a5 Add missing BATTLER_COORD usage 2021-11-08 11:54:29 -05:00
GriffinR
d20341646a Start battle_anim_mons doc 2021-11-08 11:46:13 -05:00
ghoulslash
e5a0630596 add ai flag checks alongside CanFaintTarget 2021-11-08 11:42:32 -05:00
ghoulslash
8f320a8d33 some ai updates, recycle + ripen logic 2021-11-08 11:37:41 -05:00
GriffinR
1548e902cd Add MonCoods size macro 2021-11-08 09:41:23 -05:00
BuffelSaft
03cab2058a Fix goof, make AI check PP in move limitations 
Was skipping valid moves instead of invalid ones in CanAIFaintTarget. Also, remove all instances of ~MOVE_LIMITATION_PP from the AI as it seemed detrimental.
 2021-11-08 23:57:16 +13:00
Blackforest92
76ba9d835a pulled latest RHH battle_engine 08-11-2021 2021-11-08 16:38:42 +07:00