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
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
GriffinR
3d0663fe81
Additional trader clean up
2022-02-27 13:58:48 -05:00
GriffinR
36e5d5e759
Add missing menu array counts
2022-02-27 13:47:50 -05:00
sphericalice
2d536bf560
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu
2022-01-02 21:02:53 +00:00
GriffinR
085f8adec6
Start remaining menu documentation
2021-11-03 17:38:08 -04:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
GriffinR
db8ce5d7f9
Clean up mauville_old_man, drop ScrSpecial prefix
2021-10-18 01:09:41 -04:00
Sierraffinity
74edaed426
Begin item_menu.c cleanup
2020-06-10 13:07:42 -07:00
Martin Griffin
4485d51522
Document decoration.c
2020-03-06 09:47:20 +00:00
GriffinR
973e6f9667
Document mauville_man.inc
2019-10-21 17:21:53 -05:00
GriffinR
275695c189
Document more script_menu, lilycove harbor
2019-09-19 17:27:34 -04:00
Marcus Huderle
fe12f2f4b3
Document and cleanup some decoration code
2019-04-06 12:49:09 -05:00
Phlosioneer
44e92ce259
Give window drawing functions better names
2019-02-22 01:40:11 -05:00
DizzyEggg
23b240ab65
Fix Menu and List Menu input defines
2019-02-02 11:04:38 +01:00
Diegoisawesome
7dd4ed7060
r5/r6 swap on sub_80E2578
2018-11-05 14:45:54 -06:00
DizzyEggg
2f59df03ab
Standartize AddTextPrinterParametrized functions,
2018-09-08 23:38:30 +02:00
Diegoisawesome
cb9127ccaf
Revert "Rename some specials"
...
This reverts commit 658f9351fe
2018-08-11 15:16:41 -07:00
Diegoisawesome
658f9351fe
Rename some specials
2018-08-11 14:59:43 -07:00
PikalaxALT
fd1d75ce37
Merge branch 'master' into mauville_old_man
2018-05-07 18:18:00 -04:00
PikalaxALT
4acbcf5759
Port trader from Ruby
2018-05-01 15:19:24 -04:00
