Commit Graph

6681 Commits

Author SHA1 Message Date
ghoulslash
2782e816a4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/psychoshift 2022-02-09 14:31:46 -05:00
ghoulslash
209279c207 fix psycho shift string printing 2022-02-09 14:30:30 -05:00
ghoulslash
fcc85e8c17 fix AI_WhoStrikesFirst 2022-02-09 11:23:30 -05:00
kiliwily
a86a279184 Update money.c 2022-02-06 16:25:56 +01:00
ghoulslash
36a824d8ab fix ability pop up for quick draw 2022-02-03 17:30:32 -05:00
GriffinR
7d2344c07b
Merge pull request #1616 from GriffinRichards/missing-req
Add missing :req, remove old macros
2022-02-02 22:09:36 -05:00
Eduardo Quezada D'Ottone
5dc6f1caa4
Merge pull request #2047 from SubzeroEclipse/BE_decaps
Decapitalization of some battle strings
2022-02-01 14:57:52 -03:00
SubzeroEclipse
b946775e50 Fixed some new battle strings 2022-02-01 13:19:07 +01:00
GriffinR
1ff0b0efa9 Add missing collision constant usage 2022-01-29 21:13:46 -05:00
LOuroboros
ef3db02c22
Updated GetBallThrowableState 2022-01-29 12:30:40 -03:00
SubzeroEclipse
5f33989c42 Fixed format of move descriptions' labels 2022-01-27 21:50:12 +01:00
BuffelSaft
9d1800f53e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-01-27 17:18:51 +13:00
GriffinR
e30b16f0fd Fix Swap_HandleQuitSwappingResposne typo 2022-01-26 21:50:15 -05:00
LOuroboros
88b7326325 Ported the IE's flingPower item field and ItemId_GetFlingPower 2022-01-26 21:48:01 -03:00
LOuroboros
21244d6393 Modified and moved IsPinchBerryItemEffect 2022-01-26 21:45:24 -03:00
GriffinR
2efbd5f549
Merge pull request #1608 from GriffinRichards/fix-fieldmap
Fix some incorrect fieldmap names
2022-01-26 17:51:56 -05:00
LOuroboros
6470b0d004 Used ball constants in gBallSpriteTemplates 2022-01-26 18:36:21 -03:00
LOuroboros
b33f7aed8d Oopsie 2022-01-25 23:31:23 -03:00
LOuroboros
7916ff5f47 Further updated CanFling 2022-01-25 21:02:26 -03:00
GriffinR
2495d18132 Add missing :req, remove old macros 2022-01-23 18:52:04 -05:00
ghoulslash
bc94a2bb16
Merge pull request #1979 from AsparagusEduardo/BE_wildNaturalEnemies
Wild mon natural enemies in double wild battles
2022-01-23 18:43:12 -05:00
LOuroboros
8eaf0718ec Review changes
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
2022-01-23 19:13:04 -03:00
ghoulslash
a165f9926d canbestatused for psycho shift 2022-01-23 13:46:30 -05:00
ghoulslash
3e1ddf6b93
Merge pull request #2042 from AsparagusEduardo/BE_unnerveChecks
Removed redundant checks for Unnerve
2022-01-23 13:22:52 -05:00
LOuroboros
a8a8c7e2fa Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-01-23 02:37:07 -03:00
Kurausukun
317e302147 fix inconsistent indentation 2022-01-22 19:43:11 -05:00
Kurausukun
a83e41b2cc move m4a track definitions 2022-01-22 19:37:46 -05:00
Eduardo Quezada D'Ottone
60f46a710c Removed redundant checks for Unnerve 2022-01-22 21:04:59 -03:00
Eduardo Quezada D'Ottone
b7df21b263 Optimized use of GetBattlerAbility 2022-01-22 20:25:51 -03:00
Eduardo Quezada D'Ottone
e880e4afdd
Merge branch 'battle_engine' into be_recalc_turn_order_after_actions 2022-01-22 19:01:45 -03:00
Eduardo Quezada D'Ottone
f42c4cd689
Merge pull request #1734 from ghoulslash/magician
Magician
2022-01-21 16:03:15 -03:00
GriffinR
3d0326106e Z coord / height -> elevation 2022-01-21 12:48:19 -05:00
GriffinR
79dfac92c9
Merge pull request #1604 from GriffinRichards/clean-spinda
Document Spinda spot algorithm
2022-01-21 09:55:43 -05:00
GriffinR
062cdbe01c
Merge pull request #1599 from GriffinRichards/fix-tilemaps
Break up graphics/interface and graphics/misc
2022-01-20 08:53:44 -05:00
GriffinR
a7e6045d71
Merge pull request #1597 from GriffinRichards/misc-cleanup
Miscellaneous fixes
2022-01-19 22:17:37 -05:00
GriffinR
c4f33f2b2b TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE 2022-01-19 12:54:55 -05:00
GriffinR
e682c12519 sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE 2022-01-19 12:39:11 -05:00
GriffinR
e3b49604d4 Use metatile layer constants in shop 2022-01-19 10:59:37 -05:00
GriffinR
8200fda14e Fix decorations metatile attribute names 2022-01-19 10:56:54 -05:00
GriffinR
a8b466dc80 Disambiguate fieldmap names 2022-01-19 10:15:32 -05:00
GriffinR
f127e64a3c Name overworld tilemaps for their bg, add layer type constants 2022-01-19 09:37:12 -05:00
GriffinR
30d9704418 Specify unsigned in spot comment 2022-01-17 17:27:17 -05:00
GriffinR
313f14ed63 Add Spinda spot color constants 2022-01-17 17:00:18 -05:00
GriffinR
177863da47 Fix typo 2022-01-17 16:04:02 -05:00
GriffinR
225147a94f Document Spinda spot algorithm 2022-01-17 15:34:18 -05:00
GriffinR
69759b2d12
Merge pull request #1601 from GriffinRichards/fix-decor-flag
Fix FLAG_DECORATION_0 name
2022-01-16 17:44:58 -05:00
Eduardo Quezada D'Ottone
ddfc3502f7 Fixed Pokémon Expansion flag name 2022-01-16 17:21:05 -03:00
Eduardo Quezada D'Ottone
d40119010e Merge branch 'BattleEngine' into BE_wildNaturalEnemies
# Conflicts:
#	include/constants/battle_config.h
2022-01-16 16:23:12 -03:00
GriffinR
dad4132762
Merge pull request #1596 from GriffinRichards/player-avatar-arr-const
Add missing array constants in field_player_avatar
2022-01-16 14:03:20 -05:00
ghoulslash
7182f290c1 fix harvest activation msg 2022-01-16 12:39:08 -05:00
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