diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /home/mon_data.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
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 |