pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)

Browse Source
This commit is contained in:
xCrystal
2023-07-26 17:01:20 +02:00
parent acd022d765
commit d30b9dd60f
68 changed files with 284 additions and 1826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
engine/pokemon/bills_pc.asm
View File

@@ -62,7 +62,7 @@ _DepositPKMN:
call PCMonInfo
ld a, $ff
ld [wCurPartySpecies], a
ld a, SCGB_BILLS_PC
ld a, CGB_BILLS_PC
call BillsPC_ApplyPalettes
call WaitBGMap
call BillsPC_UpdateSelectionCursor
@@ -117,7 +117,7 @@ _DepositPKMN:
call ClearSprites
call BillsPC_GetSelectedPokemonSpecies
ld [wCurPartySpecies], a
ld a, SCGB_BILLS_PC
ld a, CGB_BILLS_PC
call BillsPC_ApplyPalettes
ld de, PCString_WhatsUp
call BillsPC_PlaceString
@@ -176,7 +176,7 @@ BillsPCDepositFuncStats:
call PCMonInfo
call BillsPC_GetSelectedPokemonSpecies
ld [wCurPartySpecies], a
ld a, SCGB_BILLS_PC
ld a, CGB_BILLS_PC
call BillsPC_ApplyPalettes
ret
@@ -320,7 +320,7 @@ _WithdrawPKMN:
call PCMonInfo
ld a, $ff
ld [wCurPartySpecies], a
ld a, SCGB_BILLS_PC
ld a, CGB_BILLS_PC
call BillsPC_ApplyPalettes
call WaitBGMap
call BillsPC_UpdateSelectionCursor
@@ -374,7 +374,7 @@ _WithdrawPKMN:
call ClearSprites
call BillsPC_GetSelectedPokemonSpecies
ld [wCurPartySpecies], a
ld a, SCGB_BILLS_PC
ld a, CGB_BILLS_PC
call BillsPC_ApplyPalettes
ld de, PCString_WhatsUp
call BillsPC_PlaceString
@@ -432,7 +432,7 @@ BillsPC_Withdraw:
call PCMonInfo
call BillsPC_GetSelectedPokemonSpecies
ld [wCurPartySpecies], a
ld a, SCGB_BILLS_PC
ld a, CGB_BILLS_PC
call BillsPC_ApplyPalettes
ret
@@ -561,7 +561,7 @@ _MovePKMNWithoutMail:
call PCMonInfo
ld a, $ff
ld [wCurPartySpecies], a
ld a, SCGB_BILLS_PC
ld a, CGB_BILLS_PC
call BillsPC_ApplyPalettes
call WaitBGMap
call BillsPC_UpdateSelectionCursor
@@ -625,7 +625,7 @@ _MovePKMNWithoutMail:
call ClearSprites
call BillsPC_GetSelectedPokemonSpecies
ld [wCurPartySpecies], a
ld a, SCGB_BILLS_PC
ld a, CGB_BILLS_PC
call BillsPC_ApplyPalettes
ld de, PCString_WhatsUp
call BillsPC_PlaceString
@@ -679,7 +679,7 @@ _MovePKMNWithoutMail:
call PCMonInfo
call BillsPC_GetSelectedPokemonSpecies
ld [wCurPartySpecies], a
ld a, SCGB_BILLS_PC
ld a, CGB_BILLS_PC
call BillsPC_ApplyPalettes
ret
@@ -2160,7 +2160,7 @@ endr
BillsPC_ApplyPalettes:
ld b, a
call GetSGBLayout
call GetCGBLayout
ld a, %11100100
call DmgToCgbBGPals
ld a, %11111100

4
engine/pokemon/breeding.asm
View File

@@ -755,9 +755,9 @@ EggHatch_AnimationSequence:
Hatch_LoadFrontpicPal:
ld [wPlayerHPPal], a
ld b, SCGB_EVOLUTION
ld b, CGB_EVOLUTION
ld c, $0
jp GetSGBLayout
jp GetCGBLayout
EggHatch_CrackShell:
ld a, [wFrameCounter]

4
engine/pokemon/mon_menu.asm
View File

@@ -1127,8 +1127,8 @@ SetUpMoveScreenBG:
call PrintLevel
ld hl, wPlayerHPPal
call SetHPPal
ld b, SCGB_MOVE_LIST
call GetSGBLayout
ld b, CGB_MOVE_LIST
call GetCGBLayout
hlcoord 16, 0
lb bc, 1, 3
jp ClearBox

18
engine/pokemon/party_menu.asm
View File

@@ -18,8 +18,8 @@ SelectTradeOrDayCareMon:
call ClearBGPalettes
call InitPartyMenuLayout
call WaitBGMap
ld b, SCGB_PARTY_MENU
call GetSGBLayout
ld b, CGB_PARTY_MENU
call GetCGBLayout
call SetPalettes
call DelayFrame
call PartyMenuSelect
@@ -113,7 +113,7 @@ PlacePartyNicknames:
PlacePartyHPBar:
xor a
ld [wSGBPals], a
ld [wWhichPartyMonHPPal], a
ld a, [wPartyCount]
and a
ret z
@@ -132,15 +132,15 @@ PlacePartyHPBar:
ld b, $0
call DrawBattleHPBar
ld hl, wHPPals
ld a, [wSGBPals]
ld a, [wWhichPartyMonHPPal]
ld c, a
ld b, 0
add hl, bc
call SetHPPal
ld b, SCGB_PARTY_MENU_HP_BARS
call GetSGBLayout
ld b, CGB_PARTY_MENU_HP_BARS
call GetCGBLayout
.skip
ld hl, wSGBPals
ld hl, wWhichPartyMonHPPal
inc [hl]
pop hl
ld de, 2 * SCREEN_WIDTH
@@ -149,8 +149,8 @@ PlacePartyHPBar:
inc b
dec c
jr nz, .loop
ld b, SCGB_PARTY_MENU
call GetSGBLayout
ld b, CGB_PARTY_MENU
call GetCGBLayout
ret
PlacePartymonHPBar:

11
engine/pokemon/stats_screen.asm
View File

@@ -421,8 +421,8 @@ StatsScreen_InitUpperHalf:
farcall ComputeHPBarPixels
ld hl, wCurHPPal
call SetHPPal
ld b, SCGB_STATS_SCREEN_HP_PALS
call GetSGBLayout
ld b, CGB_STATS_SCREEN_HP_PALS
call GetCGBLayout
call DelayFrame
ret
@@ -945,16 +945,13 @@ StatsScreen_LoadTextboxSpaceGFX:
pop hl
ret
StatsScreenSpaceGFX: ; unreferenced
INCBIN "gfx/font/space.2bpp"
EggStatsScreen:
xor a
ldh [hBGMapMode], a
ld hl, wCurHPPal
call SetHPPal
ld b, SCGB_STATS_SCREEN_HP_PALS
call GetSGBLayout
ld b, CGB_STATS_SCREEN_HP_PALS
call GetCGBLayout
call StatsScreen_PlaceHorizontalDivider
ld de, EggString
hlcoord 8, 1