Hedara 5c31b58b81 Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge ...

Conflicts:
	spritesheet_rules.mk
	tools/mapjson/mapjson.cpp

2025-11-01 15:13:16 +01:00

..

battle_frontier

Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727

2025-07-27 11:59:07 -04:00

asm.inc

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

battle_anim_script.inc

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-27 16:26:37 -04:00

battle_script.inc

Fixed Belly Drum/Contrary interaction at max Attack (#8078)

2025-10-30 17:14:07 +01:00

battle_tent.inc

Removed trailing spaces in the most relevant files

2021-08-24 19:59:32 -03:00

contest_ai_script.inc

Fix incorrect point macros in contest_ai_script.inc

2024-09-08 12:50:35 +03:00

event.inc

Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge

2025-11-01 15:13:16 +01:00

field_effect_script.inc

meta: included COLOR_MAP constants in field_effect_script. Credit: SDH

2024-09-08 16:02:51 -04:00

function.inc

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

m4a.inc

Key split restructure (#2168)

2025-08-02 02:11:50 +01:00

map.inc

Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge

2025-11-01 15:13:16 +01:00

movement.inc

Replace Incorrect Slow Stairs Movement with Correct One (#6275)

2025-03-16 14:51:36 -07:00

music_voice.inc

Further removed trailing whitespaces

2022-09-13 16:26:36 -03:00

trainer_hill.inc

Clean up some trainer hill

2022-03-31 12:54:07 -04:00