Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Harmonize engine/{gfx, items, link, math} with pokegold

Browse Source
This commit is contained in:
Rangi
2020-06-17 10:39:17 -04:00
parent f2550fc3c2
commit 8019db3ea9
13 changed files with 69 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
engine/gfx/cgb_layouts.asm
View File

@@ -261,7 +261,7 @@ _CGB_Pokedex:
ld a, [wCurPartySpecies]
cp $ff
jr nz, .is_pokemon
ld hl, .PokedexQuestionMarkPalette
ld hl, PokedexQuestionMarkPalette
call LoadHLPaletteIntoDE ; green question mark palette
jr .got_palette
@@ -275,7 +275,7 @@ _CGB_Pokedex:
ld a, $1 ; green question mark palette
call FillBoxCGB
call InitPartyMenuOBPals
ld hl, .PokedexCursorPalette
ld hl, PokedexCursorPalette
ld de, wOBPals1 palette 7 ; green cursor palette
ld bc, 1 palettes
ld a, BANK(wOBPals1)
@@ -286,10 +286,10 @@ _CGB_Pokedex:
ldh [hCGBPalUpdate], a
ret
.PokedexQuestionMarkPalette:
PokedexQuestionMarkPalette:
INCLUDE "gfx/pokedex/question_mark.pal"
.PokedexCursorPalette:
PokedexCursorPalette:
INCLUDE "gfx/pokedex/cursor.pal"
_CGB_BillsPC:
@@ -300,15 +300,15 @@ _CGB_BillsPC:
ld a, [wCurPartySpecies]
cp $ff
jr nz, .GetMonPalette
ld hl, .BillsPCOrangePalette
ld hl, BillsPCOrangePalette
call LoadHLPaletteIntoDE
jr .Resume
jr .GotPalette
.GetMonPalette:
ld bc, wTempMonDVs
call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
.Resume:
.GotPalette:
call WipeAttrmap
hlcoord 1, 4, wAttrmap
lb bc, 7, 7
@@ -321,16 +321,16 @@ _CGB_BillsPC:
ldh [hCGBPalUpdate], a
ret
.Function9009:
ld hl, .BillsPCOrangePalette
Function9009:
ld hl, BillsPCOrangePalette
call LoadHLPaletteIntoDE
jr .asm_901a
jr .GotPalette
.unused
.GetMonPalette:
ld bc, wTempMonDVs
call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
.asm_901a
.GotPalette:
call WipeAttrmap
hlcoord 1, 1, wAttrmap
lb bc, 7, 7
@@ -343,7 +343,7 @@ _CGB_BillsPC:
ldh [hCGBPalUpdate], a
ret
.BillsPCOrangePalette:
BillsPCOrangePalette:
INCLUDE "gfx/pc/orange.pal"
_CGB_PokedexUnownMode:
@@ -886,10 +886,10 @@ _CGB_GamefreakLogo:
ld a, PREDEFPAL_GAMEFREAK_LOGO_BG
call GetPredefPal
call LoadHLPaletteIntoDE
ld hl, .Palette
ld hl, .GamefreakLogoOBPalette
ld de, wOBPals1
call LoadHLPaletteIntoDE
ld hl, .Palette
ld hl, .GamefreakLogoOBPalette
ld de, wOBPals1 palette 1
call LoadHLPaletteIntoDE
call WipeAttrmap
@@ -897,7 +897,7 @@ _CGB_GamefreakLogo:
call ApplyPals
ret
.Palette:
.GamefreakLogoOBPalette:
INCLUDE "gfx/splash/logo.pal"
_CGB_PlayerOrMonFrontpicPals:
@@ -947,7 +947,7 @@ _CGB_TrainerOrMonFrontpicPals:
ret
_CGB_MysteryGift:
ld hl, .Palettes
ld hl, .MysteryGiftPalettes
ld de, wBGPals1
ld bc, 2 palettes
ld a, BANK(wBGPals1)
@@ -977,5 +977,22 @@ _CGB_MysteryGift:
call ApplyAttrmap
ret
.Palettes:
.MysteryGiftPalettes:
INCLUDE "gfx/mystery_gift/mystery_gift.pal"
Unreferenced_GS_CGB_MysteryGift:
ld hl, .MysteryGiftPalette
ld de, wBGPals1
ld bc, 1 palettes
ld a, BANK(wBGPals1)
call FarCopyWRAM
call ApplyPals
call WipeAttrmap
call ApplyAttrmap
ret
.MysteryGiftPalette:
RGB 31, 31, 31
RGB 09, 31, 31
RGB 10, 12, 31
RGB 00, 03, 19