diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /home/mon_data.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'home/mon_data.asm')
| -rw-r--r-- | home/mon_data.asm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/home/mon_data.asm b/home/mon_data.asm index 8fb5bf0c9..bcfe49ddb 100644 --- a/home/mon_data.asm +++ b/home/mon_data.asm @@ -1,13 +1,12 @@ -Unreferenced_GetNthMove:: ; 384d +Unreferenced_GetNthMove:: ld hl, wListMoves_MoveIndicesBuffer ld c, a ld b, 0 add hl, bc ld a, [hl] ret -; 3856 -GetBaseData:: ; 3856 +GetBaseData:: push bc push de push hl @@ -62,13 +61,12 @@ GetBaseData:: ; 3856 pop de pop bc ret -; 389c -GetCurNick:: ; 389c +GetCurNick:: ld a, [wCurPartyMon] ld hl, wPartyMonNicknames -GetNick:: ; 38a2 +GetNick:: ; Get nickname a from list hl. push hl @@ -87,4 +85,3 @@ GetNick:: ; 38a2 pop bc pop hl ret -; 38bb |