pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

SCGB_PARTY_MENU_HP_PALS -> SCGB_PARTY_MENU_HP_BARS, and SCGB_RAM -> SCGB_DEFAULT

Browse Source
This commit is contained in:
Rangi 2020-07-04 16:18:16 -04:00
parent 26d764de5d
commit f5ac9b0eb7
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/scgb_constants.asm
View File

@ -32,8 +32,8 @@
const SCGB_MYSTERY_GIFT const SCGB_MYSTERY_GIFT
const SCGB_1E const SCGB_1E
SCGB_PARTY_MENU_HP_PALS EQU -4 SCGB_PARTY_MENU_HP_BARS EQU $fc
SCGB_RAM EQU -1 SCGB_DEFAULT EQU $ff
; PredefPals indexes (see gfx/sgb/predef.pal) ; PredefPals indexes (see gfx/sgb/predef.pal)
; GetPredefPal arguments (see engine/gfx/color.asm) ; GetPredefPal arguments (see engine/gfx/color.asm)

16
engine/gfx/cgb_layouts.asm
View File

@ -7,11 +7,11 @@ CheckCGB:
LoadSGBLayoutCGB: LoadSGBLayoutCGB:
ld a, b ld a, b
cp SCGB_RAM cp SCGB_DEFAULT
jr nz, .not_ram jr nz, .not_default
ld a, [wSGBPredef] ld a, [wDefaultSGBLayout]
.not_ram .not_default
cp SCGB_PARTY_MENU_HP_PALS cp SCGB_PARTY_MENU_HP_BARS
jp z, CGB_ApplyPartyMenuHPPals jp z, CGB_ApplyPartyMenuHPPals
call ResetBGPals call ResetBGPals
ld l, a ld l, a
@ -109,7 +109,7 @@ _CGB_BattleColors:
pop hl pop hl
call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_OB_PLAYER call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_OB_PLAYER
ld a, SCGB_BATTLE_COLORS ld a, SCGB_BATTLE_COLORS
ld [wSGBPredef], a ld [wDefaultSGBLayout], a
call ApplyPals call ApplyPals
_CGB_FinishBattleScreenLayout: _CGB_FinishBattleScreenLayout:
call InitPartyMenuBGPal7 call InitPartyMenuBGPal7
@ -531,7 +531,7 @@ _CGB_Diploma:
_CGB_MapPals: _CGB_MapPals:
call LoadMapPals call LoadMapPals
ld a, SCGB_MAPPALS ld a, SCGB_MAPPALS
ld [wSGBPredef], a ld [wDefaultSGBLayout], a
ret ret
_CGB_PartyMenu: _CGB_PartyMenu:
@ -589,7 +589,7 @@ _CGB_GSTitleScreen:
ld a, BANK(wOBPals1) ld a, BANK(wOBPals1)
call FarCopyWRAM call FarCopyWRAM
ld a, SCGB_DIPLOMA ld a, SCGB_DIPLOMA
ld [wSGBPredef], a ld [wDefaultSGBLayout], a
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a

4
engine/gfx/color.asm
View File

@ -106,7 +106,7 @@ InitPartyMenuPalettes:
call WipeAttrmap call WipeAttrmap
ret ret
; SGB layout for SCGB_PARTY_MENU_HP_PALS ; SGB layout for SCGB_PARTY_MENU_HP_BARS
SGB_ApplyPartyMenuHPPals: SGB_ApplyPartyMenuHPPals:
ld hl, wHPPals ld hl, wHPPals
ld a, [wSGBPals] ld a, [wSGBPals]
@ -630,7 +630,7 @@ ApplyAttrmap:
ldh [rVBK], a ldh [rVBK], a
ret ret
; CGB layout for SCGB_PARTY_MENU_HP_PALS ; CGB layout for SCGB_PARTY_MENU_HP_BARS
CGB_ApplyPartyMenuHPPals: CGB_ApplyPartyMenuHPPals:
ld hl, wHPPals ld hl, wHPPals
ld a, [wSGBPals] ld a, [wSGBPals]

