diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/joypad.asm | 2 | ||||
| -rw-r--r-- | home/map.asm | 4 | ||||
| -rw-r--r-- | home/menu.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 6 | ||||
| -rw-r--r-- | home/window.asm | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/home/joypad.asm b/home/joypad.asm index 8dccedf6c..13f27e7c3 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -313,7 +313,7 @@ JoyWaitAorB:: ; a36 jr .loop ; a46 -CloseText:: ; a46 +WaitButton:: ; a46 ld a, [hOAMUpdate] push af ld a, 1 diff --git a/home/map.asm b/home/map.asm index e385517a1..bd83c7069 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1425,10 +1425,10 @@ LoadTileset:: ; 2821 ld [rSVBK], a ld a, e - ld de, w6_d000 + ld de, wBackupTilemap call FarDecompress - ld hl, w6_d000 + ld hl, wBackupTilemap ld de, VTiles2 ld bc, $60 tiles call CopyBytes diff --git a/home/menu.asm b/home/menu.asm index 4e7b7772b..8c6be5471 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -548,7 +548,7 @@ PlayClickSFX:: ; 2009 MenuTextBoxWaitButton:: ; 2012 call MenuTextBox - call CloseText + call WaitButton call ExitMenu ret ; 201c diff --git a/home/text.asm b/home/text.asm index 37208af9d..0c0257c83 100644 --- a/home/text.asm +++ b/home/text.asm @@ -723,15 +723,15 @@ PokeFluteTerminatorCharacter:: ; 13e0 PlaceWholeStringInBoxAtOnce:: ; 13e5 - ld a, [TextBoxFrame + 1] + ld a, [TextBoxFlags] push af set 1, a - ld [TextBoxFrame + 1], a + ld [TextBoxFlags], a call DoTextUntilTerminator pop af - ld [TextBoxFrame + 1], a + ld [TextBoxFlags], a ret ; 13f6 diff --git a/home/window.asm b/home/window.asm index bc03e6ce4..a8eba0bb6 100644 --- a/home/window.asm +++ b/home/window.asm @@ -16,7 +16,7 @@ ResetWindow:: ; 2dba ; 2dcf -LoadMoveSprites:: ; 2dcf +CloseText:: ; 2dcf ld a, [hOAMUpdate] push af ld a, $1 |