mirror of
https://github.com/thornAvery/jep-hack.git
synced 2026-02-07 16:45:24 +13:00
SGB Morning Palettes
actual palettes are somewhat unfinished but the general idea is being applied now. Untouched palettes (aside from whatever color was used for the water) are marked with a # next to them, though the palettes are all tentative.
This commit is contained in:
Zeta_Null
parent
d5d8fe40d7
commit
54905a9be9
6 changed files with 345 additions and 213 deletions
|
|
@ -1128,16 +1128,16 @@ _CGB_MysteryGift:
|
|||
.MysteryGiftPalettes:
|
||||
INCLUDE "gfx/mystery_gift/mystery_gift.pal"
|
||||
|
||||
GS_CGB_MysteryGift: ; unreferenced
|
||||
ld hl, .MysteryGiftPalette
|
||||
ld de, wBGPals1
|
||||
ld bc, 1 palettes
|
||||
ld a, BANK(wBGPals1)
|
||||
call FarCopyWRAM
|
||||
call ApplyPals
|
||||
call WipeAttrmap
|
||||
call ApplyAttrmap
|
||||
ret
|
||||
;GS_CGB_MysteryGift: ; unreferenced
|
||||
; ld hl, .MysteryGiftPalette
|
||||
; ld de, wBGPals1
|
||||
; ld bc, 1 palettes
|
||||
; ld a, BANK(wBGPals1)
|
||||
; call FarCopyWRAM
|
||||
; call ApplyPals
|
||||
; call WipeAttrmap
|
||||
; call ApplyAttrmap
|
||||
; ret
|
||||
|
||||
.MysteryGiftPalette:
|
||||
INCLUDE "gfx/mystery_gift/gs_mystery_gift.pal"
|
||||
|
|
|
|||
|
|
@ -76,28 +76,28 @@ Unused_CheckShininess:
|
|||
and a
|
||||
ret
|
||||
|
||||
SGB_ApplyCreditsPals: ; unreferenced
|
||||
push de
|
||||
push bc
|
||||
ld hl, PalPacket_Pal01
|
||||
ld de, wSGBPals
|
||||
ld bc, PALPACKET_LENGTH
|
||||
call CopyBytes
|
||||
pop bc
|
||||
pop de
|
||||
ld a, c
|
||||
ld [wSGBPals + 3], a
|
||||
ld a, b
|
||||
ld [wSGBPals + 4], a
|
||||
ld a, e
|
||||
ld [wSGBPals + 5], a
|
||||
ld a, d
|
||||
ld [wSGBPals + 6], a
|
||||
ld hl, wSGBPals
|
||||
call PushSGBPals
|
||||
ld hl, BlkPacket_AllPal0
|
||||
call PushSGBPals
|
||||
ret
|
||||
;SGB_ApplyCreditsPals: ; unreferenced
|
||||
; push de
|
||||
; push bc
|
||||
; ld hl, PalPacket_Pal01
|
||||
; ld de, wSGBPals
|
||||
; ld bc, PALPACKET_LENGTH
|
||||
; call CopyBytes
|
||||
; pop bc
|
||||
; pop de
|
||||
; ld a, c
|
||||
; ld [wSGBPals + 3], a
|
||||
; ld a, b
|
||||
; ld [wSGBPals + 4], a
|
||||
; ld a, e
|
||||
; ld [wSGBPals + 5], a
|
||||
; ld a, d
|
||||
; ld [wSGBPals + 6], a
|
||||
; ld hl, wSGBPals
|
||||
; call PushSGBPals
|
||||
; ld hl, BlkPacket_AllPal0
|
||||
; call PushSGBPals
|
||||
; ret
|
||||
|
||||
InitPartyMenuPalettes:
|
||||
ld hl, PalPacket_PartyMenu + 1
|
||||
|
|
@ -133,104 +133,104 @@ SGB_ApplyPartyMenuHPPals:
|
|||
ld [hl], e
|
||||
ret
|
||||
|
||||
Intro_LoadMagikarpPalettes: ; unreferenced
|
||||
call CheckCGB
|
||||
ret z
|
||||
;Intro_LoadMagikarpPalettes: ; unreferenced
|
||||
; call CheckCGB
|
||||
; ret z
|
||||
;
|
||||
;; CGB only
|
||||
; ld hl, .MagikarpBGPal
|
||||
; ld de, wBGPals1
|
||||
; ld bc, 1 palettes
|
||||
; ld a, BANK(wBGPals1)
|
||||
; call FarCopyWRAM
|
||||
;
|
||||
; ld hl, .MagikarpOBPal
|
||||
; ld de, wOBPals1
|
||||
; ld bc, 1 palettes
|
||||
; ld a, BANK(wOBPals1)
|
||||
; call FarCopyWRAM
|
||||
;
|
||||
; call ApplyPals
|
||||
; ld a, TRUE
|
||||
; ldh [hCGBPalUpdate], a
|
||||
; ret
|
||||
;
|
||||
;.MagikarpBGPal:
|
||||
;INCLUDE "gfx/intro/gs_magikarp_bg.pal"
|
||||
;
|
||||
;.MagikarpOBPal:
|
||||
;INCLUDE "gfx/intro/gs_magikarp_ob.pal"
|
||||
|
||||
; CGB only
|
||||
ld hl, .MagikarpBGPal
|
||||
ld de, wBGPals1
|
||||
ld bc, 1 palettes
|
||||
ld a, BANK(wBGPals1)
|
||||
call FarCopyWRAM
|
||||
|
||||
ld hl, .MagikarpOBPal
|
||||
ld de, wOBPals1
|
||||
ld bc, 1 palettes
|
||||
ld a, BANK(wOBPals1)
|
||||
call FarCopyWRAM
|
||||
|
||||
call ApplyPals
|
||||
ld a, TRUE
|
||||
ldh [hCGBPalUpdate], a
|
||||
ret
|
||||
|
||||
.MagikarpBGPal:
|
||||
INCLUDE "gfx/intro/gs_magikarp_bg.pal"
|
||||
|
||||
.MagikarpOBPal:
|
||||
INCLUDE "gfx/intro/gs_magikarp_ob.pal"
|
||||
|
||||
Intro_LoadAllPal0: ; unreferenced
|
||||
call CheckCGB
|
||||
ret nz
|
||||
ldh a, [hSGB]
|
||||
and a
|
||||
ret z
|
||||
ld hl, BlkPacket_AllPal0
|
||||
jp PushSGBPals
|
||||
|
||||
Intro_LoadBetaIntroVenusaurPalettes: ; unreferenced
|
||||
call CheckCGB
|
||||
jr nz, .cgb
|
||||
ldh a, [hSGB]
|
||||
and a
|
||||
ret z
|
||||
ld hl, PalPacket_BetaIntroVenusaur
|
||||
jp PushSGBPals
|
||||
|
||||
.cgb
|
||||
ld de, wOBPals1
|
||||
ld a, PREDEFPAL_BETA_INTRO_VENUSAUR
|
||||
call GetPredefPal
|
||||
jp LoadHLPaletteIntoDE
|
||||
|
||||
Intro_LoadPackPalettes: ; unreferenced
|
||||
call CheckCGB
|
||||
jr nz, .cgb
|
||||
ldh a, [hSGB]
|
||||
and a
|
||||
ret z
|
||||
ld hl, PalPacket_Pack
|
||||
jp PushSGBPals
|
||||
|
||||
.cgb
|
||||
ld de, wOBPals1
|
||||
ld a, PREDEFPAL_PACK
|
||||
call GetPredefPal
|
||||
jp LoadHLPaletteIntoDE
|
||||
|
||||
GSIntro_LoadMonPalette: ; unreferenced
|
||||
call CheckCGB
|
||||
jr nz, .cgb
|
||||
ldh a, [hSGB]
|
||||
and a
|
||||
ret z
|
||||
ld a, c
|
||||
push af
|
||||
ld hl, PalPacket_Pal01
|
||||
ld de, wSGBPals
|
||||
ld bc, PALPACKET_LENGTH
|
||||
call CopyBytes
|
||||
pop af
|
||||
call GetMonPalettePointer
|
||||
ld a, [hli]
|
||||
ld [wSGBPals + 3], a
|
||||
ld a, [hli]
|
||||
ld [wSGBPals + 4], a
|
||||
ld a, [hli]
|
||||
ld [wSGBPals + 5], a
|
||||
ld a, [hl]
|
||||
ld [wSGBPals + 6], a
|
||||
ld hl, wSGBPals
|
||||
jp PushSGBPals
|
||||
|
||||
.cgb
|
||||
ld de, wOBPals1
|
||||
ld a, c
|
||||
call GetMonPalettePointer
|
||||
call LoadPalette_White_Col1_Col2_Black
|
||||
ret
|
||||
;Intro_LoadAllPal0: ; unreferenced
|
||||
; call CheckCGB
|
||||
; ret nz
|
||||
; ldh a, [hSGB]
|
||||
; and a
|
||||
; ret z
|
||||
; ld hl, BlkPacket_AllPal0
|
||||
; jp PushSGBPals
|
||||
;
|
||||
;Intro_LoadBetaIntroVenusaurPalettes: ; unreferenced
|
||||
; call CheckCGB
|
||||
; jr nz, .cgb
|
||||
; ldh a, [hSGB]
|
||||
; and a
|
||||
; ret z
|
||||
; ld hl, PalPacket_BetaIntroVenusaur
|
||||
; jp PushSGBPals
|
||||
;
|
||||
;.cgb
|
||||
; ld de, wOBPals1
|
||||
; ld a, PREDEFPAL_BETA_INTRO_VENUSAUR
|
||||
; call GetPredefPal
|
||||
; jp LoadHLPaletteIntoDE
|
||||
;
|
||||
;Intro_LoadPackPalettes: ; unreferenced
|
||||
; call CheckCGB
|
||||
; jr nz, .cgb
|
||||
; ldh a, [hSGB]
|
||||
; and a
|
||||
; ret z
|
||||
; ld hl, PalPacket_Pack
|
||||
; jp PushSGBPals
|
||||
;
|
||||
;.cgb
|
||||
; ld de, wOBPals1
|
||||
; ld a, PREDEFPAL_PACK
|
||||
; call GetPredefPal
|
||||
; jp LoadHLPaletteIntoDE
|
||||
;
|
||||
;GSIntro_LoadMonPalette: ; unreferenced
|
||||
; call CheckCGB
|
||||
; jr nz, .cgb
|
||||
; ldh a, [hSGB]
|
||||
; and a
|
||||
; ret z
|
||||
; ld a, c
|
||||
; push af
|
||||
; ld hl, PalPacket_Pal01
|
||||
; ld de, wSGBPals
|
||||
; ld bc, PALPACKET_LENGTH
|
||||
; call CopyBytes
|
||||
; pop af
|
||||
; call GetMonPalettePointer
|
||||
; ld a, [hli]
|
||||
; ld [wSGBPals + 3], a
|
||||
; ld a, [hli]
|
||||
; ld [wSGBPals + 4], a
|
||||
; ld a, [hli]
|
||||
; ld [wSGBPals + 5], a
|
||||
; ld a, [hl]
|
||||
; ld [wSGBPals + 6], a
|
||||
; ld hl, wSGBPals
|
||||
; jp PushSGBPals
|
||||
;
|
||||
;.cgb
|
||||
; ld de, wOBPals1
|
||||
; ld a, c
|
||||
; call GetMonPalettePointer
|
||||
; call LoadPalette_White_Col1_Col2_Black
|
||||
; ret
|
||||
|
||||
LoadTrainerClassPaletteAsNthBGPal:
|
||||
ld a, [wTrainerClass]
|
||||
|
|
@ -719,51 +719,51 @@ GetMonPalettePointer:
|
|||
call _GetMonPalettePointer
|
||||
ret
|
||||
|
||||
CGBCopyBattleObjectPals: ; unreferenced
|
||||
; dummied out
|
||||
ret
|
||||
call CheckCGB
|
||||
ret z
|
||||
ld hl, BattleObjectPals
|
||||
ld a, (1 << rOBPI_AUTO_INCREMENT) | $10
|
||||
ldh [rOBPI], a
|
||||
ld c, 6 palettes
|
||||
.loop
|
||||
ld a, [hli]
|
||||
ldh [rOBPD], a
|
||||
dec c
|
||||
jr nz, .loop
|
||||
ld hl, BattleObjectPals
|
||||
ld de, wOBPals1 palette 2
|
||||
ld bc, 2 palettes
|
||||
ld a, BANK(wOBPals1)
|
||||
call FarCopyWRAM
|
||||
ret
|
||||
;CGBCopyBattleObjectPals: ; unreferenced
|
||||
;; dummied out
|
||||
; ret
|
||||
; call CheckCGB
|
||||
; ret z
|
||||
; ld hl, BattleObjectPals
|
||||
; ld a, (1 << rOBPI_AUTO_INCREMENT) | $10
|
||||
; ldh [rOBPI], a
|
||||
; ld c, 6 palettes
|
||||
;.loop
|
||||
; ld a, [hli]
|
||||
; ldh [rOBPD], a
|
||||
; dec c
|
||||
; jr nz, .loop
|
||||
; ld hl, BattleObjectPals
|
||||
; ld de, wOBPals1 palette 2
|
||||
; ld bc, 2 palettes
|
||||
; ld a, BANK(wOBPals1)
|
||||
; call FarCopyWRAM
|
||||
; ret
|
||||
|
||||
BattleObjectPals:
|
||||
INCLUDE "gfx/battle_anims/battle_anims.pal"
|
||||
|
||||
CGBCopyTwoPredefObjectPals: ; unreferenced
|
||||
call CheckCGB
|
||||
ret z
|
||||
ld a, (1 << rOBPI_AUTO_INCREMENT) | $10
|
||||
ldh [rOBPI], a
|
||||
ld a, PREDEFPAL_TRADE_TUBE
|
||||
call GetPredefPal
|
||||
call .PushPalette
|
||||
ld a, PREDEFPAL_RB_GREENMON
|
||||
call GetPredefPal
|
||||
call .PushPalette
|
||||
ret
|
||||
|
||||
.PushPalette:
|
||||
ld c, 1 palettes
|
||||
.loop
|
||||
ld a, [hli]
|
||||
ldh [rOBPD], a
|
||||
dec c
|
||||
jr nz, .loop
|
||||
ret
|
||||
;CGBCopyTwoPredefObjectPals: ; unreferenced
|
||||
; call CheckCGB
|
||||
; ret z
|
||||
; ld a, (1 << rOBPI_AUTO_INCREMENT) | $10
|
||||
; ldh [rOBPI], a
|
||||
; ld a, PREDEFPAL_TRADE_TUBE
|
||||
; call GetPredefPal
|
||||
; call .PushPalette
|
||||
; ld a, PREDEFPAL_RB_GREENMON
|
||||
; call GetPredefPal
|
||||
; call .PushPalette
|
||||
; ret
|
||||
;
|
||||
;.PushPalette:
|
||||
; ld c, 1 palettes
|
||||
;.loop
|
||||
; ld a, [hli]
|
||||
; ldh [rOBPD], a
|
||||
; dec c
|
||||
; jr nz, .loop
|
||||
; ret
|
||||
|
||||
_GetMonPalettePointer:
|
||||
call GetPokemonIndexFromID
|
||||
|
|
@ -1322,8 +1322,8 @@ INCLUDE "gfx/diploma/diploma.pal"
|
|||
PartyMenuOBPals:
|
||||
INCLUDE "gfx/stats/party_menu_ob.pal"
|
||||
|
||||
UnusedBattleObjectPals: ; unreferenced
|
||||
INCLUDE "gfx/battle_anims/unused_battle_anims.pal"
|
||||
;UnusedBattleObjectPals: ; unreferenced
|
||||
;INCLUDE "gfx/battle_anims/unused_battle_anims.pal"
|
||||
|
||||
UnusedGSTitleBGPals:
|
||||
INCLUDE "gfx/title/unused_gs_bg.pal"
|
||||
|
|
|
|||
|
|
@ -562,6 +562,23 @@ endr
|
|||
ret
|
||||
|
||||
.route
|
||||
ld a, [wTimeOfDayPal]
|
||||
cp MORN_F
|
||||
jr nz, .dayroute
|
||||
ld a, [wMapGroup]
|
||||
ld b, a
|
||||
ld a, [wMapNumber]
|
||||
ld c, a
|
||||
call GetWorldMapLocation
|
||||
cp NIHON_LANDMARK
|
||||
ld a, PREDEFPAL_ROUTES_MORN
|
||||
jr nc, .routenihonmorn
|
||||
ret
|
||||
.routenihonmorn
|
||||
ld a, PREDEFPAL_ROUTES_NIHON_MORN
|
||||
ret
|
||||
|
||||
.dayroute
|
||||
ld a, [wMapGroup]
|
||||
ld b, a
|
||||
ld a, [wMapNumber]
|
||||
|
|
@ -577,14 +594,46 @@ endr
|
|||
ret
|
||||
|
||||
.cave
|
||||
ld a, [wTimeOfDayPal]
|
||||
cp MORN_F
|
||||
jr nz, .daycave
|
||||
ld a, PREDEFPAL_DUNGEONS_MORN
|
||||
ret
|
||||
|
||||
.daycave
|
||||
ld a, PREDEFPAL_DUNGEONS
|
||||
ret
|
||||
|
||||
.env5
|
||||
ld a, [wTimeOfDayPal]
|
||||
cp MORN_F
|
||||
jr nz, .dayship
|
||||
ld a, PREDEFPAL_VERMILION_MORN
|
||||
ret
|
||||
|
||||
.dayship
|
||||
ld a, PREDEFPAL_VERMILION
|
||||
ret
|
||||
|
||||
.gate
|
||||
ld a, [wTimeOfDayPal]
|
||||
cp MORN_F
|
||||
jr nz, .daygate
|
||||
ld a, [wMapGroup]
|
||||
ld b, a
|
||||
ld a, [wMapNumber]
|
||||
ld c, a
|
||||
call GetWorldMapLocation
|
||||
cp NIHON_LANDMARK
|
||||
ld a, PREDEFPAL_PEWTER_MORN
|
||||
jr nc, .gatenihonmorn
|
||||
ret
|
||||
|
||||
.gatenihonmorn
|
||||
ld a, PREDEFPAL_GATES_NIHON_MORN
|
||||
ret
|
||||
|
||||
.daygate
|
||||
ld a, [wMapGroup]
|
||||
ld b, a
|
||||
ld a, [wMapNumber]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue