summaryrefslogtreecommitdiff
path: root/home/mon_data_2.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-06-24 21:23:51 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-06-24 21:23:51 -0400
commite2fb7acac0e3c1d598021b52fc2583dd983321bc (patch)
treeea5922596ce167e5b0485ea3bacd65f43339ca60 /home/mon_data_2.asm
parent1a888f22004aec967d2b6049ede7e04b1815f956 (diff)
parent364854623267a8a39242243b0cdf80144e868642 (diff)
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts: # engine/items/mart.asm
Diffstat (limited to 'home/mon_data_2.asm')
-rw-r--r--home/mon_data_2.asm9
1 files changed, 3 insertions, 6 deletions
diff --git a/home/mon_data_2.asm b/home/mon_data_2.asm
index a5e46d836..99169eaa8 100644
--- a/home/mon_data_2.asm
+++ b/home/mon_data_2.asm
@@ -1,4 +1,4 @@
-GetPartyParamLocation:: ; 3917
+GetPartyParamLocation::
; Get the location of parameter a from wCurPartyMon in hl
push bc
ld hl, wPartyMons
@@ -9,15 +9,13 @@ GetPartyParamLocation:: ; 3917
call GetPartyLocation
pop bc
ret
-; 3927
-GetPartyLocation:: ; 3927
+GetPartyLocation::
; Add the length of a PartyMon struct to hl a times.
ld bc, PARTYMON_STRUCT_LENGTH
jp AddNTimes
-; 392d
-Unreferenced_GetDexNumber:: ; 392d
+Unreferenced_GetDexNumber::
; Probably used in gen 1 to convert index number to dex number
; Not required in gen 2 because index number == dex number
push hl
@@ -34,4 +32,3 @@ Unreferenced_GetDexNumber:: ; 392d
ld c, h
pop hl
ret
-; 3945