diff options
| -rwxr-xr-x | macros.asm | 7 | ||||
| -rwxr-xr-x | main.asm | 219 |
2 files changed, 224 insertions, 2 deletions
@@ -52,3 +52,10 @@ ENDM hlCoord: MACRO ld hl, \3 + $20 * \2 + \1 ENDM + +;\1 = 5-bit Blue value +;\2 = 5-bit Green value +;\3 = 5-bit Red value +RGB: MACRO + dw (\3 << 10 | \2 << 5 | \1) + ENDM @@ -42318,7 +42318,199 @@ FieldSelectBlinkingBorderGfx: ; 0x8b000 FieldSelectGfx: ; 0x8b100 INCBIN "gfx/field_select/field_select_tiles.2bpp" -INCBIN "baserom.gbc",$8bd00,$8c000 - $8bd00 ; 0x8bd00 +INCBIN "baserom.gbc",$8bd00,$8bf00 - $8bd00 ; 0x8bd00 + +BulbasaurBillboardBGPalette1: ; 0x8bf00 + RGB 31, 31, 31 + RGB 0, 19, 13 + RGB 26, 1, 0 + RGB 0, 0, 0 + +BulbasaurBillboardBGPalette2: ; 0x8bf08 + RGB 31, 31, 31 + RGB 0, 19, 13 + RGB 0, 9, 0 + RGB 0, 0, 0 + +IvysaurBillboardBGPalette1: ; 0x8bf10 + RGB 31, 31, 31 + RGB 0, 19, 13 + RGB 0, 12, 6 + RGB 0, 0, 0 + +IvysaurBillboardBGPalette2: ; 0x8bf18 + RGB 31, 31, 31 + RGB 25, 17, 3 + RGB 0, 12, 6 + RGB 0, 0, 0 + +VenusaurBillboardBGPalette1: ; 0x8bf20 + RGB 31, 31, 31 + RGB 0, 19, 13 + RGB 26, 1, 0 + RGB 0, 0, 0 + +VenusaurBillboardBGPalette2: ; 0x8bf28 + RGB 31, 31, 31 + RGB 0, 19, 13 + RGB 5, 15, 0 + RGB 0, 0, 0 + +CharmanderBillboardBGPalette1: ; 0x8bf30 + RGB 31, 31, 31 + RGB 31, 17, 1 + RGB 26, 0, 0 + RGB 3, 2, 0 + +CharmanderBillboardBGPalette2: ; 0x8bf38 + RGB 31, 31, 31 + RGB 31, 17, 1 + RGB 26, 0, 0 + RGB 3, 2, 0 + +CharmeleonBillboardBGPalette1: ; 0x8bf40 + RGB 31, 31, 31 + RGB 31, 17, 1 + RGB 26, 4, 0 + RGB 3, 2, 0 + +CharmeleonBillboardBGPalette2: ; 0x8bf48 + RGB 31, 31, 31 + RGB 31, 17, 1 + RGB 26, 4, 0 + RGB 3, 2, 0 + +CharizardBillboardBGPalette1: ; 0x8bf50 + RGB 31, 31, 31 + RGB 31, 17, 1 + RGB 26, 4, 0 + RGB 3, 2, 0 + +CharizardBillboardBGPalette2: ; 0x8bf58 + RGB 31, 31, 31 + RGB 31, 17, 1 + RGB 26, 4, 0 + RGB 3, 2, 0 + +SquirtleBillboardBGPalette1: ; 0x8bf60 + RGB 31, 31, 31 + RGB 26, 23, 0 + RGB 0, 16, 31 + RGB 0, 0, 0 + +SquirtleBillboardBGPalette2: ; 0x8bf68 + RGB 31, 31, 31 + RGB 14, 27, 31 + RGB 0, 16, 31 + RGB 0, 1, 3 + +WartortleBillboardBGPalette1: ; 0x8bf70 + RGB 31, 31, 31 + RGB 29, 23, 0 + RGB 0, 16, 31 + RGB 0, 0, 0 + +WartortleBillboardBGPalette2: ; 0x8bf78 + RGB 31, 31, 31 + RGB 14, 27, 31 + RGB 0, 16, 31 + RGB 0, 1, 3 + +BlastoiseBillboardBGPalette1: ; 0x8bf80 + RGB 31, 31, 31 + RGB 27, 20, 10 + RGB 12, 6, 3 + RGB 0, 0, 0 + +BlastoiseBillboardBGPalette2: ; 0x8bf88 + RGB 31, 31, 31 + RGB 11, 18, 31 + RGB 2, 6, 19 + RGB 0, 0, 0 + +CaterpieBillboardBGPalette1: ; 0x8bf90 + RGB 31, 31, 31 + RGB 23, 27, 5 + RGB 3, 17, 0 + RGB 0, 0, 0 + +CaterpieBillboardBGPalette2: ; 0x8bf98 + RGB 31, 31, 31 + RGB 23, 27, 5 + RGB 3, 17, 0 + RGB 0, 0, 0 + +MetapodBillboardBGPalette1: ; 0x8bfa0 + RGB 31, 31, 31 + RGB 23, 27, 5 + RGB 7, 18, 0 + RGB 0, 0, 0 + +MetapodBillboardBGPalette2: ; 0x8bfa8 + RGB 31, 31, 31 + RGB 23, 27, 5 + RGB 7, 18, 0 + RGB 0, 0, 0 + +ButterfreeBillboardBGPalette1: ; 0x8bfb0 + RGB 31, 31, 31 + RGB 31, 15, 0 + RGB 31, 0, 1 + RGB 3, 2, 0 + +ButterfreeBillboardBGPalette2: ; 0x8bfb8 + RGB 31, 31, 31 + RGB 11, 13, 31 + RGB 9, 8, 18 + RGB 0, 0, 0 + +WeedleBillboardBGPalette1: ; 0x8bfc0 + RGB 31, 31, 31 + RGB 29, 25, 0 + RGB 25, 6, 7 + RGB 3, 2, 0 + +WeedleBillboardBGPalette2: ; 0x8bfc8 + RGB 31, 31, 31 + RGB 29, 25, 0 + RGB 25, 6, 7 + RGB 3, 2, 0 + +KakunaBillboardBGPalette1: ; 0x8bfd0 + RGB 31, 31, 31 + RGB 28, 24, 0 + RGB 18, 12, 0 + RGB 3, 2, 0 + +KakunaBillboardBGPalette2: ; 0x8bfd8 + RGB 31, 31, 31 + RGB 28, 24, 0 + RGB 18, 12, 0 + RGB 3, 2, 0 + +BeedrillBillboardBGPalette1: ; 0x8bfe0 + RGB 31, 31, 31 + RGB 30, 27, 0 + RGB 21, 7, 0 + RGB 3, 2, 0 + +BeedrillBillboardBGPalette2: ; 0x8bfe8 + RGB 31, 31, 31 + RGB 30, 27, 0 + RGB 21, 7, 0 + RGB 3, 2, 0 + +PidgeyBillboardBGPalette1: ; 0x8bff0 + RGB 31, 31, 31 + RGB 30, 25, 1 + RGB 26, 9, 3 + RGB 3, 2, 0 + +PidgeyBillboardBGPalette2: ; 0x8bff8 + RGB 31, 31, 31 + RGB 30, 25, 1 + RGB 26, 9, 3 + RGB 3, 2, 0 SECTION "bank23", ROMX, BANK[$23] @@ -42936,7 +43128,30 @@ SECTION "bank37", ROMX, BANK[$37] StageRedFieldBottomGfx2: ; 0xdc000 INCBIN "gfx/stage/red_bottom/red_bottom_2.2bpp" -INCBIN "baserom.gbc",$dc080,$e0000 - $dc080 +INCBIN "baserom.gbc",$dc080,$dd168 - $dc080 + +PokeBallObjPalette: ; 0xdd168 + RGB 21, 21, 21 + RGB 31, 31, 31 + RGB 31, 5, 4 + RGB 0, 0, 0 +GreatBallObjPalette: ; 0xdd170 + RGB 21, 21, 21 + RGB 31, 31, 31 + RGB 2, 8, 31 + RGB 0, 0, 0 +UltraBallObjPalette: ; 0xdd178 + RGB 21, 21, 21 + RGB 31, 31, 31 + RGB 27, 21, 0 + RGB 0, 0, 0 +MasterBallObjPalette: ; 0xdd180 + RGB 21, 21, 21 + RGB 31, 31, 31 + RGB 21, 3, 21 + RGB 0, 0, 0 + +INCBIN "baserom.gbc",$dd188,$e0000 - $dd188 SECTION "bank38", ROMX, BANK[$38] |