Eduardo Quezada 80b193280d Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	src/battle_main.c
#	src/data/item_icon_table.h
#	src/data/pokemon/species_info/gen_9_families.h

2024-05-27 10:13:42 -04:00

..

layouts

Label unused layouts

2021-02-08 14:45:56 -05:00

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

Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526

2024-05-26 18:34:26 -04:00

text

Revert "Guillotine: Decapitalize everything (#3949)" (#4525)

2024-05-13 19:19:37 +02:00

tilesets

Convert tilesets.s to C

2022-09-27 17:23:26 -04:00

battle_anim_scripts.s

Adds move Spicy Extract (#4211)

2024-05-16 11:03:50 +02:00

battle_scripts_1.s

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-27 10:13:42 -04:00

battle_scripts_2.s

Fix dire hit being used on incorrect target (#4626)

2024-05-26 00:06:55 +02:00

contest_ai_scripts.s

Incorporated upstream fixes

2023-10-27 11:04:10 -03:00

event_scripts.s

[Rebase of #4286] Reordered Debug_EventScript_InflictStatus1 (#4372)

2024-04-14 17:31:39 -04:00

field_effect_scripts.s

Port pokefirered's Vs. Seeker to pokeemerald (#3256)

2023-11-26 18:58:43 +01:00

map_events.s

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

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

maps.s

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

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

mb_berry_fix.gba

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

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

mb_colosseum.gba

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

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

mb_ereader.gba

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

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

multiboot_berry_glitch_fix.s

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

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

multiboot_ereader.s

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

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

multiboot_pokemon_colosseum.s

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

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

mystery_event_script_cmd_table.s

Remove address comments

2021-07-20 15:18:31 -04:00

mystery_gift.s

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

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

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

Organized conffig files into their own folder and cleaned up

2022-11-14 11:03:49 -03:00

specials.inc

Pre-1.8 tweaks (#4275)

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