summaryrefslogtreecommitdiff
path: root/engine/namingscreen.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/namingscreen.asm')
-rwxr-xr-xengine/namingscreen.asm28
1 files changed, 11 insertions, 17 deletions
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index d9fe253fb..d80b4717b 100755
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -43,7 +43,7 @@ NamingScreen: ; 116c1
.SetUpNamingScreen: ; 116f8
call ClearBGPalettes
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call DisableLCD
call LoadNamingScreenGFX
@@ -65,9 +65,8 @@ NamingScreen: ; 116c1
ld e, a
ld d, 0
ld hl, .Jumptable
-rept 2
add hl, de
-endr
+ add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
@@ -401,9 +400,8 @@ NamingScreenJoypadLoop: ; 11915
ld e, a
ld d, $0
ld hl, .Jumptable
-rept 2
add hl, de
-endr
+ add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
@@ -662,9 +660,8 @@ NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
jr nz, .asm_11ade
ld a, $4
.asm_11ade
-rept 2
dec a
-endr
+ dec a
ld e, a
add a
add e
@@ -989,15 +986,15 @@ BoxNameInputUpper:
; 11e5d
GFX_11e5d: ; ????
-INCBIN "gfx/unknown/011e5d.2bpp"
+INCBIN "gfx/unknown/011e5d.1bpp"
; 11e6d
NamingScreenGFX_MiddleLine:
-INCBIN "gfx/unknown/011e65.2bpp"
+INCBIN "gfx/unknown/011e65.1bpp"
; 11e6d
NamingScreenGFX_UnderLine: ; 11e6d
-INCBIN "gfx/unknown/011e6d.2bpp"
+INCBIN "gfx/unknown/011e6d.1bpp"
; 11e75
_ComposeMailMessage: ; 11e75 (mail?)
@@ -1052,7 +1049,7 @@ _ComposeMailMessage: ; 11e75 (mail?)
ld a, $e3
ld [rLCDC], a
call .initwNamingScreenMaxNameLength
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call WaitBGMap
call WaitTop
@@ -1164,9 +1161,8 @@ INCBIN "gfx/icon/mail2.2bpp"
ld e, a
ld d, 0
ld hl, .Jumptable
-rept 2
add hl, de
-endr
+ add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
@@ -1391,9 +1387,8 @@ ComposeMail_AnimateCursor: ; 120c1 (4:60c1)
jr nz, .wrap_around_command_left
ld a, $4
.wrap_around_command_left
-rept 2
dec a
-endr
+ dec a
ld e, a
add a
add e
@@ -1476,9 +1471,8 @@ MailComposition_TryAddLastCharacter: ; 121ac (4:61ac)
jr nz, .asm_121c3
push hl
ld hl, wNamingScreenCurrNameLength
-rept 2
dec [hl]
-endr
+ dec [hl]
jr .asm_121c8
.asm_121c3