Commit Graph

6 Commits

Author SHA1 Message Date
cawtds
92b4b7f0a0
Keep removed headers (#7261) 2025-07-02 09:06:23 +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)
Some checks failed
CI / build (push) Has been cancelled
2025-05-16 12:04:44 +01:00
DizzyEggg
b2448ea002
Fix upcoming not working on no cash (#6121) 2025-01-26 20:25:57 -03:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
Diegoisawesome
7dad2846f8 Port agb_flash from pokeruby 2016-11-01 14:15:48 -05:00