Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

Browse Source

...

This commit is contained in:

GriffinR

2020-02-12 13:05:57 -05:00

parent 9c934c9664 66c6b7a38b

commit 956090b05f

71 changed files with 4332 additions and 2506 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

graphics/unknown/unknown_DD21B0.bin → graphics/trainer_card/back.bin

graphics/unknown/unknown_DD2D30.bin → graphics/trainer_card/back_fr.bin

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

graphics/unknown/unknown_DD1F78.bin → graphics/trainer_card/bg.bin

graphics/unknown/unknown_DD2AE0.bin → graphics/trainer_card/bg_fr.bin

graphics/unknown/unknown_DD2010.bin → graphics/trainer_card/front.bin

graphics/unknown/unknown_DD2B78.bin → graphics/trainer_card/front_fr.bin

graphics/unknown/unknown_DD228C.bin → graphics/trainer_card/front_link.bin

graphics/unknown/unknown_DD2E5C.bin → graphics/trainer_card/front_link_fr.bin