From 20eb1851ec183fb5651f514b6c27d7fe0c157410 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Mon, 19 Feb 2018 16:15:17 +0100 Subject: Move gfx/unnamed/ to gfx/duel/ they're more duel anim gfx scattered at the end of banks not no waste space --- src/engine/home.asm | 2 +- src/gfx.asm | 54 +++++++++++++++++++------------------- src/gfx/duel/55.png | Bin 0 -> 114 bytes src/gfx/duel/56.png | Bin 0 -> 85 bytes src/gfx/duel/57.png | Bin 0 -> 90 bytes src/gfx/duel/58.png | Bin 0 -> 94 bytes src/gfx/duel/59.png | Bin 0 -> 120 bytes src/gfx/duel/60.png | Bin 0 -> 97 bytes src/gfx/duel/61.png | Bin 0 -> 95 bytes src/gfx/duel/62.png | Bin 0 -> 85 bytes src/gfx/duel/63.png | Bin 0 -> 199 bytes src/gfx/duel/64.png | Bin 0 -> 102 bytes src/gfx/duel/65.png | Bin 0 -> 183 bytes src/gfx/duel/66.png | Bin 0 -> 135 bytes src/gfx/duel/box_messages.png | Bin 0 -> 1081 bytes src/gfx/duel/duel1.t5.png | Bin 3283 -> 0 bytes src/gfx/duel/duel2.png | Bin 1081 -> 0 bytes src/gfx/duel/duel_graphics.t5.png | Bin 0 -> 3283 bytes src/gfx/duel/poison.png | Bin 94 -> 0 bytes src/gfx/unnamed/1.png | Bin 114 -> 0 bytes src/gfx/unnamed/10.png | Bin 183 -> 0 bytes src/gfx/unnamed/11.png | Bin 135 -> 0 bytes src/gfx/unnamed/2.png | Bin 85 -> 0 bytes src/gfx/unnamed/3.png | Bin 90 -> 0 bytes src/gfx/unnamed/4.png | Bin 120 -> 0 bytes src/gfx/unnamed/5.png | Bin 97 -> 0 bytes src/gfx/unnamed/6.png | Bin 95 -> 0 bytes src/gfx/unnamed/7.png | Bin 85 -> 0 bytes src/gfx/unnamed/8.png | Bin 199 -> 0 bytes src/gfx/unnamed/9.png | Bin 102 -> 0 bytes 30 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 src/gfx/duel/55.png create mode 100644 src/gfx/duel/56.png create mode 100644 src/gfx/duel/57.png create mode 100644 src/gfx/duel/58.png create mode 100644 src/gfx/duel/59.png create mode 100644 src/gfx/duel/60.png create mode 100644 src/gfx/duel/61.png create mode 100644 src/gfx/duel/62.png create mode 100644 src/gfx/duel/63.png create mode 100644 src/gfx/duel/64.png create mode 100644 src/gfx/duel/65.png create mode 100644 src/gfx/duel/66.png create mode 100644 src/gfx/duel/box_messages.png delete mode 100644 src/gfx/duel/duel1.t5.png delete mode 100644 src/gfx/duel/duel2.png create mode 100644 src/gfx/duel/duel_graphics.t5.png delete mode 100644 src/gfx/duel/poison.png delete mode 100644 src/gfx/unnamed/1.png delete mode 100644 src/gfx/unnamed/10.png delete mode 100644 src/gfx/unnamed/11.png delete mode 100644 src/gfx/unnamed/2.png delete mode 100644 src/gfx/unnamed/3.png delete mode 100644 src/gfx/unnamed/4.png delete mode 100644 src/gfx/unnamed/5.png delete mode 100644 src/gfx/unnamed/6.png delete mode 100644 src/gfx/unnamed/7.png delete mode 100644 src/gfx/unnamed/8.png delete mode 100644 src/gfx/unnamed/9.png (limited to 'src') diff --git a/src/engine/home.asm b/src/engine/home.asm index 0040051..cd10623 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -4387,7 +4387,7 @@ DrawDuelBoxMessage: ; 2167 (0:2167) ld a, $a0 ld hl, $010a ld bc, $0a04 - ld de, $0504 + lb de, 5, 4 jp Func_1f5f ; 0x2189 diff --git a/src/gfx.asm b/src/gfx.asm index 67be845..91c072a 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -9,14 +9,14 @@ VWF:: ; 76668 (1d:6668) INCBIN "gfx/vwf.1bpp" DuelGraphics:: ; 76968 (1d:6968) -INCBIN "gfx/duel/duel1.t5.2bpp", $0, $1698 +INCBIN "gfx/duel/duel_graphics.t5.2bpp", $0, $1698 SECTION "Gfx 2", ROMX -INCBIN "gfx/duel/duel1.t5.2bpp", $1698, $318 +INCBIN "gfx/duel/duel_graphics.t5.2bpp", $1698, $318 DuelBoxMessages:: ; 78318 (1e:4318) -INCBIN "gfx/duel/duel2.2bpp" +INCBIN "gfx/duel/box_messages.2bpp" rept $2b68 db $ff @@ -45,13 +45,13 @@ PlayerGfx: ; 87d7e (21:7d7e) dw $24 INCBIN "gfx/duelists/player.2bpp" -Unnamed1Gfx: ; 87fc0 (21:7fc0) +Duel55Gfx: ; 87fc0 (21:7fc0) dw $2 - INCBIN "gfx/unnamed/1.2bpp" + INCBIN "gfx/duel/55.2bpp" -Unnamed2Gfx: ; 87fe2 (21:7fe2) +Duel56Gfx: ; 87fe2 (21:7fe2) dw $1 - INCBIN "gfx/unnamed/2.2bpp" + INCBIN "gfx/duel/56.2bpp" INCROM $87ff4, $88000 @@ -93,9 +93,9 @@ OWSpritePlayer: ; 8be90 (22:7e90) dw $14 INCBIN "gfx/overworld_sprites/player.2bpp" -Unnamed3Gfx: ; 8bfd2 (22:7fd2) +Duel57Gfx: ; 8bfd2 (22:7fd2) dw $1 - INCBIN "gfx/unnamed/3.2bpp" + INCBIN "gfx/duel/57.2bpp" INCROM $8bfe4, $8c000 @@ -158,9 +158,9 @@ NintendoGfx: ; 8fe22 (23:7e22) dw $18 INCBIN "gfx/nintendo.2bpp" -PoisonGfx: ; 8ffa4 (23:7fa4) +Duel58Gfx: ; 8ffa4 (23:7fa4) dw $4 - INCBIN "gfx/duel/poison.2bpp" + INCBIN "gfx/duel/58.2bpp" INCROM $8ffe6, $90000 @@ -214,13 +214,13 @@ HelpDeskLadyGfx: ; 93f26 (24:7f26) dw $8 INCBIN "gfx/overworld_sprites/help_desk_lady.2bpp" -Unnamed4Gfx: ; 93fa8 (24:7fa8) +Duel59Gfx: ; 93fa8 (24:7fa8) dw $3 - INCBIN "gfx/unnamed/4.2bpp" + INCBIN "gfx/duel/59.2bpp" -Unnamed5Gfx: ; 93fda (24:7fda) +Duel60Gfx: ; 93fda (24:7fda) dw $2 - INCBIN "gfx/unnamed/5.2bpp" + INCBIN "gfx/duel/60.2bpp" rept $4 db $ff @@ -304,13 +304,13 @@ OverworldMapOAMGfx: ; 9bf3a (26:7f3a) dw $8 INCBIN "gfx/overworld_map_oam.2bpp" -Unnamed6Gfx: ; 9bfbc (26:7fbc) +Duel61Gfx: ; 9bfbc (26:7fbc) dw $3 - INCBIN "gfx/unnamed/6.2bpp" + INCBIN "gfx/duel/61.2bpp" -Unnamed7Gfx: ; 9bfee (26:7fee) +Duel62Gfx: ; 9bfee (26:7fee) dw $1 - INCBIN "gfx/unnamed/7.2bpp" + INCBIN "gfx/duel/62.2bpp" SECTION "Gfx 9", ROMX @@ -426,13 +426,13 @@ MichaelGfx: ; 9fcf6 (27:7cf6) dw $24 INCBIN "gfx/duelists/michael.2bpp" -Unnamed8Gfx: ; 9ff38 (27:7f38) +Duel63Gfx: ; 9ff38 (27:7f38) dw $a - INCBIN "gfx/unnamed/8.2bpp" + INCBIN "gfx/duel/63.2bpp" -Unnamed9Gfx: ; 9ffda (27:7fda) +Duel64Gfx: ; 9ffda (27:7fda) dw $2 - INCBIN "gfx/unnamed/9.2bpp" + INCBIN "gfx/duel/64.2bpp" rept $4 db $ff @@ -604,13 +604,13 @@ OWSprite29: ; a3dc0 (28:7dc0) dw $14 INCBIN "gfx/overworld_sprites/29.2bpp" -Unnamed10Gfx: ; a3f02 (28:7f02) +Duel65Gfx: ; a3f02 (28:7f02) dw $b - INCBIN "gfx/unnamed/10.2bpp" + INCBIN "gfx/duel/65.2bpp" -Unnamed11Gfx: ; a3fb4 (28:7fb4) +Duel66Gfx: ; a3fb4 (28:7fb4) dw $4 - INCBIN "gfx/unnamed/11.2bpp" + INCBIN "gfx/duel/66.2bpp" INCROM $a3ff6, $a4000 diff --git a/src/gfx/duel/55.png b/src/gfx/duel/55.png new file mode 100644 index 0000000..ebab414 Binary files /dev/null and b/src/gfx/duel/55.png differ diff --git a/src/gfx/duel/56.png b/src/gfx/duel/56.png new file mode 100644 index 0000000..dd82623 Binary files /dev/null and b/src/gfx/duel/56.png differ diff --git a/src/gfx/duel/57.png b/src/gfx/duel/57.png new file mode 100644 index 0000000..7b97f92 Binary files /dev/null and b/src/gfx/duel/57.png differ diff --git a/src/gfx/duel/58.png b/src/gfx/duel/58.png new file mode 100644 index 0000000..8f8b22c Binary files /dev/null and b/src/gfx/duel/58.png differ diff --git a/src/gfx/duel/59.png b/src/gfx/duel/59.png new file mode 100644 index 0000000..16b7344 Binary files /dev/null and b/src/gfx/duel/59.png differ diff --git a/src/gfx/duel/60.png b/src/gfx/duel/60.png new file mode 100644 index 0000000..dc60679 Binary files /dev/null and b/src/gfx/duel/60.png differ diff --git a/src/gfx/duel/61.png b/src/gfx/duel/61.png new file mode 100644 index 0000000..de82420 Binary files /dev/null and b/src/gfx/duel/61.png differ diff --git a/src/gfx/duel/62.png b/src/gfx/duel/62.png new file mode 100644 index 0000000..c40fc22 Binary files /dev/null and b/src/gfx/duel/62.png differ diff --git a/src/gfx/duel/63.png b/src/gfx/duel/63.png new file mode 100644 index 0000000..5ea882f Binary files /dev/null and b/src/gfx/duel/63.png differ diff --git a/src/gfx/duel/64.png b/src/gfx/duel/64.png new file mode 100644 index 0000000..36310a4 Binary files /dev/null and b/src/gfx/duel/64.png differ diff --git a/src/gfx/duel/65.png b/src/gfx/duel/65.png new file mode 100644 index 0000000..212a40d Binary files /dev/null and b/src/gfx/duel/65.png differ diff --git a/src/gfx/duel/66.png b/src/gfx/duel/66.png new file mode 100644 index 0000000..65bebfb Binary files /dev/null and b/src/gfx/duel/66.png differ diff --git a/src/gfx/duel/box_messages.png b/src/gfx/duel/box_messages.png new file mode 100644 index 0000000..c8ce50f Binary files /dev/null and b/src/gfx/duel/box_messages.png differ diff --git a/src/gfx/duel/duel1.t5.png b/src/gfx/duel/duel1.t5.png deleted file mode 100644 index e36c5fb..0000000 Binary files a/src/gfx/duel/duel1.t5.png and /dev/null differ diff --git a/src/gfx/duel/duel2.png b/src/gfx/duel/duel2.png deleted file mode 100644 index c8ce50f..0000000 Binary files a/src/gfx/duel/duel2.png and /dev/null differ diff --git a/src/gfx/duel/duel_graphics.t5.png b/src/gfx/duel/duel_graphics.t5.png new file mode 100644 index 0000000..e36c5fb Binary files /dev/null and b/src/gfx/duel/duel_graphics.t5.png differ diff --git a/src/gfx/duel/poison.png b/src/gfx/duel/poison.png deleted file mode 100644 index 8f8b22c..0000000 Binary files a/src/gfx/duel/poison.png and /dev/null differ diff --git a/src/gfx/unnamed/1.png b/src/gfx/unnamed/1.png deleted file mode 100644 index ebab414..0000000 Binary files a/src/gfx/unnamed/1.png and /dev/null differ diff --git a/src/gfx/unnamed/10.png b/src/gfx/unnamed/10.png deleted file mode 100644 index 212a40d..0000000 Binary files a/src/gfx/unnamed/10.png and /dev/null differ diff --git a/src/gfx/unnamed/11.png b/src/gfx/unnamed/11.png deleted file mode 100644 index 65bebfb..0000000 Binary files a/src/gfx/unnamed/11.png and /dev/null differ diff --git a/src/gfx/unnamed/2.png b/src/gfx/unnamed/2.png deleted file mode 100644 index dd82623..0000000 Binary files a/src/gfx/unnamed/2.png and /dev/null differ diff --git a/src/gfx/unnamed/3.png b/src/gfx/unnamed/3.png deleted file mode 100644 index 7b97f92..0000000 Binary files a/src/gfx/unnamed/3.png and /dev/null differ diff --git a/src/gfx/unnamed/4.png b/src/gfx/unnamed/4.png deleted file mode 100644 index 16b7344..0000000 Binary files a/src/gfx/unnamed/4.png and /dev/null differ diff --git a/src/gfx/unnamed/5.png b/src/gfx/unnamed/5.png deleted file mode 100644 index dc60679..0000000 Binary files a/src/gfx/unnamed/5.png and /dev/null differ diff --git a/src/gfx/unnamed/6.png b/src/gfx/unnamed/6.png deleted file mode 100644 index de82420..0000000 Binary files a/src/gfx/unnamed/6.png and /dev/null differ diff --git a/src/gfx/unnamed/7.png b/src/gfx/unnamed/7.png deleted file mode 100644 index c40fc22..0000000 Binary files a/src/gfx/unnamed/7.png and /dev/null differ diff --git a/src/gfx/unnamed/8.png b/src/gfx/unnamed/8.png deleted file mode 100644 index 5ea882f..0000000 Binary files a/src/gfx/unnamed/8.png and /dev/null differ diff --git a/src/gfx/unnamed/9.png b/src/gfx/unnamed/9.png deleted file mode 100644 index 36310a4..0000000 Binary files a/src/gfx/unnamed/9.png and /dev/null differ -- cgit v1.2.3