diff options
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/intro_menu.asm | 2 | ||||
| -rw-r--r-- | engine/menus/naming_screen.asm | 24 | ||||
| -rw-r--r-- | engine/menus/save.asm | 24 |
3 files changed, 25 insertions, 25 deletions
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index d327f2d50..89b2f5a77 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -67,7 +67,7 @@ NewGame: call OakSpeech call InitializeWorld ld a, 1 - ld [wPreviousLandmark], a + ld [wPrevLandmark], a ld a, SPAWN_HOME ld [wDefaultSpawnpoint], a diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index fee38ac26..addaed5a3 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -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 diff --git a/engine/menus/save.asm b/engine/menus/save.asm index ad6b85ff1..51acbc485 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -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 |