Bassoonian
4034f18c0e
Update PLA descriptions
2022-11-18 22:30:40 +01:00
Bassoonian
739680e425
Victory Dance effect
2022-11-18 22:23:34 +01:00
Bassoonian
29ae22183b
Mystical Power effect
2022-11-18 22:17:08 +01:00
Bassoonian
9512b3a57a
Implement Double Shock functionality with temporary string
2022-11-18 22:12:26 +01:00
Bassoonian
a250341e6c
Forgot to reset Wicked Torque effect rate
2022-11-18 22:00:46 +01:00
Bassoonian
3ac3cb249e
Wicked Torque effect
2022-11-18 22:00:21 +01:00
Bassoonian
d4c92a0a19
Fix Bitter Malice's effect
2022-11-18 21:54:46 +01:00
Bassoonian
ed33f2b9ce
Change PLA moves to SV effects
2022-11-18 20:56:25 +01:00
Bassoonian
e279185152
Update move data to GEN9 (with config)
2022-11-18 12:22:15 +01:00
Bassoonian
f7d1a12d2d
Data entry for gen9 moves
2022-11-18 12:15:44 +01:00
LOuroboros
7260478c54
Uncommented level up moves
2022-11-11 01:31:22 -03:00
Eduardo Quezada
f2d0e547ac
Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030
...
# Conflicts:
# src/rom_header_gf.c
2022-11-09 19:54:44 -03:00
GriffinR
e434b0047f
More missing constant usage
2022-11-09 15:53:47 -05:00
GriffinR
1d1c2d41bb
Add list menu cursor constants
2022-11-09 15:16:46 -05:00
GriffinR
b3e75138da
Sync wireless improvements
2022-11-09 15:14:18 -05:00
BuffelSaft
1da4eb3b14
Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid
...
Config for Dark Void being only usable by Darkrai
2022-11-05 22:42:51 +13:00
Eduardo Quezada
44bf4a15e3
Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald
...
# Conflicts:
# include/constants/battle_config.h
# include/constants/battle_move_effects.h
2022-11-04 12:19:40 -03:00
Eduardo Quezada
d23b5c95c9
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations
...
# Conflicts:
# src/data/pokemon_graphics/front_pic_anims.h
# src/pokemon.c
2022-11-03 23:31:20 -03:00
Eduardo Quezada
edf4e45c4d
Config for Dark Void being only usable by Darkrai
2022-11-03 21:36:12 -03:00
Eduardo Quezada D'Ottone
b8371500d3
Merge pull request #1676 from BuffelSaft/multistrike
...
Multi-hit refactor and Parental Bond
2022-11-01 21:16:04 -03:00
ghoulslash
53061c7d62
Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney
...
Implemented Honey's Sweet Scent functionality
2022-11-01 20:09:30 -04:00
Eduardo Quezada
14e85249d1
Review changes
2022-10-30 17:12:13 -03:00
Eduardo Quezada
d02fc43703
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
2022-10-30 13:38:25 -03:00
GriffinR
d90132842a
Update gitignore/spacing for new region map data
2022-10-30 12:22:41 -04:00
Eduardo Quezada
e4a439aa46
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
...
# Conflicts:
# src/data/bard_music/moves.h
# src/data/bard_music/pokemon.h
2022-10-30 12:30:38 -03:00
Eduardo Quezada
3172273c73
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures
...
# Conflicts:
# src/pokemon.c
2022-10-30 12:16:09 -03:00
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5
...
Update for Porymap 5.0.0
2022-10-30 11:01:37 -04:00
Eduardo Quezada
85c0d2dac8
Review changes
2022-10-27 11:26:09 -03:00
Eduardo Quezada
85ce30b1d6
Created macros for Bard Sounds
2022-10-25 14:33:02 -03:00
Eduardo Quezada
3ed485632f
Renamed gBaseStats to gSpeciesInfo
2022-10-24 17:01:48 -03:00
BuffelSaft
6035c5a280
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-10-22 14:31:13 +13:00
GriffinR
3e8baa5b04
Merge branch 'master' into porymap-5
2022-10-18 22:54:25 -04:00
Eduardo Quezada D'Ottone
1607291982
Implemented Honey's Sweet Scent functionality
2022-10-16 20:20:13 -03:00
LOuroboros
8a1a561b80
Uncommented evo moves for each species
2022-10-14 11:28:15 -03:00
GriffinR
60e1ad20e4
Add NUM_MON_PIC_FRAMES, and trainer pic size constants
2022-10-10 23:16:08 -04:00
GriffinR
bd023b1c6c
Merge pull request #1796 from GriffinRichards/tilesets-c
...
Convert tilesets.s to C
2022-10-10 12:47:47 -04:00
GriffinR
65d3944a93
Give tileset palettes proper type, name compressed secret base tiles
2022-10-08 02:02:12 -04:00
Eduardo Quezada
77f24d42e4
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald
...
# Conflicts:
# include/constants/battle_config.h
2022-10-07 15:39:02 -03:00
Eduardo Quezada
44754f8ca7
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2
...
# Conflicts:
# include/constants/pokemon_config.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
2022-10-07 15:27:16 -03:00
Eduardo Quezada
68b474c0f0
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
...
# Conflicts:
# include/constants/items.h
# src/battle_interface.c
2022-10-07 14:52:32 -03:00
Eduardo Quezada
9b977486fe
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig
...
# Conflicts:
# src/data/pokemon/base_stats.h
2022-10-07 14:05:45 -03:00
ghoulslash
441586f23f
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags
...
4 new species flags
2022-10-07 10:55:43 -04:00
ghoulslash
1e04c80dfa
Merge pull request #2367 from AsparagusEduardo/RHH/pr/feature/MewTeach
...
Special handling for Mew's Teachable moveset
2022-10-07 10:39:56 -04:00
ghoulslash
923046c993
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925
...
I don't have any Sunday memes (pret merge 2022-09-25)
2022-10-07 10:25:59 -04:00
GriffinR
e293986fbb
Merge pull request #1793 from GriffinRichards/clean-shop
...
Clean up shop.c
2022-10-06 17:24:53 -04:00
GriffinR
1f225286d5
Use window constants in party_menu
2022-09-29 12:55:31 -04:00
Eduardo Quezada
90ad11278d
Sorry Mewtwo ^^;
2022-09-28 09:17:10 -03:00
Eduardo Quezada
d24899369f
Special handling for Mew's Teachable moveset
2022-09-28 09:04:31 -03:00
GriffinR
6db489e2d5
Use constants for overworld object palette slots
2022-09-27 20:16:48 -04:00
GriffinR
4f407a1066
Convert tilesets.s to C
2022-09-27 17:23:26 -04:00
Eduardo Quezada
ecad6ff0db
Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2
2022-09-27 10:46:49 -03:00
Eduardo Quezada
fb9105f8ac
Added Mega Evolution flag
2022-09-27 10:21:26 -03:00
Eduardo Quezada
3d214f8204
Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags
...
# Conflicts:
# src/pokemon.c
2022-09-27 10:13:32 -03:00
Eduardo Quezada
dfdfb72365
Separate config for updated move types
2022-09-26 07:50:43 -03:00
GriffinR
f0744641d1
Merge pull request #1651 from garakmon/entry_json
...
use json for region map sections
2022-09-25 21:56:09 -04:00
GriffinR
171367d66c
Merge pull request #1643 from cbt6/object-event-graphics-info
...
Format object event graphics info
2022-09-25 21:55:22 -04:00
GriffinR
56c28fb2dd
Move region map gitignore to existing data gitignore
2022-09-25 18:15:16 -04:00
GriffinR
e473aaf783
Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json
2022-09-25 18:10:04 -04:00
GriffinR
7223dbd62f
Merge branch 'master' into rme-update
2022-09-25 11:56:57 -04:00
Eduardo Quezada
f969effd36
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone
d59d8b92af
Merge branch 'dev' into AI
2022-09-24 11:07:09 -03:00
GriffinR
1107ff954d
Clean up shop.c
2022-09-22 15:08:17 -04:00
GriffinR
9bcc36fe08
Merge pull request #1767 from GriffinRichards/trainer-pals
...
Generate trainer pic palettes from image
2022-09-22 11:34:03 -04:00
Eduardo Quezada D'Ottone
681ad8c7a9
Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig
...
# Conflicts:
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
# src/data/pokemon/form_species_table_pointers.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
2022-09-18 18:25:05 -03:00
Eduardo Quezada
720cb249d6
Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald
...
# Conflicts:
# include/constants/battle_config.h
2022-09-16 12:06:06 -03:00
Eduardo Quezada
6b79c7772c
Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# src/battle_interface.c
2022-09-16 11:56:50 -03:00
Eduardo Quezada
77696ca686
Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change
2022-09-16 10:31:02 -03:00
ghoulslash
6616c89451
Merge pull request #2303 from Blackforest92/RHH-PR-Branch
...
Tidying graphics - Trio Weather
2022-09-15 18:01:43 -04:00
ghoulslash
6cfacb396e
Merge pull request #2307 from AsparagusEduardo/RHH/pr/debugMapCount
...
Automated creation of MAP_GROUP_COUNT for the debug menu
2022-09-15 18:01:05 -04:00
Eduardo Quezada
41d11b0708
Restored filename format for gendered species
2022-09-14 11:13:42 -03:00
Eduardo Quezada
ee628de82f
Config to turn off Hippopotas' and Hippowdon's female icons
2022-09-13 21:42:53 -03:00
Eduardo Quezada
0caf79f702
Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2
...
# Conflicts:
# graphics/pokemon/cherrim/anim_front.png
# graphics/pokemon/scyther/anim_front.png
# graphics/pokemon/scyther/front.png
# graphics/pokemon/shinx/anim_front.png
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
2022-09-13 20:44:49 -03:00
Eduardo Quezada
de32940fdf
Further removed trailing whitespaces
2022-09-13 16:26:36 -03:00
Eduardo Quezada
1d7e8bd730
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
2022-09-13 16:22:42 -03:00
Eduardo Quezada
2d78ac0192
Implemented Lures using the same vars as repels
2022-09-12 10:21:49 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
Eduardo Quezada
69f01d73cd
Added missing uses of Fairy type for Union Room and Battle Factory
2022-09-11 12:41:56 -04:00
Jaizu
0daeee83f3
Fix Lure prices
...
This change reflects the original prices used in Pokémon let's go pikachu/eevee
2022-09-11 18:06:05 +02:00
Eduardo Quezada
4b1aca19cb
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# src/battle_controller_link_opponent.c
# src/battle_controller_opponent.c
# src/battle_controller_recorded_opponent.c
# src/battle_controllers.c
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
# src/pokemon.c
2022-09-10 00:17:03 -04:00
Eduardo Quezada
a462db5e69
Automated creation of MAP_GROUP_COUNT for the debug menu
2022-09-09 23:34:05 -04:00
Eduardo Quezada
5e399955d5
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/monAnimations
2022-09-09 17:37:23 -04:00
LOuroboros
12fee71008
Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE
2022-09-09 15:39:48 -03:00
Eduardo Quezada D'Ottone
69d3fafdcf
Merge pull request #2273 from LOuroboros/zazaForms
...
Introduced FORM_BATTLE form changes
2022-09-09 14:15:53 -04:00
Blackforest92
431cb6fa7c
Tidying graphics - Trio Weather
2022-09-09 21:57:40 +07:00
Eduardo Quezada
8449f237c2
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags
...
# Conflicts:
# src/pokemon.c
2022-09-09 09:02:35 -04:00
Eduardo Quezada
21df8c279b
Added SPECIES_FLAG_CANNOT_BE_TRADED
...
- Also corrected Cylarex's forms not having the legendary flag
2022-09-09 08:59:53 -04:00
Eduardo Quezada
1fa9bc1b5c
Adjusted style of coords tables
2022-09-08 18:32:01 -04:00
Blackforest92
3acb32acb8
Tyding graphics - Acupressure
2022-09-09 00:25:43 +07:00
Eduardo Quezada
7fe1e706b7
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig
...
# Conflicts:
# include/constants/pokemon_config.h
2022-09-08 08:52:13 -04:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes
2022-09-07 23:07:25 -04:00
LOuroboros
a7a1ab9aeb
Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD
...
There was never a reason not to.
2022-09-06 19:20:11 -03:00
LOuroboros
f1c153e469
Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD
...
There was never a reason not to.
2022-09-06 18:37:16 -03:00
Eduardo Quezada
12bb32666b
Aligned FRONTIER_MONS trainer macros with the rest for consistency
2022-09-06 17:05:56 -04:00
Eduardo Quezada
7a0838a0f2
Adjusted GetFormChangeTargetSpeciesBoxMon to allow having form changes of the same method in the same table
2022-09-06 10:53:18 -03:00
LOuroboros
0b07f4a06e
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms
2022-09-06 10:53:12 -03:00
LOuroboros
bb290d5ab0
Updates
...
-Removed the pointless param1 setting in sXerneasFormChangeTable
-Updated the descriptions of Behemoth Blade and Behemoth Bash
-Added a new parameter to the struct FormChange
-Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves".
-Added missing calls to "CalculateMonStats".
-Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake
-Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.)
Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.
2022-09-06 10:45:07 -03:00
GriffinR
c8afeea182
Generate trainer pic palettes from image
2022-09-05 16:09:45 -04:00
Eduardo Quezada
7c7da8e176
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs
...
# Conflicts:
# src/battle_script_commands.c
2022-09-05 14:43:04 -04:00
tustin2121
33f10d2139
Adding missing externs
...
If there are not externs on these forward declarations, it's entirely possible for the program to link and missing data to be assigned to someplace presumed in IWRAM or something.
2022-09-05 09:49:20 -04:00
Eduardo Quezada
d699ea3334
Fixed macro alignments
2022-09-05 08:38:35 -04:00
Eduardo Quezada
2ee843c70d
Proper label for species flags
2022-09-04 22:13:28 -03:00
Eduardo Quezada D'Ottone
c58dfa63a1
Merge remote-tracking branch 'RHH/master' into PE_monAnimations
...
# Conflicts:
# src/pokemon.c
2022-09-02 12:06:43 -04:00
LOuroboros
b9a32a93f5
Update src/data/text/move_descriptions.h
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-08-31 23:39:59 -03:00
LOuroboros
7b8226a8af
Added descriptions for LA's moves
2022-08-30 23:05:22 -03:00
LOuroboros
cc86b2fd96
Added Z-Move stats for LA's moves
2022-08-30 20:29:36 -03:00
LOuroboros
c167e2c6cc
Added Legends: Arceus' move data
2022-08-30 19:32:44 -03:00
Eduardo Quezada
925384eedc
Generations of Pokémon can now be disabled individually
2022-08-30 12:50:59 -04:00
Eduardo Quezada
e9a5442be5
Removed unused ITEM_EXPANSION constants from base stats
2022-08-30 12:50:59 -04:00
Eduardo Quezada
df4c065ea6
Separated P_NEW_POKEMON into sections by generation.
...
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
2022-08-30 12:50:59 -04:00
LOuroboros
df88317a98
Introduced FORM_BATTLE form changes
...
For species such as Xerneas and Zacian.
2022-08-29 19:10:52 -03:00
Blackforest92
b209645b20
Changes Origin to Origin Forme
2022-08-29 21:33:28 +07:00
Eduardo Quezada D'Ottone
32a1017c2d
Fixed tab
2022-08-29 10:13:01 -04:00
Blackforest92
61c33f56a0
Updated to latest master branch + add PLA's data to teachable_learnsets.h
2022-08-29 21:01:31 +07:00
Eduardo Quezada D'Ottone
8ca2f949e3
Merge pull request #2233 from gruxor/tmhm_rework
...
Reworked TMHM into expandable list format
2022-08-29 04:20:45 -04:00
Blackforest92
d6998d4579
Edited PLA' pokedex_text.h
2022-08-28 19:55:45 +07:00
Eduardo Quezada
69f4c226f0
Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs
...
# Conflicts:
# src/battle_ai_main.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_script_commands.c
# src/pokemon.c
# src/pokemon_summary_screen.c
2022-08-27 02:42:22 -04:00
crater-git
f8fb4e8cf2
Renamed funcs, lists, etc. - Teach->Teachable
2022-08-26 14:48:06 -04:00
Eduardo Quezada D'Ottone
399a0c9d6f
Merge pull request #2142 from AgustinGDLV/exp_candy
...
Gen 8 EXP Candies
2022-08-25 23:03:24 -04:00
Eduardo Quezada D'Ottone
6b414d9555
Apply suggestions from code review
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-08-25 22:40:19 -04:00
crater-git
ed02c4b425
Removed tutor move distinction, combined llists
2022-08-25 19:56:47 -04:00
AgustinGDLV
e204527f43
changed candy item parameters
2022-08-25 15:52:47 -07:00
ghoulslash
591bac25c4
Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves
...
Moves with EFFECT_PLACEHOLDER can't be used.
2022-08-25 15:34:23 -04:00
crater-git
1ff5bdca9d
Added list endings to otherwise empty learnsets
2022-08-24 11:55:39 -04:00
Blackforest92
fb00ac977a
Adjust endif in form_species_tables.h to include Hisuian Sneasel and Qwilfish
2022-08-24 16:21:45 +07:00
Blackforest92
07a07ddc8d
Update to latest master branch + allow Reveal Glass to work with Enamorus
2022-08-24 15:00:48 +07:00
Eduardo Quezada D'Ottone
21867a6061
Merge branch 'master' into AI
2022-08-24 01:07:35 -04:00
Eduardo Quezada D'Ottone
21fe205f0f
Merge pull request #2206 from Blackforest92/Minor_Graphic_Fixes
...
Fix multiple pokemon icons & tidying pokemon graphic folders
2022-08-24 00:52:49 -04:00
Eduardo Quezada
eea718cfc6
Placeholder moves can't be used in battle.
2022-08-24 00:30:49 -04:00
crater-git
7ac2f566fd
Re-added PP if statements for P_NEW_POKEMON
2022-08-23 23:08:38 -04:00
crater-git
45511fcc44
Reworked TMHM into expandable list format
2022-08-23 21:44:42 -04:00
Eduardo Quezada
1f5adf93c7
Cleaned up use of configs be almost exclusively preproc functions
2022-08-23 21:00:08 -04:00
DizzyEggg
05ec8fb182
AI knows Party mons
2022-08-23 11:58:17 +02:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
Eduardo Quezada
75ac960365
Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms
2022-08-22 17:27:21 -04:00
GriffinR
898ec580ae
Merge pull request #1737 from GriffinRichards/lock-unlock
...
Clean up lock/unlock anim movement
2022-08-22 01:30:33 -04:00
GriffinR
30906762ed
Merge pull request #1740 from AsparagusEduardo/pret_stringTabs
...
Fixed inconsistent use of white space for scripts, .c files and .h files.
2022-08-20 23:03:59 -04:00
GriffinR
81ef818f61
Merge pull request #1731 from GriffinRichards/missing-tag
...
Move party menu data constants
2022-08-20 22:43:52 -04:00
Blackforest92
2b512a8e03
Fix Voltorb and Exeggutor' form species table
2022-08-19 18:14:11 +07:00
Blackforest92
346f3b7f4c
Fix PLA's base_stats.h (rename .item2 to .itemRare)
2022-08-19 18:01:28 +07:00
Blackforest92
a9d09bcd17
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion
2022-08-19 17:53:01 +07:00
Blackforest92
00a827b3fb
Add PLA pokemon to Form Species Table, add Kleavor's graphics
2022-08-19 17:47:34 +07:00
Eduardo Quezada
5933c42439
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
Eduardo Quezada
e8a05e92e4
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
GriffinR
5515e328b2
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
GriffinR
f534e8e44a
Move party menu data constants
2022-08-10 14:30:01 -04:00
GriffinR
99a37b5aa5
Merge pull request #1717 from mrgriffin/trainer-party-macro
...
Macros for keeping .partyFlags, .partySize, and .party in sync
2022-08-02 13:11:43 -04:00
ExpoSeed
49da2ee53f
Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION
2022-08-02 00:15:55 -05:00
Eduardo Quezada
c6cdb2a281
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-31 22:57:46 -04:00
Eduardo Quezada D'Ottone
22ab78e2f8
Fixed Steam Eruption's long name
2022-07-30 00:10:20 -04:00
Eduardo Quezada
2e1bf0d965
OamData mosaic FALSE
2022-07-29 21:27:39 -04:00
