mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Merge branch 'master' of https://github.com/pret/pokecrystal
This commit is contained in:
commit
8a45169a9d
@ -3,7 +3,7 @@
|
||||
const SCGB_BATTLE_COLORS
|
||||
const SCGB_POKEGEAR_PALS
|
||||
const SCGB_STATS_SCREEN_HP_PALS
|
||||
const SCGB_04
|
||||
const SCGB_POKEDEX
|
||||
const SCGB_SLOT_MACHINE
|
||||
const SCGB_06
|
||||
const SCGB_07
|
||||
@ -15,13 +15,13 @@
|
||||
const SCGB_0D
|
||||
const SCGB_0E
|
||||
const SCGB_0F
|
||||
const SCGB_10
|
||||
const SCGB_POKEDEX_SEARCH_OPTION
|
||||
const SCGB_11
|
||||
const SCGB_POKEPIC
|
||||
const SCGB_13
|
||||
const SCGB_PACKPALS
|
||||
const SCGB_TRAINER_CARD
|
||||
const SCGB_16
|
||||
const SCGB_POKEDEX_UNOWN_MODE
|
||||
const SCGB_17
|
||||
const SCGB_18
|
||||
const SCGB_19
|
||||
|
1212
engine/pokedex.asm
1212
engine/pokedex.asm
File diff suppressed because it is too large
Load Diff
@ -25,7 +25,7 @@ PrintUnownWord: ; fba2e (3e:7a2e)
|
||||
ld bc, 12
|
||||
ld a, " "
|
||||
call ByteFill
|
||||
ld a, [wc7dd]
|
||||
ld a, [wDexCurrentUnownIndex]
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, UnownDex
|
||||
|
2
main.asm
2
main.asm
@ -11848,7 +11848,7 @@ DrawPokedexSearchResultsWindow: ; 1de1d1 (77:61d1)
|
||||
; (### FOUN)
|
||||
next "D!@"
|
||||
|
||||
Function1de247: ; 1de247
|
||||
DrawDexEntryScreenRightEdge: ; 1de247
|
||||
ld a, [hBGMapAddress]
|
||||
ld l, a
|
||||
ld a, [hBGMapAddress + 1]
|
||||
|
@ -5866,7 +5866,7 @@ Function11ad1b: ; 11ad1b
|
||||
ld [wcd30], a
|
||||
ld a, $2
|
||||
ld [wc7d4], a
|
||||
callba Pokedex_ChangeMode
|
||||
callba Pokedex_OrderMonsByMode
|
||||
ret
|
||||
; 11ad6e
|
||||
|
||||
|
@ -37,7 +37,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59
|
||||
dw _CGB_BattleColors
|
||||
dw _CGB_PokegearPals
|
||||
dw _CGB_StatsScreenHPPals
|
||||
dw _CGB04
|
||||
dw _CGB_Pokedex
|
||||
dw _CGB_SlotMachine
|
||||
dw _CGB06
|
||||
dw _CGB07
|
||||
@ -49,13 +49,13 @@ Predef_LoadSGBLayoutCGB: ; 8d59
|
||||
dw _CGB0d
|
||||
dw _CGB0e
|
||||
dw _CGB0f
|
||||
dw _CGB10
|
||||
dw _CGB_PokedexSearchOption
|
||||
dw _CGB11
|
||||
dw _CGB_Pokepic
|
||||
dw _CGB13
|
||||
dw _CGB_PackPals
|
||||
dw _CGB_TrainerCard
|
||||
dw _CGB16
|
||||
dw _CGB_PokedexUnownMode
|
||||
dw _CGB17
|
||||
dw _CGB18
|
||||
dw _CGB19
|
||||
@ -282,7 +282,7 @@ StatsScreenPals: ; 8f6a
|
||||
RGB 17, 31, 31
|
||||
; 8f70
|
||||
|
||||
_CGB04: ; 8f70
|
||||
_CGB_Pokedex: ; 8f70
|
||||
ld de, UnknBGPals
|
||||
ld a, $1d
|
||||
call GetPredefPal
|
||||
@ -389,7 +389,7 @@ Palette9036: ; 9036
|
||||
RGB 00, 00, 00
|
||||
; 903e
|
||||
|
||||
_CGB16: ; 903e
|
||||
_CGB_PokedexUnownMode: ; 903e
|
||||
ld de, UnknBGPals
|
||||
ld a, $1d
|
||||
call GetPredefPal
|
||||
@ -822,7 +822,7 @@ _CGB0f: ; 93a6
|
||||
ret
|
||||
; 93ba
|
||||
|
||||
_CGB10: ; 93ba
|
||||
_CGB_PokedexSearchOption: ; 93ba
|
||||
ld de, UnknBGPals
|
||||
ld a, $1d
|
||||
call GetPredefPal
|
||||
|
@ -28,7 +28,7 @@ Predef_LoadSGBLayout: ; 864c
|
||||
dw .SGB_BattleColors
|
||||
dw .SGB_PokegearPals
|
||||
dw .SGB_StatsScreenHPPals
|
||||
dw .SGB04
|
||||
dw .SGB_Pokedex
|
||||
dw .SGB_SlotMachine
|
||||
dw .SGB06
|
||||
dw .SGB07
|
||||
@ -40,13 +40,13 @@ Predef_LoadSGBLayout: ; 864c
|
||||
dw .SGB0d
|
||||
dw .SGB0e
|
||||
dw .SGB0f
|
||||
dw .SGB10
|
||||
dw .SGB_PokedexSearchOption
|
||||
dw .SGB11
|
||||
dw .SGB12
|
||||
dw .SGB13
|
||||
dw .SGB_PackPals
|
||||
dw .SGB_TrainerCard
|
||||
dw .SGB16
|
||||
dw .SGB_PokedexUnownMode
|
||||
dw .SGB17
|
||||
dw .SGB18
|
||||
dw .SGB19
|
||||
@ -209,7 +209,7 @@ endr
|
||||
ret
|
||||
; 87b2
|
||||
|
||||
.SGB04: ; 87b2
|
||||
.SGB_Pokedex: ; 87b2
|
||||
ld hl, PalPacket_9ce6
|
||||
ld de, wSGBPals
|
||||
ld bc, $10
|
||||
@ -266,13 +266,13 @@ endr
|
||||
ret
|
||||
; 8823
|
||||
|
||||
.SGB16: ; 8823
|
||||
call .SGB04
|
||||
.SGB_PokedexUnownMode: ; 8823
|
||||
call .SGB_Pokedex
|
||||
ld de, BlkPacket_9af6
|
||||
ret
|
||||
; 882a
|
||||
|
||||
.SGB10: ; 882a
|
||||
.SGB_PokedexSearchOption: ; 882a
|
||||
ld hl, PalPacket_9ce6
|
||||
ld de, wSGBPals
|
||||
ld bc, $10
|
||||
|
26
wram.asm
26
wram.asm
@ -864,26 +864,27 @@ wPokedexDataStart::
|
||||
wPokedexOrder:: ds NUM_POKEMON +- 1
|
||||
wPokedexOrderEnd:: ds 6
|
||||
wPokedexMetadata::
|
||||
wDexListingPage::
|
||||
wc7d0:: ds 1 ; Dex list page
|
||||
wDexListingScrollOffset:: ; offset of the first displayed entry from the start
|
||||
wc7d0:: ds 1
|
||||
wDexListingCursor::
|
||||
wc7d1:: ds 1 ; Dex cursor
|
||||
wDexListingEnd::
|
||||
wc7d2:: ds 1 ; Last mon to display
|
||||
wc7d3:: ds 1 ; Number of mons visible per dex list page
|
||||
wDexListingHeight:: ; number of entries displayed at once in the dex listing
|
||||
wc7d3:: ds 1
|
||||
wCurrentDexMode:: ; Pokedex Mode
|
||||
wc7d4:: ds 1 ; Index of the topmost visible item in a scrolling menu
|
||||
wc7d5:: ds 1 ; Which row the cursor is at in a scrolling menu (0-6)
|
||||
wc7d6:: ds 1
|
||||
wc7d7:: ds 1
|
||||
wc7d8:: ds 1
|
||||
wc7d9:: ds 1
|
||||
wc7da:: ds 1
|
||||
wDexSearchMonType1:: ds 1 ; first type to search
|
||||
wDexSearchMonType2:: ds 1 ; second type to search
|
||||
wDexSearchResultCount:: ds 1
|
||||
wDexArrowCursorPosIndex:: ds 1
|
||||
wDexArrowCursorDelayCounter:: ds 1
|
||||
wDexArrowCursorBlinkCounter:: ds 1
|
||||
wDexSearchSlowpokeFrame:: ds 1
|
||||
wUnlockedUnownMode:: ds 1
|
||||
wc7dd:: ds 1
|
||||
wc7de:: ds 1
|
||||
wc7df:: ds 1
|
||||
wDexCurrentUnownIndex:: ds 1
|
||||
wDexUnownCount:: ds 1
|
||||
wDexConvertedMonType:: ds 1 ; mon type converted from dex search mon type
|
||||
wc7e0:: ds 1
|
||||
wc7e1:: ds 1
|
||||
wBackupDexListingCursor::
|
||||
@ -1290,6 +1291,7 @@ wIntroSceneFrameCounter::
|
||||
wHoldingUnownPuzzlePiece::
|
||||
wCardFlipCursorY::
|
||||
wCreditsBorderFrame::
|
||||
wDexEntryPrevJumptableIndex::
|
||||
wcf64:: ds 1
|
||||
IF !DEF(CRYSTAL11)
|
||||
wPokedexStatus::
|
||||
|
Loading…
Reference in New Issue
Block a user