Eduardo Quezada
de32940fdf
Further removed trailing whitespaces
2022-09-13 16:26:36 -03: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
DizzyEggg
c991131b75
Change language stuff based on the french decomp
2022-08-04 11:53:16 +02:00
Eduardo Quezada
5d4b76c0ba
Review changes from pokefirered #524
2022-07-29 17:00:07 -04:00
Eduardo Quezada
01558ff8f3
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
Eduardo Quezada
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
Eduardo Quezada
dc47a959da
Reverted comments from pokefirered
2022-07-27 20:33:34 -04:00
Eduardo Quezada
b00bd8b181
Cleaned by comparing evolution_scene.c with pokefirered
2022-07-27 18:51:32 -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
sphericalice
284e46927a
Use the FREE_AND_SET_NULL macro where appropriate
2022-06-03 15:56:11 +01:00
TheXaman
2fa812df26
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge
2022-04-13 20:51:35 +02:00
GriffinR
d664135572
Add usage of battle strings table offset constant
2022-03-10 10:44:04 -05:00
LOuroboros
d6a78f386f
Implemented evolution moves
...
Thanks to UltimaSoul and Sagiri/Zeturic
2021-12-22 18:02:23 -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
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
1b35f9adad
Use specific name limits for string limit functions
2021-11-17 22:11:03 -05:00
GriffinR
c4169cfd29
Disambiguate cry functions
2021-11-07 14:26:09 -05:00
Eduardo Quezada D'Ottone
35d5bc4367
Config for Shedinja needing a Poké Ball to be created
2021-10-22 20:50:53 -03:00
GriffinR
d8e65fc4b6
More battle doc, add battle window ids
2021-10-09 03:01:10 -04:00
GriffinR
739e7d3c31
Document summary screen sprite manager
2021-10-02 23:47:59 -04:00
BuffelSaft
4aa7c096b7
Show gender differences in evo scene
2021-09-11 16:30:09 +12: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
cf19635a80
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-06-07 13:15:46 -07:00
Kurausukun
2bbaf71998
[LEAK-INFORMED] fix CreateShedinja fakematch
...
info: the header change is required. accesses to the struct need to be
treated as non-const, even though the array must be const. thanks to
jiang for figuring this out.
2021-05-31 08:20:46 -05:00
ultima-soul
0da3f74a7e
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 18:58:38 -07:00
GriffinR
f94540c2b8
Misc reg constant cleanup
2021-04-15 03:14:42 -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
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
GriffinR
1cac608dbe
Document mail
2021-02-24 11:03:39 -05:00
GriffinR
a5852d57d1
Use TASK_NONE constant
2021-02-24 11:03:25 -05:00
GriffinR
e059c4fdfa
Use new gift ribbons size, label unused ribbons
2021-02-17 14:11:45 -05:00
Deokishisu
b89c3e901e
Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
...
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.
The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
2021-02-15 11:40:16 -05:00
GriffinR
15906ca143
Document evolution scene
2021-02-03 17:55:37 -05:00
ultima-soul
96232ea166
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-01-28 23:59:08 -08:00
GriffinR
a392cca928
Misc battle documentation
2021-01-23 00:40:31 -05:00
GriffinR
b65980cd4e
Remove unused local variables and functions
2021-01-19 18:19:33 -05:00
ultima-soul
3cb09b6507
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal
2021-01-11 15:19:11 -08:00
ultima-soul
6a0939cd4e
Remove special handling for Deoxys.
2020-12-21 22:39:19 -08:00
Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
Kaz
847878eae9
battle_gfx_sfx_util.c: Very annoying fakematch fix.
...
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
2020-09-19 17:12:25 -04:00
PokeCodec
28ef2fb774
Switch to button macros
2020-09-04 21:11:55 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
Marcus Huderle
01e6fb6dd0
Document some battle_bg-related things
2019-11-07 18:24:04 -06:00
GriffinR
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04:00
GriffinR
07fa82c911
Last non-anim trade.c doc
2019-10-10 03:50:51 -04:00
GriffinR
d1bcd60b58
Document more trade.c
2019-10-08 20:25:46 -04:00
GriffinR
66a68159b1
Continue trade doc
2019-10-05 10:41:37 -04:00
