summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-04-18 21:59:05 -0700
committerBryan Bishop <kanzure@gmail.com>2012-04-18 21:59:05 -0700
commita3dc6079899d2cfd9d8563a421f8c3ce626caceb (patch)
treeb8a6e34dc74c19bccc8c72c5c2ee787304f9b9a7 /main.asm
parentb7cca3a54857506f49975e7df5dc47b47f174d51 (diff)
parent0784a952afbd2dea5bdfaafa052134c37ae01467 (diff)
Merge pull request #4 from yenatch/document_some_asm
label expansion
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/main.asm b/main.asm
index e44e4c4db..e773bb2d8 100644
--- a/main.asm
+++ b/main.asm
@@ -3758,13 +3758,13 @@ SpecialDratini: ; 0x8b170
ld a, [$c2dd]
cp $2
ret nc
- ld bc, TeamCount
+ ld bc, PartyCount
ld a, [bc]
ld hl, 0
- call GetNthTeamMon
+ call GetNthPartyMon
ld a, [bc]
ld c, a
- ld de, TeamMon2 - TeamMon1
+ ld de, PartyMon2 - PartyMon1
.CheckForDratini
; start at the end of the party and search backwards for a Dratini
ld a, [hl]
@@ -3810,7 +3810,7 @@ SpecialDratini: ; 0x8b170
call GetFarByte
; get the address of the move's PP and update the PP
- ld hl, TeamMon1PP - TeamMon1Moves
+ ld hl, PartyMon1PP - PartyMon1Moves
add hl, de
ld [hl], a
@@ -3837,7 +3837,7 @@ SpecialDratini: ; 0x8b170
db 0
-GetNthTeamMon: ; 0x8b1ce
+GetNthPartyMon: ; 0x8b1ce
; inputs:
; hl must be set to 0 before calling this function.
; a must be set to the number of Pokémon in the party.
@@ -3846,13 +3846,13 @@ GetNthTeamMon: ; 0x8b1ce
; returns the address of the last Pokémon in the party in hl.
; sets carry if a is 0.
- ld de, TeamMon1
+ ld de, PartyMon1
add hl, de
and a
jr z, .EmptyParty
dec a
ret z
- ld de, TeamMon2 - TeamMon1
+ ld de, PartyMon2 - PartyMon1
.loop
add hl, de
dec a