summaryrefslogtreecommitdiff
path: root/engine/menus
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menus')
-rw-r--r--engine/menus/display_text_id_init.asm4
-rwxr-xr-xengine/menus/save.asm4
-rwxr-xr-xengine/menus/start_sub_menus.asm10
3 files changed, 9 insertions, 9 deletions
diff --git a/engine/menus/display_text_id_init.asm b/engine/menus/display_text_id_init.asm
index e1f6c678..45c76f9c 100644
--- a/engine/menus/display_text_id_init.asm
+++ b/engine/menus/display_text_id_init.asm
@@ -43,7 +43,7 @@ DisplayTextIDInit::
; the original direction they were facing must be restored after the dialogue is over
ld hl, wSpriteStateData1 + $19
ld c, $0f
- ld de, $0010
+ ld de, $10
.spriteFacingDirectionCopyLoop
ld a, [hl]
inc h
@@ -55,7 +55,7 @@ DisplayTextIDInit::
; loop to force all the sprites in the middle of animation to stand still
; (so that they don't like they're frozen mid-step during the dialogue)
ld hl, wSpriteStateData1 + 2
- ld de, $0010
+ ld de, $10
ld c, e
.spriteStandStillLoop
ld a, [hl]
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index f2ecc3aa..ee73c850 100755
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -702,7 +702,7 @@ ClearSAV:
PadSRAM_FF:
ld [MBC1SRamBank], a
- ld hl, $a000 ; start of SRAM
- ld bc, $2000 ; size of SRAM
+ ld hl, SRAM_Begin
+ ld bc, SRAM_End - SRAM_Begin
ld a, $ff
jp FillMemory
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index 43c767e2..526540df 100755
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -491,12 +491,12 @@ DrawTrainerInfo:
call CopyData
ld hl, TrainerInfoTextBoxTileGraphics ; trainer info text box tile patterns
ld de, vChars2 + $770
- ld bc, $0080
+ ld bc, $80
push bc
call TrainerInfo_FarCopyData
ld hl, BlankLeaderNames
ld de, vChars2 + $600
- ld bc, $0170
+ ld bc, $170
call TrainerInfo_FarCopyData
pop bc
ld hl, BadgeNumbersTileGraphics ; badge number tile patterns
@@ -504,14 +504,14 @@ DrawTrainerInfo:
call TrainerInfo_FarCopyData
ld hl, GymLeaderFaceAndBadgeTileGraphics ; gym leader face and badge tile patterns
ld de, vChars2 + $200
- ld bc, $0400
+ ld bc, $400
ld a, $03
call FarCopyData2
ld hl, TextBoxGraphics
- ld de, $00d0
+ ld de, $d0
add hl, de ; hl = colon tile pattern
ld de, vChars1 + $560
- ld bc, $0010
+ ld bc, $10
ld a, $04
push bc
call FarCopyData2