summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2015-11-01 12:21:01 -0800
committerMarcus Huderle <huderlem@gmail.com>2015-11-01 12:21:01 -0800
commita3c2ecf4d698bf91db425c57b6f2f9ea4e8017e6 (patch)
tree155265716fdbec7b52d1b3e438ed83cc5ed4f061
parent4f08f155e88d929b2d30de98e7e8f24a0884c049 (diff)
Meowth Bonus gameboy gfx.
-rw-r--r--gfx/stage/meowth_bonus/meowth_1.pngbin0 -> 562 bytes
-rw-r--r--gfx/stage/meowth_bonus/meowth_2.pngbin0 -> 180 bytes
-rw-r--r--gfx/stage/meowth_bonus/meowth_3.pngbin0 -> 380 bytes
-rw-r--r--gfx/stage/meowth_bonus/meowth_4.pngbin0 -> 637 bytes
-rw-r--r--gfx/stage/meowth_bonus/meowth_bonus_base_gameboy.pngbin0 -> 903 bytes
-rwxr-xr-xgfx/tilemaps/stage_meowth_bonus_gameboy.mapbin0 -> 1024 bytes
-rwxr-xr-xmain.asm63
7 files changed, 26 insertions, 37 deletions
diff --git a/gfx/stage/meowth_bonus/meowth_1.png b/gfx/stage/meowth_bonus/meowth_1.png
new file mode 100644
index 0000000..872a578
--- /dev/null
+++ b/gfx/stage/meowth_bonus/meowth_1.png
Binary files differ
diff --git a/gfx/stage/meowth_bonus/meowth_2.png b/gfx/stage/meowth_bonus/meowth_2.png
new file mode 100644
index 0000000..7af9bae
--- /dev/null
+++ b/gfx/stage/meowth_bonus/meowth_2.png
Binary files differ
diff --git a/gfx/stage/meowth_bonus/meowth_3.png b/gfx/stage/meowth_bonus/meowth_3.png
new file mode 100644
index 0000000..817eb46
--- /dev/null
+++ b/gfx/stage/meowth_bonus/meowth_3.png
Binary files differ
diff --git a/gfx/stage/meowth_bonus/meowth_4.png b/gfx/stage/meowth_bonus/meowth_4.png
new file mode 100644
index 0000000..73ada98
--- /dev/null
+++ b/gfx/stage/meowth_bonus/meowth_4.png
Binary files differ
diff --git a/gfx/stage/meowth_bonus/meowth_bonus_base_gameboy.png b/gfx/stage/meowth_bonus/meowth_bonus_base_gameboy.png
new file mode 100644
index 0000000..1662ec7
--- /dev/null
+++ b/gfx/stage/meowth_bonus/meowth_bonus_base_gameboy.png
Binary files differ
diff --git a/gfx/tilemaps/stage_meowth_bonus_gameboy.map b/gfx/tilemaps/stage_meowth_bonus_gameboy.map
new file mode 100755
index 0000000..4b16924
--- /dev/null
+++ b/gfx/tilemaps/stage_meowth_bonus_gameboy.map
Binary files differ
diff --git a/main.asm b/main.asm
index 2e2f8b0..3e4fc6d 100755
--- a/main.asm
+++ b/main.asm
@@ -18252,40 +18252,14 @@ StageMewtwoBonusGfx_GameBoyColor: ; 0xeaf8
db $FF, $FF ; terminators
StageMeowthBonusGfx_GameBoy: ; 0xeb4e
- VIDEO_DATA_TILES Alphabet1Gfx, vTiles0, $1a0
-
- dw $41A0
- db $33
- dw $81A0
- dw $0980
-
- VIDEO_DATA_TILES PinballPokeballGfx, vTiles0 + $400, $320
-
- dw $4400
- db $33
- dw $87A0
- dw $0180
-
- dw $7600
- db $17
- dw $8800
- dw $2800
-
- dw $4000
- db $33
- dw $8900
- dw $0680
-
- dw $4460
- db $33
- dw $8AA0
- dw $0D80
-
- dw $5800
- db $33
- dw $9800
- dw $1000
-
+ VIDEO_DATA_TILES Alphabet1Gfx, vTiles0, $1a0
+ VIDEO_DATA_TILES MeowthBonusMeowth1Gfx, vTiles0 + $1a0, $260
+ VIDEO_DATA_TILES PinballPokeballGfx, vTiles0 + $400, $320
+ VIDEO_DATA_TILES MeowthBonusMeowth2Gfx, vTiles0 + $7a0, $60
+ VIDEO_DATA_TILES MeowthBonusBaseGameBoyGfx, vTiles1, $a00
+ VIDEO_DATA_TILES MeowthBonusMeowth3Gfx, vTiles1 + $100, $1a0
+ VIDEO_DATA_TILES MeowthBonusMeowth4Gfx, vTiles1 + $2a0, $360
+ VIDEO_DATA_TILEMAP MeowthBonusTilemap_GameBoy, vBGMap0, $400
db $FF, $FF ; terminators
StageMeowthBonusGfx_GameBoyColor: ; 0xeb88
@@ -51444,7 +51418,8 @@ BigReward9000000PointsOnPic: ; 0x5f300
BigReward9000000PointsOffPic: ; 0x5f480
INCBIN "gfx/billboard/slot/9000000points_off.2bpp"
-INCBIN "baserom.gbc",$5f600,$60000 - $5f600 ; 0x5f600
+MeowthBonusBaseGameBoyGfx: ; 0x5f600
+ INCBIN "gfx/stage/meowth_bonus/meowth_bonus_base_gameboy.2bpp"
SECTION "bank18", ROMX, BANK[$18]
@@ -53714,7 +53689,16 @@ MewtoBonusBottomTilemap2_GameBoyColor: ; 0xcbc00
SECTION "bank33", ROMX, BANK[$33]
-INCBIN "baserom.gbc",$cc000,$cc800 - $cc000
+MeowthBonusMeowth3Gfx: ; 0xcc000
+ INCBIN "gfx/stage/meowth_bonus/meowth_3.2bpp"
+MeowthBonusMeowth1Gfx: ; 0xcc1a0
+ INCBIN "gfx/stage/meowth_bonus/meowth_1.2bpp"
+MeowthBonusMeowth2Gfx: ; 0xcc400
+ INCBIN "gfx/stage/meowth_bonus/meowth_2.2bpp"
+MeowthBonusMeowth4Gfx: ; 0xcc460
+ INCBIN "gfx/stage/meowth_bonus/meowth_4.2bpp"
+
+INCBIN "baserom.gbc",$cc7c0,$cc800 - $cc7c0
StageMeowthBonusCollisionAttributesBallEntrance: ; 0xcc800
INCBIN "data/collision/maps/meowth_bonus_ball_entrance.collision"
@@ -53724,7 +53708,12 @@ INCBIN "baserom.gbc",$ccc00,$cd000 - $ccc00
StageMeowthBonusCollisionAttributes: ; 0xcd000
INCBIN "data/collision/maps/meowth_bonus.collision"
-INCBIN "baserom.gbc",$cd400,$ce800 - $cd400
+INCBIN "baserom.gbc",$cd400,$cd800 - $cd400
+
+MeowthBonusTilemap_GameBoy: ; 0xcd800
+ INCBIN "gfx/tilemaps/stage_meowth_bonus_gameboy.map"
+
+INCBIN "baserom.gbc",$cdc00,$ce800 - $cdc00
StageDiglettBonusCollisionAttributesBallEntrance: ; 0xce800
INCBIN "data/collision/maps/diglett_bonus_ball_entrance.collision"