Eduardo Quezada 5bf379720f Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	src/data/moves_info.h

2024-04-12 21:30:52 -04:00

..

layouts

…

maps

- Fixes Seedot and Lotad House to give measurements based on the unit system and decimal seperator chosen by the developer. (#4193)

2024-02-15 10:23:11 +01:00

scripts

Pre-1.8 tweaks (#4275)

2024-03-12 12:21:03 +01:00

text

Clean up contest strings (#3876)

2024-02-02 10:55:39 +01:00

tilesets

…

battle_anim_scripts.s

Generic Starting Battle Status Variable (#4176)

2024-02-14 10:05:37 +01:00

battle_scripts_1.s

Merge branch '_RHH/master' into _RHH/upcoming

2024-04-12 21:30:52 -04:00

battle_scripts_2.s

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-10 17:53:32 -03:00

contest_ai_scripts.s

…

event_scripts.s

…

field_effect_scripts.s

…

map_events.s

…

maps.s

…

mb_berry_fix.gba

…

mb_colosseum.gba

…

mb_ereader.gba

…

multiboot_berry_glitch_fix.s

…

multiboot_ereader.s

…

multiboot_pokemon_colosseum.s

…

mystery_event_script_cmd_table.s

…

mystery_gift.s

…

script_cmd_table.inc

Merge remote-tracking branch '_pret/master' into _RHH/pr/master/pret_sync20240324

2024-03-24 13:52:18 -03:00

sound_data.s

…

specials.inc

Pre-1.8 tweaks (#4275)

2024-03-12 12:21:03 +01:00