diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-02 10:48:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 10:48:56 -0500 |
| commit | 6280a3786ba77956fae95bb11b425e7301d0a6fa (patch) | |
| tree | b140b92b4bd9113d0dea6c6ed8197ace1f93f8fe /graphics | |
| parent | 47f6e9f97396d1486fe515b8a994bbc285060419 (diff) | |
| parent | 5198a05272716990bcd98b9b216d3431adb25a3e (diff) | |
Merge branch 'master' into doc-sixisland
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/trainer_card/back.bin (renamed from graphics/trainer_card/unk_83CC984.bin) | bin | 300 -> 300 bytes | |||
| -rw-r--r-- | graphics/trainer_card/back_hoenn.bin (renamed from graphics/trainer_card/unk_83CC8A8.bin) | bin | 220 -> 220 bytes | |||
| -rw-r--r-- | graphics/trainer_card/bg.bin (renamed from graphics/trainer_card/unk_83CCEC8.bin) | bin | 184 -> 184 bytes | |||
| -rw-r--r-- | graphics/trainer_card/bg_hoenn.bin (renamed from graphics/trainer_card/unk_83CCE30.bin) | bin | 152 -> 152 bytes | |||
| -rw-r--r-- | graphics/trainer_card/front.bin (renamed from graphics/trainer_card/unk_83CC6F0.bin) | bin | 440 -> 440 bytes | |||
| -rw-r--r-- | graphics/trainer_card/front_hoenn.bin (renamed from graphics/trainer_card/unk_83CC4DC.bin) | bin | 532 -> 532 bytes | |||
| -rw-r--r-- | graphics/trainer_card/front_hoenn_link.bin (renamed from graphics/trainer_card/unk_83CCAB0.bin) | bin | 500 -> 500 bytes | |||
| -rw-r--r-- | graphics/trainer_card/front_link.bin (renamed from graphics/trainer_card/unk_83CCCA4.bin) | bin | 396 -> 396 bytes | |||
| -rw-r--r-- | graphics/trainer_card/gold.pal (renamed from graphics/trainer_card/unk_83CD300.pal) | 0 |
9 files changed, 0 insertions, 0 deletions
diff --git a/graphics/trainer_card/unk_83CC984.bin b/graphics/trainer_card/back.bin Binary files differindex dd54ba1c7..dd54ba1c7 100644 --- a/graphics/trainer_card/unk_83CC984.bin +++ b/graphics/trainer_card/back.bin diff --git a/graphics/trainer_card/unk_83CC8A8.bin b/graphics/trainer_card/back_hoenn.bin Binary files differindex eda105eb2..eda105eb2 100644 --- a/graphics/trainer_card/unk_83CC8A8.bin +++ b/graphics/trainer_card/back_hoenn.bin diff --git a/graphics/trainer_card/unk_83CCEC8.bin b/graphics/trainer_card/bg.bin Binary files differindex c1c452262..c1c452262 100644 --- a/graphics/trainer_card/unk_83CCEC8.bin +++ b/graphics/trainer_card/bg.bin diff --git a/graphics/trainer_card/unk_83CCE30.bin b/graphics/trainer_card/bg_hoenn.bin Binary files differindex b3994f663..b3994f663 100644 --- a/graphics/trainer_card/unk_83CCE30.bin +++ b/graphics/trainer_card/bg_hoenn.bin diff --git a/graphics/trainer_card/unk_83CC6F0.bin b/graphics/trainer_card/front.bin Binary files differindex b83c43942..b83c43942 100644 --- a/graphics/trainer_card/unk_83CC6F0.bin +++ b/graphics/trainer_card/front.bin diff --git a/graphics/trainer_card/unk_83CC4DC.bin b/graphics/trainer_card/front_hoenn.bin Binary files differindex 0f45caec6..0f45caec6 100644 --- a/graphics/trainer_card/unk_83CC4DC.bin +++ b/graphics/trainer_card/front_hoenn.bin diff --git a/graphics/trainer_card/unk_83CCAB0.bin b/graphics/trainer_card/front_hoenn_link.bin Binary files differindex 46e00f670..46e00f670 100644 --- a/graphics/trainer_card/unk_83CCAB0.bin +++ b/graphics/trainer_card/front_hoenn_link.bin diff --git a/graphics/trainer_card/unk_83CCCA4.bin b/graphics/trainer_card/front_link.bin Binary files differindex ef8e65b27..ef8e65b27 100644 --- a/graphics/trainer_card/unk_83CCCA4.bin +++ b/graphics/trainer_card/front_link.bin diff --git a/graphics/trainer_card/unk_83CD300.pal b/graphics/trainer_card/gold.pal index ebd175e97..ebd175e97 100644 --- a/graphics/trainer_card/unk_83CD300.pal +++ b/graphics/trainer_card/gold.pal |