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_808EAB0.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_808EAB0.s')
| -rw-r--r-- | asm/code_808EAB0.s | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/asm/code_808EAB0.s b/asm/code_808EAB0.s index b561623..ac46e44 100644 --- a/asm/code_808EAB0.s +++ b/asm/code_808EAB0.s @@ -66,7 +66,7 @@ _0808ED64: pop {r0} bx r0 .align 2, 0 -_0808ED70: .4byte gUnknown_203B45C +_0808ED70: .4byte gRecruitedPokemonRef _0808ED74: .4byte 0x00008f88 thumb_func_end sub_808ED00 @@ -135,7 +135,7 @@ _0808EDE2: b _0808EDFA .align 2, 0 _0808EDF0: .4byte 0x0000ffff -_0808EDF4: .4byte gUnknown_203B45C +_0808EDF4: .4byte gRecruitedPokemonRef _0808EDF8: strb r0, [r1, 0x3] _0808EDFA: @@ -168,7 +168,7 @@ _0808EE16: strb r0, [r1] b _0808EE40 .align 2, 0 -_0808EE34: .4byte gUnknown_203B45C +_0808EE34: .4byte gRecruitedPokemonRef _0808EE38: .4byte 0x00008f88 _0808EE3C: mov r0, r8 @@ -275,7 +275,7 @@ _0808EEDA: movs r1, 0x3 b _0808EF20 .align 2, 0 -_0808EF10: .4byte gUnknown_203B45C +_0808EF10: .4byte gRecruitedPokemonRef _0808EF14: .4byte 0x00008f88 _0808EF18: ldr r0, [r7] @@ -345,7 +345,7 @@ _0808EF84: bx r1 .align 2, 0 _0808EF98: .4byte 0x00008f88 -_0808EF9C: .4byte gUnknown_203B45C +_0808EF9C: .4byte gRecruitedPokemonRef thumb_func_end sub_808EE9C thumb_func_start sub_808EFA0 @@ -689,7 +689,7 @@ _0808F296: pop {r1} bx r1 .align 2, 0 -_0808F2A8: .4byte gUnknown_203B45C +_0808F2A8: .4byte gRecruitedPokemonRef _0808F2AC: .4byte 0x00008df8 thumb_func_end sub_808F154 @@ -733,7 +733,7 @@ _0808F2C4: strb r2, [r4, 0x2] b _0808F30A .align 2, 0 -_0808F300: .4byte gUnknown_203B45C +_0808F300: .4byte gRecruitedPokemonRef _0808F304: .4byte 0x00008df8 _0808F308: strb r1, [r4, 0x2] @@ -927,11 +927,11 @@ _0808F488: bne _0808F49C movs r0, 0x41 adds r1, r7, 0 - bl sub_808DD48 + bl GetPokemonEvolveConditions b _0808F4A2 _0808F49C: adds r1, r7, 0 - bl sub_808DD48 + bl GetPokemonEvolveConditions _0808F4A2: ldrh r0, [r7, 0x2] cmp r0, 0 @@ -974,7 +974,7 @@ _0808F4E0: asrs r0, 16 str r0, [sp, 0x1C] adds r1, r7, 0 - bl sub_808DD48 + bl GetPokemonEvolveConditions ldrh r0, [r7, 0x2] cmp r0, 0 bne _0808F4FA |