Eduardo Quezada D'Ottone 21fe205f0f

Merge pull request #2206 from Blackforest92/Minor_Graphic_Fixes ...

Fix multiple pokemon icons & tidying pokemon graphic folders

2022-08-24 00:52:49 -04:00

..

bag

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

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

balls

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

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

battle_anims

Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge

2022-07-22 22:57:02 -04:00

battle_frontier

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

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

battle_interface

tweak z indicator position relative to healthbox

2022-07-18 09:44:04 -04:00

battle_terrain

…

battle_transitions

Ignore num_tiles if it would truncate non-transparent tiles (#1729)

2022-08-18 23:07:25 -04:00

berries

…

berry_blender

…

berry_crush

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

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

berry_fix

…

birch_speech

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

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

cable_car

…

cave_transition

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

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

contest

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

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

credits

…

decorations

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

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

diploma

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

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

dodrio_berry_picking

…

door_anims

Some field door comments

2022-05-18 13:03:02 -04:00

easy_chat

…

evolution_scene

…

field_effects

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

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

fonts

…

frontier_pass

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

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

interface

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

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

intro

…

items

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

2022-04-03 13:21:40 -03:00

link

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

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

mail

…

map_popup

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

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

misc

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

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

naming_screen

Split naming screen palettes/graphics, use correct image palettes, clean up

2022-08-09 09:27:28 -04:00

object_events

…

party_menu

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

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

picture_frame

Ignore num_tiles if it would truncate non-transparent tiles (#1729)

2022-08-18 23:07:25 -04:00

pokeblock

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

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

pokedex

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

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

pokemon

Fix multiple pokemon graphics, tidying pokemon graphic folders

2022-07-22 22:17:29 +07:00

pokemon_jump

…

pokemon_storage

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

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

pokenav

…

rayquaza_scene

…

reset_rtc_screen

…

rotating_gates

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

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

roulette

…

shop

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

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

slot_machine

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

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

spinda_spots

…

starter_choose

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

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

summary_screen

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

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

text_window

…

title_screen

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

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

trade

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

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

trainer_card

…

trainer_hill

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

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

trainers

…

types

…

union_room_chat

…

unused

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

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

wallclock

…

weather

…

wonder_card

…

wonder_news

…