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_808DAB4.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_808DAB4.s')
| -rw-r--r-- | asm/code_808DAB4.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/code_808DAB4.s b/asm/code_808DAB4.s index 93e7bf3..a225f8d 100644 --- a/asm/code_808DAB4.s +++ b/asm/code_808DAB4.s @@ -129,7 +129,7 @@ sub_808DF2C: pop {r0} bx r0 .align 2, 0 -_0808DF40: .4byte gUnknown_203B45C +_0808DF40: .4byte gRecruitedPokemonRef thumb_func_end sub_808DF2C thumb_func_start sub_808DF44 @@ -233,7 +233,7 @@ sub_808DFDC: bl sub_8090BB0 b _0808E00A .align 2, 0 -_0808E000: .4byte gUnknown_203B45C +_0808E000: .4byte gRecruitedPokemonRef _0808E004: adds r0, r3, 0 adds r0, 0x28 @@ -1225,7 +1225,7 @@ _0808E746: movs r0, 0x1 b _0808E76A .align 2, 0 -_0808E75C: .4byte gUnknown_203B45C +_0808E75C: .4byte gRecruitedPokemonRef _0808E760: adds r2, 0x58 adds r3, 0x1 @@ -1430,8 +1430,8 @@ _0808E8C4: bx r1 thumb_func_end sub_808E858 - thumb_func_start sub_808E8C8 -sub_808E8C8: + thumb_func_start GetUnownIndex +GetUnownIndex: push {lr} lsls r0, 16 asrs r1, r0, 16 @@ -1579,7 +1579,7 @@ _0808E9B0: _0808E9B2: pop {r1} bx r1 - thumb_func_end sub_808E8C8 + thumb_func_end GetUnownIndex thumb_func_start sub_808E9B8 sub_808E9B8: |