diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-05-15 16:59:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-15 18:59:55 -0500 |
| commit | f402e46cd3c8b7236673d6edbae77903a7cc0618 (patch) | |
| tree | 37a19f3ab35a73c29d4d6da565741beaf7bb547f /asm/code_80521D0.s | |
| parent | f65dee5a143bd543c74c010d7252eb76893ee243 (diff) | |
Sese's April/May Dump (#37)
* splitting lots of pokemon square and labeling lots of other things
* actually commit this stuff
* more moving data and things
* more screen work
* split out some pokemon dungeon data
* lots of data work
* push more data work
* split kecleon, decomp another kanghaskhan func, and try to doc UpdateBGControl more
* lots of item work
* label more item things
* subtype -> category and doc types/category
Diffstat (limited to 'asm/code_80521D0.s')
| -rw-r--r-- | asm/code_80521D0.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s index ff9b5a1..a77765b 100644 --- a/asm/code_80521D0.s +++ b/asm/code_80521D0.s @@ -721,7 +721,7 @@ sub_8052910: ldrsh r7, [r4, r2] b _08052966 .align 2, 0 -_08052950: .4byte gUnknown_203B45C +_08052950: .4byte gRecruitedPokemonRef _08052954: .4byte 0x00008df8 _08052958: .4byte gAvailablePokemonNames _0805295C: @@ -749,7 +749,7 @@ _08052966: .align 2, 0 _08052988: .4byte gAvailablePokemonNames _0805298C: .4byte gUnknown_80F7AF8 -_08052990: .4byte gUnknown_203B45C +_08052990: .4byte gRecruitedPokemonRef _08052994: .4byte 0x00008df8 _08052998: .4byte gUnknown_202DFE8 _0805299C: @@ -815,7 +815,7 @@ _08052A1C: ldrsh r4, [r6, r1] ldr r0, _08052A48 adds r1, r4, 0 - bl sub_808D8E0 + bl CopyYellowSpeciesNametoBuffer _08052A28: ldrh r0, [r6] subs r0, 0x2 @@ -1379,7 +1379,7 @@ sub_8052EC0: lsrs r4, r0, 24 adds r5, r4, 0 adds r0, r4, 0 - bl sub_8090BD0 + bl GetItemType lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 |