diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-25 10:26:30 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-25 10:26:30 -0500 |
| commit | 0c6f94effd1cb4278b0c0a2f02117055a69537e1 (patch) | |
| tree | f9d84ffeab661e6e97c2b16a2aa0d7ebceae1be4 /home | |
| parent | f599e477fc3306dbca9cad4aeadfe7a66b84c7bc (diff) | |
Final relabeling before merge
Diffstat (limited to 'home')
| -rw-r--r-- | home/battle.asm | 2 | ||||
| -rw-r--r-- | home/map.asm | 4 | ||||
| -rw-r--r-- | home/menu.asm | 4 | ||||
| -rw-r--r-- | home/rtc.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 2 | ||||
| -rw-r--r-- | home/tilemap.asm | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/home/battle.asm b/home/battle.asm index 57bab4083..4786cc4d3 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -285,7 +285,7 @@ BattleTextBox:: ; 3ac3 call SpeechTextBox call MobileTextBorder call UpdateSprites - call Function321c + call ApplyTilemap pop hl call PrintTextBoxText ret diff --git a/home/map.asm b/home/map.asm index a93f208a4..d50c99349 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1091,7 +1091,7 @@ MapTextbox:: ; 269a call Function2e31 ld a, 1 ld [hOAMUpdate], a - call Function321c + call ApplyTilemap pop hl call PrintTextBoxText xor a @@ -2043,7 +2043,7 @@ Function2b5c:: ; 2b5c Function2b74:: ; 0x2b74 push af ld a, $1 - ld [wc2ce], a + ld [wSpriteUpdatesEnabled], a call ClearBGPalettes call ClearSprites call Function2bae diff --git a/home/menu.asm b/home/menu.asm index 64f7e4d8c..4e7b7772b 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -77,7 +77,7 @@ InterpretMenu2:: call MenuBox call UpdateSprites call Function1c89 - call Function321c + call ApplyTilemap call CopyMenuData2 ld a, [wMenuData2Flags] bit 7, a @@ -262,7 +262,7 @@ MenuWriteText:: push af ld a, $1 ld [hOAMUpdate], a - call Function321c + call ApplyTilemap pop af ld [hOAMUpdate], a ret diff --git a/home/rtc.asm b/home/rtc.asm index 7070c0dad..9fb71c0be 100644 --- a/home/rtc.asm +++ b/home/rtc.asm @@ -2,7 +2,7 @@ RTC:: ; 46f ; update time and time-sensitive palettes ; rtc enabled? - ld a, [wc2ce] + ld a, [wSpriteUpdatesEnabled] cp 0 ret z diff --git a/home/text.asm b/home/text.asm index 2877f88dd..37208af9d 100644 --- a/home/text.asm +++ b/home/text.asm @@ -192,7 +192,7 @@ SetUpTextBox:: ; 106c push hl call SpeechTextBox call UpdateSprites - call Function321c + call ApplyTilemap pop hl ret ; 1078 diff --git a/home/tilemap.asm b/home/tilemap.asm index 3153cea2c..74ec17cee 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -16,7 +16,7 @@ Function1c10:: ; 0x1c10 WriteBackup:: ; 0x1c17 push af call ExitMenu - call Function321c + call ApplyTilemap call UpdateSprites pop af ret |