Commit Graph

10401 Commits

Author SHA1 Message Date
GriffinR
fb81d9ad4a Correct map data comment 2022-01-20 23:26:39 -05:00
ghoulslash
da6543f8fd
Merge pull request #2014 from AsparagusEduardo/IE_noJadeOrb
Removed Jade Orb and Key Stone items
2022-01-20 19:43:57 -05:00
ghoulslash
1710d3e2ed
Merge pull request #2038 from AsparagusEduardo/BE_PEFlag
Fixed Pokémon Expansion flag name in Battle Engine
2022-01-20 19:43:28 -05:00
GriffinR
8743172686
Merge pull request #1612 from AsparagusEduardo/pret_misc
Small documentation and cleanup
2022-01-20 12:11:27 -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
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
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
GriffinR
14a11899cf
Merge pull request #1603 from LOuroboros/patch-2
Updated the value of MAX_MAP_DATA_SIZE
2022-01-16 17:37:26 -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
ddfc3502f7 Fixed Pokémon Expansion flag name 2022-01-16 17:21:05 -03:00
Eduardo Quezada D'Ottone
8ce9b2241a
Merge pull request #2037 from ghoulslash/be/harvest
Fix harvest activation msg
2022-01-16 16:34:49 -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
GriffinR
60162a98b9
Merge pull request #1602 from GriffinRichards/charmap-quote
Allow right single quotation mark in charmap
2022-01-16 13:55:16 -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
6d6ff91268 Allow right single quotation mark in charmap 2022-01-16 10:29:15 -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
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
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
GriffinR
9ded1eb14e
Merge pull request #1598 from atasro2/master
Give sensical names to Unused_AdjustBgMosaic
2022-01-14 09:12:05 -05:00
MCboy
1a33187bad
Move enum to bg.h 2022-01-14 13:48:46 +03:30
MCboy
998900bd1b
Give sensical names to Unused_AdjustBgMosaic 2022-01-14 13:37:27 +03:30
ghoulslash
d7432ed684
Merge pull request #2011 from AsparagusEduardo/BE_Instruct
Refactored Instruct to use the regular forbidden move lookup table
2022-01-13 19:29:44 -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
a0aaad2856
Merge pull request #2016 from AsparagusEduardo/PE_genderDiff
Optimized SpeciesHasGenderDifference into Base Stat flag
2022-01-13 11:55:29 -05:00
ghoulslash
be3d9c1c6d
Merge pull request #2015 from AsparagusEduardo/RHH_discord
Updated README.md in master
2022-01-13 11:54:40 -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
6603149727
Merge pull request #2021 from AsparagusEduardo/PE_elevations
Adjusted battle elevations for certain species
2022-01-13 11:45:57 -05:00
ghoulslash
c5439369a2
Merge pull request #2029 from AsparagusEduardo/PE_FixIcon
Fixed Wormadam sprite. Credit to Jaizu
2022-01-13 11:43:57 -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
GriffinR
f899a02ac6 Use MON_GIVEN_TO_ constants for givemon 2022-01-12 18:34:26 -05:00