Hedara c852954af5 Merge commit 'a545d575efd541e8885cef072ace01c8a9684584' into pret-merge ...

Conflicts:
	include/fieldmap.h
	include/menu.h
	include/text.h
	src/battle_controller_player.c
	src/battle_gfx_sfx_util.c
	src/battle_pyramid.c
	src/fieldmap.c
	src/item_use.c
	src/menu.c
	src/text.c

2026-07-29 13:33:06 +02:00

..

abnormal_weather.inc

…

aide.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

apprentice.inc

…

apricorn_tree.inc

Fix timing and structure of Apricorn Tree messages (#9650)

2026-03-29 20:10:55 +02:00

battle_frontier.inc

Banned species list (#8003)

2025-10-23 21:29:33 +02:00

battle_pike.inc

Merge commit '07fd8a28fbd5b23a6828846e4606fc3ecd54c3d9' into merrp-merge

2025-06-25 17:14:52 +02:00

berry_blender.inc

Implicit waitstate for special/specialvars

2025-11-05 22:38:51 +00:00

berry_tree.inc

Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge

2026-05-15 16:40:56 +02:00

cable_club_frlg.inc

Fix colosseum warps frlg (#10100)

2026-05-31 11:20:40 +02:00

cable_club.inc

Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge

2026-05-15 16:40:56 +02:00

cave_hole.inc

Merge pull request #2200 from mrgriffin/pret-implicit-waitstate

2026-04-21 15:54:10 +01:00

cave_of_origin.inc

…

check_furniture.inc

…

config.inc

…

contest_hall.inc

Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge

2026-05-15 16:40:56 +02:00

day_care_frlg.inc

Remove implicit waitstates from FireRed

2026-05-27 09:17:09 +01:00

day_care.inc

Merge commit 'a545d575efd541e8885cef072ace01c8a9684584' into pret-merge

2026-07-29 13:33:06 +02:00

debug.inc

Cleanup debug.inc (#10469)

2026-07-21 09:21:07 +02:00

dexnav.inc

…

elite_four.inc

…

fame_checker_frlg.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

field_move_scripts.inc

Fix space indentation in .s and .inc files (#9371)

2026-02-27 12:45:00 -08:00

field_poison.inc

Implicit waitstate for special/specialvars

2025-11-05 22:38:51 +00:00

flash.inc

…

flavor_text.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

follower.inc

Allow STR_VAR_# arguments in bufferlivemonnickname (#9752)

2026-04-11 10:55:28 +01:00

gabby_and_ty.inc

…

gift_altering_cave.inc

…

gift_aurora_ticket.inc

…

gift_battle_card.inc

…

gift_mystic_ticket.inc

…

gift_old_sea_map.inc

…

gift_pichu.inc

…

gift_stamp_card.inc

…

gift_trainer.inc

…

hall_of_fame_frlg.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

hall_of_fame.inc

…

interview.inc

…

item_ball_scripts_frlg.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

item_ball_scripts.inc

…

kecleon.inc

…

lilycove_lady.inc

Implicit waitstate for special/specialvars

2025-11-05 22:38:51 +00:00

mart_clerk.inc

Merge remote-tracking branch 'pret/master' into rhh-master

2026-06-01 20:08:44 +01:00

mauville_man.inc

Implicit waitstate for special/specialvars

2025-11-05 22:38:51 +00:00

move_relearner.inc

Merge branch 'master' into master-merge

2026-05-17 18:10:59 +02:00

move_tutors_frlg.inc

Remove implicit waitstates from FireRed

2026-05-27 09:17:09 +01:00

move_tutors.inc

Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge

2026-05-15 16:40:56 +02:00

movement.inc

Fix space indentation in .s and .inc files (#9371)

2026-02-27 12:45:00 -08:00

mystery_event_club.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

new_game.inc

gBerries refactor + untangling berry indices from item IDs (#7305)

2026-03-21 21:30:09 +01:00

obtain_item.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

pc_transfer.inc

Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge

2026-05-15 16:40:56 +02:00

pc.inc

Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge

2026-05-15 16:40:56 +02:00

pkmn_center_nurse_frlg.inc

Version specific tweaks of post whiteout script (#9521)

2026-03-16 13:17:35 +01:00

pkmn_center_nurse.inc

Fix FRLG Trainer Card Setup (#10527)

2026-07-28 21:50:55 +02:00

players_house.inc

Implicit waitstate for special/specialvars

2025-11-05 22:38:51 +00:00

pokedex_rating.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

pokemon_league.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

pokemon_mansion.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

prof_birch.inc

…

profile_man.inc

…

questionnaire.inc

…

record_mix.inc

Implicit waitstate for special/specialvars

2025-11-05 22:38:51 +00:00

repel.inc

…

rival_graphics.inc

…

roulette.inc

Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge

2026-05-15 16:40:56 +02:00

route23.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

safari_zone.inc

Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge

2026-05-15 16:40:56 +02:00

seagallop.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

secret_base.inc

Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge

2026-05-15 16:40:56 +02:00

secret_power_tm.inc

…

set_gym_trainers.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

shared_secret_base.inc

…

silphco_doors.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

static_pokemon.inc

Fix space indentation in .s and .inc files (#9371)

2026-02-27 12:45:00 -08:00

std_msgbox.inc

Cleanup 'message 0x0' (#10110)

2026-06-01 20:42:09 +02:00

surf.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

test_signpost.inc

…

trainer_battle.inc

Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge

2026-05-15 16:40:56 +02:00

trainer_card_frlg.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

trainer_hill.inc

Trainerbattle Type Differentiation (#6424)

2025-12-01 19:28:09 +01:00

trainer_script.inc

Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge

2026-05-15 16:40:56 +02:00

trainer_tower.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

trainers_frlg.inc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

tv.inc

…

wild_encounter.inc

Overworld Encounters (#8434)

2026-04-29 19:36:14 +02:00