Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use labels instead of constants for HRAM

Browse Source 
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
This commit is contained in:
Rangi
2018-08-25 14:28:22 -04:00
parent 376c64468b
commit eb1e3636bb
243 changed files with 4706 additions and 4661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
engine/menus/naming_screen.asm
View File

@@ -21,23 +21,23 @@ NamingScreen:
ld a, [hl]
push af
set NO_TEXT_SCROLL, [hl]
ld a, [hMapAnims]
ldh a, [hMapAnims]
push af
xor a
ld [hMapAnims], a
ld a, [hInMenu]
ldh [hMapAnims], a
ldh a, [hInMenu]
push af
ld a, $1
ld [hInMenu], a
ldh [hInMenu], a
call .SetUpNamingScreen
call DelayFrame
.loop
call NamingScreenJoypadLoop
jr nc, .loop
pop af
ld [hInMenu], a
ldh [hInMenu], a
pop af
ld [hMapAnims], a
ldh [hMapAnims], a
pop af
ld [wOptions], a
call ClearJoypad
@@ -51,7 +51,7 @@ NamingScreen:
call LoadNamingScreenGFX
call NamingScreen_InitText
ld a, LCDC_DEFAULT
ld [rLCDC], a
ldh [rLCDC], a
call .GetNamingScreenSetup
call WaitBGMap
call WaitTop
@@ -332,14 +332,14 @@ NamingScreenJoypadLoop:
callfar ClearSpriteAnims
call ClearSprites
xor a
ld [hSCX], a
ld [hSCY], a
ldh [hSCX], a
ldh [hSCY], a
scf
ret
.UpdateStringEntry:
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
hlcoord 1, 5
call NamingScreen_IsTargetBox
jr nz, .got_coords
@@ -358,7 +358,7 @@ NamingScreenJoypadLoop:
ld l, a
call PlaceString
ld a, $1
ld [hBGMapMode], a
ldh [hBGMapMode], a
ret
.RunJumptable:
@@ -867,16 +867,16 @@ LoadNamingScreenGFX:
ld [hli], a
ld [hl], NAMINGSCREEN_CURSOR
xor a
ld [hSCY], a
ldh [hSCY], a
ld [wGlobalAnimYOffset], a
ld [hSCX], a
ldh [hSCX], a
ld [wGlobalAnimXOffset], a
ld [wJumptableIndex], a
ld [wNamingScreenLetterCase], a
ld [hBGMapMode], a
ldh [hBGMapMode], a
ld [wNamingScreenCurrNameLength], a
ld a, $7
ld [hWX], a
ldh [hWX], a
ret
NamingScreenGFX_Border:
@@ -901,14 +901,14 @@ _ComposeMailMessage:
ld [hl], e
inc hl
ld [hl], d
ld a, [hMapAnims]
ldh a, [hMapAnims]
push af
xor a
ld [hMapAnims], a
ld a, [hInMenu]
ldh [hMapAnims], a
ldh a, [hInMenu]
push af
ld a, $1
ld [hInMenu], a
ldh [hInMenu], a
call .InitBlankMail
call DelayFrame
@@ -917,9 +917,9 @@ _ComposeMailMessage:
jr nc, .loop
pop af
ld [hInMenu], a
ldh [hInMenu], a
pop af
ld [hMapAnims], a
ldh [hMapAnims], a
ret
.InitBlankMail:
@@ -946,7 +946,7 @@ _ComposeMailMessage:
ld [hl], $0
call .InitCharset
ld a, LCDC_DEFAULT
ld [rLCDC], a
ldh [rLCDC], a
call .initwNamingScreenMaxNameLength
ld b, SCGB_DIPLOMA
call GetSGBLayout
@@ -1027,14 +1027,14 @@ INCBIN "gfx/icons/mail_big.2bpp"
callfar ClearSpriteAnims
call ClearSprites
xor a
ld [hSCX], a
ld [hSCY], a
ldh [hSCX], a
ldh [hSCY], a
scf
ret
.Update:
xor a
ld [hBGMapMode], a
ldh [hBGMapMode], a
hlcoord 1, 1
lb bc, 4, 18
call ClearBox
@@ -1045,7 +1045,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
hlcoord 2, 2
call PlaceString
ld a, $1
ld [hBGMapMode], a
ldh [hBGMapMode], a
ret
.DoJumptable: