Jaizu
767008427f
Don't pass down daycare like AlterEggSpeciesWithIncenseItem
2023-01-31 09:47:02 +01:00
Jaizu
68ee9e5739
Restore bugfix
...
Ooopsie!
2023-01-30 13:57:59 +01:00
Jaizu
267cf1e6f0
Update comment
2023-01-29 19:45:43 +01:00
Jaizu
8b1f4ac3ac
Implement Destiny Knot
2023-01-29 19:35:46 +01:00
Eduardo Quezada
749225ace1
Matching merge from upstream pret
...
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
Eduardo Quezada
77cc407386
Review change
2023-01-12 23:44:34 -03:00
Eduardo Quezada
1b0ce96e12
Config for ball inheritence when breeding
2023-01-09 02:16:29 -03:00
Eduardo Quezada
612ef46d82
Forgot to add these suggestions
2023-01-08 19:26:34 -03:00
Eduardo Quezada
c5ea97ecc3
Review changes
2023-01-08 18:42:39 -03:00
Eduardo Quezada
9250f8c994
Standarized Pichu/Light Ball/Volt Tackle interaction into their own table, allowing for custom combinations
2023-01-08 18:35:47 -03:00
Eduardo Quezada
339d794324
Fixed compile and made table into struct
2022-12-21 16:46:32 -03:00
Eduardo Quezada
8840d0bbf6
Refactored incense baby checks into table and added Gen 9 config.
2022-12-21 12:31:59 -03:00
Eduardo Quezada
e858b4e709
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
...
# Conflicts:
# include/battle.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_dome.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/battle_tower.c
# src/data/pokemon/species_info.h
# src/pokemon.c
2022-11-24 15:36:00 -03:00
Eduardo Quezada
7327be6f9e
Made Types and Egg Groups into arrays
2022-11-22 17:05:25 -03:00
GriffinR
4736b4b14d
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename
...
Renamed gBaseStats to gSpeciesInfo
2022-11-18 17:45:23 -05:00
GriffinR
1d1c2d41bb
Add list menu cursor constants
2022-11-09 15:16:46 -05:00
Eduardo Quezada
3ed485632f
Renamed gBaseStats to gSpeciesInfo
2022-10-24 17:01:48 -03:00
Eduardo Quezada
de32940fdf
Further removed trailing whitespaces
2022-09-13 16:26:36 -03: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
crater-git
f8fb4e8cf2
Renamed funcs, lists, etc. - Teach->Teachable
2022-08-26 14:48:06 -04:00
crater-git
b8a3cc2846
Consolidated funcs, renamed CanMonLearnMove
2022-08-26 11:07:08 -04:00
crater-git
ed02c4b425
Removed tutor move distinction, combined llists
2022-08-25 19:56:47 -04:00
gruxor
d719510d32
Apply suggestions from code review
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-08-24 22:31:52 -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
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
tustin2121
1cb659df8c
Renaming Script Contexts
...
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -04:00
Eduardo Quezada
231727d02b
Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge
...
# Conflicts:
# asm/macros/event.inc
# data/specials.inc
# include/constants/species.h
# src/data/pokemon/base_stats.h
2022-07-22 23:33:04 -04:00
Eduardo Quezada D'Ottone
c71b60d9f8
Merge branch 'PokemonExpansion' into PE_breedOverrides
...
# Conflicts:
# include/constants/pokemon_config.h
2022-05-07 19:45:06 -04:00
LOuroboros
af2f70e000
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:21:40 -03:00
Jaizu
4538990d47
Fix MIME_JR #ifdef
2022-02-18 15:40:54 +01:00
ultima-soul
18afd06f6d
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-18 00:28:18 -08:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
ultima-soul
d408b56549
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
ultima-soul
a68a39e35f
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-12-01 20:17:49 -08:00
Eduardo Quezada D'Ottone
7c6f76323a
Added NidoranM/Volbeat Ditto breeding config + Rotom & Furfrou
2021-11-26 22:56:48 -03:00
Eduardo Quezada D'Ottone
56836420bd
Added Vivillon forms to override
2021-11-26 22:24:03 -03:00
ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
ultima-soul
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -08:00
GriffinR
1b35f9adad
Use specific name limits for string limit functions
2021-11-17 22:11:03 -05:00
Eduardo Quezada D'Ottone
3dce58749a
Added Manaphy's and Sinistea's egg species overrides.
2021-11-16 21:12:29 -03:00
GriffinR
50d3003a0d
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
2021-11-03 19:54:20 -04:00
GriffinR
9a0618afc3
Add COPYWIN constants
2021-11-03 15:29:18 -04:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
GriffinR
7f3c529935
Document record mixing mail swap
2021-10-24 15:49:19 -04:00
Eduardo Quezada D'Ottone
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table
...
Form change table
2021-09-22 00:04:26 -03:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
ultima-soul
988320b89a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-08-17 11:25:13 -07:00
ultima-soul
64a48800c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
Kurausukun
10c80230c4
change printItemFunc to use u32 instead of s32
...
also change a use of -2 to LIST_CANCEL
2021-06-18 00:15:45 -04:00
