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

4
engine/pokedex/new_pokedex_entry.asm
View File

@@ -44,7 +44,7 @@ NewPokedexEntry:
ld [wTempMonDVs], a
ld a, [hl]
ld [wTempMonDVs + 1], a
ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld b, CGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetCGBLayout
call SetPalettes
ret

40
engine/pokedex/pokedex.asm
View File

@@ -238,8 +238,8 @@ Pokedex_InitMainScreen:
call Pokedex_ResetBGMapMode
ld a, -1
ld [wCurPartySpecies], a
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
ld a, CGB_POKEDEX
call Pokedex_GetCGBLayout
call Pokedex_UpdateCursorOAM
farcall DrawPokedexListWindow
hlcoord 0, 17
@@ -331,8 +331,8 @@ Pokedex_InitDexEntryScreen:
ldh [hWX], a
call Pokedex_GetSelectedMon
ld [wCurPartySpecies], a
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
ld a, CGB_POKEDEX
call Pokedex_GetCGBLayout
ld a, [wCurPartySpecies]
call PlayMonCry
call Pokedex_IncrementDexPointer
@@ -401,8 +401,8 @@ Pokedex_ReinitDexEntryScreen:
call WaitBGMap
call Pokedex_GetSelectedMon
ld [wCurPartySpecies], a
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
ld a, CGB_POKEDEX
call Pokedex_GetCGBLayout
ld a, [wCurPartySpecies]
call PlayMonCry
ld hl, wJumptableIndex
@@ -449,8 +449,8 @@ DexEntryScreen_MenuActionJumptable:
call WaitBGMap
call Pokedex_GetSelectedMon
ld [wCurPartySpecies], a
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
ld a, CGB_POKEDEX
call Pokedex_GetCGBLayout
ret
.Cry:
@@ -509,8 +509,8 @@ Pokedex_InitOptionScreen:
ld [wDexArrowCursorPosIndex], a
call Pokedex_DisplayModeDescription
call WaitBGMap
ld a, SCGB_POKEDEX_SEARCH_OPTION
call Pokedex_GetSGBLayout
ld a, CGB_POKEDEX_SEARCH_OPTION
call Pokedex_GetCGBLayout
call Pokedex_IncrementDexPointer
ret
@@ -617,8 +617,8 @@ Pokedex_InitSearchScreen:
ld [wDexSearchSlowpokeFrame], a
farcall DoDexSearchSlowpokeFrame
call WaitBGMap
ld a, SCGB_POKEDEX_SEARCH_OPTION
call Pokedex_GetSGBLayout
ld a, CGB_POKEDEX_SEARCH_OPTION
call Pokedex_GetCGBLayout
call Pokedex_IncrementDexPointer
ret
@@ -736,8 +736,8 @@ Pokedex_InitSearchResultsScreen:
call Pokedex_UpdateSearchResultsCursorOAM
ld a, -1
ld [wCurPartySpecies], a
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
ld a, CGB_POKEDEX
call Pokedex_GetCGBLayout
call Pokedex_IncrementDexPointer
ret
@@ -796,8 +796,8 @@ Pokedex_InitUnownMode:
call Pokedex_UnownModePlaceCursor
farcall PrintUnownWord
call WaitBGMap
ld a, SCGB_POKEDEX_UNOWN_MODE
call Pokedex_GetSGBLayout
ld a, CGB_POKEDEX_UNOWN_MODE
call Pokedex_GetCGBLayout
call Pokedex_IncrementDexPointer
ret
@@ -2311,9 +2311,9 @@ Pokedex_ApplyPrintPals:
call DelayFrame
ret
Pokedex_GetSGBLayout:
Pokedex_GetCGBLayout:
ld b, a
call GetSGBLayout
call GetCGBLayout
Pokedex_ApplyUsualPals:
; This applies the palettes used for most Pokédex screens.
@@ -2513,8 +2513,8 @@ _NewPokedexEntry:
call GetBaseData
ld de, vTiles2
predef GetMonFrontpic
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
ld a, CGB_POKEDEX
call Pokedex_GetCGBLayout
ld a, [wCurPartySpecies]
call PlayMonCry
ret