From e4f053e312b7cce44e2b4e9b8449f3e724dda0bc Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sun, 14 Apr 2019 13:40:39 +0100 Subject: Identify radio graphics --- engine/dumps/bank02.asm | 6 +++--- gfx.asm | 8 ++++---- gfx/trainer_gear/radio.png | Bin 0 -> 336 bytes gfx/trainer_gear/trainer_gear.png | Bin 0 -> 6228 bytes gfx/trainer_gear/trainer_gear_1.png | Bin 6228 -> 0 bytes gfx/trainer_gear/trainer_gear_2.png | Bin 336 -> 0 bytes 6 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 gfx/trainer_gear/radio.png create mode 100644 gfx/trainer_gear/trainer_gear.png delete mode 100644 gfx/trainer_gear/trainer_gear_1.png delete mode 100644 gfx/trainer_gear/trainer_gear_2.png diff --git a/engine/dumps/bank02.asm b/engine/dumps/bank02.asm index dd77cdc..500091e 100755 --- a/engine/dumps/bank02.asm +++ b/engine/dumps/bank02.asm @@ -1443,7 +1443,7 @@ Function8ae0: ; 02:4ae0 call ClearSprites ld b, $13 call GetSGBLayout - ld hl, TrainerGear1GFX + ld hl, TrainerGearGFX ld de, vChars2 ld bc, $0200 ld a, $02 @@ -1672,9 +1672,9 @@ Function8cb7: ; 02:4cb7 call WaitForAutoBgMapTransfer ld b, $15 call GetSGBLayout - ld de, TrainerGear2GFX + ld de, RadioGFX ld hl, vTilesetEnd - lb bc, BANK(TrainerGear2GFX), $09 + lb bc, BANK(RadioGFX), $09 call Request2bpp ld de, VerticalPipeGFX ld hl, vChars0 diff --git a/gfx.asm b/gfx.asm index e430bb4..c36a47d 100644 --- a/gfx.asm +++ b/gfx.asm @@ -19,10 +19,10 @@ UnknownBallGFX:: INCBIN "gfx/overworld/gfx_85cf.2bpp" SECTION "gfx.asm@Trainer Gear GFX", ROMX -TrainerGear1GFX:: -INCBIN "gfx/trainer_gear/trainer_gear_1.2bpp" -TrainerGear2GFX:: -INCBIN "gfx/trainer_gear/trainer_gear_2.2bpp" +TrainerGearGFX:: +INCBIN "gfx/trainer_gear/trainer_gear.2bpp" +RadioGFX:: +INCBIN "gfx/trainer_gear/radio.2bpp" VerticalPipeGFX:: INCBIN "gfx/trainer_gear/vertical_pipe.2bpp" diff --git a/gfx/trainer_gear/radio.png b/gfx/trainer_gear/radio.png new file mode 100644 index 0000000..0e92fc8 Binary files /dev/null and b/gfx/trainer_gear/radio.png differ diff --git a/gfx/trainer_gear/trainer_gear.png b/gfx/trainer_gear/trainer_gear.png new file mode 100644 index 0000000..c7d7ade Binary files /dev/null and b/gfx/trainer_gear/trainer_gear.png differ diff --git a/gfx/trainer_gear/trainer_gear_1.png b/gfx/trainer_gear/trainer_gear_1.png deleted file mode 100644 index c7d7ade..0000000 Binary files a/gfx/trainer_gear/trainer_gear_1.png and /dev/null differ diff --git a/gfx/trainer_gear/trainer_gear_2.png b/gfx/trainer_gear/trainer_gear_2.png deleted file mode 100644 index 0e92fc8..0000000 Binary files a/gfx/trainer_gear/trainer_gear_2.png and /dev/null differ -- cgit v1.2.3