mirror of
https://github.com/thornAvery/jep-hack.git
synced 2025-09-17 02:30:50 +12:00
Colored Badges
This commit is contained in:
Zeta_Null
parent
1f1f59874e
commit
67790a0e73
|
|
@ -777,9 +777,10 @@ _CGB_TrainerCard:
|
||||||
ld a, PRYCE
|
ld a, PRYCE
|
||||||
call GetTrainerPalettePointer
|
call GetTrainerPalettePointer
|
||||||
call LoadPalette_White_Col1_Col2_Black
|
call LoadPalette_White_Col1_Col2_Black
|
||||||
ld a, PREDEFPAL_CGB_BADGE
|
ld hl, .BadgePalettes
|
||||||
call GetPredefPal
|
ld bc, 8 palettes
|
||||||
call LoadHLPaletteIntoDE
|
ld a, BANK(wOBPals1)
|
||||||
|
call FarCopyWRAM
|
||||||
|
|
||||||
; fill screen with gender-based palette for the card border
|
; fill screen with gender-based palette for the card border
|
||||||
hlcoord 0, 0, wAttrmap
|
hlcoord 0, 0, wAttrmap
|
||||||
|
|
@ -868,6 +869,9 @@ _CGB_TrainerCard:
|
||||||
ld a, TRUE
|
ld a, TRUE
|
||||||
ldh [hCGBPalUpdate], a
|
ldh [hCGBPalUpdate], a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
|
.BadgePalettes:
|
||||||
|
INCLUDE "gfx/trainer_card/badges.pal"
|
||||||
|
|
||||||
_CGB_TrainerCardKanto:
|
_CGB_TrainerCardKanto:
|
||||||
ld a, [wOptions2]
|
ld a, [wOptions2]
|
||||||
|
|
@ -897,9 +901,10 @@ _CGB_TrainerCardKanto:
|
||||||
ld a, BLUE
|
ld a, BLUE
|
||||||
call GetTrainerPalettePointer
|
call GetTrainerPalettePointer
|
||||||
call LoadPalette_White_Col1_Col2_Black
|
call LoadPalette_White_Col1_Col2_Black
|
||||||
ld a, PREDEFPAL_CGB_BADGE
|
ld hl, .KantoBadgePalettes
|
||||||
call GetPredefPal
|
ld bc, 8 palettes
|
||||||
call LoadHLPaletteIntoDE
|
ld a, BANK(wOBPals1)
|
||||||
|
call FarCopyWRAM
|
||||||
|
|
||||||
; fill screen with gender-based palette for the card border
|
; fill screen with gender-based palette for the card border
|
||||||
hlcoord 0, 0, wAttrmap
|
hlcoord 0, 0, wAttrmap
|
||||||
|
|
@ -988,6 +993,9 @@ _CGB_TrainerCardKanto:
|
||||||
ld a, TRUE
|
ld a, TRUE
|
||||||
ldh [hCGBPalUpdate], a
|
ldh [hCGBPalUpdate], a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
|
.KantoBadgePalettes:
|
||||||
|
INCLUDE "gfx/trainer_card/kanto_badges.pal"
|
||||||
|
|
||||||
_CGB_MoveList:
|
_CGB_MoveList:
|
||||||
ld de, wBGPals1
|
ld de, wBGPals1
|
||||||
|
|
|
||||||
|
|
@ -613,38 +613,38 @@ TrainerCard_JohtoBadgesOAM:
|
||||||
db $00, $20, $24, $20 | (1 << 7)
|
db $00, $20, $24, $20 | (1 << 7)
|
||||||
|
|
||||||
; Hivebadge
|
; Hivebadge
|
||||||
db $68, $38, 0
|
db $68, $38, 1
|
||||||
db $04, $20, $24, $20 | (1 << 7)
|
db $04, $20, $24, $20 | (1 << 7)
|
||||||
db $04, $20, $24, $20 | (1 << 7)
|
db $04, $20, $24, $20 | (1 << 7)
|
||||||
|
|
||||||
; Plainbadge
|
; Plainbadge
|
||||||
db $68, $58, 0
|
db $68, $58, 2
|
||||||
db $08, $20, $24, $20 | (1 << 7)
|
db $08, $20, $24, $20 | (1 << 7)
|
||||||
db $08, $20, $24, $20 | (1 << 7)
|
db $08, $20, $24, $20 | (1 << 7)
|
||||||
|
|
||||||
; Fogbadge
|
; Fogbadge
|
||||||
db $68, $78, 0
|
db $68, $78, 3
|
||||||
db $0c, $20, $24, $20 | (1 << 7)
|
db $0c, $20, $24, $20 | (1 << 7)
|
||||||
db $0c, $20, $24, $20 | (1 << 7)
|
db $0c, $20, $24, $20 | (1 << 7)
|
||||||
|
|
||||||
; Mineralbadge
|
; Mineralbadge
|
||||||
db $80, $38, 0
|
db $80, $38, 5
|
||||||
db $10, $20, $24, $20 | (1 << 7)
|
db $10, $20, $24, $20 | (1 << 7)
|
||||||
db $10, $20, $24, $20 | (1 << 7)
|
db $10, $20, $24, $20 | (1 << 7)
|
||||||
|
|
||||||
; Stormbadge
|
; Stormbadge
|
||||||
db $80, $18, 0
|
db $80, $18, 4
|
||||||
db $14, $20, $24, $20 | (1 << 7)
|
db $14, $20, $24, $20 | (1 << 7)
|
||||||
db $14, $20, $24, $20 | (1 << 7)
|
db $14, $20, $24, $20 | (1 << 7)
|
||||||
|
|
||||||
; Glacierbadge
|
; Glacierbadge
|
||||||
db $80, $58, 0
|
db $80, $58, 6
|
||||||
db $18, $20, $24, $20 | (1 << 7)
|
db $18, $20, $24, $20 | (1 << 7)
|
||||||
db $18, $20, $24, $20 | (1 << 7)
|
db $18, $20, $24, $20 | (1 << 7)
|
||||||
|
|
||||||
; Risingbadge
|
; Risingbadge
|
||||||
; X-flips on alternate cycles.
|
; X-flips on alternate cycles.
|
||||||
db $80, $78, 0
|
db $80, $78, 7
|
||||||
db $1c, $20, $24, $20 | (1 << 7)
|
db $1c, $20, $24, $20 | (1 << 7)
|
||||||
db $1c | (1 << 7), $20, $24, $20 | (1 << 7)
|
db $1c | (1 << 7), $20, $24, $20 | (1 << 7)
|
||||||
|
|
||||||
|
|
@ -663,38 +663,38 @@ TrainerCard_KantoBadgesOAM:
|
||||||
db $00, $20 | (1 << 7), $24, $20
|
db $00, $20 | (1 << 7), $24, $20
|
||||||
|
|
||||||
; Cascadebadge
|
; Cascadebadge
|
||||||
db $68, $38, 0
|
db $68, $38, 1
|
||||||
db $04, $20 | (1 << 7), $24, $20
|
db $04, $20 | (1 << 7), $24, $20
|
||||||
db $04, $20 | (1 << 7), $24, $20
|
db $04, $20 | (1 << 7), $24, $20
|
||||||
|
|
||||||
; Thunderbadge
|
; Thunderbadge
|
||||||
db $68, $58, 0
|
db $68, $58, 2
|
||||||
db $08, $20 | (1 << 7), $24, $20
|
db $08, $20 | (1 << 7), $24, $20
|
||||||
db $08, $20 | (1 << 7), $24, $20
|
db $08, $20 | (1 << 7), $24, $20
|
||||||
|
|
||||||
; Rainbowbadge
|
; Rainbowbadge
|
||||||
db $68, $78, 0
|
db $68, $78, 3
|
||||||
db $0c, $20 | (1 << 7), $24, $20
|
db $0c, $20 | (1 << 7), $24, $20
|
||||||
db $0c, $20 | (1 << 7), $24, $20
|
db $0c, $20 | (1 << 7), $24, $20
|
||||||
|
|
||||||
; Soulbadge
|
; Soulbadge
|
||||||
db $80, $18, 0
|
db $80, $18, 4
|
||||||
db $10, $20 | (1 << 7), $24, $20
|
db $10, $20 | (1 << 7), $24, $20
|
||||||
db $10, $20 | (1 << 7), $24, $20
|
db $10, $20 | (1 << 7), $24, $20
|
||||||
|
|
||||||
; Marshbadge
|
; Marshbadge
|
||||||
db $80, $38, 0
|
db $80, $38, 5
|
||||||
db $14, $20 | (1 << 7), $24, $20
|
db $14, $20 | (1 << 7), $24, $20
|
||||||
db $14, $20 | (1 << 7), $24, $20
|
db $14, $20 | (1 << 7), $24, $20
|
||||||
|
|
||||||
; Volcanobadge
|
; Volcanobadge
|
||||||
db $80, $58, 0
|
db $80, $58, 6
|
||||||
db $18, $20 | (1 << 7), $24, $20
|
db $18, $20 | (1 << 7), $24, $20
|
||||||
db $18, $20 | (1 << 7), $24, $20
|
db $18, $20 | (1 << 7), $24, $20
|
||||||
|
|
||||||
; Earthbadge
|
; Earthbadge
|
||||||
; X-flips on alternate cycles.
|
; X-flips on alternate cycles.
|
||||||
db $80, $78, 0
|
db $80, $78, 7
|
||||||
db $1c, $20 | (1 << 7), $24, $20
|
db $1c, $20 | (1 << 7), $24, $20
|
||||||
db $1c | (1 << 7), $20 | (1 << 7), $24, $20
|
db $1c | (1 << 7), $20 | (1 << 7), $24, $20
|
||||||
|
|
||||||
|
|
|
||||||
8
gfx/trainer_card/badges.pal
Normal file
8
gfx/trainer_card/badges.pal
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
RGB 31,31,31, 21,21,24, 13,13,16, 00,00,00 ; ZEPHYRBADGE
|
||||||
|
RGB 31,31,31, 31,12,12, 21,00,00, 00,00,00 ; HIVEBADGE
|
||||||
|
RGB 31,31,31, 29,30,00, 23,23,00, 00,00,00 ; PLAINBADGE
|
||||||
|
RGB 31,31,31, 14,10,24, 09,07,18, 00,00,00 ; FOGBADGE
|
||||||
|
RGB 31,31,31, 27,16,08, 12,07,04, 00,00,00 ; STORMBADGE
|
||||||
|
RGB 31,31,31, 23,26,29, 15,19,23, 00,00,00 ; MINERALBADGE
|
||||||
|
RGB 31,31,31, 19,27,30, 00,22,26, 00,00,00 ; GLACIERBADGE
|
||||||
|
RGB 31,31,31, 30,09,05, 08,08,09, 00,00,00 ; RISINGBADGE
|
||||||
8
gfx/trainer_card/kanto_badges.pal
Normal file
8
gfx/trainer_card/kanto_badges.pal
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
RGB 31,31,31, 23,22,22, 14,13,13, 00,00,00 ; Boulder Badge
|
||||||
|
RGB 31,31,31, 19,31,30, 00,23,30, 00,00,00 ; Cascade Badge
|
||||||
|
RGB 31,31,31, 31,26,05, 31,11,00, 00,00,00 ; Thunder Badge
|
||||||
|
RGB 31,31,31, 31,31,14, 00,29,07, 00,00,00 ; Rainbow Badge
|
||||||
|
RGB 31,31,31, 31,19,30, 31,09,30, 00,00,00 ; Marsh Badge
|
||||||
|
RGB 31,31,31, 31,22,04, 19,13,01, 00,00,00 ; Soul Badge
|
||||||
|
RGB 31,31,31, 31,17,23, 31,00,06, 00,00,00 ; Volcano Badge
|
||||||
|
RGB 31,31,31, 19,30,12, 00,16,06, 00,00,00 ; Earth Badge
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
|
@ -90,6 +90,13 @@ DebugFlyScript:
|
||||||
|
|
||||||
; Test new badge count
|
; Test new badge count
|
||||||
setflag ENGINE_BOULDERBADGE
|
setflag ENGINE_BOULDERBADGE
|
||||||
|
setflag ENGINE_CASCADEBADGE
|
||||||
|
setflag ENGINE_THUNDERBADGE
|
||||||
|
setflag ENGINE_RAINBOWBADGE
|
||||||
|
setflag ENGINE_SOULBADGE
|
||||||
|
setflag ENGINE_MARSHBADGE
|
||||||
|
setflag ENGINE_VOLCANOBADGE
|
||||||
|
setflag ENGINE_EARTHBADGE
|
||||||
setflag ENGINE_BADGE1
|
setflag ENGINE_BADGE1
|
||||||
|
|
||||||
setflag ENGINE_FLYPOINT_PLAYERS_HOUSE
|
setflag ENGINE_FLYPOINT_PLAYERS_HOUSE
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue