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
LOuroboros
5801047e50
Removed unused local var in SetMonFormPSS
2022-08-28 12:10:54 -03:00
Eduardo Quezada
af137c9b9d
Multiple changes
...
- Simplified LoadSpecialPokePic
- Changed all checks flag checks to houldShowFemaleDifferences
2022-08-25 03:42:41 -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
b49f8c10ad
Review changes from https://github.com/pret/pokefirered/pull/525
2022-08-01 15:37:05 -04:00
Eduardo Quezada
cc288e3786
Review changes
2022-08-01 15:14:21 -04:00
Eduardo Quezada
7ea49adf3c
CpuCopy16 in UnkUtil_CpuRun
2022-08-01 08:04:48 -04:00
Eduardo Quezada
a72d4c4168
Cleanup from syncing pss and mon markings
2022-07-30 12:43:14 -04:00
Eduardo Quezada
2e1bf0d965
OamData mosaic FALSE
2022-07-29 21:27:39 -04:00
Eduardo Quezada
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada
a37d8b1346
Documented boolean uses
2022-07-25 14:59:14 -04:00
Eduardo Quezada
f3bebcd12c
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
...
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
GriffinR
1ca1bff81c
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg
2022-06-03 15:43:21 -04:00
sphericalice
d03756dfd2
Use the TRY_FREE_AND_SET_NULL macro where appropriate
2022-06-03 15:42:53 +01:00
GriffinR
5e6d8a77e4
Document some generic argument names
2022-05-31 14:34:25 -04:00
GriffinR
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
ultima-soul
84a7f960c8
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2022-02-28 23:37:41 -08:00
GriffinR
ca9bc34bea
Clean up pokemon_storage_system graphics
2022-01-07 17:36:38 -05:00
GriffinR
5cbe572607
Add window constants in pokemon_storage_system
2022-01-07 17:05:58 -05:00
Eduardo Quezada D'Ottone
3bbaf5a15d
Optimized SpeciesHasGenderDifference into Base Stat flag
2022-01-01 19:24:34 -03:00
Eduardo Quezada D'Ottone
793de70068
Fixed reference to PlayCry2
2021-12-19 13:09:01 -03:00
Eduardo Quezada D'Ottone
8b49f8f925
Merge branch 'pokemon_expansion' into PE_FormChangeHoldItems
2021-12-19 12:08:52 -03:00
ultima-soul
a68a39e35f
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-12-01 20:17:49 -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
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
GriffinR
c291fa8e7f
Propagate BG_COORD constants
2021-11-03 23:02:06 -04:00
GriffinR
50d3003a0d
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
2021-11-03 19:54:20 -04:00
GriffinR
085f8adec6
Start remaining menu documentation
2021-11-03 17:38:08 -04:00
GriffinR
9a0618afc3
Add COPYWIN constants
2021-11-03 15:29:18 -04:00
GriffinR
e14210ce1f
Merge pull request #1536 from GriffinRichards/clean-braille
...
Add font id constants, better braille support
2021-11-03 13:17:29 -04:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
GriffinR
901cd476b6
Fix incorrect arguments on CopyRectToBgTilemapBufferRect
2021-10-29 11:51:47 -04:00
GriffinR
ed6fdd743f
Some pokemon_icon clean up
2021-10-17 22:04:08 -04:00
GriffinR
f2e0c9ec9d
Some pokedex clean up
2021-10-17 21:32:09 -04:00
BuffelSaft
7610a9abad
Fix bug with female icon sprites
...
Thanks to AsparagusEduardo for this code!
2021-10-15 16:17:08 +13:00
Eduardo Quezada D'Ottone
af5ff05338
Fixed FORM_ITEM_HOLD_ABILITY check
2021-10-05 21:25:56 -03:00
Eduardo Quezada D'Ottone
4ba03a6d54
Fixed corruption bug when giving too many items from bag into boxes.
2021-09-30 22:47:25 -03:00
Eduardo Quezada D'Ottone
0fd9d2c0d5
Optimized so it only changes forms when moving items.
2021-09-30 21:55:21 -03:00
Eduardo Quezada D'Ottone
b60aab1f6a
Fixed crash
2021-09-30 20:34:42 -03:00
GriffinR
001a25e49c
Merge pull request #1507 from GriffinRichards/doc-walda
...
Document Walda Phrase
2021-09-30 12:27:20 -04:00
Eduardo Quezada D'Ottone
e6c81d2862
Fixed form change when swapping items
2021-09-29 22:05:30 -03:00
Eduardo Quezada D'Ottone
9114f3d1dc
Fixed lag and icons getting stuck when giving an item from the bag
2021-09-29 22:05:20 -03:00
Eduardo Quezada D'Ottone
1f559df27d
Final function name
2021-09-29 02:14:32 -03:00
Eduardo Quezada D'Ottone
52781969ab
Update icon in party menu
2021-09-29 02:14:23 -03:00
Eduardo Quezada D'Ottone
7c9a3f338a
Updates icon in box menu
2021-09-29 02:14:13 -03:00
Eduardo Quezada D'Ottone
9ad505d7e8
Mosaic effect when changing forms
2021-09-29 02:14:02 -03:00
Eduardo Quezada D'Ottone
55b61313a4
PSS uses form change table for holding items.
...
# Conflicts:
# src/pokemon.c
2021-09-29 02:13:44 -03:00