4
engine/gfx/crystal_layouts.asm
View File

@ -1,8 +1,8 @@
GetMysteryGift_MobileAdapterLayout: GetMysteryGift_MobileAdapterLayout:
ld a, b ld a, b
cp SCGB_RAM cp SCGB_DEFAULT
jr nz, .not_ram jr nz, .not_ram
ld a, [wSGBPredef] ld a, [wDefaultSGBLayout]
.not_ram .not_ram
push af push af
farcall ResetBGPals farcall ResetBGPals

16
engine/gfx/sgb_layouts.asm
View File

@ -3,11 +3,11 @@ LoadSGBLayout:
jp nz, LoadSGBLayoutCGB jp nz, LoadSGBLayoutCGB
ld a, b ld a, b
cp SCGB_RAM cp SCGB_DEFAULT
jr nz, .not_ram jr nz, .not_default
ld a, [wSGBPredef] ld a, [wDefaultSGBLayout]
.not_ram .not_default
cp SCGB_PARTY_MENU_HP_PALS cp SCGB_PARTY_MENU_HP_BARS
jp z, SGB_ApplyPartyMenuHPPals jp z, SGB_ApplyPartyMenuHPPals
ld l, a ld l, a
ld h, 0 ld h, 0
@ -130,7 +130,7 @@ LoadSGBLayout:
ld hl, wSGBPals ld hl, wSGBPals
ld de, wSGBPals + PALPACKET_LENGTH ld de, wSGBPals + PALPACKET_LENGTH
ld a, SCGB_BATTLE_COLORS ld a, SCGB_BATTLE_COLORS
ld [wSGBPredef], a ld [wDefaultSGBLayout], a
ret ret
.SGB_MoveList: .SGB_MoveList:
@ -318,7 +318,7 @@ endr
ld hl, PalPacket_GSTitleScreen ld hl, PalPacket_GSTitleScreen
ld de, BlkPacket_GSTitleScreen ld de, BlkPacket_GSTitleScreen
ld a, SCGB_DIPLOMA ld a, SCGB_DIPLOMA
ld [wSGBPredef], a ld [wDefaultSGBLayout], a
ret ret
.SGB_MagnetTrain: .SGB_MagnetTrain:
@ -350,7 +350,7 @@ endr
ld [hld], a ld [hld], a
ld de, BlkPacket_9a86 ld de, BlkPacket_9a86
ld a, SCGB_MAPPALS ld a, SCGB_MAPPALS
ld [wSGBPredef], a ld [wDefaultSGBLayout], a
ret ret
.SGB_Evolution: .SGB_Evolution:

2
engine/pokemon/party_menu.asm
View File

@ -138,7 +138,7 @@ PlacePartyHPBar:
ld b, $0 ld b, $0
add hl, bc add hl, bc
call SetHPPal call SetHPPal
ld b, SCGB_PARTY_MENU_HP_PALS ld b, SCGB_PARTY_MENU_HP_BARS
call GetSGBLayout call GetSGBLayout
.skip .skip
ld hl, wSGBPals ld hl, wSGBPals

2
home/tilemap.asm
View File

@ -202,7 +202,7 @@ ClearPalettes::
ret ret
GetMemSGBLayout:: GetMemSGBLayout::
ld b, SCGB_RAM ld b, SCGB_DEFAULT
GetSGBLayout:: GetSGBLayout::
; load sgb packets unless dmg ; load sgb packets unless dmg

2
wram.asm
View File

@ -1336,7 +1336,7 @@ wcd8c:: ds 1
wcd8d:: ds 11 wcd8d:: ds 11
ENDU ENDU
wSGBPredef:: db wDefaultSGBLayout:: db
wPlayerHPPal:: db wPlayerHPPal:: db
wEnemyHPPal:: db wEnemyHPPal:: db