diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-11-11 15:48:17 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-11 15:48:17 -0600 |
| commit | 558bf2f7d0c9be70ec0da4b9ef28c105c5d11622 (patch) | |
| tree | 232d44774e91c44ac08b366aa5186593ebe00d62 /asm/pokemon_storage_system.s | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
| parent | 32c7d4f252acf8cc9dc42d50da046c4b3f0beb16 (diff) | |
Merge pull request #104 from DizzyEggg/decompile_battle_7
Decompile battle 7
Diffstat (limited to 'asm/pokemon_storage_system.s')
| -rwxr-xr-x | asm/pokemon_storage_system.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index d1f7bd161..a8365ba18 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -14656,7 +14656,7 @@ _080CEC86: adds r1, r3 str r0, [r1] adds r0, r6, 0 - bl pokemon_get_pal + bl GetMonFrontSpritePal ldr r1, [r4] ldr r2, =0x00000cdc adds r1, r2 @@ -14759,7 +14759,7 @@ _080CED7E: adds r1, r4 ldrh r0, [r1] mov r1, r9 - bl species_and_otid_get_pal + bl GetFrontSpritePalFromSpeciesAndPersonality ldr r1, [r5] ldr r3, =0x00000cdc adds r2, r1, r3 |