diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-18 16:35:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 16:35:16 -0400 |
| commit | 34ad9498ea399405ddc68aea91af9dd64319417c (patch) | |
| tree | dc841f7adaaab2cdf88c0c0d6b81535c3b6ee0c0 /home | |
| parent | 5882c99f9d2581d0378a65c4559ae2ae6e0bc137 (diff) | |
| parent | 4ea75afd563ef8304f7bb3f4662e229f156a9e6d (diff) | |
Merge pull request #60 from mid-kid/master
Rub a dub dub, thanks for the grub
Diffstat (limited to 'home')
| -rw-r--r-- | home/menu.asm | 16 | ||||
| -rw-r--r-- | home/palettes.asm | 10 | ||||
| -rw-r--r-- | home/text.asm | 6 | ||||
| -rw-r--r-- | home/tilemap.asm | 2 |
4 files changed, 18 insertions, 16 deletions
diff --git a/home/menu.asm b/home/menu.asm index 3370ff0d..7bc6454d 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -1,20 +1,22 @@ -SetMenuAttributes:: +Load2DMenuData:: push hl push bc - ld hl, w2DMenuCursorInitY - ld b, $8 + ld hl, w2DMenuData + ld b, w2DMenuDataEnd - w2DMenuData .loop ld a, [de] inc de ld [hli], a dec b jr nz, .loop + + ; Reset menu state ld a, $1 - ld [hli], a - ld [hli], a + ld [hli], a ; wMenuCursorY + ld [hli], a ; wMenuCursorX xor a - ld [hli], a - ld [hli], a + ld [hli], a ; wCursorOffCharacter + ld [hli], a ; wCursorCurrentTile ld [hli], a pop bc pop hl diff --git a/home/palettes.asm b/home/palettes.asm index 6eec53ef..af7f7ba7 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -81,7 +81,7 @@ DmgToCgbBGPals:: ld c, 8 call CopyPals ; request pal update - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a pop bc @@ -120,7 +120,7 @@ DmgToCgbObjPals:: ld c, 8 call CopyPals ; request pal update - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a pop bc @@ -147,7 +147,7 @@ DmgToCgbObjPal0:: ld b, a ld c, 1 call CopyPals - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a pop bc @@ -176,7 +176,7 @@ DmgToCgbObjPal1:: ld b, a ld c, 1 call CopyPals - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a pop bc @@ -282,7 +282,7 @@ ReloadSpritesNoPalettes:: ld bc, (8 palettes) + (2 palettes) xor a call ByteFill - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a call DelayFrame ret diff --git a/home/text.asm b/home/text.asm index f7fadd5e..9d3428ac 100644 --- a/home/text.asm +++ b/home/text.asm @@ -614,7 +614,7 @@ TextCommands:: dw TextCommand_PROMPT_BUTTON ; TX_PROMPT_BUTTON dw TextCommand_SCROLL ; TX_SCROLL dw TextCommand_START_ASM ; TX_START_ASM - dw TextCommand_NUM ; TX_NUM + dw TextCommand_DECIMAL ; TX_DECIMAL dw TextCommand_PAUSE ; TX_PAUSE dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_50_79 dw TextCommand_DOTS ; TX_DOTS @@ -758,8 +758,8 @@ TextCommand_START_ASM:: ; run assembly code jp hl -TextCommand_NUM:: -; print a number +TextCommand_DECIMAL:: +; print a decimal number ld a, [hli] ld e, a ld a, [hli] diff --git a/home/tilemap.asm b/home/tilemap.asm index ddd32d9e..f65a0d5b 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -180,7 +180,7 @@ ClearPalettes:: ld a, $ff call ByteFill ; Request palette update - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a ret |