You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Identify some more labels, and make some more consistent
This commit is contained in:
@@ -1531,7 +1531,7 @@ BattleTowerAction_UbersCheck:
|
||||
ret
|
||||
|
||||
LoadOpponentTrainerAndPokemonWithOTSprite:
|
||||
farcall Function_LoadOpponentTrainerAndPokemons
|
||||
farcall LoadOpponentTrainerAndPokemon
|
||||
ldh a, [rSVBK]
|
||||
push af
|
||||
ld a, BANK(wBT_OTTrainerClass)
|
||||
|
@@ -1,4 +1,4 @@
|
||||
Function_LoadOpponentTrainerAndPokemons:
|
||||
LoadOpponentTrainerAndPokemon:
|
||||
ldh a, [rSVBK]
|
||||
push af
|
||||
ld a, BANK(wBT_OTTrainer)
|
||||
@@ -68,7 +68,7 @@ endc
|
||||
ld bc, NAME_LENGTH
|
||||
call CopyBytes
|
||||
|
||||
call Function_LoadRandomBattleTowerMon
|
||||
call LoadRandomBattleTowerMon
|
||||
pop af
|
||||
|
||||
ld hl, BattleTowerTrainerData
|
||||
@@ -91,7 +91,7 @@ endc
|
||||
|
||||
ret
|
||||
|
||||
Function_LoadRandomBattleTowerMon:
|
||||
LoadRandomBattleTowerMon:
|
||||
ld c, BATTLETOWER_PARTY_LENGTH
|
||||
.loop
|
||||
push bc
|
||||
|
@@ -42,10 +42,10 @@ _CheckForBattleTowerRules:
|
||||
dw .TextPointers
|
||||
|
||||
.Functions:
|
||||
dw Function_PartyCountEq3
|
||||
dw Function_PartySpeciesAreUnique
|
||||
dw Function_PartyItemsAreUnique
|
||||
dw Function_HasPartyAnEgg
|
||||
dw CheckBTRule_PartyCountEq3
|
||||
dw CheckBTRule_PartySpeciesAreUnique
|
||||
dw CheckBTRule_PartyItemsAreUnique
|
||||
dw CheckBTRule_HasPartyAnEgg
|
||||
|
||||
.TextPointers:
|
||||
dw ExcuseMeYoureNotReadyText
|
||||
@@ -203,19 +203,19 @@ BattleTower_CheckPartyHasThreeMonsThatAreNotEggs:
|
||||
cp BATTLETOWER_PARTY_LENGTH
|
||||
ret
|
||||
|
||||
Function_PartyCountEq3:
|
||||
CheckBTRule_PartyCountEq3:
|
||||
ld a, [wPartyCount]
|
||||
cp BATTLETOWER_PARTY_LENGTH
|
||||
ret z
|
||||
scf
|
||||
ret
|
||||
|
||||
Function_PartySpeciesAreUnique:
|
||||
CheckBTRule_PartySpeciesAreUnique:
|
||||
ld hl, wPartyMon1Species
|
||||
call VerifyUniqueness
|
||||
call CheckPartyValueIsUnique
|
||||
ret
|
||||
|
||||
VerifyUniqueness:
|
||||
CheckPartyValueIsUnique:
|
||||
ld de, wPartyCount
|
||||
ld a, [de]
|
||||
inc de
|
||||
@@ -276,12 +276,12 @@ VerifyUniqueness:
|
||||
pop bc
|
||||
ret
|
||||
|
||||
Function_PartyItemsAreUnique:
|
||||
CheckBTRule_PartyItemsAreUnique:
|
||||
ld hl, wPartyMon1Item
|
||||
call VerifyUniqueness
|
||||
call CheckPartyValueIsUnique
|
||||
ret
|
||||
|
||||
Function_HasPartyAnEgg:
|
||||
CheckBTRule_HasPartyAnEgg:
|
||||
ld hl, wPartyCount
|
||||
ld a, [hli]
|
||||
ld c, a
|
||||
|
Reference in New Issue
Block a user