summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-04-30 09:27:06 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-04-30 09:27:06 -0700
commit9d59fdc3e4cb0f13313cfc8be5884080a418f3b9 (patch)
tree1e695e768e21a88d61a4dba59df8d17a67b86b26
parentd7403bcbf7af7a1f859ca8988809a53f4a7359cc (diff)
Fixup Gengar gfx
-rw-r--r--gfx/stage/gengar_bonus/gengar.interleave.pngbin0 -> 887 bytes
-rw-r--r--gfx/stage/gengar_bonus/gengar_1.pngbin262 -> 0 bytes
-rw-r--r--gfx/stage/gengar_bonus/gengar_2.pngbin120 -> 0 bytes
-rw-r--r--gfx/stage/gengar_bonus/gengar_3.pngbin451 -> 0 bytes
-rwxr-xr-xmain.asm42
5 files changed, 25 insertions, 17 deletions
diff --git a/gfx/stage/gengar_bonus/gengar.interleave.png b/gfx/stage/gengar_bonus/gengar.interleave.png
new file mode 100644
index 0000000..a44534c
--- /dev/null
+++ b/gfx/stage/gengar_bonus/gengar.interleave.png
Binary files differ
diff --git a/gfx/stage/gengar_bonus/gengar_1.png b/gfx/stage/gengar_bonus/gengar_1.png
deleted file mode 100644
index d80e647..0000000
--- a/gfx/stage/gengar_bonus/gengar_1.png
+++ /dev/null
Binary files differ
diff --git a/gfx/stage/gengar_bonus/gengar_2.png b/gfx/stage/gengar_bonus/gengar_2.png
deleted file mode 100644
index d2fe7f1..0000000
--- a/gfx/stage/gengar_bonus/gengar_2.png
+++ /dev/null
Binary files differ
diff --git a/gfx/stage/gengar_bonus/gengar_3.png b/gfx/stage/gengar_bonus/gengar_3.png
deleted file mode 100644
index e3b87a9..0000000
--- a/gfx/stage/gengar_bonus/gengar_3.png
+++ /dev/null
Binary files differ
diff --git a/main.asm b/main.asm
index e558ef0..9680f1d 100755
--- a/main.asm
+++ b/main.asm
@@ -8105,9 +8105,9 @@ StageGengarBonusGfx_GameBoy: ; 0xea12
VIDEO_DATA_TILES GengarBonusGastlyGfx, vTilesSH + $100, $180
VIDEO_DATA_TILES_BANK GengarBonusHaunterGfx + $180, Bank(GengarBonusHaunterGfx), vTilesSH + $280, $20
VIDEO_DATA_TILES_BANK GengarBonusHaunterGfx + $1a0, Bank(GengarBonusHaunterGfx), vTilesOB + $1a0, $100
- VIDEO_DATA_TILES GengarBonusGengar1Gfx, vTilesOB + $2a0, $160
- VIDEO_DATA_TILES GengarBonusGengar2Gfx, vTilesOB + $7a0, $60
- VIDEO_DATA_TILES GengarBonusGengar3Gfx, vTilesSH + $2a0, $2a0
+ VIDEO_DATA_TILES_BANK GengarBonusGengarGfx + $2a0, Bank(GengarBonusGengarGfx), vTilesOB + $2a0, $160
+ VIDEO_DATA_TILES_BANK GengarBonusGengarGfx + $400, Bank(GengarBonusGengarGfx), vTilesOB + $7a0, $60
+ VIDEO_DATA_TILES_BANK GengarBonusGengarGfx + $460, Bank(GengarBonusGengarGfx), vTilesSH + $2a0, $2a0
VIDEO_DATA_TILEMAP GengarBonusTilemap_GameBoy, vBGMap, $400
db $FF, $FF ; terminators
@@ -8118,9 +8118,9 @@ StageGengarBonusGfx_GameBoyColor: ; 0xea5a
VIDEO_DATA_TILES GengarBonusGastlyGfx, vTilesSH + $100, $180
VIDEO_DATA_TILES_BANK GengarBonusHaunterGfx + $180, Bank(GengarBonusHaunterGfx), vTilesSH + $280, $20
VIDEO_DATA_TILES_BANK GengarBonusHaunterGfx + $1a0, Bank(GengarBonusHaunterGfx), vTilesOB + $1a0, $100
- VIDEO_DATA_TILES GengarBonusGengar1Gfx, vTilesOB + $2a0, $160
- VIDEO_DATA_TILES GengarBonusGengar2Gfx, vTilesOB + $7a0, $60
- VIDEO_DATA_TILES GengarBonusGengar3Gfx, vTilesSH + $2a0, $2a0
+ VIDEO_DATA_TILES_BANK GengarBonusGengarGfx + $2a0, Bank(GengarBonusGengarGfx), vTilesOB + $2a0, $160
+ VIDEO_DATA_TILES_BANK GengarBonusGengarGfx + $400, Bank(GengarBonusGengarGfx), vTilesOB + $7a0, $60
+ VIDEO_DATA_TILES_BANK GengarBonusGengarGfx + $460, Bank(GengarBonusGengarGfx), vTilesSH + $2a0, $2a0
VIDEO_DATA_TILES_BANK2 GengarBonus1Gfx, vTilesSH, $1000
VIDEO_DATA_TILES_BANK2 TimerDigitsGfx, vTilesOB + $600, $160
VIDEO_DATA_TILEMAP GengarBonusBottomTilemap_GameBoyColor, vBGMap, $400
@@ -18796,7 +18796,7 @@ Func_191cb: ; 0x191cb
sla a
ld c, a
ld b, $0
- ld hl, Data_1920f
+ ld hl, GengarBonusStageGengarGfxTable
add hl, bc
ld a, [hli]
ld c, a
@@ -18825,8 +18825,15 @@ Func_191cb: ; 0x191cb
scf
ret
-Data_1920f:
- dr $1920f, $1924f
+GengarBonusStageGengarGfxTable:
+ dw $60, vTilesSH tile $10, GengarBonusGengarGfx, $0000
+ dw $60, vTilesSH tile $16, GengarBonusGengarGfx + $60, $0000
+ dw $60, vTilesSH tile $1c, GengarBonusGengarGfx + $c0, $0000
+ dw $60, vTilesSH tile $22, GengarBonusGengarGfx + $120, $0000
+ dw $20, vTilesSH tile $28, GengarBonusGengarGfx + $180, $0000
+ dw $40, vTilesOB tile $1a, GengarBonusGengarGfx + $1a0, $0000
+ dw $60, vTilesOB tile $1e, GengarBonusGengarGfx + $1e0, $0000
+ dw $60, vTilesOB tile $24, GengarBonusGengarGfx + $240, $0000
InitMewtwoBonusStage: ; 0x1924f
ld a, [wd7c1]
@@ -34511,14 +34518,15 @@ SeelBonusSeel2Gfx: ; 0x9b400
INCBIN "gfx/stage/seel_bonus/seel_2.2bpp"
SeelBonusSeel4Gfx: ; 0x9b460
INCBIN "gfx/stage/seel_bonus/seel_4.2bpp"
- dr $9b900, $9bba0
-
-GengarBonusGengar1Gfx: ; 0x9bba0
- INCBIN "gfx/stage/gengar_bonus/gengar_1.2bpp"
-GengarBonusGengar2Gfx: ; 0x9bd00
- INCBIN "gfx/stage/gengar_bonus/gengar_2.2bpp"
-GengarBonusGengar3Gfx: ; 0x9bd60
- INCBIN "gfx/stage/gengar_bonus/gengar_3.2bpp"
+
+GengarBonusGengarGfx: ; 0x9b900
+ INCBIN "gfx/stage/gengar_bonus/gengar.interleave.2bpp"
+;GengarBonusGengar1Gfx: ; 0x9bba0
+; INCBIN "gfx/stage/gengar_bonus/gengar_1.2bpp"
+;GengarBonusGengar2Gfx: ; 0x9bd00
+; INCBIN "gfx/stage/gengar_bonus/gengar_2.2bpp"
+;GengarBonusGengar3Gfx: ; 0x9bd60
+; INCBIN "gfx/stage/gengar_bonus/gengar_3.2bpp"
SECTION "bank27", ROMX, BANK[$27]