diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-11-02 16:37:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-02 16:37:00 -0700 |
| commit | e29e61a4a1de2dff8ac4b7d0469794ba9ddf48f8 (patch) | |
| tree | aa9bf96f0d1d91f06220e670b660f5fcf829b945 /asm/code_8048480.s | |
| parent | f99f00b180561afeeb4b9c9918135c2db607fd52 (diff) | |
| parent | 3a1db3dfac99d017b592afa4e7e3fc7325e060cc (diff) | |
Merge pull request #68 from SethBarberee/sese_work
Moves and some friend_area_action_menu
Diffstat (limited to 'asm/code_8048480.s')
| -rw-r--r-- | asm/code_8048480.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/code_8048480.s b/asm/code_8048480.s index f7665b0..79a323d 100644 --- a/asm/code_8048480.s +++ b/asm/code_8048480.s @@ -118,12 +118,12 @@ _080485EE: cmp r0, 0 beq _0804862C adds r0, r5, 0 - bl sub_8092BC0 + bl GetMovePower cmp r0, 0 beq _0804862C ldrb r6, [r4, 0x5] adds r0, r5, 0 - bl sub_8092C0C + bl GetMoveUnk12 adds r1, r0, 0 ldrb r0, [r4, 0x5] add r0, r10 @@ -1615,7 +1615,7 @@ _080492FA: ldrb r4, [r5, 0x4] adds r0, r7, 0 str r2, [sp] - bl sub_8092BF4 + bl GetMoveMaxPP ldr r2, [sp] cmp r4, r0 beq _0804930C |