Eduardo Quezada
82252251e7
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
2024-12-20 16:04:33 -03:00
Eduardo Quezada
5483e05db6
Fixed brace style inconsistencies
2024-12-05 12:46:50 -03:00
Frank DeBlasio
bced2c97a1
Created PokeNav COMPOUND_STRINGS ( #4983 )
...
* Converted Match Call names and descriptions to COMPOUND_STRINGs
* Moved May/Brendan and Elite Four descriptions into pokenav_match_call_data.c
* Moved Steven, Brendan, and May's Match Call text to pokenav_match_call_data.c
* Cleaned up Steven's Match Call text
* Added PokeNav option text to match_call_gfx
* Moved PokeNav page descriptions to menu_handler_gfx
* Moved help bar texts to pokenav_main_menu.c
* Moved various PokeNav strings out of strings.c and into their relevant files
* Removed unused PokeNav strings
2024-08-16 22:41:26 +02:00
Bassoonian
24ed9e77ff
Fix FREE_MATCH_CALL
2024-02-02 14:13:16 +01:00
Bassoonian
acf5d8133a
Convert ifndef configs to standard configs
2024-02-02 12:43:31 +01:00
Bassoonian
d1bb078919
Merge branch 'saveblock' of https://github.com/ghoulslash/pokeemerald into ghoulsaveblock
2024-02-02 11:27:48 +01:00
Eduardo Quezada
4c57b84cd9
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
...
# Conflicts:
# graphics/pokemon/mawile/footprint.png
# src/battle_gfx_sfx_util.c
# src/fldeff_sweetscent.c
# src/pokedex.c
2023-06-02 11:45:28 -04:00
GriffinR
14f7e49099
Add some missing palette macro use
2023-05-25 15:09:16 -04:00
ghoulslash
ee0652416d
merge w pret
2023-05-11 10:27:41 -04: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
GriffinR
0cc10a1ada
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
2023-01-18 11:07:12 -05:00
Eduardo Quezada
1d7e8bd730
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
2022-09-13 16:22:42 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -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
Martin Griffin
d57442a511
Decimal paletteNums
2022-08-19 17:05:22 +01:00
Martin Griffin
6fed961ed6
Write palette IDs in hex
2022-08-19 15:29:35 +01:00
Eduardo Quezada
a37d8b1346
Documented boolean uses
2022-07-25 14:59:14 -04:00
ghoulslash
f9856c2833
merge w pret
2021-12-20 12:32:24 -05:00
GriffinR
da5752fd0d
Start match call menu doc
2021-11-12 20:17:06 -05:00
GriffinR
ffe2970e30
Rename pokenav menu handler files
2021-11-12 17:13:50 -05:00
