hedara90
|
0917af214c
|
Replace all usages of lz compression with smol (#7032)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-31 19:47:54 +02:00 |
|
Hedara
|
950dbe7897
|
Merge commit '16357c7' into pret-merge
Conflicts:
include/battle.h
include/battle_controllers.h
include/battle_script_commands.h
include/contest.h
include/list_menu.h
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_main.c
src/battle_message.c
src/battle_tower.c
src/berry_crush.c
src/contest.c
src/ereader_helpers.c
src/evolution_scene.c
src/hall_of_fame.c
src/mauville_old_man.c
src/mystery_gift_menu.c
src/pokedex.c
src/pokenav_conditions_search_results.c
src/pokenav_menu_handler_gfx.c
src/pokenav_ribbons_list.c
src/rom_header_gf.c
src/union_room.c
src/union_room_battle.c
src/union_room_player_avatar.c
|
2025-05-24 19:22:31 +02:00 |
|
Bassoonian
|
16357c7e29
|
Streamline pointer notation (#2139)
|
2025-05-16 12:04:44 +01:00 |
|
Martin Griffin
|
d913792f43
|
Enable GF species names by default
|
2024-04-25 18:40:37 +01:00 |
|
Eduardo Quezada
|
a6940c9e03
|
Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002
# Conflicts:
# src/battle_ai_script_commands.c
# src/battle_controller_player.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_controllers.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/mystery_gift_menu.c
# src/pokemon.c
|
2023-10-02 17:17:41 -03:00 |
|
Eduardo Quezada
|
af210da972
|
Solved a bunch of -Wall errors on modern
|
2023-09-20 19:01:08 -03: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 |
|
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 |
|
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
|
01558ff8f3
|
Struct pointers star standarizing
|
2022-07-29 11:15:33 -04:00 |
|
Eduardo Quezada
|
a37d8b1346
|
Documented boolean uses
|
2022-07-25 14:59:14 -04:00 |
|
GriffinR
|
1b35f9adad
|
Use specific name limits for string limit functions
|
2021-11-17 22:11:03 -05:00 |
|
GriffinR
|
d4d4234283
|
Finish pokenav list ui doc
|
2021-11-15 00:09:02 -05:00 |
|
GriffinR
|
b3e593dff5
|
Continue pokenav list ui doc
|
2021-11-13 15:52:58 -05:00 |
|
GriffinR
|
ec05157568
|
Move pokenav list item union out of list struct
|
2021-11-13 11:27:11 -05:00 |
|
GriffinR
|
3b91d8fdaf
|
Start pokenav list ui doc
|
2021-11-12 20:36:19 -05:00 |
|
GriffinR
|
da5752fd0d
|
Start match call menu doc
|
2021-11-12 20:17:06 -05:00 |
|
GriffinR
|
43e942c3af
|
Clean up pokenav ribbons
|
2021-11-09 12:50:35 -05:00 |
|