Prefix wram labels with w, part 2.
This commit is contained in:
@@ -11,7 +11,7 @@ BugContest_SetCaughtContestMon: ; e6ce
|
||||
|
||||
.firstcatch
|
||||
call .generatestats
|
||||
ld a, [TempEnemyMonSpecies]
|
||||
ld a, [wTempEnemyMonSpecies]
|
||||
ld [wd265], a
|
||||
call GetPokemonName
|
||||
ld hl, .caughttext
|
||||
@@ -19,16 +19,16 @@ BugContest_SetCaughtContestMon: ; e6ce
|
||||
ret
|
||||
|
||||
.generatestats ; e6fd
|
||||
ld a, [TempEnemyMonSpecies]
|
||||
ld [CurSpecies], a
|
||||
ld [CurPartySpecies], a
|
||||
ld a, [wTempEnemyMonSpecies]
|
||||
ld [wCurSpecies], a
|
||||
ld [wCurPartySpecies], a
|
||||
call GetBaseData
|
||||
xor a
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
ld hl, wContestMon
|
||||
call ByteFill
|
||||
xor a
|
||||
ld [MonType], a
|
||||
ld [wMonType], a
|
||||
ld hl, wContestMon
|
||||
jp GeneratePartyMonStats
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -4,7 +4,7 @@ DisplayCaughtContestMonStats: ; cc000
|
||||
call ClearSprites
|
||||
call LoadFontsBattleExtra
|
||||
|
||||
ld hl, Options
|
||||
ld hl, wOptions
|
||||
ld a, [hl]
|
||||
push af
|
||||
set 4, [hl]
|
||||
@@ -38,24 +38,24 @@ DisplayCaughtContestMonStats: ; cc000
|
||||
ld a, [wContestMon]
|
||||
ld [wd265], a
|
||||
call GetPokemonName
|
||||
ld de, StringBuffer1
|
||||
ld de, wStringBuffer1
|
||||
hlcoord 1, 2
|
||||
call PlaceString
|
||||
|
||||
ld h, b
|
||||
ld l, c
|
||||
ld a, [wContestMonLevel]
|
||||
ld [TempMonLevel], a
|
||||
ld [wTempMonLevel], a
|
||||
call PrintLevel
|
||||
|
||||
ld de, EnemyMonNick
|
||||
ld de, wEnemyMonNick
|
||||
hlcoord 1, 8
|
||||
call PlaceString
|
||||
|
||||
ld h, b
|
||||
ld l, c
|
||||
ld a, [EnemyMonLevel]
|
||||
ld [TempMonLevel], a
|
||||
ld a, [wEnemyMonLevel]
|
||||
ld [wTempMonLevel], a
|
||||
call PrintLevel
|
||||
|
||||
hlcoord 11, 4
|
||||
@@ -64,14 +64,14 @@ DisplayCaughtContestMonStats: ; cc000
|
||||
call PrintNum
|
||||
|
||||
hlcoord 11, 10
|
||||
ld de, EnemyMonMaxHP
|
||||
ld de, wEnemyMonMaxHP
|
||||
call PrintNum
|
||||
|
||||
ld hl, SwitchMonText
|
||||
call PrintText
|
||||
|
||||
pop af
|
||||
ld [Options], a
|
||||
ld [wOptions], a
|
||||
|
||||
call WaitBGMap
|
||||
ld b, SCGB_DIPLOMA
|
||||
|
@@ -97,7 +97,7 @@ LoadContestantName: ; 13730
|
||||
push bc
|
||||
; Get the Trainer Class name and copy it into wBugContestWinnerName.
|
||||
callfar GetTrainerClassName
|
||||
ld hl, StringBuffer1
|
||||
ld hl, wStringBuffer1
|
||||
ld de, wBugContestWinnerName
|
||||
ld bc, TRAINER_CLASS_NAME_LENGTH
|
||||
call CopyBytes
|
||||
@@ -121,13 +121,13 @@ LoadContestantName: ; 13730
|
||||
ld b, a
|
||||
callfar GetTrainerName
|
||||
; Append the name to wBugContestWinnerName.
|
||||
ld hl, StringBuffer1
|
||||
ld hl, wStringBuffer1
|
||||
pop de
|
||||
ld bc, NAME_LENGTH - 1
|
||||
jp CopyBytes
|
||||
|
||||
.player
|
||||
ld hl, PlayerName
|
||||
ld hl, wPlayerName
|
||||
ld de, wBugContestWinnerName
|
||||
ld bc, NAME_LENGTH
|
||||
jp CopyBytes
|
||||
|
Reference in New Issue
Block a user