Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

POKEDEX_SCX

This commit is contained in:
Remy Oukaour 2018-01-21 16:53:19 -05:00
parent 81ba6c848a
commit 5db31feba9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/pokedex.asm
View File

@ -15,8 +15,8 @@
const DEXSTATE_UPDATE_UNOWN_MODE const DEXSTATE_UPDATE_UNOWN_MODE
const DEXSTATE_EXIT const DEXSTATE_EXIT
POKDEX_SCX EQU 5 POKEDEX_SCX EQU 5
GLOBAL POKDEX_SCX GLOBAL POKEDEX_SCX
Pokedex: ; 40000 Pokedex: ; 40000
@ -233,7 +233,7 @@ Pokedex_InitMainScreen: ; 4013c (10:413c)
call Pokedex_SetBGMapMode_3ifDMG_4ifCGB call Pokedex_SetBGMapMode_3ifDMG_4ifCGB
call Pokedex_ResetBGMapMode call Pokedex_ResetBGMapMode
call Pokedex_DrawMainScreenBG call Pokedex_DrawMainScreenBG
ld a, POKDEX_SCX ld a, POKEDEX_SCX
ld [hSCX], a ld [hSCX], a
ld a, [wCurrentDexMode] ld a, [wCurrentDexMode]
@ -453,7 +453,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
ld [hBGMapMode], a ld [hBGMapMode], a
ld a, $90 ld a, $90
ld [hWY], a ld [hWY], a
ld a, POKDEX_SCX ld a, POKEDEX_SCX
ld [hSCX], a ld [hSCX], a
call DelayFrame call DelayFrame
call Pokedex_RedisplayDexEntry call Pokedex_RedisplayDexEntry
@ -497,7 +497,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
call Pokedex_RedisplayDexEntry call Pokedex_RedisplayDexEntry
call EnableLCD call EnableLCD
call WaitBGMap call WaitBGMap
ld a, POKDEX_SCX ld a, POKEDEX_SCX
ld [hSCX], a ld [hSCX], a
call Pokedex_ApplyUsualPals call Pokedex_ApplyUsualPals
ret ret
@ -733,7 +733,7 @@ Pokedex_InitSearchResultsScreen: ; 4050a (10:450a)
call Pokedex_SetBGMapMode3 call Pokedex_SetBGMapMode3
call Pokedex_ResetBGMapMode call Pokedex_ResetBGMapMode
call Pokedex_DrawSearchResultsScreenBG call Pokedex_DrawSearchResultsScreenBG
ld a, POKDEX_SCX ld a, POKEDEX_SCX
ld [hSCX], a ld [hSCX], a
ld a, $4a ld a, $4a
ld [hWX], a ld [hWX], a

4
engine/routines/newpokedexentry.asm
View File

@ -11,7 +11,7 @@ NewPokedexEntry: ; fb877
ld a, [wPokedexStatus] ld a, [wPokedexStatus]
push af push af
ld a, [hSCX] ld a, [hSCX]
add POKDEX_SCX add POKEDEX_SCX
ld [hSCX], a ld [hSCX], a
xor a xor a
ld [wPokedexStatus], a ld [wPokedexStatus], a
@ -26,7 +26,7 @@ NewPokedexEntry: ; fb877
call MaxVolume call MaxVolume
call RotateThreePalettesRight call RotateThreePalettesRight
ld a, [hSCX] ld a, [hSCX]
add -POKDEX_SCX add -POKEDEX_SCX
ld [hSCX], a ld [hSCX], a
call .ReturnFromDexRegistration call .ReturnFromDexRegistration
pop af pop af