Skip to content

Commit

Permalink
POKEDEX_SCX
Browse files Browse the repository at this point in the history
  • Loading branch information
roukaour committed Jan 21, 2018
1 parent 81ba6c8 commit 5db31fe
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions engine/pokedex.asm
Expand Up @@ -15,8 +15,8 @@
const DEXSTATE_UPDATE_UNOWN_MODE
const DEXSTATE_EXIT

POKDEX_SCX EQU 5
GLOBAL POKDEX_SCX
POKEDEX_SCX EQU 5
GLOBAL POKEDEX_SCX

Pokedex: ; 40000

Expand Down Expand Up @@ -233,7 +233,7 @@ Pokedex_InitMainScreen: ; 4013c (10:413c)
call Pokedex_SetBGMapMode_3ifDMG_4ifCGB
call Pokedex_ResetBGMapMode
call Pokedex_DrawMainScreenBG
ld a, POKDEX_SCX
ld a, POKEDEX_SCX
ld [hSCX], a

ld a, [wCurrentDexMode]
Expand Down Expand Up @@ -453,7 +453,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
ld [hBGMapMode], a
ld a, $90
ld [hWY], a
ld a, POKDEX_SCX
ld a, POKEDEX_SCX
ld [hSCX], a
call DelayFrame
call Pokedex_RedisplayDexEntry
Expand Down Expand Up @@ -497,7 +497,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
call Pokedex_RedisplayDexEntry
call EnableLCD
call WaitBGMap
ld a, POKDEX_SCX
ld a, POKEDEX_SCX
ld [hSCX], a
call Pokedex_ApplyUsualPals
ret
Expand Down Expand Up @@ -733,7 +733,7 @@ Pokedex_InitSearchResultsScreen: ; 4050a (10:450a)
call Pokedex_SetBGMapMode3
call Pokedex_ResetBGMapMode
call Pokedex_DrawSearchResultsScreenBG
ld a, POKDEX_SCX
ld a, POKEDEX_SCX
ld [hSCX], a
ld a, $4a
ld [hWX], a
Expand Down
4 changes: 2 additions & 2 deletions engine/routines/newpokedexentry.asm
Expand Up @@ -11,7 +11,7 @@ NewPokedexEntry: ; fb877
ld a, [wPokedexStatus]
push af
ld a, [hSCX]
add POKDEX_SCX
add POKEDEX_SCX
ld [hSCX], a
xor a
ld [wPokedexStatus], a
Expand All @@ -26,7 +26,7 @@ NewPokedexEntry: ; fb877
call MaxVolume
call RotateThreePalettesRight
ld a, [hSCX]
add -POKDEX_SCX
add -POKEDEX_SCX
ld [hSCX], a
call .ReturnFromDexRegistration
pop af
Expand Down

0 comments on commit 5db31fe

Please sign in to comment.