4691 Commits

Author SHA1 Message Date
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
LOuroboros
a8a8c7e2fa Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-01-23 02:37:07 -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
LOuroboros
367ba2d5bf Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into flingIE 2022-01-22 05:39:48 -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
fb81d9ad4a Correct map data comment 2022-01-20 23:26:39 -05:00
Eduardo Quezada D'Ottone
7d75e16312 Small documentation and cleanup 2022-01-20 12:25:48 -03: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
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
225147a94f Document Spinda spot algorithm 2022-01-17 15:34:18 -05:00
Eduardo Quezada D'Ottone
925f65c450 Realigned config to previous state 2022-01-16 21:10:09 -03: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
LOuroboros
a4d31da923
Updated the value of MAX_MAP_DATA_SIZE 2022-01-16 19:22:28 -03:00
Eduardo Quezada D'Ottone
02da6cc627 Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb
# Conflicts:
#	include/graphics.h
#	src/data/graphics/items.h
#	src/data/item_icon_table.h
#	src/data/items.h
#	src/data/text/item_descriptions.h
2022-01-16 18:44:03 -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
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician 2022-01-15 13:06:13 -03:00
Eduardo Quezada D'Ottone
b86694876c
Merge pull request #1508 from Scott-Bonner/get_ability
Handle GetAbilityBySpecies edge cases
2022-01-15 12:56:50 -03:00
ghoulslash
a0aaad2856
Merge pull request #2016 from AsparagusEduardo/PE_genderDiff
Optimized SpeciesHasGenderDifference into Base Stat flag
2022-01-13 11:55:29 -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
ghoulslash
035b2332af cache ai damage, effectiveness calcs 2022-01-13 11:28:27 -05:00
LOuroboros
a4f0de5106 Removed the last bits of HOLD_EFFECT_GRACIDEA 2022-01-12 01:54:29 -03:00
LOuroboros
b2965e5522 Added a pause to BattleScript_ProteanActivates 2022-01-11 20:15:47 -03:00
GriffinR
694aa3c65d Move balls, shop, link, map popups, and bag out of interface 2022-01-11 13:53:23 -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
GriffinR
8b920691e6 Fix FLAG_DECORATION_0 name 2022-01-09 01:31:42 -05:00
LOuroboros
5281fe63fc
Update NUM_TECHNICAL_MACHINES 2022-01-08 21:27:29 -03: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
5d033c2e4d Convert pokedex defines to enums 2022-01-05 12:18:49 -05:00
GriffinR
ce55e58ad8 Misc cleanup 2022-01-04 10:09:42 -05:00
TheXaman
44a6c4c0ec changed EGG_MOVES_ARRAY_COUN to 19 to include all the added egg moves (19 is max value (Buneary)) 2022-01-04 00:23:24 +01:00
Eduardo Quezada D'Ottone
4f9e6faa48
Merge branch 'item_expansion' into flingIE 2022-01-02 18:31:03 -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
Eduardo Quezada D'Ottone
3bbaf5a15d Optimized SpeciesHasGenderDifference into Base Stat flag 2022-01-01 19:24:34 -03:00
LOuroboros
74aa4f29df Corrections and additions
-Fixed a handful of prices
-Re-added the Todo comment to the entries of the TMs 51-100 in gItemIconTable.
-Added the data and sprites of the LGPE Lures, thanks to AsparagusEduardo.
-Fixed small syntax mistakes in src/data/text/item_descriptions.h
-Slightly changed some item descriptions based on AsparagusEduardo's suggestions.
-Fixed the Exp. Charm's description, and the usage of "Exp." in the Exp. Candies' descriptions.
2022-01-01 17:17:21 -03:00
Eduardo Quezada D'Ottone
b25c89f8a1 Removed Redundant Key Stone item 2021-12-31 18:22:23 -03:00
LOuroboros
9b1fd796ae Gave the Gracidea's old hold effect slot to the Enigma Berry 2021-12-31 18:07:33 -03:00
Eduardo Quezada D'Ottone
313df31e7e Removed Jade Orb, since it has no use besides being a key-lock item. 2021-12-31 17:44:03 -03:00