Curr -> Cur

This commit is contained in:
Rangi
2018-09-09 15:09:51 -04:00
parent 84cfbc70fa
commit ae022e1420
30 changed files with 321 additions and 321 deletions

View File

@@ -208,8 +208,8 @@ Init2DMenuCursorPosition:
ld [wMenuCursorY], a
xor a
ld [wCursorOffCharacter], a
ld [wCursorCurrentTile], a
ld [wCursorCurrentTile + 1], a
ld [wCursorCurTile], a
ld [wCursorCurTile + 1], a
ret
.InitFlags_a:
@@ -493,7 +493,7 @@ _2DMenuInterpretJoypad:
ret
Move2DMenuCursor:
ld hl, wCursorCurrentTile
ld hl, wCursorCurTile
ld a, [hli]
ld h, [hl]
ld l, a
@@ -549,9 +549,9 @@ Place2DMenuCursor:
.cursor_on
ld a, l
ld [wCursorCurrentTile], a
ld [wCursorCurTile], a
ld a, h
ld [wCursorCurrentTile + 1], a
ld [wCursorCurTile + 1], a
ret
_PushWindow::
@@ -797,7 +797,7 @@ _InitVerticalMenuCursor::
; wMenuCursorX
ld a, 1
ld [hli], a
; wCursorOffCharacter, wCursorCurrentTile
; wCursorOffCharacter, wCursorCurTile
xor a
ld [hli], a
ld [hli], a

View File

@@ -672,7 +672,7 @@ NamingScreen_TryAddCharacter:
MailComposition_TryAddCharacter:
ld a, [wNamingScreenMaxNameLength]
ld c, a
ld a, [wNamingScreenCurrNameLength]
ld a, [wNamingScreenCurNameLength]
cp c
ret nc
@@ -683,7 +683,7 @@ NamingScreen_LoadNextCharacter:
ld [hl], a
NamingScreen_AdvanceCursor_CheckEndOfString:
ld hl, wNamingScreenCurrNameLength
ld hl, wNamingScreenCurNameLength
inc [hl]
call NamingScreen_GetTextCursorPosition
ld a, [hl]
@@ -698,11 +698,11 @@ NamingScreen_AdvanceCursor_CheckEndOfString:
ret
; unused
ld a, [wNamingScreenCurrNameLength]
ld a, [wNamingScreenCurNameLength]
and a
ret z
push hl
ld hl, wNamingScreenCurrNameLength
ld hl, wNamingScreenCurNameLength
dec [hl]
call NamingScreen_GetTextCursorPosition
ld c, [hl]
@@ -724,7 +724,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString:
INCLUDE "data/text/unused_dakutens.asm"
NamingScreen_DeleteCharacter:
ld hl, wNamingScreenCurrNameLength
ld hl, wNamingScreenCurNameLength
ld a, [hl]
and a
ret z
@@ -744,7 +744,7 @@ NamingScreen_GetTextCursorPosition:
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [wNamingScreenCurrNameLength]
ld a, [wNamingScreenCurNameLength]
ld e, a
ld d, 0
add hl, de
@@ -874,7 +874,7 @@ LoadNamingScreenGFX:
ld [wJumptableIndex], a
ld [wNamingScreenLetterCase], a
ldh [hBGMapMode], a
ld [wNamingScreenCurrNameLength], a
ld [wNamingScreenCurNameLength], a
ld a, $7
ldh [hWX], a
ret
@@ -1109,7 +1109,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
call NamingScreen_GetLastCharacter
call MailComposition_TryAddLastCharacter
jr c, .start
ld hl, wNamingScreenCurrNameLength
ld hl, wNamingScreenCurNameLength
ld a, [hl]
cp MAIL_LINE_LENGTH
ret nz
@@ -1135,7 +1135,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
.b
call NamingScreen_DeleteCharacter
ld hl, wNamingScreenCurrNameLength
ld hl, wNamingScreenCurNameLength
ld a, [hl]
cp MAIL_LINE_LENGTH
ret nz
@@ -1350,20 +1350,20 @@ MailComposition_TryAddLastCharacter:
jp MailComposition_TryAddCharacter
; unused
ld a, [wNamingScreenCurrNameLength]
ld a, [wNamingScreenCurNameLength]
and a
ret z
cp $11
jr nz, .asm_121c3
push hl
ld hl, wNamingScreenCurrNameLength
ld hl, wNamingScreenCurNameLength
dec [hl]
dec [hl]
jr .asm_121c8
.asm_121c3
push hl
ld hl, wNamingScreenCurrNameLength
ld hl, wNamingScreenCurNameLength
dec [hl]
.asm_121c8

View File

@@ -489,9 +489,9 @@ SavePlayerData:
ld de, sPlayerData
ld bc, wPlayerDataEnd - wPlayerData
call CopyBytes
ld hl, wCurrMapData
ld de, sCurrMapData
ld bc, wCurrMapDataEnd - wCurrMapData
ld hl, wCurMapData
ld de, sCurMapData
ld bc, wCurMapDataEnd - wCurMapData
call CopyBytes
jp CloseSRAM
@@ -550,9 +550,9 @@ SaveBackupPlayerData:
ld de, sBackupPlayerData
ld bc, wPlayerDataEnd - wPlayerData
call CopyBytes
ld hl, wCurrMapData
ld de, sBackupCurrMapData
ld bc, wCurrMapDataEnd - wCurrMapData
ld hl, wCurMapData
ld de, sBackupCurMapData
ld bc, wCurMapDataEnd - wCurMapData
call CopyBytes
call CloseSRAM
ret
@@ -724,9 +724,9 @@ LoadPlayerData:
ld de, wPlayerData
ld bc, wPlayerDataEnd - wPlayerData
call CopyBytes
ld hl, sCurrMapData
ld de, wCurrMapData
ld bc, wCurrMapDataEnd - wCurrMapData
ld hl, sCurMapData
ld de, wCurMapData
ld bc, wCurMapDataEnd - wCurMapData
call CopyBytes
call CloseSRAM
ld a, BANK(sBattleTowerChallengeState)
@@ -779,9 +779,9 @@ LoadBackupPlayerData:
ld de, wPlayerData
ld bc, wPlayerDataEnd - wPlayerData
call CopyBytes
ld hl, sBackupCurrMapData
ld de, wCurrMapData
ld bc, wCurrMapDataEnd - wCurrMapData
ld hl, sBackupCurMapData
ld de, wCurMapData
ld bc, wCurMapDataEnd - wCurMapData
call CopyBytes
call CloseSRAM
ret

View File

@@ -322,8 +322,8 @@ ScrollingMenu_InitFlags:
ld a, 1
ld [wMenuCursorX], a
xor a
ld [wCursorCurrentTile], a
ld [wCursorCurrentTile + 1], a
ld [wCursorCurTile], a
ld [wCursorCurTile + 1], a
ld [wCursorOffCharacter], a
ret