Prefix wram labels with w, part 2.
This commit is contained in:
@@ -77,12 +77,12 @@ Special_CheckBugContestContestantFlag: ; 139ed
|
||||
INCLUDE "data/bug_contest_flags.asm"
|
||||
|
||||
Special_ContestDropOffMons: ; 13a12
|
||||
ld hl, PartyMon1HP
|
||||
ld hl, wPartyMon1HP
|
||||
ld a, [hli]
|
||||
or [hl]
|
||||
jr z, .fainted
|
||||
; Mask the rest of your party by setting the count to 1...
|
||||
ld hl, PartyCount
|
||||
ld hl, wPartyCount
|
||||
ld a, 1
|
||||
ld [hli], a
|
||||
inc hl
|
||||
@@ -92,18 +92,18 @@ Special_ContestDropOffMons: ; 13a12
|
||||
; ... and replacing it with the terminator byte
|
||||
ld [hl], -1
|
||||
xor a
|
||||
ld [ScriptVar], a
|
||||
ld [wScriptVar], a
|
||||
ret
|
||||
|
||||
.fainted
|
||||
ld a, $1
|
||||
ld [ScriptVar], a
|
||||
ld [wScriptVar], a
|
||||
ret
|
||||
; 13a31
|
||||
|
||||
Special_ContestReturnMons: ; 13a31
|
||||
; Restore the species of the second mon.
|
||||
ld hl, PartySpecies + 1
|
||||
ld hl, wPartySpecies + 1
|
||||
ld a, [wBugContestSecondPartySpecies]
|
||||
ld [hl], a
|
||||
; Restore the party count, which must be recomputed.
|
||||
@@ -117,6 +117,6 @@ Special_ContestReturnMons: ; 13a31
|
||||
|
||||
.done
|
||||
ld a, b
|
||||
ld [PartyCount], a
|
||||
ld [wPartyCount], a
|
||||
ret
|
||||
; 13a47
|
||||
|
Reference in New Issue
Block a user