diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-08 14:11:24 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-08 14:11:24 -0400 |
| commit | e95d42e0af1921f516c1fd4269024aa3f586514f (patch) | |
| tree | 3130d8d059dbeb247b24bd31eec28c6e358659d8 /home | |
| parent | bb58230ca7a3f0f3c58af2b182051cf33ba609ac (diff) | |
All functions in main.asm have non-generic names
Diffstat (limited to 'home')
| -rw-r--r-- | home/game_time.asm | 2 | ||||
| -rw-r--r-- | home/joypad.asm | 2 | ||||
| -rw-r--r-- | home/string.asm | 3 | ||||
| -rw-r--r-- | home/text.asm | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/home/game_time.asm b/home/game_time.asm index 54cad89c9..09d558eef 100644 --- a/home/game_time.asm +++ b/home/game_time.asm @@ -33,7 +33,7 @@ UpdateGameTimer:: ; 20ad ; Don't update if game logic is paused. - ld a, [wc2cd] + ld a, [wGameLogicPaused] and a ret nz diff --git a/home/joypad.asm b/home/joypad.asm index 0c0e30062..0cb2f6206 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -33,7 +33,7 @@ Joypad:: ; 935 ret nz ; If we're saving, input is disabled. - ld a, [wc2cd] + ld a, [wGameLogicPaused] and a ret nz diff --git a/home/string.asm b/home/string.asm index 70a0f2dd5..492246832 100644 --- a/home/string.asm +++ b/home/string.asm @@ -8,8 +8,6 @@ InitName:: ; 2ef9 ; Intended for names, so this function is limited to ten characters. push hl ld c, 10 -; 2efc - _InitString:: ; 2efc ; if the string pointed to by hl is empty (defined as "zero or more spaces ; followed by a null"), then initialize it to the string pointed to by de. @@ -31,6 +29,7 @@ _InitString:: ; 2efc inc c call CopyBytes ret + .notblank pop bc pop hl diff --git a/home/text.asm b/home/text.asm index 8632c2c65..08b3f3660 100644 --- a/home/text.asm +++ b/home/text.asm @@ -182,7 +182,7 @@ BuenaPrintText:: ; 105a PrintTextBoxText:: ; 1065 bccoord TEXTBOX_INNERX, TEXTBOX_INNERY - call PlaceWholeStringInBoxAtOnce + call PlaceHLTextAtBC ret ; 106c @@ -708,7 +708,7 @@ PokeFluteTerminatorCharacter:: ; 13e0 ; 13e5 -PlaceWholeStringInBoxAtOnce:: ; 13e5 +PlaceHLTextAtBC:: ; 13e5 ld a, [TextBoxFlags] push af set 1, a |