diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-25 22:23:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 22:23:45 -0400 |
| commit | 3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch) | |
| tree | 3d747166409fdc94f0fd1aa760693a7ee5bd2156 /home/text.asm | |
| parent | 89681d231611938a791f4256e602c88c2f9aa3e1 (diff) | |
| parent | b2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff) | |
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'home/text.asm')
| -rw-r--r-- | home/text.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/home/text.asm b/home/text.asm index ef952942d..8d3d0e7ec 100644 --- a/home/text.asm +++ b/home/text.asm @@ -28,7 +28,7 @@ ClearTileMap:: call ByteFill ; Update the BG Map. - ld a, [rLCDC] + ldh a, [rLCDC] bit rLCDC_ENABLE, a ret z jp WaitBGMap @@ -309,12 +309,12 @@ PlaceWatashi: print_name PlaceWatashiText PlaceKokoWa: print_name PlaceKokoWaText PlaceMoveTargetsName:: - ld a, [hBattleTurn] + ldh a, [hBattleTurn] xor 1 jr PlaceMoveUsersName.place PlaceMoveUsersName:: - ld a, [hBattleTurn] + ldh a, [hBattleTurn] .place: push de @@ -599,15 +599,15 @@ TextScroll:: Text_WaitBGMap:: push bc - ld a, [hOAMUpdate] + ldh a, [hOAMUpdate] push af ld a, 1 - ld [hOAMUpdate], a + ldh [hOAMUpdate], a call WaitBGMap pop af - ld [hOAMUpdate], a + ldh [hOAMUpdate], a pop bc ret @@ -626,7 +626,7 @@ UnloadBlinkingCursor:: FarString:: ld b, a - ld a, [hROMBank] + ldh a, [hROMBank] push af ld a, b @@ -744,7 +744,7 @@ TextCommand_FAR:: ; little endian ; [$16][addr][bank] - ld a, [hROMBank] + ldh a, [hROMBank] push af ld a, [hli] @@ -753,7 +753,7 @@ TextCommand_FAR:: ld d, a ld a, [hli] - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a push hl @@ -763,7 +763,7 @@ TextCommand_FAR:: pop hl pop af - ld [hROMBank], a + ldh [hROMBank], a ld [MBC3RomBank], a ret @@ -905,7 +905,7 @@ TextCommand_EXIT:: push hl push bc call GetJoypad - ld a, [hJoyDown] + ldh a, [hJoyDown] and A_BUTTON | B_BUTTON jr nz, .done ld c, 30 @@ -986,7 +986,7 @@ TextCommand_DOTS:: ld a, "…" ld [hli], a call GetJoypad - ld a, [hJoyDown] + ldh a, [hJoyDown] and A_BUTTON | B_BUTTON jr nz, .next ld c, 10 |