diff options
Diffstat (limited to 'src/pokemon_animation.c')
| -rw-r--r-- | src/pokemon_animation.c | 160 |
1 files changed, 80 insertions, 80 deletions
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 989bce37d..8c468d9f4 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -786,31 +786,31 @@ static const u8 sBackAnimationIds[] = static const u8 sBackAnimNatureModTable[] = { - 0x00, // NATURE_HARDY - 0x02, // NATURE_LONELY - 0x00, // NATURE_BRAVE - 0x00, // NATURE_ADAMANT - 0x00, // NATURE_NAUGHTY - 0x01, // NATURE_BOLD - 0x01, // NATURE_DOCILE - 0x01, // NATURE_RELAXED - 0x00, // NATURE_IMPISH - 0x01, // NATURE_LAX - 0x02, // NATURE_TIMID - 0x00, // NATURE_HASTY - 0x01, // NATURE_SERIOUS - 0x00, // NATURE_JOLLY - 0x00, // NATURE_NAIVE - 0x02, // NATURE_MODEST - 0x02, // NATURE_MILD - 0x02, // NATURE_QUIET - 0x02, // NATURE_BASHFUL - 0x01, // NATURE_RASH - 0x01, // NATURE_CALM - 0x02, // NATURE_GENTLE - 0x01, // NATURE_SASSY - 0x02, // NATURE_CAREFUL - 0x01, // NATURE_QUIRKY + [NATURE_HARDY] = 0x00, + [NATURE_LONELY] = 0x02, + [NATURE_BRAVE] = 0x00, + [NATURE_ADAMANT] = 0x00, + [NATURE_NAUGHTY] = 0x00, + [NATURE_BOLD] = 0x01, + [NATURE_DOCILE] = 0x01, + [NATURE_RELAXED] = 0x01, + [NATURE_IMPISH] = 0x00, + [NATURE_LAX] = 0x01, + [NATURE_TIMID] = 0x02, + [NATURE_HASTY] = 0x00, + [NATURE_SERIOUS] = 0x01, + [NATURE_JOLLY] = 0x00, + [NATURE_NAIVE] = 0x00, + [NATURE_MODEST] = 0x02, + [NATURE_MILD] = 0x02, + [NATURE_QUIET] = 0x02, + [NATURE_BASHFUL] = 0x02, + [NATURE_RASH] = 0x01, + [NATURE_CALM] = 0x01, + [NATURE_GENTLE] = 0x02, + [NATURE_SASSY] = 0x01, + [NATURE_CAREFUL] = 0x02, + [NATURE_QUIRKY] = 0x01, }; static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] = @@ -1164,67 +1164,67 @@ NAKED static void sub_817F9F4(struct Sprite *sprite) { asm(".syntax unified\n\ - push {r4,lr}\n\ - adds r4, r0, 0\n\ - movs r0, 0x32\n\ - ldrsh r1, [r4, r0]\n\ - movs r0, 0xC0\n\ - lsls r0, 1\n\ - cmp r1, r0\n\ - ble _0817FA14\n\ - ldr r0, =SpriteCB_SetDummyOnAnimEnd\n\ - str r0, [r4, 0x1C]\n\ - movs r0, 0\n\ - strh r0, [r4, 0x24]\n\ - b _0817FA5E\n\ - .pool\n\ + push {r4,lr}\n\ + adds r4, r0, 0\n\ + movs r0, 0x32\n\ + ldrsh r1, [r4, r0]\n\ + movs r0, 0xC0\n\ + lsls r0, 1\n\ + cmp r1, r0\n\ + ble _0817FA14\n\ + ldr r0, =SpriteCB_SetDummyOnAnimEnd\n\ + str r0, [r4, 0x1C]\n\ + movs r0, 0\n\ + strh r0, [r4, 0x24]\n\ + b _0817FA5E\n\ + .pool\n\ _0817FA14:\n\ - adds r0, r1, 0\n\ - cmp r1, 0\n\ - bge _0817FA1C\n\ - adds r0, 0x7F\n\ + adds r0, r1, 0\n\ + cmp r1, 0\n\ + bge _0817FA1C\n\ + adds r0, 0x7F\n\ _0817FA1C:\n\ - asrs r2, r0, 7\n\ - lsls r0, r2, 16\n\ - asrs r0, 16\n\ - cmp r0, 0\n\ - blt _0817FA60\n\ - cmp r0, 0x1\n\ - ble _0817FA48\n\ - cmp r0, 0x3\n\ - bgt _0817FA60\n\ - ldr r2, =0xffffff00\n\ - adds r1, r2\n\ - lsls r0, r1, 16\n\ - asrs r0, 16\n\ - movs r1, 0x2E\n\ - ldrsh r2, [r4, r1]\n\ - lsls r1, r2, 1\n\ - adds r1, r2\n\ - lsls r1, 16\n\ - b _0817FA56\n\ - .pool\n\ + asrs r2, r0, 7\n\ + lsls r0, r2, 16\n\ + asrs r0, 16\n\ + cmp r0, 0\n\ + blt _0817FA60\n\ + cmp r0, 0x1\n\ + ble _0817FA48\n\ + cmp r0, 0x3\n\ + bgt _0817FA60\n\ + ldr r2, =0xffffff00\n\ + adds r1, r2\n\ + lsls r0, r1, 16\n\ + asrs r0, 16\n\ + movs r1, 0x2E\n\ + ldrsh r2, [r4, r1]\n\ + lsls r1, r2, 1\n\ + adds r1, r2\n\ + lsls r1, 16\n\ + b _0817FA56\n\ + .pool\n\ _0817FA48:\n\ - lsls r0, r2, 7\n\ - subs r0, r1, r0\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - movs r2, 0x2E\n\ - ldrsh r1, [r4, r2]\n\ - lsls r1, 17\n\ + lsls r0, r2, 7\n\ + subs r0, r1, r0\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + movs r2, 0x2E\n\ + ldrsh r1, [r4, r2]\n\ + lsls r1, 17\n\ _0817FA56:\n\ - asrs r1, 16\n\ - bl Sin\n\ - negs r0, r0\n\ + asrs r1, 16\n\ + bl Sin\n\ + negs r0, r0\n\ _0817FA5E:\n\ - strh r0, [r4, 0x26]\n\ + strh r0, [r4, 0x26]\n\ _0817FA60:\n\ - ldrh r0, [r4, 0x32]\n\ - adds r0, 0xC\n\ - strh r0, [r4, 0x32]\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ + ldrh r0, [r4, 0x32]\n\ + adds r0, 0xC\n\ + strh r0, [r4, 0x32]\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ .syntax divided"); } |