AlexOn1ine f4c64a2d79 conflicts

2025-05-30 19:20:32 +02:00

..

layouts

Label unused layouts

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

maps

Merge branch 'master' into master-to-upcoming

2025-05-28 14:26:15 +02:00

scripts

Fixed follower NPC changing to surf sprite when choosing not to surface from dive (#7010)

2025-05-29 11:05:23 +02:00

text

Add caught mon to full party by sending a different mon to the Box (#6058)

2025-02-09 00:54:58 +01:00

tilesets

Convert tilesets.s to C

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

battle_anim_scripts.s

Documented usage of createsprite gSlideMonToOffsetSpriteTemplate (#6953)

2025-05-23 14:41:25 +02:00

battle_scripts_1.s

conflicts

2025-05-30 19:20:32 +02:00

battle_scripts_2.s

Remove old slide workaround (#6754)

2025-05-03 10:54:49 +02:00

contest_ai_scripts.s

Move general config file to the config folder (#4805)

2024-06-19 13:42:01 +02:00

event_scripts.s

Moved time constants to dedicated files (#7019)

2025-05-30 16:39:01 +02:00

field_effect_scripts.s

Remove trailing whitespace (#6968)

2025-05-23 22:33:12 +02:00

map_events.s

Updated existing OW pokemon events with new system.

2023-01-12 21:45:42 -05: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 'upstream/master' into followers

2025-02-10 00:11:38 -05:00

sound_data.s

Organized conffig files into their own folder and cleaned up

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

specials.inc

Add Code Entry functionality (#5951)

2025-01-25 22:03:08 +01:00