diff options
| author | Dennis <dhilhorst2000@gmail.com> | 2021-08-01 21:09:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-01 12:09:13 -0700 |
| commit | 26e5708818765e2abaab29b6ffdfa8f01a5600b7 (patch) | |
| tree | 28fe7891cad7a46da5e88f0293e2a9f855e14203 /asm/code_8057824.s | |
| parent | 645c45431b0e091234699c3706ff90d1654cfb57 (diff) | |
More pokemon related decomp (#48)
* add struct names
* decompile SaveRecruitedPokemon
* decompile ReadRecruitedPokemon
* decomp anotha one
* some renaming
* another save function
* more backup functions
* sub_808E400
* only one function left in pokemon_2.s
* decomp one more function
* merge 2 structs
Diffstat (limited to 'asm/code_8057824.s')
| -rw-r--r-- | asm/code_8057824.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/code_8057824.s b/asm/code_8057824.s index b715023..413eeb2 100644 --- a/asm/code_8057824.s +++ b/asm/code_8057824.s @@ -33850,7 +33850,7 @@ _08068922: mov r9, r0 adds r0, r2, r0 mov r1, r10 - bl xxx_pokemonstruct_index_to_unk_808DE30 + bl xxx_pokemonstruct_index_to_pokemon2_808DE30 ldr r0, _08068A68 ldr r0, [r0] ldr r1, _08068A6C @@ -34079,7 +34079,7 @@ _08068B08: adds r0, r4, 0 adds r1, r6, 0 ldr r2, _08068B74 - bl xxx_pokemonstruct_to_unk_808DE50 + bl xxx_pokemonstruct_to_pokemon2_808DE50 ldrh r0, [r4] movs r1, 0x1 movs r2, 0 @@ -34293,7 +34293,7 @@ _08068CDC: movs r3, 0xA ldrsh r0, [r4, r3] adds r1, r4, 0 - bl xxx_unk_to_pokemonstruct_index_808DF2C + bl xxx_pokemon2_to_pokemonstruct_index_808DF2C b _08068CFE _08068CE8: ldr r0, [sp, 0x220] @@ -34401,7 +34401,7 @@ _08068D6A: adds r0, r1 str r0, [r4] adds r1, r5, 0 - bl xxx_unk_to_pokemonstruct_808DF44 + bl xxx_pokemon2_to_pokemonstruct_808DF44 ldr r2, [r4] ldrh r0, [r2] movs r3, 0x80 @@ -34997,7 +34997,7 @@ _08069228: movs r2, 0xA ldrsh r0, [r4, r2] adds r1, r4, 0 - bl xxx_unk_to_pokemonstruct_index_808DF2C + bl xxx_pokemon2_to_pokemonstruct_index_808DF2C _0806926E: bl sub_8044210 lsls r0, 24 @@ -35196,7 +35196,7 @@ _080693CC: movs r2, 0xA ldrsh r0, [r4, r2] adds r1, r4, 0 - bl xxx_unk_to_pokemonstruct_index_808DF2C + bl xxx_pokemon2_to_pokemonstruct_index_808DF2C _0806940E: bl sub_8044210 lsls r0, 24 |