Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefix wram labels with w, part 2.

Browse Source
This commit is contained in:
luckytyphlosion
2018-01-23 17:39:09 -05:00
parent 79bd48f85c
commit a1951cefc0
323 changed files with 8581 additions and 8581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
engine/events/battle_tower/rules.asm
View File

@@ -30,7 +30,7 @@ CheckForMobileBattleRules: ; 8b1e1
; 0x8b201
CheckForBattleTowerRules: ; 8b201
ld hl, StringBuffer2
ld hl, wStringBuffer2
ld [hl], "3"
inc hl
ld [hl], "@"
@@ -212,13 +212,13 @@ BattleTower_ExecuteJumptable: ; 8b25b
; 8b2bb
BattleTower_CheckPartyLengthIs3: ; 8b2bb
ld a, [PartyCount]
ld a, [wPartyCount]
cp BATTLETOWER_PARTY_LENGTH
ret
; 8b2c1
BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1
ld hl, PartyCount
ld hl, wPartyCount
ld a, [hli]
ld b, $0
ld c, a
@@ -231,7 +231,7 @@ BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1
.egg
dec c
jr nz, .loop
ld a, [PartyCount]
ld a, [wPartyCount]
cp b
ret z
ld a, b
@@ -240,7 +240,7 @@ BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1
; 8b2da
Function_PartyCountEq3: ; 8b2da
ld a, [PartyCount]
ld a, [wPartyCount]
cp BATTLETOWER_PARTY_LENGTH
ret z
scf
@@ -248,13 +248,13 @@ Function_PartyCountEq3: ; 8b2da
; 8b2e2
Function_PartySpeciesAreUnique: ; 8b2e2
ld hl, PartyMon1Species
ld hl, wPartyMon1Species
call VerifyUniqueness
ret
; 8b2e9
VerifyUniqueness: ; 8b2e9
ld de, PartyCount
ld de, wPartyCount
ld a, [de]
inc de
dec a
@@ -318,13 +318,13 @@ VerifyUniqueness: ; 8b2e9
; 8b32a
Function_PartyItemsAreUnique: ; 8b32a
ld hl, PartyMon1Item
ld hl, wPartyMon1Item
call VerifyUniqueness
ret
; 8b331
Function_HasPartyAnEgg: ; 8b331
ld hl, PartyCount
ld hl, wPartyCount
ld a, [hli]
ld c, a
.loop