diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-11-22 12:14:58 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-22 12:14:58 -0600 |
commit | fd8720b75c56ef3f641e6c5abf6c446929c824b9 (patch) | |
tree | 7b65558bd366be680c577e6a0aea7787db24dd3f /asm/code_801EE10.s | |
parent | 938a88551f6ddefb7f696b738696c8ce2d8e0e36 (diff) |
Label all entities in Boss Fight Cutscenes (#78)
* label all entities in cutscenes
* remove commented func.. wasn't matching anyway
* Skarmony -> Skarmory
Diffstat (limited to 'asm/code_801EE10.s')
-rw-r--r-- | asm/code_801EE10.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/code_801EE10.s b/asm/code_801EE10.s index 2fbb943..4de5bb1 100644 --- a/asm/code_801EE10.s +++ b/asm/code_801EE10.s @@ -1730,7 +1730,7 @@ sub_801FB50: bl GetPlayerPokemonStruct adds r1, r0, 0 adds r0, r5, 0 - bl sub_808DA34 + bl PrintPokeNameToBuffer ldr r2, [r6] ldr r0, [r2] cmp r0, 0x1 @@ -3613,7 +3613,7 @@ _08020AB0: ldr r0, _08020AE8 ldr r1, [r4] ldr r1, [r1, 0x10] - bl sub_808DA34 + bl PrintPokeNameToBuffer movs r0, 0x11 bl sub_801FDA8 b _08020B32 @@ -3639,7 +3639,7 @@ _08020AEC: ldr r0, _08020B24 ldr r1, [r4] ldr r1, [r1, 0x10] - bl sub_808DA34 + bl PrintPokeNameToBuffer movs r0, 0x12 bl sub_801FDA8 b _08020B32 @@ -7265,12 +7265,12 @@ sub_80227B8: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x7 - bl sub_808D9AC + bl PrintColoredPokeNameToBuffer adds r4, 0x50 adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x6 - bl sub_808D9AC + bl PrintColoredPokeNameToBuffer bl HasGummiItem lsls r0, 24 cmp r0, 0 |