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
ghoulslash
f3b9e6bb63
Merge pull request #1976 from kleeenexfeu/patch-2 
[battle_engine]  Moxie interaction with spread move/follow me fix
 2022-01-16 10:58:50 -05:00
GriffinR
755d9143a6
Merge pull request #1600 from GriffinRichards/remove-berry-fix 
Remove berry fix
 2022-01-15 12:20:22 -05:00
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician 2022-01-15 13:06:13 -03:00
GriffinR
bd43b905b7 Apply palettes to some field effect pngs 2022-01-14 12:51:13 -05:00
GriffinR
4dec9b83a3 Move more graphics out of misc 2022-01-14 12:29:30 -05:00
Eduardo Quezada D'Ottone
80c1e11245 Merge branch 'BattleEngine' into BE_Instruct 
# Conflicts:
#	src/battle_script_commands.c
 2022-01-13 20:13:01 -03:00
GriffinR
fd7457b05a Remove berry fix 2022-01-13 15:26:20 -05:00
ghoulslash
2b69b02724
Merge pull request #2017 from AsparagusEduardo/BE_forbiddenAssist 
Extrapolated Assist forbidden flags to Gen 8 moves
 2022-01-13 11:52:11 -05:00
ghoulslash
cbb4bca49a
Merge pull request #2028 from AsparagusEduardo/BE_AnchorShot 
Fixed Anchor Shot description.
 2022-01-13 11:43:39 -05:00
ghoulslash
46c2a9ada5
Merge pull request #2033 from LOuroboros/galarianZenMode 
Allow Galarian Darmanitan's Zen Mode to work
 2022-01-13 11:42:54 -05:00
ghoulslash
543252bc6c
Merge pull request #2034 from LOuroboros/proteanMsgboxFlush 
Tweaked Protean's effect's InGame appearance
 2022-01-13 11:42:31 -05:00
LOuroboros
a4f0de5106 Removed the last bits of HOLD_EFFECT_GRACIDEA 2022-01-12 01:54:29 -03:00
LOuroboros
bee4019d22 Tweaked Protean's effect's InGame appearance 2022-01-11 19:52:51 -03:00
GriffinR
01af8e877f Move starter choose out of interface/misc 2022-01-11 17:49:08 -05:00
GriffinR
694aa3c65d Move balls, shop, link, map popups, and bag out of interface 2022-01-11 13:53:23 -05:00
GriffinR
fa2d25d366
Merge pull request #1594 from GriffinRichards/pokestorage-clean 
Misc pokemon_storage_system cleanup
 2022-01-11 12:26:02 -05:00
GriffinR
d782d3544d Move pokeblock graphics out of interface 2022-01-11 11:46:58 -05:00
GriffinR
565dd24309 Move party menu graphics out of interface 2022-01-11 11:37:13 -05:00
GriffinR
7103839a61 Move summary screen graphics out of interface, fix some names 2022-01-11 11:22:45 -05:00
GriffinR
fde18b4774 Fix berry crusher graphics name 2022-01-11 10:42:00 -05:00
GriffinR
0a78cb5c9e Fix some battle dome graphics names 2022-01-11 10:04:47 -05:00
LOuroboros
24b5a5709a Allow Galarian Darmanitan's Zen Mode to work 2022-01-10 23:01:18 -03:00
GriffinR
4024b3f1b3
Merge pull request #1590 from GriffinRichards/dex-enum 
Convert pokedex defines to enums
 2022-01-10 14:56:26 -05:00
LOuroboros
352523403a
Fixed usage of B_MULTI_BATTLE_WHITEOUT 2022-01-09 14:57:45 -03:00
GriffinR
429d53b95c Use runningState directly in CheckMovementInputNotOnBike 2022-01-09 11:12:35 -05:00
GriffinR
8b920691e6 Fix FLAG_DECORATION_0 name 2022-01-09 01:31:42 -05:00
GriffinR
8f1a760937 Add missing array constants in field_player_avatar 2022-01-08 23:55:26 -05:00
Eduardo Quezada D'Ottone
f6b32c8d17 Fixed Anchor Shot description. 2022-01-08 20:19:53 -03:00
sphericalice
6a21c3f5f3
Remove unneeded brackets in GetWeekCount 2022-01-08 20:39:45 +00:00
Eduardo Quezada D'Ottone
eba4c36189
Merge pull request #2024 from TheXaman/rhh_BE_B_SLEEP_TURNS 
Yawn now uses B_SLEEP_TURNS
 2022-01-07 21:56:06 -03:00
GriffinR
ca9bc34bea Clean up pokemon_storage_system graphics 2022-01-07 17:36:38 -05:00
GriffinR
5cbe572607 Add window constants in pokemon_storage_system 2022-01-07 17:05:58 -05:00
Eduardo Quezada D'Ottone
97baedbd5e
Merge pull request #1923 from WiserVisor/battle_engine 
Added Sky Drop to Battle Engine
 2022-01-07 18:14:40 -03:00
GriffinR
577e6cc740
Merge pull request #1586 from GriffinRichards/clean-areascreen 
Clean up pokedex_area_screen
 2022-01-06 23:02:23 -05:00
GriffinR
713cd6616e Add glow tile empty 2022-01-06 22:33:00 -05:00
kiliwily
8a9740b819 Update field_specials.c 2022-01-06 19:47:56 +01:00
kiliwily
ba9b533845 Revert "Update field_specials.c" 
This reverts commit f67137ddb2.
 2022-01-06 19:45:38 +01:00
kiliwily
f67137ddb2 Update field_specials.c 2022-01-06 19:29:58 +01:00
GriffinR
d4111d5520 Add comment about pokedex reordering 2022-01-05 14:50:19 -05:00
TheXaman
328b501394
Update src/battle_util.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-01-05 18:54:42 +01:00
TheXaman
9733f92c7f Yawn now uses B_SLEEP_TURNS, resolves #1873 2022-01-05 18:48:01 +01:00
GriffinR
5d033c2e4d Convert pokedex defines to enums 2022-01-05 12:18:49 -05:00
W1serV1ser
178c4c66ba Fixed gSideTimers typo 2022-01-04 12:38:50 -08:00
W1serV1ser
66faa6aa15 Follow Me/Rage Powder effect on target goes away once affected by Sky Drop 2022-01-04 12:33:31 -08:00
GriffinR
ce55e58ad8 Misc cleanup 2022-01-04 10:09:42 -05:00
sphericalice
48bf1ab98d
Use SPECIES_NONE and ITEM_NONE in battle_tower.c 2022-01-04 13:46:46 +00:00
sphericalice
2d536bf560
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu 2022-01-02 21:02:53 +00:00
Eduardo Quezada D'Ottone
d433d67558 Extrapolated Assist forbidden flags to Gen 8 moves 2022-01-01 20:21:29 -03:00
Eduardo Quezada D'Ottone
221e38ff86
Merge pull request #1957 from ghoulslash/be/ability_popup 
Ability Popup Fixes + Longer Ability Names config
 2022-01-01 19:39:55 -03:00
sphericalice
61a0036c47
Clarify ScrollableMultichoice_ProcessInput comment 2021-12-31 17:34:46 +00:00
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