diff options
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 6 | ||||
| -rw-r--r-- | engine/pokemon/correct_nick_errors.asm (renamed from engine/pokemon/check_nick_errors.asm) | 2 | ||||
| -rw-r--r-- | engine/pokemon/party_menu.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/stats_screen.asm | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 96d6ac310..75cc3fe35 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -2,7 +2,7 @@ _DepositPKMN: ; e2391 (38:6391) ld hl, wOptions ld a, [hl] push af - set 4, [hl] + set NO_TEXT_SCROLL, [hl] ld a, [wVramState] push af xor a @@ -264,7 +264,7 @@ _WithdrawPKMN: ; e2583 (38:6583) ld hl, wOptions ld a, [hl] push af - set 4, [hl] + set NO_TEXT_SCROLL, [hl] ld a, [wVramState] push af xor a @@ -507,7 +507,7 @@ _MovePKMNWithoutMail: ; e2759 ld hl, wOptions ld a, [hl] push af - set 4, [hl] + set NO_TEXT_SCROLL, [hl] ld a, [wVramState] push af xor a diff --git a/engine/pokemon/check_nick_errors.asm b/engine/pokemon/correct_nick_errors.asm index 87ebd6bb3..5d44846bf 100644 --- a/engine/pokemon/check_nick_errors.asm +++ b/engine/pokemon/correct_nick_errors.asm @@ -1,4 +1,4 @@ -CheckNickErrors:: ; 669f +CorrectNickErrors:: ; 669f ; error-check monster nick before use ; must be a peace offering to gamesharkers diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index fc1783c71..11edc0412 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -778,7 +778,7 @@ PrintPartyMenuText: ; 5049a .gotstring ; 504be ld a, [wOptions] push af - set 4, a ; disable text delay + set NO_TEXT_SCROLL, a ld [wOptions], a hlcoord 1, 16 ; Coord call PlaceString diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 59d96999f..7e44cb96e 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -772,7 +772,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) ld hl, .OTNamePointers call GetNicknamePointer call CopyNickname - farcall CheckNickErrors + farcall CorrectNickErrors hlcoord 2, 13 call PlaceString ld a, [wTempMonCaughtGender] |