Merge pull request #503 from Rangi42/master

Factor wMisc into meaningful parts; move most code out of home.asm
This commit is contained in:
yenatch
2018-04-09 21:30:24 -04:00
committed by GitHub
59 changed files with 1652 additions and 1610 deletions

View File

@@ -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

View File

@@ -1,4 +1,4 @@
CheckNickErrors:: ; 669f
CorrectNickErrors:: ; 669f
; error-check monster nick before use
; must be a peace offering to gamesharkers

View File

@@ -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

View File

@@ -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]