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
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 D'Ottone
c69275f373
Merge remote-tracking branch 'pret/master' into PE_pretmerge
...
# Conflicts:
# include/battle_anim.h
# include/pokemon.h
# src/data/pokemon/base_stats.h
2022-07-12 17:20:49 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
GriffinR
5e6d8a77e4
Document some generic argument names
2022-05-31 14:34:25 -04:00
Eduardo Quezada D'Ottone
17f5f96f74
Added Pokémon Jump data.
2022-04-10 15:45:23 -04:00
ultima-soul
01a90ca6c2
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-27 22:17:05 -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
8e424b6985
Merge branch 'master' into doc-binterface
2021-11-09 16:09:48 -05:00
GriffinR
adf773f1ed
Document remainder of save.c
2021-11-08 19:45:14 -05:00
GriffinR
be7d0bd3b0
Merge branch 'master' into doc-menu
2021-11-04 12:11:31 -04: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
9a0618afc3
Add COPYWIN constants
2021-11-03 15:29:18 -04:00
GriffinR
3e49ac804b
Merge branch 'master' into doc-finalmisc
2021-11-03 13:56:22 -04:00
GriffinR
afb9ff3a40
Document files with a few remaining symbols
2021-11-02 18:06:06 -04:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union
2021-10-07 16:10:35 -04:00
GriffinR
6aaf50ee27
Rename GF Gname, Rfu, finish bulk of Union Room, more link doc
2021-10-07 10:43:03 -04:00
GriffinR
4efa6c882a
Continue misc link documentation, rename reset_save_heap
2021-10-05 23:37:54 -04: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
3f75a58137
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-08-11 16:55:29 -07:00
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
ultima-soul
0da3f74a7e
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 18:58:38 -07:00
Kurausukun
3e725272fc
standardize "grey" to "gray"
2021-04-09 22:39:34 -04:00
ultima-soul
b8721034ef
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-02 13:42:05 -07:00
GriffinR
50e9666e16
Merge branch 'master' into doc-introcred
2021-03-29 20:56:15 -04:00
GriffinR
62968895ca
Add MON_PIC_SIZE constant
2021-03-29 09:38:19 -04:00
ultima-soul
56a1cab314
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-03-23 15:21:19 -07:00
GriffinR
b1a69d95ea
Document minigame countdown
2021-03-11 14:25:22 -05:00
GriffinR
69f7882b5e
Label missed pokemon jump anims
2021-03-03 14:32:09 -05:00
GriffinR
3f59362397
Merge branch 'master' into doc-pokejump
2021-02-28 10:27:50 -05:00
GriffinR
763724a980
Shifts to mult in ShowBonus
2021-02-26 21:13:16 -05:00
GriffinR
117b90a261
Document pokemon jump
2021-02-26 17:26:39 -05:00
GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
GriffinR
a392cca928
Misc battle documentation
2021-01-23 00:40:31 -05:00
Eduardo Quezada D'Ottone
68627882a5
Merge remote-tracking branch 'pret/master' into PE-pretSync
2020-11-07 15:00:10 -03:00
aaaaaa123456789
bacc831aa9
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
aaaaaa123456789
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
ExpoSeed
5794fc69e8
Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion
2020-10-04 02:35:23 -05:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
aaaaaa123456789
7dc95a0103
Undo PokeCodec's PRs
...
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104 , #1108 , #1115 , #1118 , #1119 , #1124 , #1126 , #1127 , #1132 , #1136 ,
#1137 , #1139 , #1140 , #1144 , #1148 , #1149 , #1150 , #1153 , #1155 , #1177 , #1179 ,
#1180 , #1181 , #1182 and #1183 .
2020-09-13 06:30:55 -03:00
DizzyEggg
448599f53c
Merge with master
2020-09-08 12:01:20 +02:00
PokeCodec
28ef2fb774
Switch to button macros
2020-09-04 21:11:55 -04:00
GriffinR
7c8bc0fbe3
Merge pull request #1149 from PokeCodec/datatypes
...
gflib documenting
2020-09-01 14:25:21 -04:00
GriffinR
c830731734
Merge branch 'master' into doc-blender
2020-08-28 16:16:00 -04:00
DizzyEggg
c2733236be
Merge with master
2020-08-27 11:36:35 +02:00
