summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatoMew <SatoMew@users.noreply.github.com>2019-04-14 13:40:39 +0100
committerSatoMew <SatoMew@users.noreply.github.com>2019-04-14 13:40:39 +0100
commite4f053e312b7cce44e2b4e9b8449f3e724dda0bc (patch)
tree1497527d7cab9d9c3ac7c2abfef4c873df9d3751
parentf797052c1e96689b90f02578f4e6784af5dbcb83 (diff)
Identify radio graphics
-rwxr-xr-xengine/dumps/bank02.asm6
-rw-r--r--gfx.asm8
-rw-r--r--gfx/trainer_gear/radio.png (renamed from gfx/trainer_gear/trainer_gear_2.png)bin336 -> 336 bytes
-rw-r--r--gfx/trainer_gear/trainer_gear.png (renamed from gfx/trainer_gear/trainer_gear_1.png)bin6228 -> 6228 bytes
4 files changed, 7 insertions, 7 deletions
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/trainer_gear_2.png b/gfx/trainer_gear/radio.png
index 0e92fc8..0e92fc8 100644
--- a/gfx/trainer_gear/trainer_gear_2.png
+++ b/gfx/trainer_gear/radio.png
Binary files differ
diff --git a/gfx/trainer_gear/trainer_gear_1.png b/gfx/trainer_gear/trainer_gear.png
index c7d7ade..c7d7ade 100644
--- a/gfx/trainer_gear/trainer_gear_1.png
+++ b/gfx/trainer_gear/trainer_gear.png
Binary files differ