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

pokedex unown mode

Browse Source
This commit is contained in:
YamaArashi
2016-01-09 19:46:41 -08:00
parent 418c84dc0c
commit b609a1690d
4 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
engine/pokedex.asm
View File

@@ -83,7 +83,7 @@ InitPokedex: ; 40063
call Pokedex_OrderMonsByMode call Pokedex_OrderMonsByMode
call Pokedex_InitCursorPosition call Pokedex_InitCursorPosition
call Pokedex_GetLandmark call Pokedex_GetLandmark
callba Function1de247 callba DrawDexEntryScreenRightEdge
call Pokedex_ResetBGMapMode call Pokedex_ResetBGMapMode
ret ret
@@ -781,11 +781,11 @@ Pokedex_UpdateSearchResultsScreen: ; 40562 (10:4562)
Pokedex_InitUnownMode: ; 405bd (10:45bd) Pokedex_InitUnownMode: ; 405bd (10:45bd)
call Pokedex_LoadUnownFont call Pokedex_LoadUnownFont
call Function409f1 call Pokedex_DrawUnownModeBG
xor a xor a
ld [wc7dd], a ld [wDexCurrentUnownIndex], a
call Function41a58 call Pokedex_LoadUnownFrontpicTiles
call Function40658 call Pokedex_UnownModePlaceCursor
callba PrintUnownWord callba PrintUnownWord
call WaitBGMap call WaitBGMap
ld a, $16 ld a, $16
@@ -831,9 +831,9 @@ Pokedex_UnownModeHandleDPadInput: ; 40610 (10:4610)
ret ret
.right .right
ld a, [wc7de] ld a, [wDexUnownCount]
ld e, a ld e, a
ld hl, wc7dd ld hl, wDexCurrentUnownIndex
ld a, [hl] ld a, [hl]
inc a inc a
cp e cp e
@@ -843,7 +843,7 @@ Pokedex_UnownModeHandleDPadInput: ; 40610 (10:4610)
jr .update jr .update
.left .left
ld hl, wc7dd ld hl, wDexCurrentUnownIndex
ld a, [hl] ld a, [hl]
and a and a
ret z ret z
@@ -855,9 +855,9 @@ Pokedex_UnownModeHandleDPadInput: ; 40610 (10:4610)
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
pop af pop af
call Function40654 call Pokedex_UnownModeEraseCursor
call Function41a58 call Pokedex_LoadUnownFrontpicTiles
call Function40658 call Pokedex_UnownModePlaceCursor
callba PrintUnownWord callba PrintUnownWord
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
@@ -865,17 +865,18 @@ Pokedex_UnownModeHandleDPadInput: ; 40610 (10:4610)
call DelayFrame call DelayFrame
ret ret
Function40654: ; 40654 (10:4654) Pokedex_UnownModeEraseCursor: ; 40654 (10:4654)
ld c, $7f ld c, " "
jr asm_4065d jr Pokedex_UnownModeUpdateCursorGfx
Function40658: ; 40658 (10:4658) Pokedex_UnownModePlaceCursor: ; 40658 (10:4658)
ld a, [wc7dd] ld a, [wDexCurrentUnownIndex]
ld c, $5a ld c, $5a ; diamond cursor
asm_4065d: ; 4065d (10:465d)
Pokedex_UnownModeUpdateCursorGfx: ; 4065d (10:465d)
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, Unknown_40a3e + 2 ld hl, UnownModeLetterAndCursorCoords + 2
rept 4 rept 4
add hl, de add hl, de
endr endr
@@ -1283,7 +1284,7 @@ Pokedex_PlaceSearchResultsTypeStrings: ; 409cf (10:49cf)
.done .done
ret ret
Function409f1: ; 409f1 (10:49f1) Pokedex_DrawUnownModeBG: ; 409f1 (10:49f1)
call Pokedex_FillBackgroundColor2 call Pokedex_FillBackgroundColor2
hlcoord 2, 1 hlcoord 2, 1
lb bc, 10, 13 lb bc, 10, 13
@@ -1307,7 +1308,7 @@ Function409f1: ; 409f1 (10:49f1)
and a and a
jr z, .done jr z, .done
push af push af
ld hl, Unknown_40a3e ld hl, UnownModeLetterAndCursorCoords
rept 4 rept 4
add hl, de add hl, de
endr endr
@@ -1323,10 +1324,10 @@ endr
jr nz, .loop jr nz, .loop
.done .done
ld a, b ld a, b
ld [wc7de], a ld [wDexUnownCount], a
ret ret
Unknown_40a3e: ; 40a3e UnownModeLetterAndCursorCoords: ; 40a3e
; letter, cursor ; letter, cursor
dwcoord 4,11, 3,11 dwcoord 4,11, 3,11
dwcoord 4,10, 3,10 dwcoord 4,10, 3,10
@@ -2526,12 +2527,12 @@ Pokedex_LoadUnownFont: ; 41a2c
call CloseSRAM call CloseSRAM
ret ret
Function41a58: ; 41a58 (10:5a58) Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58)
ld a, [UnownLetter] ld a, [UnownLetter]
push af push af
ld a, [wc7dd] ld a, [wDexCurrentUnownIndex]
ld e, a ld e, a
ld d, $0 ld d, 0
ld hl, UnownDex ld hl, UnownDex
add hl, de add hl, de
ld a, [hl] ld a, [hl]
@@ -2548,7 +2549,7 @@ Function41a58: ; 41a58 (10:5a58)
_NewPokedexEntry: ; 41a7f _NewPokedexEntry: ; 41a7f
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
callba Function1de247 callba DrawDexEntryScreenRightEdge
call Pokedex_ResetBGMapMode call Pokedex_ResetBGMapMode
call DisableLCD call DisableLCD
call LoadStandardFont call LoadStandardFont

2
engine/unowndex.asm
View File

@@ -25,7 +25,7 @@ PrintUnownWord: ; fba2e (3e:7a2e)
ld bc, 12 ld bc, 12
ld a, " " ld a, " "
call ByteFill call ByteFill
ld a, [wc7dd] ld a, [wDexCurrentUnownIndex]
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, UnownDex ld hl, UnownDex

2
main.asm
View File

@@ -12110,7 +12110,7 @@ DrawPokedexSearchResultsWindow: ; 1de1d1 (77:61d1)
; (### FOUN) ; (### FOUN)
next "D!@" next "D!@"
Function1de247: ; 1de247 DrawDexEntryScreenRightEdge: ; 1de247
ld a, [hBGMapAddress] ld a, [hBGMapAddress]
ld l, a ld l, a
ld a, [hBGMapAddress + 1] ld a, [hBGMapAddress + 1]

4
wram.asm
View File

@@ -939,8 +939,8 @@ wDexArrowCursorDelayCounter:: ds 1
wDexArrowCursorBlinkCounter:: ds 1 wDexArrowCursorBlinkCounter:: ds 1
wDexSearchSlowpokeFrame:: ds 1 wDexSearchSlowpokeFrame:: ds 1
wUnlockedUnownMode:: ds 1 wUnlockedUnownMode:: ds 1
wc7dd:: ds 1 wDexCurrentUnownIndex:: ds 1
wc7de:: ds 1 wDexUnownCount:: ds 1
wDexConvertedMonType:: ds 1 ; mon type converted from dex search mon type wDexConvertedMonType:: ds 1 ; mon type converted from dex search mon type
wc7e0:: ds 1 wc7e0:: ds 1
wc7e1:: ds 1 wc7e1:: ds 1