From 7f94088a3b51076cff9b1cc8265429bf7b4df695 Mon Sep 17 00:00:00 2001 From: Synray <31429825+Synray@users.noreply.github.com> Date: Sun, 11 Apr 2021 18:23:40 -0700 Subject: [PATCH] En_Horse OK (#554) * En_Horse OK * Remove reloc * WIP * Use EnIn * Documentation * Documentation * Remove debug prints * Warnings * Cleanup * Unused asm * Review comment * Review comments and reformat * More review comments * Rename flags * Review changes Co-authored-by: Fig02 --- .../actors/ovl_En_Horse/EnHorse_Destroy.s | 32 - .../actors/ovl_En_Horse/EnHorse_Draw.s | 55 - .../actors/ovl_En_Horse/EnHorse_Init.s | 545 --- .../actors/ovl_En_Horse/EnHorse_Update.s | 572 --- .../actors/ovl_En_Horse/func_80A5B2F0.s | 101 - .../actors/ovl_En_Horse/func_80A5B450.s | 91 - .../actors/ovl_En_Horse/func_80A5B590.s | 21 - .../actors/ovl_En_Horse/func_80A5B5E0.s | 16 - .../actors/ovl_En_Horse/func_80A5B61C.s | 273 -- .../actors/ovl_En_Horse/func_80A5B9C8.s | 52 - .../actors/ovl_En_Horse/func_80A5BA84.s | 20 - .../actors/ovl_En_Horse/func_80A5BACC.s | 20 - .../actors/ovl_En_Horse/func_80A5BB14.s | 42 - .../actors/ovl_En_Horse/func_80A5BB90.s | 12 - .../actors/ovl_En_Horse/func_80A5BBBC.s | 52 - .../actors/ovl_En_Horse/func_80A5BC68.s | 84 - .../actors/ovl_En_Horse/func_80A5BD94.s | 159 - .../actors/ovl_En_Horse/func_80A5BFD8.s | 6 - .../actors/ovl_En_Horse/func_80A5BFEC.s | 4 - .../actors/ovl_En_Horse/func_80A5BFF8.s | 51 - .../actors/ovl_En_Horse/func_80A5C0B4.s | 6 - .../actors/ovl_En_Horse/func_80A5C0C8.s | 3 - .../actors/ovl_En_Horse/func_80A5C888.s | 31 - .../actors/ovl_En_Horse/func_80A5C8FC.s | 35 - .../actors/ovl_En_Horse/func_80A5C97C.s | 103 - .../actors/ovl_En_Horse/func_80A5CAEC.s | 306 -- .../actors/ovl_En_Horse/func_80A5CF28.s | 16 - .../actors/ovl_En_Horse/func_80A5CF64.s | 87 - .../actors/ovl_En_Horse/func_80A5D0A0.s | 77 - .../actors/ovl_En_Horse/func_80A5D1A0.s | 10 - .../actors/ovl_En_Horse/func_80A5D1C4.s | 68 - .../actors/ovl_En_Horse/func_80A5D2C0.s | 77 - .../actors/ovl_En_Horse/func_80A5D3C0.s | 45 - .../actors/ovl_En_Horse/func_80A5D468.s | 133 - .../actors/ovl_En_Horse/func_80A5D628.s | 23 - .../actors/ovl_En_Horse/func_80A5D678.s | 10 - .../actors/ovl_En_Horse/func_80A5D69C.s | 46 - .../actors/ovl_En_Horse/func_80A5D748.s | 22 - .../actors/ovl_En_Horse/func_80A5D79C.s | 202 - .../actors/ovl_En_Horse/func_80A5DA68.s | 44 - .../actors/ovl_En_Horse/func_80A5DB0C.s | 20 - .../actors/ovl_En_Horse/func_80A5DB58.s | 88 - .../actors/ovl_En_Horse/func_80A5DC8C.s | 10 - .../actors/ovl_En_Horse/func_80A5DCB0.s | 45 - .../actors/ovl_En_Horse/func_80A5DD58.s | 23 - .../actors/ovl_En_Horse/func_80A5DDB0.s | 40 - .../actors/ovl_En_Horse/func_80A5DE38.s | 134 - .../actors/ovl_En_Horse/func_80A5E00C.s | 77 - .../actors/ovl_En_Horse/func_80A5E12C.s | 107 - .../actors/ovl_En_Horse/func_80A5E2A8.s | 65 - .../actors/ovl_En_Horse/func_80A5E39C.s | 142 - .../actors/ovl_En_Horse/func_80A5E588.s | 10 - .../actors/ovl_En_Horse/func_80A5E5AC.s | 44 - .../actors/ovl_En_Horse/func_80A5E650.s | 255 -- .../actors/ovl_En_Horse/func_80A5E9F8.s | 10 - .../actors/ovl_En_Horse/func_80A5EA1C.s | 85 - .../actors/ovl_En_Horse/func_80A5EB4C.s | 3 - .../actors/ovl_En_Horse/func_80A5EB54.s | 128 - .../actors/ovl_En_Horse/func_80A5ED18.s | 10 - .../actors/ovl_En_Horse/func_80A5ED3C.s | 88 - .../actors/ovl_En_Horse/func_80A5EE78.s | 3 - .../actors/ovl_En_Horse/func_80A5EE80.s | 128 - .../actors/ovl_En_Horse/func_80A5F044.s | 19 - .../actors/ovl_En_Horse/func_80A5F08C.s | 79 - .../actors/ovl_En_Horse/func_80A5F1B0.s | 130 - .../actors/ovl_En_Horse/func_80A5F380.s | 11 - .../actors/ovl_En_Horse/func_80A5F3A8.s | 14 - .../actors/ovl_En_Horse/func_80A5F3DC.s | 15 - .../actors/ovl_En_Horse/func_80A5F414.s | 133 - .../actors/ovl_En_Horse/func_80A5F5F8.s | 99 - .../actors/ovl_En_Horse/func_80A5F760.s | 86 - .../actors/ovl_En_Horse/func_80A5F890.s | 299 -- .../actors/ovl_En_Horse/func_80A5FCAC.s | 36 - .../actors/ovl_En_Horse/func_80A5FD30.s | 46 - .../actors/ovl_En_Horse/func_80A5FDD4.s | 222 - .../actors/ovl_En_Horse/func_80A600E8.s | 126 - .../actors/ovl_En_Horse/func_80A60294.s | 33 - .../actors/ovl_En_Horse/func_80A60300.s | 96 - .../actors/ovl_En_Horse/func_80A6044C.s | 10 - .../actors/ovl_En_Horse/func_80A60470.s | 86 - .../actors/ovl_En_Horse/func_80A605A4.s | 16 - .../actors/ovl_En_Horse/func_80A605E0.s | 168 - .../actors/ovl_En_Horse/func_80A60838.s | 76 - .../actors/ovl_En_Horse/func_80A60954.s | 117 - .../actors/ovl_En_Horse/func_80A60AFC.s | 62 - .../actors/ovl_En_Horse/func_80A60BDC.s | 96 - .../actors/ovl_En_Horse/func_80A60D28.s | 103 - .../actors/ovl_En_Horse/func_80A60EB0.s | 117 - .../actors/ovl_En_Horse/func_80A61058.s | 9 - .../actors/ovl_En_Horse/func_80A61078.s | 25 - .../actors/ovl_En_Horse/func_80A610C8.s | 91 - .../actors/ovl_En_Horse/func_80A6121C.s | 138 - .../actors/ovl_En_Horse/func_80A6140C.s | 14 - .../actors/ovl_En_Horse/func_80A61440.s | 231 - .../actors/ovl_En_Horse/func_80A61778.s | 187 - .../actors/ovl_En_Horse/func_80A61A04.s | 10 - .../actors/ovl_En_Horse/func_80A61A28.s | 606 --- .../actors/ovl_En_Horse/func_80A62278.s | 155 - .../actors/ovl_En_Horse/func_80A624AC.s | 46 - .../actors/ovl_En_Horse/func_80A6255C.s | 95 - .../actors/ovl_En_Horse/func_80A626B8.s | 63 - .../actors/ovl_En_Horse/func_80A627A4.s | 20 - .../actors/ovl_En_Horse/func_80A627E8.s | 35 - .../actors/ovl_En_Horse/func_80A62868.s | 92 - .../actors/ovl_En_Horse/func_80A629A4.s | 84 - .../actors/ovl_En_Horse/func_80A62ACC.s | 388 -- .../actors/ovl_En_Horse/func_80A6304C.s | 70 - .../actors/ovl_En_Horse/func_80A63148.s | 43 - .../actors/ovl_En_Horse/func_80A631D4.s | 16 - .../actors/ovl_En_Horse/func_80A63210.s | 97 - .../actors/ovl_En_Horse/func_80A63364.s | 88 - .../actors/ovl_En_Horse/func_80A634A0.s | 779 ---- .../actors/ovl_En_Horse/func_80A63FA8.s | 121 - .../actors/ovl_En_Horse/func_80A64150.s | 155 - .../actors/ovl_En_Horse/func_80A6437C.s | 80 - .../actors/ovl_En_Horse/func_80A64480.s | 73 - .../actors/ovl_En_Horse/func_80A64578.s | 71 - .../actors/ovl_En_Horse/func_80A6467C.s | 14 - .../actors/ovl_En_Horse/func_80A64ED4.s | 21 - .../actors/ovl_En_Horse/func_80A64F14.s | 76 - .../actors/ovl_En_Horse/func_80A65014.s | 26 - .../actors/ovl_En_Horse/func_80A6506C.s | 43 - .../actors/ovl_En_Horse/func_80A65108.s | 770 ---- .../actors/ovl_En_Horse/func_80A65C00.s | 96 - data/overlays/actors/z_en_horse.data.s | 135 - data/overlays/actors/z_en_horse.reloc.s | 13 - include/functions.h | 9 +- include/z64.h | 2 +- include/z64player.h | 2 +- spec | 3 +- src/code/z_actor.c | 14 +- src/code/z_camera.c | 2 +- src/code/z_horse.c | 16 +- src/code/z_parameter.c | 2 +- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 3916 +++++++++++++++-- src/overlays/actors/ovl_En_Horse/z_en_horse.h | 187 +- .../z_en_horse_game_check.c | 12 +- src/overlays/actors/ovl_En_In/z_en_in.c | 18 +- src/overlays/actors/ovl_En_In/z_en_in.h | 4 +- .../actors/ovl_player_actor/z_player.c | 32 +- 140 files changed, 3880 insertions(+), 12777 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B450.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B590.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B5E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB90.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BBBC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFD8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFEC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFF8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C888.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C8FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C97C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D628.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D678.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB58.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DC8C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E588.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E9F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB4C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE78.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F044.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F380.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3A8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F760.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FD30.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A600E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6044C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61058.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61078.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A610C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6140C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A04.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6255C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62868.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A629A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A631D4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64480.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64578.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64ED4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65014.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s delete mode 100644 data/overlays/actors/z_en_horse.data.s delete mode 100644 data/overlays/actors/z_en_horse.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s deleted file mode 100644 index 77e165b51f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel EnHorse_Destroy -/* 01528 80A5C818 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0152C 80A5C81C AFBF001C */ sw $ra, 0x001C($sp) -/* 01530 80A5C820 AFB00018 */ sw $s0, 0x0018($sp) -/* 01534 80A5C824 AFA50024 */ sw $a1, 0x0024($sp) -/* 01538 80A5C828 8C8E01F0 */ lw $t6, 0x01F0($a0) ## 000001F0 -/* 0153C 80A5C82C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01540 80A5C830 000E7900 */ sll $t7, $t6, 4 -/* 01544 80A5C834 05E30004 */ bgezl $t7, .L80A5C848 -/* 01548 80A5C838 8FA40024 */ lw $a0, 0x0024($sp) -/* 0154C 80A5C83C 0C03E27A */ jal func_800F89E8 -/* 01550 80A5C840 2484021C */ addiu $a0, $a0, 0x021C ## $a0 = 0000021C -/* 01554 80A5C844 8FA40024 */ lw $a0, 0x0024($sp) -.L80A5C848: -/* 01558 80A5C848 0C029A22 */ jal func_800A6888 -/* 0155C 80A5C84C 26050160 */ addiu $a1, $s0, 0x0160 ## $a1 = 00000160 -/* 01560 80A5C850 8FA40024 */ lw $a0, 0x0024($sp) -/* 01564 80A5C854 0C0170EB */ jal Collider_DestroyCylinder - -/* 01568 80A5C858 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 -/* 0156C 80A5C85C 8FA40024 */ lw $a0, 0x0024($sp) -/* 01570 80A5C860 0C0170EB */ jal Collider_DestroyCylinder - -/* 01574 80A5C864 260502C4 */ addiu $a1, $s0, 0x02C4 ## $a1 = 000002C4 -/* 01578 80A5C868 8FA40024 */ lw $a0, 0x0024($sp) -/* 0157C 80A5C86C 0C016F32 */ jal Collider_DestroyJntSph -/* 01580 80A5C870 26050310 */ addiu $a1, $s0, 0x0310 ## $a1 = 00000310 -/* 01584 80A5C874 8FBF001C */ lw $ra, 0x001C($sp) -/* 01588 80A5C878 8FB00018 */ lw $s0, 0x0018($sp) -/* 0158C 80A5C87C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01590 80A5C880 03E00008 */ jr $ra -/* 01594 80A5C884 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Draw.s deleted file mode 100644 index 94a3028de4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Draw.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel EnHorse_Draw -/* 0AA54 80A65D44 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0AA58 80A65D48 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0AA5C 80A65D4C AFB00020 */ sw $s0, 0x0020($sp) -/* 0AA60 80A65D50 AFA5002C */ sw $a1, 0x002C($sp) -/* 0AA64 80A65D54 8C8E01F0 */ lw $t6, 0x01F0($a0) ## 000001F0 -/* 0AA68 80A65D58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0AA6C 80A65D5C 31CF2000 */ andi $t7, $t6, 0x2000 ## $t7 = 00000000 -/* 0AA70 80A65D60 55E00027 */ bnel $t7, $zero, .L80A65E00 -/* 0AA74 80A65D64 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0AA78 80A65D68 0C024F46 */ jal func_80093D18 -/* 0AA7C 80A65D6C 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 0AA80 80A65D70 8E1901F0 */ lw $t9, 0x01F0($s0) ## 000001F0 -/* 0AA84 80A65D74 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 0AA88 80A65D78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AA8C 80A65D7C 03214025 */ or $t0, $t9, $at ## $t0 = 08000000 -/* 0AA90 80A65D80 310A0004 */ andi $t2, $t0, 0x0004 ## $t2 = 00000000 -/* 0AA94 80A65D84 1140000D */ beq $t2, $zero, .L80A65DBC -/* 0AA98 80A65D88 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -/* 0AA9C 80A65D8C 3C0B80A6 */ lui $t3, %hi(func_80A65C00) ## $t3 = 80A60000 -/* 0AAA0 80A65D90 256B5C00 */ addiu $t3, $t3, %lo(func_80A65C00) ## $t3 = 80A65C00 -/* 0AAA4 80A65D94 3C0780A6 */ lui $a3, %hi(func_80A65108) ## $a3 = 80A60000 -/* 0AAA8 80A65D98 24E75108 */ addiu $a3, $a3, %lo(func_80A65108) ## $a3 = 80A65108 -/* 0AAAC 80A65D9C AFAB0010 */ sw $t3, 0x0010($sp) -/* 0AAB0 80A65DA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AAB4 80A65DA4 8FA5002C */ lw $a1, 0x002C($sp) -/* 0AAB8 80A65DA8 26060160 */ addiu $a2, $s0, 0x0160 ## $a2 = 00000160 -/* 0AABC 80A65DAC 0C0298D8 */ jal func_800A6360 -/* 0AAC0 80A65DB0 AFA00014 */ sw $zero, 0x0014($sp) -/* 0AAC4 80A65DB4 1000000C */ beq $zero, $zero, .L80A65DE8 -/* 0AAC8 80A65DB8 8E020244 */ lw $v0, 0x0244($s0) ## 00000244 -.L80A65DBC: -/* 0AACC 80A65DBC 3C0C80A6 */ lui $t4, %hi(func_80A65C00) ## $t4 = 80A60000 -/* 0AAD0 80A65DC0 258C5C00 */ addiu $t4, $t4, %lo(func_80A65C00) ## $t4 = 80A65C00 -/* 0AAD4 80A65DC4 3C0780A6 */ lui $a3, %hi(func_80A65108) ## $a3 = 80A60000 -/* 0AAD8 80A65DC8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 0AADC 80A65DCC AFAD0014 */ sw $t5, 0x0014($sp) -/* 0AAE0 80A65DD0 24E75108 */ addiu $a3, $a3, %lo(func_80A65108) ## $a3 = 80A65108 -/* 0AAE4 80A65DD4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0AAE8 80A65DD8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0AAEC 80A65DDC 0C0298D8 */ jal func_800A6360 -/* 0AAF0 80A65DE0 26060160 */ addiu $a2, $s0, 0x0160 ## $a2 = 00000160 -/* 0AAF4 80A65DE4 8E020244 */ lw $v0, 0x0244($s0) ## 00000244 -.L80A65DE8: -/* 0AAF8 80A65DE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AAFC 80A65DEC 50400004 */ beql $v0, $zero, .L80A65E00 -/* 0AB00 80A65DF0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0AB04 80A65DF4 0040F809 */ jalr $ra, $v0 -/* 0AB08 80A65DF8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0AB0C 80A65DFC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A65E00: -/* 0AB10 80A65E00 8FB00020 */ lw $s0, 0x0020($sp) -/* 0AB14 80A65E04 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0AB18 80A65E08 03E00008 */ jr $ra -/* 0AB1C 80A65E0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s deleted file mode 100644 index e22e285c74..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s +++ /dev/null @@ -1,545 +0,0 @@ -.rdata -glabel D_80A66800 - .asciz "this->race.rider != NULL" - .balign 4 - -glabel D_80A6681C - .asciz "../z_en_horse.c" - .balign 4 - -.late_rodata -glabel D_80A6687C - .word 0x41411EB8 - -.text -glabel EnHorse_Init -/* 00DE0 80A5C0D0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00DE4 80A5C0D4 AFB10030 */ sw $s1, 0x0030($sp) -/* 00DE8 80A5C0D8 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 00DEC 80A5C0DC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 00DF0 80A5C0E0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00DF4 80A5C0E4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00DF8 80A5C0E8 AFB0002C */ sw $s0, 0x002C($sp) -/* 00DFC 80A5C0EC 3C0580A6 */ lui $a1, %hi(D_80A66664) ## $a1 = 80A60000 -/* 00E00 80A5C0F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E04 80A5C0F4 24A56664 */ addiu $a1, $a1, %lo(D_80A66664) ## $a1 = 80A66664 -/* 00E08 80A5C0F8 0C01E037 */ jal Actor_ProcessInitChain - -/* 00E0C 80A5C0FC A5C00E60 */ sh $zero, 0x0E60($t6) ## 80160E60 -/* 00E10 80A5C100 0C297032 */ jal func_80A5C0C8 -/* 00E14 80A5C104 260403C8 */ addiu $a0, $s0, 0x03C8 ## $a0 = 000003C8 -/* 00E18 80A5C108 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 00E1C 80A5C10C 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 00E20 80A5C110 26180024 */ addiu $t8, $s0, 0x0024 ## $t8 = 00000024 -/* 00E24 80A5C114 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00E28 80A5C118 A5E005BE */ sh $zero, 0x05BE($t7) ## 801605BE -/* 00E2C 80A5C11C AFB8003C */ sw $t8, 0x003C($sp) -/* 00E30 80A5C120 8F090000 */ lw $t1, 0x0000($t8) ## 00000024 -/* 00E34 80A5C124 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 -/* 00E38 80A5C128 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00E3C 80A5C12C AE090258 */ sw $t1, 0x0258($s0) ## 00000258 -/* 00E40 80A5C130 8F080004 */ lw $t0, 0x0004($t8) ## 00000028 -/* 00E44 80A5C134 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -/* 00E48 80A5C138 C604025C */ lwc1 $f4, 0x025C($s0) ## 0000025C -/* 00E4C 80A5C13C 8F090008 */ lw $t1, 0x0008($t8) ## 0000002C -/* 00E50 80A5C140 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 -/* 00E54 80A5C144 46062200 */ add.s $f8, $f4, $f6 -/* 00E58 80A5C148 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 -/* 00E5C 80A5C14C AE090260 */ sw $t1, 0x0260($s0) ## 00000260 -/* 00E60 80A5C150 E608025C */ swc1 $f8, 0x025C($s0) ## 0000025C -/* 00E64 80A5C154 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00E68 80A5C158 844A055C */ lh $t2, 0x055C($v0) ## 8016055C -/* 00E6C 80A5C15C 15400002 */ bne $t2, $zero, .L80A5C168 -/* 00E70 80A5C160 240B0046 */ addiu $t3, $zero, 0x0046 ## $t3 = 00000046 -/* 00E74 80A5C164 A44B055C */ sh $t3, 0x055C($v0) ## 8016055C -.L80A5C168: -/* 00E78 80A5C168 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00E7C 80A5C16C 304C8000 */ andi $t4, $v0, 0x8000 ## $t4 = 00000000 -/* 00E80 80A5C170 11800021 */ beq $t4, $zero, .L80A5C1F8 -/* 00E84 80A5C174 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 00E88 80A5C178 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 00E8C 80A5C17C 00416824 */ and $t5, $v0, $at -/* 00E90 80A5C180 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00E94 80A5C184 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00E98 80A5C188 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00E9C 80A5C18C A60D001C */ sh $t5, 0x001C($s0) ## 0000001C -/* 00EA0 80A5C190 AE0E0158 */ sw $t6, 0x0158($s0) ## 00000158 -/* 00EA4 80A5C194 02212021 */ addu $a0, $s1, $at -/* 00EA8 80A5C198 AFA40038 */ sw $a0, 0x0038($sp) -/* 00EAC 80A5C19C 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00EB0 80A5C1A0 240500D2 */ addiu $a1, $zero, 0x00D2 ## $a1 = 000000D2 -/* 00EB4 80A5C1A4 00027E00 */ sll $t7, $v0, 24 -/* 00EB8 80A5C1A8 000FC603 */ sra $t8, $t7, 24 -/* 00EBC 80A5C1AC 07010005 */ bgez $t8, .L80A5C1C4 -/* 00EC0 80A5C1B0 A202015C */ sb $v0, 0x015C($s0) ## 0000015C -/* 00EC4 80A5C1B4 0C00B55C */ jal Actor_Kill - -/* 00EC8 80A5C1B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ECC 80A5C1BC 10000192 */ beq $zero, $zero, .L80A5C808 -/* 00ED0 80A5C1C0 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A5C1C4: -/* 00ED4 80A5C1C4 8FA40038 */ lw $a0, 0x0038($sp) -.L80A5C1C8: -/* 00ED8 80A5C1C8 0C026062 */ jal Object_IsLoaded - -/* 00EDC 80A5C1CC 8205015C */ lb $a1, 0x015C($s0) ## 0000015C -/* 00EE0 80A5C1D0 5040FFFD */ beql $v0, $zero, .L80A5C1C8 -/* 00EE4 80A5C1D4 8FA40038 */ lw $a0, 0x0038($sp) -/* 00EE8 80A5C1D8 8219015C */ lb $t9, 0x015C($s0) ## 0000015C -/* 00EEC 80A5C1DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00EF0 80A5C1E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00EF4 80A5C1E4 0C00B591 */ jal Actor_SetObjectDependency - -/* 00EF8 80A5C1E8 A219001E */ sb $t9, 0x001E($s0) ## 0000001E -/* 00EFC 80A5C1EC 2408000C */ addiu $t0, $zero, 0x000C ## $t0 = 0000000C -/* 00F00 80A5C1F0 10000004 */ beq $zero, $zero, .L80A5C204 -/* 00F04 80A5C1F4 AE080208 */ sw $t0, 0x0208($s0) ## 00000208 -.L80A5C1F8: -/* 00F08 80A5C1F8 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E -/* 00F0C 80A5C1FC AE000158 */ sw $zero, 0x0158($s0) ## 00000158 -/* 00F10 80A5C200 AE090208 */ sw $t1, 0x0208($s0) ## 00000208 -.L80A5C204: -/* 00F14 80A5C204 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 00F18 80A5C208 24017FFF */ addiu $at, $zero, 0x7FFF ## $at = 00007FFF -/* 00F1C 80A5C20C 15410002 */ bne $t2, $at, .L80A5C218 -/* 00F20 80A5C210 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00F24 80A5C214 A60B001C */ sh $t3, 0x001C($s0) ## 0000001C -.L80A5C218: -/* 00F28 80A5C218 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -/* 00F2C 80A5C21C 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 00F30 80A5C220 14410003 */ bne $v0, $at, .L80A5C230 -/* 00F34 80A5C224 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 00F38 80A5C228 1000003B */ beq $zero, $zero, .L80A5C318 -/* 00F3C 80A5C22C AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 -.L80A5C230: -/* 00F40 80A5C230 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D -/* 00F44 80A5C234 54410009 */ bnel $v0, $at, .L80A5C25C -/* 00F48 80A5C238 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00F4C 80A5C23C 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -/* 00F50 80A5C240 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00F54 80A5C244 3C0E0005 */ lui $t6, 0x0005 ## $t6 = 00050000 -/* 00F58 80A5C248 55A10004 */ bnel $t5, $at, .L80A5C25C -/* 00F5C 80A5C24C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00F60 80A5C250 10000031 */ beq $zero, $zero, .L80A5C318 -/* 00F64 80A5C254 AE0E01F0 */ sw $t6, 0x01F0($s0) ## 000001F0 -/* 00F68 80A5C258 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80A5C25C: -/* 00F6C 80A5C25C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00F70 80A5C260 3C0F000B */ lui $t7, 0x000B ## $t7 = 000B0000 -/* 00F74 80A5C264 54410004 */ bnel $v0, $at, .L80A5C278 -/* 00F78 80A5C268 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00F7C 80A5C26C 1000002A */ beq $zero, $zero, .L80A5C318 -/* 00F80 80A5C270 AE0F01F0 */ sw $t7, 0x01F0($s0) ## 000001F0 -/* 00F84 80A5C274 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -.L80A5C278: -/* 00F88 80A5C278 14410021 */ bne $v0, $at, .L80A5C300 -/* 00F8C 80A5C27C 3C18000A */ lui $t8, 0x000A ## $t8 = 000A0000 -/* 00F90 80A5C280 AE1801F0 */ sw $t8, 0x01F0($s0) ## 000001F0 -/* 00F94 80A5C284 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 00F98 80A5C288 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 00F9C 80A5C28C 14400006 */ bne $v0, $zero, .L80A5C2A8 -/* 00FA0 80A5C290 3C198016 */ lui $t9, %hi(gGameInfo) -/* 00FA4 80A5C294 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) -/* 00FA8 80A5C298 3C0D8016 */ lui $t5, %hi(gSaveContext+0x13fa) -/* 00FAC 80A5C29C 87280556 */ lh $t0, 0x0556($t9) ## 80160556 -/* 00FB0 80A5C2A0 1100000A */ beq $t0, $zero, .L80A5C2CC -/* 00FB4 80A5C2A4 00000000 */ nop -.L80A5C2A8: -/* 00FB8 80A5C2A8 8E0901F0 */ lw $t1, 0x01F0($s0) ## 000001F0 -/* 00FBC 80A5C2AC 3C01FFFD */ lui $at, 0xFFFD ## $at = FFFD0000 -/* 00FC0 80A5C2B0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFDFFFF -/* 00FC4 80A5C2B4 01215024 */ and $t2, $t1, $at -/* 00FC8 80A5C2B8 3C010400 */ lui $at, 0x0400 ## $at = 04000000 -/* 00FCC 80A5C2BC AE0A01F0 */ sw $t2, 0x01F0($s0) ## 000001F0 -/* 00FD0 80A5C2C0 01416025 */ or $t4, $t2, $at ## $t4 = 04000000 -/* 00FD4 80A5C2C4 10000014 */ beq $zero, $zero, .L80A5C318 -/* 00FD8 80A5C2C8 AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 -.L80A5C2CC: -/* 00FDC 80A5C2CC 95ADFA5A */ lhu $t5, %lo(gSaveContext+0x13fa)($t5) -/* 00FE0 80A5C2D0 31AE0040 */ andi $t6, $t5, 0x0040 ## $t6 = 00000000 -/* 00FE4 80A5C2D4 51C00011 */ beql $t6, $zero, .L80A5C31C -/* 00FE8 80A5C2D8 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 -/* 00FEC 80A5C2DC 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 -/* 00FF0 80A5C2E0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00FF4 80A5C2E4 55E1000D */ bnel $t7, $at, .L80A5C31C -/* 00FF8 80A5C2E8 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 -/* 00FFC 80A5C2EC 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 -/* 01000 80A5C2F0 3C010030 */ lui $at, 0x0030 ## $at = 00300000 -/* 01004 80A5C2F4 0301C825 */ or $t9, $t8, $at ## $t9 = 00300000 -/* 01008 80A5C2F8 10000007 */ beq $zero, $zero, .L80A5C318 -/* 0100C 80A5C2FC AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -.L80A5C300: -/* 01010 80A5C300 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01014 80A5C304 14410003 */ bne $v0, $at, .L80A5C314 -/* 01018 80A5C308 24080080 */ addiu $t0, $zero, 0x0080 ## $t0 = 00000080 -/* 0101C 80A5C30C 10000002 */ beq $zero, $zero, .L80A5C318 -/* 01020 80A5C310 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -.L80A5C314: -/* 01024 80A5C314 AE0001F0 */ sw $zero, 0x01F0($s0) ## 000001F0 -.L80A5C318: -/* 01028 80A5C318 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 -.L80A5C31C: -/* 0102C 80A5C31C 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 01030 80A5C320 15210012 */ bne $t1, $at, .L80A5C36C -/* 01034 80A5C324 3C0A8016 */ lui $t2, %hi(gSaveContext+0x13fa) -/* 01038 80A5C328 954AFA5A */ lhu $t2, %lo(gSaveContext+0x13fa)($t2) -/* 0103C 80A5C32C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01040 80A5C330 314B000F */ andi $t3, $t2, 0x000F ## $t3 = 00000000 -/* 01044 80A5C334 5561000E */ bnel $t3, $at, .L80A5C370 -/* 01048 80A5C338 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 0104C 80A5C33C 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 01050 80A5C340 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01054 80A5C344 14400009 */ bne $v0, $zero, .L80A5C36C -/* 01058 80A5C348 3C0C8016 */ lui $t4, %hi(gGameInfo) -/* 0105C 80A5C34C 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) -/* 01060 80A5C350 858D0556 */ lh $t5, 0x0556($t4) ## 80160556 -/* 01064 80A5C354 55A00006 */ bnel $t5, $zero, .L80A5C370 -/* 01068 80A5C358 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 0106C 80A5C35C 8E0E01F0 */ lw $t6, 0x01F0($s0) ## 000001F0 -/* 01070 80A5C360 3C010200 */ lui $at, 0x0200 ## $at = 02000000 -/* 01074 80A5C364 01C17825 */ or $t7, $t6, $at ## $t7 = 02000000 -/* 01078 80A5C368 AE0F01F0 */ sw $t7, 0x01F0($s0) ## 000001F0 -.L80A5C36C: -/* 0107C 80A5C36C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -.L80A5C370: -/* 01080 80A5C370 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 01084 80A5C374 0C00B58B */ jal Actor_SetScale - -/* 01088 80A5C378 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0108C 80A5C37C 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 01090 80A5C380 44815000 */ mtc1 $at, $f10 ## $f10 = -3.50 -/* 01094 80A5C384 3C068003 */ lui $a2, %hi(ActorShadow_DrawHorse) -/* 01098 80A5C388 24C6B644 */ addiu $a2, %lo(ActorShadow_DrawHorse) -/* 0109C 80A5C38C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 010A0 80A5C390 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 010A4 80A5C394 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 010A8 80A5C398 0C00AC78 */ jal ActorShape_Init - -/* 010AC 80A5C39C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 010B0 80A5C3A0 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 010B4 80A5C3A4 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 010B8 80A5C3A8 AE18014C */ sw $t8, 0x014C($s0) ## 0000014C -/* 010BC 80A5C3AC 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 -/* 010C0 80A5C3B0 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 010C4 80A5C3B4 AFA50040 */ sw $a1, 0x0040($sp) -/* 010C8 80A5C3B8 0C0170D9 */ jal Collider_InitCylinder - -/* 010CC 80A5C3BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010D0 80A5C3C0 3C0780A6 */ lui $a3, %hi(D_80A65EAC) ## $a3 = 80A60000 -/* 010D4 80A5C3C4 8FA50040 */ lw $a1, 0x0040($sp) -/* 010D8 80A5C3C8 24E75EAC */ addiu $a3, $a3, %lo(D_80A65EAC) ## $a3 = 80A65EAC -/* 010DC 80A5C3CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010E0 80A5C3D0 0C01712B */ jal Collider_SetCylinder - -/* 010E4 80A5C3D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 010E8 80A5C3D8 260502C4 */ addiu $a1, $s0, 0x02C4 ## $a1 = 000002C4 -/* 010EC 80A5C3DC AFA50040 */ sw $a1, 0x0040($sp) -/* 010F0 80A5C3E0 0C0170D9 */ jal Collider_InitCylinder - -/* 010F4 80A5C3E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010F8 80A5C3E8 3C0780A6 */ lui $a3, %hi(D_80A65ED8) ## $a3 = 80A60000 -/* 010FC 80A5C3EC 8FA50040 */ lw $a1, 0x0040($sp) -/* 01100 80A5C3F0 24E75ED8 */ addiu $a3, $a3, %lo(D_80A65ED8) ## $a3 = 80A65ED8 -/* 01104 80A5C3F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01108 80A5C3F8 0C01712B */ jal Collider_SetCylinder - -/* 0110C 80A5C3FC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 01110 80A5C400 26050310 */ addiu $a1, $s0, 0x0310 ## $a1 = 00000310 -/* 01114 80A5C404 AFA50040 */ sw $a1, 0x0040($sp) -/* 01118 80A5C408 0C016EFE */ jal Collider_InitJntSph -/* 0111C 80A5C40C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01120 80A5C410 3C0780A6 */ lui $a3, %hi(D_80A65F28) ## $a3 = 80A60000 -/* 01124 80A5C414 26190330 */ addiu $t9, $s0, 0x0330 ## $t9 = 00000330 -/* 01128 80A5C418 8FA50040 */ lw $a1, 0x0040($sp) -/* 0112C 80A5C41C AFB90010 */ sw $t9, 0x0010($sp) -/* 01130 80A5C420 24E75F28 */ addiu $a3, $a3, %lo(D_80A65F28) ## $a3 = 80A65F28 -/* 01134 80A5C424 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01138 80A5C428 0C017014 */ jal Collider_SetJntSph -/* 0113C 80A5C42C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 01140 80A5C430 0C016C80 */ jal DamageTable_Get - -/* 01144 80A5C434 2404000B */ addiu $a0, $zero, 0x000B ## $a0 = 0000000B -/* 01148 80A5C438 3C0680A6 */ lui $a2, %hi(D_80A65F38) ## $a2 = 80A60000 -/* 0114C 80A5C43C 24C65F38 */ addiu $a2, $a2, %lo(D_80A65F38) ## $a2 = 80A65F38 -/* 01150 80A5C440 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01154 80A5C444 0C0187B5 */ jal CollisionCheck_SetInfo -/* 01158 80A5C448 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0115C 80A5C44C 8FA8003C */ lw $t0, 0x003C($sp) -/* 01160 80A5C450 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 01164 80A5C454 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 -/* 01168 80A5C458 8D0A0000 */ lw $t2, 0x0000($t0) ## 00000000 -/* 0116C 80A5C45C 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 01170 80A5C460 3C0B8016 */ lui $t3, %hi(gSaveContext+0x1360) -/* 01174 80A5C464 AE0A0038 */ sw $t2, 0x0038($s0) ## 00000038 -/* 01178 80A5C468 8D090004 */ lw $t1, 0x0004($t0) ## 00000004 -/* 0117C 80A5C46C AE09003C */ sw $t1, 0x003C($s0) ## 0000003C -/* 01180 80A5C470 C612003C */ lwc1 $f18, 0x003C($s0) ## 0000003C -/* 01184 80A5C474 8D0A0008 */ lw $t2, 0x0008($t0) ## 00000008 -/* 01188 80A5C478 AE00020C */ sw $zero, 0x020C($s0) ## 0000020C -/* 0118C 80A5C47C 46049180 */ add.s $f6, $f18, $f4 -/* 01190 80A5C480 AE0A0040 */ sw $t2, 0x0040($s0) ## 00000040 -/* 01194 80A5C484 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C -/* 01198 80A5C488 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -/* 0119C 80A5C48C 54410035 */ bnel $v0, $at, .L80A5C564 -/* 011A0 80A5C490 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 -/* 011A4 80A5C494 8D6BF9C0 */ lw $t3, %lo(gSaveContext+0x1360)($t3) -/* 011A8 80A5C498 29610004 */ slti $at, $t3, 0x0004 -/* 011AC 80A5C49C 50200031 */ beql $at, $zero, .L80A5C564 -/* 011B0 80A5C4A0 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 -/* 011B4 80A5C4A4 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 -/* 011B8 80A5C4A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 011BC 80A5C4AC 1581001C */ bne $t4, $at, .L80A5C520 -/* 011C0 80A5C4B0 00000000 */ nop -/* 011C4 80A5C4B4 860D0034 */ lh $t5, 0x0034($s0) ## 00000034 -/* 011C8 80A5C4B8 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) -/* 011CC 80A5C4BC 11A00004 */ beq $t5, $zero, .L80A5C4D0 -/* 011D0 80A5C4C0 00000000 */ nop -/* 011D4 80A5C4C4 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) -/* 011D8 80A5C4C8 11C00005 */ beq $t6, $zero, .L80A5C4E0 -/* 011DC 80A5C4CC 00000000 */ nop -.L80A5C4D0: -/* 011E0 80A5C4D0 0C00B55C */ jal Actor_Kill - -/* 011E4 80A5C4D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011E8 80A5C4D8 100000CB */ beq $zero, $zero, .L80A5C808 -/* 011EC 80A5C4DC 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A5C4E0: -/* 011F0 80A5C4E0 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 011F4 80A5C4E4 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 011F8 80A5C4E8 50400006 */ beql $v0, $zero, .L80A5C504 -/* 011FC 80A5C4EC 860F0034 */ lh $t7, 0x0034($s0) ## 00000034 -/* 01200 80A5C4F0 0C00B55C */ jal Actor_Kill - -/* 01204 80A5C4F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01208 80A5C4F8 100000C3 */ beq $zero, $zero, .L80A5C808 -/* 0120C 80A5C4FC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01210 80A5C500 860F0034 */ lh $t7, 0x0034($s0) ## 00000034 -.L80A5C504: -/* 01214 80A5C504 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01218 80A5C508 51E10030 */ beql $t7, $at, .L80A5C5CC -/* 0121C 80A5C50C 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 -/* 01220 80A5C510 0C00B55C */ jal Actor_Kill - -/* 01224 80A5C514 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01228 80A5C518 100000BB */ beq $zero, $zero, .L80A5C808 -/* 0122C 80A5C51C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A5C520: -/* 01230 80A5C520 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 01234 80A5C524 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01238 80A5C528 14400027 */ bne $v0, $zero, .L80A5C5C8 -/* 0123C 80A5C52C 3C188016 */ lui $t8, %hi(gGameInfo) -/* 01240 80A5C530 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 01244 80A5C534 3C088016 */ lui $t0, %hi(gSaveContext+0x10) -/* 01248 80A5C538 87190556 */ lh $t9, 0x0556($t8) ## 80160556 -/* 0124C 80A5C53C 57200023 */ bnel $t9, $zero, .L80A5C5CC -/* 01250 80A5C540 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 -/* 01254 80A5C544 8D08E670 */ lw $t0, %lo(gSaveContext+0x10)($t0) -/* 01258 80A5C548 51000020 */ beql $t0, $zero, .L80A5C5CC -/* 0125C 80A5C54C 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 -/* 01260 80A5C550 0C00B55C */ jal Actor_Kill - -/* 01264 80A5C554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01268 80A5C558 100000AB */ beq $zero, $zero, .L80A5C808 -/* 0126C 80A5C55C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01270 80A5C560 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 -.L80A5C564: -/* 01274 80A5C564 14410018 */ bne $v0, $at, .L80A5C5C8 -/* 01278 80A5C568 3C098016 */ lui $t1, %hi(gSaveContext+0x10) -/* 0127C 80A5C56C 8D29E670 */ lw $t1, %lo(gSaveContext+0x10)($t1) -/* 01280 80A5C570 1120000D */ beq $t1, $zero, .L80A5C5A8 -/* 01284 80A5C574 00000000 */ nop -/* 01288 80A5C578 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 0128C 80A5C57C 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01290 80A5C580 14400009 */ bne $v0, $zero, .L80A5C5A8 -/* 01294 80A5C584 3C0A8016 */ lui $t2, %hi(gGameInfo) -/* 01298 80A5C588 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) -/* 0129C 80A5C58C 3C0C8016 */ lui $t4, %hi(gSaveContext+4) -/* 012A0 80A5C590 854B0556 */ lh $t3, 0x0556($t2) ## 80160556 -/* 012A4 80A5C594 15600004 */ bne $t3, $zero, .L80A5C5A8 -/* 012A8 80A5C598 00000000 */ nop -/* 012AC 80A5C59C 8D8CE664 */ lw $t4, %lo(gSaveContext+4)($t4) -/* 012B0 80A5C5A0 51800006 */ beql $t4, $zero, .L80A5C5BC -/* 012B4 80A5C5A4 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 -.L80A5C5A8: -/* 012B8 80A5C5A8 0C00B55C */ jal Actor_Kill - -/* 012BC 80A5C5AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012C0 80A5C5B0 10000095 */ beq $zero, $zero, .L80A5C808 -/* 012C4 80A5C5B4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 012C8 80A5C5B8 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 -.L80A5C5BC: -/* 012CC 80A5C5BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 012D0 80A5C5C0 01A17025 */ or $t6, $t5, $at ## $t6 = 00010000 -/* 012D4 80A5C5C4 AE0E01F0 */ sw $t6, 0x01F0($s0) ## 000001F0 -.L80A5C5C8: -/* 012D8 80A5C5C8 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 -.L80A5C5CC: -/* 012DC 80A5C5CC 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 012E0 80A5C5D0 3C0680A6 */ lui $a2, %hi(D_80A65E84) ## $a2 = 80A60000 -/* 012E4 80A5C5D4 00021080 */ sll $v0, $v0, 2 -/* 012E8 80A5C5D8 01E27821 */ addu $t7, $t7, $v0 -/* 012EC 80A5C5DC 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 012F0 80A5C5E0 00C23021 */ addu $a2, $a2, $v0 -/* 012F4 80A5C5E4 8CC65E84 */ lw $a2, %lo(D_80A65E84)($a2) -/* 012F8 80A5C5E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 012FC 80A5C5EC 26050160 */ addiu $a1, $s0, 0x0160 ## $a1 = 00000160 -/* 01300 80A5C5F0 0C02998F */ jal func_800A663C -/* 01304 80A5C5F4 8DE70000 */ lw $a3, 0x0000($t7) ## 80A60000 -/* 01308 80A5C5F8 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 -/* 0130C 80A5C5FC 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 01310 80A5C600 AE000210 */ sw $zero, 0x0210($s0) ## 00000210 -/* 01314 80A5C604 0018C880 */ sll $t9, $t8, 2 -/* 01318 80A5C608 01194021 */ addu $t0, $t0, $t9 -/* 0131C 80A5C60C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 01320 80A5C610 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 01324 80A5C614 0C02947A */ jal Animation_PlayOnce -/* 01328 80A5C618 8D050000 */ lw $a1, 0x0000($t0) ## 80A60000 -/* 0132C 80A5C61C 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 01330 80A5C620 A2090238 */ sb $t1, 0x0238($s0) ## 00000238 -/* 01334 80A5C624 AE00023C */ sw $zero, 0x023C($s0) ## 0000023C -/* 01338 80A5C628 AE000244 */ sw $zero, 0x0244($s0) ## 00000244 -/* 0133C 80A5C62C A200037A */ sb $zero, 0x037A($s0) ## 0000037A -/* 01340 80A5C630 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01344 80A5C634 0C296FF6 */ jal func_80A5BFD8 -/* 01348 80A5C638 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0134C 80A5C63C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01350 80A5C640 0C296FFB */ jal func_80A5BFEC -/* 01354 80A5C644 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01358 80A5C648 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0135C 80A5C64C 0C29702D */ jal func_80A5C0B4 -/* 01360 80A5C650 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01364 80A5C654 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 01368 80A5C658 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0136C 80A5C65C 54410006 */ bnel $v0, $at, .L80A5C678 -/* 01370 80A5C660 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01374 80A5C664 0C297C11 */ jal func_80A5F044 -/* 01378 80A5C668 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0137C 80A5C66C 10000062 */ beq $zero, $zero, .L80A5C7F8 -/* 01380 80A5C670 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 01384 80A5C674 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A5C678: -/* 01388 80A5C678 5441002A */ bnel $v0, $at, .L80A5C724 -/* 0138C 80A5C67C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01390 80A5C680 0C297F2B */ jal func_80A5FCAC -/* 01394 80A5C684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01398 80A5C688 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 0139C 80A5C68C 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 013A0 80A5C690 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 013A4 80A5C694 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 013A8 80A5C698 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 013AC 80A5C69C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 013B0 80A5C6A0 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 013B4 80A5C6A4 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 013B8 80A5C6A8 860A00B4 */ lh $t2, 0x00B4($s0) ## 000000B4 -/* 013BC 80A5C6AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 013C0 80A5C6B0 240600CB */ addiu $a2, $zero, 0x00CB ## $a2 = 000000CB -/* 013C4 80A5C6B4 AFAA0018 */ sw $t2, 0x0018($sp) -/* 013C8 80A5C6B8 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -/* 013CC 80A5C6BC AFAD0024 */ sw $t5, 0x0024($sp) -/* 013D0 80A5C6C0 AFAC0020 */ sw $t4, 0x0020($sp) -/* 013D4 80A5C6C4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 013D8 80A5C6C8 AFAB001C */ sw $t3, 0x001C($sp) -/* 013DC 80A5C6CC 14400007 */ bne $v0, $zero, .L80A5C6EC -/* 013E0 80A5C6D0 AE02038C */ sw $v0, 0x038C($s0) ## 0000038C -/* 013E4 80A5C6D4 3C0480A6 */ lui $a0, %hi(D_80A66800) ## $a0 = 80A60000 -/* 013E8 80A5C6D8 3C0580A6 */ lui $a1, %hi(D_80A6681C) ## $a1 = 80A60000 -/* 013EC 80A5C6DC 24A5681C */ addiu $a1, $a1, %lo(D_80A6681C) ## $a1 = 80A6681C -/* 013F0 80A5C6E0 24846800 */ addiu $a0, $a0, %lo(D_80A66800) ## $a0 = 80A66800 -/* 013F4 80A5C6E4 0C0007FC */ jal __assert - -/* 013F8 80A5C6E8 24060C05 */ addiu $a2, $zero, 0x0C05 ## $a2 = 00000C05 -.L80A5C6EC: -/* 013FC 80A5C6EC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13fa) -/* 01400 80A5C6F0 95CEFA5A */ lhu $t6, %lo(gSaveContext+0x13fa)($t6) -/* 01404 80A5C6F4 3C01414A */ lui $at, 0x414A ## $at = 414A0000 -/* 01408 80A5C6F8 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 -/* 0140C 80A5C6FC 55E00006 */ bnel $t7, $zero, .L80A5C718 -/* 01410 80A5C700 44819000 */ mtc1 $at, $f18 ## $f18 = 12.62 -/* 01414 80A5C704 3C0180A6 */ lui $at, %hi(D_80A6687C) ## $at = 80A60000 -/* 01418 80A5C708 C430687C */ lwc1 $f16, %lo(D_80A6687C)($at) -/* 0141C 80A5C70C 10000039 */ beq $zero, $zero, .L80A5C7F4 -/* 01420 80A5C710 E6100398 */ swc1 $f16, 0x0398($s0) ## 00000398 -/* 01424 80A5C714 44819000 */ mtc1 $at, $f18 ## $f18 = -0.00 -.L80A5C718: -/* 01428 80A5C718 10000036 */ beq $zero, $zero, .L80A5C7F4 -/* 0142C 80A5C71C E6120398 */ swc1 $f18, 0x0398($s0) ## 00000398 -/* 01430 80A5C720 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -.L80A5C724: -/* 01434 80A5C724 14410005 */ bne $v0, $at, .L80A5C73C -/* 01438 80A5C728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0143C 80A5C72C 0C298416 */ jal func_80A61058 -/* 01440 80A5C730 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01444 80A5C734 10000030 */ beq $zero, $zero, .L80A5C7F8 -/* 01448 80A5C738 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -.L80A5C73C: -/* 0144C 80A5C73C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01450 80A5C740 54410008 */ bnel $v0, $at, .L80A5C764 -/* 01454 80A5C744 863800A4 */ lh $t8, 0x00A4($s1) ## 000000A4 -/* 01458 80A5C748 0C298503 */ jal func_80A6140C -/* 0145C 80A5C74C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01460 80A5C750 0C02126A */ jal Interface_InitHorsebackArchery -/* 01464 80A5C754 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01468 80A5C758 10000027 */ beq $zero, $zero, .L80A5C7F8 -/* 0146C 80A5C75C A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 01470 80A5C760 863800A4 */ lh $t8, 0x00A4($s1) ## 000000A4 -.L80A5C764: -/* 01474 80A5C764 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 01478 80A5C768 5701000E */ bnel $t8, $at, .L80A5C7A4 -/* 0147C 80A5C76C 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -/* 01480 80A5C770 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 01484 80A5C774 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01488 80A5C778 14400009 */ bne $v0, $zero, .L80A5C7A0 -/* 0148C 80A5C77C 3C198016 */ lui $t9, %hi(gGameInfo) -/* 01490 80A5C780 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) -/* 01494 80A5C784 87280556 */ lh $t0, 0x0556($t9) ## 80160556 -/* 01498 80A5C788 55000006 */ bnel $t0, $zero, .L80A5C7A4 -/* 0149C 80A5C78C 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -/* 014A0 80A5C790 0C298681 */ jal func_80A61A04 -/* 014A4 80A5C794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014A8 80A5C798 10000017 */ beq $zero, $zero, .L80A5C7F8 -/* 014AC 80A5C79C A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -.L80A5C7A0: -/* 014B0 80A5C7A0 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -.L80A5C7A4: -/* 014B4 80A5C7A4 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 014B8 80A5C7A8 54410006 */ bnel $v0, $at, .L80A5C7C4 -/* 014BC 80A5C7AC 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D -/* 014C0 80A5C7B0 0C297CEA */ jal func_80A5F3A8 -/* 014C4 80A5C7B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014C8 80A5C7B8 1000000F */ beq $zero, $zero, .L80A5C7F8 -/* 014CC 80A5C7BC A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 014D0 80A5C7C0 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D -.L80A5C7C4: -/* 014D4 80A5C7C4 14410009 */ bne $v0, $at, .L80A5C7EC -/* 014D8 80A5C7C8 00000000 */ nop -/* 014DC 80A5C7CC 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 014E0 80A5C7D0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 014E4 80A5C7D4 15210005 */ bne $t1, $at, .L80A5C7EC -/* 014E8 80A5C7D8 00000000 */ nop -/* 014EC 80A5C7DC 0C297CEA */ jal func_80A5F3A8 -/* 014F0 80A5C7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014F4 80A5C7E4 10000004 */ beq $zero, $zero, .L80A5C7F8 -/* 014F8 80A5C7E8 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -.L80A5C7EC: -/* 014FC 80A5C7EC 0C297CF7 */ jal func_80A5F3DC -/* 01500 80A5C7F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A5C7F4: -/* 01504 80A5C7F4 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -.L80A5C7F8: -/* 01508 80A5C7F8 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 -/* 0150C 80A5C7FC A6020034 */ sh $v0, 0x0034($s0) ## 00000034 -/* 01510 80A5C800 A6020018 */ sh $v0, 0x0018($s0) ## 00000018 -/* 01514 80A5C804 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A5C808: -/* 01518 80A5C808 8FB0002C */ lw $s0, 0x002C($sp) -/* 0151C 80A5C80C 8FB10030 */ lw $s1, 0x0030($sp) -/* 01520 80A5C810 03E00008 */ jr $ra -/* 01524 80A5C814 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s deleted file mode 100644 index a8210cfb2d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s +++ /dev/null @@ -1,572 +0,0 @@ -.late_rodata -glabel D_80A669BC - .float 0.025 - -.text -glabel EnHorse_Update -/* 093BC 80A646AC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 093C0 80A646B0 3C0F80A6 */ lui $t7, %hi(D_80A66788) ## $t7 = 80A60000 -/* 093C4 80A646B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 093C8 80A646B8 AFB00028 */ sw $s0, 0x0028($sp) -/* 093CC 80A646BC 25EF6788 */ addiu $t7, $t7, %lo(D_80A66788) ## $t7 = 80A66788 -/* 093D0 80A646C0 8DF90000 */ lw $t9, 0x0000($t7) ## 80A66788 -/* 093D4 80A646C4 27AE005C */ addiu $t6, $sp, 0x005C ## $t6 = FFFFFFEC -/* 093D8 80A646C8 8DF80004 */ lw $t8, 0x0004($t7) ## 80A6678C -/* 093DC 80A646CC ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFEC -/* 093E0 80A646D0 8DF90008 */ lw $t9, 0x0008($t7) ## 80A66790 -/* 093E4 80A646D4 3C0980A6 */ lui $t1, %hi(D_80A66794) ## $t1 = 80A60000 -/* 093E8 80A646D8 25296794 */ addiu $t1, $t1, %lo(D_80A66794) ## $t1 = 80A66794 -/* 093EC 80A646DC ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF0 -/* 093F0 80A646E0 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF4 -/* 093F4 80A646E4 8D2B0000 */ lw $t3, 0x0000($t1) ## 80A66794 -/* 093F8 80A646E8 27A80050 */ addiu $t0, $sp, 0x0050 ## $t0 = FFFFFFE0 -/* 093FC 80A646EC 8D2A0004 */ lw $t2, 0x0004($t1) ## 80A66798 -/* 09400 80A646F0 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFE0 -/* 09404 80A646F4 8D2B0008 */ lw $t3, 0x0008($t1) ## 80A6679C -/* 09408 80A646F8 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE4 -/* 0940C 80A646FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 09410 80A64700 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE8 -/* 09414 80A64704 8CAC1C44 */ lw $t4, 0x1C44($a1) ## 00001C44 -/* 09418 80A64708 AFAC004C */ sw $t4, 0x004C($sp) -/* 0941C 80A6470C 848D00B6 */ lh $t5, 0x00B6($a0) ## 000000B6 -/* 09420 80A64710 A48D0200 */ sh $t5, 0x0200($a0) ## 00000200 -/* 09424 80A64714 0C298C75 */ jal func_80A631D4 -/* 09428 80A64718 AFA50074 */ sw $a1, 0x0074($sp) -/* 0942C 80A6471C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09430 80A64720 0C2990DF */ jal func_80A6437C -/* 09434 80A64724 8FA50074 */ lw $a1, 0x0074($sp) -/* 09438 80A64728 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 0943C 80A6472C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09440 80A64730 304E2000 */ andi $t6, $v0, 0x2000 ## $t6 = 00000000 -/* 09444 80A64734 55C00005 */ bnel $t6, $zero, .L80A6474C -/* 09448 80A64738 00027B00 */ sll $t7, $v0, 12 -/* 0944C 80A6473C 0C298C13 */ jal func_80A6304C -/* 09450 80A64740 8FA50074 */ lw $a1, 0x0074($sp) -/* 09454 80A64744 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 09458 80A64748 00027B00 */ sll $t7, $v0, 12 -.L80A6474C: -/* 0945C 80A6474C 05E10020 */ bgez $t7, .L80A647D0 -/* 09460 80A64750 3C010010 */ lui $at, 0x0010 ## $at = 00100000 -/* 09464 80A64754 00411824 */ and $v1, $v0, $at -/* 09468 80A64758 1060000C */ beq $v1, $zero, .L80A6478C -/* 0946C 80A6475C 00000000 */ nop -/* 09470 80A64760 8E180388 */ lw $t8, 0x0388($s0) ## 00000388 -/* 09474 80A64764 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09478 80A64768 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0947C 80A6476C 17010007 */ bne $t8, $at, .L80A6478C -/* 09480 80A64770 3C01FFEF */ lui $at, 0xFFEF ## $at = FFEF0000 -/* 09484 80A64774 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFEFFFFF -/* 09488 80A64778 0041C824 */ and $t9, $v0, $at -/* 0948C 80A6477C 0C297803 */ jal func_80A5E00C -/* 09490 80A64780 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 09494 80A64784 10000013 */ beq $zero, $zero, .L80A647D4 -/* 09498 80A64788 8E0C014C */ lw $t4, 0x014C($s0) ## 0000014C -.L80A6478C: -/* 0949C 80A6478C 14600010 */ bne $v1, $zero, .L80A647D0 -/* 094A0 80A64790 00024280 */ sll $t0, $v0, 10 -/* 094A4 80A64794 0503000F */ bgezl $t0, .L80A647D4 -/* 094A8 80A64798 8E0C014C */ lw $t4, 0x014C($s0) ## 0000014C -/* 094AC 80A6479C 8E09014C */ lw $t1, 0x014C($s0) ## 0000014C -/* 094B0 80A647A0 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 094B4 80A647A4 5121000B */ beql $t1, $at, .L80A647D4 -/* 094B8 80A647A8 8E0C014C */ lw $t4, 0x014C($s0) ## 0000014C -/* 094BC 80A647AC 8E0A0388 */ lw $t2, 0x0388($s0) ## 00000388 -/* 094C0 80A647B0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 094C4 80A647B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 094C8 80A647B8 15410005 */ bne $t2, $at, .L80A647D0 -/* 094CC 80A647BC 3C01FFDF */ lui $at, 0xFFDF ## $at = FFDF0000 -/* 094D0 80A647C0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFDFFFFF -/* 094D4 80A647C4 00415824 */ and $t3, $v0, $at -/* 094D8 80A647C8 0C297803 */ jal func_80A5E00C -/* 094DC 80A647CC AE0B01F0 */ sw $t3, 0x01F0($s0) ## 000001F0 -.L80A647D0: -/* 094E0 80A647D0 8E0C014C */ lw $t4, 0x014C($s0) ## 0000014C -.L80A647D4: -/* 094E4 80A647D4 3C1980A6 */ lui $t9, %hi(D_80A66738) ## $t9 = 80A60000 -/* 094E8 80A647D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 094EC 80A647DC 000C6880 */ sll $t5, $t4, 2 -/* 094F0 80A647E0 032DC821 */ addu $t9, $t9, $t5 -/* 094F4 80A647E4 8F396738 */ lw $t9, %lo(D_80A66738)($t9) -/* 094F8 80A647E8 8FA50074 */ lw $a1, 0x0074($sp) -/* 094FC 80A647EC 0320F809 */ jalr $ra, $t9 -/* 09500 80A647F0 00000000 */ nop -/* 09504 80A647F4 8E0E01F0 */ lw $t6, 0x01F0($s0) ## 000001F0 -/* 09508 80A647F8 C60401C4 */ lwc1 $f4, 0x01C4($s0) ## 000001C4 -/* 0950C 80A647FC 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 09510 80A64800 01C17824 */ and $t7, $t6, $at -/* 09514 80A64804 AE0F01F0 */ sw $t7, 0x01F0($s0) ## 000001F0 -/* 09518 80A64808 26180024 */ addiu $t8, $s0, 0x0024 ## $t8 = 00000024 -/* 0951C 80A6480C E6040214 */ swc1 $f4, 0x0214($s0) ## 00000214 -/* 09520 80A64810 AFB8003C */ sw $t8, 0x003C($sp) -/* 09524 80A64814 8F0A0000 */ lw $t2, 0x0000($t8) ## 00000024 -/* 09528 80A64818 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 0952C 80A6481C AE0A01F4 */ sw $t2, 0x01F4($s0) ## 000001F4 -/* 09530 80A64820 8F090004 */ lw $t1, 0x0004($t8) ## 00000028 -/* 09534 80A64824 316C2000 */ andi $t4, $t3, 0x2000 ## $t4 = 00000000 -/* 09538 80A64828 AE0901F8 */ sw $t1, 0x01F8($s0) ## 000001F8 -/* 0953C 80A6482C 8F0A0008 */ lw $t2, 0x0008($t8) ## 0000002C -/* 09540 80A64830 158001A3 */ bne $t4, $zero, .L80A64EC0 -/* 09544 80A64834 AE0A01FC */ sw $t2, 0x01FC($s0) ## 000001FC -/* 09548 80A64838 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C -/* 0954C 80A6483C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 09550 80A64840 10410004 */ beq $v0, $at, .L80A64854 -/* 09554 80A64844 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 09558 80A64848 10410002 */ beq $v0, $at, .L80A64854 -/* 0955C 80A6484C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 09560 80A64850 14410003 */ bne $v0, $at, .L80A64860 -.L80A64854: -/* 09564 80A64854 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09568 80A64858 0C298FEA */ jal func_80A63FA8 -/* 0956C 80A6485C 8FA50074 */ lw $a1, 0x0074($sp) -.L80A64860: -/* 09570 80A64860 8E0D020C */ lw $t5, 0x020C($s0) ## 0000020C -/* 09574 80A64864 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09578 80A64868 15A10003 */ bne $t5, $at, .L80A64878 -/* 0957C 80A6486C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09580 80A64870 0C299054 */ jal func_80A64150 -/* 09584 80A64874 8FA50074 */ lw $a1, 0x0074($sp) -.L80A64878: -/* 09588 80A64878 0C00B638 */ jal Actor_MoveForward - -/* 0958C 80A6487C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09590 80A64880 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 09594 80A64884 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 09598 80A64888 57210016 */ bnel $t9, $at, .L80A648E4 -/* 0959C 80A6488C 8E0B032C */ lw $t3, 0x032C($s0) ## 0000032C -/* 095A0 80A64890 8E02038C */ lw $v0, 0x038C($s0) ## 0000038C -/* 095A4 80A64894 50400013 */ beql $v0, $zero, .L80A648E4 -/* 095A8 80A64898 8E0B032C */ lw $t3, 0x032C($s0) ## 0000032C -/* 095AC 80A6489C C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 095B0 80A648A0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 095B4 80A648A4 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 095B8 80A648A8 E4460024 */ swc1 $f6, 0x0024($v0) ## 00000024 -/* 095BC 80A648AC C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 095C0 80A648B0 8E0E038C */ lw $t6, 0x038C($s0) ## 0000038C -/* 095C4 80A648B4 460A4400 */ add.s $f16, $f8, $f10 -/* 095C8 80A648B8 E5D00028 */ swc1 $f16, 0x0028($t6) ## 00000028 -/* 095CC 80A648BC 8E0F038C */ lw $t7, 0x038C($s0) ## 0000038C -/* 095D0 80A648C0 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 095D4 80A648C4 E5F2002C */ swc1 $f18, 0x002C($t7) ## 0000002C -/* 095D8 80A648C8 8E08038C */ lw $t0, 0x038C($s0) ## 0000038C -/* 095DC 80A648CC 861800B4 */ lh $t8, 0x00B4($s0) ## 000000B4 -/* 095E0 80A648D0 A51800B4 */ sh $t8, 0x00B4($t0) ## 000000B4 -/* 095E4 80A648D4 8E0A038C */ lw $t2, 0x038C($s0) ## 0000038C -/* 095E8 80A648D8 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 095EC 80A648DC A54900B6 */ sh $t1, 0x00B6($t2) ## 000000B6 -/* 095F0 80A648E0 8E0B032C */ lw $t3, 0x032C($s0) ## 0000032C -.L80A648E4: -/* 095F4 80A648E4 916C0017 */ lbu $t4, 0x0017($t3) ## 00000017 -/* 095F8 80A648E8 318D0002 */ andi $t5, $t4, 0x0002 ## $t5 = 00000000 -/* 095FC 80A648EC 11A0000C */ beq $t5, $zero, .L80A64920 -/* 09600 80A648F0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 09604 80A648F4 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 09608 80A648F8 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 0960C 80A648FC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 09610 80A64900 4600203C */ c.lt.s $f4, $f0 -/* 09614 80A64904 00000000 */ nop -/* 09618 80A64908 45020006 */ bc1fl .L80A64924 -/* 0961C 80A6490C 92190321 */ lbu $t9, 0x0321($s0) ## 00000321 -/* 09620 80A64910 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 09624 80A64914 00000000 */ nop -/* 09628 80A64918 46060201 */ sub.s $f8, $f0, $f6 -/* 0962C 80A6491C E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -.L80A64920: -/* 09630 80A64920 92190321 */ lbu $t9, 0x0321($s0) ## 00000321 -.L80A64924: -/* 09634 80A64924 332E0002 */ andi $t6, $t9, 0x0002 ## $t6 = 00000000 -/* 09638 80A64928 51C00016 */ beql $t6, $zero, .L80A64984 -/* 0963C 80A6492C 8E0B014C */ lw $t3, 0x014C($s0) ## 0000014C -/* 09640 80A64930 8E180228 */ lw $t8, 0x0228($s0) ## 00000228 -/* 09644 80A64934 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 09648 80A64938 3C078013 */ lui $a3, %hi(D_801333E0) -/* 0964C 80A6493C ACB80000 */ sw $t8, 0x0000($a1) ## 0000021C -/* 09650 80A64940 8E0F022C */ lw $t7, 0x022C($s0) ## 0000022C -/* 09654 80A64944 3C0A8013 */ lui $t2, %hi(D_801333E8) -/* 09658 80A64948 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 0965C 80A6494C ACAF0004 */ sw $t7, 0x0004($a1) ## 00000220 -/* 09660 80A64950 8E180230 */ lw $t8, 0x0230($s0) ## 00000230 -/* 09664 80A64954 254A33E8 */ addiu $t2, %lo(D_801333E8) -/* 09668 80A64958 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 0966C 80A6495C ACB80008 */ sw $t8, 0x0008($a1) ## 00000224 -/* 09670 80A64960 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -/* 09674 80A64964 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 09678 80A64968 00084900 */ sll $t1, $t0, 4 -/* 0967C 80A6496C 05230005 */ bgezl $t1, .L80A64984 -/* 09680 80A64970 8E0B014C */ lw $t3, 0x014C($s0) ## 0000014C -/* 09684 80A64974 AFA70010 */ sw $a3, 0x0010($sp) -/* 09688 80A64978 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 0968C 80A6497C AFAA0014 */ sw $t2, 0x0014($sp) -/* 09690 80A64980 8E0B014C */ lw $t3, 0x014C($s0) ## 0000014C -.L80A64984: -/* 09694 80A64984 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 09698 80A64988 11610003 */ beq $t3, $at, .L80A64998 -/* 0969C 80A6498C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 096A0 80A64990 0C299120 */ jal func_80A64480 -/* 096A4 80A64994 8FA50074 */ lw $a1, 0x0074($sp) -.L80A64998: -/* 096A8 80A64998 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 -/* 096AC 80A6499C AFA50030 */ sw $a1, 0x0030($sp) -/* 096B0 80A649A0 0C0189B7 */ jal Collider_UpdateCylinder - -/* 096B4 80A649A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 096B8 80A649A8 260502C4 */ addiu $a1, $s0, 0x02C4 ## $a1 = 000002C4 -/* 096BC 80A649AC AFA50034 */ sw $a1, 0x0034($sp) -/* 096C0 80A649B0 0C0189B7 */ jal Collider_UpdateCylinder - -/* 096C4 80A649B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 096C8 80A649B8 0C01DE1C */ jal Math_SinS - ## sins? -/* 096CC 80A649BC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 096D0 80A649C0 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 096D4 80A649C4 44815000 */ mtc1 $at, $f10 ## $f10 = 11.00 -/* 096D8 80A649C8 860F02BE */ lh $t7, 0x02BE($s0) ## 000002BE -/* 096DC 80A649CC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 096E0 80A649D0 460A0402 */ mul.s $f16, $f0, $f10 -/* 096E4 80A649D4 4600848D */ trunc.w.s $f18, $f16 -/* 096E8 80A649D8 440E9000 */ mfc1 $t6, $f18 -/* 096EC 80A649DC 00000000 */ nop -/* 096F0 80A649E0 01CFC021 */ addu $t8, $t6, $t7 -/* 096F4 80A649E4 0C01DE0D */ jal Math_CosS - ## coss? -/* 096F8 80A649E8 A61802BE */ sh $t8, 0x02BE($s0) ## 000002BE -/* 096FC 80A649EC 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 09700 80A649F0 44812000 */ mtc1 $at, $f4 ## $f4 = 11.00 -/* 09704 80A649F4 860C02C2 */ lh $t4, 0x02C2($s0) ## 000002C2 -/* 09708 80A649F8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0970C 80A649FC 46040182 */ mul.s $f6, $f0, $f4 -/* 09710 80A64A00 4600320D */ trunc.w.s $f8, $f6 -/* 09714 80A64A04 440B4000 */ mfc1 $t3, $f8 -/* 09718 80A64A08 00000000 */ nop -/* 0971C 80A64A0C 016C6821 */ addu $t5, $t3, $t4 -/* 09720 80A64A10 0C01DE1C */ jal Math_SinS - ## sins? -/* 09724 80A64A14 A60D02C2 */ sh $t5, 0x02C2($s0) ## 000002C2 -/* 09728 80A64A18 3C01C190 */ lui $at, 0xC190 ## $at = C1900000 -/* 0972C 80A64A1C 44815000 */ mtc1 $at, $f10 ## $f10 = -18.00 -/* 09730 80A64A20 8608030A */ lh $t0, 0x030A($s0) ## 0000030A -/* 09734 80A64A24 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 09738 80A64A28 460A0402 */ mul.s $f16, $f0, $f10 -/* 0973C 80A64A2C 4600848D */ trunc.w.s $f18, $f16 -/* 09740 80A64A30 44189000 */ mfc1 $t8, $f18 -/* 09744 80A64A34 00000000 */ nop -/* 09748 80A64A38 03084821 */ addu $t1, $t8, $t0 -/* 0974C 80A64A3C 0C01DE0D */ jal Math_CosS - ## coss? -/* 09750 80A64A40 A609030A */ sh $t1, 0x030A($s0) ## 0000030A -/* 09754 80A64A44 3C01C190 */ lui $at, 0xC190 ## $at = C1900000 -/* 09758 80A64A48 44812000 */ mtc1 $at, $f4 ## $f4 = -18.00 -/* 0975C 80A64A4C 8619030E */ lh $t9, 0x030E($s0) ## 0000030E -/* 09760 80A64A50 8FA40074 */ lw $a0, 0x0074($sp) -/* 09764 80A64A54 46040182 */ mul.s $f6, $f0, $f4 -/* 09768 80A64A58 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0976C 80A64A5C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 09770 80A64A60 00812821 */ addu $a1, $a0, $at -/* 09774 80A64A64 4600320D */ trunc.w.s $f8, $f6 -/* 09778 80A64A68 440D4000 */ mfc1 $t5, $f8 -/* 0977C 80A64A6C 00000000 */ nop -/* 09780 80A64A70 01B97021 */ addu $t6, $t5, $t9 -/* 09784 80A64A74 A60E030E */ sh $t6, 0x030E($s0) ## 0000030E -/* 09788 80A64A78 AFA50038 */ sw $a1, 0x0038($sp) -/* 0978C 80A64A7C 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 09790 80A64A80 8FA60030 */ lw $a2, 0x0030($sp) -/* 09794 80A64A84 8FA40074 */ lw $a0, 0x0074($sp) -/* 09798 80A64A88 8FA50038 */ lw $a1, 0x0038($sp) -/* 0979C 80A64A8C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 097A0 80A64A90 8FA60030 */ lw $a2, 0x0030($sp) -/* 097A4 80A64A94 8FA40074 */ lw $a0, 0x0074($sp) -/* 097A8 80A64A98 8FA50038 */ lw $a1, 0x0038($sp) -/* 097AC 80A64A9C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 097B0 80A64AA0 8FA60034 */ lw $a2, 0x0034($sp) -/* 097B4 80A64AA4 8FA3004C */ lw $v1, 0x004C($sp) -/* 097B8 80A64AA8 8C6F067C */ lw $t7, 0x067C($v1) ## 0000067C -/* 097BC 80A64AAC 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 097C0 80A64AB0 53000015 */ beql $t8, $zero, .L80A64B08 -/* 097C4 80A64AB4 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 097C8 80A64AB8 8C680440 */ lw $t0, 0x0440($v1) ## 00000440 -/* 097CC 80A64ABC 8FA50074 */ lw $a1, 0x0074($sp) -/* 097D0 80A64AC0 51000011 */ beql $t0, $zero, .L80A64B08 -/* 097D4 80A64AC4 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 097D8 80A64AC8 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 097DC 80A64ACC 24030063 */ addiu $v1, $zero, 0x0063 ## $v1 = 00000063 -/* 097E0 80A64AD0 1462000A */ bne $v1, $v0, .L80A64AFC -/* 097E4 80A64AD4 00000000 */ nop -/* 097E8 80A64AD8 1462000A */ bne $v1, $v0, .L80A64B04 -/* 097EC 80A64ADC 3C01C516 */ lui $at, 0xC516 ## $at = C5160000 -/* 097F0 80A64AE0 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 097F4 80A64AE4 44818000 */ mtc1 $at, $f16 ## $f16 = -2400.00 -/* 097F8 80A64AE8 00000000 */ nop -/* 097FC 80A64AEC 4610503C */ c.lt.s $f10, $f16 -/* 09800 80A64AF0 00000000 */ nop -/* 09804 80A64AF4 45020004 */ bc1fl .L80A64B08 -/* 09808 80A64AF8 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -.L80A64AFC: -/* 0980C 80A64AFC 0C29915E */ jal func_80A64578 -/* 09810 80A64B00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A64B04: -/* 09814 80A64B04 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -.L80A64B08: -/* 09818 80A64B08 3C01FEFF */ lui $at, 0xFEFF ## $at = FEFF0000 -/* 0981C 80A64B0C 8FA50074 */ lw $a1, 0x0074($sp) -/* 09820 80A64B10 000249C0 */ sll $t1, $v0, 7 -/* 09824 80A64B14 0520001A */ bltz $t1, .L80A64B80 -/* 09828 80A64B18 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FEFFFFFF -/* 0982C 80A64B1C 0C298D28 */ jal func_80A634A0 -/* 09830 80A64B20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09834 80A64B24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09838 80A64B28 0C298AB3 */ jal func_80A62ACC -/* 0983C 80A64B2C 8FA50074 */ lw $a1, 0x0074($sp) -/* 09840 80A64B30 C60C0028 */ lwc1 $f12, 0x0028($s0) ## 00000028 -/* 09844 80A64B34 C6000248 */ lwc1 $f0, 0x0248($s0) ## 00000248 -/* 09848 80A64B38 4600603C */ c.lt.s $f12, $f0 -/* 0984C 80A64B3C 00000000 */ nop -/* 09850 80A64B40 4500000D */ bc1f .L80A64B78 -/* 09854 80A64B44 00000000 */ nop -/* 09858 80A64B48 C602024C */ lwc1 $f2, 0x024C($s0) ## 0000024C -/* 0985C 80A64B4C 4602603C */ c.lt.s $f12, $f2 -/* 09860 80A64B50 00000000 */ nop -/* 09864 80A64B54 45000008 */ bc1f .L80A64B78 -/* 09868 80A64B58 00000000 */ nop -/* 0986C 80A64B5C 4600103C */ c.lt.s $f2, $f0 -/* 09870 80A64B60 00000000 */ nop -/* 09874 80A64B64 45020004 */ bc1fl .L80A64B78 -/* 09878 80A64B68 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 -/* 0987C 80A64B6C 10000002 */ beq $zero, $zero, .L80A64B78 -/* 09880 80A64B70 E6020028 */ swc1 $f2, 0x0028($s0) ## 00000028 -/* 09884 80A64B74 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 -.L80A64B78: -/* 09888 80A64B78 10000003 */ beq $zero, $zero, .L80A64B88 -/* 0988C 80A64B7C 8FA50074 */ lw $a1, 0x0074($sp) -.L80A64B80: -/* 09890 80A64B80 00415024 */ and $t2, $v0, $at -/* 09894 80A64B84 AE0A01F0 */ sw $t2, 0x01F0($s0) ## 000001F0 -.L80A64B88: -/* 09898 80A64B88 84AB00A4 */ lh $t3, 0x00A4($a1) ## 000000A4 -/* 0989C 80A64B8C 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 098A0 80A64B90 3C0C8016 */ lui $t4, %hi(gSaveContext+0xee6) -/* 098A4 80A64B94 55610009 */ bnel $t3, $at, .L80A64BBC -/* 098A8 80A64B98 8FB9003C */ lw $t9, 0x003C($sp) -/* 098AC 80A64B9C 958CF546 */ lhu $t4, %lo(gSaveContext+0xee6)($t4) -/* 098B0 80A64BA0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 098B4 80A64BA4 318D000F */ andi $t5, $t4, 0x000F ## $t5 = 00000000 -/* 098B8 80A64BA8 51A10004 */ beql $t5, $at, .L80A64BBC -/* 098BC 80A64BAC 8FB9003C */ lw $t9, 0x003C($sp) -/* 098C0 80A64BB0 0C296D14 */ jal func_80A5B450 -/* 098C4 80A64BB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 098C8 80A64BB8 8FB9003C */ lw $t9, 0x003C($sp) -.L80A64BBC: -/* 098CC 80A64BBC 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 098D0 80A64BC0 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 -/* 098D4 80A64BC4 8F2F0000 */ lw $t7, 0x0000($t9) ## 00000000 -/* 098D8 80A64BC8 AE0F0038 */ sw $t7, 0x0038($s0) ## 00000038 -/* 098DC 80A64BCC 8F2E0004 */ lw $t6, 0x0004($t9) ## 00000004 -/* 098E0 80A64BD0 AE0E003C */ sw $t6, 0x003C($s0) ## 0000003C -/* 098E4 80A64BD4 C612003C */ lwc1 $f18, 0x003C($s0) ## 0000003C -/* 098E8 80A64BD8 8F2F0008 */ lw $t7, 0x0008($t9) ## 00000008 -/* 098EC 80A64BDC 46049180 */ add.s $f6, $f18, $f4 -/* 098F0 80A64BE0 AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 -/* 098F4 80A64BE4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 098F8 80A64BE8 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C -/* 098FC 80A64BEC 3C0180A6 */ lui $at, %hi(D_80A669BC) ## $at = 80A60000 -/* 09900 80A64BF0 C42869BC */ lwc1 $f8, %lo(D_80A669BC)($at) -/* 09904 80A64BF4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 09908 80A64BF8 240D00FE */ addiu $t5, $zero, 0x00FE ## $t5 = 000000FE -/* 0990C 80A64BFC 4608003C */ c.lt.s $f0, $f8 -/* 09910 80A64C00 00000000 */ nop -/* 09914 80A64C04 45020007 */ bc1fl .L80A64C24 -/* 09918 80A64C08 9202037A */ lbu $v0, 0x037A($s0) ## 0000037A -/* 0991C 80A64C0C 9202037A */ lbu $v0, 0x037A($s0) ## 0000037A -/* 09920 80A64C10 14400003 */ bne $v0, $zero, .L80A64C20 -/* 09924 80A64C14 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 -/* 09928 80A64C18 10000009 */ beq $zero, $zero, .L80A64C40 -/* 0992C 80A64C1C A218037A */ sb $t8, 0x037A($s0) ## 0000037A -.L80A64C20: -/* 09930 80A64C20 9202037A */ lbu $v0, 0x037A($s0) ## 0000037A -.L80A64C24: -/* 09934 80A64C24 18400006 */ blez $v0, .L80A64C40 -/* 09938 80A64C28 24480001 */ addiu $t0, $v0, 0x0001 ## $t0 = 00000001 -/* 0993C 80A64C2C 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000001 -/* 09940 80A64C30 29210004 */ slti $at, $t1, 0x0004 -/* 09944 80A64C34 14200002 */ bne $at, $zero, .L80A64C40 -/* 09948 80A64C38 A208037A */ sb $t0, 0x037A($s0) ## 0000037A -/* 0994C 80A64C3C A200037A */ sb $zero, 0x037A($s0) ## 0000037A -.L80A64C40: -/* 09950 80A64C40 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 09954 80A64C44 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 09958 80A64C48 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 0995C 80A64C4C 46105032 */ c.eq.s $f10, $f16 -/* 09960 80A64C50 3C088016 */ lui $t0, %hi(gSaveContext) -/* 09964 80A64C54 3C098016 */ lui $t1, %hi(gSaveContext+0x1360) -/* 09968 80A64C58 45020009 */ bc1fl .L80A64C80 -/* 0996C 80A64C5C A20D00AE */ sb $t5, 0x00AE($s0) ## 000000AE -/* 09970 80A64C60 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 -/* 09974 80A64C64 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 09978 80A64C68 000A5B00 */ sll $t3, $t2, 12 -/* 0997C 80A64C6C 05620004 */ bltzl $t3, .L80A64C80 -/* 09980 80A64C70 A20D00AE */ sb $t5, 0x00AE($s0) ## 000000AE -/* 09984 80A64C74 10000002 */ beq $zero, $zero, .L80A64C80 -/* 09988 80A64C78 A20C00AE */ sb $t4, 0x00AE($s0) ## 000000AE -/* 0998C 80A64C7C A20D00AE */ sb $t5, 0x00AE($s0) ## 000000AE -.L80A64C80: -/* 09990 80A64C80 C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 -/* 09994 80A64C84 4612203E */ c.le.s $f4, $f18 -/* 09998 80A64C88 00000000 */ nop -/* 0999C 80A64C8C 45020006 */ bc1fl .L80A64CA8 -/* 099A0 80A64C90 920F0288 */ lbu $t7, 0x0288($s0) ## 00000288 -/* 099A4 80A64C94 92190288 */ lbu $t9, 0x0288($s0) ## 00000288 -/* 099A8 80A64C98 372E0001 */ ori $t6, $t9, 0x0001 ## $t6 = 00000001 -/* 099AC 80A64C9C 10000004 */ beq $zero, $zero, .L80A64CB0 -/* 099B0 80A64CA0 A20E0288 */ sb $t6, 0x0288($s0) ## 00000288 -/* 099B4 80A64CA4 920F0288 */ lbu $t7, 0x0288($s0) ## 00000288 -.L80A64CA8: -/* 099B8 80A64CA8 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 -/* 099BC 80A64CAC A2180288 */ sb $t8, 0x0288($s0) ## 00000288 -.L80A64CB0: -/* 099C0 80A64CB0 8D08E660 */ lw $t0, %lo(gSaveContext)($t0) -/* 099C4 80A64CB4 24010157 */ addiu $at, $zero, 0x0157 ## $at = 00000157 -/* 099C8 80A64CB8 55010006 */ bnel $t0, $at, .L80A64CD4 -/* 099CC 80A64CBC 960203C8 */ lhu $v0, 0x03C8($s0) ## 000003C8 -/* 099D0 80A64CC0 8D29F9C0 */ lw $t1, %lo(gSaveContext+0x1360)($t1) -/* 099D4 80A64CC4 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 099D8 80A64CC8 51210079 */ beql $t1, $at, .L80A64EB0 -/* 099DC 80A64CCC 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -/* 099E0 80A64CD0 960203C8 */ lhu $v0, 0x03C8($s0) ## 000003C8 -.L80A64CD4: -/* 099E4 80A64CD4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 099E8 80A64CD8 304A0001 */ andi $t2, $v0, 0x0001 ## $t2 = 00000000 -/* 099EC 80A64CDC 1140001C */ beq $t2, $zero, .L80A64D50 -/* 099F0 80A64CE0 30580002 */ andi $t8, $v0, 0x0002 ## $t8 = 00000000 -/* 099F4 80A64CE4 304BFFFE */ andi $t3, $v0, 0xFFFE ## $t3 = 00000000 -/* 099F8 80A64CE8 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 099FC 80A64CEC 0C29919F */ jal func_80A6467C -/* 09A00 80A64CF0 A60B03C8 */ sh $t3, 0x03C8($s0) ## 000003C8 -/* 09A04 80A64CF4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 09A08 80A64CF8 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 09A0C 80A64CFC 0C29919F */ jal func_80A6467C -/* 09A10 80A64D00 AFA20040 */ sw $v0, 0x0040($sp) -/* 09A14 80A64D04 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 09A18 80A64D08 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 09A1C 80A64D0C 0C29919F */ jal func_80A6467C -/* 09A20 80A64D10 AFA20044 */ sw $v0, 0x0044($sp) -/* 09A24 80A64D14 8FAC0040 */ lw $t4, 0x0040($sp) -/* 09A28 80A64D18 8FB90044 */ lw $t9, 0x0044($sp) -/* 09A2C 80A64D1C 244F001E */ addiu $t7, $v0, 0x001E ## $t7 = 0000001E -/* 09A30 80A64D20 258D00C8 */ addiu $t5, $t4, 0x00C8 ## $t5 = 000000C8 -/* 09A34 80A64D24 272E001E */ addiu $t6, $t9, 0x001E ## $t6 = 0000001E -/* 09A38 80A64D28 AFAE0014 */ sw $t6, 0x0014($sp) -/* 09A3C 80A64D2C AFAD0010 */ sw $t5, 0x0010($sp) -/* 09A40 80A64D30 AFAF0018 */ sw $t7, 0x0018($sp) -/* 09A44 80A64D34 8FA40074 */ lw $a0, 0x0074($sp) -/* 09A48 80A64D38 260503CC */ addiu $a1, $s0, 0x03CC ## $a1 = 000003CC -/* 09A4C 80A64D3C 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFE0 -/* 09A50 80A64D40 0C00A1EB */ jal func_800287AC -/* 09A54 80A64D44 27A7005C */ addiu $a3, $sp, 0x005C ## $a3 = FFFFFFEC -/* 09A58 80A64D48 10000059 */ beq $zero, $zero, .L80A64EB0 -/* 09A5C 80A64D4C 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -.L80A64D50: -/* 09A60 80A64D50 1300001D */ beq $t8, $zero, .L80A64DC8 -/* 09A64 80A64D54 30590004 */ andi $t9, $v0, 0x0004 ## $t9 = 00000000 -/* 09A68 80A64D58 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 09A6C 80A64D5C 3048FFFD */ andi $t0, $v0, 0xFFFD ## $t0 = 00000000 -/* 09A70 80A64D60 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 09A74 80A64D64 0C29919F */ jal func_80A6467C -/* 09A78 80A64D68 A60803C8 */ sh $t0, 0x03C8($s0) ## 000003C8 -/* 09A7C 80A64D6C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 09A80 80A64D70 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 09A84 80A64D74 0C29919F */ jal func_80A6467C -/* 09A88 80A64D78 AFA20040 */ sw $v0, 0x0040($sp) -/* 09A8C 80A64D7C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 09A90 80A64D80 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 09A94 80A64D84 0C29919F */ jal func_80A6467C -/* 09A98 80A64D88 AFA20044 */ sw $v0, 0x0044($sp) -/* 09A9C 80A64D8C 8FA90040 */ lw $t1, 0x0040($sp) -/* 09AA0 80A64D90 8FAB0044 */ lw $t3, 0x0044($sp) -/* 09AA4 80A64D94 244D001E */ addiu $t5, $v0, 0x001E ## $t5 = 0000001E -/* 09AA8 80A64D98 252A00C8 */ addiu $t2, $t1, 0x00C8 ## $t2 = 000000C8 -/* 09AAC 80A64D9C 256C001E */ addiu $t4, $t3, 0x001E ## $t4 = 0000001E -/* 09AB0 80A64DA0 AFAC0014 */ sw $t4, 0x0014($sp) -/* 09AB4 80A64DA4 AFAA0010 */ sw $t2, 0x0010($sp) -/* 09AB8 80A64DA8 AFAD0018 */ sw $t5, 0x0018($sp) -/* 09ABC 80A64DAC 8FA40074 */ lw $a0, 0x0074($sp) -/* 09AC0 80A64DB0 260503D8 */ addiu $a1, $s0, 0x03D8 ## $a1 = 000003D8 -/* 09AC4 80A64DB4 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFE0 -/* 09AC8 80A64DB8 0C00A1EB */ jal func_800287AC -/* 09ACC 80A64DBC 27A7005C */ addiu $a3, $sp, 0x005C ## $a3 = FFFFFFEC -/* 09AD0 80A64DC0 1000003B */ beq $zero, $zero, .L80A64EB0 -/* 09AD4 80A64DC4 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -.L80A64DC8: -/* 09AD8 80A64DC8 1320001D */ beq $t9, $zero, .L80A64E40 -/* 09ADC 80A64DCC 304B0008 */ andi $t3, $v0, 0x0008 ## $t3 = 00000000 -/* 09AE0 80A64DD0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 09AE4 80A64DD4 304EFFFB */ andi $t6, $v0, 0xFFFB ## $t6 = 00000000 -/* 09AE8 80A64DD8 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 09AEC 80A64DDC 0C29919F */ jal func_80A6467C -/* 09AF0 80A64DE0 A60E03C8 */ sh $t6, 0x03C8($s0) ## 000003C8 -/* 09AF4 80A64DE4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 09AF8 80A64DE8 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 09AFC 80A64DEC 0C29919F */ jal func_80A6467C -/* 09B00 80A64DF0 AFA20040 */ sw $v0, 0x0040($sp) -/* 09B04 80A64DF4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 09B08 80A64DF8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 09B0C 80A64DFC 0C29919F */ jal func_80A6467C -/* 09B10 80A64E00 AFA20044 */ sw $v0, 0x0044($sp) -/* 09B14 80A64E04 8FAF0040 */ lw $t7, 0x0040($sp) -/* 09B18 80A64E08 8FA80044 */ lw $t0, 0x0044($sp) -/* 09B1C 80A64E0C 244A001E */ addiu $t2, $v0, 0x001E ## $t2 = 0000001E -/* 09B20 80A64E10 25F800C8 */ addiu $t8, $t7, 0x00C8 ## $t8 = 000000C8 -/* 09B24 80A64E14 2509001E */ addiu $t1, $t0, 0x001E ## $t1 = 0000001E -/* 09B28 80A64E18 AFA90014 */ sw $t1, 0x0014($sp) -/* 09B2C 80A64E1C AFB80010 */ sw $t8, 0x0010($sp) -/* 09B30 80A64E20 AFAA0018 */ sw $t2, 0x0018($sp) -/* 09B34 80A64E24 8FA40074 */ lw $a0, 0x0074($sp) -/* 09B38 80A64E28 260503E4 */ addiu $a1, $s0, 0x03E4 ## $a1 = 000003E4 -/* 09B3C 80A64E2C 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFE0 -/* 09B40 80A64E30 0C00A1EB */ jal func_800287AC -/* 09B44 80A64E34 27A7005C */ addiu $a3, $sp, 0x005C ## $a3 = FFFFFFEC -/* 09B48 80A64E38 1000001D */ beq $zero, $zero, .L80A64EB0 -/* 09B4C 80A64E3C 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -.L80A64E40: -/* 09B50 80A64E40 1160001A */ beq $t3, $zero, .L80A64EAC -/* 09B54 80A64E44 304CFFF7 */ andi $t4, $v0, 0xFFF7 ## $t4 = 00000000 -/* 09B58 80A64E48 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 09B5C 80A64E4C 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 09B60 80A64E50 0C29919F */ jal func_80A6467C -/* 09B64 80A64E54 A60C03C8 */ sh $t4, 0x03C8($s0) ## 000003C8 -/* 09B68 80A64E58 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 09B6C 80A64E5C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 09B70 80A64E60 0C29919F */ jal func_80A6467C -/* 09B74 80A64E64 AFA20040 */ sw $v0, 0x0040($sp) -/* 09B78 80A64E68 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 09B7C 80A64E6C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 09B80 80A64E70 0C29919F */ jal func_80A6467C -/* 09B84 80A64E74 AFA20044 */ sw $v0, 0x0044($sp) -/* 09B88 80A64E78 8FAD0040 */ lw $t5, 0x0040($sp) -/* 09B8C 80A64E7C 8FAE0044 */ lw $t6, 0x0044($sp) -/* 09B90 80A64E80 2458001E */ addiu $t8, $v0, 0x001E ## $t8 = 0000001E -/* 09B94 80A64E84 25B900C8 */ addiu $t9, $t5, 0x00C8 ## $t9 = 000000C8 -/* 09B98 80A64E88 25CF001E */ addiu $t7, $t6, 0x001E ## $t7 = 0000001E -/* 09B9C 80A64E8C AFAF0014 */ sw $t7, 0x0014($sp) -/* 09BA0 80A64E90 AFB90010 */ sw $t9, 0x0010($sp) -/* 09BA4 80A64E94 AFB80018 */ sw $t8, 0x0018($sp) -/* 09BA8 80A64E98 8FA40074 */ lw $a0, 0x0074($sp) -/* 09BAC 80A64E9C 260503F0 */ addiu $a1, $s0, 0x03F0 ## $a1 = 000003F0 -/* 09BB0 80A64EA0 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFE0 -/* 09BB4 80A64EA4 0C00A1EB */ jal func_800287AC -/* 09BB8 80A64EA8 27A7005C */ addiu $a3, $sp, 0x005C ## $a3 = FFFFFFEC -.L80A64EAC: -/* 09BBC 80A64EAC 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -.L80A64EB0: -/* 09BC0 80A64EB0 3C01F7FF */ lui $at, 0xF7FF ## $at = F7FF0000 -/* 09BC4 80A64EB4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = F7FFFFFF -/* 09BC8 80A64EB8 01014824 */ and $t1, $t0, $at -/* 09BCC 80A64EBC AE0901F0 */ sw $t1, 0x01F0($s0) ## 000001F0 -.L80A64EC0: -/* 09BD0 80A64EC0 8FBF002C */ lw $ra, 0x002C($sp) -/* 09BD4 80A64EC4 8FB00028 */ lw $s0, 0x0028($sp) -/* 09BD8 80A64EC8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 09BDC 80A64ECC 03E00008 */ jr $ra -/* 09BE0 80A64ED0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s deleted file mode 100644 index f6295d9ea1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s +++ /dev/null @@ -1,101 +0,0 @@ -.late_rodata -glabel D_80A6684C - .word 0x414CCCCD - -.text -glabel func_80A5B2F0 -/* 00000 80A5B2F0 84AE00A4 */ lh $t6, 0x00A4($a1) ## 000000A4 -/* 00004 80A5B2F4 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 00008 80A5B2F8 11C10003 */ beq $t6, $at, .L80A5B308 -/* 0000C 80A5B2FC 00000000 */ nop -/* 00010 80A5B300 03E00008 */ jr $ra -/* 00014 80A5B304 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A5B308: -/* 00018 80A5B308 3C0180A6 */ lui $at, %hi(D_80A6684C) ## $at = 80A60000 -/* 0001C 80A5B30C C426684C */ lwc1 $f6, %lo(D_80A6684C)($at) -/* 00020 80A5B310 C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 00024 80A5B314 3C0F8016 */ lui $t7, %hi(gSaveContext+0xee6) -/* 00028 80A5B318 4606203C */ c.lt.s $f4, $f6 -/* 0002C 80A5B31C 00000000 */ nop -/* 00030 80A5B320 45000003 */ bc1f .L80A5B330 -/* 00034 80A5B324 00000000 */ nop -/* 00038 80A5B328 03E00008 */ jr $ra -/* 0003C 80A5B32C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A5B330: -/* 00040 80A5B330 95EFF546 */ lhu $t7, %lo(gSaveContext+0xee6)($t7) -/* 00044 80A5B334 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00048 80A5B338 3C0380A6 */ lui $v1, %hi(D_80A665DC) ## $v1 = 80A60000 -/* 0004C 80A5B33C 31F8000F */ andi $t8, $t7, 0x000F ## $t8 = 00000000 -/* 00050 80A5B340 17010003 */ bne $t8, $at, .L80A5B350 -/* 00054 80A5B344 246365DC */ addiu $v1, $v1, %lo(D_80A665DC) ## $v1 = 80A665DC -/* 00058 80A5B348 03E00008 */ jr $ra -/* 0005C 80A5B34C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A5B350: -/* 00060 80A5B350 3C0780A6 */ lui $a3, %hi(D_80A66604) ## $a3 = 80A60000 -/* 00064 80A5B354 24E76604 */ addiu $a3, $a3, %lo(D_80A66604) ## $a3 = 80A66604 -/* 00068 80A5B358 C48E002C */ lwc1 $f14, 0x002C($a0) ## 0000002C -/* 0006C 80A5B35C 84790004 */ lh $t9, 0x0004($v1) ## 80A665E0 -.L80A5B360: -/* 00070 80A5B360 84690006 */ lh $t1, 0x0006($v1) ## 80A665E2 -/* 00074 80A5B364 84680008 */ lh $t0, 0x0008($v1) ## 80A665E4 -/* 00078 80A5B368 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 0007C 80A5B36C 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 00080 80A5B370 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 00084 80A5B374 46804020 */ cvt.s.w $f0, $f8 -/* 00088 80A5B378 46809120 */ cvt.s.w $f4, $f18 -/* 0008C 80A5B37C 46805420 */ cvt.s.w $f16, $f10 -/* 00090 80A5B380 46040180 */ add.s $f6, $f0, $f4 -/* 00094 80A5B384 46068080 */ add.s $f2, $f16, $f6 -/* 00098 80A5B388 4600103C */ c.lt.s $f2, $f0 -/* 0009C 80A5B38C 00000000 */ nop -/* 000A0 80A5B390 45020005 */ bc1fl .L80A5B3A8 -/* 000A4 80A5B394 846A0000 */ lh $t2, 0x0000($v1) ## 80A665DC -/* 000A8 80A5B398 46000306 */ mov.s $f12, $f0 -/* 000AC 80A5B39C 46001006 */ mov.s $f0, $f2 -/* 000B0 80A5B3A0 46006086 */ mov.s $f2, $f12 -/* 000B4 80A5B3A4 846A0000 */ lh $t2, 0x0000($v1) ## 80A665DC -.L80A5B3A8: -/* 000B8 80A5B3A8 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 000BC 80A5B3AC 00000000 */ nop -/* 000C0 80A5B3B0 468042A0 */ cvt.s.w $f10, $f8 -/* 000C4 80A5B3B4 460E503C */ c.lt.s $f10, $f14 -/* 000C8 80A5B3B8 00000000 */ nop -/* 000CC 80A5B3BC 4502001F */ bc1fl .L80A5B43C -/* 000D0 80A5B3C0 24630014 */ addiu $v1, $v1, 0x0014 ## $v1 = 80A665F0 -/* 000D4 80A5B3C4 846B0002 */ lh $t3, 0x0002($v1) ## 80A665F2 -/* 000D8 80A5B3C8 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 000DC 80A5B3CC 00000000 */ nop -/* 000E0 80A5B3D0 46809120 */ cvt.s.w $f4, $f18 -/* 000E4 80A5B3D4 4604703C */ c.lt.s $f14, $f4 -/* 000E8 80A5B3D8 00000000 */ nop -/* 000EC 80A5B3DC 45020017 */ bc1fl .L80A5B43C -/* 000F0 80A5B3E0 24630014 */ addiu $v1, $v1, 0x0014 ## $v1 = 80A66604 -/* 000F4 80A5B3E4 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 000F8 80A5B3E8 460C003C */ c.lt.s $f0, $f12 -/* 000FC 80A5B3EC 00000000 */ nop -/* 00100 80A5B3F0 45020012 */ bc1fl .L80A5B43C -/* 00104 80A5B3F4 24630014 */ addiu $v1, $v1, 0x0014 ## $v1 = 80A66618 -/* 00108 80A5B3F8 4602603C */ c.lt.s $f12, $f2 -/* 0010C 80A5B3FC 00000000 */ nop -/* 00110 80A5B400 4502000E */ bc1fl .L80A5B43C -/* 00114 80A5B404 24630014 */ addiu $v1, $v1, 0x0014 ## $v1 = 80A6662C -/* 00118 80A5B408 8462000A */ lh $v0, 0x000A($v1) ## 80A66636 -/* 0011C 80A5B40C 8465000C */ lh $a1, 0x000C($v1) ## 80A66638 -/* 00120 80A5B410 84860032 */ lh $a2, 0x0032($a0) ## 00000032 -/* 00124 80A5B414 00456023 */ subu $t4, $v0, $a1 -/* 00128 80A5B418 0186082A */ slt $at, $t4, $a2 -/* 0012C 80A5B41C 10200006 */ beq $at, $zero, .L80A5B438 -/* 00130 80A5B420 00A26821 */ addu $t5, $a1, $v0 -/* 00134 80A5B424 00CD082A */ slt $at, $a2, $t5 -/* 00138 80A5B428 50200004 */ beql $at, $zero, .L80A5B43C -/* 0013C 80A5B42C 24630014 */ addiu $v1, $v1, 0x0014 ## $v1 = 80A66640 -/* 00140 80A5B430 03E00008 */ jr $ra -/* 00144 80A5B434 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A5B438: -/* 00148 80A5B438 24630014 */ addiu $v1, $v1, 0x0014 ## $v1 = 80A66654 -.L80A5B43C: -/* 0014C 80A5B43C 5467FFC8 */ bnel $v1, $a3, .L80A5B360 -/* 00150 80A5B440 84790004 */ lh $t9, 0x0004($v1) ## 80A66658 -/* 00154 80A5B444 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00158 80A5B448 03E00008 */ jr $ra -/* 0015C 80A5B44C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B450.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B450.s deleted file mode 100644 index e727e7a7cc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B450.s +++ /dev/null @@ -1,91 +0,0 @@ -.late_rodata -glabel D_80A66850 - .word 0x414CCCCD - -.text -glabel func_80A5B450 -/* 00160 80A5B450 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00164 80A5B454 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00168 80A5B458 AFA5001C */ sw $a1, 0x001C($sp) -/* 0016C 80A5B45C 3C0180A6 */ lui $at, %hi(D_80A66850) ## $at = 80A60000 -/* 00170 80A5B460 C4266850 */ lwc1 $f6, %lo(D_80A66850)($at) -/* 00174 80A5B464 C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 00178 80A5B468 3C0280A6 */ lui $v0, %hi(D_80A665DC) ## $v0 = 80A60000 -/* 0017C 80A5B46C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00180 80A5B470 4606203C */ c.lt.s $f4, $f6 -/* 00184 80A5B474 244265DC */ addiu $v0, $v0, %lo(D_80A665DC) ## $v0 = 80A665DC -/* 00188 80A5B478 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0018C 80A5B47C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00190 80A5B480 45020004 */ bc1fl .L80A5B494 -/* 00194 80A5B484 C4EE002C */ lwc1 $f14, 0x002C($a3) ## 0000002C -/* 00198 80A5B488 1000003D */ beq $zero, $zero, .L80A5B580 -/* 0019C 80A5B48C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001A0 80A5B490 C4EE002C */ lwc1 $f14, 0x002C($a3) ## 0000002C -.L80A5B494: -/* 001A4 80A5B494 844E0004 */ lh $t6, 0x0004($v0) ## 00000004 -/* 001A8 80A5B498 844F0006 */ lh $t7, 0x0006($v0) ## 00000006 -/* 001AC 80A5B49C 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 001B0 80A5B4A0 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 001B4 80A5B4A4 46804020 */ cvt.s.w $f0, $f8 -/* 001B8 80A5B4A8 46805420 */ cvt.s.w $f16, $f10 -/* 001BC 80A5B4AC 46008300 */ add.s $f12, $f16, $f0 -/* 001C0 80A5B4B0 4600603C */ c.lt.s $f12, $f0 -/* 001C4 80A5B4B4 00000000 */ nop -/* 001C8 80A5B4B8 45020005 */ bc1fl .L80A5B4D0 -/* 001CC 80A5B4BC 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -/* 001D0 80A5B4C0 46000086 */ mov.s $f2, $f0 -/* 001D4 80A5B4C4 46006006 */ mov.s $f0, $f12 -/* 001D8 80A5B4C8 46001306 */ mov.s $f12, $f2 -/* 001DC 80A5B4CC 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -.L80A5B4D0: -/* 001E0 80A5B4D0 44989000 */ mtc1 $t8, $f18 ## $f18 = 0.00 -/* 001E4 80A5B4D4 00000000 */ nop -/* 001E8 80A5B4D8 46809120 */ cvt.s.w $f4, $f18 -/* 001EC 80A5B4DC 460E203C */ c.lt.s $f4, $f14 -/* 001F0 80A5B4E0 00000000 */ nop -/* 001F4 80A5B4E4 45020023 */ bc1fl .L80A5B574 -/* 001F8 80A5B4E8 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 -/* 001FC 80A5B4EC 84590002 */ lh $t9, 0x0002($v0) ## 00000002 -/* 00200 80A5B4F0 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 00204 80A5B4F4 00000000 */ nop -/* 00208 80A5B4F8 46803220 */ cvt.s.w $f8, $f6 -/* 0020C 80A5B4FC 4608703C */ c.lt.s $f14, $f8 -/* 00210 80A5B500 00000000 */ nop -/* 00214 80A5B504 4502001B */ bc1fl .L80A5B574 -/* 00218 80A5B508 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000002 -/* 0021C 80A5B50C C4E20024 */ lwc1 $f2, 0x0024($a3) ## 00000024 -/* 00220 80A5B510 4602003C */ c.lt.s $f0, $f2 -/* 00224 80A5B514 00000000 */ nop -/* 00228 80A5B518 45020016 */ bc1fl .L80A5B574 -/* 0022C 80A5B51C 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000003 -/* 00230 80A5B520 460C103C */ c.lt.s $f2, $f12 -/* 00234 80A5B524 00000000 */ nop -/* 00238 80A5B528 45020012 */ bc1fl .L80A5B574 -/* 0023C 80A5B52C 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000004 -/* 00240 80A5B530 8443000A */ lh $v1, 0x000A($v0) ## 0000000A -/* 00244 80A5B534 8444000C */ lh $a0, 0x000C($v0) ## 0000000C -/* 00248 80A5B538 84E50032 */ lh $a1, 0x0032($a3) ## 00000032 -/* 0024C 80A5B53C 00644823 */ subu $t1, $v1, $a0 -/* 00250 80A5B540 0125082A */ slt $at, $t1, $a1 -/* 00254 80A5B544 1020000A */ beq $at, $zero, .L80A5B570 -/* 00258 80A5B548 00835021 */ addu $t2, $a0, $v1 -/* 0025C 80A5B54C 00AA082A */ slt $at, $a1, $t2 -/* 00260 80A5B550 50200008 */ beql $at, $zero, .L80A5B574 -/* 00264 80A5B554 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000005 -/* 00268 80A5B558 A0E603AC */ sb $a2, 0x03AC($a3) ## 000003AC -/* 0026C 80A5B55C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00270 80A5B560 0C29892B */ jal func_80A624AC -/* 00274 80A5B564 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00278 80A5B568 10000005 */ beq $zero, $zero, .L80A5B580 -/* 0027C 80A5B56C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A5B570: -/* 00280 80A5B570 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 -.L80A5B574: -/* 00284 80A5B574 14C8FFC7 */ bne $a2, $t0, .L80A5B494 -/* 00288 80A5B578 24420014 */ addiu $v0, $v0, 0x0014 ## $v0 = 00000015 -/* 0028C 80A5B57C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A5B580: -/* 00290 80A5B580 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00294 80A5B584 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00298 80A5B588 03E00008 */ jr $ra -/* 0029C 80A5B58C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B590.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B590.s deleted file mode 100644 index 3453ccb82f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B590.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80A5B590 -/* 002A0 80A5B590 00057080 */ sll $t6, $a1, 2 -/* 002A4 80A5B594 01C57021 */ addu $t6, $t6, $a1 -/* 002A8 80A5B598 000E7040 */ sll $t6, $t6, 1 -/* 002AC 80A5B59C 008E1021 */ addu $v0, $a0, $t6 -/* 002B0 80A5B5A0 844F0000 */ lh $t7, 0x0000($v0) ## 00000000 -/* 002B4 80A5B5A4 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 002B8 80A5B5A8 00000000 */ nop -/* 002BC 80A5B5AC 468021A0 */ cvt.s.w $f6, $f4 -/* 002C0 80A5B5B0 E4C60000 */ swc1 $f6, 0x0000($a2) ## 00000000 -/* 002C4 80A5B5B4 84580002 */ lh $t8, 0x0002($v0) ## 00000002 -/* 002C8 80A5B5B8 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 002CC 80A5B5BC 00000000 */ nop -/* 002D0 80A5B5C0 468042A0 */ cvt.s.w $f10, $f8 -/* 002D4 80A5B5C4 E4CA0004 */ swc1 $f10, 0x0004($a2) ## 00000004 -/* 002D8 80A5B5C8 84590004 */ lh $t9, 0x0004($v0) ## 00000004 -/* 002DC 80A5B5CC 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 002E0 80A5B5D0 00000000 */ nop -/* 002E4 80A5B5D4 468084A0 */ cvt.s.w $f18, $f16 -/* 002E8 80A5B5D8 03E00008 */ jr $ra -/* 002EC 80A5B5DC E4D20008 */ swc1 $f18, 0x0008($a2) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B5E0.s deleted file mode 100644 index 605f092a9e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B5E0.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A5B5E0 -/* 002F0 80A5B5E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002F4 80A5B5E4 AFA70024 */ sw $a3, 0x0024($sp) -/* 002F8 80A5B5E8 00073C00 */ sll $a3, $a3, 16 -/* 002FC 80A5B5EC AFA5001C */ sw $a1, 0x001C($sp) -/* 00300 80A5B5F0 00073C03 */ sra $a3, $a3, 16 -/* 00304 80A5B5F4 AFA60020 */ sw $a2, 0x0020($sp) -/* 00308 80A5B5F8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0030C 80A5B5FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00310 80A5B600 00073400 */ sll $a2, $a3, 16 -/* 00314 80A5B604 0C01B767 */ jal func_8006DD9C -/* 00318 80A5B608 00063403 */ sra $a2, $a2, 16 -/* 0031C 80A5B60C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00320 80A5B610 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00324 80A5B614 03E00008 */ jr $ra -/* 00328 80A5B618 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s deleted file mode 100644 index fb4defd7df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s +++ /dev/null @@ -1,273 +0,0 @@ -.late_rodata -glabel D_80A66854 - .word 0x47AFC800 -glabel D_80A66858 - .float 0.8 - -glabel D_80A6685C - .word 0x3EF0A3D7 -glabel D_80A66860 - .word 0x3EF0A3D7 -glabel D_80A66864 - .float 0.4 - -glabel D_80A66868 - .float 0.4 - -.text -glabel func_80A5B61C -/* 0032C 80A5B61C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00330 80A5B620 AFB00028 */ sw $s0, 0x0028($sp) -/* 00334 80A5B624 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00338 80A5B628 AFBF002C */ sw $ra, 0x002C($sp) -/* 0033C 80A5B62C AFA50074 */ sw $a1, 0x0074($sp) -/* 00340 80A5B630 AFA60078 */ sw $a2, 0x0078($sp) -/* 00344 80A5B634 8CC40004 */ lw $a0, 0x0004($a2) ## 00000004 -/* 00348 80A5B638 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFFF4 -/* 0034C 80A5B63C 0C296D64 */ jal func_80A5B590 -/* 00350 80A5B640 8E050204 */ lw $a1, 0x0204($s0) ## 00000204 -/* 00354 80A5B644 8FAF0078 */ lw $t7, 0x0078($sp) -/* 00358 80A5B648 8E190204 */ lw $t9, 0x0204($s0) ## 00000204 -/* 0035C 80A5B64C 27AA0040 */ addiu $t2, $sp, 0x0040 ## $t2 = FFFFFFD0 -/* 00360 80A5B650 8DF80004 */ lw $t8, 0x0004($t7) ## 00000004 -/* 00364 80A5B654 00194080 */ sll $t0, $t9, 2 -/* 00368 80A5B658 01194021 */ addu $t0, $t0, $t9 -/* 0036C 80A5B65C 00084040 */ sll $t0, $t0, 1 -/* 00370 80A5B660 03084821 */ addu $t1, $t8, $t0 -/* 00374 80A5B664 85250008 */ lh $a1, 0x0008($t1) ## 00000008 -/* 00378 80A5B668 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0037C 80A5B66C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFF4 -/* 00380 80A5B670 27A60048 */ addiu $a2, $sp, 0x0048 ## $a2 = FFFFFFD8 -/* 00384 80A5B674 0C033209 */ jal Math3D_RotateXZPlane -/* 00388 80A5B678 27A70044 */ addiu $a3, $sp, 0x0044 ## $a3 = FFFFFFD4 -/* 0038C 80A5B67C C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00390 80A5B680 C7A80048 */ lwc1 $f8, 0x0048($sp) -/* 00394 80A5B684 C7B00044 */ lwc1 $f16, 0x0044($sp) -/* 00398 80A5B688 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 0039C 80A5B68C 46083282 */ mul.s $f10, $f6, $f8 -/* 003A0 80A5B690 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 003A4 80A5B694 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFFF4 -/* 003A8 80A5B698 46128182 */ mul.s $f6, $f16, $f18 -/* 003AC 80A5B69C C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 003B0 80A5B6A0 46065200 */ add.s $f8, $f10, $f6 -/* 003B4 80A5B6A4 46104480 */ add.s $f18, $f8, $f16 -/* 003B8 80A5B6A8 4612203C */ c.lt.s $f4, $f18 -/* 003BC 80A5B6AC 00000000 */ nop -/* 003C0 80A5B6B0 4502000B */ bc1fl .L80A5B6E0 -/* 003C4 80A5B6B4 8FB90078 */ lw $t9, 0x0078($sp) -/* 003C8 80A5B6B8 8E0B0204 */ lw $t3, 0x0204($s0) ## 00000204 -/* 003CC 80A5B6BC 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 003D0 80A5B6C0 AE0C0204 */ sw $t4, 0x0204($s0) ## 00000204 -/* 003D4 80A5B6C4 8FAE0078 */ lw $t6, 0x0078($sp) -/* 003D8 80A5B6C8 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 003DC 80A5B6CC 018F082A */ slt $at, $t4, $t7 -/* 003E0 80A5B6D0 54200003 */ bnel $at, $zero, .L80A5B6E0 -/* 003E4 80A5B6D4 8FB90078 */ lw $t9, 0x0078($sp) -/* 003E8 80A5B6D8 AE000204 */ sw $zero, 0x0204($s0) ## 00000204 -/* 003EC 80A5B6DC 8FB90078 */ lw $t9, 0x0078($sp) -.L80A5B6E0: -/* 003F0 80A5B6E0 8E050204 */ lw $a1, 0x0204($s0) ## 00000204 -/* 003F4 80A5B6E4 0C296D64 */ jal func_80A5B590 -/* 003F8 80A5B6E8 8F240004 */ lw $a0, 0x0004($t9) ## 00000004 -/* 003FC 80A5B6EC 8E050204 */ lw $a1, 0x0204($s0) ## 00000204 -/* 00400 80A5B6F0 8FB80078 */ lw $t8, 0x0078($sp) -/* 00404 80A5B6F4 8FA80078 */ lw $t0, 0x0078($sp) -/* 00408 80A5B6F8 24A5FFFF */ addiu $a1, $a1, 0xFFFF ## $a1 = FFFFFFFF -/* 0040C 80A5B6FC 04A10003 */ bgez $a1, .L80A5B70C -/* 00410 80A5B700 27A60058 */ addiu $a2, $sp, 0x0058 ## $a2 = FFFFFFE8 -/* 00414 80A5B704 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 00418 80A5B708 24A5FFFF */ addiu $a1, $a1, 0xFFFF ## $a1 = FFFFFFFE -.L80A5B70C: -/* 0041C 80A5B70C 0C296D64 */ jal func_80A5B590 -/* 00420 80A5B710 8D040004 */ lw $a0, 0x0004($t0) ## 00000004 -/* 00424 80A5B714 C7AA0064 */ lwc1 $f10, 0x0064($sp) -/* 00428 80A5B718 C7A6006C */ lwc1 $f6, 0x006C($sp) -/* 0042C 80A5B71C C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 00430 80A5B720 C60E002C */ lwc1 $f14, 0x002C($s0) ## 0000002C -/* 00434 80A5B724 27A9003C */ addiu $t1, $sp, 0x003C ## $t1 = FFFFFFCC -/* 00438 80A5B728 AFA90018 */ sw $t1, 0x0018($sp) -/* 0043C 80A5B72C 8FA60058 */ lw $a2, 0x0058($sp) -/* 00440 80A5B730 8FA70060 */ lw $a3, 0x0060($sp) -/* 00444 80A5B734 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00448 80A5B738 0C03392E */ jal Math3D_PointDistToLine2D -/* 0044C 80A5B73C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00450 80A5B740 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00454 80A5B744 8FA50074 */ lw $a1, 0x0074($sp) -/* 00458 80A5B748 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFFF4 -/* 0045C 80A5B74C 0C296D78 */ jal func_80A5B5E0 -/* 00460 80A5B750 24070190 */ addiu $a3, $zero, 0x0190 ## $a3 = 00000190 -/* 00464 80A5B754 3C0180A6 */ lui $at, %hi(D_80A66854) ## $at = 80A60000 -/* 00468 80A5B758 C4306854 */ lwc1 $f16, %lo(D_80A66854)($at) -/* 0046C 80A5B75C C7A8003C */ lwc1 $f8, 0x003C($sp) -/* 00470 80A5B760 3C014302 */ lui $at, 0x4302 ## $at = 43020000 -/* 00474 80A5B764 4610403C */ c.lt.s $f8, $f16 -/* 00478 80A5B768 00000000 */ nop -/* 0047C 80A5B76C 4502003E */ bc1fl .L80A5B868 -/* 00480 80A5B770 8FB90074 */ lw $t9, 0x0074($sp) -/* 00484 80A5B774 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00488 80A5B778 44812000 */ mtc1 $at, $f4 ## $f4 = 130.00 -/* 0048C 80A5B77C 00000000 */ nop -/* 00490 80A5B780 4604003C */ c.lt.s $f0, $f4 -/* 00494 80A5B784 00000000 */ nop -/* 00498 80A5B788 45030008 */ bc1tl .L80A5B7AC -/* 0049C 80A5B78C 860E008A */ lh $t6, 0x008A($s0) ## 0000008A -/* 004A0 80A5B790 8E0A032C */ lw $t2, 0x032C($s0) ## 0000032C -/* 004A4 80A5B794 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 004A8 80A5B798 914B0017 */ lbu $t3, 0x0017($t2) ## 00000017 -/* 004AC 80A5B79C 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 -/* 004B0 80A5B7A0 51800016 */ beql $t4, $zero, .L80A5B7FC -/* 004B4 80A5B7A4 44815000 */ mtc1 $at, $f10 ## $f10 = 300.00 -/* 004B8 80A5B7A8 860E008A */ lh $t6, 0x008A($s0) ## 0000008A -.L80A5B7AC: -/* 004BC 80A5B7AC 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 -/* 004C0 80A5B7B0 01CD2023 */ subu $a0, $t6, $t5 -/* 004C4 80A5B7B4 00042400 */ sll $a0, $a0, 16 -/* 004C8 80A5B7B8 0C01DE1C */ jal Math_SinS - ## sins? -/* 004CC 80A5B7BC 00042403 */ sra $a0, $a0, 16 -/* 004D0 80A5B7C0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 004D4 80A5B7C4 00000000 */ nop -/* 004D8 80A5B7C8 4600903C */ c.lt.s $f18, $f0 -/* 004DC 80A5B7CC 00000000 */ nop -/* 004E0 80A5B7D0 45020006 */ bc1fl .L80A5B7EC -/* 004E4 80A5B7D4 86180032 */ lh $t8, 0x0032($s0) ## 00000032 -/* 004E8 80A5B7D8 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 004EC 80A5B7DC 25F9FEE8 */ addiu $t9, $t7, 0xFEE8 ## $t9 = FFFFFEE8 -/* 004F0 80A5B7E0 1000001E */ beq $zero, $zero, .L80A5B85C -/* 004F4 80A5B7E4 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 004F8 80A5B7E8 86180032 */ lh $t8, 0x0032($s0) ## 00000032 -.L80A5B7EC: -/* 004FC 80A5B7EC 27080118 */ addiu $t0, $t8, 0x0118 ## $t0 = 00000118 -/* 00500 80A5B7F0 1000001A */ beq $zero, $zero, .L80A5B85C -/* 00504 80A5B7F4 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 00508 80A5B7F8 44815000 */ mtc1 $at, $f10 ## $f10 = 0.00 -.L80A5B7FC: -/* 0050C 80A5B7FC 00000000 */ nop -/* 00510 80A5B800 460A003C */ c.lt.s $f0, $f10 -/* 00514 80A5B804 00000000 */ nop -/* 00518 80A5B808 45020015 */ bc1fl .L80A5B860 -/* 0051C 80A5B80C 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 00520 80A5B810 8609008A */ lh $t1, 0x008A($s0) ## 0000008A -/* 00524 80A5B814 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 00528 80A5B818 012A2023 */ subu $a0, $t1, $t2 -/* 0052C 80A5B81C 00042400 */ sll $a0, $a0, 16 -/* 00530 80A5B820 0C01DE1C */ jal Math_SinS - ## sins? -/* 00534 80A5B824 00042403 */ sra $a0, $a0, 16 -/* 00538 80A5B828 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0053C 80A5B82C 00000000 */ nop -/* 00540 80A5B830 4600303C */ c.lt.s $f6, $f0 -/* 00544 80A5B834 00000000 */ nop -/* 00548 80A5B838 45020006 */ bc1fl .L80A5B854 -/* 0054C 80A5B83C 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 00550 80A5B840 860B0032 */ lh $t3, 0x0032($s0) ## 00000032 -/* 00554 80A5B844 256C0118 */ addiu $t4, $t3, 0x0118 ## $t4 = 00000118 -/* 00558 80A5B848 10000004 */ beq $zero, $zero, .L80A5B85C -/* 0055C 80A5B84C A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 -/* 00560 80A5B850 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -.L80A5B854: -/* 00564 80A5B854 25CDFEE8 */ addiu $t5, $t6, 0xFEE8 ## $t5 = FFFFFEE8 -/* 00568 80A5B858 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 -.L80A5B85C: -/* 0056C 80A5B85C 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -.L80A5B860: -/* 00570 80A5B860 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 00574 80A5B864 8FB90074 */ lw $t9, 0x0074($sp) -.L80A5B868: -/* 00578 80A5B868 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0057C 80A5B86C 0C00B6E3 */ jal Actor_WorldDistXZToActor -/* 00580 80A5B870 8F251C44 */ lw $a1, 0x1C44($t9) ## 00001C44 -/* 00584 80A5B874 8FB80074 */ lw $t8, 0x0074($sp) -/* 00588 80A5B878 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 0058C 80A5B87C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00590 80A5B880 0C00B69E */ jal Actor_WorldYawTowardActor -/* 00594 80A5B884 8F051C44 */ lw $a1, 0x1C44($t8) ## 00001C44 -/* 00598 80A5B888 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0059C 80A5B88C 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 -/* 005A0 80A5B890 C7B00050 */ lwc1 $f16, 0x0050($sp) -/* 005A4 80A5B894 86080032 */ lh $t0, 0x0032($s0) ## 00000032 -/* 005A8 80A5B898 4608803E */ c.le.s $f16, $f8 -/* 005AC 80A5B89C 00482023 */ subu $a0, $v0, $t0 -/* 005B0 80A5B8A0 00042400 */ sll $a0, $a0, 16 -/* 005B4 80A5B8A4 00042403 */ sra $a0, $a0, 16 -/* 005B8 80A5B8A8 45030014 */ bc1tl .L80A5B8FC -/* 005BC 80A5B8AC C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 005C0 80A5B8B0 0C01DE1C */ jal Math_SinS - ## sins? -/* 005C4 80A5B8B4 A7A4004E */ sh $a0, 0x004E($sp) -/* 005C8 80A5B8B8 3C0180A6 */ lui $at, %hi(D_80A66858) ## $at = 80A60000 -/* 005CC 80A5B8BC C4246858 */ lwc1 $f4, %lo(D_80A66858)($at) -/* 005D0 80A5B8C0 46000005 */ abs.s $f0, $f0 -/* 005D4 80A5B8C4 87A4004E */ lh $a0, 0x004E($sp) -/* 005D8 80A5B8C8 4604003C */ c.lt.s $f0, $f4 -/* 005DC 80A5B8CC 00000000 */ nop -/* 005E0 80A5B8D0 4502001D */ bc1fl .L80A5B948 -/* 005E4 80A5B8D4 8FAB0078 */ lw $t3, 0x0078($sp) -/* 005E8 80A5B8D8 0C01DE0D */ jal Math_CosS - ## coss? -/* 005EC 80A5B8DC 00000000 */ nop -/* 005F0 80A5B8E0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 005F4 80A5B8E4 00000000 */ nop -/* 005F8 80A5B8E8 4600903C */ c.lt.s $f18, $f0 -/* 005FC 80A5B8EC 00000000 */ nop -/* 00600 80A5B8F0 45020015 */ bc1fl .L80A5B948 -/* 00604 80A5B8F4 8FAB0078 */ lw $t3, 0x0078($sp) -/* 00608 80A5B8F8 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -.L80A5B8FC: -/* 0060C 80A5B8FC C60A0398 */ lwc1 $f10, 0x0398($s0) ## 00000398 -/* 00610 80A5B900 3C0180A6 */ lui $at, %hi(D_80A66860) ## $at = 80A60000 -/* 00614 80A5B904 460A003C */ c.lt.s $f0, $f10 -/* 00618 80A5B908 00000000 */ nop -/* 0061C 80A5B90C 45000006 */ bc1f .L80A5B928 -/* 00620 80A5B910 00000000 */ nop -/* 00624 80A5B914 3C0180A6 */ lui $at, %hi(D_80A6685C) ## $at = 80A60000 -/* 00628 80A5B918 C426685C */ lwc1 $f6, %lo(D_80A6685C)($at) -/* 0062C 80A5B91C 46060200 */ add.s $f8, $f0, $f6 -/* 00630 80A5B920 10000004 */ beq $zero, $zero, .L80A5B934 -/* 00634 80A5B924 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -.L80A5B928: -/* 00638 80A5B928 C4306860 */ lwc1 $f16, %lo(D_80A66860)($at) -/* 0063C 80A5B92C 46100101 */ sub.s $f4, $f0, $f16 -/* 00640 80A5B930 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L80A5B934: -/* 00644 80A5B934 96090394 */ lhu $t1, 0x0394($s0) ## 00000394 -/* 00648 80A5B938 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 0064C 80A5B93C 1000001D */ beq $zero, $zero, .L80A5B9B4 -/* 00650 80A5B940 A60A0394 */ sh $t2, 0x0394($s0) ## 00000394 -/* 00654 80A5B944 8FAB0078 */ lw $t3, 0x0078($sp) -.L80A5B948: -/* 00658 80A5B948 8E0E0204 */ lw $t6, 0x0204($s0) ## 00000204 -/* 0065C 80A5B94C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 00660 80A5B950 8D6C0004 */ lw $t4, 0x0004($t3) ## 00000004 -/* 00664 80A5B954 000E6880 */ sll $t5, $t6, 2 -/* 00668 80A5B958 01AE6821 */ addu $t5, $t5, $t6 -/* 0066C 80A5B95C 000D6840 */ sll $t5, $t5, 1 -/* 00670 80A5B960 018D7821 */ addu $t7, $t4, $t5 -/* 00674 80A5B964 85F90006 */ lh $t9, 0x0006($t7) ## 00000006 -/* 00678 80A5B968 3C0180A6 */ lui $at, %hi(D_80A66868) ## $at = 80A60000 -/* 0067C 80A5B96C 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 00680 80A5B970 00000000 */ nop -/* 00684 80A5B974 468092A0 */ cvt.s.w $f10, $f18 -/* 00688 80A5B978 460A003C */ c.lt.s $f0, $f10 -/* 0068C 80A5B97C 00000000 */ nop -/* 00690 80A5B980 45000006 */ bc1f .L80A5B99C -/* 00694 80A5B984 00000000 */ nop -/* 00698 80A5B988 3C0180A6 */ lui $at, %hi(D_80A66864) ## $at = 80A60000 -/* 0069C 80A5B98C C4266864 */ lwc1 $f6, %lo(D_80A66864)($at) -/* 006A0 80A5B990 46060200 */ add.s $f8, $f0, $f6 -/* 006A4 80A5B994 10000004 */ beq $zero, $zero, .L80A5B9A8 -/* 006A8 80A5B998 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -.L80A5B99C: -/* 006AC 80A5B99C C4306868 */ lwc1 $f16, %lo(D_80A66868)($at) -/* 006B0 80A5B9A0 46100101 */ sub.s $f4, $f0, $f16 -/* 006B4 80A5B9A4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L80A5B9A8: -/* 006B8 80A5B9A8 96180394 */ lhu $t8, 0x0394($s0) ## 00000394 -/* 006BC 80A5B9AC 3308FFFE */ andi $t0, $t8, 0xFFFE ## $t0 = 00000000 -/* 006C0 80A5B9B0 A6080394 */ sh $t0, 0x0394($s0) ## 00000394 -.L80A5B9B4: -/* 006C4 80A5B9B4 8FBF002C */ lw $ra, 0x002C($sp) -/* 006C8 80A5B9B8 8FB00028 */ lw $s0, 0x0028($sp) -/* 006CC 80A5B9BC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 006D0 80A5B9C0 03E00008 */ jr $ra -/* 006D4 80A5B9C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s deleted file mode 100644 index 6e79dbae63..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80A5B9C8 -/* 006D8 80A5B9C8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006DC 80A5B9CC AFBF0024 */ sw $ra, 0x0024($sp) -/* 006E0 80A5B9D0 AFB00020 */ sw $s0, 0x0020($sp) -/* 006E4 80A5B9D4 8C820218 */ lw $v0, 0x0218($a0) ## 00000218 -/* 006E8 80A5B9D8 3C0380A6 */ lui $v1, %hi(D_80A6665C) ## $v1 = 80A60000 -/* 006EC 80A5B9DC 2463665C */ addiu $v1, $v1, %lo(D_80A6665C) ## $v1 = 80A6665C -/* 006F0 80A5B9E0 00027080 */ sll $t6, $v0, 2 -/* 006F4 80A5B9E4 006E7821 */ addu $t7, $v1, $t6 -/* 006F8 80A5B9E8 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 006FC 80A5B9EC C4800214 */ lwc1 $f0, 0x0214($a0) ## 00000214 -/* 00700 80A5B9F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00704 80A5B9F4 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00708 80A5B9F8 00000000 */ nop -/* 0070C 80A5B9FC 468021A0 */ cvt.s.w $f6, $f4 -/* 00710 80A5BA00 4600303C */ c.lt.s $f6, $f0 -/* 00714 80A5BA04 00000000 */ nop -/* 00718 80A5BA08 4502001A */ bc1fl .L80A5BA74 -/* 0071C 80A5BA0C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00720 80A5BA10 14400008 */ bne $v0, $zero, .L80A5BA34 -/* 00724 80A5BA14 3C078013 */ lui $a3, %hi(D_801333E0) -/* 00728 80A5BA18 8C790004 */ lw $t9, 0x0004($v1) ## 80A66660 -/* 0072C 80A5BA1C 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 00730 80A5BA20 00000000 */ nop -/* 00734 80A5BA24 468042A0 */ cvt.s.w $f10, $f8 -/* 00738 80A5BA28 4600503C */ c.lt.s $f10, $f0 -/* 0073C 80A5BA2C 00000000 */ nop -/* 00740 80A5BA30 4501000F */ bc1t .L80A5BA70 -.L80A5BA34: -/* 00744 80A5BA34 3C088013 */ lui $t0, %hi(D_801333E8) -/* 00748 80A5BA38 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 0074C 80A5BA3C 250833E8 */ addiu $t0, %lo(D_801333E8) -/* 00750 80A5BA40 AFA80014 */ sw $t0, 0x0014($sp) -/* 00754 80A5BA44 AFA70010 */ sw $a3, 0x0010($sp) -/* 00758 80A5BA48 24042803 */ addiu $a0, $zero, 0x2803 ## $a0 = 00002803 -/* 0075C 80A5BA4C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 00760 80A5BA50 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00764 80A5BA54 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00768 80A5BA58 8E090218 */ lw $t1, 0x0218($s0) ## 00000218 -/* 0076C 80A5BA5C 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 00770 80A5BA60 29410002 */ slti $at, $t2, 0x0002 -/* 00774 80A5BA64 14200002 */ bne $at, $zero, .L80A5BA70 -/* 00778 80A5BA68 AE0A0218 */ sw $t2, 0x0218($s0) ## 00000218 -/* 0077C 80A5BA6C AE000218 */ sw $zero, 0x0218($s0) ## 00000218 -.L80A5BA70: -/* 00780 80A5BA70 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5BA74: -/* 00784 80A5BA74 8FB00020 */ lw $s0, 0x0020($sp) -/* 00788 80A5BA78 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0078C 80A5BA7C 03E00008 */ jr $ra -/* 00790 80A5BA80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s deleted file mode 100644 index 8f30bbb8d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80A5BA84 -/* 00794 80A5BA84 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00798 80A5BA88 AFA40020 */ sw $a0, 0x0020($sp) -/* 0079C 80A5BA8C 8FA50020 */ lw $a1, 0x0020($sp) -/* 007A0 80A5BA90 3C078013 */ lui $a3, %hi(D_801333E0) -/* 007A4 80A5BA94 3C0E8013 */ lui $t6, %hi(D_801333E8) -/* 007A8 80A5BA98 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 007AC 80A5BA9C AFBF001C */ sw $ra, 0x001C($sp) -/* 007B0 80A5BAA0 25CE33E8 */ addiu $t6, %lo(D_801333E8) -/* 007B4 80A5BAA4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 007B8 80A5BAA8 AFA70010 */ sw $a3, 0x0010($sp) -/* 007BC 80A5BAAC 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 -/* 007C0 80A5BAB0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 007C4 80A5BAB4 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 007C8 80A5BAB8 24A500E4 */ addiu $a1, $a1, 0x00E4 ## $a1 = 000000E4 -/* 007CC 80A5BABC 8FBF001C */ lw $ra, 0x001C($sp) -/* 007D0 80A5BAC0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 007D4 80A5BAC4 03E00008 */ jr $ra -/* 007D8 80A5BAC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s deleted file mode 100644 index 20050f64f2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80A5BACC -/* 007DC 80A5BACC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 007E0 80A5BAD0 AFA40020 */ sw $a0, 0x0020($sp) -/* 007E4 80A5BAD4 8FA50020 */ lw $a1, 0x0020($sp) -/* 007E8 80A5BAD8 3C078013 */ lui $a3, %hi(D_801333E0) -/* 007EC 80A5BADC 3C0E8013 */ lui $t6, %hi(D_801333E8) -/* 007F0 80A5BAE0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 007F4 80A5BAE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 007F8 80A5BAE8 25CE33E8 */ addiu $t6, %lo(D_801333E8) -/* 007FC 80A5BAEC AFAE0014 */ sw $t6, 0x0014($sp) -/* 00800 80A5BAF0 AFA70010 */ sw $a3, 0x0010($sp) -/* 00804 80A5BAF4 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 -/* 00808 80A5BAF8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0080C 80A5BAFC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00810 80A5BB00 24A500E4 */ addiu $a1, $a1, 0x00E4 ## $a1 = 000000E4 -/* 00814 80A5BB04 8FBF001C */ lw $ra, 0x001C($sp) -/* 00818 80A5BB08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0081C 80A5BB0C 03E00008 */ jr $ra -/* 00820 80A5BB10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s deleted file mode 100644 index d5901412ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s +++ /dev/null @@ -1,42 +0,0 @@ -.late_rodata -glabel D_80A6686C - .word 0x3F707379 -glabel D_80A66870 - .float 0.7 - -.text -glabel func_80A5BB14 -/* 00824 80A5BB14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00828 80A5BB18 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0082C 80A5BB1C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00830 80A5BB20 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00834 80A5BB24 AFA40020 */ sw $a0, 0x0020($sp) -/* 00838 80A5BB28 AFA50024 */ sw $a1, 0x0024($sp) -/* 0083C 80A5BB2C E7A4001C */ swc1 $f4, 0x001C($sp) -/* 00840 80A5BB30 0C01DE0D */ jal Math_CosS - ## coss? -/* 00844 80A5BB34 848400B4 */ lh $a0, 0x00B4($a0) ## 000000B4 -/* 00848 80A5BB38 3C0180A6 */ lui $at, %hi(D_80A6686C) ## $at = 80A60000 -/* 0084C 80A5BB3C C426686C */ lwc1 $f6, %lo(D_80A6686C)($at) -/* 00850 80A5BB40 8FAF0020 */ lw $t7, 0x0020($sp) -/* 00854 80A5BB44 4606003C */ c.lt.s $f0, $f6 -/* 00858 80A5BB48 00000000 */ nop -/* 0085C 80A5BB4C 4502000C */ bc1fl .L80A5BB80 -/* 00860 80A5BB50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00864 80A5BB54 0C01DE1C */ jal Math_SinS - ## sins? -/* 00868 80A5BB58 85E400B4 */ lh $a0, 0x00B4($t7) ## 000000B4 -/* 0086C 80A5BB5C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00870 80A5BB60 3C0180A6 */ lui $at, %hi(D_80A66870) ## $at = 80A60000 -/* 00874 80A5BB64 4608003C */ c.lt.s $f0, $f8 -/* 00878 80A5BB68 00000000 */ nop -/* 0087C 80A5BB6C 45020004 */ bc1fl .L80A5BB80 -/* 00880 80A5BB70 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00884 80A5BB74 C42A6870 */ lwc1 $f10, %lo(D_80A66870)($at) -/* 00888 80A5BB78 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 0088C 80A5BB7C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A5BB80: -/* 00890 80A5BB80 C7A0001C */ lwc1 $f0, 0x001C($sp) -/* 00894 80A5BB84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00898 80A5BB88 03E00008 */ jr $ra -/* 0089C 80A5BB8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB90.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB90.s deleted file mode 100644 index f50b4bb68e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB90.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A5BB90 -/* 008A0 80A5BB90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008A4 80A5BB94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008A8 80A5BB98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 008AC 80A5BB9C AFA40018 */ sw $a0, 0x0018($sp) -/* 008B0 80A5BBA0 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 008B4 80A5BBA4 0C029B84 */ jal SkinMatrix_Vec3fMtxFMultXYZW -/* 008B8 80A5BBA8 00812021 */ addu $a0, $a0, $at -/* 008BC 80A5BBAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008C0 80A5BBB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008C4 80A5BBB4 03E00008 */ jr $ra -/* 008C8 80A5BBB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BBBC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BBBC.s deleted file mode 100644 index 550e241667..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BBBC.s +++ /dev/null @@ -1,52 +0,0 @@ -.late_rodata -glabel D_80A66874 - .float 0.008 - -.text -glabel func_80A5BBBC -/* 008CC 80A5BBBC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 008D0 80A5BBC0 AFA50034 */ sw $a1, 0x0034($sp) -/* 008D4 80A5BBC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 008D8 80A5BBC8 AFA60038 */ sw $a2, 0x0038($sp) -/* 008DC 80A5BBCC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 008E0 80A5BBD0 AFA40030 */ sw $a0, 0x0030($sp) -/* 008E4 80A5BBD4 27A60024 */ addiu $a2, $sp, 0x0024 ## $a2 = FFFFFFF4 -/* 008E8 80A5BBD8 0C296EE4 */ jal func_80A5BB90 -/* 008EC 80A5BBDC 27A70020 */ addiu $a3, $sp, 0x0020 ## $a3 = FFFFFFF0 -/* 008F0 80A5BBE0 C7A00020 */ lwc1 $f0, 0x0020($sp) -/* 008F4 80A5BBE4 3C0180A6 */ lui $at, %hi(D_80A66874) ## $at = 80A60000 -/* 008F8 80A5BBE8 C4246874 */ lwc1 $f4, %lo(D_80A66874)($at) -/* 008FC 80A5BBEC 46000005 */ abs.s $f0, $f0 -/* 00900 80A5BBF0 8FA50030 */ lw $a1, 0x0030($sp) -/* 00904 80A5BBF4 4604003C */ c.lt.s $f0, $f4 -/* 00908 80A5BBF8 24A500E0 */ addiu $a1, $a1, 0x00E0 ## $a1 = 000000E0 -/* 0090C 80A5BBFC 45000003 */ bc1f .L80A5BC0C -/* 00910 80A5BC00 00000000 */ nop -/* 00914 80A5BC04 10000014 */ beq $zero, $zero, .L80A5BC58 -/* 00918 80A5BC08 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A5BC0C: -/* 0091C 80A5BC0C 0C032D9E */ jal Math3D_Vec3f_DistXYZ -/* 00920 80A5BC10 8FA40038 */ lw $a0, 0x0038($sp) -/* 00924 80A5BC14 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 00928 80A5BC18 8FA40030 */ lw $a0, 0x0030($sp) -/* 0092C 80A5BC1C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00930 80A5BC20 27A60024 */ addiu $a2, $sp, 0x0024 ## $a2 = FFFFFFF4 -/* 00934 80A5BC24 0C00C535 */ jal func_800314D4 -/* 00938 80A5BC28 8FA70020 */ lw $a3, 0x0020($sp) -/* 0093C 80A5BC2C 0002102B */ sltu $v0, $zero, $v0 -/* 00940 80A5BC30 14400009 */ bne $v0, $zero, .L80A5BC58 -/* 00944 80A5BC34 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 00948 80A5BC38 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0094C 80A5BC3C 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 00950 80A5BC40 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00954 80A5BC44 4608303C */ c.lt.s $f6, $f8 -/* 00958 80A5BC48 00000000 */ nop -/* 0095C 80A5BC4C 45020003 */ bc1fl .L80A5BC5C -/* 00960 80A5BC50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00964 80A5BC54 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A5BC58: -/* 00968 80A5BC58 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A5BC5C: -/* 0096C 80A5BC5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00970 80A5BC60 03E00008 */ jr $ra -/* 00974 80A5BC64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s deleted file mode 100644 index 9f8cffc97b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_80A5BC68 -/* 00978 80A5BC68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0097C 80A5BC6C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00980 80A5BC70 AFB00020 */ sw $s0, 0x0020($sp) -/* 00984 80A5BC74 AFA5002C */ sw $a1, 0x002C($sp) -/* 00988 80A5BC78 8C830210 */ lw $v1, 0x0210($a0) ## 00000210 -/* 0098C 80A5BC7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00990 80A5BC80 3C01420C */ lui $at, 0x420C ## $at = 420C0000 -/* 00994 80A5BC84 54600027 */ bnel $v1, $zero, .L80A5BD24 -/* 00998 80A5BC88 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0099C 80A5BC8C C4800214 */ lwc1 $f0, 0x0214($a0) ## 00000214 -/* 009A0 80A5BC90 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -/* 009A4 80A5BC94 3C0141E0 */ lui $at, 0x41E0 ## $at = 41E00000 -/* 009A8 80A5BC98 4600203C */ c.lt.s $f4, $f0 -/* 009AC 80A5BC9C 00000000 */ nop -/* 009B0 80A5BCA0 45020005 */ bc1fl .L80A5BCB8 -/* 009B4 80A5BCA4 44813000 */ mtc1 $at, $f6 ## $f6 = 28.00 -/* 009B8 80A5BCA8 8C8E0158 */ lw $t6, 0x0158($a0) ## 00000158 -/* 009BC 80A5BCAC 51C0000C */ beql $t6, $zero, .L80A5BCE0 -/* 009C0 80A5BCB0 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 009C4 80A5BCB4 44813000 */ mtc1 $at, $f6 ## $f6 = 28.00 -.L80A5BCB8: -/* 009C8 80A5BCB8 00000000 */ nop -/* 009CC 80A5BCBC 4600303C */ c.lt.s $f6, $f0 -/* 009D0 80A5BCC0 00000000 */ nop -/* 009D4 80A5BCC4 45020017 */ bc1fl .L80A5BD24 -/* 009D8 80A5BCC8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 009DC 80A5BCCC 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 -/* 009E0 80A5BCD0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 009E4 80A5BCD4 55E10013 */ bnel $t7, $at, .L80A5BD24 -/* 009E8 80A5BCD8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 009EC 80A5BCDC 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -.L80A5BCE0: -/* 009F0 80A5BCE0 3C078013 */ lui $a3, %hi(D_801333E0) -/* 009F4 80A5BCE4 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 009F8 80A5BCE8 30581000 */ andi $t8, $v0, 0x1000 ## $t8 = 00000000 -/* 009FC 80A5BCEC 1700000C */ bne $t8, $zero, .L80A5BD20 -/* 00A00 80A5BCF0 34591000 */ ori $t9, $v0, 0x1000 ## $t9 = 00001000 -/* 00A04 80A5BCF4 3C088013 */ lui $t0, %hi(D_801333E8) -/* 00A08 80A5BCF8 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 00A0C 80A5BCFC 250833E8 */ addiu $t0, %lo(D_801333E8) -/* 00A10 80A5BD00 AFA80014 */ sw $t0, 0x0014($sp) -/* 00A14 80A5BD04 AFA70010 */ sw $a3, 0x0010($sp) -/* 00A18 80A5BD08 2404282C */ addiu $a0, $zero, 0x282C ## $a0 = 0000282C -/* 00A1C 80A5BD0C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 00A20 80A5BD10 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00A24 80A5BD14 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00A28 80A5BD18 1000001A */ beq $zero, $zero, .L80A5BD84 -/* 00A2C 80A5BD1C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5BD20: -/* 00A30 80A5BD20 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A5BD24: -/* 00A34 80A5BD24 14610016 */ bne $v1, $at, .L80A5BD80 -/* 00A38 80A5BD28 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 00A3C 80A5BD2C 44814000 */ mtc1 $at, $f8 ## $f8 = 25.00 -/* 00A40 80A5BD30 C60A0214 */ lwc1 $f10, 0x0214($s0) ## 00000214 -/* 00A44 80A5BD34 460A403C */ c.lt.s $f8, $f10 -/* 00A48 80A5BD38 00000000 */ nop -/* 00A4C 80A5BD3C 45020011 */ bc1fl .L80A5BD84 -/* 00A50 80A5BD40 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A54 80A5BD44 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 00A58 80A5BD48 3C078013 */ lui $a3, %hi(D_801333E0) -/* 00A5C 80A5BD4C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00A60 80A5BD50 30490800 */ andi $t1, $v0, 0x0800 ## $t1 = 00000000 -/* 00A64 80A5BD54 1520000A */ bne $t1, $zero, .L80A5BD80 -/* 00A68 80A5BD58 344A0800 */ ori $t2, $v0, 0x0800 ## $t2 = 00000800 -/* 00A6C 80A5BD5C 3C0B8013 */ lui $t3, %hi(D_801333E8) -/* 00A70 80A5BD60 AE0A01F0 */ sw $t2, 0x01F0($s0) ## 000001F0 -/* 00A74 80A5BD64 256B33E8 */ addiu $t3, %lo(D_801333E8) -/* 00A78 80A5BD68 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00A7C 80A5BD6C AFA70010 */ sw $a3, 0x0010($sp) -/* 00A80 80A5BD70 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B -/* 00A84 80A5BD74 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 00A88 80A5BD78 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00A8C 80A5BD7C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80A5BD80: -/* 00A90 80A5BD80 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5BD84: -/* 00A94 80A5BD84 8FB00020 */ lw $s0, 0x0020($sp) -/* 00A98 80A5BD88 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A9C 80A5BD8C 03E00008 */ jr $ra -/* 00AA0 80A5BD90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s deleted file mode 100644 index 7eb627d830..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s +++ /dev/null @@ -1,159 +0,0 @@ -.late_rodata -glabel D_80A66878 - .word 0x7E967699 - -.text -glabel func_80A5BD94 -/* 00AA4 80A5BD94 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 00AA8 80A5BD98 AFB00028 */ sw $s0, 0x0028($sp) -/* 00AAC 80A5BD9C AFBE0048 */ sw $s8, 0x0048($sp) -/* 00AB0 80A5BDA0 AFB70044 */ sw $s7, 0x0044($sp) -/* 00AB4 80A5BDA4 AFB60040 */ sw $s6, 0x0040($sp) -/* 00AB8 80A5BDA8 AFB20030 */ sw $s2, 0x0030($sp) -/* 00ABC 80A5BDAC F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 00AC0 80A5BDB0 3C0180A6 */ lui $at, %hi(D_80A66878) ## $at = 80A60000 -/* 00AC4 80A5BDB4 3C1080A6 */ lui $s0, %hi(D_80A65F40) ## $s0 = 80A60000 -/* 00AC8 80A5BDB8 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00ACC 80A5BDBC 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 00AD0 80A5BDC0 AFBF004C */ sw $ra, 0x004C($sp) -/* 00AD4 80A5BDC4 AFB5003C */ sw $s5, 0x003C($sp) -/* 00AD8 80A5BDC8 AFB40038 */ sw $s4, 0x0038($sp) -/* 00ADC 80A5BDCC AFB30034 */ sw $s3, 0x0034($sp) -/* 00AE0 80A5BDD0 AFB1002C */ sw $s1, 0x002C($sp) -/* 00AE4 80A5BDD4 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00AE8 80A5BDD8 C4366878 */ lwc1 $f22, %lo(D_80A66878)($at) -/* 00AEC 80A5BDDC 0000F025 */ or $s8, $zero, $zero ## $s8 = 00000000 -/* 00AF0 80A5BDE0 26105F40 */ addiu $s0, $s0, %lo(D_80A65F40) ## $s0 = 80A65F40 -/* 00AF4 80A5BDE4 27B70068 */ addiu $s7, $sp, 0x0068 ## $s7 = FFFFFFE0 -/* 00AF8 80A5BDE8 86C200A4 */ lh $v0, 0x00A4($s6) ## 000000A4 -.L80A5BDEC: -/* 00AFC 80A5BDEC 860E0000 */ lh $t6, 0x0000($s0) ## 80A65F40 -/* 00B00 80A5BDF0 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 00B04 80A5BDF4 144E0064 */ bne $v0, $t6, .L80A5BF88 -/* 00B08 80A5BDF8 00000000 */ nop -/* 00B0C 80A5BDFC 14410022 */ bne $v0, $at, .L80A5BE88 -/* 00B10 80A5BE00 8ED11C44 */ lw $s1, 0x1C44($s6) ## 00001C44 -/* 00B14 80A5BE04 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 00B18 80A5BE08 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 00B1C 80A5BE0C 1040000A */ beq $v0, $zero, .L80A5BE38 -/* 00B20 80A5BE10 3C0F8016 */ lui $t7, %hi(gSaveContext+0x13fa) -/* 00B24 80A5BE14 95EFFA5A */ lhu $t7, %lo(gSaveContext+0x13fa)($t7) -/* 00B28 80A5BE18 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00B2C 80A5BE1C 31F8000F */ andi $t8, $t7, 0x000F ## $t8 = 00000000 -/* 00B30 80A5BE20 5701001A */ bnel $t8, $at, .L80A5BE8C -/* 00B34 80A5BE24 860B0002 */ lh $t3, 0x0002($s0) ## 80A65F42 -/* 00B38 80A5BE28 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 00B3C 80A5BE2C 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 00B40 80A5BE30 54400016 */ bnel $v0, $zero, .L80A5BE8C -/* 00B44 80A5BE34 860B0002 */ lh $t3, 0x0002($s0) ## 80A65F42 -.L80A5BE38: -/* 00B48 80A5BE38 86020002 */ lh $v0, 0x0002($s0) ## 80A65F42 -/* 00B4C 80A5BE3C 24010358 */ addiu $at, $zero, 0x0358 ## $at = 00000358 -/* 00B50 80A5BE40 54410008 */ bnel $v0, $at, .L80A5BE64 -/* 00B54 80A5BE44 2401FC15 */ addiu $at, $zero, 0xFC15 ## $at = FFFFFC15 -/* 00B58 80A5BE48 86190004 */ lh $t9, 0x0004($s0) ## 80A65F44 -/* 00B5C 80A5BE4C 57200005 */ bnel $t9, $zero, .L80A5BE64 -/* 00B60 80A5BE50 2401FC15 */ addiu $at, $zero, 0xFC15 ## $at = FFFFFC15 -/* 00B64 80A5BE54 86080006 */ lh $t0, 0x0006($s0) ## 80A65F46 -/* 00B68 80A5BE58 2401FC6A */ addiu $at, $zero, 0xFC6A ## $at = FFFFFC6A -/* 00B6C 80A5BE5C 1101000A */ beq $t0, $at, .L80A5BE88 -/* 00B70 80A5BE60 2401FC15 */ addiu $at, $zero, 0xFC15 ## $at = FFFFFC15 -.L80A5BE64: -/* 00B74 80A5BE64 14410048 */ bne $v0, $at, .L80A5BF88 -/* 00B78 80A5BE68 00000000 */ nop -/* 00B7C 80A5BE6C 86090004 */ lh $t1, 0x0004($s0) ## 80A65F44 -/* 00B80 80A5BE70 15200045 */ bne $t1, $zero, .L80A5BF88 -/* 00B84 80A5BE74 00000000 */ nop -/* 00B88 80A5BE78 860A0006 */ lh $t2, 0x0006($s0) ## 80A65F46 -/* 00B8C 80A5BE7C 2401FD0D */ addiu $at, $zero, 0xFD0D ## $at = FFFFFD0D -/* 00B90 80A5BE80 15410041 */ bne $t2, $at, .L80A5BF88 -/* 00B94 80A5BE84 00000000 */ nop -.L80A5BE88: -/* 00B98 80A5BE88 860B0002 */ lh $t3, 0x0002($s0) ## 80A65F42 -.L80A5BE8C: -/* 00B9C 80A5BE8C 860C0004 */ lh $t4, 0x0004($s0) ## 80A65F44 -/* 00BA0 80A5BE90 860D0006 */ lh $t5, 0x0006($s0) ## 80A65F46 -/* 00BA4 80A5BE94 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 00BA8 80A5BE98 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 -/* 00BAC 80A5BE9C 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 -/* 00BB0 80A5BEA0 468021A0 */ cvt.s.w $f6, $f4 -/* 00BB4 80A5BEA4 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 -/* 00BB8 80A5BEA8 02E02825 */ or $a1, $s7, $zero ## $a1 = FFFFFFE0 -/* 00BBC 80A5BEAC 468042A0 */ cvt.s.w $f10, $f8 -/* 00BC0 80A5BEB0 E7A60068 */ swc1 $f6, 0x0068($sp) -/* 00BC4 80A5BEB4 468084A0 */ cvt.s.w $f18, $f16 -/* 00BC8 80A5BEB8 E7AA006C */ swc1 $f10, 0x006C($sp) -/* 00BCC 80A5BEBC 0C032D9E */ jal Math3D_Vec3f_DistXYZ -/* 00BD0 80A5BEC0 E7B20070 */ swc1 $f18, 0x0070($sp) -/* 00BD4 80A5BEC4 4600B03C */ c.lt.s $f22, $f0 -/* 00BD8 80A5BEC8 46000506 */ mov.s $f20, $f0 -/* 00BDC 80A5BECC 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 00BE0 80A5BED0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00BE4 80A5BED4 4501002C */ bc1t .L80A5BF88 -/* 00BE8 80A5BED8 00000000 */ nop -/* 00BEC 80A5BEDC 0C296EEF */ jal func_80A5BBBC -/* 00BF0 80A5BEE0 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFE0 -/* 00BF4 80A5BEE4 14400028 */ bne $v0, $zero, .L80A5BF88 -/* 00BF8 80A5BEE8 00000000 */ nop -/* 00BFC 80A5BEEC 860E0002 */ lh $t6, 0x0002($s0) ## 80A65F42 -/* 00C00 80A5BEF0 26510024 */ addiu $s1, $s2, 0x0024 ## $s1 = 00000024 -/* 00C04 80A5BEF4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00C08 80A5BEF8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00C0C 80A5BEFC 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 00C10 80A5BF00 4600A586 */ mov.s $f22, $f20 -/* 00C14 80A5BF04 468021A0 */ cvt.s.w $f6, $f4 -/* 00C18 80A5BF08 02C19821 */ addu $s3, $s6, $at -/* 00C1C 80A5BF0C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00C20 80A5BF10 241E0001 */ addiu $s8, $zero, 0x0001 ## $s8 = 00000001 -/* 00C24 80A5BF14 265400E4 */ addiu $s4, $s2, 0x00E4 ## $s4 = 000000E4 -/* 00C28 80A5BF18 265500F0 */ addiu $s5, $s2, 0x00F0 ## $s5 = 000000F0 -/* 00C2C 80A5BF1C E6460024 */ swc1 $f6, 0x0024($s2) ## 00000024 -/* 00C30 80A5BF20 860F0004 */ lh $t7, 0x0004($s0) ## 80A65F44 -/* 00C34 80A5BF24 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 00C38 80A5BF28 00000000 */ nop -/* 00C3C 80A5BF2C 468042A0 */ cvt.s.w $f10, $f8 -/* 00C40 80A5BF30 E64A0028 */ swc1 $f10, 0x0028($s2) ## 00000028 -/* 00C44 80A5BF34 86180006 */ lh $t8, 0x0006($s0) ## 80A65F46 -/* 00C48 80A5BF38 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00C4C 80A5BF3C 00000000 */ nop -/* 00C50 80A5BF40 468084A0 */ cvt.s.w $f18, $f16 -/* 00C54 80A5BF44 E652002C */ swc1 $f18, 0x002C($s2) ## 0000002C -/* 00C58 80A5BF48 8E280000 */ lw $t0, 0x0000($s1) ## 00000024 -/* 00C5C 80A5BF4C AE480100 */ sw $t0, 0x0100($s2) ## 00000100 -/* 00C60 80A5BF50 8E390004 */ lw $t9, 0x0004($s1) ## 00000028 -/* 00C64 80A5BF54 AE590104 */ sw $t9, 0x0104($s2) ## 00000104 -/* 00C68 80A5BF58 8E280008 */ lw $t0, 0x0008($s1) ## 0000002C -/* 00C6C 80A5BF5C AE480108 */ sw $t0, 0x0108($s2) ## 00000108 -/* 00C70 80A5BF60 86090008 */ lh $t1, 0x0008($s0) ## 80A65F48 -/* 00C74 80A5BF64 A6490032 */ sh $t1, 0x0032($s2) ## 00000032 -/* 00C78 80A5BF68 0C00B69E */ jal Actor_WorldYawTowardActor -/* 00C7C 80A5BF6C 8EC51C44 */ lw $a1, 0x1C44($s6) ## 00001C44 -/* 00C80 80A5BF70 A64200B6 */ sh $v0, 0x00B6($s2) ## 000000B6 -/* 00C84 80A5BF74 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00C88 80A5BF78 02202825 */ or $a1, $s1, $zero ## $a1 = 00000024 -/* 00C8C 80A5BF7C 02803025 */ or $a2, $s4, $zero ## $a2 = 000000E4 -/* 00C90 80A5BF80 0C029B84 */ jal SkinMatrix_Vec3fMtxFMultXYZW -/* 00C94 80A5BF84 02A03825 */ or $a3, $s5, $zero ## $a3 = 000000F0 -.L80A5BF88: -/* 00C98 80A5BF88 3C0A80A6 */ lui $t2, %hi(D_80A665DA) ## $t2 = 80A60000 -/* 00C9C 80A5BF8C 254A65DA */ addiu $t2, $t2, %lo(D_80A665DA) ## $t2 = 80A665DA -/* 00CA0 80A5BF90 2610000A */ addiu $s0, $s0, 0x000A ## $s0 = 80A65F4A -/* 00CA4 80A5BF94 560AFF95 */ bnel $s0, $t2, .L80A5BDEC -/* 00CA8 80A5BF98 86C200A4 */ lh $v0, 0x00A4($s6) ## 000000A4 -/* 00CAC 80A5BF9C 8FBF004C */ lw $ra, 0x004C($sp) -/* 00CB0 80A5BFA0 03C01025 */ or $v0, $s8, $zero ## $v0 = 00000001 -/* 00CB4 80A5BFA4 8FBE0048 */ lw $s8, 0x0048($sp) -/* 00CB8 80A5BFA8 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00CBC 80A5BFAC D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 00CC0 80A5BFB0 8FB00028 */ lw $s0, 0x0028($sp) -/* 00CC4 80A5BFB4 8FB1002C */ lw $s1, 0x002C($sp) -/* 00CC8 80A5BFB8 8FB20030 */ lw $s2, 0x0030($sp) -/* 00CCC 80A5BFBC 8FB30034 */ lw $s3, 0x0034($sp) -/* 00CD0 80A5BFC0 8FB40038 */ lw $s4, 0x0038($sp) -/* 00CD4 80A5BFC4 8FB5003C */ lw $s5, 0x003C($sp) -/* 00CD8 80A5BFC8 8FB60040 */ lw $s6, 0x0040($sp) -/* 00CDC 80A5BFCC 8FB70044 */ lw $s7, 0x0044($sp) -/* 00CE0 80A5BFD0 03E00008 */ jr $ra -/* 00CE4 80A5BFD4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFD8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFD8.s deleted file mode 100644 index b4e50401b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFD8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80A5BFD8 -/* 00CE8 80A5BFD8 AFA50004 */ sw $a1, 0x0004($sp) -/* 00CEC 80A5BFDC 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 00CF0 80A5BFE0 AC8E0380 */ sw $t6, 0x0380($a0) ## 00000380 -/* 00CF4 80A5BFE4 03E00008 */ jr $ra -/* 00CF8 80A5BFE8 A4800384 */ sh $zero, 0x0384($a0) ## 00000384 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFEC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFEC.s deleted file mode 100644 index 6833c67d6a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFEC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80A5BFEC -/* 00CFC 80A5BFEC AFA50004 */ sw $a1, 0x0004($sp) -/* 00D00 80A5BFF0 03E00008 */ jr $ra -/* 00D04 80A5BFF4 AC800388 */ sw $zero, 0x0388($a0) ## 00000388 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFF8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFF8.s deleted file mode 100644 index 49f3fbcc67..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFF8.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80A5BFF8 -/* 00D08 80A5BFF8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00D0C 80A5BFFC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D10 80A5C000 8CA61C44 */ lw $a2, 0x1C44($a1) ## 00001C44 -/* 00D14 80A5C004 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00D18 80A5C008 8CCE067C */ lw $t6, 0x067C($a2) ## 0000067C -/* 00D1C 80A5C00C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00D20 80A5C010 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00D24 80A5C014 15E00021 */ bne $t7, $zero, .L80A5C09C -/* 00D28 80A5C018 00000000 */ nop -/* 00D2C 80A5C01C AFA6001C */ sw $a2, 0x001C($sp) -/* 00D30 80A5C020 AFA50024 */ sw $a1, 0x0024($sp) -/* 00D34 80A5C024 0C00B75E */ jal func_8002DD78 -/* 00D38 80A5C028 AFA70020 */ sw $a3, 0x0020($sp) -/* 00D3C 80A5C02C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00D40 80A5C030 8FA3001C */ lw $v1, 0x001C($sp) -/* 00D44 80A5C034 8FA50024 */ lw $a1, 0x0024($sp) -/* 00D48 80A5C038 10410018 */ beq $v0, $at, .L80A5C09C -/* 00D4C 80A5C03C 8FA70020 */ lw $a3, 0x0020($sp) -/* 00D50 80A5C040 8C78067C */ lw $t8, 0x067C($v1) ## 0000067C -/* 00D54 80A5C044 0018CAC0 */ sll $t9, $t8, 11 -/* 00D58 80A5C048 07200014 */ bltz $t9, .L80A5C09C -/* 00D5C 80A5C04C 00000000 */ nop -/* 00D60 80A5C050 8CE801F0 */ lw $t0, 0x01F0($a3) ## 000001F0 -/* 00D64 80A5C054 00084B00 */ sll $t1, $t0, 12 -/* 00D68 80A5C058 05230005 */ bgezl $t1, .L80A5C070 -/* 00D6C 80A5C05C 8CEB014C */ lw $t3, 0x014C($a3) ## 0000014C -/* 00D70 80A5C060 8CEA0388 */ lw $t2, 0x0388($a3) ## 00000388 -/* 00D74 80A5C064 1140000D */ beq $t2, $zero, .L80A5C09C -/* 00D78 80A5C068 00000000 */ nop -/* 00D7C 80A5C06C 8CEB014C */ lw $t3, 0x014C($a3) ## 0000014C -.L80A5C070: -/* 00D80 80A5C070 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 -/* 00D84 80A5C074 11610009 */ beq $t3, $at, .L80A5C09C -/* 00D88 80A5C078 00000000 */ nop -/* 00D8C 80A5C07C 8C6C0004 */ lw $t4, 0x0004($v1) ## 00000004 -/* 00D90 80A5C080 318D0100 */ andi $t5, $t4, 0x0100 ## $t5 = 00000000 -/* 00D94 80A5C084 15A00005 */ bne $t5, $zero, .L80A5C09C -/* 00D98 80A5C088 00000000 */ nop -/* 00D9C 80A5C08C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00DA0 80A5C090 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00DA4 80A5C094 11C00003 */ beq $t6, $zero, .L80A5C0A4 -/* 00DA8 80A5C098 00000000 */ nop -.L80A5C09C: -/* 00DAC 80A5C09C 10000001 */ beq $zero, $zero, .L80A5C0A4 -/* 00DB0 80A5C0A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A5C0A4: -/* 00DB4 80A5C0A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00DB8 80A5C0A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00DBC 80A5C0AC 03E00008 */ jr $ra -/* 00DC0 80A5C0B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0B4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0B4.s deleted file mode 100644 index a8283611dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0B4.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80A5C0B4 -/* 00DC4 80A5C0B4 AFA50004 */ sw $a1, 0x0004($sp) -/* 00DC8 80A5C0B8 AC80039C */ sw $zero, 0x039C($a0) ## 0000039C -/* 00DCC 80A5C0BC AC8003A0 */ sw $zero, 0x03A0($a0) ## 000003A0 -/* 00DD0 80A5C0C0 03E00008 */ jr $ra -/* 00DD4 80A5C0C4 AC8003A4 */ sw $zero, 0x03A4($a0) ## 000003A4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0C8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0C8.s deleted file mode 100644 index 3c873fa18b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0C8.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80A5C0C8 -/* 00DD8 80A5C0C8 03E00008 */ jr $ra -/* 00DDC 80A5C0CC A4800000 */ sh $zero, 0x0000($a0) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C888.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C888.s deleted file mode 100644 index 9540d59106..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C888.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80A5C888 -/* 01598 80A5C888 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0159C 80A5C88C AFBF0014 */ sw $ra, 0x0014($sp) -/* 015A0 80A5C890 8CA61C44 */ lw $a2, 0x1C44($a1) ## 00001C44 -/* 015A4 80A5C894 AFA40018 */ sw $a0, 0x0018($sp) -/* 015A8 80A5C898 24070190 */ addiu $a3, $zero, 0x0190 ## $a3 = 00000190 -/* 015AC 80A5C89C 0C296D78 */ jal func_80A5B5E0 -/* 015B0 80A5C8A0 24C60024 */ addiu $a2, $a2, 0x0024 ## $a2 = 00000024 -/* 015B4 80A5C8A4 8FA40018 */ lw $a0, 0x0018($sp) -/* 015B8 80A5C8A8 8C8E01F0 */ lw $t6, 0x01F0($a0) ## 000001F0 -/* 015BC 80A5C8AC 31CF4000 */ andi $t7, $t6, 0x4000 ## $t7 = 00000000 -/* 015C0 80A5C8B0 51E0000D */ beql $t7, $zero, .L80A5C8E8 -/* 015C4 80A5C8B4 84890032 */ lh $t1, 0x0032($a0) ## 00000032 -/* 015C8 80A5C8B8 84980032 */ lh $t8, 0x0032($a0) ## 00000032 -/* 015CC 80A5C8BC 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 015D0 80A5C8C0 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 -/* 015D4 80A5C8C4 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 015D8 80A5C8C8 00000000 */ nop -/* 015DC 80A5C8CC 468021A0 */ cvt.s.w $f6, $f4 -/* 015E0 80A5C8D0 46083280 */ add.s $f10, $f6, $f8 -/* 015E4 80A5C8D4 4600540D */ trunc.w.s $f16, $f10 -/* 015E8 80A5C8D8 44088000 */ mfc1 $t0, $f16 -/* 015EC 80A5C8DC 00000000 */ nop -/* 015F0 80A5C8E0 A4880032 */ sh $t0, 0x0032($a0) ## 00000032 -/* 015F4 80A5C8E4 84890032 */ lh $t1, 0x0032($a0) ## 00000032 -.L80A5C8E8: -/* 015F8 80A5C8E8 A48900B6 */ sh $t1, 0x00B6($a0) ## 000000B6 -/* 015FC 80A5C8EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01600 80A5C8F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01604 80A5C8F4 03E00008 */ jr $ra -/* 01608 80A5C8F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C8FC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C8FC.s deleted file mode 100644 index 0df7f21de6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C8FC.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A5C8FC -/* 0160C 80A5C8FC 8C82014C */ lw $v0, 0x014C($a0) ## 0000014C -/* 01610 80A5C900 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 01614 80A5C904 1041001B */ beq $v0, $at, .L80A5C974 -/* 01618 80A5C908 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 -/* 0161C 80A5C90C 10410019 */ beq $v0, $at, .L80A5C974 -/* 01620 80A5C910 00000000 */ nop -/* 01624 80A5C914 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 01628 80A5C918 3C0E80A6 */ lui $t6, %hi(D_80A6666C) ## $t6 = 80A60000 -/* 0162C 80A5C91C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01630 80A5C920 01C37021 */ addu $t6, $t6, $v1 -/* 01634 80A5C924 91CE666C */ lbu $t6, %lo(D_80A6666C)($t6) -/* 01638 80A5C928 51C00007 */ beql $t6, $zero, .L80A5C948 -/* 0163C 80A5C92C 908F028A */ lbu $t7, 0x028A($a0) ## 0000028A -/* 01640 80A5C930 50610005 */ beql $v1, $at, .L80A5C948 -/* 01644 80A5C934 908F028A */ lbu $t7, 0x028A($a0) ## 0000028A -/* 01648 80A5C938 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 -/* 0164C 80A5C93C AC800154 */ sw $zero, 0x0154($a0) ## 00000154 -/* 01650 80A5C940 8C82014C */ lw $v0, 0x014C($a0) ## 0000014C -/* 01654 80A5C944 908F028A */ lbu $t7, 0x028A($a0) ## 0000028A -.L80A5C948: -/* 01658 80A5C948 909902D6 */ lbu $t9, 0x02D6($a0) ## 000002D6 -/* 0165C 80A5C94C 90890322 */ lbu $t1, 0x0322($a0) ## 00000322 -/* 01660 80A5C950 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 -/* 01664 80A5C954 3328FFFE */ andi $t0, $t9, 0xFFFE ## $t0 = 00000000 -/* 01668 80A5C958 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 -/* 0166C 80A5C95C AC820254 */ sw $v0, 0x0254($a0) ## 00000254 -/* 01670 80A5C960 AC80014C */ sw $zero, 0x014C($a0) ## 0000014C -/* 01674 80A5C964 A098028A */ sb $t8, 0x028A($a0) ## 0000028A -/* 01678 80A5C968 A08802D6 */ sb $t0, 0x02D6($a0) ## 000002D6 -/* 0167C 80A5C96C A08A0322 */ sb $t2, 0x0322($a0) ## 00000322 -/* 01680 80A5C970 AC800210 */ sw $zero, 0x0210($a0) ## 00000210 -.L80A5C974: -/* 01684 80A5C974 03E00008 */ jr $ra -/* 01688 80A5C978 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C97C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C97C.s deleted file mode 100644 index f12b942da7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C97C.s +++ /dev/null @@ -1,103 +0,0 @@ -glabel func_80A5C97C -/* 0168C 80A5C97C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01690 80A5C980 AFBF001C */ sw $ra, 0x001C($sp) -/* 01694 80A5C984 AFB00018 */ sw $s0, 0x0018($sp) -/* 01698 80A5C988 8C8E0150 */ lw $t6, 0x0150($a0) ## 00000150 -/* 0169C 80A5C98C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 016A0 80A5C990 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 016A4 80A5C994 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 016A8 80A5C998 AC8F0150 */ sw $t7, 0x0150($a0) ## 00000150 -/* 016AC 80A5C99C 05E1004E */ bgez $t7, .L80A5CAD8 -/* 016B0 80A5C9A0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 016B4 80A5C9A4 9099028A */ lbu $t9, 0x028A($a0) ## 0000028A -/* 016B8 80A5C9A8 908902D6 */ lbu $t1, 0x02D6($a0) ## 000002D6 -/* 016BC 80A5C9AC 908B0322 */ lbu $t3, 0x0322($a0) ## 00000322 -/* 016C0 80A5C9B0 8C8D020C */ lw $t5, 0x020C($a0) ## 0000020C -/* 016C4 80A5C9B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 016C8 80A5C9B8 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 016CC 80A5C9BC 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 016D0 80A5C9C0 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 016D4 80A5C9C4 A088028A */ sb $t0, 0x028A($a0) ## 0000028A -/* 016D8 80A5C9C8 A08A02D6 */ sb $t2, 0x02D6($a0) ## 000002D6 -/* 016DC 80A5C9CC 15A1002D */ bne $t5, $at, .L80A5CA84 -/* 016E0 80A5C9D0 A08C0322 */ sb $t4, 0x0322($a0) ## 00000322 -/* 016E4 80A5C9D4 8C8E01F0 */ lw $t6, 0x01F0($a0) ## 000001F0 -/* 016E8 80A5C9D8 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 016EC 80A5C9DC 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 016F0 80A5C9E0 01C17824 */ and $t7, $t6, $at -/* 016F4 80A5C9E4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 016F8 80A5C9E8 14410005 */ bne $v0, $at, .L80A5CA00 -/* 016FC 80A5C9EC AC8F01F0 */ sw $t7, 0x01F0($a0) ## 000001F0 -/* 01700 80A5C9F0 0C2973CA */ jal func_80A5CF28 -/* 01704 80A5C9F4 00000000 */ nop -/* 01708 80A5C9F8 1000001E */ beq $zero, $zero, .L80A5CA74 -/* 0170C 80A5C9FC 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L80A5CA00: -/* 01710 80A5CA00 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01714 80A5CA04 14410010 */ bne $v0, $at, .L80A5CA48 -/* 01718 80A5CA08 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 0171C 80A5CA0C A618001C */ sh $t8, 0x001C($s0) ## 0000001C -/* 01720 80A5CA10 90B91D6C */ lbu $t9, 0x1D6C($a1) ## 00001D6C -/* 01724 80A5CA14 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 01728 80A5CA18 53200006 */ beql $t9, $zero, .L80A5CA34 -/* 0172C 80A5CA1C 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 -/* 01730 80A5CA20 0C2973D9 */ jal func_80A5CF64 -/* 01734 80A5CA24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01738 80A5CA28 10000012 */ beq $zero, $zero, .L80A5CA74 -/* 0173C 80A5CA2C 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 01740 80A5CA30 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 -.L80A5CA34: -/* 01744 80A5CA34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01748 80A5CA38 0C29772C */ jal func_80A5DCB0 -/* 0174C 80A5CA3C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 01750 80A5CA40 1000000C */ beq $zero, $zero, .L80A5CA74 -/* 01754 80A5CA44 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L80A5CA48: -/* 01758 80A5CA48 8E080254 */ lw $t0, 0x0254($s0) ## 00000254 -/* 0175C 80A5CA4C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01760 80A5CA50 15010005 */ bne $t0, $at, .L80A5CA68 -/* 01764 80A5CA54 00000000 */ nop -/* 01768 80A5CA58 0C2973D9 */ jal func_80A5CF64 -/* 0176C 80A5CA5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01770 80A5CA60 10000004 */ beq $zero, $zero, .L80A5CA74 -/* 01774 80A5CA64 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L80A5CA68: -/* 01778 80A5CA68 0C2973CA */ jal func_80A5CF28 -/* 0177C 80A5CA6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01780 80A5CA70 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L80A5CA74: -/* 01784 80A5CA74 51200019 */ beql $t1, $zero, .L80A5CADC -/* 01788 80A5CA78 8FBF001C */ lw $ra, 0x001C($sp) -/* 0178C 80A5CA7C 10000016 */ beq $zero, $zero, .L80A5CAD8 -/* 01790 80A5CA80 A600001C */ sh $zero, 0x001C($s0) ## 0000001C -.L80A5CA84: -/* 01794 80A5CA84 8E020254 */ lw $v0, 0x0254($s0) ## 00000254 -/* 01798 80A5CA88 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0179C 80A5CA8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017A0 80A5CA90 14410005 */ bne $v0, $at, .L80A5CAA8 -/* 017A4 80A5CA94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 017A8 80A5CA98 0C297CE0 */ jal func_80A5F380 -/* 017AC 80A5CA9C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 017B0 80A5CAA0 1000000E */ beq $zero, $zero, .L80A5CADC -/* 017B4 80A5CAA4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5CAA8: -/* 017B8 80A5CAA8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 017BC 80A5CAAC 14410007 */ bne $v0, $at, .L80A5CACC -/* 017C0 80A5CAB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017C4 80A5CAB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017C8 80A5CAB8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 017CC 80A5CABC 0C297CE0 */ jal func_80A5F380 -/* 017D0 80A5CAC0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 017D4 80A5CAC4 10000005 */ beq $zero, $zero, .L80A5CADC -/* 017D8 80A5CAC8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5CACC: -/* 017DC 80A5CACC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 017E0 80A5CAD0 0C297CE0 */ jal func_80A5F380 -/* 017E4 80A5CAD4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -.L80A5CAD8: -/* 017E8 80A5CAD8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5CADC: -/* 017EC 80A5CADC 8FB00018 */ lw $s0, 0x0018($sp) -/* 017F0 80A5CAE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 017F4 80A5CAE4 03E00008 */ jr $ra -/* 017F8 80A5CAE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s deleted file mode 100644 index f1724366a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s +++ /dev/null @@ -1,306 +0,0 @@ -.late_rodata -glabel D_80A66880 - .word 0x3D75C28F -glabel D_80A66884 - .word 0x3C97B426 -glabel D_80A66888 - .float 0.01 - -glabel D_80A6688C - .word 0x38021CC8 -glabel D_80A66890 - .word 0x400CCCCD, 0x00000000 - -.text -glabel func_80A5CAEC -/* 017FC 80A5CAEC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01800 80A5CAF0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01804 80A5CAF4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01808 80A5CAF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0180C 80A5CAFC AFA5004C */ sw $a1, 0x004C($sp) -/* 01810 80A5CB00 AFA60050 */ sw $a2, 0x0050($sp) -/* 01814 80A5CB04 0C296FFE */ jal func_80A5BFF8 -/* 01818 80A5CB08 AFA70054 */ sw $a3, 0x0054($sp) -/* 0181C 80A5CB0C 14400014 */ bne $v0, $zero, .L80A5CB60 -/* 01820 80A5CB10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01824 80A5CB14 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 01828 80A5CB18 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 0182C 80A5CB1C C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 01830 80A5CB20 C7A6005C */ lwc1 $f6, 0x005C($sp) -/* 01834 80A5CB24 4602203C */ c.lt.s $f4, $f2 -/* 01838 80A5CB28 00000000 */ nop -/* 0183C 80A5CB2C 45020005 */ bc1fl .L80A5CB44 -/* 01840 80A5CB30 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01844 80A5CB34 46061201 */ sub.s $f8, $f2, $f6 -/* 01848 80A5CB38 100000F6 */ beq $zero, $zero, .L80A5CF14 -/* 0184C 80A5CB3C E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 01850 80A5CB40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80A5CB44: -/* 01854 80A5CB44 00000000 */ nop -/* 01858 80A5CB48 4600103C */ c.lt.s $f2, $f0 -/* 0185C 80A5CB4C 00000000 */ nop -/* 01860 80A5CB50 450200F1 */ bc1fl .L80A5CF18 -/* 01864 80A5CB54 8FBF001C */ lw $ra, 0x001C($sp) -/* 01868 80A5CB58 100000EE */ beq $zero, $zero, .L80A5CF14 -/* 0186C 80A5CB5C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L80A5CB60: -/* 01870 80A5CB60 0C296EC5 */ jal func_80A5BB14 -/* 01874 80A5CB64 8FA5004C */ lw $a1, 0x004C($sp) -/* 01878 80A5CB68 C7AC0060 */ lwc1 $f12, 0x0060($sp) -/* 0187C 80A5CB6C 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 -/* 01880 80A5CB70 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFF8 -/* 01884 80A5CB74 46006302 */ mul.s $f12, $f12, $f0 -/* 01888 80A5CB78 27A6003E */ addiu $a2, $sp, 0x003E ## $a2 = FFFFFFF6 -/* 0188C 80A5CB7C 0C298C52 */ jal func_80A63148 -/* 01890 80A5CB80 E7AC0060 */ swc1 $f12, 0x0060($sp) -/* 01894 80A5CB84 0C01DE0D */ jal Math_CosS - ## coss? -/* 01898 80A5CB88 87A4003E */ lh $a0, 0x003E($sp) -/* 0189C 80A5CB8C C7AA0054 */ lwc1 $f10, 0x0054($sp) -/* 018A0 80A5CB90 C7AC0060 */ lwc1 $f12, 0x0060($sp) -/* 018A4 80A5CB94 C7A60050 */ lwc1 $f6, 0x0050($sp) -/* 018A8 80A5CB98 460A003E */ c.le.s $f0, $f10 -/* 018AC 80A5CB9C C7AA0040 */ lwc1 $f10, 0x0040($sp) -/* 018B0 80A5CBA0 C7A40058 */ lwc1 $f4, 0x0058($sp) -/* 018B4 80A5CBA4 4502000F */ bc1fl .L80A5CBE4 -/* 018B8 80A5CBA8 4604503C */ c.lt.s $f10, $f4 -/* 018BC 80A5CBAC C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 018C0 80A5CBB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 018C4 80A5CBB4 46062201 */ sub.s $f8, $f4, $f6 -/* 018C8 80A5CBB8 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 018CC 80A5CBBC C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 018D0 80A5CBC0 4600103C */ c.lt.s $f2, $f0 -/* 018D4 80A5CBC4 00000000 */ nop -/* 018D8 80A5CBC8 45000003 */ bc1f .L80A5CBD8 -/* 018DC 80A5CBCC 00000000 */ nop -/* 018E0 80A5CBD0 100000D0 */ beq $zero, $zero, .L80A5CF14 -/* 018E4 80A5CBD4 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L80A5CBD8: -/* 018E8 80A5CBD8 100000CE */ beq $zero, $zero, .L80A5CF14 -/* 018EC 80A5CBDC E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 018F0 80A5CBE0 4604503C */ c.lt.s $f10, $f4 -.L80A5CBE4: -/* 018F4 80A5CBE4 00000000 */ nop -/* 018F8 80A5CBE8 45020015 */ bc1fl .L80A5CC40 -/* 018FC 80A5CBEC 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 01900 80A5CBF0 8E0E01F0 */ lw $t6, 0x01F0($s0) ## 000001F0 -/* 01904 80A5CBF4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 01908 80A5CBF8 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 0190C 80A5CBFC 01C17824 */ and $t7, $t6, $at -/* 01910 80A5CC00 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 01914 80A5CC04 AE0F01F0 */ sw $t7, 0x01F0($s0) ## 000001F0 -/* 01918 80A5CC08 01E1C824 */ and $t9, $t7, $at -/* 0191C 80A5CC0C AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 01920 80A5CC10 C7A8005C */ lwc1 $f8, 0x005C($sp) -/* 01924 80A5CC14 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01928 80A5CC18 46083281 */ sub.s $f10, $f6, $f8 -/* 0192C 80A5CC1C E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 01930 80A5CC20 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 01934 80A5CC24 4600203C */ c.lt.s $f4, $f0 -/* 01938 80A5CC28 00000000 */ nop -/* 0193C 80A5CC2C 450200BA */ bc1fl .L80A5CF18 -/* 01940 80A5CC30 8FBF001C */ lw $ra, 0x001C($sp) -/* 01944 80A5CC34 100000B7 */ beq $zero, $zero, .L80A5CF14 -/* 01948 80A5CC38 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 0194C 80A5CC3C 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -.L80A5CC40: -/* 01950 80A5CC40 30480001 */ andi $t0, $v0, 0x0001 ## $t0 = 00000000 -/* 01954 80A5CC44 11000035 */ beq $t0, $zero, .L80A5CD1C -/* 01958 80A5CC48 304C0002 */ andi $t4, $v0, 0x0002 ## $t4 = 00000000 -/* 0195C 80A5CC4C 8E090240 */ lw $t1, 0x0240($s0) ## 00000240 -/* 01960 80A5CC50 240A0010 */ addiu $t2, $zero, 0x0010 ## $t2 = 00000010 -/* 01964 80A5CC54 8FA5004C */ lw $a1, 0x004C($sp) -/* 01968 80A5CC58 01495823 */ subu $t3, $t2, $t1 -/* 0196C 80A5CC5C 19600012 */ blez $t3, .L80A5CCA8 -/* 01970 80A5CC60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01974 80A5CC64 0C296EC5 */ jal func_80A5BB14 -/* 01978 80A5CC68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0197C 80A5CC6C 8E0C0208 */ lw $t4, 0x0208($s0) ## 00000208 -/* 01980 80A5CC70 8E0D0240 */ lw $t5, 0x0240($s0) ## 00000240 -/* 01984 80A5CC74 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01988 80A5CC78 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 0198C 80A5CC7C 01CD7823 */ subu $t7, $t6, $t5 -/* 01990 80A5CC80 C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 01994 80A5CC84 46803220 */ cvt.s.w $f8, $f6 -/* 01998 80A5CC88 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 0199C 80A5CC8C 46080282 */ mul.s $f10, $f0, $f8 -/* 019A0 80A5CC90 46803220 */ cvt.s.w $f8, $f6 -/* 019A4 80A5CC94 46025101 */ sub.s $f4, $f10, $f2 -/* 019A8 80A5CC98 46082283 */ div.s $f10, $f4, $f8 -/* 019AC 80A5CC9C 46025180 */ add.s $f6, $f10, $f2 -/* 019B0 80A5CCA0 10000009 */ beq $zero, $zero, .L80A5CCC8 -/* 019B4 80A5CCA4 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L80A5CCA8: -/* 019B8 80A5CCA8 0C296EC5 */ jal func_80A5BB14 -/* 019BC 80A5CCAC 8FA5004C */ lw $a1, 0x004C($sp) -/* 019C0 80A5CCB0 8E180208 */ lw $t8, 0x0208($s0) ## 00000208 -/* 019C4 80A5CCB4 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 019C8 80A5CCB8 00000000 */ nop -/* 019CC 80A5CCBC 46802220 */ cvt.s.w $f8, $f4 -/* 019D0 80A5CCC0 46080282 */ mul.s $f10, $f0, $f8 -/* 019D4 80A5CCC4 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -.L80A5CCC8: -/* 019D8 80A5CCC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019DC 80A5CCCC 0C296EC5 */ jal func_80A5BB14 -/* 019E0 80A5CCD0 8FA5004C */ lw $a1, 0x004C($sp) -/* 019E4 80A5CCD4 8E190208 */ lw $t9, 0x0208($s0) ## 00000208 -/* 019E8 80A5CCD8 C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 019EC 80A5CCDC 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 019F0 80A5CCE0 00000000 */ nop -/* 019F4 80A5CCE4 46803120 */ cvt.s.w $f4, $f6 -/* 019F8 80A5CCE8 46040202 */ mul.s $f8, $f0, $f4 -/* 019FC 80A5CCEC 4602403E */ c.le.s $f8, $f2 -/* 01A00 80A5CCF0 00000000 */ nop -/* 01A04 80A5CCF4 45020048 */ bc1fl .L80A5CE18 -/* 01A08 80A5CCF8 87AD003E */ lh $t5, 0x003E($sp) -/* 01A0C 80A5CCFC 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -/* 01A10 80A5CD00 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 01A14 80A5CD04 C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 01A18 80A5CD08 01015024 */ and $t2, $t0, $at -/* 01A1C 80A5CD0C AE0A01F0 */ sw $t2, 0x01F0($s0) ## 000001F0 -/* 01A20 80A5CD10 354B0002 */ ori $t3, $t2, 0x0002 ## $t3 = 00000002 -/* 01A24 80A5CD14 1000003F */ beq $zero, $zero, .L80A5CE14 -/* 01A28 80A5CD18 AE0B01F0 */ sw $t3, 0x01F0($s0) ## 000001F0 -.L80A5CD1C: -/* 01A2C 80A5CD1C 11800015 */ beq $t4, $zero, .L80A5CD74 -/* 01A30 80A5CD20 3C0180A6 */ lui $at, %hi(D_80A66884) ## $at = 80A60000 -/* 01A34 80A5CD24 C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 01A38 80A5CD28 3C0180A6 */ lui $at, %hi(D_80A66880) ## $at = 80A60000 -/* 01A3C 80A5CD2C 4602603C */ c.lt.s $f12, $f2 -/* 01A40 80A5CD30 00000000 */ nop -/* 01A44 80A5CD34 45020007 */ bc1fl .L80A5CD54 -/* 01A48 80A5CD38 460C103C */ c.lt.s $f2, $f12 -/* 01A4C 80A5CD3C C42A6880 */ lwc1 $f10, %lo(D_80A66880)($at) -/* 01A50 80A5CD40 460A1181 */ sub.s $f6, $f2, $f10 -/* 01A54 80A5CD44 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 01A58 80A5CD48 10000032 */ beq $zero, $zero, .L80A5CE14 -/* 01A5C 80A5CD4C C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 01A60 80A5CD50 460C103C */ c.lt.s $f2, $f12 -.L80A5CD54: -/* 01A64 80A5CD54 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 01A68 80A5CD58 00417024 */ and $t6, $v0, $at -/* 01A6C 80A5CD5C 4502002E */ bc1fl .L80A5CE18 -/* 01A70 80A5CD60 87AD003E */ lh $t5, 0x003E($sp) -/* 01A74 80A5CD64 E60C0068 */ swc1 $f12, 0x0068($s0) ## 00000068 -/* 01A78 80A5CD68 C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 01A7C 80A5CD6C 10000029 */ beq $zero, $zero, .L80A5CE14 -/* 01A80 80A5CD70 AE0E01F0 */ sw $t6, 0x01F0($s0) ## 000001F0 -.L80A5CD74: -/* 01A84 80A5CD74 C4246884 */ lwc1 $f4, %lo(D_80A66884)($at) -/* 01A88 80A5CD78 C7AA0040 */ lwc1 $f10, 0x0040($sp) -/* 01A8C 80A5CD7C C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 01A90 80A5CD80 46046202 */ mul.s $f8, $f12, $f4 -/* 01A94 80A5CD84 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01A98 80A5CD88 460A4182 */ mul.s $f6, $f8, $f10 -/* 01A9C 80A5CD8C 4606103E */ c.le.s $f2, $f6 -/* 01AA0 80A5CD90 00000000 */ nop -/* 01AA4 80A5CD94 45020006 */ bc1fl .L80A5CDB0 -/* 01AA8 80A5CD98 44810000 */ mtc1 $at, $f0 ## $f0 = -1.00 -/* 01AAC 80A5CD9C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01AB0 80A5CDA0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 01AB4 80A5CDA4 10000004 */ beq $zero, $zero, .L80A5CDB8 -/* 01AB8 80A5CDA8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 01ABC 80A5CDAC 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 -.L80A5CDB0: -/* 01AC0 80A5CDB0 00000000 */ nop -/* 01AC4 80A5CDB4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -.L80A5CDB8: -/* 01AC8 80A5CDB8 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 01ACC 80A5CDBC 3C0180A6 */ lui $at, %hi(D_80A66888) ## $at = 80A60000 -/* 01AD0 80A5CDC0 C42A6888 */ lwc1 $f10, %lo(D_80A66888)($at) -/* 01AD4 80A5CDC4 46040202 */ mul.s $f8, $f0, $f4 -/* 01AD8 80A5CDC8 00000000 */ nop -/* 01ADC 80A5CDCC 460A4182 */ mul.s $f6, $f8, $f10 -/* 01AE0 80A5CDD0 46061100 */ add.s $f4, $f2, $f6 -/* 01AE4 80A5CDD4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 01AE8 80A5CDD8 C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 01AEC 80A5CDDC C7A8005C */ lwc1 $f8, 0x005C($sp) -/* 01AF0 80A5CDE0 4602603C */ c.lt.s $f12, $f2 -/* 01AF4 80A5CDE4 00000000 */ nop -/* 01AF8 80A5CDE8 4500000A */ bc1f .L80A5CE14 -/* 01AFC 80A5CDEC 00000000 */ nop -/* 01B00 80A5CDF0 46081281 */ sub.s $f10, $f2, $f8 -/* 01B04 80A5CDF4 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 01B08 80A5CDF8 C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 01B0C 80A5CDFC 460C103C */ c.lt.s $f2, $f12 -/* 01B10 80A5CE00 00000000 */ nop -/* 01B14 80A5CE04 45020004 */ bc1fl .L80A5CE18 -/* 01B18 80A5CE08 87AD003E */ lh $t5, 0x003E($sp) -/* 01B1C 80A5CE0C E60C0068 */ swc1 $f12, 0x0068($s0) ## 00000068 -/* 01B20 80A5CE10 C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -.L80A5CE14: -/* 01B24 80A5CE14 87AD003E */ lh $t5, 0x003E($sp) -.L80A5CE18: -/* 01B28 80A5CE18 8E0F0208 */ lw $t7, 0x0208($s0) ## 00000208 -/* 01B2C 80A5CE1C 3C0180A6 */ lui $at, %hi(D_80A6688C) ## $at = 80A60000 -/* 01B30 80A5CE20 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 01B34 80A5CE24 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 01B38 80A5CE28 C424688C */ lwc1 $f4, %lo(D_80A6688C)($at) -/* 01B3C 80A5CE2C 46803020 */ cvt.s.w $f0, $f6 -/* 01B40 80A5CE30 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01B44 80A5CE34 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 01B48 80A5CE38 3C0180A6 */ lui $at, %hi(D_80A66890) ## $at = 80A60000 -/* 01B4C 80A5CE3C 87A30066 */ lh $v1, 0x0066($sp) -/* 01B50 80A5CE40 468051A0 */ cvt.s.w $f6, $f10 -/* 01B54 80A5CE44 46040302 */ mul.s $f12, $f0, $f4 -/* 01B58 80A5CE48 0003C823 */ subu $t9, $zero, $v1 -/* 01B5C 80A5CE4C 46064103 */ div.s $f4, $f8, $f6 -/* 01B60 80A5CE50 C4286890 */ lwc1 $f8, %lo(D_80A66890)($at) -/* 01B64 80A5CE54 46041282 */ mul.s $f10, $f2, $f4 -/* 01B68 80A5CE58 00000000 */ nop -/* 01B6C 80A5CE5C 460C0182 */ mul.s $f6, $f0, $f12 -/* 01B70 80A5CE60 460A4381 */ sub.s $f14, $f8, $f10 -/* 01B74 80A5CE64 460C3102 */ mul.s $f4, $f6, $f12 -/* 01B78 80A5CE68 00000000 */ nop -/* 01B7C 80A5CE6C 460E2202 */ mul.s $f8, $f4, $f14 -/* 01B80 80A5CE70 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 01B84 80A5CE74 4600428D */ trunc.w.s $f10, $f8 -/* 01B88 80A5CE78 46802220 */ cvt.s.w $f8, $f4 -/* 01B8C 80A5CE7C 44025000 */ mfc1 $v0, $f10 -/* 01B90 80A5CE80 00000000 */ nop -/* 01B94 80A5CE84 00021400 */ sll $v0, $v0, 16 -/* 01B98 80A5CE88 00021403 */ sra $v0, $v0, 16 -/* 01B9C 80A5CE8C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 01BA0 80A5CE90 460E4482 */ mul.s $f18, $f8, $f14 -/* 01BA4 80A5CE94 46803420 */ cvt.s.w $f16, $f6 -/* 01BA8 80A5CE98 4612803C */ c.lt.s $f16, $f18 -/* 01BAC 80A5CE9C 00000000 */ nop -/* 01BB0 80A5CEA0 45000007 */ bc1f .L80A5CEC0 -/* 01BB4 80A5CEA4 00000000 */ nop -/* 01BB8 80A5CEA8 4600928D */ trunc.w.s $f10, $f18 -/* 01BBC 80A5CEAC 44025000 */ mfc1 $v0, $f10 -/* 01BC0 80A5CEB0 00000000 */ nop -/* 01BC4 80A5CEB4 00021400 */ sll $v0, $v0, 16 -/* 01BC8 80A5CEB8 10000011 */ beq $zero, $zero, .L80A5CF00 -/* 01BCC 80A5CEBC 00021403 */ sra $v0, $v0, 16 -.L80A5CEC0: -/* 01BD0 80A5CEC0 44833000 */ mtc1 $v1, $f6 ## $f6 = 0.00 -/* 01BD4 80A5CEC4 00000000 */ nop -/* 01BD8 80A5CEC8 46803120 */ cvt.s.w $f4, $f6 -/* 01BDC 80A5CECC 460E2082 */ mul.s $f2, $f4, $f14 -/* 01BE0 80A5CED0 4610103C */ c.lt.s $f2, $f16 -/* 01BE4 80A5CED4 00000000 */ nop -/* 01BE8 80A5CED8 45020004 */ bc1fl .L80A5CEEC -/* 01BEC 80A5CEDC 46008006 */ mov.s $f0, $f16 -/* 01BF0 80A5CEE0 10000002 */ beq $zero, $zero, .L80A5CEEC -/* 01BF4 80A5CEE4 46001006 */ mov.s $f0, $f2 -/* 01BF8 80A5CEE8 46008006 */ mov.s $f0, $f16 -.L80A5CEEC: -/* 01BFC 80A5CEEC 4600020D */ trunc.w.s $f8, $f0 -/* 01C00 80A5CEF0 44024000 */ mfc1 $v0, $f8 -/* 01C04 80A5CEF4 00000000 */ nop -/* 01C08 80A5CEF8 00021400 */ sll $v0, $v0, 16 -/* 01C0C 80A5CEFC 00021403 */ sra $v0, $v0, 16 -.L80A5CF00: -/* 01C10 80A5CF00 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 01C14 80A5CF04 01225821 */ addu $t3, $t1, $v0 -/* 01C18 80A5CF08 A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -/* 01C1C 80A5CF0C 860C0032 */ lh $t4, 0x0032($s0) ## 00000032 -/* 01C20 80A5CF10 A60C00B6 */ sh $t4, 0x00B6($s0) ## 000000B6 -.L80A5CF14: -/* 01C24 80A5CF14 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5CF18: -/* 01C28 80A5CF18 8FB00018 */ lw $s0, 0x0018($sp) -/* 01C2C 80A5CF1C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01C30 80A5CF20 03E00008 */ jr $ra -/* 01C34 80A5CF24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF28.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF28.s deleted file mode 100644 index db98c0d109..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF28.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A5CF28 -/* 01C38 80A5CF28 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01C3C 80A5CF2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C40 80A5CF30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C44 80A5CF34 E48401C4 */ swc1 $f4, 0x01C4($a0) ## 000001C4 -/* 01C48 80A5CF38 0C2973D9 */ jal func_80A5CF64 -/* 01C4C 80A5CF3C AFA40018 */ sw $a0, 0x0018($sp) -/* 01C50 80A5CF40 8FA40018 */ lw $a0, 0x0018($sp) -/* 01C54 80A5CF44 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF -/* 01C58 80A5CF48 8C8E01F0 */ lw $t6, 0x01F0($a0) ## 000001F0 -/* 01C5C 80A5CF4C 01C17824 */ and $t7, $t6, $at -/* 01C60 80A5CF50 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 000001F0 -/* 01C64 80A5CF54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01C68 80A5CF58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01C6C 80A5CF5C 03E00008 */ jr $ra -/* 01C70 80A5CF60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s deleted file mode 100644 index c6ac7d2492..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_80A5CF64 -/* 01C74 80A5CF64 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01C78 80A5CF68 AFBF002C */ sw $ra, 0x002C($sp) -/* 01C7C 80A5CF6C AFB00028 */ sw $s0, 0x0028($sp) -/* 01C80 80A5CF70 3C01420C */ lui $at, 0x420C ## $at = 420C0000 -/* 01C84 80A5CF74 44812000 */ mtc1 $at, $f4 ## $f4 = 35.00 -/* 01C88 80A5CF78 C4800214 */ lwc1 $f0, 0x0214($a0) ## 00000214 -/* 01C8C 80A5CF7C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 01C90 80A5CF80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C94 80A5CF84 4600203C */ c.lt.s $f4, $f0 -/* 01C98 80A5CF88 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 01C9C 80A5CF8C AC800210 */ sw $zero, 0x0210($a0) ## 00000210 -/* 01CA0 80A5CF90 3C0141E0 */ lui $at, 0x41E0 ## $at = 41E00000 -/* 01CA4 80A5CF94 45020005 */ bc1fl .L80A5CFAC -/* 01CA8 80A5CF98 44813000 */ mtc1 $at, $f6 ## $f6 = 28.00 -/* 01CAC 80A5CF9C 8C820158 */ lw $v0, 0x0158($a0) ## 00000158 -/* 01CB0 80A5CFA0 5040000B */ beql $v0, $zero, .L80A5CFD0 -/* 01CB4 80A5CFA4 8E0301F0 */ lw $v1, 0x01F0($s0) ## 000001F0 -/* 01CB8 80A5CFA8 44813000 */ mtc1 $at, $f6 ## $f6 = 28.00 -.L80A5CFAC: -/* 01CBC 80A5CFAC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01CC0 80A5CFB0 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 -/* 01CC4 80A5CFB4 4600303C */ c.lt.s $f6, $f0 -/* 01CC8 80A5CFB8 00000000 */ nop -/* 01CCC 80A5CFBC 45020014 */ bc1fl .L80A5D010 -/* 01CD0 80A5CFC0 C60801C4 */ lwc1 $f8, 0x01C4($s0) ## 000001C4 -/* 01CD4 80A5CFC4 54410012 */ bnel $v0, $at, .L80A5D010 -/* 01CD8 80A5CFC8 C60801C4 */ lwc1 $f8, 0x01C4($s0) ## 000001C4 -/* 01CDC 80A5CFCC 8E0301F0 */ lw $v1, 0x01F0($s0) ## 000001F0 -.L80A5CFD0: -/* 01CE0 80A5CFD0 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01CE4 80A5CFD4 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 01CE8 80A5CFD8 306F1000 */ andi $t7, $v1, 0x1000 ## $t7 = 00000000 -/* 01CEC 80A5CFDC 15E0000B */ bne $t7, $zero, .L80A5D00C -/* 01CF0 80A5CFE0 34781000 */ ori $t8, $v1, 0x1000 ## $t8 = 00001000 -/* 01CF4 80A5CFE4 3C198013 */ lui $t9, %hi(D_801333E8) -/* 01CF8 80A5CFE8 AE1801F0 */ sw $t8, 0x01F0($s0) ## 000001F0 -/* 01CFC 80A5CFEC 273933E8 */ addiu $t9, %lo(D_801333E8) -/* 01D00 80A5CFF0 AFB90014 */ sw $t9, 0x0014($sp) -/* 01D04 80A5CFF4 AFA70010 */ sw $a3, 0x0010($sp) -/* 01D08 80A5CFF8 2404282C */ addiu $a0, $zero, 0x282C ## $a0 = 0000282C -/* 01D0C 80A5CFFC 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 01D10 80A5D000 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01D14 80A5D004 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01D18 80A5D008 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 -.L80A5D00C: -/* 01D1C 80A5D00C C60801C4 */ lwc1 $f8, 0x01C4($s0) ## 000001C4 -.L80A5D010: -/* 01D20 80A5D010 00024080 */ sll $t0, $v0, 2 -/* 01D24 80A5D014 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 01D28 80A5D018 E7A80034 */ swc1 $f8, 0x0034($sp) -/* 01D2C 80A5D01C 8E0A0210 */ lw $t2, 0x0210($s0) ## 00000210 -/* 01D30 80A5D020 01284821 */ addu $t1, $t1, $t0 -/* 01D34 80A5D024 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 01D38 80A5D028 000A5880 */ sll $t3, $t2, 2 -/* 01D3C 80A5D02C 012B6021 */ addu $t4, $t1, $t3 -/* 01D40 80A5D030 0C028800 */ jal Animation_GetLastFrame - -/* 01D44 80A5D034 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 01D48 80A5D038 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -/* 01D4C 80A5D03C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 01D50 80A5D040 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 01D54 80A5D044 000D7080 */ sll $t6, $t5, 2 -/* 01D58 80A5D048 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 01D5C 80A5D04C 01EE7821 */ addu $t7, $t7, $t6 -/* 01D60 80A5D050 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 01D64 80A5D054 46805420 */ cvt.s.w $f16, $f10 -/* 01D68 80A5D058 0018C880 */ sll $t9, $t8, 2 -/* 01D6C 80A5D05C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 01D70 80A5D060 01F94021 */ addu $t0, $t7, $t9 -/* 01D74 80A5D064 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 -/* 01D78 80A5D068 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 01D7C 80A5D06C 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 01D80 80A5D070 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01D84 80A5D074 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01D88 80A5D078 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 01D8C 80A5D07C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01D90 80A5D080 8FA70034 */ lw $a3, 0x0034($sp) -/* 01D94 80A5D084 0C029468 */ jal Animation_Change - -/* 01D98 80A5D088 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 01D9C 80A5D08C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01DA0 80A5D090 8FB00028 */ lw $s0, 0x0028($sp) -/* 01DA4 80A5D094 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01DA8 80A5D098 03E00008 */ jr $ra -/* 01DAC 80A5D09C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s deleted file mode 100644 index 4b3fba3e97..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_80A66898 - .word 0x3FE6A090, 0x2DE00D1B - -.text -glabel func_80A5D0A0 -/* 01DB0 80A5D0A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01DB4 80A5D0A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01DB8 80A5D0A8 AFB00018 */ sw $s0, 0x0018($sp) -/* 01DBC 80A5D0AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01DC0 80A5D0B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01DC4 80A5D0B4 AFA5002C */ sw $a1, 0x002C($sp) -/* 01DC8 80A5D0B8 A7A00022 */ sh $zero, 0x0022($sp) -/* 01DCC 80A5D0BC 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFFC -/* 01DD0 80A5D0C0 24840264 */ addiu $a0, $a0, 0x0264 ## $a0 = 00000264 -/* 01DD4 80A5D0C4 27A60022 */ addiu $a2, $sp, 0x0022 ## $a2 = FFFFFFFA -/* 01DD8 80A5D0C8 0C298C52 */ jal func_80A63148 -/* 01DDC 80A5D0CC E484FE04 */ swc1 $f4, -0x01FC($a0) ## 00000068 -/* 01DE0 80A5D0D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01DE4 80A5D0D4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01DE8 80A5D0D8 C7A80024 */ lwc1 $f8, 0x0024($sp) -/* 01DEC 80A5D0DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DF0 80A5D0E0 4608303C */ c.lt.s $f6, $f8 -/* 01DF4 80A5D0E4 00000000 */ nop -/* 01DF8 80A5D0E8 45000022 */ bc1f .L80A5D174 -/* 01DFC 80A5D0EC 00000000 */ nop -/* 01E00 80A5D0F0 0C296FFE */ jal func_80A5BFF8 -/* 01E04 80A5D0F4 8FA5002C */ lw $a1, 0x002C($sp) -/* 01E08 80A5D0F8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01E0C 80A5D0FC 1441001D */ bne $v0, $at, .L80A5D174 -/* 01E10 80A5D100 00000000 */ nop -/* 01E14 80A5D104 0C01DE0D */ jal Math_CosS - ## coss? -/* 01E18 80A5D108 87A40022 */ lh $a0, 0x0022($sp) -/* 01E1C 80A5D10C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 01E20 80A5D110 44815000 */ mtc1 $at, $f10 ## $f10 = -0.50 -/* 01E24 80A5D114 00000000 */ nop -/* 01E28 80A5D118 460A003E */ c.le.s $f0, $f10 -/* 01E2C 80A5D11C 00000000 */ nop -/* 01E30 80A5D120 45000005 */ bc1f .L80A5D138 -/* 01E34 80A5D124 00000000 */ nop -/* 01E38 80A5D128 0C297962 */ jal func_80A5E588 -/* 01E3C 80A5D12C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E40 80A5D130 10000010 */ beq $zero, $zero, .L80A5D174 -/* 01E44 80A5D134 00000000 */ nop -.L80A5D138: -/* 01E48 80A5D138 0C01DE0D */ jal Math_CosS - ## coss? -/* 01E4C 80A5D13C 87A40022 */ lh $a0, 0x0022($sp) -/* 01E50 80A5D140 3C0180A6 */ lui $at, %hi(D_80A66898) ## $at = 80A60000 -/* 01E54 80A5D144 D4306898 */ ldc1 $f16, %lo(D_80A66898)($at) -/* 01E58 80A5D148 460004A1 */ cvt.d.s $f18, $f0 -/* 01E5C 80A5D14C 4630903E */ c.le.d $f18, $f16 -/* 01E60 80A5D150 00000000 */ nop -/* 01E64 80A5D154 45000005 */ bc1f .L80A5D16C -/* 01E68 80A5D158 00000000 */ nop -/* 01E6C 80A5D15C 0C2974F0 */ jal func_80A5D3C0 -/* 01E70 80A5D160 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E74 80A5D164 10000003 */ beq $zero, $zero, .L80A5D174 -/* 01E78 80A5D168 00000000 */ nop -.L80A5D16C: -/* 01E7C 80A5D16C 0C29758A */ jal func_80A5D628 -/* 01E80 80A5D170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A5D174: -/* 01E84 80A5D174 0C02927F */ jal SkelAnime_Update - -/* 01E88 80A5D178 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 01E8C 80A5D17C 50400004 */ beql $v0, $zero, .L80A5D190 -/* 01E90 80A5D180 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E94 80A5D184 0C297468 */ jal func_80A5D1A0 -/* 01E98 80A5D188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E9C 80A5D18C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5D190: -/* 01EA0 80A5D190 8FB00018 */ lw $s0, 0x0018($sp) -/* 01EA4 80A5D194 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01EA8 80A5D198 03E00008 */ jr $ra -/* 01EAC 80A5D19C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1A0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1A0.s deleted file mode 100644 index 3a1cbf72d1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1A0.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A5D1A0 -/* 01EB0 80A5D1A0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01EB4 80A5D1A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01EB8 80A5D1A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01EBC 80A5D1AC 0C297471 */ jal func_80A5D1C4 -/* 01EC0 80A5D1B0 E48401C4 */ swc1 $f4, 0x01C4($a0) ## 000001C4 -/* 01EC4 80A5D1B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01EC8 80A5D1B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01ECC 80A5D1BC 03E00008 */ jr $ra -/* 01ED0 80A5D1C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s deleted file mode 100644 index b1279f1448..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80A5D1C4 -/* 01ED4 80A5D1C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01ED8 80A5D1C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 01EDC 80A5D1CC AFB00028 */ sw $s0, 0x0028($sp) -/* 01EE0 80A5D1D0 C48401C4 */ lwc1 $f4, 0x01C4($a0) ## 000001C4 -/* 01EE4 80A5D1D4 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 01EE8 80A5D1D8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01EEC 80A5D1DC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 01EF0 80A5D1E0 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 01EF4 80A5D1E4 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 01EF8 80A5D1E8 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 -/* 01EFC 80A5D1EC 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 01F00 80A5D1F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F04 80A5D1F4 0018C880 */ sll $t9, $t8, 2 -/* 01F08 80A5D1F8 01194021 */ addu $t0, $t0, $t9 -/* 01F0C 80A5D1FC 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 01F10 80A5D200 0C028800 */ jal Animation_GetLastFrame - -/* 01F14 80A5D204 8D040004 */ lw $a0, 0x0004($t0) ## 80A60004 -/* 01F18 80A5D208 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 01F1C 80A5D20C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 01F20 80A5D210 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 01F24 80A5D214 00095080 */ sll $t2, $t1, 2 -/* 01F28 80A5D218 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 01F2C 80A5D21C 016A5821 */ addu $t3, $t3, $t2 -/* 01F30 80A5D220 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 01F34 80A5D224 46803220 */ cvt.s.w $f8, $f6 -/* 01F38 80A5D228 000C6880 */ sll $t5, $t4, 2 -/* 01F3C 80A5D22C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 01F40 80A5D230 016D7021 */ addu $t6, $t3, $t5 -/* 01F44 80A5D234 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 -/* 01F48 80A5D238 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 01F4C 80A5D23C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01F50 80A5D240 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01F54 80A5D244 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01F58 80A5D248 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 01F5C 80A5D24C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01F60 80A5D250 8FA70034 */ lw $a3, 0x0034($sp) -/* 01F64 80A5D254 0C029468 */ jal Animation_Change - -/* 01F68 80A5D258 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 01F6C 80A5D25C 8E190228 */ lw $t9, 0x0228($s0) ## 00000228 -/* 01F70 80A5D260 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 01F74 80A5D264 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01F78 80A5D268 ACB90000 */ sw $t9, 0x0000($a1) ## 0000021C -/* 01F7C 80A5D26C 8E18022C */ lw $t8, 0x022C($s0) ## 0000022C -/* 01F80 80A5D270 3C0A8013 */ lui $t2, %hi(D_801333E8) -/* 01F84 80A5D274 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 01F88 80A5D278 ACB80004 */ sw $t8, 0x0004($a1) ## 00000220 -/* 01F8C 80A5D27C 8E190230 */ lw $t9, 0x0230($s0) ## 00000230 -/* 01F90 80A5D280 254A33E8 */ addiu $t2, %lo(D_801333E8) -/* 01F94 80A5D284 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 -/* 01F98 80A5D288 ACB90008 */ sw $t9, 0x0008($a1) ## 00000224 -/* 01F9C 80A5D28C 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -/* 01FA0 80A5D290 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01FA4 80A5D294 00084900 */ sll $t1, $t0, 4 -/* 01FA8 80A5D298 05230005 */ bgezl $t1, .L80A5D2B0 -/* 01FAC 80A5D29C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01FB0 80A5D2A0 AFA70010 */ sw $a3, 0x0010($sp) -/* 01FB4 80A5D2A4 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01FB8 80A5D2A8 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01FBC 80A5D2AC 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5D2B0: -/* 01FC0 80A5D2B0 8FB00028 */ lw $s0, 0x0028($sp) -/* 01FC4 80A5D2B4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01FC8 80A5D2B8 03E00008 */ jr $ra -/* 01FCC 80A5D2BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s deleted file mode 100644 index 8ef01f914d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_80A668A0 - .word 0x3FE6A090, 0x2DE00D1B - -.text -glabel func_80A5D2C0 -/* 01FD0 80A5D2C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01FD4 80A5D2C4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01FD8 80A5D2C8 AFB00018 */ sw $s0, 0x0018($sp) -/* 01FDC 80A5D2CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01FE0 80A5D2D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01FE4 80A5D2D4 AFA5002C */ sw $a1, 0x002C($sp) -/* 01FE8 80A5D2D8 A7A00022 */ sh $zero, 0x0022($sp) -/* 01FEC 80A5D2DC 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFFC -/* 01FF0 80A5D2E0 24840264 */ addiu $a0, $a0, 0x0264 ## $a0 = 00000264 -/* 01FF4 80A5D2E4 27A60022 */ addiu $a2, $sp, 0x0022 ## $a2 = FFFFFFFA -/* 01FF8 80A5D2E8 0C298C52 */ jal func_80A63148 -/* 01FFC 80A5D2EC E484FE04 */ swc1 $f4, -0x01FC($a0) ## 00000068 -/* 02000 80A5D2F0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02004 80A5D2F4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 02008 80A5D2F8 C7A80024 */ lwc1 $f8, 0x0024($sp) -/* 0200C 80A5D2FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02010 80A5D300 4608303C */ c.lt.s $f6, $f8 -/* 02014 80A5D304 00000000 */ nop -/* 02018 80A5D308 45000022 */ bc1f .L80A5D394 -/* 0201C 80A5D30C 00000000 */ nop -/* 02020 80A5D310 0C296FFE */ jal func_80A5BFF8 -/* 02024 80A5D314 8FA5002C */ lw $a1, 0x002C($sp) -/* 02028 80A5D318 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0202C 80A5D31C 1441001D */ bne $v0, $at, .L80A5D394 -/* 02030 80A5D320 00000000 */ nop -/* 02034 80A5D324 0C01DE0D */ jal Math_CosS - ## coss? -/* 02038 80A5D328 87A40022 */ lh $a0, 0x0022($sp) -/* 0203C 80A5D32C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 02040 80A5D330 44815000 */ mtc1 $at, $f10 ## $f10 = -0.50 -/* 02044 80A5D334 00000000 */ nop -/* 02048 80A5D338 460A003E */ c.le.s $f0, $f10 -/* 0204C 80A5D33C 00000000 */ nop -/* 02050 80A5D340 45000005 */ bc1f .L80A5D358 -/* 02054 80A5D344 00000000 */ nop -/* 02058 80A5D348 0C297962 */ jal func_80A5E588 -/* 0205C 80A5D34C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02060 80A5D350 10000010 */ beq $zero, $zero, .L80A5D394 -/* 02064 80A5D354 00000000 */ nop -.L80A5D358: -/* 02068 80A5D358 0C01DE0D */ jal Math_CosS - ## coss? -/* 0206C 80A5D35C 87A40022 */ lh $a0, 0x0022($sp) -/* 02070 80A5D360 3C0180A6 */ lui $at, %hi(D_80A668A0) ## $at = 80A60000 -/* 02074 80A5D364 D43068A0 */ ldc1 $f16, %lo(D_80A668A0)($at) -/* 02078 80A5D368 460004A1 */ cvt.d.s $f18, $f0 -/* 0207C 80A5D36C 4630903E */ c.le.d $f18, $f16 -/* 02080 80A5D370 00000000 */ nop -/* 02084 80A5D374 45000005 */ bc1f .L80A5D38C -/* 02088 80A5D378 00000000 */ nop -/* 0208C 80A5D37C 0C2974F0 */ jal func_80A5D3C0 -/* 02090 80A5D380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02094 80A5D384 10000003 */ beq $zero, $zero, .L80A5D394 -/* 02098 80A5D388 00000000 */ nop -.L80A5D38C: -/* 0209C 80A5D38C 0C29758A */ jal func_80A5D628 -/* 020A0 80A5D390 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A5D394: -/* 020A4 80A5D394 0C02927F */ jal SkelAnime_Update - -/* 020A8 80A5D398 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 020AC 80A5D39C 50400004 */ beql $v0, $zero, .L80A5D3B0 -/* 020B0 80A5D3A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 020B4 80A5D3A4 0C2973CA */ jal func_80A5CF28 -/* 020B8 80A5D3A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020BC 80A5D3AC 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5D3B0: -/* 020C0 80A5D3B0 8FB00018 */ lw $s0, 0x0018($sp) -/* 020C4 80A5D3B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 020C8 80A5D3B8 03E00008 */ jr $ra -/* 020CC 80A5D3BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s deleted file mode 100644 index 48b457be27..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80A5D3C0 -/* 020D0 80A5D3C0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 020D4 80A5D3C4 AFBF002C */ sw $ra, 0x002C($sp) -/* 020D8 80A5D3C8 AFB00028 */ sw $s0, 0x0028($sp) -/* 020DC 80A5D3CC 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 -/* 020E0 80A5D3D0 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 020E4 80A5D3D4 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 020E8 80A5D3D8 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 020EC 80A5D3DC 0018C880 */ sll $t9, $t8, 2 -/* 020F0 80A5D3E0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 020F4 80A5D3E4 AC800218 */ sw $zero, 0x0218($a0) ## 00000218 -/* 020F8 80A5D3E8 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 020FC 80A5D3EC 01194021 */ addu $t0, $t0, $t9 -/* 02100 80A5D3F0 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 02104 80A5D3F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02108 80A5D3F8 0C028800 */ jal Animation_GetLastFrame - -/* 0210C 80A5D3FC 8D040010 */ lw $a0, 0x0010($t0) ## 80A60010 -/* 02110 80A5D400 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 02114 80A5D404 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 02118 80A5D408 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 0211C 80A5D40C 00095080 */ sll $t2, $t1, 2 -/* 02120 80A5D410 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 02124 80A5D414 016A5821 */ addu $t3, $t3, $t2 -/* 02128 80A5D418 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 0212C 80A5D41C 468021A0 */ cvt.s.w $f6, $f4 -/* 02130 80A5D420 000C6880 */ sll $t5, $t4, 2 -/* 02134 80A5D424 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 02138 80A5D428 016D7021 */ addu $t6, $t3, $t5 -/* 0213C 80A5D42C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 02140 80A5D430 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 02144 80A5D434 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02148 80A5D438 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0214C 80A5D43C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 02150 80A5D440 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 02154 80A5D444 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02158 80A5D448 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0215C 80A5D44C 0C029468 */ jal Animation_Change - -/* 02160 80A5D450 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02164 80A5D454 8FBF002C */ lw $ra, 0x002C($sp) -/* 02168 80A5D458 8FB00028 */ lw $s0, 0x0028($sp) -/* 0216C 80A5D45C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02170 80A5D460 03E00008 */ jr $ra -/* 02174 80A5D464 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s deleted file mode 100644 index ff2365a172..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s +++ /dev/null @@ -1,133 +0,0 @@ -.late_rodata -glabel D_80A668A8 - .word 0x3FE6A090, 0x2DE00D1B -glabel D_80A668B0 - .word 0x3FE6A090, 0x2DE00D1B - -.text -glabel func_80A5D468 -/* 02178 80A5D468 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0217C 80A5D46C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02180 80A5D470 AFBF001C */ sw $ra, 0x001C($sp) -/* 02184 80A5D474 AFB00018 */ sw $s0, 0x0018($sp) -/* 02188 80A5D478 AFA50034 */ sw $a1, 0x0034($sp) -/* 0218C 80A5D47C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02190 80A5D480 0C296E72 */ jal func_80A5B9C8 -/* 02194 80A5D484 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 02198 80A5D488 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 -/* 0219C 80A5D48C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFFC -/* 021A0 80A5D490 0C298C52 */ jal func_80A63148 -/* 021A4 80A5D494 27A60028 */ addiu $a2, $sp, 0x0028 ## $a2 = FFFFFFF8 -/* 021A8 80A5D498 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 021AC 80A5D49C 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 021B0 80A5D4A0 C7A8002C */ lwc1 $f8, 0x002C($sp) -/* 021B4 80A5D4A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021B8 80A5D4A8 4608303C */ c.lt.s $f6, $f8 -/* 021BC 80A5D4AC 00000000 */ nop -/* 021C0 80A5D4B0 45000045 */ bc1f .L80A5D5C8 -/* 021C4 80A5D4B4 00000000 */ nop -/* 021C8 80A5D4B8 0C296FFE */ jal func_80A5BFF8 -/* 021CC 80A5D4BC 8FA50034 */ lw $a1, 0x0034($sp) -/* 021D0 80A5D4C0 14400005 */ bne $v0, $zero, .L80A5D4D8 -/* 021D4 80A5D4C4 00000000 */ nop -/* 021D8 80A5D4C8 0C2973CA */ jal func_80A5CF28 -/* 021DC 80A5D4CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021E0 80A5D4D0 1000003D */ beq $zero, $zero, .L80A5D5C8 -/* 021E4 80A5D4D4 00000000 */ nop -.L80A5D4D8: -/* 021E8 80A5D4D8 0C01DE0D */ jal Math_CosS - ## coss? -/* 021EC 80A5D4DC 87A40028 */ lh $a0, 0x0028($sp) -/* 021F0 80A5D4E0 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 021F4 80A5D4E4 44815000 */ mtc1 $at, $f10 ## $f10 = -0.50 -/* 021F8 80A5D4E8 00000000 */ nop -/* 021FC 80A5D4EC 460A003E */ c.le.s $f0, $f10 -/* 02200 80A5D4F0 00000000 */ nop -/* 02204 80A5D4F4 45000005 */ bc1f .L80A5D50C -/* 02208 80A5D4F8 00000000 */ nop -/* 0220C 80A5D4FC 0C297962 */ jal func_80A5E588 -/* 02210 80A5D500 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02214 80A5D504 10000030 */ beq $zero, $zero, .L80A5D5C8 -/* 02218 80A5D508 00000000 */ nop -.L80A5D50C: -/* 0221C 80A5D50C 0C01DE0D */ jal Math_CosS - ## coss? -/* 02220 80A5D510 87A40028 */ lh $a0, 0x0028($sp) -/* 02224 80A5D514 3C0180A6 */ lui $at, %hi(D_80A668A8) ## $at = 80A60000 -/* 02228 80A5D518 D43068A8 */ ldc1 $f16, %lo(D_80A668A8)($at) -/* 0222C 80A5D51C 460004A1 */ cvt.d.s $f18, $f0 -/* 02230 80A5D520 87AE0028 */ lh $t6, 0x0028($sp) -/* 02234 80A5D524 4630903E */ c.le.d $f18, $f16 -/* 02238 80A5D528 00000000 */ nop -/* 0223C 80A5D52C 45000024 */ bc1f .L80A5D5C0 -/* 02240 80A5D530 00000000 */ nop -/* 02244 80A5D534 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 02248 80A5D538 3C01C448 */ lui $at, 0xC448 ## $at = C4480000 -/* 0224C 80A5D53C 44811000 */ mtc1 $at, $f2 ## $f2 = -800.00 -/* 02250 80A5D540 46802020 */ cvt.s.w $f0, $f4 -/* 02254 80A5D544 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 02258 80A5D548 4602003C */ c.lt.s $f0, $f2 -/* 0225C 80A5D54C 00000000 */ nop -/* 02260 80A5D550 45020008 */ bc1fl .L80A5D574 -/* 02264 80A5D554 44816000 */ mtc1 $at, $f12 ## $f12 = 800.00 -/* 02268 80A5D558 4600118D */ trunc.w.s $f6, $f2 -/* 0226C 80A5D55C 44023000 */ mfc1 $v0, $f6 -/* 02270 80A5D560 00000000 */ nop -/* 02274 80A5D564 00021400 */ sll $v0, $v0, 16 -/* 02278 80A5D568 1000000F */ beq $zero, $zero, .L80A5D5A8 -/* 0227C 80A5D56C 00021403 */ sra $v0, $v0, 16 -/* 02280 80A5D570 44816000 */ mtc1 $at, $f12 ## $f12 = 800.00 -.L80A5D574: -/* 02284 80A5D574 00000000 */ nop -/* 02288 80A5D578 4600603C */ c.lt.s $f12, $f0 -/* 0228C 80A5D57C 00000000 */ nop -/* 02290 80A5D580 45020004 */ bc1fl .L80A5D594 -/* 02294 80A5D584 46000086 */ mov.s $f2, $f0 -/* 02298 80A5D588 10000002 */ beq $zero, $zero, .L80A5D594 -/* 0229C 80A5D58C 46006086 */ mov.s $f2, $f12 -/* 022A0 80A5D590 46000086 */ mov.s $f2, $f0 -.L80A5D594: -/* 022A4 80A5D594 4600120D */ trunc.w.s $f8, $f2 -/* 022A8 80A5D598 44024000 */ mfc1 $v0, $f8 -/* 022AC 80A5D59C 00000000 */ nop -/* 022B0 80A5D5A0 00021400 */ sll $v0, $v0, 16 -/* 022B4 80A5D5A4 00021403 */ sra $v0, $v0, 16 -.L80A5D5A8: -/* 022B8 80A5D5A8 86190032 */ lh $t9, 0x0032($s0) ## 00000032 -/* 022BC 80A5D5AC 03224021 */ addu $t0, $t9, $v0 -/* 022C0 80A5D5B0 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 022C4 80A5D5B4 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 022C8 80A5D5B8 10000003 */ beq $zero, $zero, .L80A5D5C8 -/* 022CC 80A5D5BC A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -.L80A5D5C0: -/* 022D0 80A5D5C0 0C29759E */ jal func_80A5D678 -/* 022D4 80A5D5C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A5D5C8: -/* 022D8 80A5D5C8 0C02927F */ jal SkelAnime_Update - -/* 022DC 80A5D5CC 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 022E0 80A5D5D0 50400011 */ beql $v0, $zero, .L80A5D618 -/* 022E4 80A5D5D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 022E8 80A5D5D8 0C01DE0D */ jal Math_CosS - ## coss? -/* 022EC 80A5D5DC 87A40028 */ lh $a0, 0x0028($sp) -/* 022F0 80A5D5E0 3C0180A6 */ lui $at, %hi(D_80A668B0) ## $at = 80A60000 -/* 022F4 80A5D5E4 D42A68B0 */ ldc1 $f10, %lo(D_80A668B0)($at) -/* 022F8 80A5D5E8 46000421 */ cvt.d.s $f16, $f0 -/* 022FC 80A5D5EC 462A803E */ c.le.d $f16, $f10 -/* 02300 80A5D5F0 00000000 */ nop -/* 02304 80A5D5F4 45000005 */ bc1f .L80A5D60C -/* 02308 80A5D5F8 00000000 */ nop -/* 0230C 80A5D5FC 0C2974F0 */ jal func_80A5D3C0 -/* 02310 80A5D600 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02314 80A5D604 10000004 */ beq $zero, $zero, .L80A5D618 -/* 02318 80A5D608 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5D60C: -/* 0231C 80A5D60C 0C2973CA */ jal func_80A5CF28 -/* 02320 80A5D610 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02324 80A5D614 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5D618: -/* 02328 80A5D618 8FB00018 */ lw $s0, 0x0018($sp) -/* 0232C 80A5D61C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02330 80A5D620 03E00008 */ jr $ra -/* 02334 80A5D624 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D628.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D628.s deleted file mode 100644 index f666e2ced1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D628.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80A5D628 -/* 02338 80A5D628 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0233C 80A5D62C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02340 80A5D630 0C29759E */ jal func_80A5D678 -/* 02344 80A5D634 AFA40018 */ sw $a0, 0x0018($sp) -/* 02348 80A5D638 8FA40018 */ lw $a0, 0x0018($sp) -/* 0234C 80A5D63C 8C8201F0 */ lw $v0, 0x01F0($a0) ## 000001F0 -/* 02350 80A5D640 304E0100 */ andi $t6, $v0, 0x0100 ## $t6 = 00000000 -/* 02354 80A5D644 15C00007 */ bne $t6, $zero, .L80A5D664 -/* 02358 80A5D648 304F0200 */ andi $t7, $v0, 0x0200 ## $t7 = 00000000 -/* 0235C 80A5D64C 15E00005 */ bne $t7, $zero, .L80A5D664 -/* 02360 80A5D650 34580200 */ ori $t8, $v0, 0x0200 ## $t8 = 00000200 -/* 02364 80A5D654 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 02368 80A5D658 AC9801F0 */ sw $t8, 0x01F0($a0) ## 000001F0 -/* 0236C 80A5D65C 10000002 */ beq $zero, $zero, .L80A5D668 -/* 02370 80A5D660 A499037C */ sh $t9, 0x037C($a0) ## 0000037C -.L80A5D664: -/* 02374 80A5D664 A480037C */ sh $zero, 0x037C($a0) ## 0000037C -.L80A5D668: -/* 02378 80A5D668 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0237C 80A5D66C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02380 80A5D670 03E00008 */ jr $ra -/* 02384 80A5D674 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D678.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D678.s deleted file mode 100644 index ee40e3c126..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D678.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A5D678 -/* 02388 80A5D678 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0238C 80A5D67C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02390 80A5D680 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 -/* 02394 80A5D684 0C2975A7 */ jal func_80A5D69C -/* 02398 80A5D688 AC800154 */ sw $zero, 0x0154($a0) ## 00000154 -/* 0239C 80A5D68C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 023A0 80A5D690 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 023A4 80A5D694 03E00008 */ jr $ra -/* 023A8 80A5D698 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s deleted file mode 100644 index 831db5a7b4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80A5D69C -/* 023AC 80A5D69C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 023B0 80A5D6A0 AFBF002C */ sw $ra, 0x002C($sp) -/* 023B4 80A5D6A4 AFB00028 */ sw $s0, 0x0028($sp) -/* 023B8 80A5D6A8 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 -/* 023BC 80A5D6AC 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 023C0 80A5D6B0 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 023C4 80A5D6B4 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 023C8 80A5D6B8 0018C880 */ sll $t9, $t8, 2 -/* 023CC 80A5D6BC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 023D0 80A5D6C0 AC800218 */ sw $zero, 0x0218($a0) ## 00000218 -/* 023D4 80A5D6C4 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 023D8 80A5D6C8 A480037C */ sh $zero, 0x037C($a0) ## 0000037C -/* 023DC 80A5D6CC 01194021 */ addu $t0, $t0, $t9 -/* 023E0 80A5D6D0 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 023E4 80A5D6D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 023E8 80A5D6D8 0C028800 */ jal Animation_GetLastFrame - -/* 023EC 80A5D6DC 8D040010 */ lw $a0, 0x0010($t0) ## 80A60010 -/* 023F0 80A5D6E0 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 023F4 80A5D6E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 023F8 80A5D6E8 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 023FC 80A5D6EC 00095080 */ sll $t2, $t1, 2 -/* 02400 80A5D6F0 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 02404 80A5D6F4 016A5821 */ addu $t3, $t3, $t2 -/* 02408 80A5D6F8 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 0240C 80A5D6FC 468021A0 */ cvt.s.w $f6, $f4 -/* 02410 80A5D700 000C6880 */ sll $t5, $t4, 2 -/* 02414 80A5D704 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 02418 80A5D708 016D7021 */ addu $t6, $t3, $t5 -/* 0241C 80A5D70C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 02420 80A5D710 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 02424 80A5D714 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02428 80A5D718 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0242C 80A5D71C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 02430 80A5D720 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 02434 80A5D724 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02438 80A5D728 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0243C 80A5D72C 0C029468 */ jal Animation_Change - -/* 02440 80A5D730 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02444 80A5D734 8FBF002C */ lw $ra, 0x002C($sp) -/* 02448 80A5D738 8FB00028 */ lw $s0, 0x0028($sp) -/* 0244C 80A5D73C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02450 80A5D740 03E00008 */ jr $ra -/* 02454 80A5D744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s deleted file mode 100644 index 05b6e32e54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A5D748 -/* 02458 80A5D748 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0245C 80A5D74C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02460 80A5D750 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 02464 80A5D754 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 02468 80A5D758 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0246C 80A5D75C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 02470 80A5D760 AC800218 */ sw $zero, 0x0218($a0) ## 00000218 -/* 02474 80A5D764 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 02478 80A5D768 A480037C */ sh $zero, 0x037C($a0) ## 0000037C -/* 0247C 80A5D76C 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 -/* 02480 80A5D770 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 02484 80A5D774 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02488 80A5D778 0018C880 */ sll $t9, $t8, 2 -/* 0248C 80A5D77C 01194021 */ addu $t0, $t0, $t9 -/* 02490 80A5D780 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 02494 80A5D784 0C02947A */ jal Animation_PlayOnce -/* 02498 80A5D788 8D050010 */ lw $a1, 0x0010($t0) ## 80A60010 -/* 0249C 80A5D78C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 024A0 80A5D790 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 024A4 80A5D794 03E00008 */ jr $ra -/* 024A8 80A5D798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s deleted file mode 100644 index 96b1b1853d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s +++ /dev/null @@ -1,202 +0,0 @@ -.late_rodata -glabel D_80A668B8 - .word 0x3D75C28F - -.text -glabel func_80A5D79C -/* 024AC 80A5D79C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 024B0 80A5D7A0 AFBF002C */ sw $ra, 0x002C($sp) -/* 024B4 80A5D7A4 AFB00028 */ sw $s0, 0x0028($sp) -/* 024B8 80A5D7A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 024BC 80A5D7AC 0C296E72 */ jal func_80A5B9C8 -/* 024C0 80A5D7B0 AFA50044 */ sw $a1, 0x0044($sp) -/* 024C4 80A5D7B4 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 -/* 024C8 80A5D7B8 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFFC -/* 024CC 80A5D7BC 0C298C52 */ jal func_80A63148 -/* 024D0 80A5D7C0 27A6003A */ addiu $a2, $sp, 0x003A ## $a2 = FFFFFFFA -/* 024D4 80A5D7C4 8E0E0154 */ lw $t6, 0x0154($s0) ## 00000154 -/* 024D8 80A5D7C8 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 024DC 80A5D7CC 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 024E0 80A5D7D0 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 024E4 80A5D7D4 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 024E8 80A5D7D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024EC 80A5D7DC 46802020 */ cvt.s.w $f0, $f4 -/* 024F0 80A5D7E0 8FA50044 */ lw $a1, 0x0044($sp) -/* 024F4 80A5D7E4 3C07BF00 */ lui $a3, 0xBF00 ## $a3 = BF000000 -/* 024F8 80A5D7E8 24180190 */ addiu $t8, $zero, 0x0190 ## $t8 = 00000190 -/* 024FC 80A5D7EC 46006032 */ c.eq.s $f12, $f0 -/* 02500 80A5D7F0 00000000 */ nop -/* 02504 80A5D7F4 45030011 */ bc1tl .L80A5D83C -/* 02508 80A5D7F8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0250C 80A5D7FC 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 -/* 02510 80A5D800 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02514 80A5D804 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 02518 80A5D808 00000000 */ nop -/* 0251C 80A5D80C 468030A0 */ cvt.s.w $f2, $f6 -/* 02520 80A5D810 4602603C */ c.lt.s $f12, $f2 -/* 02524 80A5D814 00000000 */ nop -/* 02528 80A5D818 45020016 */ bc1fl .L80A5D874 -/* 0252C 80A5D81C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 02530 80A5D820 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 02534 80A5D824 00000000 */ nop -/* 02538 80A5D828 46080281 */ sub.s $f10, $f0, $f8 -/* 0253C 80A5D82C 460A103C */ c.lt.s $f2, $f10 -/* 02540 80A5D830 00000000 */ nop -/* 02544 80A5D834 4500000E */ bc1f .L80A5D870 -/* 02548 80A5D838 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80A5D83C: -/* 0254C 80A5D83C 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 02550 80A5D840 3C0180A6 */ lui $at, %hi(D_80A668B8) ## $at = 80A60000 -/* 02554 80A5D844 C43268B8 */ lwc1 $f18, %lo(D_80A668B8)($at) -/* 02558 80A5D848 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 0255C 80A5D84C 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 02560 80A5D850 AFB8001C */ sw $t8, 0x001C($sp) -/* 02564 80A5D854 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 02568 80A5D858 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 0256C 80A5D85C 0C2972BB */ jal func_80A5CAEC -/* 02570 80A5D860 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 02574 80A5D864 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 02578 80A5D868 10000006 */ beq $zero, $zero, .L80A5D884 -/* 0257C 80A5D86C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -.L80A5D870: -/* 02580 80A5D870 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L80A5D874: -/* 02584 80A5D874 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 02588 80A5D878 00000000 */ nop -/* 0258C 80A5D87C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 02590 80A5D880 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -.L80A5D884: -/* 02594 80A5D884 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 02598 80A5D888 46006032 */ c.eq.s $f12, $f0 -/* 0259C 80A5D88C 00000000 */ nop -/* 025A0 80A5D890 4502000C */ bc1fl .L80A5D8C4 -/* 025A4 80A5D894 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 025A8 80A5D898 8E1901F0 */ lw $t9, 0x01F0($s0) ## 000001F0 -/* 025AC 80A5D89C 2401FDFF */ addiu $at, $zero, 0xFDFF ## $at = FFFFFDFF -/* 025B0 80A5D8A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025B4 80A5D8A4 03214024 */ and $t0, $t9, $at -/* 025B8 80A5D8A8 0C2973CA */ jal func_80A5CF28 -/* 025BC 80A5D8AC AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -/* 025C0 80A5D8B0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 025C4 80A5D8B4 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 -/* 025C8 80A5D8B8 10000010 */ beq $zero, $zero, .L80A5D8FC -/* 025CC 80A5D8BC AE000154 */ sw $zero, 0x0154($s0) ## 00000154 -/* 025D0 80A5D8C0 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 -.L80A5D8C4: -/* 025D4 80A5D8C4 00000000 */ nop -/* 025D8 80A5D8C8 4600403C */ c.lt.s $f8, $f0 -/* 025DC 80A5D8CC 00000000 */ nop -/* 025E0 80A5D8D0 4502000B */ bc1fl .L80A5D900 -/* 025E4 80A5D8D4 8E020150 */ lw $v0, 0x0150($s0) ## 00000150 -/* 025E8 80A5D8D8 8E0901F0 */ lw $t1, 0x01F0($s0) ## 000001F0 -/* 025EC 80A5D8DC 2401FDFF */ addiu $at, $zero, 0xFDFF ## $at = FFFFFDFF -/* 025F0 80A5D8E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025F4 80A5D8E4 01215024 */ and $t2, $t1, $at -/* 025F8 80A5D8E8 0C29769A */ jal func_80A5DA68 -/* 025FC 80A5D8EC AE0A01F0 */ sw $t2, 0x01F0($s0) ## 000001F0 -/* 02600 80A5D8F0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 02604 80A5D8F4 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 -/* 02608 80A5D8F8 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 -.L80A5D8FC: -/* 0260C 80A5D8FC 8E020150 */ lw $v0, 0x0150($s0) ## 00000150 -.L80A5D900: -/* 02610 80A5D900 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 02614 80A5D904 244CFFFF */ addiu $t4, $v0, 0xFFFF ## $t4 = FFFFFFFF -/* 02618 80A5D908 46805420 */ cvt.s.w $f16, $f10 -/* 0261C 80A5D90C 4610603C */ c.lt.s $f12, $f16 -/* 02620 80A5D910 00000000 */ nop -/* 02624 80A5D914 4502000A */ bc1fl .L80A5D940 -/* 02628 80A5D918 8602037C */ lh $v0, 0x037C($s0) ## 0000037C -/* 0262C 80A5D91C 448C9000 */ mtc1 $t4, $f18 ## $f18 = NaN -/* 02630 80A5D920 AE0C0150 */ sw $t4, 0x0150($s0) ## 00000150 -/* 02634 80A5D924 46809120 */ cvt.s.w $f4, $f18 -/* 02638 80A5D928 460C203E */ c.le.s $f4, $f12 -/* 0263C 80A5D92C 00000000 */ nop -/* 02640 80A5D930 45020003 */ bc1fl .L80A5D940 -/* 02644 80A5D934 8602037C */ lh $v0, 0x037C($s0) ## 0000037C -/* 02648 80A5D938 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 -/* 0264C 80A5D93C 8602037C */ lh $v0, 0x037C($s0) ## 0000037C -.L80A5D940: -/* 02650 80A5D940 1C400042 */ bgtz $v0, .L80A5DA4C -/* 02654 80A5D944 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 02658 80A5D948 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 -/* 0265C 80A5D94C 2401FDFF */ addiu $at, $zero, 0xFDFF ## $at = FFFFFDFF -/* 02660 80A5D950 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 02664 80A5D954 01A17024 */ and $t6, $t5, $at -/* 02668 80A5D958 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 -/* 0266C 80A5D95C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.75 -/* 02670 80A5D960 AE0E01F0 */ sw $t6, 0x01F0($s0) ## 000001F0 -/* 02674 80A5D964 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 02678 80A5D968 46083282 */ mul.s $f10, $f6, $f8 -/* 0267C 80A5D96C 0C02927F */ jal SkelAnime_Update - -/* 02680 80A5D970 E60A01C8 */ swc1 $f10, 0x01C8($s0) ## 000001C8 -/* 02684 80A5D974 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 02688 80A5D978 54400007 */ bnel $v0, $zero, .L80A5D998 -/* 0268C 80A5D97C 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 -/* 02690 80A5D980 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 02694 80A5D984 46106032 */ c.eq.s $f12, $f16 -/* 02698 80A5D988 00000000 */ nop -/* 0269C 80A5D98C 45020032 */ bc1fl .L80A5DA58 -/* 026A0 80A5D990 8FBF002C */ lw $ra, 0x002C($sp) -/* 026A4 80A5D994 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 -.L80A5D998: -/* 026A8 80A5D998 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 026AC 80A5D99C 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 026B0 80A5D9A0 00000000 */ nop -/* 026B4 80A5D9A4 46809120 */ cvt.s.w $f4, $f18 -/* 026B8 80A5D9A8 460C203E */ c.le.s $f4, $f12 -/* 026BC 80A5D9AC 00000000 */ nop -/* 026C0 80A5D9B0 45020029 */ bc1fl .L80A5DA58 -/* 026C4 80A5D9B4 8FBF002C */ lw $ra, 0x002C($sp) -/* 026C8 80A5D9B8 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 026CC 80A5D9BC C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 026D0 80A5D9C0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 026D4 80A5D9C4 C7AA003C */ lwc1 $f10, 0x003C($sp) -/* 026D8 80A5D9C8 4608303C */ c.lt.s $f6, $f8 -/* 026DC 80A5D9CC 00000000 */ nop -/* 026E0 80A5D9D0 45020007 */ bc1fl .L80A5D9F0 -/* 026E4 80A5D9D4 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 026E8 80A5D9D8 0C29769A */ jal func_80A5DA68 -/* 026EC 80A5D9DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026F0 80A5D9E0 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 -/* 026F4 80A5D9E4 1000001B */ beq $zero, $zero, .L80A5DA54 -/* 026F8 80A5D9E8 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 -/* 026FC 80A5D9EC 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 -.L80A5D9F0: -/* 02700 80A5D9F0 00000000 */ nop -/* 02704 80A5D9F4 4610503C */ c.lt.s $f10, $f16 -/* 02708 80A5D9F8 00000000 */ nop -/* 0270C 80A5D9FC 4501000A */ bc1t .L80A5DA28 -/* 02710 80A5DA00 00000000 */ nop -/* 02714 80A5DA04 0C01DE0D */ jal Math_CosS - ## coss? -/* 02718 80A5DA08 87A4003A */ lh $a0, 0x003A($sp) -/* 0271C 80A5DA0C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 02720 80A5DA10 44819000 */ mtc1 $at, $f18 ## $f18 = -0.50 -/* 02724 80A5DA14 00000000 */ nop -/* 02728 80A5DA18 4612003E */ c.le.s $f0, $f18 -/* 0272C 80A5DA1C 00000000 */ nop -/* 02730 80A5DA20 45000006 */ bc1f .L80A5DA3C -/* 02734 80A5DA24 00000000 */ nop -.L80A5DA28: -/* 02738 80A5DA28 0C2973CA */ jal func_80A5CF28 -/* 0273C 80A5DA2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02740 80A5DA30 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 -/* 02744 80A5DA34 10000007 */ beq $zero, $zero, .L80A5DA54 -/* 02748 80A5DA38 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 -.L80A5DA3C: -/* 0274C 80A5DA3C 0C2975D2 */ jal func_80A5D748 -/* 02750 80A5DA40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02754 80A5DA44 10000004 */ beq $zero, $zero, .L80A5DA58 -/* 02758 80A5DA48 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5DA4C: -/* 0275C 80A5DA4C E60C0068 */ swc1 $f12, 0x0068($s0) ## 00000068 -/* 02760 80A5DA50 A618037C */ sh $t8, 0x037C($s0) ## 0000037C -.L80A5DA54: -/* 02764 80A5DA54 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5DA58: -/* 02768 80A5DA58 8FB00028 */ lw $s0, 0x0028($sp) -/* 0276C 80A5DA5C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02770 80A5DA60 03E00008 */ jr $ra -/* 02774 80A5DA64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s deleted file mode 100644 index 08884ae0a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80A5DA68 -/* 02778 80A5DA68 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0277C 80A5DA6C AFBF002C */ sw $ra, 0x002C($sp) -/* 02780 80A5DA70 AFB00028 */ sw $s0, 0x0028($sp) -/* 02784 80A5DA74 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 -/* 02788 80A5DA78 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 0278C 80A5DA7C 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 02790 80A5DA80 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 02794 80A5DA84 0018C880 */ sll $t9, $t8, 2 -/* 02798 80A5DA88 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 0279C 80A5DA8C AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 027A0 80A5DA90 01194021 */ addu $t0, $t0, $t9 -/* 027A4 80A5DA94 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 027A8 80A5DA98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 027AC 80A5DA9C 0C028800 */ jal Animation_GetLastFrame - -/* 027B0 80A5DAA0 8D040014 */ lw $a0, 0x0014($t0) ## 80A60014 -/* 027B4 80A5DAA4 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 027B8 80A5DAA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 027BC 80A5DAAC 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 027C0 80A5DAB0 00095080 */ sll $t2, $t1, 2 -/* 027C4 80A5DAB4 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 027C8 80A5DAB8 016A5821 */ addu $t3, $t3, $t2 -/* 027CC 80A5DABC 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 027D0 80A5DAC0 468021A0 */ cvt.s.w $f6, $f4 -/* 027D4 80A5DAC4 000C6880 */ sll $t5, $t4, 2 -/* 027D8 80A5DAC8 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 027DC 80A5DACC 016D7021 */ addu $t6, $t3, $t5 -/* 027E0 80A5DAD0 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 027E4 80A5DAD4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 027E8 80A5DAD8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 027EC 80A5DADC AFAF0014 */ sw $t7, 0x0014($sp) -/* 027F0 80A5DAE0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 027F4 80A5DAE4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 027F8 80A5DAE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 027FC 80A5DAEC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02800 80A5DAF0 0C029468 */ jal Animation_Change - -/* 02804 80A5DAF4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02808 80A5DAF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0280C 80A5DAFC 8FB00028 */ lw $s0, 0x0028($sp) -/* 02810 80A5DB00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02814 80A5DB04 03E00008 */ jr $ra -/* 02818 80A5DB08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s deleted file mode 100644 index 3d887ab77c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80A5DB0C -/* 0281C 80A5DB0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02820 80A5DB10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02824 80A5DB14 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 02828 80A5DB18 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 0282C 80A5DB1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02830 80A5DB20 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 02834 80A5DB24 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 02838 80A5DB28 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 -/* 0283C 80A5DB2C 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 02840 80A5DB30 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02844 80A5DB34 0018C880 */ sll $t9, $t8, 2 -/* 02848 80A5DB38 01194021 */ addu $t0, $t0, $t9 -/* 0284C 80A5DB3C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 02850 80A5DB40 0C02947A */ jal Animation_PlayOnce -/* 02854 80A5DB44 8D050014 */ lw $a1, 0x0014($t0) ## 80A60014 -/* 02858 80A5DB48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0285C 80A5DB4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02860 80A5DB50 03E00008 */ jr $ra -/* 02864 80A5DB54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB58.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB58.s deleted file mode 100644 index b118712b88..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB58.s +++ /dev/null @@ -1,88 +0,0 @@ -.late_rodata -glabel D_80A668BC - .word 0x3D75C28F - -.text -glabel func_80A5DB58 -/* 02868 80A5DB58 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0286C 80A5DB5C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 02870 80A5DB60 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 02874 80A5DB64 3C0180A6 */ lui $at, %hi(D_80A668BC) ## $at = 80A60000 -/* 02878 80A5DB68 C42668BC */ lwc1 $f6, %lo(D_80A668BC)($at) -/* 0287C 80A5DB6C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02880 80A5DB70 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 02884 80A5DB74 AFBF002C */ sw $ra, 0x002C($sp) -/* 02888 80A5DB78 AFB00028 */ sw $s0, 0x0028($sp) -/* 0288C 80A5DB7C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 02890 80A5DB80 240E0190 */ addiu $t6, $zero, 0x0190 ## $t6 = 00000190 -/* 02894 80A5DB84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02898 80A5DB88 AFAE001C */ sw $t6, 0x001C($sp) -/* 0289C 80A5DB8C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 028A0 80A5DB90 3C07BF00 */ lui $a3, 0xBF00 ## $a3 = BF000000 -/* 028A4 80A5DB94 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 028A8 80A5DB98 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 028AC 80A5DB9C 0C2972BB */ jal func_80A5CAEC -/* 028B0 80A5DBA0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 028B4 80A5DBA4 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 -/* 028B8 80A5DBA8 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFFC -/* 028BC 80A5DBAC 0C298C52 */ jal func_80A63148 -/* 028C0 80A5DBB0 27A6003A */ addiu $a2, $sp, 0x003A ## $a2 = FFFFFFFA -/* 028C4 80A5DBB4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 028C8 80A5DBB8 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 028CC 80A5DBBC C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 028D0 80A5DBC0 460A003C */ c.lt.s $f0, $f10 -/* 028D4 80A5DBC4 00000000 */ nop -/* 028D8 80A5DBC8 45020005 */ bc1fl .L80A5DBE0 -/* 028DC 80A5DBCC 3C013EC0 */ lui $at, 0x3EC0 ## $at = 3EC00000 -/* 028E0 80A5DBD0 0C29759E */ jal func_80A5D678 -/* 028E4 80A5DBD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028E8 80A5DBD8 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 028EC 80A5DBDC 3C013EC0 */ lui $at, 0x3EC0 ## $at = 3EC00000 -.L80A5DBE0: -/* 028F0 80A5DBE0 44818000 */ mtc1 $at, $f16 ## $f16 = 0.38 -/* 028F4 80A5DBE4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 028F8 80A5DBE8 46100482 */ mul.s $f18, $f0, $f16 -/* 028FC 80A5DBEC 0C02927F */ jal SkelAnime_Update - -/* 02900 80A5DBF0 E61201C8 */ swc1 $f18, 0x01C8($s0) ## 000001C8 -/* 02904 80A5DBF4 50400021 */ beql $v0, $zero, .L80A5DC7C -/* 02908 80A5DBF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0290C 80A5DBFC 0C296EA1 */ jal func_80A5BA84 -/* 02910 80A5DC00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02914 80A5DC04 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 02918 80A5DC08 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 0291C 80A5DC0C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 02920 80A5DC10 0C02A800 */ jal func_800AA000 -/* 02924 80A5DC14 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 02928 80A5DC18 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 0292C 80A5DC1C 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 02930 80A5DC20 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 02934 80A5DC24 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 02938 80A5DC28 4600203E */ c.le.s $f4, $f0 -/* 0293C 80A5DC2C 00000000 */ nop -/* 02940 80A5DC30 45020006 */ bc1fl .L80A5DC4C -/* 02944 80A5DC34 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 02948 80A5DC38 0C297723 */ jal func_80A5DC8C -/* 0294C 80A5DC3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02950 80A5DC40 1000000E */ beq $zero, $zero, .L80A5DC7C -/* 02954 80A5DC44 8FBF002C */ lw $ra, 0x002C($sp) -/* 02958 80A5DC48 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 -.L80A5DC4C: -/* 0295C 80A5DC4C 00000000 */ nop -/* 02960 80A5DC50 4606003C */ c.lt.s $f0, $f6 -/* 02964 80A5DC54 00000000 */ nop -/* 02968 80A5DC58 45000005 */ bc1f .L80A5DC70 -/* 0296C 80A5DC5C 00000000 */ nop -/* 02970 80A5DC60 0C29759E */ jal func_80A5D678 -/* 02974 80A5DC64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02978 80A5DC68 10000004 */ beq $zero, $zero, .L80A5DC7C -/* 0297C 80A5DC6C 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5DC70: -/* 02980 80A5DC70 0C2976C3 */ jal func_80A5DB0C -/* 02984 80A5DC74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02988 80A5DC78 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5DC7C: -/* 0298C 80A5DC7C 8FB00028 */ lw $s0, 0x0028($sp) -/* 02990 80A5DC80 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02994 80A5DC84 03E00008 */ jr $ra -/* 02998 80A5DC88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DC8C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DC8C.s deleted file mode 100644 index 46fe6374e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DC8C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A5DC8C -/* 0299C 80A5DC8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 029A0 80A5DC90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 029A4 80A5DC94 AC800154 */ sw $zero, 0x0154($a0) ## 00000154 -/* 029A8 80A5DC98 0C29772C */ jal func_80A5DCB0 -/* 029AC 80A5DC9C AC800150 */ sw $zero, 0x0150($a0) ## 00000150 -/* 029B0 80A5DCA0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 029B4 80A5DCA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 029B8 80A5DCA8 03E00008 */ jr $ra -/* 029BC 80A5DCAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s deleted file mode 100644 index d11412b8a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80A5DCB0 -/* 029C0 80A5DCB0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 029C4 80A5DCB4 AFBF002C */ sw $ra, 0x002C($sp) -/* 029C8 80A5DCB8 AFB00028 */ sw $s0, 0x0028($sp) -/* 029CC 80A5DCBC 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 -/* 029D0 80A5DCC0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 029D4 80A5DCC4 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 029D8 80A5DCC8 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 029DC 80A5DCCC 0018C880 */ sll $t9, $t8, 2 -/* 029E0 80A5DCD0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 029E4 80A5DCD4 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 029E8 80A5DCD8 AC800234 */ sw $zero, 0x0234($a0) ## 00000234 -/* 029EC 80A5DCDC 01194021 */ addu $t0, $t0, $t9 -/* 029F0 80A5DCE0 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 029F4 80A5DCE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 029F8 80A5DCE8 0C028800 */ jal Animation_GetLastFrame - -/* 029FC 80A5DCEC 8D040018 */ lw $a0, 0x0018($t0) ## 80A60018 -/* 02A00 80A5DCF0 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 02A04 80A5DCF4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 02A08 80A5DCF8 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 02A0C 80A5DCFC 00095080 */ sll $t2, $t1, 2 -/* 02A10 80A5DD00 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 02A14 80A5DD04 016A5821 */ addu $t3, $t3, $t2 -/* 02A18 80A5DD08 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 02A1C 80A5DD0C 468021A0 */ cvt.s.w $f6, $f4 -/* 02A20 80A5DD10 000C6880 */ sll $t5, $t4, 2 -/* 02A24 80A5DD14 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 02A28 80A5DD18 016D7021 */ addu $t6, $t3, $t5 -/* 02A2C 80A5DD1C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 02A30 80A5DD20 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 02A34 80A5DD24 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02A38 80A5DD28 AFAF0014 */ sw $t7, 0x0014($sp) -/* 02A3C 80A5DD2C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 02A40 80A5DD30 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 02A44 80A5DD34 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02A48 80A5DD38 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02A4C 80A5DD3C 0C029468 */ jal Animation_Change - -/* 02A50 80A5DD40 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02A54 80A5DD44 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A58 80A5DD48 8FB00028 */ lw $s0, 0x0028($sp) -/* 02A5C 80A5DD4C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02A60 80A5DD50 03E00008 */ jr $ra -/* 02A64 80A5DD54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s deleted file mode 100644 index 42d47aa4b8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80A5DD58 -/* 02A68 80A5DD58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A6C 80A5DD5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02A70 80A5DD60 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 02A74 80A5DD64 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 02A78 80A5DD68 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02A7C 80A5DD6C AC800154 */ sw $zero, 0x0154($a0) ## 00000154 -/* 02A80 80A5DD70 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 -/* 02A84 80A5DD74 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 02A88 80A5DD78 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 02A8C 80A5DD7C AC800234 */ sw $zero, 0x0234($a0) ## 00000234 -/* 02A90 80A5DD80 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 -/* 02A94 80A5DD84 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 02A98 80A5DD88 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02A9C 80A5DD8C 0018C880 */ sll $t9, $t8, 2 -/* 02AA0 80A5DD90 01194021 */ addu $t0, $t0, $t9 -/* 02AA4 80A5DD94 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 02AA8 80A5DD98 0C02947A */ jal Animation_PlayOnce -/* 02AAC 80A5DD9C 8D050018 */ lw $a1, 0x0018($t0) ## 80A60018 -/* 02AB0 80A5DDA0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02AB4 80A5DDA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02AB8 80A5DDA8 03E00008 */ jr $ra -/* 02ABC 80A5DDAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s deleted file mode 100644 index 8f29909a2b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s +++ /dev/null @@ -1,40 +0,0 @@ -.late_rodata -glabel D_80A668C0 - .float 0.01 - -.text -glabel func_80A5DDB0 -/* 02AC0 80A5DDB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02AC4 80A5DDB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02AC8 80A5DDB8 AFA5001C */ sw $a1, 0x001C($sp) -/* 02ACC 80A5DDBC 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 02AD0 80A5DDC0 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 02AD4 80A5DDC4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02AD8 80A5DDC8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 02ADC 80A5DDCC AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 02AE0 80A5DDD0 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 -/* 02AE4 80A5DDD4 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 02AE8 80A5DDD8 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02AEC 80A5DDDC 0018C880 */ sll $t9, $t8, 2 -/* 02AF0 80A5DDE0 01194021 */ addu $t0, $t0, $t9 -/* 02AF4 80A5DDE4 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 02AF8 80A5DDE8 8D050018 */ lw $a1, 0x0018($t0) ## 80A60018 -/* 02AFC 80A5DDEC 0C02947A */ jal Animation_PlayOnce -/* 02B00 80A5DDF0 AFA60018 */ sw $a2, 0x0018($sp) -/* 02B04 80A5DDF4 8FA60018 */ lw $a2, 0x0018($sp) -/* 02B08 80A5DDF8 3C0180A6 */ lui $at, %hi(D_80A668C0) ## $at = 80A60000 -/* 02B0C 80A5DDFC C42868C0 */ lwc1 $f8, %lo(D_80A668C0)($at) -/* 02B10 80A5DE00 8CC201CC */ lw $v0, 0x01CC($a2) ## 000001CC -/* 02B14 80A5DE04 C4C6025C */ lwc1 $f6, 0x025C($a2) ## 0000025C -/* 02B18 80A5DE08 84490002 */ lh $t1, 0x0002($v0) ## 00000002 -/* 02B1C 80A5DE0C ACC00244 */ sw $zero, 0x0244($a2) ## 00000244 -/* 02B20 80A5DE10 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 02B24 80A5DE14 00000000 */ nop -/* 02B28 80A5DE18 46802020 */ cvt.s.w $f0, $f4 -/* 02B2C 80A5DE1C 46080282 */ mul.s $f10, $f0, $f8 -/* 02B30 80A5DE20 460A3400 */ add.s $f16, $f6, $f10 -/* 02B34 80A5DE24 E4D0025C */ swc1 $f16, 0x025C($a2) ## 0000025C -/* 02B38 80A5DE28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02B3C 80A5DE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02B40 80A5DE30 03E00008 */ jr $ra -/* 02B44 80A5DE34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s deleted file mode 100644 index 290d31a2e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s +++ /dev/null @@ -1,134 +0,0 @@ -.late_rodata -glabel D_80A668C4 - .word 0x3D75C28F -glabel D_80A668C8 - .float 0.3 - -.text -glabel func_80A5DE38 -/* 02B48 80A5DE38 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 02B4C 80A5DE3C AFB00028 */ sw $s0, 0x0028($sp) -/* 02B50 80A5DE40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02B54 80A5DE44 AFBF002C */ sw $ra, 0x002C($sp) -/* 02B58 80A5DE48 AFA50044 */ sw $a1, 0x0044($sp) -/* 02B5C 80A5DE4C 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFFC -/* 02B60 80A5DE50 24840264 */ addiu $a0, $a0, 0x0264 ## $a0 = 00000264 -/* 02B64 80A5DE54 0C298C52 */ jal func_80A63148 -/* 02B68 80A5DE58 27A6003A */ addiu $a2, $sp, 0x003A ## $a2 = FFFFFFFA -/* 02B6C 80A5DE5C 8E020150 */ lw $v0, 0x0150($s0) ## 00000150 -/* 02B70 80A5DE60 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 02B74 80A5DE64 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 02B78 80A5DE68 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 02B7C 80A5DE6C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 02B80 80A5DE70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B84 80A5DE74 46802020 */ cvt.s.w $f0, $f4 -/* 02B88 80A5DE78 8FA50044 */ lw $a1, 0x0044($sp) -/* 02B8C 80A5DE7C 3C07BF00 */ lui $a3, 0xBF00 ## $a3 = BF000000 -/* 02B90 80A5DE80 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02B94 80A5DE84 240E0190 */ addiu $t6, $zero, 0x0190 ## $t6 = 00000190 -/* 02B98 80A5DE88 4602003E */ c.le.s $f0, $f2 -/* 02B9C 80A5DE8C 00000000 */ nop -/* 02BA0 80A5DE90 4502000E */ bc1fl .L80A5DECC -/* 02BA4 80A5DE94 4600103C */ c.lt.s $f2, $f0 -/* 02BA8 80A5DE98 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 02BAC 80A5DE9C 3C0180A6 */ lui $at, %hi(D_80A668C4) ## $at = 80A60000 -/* 02BB0 80A5DEA0 C42868C4 */ lwc1 $f8, %lo(D_80A668C4)($at) -/* 02BB4 80A5DEA4 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 02BB8 80A5DEA8 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 02BBC 80A5DEAC AFAE001C */ sw $t6, 0x001C($sp) -/* 02BC0 80A5DEB0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 02BC4 80A5DEB4 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 02BC8 80A5DEB8 0C2972BB */ jal func_80A5CAEC -/* 02BCC 80A5DEBC E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 02BD0 80A5DEC0 1000000A */ beq $zero, $zero, .L80A5DEEC -/* 02BD4 80A5DEC4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02BD8 80A5DEC8 4600103C */ c.lt.s $f2, $f0 -.L80A5DECC: -/* 02BDC 80A5DECC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 02BE0 80A5DED0 45020006 */ bc1fl .L80A5DEEC -/* 02BE4 80A5DED4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02BE8 80A5DED8 44818000 */ mtc1 $at, $f16 ## $f16 = 6.00 -/* 02BEC 80A5DEDC 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 02BF0 80A5DEE0 AE0F0150 */ sw $t7, 0x0150($s0) ## 00000150 -/* 02BF4 80A5DEE4 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 02BF8 80A5DEE8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -.L80A5DEEC: -/* 02BFC 80A5DEEC 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 -/* 02C00 80A5DEF0 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 02C04 80A5DEF4 4612003C */ c.lt.s $f0, $f18 -/* 02C08 80A5DEF8 00000000 */ nop -/* 02C0C 80A5DEFC 45000004 */ bc1f .L80A5DF10 -/* 02C10 80A5DF00 00000000 */ nop -/* 02C14 80A5DF04 0C29769A */ jal func_80A5DA68 -/* 02C18 80A5DF08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C1C 80A5DF0C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -.L80A5DF10: -/* 02C20 80A5DF10 3C0180A6 */ lui $at, %hi(D_80A668C8) ## $at = 80A60000 -/* 02C24 80A5DF14 C42468C8 */ lwc1 $f4, %lo(D_80A668C8)($at) -/* 02C28 80A5DF18 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 02C2C 80A5DF1C 46040182 */ mul.s $f6, $f0, $f4 -/* 02C30 80A5DF20 0C02927F */ jal SkelAnime_Update - -/* 02C34 80A5DF24 E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 -/* 02C38 80A5DF28 50400034 */ beql $v0, $zero, .L80A5DFFC -/* 02C3C 80A5DF2C 8FBF002C */ lw $ra, 0x002C($sp) -/* 02C40 80A5DF30 0C296EB3 */ jal func_80A5BACC -/* 02C44 80A5DF34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C48 80A5DF38 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 02C4C 80A5DF3C 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 -/* 02C50 80A5DF40 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 02C54 80A5DF44 0C02A800 */ jal func_800AA000 -/* 02C58 80A5DF48 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 02C5C 80A5DF4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C60 80A5DF50 0C296FFE */ jal func_80A5BFF8 -/* 02C64 80A5DF54 8FA50044 */ lw $a1, 0x0044($sp) -/* 02C68 80A5DF58 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02C6C 80A5DF5C 14410024 */ bne $v0, $at, .L80A5DFF0 -/* 02C70 80A5DF60 C7A8003C */ lwc1 $f8, 0x003C($sp) -/* 02C74 80A5DF64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02C78 80A5DF68 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 02C7C 80A5DF6C 00000000 */ nop -/* 02C80 80A5DF70 4608503E */ c.le.s $f10, $f8 -/* 02C84 80A5DF74 00000000 */ nop -/* 02C88 80A5DF78 4502000F */ bc1fl .L80A5DFB8 -/* 02C8C 80A5DF7C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02C90 80A5DF80 0C01DE0D */ jal Math_CosS - ## coss? -/* 02C94 80A5DF84 87A4003A */ lh $a0, 0x003A($sp) -/* 02C98 80A5DF88 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 02C9C 80A5DF8C 44818000 */ mtc1 $at, $f16 ## $f16 = -0.50 -/* 02CA0 80A5DF90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CA4 80A5DF94 4610003E */ c.le.s $f0, $f16 -/* 02CA8 80A5DF98 00000000 */ nop -/* 02CAC 80A5DF9C 45020006 */ bc1fl .L80A5DFB8 -/* 02CB0 80A5DFA0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02CB4 80A5DFA4 0C2978AA */ jal func_80A5E2A8 -/* 02CB8 80A5DFA8 8FA50044 */ lw $a1, 0x0044($sp) -/* 02CBC 80A5DFAC 10000013 */ beq $zero, $zero, .L80A5DFFC -/* 02CC0 80A5DFB0 8FBF002C */ lw $ra, 0x002C($sp) -/* 02CC4 80A5DFB4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -.L80A5DFB8: -/* 02CC8 80A5DFB8 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 02CCC 80A5DFBC C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 -/* 02CD0 80A5DFC0 4604903C */ c.lt.s $f18, $f4 -/* 02CD4 80A5DFC4 00000000 */ nop -/* 02CD8 80A5DFC8 45000005 */ bc1f .L80A5DFE0 -/* 02CDC 80A5DFCC 00000000 */ nop -/* 02CE0 80A5DFD0 0C29769A */ jal func_80A5DA68 -/* 02CE4 80A5DFD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CE8 80A5DFD8 10000008 */ beq $zero, $zero, .L80A5DFFC -/* 02CEC 80A5DFDC 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5DFE0: -/* 02CF0 80A5DFE0 0C297756 */ jal func_80A5DD58 -/* 02CF4 80A5DFE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CF8 80A5DFE8 10000004 */ beq $zero, $zero, .L80A5DFFC -/* 02CFC 80A5DFEC 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5DFF0: -/* 02D00 80A5DFF0 0C297756 */ jal func_80A5DD58 -/* 02D04 80A5DFF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D08 80A5DFF8 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5DFFC: -/* 02D0C 80A5DFFC 8FB00028 */ lw $s0, 0x0028($sp) -/* 02D10 80A5E000 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02D14 80A5E004 03E00008 */ jr $ra -/* 02D18 80A5E008 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s deleted file mode 100644 index 15e09c5da3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_80A5E00C -/* 02D1C 80A5E00C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02D20 80A5E010 AFBF002C */ sw $ra, 0x002C($sp) -/* 02D24 80A5E014 AFB00028 */ sw $s0, 0x0028($sp) -/* 02D28 80A5E018 8C9801F0 */ lw $t8, 0x01F0($a0) ## 000001F0 -/* 02D2C 80A5E01C 8C890228 */ lw $t1, 0x0228($a0) ## 00000228 -/* 02D30 80A5E020 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 02D34 80A5E024 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 02D38 80A5E028 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 02D3C 80A5E02C 0301C824 */ and $t9, $t8, $at -/* 02D40 80A5E030 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 02D44 80A5E034 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 02D48 80A5E038 AC9901F0 */ sw $t9, 0x01F0($a0) ## 000001F0 -/* 02D4C 80A5E03C 2485021C */ addiu $a1, $a0, 0x021C ## $a1 = 0000021C -/* 02D50 80A5E040 ACA90000 */ sw $t1, 0x0000($a1) ## 0000021C -/* 02D54 80A5E044 8C88022C */ lw $t0, 0x022C($a0) ## 0000022C -/* 02D58 80A5E048 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D5C 80A5E04C 3C078013 */ lui $a3, %hi(D_801333E0) -/* 02D60 80A5E050 ACA80004 */ sw $t0, 0x0004($a1) ## 00000220 -/* 02D64 80A5E054 8C890230 */ lw $t1, 0x0230($a0) ## 00000230 -/* 02D68 80A5E058 3C0C8013 */ lui $t4, %hi(D_801333E8) -/* 02D6C 80A5E05C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 02D70 80A5E060 ACA90008 */ sw $t1, 0x0008($a1) ## 00000224 -/* 02D74 80A5E064 8C8A01F0 */ lw $t2, 0x01F0($a0) ## 000001F0 -/* 02D78 80A5E068 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 02D7C 80A5E06C 258C33E8 */ addiu $t4, %lo(D_801333E8) -/* 02D80 80A5E070 000A5900 */ sll $t3, $t2, 4 -/* 02D84 80A5E074 05610004 */ bgez $t3, .L80A5E088 -/* 02D88 80A5E078 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 02D8C 80A5E07C AFA70010 */ sw $a3, 0x0010($sp) -/* 02D90 80A5E080 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02D94 80A5E084 AFAC0014 */ sw $t4, 0x0014($sp) -.L80A5E088: -/* 02D98 80A5E088 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 02D9C 80A5E08C 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 02DA0 80A5E090 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02DA4 80A5E094 0C02A800 */ jal func_800AA000 -/* 02DA8 80A5E098 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 02DAC 80A5E09C 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -/* 02DB0 80A5E0A0 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 02DB4 80A5E0A4 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 02DB8 80A5E0A8 000D7080 */ sll $t6, $t5, 2 -/* 02DBC 80A5E0AC 01EE7821 */ addu $t7, $t7, $t6 -/* 02DC0 80A5E0B0 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 02DC4 80A5E0B4 0018C880 */ sll $t9, $t8, 2 -/* 02DC8 80A5E0B8 01F94021 */ addu $t0, $t7, $t9 -/* 02DCC 80A5E0BC 0C028800 */ jal Animation_GetLastFrame - -/* 02DD0 80A5E0C0 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 02DD4 80A5E0C4 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 02DD8 80A5E0C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 02DDC 80A5E0CC 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 02DE0 80A5E0D0 00095080 */ sll $t2, $t1, 2 -/* 02DE4 80A5E0D4 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 02DE8 80A5E0D8 016A5821 */ addu $t3, $t3, $t2 -/* 02DEC 80A5E0DC 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 02DF0 80A5E0E0 468021A0 */ cvt.s.w $f6, $f4 -/* 02DF4 80A5E0E4 000C6880 */ sll $t5, $t4, 2 -/* 02DF8 80A5E0E8 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 02DFC 80A5E0EC 016D7021 */ addu $t6, $t3, $t5 -/* 02E00 80A5E0F0 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 02E04 80A5E0F4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 02E08 80A5E0F8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 02E0C 80A5E0FC AFB80014 */ sw $t8, 0x0014($sp) -/* 02E10 80A5E100 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 02E14 80A5E104 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 02E18 80A5E108 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02E1C 80A5E10C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02E20 80A5E110 0C029468 */ jal Animation_Change - -/* 02E24 80A5E114 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02E28 80A5E118 8FBF002C */ lw $ra, 0x002C($sp) -/* 02E2C 80A5E11C 8FB00028 */ lw $s0, 0x0028($sp) -/* 02E30 80A5E120 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02E34 80A5E124 03E00008 */ jr $ra -/* 02E38 80A5E128 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s deleted file mode 100644 index eff9ec226f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_80A5E12C -/* 02E3C 80A5E12C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 02E40 80A5E130 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02E44 80A5E134 AFB00020 */ sw $s0, 0x0020($sp) -/* 02E48 80A5E138 AFA5003C */ sw $a1, 0x003C($sp) -/* 02E4C 80A5E13C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 02E50 80A5E140 44813000 */ mtc1 $at, $f6 ## $f6 = 25.00 -/* 02E54 80A5E144 C4880214 */ lwc1 $f8, 0x0214($a0) ## 00000214 -/* 02E58 80A5E148 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02E5C 80A5E14C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02E60 80A5E150 4608303C */ c.lt.s $f6, $f8 -/* 02E64 80A5E154 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 02E68 80A5E158 45020016 */ bc1fl .L80A5E1B4 -/* 02E6C 80A5E15C 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 -/* 02E70 80A5E160 8C8201F0 */ lw $v0, 0x01F0($a0) ## 00000454 -/* 02E74 80A5E164 3C078013 */ lui $a3, %hi(D_801333E0) -/* 02E78 80A5E168 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 02E7C 80A5E16C 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 -/* 02E80 80A5E170 15C0000F */ bne $t6, $zero, .L80A5E1B0 -/* 02E84 80A5E174 344F0800 */ ori $t7, $v0, 0x0800 ## $t7 = 00000800 -/* 02E88 80A5E178 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 00000454 -/* 02E8C 80A5E17C 3C188013 */ lui $t8, %hi(D_801333E8) -/* 02E90 80A5E180 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 02E94 80A5E184 AFB80014 */ sw $t8, 0x0014($sp) -/* 02E98 80A5E188 AFA70010 */ sw $a3, 0x0010($sp) -/* 02E9C 80A5E18C 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B -/* 02EA0 80A5E190 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 02EA4 80A5E194 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02EA8 80A5E198 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 02EAC 80A5E19C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 02EB0 80A5E1A0 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 02EB4 80A5E1A4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02EB8 80A5E1A8 0C02A800 */ jal func_800AA000 -/* 02EBC 80A5E1AC 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -.L80A5E1B0: -/* 02EC0 80A5E1B0 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 -.L80A5E1B4: -/* 02EC4 80A5E1B4 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 02EC8 80A5E1B8 0C298C52 */ jal func_80A63148 -/* 02ECC 80A5E1BC 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 02ED0 80A5E1C0 0C02927F */ jal SkelAnime_Update - -/* 02ED4 80A5E1C4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 02ED8 80A5E1C8 10400032 */ beq $v0, $zero, .L80A5E294 -/* 02EDC 80A5E1CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02EE0 80A5E1D0 0C296FFE */ jal func_80A5BFF8 -/* 02EE4 80A5E1D4 8FA5003C */ lw $a1, 0x003C($sp) -/* 02EE8 80A5E1D8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02EEC 80A5E1DC 1441002B */ bne $v0, $at, .L80A5E28C -/* 02EF0 80A5E1E0 00000000 */ nop -/* 02EF4 80A5E1E4 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 02EF8 80A5E1E8 24030064 */ addiu $v1, $zero, 0x0064 ## $v1 = 00000064 -/* 02EFC 80A5E1EC 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 02F00 80A5E1F0 30590010 */ andi $t9, $v0, 0x0010 ## $t9 = 00000000 -/* 02F04 80A5E1F4 13200009 */ beq $t9, $zero, .L80A5E21C -/* 02F08 80A5E1F8 30490020 */ andi $t1, $v0, 0x0020 ## $t1 = 00000000 -/* 02F0C 80A5E1FC 00414024 */ and $t0, $v0, $at -/* 02F10 80A5E200 AE030150 */ sw $v1, 0x0150($s0) ## 00000150 -/* 02F14 80A5E204 AE030154 */ sw $v1, 0x0154($s0) ## 00000154 -/* 02F18 80A5E208 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -/* 02F1C 80A5E20C 0C29796B */ jal func_80A5E5AC -/* 02F20 80A5E210 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F24 80A5E214 10000020 */ beq $zero, $zero, .L80A5E298 -/* 02F28 80A5E218 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5E21C: -/* 02F2C 80A5E21C 1120000A */ beq $t1, $zero, .L80A5E248 -/* 02F30 80A5E220 24030064 */ addiu $v1, $zero, 0x0064 ## $v1 = 00000064 -/* 02F34 80A5E224 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF -/* 02F38 80A5E228 00415024 */ and $t2, $v0, $at -/* 02F3C 80A5E22C AE030150 */ sw $v1, 0x0150($s0) ## 00000150 -/* 02F40 80A5E230 AE030154 */ sw $v1, 0x0154($s0) ## 00000154 -/* 02F44 80A5E234 AE0A01F0 */ sw $t2, 0x01F0($s0) ## 000001F0 -/* 02F48 80A5E238 0C2975A7 */ jal func_80A5D69C -/* 02F4C 80A5E23C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F50 80A5E240 10000015 */ beq $zero, $zero, .L80A5E298 -/* 02F54 80A5E244 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5E248: -/* 02F58 80A5E248 0C01DE0D */ jal Math_CosS - ## coss? -/* 02F5C 80A5E24C 87A40032 */ lh $a0, 0x0032($sp) -/* 02F60 80A5E250 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 02F64 80A5E254 44815000 */ mtc1 $at, $f10 ## $f10 = -0.50 -/* 02F68 80A5E258 00000000 */ nop -/* 02F6C 80A5E25C 460A003E */ c.le.s $f0, $f10 -/* 02F70 80A5E260 00000000 */ nop -/* 02F74 80A5E264 45000005 */ bc1f .L80A5E27C -/* 02F78 80A5E268 00000000 */ nop -/* 02F7C 80A5E26C 0C297962 */ jal func_80A5E588 -/* 02F80 80A5E270 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F84 80A5E274 10000008 */ beq $zero, $zero, .L80A5E298 -/* 02F88 80A5E278 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5E27C: -/* 02F8C 80A5E27C 0C2973CA */ jal func_80A5CF28 -/* 02F90 80A5E280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F94 80A5E284 10000004 */ beq $zero, $zero, .L80A5E298 -/* 02F98 80A5E288 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5E28C: -/* 02F9C 80A5E28C 0C2973CA */ jal func_80A5CF28 -/* 02FA0 80A5E290 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A5E294: -/* 02FA4 80A5E294 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5E298: -/* 02FA8 80A5E298 8FB00020 */ lw $s0, 0x0020($sp) -/* 02FAC 80A5E29C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02FB0 80A5E2A0 03E00008 */ jr $ra -/* 02FB4 80A5E2A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s deleted file mode 100644 index 3ccfe7696a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80A5E2A8 -/* 02FB8 80A5E2A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02FBC 80A5E2AC AFBF002C */ sw $ra, 0x002C($sp) -/* 02FC0 80A5E2B0 AFB00028 */ sw $s0, 0x0028($sp) -/* 02FC4 80A5E2B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 02FC8 80A5E2B8 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 02FCC 80A5E2BC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02FD0 80A5E2C0 3C078013 */ lui $a3, %hi(D_801333E0) -/* 02FD4 80A5E2C4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 02FD8 80A5E2C8 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 02FDC 80A5E2CC 3C188013 */ lui $t8, %hi(D_801333E8) -/* 02FE0 80A5E2D0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 02FE4 80A5E2D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02FE8 80A5E2D8 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 02FEC 80A5E2DC AFB80014 */ sw $t8, 0x0014($sp) -/* 02FF0 80A5E2E0 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 02FF4 80A5E2E4 2404281A */ addiu $a0, $zero, 0x281A ## $a0 = 0000281A -/* 02FF8 80A5E2E8 AFA70010 */ sw $a3, 0x0010($sp) -/* 02FFC 80A5E2EC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 03000 80A5E2F0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03004 80A5E2F4 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 -/* 03008 80A5E2F8 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 0300C 80A5E2FC 8E0A0210 */ lw $t2, 0x0210($s0) ## 00000210 -/* 03010 80A5E300 00194080 */ sll $t0, $t9, 2 -/* 03014 80A5E304 01284821 */ addu $t1, $t1, $t0 -/* 03018 80A5E308 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 0301C 80A5E30C 000A5880 */ sll $t3, $t2, 2 -/* 03020 80A5E310 012B6021 */ addu $t4, $t1, $t3 -/* 03024 80A5E314 0C028800 */ jal Animation_GetLastFrame - -/* 03028 80A5E318 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 0302C 80A5E31C 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -/* 03030 80A5E320 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03034 80A5E324 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 03038 80A5E328 000D7080 */ sll $t6, $t5, 2 -/* 0303C 80A5E32C 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 03040 80A5E330 01EE7821 */ addu $t7, $t7, $t6 -/* 03044 80A5E334 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 03048 80A5E338 468021A0 */ cvt.s.w $f6, $f4 -/* 0304C 80A5E33C 0018C880 */ sll $t9, $t8, 2 -/* 03050 80A5E340 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 03054 80A5E344 01F94021 */ addu $t0, $t7, $t9 -/* 03058 80A5E348 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 0305C 80A5E34C 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 03060 80A5E350 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 03064 80A5E354 AFAA0014 */ sw $t2, 0x0014($sp) -/* 03068 80A5E358 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0306C 80A5E35C 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 03070 80A5E360 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 03074 80A5E364 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03078 80A5E368 0C029468 */ jal Animation_Change - -/* 0307C 80A5E36C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 03080 80A5E370 8E0901F0 */ lw $t1, 0x01F0($s0) ## 000001F0 -/* 03084 80A5E374 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 03088 80A5E378 352B0400 */ ori $t3, $t1, 0x0400 ## $t3 = 00000400 -/* 0308C 80A5E37C AE0B01F0 */ sw $t3, 0x01F0($s0) ## 000001F0 -/* 03090 80A5E380 01616824 */ and $t5, $t3, $at -/* 03094 80A5E384 AE0D01F0 */ sw $t5, 0x01F0($s0) ## 000001F0 -/* 03098 80A5E388 8FBF002C */ lw $ra, 0x002C($sp) -/* 0309C 80A5E38C 8FB00028 */ lw $s0, 0x0028($sp) -/* 030A0 80A5E390 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 030A4 80A5E394 03E00008 */ jr $ra -/* 030A8 80A5E398 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s deleted file mode 100644 index 87c8f57038..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s +++ /dev/null @@ -1,142 +0,0 @@ -.late_rodata -glabel D_80A668CC - .float 0.6 - -.text -glabel func_80A5E39C -/* 030AC 80A5E39C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 030B0 80A5E3A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 030B4 80A5E3A4 AFB00020 */ sw $s0, 0x0020($sp) -/* 030B8 80A5E3A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 030BC 80A5E3AC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 030C0 80A5E3B0 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 030C4 80A5E3B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 030C8 80A5E3B8 3C0180A6 */ lui $at, %hi(D_80A668CC) ## $at = 80A60000 -/* 030CC 80A5E3BC 4600103C */ c.lt.s $f2, $f0 -/* 030D0 80A5E3C0 00000000 */ nop -/* 030D4 80A5E3C4 4502000B */ bc1fl .L80A5E3F4 -/* 030D8 80A5E3C8 8E0E01F0 */ lw $t6, 0x01F0($s0) ## 000001F0 -/* 030DC 80A5E3CC C42468CC */ lwc1 $f4, %lo(D_80A668CC)($at) -/* 030E0 80A5E3D0 46040181 */ sub.s $f6, $f0, $f4 -/* 030E4 80A5E3D4 E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -/* 030E8 80A5E3D8 C4880068 */ lwc1 $f8, 0x0068($a0) ## 00000068 -/* 030EC 80A5E3DC 4602403C */ c.lt.s $f8, $f2 -/* 030F0 80A5E3E0 00000000 */ nop -/* 030F4 80A5E3E4 45020003 */ bc1fl .L80A5E3F4 -/* 030F8 80A5E3E8 8E0E01F0 */ lw $t6, 0x01F0($s0) ## 000001F0 -/* 030FC 80A5E3EC E4820068 */ swc1 $f2, 0x0068($a0) ## 00000068 -/* 03100 80A5E3F0 8E0E01F0 */ lw $t6, 0x01F0($s0) ## 000001F0 -.L80A5E3F4: -/* 03104 80A5E3F4 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 03108 80A5E3F8 31CF0400 */ andi $t7, $t6, 0x0400 ## $t7 = 00000000 -/* 0310C 80A5E3FC 51E00035 */ beql $t7, $zero, .L80A5E4D4 -/* 03110 80A5E400 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 03114 80A5E404 44815000 */ mtc1 $at, $f10 ## $f10 = 29.00 -/* 03118 80A5E408 C61001C4 */ lwc1 $f16, 0x01C4($s0) ## 000001C4 -/* 0311C 80A5E40C 4610503C */ c.lt.s $f10, $f16 -/* 03120 80A5E410 00000000 */ nop -/* 03124 80A5E414 4502002F */ bc1fl .L80A5E4D4 -/* 03128 80A5E418 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 0312C 80A5E41C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 03130 80A5E420 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 03134 80A5E424 3C013FE0 */ lui $at, 0x3FE0 ## $at = 3FE00000 -/* 03138 80A5E428 44819800 */ mtc1 $at, $f19 ## $f19 = 1.75 -/* 0313C 80A5E42C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 03140 80A5E430 46000121 */ cvt.d.s $f4, $f0 -/* 03144 80A5E434 4624903C */ c.lt.d $f18, $f4 -/* 03148 80A5E438 00000000 */ nop -/* 0314C 80A5E43C 45000020 */ bc1f .L80A5E4C0 -/* 03150 80A5E440 00000000 */ nop -/* 03154 80A5E444 8E190228 */ lw $t9, 0x0228($s0) ## 00000228 -/* 03158 80A5E448 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 0315C 80A5E44C 3C078013 */ lui $a3, %hi(D_801333E0) -/* 03160 80A5E450 ACB90000 */ sw $t9, 0x0000($a1) ## 0000021C -/* 03164 80A5E454 8E18022C */ lw $t8, 0x022C($s0) ## 0000022C -/* 03168 80A5E458 3C0A8013 */ lui $t2, %hi(D_801333E8) -/* 0316C 80A5E45C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 03170 80A5E460 ACB80004 */ sw $t8, 0x0004($a1) ## 00000220 -/* 03174 80A5E464 8E190230 */ lw $t9, 0x0230($s0) ## 00000230 -/* 03178 80A5E468 254A33E8 */ addiu $t2, %lo(D_801333E8) -/* 0317C 80A5E46C 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 03180 80A5E470 ACB90008 */ sw $t9, 0x0008($a1) ## 00000224 -/* 03184 80A5E474 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -/* 03188 80A5E478 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0318C 80A5E47C 00084900 */ sll $t1, $t0, 4 -/* 03190 80A5E480 05230005 */ bgezl $t1, .L80A5E498 -/* 03194 80A5E484 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 03198 80A5E488 AFA70010 */ sw $a3, 0x0010($sp) -/* 0319C 80A5E48C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 031A0 80A5E490 AFAA0014 */ sw $t2, 0x0014($sp) -/* 031A4 80A5E494 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -.L80A5E498: -/* 031A8 80A5E498 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 031AC 80A5E49C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 031B0 80A5E4A0 0C02A800 */ jal func_800AA000 -/* 031B4 80A5E4A4 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 031B8 80A5E4A8 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 031BC 80A5E4AC 2401FBFF */ addiu $at, $zero, 0xFBFF ## $at = FFFFFBFF -/* 031C0 80A5E4B0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 031C4 80A5E4B4 01616024 */ and $t4, $t3, $at -/* 031C8 80A5E4B8 10000005 */ beq $zero, $zero, .L80A5E4D0 -/* 031CC 80A5E4BC AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 -.L80A5E4C0: -/* 031D0 80A5E4C0 0C2973CA */ jal func_80A5CF28 -/* 031D4 80A5E4C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031D8 80A5E4C8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 031DC 80A5E4CC 00000000 */ nop -.L80A5E4D0: -/* 031E0 80A5E4D0 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -.L80A5E4D4: -/* 031E4 80A5E4D4 44813000 */ mtc1 $at, $f6 ## $f6 = 29.00 -/* 031E8 80A5E4D8 C60801C4 */ lwc1 $f8, 0x01C4($s0) ## 000001C4 -/* 031EC 80A5E4DC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 031F0 80A5E4E0 4608303C */ c.lt.s $f6, $f8 -/* 031F4 80A5E4E4 00000000 */ nop -/* 031F8 80A5E4E8 45020004 */ bc1fl .L80A5E4FC -/* 031FC 80A5E4EC 44810000 */ mtc1 $at, $f0 ## $f0 = 3.00 -/* 03200 80A5E4F0 1000000C */ beq $zero, $zero, .L80A5E524 -/* 03204 80A5E4F4 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 03208 80A5E4F8 44810000 */ mtc1 $at, $f0 ## $f0 = 3.00 -.L80A5E4FC: -/* 0320C 80A5E4FC C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 03210 80A5E500 460A003C */ c.lt.s $f0, $f10 -/* 03214 80A5E504 00000000 */ nop -/* 03218 80A5E508 45000006 */ bc1f .L80A5E524 -/* 0321C 80A5E50C 00000000 */ nop -/* 03220 80A5E510 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 -/* 03224 80A5E514 31AE0010 */ andi $t6, $t5, 0x0010 ## $t6 = 00000000 -/* 03228 80A5E518 11C00002 */ beq $t6, $zero, .L80A5E524 -/* 0322C 80A5E51C 00000000 */ nop -/* 03230 80A5E520 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L80A5E524: -/* 03234 80A5E524 0C02927F */ jal SkelAnime_Update - -/* 03238 80A5E528 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 0323C 80A5E52C 50400012 */ beql $v0, $zero, .L80A5E578 -/* 03240 80A5E530 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03244 80A5E534 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 -/* 03248 80A5E538 24020064 */ addiu $v0, $zero, 0x0064 ## $v0 = 00000064 -/* 0324C 80A5E53C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03250 80A5E540 31F80010 */ andi $t8, $t7, 0x0010 ## $t8 = 00000000 -/* 03254 80A5E544 13000009 */ beq $t8, $zero, .L80A5E56C -/* 03258 80A5E548 00000000 */ nop -/* 0325C 80A5E54C AE020150 */ sw $v0, 0x0150($s0) ## 00000150 -/* 03260 80A5E550 0C29796B */ jal func_80A5E5AC -/* 03264 80A5E554 AE020154 */ sw $v0, 0x0154($s0) ## 00000154 -/* 03268 80A5E558 8E1901F0 */ lw $t9, 0x01F0($s0) ## 000001F0 -/* 0326C 80A5E55C 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 03270 80A5E560 03214024 */ and $t0, $t9, $at -/* 03274 80A5E564 10000003 */ beq $zero, $zero, .L80A5E574 -/* 03278 80A5E568 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -.L80A5E56C: -/* 0327C 80A5E56C 0C2973CA */ jal func_80A5CF28 -/* 03280 80A5E570 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A5E574: -/* 03284 80A5E574 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5E578: -/* 03288 80A5E578 8FB00020 */ lw $s0, 0x0020($sp) -/* 0328C 80A5E57C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03290 80A5E580 03E00008 */ jr $ra -/* 03294 80A5E584 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E588.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E588.s deleted file mode 100644 index 3fa48a322a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E588.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A5E588 -/* 03298 80A5E588 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0329C 80A5E58C AFBF0014 */ sw $ra, 0x0014($sp) -/* 032A0 80A5E590 AC800154 */ sw $zero, 0x0154($a0) ## 00000154 -/* 032A4 80A5E594 0C29796B */ jal func_80A5E5AC -/* 032A8 80A5E598 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 -/* 032AC 80A5E59C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 032B0 80A5E5A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 032B4 80A5E5A4 03E00008 */ jr $ra -/* 032B8 80A5E5A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s deleted file mode 100644 index eb57057bbb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80A5E5AC -/* 032BC 80A5E5AC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 032C0 80A5E5B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 032C4 80A5E5B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 032C8 80A5E5B8 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 -/* 032CC 80A5E5BC 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 032D0 80A5E5C0 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 032D4 80A5E5C4 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 032D8 80A5E5C8 0018C880 */ sll $t9, $t8, 2 -/* 032DC 80A5E5CC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 032E0 80A5E5D0 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 032E4 80A5E5D4 AC800218 */ sw $zero, 0x0218($a0) ## 00000218 -/* 032E8 80A5E5D8 01194021 */ addu $t0, $t0, $t9 -/* 032EC 80A5E5DC 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 032F0 80A5E5E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 032F4 80A5E5E4 0C028800 */ jal Animation_GetLastFrame - -/* 032F8 80A5E5E8 8D040010 */ lw $a0, 0x0010($t0) ## 80A60010 -/* 032FC 80A5E5EC 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 03300 80A5E5F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03304 80A5E5F4 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 03308 80A5E5F8 00095080 */ sll $t2, $t1, 2 -/* 0330C 80A5E5FC 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 03310 80A5E600 016A5821 */ addu $t3, $t3, $t2 -/* 03314 80A5E604 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 03318 80A5E608 468021A0 */ cvt.s.w $f6, $f4 -/* 0331C 80A5E60C 000C6880 */ sll $t5, $t4, 2 -/* 03320 80A5E610 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 03324 80A5E614 016D7021 */ addu $t6, $t3, $t5 -/* 03328 80A5E618 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 0332C 80A5E61C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 03330 80A5E620 AFA00014 */ sw $zero, 0x0014($sp) -/* 03334 80A5E624 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03338 80A5E628 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 0333C 80A5E62C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03340 80A5E630 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03344 80A5E634 0C029468 */ jal Animation_Change - -/* 03348 80A5E638 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0334C 80A5E63C 8FBF002C */ lw $ra, 0x002C($sp) -/* 03350 80A5E640 8FB00028 */ lw $s0, 0x0028($sp) -/* 03354 80A5E644 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 03358 80A5E648 03E00008 */ jr $ra -/* 0335C 80A5E64C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s deleted file mode 100644 index f1b1809580..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s +++ /dev/null @@ -1,255 +0,0 @@ -glabel func_80A5E650 -/* 03360 80A5E650 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03364 80A5E654 AFBF001C */ sw $ra, 0x001C($sp) -/* 03368 80A5E658 AFB00018 */ sw $s0, 0x0018($sp) -/* 0336C 80A5E65C AFA5003C */ sw $a1, 0x003C($sp) -/* 03370 80A5E660 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 03374 80A5E664 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03378 80A5E668 0C296E72 */ jal func_80A5B9C8 -/* 0337C 80A5E66C AFAF002C */ sw $t7, 0x002C($sp) -/* 03380 80A5E670 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 -/* 03384 80A5E674 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 03388 80A5E678 0C298C52 */ jal func_80A63148 -/* 0338C 80A5E67C 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 03390 80A5E680 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03394 80A5E684 0C296FFE */ jal func_80A5BFF8 -/* 03398 80A5E688 8FA5003C */ lw $a1, 0x003C($sp) -/* 0339C 80A5E68C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 033A0 80A5E690 14410050 */ bne $v0, $at, .L80A5E7D4 -/* 033A4 80A5E694 8FAB002C */ lw $t3, 0x002C($sp) -/* 033A8 80A5E698 8E180154 */ lw $t8, 0x0154($s0) ## 00000154 -/* 033AC 80A5E69C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 033B0 80A5E6A0 C7B00034 */ lwc1 $f16, 0x0034($sp) -/* 033B4 80A5E6A4 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 033B8 80A5E6A8 00000000 */ nop -/* 033BC 80A5E6AC 46802020 */ cvt.s.w $f0, $f4 -/* 033C0 80A5E6B0 46006032 */ c.eq.s $f12, $f0 -/* 033C4 80A5E6B4 00000000 */ nop -/* 033C8 80A5E6B8 45030012 */ bc1tl .L80A5E704 -/* 033CC 80A5E6BC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 033D0 80A5E6C0 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 -/* 033D4 80A5E6C4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 033D8 80A5E6C8 C7B20034 */ lwc1 $f18, 0x0034($sp) -/* 033DC 80A5E6CC 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 033E0 80A5E6D0 00000000 */ nop -/* 033E4 80A5E6D4 468030A0 */ cvt.s.w $f2, $f6 -/* 033E8 80A5E6D8 4602603C */ c.lt.s $f12, $f2 -/* 033EC 80A5E6DC 00000000 */ nop -/* 033F0 80A5E6E0 45020034 */ bc1fl .L80A5E7B4 -/* 033F4 80A5E6E4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 033F8 80A5E6E8 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 033FC 80A5E6EC 00000000 */ nop -/* 03400 80A5E6F0 46080281 */ sub.s $f10, $f0, $f8 -/* 03404 80A5E6F4 460A103C */ c.lt.s $f2, $f10 -/* 03408 80A5E6F8 00000000 */ nop -/* 0340C 80A5E6FC 4500002C */ bc1f .L80A5E7B0 -/* 03410 80A5E700 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80A5E704: -/* 03414 80A5E704 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 03418 80A5E708 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0341C 80A5E70C C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 03420 80A5E710 4612803C */ c.lt.s $f16, $f18 -/* 03424 80A5E714 00000000 */ nop -/* 03428 80A5E718 4502000F */ bc1fl .L80A5E758 -/* 0342C 80A5E71C 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 03430 80A5E720 8E080150 */ lw $t0, 0x0150($s0) ## 00000150 -/* 03434 80A5E724 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 03438 80A5E728 00000000 */ nop -/* 0343C 80A5E72C 468021A0 */ cvt.s.w $f6, $f4 -/* 03440 80A5E730 460C303E */ c.le.s $f6, $f12 -/* 03444 80A5E734 00000000 */ nop -/* 03448 80A5E738 45020007 */ bc1fl .L80A5E758 -/* 0344C 80A5E73C 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 03450 80A5E740 0C2973CA */ jal func_80A5CF28 -/* 03454 80A5E744 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03458 80A5E748 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0345C 80A5E74C 100000A5 */ beq $zero, $zero, .L80A5E9E4 -/* 03460 80A5E750 E60C0068 */ swc1 $f12, 0x0068($s0) ## 00000068 -/* 03464 80A5E754 44815000 */ mtc1 $at, $f10 ## $f10 = 0.00 -.L80A5E758: -/* 03468 80A5E758 24098001 */ addiu $t1, $zero, 0x8001 ## $t1 = FFFF8001 -/* 0346C 80A5E75C 460A403C */ c.lt.s $f8, $f10 -/* 03470 80A5E760 00000000 */ nop -/* 03474 80A5E764 45000003 */ bc1f .L80A5E774 -/* 03478 80A5E768 00000000 */ nop -/* 0347C 80A5E76C 10000025 */ beq $zero, $zero, .L80A5E804 -/* 03480 80A5E770 A7A90032 */ sh $t1, 0x0032($sp) -.L80A5E774: -/* 03484 80A5E774 0C01DE0D */ jal Math_CosS - ## coss? -/* 03488 80A5E778 87A40032 */ lh $a0, 0x0032($sp) -/* 0348C 80A5E77C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 03490 80A5E780 44818000 */ mtc1 $at, $f16 ## $f16 = -0.50 -/* 03494 80A5E784 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 03498 80A5E788 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0349C 80A5E78C 4600803C */ c.lt.s $f16, $f0 -/* 034A0 80A5E790 00000000 */ nop -/* 034A4 80A5E794 4502001C */ bc1fl .L80A5E808 -/* 034A8 80A5E798 3C01C496 */ lui $at, 0xC496 ## $at = C4960000 -/* 034AC 80A5E79C 0C2973CA */ jal func_80A5CF28 -/* 034B0 80A5E7A0 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 -/* 034B4 80A5E7A4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 034B8 80A5E7A8 1000008E */ beq $zero, $zero, .L80A5E9E4 -/* 034BC 80A5E7AC E60C0068 */ swc1 $f12, 0x0068($s0) ## 00000068 -.L80A5E7B0: -/* 034C0 80A5E7B0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80A5E7B4: -/* 034C4 80A5E7B4 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 034C8 80A5E7B8 240A8001 */ addiu $t2, $zero, 0x8001 ## $t2 = FFFF8001 -/* 034CC 80A5E7BC 4604903C */ c.lt.s $f18, $f4 -/* 034D0 80A5E7C0 00000000 */ nop -/* 034D4 80A5E7C4 45020010 */ bc1fl .L80A5E808 -/* 034D8 80A5E7C8 3C01C496 */ lui $at, 0xC496 ## $at = C4960000 -/* 034DC 80A5E7CC 1000000D */ beq $zero, $zero, .L80A5E804 -/* 034E0 80A5E7D0 A7AA0032 */ sh $t2, 0x0032($sp) -.L80A5E7D4: -/* 034E4 80A5E7D4 8D6C0004 */ lw $t4, 0x0004($t3) ## 00000004 -/* 034E8 80A5E7D8 240E8001 */ addiu $t6, $zero, 0x8001 ## $t6 = FFFF8001 -/* 034EC 80A5E7DC 318D0100 */ andi $t5, $t4, 0x0100 ## $t5 = 00000000 -/* 034F0 80A5E7E0 51A00007 */ beql $t5, $zero, .L80A5E800 -/* 034F4 80A5E7E4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 034F8 80A5E7E8 0C2973CA */ jal func_80A5CF28 -/* 034FC 80A5E7EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03500 80A5E7F0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 03504 80A5E7F4 1000007B */ beq $zero, $zero, .L80A5E9E4 -/* 03508 80A5E7F8 E60C0068 */ swc1 $f12, 0x0068($s0) ## 00000068 -/* 0350C 80A5E7FC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -.L80A5E800: -/* 03510 80A5E800 A7AE0032 */ sh $t6, 0x0032($sp) -.L80A5E804: -/* 03514 80A5E804 3C01C496 */ lui $at, 0xC496 ## $at = C4960000 -.L80A5E808: -/* 03518 80A5E808 44811000 */ mtc1 $at, $f2 ## $f2 = -1200.00 -/* 0351C 80A5E80C 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 03520 80A5E810 44813000 */ mtc1 $at, $f6 ## $f6 = -2.00 -/* 03524 80A5E814 24187FFF */ addiu $t8, $zero, 0x7FFF ## $t8 = 00007FFF -/* 03528 80A5E818 3C014496 */ lui $at, 0x4496 ## $at = 44960000 -/* 0352C 80A5E81C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 03530 80A5E820 87AF0032 */ lh $t7, 0x0032($sp) -/* 03534 80A5E824 030FC823 */ subu $t9, $t8, $t7 -/* 03538 80A5E828 00194400 */ sll $t0, $t9, 16 -/* 0353C 80A5E82C 00084C03 */ sra $t1, $t0, 16 -/* 03540 80A5E830 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 03544 80A5E834 00000000 */ nop -/* 03548 80A5E838 46804020 */ cvt.s.w $f0, $f8 -/* 0354C 80A5E83C 4602003C */ c.lt.s $f0, $f2 -/* 03550 80A5E840 00000000 */ nop -/* 03554 80A5E844 45020008 */ bc1fl .L80A5E868 -/* 03558 80A5E848 44817000 */ mtc1 $at, $f14 ## $f14 = 1200.00 -/* 0355C 80A5E84C 4600128D */ trunc.w.s $f10, $f2 -/* 03560 80A5E850 44035000 */ mfc1 $v1, $f10 -/* 03564 80A5E854 00000000 */ nop -/* 03568 80A5E858 00031C00 */ sll $v1, $v1, 16 -/* 0356C 80A5E85C 1000000F */ beq $zero, $zero, .L80A5E89C -/* 03570 80A5E860 00031C03 */ sra $v1, $v1, 16 -/* 03574 80A5E864 44817000 */ mtc1 $at, $f14 ## $f14 = 1200.00 -.L80A5E868: -/* 03578 80A5E868 00000000 */ nop -/* 0357C 80A5E86C 4600703C */ c.lt.s $f14, $f0 -/* 03580 80A5E870 00000000 */ nop -/* 03584 80A5E874 45020004 */ bc1fl .L80A5E888 -/* 03588 80A5E878 46000086 */ mov.s $f2, $f0 -/* 0358C 80A5E87C 10000002 */ beq $zero, $zero, .L80A5E888 -/* 03590 80A5E880 46007086 */ mov.s $f2, $f14 -/* 03594 80A5E884 46000086 */ mov.s $f2, $f0 -.L80A5E888: -/* 03598 80A5E888 4600140D */ trunc.w.s $f16, $f2 -/* 0359C 80A5E88C 44038000 */ mfc1 $v1, $f16 -/* 035A0 80A5E890 00000000 */ nop -/* 035A4 80A5E894 00031C00 */ sll $v1, $v1, 16 -/* 035A8 80A5E898 00031C03 */ sra $v1, $v1, 16 -.L80A5E89C: -/* 035AC 80A5E89C 8E020150 */ lw $v0, 0x0150($s0) ## 00000150 -/* 035B0 80A5E8A0 860C0032 */ lh $t4, 0x0032($s0) ## 00000032 -/* 035B4 80A5E8A4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 035B8 80A5E8A8 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 035BC 80A5E8AC 01836821 */ addu $t5, $t4, $v1 -/* 035C0 80A5E8B0 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 -/* 035C4 80A5E8B4 46809120 */ cvt.s.w $f4, $f18 -/* 035C8 80A5E8B8 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 035CC 80A5E8BC 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 035D0 80A5E8C0 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 035D4 80A5E8C4 A60E00B6 */ sh $t6, 0x00B6($s0) ## 000000B6 -/* 035D8 80A5E8C8 4604603C */ c.lt.s $f12, $f4 -/* 035DC 80A5E8CC 00000000 */ nop -/* 035E0 80A5E8D0 4502000A */ bc1fl .L80A5E8FC -/* 035E4 80A5E8D4 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 035E8 80A5E8D8 448F3000 */ mtc1 $t7, $f6 ## $f6 = NaN -/* 035EC 80A5E8DC AE0F0150 */ sw $t7, 0x0150($s0) ## 00000150 -/* 035F0 80A5E8E0 46803220 */ cvt.s.w $f8, $f6 -/* 035F4 80A5E8E4 460C403E */ c.le.s $f8, $f12 -/* 035F8 80A5E8E8 00000000 */ nop -/* 035FC 80A5E8EC 45020003 */ bc1fl .L80A5E8FC -/* 03600 80A5E8F0 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 03604 80A5E8F4 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 -/* 03608 80A5E8F8 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -.L80A5E8FC: -/* 0360C 80A5E8FC 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 03610 80A5E900 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 03614 80A5E904 46105482 */ mul.s $f18, $f10, $f16 -/* 03618 80A5E908 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 0361C 80A5E90C 46049182 */ mul.s $f6, $f18, $f4 -/* 03620 80A5E910 0C02927F */ jal SkelAnime_Update - -/* 03624 80A5E914 E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 -/* 03628 80A5E918 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0362C 80A5E91C 50400032 */ beql $v0, $zero, .L80A5E9E8 -/* 03630 80A5E920 8FBF001C */ lw $ra, 0x001C($sp) -/* 03634 80A5E924 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 -/* 03638 80A5E928 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0363C 80A5E92C 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 03640 80A5E930 00000000 */ nop -/* 03644 80A5E934 468042A0 */ cvt.s.w $f10, $f8 -/* 03648 80A5E938 460C503E */ c.le.s $f10, $f12 -/* 0364C 80A5E93C 00000000 */ nop -/* 03650 80A5E940 45020029 */ bc1fl .L80A5E9E8 -/* 03654 80A5E944 8FBF001C */ lw $ra, 0x001C($sp) -/* 03658 80A5E948 0C296FFE */ jal func_80A5BFF8 -/* 0365C 80A5E94C 8FA5003C */ lw $a1, 0x003C($sp) -/* 03660 80A5E950 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03664 80A5E954 14410023 */ bne $v0, $at, .L80A5E9E4 -/* 03668 80A5E958 C7B20034 */ lwc1 $f18, 0x0034($sp) -/* 0366C 80A5E95C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 03670 80A5E960 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 03674 80A5E964 00000000 */ nop -/* 03678 80A5E968 4612803C */ c.lt.s $f16, $f18 -/* 0367C 80A5E96C 00000000 */ nop -/* 03680 80A5E970 4502000F */ bc1fl .L80A5E9B0 -/* 03684 80A5E974 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 03688 80A5E978 0C01DE0D */ jal Math_CosS - ## coss? -/* 0368C 80A5E97C 87A40032 */ lh $a0, 0x0032($sp) -/* 03690 80A5E980 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 03694 80A5E984 44812000 */ mtc1 $at, $f4 ## $f4 = -0.50 -/* 03698 80A5E988 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0369C 80A5E98C 4604003E */ c.le.s $f0, $f4 -/* 036A0 80A5E990 00000000 */ nop -/* 036A4 80A5E994 45020006 */ bc1fl .L80A5E9B0 -/* 036A8 80A5E998 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 036AC 80A5E99C 0C297962 */ jal func_80A5E588 -/* 036B0 80A5E9A0 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 -/* 036B4 80A5E9A4 10000010 */ beq $zero, $zero, .L80A5E9E8 -/* 036B8 80A5E9A8 8FBF001C */ lw $ra, 0x001C($sp) -/* 036BC 80A5E9AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80A5E9B0: -/* 036C0 80A5E9B0 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 036C4 80A5E9B4 C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 036C8 80A5E9B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036CC 80A5E9BC 4608303C */ c.lt.s $f6, $f8 -/* 036D0 80A5E9C0 00000000 */ nop -/* 036D4 80A5E9C4 45000005 */ bc1f .L80A5E9DC -/* 036D8 80A5E9C8 00000000 */ nop -/* 036DC 80A5E9CC 0C2973CA */ jal func_80A5CF28 -/* 036E0 80A5E9D0 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 -/* 036E4 80A5E9D4 10000004 */ beq $zero, $zero, .L80A5E9E8 -/* 036E8 80A5E9D8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5E9DC: -/* 036EC 80A5E9DC 0C29796B */ jal func_80A5E5AC -/* 036F0 80A5E9E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A5E9E4: -/* 036F4 80A5E9E4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5E9E8: -/* 036F8 80A5E9E8 8FB00018 */ lw $s0, 0x0018($sp) -/* 036FC 80A5E9EC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03700 80A5E9F0 03E00008 */ jr $ra -/* 03704 80A5E9F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E9F8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E9F8.s deleted file mode 100644 index 05d80d0f03..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E9F8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A5E9F8 -/* 03708 80A5E9F8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0370C 80A5E9FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03710 80A5EA00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03714 80A5EA04 0C297A87 */ jal func_80A5EA1C -/* 03718 80A5EA08 E48401C4 */ swc1 $f4, 0x01C4($a0) ## 000001C4 -/* 0371C 80A5EA0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03720 80A5EA10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03724 80A5EA14 03E00008 */ jr $ra -/* 03728 80A5EA18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s deleted file mode 100644 index 6f7344ce58..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s +++ /dev/null @@ -1,85 +0,0 @@ -.late_rodata -glabel D_80A668D0 - .float 0.01 - -.text -glabel func_80A5EA1C -/* 0372C 80A5EA1C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03730 80A5EA20 AFBF002C */ sw $ra, 0x002C($sp) -/* 03734 80A5EA24 AFB00028 */ sw $s0, 0x0028($sp) -/* 03738 80A5EA28 AFA5003C */ sw $a1, 0x003C($sp) -/* 0373C 80A5EA2C C48401C4 */ lwc1 $f4, 0x01C4($a0) ## 000001C4 -/* 03740 80A5EA30 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 03744 80A5EA34 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 -/* 03748 80A5EA38 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 0374C 80A5EA3C AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 03750 80A5EA40 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 03754 80A5EA44 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 -/* 03758 80A5EA48 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 0375C 80A5EA4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03760 80A5EA50 0018C880 */ sll $t9, $t8, 2 -/* 03764 80A5EA54 01194021 */ addu $t0, $t0, $t9 -/* 03768 80A5EA58 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 0376C 80A5EA5C 0C028800 */ jal Animation_GetLastFrame - -/* 03770 80A5EA60 8D04001C */ lw $a0, 0x001C($t0) ## 80A6001C -/* 03774 80A5EA64 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 03778 80A5EA68 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0377C 80A5EA6C 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 03780 80A5EA70 00095080 */ sll $t2, $t1, 2 -/* 03784 80A5EA74 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 03788 80A5EA78 016A5821 */ addu $t3, $t3, $t2 -/* 0378C 80A5EA7C 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 03790 80A5EA80 46803220 */ cvt.s.w $f8, $f6 -/* 03794 80A5EA84 000C6880 */ sll $t5, $t4, 2 -/* 03798 80A5EA88 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 0379C 80A5EA8C 016D7021 */ addu $t6, $t3, $t5 -/* 037A0 80A5EA90 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 -/* 037A4 80A5EA94 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 037A8 80A5EA98 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 037AC 80A5EA9C AFAF0014 */ sw $t7, 0x0014($sp) -/* 037B0 80A5EAA0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 037B4 80A5EAA4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 037B8 80A5EAA8 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 037BC 80A5EAAC 8FA70034 */ lw $a3, 0x0034($sp) -/* 037C0 80A5EAB0 0C029468 */ jal Animation_Change - -/* 037C4 80A5EAB4 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 037C8 80A5EAB8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 037CC 80A5EABC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 037D0 80A5EAC0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 037D4 80A5EAC4 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC -/* 037D8 80A5EAC8 AE000244 */ sw $zero, 0x0244($s0) ## 00000244 -/* 037DC 80A5EACC E6100274 */ swc1 $f16, 0x0274($s0) ## 00000274 -/* 037E0 80A5EAD0 E612006C */ swc1 $f18, 0x006C($s0) ## 0000006C -/* 037E4 80A5EAD4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 037E8 80A5EAD8 84580002 */ lh $t8, 0x0002($v0) ## 00000002 -/* 037EC 80A5EADC 3C0180A6 */ lui $at, %hi(D_80A668D0) ## $at = 80A60000 -/* 037F0 80A5EAE0 C42A68D0 */ lwc1 $f10, %lo(D_80A668D0)($at) -/* 037F4 80A5EAE4 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 037F8 80A5EAE8 C608025C */ lwc1 $f8, 0x025C($s0) ## 0000025C -/* 037FC 80A5EAEC 3C078013 */ lui $a3, %hi(D_801333E0) -/* 03800 80A5EAF0 46803020 */ cvt.s.w $f0, $f6 -/* 03804 80A5EAF4 3C198013 */ lui $t9, %hi(D_801333E8) -/* 03808 80A5EAF8 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 0380C 80A5EAFC 273933E8 */ addiu $t9, %lo(D_801333E8) -/* 03810 80A5EB00 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 -/* 03814 80A5EB04 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 03818 80A5EB08 460A0402 */ mul.s $f16, $f0, $f10 -/* 0381C 80A5EB0C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03820 80A5EB10 46104481 */ sub.s $f18, $f8, $f16 -/* 03824 80A5EB14 E612025C */ swc1 $f18, 0x025C($s0) ## 0000025C -/* 03828 80A5EB18 AFB90014 */ sw $t9, 0x0014($sp) -/* 0382C 80A5EB1C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 03830 80A5EB20 AFA70010 */ sw $a3, 0x0010($sp) -/* 03834 80A5EB24 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 03838 80A5EB28 240500AA */ addiu $a1, $zero, 0x00AA ## $a1 = 000000AA -/* 0383C 80A5EB2C 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 03840 80A5EB30 0C02A800 */ jal func_800AA000 -/* 03844 80A5EB34 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 03848 80A5EB38 8FBF002C */ lw $ra, 0x002C($sp) -/* 0384C 80A5EB3C 8FB00028 */ lw $s0, 0x0028($sp) -/* 03850 80A5EB40 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03854 80A5EB44 03E00008 */ jr $ra -/* 03858 80A5EB48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB4C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB4C.s deleted file mode 100644 index d13900f7c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB4C.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80A5EB4C -/* 0385C 80A5EB4C 03E00008 */ jr $ra -/* 03860 80A5EB50 AFA40000 */ sw $a0, 0x0000($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s deleted file mode 100644 index 98290b3a3f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s +++ /dev/null @@ -1,128 +0,0 @@ -.late_rodata -glabel D_80A668D4 - .float 0.01 - -.text -glabel func_80A5EB54 -/* 03864 80A5EB54 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03868 80A5EB58 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 0386C 80A5EB5C 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 03870 80A5EB60 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03874 80A5EB64 AFB00020 */ sw $s0, 0x0020($sp) -/* 03878 80A5EB68 AFA50044 */ sw $a1, 0x0044($sp) -/* 0387C 80A5EB6C 3C014188 */ lui $at, 0x4188 ## $at = 41880000 -/* 03880 80A5EB70 C48201C4 */ lwc1 $f2, 0x01C4($a0) ## 000001C4 -/* 03884 80A5EB74 44813000 */ mtc1 $at, $f6 ## $f6 = 17.00 -/* 03888 80A5EB78 8C8E01F0 */ lw $t6, 0x01F0($a0) ## 000001F0 -/* 0388C 80A5EB7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03890 80A5EB80 4602303C */ c.lt.s $f6, $f2 -/* 03894 80A5EB84 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 03898 80A5EB88 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 000001F0 -/* 0389C 80A5EB8C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 038A0 80A5EB90 4502001D */ bc1fl .L80A5EC08 -/* 038A4 80A5EB94 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC -/* 038A8 80A5EB98 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 038AC 80A5EB9C C48A0060 */ lwc1 $f10, 0x0060($a0) ## 00000060 -/* 038B0 80A5EBA0 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 038B4 80A5EBA4 44814000 */ mtc1 $at, $f8 ## $f8 = -3.50 -/* 038B8 80A5EBA8 460A0032 */ c.eq.s $f0, $f10 -/* 038BC 80A5EBAC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 038C0 80A5EBB0 E488006C */ swc1 $f8, 0x006C($a0) ## 0000006C -/* 038C4 80A5EBB4 45020005 */ bc1fl .L80A5EBCC -/* 038C8 80A5EBB8 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 038CC 80A5EBBC 44818000 */ mtc1 $at, $f16 ## $f16 = 90.00 -/* 038D0 80A5EBC0 00000000 */ nop -/* 038D4 80A5EBC4 E4900060 */ swc1 $f16, 0x0060($a0) ## 00000060 -/* 038D8 80A5EBC8 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -.L80A5EBCC: -/* 038DC 80A5EBCC 44813000 */ mtc1 $at, $f6 ## $f6 = 90.00 -/* 038E0 80A5EBD0 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 038E4 80A5EBD4 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 038E8 80A5EBD8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 038EC 80A5EBDC 46062200 */ add.s $f8, $f4, $f6 -/* 038F0 80A5EBE0 4608903C */ c.lt.s $f18, $f8 -/* 038F4 80A5EBE4 00000000 */ nop -/* 038F8 80A5EBE8 45000004 */ bc1f .L80A5EBFC -/* 038FC 80A5EBEC 00000000 */ nop -/* 03900 80A5EBF0 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 -/* 03904 80A5EBF4 1000000E */ beq $zero, $zero, .L80A5EC30 -/* 03908 80A5EBF8 E60A01C8 */ swc1 $f10, 0x01C8($s0) ## 000001C8 -.L80A5EBFC: -/* 0390C 80A5EBFC 1000000C */ beq $zero, $zero, .L80A5EC30 -/* 03910 80A5EC00 E60001C8 */ swc1 $f0, 0x01C8($s0) ## 000001C8 -/* 03914 80A5EC04 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC -.L80A5EC08: -/* 03918 80A5EC08 3C0180A6 */ lui $at, %hi(D_80A668D4) ## $at = 80A60000 -/* 0391C 80A5EC0C C42668D4 */ lwc1 $f6, %lo(D_80A668D4)($at) -/* 03920 80A5EC10 84580002 */ lh $t8, 0x0002($v0) ## 00000002 -/* 03924 80A5EC14 C6040274 */ lwc1 $f4, 0x0274($s0) ## 00000274 -/* 03928 80A5EC18 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 0392C 80A5EC1C 00000000 */ nop -/* 03930 80A5EC20 46808020 */ cvt.s.w $f0, $f16 -/* 03934 80A5EC24 46060482 */ mul.s $f18, $f0, $f6 -/* 03938 80A5EC28 46122200 */ add.s $f8, $f4, $f18 -/* 0393C 80A5EC2C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -.L80A5EC30: -/* 03940 80A5EC30 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 03944 80A5EC34 0C02927F */ jal SkelAnime_Update - -/* 03948 80A5EC38 E7A2002C */ swc1 $f2, 0x002C($sp) -/* 0394C 80A5EC3C 14400012 */ bne $v0, $zero, .L80A5EC88 -/* 03950 80A5EC40 C7A2002C */ lwc1 $f2, 0x002C($sp) -/* 03954 80A5EC44 3C014188 */ lui $at, 0x4188 ## $at = 41880000 -/* 03958 80A5EC48 44815000 */ mtc1 $at, $f10 ## $f10 = 17.00 -/* 0395C 80A5EC4C 00000000 */ nop -/* 03960 80A5EC50 4602503C */ c.lt.s $f10, $f2 -/* 03964 80A5EC54 00000000 */ nop -/* 03968 80A5EC58 4502002B */ bc1fl .L80A5ED08 -/* 0396C 80A5EC5C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03970 80A5EC60 C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 -/* 03974 80A5EC64 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 03978 80A5EC68 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 0397C 80A5EC6C 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 -/* 03980 80A5EC70 46043481 */ sub.s $f18, $f6, $f4 -/* 03984 80A5EC74 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 03988 80A5EC78 46089280 */ add.s $f10, $f18, $f8 -/* 0398C 80A5EC7C 460A803C */ c.lt.s $f16, $f10 -/* 03990 80A5EC80 00000000 */ nop -/* 03994 80A5EC84 4500001F */ bc1f .L80A5ED04 -.L80A5EC88: -/* 03998 80A5EC88 3C078013 */ lui $a3, %hi(D_801333E0) -/* 0399C 80A5EC8C 3C198013 */ lui $t9, %hi(D_801333E8) -/* 039A0 80A5EC90 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 039A4 80A5EC94 273933E8 */ addiu $t9, %lo(D_801333E8) -/* 039A8 80A5EC98 AFB90014 */ sw $t9, 0x0014($sp) -/* 039AC 80A5EC9C AFA70010 */ sw $a3, 0x0010($sp) -/* 039B0 80A5ECA0 24042819 */ addiu $a0, $zero, 0x2819 ## $a0 = 00002819 -/* 039B4 80A5ECA4 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 039B8 80A5ECA8 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 039BC 80A5ECAC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 039C0 80A5ECB0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 039C4 80A5ECB4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 039C8 80A5ECB8 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 039CC 80A5ECBC 0C02A800 */ jal func_800AA000 -/* 039D0 80A5ECC0 24070050 */ addiu $a3, $zero, 0x0050 ## $a3 = 00000050 -/* 039D4 80A5ECC4 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -/* 039D8 80A5ECC8 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB -/* 039DC 80A5ECCC C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 039E0 80A5ECD0 01014824 */ and $t1, $t0, $at -/* 039E4 80A5ECD4 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 039E8 80A5ECD8 44813000 */ mtc1 $at, $f6 ## $f6 = -3.50 -/* 039EC 80A5ECDC AE0901F0 */ sw $t1, 0x01F0($s0) ## 000001F0 -/* 039F0 80A5ECE0 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 039F4 80A5ECE4 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 039F8 80A5ECE8 8FA40044 */ lw $a0, 0x0044($sp) -/* 039FC 80A5ECEC 3C0541C8 */ lui $a1, 0x41C8 ## $a1 = 41C80000 -/* 03A00 80A5ECF0 0C00A295 */ jal func_80028A54 -/* 03A04 80A5ECF4 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 03A08 80A5ECF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03A0C 80A5ECFC 0C29776C */ jal func_80A5DDB0 -/* 03A10 80A5ED00 8FA50044 */ lw $a1, 0x0044($sp) -.L80A5ED04: -/* 03A14 80A5ED04 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5ED08: -/* 03A18 80A5ED08 8FB00020 */ lw $s0, 0x0020($sp) -/* 03A1C 80A5ED0C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03A20 80A5ED10 03E00008 */ jr $ra -/* 03A24 80A5ED14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED18.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED18.s deleted file mode 100644 index 7dc54ff66f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED18.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A5ED18 -/* 03A28 80A5ED18 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03A2C 80A5ED1C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03A30 80A5ED20 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03A34 80A5ED24 0C297B4F */ jal func_80A5ED3C -/* 03A38 80A5ED28 E48401C4 */ swc1 $f4, 0x01C4($a0) ## 000001C4 -/* 03A3C 80A5ED2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03A40 80A5ED30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03A44 80A5ED34 03E00008 */ jr $ra -/* 03A48 80A5ED38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s deleted file mode 100644 index dd2b9400ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s +++ /dev/null @@ -1,88 +0,0 @@ -.late_rodata -glabel D_80A668D8 - .float 0.01 - -.text -glabel func_80A5ED3C -/* 03A4C 80A5ED3C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03A50 80A5ED40 AFBF002C */ sw $ra, 0x002C($sp) -/* 03A54 80A5ED44 AFB00028 */ sw $s0, 0x0028($sp) -/* 03A58 80A5ED48 AFA5003C */ sw $a1, 0x003C($sp) -/* 03A5C 80A5ED4C C48401C4 */ lwc1 $f4, 0x01C4($a0) ## 000001C4 -/* 03A60 80A5ED50 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 03A64 80A5ED54 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 03A68 80A5ED58 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 03A6C 80A5ED5C AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 03A70 80A5ED60 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 03A74 80A5ED64 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 -/* 03A78 80A5ED68 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 03A7C 80A5ED6C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03A80 80A5ED70 0018C880 */ sll $t9, $t8, 2 -/* 03A84 80A5ED74 01194021 */ addu $t0, $t0, $t9 -/* 03A88 80A5ED78 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 03A8C 80A5ED7C 0C028800 */ jal Animation_GetLastFrame - -/* 03A90 80A5ED80 8D040020 */ lw $a0, 0x0020($t0) ## 80A60020 -/* 03A94 80A5ED84 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 03A98 80A5ED88 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 03A9C 80A5ED8C 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 03AA0 80A5ED90 00095080 */ sll $t2, $t1, 2 -/* 03AA4 80A5ED94 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 03AA8 80A5ED98 016A5821 */ addu $t3, $t3, $t2 -/* 03AAC 80A5ED9C 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 03AB0 80A5EDA0 46803220 */ cvt.s.w $f8, $f6 -/* 03AB4 80A5EDA4 000C6880 */ sll $t5, $t4, 2 -/* 03AB8 80A5EDA8 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 03ABC 80A5EDAC 016D7021 */ addu $t6, $t3, $t5 -/* 03AC0 80A5EDB0 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 -/* 03AC4 80A5EDB4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 03AC8 80A5EDB8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 03ACC 80A5EDBC AFAF0014 */ sw $t7, 0x0014($sp) -/* 03AD0 80A5EDC0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 03AD4 80A5EDC4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 03AD8 80A5EDC8 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 03ADC 80A5EDCC 8FA70034 */ lw $a3, 0x0034($sp) -/* 03AE0 80A5EDD0 0C029468 */ jal Animation_Change - -/* 03AE4 80A5EDD4 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 03AE8 80A5EDD8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 03AEC 80A5EDDC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 03AF0 80A5EDE0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03AF4 80A5EDE4 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC -/* 03AF8 80A5EDE8 AE000244 */ sw $zero, 0x0244($s0) ## 00000244 -/* 03AFC 80A5EDEC E6100274 */ swc1 $f16, 0x0274($s0) ## 00000274 -/* 03B00 80A5EDF0 E612006C */ swc1 $f18, 0x006C($s0) ## 0000006C -/* 03B04 80A5EDF4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 03B08 80A5EDF8 84580002 */ lh $t8, 0x0002($v0) ## 00000002 -/* 03B0C 80A5EDFC 3C0180A6 */ lui $at, %hi(D_80A668D8) ## $at = 80A60000 -/* 03B10 80A5EE00 C42A68D8 */ lwc1 $f10, %lo(D_80A668D8)($at) -/* 03B14 80A5EE04 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 03B18 80A5EE08 C608025C */ lwc1 $f8, 0x025C($s0) ## 0000025C -/* 03B1C 80A5EE0C 8E1901F0 */ lw $t9, 0x01F0($s0) ## 000001F0 -/* 03B20 80A5EE10 46803020 */ cvt.s.w $f0, $f6 -/* 03B24 80A5EE14 3C078013 */ lui $a3, %hi(D_801333E0) -/* 03B28 80A5EE18 3C098013 */ lui $t1, %hi(D_801333E8) -/* 03B2C 80A5EE1C 37280008 */ ori $t0, $t9, 0x0008 ## $t0 = 00000008 -/* 03B30 80A5EE20 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 03B34 80A5EE24 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -/* 03B38 80A5EE28 460A0402 */ mul.s $f16, $f0, $f10 -/* 03B3C 80A5EE2C 252933E8 */ addiu $t1, %lo(D_801333E8) -/* 03B40 80A5EE30 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 -/* 03B44 80A5EE34 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 03B48 80A5EE38 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03B4C 80A5EE3C 46104481 */ sub.s $f18, $f8, $f16 -/* 03B50 80A5EE40 E612025C */ swc1 $f18, 0x025C($s0) ## 0000025C -/* 03B54 80A5EE44 AFA90014 */ sw $t1, 0x0014($sp) -/* 03B58 80A5EE48 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 03B5C 80A5EE4C AFA70010 */ sw $a3, 0x0010($sp) -/* 03B60 80A5EE50 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 03B64 80A5EE54 240500AA */ addiu $a1, $zero, 0x00AA ## $a1 = 000000AA -/* 03B68 80A5EE58 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 03B6C 80A5EE5C 0C02A800 */ jal func_800AA000 -/* 03B70 80A5EE60 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 03B74 80A5EE64 8FBF002C */ lw $ra, 0x002C($sp) -/* 03B78 80A5EE68 8FB00028 */ lw $s0, 0x0028($sp) -/* 03B7C 80A5EE6C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03B80 80A5EE70 03E00008 */ jr $ra -/* 03B84 80A5EE74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE78.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE78.s deleted file mode 100644 index d84e84b3ea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE78.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80A5EE78 -/* 03B88 80A5EE78 03E00008 */ jr $ra -/* 03B8C 80A5EE7C AFA40000 */ sw $a0, 0x0000($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s deleted file mode 100644 index 8a1b49271b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s +++ /dev/null @@ -1,128 +0,0 @@ -.late_rodata -glabel D_80A668DC - .float 0.01 - -.text -glabel func_80A5EE80 -/* 03B90 80A5EE80 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03B94 80A5EE84 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 03B98 80A5EE88 44812000 */ mtc1 $at, $f4 ## $f4 = 13.00 -/* 03B9C 80A5EE8C AFBF0024 */ sw $ra, 0x0024($sp) -/* 03BA0 80A5EE90 AFB00020 */ sw $s0, 0x0020($sp) -/* 03BA4 80A5EE94 AFA50044 */ sw $a1, 0x0044($sp) -/* 03BA8 80A5EE98 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 03BAC 80A5EE9C C48201C4 */ lwc1 $f2, 0x01C4($a0) ## 000001C4 -/* 03BB0 80A5EEA0 44813000 */ mtc1 $at, $f6 ## $f6 = 23.00 -/* 03BB4 80A5EEA4 8C8E01F0 */ lw $t6, 0x01F0($a0) ## 000001F0 -/* 03BB8 80A5EEA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03BBC 80A5EEAC 4602303C */ c.lt.s $f6, $f2 -/* 03BC0 80A5EEB0 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 03BC4 80A5EEB4 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 000001F0 -/* 03BC8 80A5EEB8 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 03BCC 80A5EEBC 4502001D */ bc1fl .L80A5EF34 -/* 03BD0 80A5EEC0 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC -/* 03BD4 80A5EEC4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03BD8 80A5EEC8 C48A0060 */ lwc1 $f10, 0x0060($a0) ## 00000060 -/* 03BDC 80A5EECC 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 03BE0 80A5EED0 44814000 */ mtc1 $at, $f8 ## $f8 = -3.50 -/* 03BE4 80A5EED4 460A0032 */ c.eq.s $f0, $f10 -/* 03BE8 80A5EED8 3C01C128 */ lui $at, 0xC128 ## $at = C1280000 -/* 03BEC 80A5EEDC E488006C */ swc1 $f8, 0x006C($a0) ## 0000006C -/* 03BF0 80A5EEE0 45020005 */ bc1fl .L80A5EEF8 -/* 03BF4 80A5EEE4 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 03BF8 80A5EEE8 44818000 */ mtc1 $at, $f16 ## $f16 = 90.00 -/* 03BFC 80A5EEEC 00000000 */ nop -/* 03C00 80A5EEF0 E4900060 */ swc1 $f16, 0x0060($a0) ## 00000060 -/* 03C04 80A5EEF4 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -.L80A5EEF8: -/* 03C08 80A5EEF8 44813000 */ mtc1 $at, $f6 ## $f6 = 90.00 -/* 03C0C 80A5EEFC C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 03C10 80A5EF00 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 03C14 80A5EF04 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 03C18 80A5EF08 46062200 */ add.s $f8, $f4, $f6 -/* 03C1C 80A5EF0C 4608903C */ c.lt.s $f18, $f8 -/* 03C20 80A5EF10 00000000 */ nop -/* 03C24 80A5EF14 45000004 */ bc1f .L80A5EF28 -/* 03C28 80A5EF18 00000000 */ nop -/* 03C2C 80A5EF1C 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 -/* 03C30 80A5EF20 1000000E */ beq $zero, $zero, .L80A5EF5C -/* 03C34 80A5EF24 E60A01C8 */ swc1 $f10, 0x01C8($s0) ## 000001C8 -.L80A5EF28: -/* 03C38 80A5EF28 1000000C */ beq $zero, $zero, .L80A5EF5C -/* 03C3C 80A5EF2C E60001C8 */ swc1 $f0, 0x01C8($s0) ## 000001C8 -/* 03C40 80A5EF30 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC -.L80A5EF34: -/* 03C44 80A5EF34 3C0180A6 */ lui $at, %hi(D_80A668DC) ## $at = 80A60000 -/* 03C48 80A5EF38 C42668DC */ lwc1 $f6, %lo(D_80A668DC)($at) -/* 03C4C 80A5EF3C 84580002 */ lh $t8, 0x0002($v0) ## 00000002 -/* 03C50 80A5EF40 C6040274 */ lwc1 $f4, 0x0274($s0) ## 00000274 -/* 03C54 80A5EF44 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 03C58 80A5EF48 00000000 */ nop -/* 03C5C 80A5EF4C 46808020 */ cvt.s.w $f0, $f16 -/* 03C60 80A5EF50 46060482 */ mul.s $f18, $f0, $f6 -/* 03C64 80A5EF54 46122200 */ add.s $f8, $f4, $f18 -/* 03C68 80A5EF58 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -.L80A5EF5C: -/* 03C6C 80A5EF5C 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 03C70 80A5EF60 0C02927F */ jal SkelAnime_Update - -/* 03C74 80A5EF64 E7A2002C */ swc1 $f2, 0x002C($sp) -/* 03C78 80A5EF68 14400012 */ bne $v0, $zero, .L80A5EFB4 -/* 03C7C 80A5EF6C C7A2002C */ lwc1 $f2, 0x002C($sp) -/* 03C80 80A5EF70 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 03C84 80A5EF74 44815000 */ mtc1 $at, $f10 ## $f10 = 23.00 -/* 03C88 80A5EF78 00000000 */ nop -/* 03C8C 80A5EF7C 4602503C */ c.lt.s $f10, $f2 -/* 03C90 80A5EF80 00000000 */ nop -/* 03C94 80A5EF84 4502002B */ bc1fl .L80A5F034 -/* 03C98 80A5EF88 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03C9C 80A5EF8C C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 -/* 03CA0 80A5EF90 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 03CA4 80A5EF94 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 03CA8 80A5EF98 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 -/* 03CAC 80A5EF9C 46043481 */ sub.s $f18, $f6, $f4 -/* 03CB0 80A5EFA0 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 03CB4 80A5EFA4 46089280 */ add.s $f10, $f18, $f8 -/* 03CB8 80A5EFA8 460A803C */ c.lt.s $f16, $f10 -/* 03CBC 80A5EFAC 00000000 */ nop -/* 03CC0 80A5EFB0 4500001F */ bc1f .L80A5F030 -.L80A5EFB4: -/* 03CC4 80A5EFB4 3C078013 */ lui $a3, %hi(D_801333E0) -/* 03CC8 80A5EFB8 3C198013 */ lui $t9, %hi(D_801333E8) -/* 03CCC 80A5EFBC 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 03CD0 80A5EFC0 273933E8 */ addiu $t9, %lo(D_801333E8) -/* 03CD4 80A5EFC4 AFB90014 */ sw $t9, 0x0014($sp) -/* 03CD8 80A5EFC8 AFA70010 */ sw $a3, 0x0010($sp) -/* 03CDC 80A5EFCC 24042819 */ addiu $a0, $zero, 0x2819 ## $a0 = 00002819 -/* 03CE0 80A5EFD0 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 03CE4 80A5EFD4 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 03CE8 80A5EFD8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03CEC 80A5EFDC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 03CF0 80A5EFE0 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 03CF4 80A5EFE4 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 03CF8 80A5EFE8 0C02A800 */ jal func_800AA000 -/* 03CFC 80A5EFEC 24070050 */ addiu $a3, $zero, 0x0050 ## $a3 = 00000050 -/* 03D00 80A5EFF0 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -/* 03D04 80A5EFF4 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB -/* 03D08 80A5EFF8 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 03D0C 80A5EFFC 01014824 */ and $t1, $t0, $at -/* 03D10 80A5F000 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 03D14 80A5F004 44813000 */ mtc1 $at, $f6 ## $f6 = -3.50 -/* 03D18 80A5F008 AE0901F0 */ sw $t1, 0x01F0($s0) ## 000001F0 -/* 03D1C 80A5F00C E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 03D20 80A5F010 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 03D24 80A5F014 8FA40044 */ lw $a0, 0x0044($sp) -/* 03D28 80A5F018 3C0541C8 */ lui $a1, 0x41C8 ## $a1 = 41C80000 -/* 03D2C 80A5F01C 0C00A295 */ jal func_80028A54 -/* 03D30 80A5F020 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 03D34 80A5F024 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03D38 80A5F028 0C29776C */ jal func_80A5DDB0 -/* 03D3C 80A5F02C 8FA50044 */ lw $a1, 0x0044($sp) -.L80A5F030: -/* 03D40 80A5F030 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5F034: -/* 03D44 80A5F034 8FB00020 */ lw $s0, 0x0020($sp) -/* 03D48 80A5F038 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03D4C 80A5F03C 03E00008 */ jr $ra -/* 03D50 80A5F040 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F044.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F044.s deleted file mode 100644 index 8bb971a816..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F044.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80A5F044 -/* 03D54 80A5F044 908E028A */ lbu $t6, 0x028A($a0) ## 0000028A -/* 03D58 80A5F048 909802D6 */ lbu $t8, 0x02D6($a0) ## 000002D6 -/* 03D5C 80A5F04C 90880322 */ lbu $t0, 0x0322($a0) ## 00000322 -/* 03D60 80A5F050 8C8C01F0 */ lw $t4, 0x01F0($a0) ## 000001F0 -/* 03D64 80A5F054 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 03D68 80A5F058 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 -/* 03D6C 80A5F05C 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 -/* 03D70 80A5F060 3319FFFE */ andi $t9, $t8, 0xFFFE ## $t9 = 00000000 -/* 03D74 80A5F064 3109FFFE */ andi $t1, $t0, 0xFFFE ## $t1 = 00000000 -/* 03D78 80A5F068 358D2000 */ ori $t5, $t4, 0x2000 ## $t5 = 00002000 -/* 03D7C 80A5F06C A08F028A */ sb $t7, 0x028A($a0) ## 0000028A -/* 03D80 80A5F070 A09902D6 */ sb $t9, 0x02D6($a0) ## 000002D6 -/* 03D84 80A5F074 A0890322 */ sb $t1, 0x0322($a0) ## 00000322 -/* 03D88 80A5F078 AC8A014C */ sw $t2, 0x014C($a0) ## 0000014C -/* 03D8C 80A5F07C AC8B0210 */ sw $t3, 0x0210($a0) ## 00000210 -/* 03D90 80A5F080 AC8D01F0 */ sw $t5, 0x01F0($a0) ## 000001F0 -/* 03D94 80A5F084 03E00008 */ jr $ra -/* 03D98 80A5F088 A4800250 */ sh $zero, 0x0250($a0) ## 00000250 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s deleted file mode 100644 index 2c4a9e473c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_80A5F08C -/* 03D9C 80A5F08C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03DA0 80A5F090 3C028016 */ lui $v0, %hi(gGameInfo) -/* 03DA4 80A5F094 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 03DA8 80A5F098 AFBF002C */ sw $ra, 0x002C($sp) -/* 03DAC 80A5F09C AFB10028 */ sw $s1, 0x0028($sp) -/* 03DB0 80A5F0A0 AFB00024 */ sw $s0, 0x0024($sp) -/* 03DB4 80A5F0A4 844E05BE */ lh $t6, 0x05BE($v0) ## 801605BE -/* 03DB8 80A5F0A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03DBC 80A5F0AC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03DC0 80A5F0B0 51C00029 */ beql $t6, $zero, .L80A5F158 -/* 03DC4 80A5F0B4 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 03DC8 80A5F0B8 8C8F0158 */ lw $t7, 0x0158($a0) ## 00000158 -/* 03DCC 80A5F0BC 55E00026 */ bnel $t7, $zero, .L80A5F158 -/* 03DD0 80A5F0C0 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 03DD4 80A5F0C4 0C296F65 */ jal func_80A5BD94 -/* 03DD8 80A5F0C8 A44005BE */ sh $zero, 0x05BE($v0) ## 801605BE -/* 03DDC 80A5F0CC 10400021 */ beq $v0, $zero, .L80A5F154 -/* 03DE0 80A5F0D0 3C078013 */ lui $a3, %hi(D_801333E0) -/* 03DE4 80A5F0D4 3C188013 */ lui $t8, %hi(D_801333E8) -/* 03DE8 80A5F0D8 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 03DEC 80A5F0DC 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 03DF0 80A5F0E0 AFB80014 */ sw $t8, 0x0014($sp) -/* 03DF4 80A5F0E4 AFA70010 */ sw $a3, 0x0010($sp) -/* 03DF8 80A5F0E8 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 03DFC 80A5F0EC 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 03E00 80A5F0F0 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 03E04 80A5F0F4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03E08 80A5F0F8 8E1901F0 */ lw $t9, 0x01F0($s0) ## 000001F0 -/* 03E0C 80A5F0FC 2401DFFF */ addiu $at, $zero, 0xDFFF ## $at = FFFFDFFF -/* 03E10 80A5F100 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 03E14 80A5F104 03214024 */ and $t0, $t9, $at -/* 03E18 80A5F108 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -/* 03E1C 80A5F10C 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 -/* 03E20 80A5F110 3C018016 */ lui $at, %hi(gSaveContext+0x1348) -/* 03E24 80A5F114 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 03E28 80A5F118 A429F9A8 */ sh $t1, %lo(gSaveContext+0x1348)($at) -/* 03E2C 80A5F11C 0C016AA4 */ jal Camera_SetParam -/* 03E30 80A5F120 8E240790 */ lw $a0, 0x0790($s1) ## 00000790 -/* 03E34 80A5F124 8E240790 */ lw $a0, 0x0790($s1) ## 00000790 -/* 03E38 80A5F128 0C0169DF */ jal Camera_ChangeSetting -/* 03E3C 80A5F12C 24050038 */ addiu $a1, $zero, 0x0038 ## $a1 = 00000038 -/* 03E40 80A5F130 8E240790 */ lw $a0, 0x0790($s1) ## 00000790 -/* 03E44 80A5F134 240A0051 */ addiu $t2, $zero, 0x0051 ## $t2 = 00000051 -/* 03E48 80A5F138 AFAA0010 */ sw $t2, 0x0010($sp) -/* 03E4C 80A5F13C AFA00018 */ sw $zero, 0x0018($sp) -/* 03E50 80A5F140 AFA00014 */ sw $zero, 0x0014($sp) -/* 03E54 80A5F144 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 03E58 80A5F148 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03E5C 80A5F14C 0C016BF5 */ jal Camera_SetCameraData - ## setCameraData -/* 03E60 80A5F150 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -.L80A5F154: -/* 03E64 80A5F154 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -.L80A5F158: -/* 03E68 80A5F158 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03E6C 80A5F15C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03E70 80A5F160 316C2000 */ andi $t4, $t3, 0x2000 ## $t4 = 00000000 -/* 03E74 80A5F164 5580000E */ bnel $t4, $zero, .L80A5F1A0 -/* 03E78 80A5F168 8FBF002C */ lw $ra, 0x002C($sp) -/* 03E7C 80A5F16C 0C297DD8 */ jal func_80A5F760 -/* 03E80 80A5F170 A6000250 */ sh $zero, 0x0250($s0) ## 00000250 -/* 03E84 80A5F174 920D028A */ lbu $t5, 0x028A($s0) ## 0000028A -/* 03E88 80A5F178 920F02D6 */ lbu $t7, 0x02D6($s0) ## 000002D6 -/* 03E8C 80A5F17C 92190322 */ lbu $t9, 0x0322($s0) ## 00000322 -/* 03E90 80A5F180 35AE0001 */ ori $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 03E94 80A5F184 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 03E98 80A5F188 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 03E9C 80A5F18C A600001C */ sh $zero, 0x001C($s0) ## 0000001C -/* 03EA0 80A5F190 A20E028A */ sb $t6, 0x028A($s0) ## 0000028A -/* 03EA4 80A5F194 A21802D6 */ sb $t8, 0x02D6($s0) ## 000002D6 -/* 03EA8 80A5F198 A2080322 */ sb $t0, 0x0322($s0) ## 00000322 -/* 03EAC 80A5F19C 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5F1A0: -/* 03EB0 80A5F1A0 8FB00024 */ lw $s0, 0x0024($sp) -/* 03EB4 80A5F1A4 8FB10028 */ lw $s1, 0x0028($sp) -/* 03EB8 80A5F1A8 03E00008 */ jr $ra -/* 03EBC 80A5F1AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s deleted file mode 100644 index 0e52515614..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s +++ /dev/null @@ -1,130 +0,0 @@ -glabel func_80A5F1B0 -/* 03EC0 80A5F1B0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03EC4 80A5F1B4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03EC8 80A5F1B8 AFB00028 */ sw $s0, 0x0028($sp) -/* 03ECC 80A5F1BC AFBF002C */ sw $ra, 0x002C($sp) -/* 03ED0 80A5F1C0 AFA60038 */ sw $a2, 0x0038($sp) -/* 03ED4 80A5F1C4 AFA7003C */ sw $a3, 0x003C($sp) -/* 03ED8 80A5F1C8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 03EDC 80A5F1CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03EE0 80A5F1D0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 03EE4 80A5F1D4 10A00007 */ beq $a1, $zero, .L80A5F1F4 -/* 03EE8 80A5F1D8 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 03EEC 80A5F1DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03EF0 80A5F1E0 10A10004 */ beq $a1, $at, .L80A5F1F4 -/* 03EF4 80A5F1E4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03EF8 80A5F1E8 50A10003 */ beql $a1, $at, .L80A5F1F8 -/* 03EFC 80A5F1EC 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 -/* 03F00 80A5F1F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L80A5F1F4: -/* 03F04 80A5F1F4 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 -.L80A5F1F8: -/* 03F08 80A5F1F8 50AF005D */ beql $a1, $t7, .L80A5F370 -/* 03F0C 80A5F1FC 8FBF002C */ lw $ra, 0x002C($sp) -/* 03F10 80A5F200 14A00007 */ bne $a1, $zero, .L80A5F220 -/* 03F14 80A5F204 AE050210 */ sw $a1, 0x0210($s0) ## 00000210 -/* 03F18 80A5F208 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 -/* 03F1C 80A5F20C 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF -/* 03F20 80A5F210 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 -/* 03F24 80A5F214 0301C824 */ and $t9, $t8, $at -/* 03F28 80A5F218 10000037 */ beq $zero, $zero, .L80A5F2F8 -/* 03F2C 80A5F21C AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -.L80A5F220: -/* 03F30 80A5F220 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -/* 03F34 80A5F224 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03F38 80A5F228 54410018 */ bnel $v0, $at, .L80A5F28C -/* 03F3C 80A5F22C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03F40 80A5F230 8E090228 */ lw $t1, 0x0228($s0) ## 00000228 -/* 03F44 80A5F234 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 03F48 80A5F238 3C078013 */ lui $a3, %hi(D_801333E0) -/* 03F4C 80A5F23C ACA90000 */ sw $t1, 0x0000($a1) ## 0000021C -/* 03F50 80A5F240 8E08022C */ lw $t0, 0x022C($s0) ## 0000022C -/* 03F54 80A5F244 3C0C8013 */ lui $t4, %hi(D_801333E8) -/* 03F58 80A5F248 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 03F5C 80A5F24C ACA80004 */ sw $t0, 0x0004($a1) ## 00000220 -/* 03F60 80A5F250 8E090230 */ lw $t1, 0x0230($s0) ## 00000230 -/* 03F64 80A5F254 258C33E8 */ addiu $t4, %lo(D_801333E8) -/* 03F68 80A5F258 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 -/* 03F6C 80A5F25C ACA90008 */ sw $t1, 0x0008($a1) ## 00000224 -/* 03F70 80A5F260 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 -/* 03F74 80A5F264 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03F78 80A5F268 000A5900 */ sll $t3, $t2, 4 -/* 03F7C 80A5F26C 05610004 */ bgez $t3, .L80A5F280 -/* 03F80 80A5F270 00000000 */ nop -/* 03F84 80A5F274 AFA70010 */ sw $a3, 0x0010($sp) -/* 03F88 80A5F278 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 03F8C 80A5F27C AFAC0014 */ sw $t4, 0x0014($sp) -.L80A5F280: -/* 03F90 80A5F280 1000001D */ beq $zero, $zero, .L80A5F2F8 -/* 03F94 80A5F284 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -/* 03F98 80A5F288 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A5F28C: -/* 03F9C 80A5F28C 5441001B */ bnel $v0, $at, .L80A5F2FC -/* 03FA0 80A5F290 8E080158 */ lw $t0, 0x0158($s0) ## 00000158 -/* 03FA4 80A5F294 8E0E0228 */ lw $t6, 0x0228($s0) ## 00000228 -/* 03FA8 80A5F298 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 03FAC 80A5F29C 3C078013 */ lui $a3, %hi(D_801333E0) -/* 03FB0 80A5F2A0 ACAE0000 */ sw $t6, 0x0000($a1) ## 0000021C -/* 03FB4 80A5F2A4 8E0D022C */ lw $t5, 0x022C($s0) ## 0000022C -/* 03FB8 80A5F2A8 3C188013 */ lui $t8, %hi(D_801333E8) -/* 03FBC 80A5F2AC 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 03FC0 80A5F2B0 ACAD0004 */ sw $t5, 0x0004($a1) ## 00000220 -/* 03FC4 80A5F2B4 8E0E0230 */ lw $t6, 0x0230($s0) ## 00000230 -/* 03FC8 80A5F2B8 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 03FCC 80A5F2BC 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 03FD0 80A5F2C0 ACAE0008 */ sw $t6, 0x0008($a1) ## 00000224 -/* 03FD4 80A5F2C4 8E0301F0 */ lw $v1, 0x01F0($s0) ## 000001F0 -/* 03FD8 80A5F2C8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03FDC 80A5F2CC 00037900 */ sll $t7, $v1, 4 -/* 03FE0 80A5F2D0 05E30006 */ bgezl $t7, .L80A5F2EC -/* 03FE4 80A5F2D4 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 03FE8 80A5F2D8 AFA70010 */ sw $a3, 0x0010($sp) -/* 03FEC 80A5F2DC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 03FF0 80A5F2E0 AFB80014 */ sw $t8, 0x0014($sp) -/* 03FF4 80A5F2E4 8E0301F0 */ lw $v1, 0x01F0($s0) ## 000001F0 -/* 03FF8 80A5F2E8 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -.L80A5F2EC: -/* 03FFC 80A5F2EC 0061C824 */ and $t9, $v1, $at -/* 04000 80A5F2F0 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 04004 80A5F2F4 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -.L80A5F2F8: -/* 04008 80A5F2F8 8E080158 */ lw $t0, 0x0158($s0) ## 00000158 -.L80A5F2FC: -/* 0400C 80A5F2FC 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 -/* 04010 80A5F300 00025880 */ sll $t3, $v0, 2 -/* 04014 80A5F304 00084880 */ sll $t1, $t0, 2 -/* 04018 80A5F308 01495021 */ addu $t2, $t2, $t1 -/* 0401C 80A5F30C 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) -/* 04020 80A5F310 014B6021 */ addu $t4, $t2, $t3 -/* 04024 80A5F314 0C028800 */ jal Animation_GetLastFrame - -/* 04028 80A5F318 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 0402C 80A5F31C 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -/* 04030 80A5F320 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 04034 80A5F324 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 04038 80A5F328 000D7080 */ sll $t6, $t5, 2 -/* 0403C 80A5F32C 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 04040 80A5F330 01EE7821 */ addu $t7, $t7, $t6 -/* 04044 80A5F334 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 04048 80A5F338 46803220 */ cvt.s.w $f8, $f6 -/* 0404C 80A5F33C 0018C880 */ sll $t9, $t8, 2 -/* 04050 80A5F340 01F94021 */ addu $t0, $t7, $t9 -/* 04054 80A5F344 C7AA0038 */ lwc1 $f10, 0x0038($sp) -/* 04058 80A5F348 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 0405C 80A5F34C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 04060 80A5F350 AFA90014 */ sw $t1, 0x0014($sp) -/* 04064 80A5F354 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04068 80A5F358 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 0406C 80A5F35C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04070 80A5F360 8FA7003C */ lw $a3, 0x003C($sp) -/* 04074 80A5F364 0C029468 */ jal Animation_Change - -/* 04078 80A5F368 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 0407C 80A5F36C 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5F370: -/* 04080 80A5F370 8FB00028 */ lw $s0, 0x0028($sp) -/* 04084 80A5F374 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04088 80A5F378 03E00008 */ jr $ra -/* 0408C 80A5F37C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F380.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F380.s deleted file mode 100644 index 5ffc83514a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F380.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80A5F380 -/* 04090 80A5F380 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 04094 80A5F384 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04098 80A5F388 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0409C 80A5F38C 44066000 */ mfc1 $a2, $f12 -/* 040A0 80A5F390 0C297C6C */ jal func_80A5F1B0 -/* 040A4 80A5F394 8C870214 */ lw $a3, 0x0214($a0) ## 00000214 -/* 040A8 80A5F398 8FBF0014 */ lw $ra, 0x0014($sp) -/* 040AC 80A5F39C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 040B0 80A5F3A0 03E00008 */ jr $ra -/* 040B4 80A5F3A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3A8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3A8.s deleted file mode 100644 index cf7b9b56fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3A8.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80A5F3A8 -/* 040B8 80A5F3A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 040BC 80A5F3AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 040C0 80A5F3B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 040C4 80A5F3B4 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 040C8 80A5F3B8 44060000 */ mfc1 $a2, $f0 -/* 040CC 80A5F3BC 44070000 */ mfc1 $a3, $f0 -/* 040D0 80A5F3C0 AC8E0210 */ sw $t6, 0x0210($a0) ## 00000210 -/* 040D4 80A5F3C4 0C297C6C */ jal func_80A5F1B0 -/* 040D8 80A5F3C8 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 040DC 80A5F3CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 040E0 80A5F3D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 040E4 80A5F3D4 03E00008 */ jr $ra -/* 040E8 80A5F3D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3DC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3DC.s deleted file mode 100644 index dc91f9599f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3DC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80A5F3DC -/* 040EC 80A5F3DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 040F0 80A5F3E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 040F4 80A5F3E4 0C297CEA */ jal func_80A5F3A8 -/* 040F8 80A5F3E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 040FC 80A5F3EC 8FA40018 */ lw $a0, 0x0018($sp) -/* 04100 80A5F3F0 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 04104 80A5F3F4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 04108 80A5F3F8 8C8E01F0 */ lw $t6, 0x01F0($a0) ## 000001F0 -/* 0410C 80A5F3FC 01C17824 */ and $t7, $t6, $at -/* 04110 80A5F400 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 000001F0 -/* 04114 80A5F404 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04118 80A5F408 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0411C 80A5F40C 03E00008 */ jr $ra -/* 04120 80A5F410 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s deleted file mode 100644 index d9f2246741..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s +++ /dev/null @@ -1,133 +0,0 @@ -glabel func_80A5F414 -/* 04124 80A5F414 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 04128 80A5F418 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0412C 80A5F41C AFBF002C */ sw $ra, 0x002C($sp) -/* 04130 80A5F420 AFB00028 */ sw $s0, 0x0028($sp) -/* 04134 80A5F424 AFA5003C */ sw $a1, 0x003C($sp) -/* 04138 80A5F428 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 0413C 80A5F42C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04140 80A5F430 0C296F1A */ jal func_80A5BC68 -/* 04144 80A5F434 8FA5003C */ lw $a1, 0x003C($sp) -/* 04148 80A5F438 3C028016 */ lui $v0, %hi(gGameInfo) -/* 0414C 80A5F43C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 04150 80A5F440 844E05BE */ lh $t6, 0x05BE($v0) ## 801605BE -/* 04154 80A5F444 11C00041 */ beq $t6, $zero, .L80A5F54C -/* 04158 80A5F448 00000000 */ nop -/* 0415C 80A5F44C 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 -/* 04160 80A5F450 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04164 80A5F454 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 04168 80A5F458 15E0003C */ bne $t7, $zero, .L80A5F54C -/* 0416C 80A5F45C 00000000 */ nop -/* 04170 80A5F460 A44005BE */ sh $zero, 0x05BE($v0) ## 801605BE -/* 04174 80A5F464 0C296EEF */ jal func_80A5BBBC -/* 04178 80A5F468 8FA4003C */ lw $a0, 0x003C($sp) -/* 0417C 80A5F46C 14400028 */ bne $v0, $zero, .L80A5F510 -/* 04180 80A5F470 3C078013 */ lui $a3, %hi(D_801333E0) -/* 04184 80A5F474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04188 80A5F478 0C296F65 */ jal func_80A5BD94 -/* 0418C 80A5F47C 8FA5003C */ lw $a1, 0x003C($sp) -/* 04190 80A5F480 10400032 */ beq $v0, $zero, .L80A5F54C -/* 04194 80A5F484 3C078013 */ lui $a3, %hi(D_801333E0) -/* 04198 80A5F488 3C188013 */ lui $t8, %hi(D_801333E8) -/* 0419C 80A5F48C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 041A0 80A5F490 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 041A4 80A5F494 AFB80014 */ sw $t8, 0x0014($sp) -/* 041A8 80A5F498 AFA70010 */ sw $a3, 0x0010($sp) -/* 041AC 80A5F49C 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 041B0 80A5F4A0 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 041B4 80A5F4A4 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 041B8 80A5F4A8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 041BC 80A5F4AC A6000250 */ sh $zero, 0x0250($s0) ## 00000250 -/* 041C0 80A5F4B0 8FA5003C */ lw $a1, 0x003C($sp) -/* 041C4 80A5F4B4 0C297DD8 */ jal func_80A5F760 -/* 041C8 80A5F4B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 041CC 80A5F4BC 8FB9003C */ lw $t9, 0x003C($sp) -/* 041D0 80A5F4C0 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 041D4 80A5F4C4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 041D8 80A5F4C8 0C016AA4 */ jal Camera_SetParam -/* 041DC 80A5F4CC 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 -/* 041E0 80A5F4D0 8FA8003C */ lw $t0, 0x003C($sp) -/* 041E4 80A5F4D4 24050038 */ addiu $a1, $zero, 0x0038 ## $a1 = 00000038 -/* 041E8 80A5F4D8 0C0169DF */ jal Camera_ChangeSetting -/* 041EC 80A5F4DC 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 041F0 80A5F4E0 8FA9003C */ lw $t1, 0x003C($sp) -/* 041F4 80A5F4E4 240A0051 */ addiu $t2, $zero, 0x0051 ## $t2 = 00000051 -/* 041F8 80A5F4E8 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 041FC 80A5F4EC 8D240790 */ lw $a0, 0x0790($t1) ## 00000790 -/* 04200 80A5F4F0 AFA00018 */ sw $zero, 0x0018($sp) -/* 04204 80A5F4F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 04208 80A5F4F8 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0420C 80A5F4FC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04210 80A5F500 0C016BF5 */ jal Camera_SetCameraData - ## setCameraData -/* 04214 80A5F504 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04218 80A5F508 10000010 */ beq $zero, $zero, .L80A5F54C -/* 0421C 80A5F50C 00000000 */ nop -.L80A5F510: -/* 04220 80A5F510 3C0B8013 */ lui $t3, %hi(D_801333E8) -/* 04224 80A5F514 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 04228 80A5F518 256B33E8 */ addiu $t3, %lo(D_801333E8) -/* 0422C 80A5F51C AFAB0014 */ sw $t3, 0x0014($sp) -/* 04230 80A5F520 AFA70010 */ sw $a3, 0x0010($sp) -/* 04234 80A5F524 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 04238 80A5F528 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 0423C 80A5F52C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 04240 80A5F530 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 04244 80A5F534 A6000250 */ sh $zero, 0x0250($s0) ## 00000250 -/* 04248 80A5F538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0424C 80A5F53C 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 04250 80A5F540 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 04254 80A5F544 0C297D7E */ jal func_80A5F5F8 -/* 04258 80A5F548 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -.L80A5F54C: -/* 0425C 80A5F54C 0C02927F */ jal SkelAnime_Update - -/* 04260 80A5F550 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 04264 80A5F554 50400024 */ beql $v0, $zero, .L80A5F5E8 -/* 04268 80A5F558 8FBF002C */ lw $ra, 0x002C($sp) -/* 0426C 80A5F55C 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -/* 04270 80A5F560 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 04274 80A5F564 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04278 80A5F568 10400009 */ beq $v0, $zero, .L80A5F590 -/* 0427C 80A5F56C 00000000 */ nop -/* 04280 80A5F570 54410004 */ bnel $v0, $at, .L80A5F584 -/* 04284 80A5F574 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 04288 80A5F578 10000005 */ beq $zero, $zero, .L80A5F590 -/* 0428C 80A5F57C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 04290 80A5F580 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A5F584: -/* 04294 80A5F584 14410002 */ bne $v0, $at, .L80A5F590 -/* 04298 80A5F588 00000000 */ nop -/* 0429C 80A5F58C 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -.L80A5F590: -/* 042A0 80A5F590 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 042A4 80A5F594 AFA30034 */ sw $v1, 0x0034($sp) -/* 042A8 80A5F598 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 042AC 80A5F59C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 042B0 80A5F5A0 8FA30034 */ lw $v1, 0x0034($sp) -/* 042B4 80A5F5A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042B8 80A5F5A8 4600303C */ c.lt.s $f6, $f0 -/* 042BC 80A5F5AC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 042C0 80A5F5B0 3C0580A6 */ lui $a1, %hi(D_80A66678) ## $a1 = 80A60000 -/* 042C4 80A5F5B4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 042C8 80A5F5B8 45000003 */ bc1f .L80A5F5C8 -/* 042CC 80A5F5BC 000370C0 */ sll $t6, $v1, 3 -/* 042D0 80A5F5C0 10000001 */ beq $zero, $zero, .L80A5F5C8 -/* 042D4 80A5F5C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A5F5C8: -/* 042D8 80A5F5C8 00026080 */ sll $t4, $v0, 2 -/* 042DC 80A5F5CC 018E7821 */ addu $t7, $t4, $t6 -/* 042E0 80A5F5D0 00AF2821 */ addu $a1, $a1, $t7 -/* 042E4 80A5F5D4 44060000 */ mfc1 $a2, $f0 -/* 042E8 80A5F5D8 44070000 */ mfc1 $a3, $f0 -/* 042EC 80A5F5DC 0C297C6C */ jal func_80A5F1B0 -/* 042F0 80A5F5E0 8CA56678 */ lw $a1, %lo(D_80A66678)($a1) -/* 042F4 80A5F5E4 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5F5E8: -/* 042F8 80A5F5E8 8FB00028 */ lw $s0, 0x0028($sp) -/* 042FC 80A5F5EC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 04300 80A5F5F0 03E00008 */ jr $ra -/* 04304 80A5F5F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s deleted file mode 100644 index 7745d586b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_80A5F5F8 -/* 04308 80A5F5F8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0430C 80A5F5FC AFBF002C */ sw $ra, 0x002C($sp) -/* 04310 80A5F600 AFB00028 */ sw $s0, 0x0028($sp) -/* 04314 80A5F604 AFA60038 */ sw $a2, 0x0038($sp) -/* 04318 80A5F608 AFA7003C */ sw $a3, 0x003C($sp) -/* 0431C 80A5F60C 8C8F01F0 */ lw $t7, 0x01F0($a0) ## 000001F0 -/* 04320 80A5F610 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 04324 80A5F614 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 04328 80A5F618 01E1C024 */ and $t8, $t7, $at -/* 0432C 80A5F61C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 04330 80A5F620 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04334 80A5F624 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04338 80A5F628 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 0433C 80A5F62C 10A10007 */ beq $a1, $at, .L80A5F64C -/* 04340 80A5F630 AC9801F0 */ sw $t8, 0x01F0($a0) ## 000001F0 -/* 04344 80A5F634 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04348 80A5F638 10A10004 */ beq $a1, $at, .L80A5F64C -/* 0434C 80A5F63C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 04350 80A5F640 50A10003 */ beql $a1, $at, .L80A5F650 -/* 04354 80A5F644 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -/* 04358 80A5F648 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -.L80A5F64C: -/* 0435C 80A5F64C 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -.L80A5F650: -/* 04360 80A5F650 50A20022 */ beql $a1, $v0, .L80A5F6DC -/* 04364 80A5F654 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 04368 80A5F658 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 -/* 0436C 80A5F65C 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 04370 80A5F660 AE050210 */ sw $a1, 0x0210($s0) ## 00000210 -/* 04374 80A5F664 00194080 */ sll $t0, $t9, 2 -/* 04378 80A5F668 01284821 */ addu $t1, $t1, $t0 -/* 0437C 80A5F66C 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 04380 80A5F670 00055080 */ sll $t2, $a1, 2 -/* 04384 80A5F674 012A5821 */ addu $t3, $t1, $t2 -/* 04388 80A5F678 0C028800 */ jal Animation_GetLastFrame - -/* 0438C 80A5F67C 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 04390 80A5F680 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 -/* 04394 80A5F684 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04398 80A5F688 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 -/* 0439C 80A5F68C 000C6880 */ sll $t5, $t4, 2 -/* 043A0 80A5F690 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 -/* 043A4 80A5F694 01CD7021 */ addu $t6, $t6, $t5 -/* 043A8 80A5F698 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 043AC 80A5F69C 468021A0 */ cvt.s.w $f6, $f4 -/* 043B0 80A5F6A0 000FC080 */ sll $t8, $t7, 2 -/* 043B4 80A5F6A4 01D8C821 */ addu $t9, $t6, $t8 -/* 043B8 80A5F6A8 C7A80038 */ lwc1 $f8, 0x0038($sp) -/* 043BC 80A5F6AC 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 043C0 80A5F6B0 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 043C4 80A5F6B4 AFA80014 */ sw $t0, 0x0014($sp) -/* 043C8 80A5F6B8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 043CC 80A5F6BC 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 043D0 80A5F6C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 043D4 80A5F6C4 8FA7003C */ lw $a3, 0x003C($sp) -/* 043D8 80A5F6C8 0C029468 */ jal Animation_Change - -/* 043DC 80A5F6CC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 043E0 80A5F6D0 1000001F */ beq $zero, $zero, .L80A5F750 -/* 043E4 80A5F6D4 8FBF002C */ lw $ra, 0x002C($sp) -/* 043E8 80A5F6D8 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -.L80A5F6DC: -/* 043EC 80A5F6DC 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 043F0 80A5F6E0 00026080 */ sll $t4, $v0, 2 -/* 043F4 80A5F6E4 00095080 */ sll $t2, $t1, 2 -/* 043F8 80A5F6E8 016A5821 */ addu $t3, $t3, $t2 -/* 043FC 80A5F6EC 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 04400 80A5F6F0 016C6821 */ addu $t5, $t3, $t4 -/* 04404 80A5F6F4 0C028800 */ jal Animation_GetLastFrame - -/* 04408 80A5F6F8 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 0440C 80A5F6FC 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 -/* 04410 80A5F700 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 04414 80A5F704 3C1880A6 */ lui $t8, %hi(D_80A65E58) ## $t8 = 80A60000 -/* 04418 80A5F708 000F7080 */ sll $t6, $t7, 2 -/* 0441C 80A5F70C 8E190210 */ lw $t9, 0x0210($s0) ## 00000210 -/* 04420 80A5F710 030EC021 */ addu $t8, $t8, $t6 -/* 04424 80A5F714 8F185E58 */ lw $t8, %lo(D_80A65E58)($t8) -/* 04428 80A5F718 46805420 */ cvt.s.w $f16, $f10 -/* 0442C 80A5F71C 00194080 */ sll $t0, $t9, 2 -/* 04430 80A5F720 03084821 */ addu $t1, $t8, $t0 -/* 04434 80A5F724 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 04438 80A5F728 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 0443C 80A5F72C 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 04440 80A5F730 AFAA0014 */ sw $t2, 0x0014($sp) -/* 04444 80A5F734 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 04448 80A5F738 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 0444C 80A5F73C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04450 80A5F740 8FA7003C */ lw $a3, 0x003C($sp) -/* 04454 80A5F744 0C029468 */ jal Animation_Change - -/* 04458 80A5F748 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0445C 80A5F74C 8FBF002C */ lw $ra, 0x002C($sp) -.L80A5F750: -/* 04460 80A5F750 8FB00028 */ lw $s0, 0x0028($sp) -/* 04464 80A5F754 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04468 80A5F758 03E00008 */ jr $ra -/* 0446C 80A5F75C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F760.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F760.s deleted file mode 100644 index bdccb4bd02..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F760.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_80A5F760 -/* 04470 80A5F760 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04474 80A5F764 AFBF001C */ sw $ra, 0x001C($sp) -/* 04478 80A5F768 AFB00018 */ sw $s0, 0x0018($sp) -/* 0447C 80A5F76C 8CA51C44 */ lw $a1, 0x1C44($a1) ## 00001C44 -/* 04480 80A5F770 24100004 */ addiu $s0, $zero, 0x0004 ## $s0 = 00000004 -/* 04484 80A5F774 0C00B6E3 */ jal Actor_WorldDistXZToActor -/* 04488 80A5F778 AFA40020 */ sw $a0, 0x0020($sp) -/* 0448C 80A5F77C 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 04490 80A5F780 44811000 */ mtc1 $at, $f2 ## $f2 = 400.00 -/* 04494 80A5F784 8FA40020 */ lw $a0, 0x0020($sp) -/* 04498 80A5F788 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 0449C 80A5F78C 4600103C */ c.lt.s $f2, $f0 -/* 044A0 80A5F790 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 044A4 80A5F794 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 044A8 80A5F798 45020006 */ bc1fl .L80A5F7B4 -/* 044AC 80A5F79C 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 044B0 80A5F7A0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 044B4 80A5F7A4 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 044B8 80A5F7A8 1000000C */ beq $zero, $zero, .L80A5F7DC -/* 044BC 80A5F7AC 24100006 */ addiu $s0, $zero, 0x0006 ## $s0 = 00000006 -/* 044C0 80A5F7B0 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -.L80A5F7B4: -/* 044C4 80A5F7B4 00000000 */ nop -/* 044C8 80A5F7B8 460C003E */ c.le.s $f0, $f12 -/* 044CC 80A5F7BC 00000000 */ nop -/* 044D0 80A5F7C0 45030007 */ bc1tl .L80A5F7E0 -/* 044D4 80A5F7C4 8C820210 */ lw $v0, 0x0210($a0) ## 00000210 -/* 044D8 80A5F7C8 4602003E */ c.le.s $f0, $f2 -/* 044DC 80A5F7CC 00000000 */ nop -/* 044E0 80A5F7D0 45020003 */ bc1fl .L80A5F7E0 -/* 044E4 80A5F7D4 8C820210 */ lw $v0, 0x0210($a0) ## 00000210 -/* 044E8 80A5F7D8 24100005 */ addiu $s0, $zero, 0x0005 ## $s0 = 00000005 -.L80A5F7DC: -/* 044EC 80A5F7DC 8C820210 */ lw $v0, 0x0210($a0) ## 00000210 -.L80A5F7E0: -/* 044F0 80A5F7E0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 044F4 80A5F7E4 5441000A */ bnel $v0, $at, .L80A5F810 -/* 044F8 80A5F7E8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 044FC 80A5F7EC 4600103C */ c.lt.s $f2, $f0 -/* 04500 80A5F7F0 00000000 */ nop -/* 04504 80A5F7F4 45000003 */ bc1f .L80A5F804 -/* 04508 80A5F7F8 00000000 */ nop -/* 0450C 80A5F7FC 1000001D */ beq $zero, $zero, .L80A5F874 -/* 04510 80A5F800 24100006 */ addiu $s0, $zero, 0x0006 ## $s0 = 00000006 -.L80A5F804: -/* 04514 80A5F804 1000001B */ beq $zero, $zero, .L80A5F874 -/* 04518 80A5F808 24100005 */ addiu $s0, $zero, 0x0005 ## $s0 = 00000005 -/* 0451C 80A5F80C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80A5F810: -/* 04520 80A5F810 54410010 */ bnel $v0, $at, .L80A5F854 -/* 04524 80A5F814 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 04528 80A5F818 4600103C */ c.lt.s $f2, $f0 -/* 0452C 80A5F81C 00000000 */ nop -/* 04530 80A5F820 45020004 */ bc1fl .L80A5F834 -/* 04534 80A5F824 460C003C */ c.lt.s $f0, $f12 -/* 04538 80A5F828 10000012 */ beq $zero, $zero, .L80A5F874 -/* 0453C 80A5F82C 24100006 */ addiu $s0, $zero, 0x0006 ## $s0 = 00000006 -/* 04540 80A5F830 460C003C */ c.lt.s $f0, $f12 -.L80A5F834: -/* 04544 80A5F834 00000000 */ nop -/* 04548 80A5F838 45000003 */ bc1f .L80A5F848 -/* 0454C 80A5F83C 00000000 */ nop -/* 04550 80A5F840 1000000C */ beq $zero, $zero, .L80A5F874 -/* 04554 80A5F844 24100004 */ addiu $s0, $zero, 0x0004 ## $s0 = 00000004 -.L80A5F848: -/* 04558 80A5F848 1000000A */ beq $zero, $zero, .L80A5F874 -/* 0455C 80A5F84C 24100005 */ addiu $s0, $zero, 0x0005 ## $s0 = 00000005 -/* 04560 80A5F850 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -.L80A5F854: -/* 04564 80A5F854 14410007 */ bne $v0, $at, .L80A5F874 -/* 04568 80A5F858 00000000 */ nop -/* 0456C 80A5F85C 4600603C */ c.lt.s $f12, $f0 -/* 04570 80A5F860 24100004 */ addiu $s0, $zero, 0x0004 ## $s0 = 00000004 -/* 04574 80A5F864 45000003 */ bc1f .L80A5F874 -/* 04578 80A5F868 00000000 */ nop -/* 0457C 80A5F86C 10000001 */ beq $zero, $zero, .L80A5F874 -/* 04580 80A5F870 24100005 */ addiu $s0, $zero, 0x0005 ## $s0 = 00000005 -.L80A5F874: -/* 04584 80A5F874 0C297D7E */ jal func_80A5F5F8 -/* 04588 80A5F878 02002825 */ or $a1, $s0, $zero ## $a1 = 00000005 -/* 0458C 80A5F87C 8FBF001C */ lw $ra, 0x001C($sp) -/* 04590 80A5F880 8FB00018 */ lw $s0, 0x0018($sp) -/* 04594 80A5F884 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04598 80A5F888 03E00008 */ jr $ra -/* 0459C 80A5F88C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s deleted file mode 100644 index a5077ecfaf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s +++ /dev/null @@ -1,299 +0,0 @@ -.late_rodata -glabel D_80A668E0 - .word 0x46FFFE00 -glabel D_80A668E4 - .word 0x46FFFE00 -glabel D_80A668E8 - .word 0xC6FFFE00 -glabel D_80A668EC - .word 0x46FFFE00 -glabel D_80A668F0 - .float 0.3 - -.text -glabel func_80A5F890 -/* 045A0 80A5F890 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 045A4 80A5F894 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 045A8 80A5F898 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 045AC 80A5F89C AFBF0024 */ sw $ra, 0x0024($sp) -/* 045B0 80A5F8A0 AFB00020 */ sw $s0, 0x0020($sp) -/* 045B4 80A5F8A4 AFA50044 */ sw $a1, 0x0044($sp) -/* 045B8 80A5F8A8 A5C005BE */ sh $zero, 0x05BE($t6) ## 801605BE -/* 045BC 80A5F8AC 8FAF0044 */ lw $t7, 0x0044($sp) -/* 045C0 80A5F8B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 045C4 80A5F8B4 0C00B6E3 */ jal Actor_WorldDistXZToActor -/* 045C8 80A5F8B8 8DE51C44 */ lw $a1, 0x1C44($t7) ## 00001C44 -/* 045CC 80A5F8BC E7A0003C */ swc1 $f0, 0x003C($sp) -/* 045D0 80A5F8C0 8E020370 */ lw $v0, 0x0370($s0) ## 00000370 -/* 045D4 80A5F8C4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 045D8 80A5F8C8 10410002 */ beq $v0, $at, .L80A5F8D4 -/* 045DC 80A5F8CC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 045E0 80A5F8D0 1441005A */ bne $v0, $at, .L80A5FA3C -.L80A5F8D4: -/* 045E4 80A5F8D4 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 045E8 80A5F8D8 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 -/* 045EC 80A5F8DC 00000000 */ nop -/* 045F0 80A5F8E0 4600203C */ c.lt.s $f4, $f0 -/* 045F4 80A5F8E4 00000000 */ nop -/* 045F8 80A5F8E8 45020055 */ bc1fl .L80A5FA40 -/* 045FC 80A5F8EC 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 -/* 04600 80A5F8F0 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 04604 80A5F8F4 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 04608 80A5F8F8 30588000 */ andi $t8, $v0, 0x8000 ## $t8 = 00000000 -/* 0460C 80A5F8FC 1700004F */ bne $t8, $zero, .L80A5FA3C -/* 04610 80A5F900 34488000 */ ori $t0, $v0, 0x8000 ## $t0 = 00008000 -/* 04614 80A5F904 AE190210 */ sw $t9, 0x0210($s0) ## 00000210 -/* 04618 80A5F908 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -/* 0461C 80A5F90C 8FA90044 */ lw $t1, 0x0044($sp) -/* 04620 80A5F910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04624 80A5F914 0C00B69E */ jal Actor_WorldYawTowardActor -/* 04628 80A5F918 8D251C44 */ lw $a1, 0x1C44($t1) ## 00001C44 -/* 0462C 80A5F91C A6020376 */ sh $v0, 0x0376($s0) ## 00000376 -/* 04630 80A5F920 860A0376 */ lh $t2, 0x0376($s0) ## 00000376 -/* 04634 80A5F924 860B0032 */ lh $t3, 0x0032($s0) ## 00000032 -/* 04638 80A5F928 3C0180A6 */ lui $at, %hi(D_80A668E0) ## $at = 80A60000 -/* 0463C 80A5F92C 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 04640 80A5F930 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 -/* 04644 80A5F934 C43268E0 */ lwc1 $f18, %lo(D_80A668E0)($at) -/* 04648 80A5F938 46803220 */ cvt.s.w $f8, $f6 -/* 0464C 80A5F93C 3C0180A6 */ lui $at, %hi(D_80A668E8) ## $at = 80A60000 -/* 04650 80A5F940 46805420 */ cvt.s.w $f16, $f10 -/* 04654 80A5F944 46104001 */ sub.s $f0, $f8, $f16 -/* 04658 80A5F948 4600903C */ c.lt.s $f18, $f0 -/* 0465C 80A5F94C 00000000 */ nop -/* 04660 80A5F950 45000005 */ bc1f .L80A5F968 -/* 04664 80A5F954 00000000 */ nop -/* 04668 80A5F958 3C0180A6 */ lui $at, %hi(D_80A668E4) ## $at = 80A60000 -/* 0466C 80A5F95C C42468E4 */ lwc1 $f4, %lo(D_80A668E4)($at) -/* 04670 80A5F960 10000009 */ beq $zero, $zero, .L80A5F988 -/* 04674 80A5F964 46040001 */ sub.s $f0, $f0, $f4 -.L80A5F968: -/* 04678 80A5F968 C42668E8 */ lwc1 $f6, %lo(D_80A668E8)($at) -/* 0467C 80A5F96C 3C0180A6 */ lui $at, %hi(D_80A668EC) ## $at = 80A60000 -/* 04680 80A5F970 4606003C */ c.lt.s $f0, $f6 -/* 04684 80A5F974 00000000 */ nop -/* 04688 80A5F978 45020004 */ bc1fl .L80A5F98C -/* 0468C 80A5F97C 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 -/* 04690 80A5F980 C42A68EC */ lwc1 $f10, %lo(D_80A668EC)($at) -/* 04694 80A5F984 460A0000 */ add.s $f0, $f0, $f10 -.L80A5F988: -/* 04698 80A5F988 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 -.L80A5F98C: -/* 0469C 80A5F98C 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 -/* 046A0 80A5F990 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 -/* 046A4 80A5F994 000C6880 */ sll $t5, $t4, 2 -/* 046A8 80A5F998 01CD7021 */ addu $t6, $t6, $t5 -/* 046AC 80A5F99C 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 046B0 80A5F9A0 000FC080 */ sll $t8, $t7, 2 -/* 046B4 80A5F9A4 01D8C821 */ addu $t9, $t6, $t8 -/* 046B8 80A5F9A8 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 046BC 80A5F9AC 0C028800 */ jal Animation_GetLastFrame - -/* 046C0 80A5F9B0 E7A00038 */ swc1 $f0, 0x0038($sp) -/* 046C4 80A5F9B4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 046C8 80A5F9B8 C7A00038 */ lwc1 $f0, 0x0038($sp) -/* 046CC 80A5F9BC 8E0A0158 */ lw $t2, 0x0158($s0) ## 00000158 -/* 046D0 80A5F9C0 46804420 */ cvt.s.w $f16, $f8 -/* 046D4 80A5F9C4 3C0C80A6 */ lui $t4, %hi(D_80A65E58) ## $t4 = 80A60000 -/* 046D8 80A5F9C8 000A5880 */ sll $t3, $t2, 2 -/* 046DC 80A5F9CC 8E0D0210 */ lw $t5, 0x0210($s0) ## 00000210 -/* 046E0 80A5F9D0 018B6021 */ addu $t4, $t4, $t3 -/* 046E4 80A5F9D4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 046E8 80A5F9D8 46100483 */ div.s $f18, $f0, $f16 -/* 046EC 80A5F9DC 000D7880 */ sll $t7, $t5, 2 -/* 046F0 80A5F9E0 4600910D */ trunc.w.s $f4, $f18 -/* 046F4 80A5F9E4 44092000 */ mfc1 $t1, $f4 -/* 046F8 80A5F9E8 00000000 */ nop -/* 046FC 80A5F9EC A6090378 */ sh $t1, 0x0378($s0) ## 00000378 -/* 04700 80A5F9F0 8D8C5E58 */ lw $t4, %lo(D_80A65E58)($t4) -/* 04704 80A5F9F4 018F7021 */ addu $t6, $t4, $t7 -/* 04708 80A5F9F8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 0470C 80A5F9FC 0C02947A */ jal Animation_PlayOnce -/* 04710 80A5FA00 AFA40030 */ sw $a0, 0x0030($sp) -/* 04714 80A5FA04 8E090228 */ lw $t1, 0x0228($s0) ## 00000228 -/* 04718 80A5FA08 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 -/* 0471C 80A5FA0C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04720 80A5FA10 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 04724 80A5FA14 AE09021C */ sw $t1, 0x021C($s0) ## 0000021C -/* 04728 80A5FA18 8E090230 */ lw $t1, 0x0230($s0) ## 00000230 -/* 0472C 80A5FA1C 8E08022C */ lw $t0, 0x022C($s0) ## 0000022C -/* 04730 80A5FA20 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 04734 80A5FA24 0301C824 */ and $t9, $t8, $at -/* 04738 80A5FA28 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 0473C 80A5FA2C E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 -/* 04740 80A5FA30 AE090224 */ sw $t1, 0x0224($s0) ## 00000224 -/* 04744 80A5FA34 10000027 */ beq $zero, $zero, .L80A5FAD4 -/* 04748 80A5FA38 AE080220 */ sw $t0, 0x0220($s0) ## 00000220 -.L80A5FA3C: -/* 0474C 80A5FA3C 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 -.L80A5FA40: -/* 04750 80A5FA40 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 04754 80A5FA44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04758 80A5FA48 314B8000 */ andi $t3, $t2, 0x8000 ## $t3 = 00000000 -/* 0475C 80A5FA4C 1160001D */ beq $t3, $zero, .L80A5FAC4 -/* 04760 80A5FA50 00000000 */ nop -/* 04764 80A5FA54 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 -/* 04768 80A5FA58 860C0378 */ lh $t4, 0x0378($s0) ## 00000378 -/* 0476C 80A5FA5C 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 -/* 04770 80A5FA60 C6080214 */ lwc1 $f8, 0x0214($s0) ## 00000214 -/* 04774 80A5FA64 01AC7821 */ addu $t7, $t5, $t4 -/* 04778 80A5FA68 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 0477C 80A5FA6C 4608503C */ c.lt.s $f10, $f8 -/* 04780 80A5FA70 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 04784 80A5FA74 45000010 */ bc1f .L80A5FAB8 -/* 04788 80A5FA78 A60E00B6 */ sh $t6, 0x00B6($s0) ## 000000B6 -/* 0478C 80A5FA7C 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 04790 80A5FA80 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B -/* 04794 80A5FA84 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 04798 80A5FA88 30580800 */ andi $t8, $v0, 0x0800 ## $t8 = 00000000 -/* 0479C 80A5FA8C 1700000A */ bne $t8, $zero, .L80A5FAB8 -/* 047A0 80A5FA90 34590800 */ ori $t9, $v0, 0x0800 ## $t9 = 00000800 -/* 047A4 80A5FA94 3C088013 */ lui $t0, %hi(D_801333E0) -/* 047A8 80A5FA98 3C098013 */ lui $t1, %hi(D_801333E8) -/* 047AC 80A5FA9C AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 047B0 80A5FAA0 252933E8 */ addiu $t1, %lo(D_801333E8) -/* 047B4 80A5FAA4 250733E0 */ addiu $a3, $t0, %lo(D_801333E0) -/* 047B8 80A5FAA8 AFA70010 */ sw $a3, 0x0010($sp) -/* 047BC 80A5FAAC AFA90014 */ sw $t1, 0x0014($sp) -/* 047C0 80A5FAB0 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 047C4 80A5FAB4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80A5FAB8: -/* 047C8 80A5FAB8 260A01AC */ addiu $t2, $s0, 0x01AC ## $t2 = 000001AC -/* 047CC 80A5FABC 10000005 */ beq $zero, $zero, .L80A5FAD4 -/* 047D0 80A5FAC0 AFAA0030 */ sw $t2, 0x0030($sp) -.L80A5FAC4: -/* 047D4 80A5FAC4 0C297222 */ jal func_80A5C888 -/* 047D8 80A5FAC8 8FA50044 */ lw $a1, 0x0044($sp) -/* 047DC 80A5FACC 260B01AC */ addiu $t3, $s0, 0x01AC ## $t3 = 000001AC -/* 047E0 80A5FAD0 AFAB0030 */ sw $t3, 0x0030($sp) -.L80A5FAD4: -/* 047E4 80A5FAD4 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -/* 047E8 80A5FAD8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 047EC 80A5FADC 14410008 */ bne $v0, $at, .L80A5FB00 -/* 047F0 80A5FAE0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 047F4 80A5FAE4 44810000 */ mtc1 $at, $f0 ## $f0 = 8.00 -/* 047F8 80A5FAE8 3C0180A6 */ lui $at, %hi(D_80A668F0) ## $at = 80A60000 -/* 047FC 80A5FAEC E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 04800 80A5FAF0 C43068F0 */ lwc1 $f16, %lo(D_80A668F0)($at) -/* 04804 80A5FAF4 46100482 */ mul.s $f18, $f0, $f16 -/* 04808 80A5FAF8 1000001D */ beq $zero, $zero, .L80A5FB70 -/* 0480C 80A5FAFC E61201C8 */ swc1 $f18, 0x01C8($s0) ## 000001C8 -.L80A5FB00: -/* 04810 80A5FB00 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04814 80A5FB04 14410008 */ bne $v0, $at, .L80A5FB28 -/* 04818 80A5FB08 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 0481C 80A5FB0C 44810000 */ mtc1 $at, $f0 ## $f0 = 6.00 -/* 04820 80A5FB10 3C013EC0 */ lui $at, 0x3EC0 ## $at = 3EC00000 -/* 04824 80A5FB14 44812000 */ mtc1 $at, $f4 ## $f4 = 0.38 -/* 04828 80A5FB18 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 0482C 80A5FB1C 46040182 */ mul.s $f6, $f0, $f4 -/* 04830 80A5FB20 10000013 */ beq $zero, $zero, .L80A5FB70 -/* 04834 80A5FB24 E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 -.L80A5FB28: -/* 04838 80A5FB28 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0483C 80A5FB2C 1441000B */ bne $v0, $at, .L80A5FB5C -/* 04840 80A5FB30 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 04844 80A5FB34 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 04848 80A5FB38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0484C 80A5FB3C 0C296E72 */ jal func_80A5B9C8 -/* 04850 80A5FB40 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 04854 80A5FB44 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 -/* 04858 80A5FB48 44818000 */ mtc1 $at, $f16 ## $f16 = 0.75 -/* 0485C 80A5FB4C C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 04860 80A5FB50 46104482 */ mul.s $f18, $f8, $f16 -/* 04864 80A5FB54 10000006 */ beq $zero, $zero, .L80A5FB70 -/* 04868 80A5FB58 E61201C8 */ swc1 $f18, 0x01C8($s0) ## 000001C8 -.L80A5FB5C: -/* 0486C 80A5FB5C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04870 80A5FB60 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04874 80A5FB64 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 04878 80A5FB68 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 0487C 80A5FB6C E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 -.L80A5FB70: -/* 04880 80A5FB70 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 -/* 04884 80A5FB74 31AC8000 */ andi $t4, $t5, 0x8000 ## $t4 = 00000000 -/* 04888 80A5FB78 15800023 */ bne $t4, $zero, .L80A5FC08 -/* 0488C 80A5FB7C 00000000 */ nop -/* 04890 80A5FB80 860F0250 */ lh $t7, 0x0250($s0) ## 00000250 -/* 04894 80A5FB84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04898 80A5FB88 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 0489C 80A5FB8C 25EE0001 */ addiu $t6, $t7, 0x0001 ## $t6 = 00000001 -/* 048A0 80A5FB90 A60E0250 */ sh $t6, 0x0250($s0) ## 00000250 -/* 048A4 80A5FB94 86180250 */ lh $t8, 0x0250($s0) ## 00000250 -/* 048A8 80A5FB98 26190228 */ addiu $t9, $s0, 0x0228 ## $t9 = 00000228 -/* 048AC 80A5FB9C 2B01012D */ slti $at, $t8, 0x012D -/* 048B0 80A5FBA0 14200019 */ bne $at, $zero, .L80A5FC08 -/* 048B4 80A5FBA4 00000000 */ nop -/* 048B8 80A5FBA8 AFB9002C */ sw $t9, 0x002C($sp) -/* 048BC 80A5FBAC 0C297CF7 */ jal func_80A5F3DC -/* 048C0 80A5FBB0 AFA50034 */ sw $a1, 0x0034($sp) -/* 048C4 80A5FBB4 8FA8002C */ lw $t0, 0x002C($sp) -/* 048C8 80A5FBB8 8FA50034 */ lw $a1, 0x0034($sp) -/* 048CC 80A5FBBC 3C078013 */ lui $a3, %hi(D_801333E0) -/* 048D0 80A5FBC0 8D0A0000 */ lw $t2, 0x0000($t0) ## 00000000 -/* 048D4 80A5FBC4 3C0C8013 */ lui $t4, %hi(D_801333E8) -/* 048D8 80A5FBC8 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 048DC 80A5FBCC ACAA0000 */ sw $t2, 0x0000($a1) ## 00000000 -/* 048E0 80A5FBD0 8D090004 */ lw $t1, 0x0004($t0) ## 00000004 -/* 048E4 80A5FBD4 258C33E8 */ addiu $t4, %lo(D_801333E8) -/* 048E8 80A5FBD8 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 048EC 80A5FBDC ACA90004 */ sw $t1, 0x0004($a1) ## 00000004 -/* 048F0 80A5FBE0 8D0A0008 */ lw $t2, 0x0008($t0) ## 00000008 -/* 048F4 80A5FBE4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 048F8 80A5FBE8 ACAA0008 */ sw $t2, 0x0008($a1) ## 00000008 -/* 048FC 80A5FBEC 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 04900 80A5FBF0 000B6900 */ sll $t5, $t3, 4 -/* 04904 80A5FBF4 05A10004 */ bgez $t5, .L80A5FC08 -/* 04908 80A5FBF8 00000000 */ nop -/* 0490C 80A5FBFC AFA70010 */ sw $a3, 0x0010($sp) -/* 04910 80A5FC00 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 04914 80A5FC04 AFAC0014 */ sw $t4, 0x0014($sp) -.L80A5FC08: -/* 04918 80A5FC08 0C02927F */ jal SkelAnime_Update - -/* 0491C 80A5FC0C 8FA40030 */ lw $a0, 0x0030($sp) -/* 04920 80A5FC10 50400022 */ beql $v0, $zero, .L80A5FC9C -/* 04924 80A5FC14 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04928 80A5FC18 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -/* 0492C 80A5FC1C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04930 80A5FC20 54410006 */ bnel $v0, $at, .L80A5FC3C -/* 04934 80A5FC24 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04938 80A5FC28 0C296EB3 */ jal func_80A5BACC -/* 0493C 80A5FC2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04940 80A5FC30 10000007 */ beq $zero, $zero, .L80A5FC50 -/* 04944 80A5FC34 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 -/* 04948 80A5FC38 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80A5FC3C: -/* 0494C 80A5FC3C 54410004 */ bnel $v0, $at, .L80A5FC50 -/* 04950 80A5FC40 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 -/* 04954 80A5FC44 0C296EA1 */ jal func_80A5BA84 -/* 04958 80A5FC48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0495C 80A5FC4C 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 -.L80A5FC50: -/* 04960 80A5FC50 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 04964 80A5FC54 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 04968 80A5FC58 01E17024 */ and $t6, $t7, $at -/* 0496C 80A5FC5C AE0E01F0 */ sw $t6, 0x01F0($s0) ## 000001F0 -/* 04970 80A5FC60 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 04974 80A5FC64 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 04978 80A5FC68 C7AA003C */ lwc1 $f10, 0x003C($sp) -/* 0497C 80A5FC6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04980 80A5FC70 4608503C */ c.lt.s $f10, $f8 -/* 04984 80A5FC74 00000000 */ nop -/* 04988 80A5FC78 45000005 */ bc1f .L80A5FC90 -/* 0498C 80A5FC7C 00000000 */ nop -/* 04990 80A5FC80 0C297CF7 */ jal func_80A5F3DC -/* 04994 80A5FC84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04998 80A5FC88 10000004 */ beq $zero, $zero, .L80A5FC9C -/* 0499C 80A5FC8C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5FC90: -/* 049A0 80A5FC90 0C297DD8 */ jal func_80A5F760 -/* 049A4 80A5FC94 8FA50044 */ lw $a1, 0x0044($sp) -/* 049A8 80A5FC98 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5FC9C: -/* 049AC 80A5FC9C 8FB00020 */ lw $s0, 0x0020($sp) -/* 049B0 80A5FCA0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 049B4 80A5FCA4 03E00008 */ jr $ra -/* 049B8 80A5FCA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s deleted file mode 100644 index 4ec2e547b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80A5FCAC -/* 049BC 80A5FCAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 049C0 80A5FCB0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 049C4 80A5FCB4 AFBF001C */ sw $ra, 0x001C($sp) -/* 049C8 80A5FCB8 AC800204 */ sw $zero, 0x0204($a0) ## 00000204 -/* 049CC 80A5FCBC AC800218 */ sw $zero, 0x0218($a0) ## 00000218 -/* 049D0 80A5FCC0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 049D4 80A5FCC4 0C297F75 */ jal func_80A5FDD4 -/* 049D8 80A5FCC8 AFA40020 */ sw $a0, 0x0020($sp) -/* 049DC 80A5FCCC 8FA40020 */ lw $a0, 0x0020($sp) -/* 049E0 80A5FCD0 3C078013 */ lui $a3, %hi(D_801333E0) -/* 049E4 80A5FCD4 3C088013 */ lui $t0, %hi(D_801333E8) -/* 049E8 80A5FCD8 8C8F0228 */ lw $t7, 0x0228($a0) ## 00000228 -/* 049EC 80A5FCDC 2485021C */ addiu $a1, $a0, 0x021C ## $a1 = 0000021C -/* 049F0 80A5FCE0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 049F4 80A5FCE4 ACAF0000 */ sw $t7, 0x0000($a1) ## 0000021C -/* 049F8 80A5FCE8 8C8E022C */ lw $t6, 0x022C($a0) ## 0000022C -/* 049FC 80A5FCEC 250833E8 */ addiu $t0, %lo(D_801333E8) -/* 04A00 80A5FCF0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 04A04 80A5FCF4 ACAE0004 */ sw $t6, 0x0004($a1) ## 00000220 -/* 04A08 80A5FCF8 8C8F0230 */ lw $t7, 0x0230($a0) ## 00000230 -/* 04A0C 80A5FCFC ACAF0008 */ sw $t7, 0x0008($a1) ## 00000224 -/* 04A10 80A5FD00 8C9801F0 */ lw $t8, 0x01F0($a0) ## 000001F0 -/* 04A14 80A5FD04 24041844 */ addiu $a0, $zero, 0x1844 ## $a0 = 00001844 -/* 04A18 80A5FD08 0018C900 */ sll $t9, $t8, 4 -/* 04A1C 80A5FD0C 07230005 */ bgezl $t9, .L80A5FD24 -/* 04A20 80A5FD10 8FBF001C */ lw $ra, 0x001C($sp) -/* 04A24 80A5FD14 AFA70010 */ sw $a3, 0x0010($sp) -/* 04A28 80A5FD18 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 04A2C 80A5FD1C AFA80014 */ sw $t0, 0x0014($sp) -/* 04A30 80A5FD20 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5FD24: -/* 04A34 80A5FD24 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04A38 80A5FD28 03E00008 */ jr $ra -/* 04A3C 80A5FD2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FD30.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FD30.s deleted file mode 100644 index 55dec45008..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FD30.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80A5FD30 -/* 04A40 80A5FD30 3C0F80A6 */ lui $t7, %hi(D_80A66690) ## $t7 = 80A60000 -/* 04A44 80A5FD34 25EF6690 */ addiu $t7, $t7, %lo(D_80A66690) ## $t7 = 80A66690 -/* 04A48 80A5FD38 00047040 */ sll $t6, $a0, 1 -/* 04A4C 80A5FD3C 01CF1021 */ addu $v0, $t6, $t7 -/* 04A50 80A5FD40 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 -/* 04A54 80A5FD44 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -/* 04A58 80A5FD48 8FA50010 */ lw $a1, 0x0010($sp) -/* 04A5C 80A5FD4C 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 04A60 80A5FD50 A4F80000 */ sh $t8, 0x0000($a3) ## 00000000 -/* 04A64 80A5FD54 1083000B */ beq $a0, $v1, .L80A5FD84 -/* 04A68 80A5FD58 E4AC0000 */ swc1 $f12, 0x0000($a1) ## 00000000 -/* 04A6C 80A5FD5C 3C1980A6 */ lui $t9, %hi(D_80A6669E) ## $t9 = 80A60000 -/* 04A70 80A5FD60 2739669E */ addiu $t9, $t9, %lo(D_80A6669E) ## $t9 = 80A6669E -/* 04A74 80A5FD64 10590007 */ beq $v0, $t9, .L80A5FD84 -/* 04A78 80A5FD68 3C0880A6 */ lui $t0, %hi(D_80A666A0) ## $t0 = 80A60000 -/* 04A7C 80A5FD6C 250866A0 */ addiu $t0, $t0, %lo(D_80A666A0) ## $t0 = 80A666A0 -/* 04A80 80A5FD70 10480004 */ beq $v0, $t0, .L80A5FD84 -/* 04A84 80A5FD74 3C0980A6 */ lui $t1, %hi(D_80A66698) ## $t1 = 80A60000 -/* 04A88 80A5FD78 25296698 */ addiu $t1, $t1, %lo(D_80A66698) ## $t1 = 80A66698 -/* 04A8C 80A5FD7C 54490005 */ bnel $v0, $t1, .L80A5FD94 -/* 04A90 80A5FD80 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80A5FD84: -/* 04A94 80A5FD84 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04A98 80A5FD88 00000000 */ nop -/* 04A9C 80A5FD8C E4A40000 */ swc1 $f4, 0x0000($a1) ## 00000000 -/* 04AA0 80A5FD90 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80A5FD94: -/* 04AA4 80A5FD94 14C1000D */ bne $a2, $at, .L80A5FDCC -/* 04AA8 80A5FD98 3C0A80A6 */ lui $t2, %hi(D_80A6669A) ## $t2 = 80A60000 -/* 04AAC 80A5FD9C 254A669A */ addiu $t2, $t2, %lo(D_80A6669A) ## $t2 = 80A6669A -/* 04AB0 80A5FDA0 144A0005 */ bne $v0, $t2, .L80A5FDB8 -/* 04AB4 80A5FDA4 3C0C80A6 */ lui $t4, %hi(D_80A6669C) ## $t4 = 80A60000 -/* 04AB8 80A5FDA8 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 -/* 04ABC 80A5FDAC A4EB0000 */ sh $t3, 0x0000($a3) ## 00000000 -/* 04AC0 80A5FDB0 03E00008 */ jr $ra -/* 04AC4 80A5FDB4 E4AC0000 */ swc1 $f12, 0x0000($a1) ## 00000000 -.L80A5FDB8: -/* 04AC8 80A5FDB8 258C669C */ addiu $t4, $t4, %lo(D_80A6669C) ## $t4 = 80A6669C -/* 04ACC 80A5FDBC 144C0003 */ bne $v0, $t4, .L80A5FDCC -/* 04AD0 80A5FDC0 00000000 */ nop -/* 04AD4 80A5FDC4 A4E30000 */ sh $v1, 0x0000($a3) ## 00000000 -/* 04AD8 80A5FDC8 E4AC0000 */ swc1 $f12, 0x0000($a1) ## 00000000 -.L80A5FDCC: -/* 04ADC 80A5FDCC 03E00008 */ jr $ra -/* 04AE0 80A5FDD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s deleted file mode 100644 index 2e74f013a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s +++ /dev/null @@ -1,222 +0,0 @@ -.late_rodata -glabel D_80A668F4 - .float 0.2 - -.text -glabel func_80A5FDD4 -/* 04AE4 80A5FDD4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 04AE8 80A5FDD8 AFBF002C */ sw $ra, 0x002C($sp) -/* 04AEC 80A5FDDC AFB00028 */ sw $s0, 0x0028($sp) -/* 04AF0 80A5FDE0 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 04AF4 80A5FDE4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04AF8 80A5FDE8 8C8E01F0 */ lw $t6, 0x01F0($a0) ## 000001F0 -/* 04AFC 80A5FDEC 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF -/* 04B00 80A5FDF0 46002032 */ c.eq.s $f4, $f0 -/* 04B04 80A5FDF4 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 04B08 80A5FDF8 01C17824 */ and $t7, $t6, $at -/* 04B0C 80A5FDFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04B10 80A5FE00 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 04B14 80A5FE04 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C -/* 04B18 80A5FE08 45000009 */ bc1f .L80A5FE30 -/* 04B1C 80A5FE0C AC8F01F0 */ sw $t7, 0x01F0($a0) ## 000001F0 -/* 04B20 80A5FE10 8C980210 */ lw $t8, 0x0210($a0) ## 00000210 -/* 04B24 80A5FE14 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 04B28 80A5FE18 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 04B2C 80A5FE1C 13000002 */ beq $t8, $zero, .L80A5FE28 -/* 04B30 80A5FE20 00000000 */ nop -/* 04B34 80A5FE24 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80A5FE28: -/* 04B38 80A5FE28 10000023 */ beq $zero, $zero, .L80A5FEB8 -/* 04B3C 80A5FE2C AE000210 */ sw $zero, 0x0210($s0) ## 00000210 -.L80A5FE30: -/* 04B40 80A5FE30 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 04B44 80A5FE34 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 04B48 80A5FE38 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 04B4C 80A5FE3C 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 04B50 80A5FE40 4606003E */ c.le.s $f0, $f6 -/* 04B54 80A5FE44 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 04B58 80A5FE48 45020008 */ bc1fl .L80A5FE6C -/* 04B5C 80A5FE4C 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 04B60 80A5FE50 8E190210 */ lw $t9, 0x0210($s0) ## 00000210 -/* 04B64 80A5FE54 10B90002 */ beq $a1, $t9, .L80A5FE60 -/* 04B68 80A5FE58 00000000 */ nop -/* 04B6C 80A5FE5C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80A5FE60: -/* 04B70 80A5FE60 10000015 */ beq $zero, $zero, .L80A5FEB8 -/* 04B74 80A5FE64 AE050210 */ sw $a1, 0x0210($s0) ## 00000210 -/* 04B78 80A5FE68 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -.L80A5FE6C: -/* 04B7C 80A5FE6C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 04B80 80A5FE70 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 04B84 80A5FE74 4608003E */ c.le.s $f0, $f8 -/* 04B88 80A5FE78 00000000 */ nop -/* 04B8C 80A5FE7C 45020009 */ bc1fl .L80A5FEA4 -/* 04B90 80A5FE80 8E090210 */ lw $t1, 0x0210($s0) ## 00000210 -/* 04B94 80A5FE84 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 -/* 04B98 80A5FE88 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 04B9C 80A5FE8C 10880002 */ beq $a0, $t0, .L80A5FE98 -/* 04BA0 80A5FE90 00000000 */ nop -/* 04BA4 80A5FE94 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80A5FE98: -/* 04BA8 80A5FE98 10000007 */ beq $zero, $zero, .L80A5FEB8 -/* 04BAC 80A5FE9C AE040210 */ sw $a0, 0x0210($s0) ## 00000210 -/* 04BB0 80A5FEA0 8E090210 */ lw $t1, 0x0210($s0) ## 00000210 -.L80A5FEA4: -/* 04BB4 80A5FEA4 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 04BB8 80A5FEA8 50C90003 */ beql $a2, $t1, .L80A5FEB8 -/* 04BBC 80A5FEAC AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -/* 04BC0 80A5FEB0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 04BC4 80A5FEB4 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -.L80A5FEB8: -/* 04BC8 80A5FEB8 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -/* 04BCC 80A5FEBC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 04BD0 80A5FEC0 14A20007 */ bne $a1, $v0, .L80A5FEE0 -/* 04BD4 80A5FEC4 00000000 */ nop -/* 04BD8 80A5FEC8 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 04BDC 80A5FECC 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 04BE0 80A5FED0 00000000 */ nop -/* 04BE4 80A5FED4 46105482 */ mul.s $f18, $f10, $f16 -/* 04BE8 80A5FED8 1000002D */ beq $zero, $zero, .L80A5FF90 -/* 04BEC 80A5FEDC E7B20030 */ swc1 $f18, 0x0030($sp) -.L80A5FEE0: -/* 04BF0 80A5FEE0 14820013 */ bne $a0, $v0, .L80A5FF30 -/* 04BF4 80A5FEE4 3C078013 */ lui $a3, %hi(D_801333E0) -/* 04BF8 80A5FEE8 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 04BFC 80A5FEEC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 -/* 04C00 80A5FEF0 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 04C04 80A5FEF4 3C0A8013 */ lui $t2, %hi(D_801333E8) -/* 04C08 80A5FEF8 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 04C0C 80A5FEFC 46062202 */ mul.s $f8, $f4, $f6 -/* 04C10 80A5FF00 254A33E8 */ addiu $t2, %lo(D_801333E8) -/* 04C14 80A5FF04 AFAA0014 */ sw $t2, 0x0014($sp) -/* 04C18 80A5FF08 AFA70010 */ sw $a3, 0x0010($sp) -/* 04C1C 80A5FF0C AFA30034 */ sw $v1, 0x0034($sp) -/* 04C20 80A5FF10 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 -/* 04C24 80A5FF14 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 04C28 80A5FF18 E7A80030 */ swc1 $f8, 0x0030($sp) -/* 04C2C 80A5FF1C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 04C30 80A5FF20 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 04C34 80A5FF24 8FA30034 */ lw $v1, 0x0034($sp) -/* 04C38 80A5FF28 10000019 */ beq $zero, $zero, .L80A5FF90 -/* 04C3C 80A5FF2C 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -.L80A5FF30: -/* 04C40 80A5FF30 14C20014 */ bne $a2, $v0, .L80A5FF84 -/* 04C44 80A5FF34 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04C48 80A5FF38 3C0180A6 */ lui $at, %hi(D_80A668F4) ## $at = 80A60000 -/* 04C4C 80A5FF3C C43068F4 */ lwc1 $f16, %lo(D_80A668F4)($at) -/* 04C50 80A5FF40 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 04C54 80A5FF44 3C078013 */ lui $a3, %hi(D_801333E0) -/* 04C58 80A5FF48 3C0B8013 */ lui $t3, %hi(D_801333E8) -/* 04C5C 80A5FF4C 46105482 */ mul.s $f18, $f10, $f16 -/* 04C60 80A5FF50 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 04C64 80A5FF54 256B33E8 */ addiu $t3, %lo(D_801333E8) -/* 04C68 80A5FF58 AFAB0014 */ sw $t3, 0x0014($sp) -/* 04C6C 80A5FF5C AFA70010 */ sw $a3, 0x0010($sp) -/* 04C70 80A5FF60 AFA30034 */ sw $v1, 0x0034($sp) -/* 04C74 80A5FF64 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 -/* 04C78 80A5FF68 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 04C7C 80A5FF6C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 04C80 80A5FF70 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 04C84 80A5FF74 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 04C88 80A5FF78 8FA30034 */ lw $v1, 0x0034($sp) -/* 04C8C 80A5FF7C 10000004 */ beq $zero, $zero, .L80A5FF90 -/* 04C90 80A5FF80 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -.L80A5FF84: -/* 04C94 80A5FF84 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -/* 04C98 80A5FF88 00000000 */ nop -/* 04C9C 80A5FF8C E7A40030 */ swc1 $f4, 0x0030($sp) -.L80A5FF90: -/* 04CA0 80A5FF90 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04CA4 80A5FF94 5461002B */ bnel $v1, $at, .L80A60044 -/* 04CA8 80A5FF98 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 -/* 04CAC 80A5FF9C 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 -/* 04CB0 80A5FFA0 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 -/* 04CB4 80A5FFA4 00027880 */ sll $t7, $v0, 2 -/* 04CB8 80A5FFA8 000C6880 */ sll $t5, $t4, 2 -/* 04CBC 80A5FFAC 01CD7021 */ addu $t6, $t6, $t5 -/* 04CC0 80A5FFB0 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 04CC4 80A5FFB4 01CFC021 */ addu $t8, $t6, $t7 -/* 04CC8 80A5FFB8 0C028800 */ jal Animation_GetLastFrame - -/* 04CCC 80A5FFBC 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 04CD0 80A5FFC0 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 -/* 04CD4 80A5FFC4 3C0180A6 */ lui $at, %hi(D_80A65E60) ## $at = 80A60000 -/* 04CD8 80A5FFC8 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 04CDC 80A5FFCC 00031880 */ sll $v1, $v1, 2 -/* 04CE0 80A5FFD0 00230821 */ addu $at, $at, $v1 -/* 04CE4 80A5FFD4 C4265E60 */ lwc1 $f6, %lo(D_80A65E60)($at) -/* 04CE8 80A5FFD8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 04CEC 80A5FFDC 44818000 */ mtc1 $at, $f16 ## $f16 = 1.50 -/* 04CF0 80A5FFE0 46083282 */ mul.s $f10, $f6, $f8 -/* 04CF4 80A5FFE4 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 -/* 04CF8 80A5FFE8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04CFC 80A5FFEC 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 04D00 80A5FFF0 00194080 */ sll $t0, $t9, 2 -/* 04D04 80A5FFF4 01284821 */ addu $t1, $t1, $t0 -/* 04D08 80A5FFF8 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 04D0C 80A5FFFC 46105482 */ mul.s $f18, $f10, $f16 -/* 04D10 80A60000 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04D14 80A60004 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 04D18 80A60008 01235021 */ addu $t2, $t1, $v1 -/* 04D1C 80A6000C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 04D20 80A60010 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 04D24 80A60014 468021A0 */ cvt.s.w $f6, $f4 -/* 04D28 80A60018 44069000 */ mfc1 $a2, $f18 -/* 04D2C 80A6001C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 04D30 80A60020 44070000 */ mfc1 $a3, $f0 -/* 04D34 80A60024 AFAB0014 */ sw $t3, 0x0014($sp) -/* 04D38 80A60028 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 04D3C 80A6002C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04D40 80A60030 0C029468 */ jal Animation_Change - -/* 04D44 80A60034 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 04D48 80A60038 10000027 */ beq $zero, $zero, .L80A600D8 -/* 04D4C 80A6003C 8FBF002C */ lw $ra, 0x002C($sp) -/* 04D50 80A60040 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 -.L80A60044: -/* 04D54 80A60044 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 -/* 04D58 80A60048 00027880 */ sll $t7, $v0, 2 -/* 04D5C 80A6004C 000C6880 */ sll $t5, $t4, 2 -/* 04D60 80A60050 01CD7021 */ addu $t6, $t6, $t5 -/* 04D64 80A60054 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 04D68 80A60058 01CFC021 */ addu $t8, $t6, $t7 -/* 04D6C 80A6005C 0C028800 */ jal Animation_GetLastFrame - -/* 04D70 80A60060 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 04D74 80A60064 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 -/* 04D78 80A60068 3C0180A6 */ lui $at, %hi(D_80A65E60) ## $at = 80A60000 -/* 04D7C 80A6006C C7B00030 */ lwc1 $f16, 0x0030($sp) -/* 04D80 80A60070 00031880 */ sll $v1, $v1, 2 -/* 04D84 80A60074 00230821 */ addu $at, $at, $v1 -/* 04D88 80A60078 C42A5E60 */ lwc1 $f10, %lo(D_80A65E60)($at) -/* 04D8C 80A6007C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 04D90 80A60080 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 04D94 80A60084 46105482 */ mul.s $f18, $f10, $f16 -/* 04D98 80A60088 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 -/* 04D9C 80A6008C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 04DA0 80A60090 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 04DA4 80A60094 00194080 */ sll $t0, $t9, 2 -/* 04DA8 80A60098 01284821 */ addu $t1, $t1, $t0 -/* 04DAC 80A6009C 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 04DB0 80A600A0 46049182 */ mul.s $f6, $f18, $f4 -/* 04DB4 80A600A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04DB8 80A600A8 01235021 */ addu $t2, $t1, $v1 -/* 04DBC 80A600AC 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 04DC0 80A600B0 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 04DC4 80A600B4 44070000 */ mfc1 $a3, $f0 -/* 04DC8 80A600B8 468042A0 */ cvt.s.w $f10, $f8 -/* 04DCC 80A600BC 44063000 */ mfc1 $a2, $f6 -/* 04DD0 80A600C0 AFAB0014 */ sw $t3, 0x0014($sp) -/* 04DD4 80A600C4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 04DD8 80A600C8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04DDC 80A600CC 0C029468 */ jal Animation_Change - -/* 04DE0 80A600D0 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 04DE4 80A600D4 8FBF002C */ lw $ra, 0x002C($sp) -.L80A600D8: -/* 04DE8 80A600D8 8FB00028 */ lw $s0, 0x0028($sp) -/* 04DEC 80A600DC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 04DF0 80A600E0 03E00008 */ jr $ra -/* 04DF4 80A600E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A600E8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A600E8.s deleted file mode 100644 index a1720b950b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A600E8.s +++ /dev/null @@ -1,126 +0,0 @@ -.late_rodata -glabel D_80A668F8 - .float 0.2 - -.text -glabel func_80A600E8 -/* 04DF8 80A600E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04DFC 80A600EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 04E00 80A600F0 AFB00020 */ sw $s0, 0x0020($sp) -/* 04E04 80A600F4 AFA5002C */ sw $a1, 0x002C($sp) -/* 04E08 80A600F8 8C820210 */ lw $v0, 0x0210($a0) ## 00000210 -/* 04E0C 80A600FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04E10 80A60100 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04E14 80A60104 10400003 */ beq $v0, $zero, .L80A60114 -/* 04E18 80A60108 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E1C 80A6010C 54410006 */ bnel $v0, $at, .L80A60128 -/* 04E20 80A60110 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -.L80A60114: -/* 04E24 80A60114 0C296F1A */ jal func_80A5BC68 -/* 04E28 80A60118 8FA5002C */ lw $a1, 0x002C($sp) -/* 04E2C 80A6011C 10000006 */ beq $zero, $zero, .L80A60138 -/* 04E30 80A60120 00000000 */ nop -/* 04E34 80A60124 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -.L80A60128: -/* 04E38 80A60128 14410003 */ bne $v0, $at, .L80A60138 -/* 04E3C 80A6012C 00000000 */ nop -/* 04E40 80A60130 0C296E72 */ jal func_80A5B9C8 -/* 04E44 80A60134 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A60138: -/* 04E48 80A60138 3C0680A6 */ lui $a2, %hi(D_80A66654) ## $a2 = 80A60000 -/* 04E4C 80A6013C 24C66654 */ addiu $a2, $a2, %lo(D_80A66654) ## $a2 = 80A66654 -/* 04E50 80A60140 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E54 80A60144 0C296D87 */ jal func_80A5B61C -/* 04E58 80A60148 8FA5002C */ lw $a1, 0x002C($sp) -/* 04E5C 80A6014C 8E0E0388 */ lw $t6, 0x0388($s0) ## 00000388 -/* 04E60 80A60150 55C0000C */ bnel $t6, $zero, .L80A60184 -/* 04E64 80A60154 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -/* 04E68 80A60158 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04E6C 80A6015C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04E70 80A60160 8E0F038C */ lw $t7, 0x038C($s0) ## 0000038C -/* 04E74 80A60164 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 04E78 80A60168 E5E60068 */ swc1 $f6, 0x0068($t7) ## 00000068 -/* 04E7C 80A6016C 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 04E80 80A60170 53000004 */ beql $t8, $zero, .L80A60184 -/* 04E84 80A60174 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -/* 04E88 80A60178 0C297F75 */ jal func_80A5FDD4 -/* 04E8C 80A6017C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E90 80A60180 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -.L80A60184: -/* 04E94 80A60184 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 04E98 80A60188 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 04E9C 80A6018C 14410006 */ bne $v0, $at, .L80A601A8 -/* 04EA0 80A60190 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 04EA4 80A60194 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 04EA8 80A60198 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 04EAC 80A6019C 460A4002 */ mul.s $f0, $f8, $f10 -/* 04EB0 80A601A0 10000014 */ beq $zero, $zero, .L80A601F4 -/* 04EB4 80A601A4 00000000 */ nop -.L80A601A8: -/* 04EB8 80A601A8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04EBC 80A601AC 14410006 */ bne $v0, $at, .L80A601C8 -/* 04EC0 80A601B0 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 04EC4 80A601B4 44819000 */ mtc1 $at, $f18 ## $f18 = 0.25 -/* 04EC8 80A601B8 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 04ECC 80A601BC 46128002 */ mul.s $f0, $f16, $f18 -/* 04ED0 80A601C0 1000000C */ beq $zero, $zero, .L80A601F4 -/* 04ED4 80A601C4 00000000 */ nop -.L80A601C8: -/* 04ED8 80A601C8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04EDC 80A601CC 14410006 */ bne $v0, $at, .L80A601E8 -/* 04EE0 80A601D0 3C0180A6 */ lui $at, %hi(D_80A668F8) ## $at = 80A60000 -/* 04EE4 80A601D4 C42668F8 */ lwc1 $f6, %lo(D_80A668F8)($at) -/* 04EE8 80A601D8 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 04EEC 80A601DC 46062002 */ mul.s $f0, $f4, $f6 -/* 04EF0 80A601E0 10000004 */ beq $zero, $zero, .L80A601F4 -/* 04EF4 80A601E4 00000000 */ nop -.L80A601E8: -/* 04EF8 80A601E8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04EFC 80A601EC 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 04F00 80A601F0 00000000 */ nop -.L80A601F4: -/* 04F04 80A601F4 0C02927F */ jal SkelAnime_Update - -/* 04F08 80A601F8 E60001C8 */ swc1 $f0, 0x01C8($s0) ## 000001C8 -/* 04F0C 80A601FC 1440000A */ bne $v0, $zero, .L80A60228 -/* 04F10 80A60200 00000000 */ nop -/* 04F14 80A60204 8E190210 */ lw $t9, 0x0210($s0) ## 00000210 -/* 04F18 80A60208 5720000A */ bnel $t9, $zero, .L80A60234 -/* 04F1C 80A6020C 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -/* 04F20 80A60210 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 04F24 80A60214 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 04F28 80A60218 460A4032 */ c.eq.s $f8, $f10 -/* 04F2C 80A6021C 00000000 */ nop -/* 04F30 80A60220 45030004 */ bc1tl .L80A60234 -/* 04F34 80A60224 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -.L80A60228: -/* 04F38 80A60228 0C297F75 */ jal func_80A5FDD4 -/* 04F3C 80A6022C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F40 80A60230 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -.L80A60234: -/* 04F44 80A60234 00084A00 */ sll $t1, $t0, 8 -/* 04F48 80A60238 05230009 */ bgezl $t1, .L80A60260 -/* 04F4C 80A6023C 8E02038C */ lw $v0, 0x038C($s0) ## 0000038C -/* 04F50 80A60240 8E0B038C */ lw $t3, 0x038C($s0) ## 0000038C -/* 04F54 80A60244 240A0007 */ addiu $t2, $zero, 0x0007 ## $t2 = 00000007 -/* 04F58 80A60248 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 04F5C 80A6024C A56A01E6 */ sh $t2, 0x01E6($t3) ## 000001E6 -/* 04F60 80A60250 8E0C038C */ lw $t4, 0x038C($s0) ## 0000038C -/* 04F64 80A60254 1000000A */ beq $zero, $zero, .L80A60280 -/* 04F68 80A60258 E59001E0 */ swc1 $f16, 0x01E0($t4) ## 000001E0 -/* 04F6C 80A6025C 8E02038C */ lw $v0, 0x038C($s0) ## 0000038C -.L80A60260: -/* 04F70 80A60260 96060394 */ lhu $a2, 0x0394($s0) ## 00000394 -/* 04F74 80A60264 8E040210 */ lw $a0, 0x0210($s0) ## 00000210 -/* 04F78 80A60268 8E0501C4 */ lw $a1, 0x01C4($s0) ## 000001C4 -/* 04F7C 80A6026C 244D01E0 */ addiu $t5, $v0, 0x01E0 ## $t5 = 000001E0 -/* 04F80 80A60270 AFAD0010 */ sw $t5, 0x0010($sp) -/* 04F84 80A60274 244701E6 */ addiu $a3, $v0, 0x01E6 ## $a3 = 000001E6 -/* 04F88 80A60278 0C297F4C */ jal func_80A5FD30 -/* 04F8C 80A6027C 30C60001 */ andi $a2, $a2, 0x0001 ## $a2 = 00000000 -.L80A60280: -/* 04F90 80A60280 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04F94 80A60284 8FB00020 */ lw $s0, 0x0020($sp) -/* 04F98 80A60288 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04F9C 80A6028C 03E00008 */ jr $ra -/* 04FA0 80A60290 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s deleted file mode 100644 index 140293c485..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s +++ /dev/null @@ -1,33 +0,0 @@ -.late_rodata -glabel D_80A668FC - .float 0.3 - -.text -glabel func_80A60294 -/* 04FA4 80A60294 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04FA8 80A60298 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04FAC 80A6029C AFA5001C */ sw $a1, 0x001C($sp) -/* 04FB0 80A602A0 AFA60020 */ sw $a2, 0x0020($sp) -/* 04FB4 80A602A4 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 04FB8 80A602A8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 04FBC 80A602AC AC8E0210 */ sw $t6, 0x0210($a0) ## 00000210 -/* 04FC0 80A602B0 AC8F0380 */ sw $t7, 0x0380($a0) ## 00000380 -/* 04FC4 80A602B4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 04FC8 80A602B8 3C0180A6 */ lui $at, %hi(D_80A668FC) ## $at = 80A60000 -/* 04FCC 80A602BC C42668FC */ lwc1 $f6, %lo(D_80A668FC)($at) -/* 04FD0 80A602C0 C4E40068 */ lwc1 $f4, 0x0068($a3) ## 00000068 -/* 04FD4 80A602C4 8CF80158 */ lw $t8, 0x0158($a3) ## 00000158 -/* 04FD8 80A602C8 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 04FDC 80A602CC 46062202 */ mul.s $f8, $f4, $f6 -/* 04FE0 80A602D0 0018C880 */ sll $t9, $t8, 2 -/* 04FE4 80A602D4 01194021 */ addu $t0, $t0, $t9 -/* 04FE8 80A602D8 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 04FEC 80A602DC 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 04FF0 80A602E0 8D050018 */ lw $a1, 0x0018($t0) ## 80A60018 -/* 04FF4 80A602E4 44064000 */ mfc1 $a2, $f8 -/* 04FF8 80A602E8 0C0294A7 */ jal Animation_PlayOnceSetSpeed -/* 04FFC 80A602EC 00000000 */ nop -/* 05000 80A602F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05004 80A602F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05008 80A602F8 03E00008 */ jr $ra -/* 0500C 80A602FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s deleted file mode 100644 index 22a2b52e9d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s +++ /dev/null @@ -1,96 +0,0 @@ -.late_rodata -glabel D_80A66900 - .float 0.3 - -glabel D_80A66904 - .float 0.3 - -.text -glabel func_80A60300 -/* 05010 80A60300 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 05014 80A60304 AFBF001C */ sw $ra, 0x001C($sp) -/* 05018 80A60308 AFB00018 */ sw $s0, 0x0018($sp) -/* 0501C 80A6030C AFA5003C */ sw $a1, 0x003C($sp) -/* 05020 80A60310 8CCE0018 */ lw $t6, 0x0018($a2) ## 00000018 -/* 05024 80A60314 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05028 80A60318 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0502C 80A6031C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 05030 80A60320 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFF4 -/* 05034 80A60324 468021A0 */ cvt.s.w $f6, $f4 -/* 05038 80A60328 E7A6002C */ swc1 $f6, 0x002C($sp) -/* 0503C 80A6032C 8CCF001C */ lw $t7, 0x001C($a2) ## 0000001C -/* 05040 80A60330 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 05044 80A60334 00000000 */ nop -/* 05048 80A60338 468042A0 */ cvt.s.w $f10, $f8 -/* 0504C 80A6033C E7AA0030 */ swc1 $f10, 0x0030($sp) -/* 05050 80A60340 8CD80020 */ lw $t8, 0x0020($a2) ## 00000020 -/* 05054 80A60344 AFA50024 */ sw $a1, 0x0024($sp) -/* 05058 80A60348 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 0505C 80A6034C 00000000 */ nop -/* 05060 80A60350 468084A0 */ cvt.s.w $f18, $f16 -/* 05064 80A60354 0C032D9E */ jal Math3D_Vec3f_DistXYZ -/* 05068 80A60358 E7B20034 */ swc1 $f18, 0x0034($sp) -/* 0506C 80A6035C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 05070 80A60360 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 -/* 05074 80A60364 8FA50024 */ lw $a1, 0x0024($sp) -/* 05078 80A60368 27A6002C */ addiu $a2, $sp, 0x002C ## $a2 = FFFFFFF4 -/* 0507C 80A6036C 4600103C */ c.lt.s $f2, $f0 -/* 05080 80A60370 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05084 80A60374 24070190 */ addiu $a3, $zero, 0x0190 ## $a3 = 00000190 -/* 05088 80A60378 4502000C */ bc1fl .L80A603AC -/* 0508C 80A6037C 8CC80000 */ lw $t0, 0x0000($a2) ## FFFFFFF4 -/* 05090 80A60380 0C296D78 */ jal func_80A5B5E0 -/* 05094 80A60384 8FA5003C */ lw $a1, 0x003C($sp) -/* 05098 80A60388 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0509C 80A6038C 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 -/* 050A0 80A60390 3C0180A6 */ lui $at, %hi(D_80A66900) ## $at = 80A60000 -/* 050A4 80A60394 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 050A8 80A60398 C4246900 */ lwc1 $f4, %lo(D_80A66900)($at) -/* 050AC 80A6039C 46041182 */ mul.s $f6, $f2, $f4 -/* 050B0 80A603A0 10000009 */ beq $zero, $zero, .L80A603C8 -/* 050B4 80A603A4 E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 -/* 050B8 80A603A8 8CC80000 */ lw $t0, 0x0000($a2) ## 00000000 -.L80A603AC: -/* 050BC 80A603AC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 050C0 80A603B0 ACA80000 */ sw $t0, 0x0000($a1) ## 00000000 -/* 050C4 80A603B4 8CD90004 */ lw $t9, 0x0004($a2) ## 00000004 -/* 050C8 80A603B8 ACB90004 */ sw $t9, 0x0004($a1) ## 00000004 -/* 050CC 80A603BC 8CC80008 */ lw $t0, 0x0008($a2) ## 00000008 -/* 050D0 80A603C0 ACA80008 */ sw $t0, 0x0008($a1) ## 00000008 -/* 050D4 80A603C4 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -.L80A603C8: -/* 050D8 80A603C8 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 050DC 80A603CC 0C02927F */ jal SkelAnime_Update - -/* 050E0 80A603D0 AFA40024 */ sw $a0, 0x0024($sp) -/* 050E4 80A603D4 50400019 */ beql $v0, $zero, .L80A6043C -/* 050E8 80A603D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 050EC 80A603DC 0C296EB3 */ jal func_80A5BACC -/* 050F0 80A603E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 050F4 80A603E4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 050F8 80A603E8 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 -/* 050FC 80A603EC 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 05100 80A603F0 0C02A800 */ jal func_800AA000 -/* 05104 80A603F4 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 05108 80A603F8 3C0180A6 */ lui $at, %hi(D_80A66904) ## $at = 80A60000 -/* 0510C 80A603FC C4306904 */ lwc1 $f16, %lo(D_80A66904)($at) -/* 05110 80A60400 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 05114 80A60404 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 05118 80A60408 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 0511C 80A6040C 46105482 */ mul.s $f18, $f10, $f16 -/* 05120 80A60410 00095080 */ sll $t2, $t1, 2 -/* 05124 80A60414 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 05128 80A60418 016A5821 */ addu $t3, $t3, $t2 -/* 0512C 80A6041C 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05130 80A60420 000C6880 */ sll $t5, $t4, 2 -/* 05134 80A60424 8FA40024 */ lw $a0, 0x0024($sp) -/* 05138 80A60428 44069000 */ mfc1 $a2, $f18 -/* 0513C 80A6042C 016D7021 */ addu $t6, $t3, $t5 -/* 05140 80A60430 0C0294A7 */ jal Animation_PlayOnceSetSpeed -/* 05144 80A60434 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 05148 80A60438 8FBF001C */ lw $ra, 0x001C($sp) -.L80A6043C: -/* 0514C 80A6043C 8FB00018 */ lw $s0, 0x0018($sp) -/* 05150 80A60440 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 05154 80A60444 03E00008 */ jr $ra -/* 05158 80A60448 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6044C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6044C.s deleted file mode 100644 index 25f633e9e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6044C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A6044C -/* 0515C 80A6044C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 05160 80A60450 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05164 80A60454 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05168 80A60458 0C29811C */ jal func_80A60470 -/* 0516C 80A6045C E48401C4 */ swc1 $f4, 0x01C4($a0) ## 000001C4 -/* 05170 80A60460 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05174 80A60464 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05178 80A60468 03E00008 */ jr $ra -/* 0517C 80A6046C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s deleted file mode 100644 index e681b9f8e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s +++ /dev/null @@ -1,86 +0,0 @@ -.late_rodata -glabel D_80A66908 - .float 0.01 - -.text -glabel func_80A60470 -/* 05180 80A60470 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 05184 80A60474 AFBF002C */ sw $ra, 0x002C($sp) -/* 05188 80A60478 AFB00028 */ sw $s0, 0x0028($sp) -/* 0518C 80A6047C AFA5003C */ sw $a1, 0x003C($sp) -/* 05190 80A60480 C48401C4 */ lwc1 $f4, 0x01C4($a0) ## 000001C4 -/* 05194 80A60484 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 05198 80A60488 AC8E0210 */ sw $t6, 0x0210($a0) ## 00000210 -/* 0519C 80A6048C E7A40034 */ swc1 $f4, 0x0034($sp) -/* 051A0 80A60490 8C8F0158 */ lw $t7, 0x0158($a0) ## 00000158 -/* 051A4 80A60494 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 -/* 051A8 80A60498 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 051AC 80A6049C 000FC080 */ sll $t8, $t7, 2 -/* 051B0 80A604A0 0338C821 */ addu $t9, $t9, $t8 -/* 051B4 80A604A4 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) -/* 051B8 80A604A8 0C028800 */ jal Animation_GetLastFrame - -/* 051BC 80A604AC 8F240020 */ lw $a0, 0x0020($t9) ## 80A60020 -/* 051C0 80A604B0 8E080158 */ lw $t0, 0x0158($s0) ## 00000158 -/* 051C4 80A604B4 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 051C8 80A604B8 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 -/* 051CC 80A604BC 00084880 */ sll $t1, $t0, 2 -/* 051D0 80A604C0 8E0B0210 */ lw $t3, 0x0210($s0) ## 00000210 -/* 051D4 80A604C4 01495021 */ addu $t2, $t2, $t1 -/* 051D8 80A604C8 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) -/* 051DC 80A604CC 46803220 */ cvt.s.w $f8, $f6 -/* 051E0 80A604D0 000B6080 */ sll $t4, $t3, 2 -/* 051E4 80A604D4 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 051E8 80A604D8 014C6821 */ addu $t5, $t2, $t4 -/* 051EC 80A604DC 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 -/* 051F0 80A604E0 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 051F4 80A604E4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 051F8 80A604E8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 051FC 80A604EC E7A80010 */ swc1 $f8, 0x0010($sp) -/* 05200 80A604F0 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 05204 80A604F4 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 05208 80A604F8 8FA70034 */ lw $a3, 0x0034($sp) -/* 0520C 80A604FC 0C029468 */ jal Animation_Change - -/* 05210 80A60500 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 05214 80A60504 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 05218 80A60508 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 0521C 80A6050C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 05220 80A60510 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC -/* 05224 80A60514 AE000244 */ sw $zero, 0x0244($s0) ## 00000244 -/* 05228 80A60518 E6100274 */ swc1 $f16, 0x0274($s0) ## 00000274 -/* 0522C 80A6051C E612006C */ swc1 $f18, 0x006C($s0) ## 0000006C -/* 05230 80A60520 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 05234 80A60524 844F0002 */ lh $t7, 0x0002($v0) ## 00000002 -/* 05238 80A60528 3C0180A6 */ lui $at, %hi(D_80A66908) ## $at = 80A60000 -/* 0523C 80A6052C C42A6908 */ lwc1 $f10, %lo(D_80A66908)($at) -/* 05240 80A60530 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 05244 80A60534 C608025C */ lwc1 $f8, 0x025C($s0) ## 0000025C -/* 05248 80A60538 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 -/* 0524C 80A6053C 46803020 */ cvt.s.w $f0, $f6 -/* 05250 80A60540 3C078013 */ lui $a3, %hi(D_801333E0) -/* 05254 80A60544 3C088013 */ lui $t0, %hi(D_801333E8) -/* 05258 80A60548 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 -/* 0525C 80A6054C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 05260 80A60550 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 05264 80A60554 460A0402 */ mul.s $f16, $f0, $f10 -/* 05268 80A60558 250833E8 */ addiu $t0, %lo(D_801333E8) -/* 0526C 80A6055C 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 -/* 05270 80A60560 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 05274 80A60564 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 05278 80A60568 46104481 */ sub.s $f18, $f8, $f16 -/* 0527C 80A6056C E612025C */ swc1 $f18, 0x025C($s0) ## 0000025C -/* 05280 80A60570 AFA80014 */ sw $t0, 0x0014($sp) -/* 05284 80A60574 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 05288 80A60578 AFA70010 */ sw $a3, 0x0010($sp) -/* 0528C 80A6057C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 05290 80A60580 240500AA */ addiu $a1, $zero, 0x00AA ## $a1 = 000000AA -/* 05294 80A60584 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 05298 80A60588 0C02A800 */ jal func_800AA000 -/* 0529C 80A6058C 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 052A0 80A60590 8FBF002C */ lw $ra, 0x002C($sp) -/* 052A4 80A60594 8FB00028 */ lw $s0, 0x0028($sp) -/* 052A8 80A60598 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 052AC 80A6059C 03E00008 */ jr $ra -/* 052B0 80A605A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605A4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605A4.s deleted file mode 100644 index c42d7b9be8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605A4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A605A4 -/* 052B4 80A605A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 052B8 80A605A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 052BC 80A605AC AFA60020 */ sw $a2, 0x0020($sp) -/* 052C0 80A605B0 0C298113 */ jal func_80A6044C -/* 052C4 80A605B4 AFA40018 */ sw $a0, 0x0018($sp) -/* 052C8 80A605B8 8FA40018 */ lw $a0, 0x0018($sp) -/* 052CC 80A605BC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 052D0 80A605C0 948F0384 */ lhu $t7, 0x0384($a0) ## 00000384 -/* 052D4 80A605C4 AC8E0380 */ sw $t6, 0x0380($a0) ## 00000380 -/* 052D8 80A605C8 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 -/* 052DC 80A605CC A4980384 */ sh $t8, 0x0384($a0) ## 00000384 -/* 052E0 80A605D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 052E4 80A605D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 052E8 80A605D8 03E00008 */ jr $ra -/* 052EC 80A605DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s deleted file mode 100644 index be741bd5d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s +++ /dev/null @@ -1,168 +0,0 @@ -.late_rodata -glabel D_80A6690C - .float 0.01 - -glabel D_80A66910 - .float 0.01 - -.text -glabel func_80A605E0 -/* 052F0 80A605E0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 052F4 80A605E4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 052F8 80A605E8 AFB00020 */ sw $s0, 0x0020($sp) -/* 052FC 80A605EC AFA50044 */ sw $a1, 0x0044($sp) -/* 05300 80A605F0 948E0384 */ lhu $t6, 0x0384($a0) ## 00000384 -/* 05304 80A605F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05308 80A605F8 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 0530C 80A605FC 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 05310 80A60600 51E00006 */ beql $t7, $zero, .L80A6061C -/* 05314 80A60604 44812000 */ mtc1 $at, $f4 ## $f4 = 13.00 -/* 05318 80A60608 0C2980C0 */ jal func_80A60300 -/* 0531C 80A6060C 00000000 */ nop -/* 05320 80A60610 10000085 */ beq $zero, $zero, .L80A60828 -/* 05324 80A60614 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05328 80A60618 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -.L80A6061C: -/* 0532C 80A6061C 3C014198 */ lui $at, 0x4198 ## $at = 41980000 -/* 05330 80A60620 C60201C4 */ lwc1 $f2, 0x01C4($s0) ## 000001C4 -/* 05334 80A60624 44813000 */ mtc1 $at, $f6 ## $f6 = 19.00 -/* 05338 80A60628 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 -/* 0533C 80A6062C 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 05340 80A60630 4602303C */ c.lt.s $f6, $f2 -/* 05344 80A60634 37190004 */ ori $t9, $t8, 0x0004 ## $t9 = 00000004 -/* 05348 80A60638 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 0534C 80A6063C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 05350 80A60640 4502001E */ bc1fl .L80A606BC -/* 05354 80A60644 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC -/* 05358 80A60648 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0535C 80A6064C C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 -/* 05360 80A60650 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 05364 80A60654 44814000 */ mtc1 $at, $f8 ## $f8 = -3.50 -/* 05368 80A60658 46105032 */ c.eq.s $f10, $f16 -/* 0536C 80A6065C 3C01C128 */ lui $at, 0xC128 ## $at = C1280000 -/* 05370 80A60660 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 05374 80A60664 45020005 */ bc1fl .L80A6067C -/* 05378 80A60668 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 0537C 80A6066C 44819000 */ mtc1 $at, $f18 ## $f18 = 90.00 -/* 05380 80A60670 00000000 */ nop -/* 05384 80A60674 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 05388 80A60678 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -.L80A6067C: -/* 0538C 80A6067C 44814000 */ mtc1 $at, $f8 ## $f8 = 90.00 -/* 05390 80A60680 C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 -/* 05394 80A60684 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 05398 80A60688 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0539C 80A6068C 46083280 */ add.s $f10, $f6, $f8 -/* 053A0 80A60690 460A203C */ c.lt.s $f4, $f10 -/* 053A4 80A60694 00000000 */ nop -/* 053A8 80A60698 45020005 */ bc1fl .L80A606B0 -/* 053AC 80A6069C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 053B0 80A606A0 44818000 */ mtc1 $at, $f16 ## $f16 = 1.50 -/* 053B4 80A606A4 1000000F */ beq $zero, $zero, .L80A606E4 -/* 053B8 80A606A8 E61001C8 */ swc1 $f16, 0x01C8($s0) ## 000001C8 -/* 053BC 80A606AC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -.L80A606B0: -/* 053C0 80A606B0 1000000C */ beq $zero, $zero, .L80A606E4 -/* 053C4 80A606B4 E61201C8 */ swc1 $f18, 0x01C8($s0) ## 000001C8 -/* 053C8 80A606B8 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC -.L80A606BC: -/* 053CC 80A606BC 3C0180A6 */ lui $at, %hi(D_80A6690C) ## $at = 80A60000 -/* 053D0 80A606C0 C424690C */ lwc1 $f4, %lo(D_80A6690C)($at) -/* 053D4 80A606C4 84480002 */ lh $t0, 0x0002($v0) ## 00000002 -/* 053D8 80A606C8 C6080274 */ lwc1 $f8, 0x0274($s0) ## 00000274 -/* 053DC 80A606CC 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 053E0 80A606D0 00000000 */ nop -/* 053E4 80A606D4 46803020 */ cvt.s.w $f0, $f6 -/* 053E8 80A606D8 46040282 */ mul.s $f10, $f0, $f4 -/* 053EC 80A606DC 460A4400 */ add.s $f16, $f8, $f10 -/* 053F0 80A606E0 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -.L80A606E4: -/* 053F4 80A606E4 AFA40028 */ sw $a0, 0x0028($sp) -/* 053F8 80A606E8 0C02927F */ jal SkelAnime_Update - -/* 053FC 80A606EC E7A2003C */ swc1 $f2, 0x003C($sp) -/* 05400 80A606F0 14400013 */ bne $v0, $zero, .L80A60740 -/* 05404 80A606F4 C7A2003C */ lwc1 $f2, 0x003C($sp) -/* 05408 80A606F8 3C014198 */ lui $at, 0x4198 ## $at = 41980000 -/* 0540C 80A606FC 44819000 */ mtc1 $at, $f18 ## $f18 = 19.00 -/* 05410 80A60700 00000000 */ nop -/* 05414 80A60704 4602903C */ c.lt.s $f18, $f2 -/* 05418 80A60708 00000000 */ nop -/* 0541C 80A6070C 45020046 */ bc1fl .L80A60828 -/* 05420 80A60710 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05424 80A60714 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 05428 80A60718 C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 -/* 0542C 80A6071C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 05430 80A60720 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 -/* 05434 80A60724 46082281 */ sub.s $f10, $f4, $f8 -/* 05438 80A60728 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 0543C 80A6072C 46105480 */ add.s $f18, $f10, $f16 -/* 05440 80A60730 4612303C */ c.lt.s $f6, $f18 -/* 05444 80A60734 00000000 */ nop -/* 05448 80A60738 4502003B */ bc1fl .L80A60828 -/* 0544C 80A6073C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A60740: -/* 05450 80A60740 96090384 */ lhu $t1, 0x0384($s0) ## 00000384 -/* 05454 80A60744 3C078013 */ lui $a3, %hi(D_801333E0) -/* 05458 80A60748 3C0B8013 */ lui $t3, %hi(D_801333E8) -/* 0545C 80A6074C 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 05460 80A60750 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 05464 80A60754 A60A0384 */ sh $t2, 0x0384($s0) ## 00000384 -/* 05468 80A60758 256B33E8 */ addiu $t3, %lo(D_801333E8) -/* 0546C 80A6075C AFAB0014 */ sw $t3, 0x0014($sp) -/* 05470 80A60760 AFA70010 */ sw $a3, 0x0010($sp) -/* 05474 80A60764 24042819 */ addiu $a0, $zero, 0x2819 ## $a0 = 00002819 -/* 05478 80A60768 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 0547C 80A6076C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 05480 80A60770 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 05484 80A60774 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 05488 80A60778 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 0548C 80A6077C 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 05490 80A60780 0C02A800 */ jal func_800AA000 -/* 05494 80A60784 24070050 */ addiu $a3, $zero, 0x0050 ## $a3 = 00000050 -/* 05498 80A60788 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 -/* 0549C 80A6078C 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB -/* 054A0 80A60790 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 054A4 80A60794 01816824 */ and $t5, $t4, $at -/* 054A8 80A60798 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 054AC 80A6079C 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 -/* 054B0 80A607A0 C60A0080 */ lwc1 $f10, 0x0080($s0) ## 00000080 -/* 054B4 80A607A4 AE0D01F0 */ sw $t5, 0x01F0($s0) ## 000001F0 -/* 054B8 80A607A8 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 054BC 80A607AC E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 054C0 80A607B0 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 054C4 80A607B4 8FA40044 */ lw $a0, 0x0044($sp) -/* 054C8 80A607B8 3C0541C8 */ lui $a1, 0x41C8 ## $a1 = 41C80000 -/* 054CC 80A607BC 0C00A295 */ jal func_80028A54 -/* 054D0 80A607C0 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 054D4 80A607C4 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 -/* 054D8 80A607C8 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 054DC 80A607CC 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 -/* 054E0 80A607D0 000FC080 */ sll $t8, $t7, 2 -/* 054E4 80A607D4 AE0E0210 */ sw $t6, 0x0210($s0) ## 00000210 -/* 054E8 80A607D8 0338C821 */ addu $t9, $t9, $t8 -/* 054EC 80A607DC 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) -/* 054F0 80A607E0 3C0680A6 */ lui $a2, %hi(D_80A65E78) ## $a2 = 80A60000 -/* 054F4 80A607E4 8CC65E78 */ lw $a2, %lo(D_80A65E78)($a2) -/* 054F8 80A607E8 8FA40028 */ lw $a0, 0x0028($sp) -/* 054FC 80A607EC 0C0294A7 */ jal Animation_PlayOnceSetSpeed -/* 05500 80A607F0 8F250018 */ lw $a1, 0x0018($t9) ## 80A60018 -/* 05504 80A607F4 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC -/* 05508 80A607F8 3C0180A6 */ lui $at, %hi(D_80A66910) ## $at = 80A60000 -/* 0550C 80A607FC C4326910 */ lwc1 $f18, %lo(D_80A66910)($at) -/* 05510 80A60800 84480002 */ lh $t0, 0x0002($v0) ## 00000002 -/* 05514 80A60804 C606025C */ lwc1 $f6, 0x025C($s0) ## 0000025C -/* 05518 80A60808 AE000244 */ sw $zero, 0x0244($s0) ## 00000244 -/* 0551C 80A6080C 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 05520 80A60810 00000000 */ nop -/* 05524 80A60814 46808020 */ cvt.s.w $f0, $f16 -/* 05528 80A60818 46120102 */ mul.s $f4, $f0, $f18 -/* 0552C 80A6081C 46043200 */ add.s $f8, $f6, $f4 -/* 05530 80A60820 E608025C */ swc1 $f8, 0x025C($s0) ## 0000025C -/* 05534 80A60824 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A60828: -/* 05538 80A60828 8FB00020 */ lw $s0, 0x0020($sp) -/* 0553C 80A6082C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 05540 80A60830 03E00008 */ jr $ra -/* 05544 80A60834 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s deleted file mode 100644 index 94d518a921..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_80A60838 -/* 05548 80A60838 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0554C 80A6083C AFA50034 */ sw $a1, 0x0034($sp) -/* 05550 80A60840 AFBF002C */ sw $ra, 0x002C($sp) -/* 05554 80A60844 AFB00028 */ sw $s0, 0x0028($sp) -/* 05558 80A60848 AFA60038 */ sw $a2, 0x0038($sp) -/* 0555C 80A6084C 948E0384 */ lhu $t6, 0x0384($a0) ## 00000384 -/* 05560 80A60850 8C9801F0 */ lw $t8, 0x01F0($a0) ## 000001F0 -/* 05564 80A60854 8C890228 */ lw $t1, 0x0228($a0) ## 00000228 -/* 05568 80A60858 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -/* 0556C 80A6085C 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 05570 80A60860 31CFFFFB */ andi $t7, $t6, 0xFFFB ## $t7 = 00000000 -/* 05574 80A60864 0301C824 */ and $t9, $t8, $at -/* 05578 80A60868 AC820210 */ sw $v0, 0x0210($a0) ## 00000210 -/* 0557C 80A6086C AC820380 */ sw $v0, 0x0380($a0) ## 00000380 -/* 05580 80A60870 A48F0384 */ sh $t7, 0x0384($a0) ## 00000384 -/* 05584 80A60874 AC9901F0 */ sw $t9, 0x01F0($a0) ## 000001F0 -/* 05588 80A60878 2485021C */ addiu $a1, $a0, 0x021C ## $a1 = 0000021C -/* 0558C 80A6087C ACA90000 */ sw $t1, 0x0000($a1) ## 0000021C -/* 05590 80A60880 8C88022C */ lw $t0, 0x022C($a0) ## 0000022C -/* 05594 80A60884 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05598 80A60888 3C078013 */ lui $a3, %hi(D_801333E0) -/* 0559C 80A6088C ACA80004 */ sw $t0, 0x0004($a1) ## 00000220 -/* 055A0 80A60890 8C890230 */ lw $t1, 0x0230($a0) ## 00000230 -/* 055A4 80A60894 3C0C8013 */ lui $t4, %hi(D_801333E8) -/* 055A8 80A60898 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 055AC 80A6089C ACA90008 */ sw $t1, 0x0008($a1) ## 00000224 -/* 055B0 80A608A0 8C8A01F0 */ lw $t2, 0x01F0($a0) ## 000001F0 -/* 055B4 80A608A4 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 055B8 80A608A8 258C33E8 */ addiu $t4, %lo(D_801333E8) -/* 055BC 80A608AC 000A5900 */ sll $t3, $t2, 4 -/* 055C0 80A608B0 05610004 */ bgez $t3, .L80A608C4 -/* 055C4 80A608B4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 055C8 80A608B8 AFA70010 */ sw $a3, 0x0010($sp) -/* 055CC 80A608BC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 055D0 80A608C0 AFAC0014 */ sw $t4, 0x0014($sp) -.L80A608C4: -/* 055D4 80A608C4 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -/* 055D8 80A608C8 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 055DC 80A608CC 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 055E0 80A608D0 000D7080 */ sll $t6, $t5, 2 -/* 055E4 80A608D4 01EE7821 */ addu $t7, $t7, $t6 -/* 055E8 80A608D8 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 055EC 80A608DC 0018C880 */ sll $t9, $t8, 2 -/* 055F0 80A608E0 01F94021 */ addu $t0, $t7, $t9 -/* 055F4 80A608E4 0C028800 */ jal Animation_GetLastFrame - -/* 055F8 80A608E8 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 055FC 80A608EC 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 05600 80A608F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 05604 80A608F4 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 05608 80A608F8 00095080 */ sll $t2, $t1, 2 -/* 0560C 80A608FC 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 05610 80A60900 016A5821 */ addu $t3, $t3, $t2 -/* 05614 80A60904 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05618 80A60908 468021A0 */ cvt.s.w $f6, $f4 -/* 0561C 80A6090C 000C6880 */ sll $t5, $t4, 2 -/* 05620 80A60910 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 05624 80A60914 016D7021 */ addu $t6, $t3, $t5 -/* 05628 80A60918 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 0562C 80A6091C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 05630 80A60920 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 05634 80A60924 AFB80014 */ sw $t8, 0x0014($sp) -/* 05638 80A60928 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0563C 80A6092C 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 05640 80A60930 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05644 80A60934 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05648 80A60938 0C029468 */ jal Animation_Change - -/* 0564C 80A6093C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 05650 80A60940 8FBF002C */ lw $ra, 0x002C($sp) -/* 05654 80A60944 8FB00028 */ lw $s0, 0x0028($sp) -/* 05658 80A60948 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0565C 80A6094C 03E00008 */ jr $ra -/* 05660 80A60950 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s deleted file mode 100644 index 07e0246e43..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel func_80A60954 -/* 05664 80A60954 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 05668 80A60958 AFBF002C */ sw $ra, 0x002C($sp) -/* 0566C 80A6095C AFB00028 */ sw $s0, 0x0028($sp) -/* 05670 80A60960 AFA5003C */ sw $a1, 0x003C($sp) -/* 05674 80A60964 AFA60040 */ sw $a2, 0x0040($sp) -/* 05678 80A60968 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 0567C 80A6096C 44813000 */ mtc1 $at, $f6 ## $f6 = 25.00 -/* 05680 80A60970 C4880214 */ lwc1 $f8, 0x0214($a0) ## 00000214 -/* 05684 80A60974 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 05688 80A60978 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0568C 80A6097C 4608303C */ c.lt.s $f6, $f8 -/* 05690 80A60980 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 05694 80A60984 45020011 */ bc1fl .L80A609CC -/* 05698 80A60988 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 0569C 80A6098C 8C8201F0 */ lw $v0, 0x01F0($a0) ## 0000039C -/* 056A0 80A60990 3C078013 */ lui $a3, %hi(D_801333E0) -/* 056A4 80A60994 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 056A8 80A60998 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 -/* 056AC 80A6099C 15C0000A */ bne $t6, $zero, .L80A609C8 -/* 056B0 80A609A0 344F0800 */ ori $t7, $v0, 0x0800 ## $t7 = 00000800 -/* 056B4 80A609A4 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 0000039C -/* 056B8 80A609A8 3C188013 */ lui $t8, %hi(D_801333E8) -/* 056BC 80A609AC 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 056C0 80A609B0 AFB80014 */ sw $t8, 0x0014($sp) -/* 056C4 80A609B4 AFA70010 */ sw $a3, 0x0010($sp) -/* 056C8 80A609B8 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B -/* 056CC 80A609BC 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 056D0 80A609C0 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 056D4 80A609C4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80A609C8: -/* 056D8 80A609C8 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -.L80A609CC: -/* 056DC 80A609CC 0C02927F */ jal SkelAnime_Update - -/* 056E0 80A609D0 AFA40030 */ sw $a0, 0x0030($sp) -/* 056E4 80A609D4 50400045 */ beql $v0, $zero, .L80A60AEC -/* 056E8 80A609D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 056EC 80A609DC 96020384 */ lhu $v0, 0x0384($s0) ## 00000384 -/* 056F0 80A609E0 AE000210 */ sw $zero, 0x0210($s0) ## 00000210 -/* 056F4 80A609E4 30590004 */ andi $t9, $v0, 0x0004 ## $t9 = 00000000 -/* 056F8 80A609E8 17200022 */ bne $t9, $zero, .L80A60A74 -/* 056FC 80A609EC 34480004 */ ori $t0, $v0, 0x0004 ## $t0 = 00000004 -/* 05700 80A609F0 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 05704 80A609F4 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 05708 80A609F8 A6080384 */ sh $t0, 0x0384($s0) ## 00000384 -/* 0570C 80A609FC 00095080 */ sll $t2, $t1, 2 -/* 05710 80A60A00 016A5821 */ addu $t3, $t3, $t2 -/* 05714 80A60A04 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05718 80A60A08 00006880 */ sll $t5, $zero, 2 -/* 0571C 80A60A0C 016D7021 */ addu $t6, $t3, $t5 -/* 05720 80A60A10 0C028800 */ jal Animation_GetLastFrame - -/* 05724 80A60A14 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 05728 80A60A18 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 -/* 0572C 80A60A1C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 05730 80A60A20 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 -/* 05734 80A60A24 000FC080 */ sll $t8, $t7, 2 -/* 05738 80A60A28 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 -/* 0573C 80A60A2C 0338C821 */ addu $t9, $t9, $t8 -/* 05740 80A60A30 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) -/* 05744 80A60A34 46805420 */ cvt.s.w $f16, $f10 -/* 05748 80A60A38 00084880 */ sll $t1, $t0, 2 -/* 0574C 80A60A3C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 05750 80A60A40 03295021 */ addu $t2, $t9, $t1 -/* 05754 80A60A44 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 -/* 05758 80A60A48 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 0575C 80A60A4C 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 05760 80A60A50 AFAC0014 */ sw $t4, 0x0014($sp) -/* 05764 80A60A54 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 05768 80A60A58 8FA40030 */ lw $a0, 0x0030($sp) -/* 0576C 80A60A5C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05770 80A60A60 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05774 80A60A64 0C029468 */ jal Animation_Change - -/* 05778 80A60A68 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0577C 80A60A6C 1000001F */ beq $zero, $zero, .L80A60AEC -/* 05780 80A60A70 8FBF002C */ lw $ra, 0x002C($sp) -.L80A60A74: -/* 05784 80A60A74 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 -/* 05788 80A60A78 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 -/* 0578C 80A60A7C 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 -/* 05790 80A60A80 000B6880 */ sll $t5, $t3, 2 -/* 05794 80A60A84 01CD7021 */ addu $t6, $t6, $t5 -/* 05798 80A60A88 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 0579C 80A60A8C 000FC080 */ sll $t8, $t7, 2 -/* 057A0 80A60A90 01D84021 */ addu $t0, $t6, $t8 -/* 057A4 80A60A94 0C028800 */ jal Animation_GetLastFrame - -/* 057A8 80A60A98 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 057AC 80A60A9C 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 -/* 057B0 80A60AA0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 057B4 80A60AA4 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 -/* 057B8 80A60AA8 00194880 */ sll $t1, $t9, 2 -/* 057BC 80A60AAC 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 057C0 80A60AB0 01495021 */ addu $t2, $t2, $t1 -/* 057C4 80A60AB4 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) -/* 057C8 80A60AB8 468021A0 */ cvt.s.w $f6, $f4 -/* 057CC 80A60ABC 000C5880 */ sll $t3, $t4, 2 -/* 057D0 80A60AC0 014B6821 */ addu $t5, $t2, $t3 -/* 057D4 80A60AC4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 057D8 80A60AC8 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 057DC 80A60ACC AFA00014 */ sw $zero, 0x0014($sp) -/* 057E0 80A60AD0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 057E4 80A60AD4 8FA40030 */ lw $a0, 0x0030($sp) -/* 057E8 80A60AD8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 057EC 80A60ADC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 057F0 80A60AE0 0C029468 */ jal Animation_Change - -/* 057F4 80A60AE4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 057F8 80A60AE8 8FBF002C */ lw $ra, 0x002C($sp) -.L80A60AEC: -/* 057FC 80A60AEC 8FB00028 */ lw $s0, 0x0028($sp) -/* 05800 80A60AF0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 05804 80A60AF4 03E00008 */ jr $ra -/* 05808 80A60AF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s deleted file mode 100644 index f0930e66bc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s +++ /dev/null @@ -1,62 +0,0 @@ -.late_rodata -glabel D_80A66914 - .float 0.3 - -.text -glabel func_80A60AFC -/* 0580C 80A60AFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05810 80A60B00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05814 80A60B04 AFA5001C */ sw $a1, 0x001C($sp) -/* 05818 80A60B08 AFA60020 */ sw $a2, 0x0020($sp) -/* 0581C 80A60B0C 8CCF000C */ lw $t7, 0x000C($a2) ## 0000000C -/* 05820 80A60B10 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 05824 80A60B14 3C0180A6 */ lui $at, %hi(D_80A66914) ## $at = 80A60000 -/* 05828 80A60B18 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 0582C 80A60B1C 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 05830 80A60B20 468021A0 */ cvt.s.w $f6, $f4 -/* 05834 80A60B24 E486FE78 */ swc1 $f6, -0x0188($a0) ## 00000024 -/* 05838 80A60B28 8FB80020 */ lw $t8, 0x0020($sp) -/* 0583C 80A60B2C 8C8BFE78 */ lw $t3, -0x0188($a0) ## 00000024 -/* 05840 80A60B30 8F190010 */ lw $t9, 0x0010($t8) ## 00000010 -/* 05844 80A60B34 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 05848 80A60B38 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 0584C 80A60B3C 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 05850 80A60B40 468042A0 */ cvt.s.w $f10, $f8 -/* 05854 80A60B44 E48AFE7C */ swc1 $f10, -0x0184($a0) ## 00000028 -/* 05858 80A60B48 8FA80020 */ lw $t0, 0x0020($sp) -/* 0585C 80A60B4C 8C8AFE7C */ lw $t2, -0x0184($a0) ## 00000028 -/* 05860 80A60B50 8D090014 */ lw $t1, 0x0014($t0) ## 00000014 -/* 05864 80A60B54 AC8BFF54 */ sw $t3, -0x00AC($a0) ## 00000100 -/* 05868 80A60B58 AC8AFF58 */ sw $t2, -0x00A8($a0) ## 00000104 -/* 0586C 80A60B5C 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 05870 80A60B60 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 -/* 05874 80A60B64 468084A0 */ cvt.s.w $f18, $f16 -/* 05878 80A60B68 E492FE80 */ swc1 $f18, -0x0180($a0) ## 0000002C -/* 0587C 80A60B6C 8C8BFE80 */ lw $t3, -0x0180($a0) ## 0000002C -/* 05880 80A60B70 AC8BFF5C */ sw $t3, -0x00A4($a0) ## 00000108 -/* 05884 80A60B74 8FAC0020 */ lw $t4, 0x0020($sp) -/* 05888 80A60B78 958D0008 */ lhu $t5, 0x0008($t4) ## 00000008 -/* 0588C 80A60B7C AC980064 */ sw $t8, 0x0064($a0) ## 00000210 -/* 05890 80A60B80 AC9901D4 */ sw $t9, 0x01D4($a0) ## 00000380 -/* 05894 80A60B84 A48DFE86 */ sh $t5, -0x017A($a0) ## 00000032 -/* 05898 80A60B88 888FFE84 */ lwl $t7, -0x017C($a0) ## 00000030 -/* 0589C 80A60B8C 988FFE87 */ lwr $t7, -0x0179($a0) ## 00000033 -/* 058A0 80A60B90 A88FFF08 */ swl $t7, -0x00F8($a0) ## 000000B4 -/* 058A4 80A60B94 B88FFF0B */ swr $t7, -0x00F5($a0) ## 000000B7 -/* 058A8 80A60B98 948FFE88 */ lhu $t7, -0x0178($a0) ## 00000034 -/* 058AC 80A60B9C A48FFF0C */ sh $t7, -0x00F4($a0) ## 000000B8 -/* 058B0 80A60BA0 C4266914 */ lwc1 $f6, %lo(D_80A66914)($at) -/* 058B4 80A60BA4 C4E40068 */ lwc1 $f4, 0x0068($a3) ## 00000068 -/* 058B8 80A60BA8 8CE80158 */ lw $t0, 0x0158($a3) ## 00000158 -/* 058BC 80A60BAC 46062202 */ mul.s $f8, $f4, $f6 -/* 058C0 80A60BB0 00084880 */ sll $t1, $t0, 2 -/* 058C4 80A60BB4 01495021 */ addu $t2, $t2, $t1 -/* 058C8 80A60BB8 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) -/* 058CC 80A60BBC 8D450018 */ lw $a1, 0x0018($t2) ## 80A60018 -/* 058D0 80A60BC0 44064000 */ mfc1 $a2, $f8 -/* 058D4 80A60BC4 0C0294A7 */ jal Animation_PlayOnceSetSpeed -/* 058D8 80A60BC8 00000000 */ nop -/* 058DC 80A60BCC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 058E0 80A60BD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 058E4 80A60BD4 03E00008 */ jr $ra -/* 058E8 80A60BD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s deleted file mode 100644 index f93b916347..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s +++ /dev/null @@ -1,96 +0,0 @@ -.late_rodata -glabel D_80A66918 - .float 0.3 - -glabel D_80A6691C - .float 0.3 - -.text -glabel func_80A60BDC -/* 058EC 80A60BDC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 058F0 80A60BE0 AFBF001C */ sw $ra, 0x001C($sp) -/* 058F4 80A60BE4 AFB00018 */ sw $s0, 0x0018($sp) -/* 058F8 80A60BE8 AFA5003C */ sw $a1, 0x003C($sp) -/* 058FC 80A60BEC 8CCE0018 */ lw $t6, 0x0018($a2) ## 00000018 -/* 05900 80A60BF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05904 80A60BF4 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 05908 80A60BF8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 0590C 80A60BFC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFF4 -/* 05910 80A60C00 468021A0 */ cvt.s.w $f6, $f4 -/* 05914 80A60C04 E7A6002C */ swc1 $f6, 0x002C($sp) -/* 05918 80A60C08 8CCF001C */ lw $t7, 0x001C($a2) ## 0000001C -/* 0591C 80A60C0C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 05920 80A60C10 00000000 */ nop -/* 05924 80A60C14 468042A0 */ cvt.s.w $f10, $f8 -/* 05928 80A60C18 E7AA0030 */ swc1 $f10, 0x0030($sp) -/* 0592C 80A60C1C 8CD80020 */ lw $t8, 0x0020($a2) ## 00000020 -/* 05930 80A60C20 AFA50024 */ sw $a1, 0x0024($sp) -/* 05934 80A60C24 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 05938 80A60C28 00000000 */ nop -/* 0593C 80A60C2C 468084A0 */ cvt.s.w $f18, $f16 -/* 05940 80A60C30 0C032D9E */ jal Math3D_Vec3f_DistXYZ -/* 05944 80A60C34 E7B20034 */ swc1 $f18, 0x0034($sp) -/* 05948 80A60C38 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0594C 80A60C3C 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 -/* 05950 80A60C40 8FA50024 */ lw $a1, 0x0024($sp) -/* 05954 80A60C44 27A6002C */ addiu $a2, $sp, 0x002C ## $a2 = FFFFFFF4 -/* 05958 80A60C48 4600103C */ c.lt.s $f2, $f0 -/* 0595C 80A60C4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05960 80A60C50 24070190 */ addiu $a3, $zero, 0x0190 ## $a3 = 00000190 -/* 05964 80A60C54 4502000C */ bc1fl .L80A60C88 -/* 05968 80A60C58 8CC80000 */ lw $t0, 0x0000($a2) ## FFFFFFF4 -/* 0596C 80A60C5C 0C296D78 */ jal func_80A5B5E0 -/* 05970 80A60C60 8FA5003C */ lw $a1, 0x003C($sp) -/* 05974 80A60C64 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 05978 80A60C68 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 -/* 0597C 80A60C6C 3C0180A6 */ lui $at, %hi(D_80A66918) ## $at = 80A60000 -/* 05980 80A60C70 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 05984 80A60C74 C4246918 */ lwc1 $f4, %lo(D_80A66918)($at) -/* 05988 80A60C78 46041182 */ mul.s $f6, $f2, $f4 -/* 0598C 80A60C7C 10000009 */ beq $zero, $zero, .L80A60CA4 -/* 05990 80A60C80 E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 -/* 05994 80A60C84 8CC80000 */ lw $t0, 0x0000($a2) ## 00000000 -.L80A60C88: -/* 05998 80A60C88 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0599C 80A60C8C ACA80000 */ sw $t0, 0x0000($a1) ## 00000000 -/* 059A0 80A60C90 8CD90004 */ lw $t9, 0x0004($a2) ## 00000004 -/* 059A4 80A60C94 ACB90004 */ sw $t9, 0x0004($a1) ## 00000004 -/* 059A8 80A60C98 8CC80008 */ lw $t0, 0x0008($a2) ## 00000008 -/* 059AC 80A60C9C ACA80008 */ sw $t0, 0x0008($a1) ## 00000008 -/* 059B0 80A60CA0 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -.L80A60CA4: -/* 059B4 80A60CA4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 059B8 80A60CA8 0C02927F */ jal SkelAnime_Update - -/* 059BC 80A60CAC AFA40024 */ sw $a0, 0x0024($sp) -/* 059C0 80A60CB0 50400019 */ beql $v0, $zero, .L80A60D18 -/* 059C4 80A60CB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 059C8 80A60CB8 0C296EB3 */ jal func_80A5BACC -/* 059CC 80A60CBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 059D0 80A60CC0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 059D4 80A60CC4 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 -/* 059D8 80A60CC8 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 059DC 80A60CCC 0C02A800 */ jal func_800AA000 -/* 059E0 80A60CD0 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 059E4 80A60CD4 3C0180A6 */ lui $at, %hi(D_80A6691C) ## $at = 80A60000 -/* 059E8 80A60CD8 C430691C */ lwc1 $f16, %lo(D_80A6691C)($at) -/* 059EC 80A60CDC C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 059F0 80A60CE0 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 059F4 80A60CE4 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 059F8 80A60CE8 46105482 */ mul.s $f18, $f10, $f16 -/* 059FC 80A60CEC 00095080 */ sll $t2, $t1, 2 -/* 05A00 80A60CF0 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 05A04 80A60CF4 016A5821 */ addu $t3, $t3, $t2 -/* 05A08 80A60CF8 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05A0C 80A60CFC 000C6880 */ sll $t5, $t4, 2 -/* 05A10 80A60D00 8FA40024 */ lw $a0, 0x0024($sp) -/* 05A14 80A60D04 44069000 */ mfc1 $a2, $f18 -/* 05A18 80A60D08 016D7021 */ addu $t6, $t3, $t5 -/* 05A1C 80A60D0C 0C0294A7 */ jal Animation_PlayOnceSetSpeed -/* 05A20 80A60D10 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 05A24 80A60D14 8FBF001C */ lw $ra, 0x001C($sp) -.L80A60D18: -/* 05A28 80A60D18 8FB00018 */ lw $s0, 0x0018($sp) -/* 05A2C 80A60D1C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 05A30 80A60D20 03E00008 */ jr $ra -/* 05A34 80A60D24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s deleted file mode 100644 index e4ec4c4ec9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s +++ /dev/null @@ -1,103 +0,0 @@ -glabel func_80A60D28 -/* 05A38 80A60D28 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05A3C 80A60D2C AFBF002C */ sw $ra, 0x002C($sp) -/* 05A40 80A60D30 AFB00028 */ sw $s0, 0x0028($sp) -/* 05A44 80A60D34 AFA50034 */ sw $a1, 0x0034($sp) -/* 05A48 80A60D38 8CCE000C */ lw $t6, 0x000C($a2) ## 0000000C -/* 05A4C 80A60D3C 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 05A50 80A60D40 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 05A54 80A60D44 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 05A58 80A60D48 948E0384 */ lhu $t6, 0x0384($a0) ## 00000384 -/* 05A5C 80A60D4C 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 -/* 05A60 80A60D50 468021A0 */ cvt.s.w $f6, $f4 -/* 05A64 80A60D54 2485021C */ addiu $a1, $a0, 0x021C ## $a1 = 0000021C -/* 05A68 80A60D58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05A6C 80A60D5C 3C078013 */ lui $a3, %hi(D_801333E0) -/* 05A70 80A60D60 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 05A74 80A60D64 E4860024 */ swc1 $f6, 0x0024($a0) ## 00000024 -/* 05A78 80A60D68 8CCF0010 */ lw $t7, 0x0010($a2) ## 00000010 -/* 05A7C 80A60D6C 8C880024 */ lw $t0, 0x0024($a0) ## 00000024 -/* 05A80 80A60D70 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 05A84 80A60D74 31CFFFFB */ andi $t7, $t6, 0xFFFB ## $t7 = 00000000 -/* 05A88 80A60D78 468042A0 */ cvt.s.w $f10, $f8 -/* 05A8C 80A60D7C E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 -/* 05A90 80A60D80 8CD80014 */ lw $t8, 0x0014($a2) ## 00000014 -/* 05A94 80A60D84 AC880100 */ sw $t0, 0x0100($a0) ## 00000100 -/* 05A98 80A60D88 8C990028 */ lw $t9, 0x0028($a0) ## 00000028 -/* 05A9C 80A60D8C 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 05AA0 80A60D90 8C9801F0 */ lw $t8, 0x01F0($a0) ## 000001F0 -/* 05AA4 80A60D94 AC990104 */ sw $t9, 0x0104($a0) ## 00000104 -/* 05AA8 80A60D98 468084A0 */ cvt.s.w $f18, $f16 -/* 05AAC 80A60D9C 0301C824 */ and $t9, $t8, $at -/* 05AB0 80A60DA0 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C -/* 05AB4 80A60DA4 8C88002C */ lw $t0, 0x002C($a0) ## 0000002C -/* 05AB8 80A60DA8 AC880108 */ sw $t0, 0x0108($a0) ## 00000108 -/* 05ABC 80A60DAC 94C90008 */ lhu $t1, 0x0008($a2) ## 00000008 -/* 05AC0 80A60DB0 AC8C0210 */ sw $t4, 0x0210($a0) ## 00000210 -/* 05AC4 80A60DB4 AC8D0380 */ sw $t5, 0x0380($a0) ## 00000380 -/* 05AC8 80A60DB8 A4890032 */ sh $t1, 0x0032($a0) ## 00000032 -/* 05ACC 80A60DBC 888B0030 */ lwl $t3, 0x0030($a0) ## 00000030 -/* 05AD0 80A60DC0 988B0033 */ lwr $t3, 0x0033($a0) ## 00000033 -/* 05AD4 80A60DC4 8C890228 */ lw $t1, 0x0228($a0) ## 00000228 -/* 05AD8 80A60DC8 A48F0384 */ sh $t7, 0x0384($a0) ## 00000384 -/* 05ADC 80A60DCC A88B00B4 */ swl $t3, 0x00B4($a0) ## 000000B4 -/* 05AE0 80A60DD0 B88B00B7 */ swr $t3, 0x00B7($a0) ## 000000B7 -/* 05AE4 80A60DD4 948B0034 */ lhu $t3, 0x0034($a0) ## 00000034 -/* 05AE8 80A60DD8 AC9901F0 */ sw $t9, 0x01F0($a0) ## 000001F0 -/* 05AEC 80A60DDC 3C0C8013 */ lui $t4, %hi(D_801333E8) -/* 05AF0 80A60DE0 A48B00B8 */ sh $t3, 0x00B8($a0) ## 000000B8 -/* 05AF4 80A60DE4 ACA90000 */ sw $t1, 0x0000($a1) ## 0000021C -/* 05AF8 80A60DE8 8C88022C */ lw $t0, 0x022C($a0) ## 0000022C -/* 05AFC 80A60DEC 258C33E8 */ addiu $t4, %lo(D_801333E8) -/* 05B00 80A60DF0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 05B04 80A60DF4 ACA80004 */ sw $t0, 0x0004($a1) ## 00000220 -/* 05B08 80A60DF8 8C890230 */ lw $t1, 0x0230($a0) ## 00000230 -/* 05B0C 80A60DFC ACA90008 */ sw $t1, 0x0008($a1) ## 00000224 -/* 05B10 80A60E00 8C8A01F0 */ lw $t2, 0x01F0($a0) ## 000001F0 -/* 05B14 80A60E04 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 05B18 80A60E08 000A5900 */ sll $t3, $t2, 4 -/* 05B1C 80A60E0C 05630005 */ bgezl $t3, .L80A60E24 -/* 05B20 80A60E10 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -/* 05B24 80A60E14 AFA70010 */ sw $a3, 0x0010($sp) -/* 05B28 80A60E18 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 05B2C 80A60E1C AFAC0014 */ sw $t4, 0x0014($sp) -/* 05B30 80A60E20 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -.L80A60E24: -/* 05B34 80A60E24 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 05B38 80A60E28 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 05B3C 80A60E2C 000D7080 */ sll $t6, $t5, 2 -/* 05B40 80A60E30 01EE7821 */ addu $t7, $t7, $t6 -/* 05B44 80A60E34 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 05B48 80A60E38 0018C880 */ sll $t9, $t8, 2 -/* 05B4C 80A60E3C 01F94021 */ addu $t0, $t7, $t9 -/* 05B50 80A60E40 0C028800 */ jal Animation_GetLastFrame - -/* 05B54 80A60E44 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 05B58 80A60E48 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 05B5C 80A60E4C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 05B60 80A60E50 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 05B64 80A60E54 00095080 */ sll $t2, $t1, 2 -/* 05B68 80A60E58 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 05B6C 80A60E5C 016A5821 */ addu $t3, $t3, $t2 -/* 05B70 80A60E60 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05B74 80A60E64 468021A0 */ cvt.s.w $f6, $f4 -/* 05B78 80A60E68 000C6880 */ sll $t5, $t4, 2 -/* 05B7C 80A60E6C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 05B80 80A60E70 016D7021 */ addu $t6, $t3, $t5 -/* 05B84 80A60E74 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 05B88 80A60E78 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 05B8C 80A60E7C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 05B90 80A60E80 AFB80014 */ sw $t8, 0x0014($sp) -/* 05B94 80A60E84 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 05B98 80A60E88 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 05B9C 80A60E8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05BA0 80A60E90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05BA4 80A60E94 0C029468 */ jal Animation_Change - -/* 05BA8 80A60E98 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 05BAC 80A60E9C 8FBF002C */ lw $ra, 0x002C($sp) -/* 05BB0 80A60EA0 8FB00028 */ lw $s0, 0x0028($sp) -/* 05BB4 80A60EA4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 05BB8 80A60EA8 03E00008 */ jr $ra -/* 05BBC 80A60EAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s deleted file mode 100644 index 02499922da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel func_80A60EB0 -/* 05BC0 80A60EB0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 05BC4 80A60EB4 AFBF002C */ sw $ra, 0x002C($sp) -/* 05BC8 80A60EB8 AFB00028 */ sw $s0, 0x0028($sp) -/* 05BCC 80A60EBC AFA5003C */ sw $a1, 0x003C($sp) -/* 05BD0 80A60EC0 AFA60040 */ sw $a2, 0x0040($sp) -/* 05BD4 80A60EC4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 05BD8 80A60EC8 44813000 */ mtc1 $at, $f6 ## $f6 = 25.00 -/* 05BDC 80A60ECC C4880214 */ lwc1 $f8, 0x0214($a0) ## 00000214 -/* 05BE0 80A60ED0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 05BE4 80A60ED4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05BE8 80A60ED8 4608303C */ c.lt.s $f6, $f8 -/* 05BEC 80A60EDC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 05BF0 80A60EE0 45020011 */ bc1fl .L80A60F28 -/* 05BF4 80A60EE4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 05BF8 80A60EE8 8C8201F0 */ lw $v0, 0x01F0($a0) ## 0000039C -/* 05BFC 80A60EEC 3C078013 */ lui $a3, %hi(D_801333E0) -/* 05C00 80A60EF0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 05C04 80A60EF4 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 -/* 05C08 80A60EF8 15C0000A */ bne $t6, $zero, .L80A60F24 -/* 05C0C 80A60EFC 344F0800 */ ori $t7, $v0, 0x0800 ## $t7 = 00000800 -/* 05C10 80A60F00 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 0000039C -/* 05C14 80A60F04 3C188013 */ lui $t8, %hi(D_801333E8) -/* 05C18 80A60F08 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 05C1C 80A60F0C AFB80014 */ sw $t8, 0x0014($sp) -/* 05C20 80A60F10 AFA70010 */ sw $a3, 0x0010($sp) -/* 05C24 80A60F14 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B -/* 05C28 80A60F18 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 05C2C 80A60F1C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 05C30 80A60F20 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80A60F24: -/* 05C34 80A60F24 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -.L80A60F28: -/* 05C38 80A60F28 0C02927F */ jal SkelAnime_Update - -/* 05C3C 80A60F2C AFA40030 */ sw $a0, 0x0030($sp) -/* 05C40 80A60F30 50400045 */ beql $v0, $zero, .L80A61048 -/* 05C44 80A60F34 8FBF002C */ lw $ra, 0x002C($sp) -/* 05C48 80A60F38 96020384 */ lhu $v0, 0x0384($s0) ## 00000384 -/* 05C4C 80A60F3C AE000210 */ sw $zero, 0x0210($s0) ## 00000210 -/* 05C50 80A60F40 30590004 */ andi $t9, $v0, 0x0004 ## $t9 = 00000000 -/* 05C54 80A60F44 17200022 */ bne $t9, $zero, .L80A60FD0 -/* 05C58 80A60F48 34480004 */ ori $t0, $v0, 0x0004 ## $t0 = 00000004 -/* 05C5C 80A60F4C 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 05C60 80A60F50 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 05C64 80A60F54 A6080384 */ sh $t0, 0x0384($s0) ## 00000384 -/* 05C68 80A60F58 00095080 */ sll $t2, $t1, 2 -/* 05C6C 80A60F5C 016A5821 */ addu $t3, $t3, $t2 -/* 05C70 80A60F60 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05C74 80A60F64 00006880 */ sll $t5, $zero, 2 -/* 05C78 80A60F68 016D7021 */ addu $t6, $t3, $t5 -/* 05C7C 80A60F6C 0C028800 */ jal Animation_GetLastFrame - -/* 05C80 80A60F70 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 05C84 80A60F74 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 -/* 05C88 80A60F78 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 05C8C 80A60F7C 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 -/* 05C90 80A60F80 000FC080 */ sll $t8, $t7, 2 -/* 05C94 80A60F84 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 -/* 05C98 80A60F88 0338C821 */ addu $t9, $t9, $t8 -/* 05C9C 80A60F8C 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) -/* 05CA0 80A60F90 46805420 */ cvt.s.w $f16, $f10 -/* 05CA4 80A60F94 00084880 */ sll $t1, $t0, 2 -/* 05CA8 80A60F98 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 05CAC 80A60F9C 03295021 */ addu $t2, $t9, $t1 -/* 05CB0 80A60FA0 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 -/* 05CB4 80A60FA4 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 05CB8 80A60FA8 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 05CBC 80A60FAC AFAC0014 */ sw $t4, 0x0014($sp) -/* 05CC0 80A60FB0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 05CC4 80A60FB4 8FA40030 */ lw $a0, 0x0030($sp) -/* 05CC8 80A60FB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05CCC 80A60FBC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05CD0 80A60FC0 0C029468 */ jal Animation_Change - -/* 05CD4 80A60FC4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 05CD8 80A60FC8 1000001F */ beq $zero, $zero, .L80A61048 -/* 05CDC 80A60FCC 8FBF002C */ lw $ra, 0x002C($sp) -.L80A60FD0: -/* 05CE0 80A60FD0 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 -/* 05CE4 80A60FD4 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 -/* 05CE8 80A60FD8 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 -/* 05CEC 80A60FDC 000B6880 */ sll $t5, $t3, 2 -/* 05CF0 80A60FE0 01CD7021 */ addu $t6, $t6, $t5 -/* 05CF4 80A60FE4 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 05CF8 80A60FE8 000FC080 */ sll $t8, $t7, 2 -/* 05CFC 80A60FEC 01D84021 */ addu $t0, $t6, $t8 -/* 05D00 80A60FF0 0C028800 */ jal Animation_GetLastFrame - -/* 05D04 80A60FF4 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 05D08 80A60FF8 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 -/* 05D0C 80A60FFC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 05D10 80A61000 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 -/* 05D14 80A61004 00194880 */ sll $t1, $t9, 2 -/* 05D18 80A61008 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 05D1C 80A6100C 01495021 */ addu $t2, $t2, $t1 -/* 05D20 80A61010 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) -/* 05D24 80A61014 468021A0 */ cvt.s.w $f6, $f4 -/* 05D28 80A61018 000C5880 */ sll $t3, $t4, 2 -/* 05D2C 80A6101C 014B6821 */ addu $t5, $t2, $t3 -/* 05D30 80A61020 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 05D34 80A61024 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 05D38 80A61028 AFA00014 */ sw $zero, 0x0014($sp) -/* 05D3C 80A6102C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 05D40 80A61030 8FA40030 */ lw $a0, 0x0030($sp) -/* 05D44 80A61034 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05D48 80A61038 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05D4C 80A6103C 0C029468 */ jal Animation_Change - -/* 05D50 80A61040 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 05D54 80A61044 8FBF002C */ lw $ra, 0x002C($sp) -.L80A61048: -/* 05D58 80A61048 8FB00028 */ lw $s0, 0x0028($sp) -/* 05D5C 80A6104C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 05D60 80A61050 03E00008 */ jr $ra -/* 05D64 80A61054 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61058.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61058.s deleted file mode 100644 index 8ba508f0d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61058.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80A61058 -/* 05D68 80A61058 AFA50004 */ sw $a1, 0x0004($sp) -/* 05D6C 80A6105C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 05D70 80A61060 240E0011 */ addiu $t6, $zero, 0x0011 ## $t6 = 00000011 -/* 05D74 80A61064 AC80020C */ sw $zero, 0x020C($a0) ## 0000020C -/* 05D78 80A61068 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 05D7C 80A6106C AC800380 */ sw $zero, 0x0380($a0) ## 00000380 -/* 05D80 80A61070 03E00008 */ jr $ra -/* 05D84 80A61074 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61078.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61078.s deleted file mode 100644 index 61a8f37bf8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61078.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80A61078 -/* 05D88 80A61078 3C0580A6 */ lui $a1, %hi(D_80A666D4) ## $a1 = 80A60000 -/* 05D8C 80A6107C 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -/* 05D90 80A61080 24A566D4 */ addiu $a1, $a1, %lo(D_80A666D4) ## $a1 = 80A666D4 -/* 05D94 80A61084 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A61088: -/* 05D98 80A61088 8CA60000 */ lw $a2, 0x0000($a1) ## 80A666D4 -/* 05D9C 80A6108C 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 05DA0 80A61090 14860003 */ bne $a0, $a2, .L80A610A0 -/* 05DA4 80A61094 0086082A */ slt $at, $a0, $a2 -/* 05DA8 80A61098 03E00008 */ jr $ra -/* 05DAC 80A6109C 8CA20004 */ lw $v0, 0x0004($a1) ## 80A666D8 -.L80A610A0: -/* 05DB0 80A610A0 50200004 */ beql $at, $zero, .L80A610B4 -/* 05DB4 80A610A4 0062082A */ slt $at, $v1, $v0 -/* 05DB8 80A610A8 03E00008 */ jr $ra -/* 05DBC 80A610AC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A610B0: -/* 05DC0 80A610B0 0062082A */ slt $at, $v1, $v0 -.L80A610B4: -/* 05DC4 80A610B4 1420FFF4 */ bne $at, $zero, .L80A61088 -/* 05DC8 80A610B8 24A50008 */ addiu $a1, $a1, 0x0008 ## $a1 = 80A666DC -/* 05DCC 80A610BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 05DD0 80A610C0 03E00008 */ jr $ra -/* 05DD4 80A610C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A610C8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A610C8.s deleted file mode 100644 index 2acf63fd3e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A610C8.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_80A610C8 -/* 05DD8 80A610C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05DDC 80A610CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 05DE0 80A610D0 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 05DE4 80A610D4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 05DE8 80A610D8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 05DEC 80A610DC 15C1000A */ bne $t6, $at, .L80A61108 -/* 05DF0 80A610E0 8CA61D88 */ lw $a2, 0x1D88($a1) ## 00001D88 -/* 05DF4 80A610E4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 05DF8 80A610E8 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 05DFC 80A610EC 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 05E00 80A610F0 AC8F020C */ sw $t7, 0x020C($a0) ## 0000020C -/* 05E04 80A610F4 A498001C */ sh $t8, 0x001C($a0) ## 0000001C -/* 05E08 80A610F8 0C29723F */ jal func_80A5C8FC -/* 05E0C 80A610FC AC99014C */ sw $t9, 0x014C($a0) ## 0000014C -/* 05E10 80A61100 10000043 */ beq $zero, $zero, .L80A61210 -/* 05E14 80A61104 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A61108: -/* 05E18 80A61108 50C00041 */ beql $a2, $zero, .L80A61210 -/* 05E1C 80A6110C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05E20 80A61110 94C40000 */ lhu $a0, 0x0000($a2) ## 00000000 -/* 05E24 80A61114 AFA70020 */ sw $a3, 0x0020($sp) -/* 05E28 80A61118 AFA60018 */ sw $a2, 0x0018($sp) -/* 05E2C 80A6111C 0C29841E */ jal func_80A61078 -/* 05E30 80A61120 AFA50024 */ sw $a1, 0x0024($sp) -/* 05E34 80A61124 8FA50024 */ lw $a1, 0x0024($sp) -/* 05E38 80A61128 8FA60018 */ lw $a2, 0x0018($sp) -/* 05E3C 80A6112C 8FA70020 */ lw $a3, 0x0020($sp) -/* 05E40 80A61130 10400036 */ beq $v0, $zero, .L80A6120C -/* 05E44 80A61134 00404025 */ or $t0, $v0, $zero ## $t0 = 00000000 -/* 05E48 80A61138 8CE30380 */ lw $v1, 0x0380($a3) ## 00000380 -/* 05E4C 80A6113C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 05E50 80A61140 0008C880 */ sll $t9, $t0, 2 -/* 05E54 80A61144 1043002A */ beq $v0, $v1, .L80A611F0 -/* 05E58 80A61148 3C0180A6 */ lui $at, %hi(D_80A666A4) ## $at = 80A60000 -/* 05E5C 80A6114C 1460001E */ bne $v1, $zero, .L80A611C8 -/* 05E60 80A61150 00390821 */ addu $at, $at, $t9 -/* 05E64 80A61154 8CC9000C */ lw $t1, 0x000C($a2) ## 0000000C -/* 05E68 80A61158 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 05E6C 80A6115C 00000000 */ nop -/* 05E70 80A61160 468021A0 */ cvt.s.w $f6, $f4 -/* 05E74 80A61164 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 05E78 80A61168 8CCA0010 */ lw $t2, 0x0010($a2) ## 00000010 -/* 05E7C 80A6116C 8CF80024 */ lw $t8, 0x0024($a3) ## 00000024 -/* 05E80 80A61170 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 05E84 80A61174 00000000 */ nop -/* 05E88 80A61178 468042A0 */ cvt.s.w $f10, $f8 -/* 05E8C 80A6117C E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 05E90 80A61180 8CCB0014 */ lw $t3, 0x0014($a2) ## 00000014 -/* 05E94 80A61184 8CEF0028 */ lw $t7, 0x0028($a3) ## 00000028 -/* 05E98 80A61188 448B8000 */ mtc1 $t3, $f16 ## $f16 = 0.00 -/* 05E9C 80A6118C 00000000 */ nop -/* 05EA0 80A61190 468084A0 */ cvt.s.w $f18, $f16 -/* 05EA4 80A61194 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 05EA8 80A61198 94CC0008 */ lhu $t4, 0x0008($a2) ## 00000008 -/* 05EAC 80A6119C ACF80100 */ sw $t8, 0x0100($a3) ## 00000100 -/* 05EB0 80A611A0 8CF8002C */ lw $t8, 0x002C($a3) ## 0000002C -/* 05EB4 80A611A4 A4EC0032 */ sh $t4, 0x0032($a3) ## 00000032 -/* 05EB8 80A611A8 88EE0030 */ lwl $t6, 0x0030($a3) ## 00000030 -/* 05EBC 80A611AC 98EE0033 */ lwr $t6, 0x0033($a3) ## 00000033 -/* 05EC0 80A611B0 ACEF0104 */ sw $t7, 0x0104($a3) ## 00000104 -/* 05EC4 80A611B4 ACF80108 */ sw $t8, 0x0108($a3) ## 00000108 -/* 05EC8 80A611B8 A8EE00B4 */ swl $t6, 0x00B4($a3) ## 000000B4 -/* 05ECC 80A611BC B8EE00B7 */ swr $t6, 0x00B7($a3) ## 000000B7 -/* 05ED0 80A611C0 94EE0034 */ lhu $t6, 0x0034($a3) ## 00000034 -/* 05ED4 80A611C4 A4EE00B8 */ sh $t6, 0x00B8($a3) ## 000000B8 -.L80A611C8: -/* 05ED8 80A611C8 ACE80380 */ sw $t0, 0x0380($a3) ## 00000380 -/* 05EDC 80A611CC 8C3966A4 */ lw $t9, %lo(D_80A666A4)($at) -/* 05EE0 80A611D0 AFA70020 */ sw $a3, 0x0020($sp) -/* 05EE4 80A611D4 AFA60018 */ sw $a2, 0x0018($sp) -/* 05EE8 80A611D8 0320F809 */ jalr $ra, $t9 -/* 05EEC 80A611DC AFA50024 */ sw $a1, 0x0024($sp) -/* 05EF0 80A611E0 8FA70020 */ lw $a3, 0x0020($sp) -/* 05EF4 80A611E4 8FA50024 */ lw $a1, 0x0024($sp) -/* 05EF8 80A611E8 8FA60018 */ lw $a2, 0x0018($sp) -/* 05EFC 80A611EC 8CE30380 */ lw $v1, 0x0380($a3) ## 00000380 -.L80A611F0: -/* 05F00 80A611F0 00034880 */ sll $t1, $v1, 2 -/* 05F04 80A611F4 3C1980A6 */ lui $t9, %hi(D_80A666BC) ## $t9 = 80A60000 -/* 05F08 80A611F8 0329C821 */ addu $t9, $t9, $t1 -/* 05F0C 80A611FC 8F3966BC */ lw $t9, %lo(D_80A666BC)($t9) -/* 05F10 80A61200 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 05F14 80A61204 0320F809 */ jalr $ra, $t9 -/* 05F18 80A61208 00000000 */ nop -.L80A6120C: -/* 05F1C 80A6120C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A61210: -/* 05F20 80A61210 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05F24 80A61214 03E00008 */ jr $ra -/* 05F28 80A61218 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s deleted file mode 100644 index 055267562f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s +++ /dev/null @@ -1,138 +0,0 @@ -.late_rodata -glabel D_80A66920 - .float 0.4 - -glabel D_80A66924 - .float 0.4 - -.text -glabel func_80A6121C -/* 05F2C 80A6121C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 05F30 80A61220 AFB10020 */ sw $s1, 0x0020($sp) -/* 05F34 80A61224 AFB0001C */ sw $s0, 0x001C($sp) -/* 05F38 80A61228 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05F3C 80A6122C AFBF0024 */ sw $ra, 0x0024($sp) -/* 05F40 80A61230 AFA5004C */ sw $a1, 0x004C($sp) -/* 05F44 80A61234 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 05F48 80A61238 8CC40004 */ lw $a0, 0x0004($a2) ## 00000004 -/* 05F4C 80A6123C 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFF4 -/* 05F50 80A61240 0C296D64 */ jal func_80A5B590 -/* 05F54 80A61244 8E050204 */ lw $a1, 0x0204($s0) ## 00000204 -/* 05F58 80A61248 8E0F0204 */ lw $t7, 0x0204($s0) ## 00000204 -/* 05F5C 80A6124C 8E2E0004 */ lw $t6, 0x0004($s1) ## 00000004 -/* 05F60 80A61250 27A80030 */ addiu $t0, $sp, 0x0030 ## $t0 = FFFFFFE8 -/* 05F64 80A61254 000FC080 */ sll $t8, $t7, 2 -/* 05F68 80A61258 030FC021 */ addu $t8, $t8, $t7 -/* 05F6C 80A6125C 0018C040 */ sll $t8, $t8, 1 -/* 05F70 80A61260 01D8C821 */ addu $t9, $t6, $t8 -/* 05F74 80A61264 87250008 */ lh $a1, 0x0008($t9) ## 00000008 -/* 05F78 80A61268 AFA80010 */ sw $t0, 0x0010($sp) -/* 05F7C 80A6126C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFF4 -/* 05F80 80A61270 27A60038 */ addiu $a2, $sp, 0x0038 ## $a2 = FFFFFFF0 -/* 05F84 80A61274 0C033209 */ jal Math3D_RotateXZPlane -/* 05F88 80A61278 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFEC -/* 05F8C 80A6127C 8E2A0000 */ lw $t2, 0x0000($s1) ## 00000000 -/* 05F90 80A61280 8E090204 */ lw $t1, 0x0204($s0) ## 00000204 -/* 05F94 80A61284 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFF4 -/* 05F98 80A61288 254BFFFF */ addiu $t3, $t2, 0xFFFF ## $t3 = FFFFFFFF -/* 05F9C 80A6128C 012B082A */ slt $at, $t1, $t3 -/* 05FA0 80A61290 54200011 */ bnel $at, $zero, .L80A612D8 -/* 05FA4 80A61294 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 05FA8 80A61298 0C032D9E */ jal Math3D_Vec3f_DistXYZ -/* 05FAC 80A6129C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 05FB0 80A612A0 3C0C8016 */ lui $t4, %hi(gGameInfo) -/* 05FB4 80A612A4 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) -/* 05FB8 80A612A8 858D0564 */ lh $t5, 0x0564($t4) ## 80160564 -/* 05FBC 80A612AC 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 05FC0 80A612B0 00000000 */ nop -/* 05FC4 80A612B4 468021A0 */ cvt.s.w $f6, $f4 -/* 05FC8 80A612B8 4606003C */ c.lt.s $f0, $f6 -/* 05FCC 80A612BC 00000000 */ nop -/* 05FD0 80A612C0 45020005 */ bc1fl .L80A612D8 -/* 05FD4 80A612C4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 05FD8 80A612C8 8E0F03A4 */ lw $t7, 0x03A4($s0) ## 000003A4 -/* 05FDC 80A612CC 35EE0002 */ ori $t6, $t7, 0x0002 ## $t6 = 00000002 -/* 05FE0 80A612D0 AE0E03A4 */ sw $t6, 0x03A4($s0) ## 000003A4 -/* 05FE4 80A612D4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -.L80A612D8: -/* 05FE8 80A612D8 C7AA0038 */ lwc1 $f10, 0x0038($sp) -/* 05FEC 80A612DC C7B20034 */ lwc1 $f18, 0x0034($sp) -/* 05FF0 80A612E0 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 05FF4 80A612E4 460A4402 */ mul.s $f16, $f8, $f10 -/* 05FF8 80A612E8 C7AA0030 */ lwc1 $f10, 0x0030($sp) -/* 05FFC 80A612EC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 06000 80A612F0 46049182 */ mul.s $f6, $f18, $f4 -/* 06004 80A612F4 46068200 */ add.s $f8, $f16, $f6 -/* 06008 80A612F8 460A4480 */ add.s $f18, $f8, $f10 -/* 0600C 80A612FC 4612103C */ c.lt.s $f2, $f18 -/* 06010 80A61300 00000000 */ nop -/* 06014 80A61304 4502000E */ bc1fl .L80A61340 -/* 06018 80A61308 8E0C03A4 */ lw $t4, 0x03A4($s0) ## 000003A4 -/* 0601C 80A6130C 8E180204 */ lw $t8, 0x0204($s0) ## 00000204 -/* 06020 80A61310 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 06024 80A61314 AE190204 */ sw $t9, 0x0204($s0) ## 00000204 -/* 06028 80A61318 8E2A0000 */ lw $t2, 0x0000($s1) ## 00000000 -/* 0602C 80A6131C 032A082A */ slt $at, $t9, $t2 -/* 06030 80A61320 54200007 */ bnel $at, $zero, .L80A61340 -/* 06034 80A61324 8E0C03A4 */ lw $t4, 0x03A4($s0) ## 000003A4 -/* 06038 80A61328 8E0903A4 */ lw $t1, 0x03A4($s0) ## 000003A4 -/* 0603C 80A6132C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 06040 80A61330 352B0001 */ ori $t3, $t1, 0x0001 ## $t3 = 00000001 -/* 06044 80A61334 10000030 */ beq $zero, $zero, .L80A613F8 -/* 06048 80A61338 AE0B03A4 */ sw $t3, 0x03A4($s0) ## 000003A4 -/* 0604C 80A6133C 8E0C03A4 */ lw $t4, 0x03A4($s0) ## 000003A4 -.L80A61340: -/* 06050 80A61340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06054 80A61344 8FA5004C */ lw $a1, 0x004C($sp) -/* 06058 80A61348 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 0605C 80A6134C 15A00005 */ bne $t5, $zero, .L80A61364 -/* 06060 80A61350 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFF4 -/* 06064 80A61354 0C296D78 */ jal func_80A5B5E0 -/* 06068 80A61358 24070320 */ addiu $a3, $zero, 0x0320 ## $a3 = 00000320 -/* 0606C 80A6135C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 06070 80A61360 00000000 */ nop -.L80A61364: -/* 06074 80A61364 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 06078 80A61368 8E180204 */ lw $t8, 0x0204($s0) ## 00000204 -/* 0607C 80A6136C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 06080 80A61370 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 06084 80A61374 8E2E0004 */ lw $t6, 0x0004($s1) ## 00000004 -/* 06088 80A61378 0018C880 */ sll $t9, $t8, 2 -/* 0608C 80A6137C 0338C821 */ addu $t9, $t9, $t8 -/* 06090 80A61380 0019C840 */ sll $t9, $t9, 1 -/* 06094 80A61384 01D94021 */ addu $t0, $t6, $t9 -/* 06098 80A61388 850A0006 */ lh $t2, 0x0006($t0) ## 00000006 -/* 0609C 80A6138C 3C0180A6 */ lui $at, %hi(D_80A66924) ## $at = 80A60000 -/* 060A0 80A61390 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 060A4 80A61394 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 060A8 80A61398 00000000 */ nop -/* 060AC 80A6139C 46802420 */ cvt.s.w $f16, $f4 -/* 060B0 80A613A0 4610003C */ c.lt.s $f0, $f16 -/* 060B4 80A613A4 00000000 */ nop -/* 060B8 80A613A8 4500000A */ bc1f .L80A613D4 -/* 060BC 80A613AC 00000000 */ nop -/* 060C0 80A613B0 8E0903A4 */ lw $t1, 0x03A4($s0) ## 000003A4 -/* 060C4 80A613B4 312B0001 */ andi $t3, $t1, 0x0001 ## $t3 = 00000000 -/* 060C8 80A613B8 15600006 */ bne $t3, $zero, .L80A613D4 -/* 060CC 80A613BC 00000000 */ nop -/* 060D0 80A613C0 3C0180A6 */ lui $at, %hi(D_80A66920) ## $at = 80A60000 -/* 060D4 80A613C4 C4266920 */ lwc1 $f6, %lo(D_80A66920)($at) -/* 060D8 80A613C8 46060200 */ add.s $f8, $f0, $f6 -/* 060DC 80A613CC 1000000A */ beq $zero, $zero, .L80A613F8 -/* 060E0 80A613D0 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -.L80A613D4: -/* 060E4 80A613D4 C42A6924 */ lwc1 $f10, %lo(D_80A66924)($at) -/* 060E8 80A613D8 460A0481 */ sub.s $f18, $f0, $f10 -/* 060EC 80A613DC E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 060F0 80A613E0 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 060F4 80A613E4 4602203C */ c.lt.s $f4, $f2 -/* 060F8 80A613E8 00000000 */ nop -/* 060FC 80A613EC 45000002 */ bc1f .L80A613F8 -/* 06100 80A613F0 00000000 */ nop -/* 06104 80A613F4 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -.L80A613F8: -/* 06108 80A613F8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0610C 80A613FC 8FB0001C */ lw $s0, 0x001C($sp) -/* 06110 80A61400 8FB10020 */ lw $s1, 0x0020($sp) -/* 06114 80A61404 03E00008 */ jr $ra -/* 06118 80A61408 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6140C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6140C.s deleted file mode 100644 index 457532ab56..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6140C.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80A6140C -/* 0611C 80A6140C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06120 80A61410 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06124 80A61414 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 06128 80A61418 AC8003A0 */ sw $zero, 0x03A0($a0) ## 000003A0 -/* 0612C 80A6141C AC800218 */ sw $zero, 0x0218($a0) ## 00000218 -/* 06130 80A61420 AC800204 */ sw $zero, 0x0204($a0) ## 00000204 -/* 06134 80A61424 AC8003A8 */ sw $zero, 0x03A8($a0) ## 000003A8 -/* 06138 80A61428 0C298510 */ jal func_80A61440 -/* 0613C 80A6142C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 06140 80A61430 8FBF0014 */ lw $ra, 0x0014($sp) -/* 06144 80A61434 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06148 80A61438 03E00008 */ jr $ra -/* 0614C 80A6143C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s deleted file mode 100644 index 001c7c309f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s +++ /dev/null @@ -1,231 +0,0 @@ -.late_rodata -glabel D_80A66928 - .float 0.2 - -.text -glabel func_80A61440 -/* 06150 80A61440 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 06154 80A61444 AFBF002C */ sw $ra, 0x002C($sp) -/* 06158 80A61448 AFB00028 */ sw $s0, 0x0028($sp) -/* 0615C 80A6144C C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 06160 80A61450 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 06164 80A61454 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 06168 80A61458 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0616C 80A6145C 46002032 */ c.eq.s $f4, $f0 -/* 06170 80A61460 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 06174 80A61464 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 06178 80A61468 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 0617C 80A6146C 45000009 */ bc1f .L80A61494 -/* 06180 80A61470 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 06184 80A61474 8C8F0210 */ lw $t7, 0x0210($a0) ## 00000210 -/* 06188 80A61478 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 0618C 80A6147C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 06190 80A61480 11E00002 */ beq $t7, $zero, .L80A6148C -/* 06194 80A61484 00000000 */ nop -/* 06198 80A61488 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80A6148C: -/* 0619C 80A6148C 10000024 */ beq $zero, $zero, .L80A61520 -/* 061A0 80A61490 AE000210 */ sw $zero, 0x0210($s0) ## 00000210 -.L80A61494: -/* 061A4 80A61494 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 061A8 80A61498 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 061AC 80A6149C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 061B0 80A614A0 4606003E */ c.le.s $f0, $f6 -/* 061B4 80A614A4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 061B8 80A614A8 45020009 */ bc1fl .L80A614D0 -/* 061BC 80A614AC 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 061C0 80A614B0 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 061C4 80A614B4 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 061C8 80A614B8 10980002 */ beq $a0, $t8, .L80A614C4 -/* 061CC 80A614BC 00000000 */ nop -/* 061D0 80A614C0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80A614C4: -/* 061D4 80A614C4 10000016 */ beq $zero, $zero, .L80A61520 -/* 061D8 80A614C8 AE040210 */ sw $a0, 0x0210($s0) ## 00000210 -/* 061DC 80A614CC 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -.L80A614D0: -/* 061E0 80A614D0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 061E4 80A614D4 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 061E8 80A614D8 4608003E */ c.le.s $f0, $f8 -/* 061EC 80A614DC 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 061F0 80A614E0 4502000A */ bc1fl .L80A6150C -/* 061F4 80A614E4 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 -/* 061F8 80A614E8 8E190210 */ lw $t9, 0x0210($s0) ## 00000210 -/* 061FC 80A614EC 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 06200 80A614F0 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 06204 80A614F4 10B90002 */ beq $a1, $t9, .L80A61500 -/* 06208 80A614F8 00000000 */ nop -/* 0620C 80A614FC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80A61500: -/* 06210 80A61500 10000007 */ beq $zero, $zero, .L80A61520 -/* 06214 80A61504 AE050210 */ sw $a1, 0x0210($s0) ## 00000210 -/* 06218 80A61508 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 -.L80A6150C: -/* 0621C 80A6150C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 06220 80A61510 50C80003 */ beql $a2, $t0, .L80A61520 -/* 06224 80A61514 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -/* 06228 80A61518 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 0622C 80A6151C AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -.L80A61520: -/* 06230 80A61520 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -/* 06234 80A61524 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 06238 80A61528 14820007 */ bne $a0, $v0, .L80A61548 -/* 0623C 80A6152C 00000000 */ nop -/* 06240 80A61530 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 06244 80A61534 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 06248 80A61538 00000000 */ nop -/* 0624C 80A6153C 46105482 */ mul.s $f18, $f10, $f16 -/* 06250 80A61540 10000037 */ beq $zero, $zero, .L80A61620 -/* 06254 80A61544 E7B20030 */ swc1 $f18, 0x0030($sp) -.L80A61548: -/* 06258 80A61548 14A20018 */ bne $a1, $v0, .L80A615AC -/* 0625C 80A6154C 3C078013 */ lui $a3, %hi(D_801333E0) -/* 06260 80A61550 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 06264 80A61554 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 -/* 06268 80A61558 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 0626C 80A6155C 3C098013 */ lui $t1, %hi(D_801333E8) -/* 06270 80A61560 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 06274 80A61564 46062202 */ mul.s $f8, $f4, $f6 -/* 06278 80A61568 252933E8 */ addiu $t1, %lo(D_801333E8) -/* 0627C 80A6156C AFA90014 */ sw $t1, 0x0014($sp) -/* 06280 80A61570 AFA70010 */ sw $a3, 0x0010($sp) -/* 06284 80A61574 AFA30034 */ sw $v1, 0x0034($sp) -/* 06288 80A61578 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 -/* 0628C 80A6157C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 06290 80A61580 E7A80030 */ swc1 $f8, 0x0030($sp) -/* 06294 80A61584 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 06298 80A61588 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0629C 80A6158C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 062A0 80A61590 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 062A4 80A61594 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 062A8 80A61598 0C02A800 */ jal func_800AA000 -/* 062AC 80A6159C 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 062B0 80A615A0 8FA30034 */ lw $v1, 0x0034($sp) -/* 062B4 80A615A4 1000001E */ beq $zero, $zero, .L80A61620 -/* 062B8 80A615A8 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -.L80A615AC: -/* 062BC 80A615AC 14C20019 */ bne $a2, $v0, .L80A61614 -/* 062C0 80A615B0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 062C4 80A615B4 3C0180A6 */ lui $at, %hi(D_80A66928) ## $at = 80A60000 -/* 062C8 80A615B8 C4306928 */ lwc1 $f16, %lo(D_80A66928)($at) -/* 062CC 80A615BC C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 062D0 80A615C0 3C078013 */ lui $a3, %hi(D_801333E0) -/* 062D4 80A615C4 3C0A8013 */ lui $t2, %hi(D_801333E8) -/* 062D8 80A615C8 46105482 */ mul.s $f18, $f10, $f16 -/* 062DC 80A615CC 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 062E0 80A615D0 254A33E8 */ addiu $t2, %lo(D_801333E8) -/* 062E4 80A615D4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 062E8 80A615D8 AFA70010 */ sw $a3, 0x0010($sp) -/* 062EC 80A615DC AFA30034 */ sw $v1, 0x0034($sp) -/* 062F0 80A615E0 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 -/* 062F4 80A615E4 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 062F8 80A615E8 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 062FC 80A615EC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 06300 80A615F0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 06304 80A615F4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 06308 80A615F8 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 -/* 0630C 80A615FC 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 06310 80A61600 0C02A800 */ jal func_800AA000 -/* 06314 80A61604 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 06318 80A61608 8FA30034 */ lw $v1, 0x0034($sp) -/* 0631C 80A6160C 10000004 */ beq $zero, $zero, .L80A61620 -/* 06320 80A61610 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 -.L80A61614: -/* 06324 80A61614 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -/* 06328 80A61618 00000000 */ nop -/* 0632C 80A6161C E7A40030 */ swc1 $f4, 0x0030($sp) -.L80A61620: -/* 06330 80A61620 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06334 80A61624 5461002B */ bnel $v1, $at, .L80A616D4 -/* 06338 80A61628 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 -/* 0633C 80A6162C 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 -/* 06340 80A61630 3C0D80A6 */ lui $t5, %hi(D_80A65E58) ## $t5 = 80A60000 -/* 06344 80A61634 00027080 */ sll $t6, $v0, 2 -/* 06348 80A61638 000B6080 */ sll $t4, $t3, 2 -/* 0634C 80A6163C 01AC6821 */ addu $t5, $t5, $t4 -/* 06350 80A61640 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) -/* 06354 80A61644 01AE7821 */ addu $t7, $t5, $t6 -/* 06358 80A61648 0C028800 */ jal Animation_GetLastFrame - -/* 0635C 80A6164C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 06360 80A61650 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 -/* 06364 80A61654 3C0180A6 */ lui $at, %hi(D_80A65E60) ## $at = 80A60000 -/* 06368 80A61658 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 0636C 80A6165C 00031880 */ sll $v1, $v1, 2 -/* 06370 80A61660 00230821 */ addu $at, $at, $v1 -/* 06374 80A61664 C4265E60 */ lwc1 $f6, %lo(D_80A65E60)($at) -/* 06378 80A61668 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0637C 80A6166C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.50 -/* 06380 80A61670 46083282 */ mul.s $f10, $f6, $f8 -/* 06384 80A61674 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 -/* 06388 80A61678 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0638C 80A6167C 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 06390 80A61680 0018C880 */ sll $t9, $t8, 2 -/* 06394 80A61684 01194021 */ addu $t0, $t0, $t9 -/* 06398 80A61688 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 0639C 80A6168C 46105482 */ mul.s $f18, $f10, $f16 -/* 063A0 80A61690 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 063A4 80A61694 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 063A8 80A61698 01034821 */ addu $t1, $t0, $v1 -/* 063AC 80A6169C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 063B0 80A616A0 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 063B4 80A616A4 468021A0 */ cvt.s.w $f6, $f4 -/* 063B8 80A616A8 44069000 */ mfc1 $a2, $f18 -/* 063BC 80A616AC 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 063C0 80A616B0 44070000 */ mfc1 $a3, $f0 -/* 063C4 80A616B4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 063C8 80A616B8 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 063CC 80A616BC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 063D0 80A616C0 0C029468 */ jal Animation_Change - -/* 063D4 80A616C4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 063D8 80A616C8 10000027 */ beq $zero, $zero, .L80A61768 -/* 063DC 80A616CC 8FBF002C */ lw $ra, 0x002C($sp) -/* 063E0 80A616D0 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 -.L80A616D4: -/* 063E4 80A616D4 3C0D80A6 */ lui $t5, %hi(D_80A65E58) ## $t5 = 80A60000 -/* 063E8 80A616D8 00027080 */ sll $t6, $v0, 2 -/* 063EC 80A616DC 000B6080 */ sll $t4, $t3, 2 -/* 063F0 80A616E0 01AC6821 */ addu $t5, $t5, $t4 -/* 063F4 80A616E4 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) -/* 063F8 80A616E8 01AE7821 */ addu $t7, $t5, $t6 -/* 063FC 80A616EC 0C028800 */ jal Animation_GetLastFrame - -/* 06400 80A616F0 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 06404 80A616F4 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 -/* 06408 80A616F8 3C0180A6 */ lui $at, %hi(D_80A65E60) ## $at = 80A60000 -/* 0640C 80A616FC C7B00030 */ lwc1 $f16, 0x0030($sp) -/* 06410 80A61700 00031880 */ sll $v1, $v1, 2 -/* 06414 80A61704 00230821 */ addu $at, $at, $v1 -/* 06418 80A61708 C42A5E60 */ lwc1 $f10, %lo(D_80A65E60)($at) -/* 0641C 80A6170C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 06420 80A61710 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 06424 80A61714 46105482 */ mul.s $f18, $f10, $f16 -/* 06428 80A61718 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 -/* 0642C 80A6171C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 06430 80A61720 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 06434 80A61724 0018C880 */ sll $t9, $t8, 2 -/* 06438 80A61728 01194021 */ addu $t0, $t0, $t9 -/* 0643C 80A6172C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 06440 80A61730 46049182 */ mul.s $f6, $f18, $f4 -/* 06444 80A61734 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 06448 80A61738 01034821 */ addu $t1, $t0, $v1 -/* 0644C 80A6173C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 06450 80A61740 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 06454 80A61744 44070000 */ mfc1 $a3, $f0 -/* 06458 80A61748 468042A0 */ cvt.s.w $f10, $f8 -/* 0645C 80A6174C 44063000 */ mfc1 $a2, $f6 -/* 06460 80A61750 AFAA0014 */ sw $t2, 0x0014($sp) -/* 06464 80A61754 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 06468 80A61758 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0646C 80A6175C 0C029468 */ jal Animation_Change - -/* 06470 80A61760 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 06474 80A61764 8FBF002C */ lw $ra, 0x002C($sp) -.L80A61768: -/* 06478 80A61768 8FB00028 */ lw $s0, 0x0028($sp) -/* 0647C 80A6176C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 06480 80A61770 03E00008 */ jr $ra -/* 06484 80A61774 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s deleted file mode 100644 index dab62ab48b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s +++ /dev/null @@ -1,187 +0,0 @@ -.late_rodata -glabel D_80A6692C - .float 0.2 - -.text -glabel func_80A61778 -/* 06488 80A61778 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0648C 80A6177C AFBF0014 */ sw $ra, 0x0014($sp) -/* 06490 80A61780 8C8E0210 */ lw $t6, 0x0210($a0) ## 00000210 -/* 06494 80A61784 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 06498 80A61788 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0649C 80A6178C 55C10007 */ bnel $t6, $at, .L80A617AC -/* 064A0 80A61790 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 064A4 80A61794 AFA5002C */ sw $a1, 0x002C($sp) -/* 064A8 80A61798 0C296E72 */ jal func_80A5B9C8 -/* 064AC 80A6179C AFA70028 */ sw $a3, 0x0028($sp) -/* 064B0 80A617A0 8FA5002C */ lw $a1, 0x002C($sp) -/* 064B4 80A617A4 8FA70028 */ lw $a3, 0x0028($sp) -/* 064B8 80A617A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L80A617AC: -/* 064BC 80A617AC 00A14021 */ addu $t0, $a1, $at -/* 064C0 80A617B0 950F072E */ lhu $t7, 0x072E($t0) ## 0000072E -/* 064C4 80A617B4 24040041 */ addiu $a0, $zero, 0x0041 ## $a0 = 00000041 -/* 064C8 80A617B8 55E00005 */ bnel $t7, $zero, .L80A617D0 -/* 064CC 80A617BC AFA5002C */ sw $a1, 0x002C($sp) -/* 064D0 80A617C0 8CF803A8 */ lw $t8, 0x03A8($a3) ## 000003A8 -/* 064D4 80A617C4 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 064D8 80A617C8 ACF903A8 */ sw $t9, 0x03A8($a3) ## 000003A8 -/* 064DC 80A617CC AFA5002C */ sw $a1, 0x002C($sp) -.L80A617D0: -/* 064E0 80A617D0 AFA70028 */ sw $a3, 0x0028($sp) -/* 064E4 80A617D4 0C03D696 */ jal func_800F5A58 -/* 064E8 80A617D8 AFA8001C */ sw $t0, 0x001C($sp) -/* 064EC 80A617DC 3C0680A6 */ lui $a2, %hi(D_80A66730) ## $a2 = 80A60000 -/* 064F0 80A617E0 8FA5002C */ lw $a1, 0x002C($sp) -/* 064F4 80A617E4 8FA40028 */ lw $a0, 0x0028($sp) -/* 064F8 80A617E8 AFA20020 */ sw $v0, 0x0020($sp) -/* 064FC 80A617EC 0C298487 */ jal func_80A6121C -/* 06500 80A617F0 24C66730 */ addiu $a2, $a2, %lo(D_80A66730) ## $a2 = 80A66730 -/* 06504 80A617F4 8FA70028 */ lw $a3, 0x0028($sp) -/* 06508 80A617F8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0650C 80A617FC 8FA8001C */ lw $t0, 0x001C($sp) -/* 06510 80A61800 8CE303A4 */ lw $v1, 0x03A4($a3) ## 000003A4 -/* 06514 80A61804 8FAB0020 */ lw $t3, 0x0020($sp) -/* 06518 80A61808 30690001 */ andi $t1, $v1, 0x0001 ## $t1 = 00000000 -/* 0651C 80A6180C 55200005 */ bnel $t1, $zero, .L80A61824 -/* 06520 80A61810 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06524 80A61814 8CEA03A8 */ lw $t2, 0x03A8($a3) ## 000003A8 -/* 06528 80A61818 2941002E */ slti $at, $t2, 0x002E -/* 0652C 80A6181C 14200015 */ bne $at, $zero, .L80A61874 -/* 06530 80A61820 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80A61824: -/* 06534 80A61824 11610013 */ beq $t3, $at, .L80A61874 -/* 06538 80A61828 3C048016 */ lui $a0, %hi(gSaveContext) -/* 0653C 80A6182C 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 06540 80A61830 948C1404 */ lhu $t4, 0x1404($a0) ## 8015FA64 -/* 06544 80A61834 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 06548 80A61838 240D03B0 */ addiu $t5, $zero, 0x03B0 ## $t5 = 000003B0 -/* 0654C 80A6183C 1181000D */ beq $t4, $at, .L80A61874 -/* 06550 80A61840 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 06554 80A61844 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06558 80A61848 AC800008 */ sw $zero, 0x0008($a0) ## 8015E668 -/* 0655C 80A6184C 00250821 */ addu $at, $at, $a1 -/* 06560 80A61850 A42D1E1A */ sh $t5, 0x1E1A($at) ## 00011E1A -/* 06564 80A61854 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06568 80A61858 00250821 */ addu $at, $at, $a1 -/* 0656C 80A6185C A02E1E15 */ sb $t6, 0x1E15($at) ## 00011E15 -/* 06570 80A61860 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06574 80A61864 00250821 */ addu $at, $at, $a1 -/* 06578 80A61868 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 0657C 80A6186C A02F1E5E */ sb $t7, 0x1E5E($at) ## 00011E5E -/* 06580 80A61870 8CE303A4 */ lw $v1, 0x03A4($a3) ## 000003A4 -.L80A61874: -/* 06584 80A61874 9502072E */ lhu $v0, 0x072E($t0) ## 0000072E -/* 06588 80A61878 3C048016 */ lui $a0, %hi(gSaveContext) -/* 0658C 80A6187C 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 06590 80A61880 10400018 */ beq $v0, $zero, .L80A618E4 -/* 06594 80A61884 30780002 */ andi $t8, $v1, 0x0002 ## $t8 = 00000000 -/* 06598 80A61888 17000016 */ bne $t8, $zero, .L80A618E4 -/* 0659C 80A6188C 00000000 */ nop -/* 065A0 80A61890 94990F2A */ lhu $t9, 0x0F2A($a0) ## 8015F58A -/* 065A4 80A61894 33290001 */ andi $t1, $t9, 0x0001 ## $t1 = 00000000 -/* 065A8 80A61898 5120000B */ beql $t1, $zero, .L80A618C8 -/* 065AC 80A6189C 948C1406 */ lhu $t4, 0x1406($a0) ## 8015FA66 -/* 065B0 80A618A0 948A1406 */ lhu $t2, 0x1406($a0) ## 8015FA66 -/* 065B4 80A618A4 346B0004 */ ori $t3, $v1, 0x0004 ## $t3 = 00000004 -/* 065B8 80A618A8 294105DC */ slti $at, $t2, 0x05DC -/* 065BC 80A618AC 1420000D */ bne $at, $zero, .L80A618E4 -/* 065C0 80A618B0 00000000 */ nop -/* 065C4 80A618B4 ACEB03A4 */ sw $t3, 0x03A4($a3) ## 000003A4 -/* 065C8 80A618B8 9502072E */ lhu $v0, 0x072E($t0) ## 0000072E -/* 065CC 80A618BC 10000009 */ beq $zero, $zero, .L80A618E4 -/* 065D0 80A618C0 01601825 */ or $v1, $t3, $zero ## $v1 = 00000004 -/* 065D4 80A618C4 948C1406 */ lhu $t4, 0x1406($a0) ## 8015FA66 -.L80A618C8: -/* 065D8 80A618C8 346D0004 */ ori $t5, $v1, 0x0004 ## $t5 = 00000004 -/* 065DC 80A618CC 298103E8 */ slti $at, $t4, 0x03E8 -/* 065E0 80A618D0 14200004 */ bne $at, $zero, .L80A618E4 -/* 065E4 80A618D4 00000000 */ nop -/* 065E8 80A618D8 ACED03A4 */ sw $t5, 0x03A4($a3) ## 000003A4 -/* 065EC 80A618DC 9502072E */ lhu $v0, 0x072E($t0) ## 0000072E -/* 065F0 80A618E0 01A01825 */ or $v1, $t5, $zero ## $v1 = 00000004 -.L80A618E4: -/* 065F4 80A618E4 10400002 */ beq $v0, $zero, .L80A618F0 -/* 065F8 80A618E8 306E0002 */ andi $t6, $v1, 0x0002 ## $t6 = 00000000 -/* 065FC 80A618EC 11C00009 */ beq $t6, $zero, .L80A61914 -.L80A618F0: -/* 06600 80A618F0 306F0004 */ andi $t7, $v1, 0x0004 ## $t7 = 00000004 -/* 06604 80A618F4 11E00007 */ beq $t7, $zero, .L80A61914 -/* 06608 80A618F8 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB -/* 0660C 80A618FC 0061C024 */ and $t8, $v1, $at -/* 06610 80A61900 ACF803A4 */ sw $t8, 0x03A4($a3) ## 000003A4 -/* 06614 80A61904 AFA70028 */ sw $a3, 0x0028($sp) -/* 06618 80A61908 0C03E803 */ jal Audio_SetBGM - -/* 0661C 80A6190C 24040041 */ addiu $a0, $zero, 0x0041 ## $a0 = 00000041 -/* 06620 80A61910 8FA70028 */ lw $a3, 0x0028($sp) -.L80A61914: -/* 06624 80A61914 8CF903A0 */ lw $t9, 0x03A0($a3) ## 000003A0 -/* 06628 80A61918 5720000A */ bnel $t9, $zero, .L80A61944 -/* 0662C 80A6191C 8CE20210 */ lw $v0, 0x0210($a3) ## 00000210 -/* 06630 80A61920 8CE90210 */ lw $t1, 0x0210($a3) ## 00000210 -/* 06634 80A61924 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 06638 80A61928 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0663C 80A6192C 11200004 */ beq $t1, $zero, .L80A61940 -/* 06640 80A61930 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 06644 80A61934 0C298510 */ jal func_80A61440 -/* 06648 80A61938 AFA70028 */ sw $a3, 0x0028($sp) -/* 0664C 80A6193C 8FA70028 */ lw $a3, 0x0028($sp) -.L80A61940: -/* 06650 80A61940 8CE20210 */ lw $v0, 0x0210($a3) ## 00000210 -.L80A61944: -/* 06654 80A61944 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 06658 80A61948 24E401AC */ addiu $a0, $a3, 0x01AC ## $a0 = 000001AC -/* 0665C 80A6194C 14410006 */ bne $v0, $at, .L80A61968 -/* 06660 80A61950 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 06664 80A61954 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 06668 80A61958 C4E60068 */ lwc1 $f6, 0x0068($a3) ## 00000068 -/* 0666C 80A6195C 46083002 */ mul.s $f0, $f6, $f8 -/* 06670 80A61960 10000015 */ beq $zero, $zero, .L80A619B8 -/* 06674 80A61964 E4E001C8 */ swc1 $f0, 0x01C8($a3) ## 000001C8 -.L80A61968: -/* 06678 80A61968 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0667C 80A6196C 14410006 */ bne $v0, $at, .L80A61988 -/* 06680 80A61970 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 06684 80A61974 44818000 */ mtc1 $at, $f16 ## $f16 = 0.25 -/* 06688 80A61978 C4EA0068 */ lwc1 $f10, 0x0068($a3) ## 00000068 -/* 0668C 80A6197C 46105002 */ mul.s $f0, $f10, $f16 -/* 06690 80A61980 1000000D */ beq $zero, $zero, .L80A619B8 -/* 06694 80A61984 E4E001C8 */ swc1 $f0, 0x01C8($a3) ## 000001C8 -.L80A61988: -/* 06698 80A61988 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0669C 80A6198C 14410006 */ bne $v0, $at, .L80A619A8 -/* 066A0 80A61990 3C0180A6 */ lui $at, %hi(D_80A6692C) ## $at = 80A60000 -/* 066A4 80A61994 C424692C */ lwc1 $f4, %lo(D_80A6692C)($at) -/* 066A8 80A61998 C4F20068 */ lwc1 $f18, 0x0068($a3) ## 00000068 -/* 066AC 80A6199C 46049002 */ mul.s $f0, $f18, $f4 -/* 066B0 80A619A0 10000005 */ beq $zero, $zero, .L80A619B8 -/* 066B4 80A619A4 E4E001C8 */ swc1 $f0, 0x01C8($a3) ## 000001C8 -.L80A619A8: -/* 066B8 80A619A8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 066BC 80A619AC 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 066C0 80A619B0 00000000 */ nop -/* 066C4 80A619B4 E4E001C8 */ swc1 $f0, 0x01C8($a3) ## 000001C8 -.L80A619B8: -/* 066C8 80A619B8 0C02927F */ jal SkelAnime_Update - -/* 066CC 80A619BC AFA70028 */ sw $a3, 0x0028($sp) -/* 066D0 80A619C0 1440000A */ bne $v0, $zero, .L80A619EC -/* 066D4 80A619C4 8FA70028 */ lw $a3, 0x0028($sp) -/* 066D8 80A619C8 8CEA0210 */ lw $t2, 0x0210($a3) ## 00000210 -/* 066DC 80A619CC 5540000A */ bnel $t2, $zero, .L80A619F8 -/* 066E0 80A619D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 066E4 80A619D4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 066E8 80A619D8 C4E80068 */ lwc1 $f8, 0x0068($a3) ## 00000068 -/* 066EC 80A619DC 46083032 */ c.eq.s $f6, $f8 -/* 066F0 80A619E0 00000000 */ nop -/* 066F4 80A619E4 45030004 */ bc1tl .L80A619F8 -/* 066F8 80A619E8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A619EC: -/* 066FC 80A619EC 0C298510 */ jal func_80A61440 -/* 06700 80A619F0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 06704 80A619F4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A619F8: -/* 06708 80A619F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0670C 80A619FC 03E00008 */ jr $ra -/* 06710 80A61A00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A04.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A04.s deleted file mode 100644 index 5df28edbd7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A04.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A61A04 -/* 06714 80A61A04 8C8F01F0 */ lw $t7, 0x01F0($a0) ## 000001F0 -/* 06718 80A61A08 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0671C 80A61A0C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06720 80A61A10 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 -/* 06724 80A61A14 01E1C025 */ or $t8, $t7, $at ## $t8 = 00010000 -/* 06728 80A61A18 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 0672C 80A61A1C AC9801F0 */ sw $t8, 0x01F0($a0) ## 000001F0 -/* 06730 80A61A20 03E00008 */ jr $ra -/* 06734 80A61A24 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s deleted file mode 100644 index 67c2b50ac3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s +++ /dev/null @@ -1,606 +0,0 @@ -.late_rodata -glabel D_80A66930 - .float 0.4 - -glabel D_80A66934 - .word 0x3EF0A3D7 -glabel D_80A66938 - .float 0.4 - -glabel D_80A6693C - .word 0x3EF0A3D7 -glabel D_80A66940 - .float 0.3 - -glabel D_80A66944 - .float 0.1 - -.text -glabel func_80A61A28 -/* 06738 80A61A28 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 0673C 80A61A2C AFBF002C */ sw $ra, 0x002C($sp) -/* 06740 80A61A30 AFB00028 */ sw $s0, 0x0028($sp) -/* 06744 80A61A34 AFA50064 */ sw $a1, 0x0064($sp) -/* 06748 80A61A38 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 0674C 80A61A3C 3C188016 */ lui $t8, %hi(gGameInfo) -/* 06750 80A61A40 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 06754 80A61A44 AFAF005C */ sw $t7, 0x005C($sp) -/* 06758 80A61A48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0675C 80A61A4C 871905BE */ lh $t9, 0x05BE($t8) ## 801605BE -/* 06760 80A61A50 17200005 */ bne $t9, $zero, .L80A61A68 -/* 06764 80A61A54 00000000 */ nop -/* 06768 80A61A58 8C880158 */ lw $t0, 0x0158($a0) ## 00000158 -/* 0676C 80A61A5C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06770 80A61A60 5501000E */ bnel $t0, $at, .L80A61A9C -/* 06774 80A61A64 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 -.L80A61A68: -/* 06778 80A61A68 0C297CF7 */ jal func_80A5F3DC -/* 0677C 80A61A6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06780 80A61A70 3C078013 */ lui $a3, %hi(D_801333E0) -/* 06784 80A61A74 3C098013 */ lui $t1, %hi(D_801333E8) -/* 06788 80A61A78 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 0678C 80A61A7C 252933E8 */ addiu $t1, %lo(D_801333E8) -/* 06790 80A61A80 AFA90014 */ sw $t1, 0x0014($sp) -/* 06794 80A61A84 AFA70010 */ sw $a3, 0x0010($sp) -/* 06798 80A61A88 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 0679C 80A61A8C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 067A0 80A61A90 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 067A4 80A61A94 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 067A8 80A61A98 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 -.L80A61A9C: -/* 067AC 80A61A9C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 067B0 80A61AA0 AFA50034 */ sw $a1, 0x0034($sp) -/* 067B4 80A61AA4 0C032D9E */ jal Math3D_Vec3f_DistXYZ -/* 067B8 80A61AA8 AFA40038 */ sw $a0, 0x0038($sp) -/* 067BC 80A61AAC 8FA4005C */ lw $a0, 0x005C($sp) -/* 067C0 80A61AB0 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 067C4 80A61AB4 8FA50038 */ lw $a1, 0x0038($sp) -/* 067C8 80A61AB8 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 067CC 80A61ABC 0C032D9E */ jal Math3D_Vec3f_DistXYZ -/* 067D0 80A61AC0 AFA40030 */ sw $a0, 0x0030($sp) -/* 067D4 80A61AC4 8FA40030 */ lw $a0, 0x0030($sp) -/* 067D8 80A61AC8 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 067DC 80A61ACC 0C032D9E */ jal Math3D_Vec3f_DistXYZ -/* 067E0 80A61AD0 8FA50034 */ lw $a1, 0x0034($sp) -/* 067E4 80A61AD4 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 067E8 80A61AD8 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 067EC 80A61ADC C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 067F0 80A61AE0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 067F4 80A61AE4 C7A80058 */ lwc1 $f8, 0x0058($sp) -/* 067F8 80A61AE8 4604603C */ c.lt.s $f12, $f4 -/* 067FC 80A61AEC 00000000 */ nop -/* 06800 80A61AF0 45020026 */ bc1fl .L80A61B8C -/* 06804 80A61AF4 460C003C */ c.lt.s $f0, $f12 -/* 06808 80A61AF8 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 0680C 80A61AFC 3C0180A6 */ lui $at, %hi(D_80A66934) ## $at = 80A60000 -/* 06810 80A61B00 4608303C */ c.lt.s $f6, $f8 -/* 06814 80A61B04 00000000 */ nop -/* 06818 80A61B08 45020011 */ bc1fl .L80A61B50 -/* 0681C 80A61B0C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 06820 80A61B10 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 06824 80A61B14 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 -/* 06828 80A61B18 3C0180A6 */ lui $at, %hi(D_80A66930) ## $at = 80A60000 -/* 0682C 80A61B1C C4306930 */ lwc1 $f16, %lo(D_80A66930)($at) -/* 06830 80A61B20 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 06834 80A61B24 46105480 */ add.s $f18, $f10, $f16 -/* 06838 80A61B28 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 0683C 80A61B2C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 06840 80A61B30 4600103C */ c.lt.s $f2, $f0 -/* 06844 80A61B34 00000000 */ nop -/* 06848 80A61B38 45020035 */ bc1fl .L80A61C10 -/* 0684C 80A61B3C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 06850 80A61B40 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 06854 80A61B44 10000031 */ beq $zero, $zero, .L80A61C0C -/* 06858 80A61B48 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 0685C 80A61B4C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -.L80A61B50: -/* 06860 80A61B50 C4266934 */ lwc1 $f6, %lo(D_80A66934)($at) -/* 06864 80A61B54 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 06868 80A61B58 46062201 */ sub.s $f8, $f4, $f6 -/* 0686C 80A61B5C E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 06870 80A61B60 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 06874 80A61B64 460A003C */ c.lt.s $f0, $f10 -/* 06878 80A61B68 00000000 */ nop -/* 0687C 80A61B6C 45020028 */ bc1fl .L80A61C10 -/* 06880 80A61B70 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 06884 80A61B74 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 06888 80A61B78 00000000 */ nop -/* 0688C 80A61B7C E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 06890 80A61B80 10000022 */ beq $zero, $zero, .L80A61C0C -/* 06894 80A61B84 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 06898 80A61B88 460C003C */ c.lt.s $f0, $f12 -.L80A61B8C: -/* 0689C 80A61B8C 3C0180A6 */ lui $at, %hi(D_80A6693C) ## $at = 80A60000 -/* 068A0 80A61B90 45020011 */ bc1fl .L80A61BD8 -/* 068A4 80A61B94 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 068A8 80A61B98 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 068AC 80A61B9C 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 -/* 068B0 80A61BA0 3C0180A6 */ lui $at, %hi(D_80A66938) ## $at = 80A60000 -/* 068B4 80A61BA4 C4246938 */ lwc1 $f4, %lo(D_80A66938)($at) -/* 068B8 80A61BA8 C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 -/* 068BC 80A61BAC 46049180 */ add.s $f6, $f18, $f4 -/* 068C0 80A61BB0 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 068C4 80A61BB4 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 068C8 80A61BB8 4600103C */ c.lt.s $f2, $f0 -/* 068CC 80A61BBC 00000000 */ nop -/* 068D0 80A61BC0 45020013 */ bc1fl .L80A61C10 -/* 068D4 80A61BC4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 068D8 80A61BC8 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 068DC 80A61BCC 1000000F */ beq $zero, $zero, .L80A61C0C -/* 068E0 80A61BD0 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 068E4 80A61BD4 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -.L80A61BD8: -/* 068E8 80A61BD8 C42A693C */ lwc1 $f10, %lo(D_80A6693C)($at) -/* 068EC 80A61BDC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 068F0 80A61BE0 460A4401 */ sub.s $f16, $f8, $f10 -/* 068F4 80A61BE4 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 068F8 80A61BE8 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 068FC 80A61BEC 4612003C */ c.lt.s $f0, $f18 -/* 06900 80A61BF0 00000000 */ nop -/* 06904 80A61BF4 45020006 */ bc1fl .L80A61C10 -/* 06908 80A61BF8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 0690C 80A61BFC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 06910 80A61C00 00000000 */ nop -/* 06914 80A61C04 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 06918 80A61C08 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -.L80A61C0C: -/* 0691C 80A61C0C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -.L80A61C10: -/* 06920 80A61C10 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 -/* 06924 80A61C14 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 06928 80A61C18 4600303E */ c.le.s $f6, $f0 -/* 0692C 80A61C1C 00000000 */ nop -/* 06930 80A61C20 45020008 */ bc1fl .L80A61C44 -/* 06934 80A61C24 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 -/* 06938 80A61C28 3C0180A6 */ lui $at, %hi(D_80A66940) ## $at = 80A60000 -/* 0693C 80A61C2C C4286940 */ lwc1 $f8, %lo(D_80A66940)($at) -/* 06940 80A61C30 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 06944 80A61C34 46080282 */ mul.s $f10, $f0, $f8 -/* 06948 80A61C38 10000032 */ beq $zero, $zero, .L80A61D04 -/* 0694C 80A61C3C E60A01C8 */ swc1 $f10, 0x01C8($s0) ## 000001C8 -/* 06950 80A61C40 44818000 */ mtc1 $at, $f16 ## $f16 = -0.00 -.L80A61C44: -/* 06954 80A61C44 3C0180A6 */ lui $at, %hi(D_80A66944) ## $at = 80A60000 -/* 06958 80A61C48 4600803E */ c.le.s $f16, $f0 -/* 0695C 80A61C4C 00000000 */ nop -/* 06960 80A61C50 45000007 */ bc1f .L80A61C70 -/* 06964 80A61C54 00000000 */ nop -/* 06968 80A61C58 3C013EC0 */ lui $at, 0x3EC0 ## $at = 3EC00000 -/* 0696C 80A61C5C 44819000 */ mtc1 $at, $f18 ## $f18 = 0.38 -/* 06970 80A61C60 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 06974 80A61C64 46120102 */ mul.s $f4, $f0, $f18 -/* 06978 80A61C68 10000026 */ beq $zero, $zero, .L80A61D04 -/* 0697C 80A61C6C E60401C8 */ swc1 $f4, 0x01C8($s0) ## 000001C8 -.L80A61C70: -/* 06980 80A61C70 C4266944 */ lwc1 $f6, %lo(D_80A66944)($at) -/* 06984 80A61C74 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 -/* 06988 80A61C78 4600303C */ c.lt.s $f6, $f0 -/* 0698C 80A61C7C 00000000 */ nop -/* 06990 80A61C80 4500000C */ bc1f .L80A61CB4 -/* 06994 80A61C84 00000000 */ nop -/* 06998 80A61C88 44814000 */ mtc1 $at, $f8 ## $f8 = 0.75 -/* 0699C 80A61C8C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 069A0 80A61C90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 069A4 80A61C94 46080282 */ mul.s $f10, $f0, $f8 -/* 069A8 80A61C98 E60A01C8 */ swc1 $f10, 0x01C8($s0) ## 000001C8 -/* 069AC 80A61C9C 0C296E72 */ jal func_80A5B9C8 -/* 069B0 80A61CA0 AFA6004C */ sw $a2, 0x004C($sp) -/* 069B4 80A61CA4 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 069B8 80A61CA8 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 069BC 80A61CAC 10000015 */ beq $zero, $zero, .L80A61D04 -/* 069C0 80A61CB0 8FA6004C */ lw $a2, 0x004C($sp) -.L80A61CB4: -/* 069C4 80A61CB4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 069C8 80A61CB8 00000000 */ nop -/* 069CC 80A61CBC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 069D0 80A61CC0 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 069D4 80A61CC4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 069D8 80A61CC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 069DC 80A61CCC 4600803C */ c.lt.s $f16, $f0 -/* 069E0 80A61CD0 8FA50064 */ lw $a1, 0x0064($sp) -/* 069E4 80A61CD4 45000003 */ bc1f .L80A61CE4 -/* 069E8 80A61CD8 00000000 */ nop -/* 069EC 80A61CDC 10000001 */ beq $zero, $zero, .L80A61CE4 -/* 069F0 80A61CE0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L80A61CE4: -/* 069F4 80A61CE4 0C296F1A */ jal func_80A5BC68 -/* 069F8 80A61CE8 AFA6004C */ sw $a2, 0x004C($sp) -/* 069FC 80A61CEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 06A00 80A61CF0 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 06A04 80A61CF4 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 06A08 80A61CF8 8FA6004C */ lw $a2, 0x004C($sp) -/* 06A0C 80A61CFC 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 06A10 80A61D00 E61201C8 */ swc1 $f18, 0x01C8($s0) ## 000001C8 -.L80A61D04: -/* 06A14 80A61D04 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 06A18 80A61D08 10C10006 */ beq $a2, $at, .L80A61D24 -/* 06A1C 80A61D0C C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 06A20 80A61D10 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 06A24 80A61D14 10C10003 */ beq $a2, $at, .L80A61D24 -/* 06A28 80A61D18 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 06A2C 80A61D1C 54C1002F */ bnel $a2, $at, .L80A61DDC -/* 06A30 80A61D20 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -.L80A61D24: -/* 06A34 80A61D24 460C203C */ c.lt.s $f4, $f12 -/* 06A38 80A61D28 8FA40034 */ lw $a0, 0x0034($sp) -/* 06A3C 80A61D2C 8FA50038 */ lw $a1, 0x0038($sp) -/* 06A40 80A61D30 45000014 */ bc1f .L80A61D84 -/* 06A44 80A61D34 00000000 */ nop -/* 06A48 80A61D38 8FA5005C */ lw $a1, 0x005C($sp) -/* 06A4C 80A61D3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06A50 80A61D40 84A300B6 */ lh $v1, 0x00B6($a1) ## 000000B6 -/* 06A54 80A61D44 AFA6004C */ sw $a2, 0x004C($sp) -/* 06A58 80A61D48 0C00B69E */ jal Actor_WorldYawTowardActor -/* 06A5C 80A61D4C A7A30046 */ sh $v1, 0x0046($sp) -/* 06A60 80A61D50 87A30046 */ lh $v1, 0x0046($sp) -/* 06A64 80A61D54 18400003 */ blez $v0, .L80A61D64 -/* 06A68 80A61D58 8FA6004C */ lw $a2, 0x004C($sp) -/* 06A6C 80A61D5C 10000002 */ beq $zero, $zero, .L80A61D68 -/* 06A70 80A61D60 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A61D64: -/* 06A74 80A61D64 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80A61D68: -/* 06A78 80A61D68 00025B80 */ sll $t3, $v0, 14 -/* 06A7C 80A61D6C 01625823 */ subu $t3, $t3, $v0 -/* 06A80 80A61D70 006B1821 */ addu $v1, $v1, $t3 -/* 06A84 80A61D74 00031C00 */ sll $v1, $v1, 16 -/* 06A88 80A61D78 00031C03 */ sra $v1, $v1, 16 -/* 06A8C 80A61D7C 10000008 */ beq $zero, $zero, .L80A61DA0 -/* 06A90 80A61D80 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -.L80A61D84: -/* 06A94 80A61D84 0C01E01A */ jal Math_Vec3f_Yaw - -/* 06A98 80A61D88 AFA6004C */ sw $a2, 0x004C($sp) -/* 06A9C 80A61D8C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 06AA0 80A61D90 8FA6004C */ lw $a2, 0x004C($sp) -/* 06AA4 80A61D94 00441823 */ subu $v1, $v0, $a0 -/* 06AA8 80A61D98 00031C00 */ sll $v1, $v1, 16 -/* 06AAC 80A61D9C 00031C03 */ sra $v1, $v1, 16 -.L80A61DA0: -/* 06AB0 80A61DA0 28610191 */ slti $at, $v1, 0x0191 -/* 06AB4 80A61DA4 14200003 */ bne $at, $zero, .L80A61DB4 -/* 06AB8 80A61DA8 248C0190 */ addiu $t4, $a0, 0x0190 ## $t4 = 00000190 -/* 06ABC 80A61DAC 10000008 */ beq $zero, $zero, .L80A61DD0 -/* 06AC0 80A61DB0 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 -.L80A61DB4: -/* 06AC4 80A61DB4 2861FE70 */ slti $at, $v1, 0xFE70 -/* 06AC8 80A61DB8 10200004 */ beq $at, $zero, .L80A61DCC -/* 06ACC 80A61DBC 00837021 */ addu $t6, $a0, $v1 -/* 06AD0 80A61DC0 248DFE70 */ addiu $t5, $a0, 0xFE70 ## $t5 = FFFFFE70 -/* 06AD4 80A61DC4 10000002 */ beq $zero, $zero, .L80A61DD0 -/* 06AD8 80A61DC8 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 -.L80A61DCC: -/* 06ADC 80A61DCC A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 -.L80A61DD0: -/* 06AE0 80A61DD0 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 06AE4 80A61DD4 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 06AE8 80A61DD8 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -.L80A61DDC: -/* 06AEC 80A61DDC AFA40034 */ sw $a0, 0x0034($sp) -/* 06AF0 80A61DE0 0C02927F */ jal SkelAnime_Update - -/* 06AF4 80A61DE4 AFA6004C */ sw $a2, 0x004C($sp) -/* 06AF8 80A61DE8 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 -/* 06AFC 80A61DEC 8FA6004C */ lw $a2, 0x004C($sp) -/* 06B00 80A61DF0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06B04 80A61DF4 50600003 */ beql $v1, $zero, .L80A61E04 -/* 06B08 80A61DF8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 06B0C 80A61DFC 14610035 */ bne $v1, $at, .L80A61ED4 -/* 06B10 80A61E00 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -.L80A61E04: -/* 06B14 80A61E04 10C10005 */ beq $a2, $at, .L80A61E1C -/* 06B18 80A61E08 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 06B1C 80A61E0C 10C10003 */ beq $a2, $at, .L80A61E1C -/* 06B20 80A61E10 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 06B24 80A61E14 14C1002F */ bne $a2, $at, .L80A61ED4 -/* 06B28 80A61E18 00000000 */ nop -.L80A61E1C: -/* 06B2C 80A61E1C 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 -/* 06B30 80A61E20 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 06B34 80A61E24 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -/* 06B38 80A61E28 0018C880 */ sll $t9, $t8, 2 -/* 06B3C 80A61E2C 01194021 */ addu $t0, $t0, $t9 -/* 06B40 80A61E30 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 06B44 80A61E34 00064880 */ sll $t1, $a2, 2 -/* 06B48 80A61E38 01095021 */ addu $t2, $t0, $t1 -/* 06B4C 80A61E3C 0C028800 */ jal Animation_GetLastFrame - -/* 06B50 80A61E40 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 06B54 80A61E44 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 -/* 06B58 80A61E48 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 06B5C 80A61E4C 3C0D80A6 */ lui $t5, %hi(D_80A65E58) ## $t5 = 80A60000 -/* 06B60 80A61E50 000B6080 */ sll $t4, $t3, 2 -/* 06B64 80A61E54 8E0E0210 */ lw $t6, 0x0210($s0) ## 00000210 -/* 06B68 80A61E58 01AC6821 */ addu $t5, $t5, $t4 -/* 06B6C 80A61E5C 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) -/* 06B70 80A61E60 46803220 */ cvt.s.w $f8, $f6 -/* 06B74 80A61E64 000E7880 */ sll $t7, $t6, 2 -/* 06B78 80A61E68 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 06B7C 80A61E6C 01AFC021 */ addu $t8, $t5, $t7 -/* 06B80 80A61E70 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 -/* 06B84 80A61E74 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 06B88 80A61E78 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 06B8C 80A61E7C AFB90014 */ sw $t9, 0x0014($sp) -/* 06B90 80A61E80 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 06B94 80A61E84 8FA40034 */ lw $a0, 0x0034($sp) -/* 06B98 80A61E88 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06B9C 80A61E8C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06BA0 80A61E90 0C029468 */ jal Animation_Change - -/* 06BA4 80A61E94 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 06BA8 80A61E98 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 -/* 06BAC 80A61E9C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 06BB0 80A61EA0 54610006 */ bnel $v1, $at, .L80A61EBC -/* 06BB4 80A61EA4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 06BB8 80A61EA8 0C296EB3 */ jal func_80A5BACC -/* 06BBC 80A61EAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06BC0 80A61EB0 100000ED */ beq $zero, $zero, .L80A62268 -/* 06BC4 80A61EB4 8FBF002C */ lw $ra, 0x002C($sp) -/* 06BC8 80A61EB8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80A61EBC: -/* 06BCC 80A61EBC 546100EA */ bnel $v1, $at, .L80A62268 -/* 06BD0 80A61EC0 8FBF002C */ lw $ra, 0x002C($sp) -/* 06BD4 80A61EC4 0C296EA1 */ jal func_80A5BA84 -/* 06BD8 80A61EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06BDC 80A61ECC 100000E6 */ beq $zero, $zero, .L80A62268 -/* 06BE0 80A61ED0 8FBF002C */ lw $ra, 0x002C($sp) -.L80A61ED4: -/* 06BE4 80A61ED4 104000BE */ beq $v0, $zero, .L80A621D0 -/* 06BE8 80A61ED8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 06BEC 80A61EDC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 06BF0 80A61EE0 14C10006 */ bne $a2, $at, .L80A61EFC -/* 06BF4 80A61EE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06BF8 80A61EE8 0C296EB3 */ jal func_80A5BACC -/* 06BFC 80A61EEC AFA6004C */ sw $a2, 0x004C($sp) -/* 06C00 80A61EF0 8FA6004C */ lw $a2, 0x004C($sp) -/* 06C04 80A61EF4 10000008 */ beq $zero, $zero, .L80A61F18 -/* 06C08 80A61EF8 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 -.L80A61EFC: -/* 06C0C 80A61EFC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 06C10 80A61F00 14C10005 */ bne $a2, $at, .L80A61F18 -/* 06C14 80A61F04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06C18 80A61F08 0C296EA1 */ jal func_80A5BA84 -/* 06C1C 80A61F0C AFA6004C */ sw $a2, 0x004C($sp) -/* 06C20 80A61F10 8FA6004C */ lw $a2, 0x004C($sp) -/* 06C24 80A61F14 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 -.L80A61F18: -/* 06C28 80A61F18 10600003 */ beq $v1, $zero, .L80A61F28 -/* 06C2C 80A61F1C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06C30 80A61F20 14610069 */ bne $v1, $at, .L80A620C8 -/* 06C34 80A61F24 00000000 */ nop -.L80A61F28: -/* 06C38 80A61F28 10C30022 */ beq $a2, $v1, .L80A61FB4 -/* 06C3C 80A61F2C 00000000 */ nop -/* 06C40 80A61F30 8E080158 */ lw $t0, 0x0158($s0) ## 00000158 -/* 06C44 80A61F34 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 -/* 06C48 80A61F38 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -/* 06C4C 80A61F3C 00084880 */ sll $t1, $t0, 2 -/* 06C50 80A61F40 01495021 */ addu $t2, $t2, $t1 -/* 06C54 80A61F44 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) -/* 06C58 80A61F48 00065880 */ sll $t3, $a2, 2 -/* 06C5C 80A61F4C 014B6021 */ addu $t4, $t2, $t3 -/* 06C60 80A61F50 0C028800 */ jal Animation_GetLastFrame - -/* 06C64 80A61F54 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 06C68 80A61F58 8E0E0158 */ lw $t6, 0x0158($s0) ## 00000158 -/* 06C6C 80A61F5C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 06C70 80A61F60 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 06C74 80A61F64 000E6880 */ sll $t5, $t6, 2 -/* 06C78 80A61F68 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 06C7C 80A61F6C 01ED7821 */ addu $t7, $t7, $t5 -/* 06C80 80A61F70 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 06C84 80A61F74 468084A0 */ cvt.s.w $f18, $f16 -/* 06C88 80A61F78 0018C880 */ sll $t9, $t8, 2 -/* 06C8C 80A61F7C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 06C90 80A61F80 01F94021 */ addu $t0, $t7, $t9 -/* 06C94 80A61F84 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 -/* 06C98 80A61F88 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 06C9C 80A61F8C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 06CA0 80A61F90 AFA90014 */ sw $t1, 0x0014($sp) -/* 06CA4 80A61F94 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 06CA8 80A61F98 8FA40034 */ lw $a0, 0x0034($sp) -/* 06CAC 80A61F9C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06CB0 80A61FA0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06CB4 80A61FA4 0C029468 */ jal Animation_Change - -/* 06CB8 80A61FA8 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 06CBC 80A61FAC 100000AE */ beq $zero, $zero, .L80A62268 -/* 06CC0 80A61FB0 8FBF002C */ lw $ra, 0x002C($sp) -.L80A61FB4: -/* 06CC4 80A61FB4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 06CC8 80A61FB8 00000000 */ nop -/* 06CCC 80A61FBC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 06CD0 80A61FC0 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 06CD4 80A61FC4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 06CD8 80A61FC8 4600303C */ c.lt.s $f6, $f0 -/* 06CDC 80A61FCC 00000000 */ nop -/* 06CE0 80A61FD0 45020008 */ bc1fl .L80A61FF4 -/* 06CE4 80A61FD4 8E0D0228 */ lw $t5, 0x0228($s0) ## 00000228 -/* 06CE8 80A61FD8 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 -/* 06CEC 80A61FDC 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF -/* 06CF0 80A61FE0 AE000210 */ sw $zero, 0x0210($s0) ## 00000210 -/* 06CF4 80A61FE4 01415824 */ and $t3, $t2, $at -/* 06CF8 80A61FE8 10000016 */ beq $zero, $zero, .L80A62044 -/* 06CFC 80A61FEC AE0B01F0 */ sw $t3, 0x01F0($s0) ## 000001F0 -/* 06D00 80A61FF0 8E0D0228 */ lw $t5, 0x0228($s0) ## 00000228 -.L80A61FF4: -/* 06D04 80A61FF4 AE0C0210 */ sw $t4, 0x0210($s0) ## 00000210 -/* 06D08 80A61FF8 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 06D0C 80A61FFC ACAD0000 */ sw $t5, 0x0000($a1) ## 0000021C -/* 06D10 80A62000 8E0E022C */ lw $t6, 0x022C($s0) ## 0000022C -/* 06D14 80A62004 3C198013 */ lui $t9, %hi(D_801333E0) -/* 06D18 80A62008 3C088013 */ lui $t0, %hi(D_801333E8) -/* 06D1C 80A6200C ACAE0004 */ sw $t6, 0x0004($a1) ## 00000220 -/* 06D20 80A62010 8E0D0230 */ lw $t5, 0x0230($s0) ## 00000230 -/* 06D24 80A62014 250833E8 */ addiu $t0, %lo(D_801333E8) -/* 06D28 80A62018 272733E0 */ addiu $a3, $t9, %lo(D_801333E0) -/* 06D2C 80A6201C ACAD0008 */ sw $t5, 0x0008($a1) ## 00000224 -/* 06D30 80A62020 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 -/* 06D34 80A62024 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 -/* 06D38 80A62028 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 06D3C 80A6202C 00187900 */ sll $t7, $t8, 4 -/* 06D40 80A62030 05E30005 */ bgezl $t7, .L80A62048 -/* 06D44 80A62034 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 06D48 80A62038 AFA70010 */ sw $a3, 0x0010($sp) -/* 06D4C 80A6203C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 06D50 80A62040 AFA80014 */ sw $t0, 0x0014($sp) -.L80A62044: -/* 06D54 80A62044 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -.L80A62048: -/* 06D58 80A62048 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 06D5C 80A6204C 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 06D60 80A62050 00095080 */ sll $t2, $t1, 2 -/* 06D64 80A62054 016A5821 */ addu $t3, $t3, $t2 -/* 06D68 80A62058 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 06D6C 80A6205C 000C7080 */ sll $t6, $t4, 2 -/* 06D70 80A62060 016E6821 */ addu $t5, $t3, $t6 -/* 06D74 80A62064 0C028800 */ jal Animation_GetLastFrame - -/* 06D78 80A62068 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 06D7C 80A6206C 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 -/* 06D80 80A62070 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 06D84 80A62074 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 -/* 06D88 80A62078 00187880 */ sll $t7, $t8, 2 -/* 06D8C 80A6207C 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 -/* 06D90 80A62080 032FC821 */ addu $t9, $t9, $t7 -/* 06D94 80A62084 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) -/* 06D98 80A62088 468042A0 */ cvt.s.w $f10, $f8 -/* 06D9C 80A6208C 00084880 */ sll $t1, $t0, 2 -/* 06DA0 80A62090 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 06DA4 80A62094 03295021 */ addu $t2, $t9, $t1 -/* 06DA8 80A62098 44818000 */ mtc1 $at, $f16 ## $f16 = -3.00 -/* 06DAC 80A6209C 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 06DB0 80A620A0 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 06DB4 80A620A4 AFAC0014 */ sw $t4, 0x0014($sp) -/* 06DB8 80A620A8 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 06DBC 80A620AC 8FA40034 */ lw $a0, 0x0034($sp) -/* 06DC0 80A620B0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06DC4 80A620B4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06DC8 80A620B8 0C029468 */ jal Animation_Change - -/* 06DCC 80A620BC E7B00018 */ swc1 $f16, 0x0018($sp) -/* 06DD0 80A620C0 10000069 */ beq $zero, $zero, .L80A62268 -/* 06DD4 80A620C4 8FBF002C */ lw $ra, 0x002C($sp) -.L80A620C8: -/* 06DD8 80A620C8 50C30023 */ beql $a2, $v1, .L80A62158 -/* 06DDC 80A620CC 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -/* 06DE0 80A620D0 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 -/* 06DE4 80A620D4 3C0D80A6 */ lui $t5, %hi(D_80A65E58) ## $t5 = 80A60000 -/* 06DE8 80A620D8 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -/* 06DEC 80A620DC 000B7080 */ sll $t6, $t3, 2 -/* 06DF0 80A620E0 01AE6821 */ addu $t5, $t5, $t6 -/* 06DF4 80A620E4 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) -/* 06DF8 80A620E8 0006C080 */ sll $t8, $a2, 2 -/* 06DFC 80A620EC 01B87821 */ addu $t7, $t5, $t8 -/* 06E00 80A620F0 0C028800 */ jal Animation_GetLastFrame - -/* 06E04 80A620F4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 06E08 80A620F8 8E080158 */ lw $t0, 0x0158($s0) ## 00000158 -/* 06E0C 80A620FC 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 06E10 80A62100 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 06E14 80A62104 0008C880 */ sll $t9, $t0, 2 -/* 06E18 80A62108 8E0A0210 */ lw $t2, 0x0210($s0) ## 00000210 -/* 06E1C 80A6210C 01394821 */ addu $t1, $t1, $t9 -/* 06E20 80A62110 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 06E24 80A62114 46809120 */ cvt.s.w $f4, $f18 -/* 06E28 80A62118 000A6080 */ sll $t4, $t2, 2 -/* 06E2C 80A6211C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 06E30 80A62120 012C5821 */ addu $t3, $t1, $t4 -/* 06E34 80A62124 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 -/* 06E38 80A62128 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 06E3C 80A6212C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 06E40 80A62130 AFAE0014 */ sw $t6, 0x0014($sp) -/* 06E44 80A62134 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 06E48 80A62138 8FA40034 */ lw $a0, 0x0034($sp) -/* 06E4C 80A6213C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06E50 80A62140 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06E54 80A62144 0C029468 */ jal Animation_Change - -/* 06E58 80A62148 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 06E5C 80A6214C 10000046 */ beq $zero, $zero, .L80A62268 -/* 06E60 80A62150 8FBF002C */ lw $ra, 0x002C($sp) -/* 06E64 80A62154 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -.L80A62158: -/* 06E68 80A62158 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 06E6C 80A6215C 00034080 */ sll $t0, $v1, 2 -/* 06E70 80A62160 000DC080 */ sll $t8, $t5, 2 -/* 06E74 80A62164 01F87821 */ addu $t7, $t7, $t8 -/* 06E78 80A62168 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 06E7C 80A6216C 01E8C821 */ addu $t9, $t7, $t0 -/* 06E80 80A62170 0C028800 */ jal Animation_GetLastFrame - -/* 06E84 80A62174 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 06E88 80A62178 8E0A0158 */ lw $t2, 0x0158($s0) ## 00000158 -/* 06E8C 80A6217C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 06E90 80A62180 3C0C80A6 */ lui $t4, %hi(D_80A65E58) ## $t4 = 80A60000 -/* 06E94 80A62184 000A4880 */ sll $t1, $t2, 2 -/* 06E98 80A62188 8E0B0210 */ lw $t3, 0x0210($s0) ## 00000210 -/* 06E9C 80A6218C 01896021 */ addu $t4, $t4, $t1 -/* 06EA0 80A62190 8D8C5E58 */ lw $t4, %lo(D_80A65E58)($t4) -/* 06EA4 80A62194 468042A0 */ cvt.s.w $f10, $f8 -/* 06EA8 80A62198 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 06EAC 80A6219C 000B7080 */ sll $t6, $t3, 2 -/* 06EB0 80A621A0 018E6821 */ addu $t5, $t4, $t6 -/* 06EB4 80A621A4 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 06EB8 80A621A8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 06EBC 80A621AC 44070000 */ mfc1 $a3, $f0 -/* 06EC0 80A621B0 AFB80014 */ sw $t8, 0x0014($sp) -/* 06EC4 80A621B4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 06EC8 80A621B8 8FA40034 */ lw $a0, 0x0034($sp) -/* 06ECC 80A621BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06ED0 80A621C0 0C029468 */ jal Animation_Change - -/* 06ED4 80A621C4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 06ED8 80A621C8 10000027 */ beq $zero, $zero, .L80A62268 -/* 06EDC 80A621CC 8FBF002C */ lw $ra, 0x002C($sp) -.L80A621D0: -/* 06EE0 80A621D0 54610025 */ bnel $v1, $at, .L80A62268 -/* 06EE4 80A621D4 8FBF002C */ lw $ra, 0x002C($sp) -/* 06EE8 80A621D8 10C00003 */ beq $a2, $zero, .L80A621E8 -/* 06EEC 80A621DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06EF0 80A621E0 54C10021 */ bnel $a2, $at, .L80A62268 -/* 06EF4 80A621E4 8FBF002C */ lw $ra, 0x002C($sp) -.L80A621E8: -/* 06EF8 80A621E8 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 -/* 06EFC 80A621EC 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 -/* 06F00 80A621F0 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -/* 06F04 80A621F4 000F4080 */ sll $t0, $t7, 2 -/* 06F08 80A621F8 0328C821 */ addu $t9, $t9, $t0 -/* 06F0C 80A621FC 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) -/* 06F10 80A62200 00065080 */ sll $t2, $a2, 2 -/* 06F14 80A62204 032A4821 */ addu $t1, $t9, $t2 -/* 06F18 80A62208 0C028800 */ jal Animation_GetLastFrame - -/* 06F1C 80A6220C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 06F20 80A62210 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 -/* 06F24 80A62214 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 06F28 80A62218 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 -/* 06F2C 80A6221C 000B6080 */ sll $t4, $t3, 2 -/* 06F30 80A62220 8E0D0210 */ lw $t5, 0x0210($s0) ## 00000210 -/* 06F34 80A62224 01CC7021 */ addu $t6, $t6, $t4 -/* 06F38 80A62228 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 06F3C 80A6222C 468084A0 */ cvt.s.w $f18, $f16 -/* 06F40 80A62230 000DC080 */ sll $t8, $t5, 2 -/* 06F44 80A62234 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 06F48 80A62238 01D87821 */ addu $t7, $t6, $t8 -/* 06F4C 80A6223C 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 -/* 06F50 80A62240 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 06F54 80A62244 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 06F58 80A62248 AFA80014 */ sw $t0, 0x0014($sp) -/* 06F5C 80A6224C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 06F60 80A62250 8FA40034 */ lw $a0, 0x0034($sp) -/* 06F64 80A62254 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06F68 80A62258 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06F6C 80A6225C 0C029468 */ jal Animation_Change - -/* 06F70 80A62260 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 06F74 80A62264 8FBF002C */ lw $ra, 0x002C($sp) -.L80A62268: -/* 06F78 80A62268 8FB00028 */ lw $s0, 0x0028($sp) -/* 06F7C 80A6226C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 06F80 80A62270 03E00008 */ jr $ra -/* 06F84 80A62274 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s deleted file mode 100644 index afd7aa7aec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s +++ /dev/null @@ -1,155 +0,0 @@ -.late_rodata -glabel D_80A66948 - .float 0.01 - -glabel D_80A6694C - .word 0x4242CCCD - -.text -glabel func_80A62278 -/* 06F88 80A62278 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 06F8C 80A6227C AFB00028 */ sw $s0, 0x0028($sp) -/* 06F90 80A62280 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06F94 80A62284 AFBF002C */ sw $ra, 0x002C($sp) -/* 06F98 80A62288 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 06F9C 80A6228C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 06FA0 80A62290 3C0541C8 */ lui $a1, 0x41C8 ## $a1 = 41C80000 -/* 06FA4 80A62294 0C00A295 */ jal func_80028A54 -/* 06FA8 80A62298 AFA60034 */ sw $a2, 0x0034($sp) -/* 06FAC 80A6229C 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 -/* 06FB0 80A622A0 8FA60034 */ lw $a2, 0x0034($sp) -/* 06FB4 80A622A4 8E0801CC */ lw $t0, 0x01CC($s0) ## 000001CC -/* 06FB8 80A622A8 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 06FBC 80A622AC 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 06FC0 80A622B0 35F80004 */ ori $t8, $t7, 0x0004 ## $t8 = 00000004 -/* 06FC4 80A622B4 AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C -/* 06FC8 80A622B8 AE1801F0 */ sw $t8, 0x01F0($s0) ## 000001F0 -/* 06FCC 80A622BC AE190210 */ sw $t9, 0x0210($s0) ## 00000210 -/* 06FD0 80A622C0 85090002 */ lh $t1, 0x0002($t0) ## 00000002 -/* 06FD4 80A622C4 8CCB0000 */ lw $t3, 0x0000($a2) ## 00000000 -/* 06FD8 80A622C8 3C0180A6 */ lui $at, %hi(D_80A66948) ## $at = 80A60000 -/* 06FDC 80A622CC 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 06FE0 80A622D0 C4266948 */ lwc1 $f6, %lo(D_80A66948)($at) -/* 06FE4 80A622D4 AE0B03B0 */ sw $t3, 0x03B0($s0) ## 000003B0 -/* 06FE8 80A622D8 46802020 */ cvt.s.w $f0, $f4 -/* 06FEC 80A622DC 8CCA0004 */ lw $t2, 0x0004($a2) ## 00000004 -/* 06FF0 80A622E0 920C03AC */ lbu $t4, 0x03AC($s0) ## 000003AC -/* 06FF4 80A622E4 3C0E80A6 */ lui $t6, %hi(D_80A665DC) ## $t6 = 80A60000 -/* 06FF8 80A622E8 AE0A03B4 */ sw $t2, 0x03B4($s0) ## 000003B4 -/* 06FFC 80A622EC C60803B4 */ lwc1 $f8, 0x03B4($s0) ## 000003B4 -/* 07000 80A622F0 46060002 */ mul.s $f0, $f0, $f6 -/* 07004 80A622F4 8CCB0008 */ lw $t3, 0x0008($a2) ## 00000008 -/* 07008 80A622F8 000C6880 */ sll $t5, $t4, 2 -/* 0700C 80A622FC 01AC6821 */ addu $t5, $t5, $t4 -/* 07010 80A62300 000D6880 */ sll $t5, $t5, 2 -/* 07014 80A62304 25CE65DC */ addiu $t6, $t6, %lo(D_80A665DC) ## $t6 = 80A665DC -/* 07018 80A62308 01AE1021 */ addu $v0, $t5, $t6 -/* 0701C 80A6230C 46004280 */ add.s $f10, $f8, $f0 -/* 07020 80A62310 AE0B03B8 */ sw $t3, 0x03B8($s0) ## 000003B8 -/* 07024 80A62314 3C0180A6 */ lui $at, %hi(D_80A6694C) ## $at = 80A60000 -/* 07028 80A62318 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 0000000C -/* 0702C 80A6231C E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 -/* 07030 80A62320 844F0010 */ lh $t7, 0x0010($v0) ## 00000010 -/* 07034 80A62324 C424694C */ lwc1 $f4, %lo(D_80A6694C)($at) -/* 07038 80A62328 C60803B4 */ lwc1 $f8, 0x03B4($s0) ## 000003B4 -/* 0703C 80A6232C 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 07040 80A62330 3C01C3B4 */ lui $at, 0xC3B4 ## $at = C3B40000 -/* 07044 80A62334 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 07048 80A62338 468084A0 */ cvt.s.w $f18, $f16 -/* 0704C 80A6233C 44818000 */ mtc1 $at, $f16 ## $f16 = -360.00 -/* 07050 80A62340 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 07054 80A62344 86080032 */ lh $t0, 0x0032($s0) ## 00000032 -/* 07058 80A62348 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 -/* 0705C 80A6234C 3C0D80A6 */ lui $t5, %hi(D_80A65E58) ## $t5 = 80A60000 -/* 07060 80A62350 46049180 */ add.s $f6, $f18, $f4 -/* 07064 80A62354 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 07068 80A62358 000B6080 */ sll $t4, $t3, 2 -/* 0706C 80A6235C 8E0E0210 */ lw $t6, 0x0210($s0) ## 00000210 -/* 07070 80A62360 46083281 */ sub.s $f10, $f6, $f8 -/* 07074 80A62364 C608025C */ lwc1 $f8, 0x025C($s0) ## 0000025C -/* 07078 80A62368 01AC6821 */ addu $t5, $t5, $t4 -/* 0707C 80A6236C 000E7880 */ sll $t7, $t6, 2 -/* 07080 80A62370 46105481 */ sub.s $f18, $f10, $f16 -/* 07084 80A62374 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 07088 80A62378 46004281 */ sub.s $f10, $f8, $f0 -/* 0708C 80A6237C 46049183 */ div.s $f6, $f18, $f4 -/* 07090 80A62380 E60A025C */ swc1 $f10, 0x025C($s0) ## 0000025C -/* 07094 80A62384 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 07098 80A62388 E60603C0 */ swc1 $f6, 0x03C0($s0) ## 000003C0 -/* 0709C 80A6238C 8449000A */ lh $t1, 0x000A($v0) ## 0000000A -/* 070A0 80A62390 AE0003BC */ sw $zero, 0x03BC($s0) ## 000003BC -/* 070A4 80A62394 E610006C */ swc1 $f16, 0x006C($s0) ## 0000006C -/* 070A8 80A62398 01095023 */ subu $t2, $t0, $t1 -/* 070AC 80A6239C A60A03C4 */ sh $t2, 0x03C4($s0) ## 000003C4 -/* 070B0 80A623A0 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 070B4 80A623A4 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) -/* 070B8 80A623A8 01AFC021 */ addu $t8, $t5, $t7 -/* 070BC 80A623AC 0C028800 */ jal Animation_GetLastFrame - -/* 070C0 80A623B0 8F040000 */ lw $a0, 0x0000($t8) ## 00000004 -/* 070C4 80A623B4 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 -/* 070C8 80A623B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 070CC 80A623BC 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 070D0 80A623C0 00194080 */ sll $t0, $t9, 2 -/* 070D4 80A623C4 8E0A0210 */ lw $t2, 0x0210($s0) ## 00000210 -/* 070D8 80A623C8 01284821 */ addu $t1, $t1, $t0 -/* 070DC 80A623CC 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 070E0 80A623D0 468021A0 */ cvt.s.w $f6, $f4 -/* 070E4 80A623D4 000A5880 */ sll $t3, $t2, 2 -/* 070E8 80A623D8 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 070EC 80A623DC 012B6021 */ addu $t4, $t1, $t3 -/* 070F0 80A623E0 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 070F4 80A623E4 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 070F8 80A623E8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 070FC 80A623EC AFAE0014 */ sw $t6, 0x0014($sp) -/* 07100 80A623F0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 07104 80A623F4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 07108 80A623F8 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 0710C 80A623FC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 07110 80A62400 0C029468 */ jal Animation_Change - -/* 07114 80A62404 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 07118 80A62408 8E0F0228 */ lw $t7, 0x0228($s0) ## 00000228 -/* 0711C 80A6240C 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 07120 80A62410 3C078013 */ lui $a3, %hi(D_801333E0) -/* 07124 80A62414 ACAF0000 */ sw $t7, 0x0000($a1) ## 0000021C -/* 07128 80A62418 8E0D022C */ lw $t5, 0x022C($s0) ## 0000022C -/* 0712C 80A6241C 3C088013 */ lui $t0, %hi(D_801333E8) -/* 07130 80A62420 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 07134 80A62424 ACAD0004 */ sw $t5, 0x0004($a1) ## 00000220 -/* 07138 80A62428 8E0F0230 */ lw $t7, 0x0230($s0) ## 00000230 -/* 0713C 80A6242C 250833E8 */ addiu $t0, %lo(D_801333E8) -/* 07140 80A62430 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 07144 80A62434 ACAF0008 */ sw $t7, 0x0008($a1) ## 00000224 -/* 07148 80A62438 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 -/* 0714C 80A6243C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 07150 80A62440 0018C900 */ sll $t9, $t8, 4 -/* 07154 80A62444 07210004 */ bgez $t9, .L80A62458 -/* 07158 80A62448 00000000 */ nop -/* 0715C 80A6244C AFA70010 */ sw $a3, 0x0010($sp) -/* 07160 80A62450 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 07164 80A62454 AFA80014 */ sw $t0, 0x0014($sp) -.L80A62458: -/* 07168 80A62458 3C0A8013 */ lui $t2, %hi(D_801333E0) -/* 0716C 80A6245C 3C098013 */ lui $t1, %hi(D_801333E8) -/* 07170 80A62460 252933E8 */ addiu $t1, %lo(D_801333E8) -/* 07174 80A62464 254733E0 */ addiu $a3, $t2, %lo(D_801333E0) -/* 07178 80A62468 AFA70010 */ sw $a3, 0x0010($sp) -/* 0717C 80A6246C AFA90014 */ sw $t1, 0x0014($sp) -/* 07180 80A62470 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 -/* 07184 80A62474 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 07188 80A62478 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 0718C 80A6247C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 07190 80A62480 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 07194 80A62484 240500AA */ addiu $a1, $zero, 0x00AA ## $a1 = 000000AA -/* 07198 80A62488 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0719C 80A6248C 0C02A800 */ jal func_800AA000 -/* 071A0 80A62490 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 071A4 80A62494 AE000244 */ sw $zero, 0x0244($s0) ## 00000244 -/* 071A8 80A62498 8FBF002C */ lw $ra, 0x002C($sp) -/* 071AC 80A6249C 8FB00028 */ lw $s0, 0x0028($sp) -/* 071B0 80A624A0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 071B4 80A624A4 03E00008 */ jr $ra -/* 071B8 80A624A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s deleted file mode 100644 index 1d974caeee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80A624AC -/* 071BC 80A624AC 908F03AC */ lbu $t7, 0x03AC($a0) ## 000003AC -/* 071C0 80A624B0 3C0E80A6 */ lui $t6, %hi(func_80A62278) ## $t6 = 80A60000 -/* 071C4 80A624B4 25CE2278 */ addiu $t6, $t6, %lo(func_80A62278) ## $t6 = 80A62278 -/* 071C8 80A624B8 15E00014 */ bne $t7, $zero, .L80A6250C -/* 071CC 80A624BC AC8E0244 */ sw $t6, 0x0244($a0) ## 00000244 -/* 071D0 80A624C0 3C020200 */ lui $v0, %hi(D_02002AC0) ## $v0 = 02000000 -/* 071D4 80A624C4 24422AC0 */ addiu $v0, $v0, %lo(D_02002AC0) ## $v0 = 02002AC0 -/* 071D8 80A624C8 0002C100 */ sll $t8, $v0, 4 -/* 071DC 80A624CC 0018CF02 */ srl $t9, $t8, 28 -/* 071E0 80A624D0 00194080 */ sll $t0, $t9, 2 -/* 071E4 80A624D4 3C098016 */ lui $t1, %hi(gSegments) -/* 071E8 80A624D8 01284821 */ addu $t1, $t1, $t0 -/* 071EC 80A624DC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 071F0 80A624E0 8D296FA8 */ lw $t1, %lo(gSegments)($t1) -/* 071F4 80A624E4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 071F8 80A624E8 00415024 */ and $t2, $v0, $at -/* 071FC 80A624EC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 07200 80A624F0 012A5821 */ addu $t3, $t1, $t2 -/* 07204 80A624F4 01616021 */ addu $t4, $t3, $at -/* 07208 80A624F8 ACAC1D68 */ sw $t4, 0x1D68($a1) ## 00001D68 -/* 0720C 80A624FC 3C018016 */ lui $at, %hi(gSaveContext+0x1414) -/* 07210 80A62500 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 07214 80A62504 03E00008 */ jr $ra -/* 07218 80A62508 A02DFA74 */ sb $t5, %lo(gSaveContext+0x1414)($at) -.L80A6250C: -/* 0721C 80A6250C 3C020200 */ lui $v0, %hi(D_02000230) ## $v0 = 02000000 -/* 07220 80A62510 24420230 */ addiu $v0, $v0, %lo(D_02000230) ## $v0 = 02000230 -/* 07224 80A62514 00027100 */ sll $t6, $v0, 4 -/* 07228 80A62518 000E7F02 */ srl $t7, $t6, 28 -/* 0722C 80A6251C 000FC080 */ sll $t8, $t7, 2 -/* 07230 80A62520 3C198016 */ lui $t9, %hi(gSegments) -/* 07234 80A62524 0338C821 */ addu $t9, $t9, $t8 -/* 07238 80A62528 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0723C 80A6252C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 07240 80A62530 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 07244 80A62534 00414024 */ and $t0, $v0, $at -/* 07248 80A62538 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0724C 80A6253C 03284821 */ addu $t1, $t9, $t0 -/* 07250 80A62540 01215021 */ addu $t2, $t1, $at -/* 07254 80A62544 ACAA1D68 */ sw $t2, 0x1D68($a1) ## 00001D68 -/* 07258 80A62548 3C018016 */ lui $at, %hi(gSaveContext+0x1414) -/* 0725C 80A6254C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 07260 80A62550 A02BFA74 */ sb $t3, %lo(gSaveContext+0x1414)($at) -/* 07264 80A62554 03E00008 */ jr $ra -/* 07268 80A62558 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6255C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6255C.s deleted file mode 100644 index e8940f79f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6255C.s +++ /dev/null @@ -1,95 +0,0 @@ -.late_rodata -glabel D_80A66950 - .word 0xBECCCCCD - -.text -glabel func_80A6255C -/* 0726C 80A6255C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 07270 80A62560 AFBF0014 */ sw $ra, 0x0014($sp) -/* 07274 80A62564 AFA40018 */ sw $a0, 0x0018($sp) -/* 07278 80A62568 AFA5001C */ sw $a1, 0x001C($sp) -/* 0727C 80A6256C 8C8203BC */ lw $v0, 0x03BC($a0) ## 000003BC -/* 07280 80A62570 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 07284 80A62574 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 07288 80A62578 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0728C 80A6257C 908F03AC */ lbu $t7, 0x03AC($a0) ## 000003AC -/* 07290 80A62580 3C1980A6 */ lui $t9, %hi(D_80A665DC) ## $t9 = 80A60000 -/* 07294 80A62584 46802020 */ cvt.s.w $f0, $f4 -/* 07298 80A62588 000FC080 */ sll $t8, $t7, 2 -/* 0729C 80A6258C 030FC021 */ addu $t8, $t8, $t7 -/* 072A0 80A62590 0018C080 */ sll $t8, $t8, 2 -/* 072A4 80A62594 273965DC */ addiu $t9, $t9, %lo(D_80A665DC) ## $t9 = 80A665DC -/* 072A8 80A62598 03191821 */ addu $v1, $t8, $t9 -/* 072AC 80A6259C 46060383 */ div.s $f14, $f0, $f6 -/* 072B0 80A625A0 8468000E */ lh $t0, 0x000E($v1) ## 0000000E -/* 072B4 80A625A4 00420019 */ multu $v0, $v0 -/* 072B8 80A625A8 C48203B0 */ lwc1 $f2, 0x03B0($a0) ## 000003B0 -/* 072BC 80A625AC 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 072C0 80A625B0 C48C03B8 */ lwc1 $f12, 0x03B8($a0) ## 000003B8 -/* 072C4 80A625B4 3C0180A6 */ lui $at, %hi(D_80A66950) ## $at = 80A60000 -/* 072C8 80A625B8 468054A0 */ cvt.s.w $f18, $f10 -/* 072CC 80A625BC 848A03C4 */ lh $t2, 0x03C4($a0) ## 000003C4 -/* 072D0 80A625C0 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 072D4 80A625C4 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 072D8 80A625C8 00007012 */ mflo $t6 -/* 072DC 80A625CC 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 072E0 80A625D0 46029101 */ sub.s $f4, $f18, $f2 -/* 072E4 80A625D4 46804420 */ cvt.s.w $f16, $f8 -/* 072E8 80A625D8 460E2182 */ mul.s $f6, $f4, $f14 -/* 072EC 80A625DC 46023200 */ add.s $f8, $f6, $f2 -/* 072F0 80A625E0 E488FE78 */ swc1 $f8, -0x0188($a0) ## 00000024 -/* 072F4 80A625E4 84690012 */ lh $t1, 0x0012($v1) ## 00000012 -/* 072F8 80A625E8 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 072FC 80A625EC 00000000 */ nop -/* 07300 80A625F0 468054A0 */ cvt.s.w $f18, $f10 -/* 07304 80A625F4 C48A0208 */ lwc1 $f10, 0x0208($a0) ## 000003B4 -/* 07308 80A625F8 460C9101 */ sub.s $f4, $f18, $f12 -/* 0730C 80A625FC C4920214 */ lwc1 $f18, 0x0214($a0) ## 000003C0 -/* 07310 80A62600 460E2182 */ mul.s $f6, $f4, $f14 -/* 07314 80A62604 460C3200 */ add.s $f8, $f6, $f12 -/* 07318 80A62608 46009102 */ mul.s $f4, $f18, $f0 -/* 0731C 80A6260C E488FE80 */ swc1 $f8, -0x0180($a0) ## 0000002C -/* 07320 80A62610 C4286950 */ lwc1 $f8, %lo(D_80A66950)($at) -/* 07324 80A62614 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 07328 80A62618 46104482 */ mul.s $f18, $f8, $f16 -/* 0732C 80A6261C 46045180 */ add.s $f6, $f10, $f4 -/* 07330 80A62620 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 07334 80A62624 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 07338 80A62628 460E2201 */ sub.s $f8, $f4, $f14 -/* 0733C 80A6262C 46123280 */ add.s $f10, $f6, $f18 -/* 07340 80A62630 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 07344 80A62634 00000000 */ nop -/* 07348 80A62638 468034A0 */ cvt.s.w $f18, $f6 -/* 0734C 80A6263C E48AFE7C */ swc1 $f10, -0x0184($a0) ## 00000028 -/* 07350 80A62640 846B000A */ lh $t3, 0x000A($v1) ## 0000000A -/* 07354 80A62644 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 07358 80A62648 46124282 */ mul.s $f10, $f8, $f18 -/* 0735C 80A6264C 468021A0 */ cvt.s.w $f6, $f4 -/* 07360 80A62650 44812000 */ mtc1 $at, $f4 ## $f4 = 23.00 -/* 07364 80A62654 460A3200 */ add.s $f8, $f6, $f10 -/* 07368 80A62658 460E2182 */ mul.s $f6, $f4, $f14 -/* 0736C 80A6265C 4600448D */ trunc.w.s $f18, $f8 -/* 07370 80A62660 E4860018 */ swc1 $f6, 0x0018($a0) ## 000001C4 -/* 07374 80A62664 44069000 */ mfc1 $a2, $f18 -/* 07378 80A62668 00000000 */ nop -/* 0737C 80A6266C 00063400 */ sll $a2, $a2, 16 -/* 07380 80A62670 00063403 */ sra $a2, $a2, 16 -/* 07384 80A62674 A486FF0A */ sh $a2, -0x00F6($a0) ## 000000B6 -/* 07388 80A62678 A486FE86 */ sh $a2, -0x017A($a0) ## 00000032 -/* 0738C 80A6267C 0C02927F */ jal SkelAnime_Update - -/* 07390 80A62680 AFA50018 */ sw $a1, 0x0018($sp) -/* 07394 80A62684 8FA50018 */ lw $a1, 0x0018($sp) -/* 07398 80A62688 8CAD03BC */ lw $t5, 0x03BC($a1) ## 000003BC -/* 0739C 80A6268C 29A1001E */ slti $at, $t5, 0x001E -/* 073A0 80A62690 50200006 */ beql $at, $zero, .L80A626AC -/* 073A4 80A62694 8FBF0014 */ lw $ra, 0x0014($sp) -/* 073A8 80A62698 8CAE01F0 */ lw $t6, 0x01F0($a1) ## 000001F0 -/* 073AC 80A6269C 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 073B0 80A626A0 01C17825 */ or $t7, $t6, $at ## $t7 = 01000000 -/* 073B4 80A626A4 ACAF01F0 */ sw $t7, 0x01F0($a1) ## 000001F0 -/* 073B8 80A626A8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A626AC: -/* 073BC 80A626AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 073C0 80A626B0 03E00008 */ jr $ra -/* 073C4 80A626B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s deleted file mode 100644 index 19b00b7715..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80A626B8 -/* 073C8 80A626B8 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 073CC 80A626BC 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 073D0 80A626C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 073D4 80A626C4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 073D8 80A626C8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 073DC 80A626CC AFBF0024 */ sw $ra, 0x0024($sp) -/* 073E0 80A626D0 AFB00020 */ sw $s0, 0x0020($sp) -/* 073E4 80A626D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 073E8 80A626D8 AFA5002C */ sw $a1, 0x002C($sp) -/* 073EC 80A626DC 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 073F0 80A626E0 E484FEBC */ swc1 $f4, -0x0144($a0) ## 00000068 -/* 073F4 80A626E4 0C02927F */ jal SkelAnime_Update - -/* 073F8 80A626E8 E486001C */ swc1 $f6, 0x001C($a0) ## 000001C8 -/* 073FC 80A626EC 10400028 */ beq $v0, $zero, .L80A62790 -/* 07400 80A626F0 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB -/* 07404 80A626F4 8E0E01F0 */ lw $t6, 0x01F0($s0) ## 000001F0 -/* 07408 80A626F8 921803AC */ lbu $t8, 0x03AC($s0) ## 000003AC -/* 0740C 80A626FC 3C0880A6 */ lui $t0, %hi(D_80A665EC) ## $t0 = 80A60000 -/* 07410 80A62700 01C17824 */ and $t7, $t6, $at -/* 07414 80A62704 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 07418 80A62708 44814000 */ mtc1 $at, $f8 ## $f8 = -3.50 -/* 0741C 80A6270C 0018C880 */ sll $t9, $t8, 2 -/* 07420 80A62710 0338C821 */ addu $t9, $t9, $t8 -/* 07424 80A62714 0019C880 */ sll $t9, $t9, 2 -/* 07428 80A62718 AE0F01F0 */ sw $t7, 0x01F0($s0) ## 000001F0 -/* 0742C 80A6271C 01194021 */ addu $t0, $t0, $t9 -/* 07430 80A62720 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 07434 80A62724 850865EC */ lh $t0, %lo(D_80A665EC)($t0) -/* 07438 80A62728 3C0541C8 */ lui $a1, 0x41C8 ## $a1 = 41C80000 -/* 0743C 80A6272C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 07440 80A62730 44885000 */ mtc1 $t0, $f10 ## $f10 = -0.00 -/* 07444 80A62734 00000000 */ nop -/* 07448 80A62738 46805420 */ cvt.s.w $f16, $f10 -/* 0744C 80A6273C E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 07450 80A62740 0C00A295 */ jal func_80028A54 -/* 07454 80A62744 8FA4002C */ lw $a0, 0x002C($sp) -/* 07458 80A62748 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0745C 80A6274C 0C29776C */ jal func_80A5DDB0 -/* 07460 80A62750 8FA5002C */ lw $a1, 0x002C($sp) -/* 07464 80A62754 3C078013 */ lui $a3, %hi(D_801333E0) -/* 07468 80A62758 3C098013 */ lui $t1, %hi(D_801333E8) -/* 0746C 80A6275C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 07470 80A62760 252933E8 */ addiu $t1, %lo(D_801333E8) -/* 07474 80A62764 AFA90014 */ sw $t1, 0x0014($sp) -/* 07478 80A62768 AFA70010 */ sw $a3, 0x0010($sp) -/* 0747C 80A6276C 24042819 */ addiu $a0, $zero, 0x2819 ## $a0 = 00002819 -/* 07480 80A62770 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 07484 80A62774 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 07488 80A62778 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0748C 80A6277C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 07490 80A62780 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 07494 80A62784 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 07498 80A62788 0C02A800 */ jal func_800AA000 -/* 0749C 80A6278C 24070050 */ addiu $a3, $zero, 0x0050 ## $a3 = 00000050 -.L80A62790: -/* 074A0 80A62790 8FBF0024 */ lw $ra, 0x0024($sp) -/* 074A4 80A62794 8FB00020 */ lw $s0, 0x0020($sp) -/* 074A8 80A62798 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 074AC 80A6279C 03E00008 */ jr $ra -/* 074B0 80A627A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627A4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627A4.s deleted file mode 100644 index 29a3a5fcc0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627A4.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80A627A4 -/* 074B4 80A627A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 074B8 80A627A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 074BC 80A627AC 8C8E03BC */ lw $t6, 0x03BC($a0) ## 000003BC -/* 074C0 80A627B0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 074C4 80A627B4 29E1001E */ slti $at, $t7, 0x001E -/* 074C8 80A627B8 10200005 */ beq $at, $zero, .L80A627D0 -/* 074CC 80A627BC AC8F03BC */ sw $t7, 0x03BC($a0) ## 000003BC -/* 074D0 80A627C0 0C298957 */ jal func_80A6255C -/* 074D4 80A627C4 00000000 */ nop -/* 074D8 80A627C8 10000004 */ beq $zero, $zero, .L80A627DC -/* 074DC 80A627CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A627D0: -/* 074E0 80A627D0 0C2989AE */ jal func_80A626B8 -/* 074E4 80A627D4 00000000 */ nop -/* 074E8 80A627D8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A627DC: -/* 074EC 80A627DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 074F0 80A627E0 03E00008 */ jr $ra -/* 074F4 80A627E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s deleted file mode 100644 index 9d4c751118..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A627E8 -/* 074F8 80A627E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 074FC 80A627EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 07500 80A627F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 07504 80A627F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 07508 80A627F8 AFA60020 */ sw $a2, 0x0020($sp) -/* 0750C 80A627FC AFA70024 */ sw $a3, 0x0024($sp) -/* 07510 80A62800 0C01DE1C */ jal Math_SinS - ## sins? -/* 07514 80A62804 87A4001E */ lh $a0, 0x001E($sp) -/* 07518 80A62808 C7A40020 */ lwc1 $f4, 0x0020($sp) -/* 0751C 80A6280C 8FA30018 */ lw $v1, 0x0018($sp) -/* 07520 80A62810 8FA20028 */ lw $v0, 0x0028($sp) -/* 07524 80A62814 46040182 */ mul.s $f6, $f0, $f4 -/* 07528 80A62818 C4680000 */ lwc1 $f8, 0x0000($v1) ## 00000000 -/* 0752C 80A6281C 46083280 */ add.s $f10, $f6, $f8 -/* 07530 80A62820 E44A0000 */ swc1 $f10, 0x0000($v0) ## 00000000 -/* 07534 80A62824 C7B20024 */ lwc1 $f18, 0x0024($sp) -/* 07538 80A62828 C4700004 */ lwc1 $f16, 0x0004($v1) ## 00000004 -/* 0753C 80A6282C 46128100 */ add.s $f4, $f16, $f18 -/* 07540 80A62830 E4440004 */ swc1 $f4, 0x0004($v0) ## 00000004 -/* 07544 80A62834 0C01DE0D */ jal Math_CosS - ## coss? -/* 07548 80A62838 87A4001E */ lh $a0, 0x001E($sp) -/* 0754C 80A6283C C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 07550 80A62840 8FAE0018 */ lw $t6, 0x0018($sp) -/* 07554 80A62844 8FAF0028 */ lw $t7, 0x0028($sp) -/* 07558 80A62848 46060202 */ mul.s $f8, $f0, $f6 -/* 0755C 80A6284C C5CA0008 */ lwc1 $f10, 0x0008($t6) ## 00000008 -/* 07560 80A62850 460A4400 */ add.s $f16, $f8, $f10 -/* 07564 80A62854 E5F00008 */ swc1 $f16, 0x0008($t7) ## 00000008 -/* 07568 80A62858 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0756C 80A6285C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 07570 80A62860 03E00008 */ jr $ra -/* 07574 80A62864 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62868.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62868.s deleted file mode 100644 index bbde1804ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62868.s +++ /dev/null @@ -1,92 +0,0 @@ -.late_rodata -glabel D_80A66954 - .word 0x38000100 -glabel D_80A66958 - .word 0x3F51B3F3 - -.text -glabel func_80A62868 -/* 07578 80A62868 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0757C 80A6286C AFBF0024 */ sw $ra, 0x0024($sp) -/* 07580 80A62870 AFB00020 */ sw $s0, 0x0020($sp) -/* 07584 80A62874 AFA40040 */ sw $a0, 0x0040($sp) -/* 07588 80A62878 AFA50044 */ sw $a1, 0x0044($sp) -/* 0758C 80A6287C AFA60048 */ sw $a2, 0x0048($sp) -/* 07590 80A62880 AFA7004C */ sw $a3, 0x004C($sp) -/* 07594 80A62884 ACE00000 */ sw $zero, 0x0000($a3) ## 00000000 -/* 07598 80A62888 8FB00044 */ lw $s0, 0x0044($sp) -/* 0759C 80A6288C 8FA70048 */ lw $a3, 0x0048($sp) -/* 075A0 80A62890 8FA5004C */ lw $a1, 0x004C($sp) -/* 075A4 80A62894 261007C0 */ addiu $s0, $s0, 0x07C0 ## $s0 = 000007C0 -/* 075A8 80A62898 02002025 */ or $a0, $s0, $zero ## $a0 = 000007C0 -/* 075AC 80A6289C 0C00F250 */ jal BgCheck_EntityRaycastFloor3 -/* 075B0 80A628A0 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFFC -/* 075B4 80A628A4 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 -/* 075B8 80A628A8 44812000 */ mtc1 $at, $f4 ## $f4 = -32000.00 -/* 075BC 80A628AC 8FAF0050 */ lw $t7, 0x0050($sp) -/* 075C0 80A628B0 8FA20048 */ lw $v0, 0x0048($sp) -/* 075C4 80A628B4 46040032 */ c.eq.s $f0, $f4 -/* 075C8 80A628B8 E5E00000 */ swc1 $f0, 0x0000($t7) ## 00000000 -/* 075CC 80A628BC 8FA40044 */ lw $a0, 0x0044($sp) -/* 075D0 80A628C0 02002825 */ or $a1, $s0, $zero ## $a1 = 000007C0 -/* 075D4 80A628C4 45000003 */ bc1f .L80A628D4 -/* 075D8 80A628C8 27B80038 */ addiu $t8, $sp, 0x0038 ## $t8 = FFFFFFF8 -/* 075DC 80A628CC 10000030 */ beq $zero, $zero, .L80A62990 -/* 075E0 80A628D0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A628D4: -/* 075E4 80A628D4 8C460000 */ lw $a2, 0x0000($v0) ## 00000001 -/* 075E8 80A628D8 8C470008 */ lw $a3, 0x0008($v0) ## 00000009 -/* 075EC 80A628DC 27B90034 */ addiu $t9, $sp, 0x0034 ## $t9 = FFFFFFF4 -/* 075F0 80A628E0 AFB90014 */ sw $t9, 0x0014($sp) -/* 075F4 80A628E4 0C010891 */ jal WaterBox_GetSurfaceImpl -/* 075F8 80A628E8 AFB80010 */ sw $t8, 0x0010($sp) -/* 075FC 80A628EC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 07600 80A628F0 14410009 */ bne $v0, $at, .L80A62918 -/* 07604 80A628F4 8FA80050 */ lw $t0, 0x0050($sp) -/* 07608 80A628F8 C5060000 */ lwc1 $f6, 0x0000($t0) ## 00000000 -/* 0760C 80A628FC C7A80038 */ lwc1 $f8, 0x0038($sp) -/* 07610 80A62900 4608303C */ c.lt.s $f6, $f8 -/* 07614 80A62904 00000000 */ nop -/* 07618 80A62908 45020004 */ bc1fl .L80A6291C -/* 0761C 80A6290C 8FA9004C */ lw $t1, 0x004C($sp) -/* 07620 80A62910 1000001F */ beq $zero, $zero, .L80A62990 -/* 07624 80A62914 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A62918: -/* 07628 80A62918 8FA9004C */ lw $t1, 0x004C($sp) -.L80A6291C: -/* 0762C 80A6291C 3C0180A6 */ lui $at, %hi(D_80A66954) ## $at = 80A60000 -/* 07630 80A62920 C4326954 */ lwc1 $f18, %lo(D_80A66954)($at) -/* 07634 80A62924 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 07638 80A62928 3C0180A6 */ lui $at, %hi(D_80A66958) ## $at = 80A60000 -/* 0763C 80A6292C C4266958 */ lwc1 $f6, %lo(D_80A66958)($at) -/* 07640 80A62930 84AA000A */ lh $t2, 0x000A($a1) ## 0000000A -/* 07644 80A62934 02002025 */ or $a0, $s0, $zero ## $a0 = 000007C0 -/* 07648 80A62938 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 0764C 80A6293C 00000000 */ nop -/* 07650 80A62940 46805420 */ cvt.s.w $f16, $f10 -/* 07654 80A62944 46128102 */ mul.s $f4, $f16, $f18 -/* 07658 80A62948 4606203C */ c.lt.s $f4, $f6 -/* 0765C 80A6294C 00000000 */ nop -/* 07660 80A62950 4501000C */ bc1t .L80A62984 -/* 07664 80A62954 00000000 */ nop -/* 07668 80A62958 0C0107BB */ jal SurfaceType_IsHorseBlocked -/* 0766C 80A6295C 8FA6003C */ lw $a2, 0x003C($sp) -/* 07670 80A62960 14400008 */ bne $v0, $zero, .L80A62984 -/* 07674 80A62964 02002025 */ or $a0, $s0, $zero ## $a0 = 000007C0 -/* 07678 80A62968 8FAB004C */ lw $t3, 0x004C($sp) -/* 0767C 80A6296C 8FA6003C */ lw $a2, 0x003C($sp) -/* 07680 80A62970 0C010753 */ jal func_80041D4C -/* 07684 80A62974 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 07688 80A62978 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0768C 80A6297C 54410004 */ bnel $v0, $at, .L80A62990 -/* 07690 80A62980 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A62984: -/* 07694 80A62984 10000002 */ beq $zero, $zero, .L80A62990 -/* 07698 80A62988 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -/* 0769C 80A6298C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A62990: -/* 076A0 80A62990 8FBF0024 */ lw $ra, 0x0024($sp) -/* 076A4 80A62994 8FB00020 */ lw $s0, 0x0020($sp) -/* 076A8 80A62998 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 076AC 80A6299C 03E00008 */ jr $ra -/* 076B0 80A629A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A629A4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A629A4.s deleted file mode 100644 index 1a969c32a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A629A4.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_80A629A4 -/* 076B4 80A629A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 076B8 80A629A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 076BC 80A629AC AFA70024 */ sw $a3, 0x0024($sp) -/* 076C0 80A629B0 8C8E014C */ lw $t6, 0x014C($a0) ## 0000014C -/* 076C4 80A629B4 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 076C8 80A629B8 51C10041 */ beql $t6, $at, .L80A62AC0 -/* 076CC 80A629BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 076D0 80A629C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 076D4 80A629C4 0C296CBC */ jal func_80A5B2F0 -/* 076D8 80A629C8 AFA60020 */ sw $a2, 0x0020($sp) -/* 076DC 80A629CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 076E0 80A629D0 1440003A */ bne $v0, $zero, .L80A62ABC -/* 076E4 80A629D4 8FA60020 */ lw $a2, 0x0020($sp) -/* 076E8 80A629D8 8C9801F4 */ lw $t8, 0x01F4($a0) ## 000001F4 -/* 076EC 80A629DC 8C9901F0 */ lw $t9, 0x01F0($a0) ## 000001F0 -/* 076F0 80A629E0 84820200 */ lh $v0, 0x0200($a0) ## 00000200 -/* 076F4 80A629E4 8C89020C */ lw $t1, 0x020C($a0) ## 0000020C -/* 076F8 80A629E8 AC980024 */ sw $t8, 0x0024($a0) ## 00000024 -/* 076FC 80A629EC 8C9801FC */ lw $t8, 0x01FC($a0) ## 000001FC -/* 07700 80A629F0 8C8F01F8 */ lw $t7, 0x01F8($a0) ## 000001F8 -/* 07704 80A629F4 37284000 */ ori $t0, $t9, 0x4000 ## $t0 = 00004000 -/* 07708 80A629F8 AC8801F0 */ sw $t0, 0x01F0($a0) ## 000001F0 -/* 0770C 80A629FC A48200B6 */ sh $v0, 0x00B6($a0) ## 000000B6 -/* 07710 80A62A00 A4820032 */ sh $v0, 0x0032($a0) ## 00000032 -/* 07714 80A62A04 AC98002C */ sw $t8, 0x002C($a0) ## 0000002C -/* 07718 80A62A08 15200007 */ bne $t1, $zero, .L80A62A28 -/* 0771C 80A62A0C AC8F0028 */ sw $t7, 0x0028($a0) ## 00000028 -/* 07720 80A62A10 8C8A0210 */ lw $t2, 0x0210($a0) ## 00000210 -/* 07724 80A62A14 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 07728 80A62A18 51410029 */ beql $t2, $at, .L80A62AC0 -/* 0772C 80A62A1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07730 80A62A20 10000027 */ beq $zero, $zero, .L80A62AC0 -/* 07734 80A62A24 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A62A28: -/* 07738 80A62A28 8C8B014C */ lw $t3, 0x014C($a0) ## 0000014C -/* 0773C 80A62A2C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 07740 80A62A30 51610023 */ beql $t3, $at, .L80A62AC0 -/* 07744 80A62A34 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07748 80A62A38 8C8201F0 */ lw $v0, 0x01F0($a0) ## 000001F0 -/* 0774C 80A62A3C 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB -/* 07750 80A62A40 304C0004 */ andi $t4, $v0, 0x0004 ## $t4 = 00000000 -/* 07754 80A62A44 11800007 */ beq $t4, $zero, .L80A62A64 -/* 07758 80A62A48 00416824 */ and $t5, $v0, $at -/* 0775C 80A62A4C 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 07760 80A62A50 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 -/* 07764 80A62A54 C4860080 */ lwc1 $f6, 0x0080($a0) ## 00000080 -/* 07768 80A62A58 AC8D01F0 */ sw $t5, 0x01F0($a0) ## 000001F0 -/* 0776C 80A62A5C E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 07770 80A62A60 E4860028 */ swc1 $f6, 0x0028($a0) ## 00000028 -.L80A62A64: -/* 07774 80A62A64 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 07778 80A62A68 10C20003 */ beq $a2, $v0, .L80A62A78 -/* 0777C 80A62A6C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 07780 80A62A70 54C10006 */ bnel $a2, $at, .L80A62A8C -/* 07784 80A62A74 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80A62A78: -/* 07788 80A62A78 8C8E01F0 */ lw $t6, 0x01F0($a0) ## 000001F0 -/* 0778C 80A62A7C 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 -/* 07790 80A62A80 10000009 */ beq $zero, $zero, .L80A62AA8 -/* 07794 80A62A84 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 000001F0 -/* 07798 80A62A88 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80A62A8C: -/* 0779C 80A62A8C 10C10003 */ beq $a2, $at, .L80A62A9C -/* 077A0 80A62A90 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 077A4 80A62A94 54C10005 */ bnel $a2, $at, .L80A62AAC -/* 077A8 80A62A98 8FA80024 */ lw $t0, 0x0024($sp) -.L80A62A9C: -/* 077AC 80A62A9C 8C9801F0 */ lw $t8, 0x01F0($a0) ## 000001F0 -/* 077B0 80A62AA0 37190020 */ ori $t9, $t8, 0x0020 ## $t9 = 00000020 -/* 077B4 80A62AA4 AC9901F0 */ sw $t9, 0x01F0($a0) ## 000001F0 -.L80A62AA8: -/* 077B8 80A62AA8 8FA80024 */ lw $t0, 0x0024($sp) -.L80A62AAC: -/* 077BC 80A62AAC 55020004 */ bnel $t0, $v0, .L80A62AC0 -/* 077C0 80A62AB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 077C4 80A62AB4 0C297803 */ jal func_80A5E00C -/* 077C8 80A62AB8 00000000 */ nop -.L80A62ABC: -/* 077CC 80A62ABC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A62AC0: -/* 077D0 80A62AC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 077D4 80A62AC4 03E00008 */ jr $ra -/* 077D8 80A62AC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s deleted file mode 100644 index fa1c58e2b4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s +++ /dev/null @@ -1,388 +0,0 @@ -.late_rodata -glabel D_80A6695C - .word 0x4622F983 -glabel D_80A66960 - .word 0x38000100 -glabel D_80A66964 - .word 0x3F51B3F3 -glabel D_80A66968 - .word 0x45FFF800 - -.text -glabel func_80A62ACC -/* 077DC 80A62ACC 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 077E0 80A62AD0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 077E4 80A62AD4 AFB00020 */ sw $s0, 0x0020($sp) -/* 077E8 80A62AD8 AFA5008C */ sw $a1, 0x008C($sp) -/* 077EC 80A62ADC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 077F0 80A62AE0 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 077F4 80A62AE4 C4860068 */ lwc1 $f6, 0x0068($a0) ## 00000068 -/* 077F8 80A62AE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 077FC 80A62AEC 00007025 */ or $t6, $zero, $zero ## $t6 = 00000000 -/* 07800 80A62AF0 4606203C */ c.lt.s $f4, $f6 -/* 07804 80A62AF4 27B8003C */ addiu $t8, $sp, 0x003C ## $t8 = FFFFFFB4 -/* 07808 80A62AF8 27B90038 */ addiu $t9, $sp, 0x0038 ## $t9 = FFFFFFB0 -/* 0780C 80A62AFC 45020003 */ bc1fl .L80A62B0C -/* 07810 80A62B00 8FA4008C */ lw $a0, 0x008C($sp) -/* 07814 80A62B04 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 07818 80A62B08 8FA4008C */ lw $a0, 0x008C($sp) -.L80A62B0C: -/* 0781C 80A62B0C AFAE0044 */ sw $t6, 0x0044($sp) -/* 07820 80A62B10 8E07002C */ lw $a3, 0x002C($s0) ## 0000002C -/* 07824 80A62B14 8E060024 */ lw $a2, 0x0024($s0) ## 00000024 -/* 07828 80A62B18 248507C0 */ addiu $a1, $a0, 0x07C0 ## $a1 = 000007C0 -/* 0782C 80A62B1C AFA50030 */ sw $a1, 0x0030($sp) -/* 07830 80A62B20 AFB90014 */ sw $t9, 0x0014($sp) -/* 07834 80A62B24 0C010891 */ jal WaterBox_GetSurfaceImpl -/* 07838 80A62B28 AFB80010 */ sw $t8, 0x0010($sp) -/* 0783C 80A62B2C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 07840 80A62B30 1441000C */ bne $v0, $at, .L80A62B64 -/* 07844 80A62B34 C7AA003C */ lwc1 $f10, 0x003C($sp) -/* 07848 80A62B38 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 -/* 0784C 80A62B3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07850 80A62B40 8FA5008C */ lw $a1, 0x008C($sp) -/* 07854 80A62B44 460A403C */ c.lt.s $f8, $f10 -/* 07858 80A62B48 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0785C 80A62B4C 45020006 */ bc1fl .L80A62B68 -/* 07860 80A62B50 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 07864 80A62B54 0C298A69 */ jal func_80A629A4 -/* 07868 80A62B58 8FA70044 */ lw $a3, 0x0044($sp) -/* 0786C 80A62B5C 10000137 */ beq $zero, $zero, .L80A6303C -/* 07870 80A62B60 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A62B64: -/* 07874 80A62B64 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -.L80A62B68: -/* 07878 80A62B68 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 -/* 0787C 80A62B6C 27A8006C */ addiu $t0, $sp, 0x006C ## $t0 = FFFFFFE4 -/* 07880 80A62B70 AFA80010 */ sw $t0, 0x0010($sp) -/* 07884 80A62B74 AFA4002C */ sw $a0, 0x002C($sp) -/* 07888 80A62B78 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 -/* 0788C 80A62B7C 0C2989FA */ jal func_80A627E8 -/* 07890 80A62B80 3C074270 */ lui $a3, 0x4270 ## $a3 = 42700000 -/* 07894 80A62B84 26090248 */ addiu $t1, $s0, 0x0248 ## $t1 = 00000248 -/* 07898 80A62B88 AFA90010 */ sw $t1, 0x0010($sp) -/* 0789C 80A62B8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 078A0 80A62B90 8FA5008C */ lw $a1, 0x008C($sp) -/* 078A4 80A62B94 27A6006C */ addiu $a2, $sp, 0x006C ## $a2 = FFFFFFE4 -/* 078A8 80A62B98 0C298A1A */ jal func_80A62868 -/* 078AC 80A62B9C 27A70080 */ addiu $a3, $sp, 0x0080 ## $a3 = FFFFFFF8 -/* 078B0 80A62BA0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 078B4 80A62BA4 14410008 */ bne $v0, $at, .L80A62BC8 -/* 078B8 80A62BA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 078BC 80A62BAC A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 078C0 80A62BB0 8FA70044 */ lw $a3, 0x0044($sp) -/* 078C4 80A62BB4 8FA5008C */ lw $a1, 0x008C($sp) -/* 078C8 80A62BB8 0C298A69 */ jal func_80A629A4 -/* 078CC 80A62BBC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 078D0 80A62BC0 1000011E */ beq $zero, $zero, .L80A6303C -/* 078D4 80A62BC4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A62BC8: -/* 078D8 80A62BC8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 078DC 80A62BCC 14410007 */ bne $v0, $at, .L80A62BEC -/* 078E0 80A62BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 078E4 80A62BD4 8FA5008C */ lw $a1, 0x008C($sp) -/* 078E8 80A62BD8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 078EC 80A62BDC 0C298A69 */ jal func_80A629A4 -/* 078F0 80A62BE0 8FA70044 */ lw $a3, 0x0044($sp) -/* 078F4 80A62BE4 10000115 */ beq $zero, $zero, .L80A6303C -/* 078F8 80A62BE8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A62BEC: -/* 078FC 80A62BEC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 07900 80A62BF0 14410008 */ bne $v0, $at, .L80A62C14 -/* 07904 80A62BF4 8FA4002C */ lw $a0, 0x002C($sp) -/* 07908 80A62BF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0790C 80A62BFC 8FA5008C */ lw $a1, 0x008C($sp) -/* 07910 80A62C00 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 07914 80A62C04 0C298A69 */ jal func_80A629A4 -/* 07918 80A62C08 8FA70044 */ lw $a3, 0x0044($sp) -/* 0791C 80A62C0C 1000010B */ beq $zero, $zero, .L80A6303C -/* 07920 80A62C10 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A62C14: -/* 07924 80A62C14 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 -/* 07928 80A62C18 27AA0060 */ addiu $t2, $sp, 0x0060 ## $t2 = FFFFFFD8 -/* 0792C 80A62C1C AFAA0010 */ sw $t2, 0x0010($sp) -/* 07930 80A62C20 3C06C1F0 */ lui $a2, 0xC1F0 ## $a2 = C1F00000 -/* 07934 80A62C24 0C2989FA */ jal func_80A627E8 -/* 07938 80A62C28 3C074270 */ lui $a3, 0x4270 ## $a3 = 42700000 -/* 0793C 80A62C2C 260B024C */ addiu $t3, $s0, 0x024C ## $t3 = 0000024C -/* 07940 80A62C30 AFAB0010 */ sw $t3, 0x0010($sp) -/* 07944 80A62C34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07948 80A62C38 8FA5008C */ lw $a1, 0x008C($sp) -/* 0794C 80A62C3C 27A60060 */ addiu $a2, $sp, 0x0060 ## $a2 = FFFFFFD8 -/* 07950 80A62C40 0C298A1A */ jal func_80A62868 -/* 07954 80A62C44 27A7007C */ addiu $a3, $sp, 0x007C ## $a3 = FFFFFFF4 -/* 07958 80A62C48 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0795C 80A62C4C 14410008 */ bne $v0, $at, .L80A62C70 -/* 07960 80A62C50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07964 80A62C54 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 07968 80A62C58 8FA70044 */ lw $a3, 0x0044($sp) -/* 0796C 80A62C5C 8FA5008C */ lw $a1, 0x008C($sp) -/* 07970 80A62C60 0C298A69 */ jal func_80A629A4 -/* 07974 80A62C64 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 07978 80A62C68 100000F4 */ beq $zero, $zero, .L80A6303C -/* 0797C 80A62C6C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A62C70: -/* 07980 80A62C70 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 07984 80A62C74 14410007 */ bne $v0, $at, .L80A62C94 -/* 07988 80A62C78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0798C 80A62C7C 8FA5008C */ lw $a1, 0x008C($sp) -/* 07990 80A62C80 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 07994 80A62C84 0C298A69 */ jal func_80A629A4 -/* 07998 80A62C88 8FA70044 */ lw $a3, 0x0044($sp) -/* 0799C 80A62C8C 100000EB */ beq $zero, $zero, .L80A6303C -/* 079A0 80A62C90 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A62C94: -/* 079A4 80A62C94 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 079A8 80A62C98 14410007 */ bne $v0, $at, .L80A62CB8 -/* 079AC 80A62C9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 079B0 80A62CA0 8FA5008C */ lw $a1, 0x008C($sp) -/* 079B4 80A62CA4 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 079B8 80A62CA8 0C298A69 */ jal func_80A629A4 -/* 079BC 80A62CAC 8FA70044 */ lw $a3, 0x0044($sp) -/* 079C0 80A62CB0 100000E2 */ beq $zero, $zero, .L80A6303C -/* 079C4 80A62CB4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A62CB8: -/* 079C8 80A62CB8 C610024C */ lwc1 $f16, 0x024C($s0) ## 0000024C -/* 079CC 80A62CBC C6120248 */ lwc1 $f18, 0x0248($s0) ## 00000248 -/* 079D0 80A62CC0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 079D4 80A62CC4 44817000 */ mtc1 $at, $f14 ## $f14 = 60.00 -/* 079D8 80A62CC8 0C03F494 */ jal Math_FAtan2F -/* 079DC 80A62CCC 46128301 */ sub.s $f12, $f16, $f18 -/* 079E0 80A62CD0 3C0180A6 */ lui $at, %hi(D_80A6695C) ## $at = 80A60000 -/* 079E4 80A62CD4 C424695C */ lwc1 $f4, %lo(D_80A6695C)($at) -/* 079E8 80A62CD8 3C0180A6 */ lui $at, %hi(D_80A66960) ## $at = 80A60000 -/* 079EC 80A62CDC 27A30054 */ addiu $v1, $sp, 0x0054 ## $v1 = FFFFFFCC -/* 079F0 80A62CE0 46040182 */ mul.s $f6, $f0, $f4 -/* 079F4 80A62CE4 27B9006C */ addiu $t9, $sp, 0x006C ## $t9 = FFFFFFE4 -/* 079F8 80A62CE8 4600320D */ trunc.w.s $f8, $f6 -/* 079FC 80A62CEC 440D4000 */ mfc1 $t5, $f8 -/* 07A00 80A62CF0 00000000 */ nop -/* 07A04 80A62CF4 A7AD007A */ sh $t5, 0x007A($sp) -/* 07A08 80A62CF8 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 07A0C 80A62CFC 50A000CF */ beql $a1, $zero, .L80A6303C -/* 07A10 80A62D00 8FBF0024 */ lw $ra, 0x0024($sp) -/* 07A14 80A62D04 8F290000 */ lw $t1, 0x0000($t9) ## FFFFFFE4 -/* 07A18 80A62D08 C4206960 */ lwc1 $f0, %lo(D_80A66960)($at) -/* 07A1C 80A62D0C 84AE0008 */ lh $t6, 0x0008($a1) ## 00000008 -/* 07A20 80A62D10 84AF000A */ lh $t7, 0x000A($a1) ## 0000000A -/* 07A24 80A62D14 84B8000C */ lh $t8, 0x000C($a1) ## 0000000C -/* 07A28 80A62D18 AC690000 */ sw $t1, 0x0000($v1) ## FFFFFFCC -/* 07A2C 80A62D1C 8F280004 */ lw $t0, 0x0004($t9) ## FFFFFFE8 -/* 07A30 80A62D20 448E5000 */ mtc1 $t6, $f10 ## $f10 = 0.00 -/* 07A34 80A62D24 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 07A38 80A62D28 AC680004 */ sw $t0, 0x0004($v1) ## FFFFFFD0 -/* 07A3C 80A62D2C 8F290008 */ lw $t1, 0x0008($t9) ## FFFFFFEC -/* 07A40 80A62D30 46805420 */ cvt.s.w $f16, $f10 -/* 07A44 80A62D34 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 07A48 80A62D38 AC690008 */ sw $t1, 0x0008($v1) ## FFFFFFD4 -/* 07A4C 80A62D3C C60A0248 */ lwc1 $f10, 0x0248($s0) ## 00000248 -/* 07A50 80A62D40 46809120 */ cvt.s.w $f4, $f18 -/* 07A54 80A62D44 E7AA0058 */ swc1 $f10, 0x0058($sp) -/* 07A58 80A62D48 8E0A0078 */ lw $t2, 0x0078($s0) ## 00000078 -/* 07A5C 80A62D4C 46008302 */ mul.s $f12, $f16, $f0 -/* 07A60 80A62D50 854B000E */ lh $t3, 0x000E($t2) ## 0000000E -/* 07A64 80A62D54 46002382 */ mul.s $f14, $f4, $f0 -/* 07A68 80A62D58 AFA30010 */ sw $v1, 0x0010($sp) -/* 07A6C 80A62D5C 448B8000 */ mtc1 $t3, $f16 ## $f16 = 0.00 -/* 07A70 80A62D60 E7AC0050 */ swc1 $f12, 0x0050($sp) -/* 07A74 80A62D64 46803220 */ cvt.s.w $f8, $f6 -/* 07A78 80A62D68 E7AE004C */ swc1 $f14, 0x004C($sp) -/* 07A7C 80A62D6C 46808420 */ cvt.s.w $f16, $f16 -/* 07A80 80A62D70 46004082 */ mul.s $f2, $f8, $f0 -/* 07A84 80A62D74 44078000 */ mfc1 $a3, $f16 -/* 07A88 80A62D78 44061000 */ mfc1 $a2, $f2 -/* 07A8C 80A62D7C 0C0332C3 */ jal Math3D_DistPlaneToPos -/* 07A90 80A62D80 E7A20048 */ swc1 $f2, 0x0048($sp) -/* 07A94 80A62D84 8FAC0080 */ lw $t4, 0x0080($sp) -/* 07A98 80A62D88 8E0D0078 */ lw $t5, 0x0078($s0) ## 00000078 -/* 07A9C 80A62D8C 27A30054 */ addiu $v1, $sp, 0x0054 ## $v1 = FFFFFFCC -/* 07AA0 80A62D90 C7A20048 */ lwc1 $f2, 0x0048($sp) -/* 07AA4 80A62D94 118D0021 */ beq $t4, $t5, .L80A62E1C -/* 07AA8 80A62D98 C7AC0050 */ lwc1 $f12, 0x0050($sp) -/* 07AAC 80A62D9C C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 -/* 07AB0 80A62DA0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 07AB4 80A62DA4 00000000 */ nop -/* 07AB8 80A62DA8 4612203E */ c.le.s $f4, $f18 -/* 07ABC 80A62DAC 00000000 */ nop -/* 07AC0 80A62DB0 4502001B */ bc1fl .L80A62E20 -/* 07AC4 80A62DB4 27AE0060 */ addiu $t6, $sp, 0x0060 ## $t6 = FFFFFFD8 -/* 07AC8 80A62DB8 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 07ACC 80A62DBC 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 -/* 07AD0 80A62DC0 30420004 */ andi $v0, $v0, 0x0004 ## $v0 = 00000000 -/* 07AD4 80A62DC4 14400007 */ bne $v0, $zero, .L80A62DE4 -/* 07AD8 80A62DC8 00000000 */ nop -/* 07ADC 80A62DCC 44813000 */ mtc1 $at, $f6 ## $f6 = -40.00 -/* 07AE0 80A62DD0 00000000 */ nop -/* 07AE4 80A62DD4 4606003C */ c.lt.s $f0, $f6 -/* 07AE8 80A62DD8 00000000 */ nop -/* 07AEC 80A62DDC 45030009 */ bc1tl .L80A62E04 -/* 07AF0 80A62DE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A62DE4: -/* 07AF4 80A62DE4 1040000D */ beq $v0, $zero, .L80A62E1C -/* 07AF8 80A62DE8 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 07AFC 80A62DEC 44814000 */ mtc1 $at, $f8 ## $f8 = -200.00 -/* 07B00 80A62DF0 00000000 */ nop -/* 07B04 80A62DF4 4608003C */ c.lt.s $f0, $f8 -/* 07B08 80A62DF8 00000000 */ nop -/* 07B0C 80A62DFC 45000007 */ bc1f .L80A62E1C -/* 07B10 80A62E00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A62E04: -/* 07B14 80A62E04 8FA5008C */ lw $a1, 0x008C($sp) -/* 07B18 80A62E08 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 07B1C 80A62E0C 0C298A69 */ jal func_80A629A4 -/* 07B20 80A62E10 8FA70044 */ lw $a3, 0x0044($sp) -/* 07B24 80A62E14 10000089 */ beq $zero, $zero, .L80A6303C -/* 07B28 80A62E18 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A62E1C: -/* 07B2C 80A62E1C 27AE0060 */ addiu $t6, $sp, 0x0060 ## $t6 = FFFFFFD8 -.L80A62E20: -/* 07B30 80A62E20 8DD80000 */ lw $t8, 0x0000($t6) ## FFFFFFD8 -/* 07B34 80A62E24 44061000 */ mfc1 $a2, $f2 -/* 07B38 80A62E28 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 07B3C 80A62E2C 8DCF0004 */ lw $t7, 0x0004($t6) ## FFFFFFDC -/* 07B40 80A62E30 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 07B44 80A62E34 8DD80008 */ lw $t8, 0x0008($t6) ## FFFFFFE0 -/* 07B48 80A62E38 AC780008 */ sw $t8, 0x0008($v1) ## 00000008 -/* 07B4C 80A62E3C C60A024C */ lwc1 $f10, 0x024C($s0) ## 0000024C -/* 07B50 80A62E40 C7AE004C */ lwc1 $f14, 0x004C($sp) -/* 07B54 80A62E44 E7AA0058 */ swc1 $f10, 0x0058($sp) -/* 07B58 80A62E48 8E190078 */ lw $t9, 0x0078($s0) ## 00000078 -/* 07B5C 80A62E4C 8728000E */ lh $t0, 0x000E($t9) ## 0000000E -/* 07B60 80A62E50 AFA30010 */ sw $v1, 0x0010($sp) -/* 07B64 80A62E54 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 07B68 80A62E58 00000000 */ nop -/* 07B6C 80A62E5C 46808420 */ cvt.s.w $f16, $f16 -/* 07B70 80A62E60 44078000 */ mfc1 $a3, $f16 -/* 07B74 80A62E64 0C0332C3 */ jal Math3D_DistPlaneToPos -/* 07B78 80A62E68 00000000 */ nop -/* 07B7C 80A62E6C 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 07B80 80A62E70 8FA9007C */ lw $t1, 0x007C($sp) -/* 07B84 80A62E74 51250013 */ beql $t1, $a1, .L80A62EC4 -/* 07B88 80A62E78 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 -/* 07B8C 80A62E7C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 07B90 80A62E80 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 07B94 80A62E84 4612203E */ c.le.s $f4, $f18 -/* 07B98 80A62E88 00000000 */ nop -/* 07B9C 80A62E8C 4502000D */ bc1fl .L80A62EC4 -/* 07BA0 80A62E90 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 -/* 07BA4 80A62E94 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 -/* 07BA8 80A62E98 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 -/* 07BAC 80A62E9C 314B0004 */ andi $t3, $t2, 0x0004 ## $t3 = 00000000 -/* 07BB0 80A62EA0 55600008 */ bnel $t3, $zero, .L80A62EC4 -/* 07BB4 80A62EA4 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 -/* 07BB8 80A62EA8 44813000 */ mtc1 $at, $f6 ## $f6 = -40.00 -/* 07BBC 80A62EAC 00000000 */ nop -/* 07BC0 80A62EB0 4606003C */ c.lt.s $f0, $f6 -/* 07BC4 80A62EB4 00000000 */ nop -/* 07BC8 80A62EB8 4503000D */ bc1tl .L80A62EF0 -/* 07BCC 80A62EBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07BD0 80A62EC0 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 -.L80A62EC4: -/* 07BD4 80A62EC4 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 07BD8 80A62EC8 C7AA004C */ lwc1 $f10, 0x004C($sp) -/* 07BDC 80A62ECC 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 -/* 07BE0 80A62ED0 11A0000D */ beq $t5, $zero, .L80A62F08 -/* 07BE4 80A62ED4 00000000 */ nop -/* 07BE8 80A62ED8 44814000 */ mtc1 $at, $f8 ## $f8 = -200.00 -/* 07BEC 80A62EDC 00000000 */ nop -/* 07BF0 80A62EE0 4608003C */ c.lt.s $f0, $f8 -/* 07BF4 80A62EE4 00000000 */ nop -/* 07BF8 80A62EE8 45000007 */ bc1f .L80A62F08 -/* 07BFC 80A62EEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A62EF0: -/* 07C00 80A62EF0 8FA5008C */ lw $a1, 0x008C($sp) -/* 07C04 80A62EF4 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 07C08 80A62EF8 0C298A69 */ jal func_80A629A4 -/* 07C0C 80A62EFC 8FA70044 */ lw $a3, 0x0044($sp) -/* 07C10 80A62F00 1000004E */ beq $zero, $zero, .L80A6303C -/* 07C14 80A62F04 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A62F08: -/* 07C18 80A62F08 3C0180A6 */ lui $at, %hi(D_80A66964) ## $at = 80A60000 -/* 07C1C 80A62F0C C4306964 */ lwc1 $f16, %lo(D_80A66964)($at) -/* 07C20 80A62F10 8FA40030 */ lw $a0, 0x0030($sp) -/* 07C24 80A62F14 4610503C */ c.lt.s $f10, $f16 -/* 07C28 80A62F18 00000000 */ nop -/* 07C2C 80A62F1C 4503000C */ bc1tl .L80A62F50 -/* 07C30 80A62F20 C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 -/* 07C34 80A62F24 0C0107BB */ jal SurfaceType_IsHorseBlocked -/* 07C38 80A62F28 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 07C3C 80A62F2C 14400007 */ bne $v0, $zero, .L80A62F4C -/* 07C40 80A62F30 8FA40030 */ lw $a0, 0x0030($sp) -/* 07C44 80A62F34 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 07C48 80A62F38 0C010753 */ jal func_80041D4C -/* 07C4C 80A62F3C 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 07C50 80A62F40 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 07C54 80A62F44 54410015 */ bnel $v0, $at, .L80A62F9C -/* 07C58 80A62F48 8E0E01F0 */ lw $t6, 0x01F0($s0) ## 000001F0 -.L80A62F4C: -/* 07C5C 80A62F4C C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 -.L80A62F50: -/* 07C60 80A62F50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 07C64 80A62F54 8FA70044 */ lw $a3, 0x0044($sp) -/* 07C68 80A62F58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07C6C 80A62F5C 4612203E */ c.le.s $f4, $f18 -/* 07C70 80A62F60 8FA5008C */ lw $a1, 0x008C($sp) -/* 07C74 80A62F64 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 07C78 80A62F68 45000007 */ bc1f .L80A62F88 -/* 07C7C 80A62F6C 00000000 */ nop -/* 07C80 80A62F70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07C84 80A62F74 8FA5008C */ lw $a1, 0x008C($sp) -/* 07C88 80A62F78 0C298A69 */ jal func_80A629A4 -/* 07C8C 80A62F7C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 07C90 80A62F80 1000002E */ beq $zero, $zero, .L80A6303C -/* 07C94 80A62F84 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A62F88: -/* 07C98 80A62F88 0C298A69 */ jal func_80A629A4 -/* 07C9C 80A62F8C 8FA70044 */ lw $a3, 0x0044($sp) -/* 07CA0 80A62F90 1000002A */ beq $zero, $zero, .L80A6303C -/* 07CA4 80A62F94 8FBF0024 */ lw $ra, 0x0024($sp) -/* 07CA8 80A62F98 8E0E01F0 */ lw $t6, 0x01F0($s0) ## 000001F0 -.L80A62F9C: -/* 07CAC 80A62F9C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 07CB0 80A62FA0 31CF0004 */ andi $t7, $t6, 0x0004 ## $t7 = 00000000 -/* 07CB4 80A62FA4 51E00004 */ beql $t7, $zero, .L80A62FB8 -/* 07CB8 80A62FA8 C6020080 */ lwc1 $f2, 0x0080($s0) ## 00000080 -/* 07CBC 80A62FAC 10000022 */ beq $zero, $zero, .L80A63038 -/* 07CC0 80A62FB0 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 07CC4 80A62FB4 C6020080 */ lwc1 $f2, 0x0080($s0) ## 00000080 -.L80A62FB8: -/* 07CC8 80A62FB8 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 07CCC 80A62FBC C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 07CD0 80A62FC0 87A2007A */ lh $v0, 0x007A($sp) -/* 07CD4 80A62FC4 46061200 */ add.s $f8, $f2, $f6 -/* 07CD8 80A62FC8 460A403C */ c.lt.s $f8, $f10 -/* 07CDC 80A62FCC 00000000 */ nop -/* 07CE0 80A62FD0 45020004 */ bc1fl .L80A62FE4 -/* 07CE4 80A62FD4 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 07CE8 80A62FD8 10000017 */ beq $zero, $zero, .L80A63038 -/* 07CEC 80A62FDC A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 07CF0 80A62FE0 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -.L80A62FE4: -/* 07CF4 80A62FE4 3C0180A6 */ lui $at, %hi(D_80A66968) ## $at = 80A60000 -/* 07CF8 80A62FE8 C4326968 */ lwc1 $f18, %lo(D_80A66968)($at) -/* 07CFC 80A62FEC 46808020 */ cvt.s.w $f0, $f16 -/* 07D00 80A62FF0 46000005 */ abs.s $f0, $f0 -/* 07D04 80A62FF4 4600903C */ c.lt.s $f18, $f0 -/* 07D08 80A62FF8 00000000 */ nop -/* 07D0C 80A62FFC 4503000F */ bc1tl .L80A6303C -/* 07D10 80A63000 8FBF0024 */ lw $ra, 0x0024($sp) -/* 07D14 80A63004 C6000248 */ lwc1 $f0, 0x0248($s0) ## 00000248 -/* 07D18 80A63008 C604024C */ lwc1 $f4, 0x024C($s0) ## 0000024C -/* 07D1C 80A6300C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 07D20 80A63010 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 07D24 80A63014 46002181 */ sub.s $f6, $f4, $f0 -/* 07D28 80A63018 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 07D2C 80A6301C 44818000 */ mtc1 $at, $f16 ## $f16 = 45.00 -/* 07D30 80A63020 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 -/* 07D34 80A63024 46083282 */ mul.s $f10, $f6, $f8 -/* 07D38 80A63028 46105483 */ div.s $f18, $f10, $f16 -/* 07D3C 80A6302C 46120100 */ add.s $f4, $f0, $f18 -/* 07D40 80A63030 46022181 */ sub.s $f6, $f4, $f2 -/* 07D44 80A63034 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -.L80A63038: -/* 07D48 80A63038 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A6303C: -/* 07D4C 80A6303C 8FB00020 */ lw $s0, 0x0020($sp) -/* 07D50 80A63040 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 07D54 80A63044 03E00008 */ jr $ra -/* 07D58 80A63048 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s deleted file mode 100644 index 1dceba0c1b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_80A6304C -/* 07D5C 80A6304C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 07D60 80A63050 AFBF001C */ sw $ra, 0x001C($sp) -/* 07D64 80A63054 AFB10018 */ sw $s1, 0x0018($sp) -/* 07D68 80A63058 AFB00014 */ sw $s0, 0x0014($sp) -/* 07D6C 80A6305C 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 07D70 80A63060 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 07D74 80A63064 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 07D78 80A63068 0C299405 */ jal func_80A65014 -/* 07D7C 80A6306C AFAE0020 */ sw $t6, 0x0020($sp) -/* 07D80 80A63070 1040000C */ beq $v0, $zero, .L80A630A4 -/* 07D84 80A63074 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 07D88 80A63078 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 -/* 07D8C 80A6307C 8FB90020 */ lw $t9, 0x0020($sp) -/* 07D90 80A63080 000FC3C0 */ sll $t8, $t7, 15 -/* 07D94 80A63084 07020008 */ bltzl $t8, .L80A630A8 -/* 07D98 80A63088 8E09020C */ lw $t1, 0x020C($s0) ## 0000020C -/* 07D9C 80A6308C 8F280440 */ lw $t0, 0x0440($t9) ## 00000440 -/* 07DA0 80A63090 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07DA4 80A63094 55000004 */ bnel $t0, $zero, .L80A630A8 -/* 07DA8 80A63098 8E09020C */ lw $t1, 0x020C($s0) ## 0000020C -/* 07DAC 80A6309C 0C00BD8F */ jal func_8002F63C -/* 07DB0 80A630A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80A630A4: -/* 07DB4 80A630A4 8E09020C */ lw $t1, 0x020C($s0) ## 0000020C -.L80A630A8: -/* 07DB8 80A630A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07DBC 80A630AC 5520000E */ bnel $t1, $zero, .L80A630E8 -/* 07DC0 80A630B0 8E0A020C */ lw $t2, 0x020C($s0) ## 0000020C -/* 07DC4 80A630B4 0C00BD86 */ jal Actor_HasChild -/* 07DC8 80A630B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07DCC 80A630BC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 07DD0 80A630C0 14430008 */ bne $v0, $v1, .L80A630E4 -/* 07DD4 80A630C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07DD8 80A630C8 24020037 */ addiu $v0, $zero, 0x0037 ## $v0 = 00000037 -/* 07DDC 80A630CC AE020150 */ sw $v0, 0x0150($s0) ## 00000150 -/* 07DE0 80A630D0 AE020154 */ sw $v0, 0x0154($s0) ## 00000154 -/* 07DE4 80A630D4 0C29723F */ jal func_80A5C8FC -/* 07DE8 80A630D8 AE03020C */ sw $v1, 0x020C($s0) ## 0000020C -/* 07DEC 80A630DC 10000016 */ beq $zero, $zero, .L80A63138 -/* 07DF0 80A630E0 8FBF001C */ lw $ra, 0x001C($sp) -.L80A630E4: -/* 07DF4 80A630E4 8E0A020C */ lw $t2, 0x020C($s0) ## 0000020C -.L80A630E8: -/* 07DF8 80A630E8 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 07DFC 80A630EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07E00 80A630F0 546A0011 */ bnel $v1, $t2, .L80A63138 -/* 07E04 80A630F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 07E08 80A630F8 0C00BD9D */ jal Actor_HasNoChild -/* 07E0C 80A630FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07E10 80A63100 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 07E14 80A63104 1443000B */ bne $v0, $v1, .L80A63134 -/* 07E18 80A63108 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 07E1C 80A6310C 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 07E20 80A63110 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 07E24 80A63114 24020023 */ addiu $v0, $zero, 0x0023 ## $v0 = 00000023 -/* 07E28 80A63118 01616024 */ and $t4, $t3, $at -/* 07E2C 80A6311C AE020150 */ sw $v0, 0x0150($s0) ## 00000150 -/* 07E30 80A63120 AE020154 */ sw $v0, 0x0154($s0) ## 00000154 -/* 07E34 80A63124 AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 -/* 07E38 80A63128 AE00020C */ sw $zero, 0x020C($s0) ## 0000020C -/* 07E3C 80A6312C 0C29723F */ jal func_80A5C8FC -/* 07E40 80A63130 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A63134: -/* 07E44 80A63134 8FBF001C */ lw $ra, 0x001C($sp) -.L80A63138: -/* 07E48 80A63138 8FB00014 */ lw $s0, 0x0014($sp) -/* 07E4C 80A6313C 8FB10018 */ lw $s1, 0x0018($sp) -/* 07E50 80A63140 03E00008 */ jr $ra -/* 07E54 80A63144 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s deleted file mode 100644 index dbdd1afd14..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s +++ /dev/null @@ -1,43 +0,0 @@ -.late_rodata -glabel D_80A6696C - .word 0x4622F983 - -.text -glabel func_80A63148 -/* 07E58 80A63148 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 07E5C 80A6314C AFBF0014 */ sw $ra, 0x0014($sp) -/* 07E60 80A63150 AFA60020 */ sw $a2, 0x0020($sp) -/* 07E64 80A63154 C4820000 */ lwc1 $f2, 0x0000($a0) ## 00000000 -/* 07E68 80A63158 C48C0004 */ lwc1 $f12, 0x0004($a0) ## 00000004 -/* 07E6C 80A6315C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 07E70 80A63160 46021102 */ mul.s $f4, $f2, $f2 -/* 07E74 80A63164 44817000 */ mtc1 $at, $f14 ## $f14 = 60.00 -/* 07E78 80A63168 460C6182 */ mul.s $f6, $f12, $f12 -/* 07E7C 80A6316C 46062000 */ add.s $f0, $f4, $f6 -/* 07E80 80A63170 46000004 */ sqrt.s $f0, $f0 -/* 07E84 80A63174 4600703C */ c.lt.s $f14, $f0 -/* 07E88 80A63178 E4A00000 */ swc1 $f0, 0x0000($a1) ## 00000000 -/* 07E8C 80A6317C 45020004 */ bc1fl .L80A63190 -/* 07E90 80A63180 C4A80000 */ lwc1 $f8, 0x0000($a1) ## 00000000 -/* 07E94 80A63184 10000003 */ beq $zero, $zero, .L80A63194 -/* 07E98 80A63188 E4AE0000 */ swc1 $f14, 0x0000($a1) ## 00000000 -/* 07E9C 80A6318C C4A80000 */ lwc1 $f8, 0x0000($a1) ## 00000000 -.L80A63190: -/* 07EA0 80A63190 E4A80000 */ swc1 $f8, 0x0000($a1) ## 00000000 -.L80A63194: -/* 07EA4 80A63194 C48C0000 */ lwc1 $f12, 0x0000($a0) ## 00000000 -/* 07EA8 80A63198 C48E0004 */ lwc1 $f14, 0x0004($a0) ## 00000004 -/* 07EAC 80A6319C 0C03F494 */ jal Math_FAtan2F -/* 07EB0 80A631A0 46006307 */ neg.s $f12, $f12 -/* 07EB4 80A631A4 3C0180A6 */ lui $at, %hi(D_80A6696C) ## $at = 80A60000 -/* 07EB8 80A631A8 C42A696C */ lwc1 $f10, %lo(D_80A6696C)($at) -/* 07EBC 80A631AC 8FB80020 */ lw $t8, 0x0020($sp) -/* 07EC0 80A631B0 460A0402 */ mul.s $f16, $f0, $f10 -/* 07EC4 80A631B4 4600848D */ trunc.w.s $f18, $f16 -/* 07EC8 80A631B8 440F9000 */ mfc1 $t7, $f18 -/* 07ECC 80A631BC 00000000 */ nop -/* 07ED0 80A631C0 A70F0000 */ sh $t7, 0x0000($t8) ## 00000000 -/* 07ED4 80A631C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07ED8 80A631C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 07EDC 80A631CC 03E00008 */ jr $ra -/* 07EE0 80A631D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A631D4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A631D4.s deleted file mode 100644 index 7e35649aad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A631D4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A631D4 -/* 07EE4 80A631D4 8C8F0264 */ lw $t7, 0x0264($a0) ## 00000264 -/* 07EE8 80A631D8 8C8E0268 */ lw $t6, 0x0268($a0) ## 00000268 -/* 07EEC 80A631DC AC8F026C */ sw $t7, 0x026C($a0) ## 0000026C -/* 07EF0 80A631E0 AC8E0270 */ sw $t6, 0x0270($a0) ## 00000270 -/* 07EF4 80A631E4 80B80028 */ lb $t8, 0x0028($a1) ## 00000028 -/* 07EF8 80A631E8 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 07EFC 80A631EC 00000000 */ nop -/* 07F00 80A631F0 468021A0 */ cvt.s.w $f6, $f4 -/* 07F04 80A631F4 E4860264 */ swc1 $f6, 0x0264($a0) ## 00000264 -/* 07F08 80A631F8 80B90029 */ lb $t9, 0x0029($a1) ## 00000029 -/* 07F0C 80A631FC 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 07F10 80A63200 00000000 */ nop -/* 07F14 80A63204 468042A0 */ cvt.s.w $f10, $f8 -/* 07F18 80A63208 03E00008 */ jr $ra -/* 07F1C 80A6320C E48A0268 */ swc1 $f10, 0x0268($a0) ## 00000268 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s deleted file mode 100644 index 528833e302..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s +++ /dev/null @@ -1,97 +0,0 @@ -.late_rodata -glabel D_80A66970 - .word 0x38000100 -glabel D_80A66974 - .word 0x4622F983 -glabel D_80A66978 - .word 0x3F350481 - -.text -glabel func_80A63210 -/* 07F20 80A63210 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 07F24 80A63214 AFBF0034 */ sw $ra, 0x0034($sp) -/* 07F28 80A63218 AFB00030 */ sw $s0, 0x0030($sp) -/* 07F2C 80A6321C F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 07F30 80A63220 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 07F34 80A63224 AFA5004C */ sw $a1, 0x004C($sp) -/* 07F38 80A63228 84CE0008 */ lh $t6, 0x0008($a2) ## 00000008 -/* 07F3C 80A6322C 84CF000A */ lh $t7, 0x000A($a2) ## 0000000A -/* 07F40 80A63230 3C0180A6 */ lui $at, %hi(D_80A66970) ## $at = 80A60000 -/* 07F44 80A63234 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 07F48 80A63238 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 07F4C 80A6323C C4206970 */ lwc1 $f0, %lo(D_80A66970)($at) -/* 07F50 80A63240 46802320 */ cvt.s.w $f12, $f4 -/* 07F54 80A63244 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 07F58 80A63248 46803220 */ cvt.s.w $f8, $f6 -/* 07F5C 80A6324C 46006502 */ mul.s $f20, $f12, $f0 -/* 07F60 80A63250 00000000 */ nop -/* 07F64 80A63254 46004282 */ mul.s $f10, $f8, $f0 -/* 07F68 80A63258 E7AA003C */ swc1 $f10, 0x003C($sp) -/* 07F6C 80A6325C 84D8000C */ lh $t8, 0x000C($a2) ## 0000000C -/* 07F70 80A63260 AFA60050 */ sw $a2, 0x0050($sp) -/* 07F74 80A63264 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 07F78 80A63268 00000000 */ nop -/* 07F7C 80A6326C 468083A0 */ cvt.s.w $f14, $f16 -/* 07F80 80A63270 46007582 */ mul.s $f22, $f14, $f0 -/* 07F84 80A63274 0C03F494 */ jal Math_FAtan2F -/* 07F88 80A63278 00000000 */ nop -/* 07F8C 80A6327C 3C0180A6 */ lui $at, %hi(D_80A66974) ## $at = 80A60000 -/* 07F90 80A63280 C4326974 */ lwc1 $f18, %lo(D_80A66974)($at) -/* 07F94 80A63284 86190032 */ lh $t9, 0x0032($s0) ## 00000032 -/* 07F98 80A63288 46120102 */ mul.s $f4, $f0, $f18 -/* 07F9C 80A6328C 4600218D */ trunc.w.s $f6, $f4 -/* 07FA0 80A63290 440B3000 */ mfc1 $t3, $f6 -/* 07FA4 80A63294 00000000 */ nop -/* 07FA8 80A63298 032B2023 */ subu $a0, $t9, $t3 -/* 07FAC 80A6329C 24848001 */ addiu $a0, $a0, 0x8001 ## $a0 = FFFF8001 -/* 07FB0 80A632A0 00042400 */ sll $a0, $a0, 16 -/* 07FB4 80A632A4 0C01DE0D */ jal Math_CosS - ## coss? -/* 07FB8 80A632A8 00042403 */ sra $a0, $a0, 16 -/* 07FBC 80A632AC 3C0180A6 */ lui $at, %hi(D_80A66978) ## $at = 80A60000 -/* 07FC0 80A632B0 C4286978 */ lwc1 $f8, %lo(D_80A66978)($at) -/* 07FC4 80A632B4 8FA50050 */ lw $a1, 0x0050($sp) -/* 07FC8 80A632B8 4608003C */ c.lt.s $f0, $f8 -/* 07FCC 80A632BC 00000000 */ nop -/* 07FD0 80A632C0 45030023 */ bc1tl .L80A63350 -/* 07FD4 80A632C4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 07FD8 80A632C8 84AC000E */ lh $t4, 0x000E($a1) ## 0000000E -/* 07FDC 80A632CC 4406B000 */ mfc1 $a2, $f22 -/* 07FE0 80A632D0 260D0024 */ addiu $t5, $s0, 0x0024 ## $t5 = 00000024 -/* 07FE4 80A632D4 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 07FE8 80A632D8 AFAD0010 */ sw $t5, 0x0010($sp) -/* 07FEC 80A632DC 4600A306 */ mov.s $f12, $f20 -/* 07FF0 80A632E0 468052A0 */ cvt.s.w $f10, $f10 -/* 07FF4 80A632E4 C7AE003C */ lwc1 $f14, 0x003C($sp) -/* 07FF8 80A632E8 44075000 */ mfc1 $a3, $f10 -/* 07FFC 80A632EC 0C0332C3 */ jal Math3D_DistPlaneToPos -/* 08000 80A632F0 00000000 */ nop -/* 08004 80A632F4 4614A402 */ mul.s $f16, $f20, $f20 -/* 08008 80A632F8 46000306 */ mov.s $f12, $f0 -/* 0800C 80A632FC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 08010 80A63300 4616B482 */ mul.s $f18, $f22, $f22 -/* 08014 80A63304 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 08018 80A63308 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0801C 80A6330C 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 08020 80A63310 460C2181 */ sub.s $f6, $f4, $f12 -/* 08024 80A63314 46128000 */ add.s $f0, $f16, $f18 -/* 08028 80A63318 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 0802C 80A6331C 46000004 */ sqrt.s $f0, $f0 -/* 08030 80A63320 46004283 */ div.s $f10, $f8, $f0 -/* 08034 80A63324 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 08038 80A63328 460A3082 */ mul.s $f2, $f6, $f10 -/* 0803C 80A6332C 00000000 */ nop -/* 08040 80A63330 46141482 */ mul.s $f18, $f2, $f20 -/* 08044 80A63334 00000000 */ nop -/* 08048 80A63338 46161182 */ mul.s $f6, $f2, $f22 -/* 0804C 80A6333C 46128100 */ add.s $f4, $f16, $f18 -/* 08050 80A63340 46064280 */ add.s $f10, $f8, $f6 -/* 08054 80A63344 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 08058 80A63348 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 0805C 80A6334C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A63350: -/* 08060 80A63350 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 08064 80A63354 D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 08068 80A63358 8FB00030 */ lw $s0, 0x0030($sp) -/* 0806C 80A6335C 03E00008 */ jr $ra -/* 08070 80A63360 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s deleted file mode 100644 index 2e41d44466..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_80A63364 -/* 08074 80A63364 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 08078 80A63368 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0807C 80A6336C AFB00030 */ sw $s0, 0x0030($sp) -/* 08080 80A63370 AFA50074 */ sw $a1, 0x0074($sp) -/* 08084 80A63374 84AF00A4 */ lh $t7, 0x00A4($a1) ## 000000A4 -/* 08088 80A63378 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0808C 80A6337C 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 08090 80A63380 15E10005 */ bne $t7, $at, .L80A63398 -/* 08094 80A63384 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFF0 -/* 08098 80A63388 3C014198 */ lui $at, 0x4198 ## $at = 41980000 -/* 0809C 80A6338C 44810000 */ mtc1 $at, $f0 ## $f0 = 19.00 -/* 080A0 80A63390 10000005 */ beq $zero, $zero, .L80A633A8 -/* 080A4 80A63394 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -.L80A63398: -/* 080A8 80A63398 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 080AC 80A6339C 44810000 */ mtc1 $at, $f0 ## $f0 = 40.00 -/* 080B0 80A633A0 00000000 */ nop -/* 080B4 80A633A4 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -.L80A633A8: -/* 080B8 80A633A8 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 080BC 80A633AC E7A0006C */ swc1 $f0, 0x006C($sp) -/* 080C0 80A633B0 C7A0006C */ lwc1 $f0, 0x006C($sp) -/* 080C4 80A633B4 C7A40064 */ lwc1 $f4, 0x0064($sp) -/* 080C8 80A633B8 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 -/* 080CC 80A633BC 27A50060 */ addiu $a1, $sp, 0x0060 ## $a1 = FFFFFFF0 -/* 080D0 80A633C0 46002180 */ add.s $f6, $f4, $f0 -/* 080D4 80A633C4 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 080D8 80A633C8 E7A60064 */ swc1 $f6, 0x0064($sp) -/* 080DC 80A633CC 0C01DE1C */ jal Math_SinS - ## sins? -/* 080E0 80A633D0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 080E4 80A633D4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 080E8 80A633D8 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 -/* 080EC 80A633DC C7A80054 */ lwc1 $f8, 0x0054($sp) -/* 080F0 80A633E0 46005402 */ mul.s $f16, $f10, $f0 -/* 080F4 80A633E4 46104480 */ add.s $f18, $f8, $f16 -/* 080F8 80A633E8 E7B20054 */ swc1 $f18, 0x0054($sp) -/* 080FC 80A633EC 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 08100 80A633F0 00042023 */ subu $a0, $zero, $a0 -/* 08104 80A633F4 00042400 */ sll $a0, $a0, 16 -/* 08108 80A633F8 0C01DE1C */ jal Math_SinS - ## sins? -/* 0810C 80A633FC 00042403 */ sra $a0, $a0, 16 -/* 08110 80A63400 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 08114 80A63404 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 08118 80A63408 C7A40058 */ lwc1 $f4, 0x0058($sp) -/* 0811C 80A6340C 46003282 */ mul.s $f10, $f6, $f0 -/* 08120 80A63410 460A2200 */ add.s $f8, $f4, $f10 -/* 08124 80A63414 E7A80058 */ swc1 $f8, 0x0058($sp) -/* 08128 80A63418 0C01DE0D */ jal Math_CosS - ## coss? -/* 0812C 80A6341C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 08130 80A63420 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 08134 80A63424 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 -/* 08138 80A63428 C7B0005C */ lwc1 $f16, 0x005C($sp) -/* 0813C 80A6342C 8FA40074 */ lw $a0, 0x0074($sp) -/* 08140 80A63430 46009182 */ mul.s $f6, $f18, $f0 -/* 08144 80A63434 27B80044 */ addiu $t8, $sp, 0x0044 ## $t8 = FFFFFFD4 -/* 08148 80A63438 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0814C 80A6343C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 08150 80A63440 27A90040 */ addiu $t1, $sp, 0x0040 ## $t1 = FFFFFFD0 -/* 08154 80A63444 AFA90024 */ sw $t1, 0x0024($sp) -/* 08158 80A63448 AFA80020 */ sw $t0, 0x0020($sp) -/* 0815C 80A6344C 46068100 */ add.s $f4, $f16, $f6 -/* 08160 80A63450 AFB90014 */ sw $t9, 0x0014($sp) -/* 08164 80A63454 AFB80010 */ sw $t8, 0x0010($sp) -/* 08168 80A63458 27A50060 */ addiu $a1, $sp, 0x0060 ## $a1 = FFFFFFF0 -/* 0816C 80A6345C E7A4005C */ swc1 $f4, 0x005C($sp) -/* 08170 80A63460 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFE4 -/* 08174 80A63464 27A70048 */ addiu $a3, $sp, 0x0048 ## $a3 = FFFFFFD8 -/* 08178 80A63468 AFA00018 */ sw $zero, 0x0018($sp) -/* 0817C 80A6346C AFA0001C */ sw $zero, 0x001C($sp) -/* 08180 80A63470 0C00F7A1 */ jal BgCheck_EntityLineTest1 -/* 08184 80A63474 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 08188 80A63478 10400004 */ beq $v0, $zero, .L80A6348C -/* 0818C 80A6347C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08190 80A63480 8FA50074 */ lw $a1, 0x0074($sp) -/* 08194 80A63484 0C298C84 */ jal func_80A63210 -/* 08198 80A63488 8FA60044 */ lw $a2, 0x0044($sp) -.L80A6348C: -/* 0819C 80A6348C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 081A0 80A63490 8FB00030 */ lw $s0, 0x0030($sp) -/* 081A4 80A63494 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 081A8 80A63498 03E00008 */ jr $ra -/* 081AC 80A6349C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s deleted file mode 100644 index 79f5ca537d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s +++ /dev/null @@ -1,779 +0,0 @@ -.late_rodata -glabel D_80A6697C - .word 0xBE99999A -glabel D_80A66980 - .word 0x414CCCCD -glabel D_80A66984 - .word 0x4622F983 -glabel D_80A66988 - .word 0x38000100 -glabel D_80A6698C - .word 0x38000100 -glabel D_80A66990 - .word 0x38000100 -glabel D_80A66994 - .word 0x3F51B3F3 -glabel D_80A66998 - .word 0x38000100 -glabel D_80A6699C - .word 0x3F51B3F3 -glabel D_80A669A0 - .word 0x415CCCCD -glabel D_80A669A4 - .word 0x415CCCCD - -.text -glabel func_80A634A0 -/* 081B0 80A634A0 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 081B4 80A634A4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 081B8 80A634A8 AFB00030 */ sw $s0, 0x0030($sp) -/* 081BC 80A634AC AFA500C4 */ sw $a1, 0x00C4($sp) -/* 081C0 80A634B0 AFA00088 */ sw $zero, 0x0088($sp) -/* 081C4 80A634B4 AFA00084 */ sw $zero, 0x0084($sp) -/* 081C8 80A634B8 84AF00A4 */ lh $t7, 0x00A4($a1) ## 000000A4 -/* 081CC 80A634BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 081D0 80A634C0 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 081D4 80A634C4 15E10005 */ bne $t7, $at, .L80A634DC -/* 081D8 80A634C8 8FA400C4 */ lw $a0, 0x00C4($sp) -/* 081DC 80A634CC 3C014198 */ lui $at, 0x4198 ## $at = 41980000 -/* 081E0 80A634D0 44810000 */ mtc1 $at, $f0 ## $f0 = 19.00 -/* 081E4 80A634D4 10000005 */ beq $zero, $zero, .L80A634EC -/* 081E8 80A634D8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -.L80A634DC: -/* 081EC 80A634DC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 081F0 80A634E0 44810000 */ mtc1 $at, $f0 ## $f0 = 40.00 -/* 081F4 80A634E4 00000000 */ nop -/* 081F8 80A634E8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -.L80A634EC: -/* 081FC 80A634EC 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 08200 80A634F0 44060000 */ mfc1 $a2, $f0 -/* 08204 80A634F4 2418001D */ addiu $t8, $zero, 0x001D ## $t8 = 0000001D -/* 08208 80A634F8 AFB80014 */ sw $t8, 0x0014($sp) -/* 0820C 80A634FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08210 80A63500 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 -/* 08214 80A63504 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 08218 80A63508 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0821C 80A6350C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08220 80A63510 0C296CBC */ jal func_80A5B2F0 -/* 08224 80A63514 8FA500C4 */ lw $a1, 0x00C4($sp) -/* 08228 80A63518 5440029F */ bnel $v0, $zero, .L80A63F98 -/* 0822C 80A6351C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08230 80A63520 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 -/* 08234 80A63524 33280008 */ andi $t0, $t9, 0x0008 ## $t0 = 00000000 -/* 08238 80A63528 51000022 */ beql $t0, $zero, .L80A635B4 -/* 0823C 80A6352C 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 -/* 08240 80A63530 8609007E */ lh $t1, 0x007E($s0) ## 0000007E -/* 08244 80A63534 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 08248 80A63538 012A2023 */ subu $a0, $t1, $t2 -/* 0824C 80A6353C 00042400 */ sll $a0, $a0, 16 -/* 08250 80A63540 0C01DE0D */ jal Math_CosS - ## coss? -/* 08254 80A63544 00042403 */ sra $a0, $a0, 16 -/* 08258 80A63548 3C0180A6 */ lui $at, %hi(D_80A6697C) ## $at = 80A60000 -/* 0825C 80A6354C C426697C */ lwc1 $f6, %lo(D_80A6697C)($at) -/* 08260 80A63550 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 08264 80A63554 4606003C */ c.lt.s $f0, $f6 -/* 08268 80A63558 00000000 */ nop -/* 0826C 80A6355C 45020015 */ bc1fl .L80A635B4 -/* 08270 80A63560 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 -/* 08274 80A63564 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 08278 80A63568 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 0827C 80A6356C 3C078013 */ lui $a3, %hi(D_801333E0) -/* 08280 80A63570 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 08284 80A63574 4600403C */ c.lt.s $f8, $f0 -/* 08288 80A63578 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0828C 80A6357C 4502000D */ bc1fl .L80A635B4 -/* 08290 80A63580 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 -/* 08294 80A63584 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 08298 80A63588 3C0B8013 */ lui $t3, %hi(D_801333E8) -/* 0829C 80A6358C 256B33E8 */ addiu $t3, %lo(D_801333E8) -/* 082A0 80A63590 460A0401 */ sub.s $f16, $f0, $f10 -/* 082A4 80A63594 2404282C */ addiu $a0, $zero, 0x282C ## $a0 = 0000282C -/* 082A8 80A63598 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 082AC 80A6359C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 082B0 80A635A0 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 082B4 80A635A4 AFAB0014 */ sw $t3, 0x0014($sp) -/* 082B8 80A635A8 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 082BC 80A635AC AFA70010 */ sw $a3, 0x0010($sp) -/* 082C0 80A635B0 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 -.L80A635B4: -/* 082C4 80A635B4 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 -/* 082C8 80A635B8 55A00277 */ bnel $t5, $zero, .L80A63F98 -/* 082CC 80A635BC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 082D0 80A635C0 8E0E020C */ lw $t6, 0x020C($s0) ## 0000020C -/* 082D4 80A635C4 51C00274 */ beql $t6, $zero, .L80A63F98 -/* 082D8 80A635C8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 082DC 80A635CC C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 082E0 80A635D0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 082E4 80A635D4 00000000 */ nop -/* 082E8 80A635D8 4612003C */ c.lt.s $f0, $f18 -/* 082EC 80A635DC 00000000 */ nop -/* 082F0 80A635E0 4503026D */ bc1tl .L80A63F98 -/* 082F4 80A635E4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 082F8 80A635E8 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C -/* 082FC 80A635EC 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 08300 80A635F0 10410268 */ beq $v0, $at, .L80A63F94 -/* 08304 80A635F4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 08308 80A635F8 10410266 */ beq $v0, $at, .L80A63F94 -/* 0830C 80A635FC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 08310 80A63600 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 08314 80A63604 3C0180A6 */ lui $at, %hi(D_80A66980) ## $at = 80A60000 -/* 08318 80A63608 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0831C 80A6360C 4600203C */ c.lt.s $f4, $f0 -/* 08320 80A63610 26030024 */ addiu $v1, $s0, 0x0024 ## $v1 = 00000024 -/* 08324 80A63614 45000011 */ bc1f .L80A6365C -/* 08328 80A63618 00000000 */ nop -/* 0832C 80A6361C C4266980 */ lwc1 $f6, %lo(D_80A66980)($at) -/* 08330 80A63620 3C014366 */ lui $at, 0x4366 ## $at = 43660000 -/* 08334 80A63624 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 08338 80A63628 4606003C */ c.lt.s $f0, $f6 -/* 0833C 80A6362C 00000000 */ nop -/* 08340 80A63630 45020007 */ bc1fl .L80A63650 -/* 08344 80A63634 44815000 */ mtc1 $at, $f10 ## $f10 = 230.00 -/* 08348 80A63638 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 0834C 80A6363C 44814000 */ mtc1 $at, $f8 ## $f8 = 160.00 -/* 08350 80A63640 AFA00070 */ sw $zero, 0x0070($sp) -/* 08354 80A63644 10000009 */ beq $zero, $zero, .L80A6366C -/* 08358 80A63648 E7A8008C */ swc1 $f8, 0x008C($sp) -/* 0835C 80A6364C 44815000 */ mtc1 $at, $f10 ## $f10 = 160.00 -.L80A63650: -/* 08360 80A63650 AFAF0070 */ sw $t7, 0x0070($sp) -/* 08364 80A63654 10000005 */ beq $zero, $zero, .L80A6366C -/* 08368 80A63658 E7AA008C */ swc1 $f10, 0x008C($sp) -.L80A6365C: -/* 0836C 80A6365C 0C298CD9 */ jal func_80A63364 -/* 08370 80A63660 8FA500C4 */ lw $a1, 0x00C4($sp) -/* 08374 80A63664 1000024C */ beq $zero, $zero, .L80A63F98 -/* 08378 80A63668 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A6366C: -/* 0837C 80A6366C 8C790000 */ lw $t9, 0x0000($v1) ## 00000000 -/* 08380 80A63670 27A200AC */ addiu $v0, $sp, 0x00AC ## $v0 = FFFFFFEC -/* 08384 80A63674 3C014198 */ lui $at, 0x4198 ## $at = 41980000 -/* 08388 80A63678 AC590000 */ sw $t9, 0x0000($v0) ## FFFFFFEC -/* 0838C 80A6367C 8C780004 */ lw $t8, 0x0004($v1) ## 00000004 -/* 08390 80A63680 44819000 */ mtc1 $at, $f18 ## $f18 = 19.00 -/* 08394 80A63684 27A800A0 */ addiu $t0, $sp, 0x00A0 ## $t0 = FFFFFFE0 -/* 08398 80A63688 AC580004 */ sw $t8, 0x0004($v0) ## FFFFFFF0 -/* 0839C 80A6368C 8C790008 */ lw $t9, 0x0008($v1) ## 00000008 -/* 083A0 80A63690 AC590008 */ sw $t9, 0x0008($v0) ## FFFFFFF4 -/* 083A4 80A63694 C7B000B0 */ lwc1 $f16, 0x00B0($sp) -/* 083A8 80A63698 46128100 */ add.s $f4, $f16, $f18 -/* 083AC 80A6369C E7A400B0 */ swc1 $f4, 0x00B0($sp) -/* 083B0 80A636A0 8C4A0000 */ lw $t2, 0x0000($v0) ## FFFFFFEC -/* 083B4 80A636A4 AD0A0000 */ sw $t2, 0x0000($t0) ## FFFFFFE0 -/* 083B8 80A636A8 8C490004 */ lw $t1, 0x0004($v0) ## FFFFFFF0 -/* 083BC 80A636AC AD090004 */ sw $t1, 0x0004($t0) ## FFFFFFE4 -/* 083C0 80A636B0 8C4A0008 */ lw $t2, 0x0008($v0) ## FFFFFFF4 -/* 083C4 80A636B4 AD0A0008 */ sw $t2, 0x0008($t0) ## FFFFFFE8 -/* 083C8 80A636B8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 083CC 80A636BC 0C01DE1C */ jal Math_SinS - ## sins? -/* 083D0 80A636C0 AFA30044 */ sw $v1, 0x0044($sp) -/* 083D4 80A636C4 C7A8008C */ lwc1 $f8, 0x008C($sp) -/* 083D8 80A636C8 C7A600A0 */ lwc1 $f6, 0x00A0($sp) -/* 083DC 80A636CC 46004282 */ mul.s $f10, $f8, $f0 -/* 083E0 80A636D0 460A3400 */ add.s $f16, $f6, $f10 -/* 083E4 80A636D4 E7B000A0 */ swc1 $f16, 0x00A0($sp) -/* 083E8 80A636D8 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 083EC 80A636DC 00042023 */ subu $a0, $zero, $a0 -/* 083F0 80A636E0 00042400 */ sll $a0, $a0, 16 -/* 083F4 80A636E4 0C01DE1C */ jal Math_SinS - ## sins? -/* 083F8 80A636E8 00042403 */ sra $a0, $a0, 16 -/* 083FC 80A636EC C7A4008C */ lwc1 $f4, 0x008C($sp) -/* 08400 80A636F0 C7B200A4 */ lwc1 $f18, 0x00A4($sp) -/* 08404 80A636F4 46002202 */ mul.s $f8, $f4, $f0 -/* 08408 80A636F8 46089180 */ add.s $f6, $f18, $f8 -/* 0840C 80A636FC E7A600A4 */ swc1 $f6, 0x00A4($sp) -/* 08410 80A63700 0C01DE0D */ jal Math_CosS - ## coss? -/* 08414 80A63704 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 08418 80A63708 C7B0008C */ lwc1 $f16, 0x008C($sp) -/* 0841C 80A6370C C7AA00A8 */ lwc1 $f10, 0x00A8($sp) -/* 08420 80A63710 27A600A0 */ addiu $a2, $sp, 0x00A0 ## $a2 = FFFFFFE0 -/* 08424 80A63714 46008102 */ mul.s $f4, $f16, $f0 -/* 08428 80A63718 27A7005C */ addiu $a3, $sp, 0x005C ## $a3 = FFFFFF9C -/* 0842C 80A6371C 27AD0088 */ addiu $t5, $sp, 0x0088 ## $t5 = FFFFFFC8 -/* 08430 80A63720 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 08434 80A63724 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 08438 80A63728 27B80080 */ addiu $t8, $sp, 0x0080 ## $t8 = FFFFFFC0 -/* 0843C 80A6372C 27A500AC */ addiu $a1, $sp, 0x00AC ## $a1 = FFFFFFEC -/* 08440 80A63730 46045480 */ add.s $f18, $f10, $f4 -/* 08444 80A63734 E7B200A8 */ swc1 $f18, 0x00A8($sp) -/* 08448 80A63738 8CCC0000 */ lw $t4, 0x0000($a2) ## FFFFFFE0 -/* 0844C 80A6373C 8CCB0004 */ lw $t3, 0x0004($a2) ## FFFFFFE4 -/* 08450 80A63740 ACEC0000 */ sw $t4, 0x0000($a3) ## FFFFFF9C -/* 08454 80A63744 8CCC0008 */ lw $t4, 0x0008($a2) ## FFFFFFE8 -/* 08458 80A63748 ACEB0004 */ sw $t3, 0x0004($a3) ## FFFFFFA0 -/* 0845C 80A6374C ACEC0008 */ sw $t4, 0x0008($a3) ## FFFFFFA4 -/* 08460 80A63750 8FA400C4 */ lw $a0, 0x00C4($sp) -/* 08464 80A63754 AFA00088 */ sw $zero, 0x0088($sp) -/* 08468 80A63758 AFB80024 */ sw $t8, 0x0024($sp) -/* 0846C 80A6375C 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 08470 80A63760 AFA4003C */ sw $a0, 0x003C($sp) -/* 08474 80A63764 AFAF0020 */ sw $t7, 0x0020($sp) -/* 08478 80A63768 AFA0001C */ sw $zero, 0x001C($sp) -/* 0847C 80A6376C AFA00018 */ sw $zero, 0x0018($sp) -/* 08480 80A63770 AFAE0014 */ sw $t6, 0x0014($sp) -/* 08484 80A63774 0C00F7A1 */ jal BgCheck_EntityLineTest1 -/* 08488 80A63778 AFAD0010 */ sw $t5, 0x0010($sp) -/* 0848C 80A6377C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 08490 80A63780 1441000A */ bne $v0, $at, .L80A637AC -/* 08494 80A63784 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFEC -/* 08498 80A63788 0C032D94 */ jal Math3D_Vec3fDistSq -/* 0849C 80A6378C 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFF9C -/* 084A0 80A63790 46000021 */ cvt.d.s $f0, $f0 -/* 084A4 80A63794 46200004 */ sqrt.d $f0, $f0 -/* 084A8 80A63798 46200220 */ cvt.s.d $f8, $f0 -/* 084AC 80A6379C E7A8008C */ swc1 $f8, 0x008C($sp) -/* 084B0 80A637A0 8E1901F0 */ lw $t9, 0x01F0($s0) ## 000001F0 -/* 084B4 80A637A4 37284000 */ ori $t0, $t9, 0x4000 ## $t0 = 00004000 -/* 084B8 80A637A8 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -.L80A637AC: -/* 084BC 80A637AC 8FA90088 */ lw $t1, 0x0088($sp) -/* 084C0 80A637B0 C7A6008C */ lwc1 $f6, 0x008C($sp) -/* 084C4 80A637B4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 084C8 80A637B8 5120006D */ beql $t1, $zero, .L80A63970 -/* 084CC 80A637BC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 084D0 80A637C0 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 084D4 80A637C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 084D8 80A637C8 8FA500C4 */ lw $a1, 0x00C4($sp) -/* 084DC 80A637CC 4610303C */ c.lt.s $f6, $f16 -/* 084E0 80A637D0 00000000 */ nop -/* 084E4 80A637D4 45020004 */ bc1fl .L80A637E8 -/* 084E8 80A637D8 8FAA0088 */ lw $t2, 0x0088($sp) -/* 084EC 80A637DC 0C298C84 */ jal func_80A63210 -/* 084F0 80A637E0 01203025 */ or $a2, $t1, $zero ## $a2 = 00000000 -/* 084F4 80A637E4 8FAA0088 */ lw $t2, 0x0088($sp) -.L80A637E8: -/* 084F8 80A637E8 854B0008 */ lh $t3, 0x0008($t2) ## 00000008 -/* 084FC 80A637EC 854C000C */ lh $t4, 0x000C($t2) ## 0000000C -/* 08500 80A637F0 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 -/* 08504 80A637F4 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 08508 80A637F8 46805320 */ cvt.s.w $f12, $f10 -/* 0850C 80A637FC 0C03F494 */ jal Math_FAtan2F -/* 08510 80A63800 468023A0 */ cvt.s.w $f14, $f4 -/* 08514 80A63804 3C0180A6 */ lui $at, %hi(D_80A66984) ## $at = 80A60000 -/* 08518 80A63808 C4326984 */ lwc1 $f18, %lo(D_80A66984)($at) -/* 0851C 80A6380C 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 -/* 08520 80A63810 46120202 */ mul.s $f8, $f0, $f18 -/* 08524 80A63814 4600418D */ trunc.w.s $f6, $f8 -/* 08528 80A63818 44193000 */ mfc1 $t9, $f6 -/* 0852C 80A6381C 00000000 */ nop -/* 08530 80A63820 01B92023 */ subu $a0, $t5, $t9 -/* 08534 80A63824 24848001 */ addiu $a0, $a0, 0x8001 ## $a0 = FFFF8001 -/* 08538 80A63828 00042400 */ sll $a0, $a0, 16 -/* 0853C 80A6382C 0C01DE0D */ jal Math_CosS - ## coss? -/* 08540 80A63830 00042403 */ sra $a0, $a0, 16 -/* 08544 80A63834 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 08548 80A63838 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 0854C 80A6383C 8FA4003C */ lw $a0, 0x003C($sp) -/* 08550 80A63840 8FA50088 */ lw $a1, 0x0088($sp) -/* 08554 80A63844 4610003C */ c.lt.s $f0, $f16 -/* 08558 80A63848 00000000 */ nop -/* 0855C 80A6384C 450301D2 */ bc1tl .L80A63F98 -/* 08560 80A63850 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08564 80A63854 0C0107BB */ jal SurfaceType_IsHorseBlocked -/* 08568 80A63858 8FA60080 */ lw $a2, 0x0080($sp) -/* 0856C 80A6385C 544001CE */ bnel $v0, $zero, .L80A63F98 -/* 08570 80A63860 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08574 80A63864 8FA20070 */ lw $v0, 0x0070($sp) -/* 08578 80A63868 C7AA008C */ lwc1 $f10, 0x008C($sp) -/* 0857C 80A6386C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 08580 80A63870 54400007 */ bnel $v0, $zero, .L80A63890 -/* 08584 80A63874 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 08588 80A63878 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -/* 0858C 80A6387C 00000000 */ nop -/* 08590 80A63880 4604503C */ c.lt.s $f10, $f4 -/* 08594 80A63884 00000000 */ nop -/* 08598 80A63888 4501000A */ bc1t .L80A638B4 -/* 0859C 80A6388C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80A63890: -/* 085A0 80A63890 14410018 */ bne $v0, $at, .L80A638F4 -/* 085A4 80A63894 C7B2008C */ lwc1 $f18, 0x008C($sp) -/* 085A8 80A63898 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 085AC 80A6389C 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 085B0 80A638A0 00000000 */ nop -/* 085B4 80A638A4 4608903C */ c.lt.s $f18, $f8 -/* 085B8 80A638A8 00000000 */ nop -/* 085BC 80A638AC 45020012 */ bc1fl .L80A638F8 -/* 085C0 80A638B0 8FA4003C */ lw $a0, 0x003C($sp) -.L80A638B4: -/* 085C4 80A638B4 14400005 */ bne $v0, $zero, .L80A638CC -/* 085C8 80A638B8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 085CC 80A638BC 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -/* 085D0 80A638C0 35090010 */ ori $t1, $t0, 0x0010 ## $t1 = 00000010 -/* 085D4 80A638C4 100001B3 */ beq $zero, $zero, .L80A63F94 -/* 085D8 80A638C8 AE0901F0 */ sw $t1, 0x01F0($s0) ## 000001F0 -.L80A638CC: -/* 085DC 80A638CC 544101B2 */ bnel $v0, $at, .L80A63F98 -/* 085E0 80A638D0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 085E4 80A638D4 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 085E8 80A638D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 085EC 80A638DC 356A0010 */ ori $t2, $t3, 0x0010 ## $t2 = 00000010 -/* 085F0 80A638E0 AE0A01F0 */ sw $t2, 0x01F0($s0) ## 000001F0 -/* 085F4 80A638E4 0C2978AA */ jal func_80A5E2A8 -/* 085F8 80A638E8 8FA500C4 */ lw $a1, 0x00C4($sp) -/* 085FC 80A638EC 100001AA */ beq $zero, $zero, .L80A63F98 -/* 08600 80A638F0 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A638F4: -/* 08604 80A638F4 8FA4003C */ lw $a0, 0x003C($sp) -.L80A638F8: -/* 08608 80A638F8 0C00FAE1 */ jal DynaPoly_GetActor - ## DynaPoly_GetActor -/* 0860C 80A638FC 8FA50080 */ lw $a1, 0x0080($sp) -/* 08610 80A63900 8E0301F0 */ lw $v1, 0x01F0($s0) ## 000001F0 -/* 08614 80A63904 00036140 */ sll $t4, $v1, 5 -/* 08618 80A63908 05830019 */ bgezl $t4, .L80A63970 -/* 0861C 80A6390C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 08620 80A63910 10400005 */ beq $v0, $zero, .L80A63928 -/* 08624 80A63914 00000000 */ nop -/* 08628 80A63918 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 0862C 80A6391C 24010108 */ addiu $at, $zero, 0x0108 ## $at = 00000108 -/* 08630 80A63920 55C10004 */ bnel $t6, $at, .L80A63934 -/* 08634 80A63924 8FA20070 */ lw $v0, 0x0070($sp) -.L80A63928: -/* 08638 80A63928 54400011 */ bnel $v0, $zero, .L80A63970 -/* 0863C 80A6392C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 08640 80A63930 8FA20070 */ lw $v0, 0x0070($sp) -.L80A63934: -/* 08644 80A63934 346F0010 */ ori $t7, $v1, 0x0010 ## $t7 = 00000010 -/* 08648 80A63938 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0864C 80A6393C 14400003 */ bne $v0, $zero, .L80A6394C -/* 08650 80A63940 00000000 */ nop -/* 08654 80A63944 10000193 */ beq $zero, $zero, .L80A63F94 -/* 08658 80A63948 AE0F01F0 */ sw $t7, 0x01F0($s0) ## 000001F0 -.L80A6394C: -/* 0865C 80A6394C 14410191 */ bne $v0, $at, .L80A63F94 -/* 08660 80A63950 34780010 */ ori $t8, $v1, 0x0010 ## $t8 = 00000010 -/* 08664 80A63954 AE1801F0 */ sw $t8, 0x01F0($s0) ## 000001F0 -/* 08668 80A63958 8FA500C4 */ lw $a1, 0x00C4($sp) -/* 0866C 80A6395C 0C2978AA */ jal func_80A5E2A8 -/* 08670 80A63960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08674 80A63964 1000018C */ beq $zero, $zero, .L80A63F98 -/* 08678 80A63968 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0867C 80A6396C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -.L80A63970: -/* 08680 80A63970 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 08684 80A63974 C7A6008C */ lwc1 $f6, 0x008C($sp) -/* 08688 80A63978 27B900AC */ addiu $t9, $sp, 0x00AC ## $t9 = FFFFFFEC -/* 0868C 80A6397C 27AD0094 */ addiu $t5, $sp, 0x0094 ## $t5 = FFFFFFD4 -/* 08690 80A63980 46103280 */ add.s $f10, $f6, $f16 -/* 08694 80A63984 E7AA008C */ swc1 $f10, 0x008C($sp) -/* 08698 80A63988 8F290000 */ lw $t1, 0x0000($t9) ## FFFFFFEC -/* 0869C 80A6398C ADA90000 */ sw $t1, 0x0000($t5) ## FFFFFFD4 -/* 086A0 80A63990 8F280004 */ lw $t0, 0x0004($t9) ## FFFFFFF0 -/* 086A4 80A63994 ADA80004 */ sw $t0, 0x0004($t5) ## FFFFFFD8 -/* 086A8 80A63998 8F290008 */ lw $t1, 0x0008($t9) ## FFFFFFF4 -/* 086AC 80A6399C ADA90008 */ sw $t1, 0x0008($t5) ## FFFFFFDC -/* 086B0 80A639A0 0C01DE1C */ jal Math_SinS - ## sins? -/* 086B4 80A639A4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 086B8 80A639A8 C7B2008C */ lwc1 $f18, 0x008C($sp) -/* 086BC 80A639AC C7A40094 */ lwc1 $f4, 0x0094($sp) -/* 086C0 80A639B0 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 086C4 80A639B4 46009202 */ mul.s $f8, $f18, $f0 -/* 086C8 80A639B8 44815000 */ mtc1 $at, $f10 ## $f10 = 120.00 -/* 086CC 80A639BC 46082180 */ add.s $f6, $f4, $f8 -/* 086D0 80A639C0 E7A60094 */ swc1 $f6, 0x0094($sp) -/* 086D4 80A639C4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 086D8 80A639C8 460A8480 */ add.s $f18, $f16, $f10 -/* 086DC 80A639CC E7B20098 */ swc1 $f18, 0x0098($sp) -/* 086E0 80A639D0 0C01DE0D */ jal Math_CosS - ## coss? -/* 086E4 80A639D4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 086E8 80A639D8 C7A8008C */ lwc1 $f8, 0x008C($sp) -/* 086EC 80A639DC C7A4009C */ lwc1 $f4, 0x009C($sp) -/* 086F0 80A639E0 27A70094 */ addiu $a3, $sp, 0x0094 ## $a3 = FFFFFFD4 -/* 086F4 80A639E4 46004182 */ mul.s $f6, $f8, $f0 -/* 086F8 80A639E8 27AB0050 */ addiu $t3, $sp, 0x0050 ## $t3 = FFFFFF90 -/* 086FC 80A639EC 27A50084 */ addiu $a1, $sp, 0x0084 ## $a1 = FFFFFFC4 -/* 08700 80A639F0 27A60080 */ addiu $a2, $sp, 0x0080 ## $a2 = FFFFFFC0 -/* 08704 80A639F4 46062400 */ add.s $f16, $f4, $f6 -/* 08708 80A639F8 E7B0009C */ swc1 $f16, 0x009C($sp) -/* 0870C 80A639FC 8CEC0000 */ lw $t4, 0x0000($a3) ## FFFFFFD4 -/* 08710 80A63A00 AD6C0000 */ sw $t4, 0x0000($t3) ## FFFFFF90 -/* 08714 80A63A04 8CEA0004 */ lw $t2, 0x0004($a3) ## FFFFFFD8 -/* 08718 80A63A08 AD6A0004 */ sw $t2, 0x0004($t3) ## FFFFFF94 -/* 0871C 80A63A0C 8CEC0008 */ lw $t4, 0x0008($a3) ## FFFFFFDC -/* 08720 80A63A10 AD6C0008 */ sw $t4, 0x0008($t3) ## FFFFFF98 -/* 08724 80A63A14 0C00F250 */ jal BgCheck_EntityRaycastFloor3 -/* 08728 80A63A18 8FA4003C */ lw $a0, 0x003C($sp) -/* 0872C 80A63A1C 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 -/* 08730 80A63A20 44815000 */ mtc1 $at, $f10 ## $f10 = -32000.00 -/* 08734 80A63A24 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 08738 80A63A28 460A0032 */ c.eq.s $f0, $f10 -/* 0873C 80A63A2C 00000000 */ nop -/* 08740 80A63A30 45030159 */ bc1tl .L80A63F98 -/* 08744 80A63A34 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08748 80A63A38 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 0874C 80A63A3C 8FAE0084 */ lw $t6, 0x0084($sp) -/* 08750 80A63A40 46120201 */ sub.s $f8, $f0, $f18 -/* 08754 80A63A44 E7A8007C */ swc1 $f8, 0x007C($sp) -/* 08758 80A63A48 8E020078 */ lw $v0, 0x0078($s0) ## 00000078 -/* 0875C 80A63A4C 50400152 */ beql $v0, $zero, .L80A63F98 -/* 08760 80A63A50 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08764 80A63A54 51C00150 */ beql $t6, $zero, .L80A63F98 -/* 08768 80A63A58 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0876C 80A63A5C 844F0008 */ lh $t7, 0x0008($v0) ## 00000008 -/* 08770 80A63A60 8458000A */ lh $t8, 0x000A($v0) ## 0000000A -/* 08774 80A63A64 844D000C */ lh $t5, 0x000C($v0) ## 0000000C -/* 08778 80A63A68 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 0877C 80A63A6C 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 08780 80A63A70 3C0180A6 */ lui $at, %hi(D_80A66988) ## $at = 80A60000 -/* 08784 80A63A74 468021A0 */ cvt.s.w $f6, $f4 -/* 08788 80A63A78 C4206988 */ lwc1 $f0, %lo(D_80A66988)($at) -/* 0878C 80A63A7C 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 08790 80A63A80 8459000E */ lh $t9, 0x000E($v0) ## 0000000E -/* 08794 80A63A84 27A80050 */ addiu $t0, $sp, 0x0050 ## $t0 = FFFFFF90 -/* 08798 80A63A88 468082A0 */ cvt.s.w $f10, $f16 -/* 0879C 80A63A8C 46003302 */ mul.s $f12, $f6, $f0 -/* 087A0 80A63A90 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 087A4 80A63A94 AFA80010 */ sw $t0, 0x0010($sp) -/* 087A8 80A63A98 46005382 */ mul.s $f14, $f10, $f0 -/* 087AC 80A63A9C 46809220 */ cvt.s.w $f8, $f18 -/* 087B0 80A63AA0 468031A0 */ cvt.s.w $f6, $f6 -/* 087B4 80A63AA4 46004102 */ mul.s $f4, $f8, $f0 -/* 087B8 80A63AA8 44073000 */ mfc1 $a3, $f6 -/* 087BC 80A63AAC 44062000 */ mfc1 $a2, $f4 -/* 087C0 80A63AB0 0C0332C3 */ jal Math3D_DistPlaneToPos -/* 087C4 80A63AB4 00000000 */ nop -/* 087C8 80A63AB8 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 -/* 087CC 80A63ABC 44818000 */ mtc1 $at, $f16 ## $f16 = -40.00 -/* 087D0 80A63AC0 8FA90084 */ lw $t1, 0x0084($sp) -/* 087D4 80A63AC4 4610003C */ c.lt.s $f0, $f16 -/* 087D8 80A63AC8 00000000 */ nop -/* 087DC 80A63ACC 45020031 */ bc1fl .L80A63B94 -/* 087E0 80A63AD0 8FAC0084 */ lw $t4, 0x0084($sp) -/* 087E4 80A63AD4 852B0008 */ lh $t3, 0x0008($t1) ## 00000008 -/* 087E8 80A63AD8 852A000A */ lh $t2, 0x000A($t1) ## 0000000A -/* 087EC 80A63ADC 852C000C */ lh $t4, 0x000C($t1) ## 0000000C -/* 087F0 80A63AE0 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 -/* 087F4 80A63AE4 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 087F8 80A63AE8 3C0180A6 */ lui $at, %hi(D_80A6698C) ## $at = 80A60000 -/* 087FC 80A63AEC 468054A0 */ cvt.s.w $f18, $f10 -/* 08800 80A63AF0 C420698C */ lwc1 $f0, %lo(D_80A6698C)($at) -/* 08804 80A63AF4 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 08808 80A63AF8 852E000E */ lh $t6, 0x000E($t1) ## 0000000E -/* 0880C 80A63AFC 8FAF0044 */ lw $t7, 0x0044($sp) -/* 08810 80A63B00 46804120 */ cvt.s.w $f4, $f8 -/* 08814 80A63B04 46009302 */ mul.s $f12, $f18, $f0 -/* 08818 80A63B08 448E9000 */ mtc1 $t6, $f18 ## $f18 = 0.00 -/* 0881C 80A63B0C AFAF0010 */ sw $t7, 0x0010($sp) -/* 08820 80A63B10 46002382 */ mul.s $f14, $f4, $f0 -/* 08824 80A63B14 46803420 */ cvt.s.w $f16, $f6 -/* 08828 80A63B18 468094A0 */ cvt.s.w $f18, $f18 -/* 0882C 80A63B1C 46008282 */ mul.s $f10, $f16, $f0 -/* 08830 80A63B20 44079000 */ mfc1 $a3, $f18 -/* 08834 80A63B24 44065000 */ mfc1 $a2, $f10 -/* 08838 80A63B28 0C0332C3 */ jal Math3D_DistPlaneToPos -/* 0883C 80A63B2C 00000000 */ nop -/* 08840 80A63B30 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 08844 80A63B34 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 08848 80A63B38 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0884C 80A63B3C 8FB80070 */ lw $t8, 0x0070($sp) -/* 08850 80A63B40 4600403C */ c.lt.s $f8, $f0 -/* 08854 80A63B44 00000000 */ nop -/* 08858 80A63B48 45020012 */ bc1fl .L80A63B94 -/* 0885C 80A63B4C 8FAC0084 */ lw $t4, 0x0084($sp) -/* 08860 80A63B50 5701000C */ bnel $t8, $at, .L80A63B84 -/* 08864 80A63B54 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 08868 80A63B58 8E0D014C */ lw $t5, 0x014C($s0) ## 0000014C -/* 0886C 80A63B5C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 08870 80A63B60 51A10008 */ beql $t5, $at, .L80A63B84 -/* 08874 80A63B64 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 08878 80A63B68 8E1901F0 */ lw $t9, 0x01F0($s0) ## 000001F0 -/* 0887C 80A63B6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08880 80A63B70 37280010 */ ori $t0, $t9, 0x0010 ## $t0 = 00000010 -/* 08884 80A63B74 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -/* 08888 80A63B78 0C2978AA */ jal func_80A5E2A8 -/* 0888C 80A63B7C 8FA500C4 */ lw $a1, 0x00C4($sp) -/* 08890 80A63B80 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -.L80A63B84: -/* 08894 80A63B84 356A4000 */ ori $t2, $t3, 0x4000 ## $t2 = 00004000 -/* 08898 80A63B88 10000102 */ beq $zero, $zero, .L80A63F94 -/* 0889C 80A63B8C AE0A01F0 */ sw $t2, 0x01F0($s0) ## 000001F0 -/* 088A0 80A63B90 8FAC0084 */ lw $t4, 0x0084($sp) -.L80A63B94: -/* 088A4 80A63B94 3C0180A6 */ lui $at, %hi(D_80A66990) ## $at = 80A60000 -/* 088A8 80A63B98 C4306990 */ lwc1 $f16, %lo(D_80A66990)($at) -/* 088AC 80A63B9C 8589000A */ lh $t1, 0x000A($t4) ## 0000000A -/* 088B0 80A63BA0 3C0180A6 */ lui $at, %hi(D_80A66994) ## $at = 80A60000 -/* 088B4 80A63BA4 C42A6994 */ lwc1 $f10, %lo(D_80A66994)($at) -/* 088B8 80A63BA8 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 088BC 80A63BAC 8FA4003C */ lw $a0, 0x003C($sp) -/* 088C0 80A63BB0 01802825 */ or $a1, $t4, $zero ## $a1 = 00000000 -/* 088C4 80A63BB4 468021A0 */ cvt.s.w $f6, $f4 -/* 088C8 80A63BB8 46103002 */ mul.s $f0, $f6, $f16 -/* 088CC 80A63BBC 460A003C */ c.lt.s $f0, $f10 -/* 088D0 80A63BC0 00000000 */ nop -/* 088D4 80A63BC4 4503000C */ bc1tl .L80A63BF8 -/* 088D8 80A63BC8 8FAE0070 */ lw $t6, 0x0070($sp) -/* 088DC 80A63BCC 0C0107BB */ jal SurfaceType_IsHorseBlocked -/* 088E0 80A63BD0 8FA60080 */ lw $a2, 0x0080($sp) -/* 088E4 80A63BD4 14400007 */ bne $v0, $zero, .L80A63BF4 -/* 088E8 80A63BD8 8FA4003C */ lw $a0, 0x003C($sp) -/* 088EC 80A63BDC 8FA50084 */ lw $a1, 0x0084($sp) -/* 088F0 80A63BE0 0C010753 */ jal func_80041D4C -/* 088F4 80A63BE4 8FA60080 */ lw $a2, 0x0080($sp) -/* 088F8 80A63BE8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 088FC 80A63BEC 14410011 */ bne $v0, $at, .L80A63C34 -/* 08900 80A63BF0 8FB90088 */ lw $t9, 0x0088($sp) -.L80A63BF4: -/* 08904 80A63BF4 8FAE0070 */ lw $t6, 0x0070($sp) -.L80A63BF8: -/* 08908 80A63BF8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0890C 80A63BFC 55C100E6 */ bnel $t6, $at, .L80A63F98 -/* 08910 80A63C00 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08914 80A63C04 8E0F014C */ lw $t7, 0x014C($s0) ## 0000014C -/* 08918 80A63C08 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 0891C 80A63C0C 51E100E2 */ beql $t7, $at, .L80A63F98 -/* 08920 80A63C10 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08924 80A63C14 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 -/* 08928 80A63C18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0892C 80A63C1C 370D0010 */ ori $t5, $t8, 0x0010 ## $t5 = 00000010 -/* 08930 80A63C20 AE0D01F0 */ sw $t5, 0x01F0($s0) ## 000001F0 -/* 08934 80A63C24 0C2978AA */ jal func_80A5E2A8 -/* 08938 80A63C28 8FA500C4 */ lw $a1, 0x00C4($sp) -/* 0893C 80A63C2C 100000DA */ beq $zero, $zero, .L80A63F98 -/* 08940 80A63C30 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A63C34: -/* 08944 80A63C34 132000D7 */ beq $t9, $zero, .L80A63F94 -/* 08948 80A63C38 C7B20054 */ lwc1 $f18, 0x0054($sp) -/* 0894C 80A63C3C C7A80060 */ lwc1 $f8, 0x0060($sp) -/* 08950 80A63C40 4608903C */ c.lt.s $f18, $f8 -/* 08954 80A63C44 00000000 */ nop -/* 08958 80A63C48 450300D3 */ bc1tl .L80A63F98 -/* 0895C 80A63C4C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08960 80A63C50 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 -/* 08964 80A63C54 27A900AC */ addiu $t1, $sp, 0x00AC ## $t1 = FFFFFFEC -/* 08968 80A63C58 00085B80 */ sll $t3, $t0, 14 -/* 0896C 80A63C5C 056200CE */ bltzl $t3, .L80A63F98 -/* 08970 80A63C60 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08974 80A63C64 8D2E0000 */ lw $t6, 0x0000($t1) ## FFFFFFEC -/* 08978 80A63C68 27AA0094 */ addiu $t2, $sp, 0x0094 ## $t2 = FFFFFFD4 -/* 0897C 80A63C6C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 08980 80A63C70 AD4E0000 */ sw $t6, 0x0000($t2) ## FFFFFFD4 -/* 08984 80A63C74 8D2C0004 */ lw $t4, 0x0004($t1) ## FFFFFFF0 -/* 08988 80A63C78 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 -/* 0898C 80A63C7C AD4C0004 */ sw $t4, 0x0004($t2) ## FFFFFFD8 -/* 08990 80A63C80 8D2E0008 */ lw $t6, 0x0008($t1) ## FFFFFFF4 -/* 08994 80A63C84 AD4E0008 */ sw $t6, 0x0008($t2) ## FFFFFFDC -/* 08998 80A63C88 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 0899C 80A63C8C 8FAF0070 */ lw $t7, 0x0070($sp) -/* 089A0 80A63C90 46062400 */ add.s $f16, $f4, $f6 -/* 089A4 80A63C94 15E00012 */ bne $t7, $zero, .L80A63CE0 -/* 089A8 80A63C98 E7B00098 */ swc1 $f16, 0x0098($sp) -/* 089AC 80A63C9C 0C01DE1C */ jal Math_SinS - ## sins? -/* 089B0 80A63CA0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 089B4 80A63CA4 3C01438A */ lui $at, 0x438A ## $at = 438A0000 -/* 089B8 80A63CA8 44819000 */ mtc1 $at, $f18 ## $f18 = 276.00 -/* 089BC 80A63CAC C7AA0094 */ lwc1 $f10, 0x0094($sp) -/* 089C0 80A63CB0 46009202 */ mul.s $f8, $f18, $f0 -/* 089C4 80A63CB4 46085100 */ add.s $f4, $f10, $f8 -/* 089C8 80A63CB8 E7A40094 */ swc1 $f4, 0x0094($sp) -/* 089CC 80A63CBC 0C01DE0D */ jal Math_CosS - ## coss? -/* 089D0 80A63CC0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 089D4 80A63CC4 3C01438A */ lui $at, 0x438A ## $at = 438A0000 -/* 089D8 80A63CC8 44818000 */ mtc1 $at, $f16 ## $f16 = 276.00 -/* 089DC 80A63CCC C7A6009C */ lwc1 $f6, 0x009C($sp) -/* 089E0 80A63CD0 46008482 */ mul.s $f18, $f16, $f0 -/* 089E4 80A63CD4 46123280 */ add.s $f10, $f6, $f18 -/* 089E8 80A63CD8 10000011 */ beq $zero, $zero, .L80A63D20 -/* 089EC 80A63CDC E7AA009C */ swc1 $f10, 0x009C($sp) -.L80A63CE0: -/* 089F0 80A63CE0 0C01DE1C */ jal Math_SinS - ## sins? -/* 089F4 80A63CE4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 089F8 80A63CE8 3C0143C3 */ lui $at, 0x43C3 ## $at = 43C30000 -/* 089FC 80A63CEC 44812000 */ mtc1 $at, $f4 ## $f4 = 390.00 -/* 08A00 80A63CF0 C7A80094 */ lwc1 $f8, 0x0094($sp) -/* 08A04 80A63CF4 46002402 */ mul.s $f16, $f4, $f0 -/* 08A08 80A63CF8 46104180 */ add.s $f6, $f8, $f16 -/* 08A0C 80A63CFC E7A60094 */ swc1 $f6, 0x0094($sp) -/* 08A10 80A63D00 0C01DE0D */ jal Math_CosS - ## coss? -/* 08A14 80A63D04 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 08A18 80A63D08 3C0143C3 */ lui $at, 0x43C3 ## $at = 43C30000 -/* 08A1C 80A63D0C 44815000 */ mtc1 $at, $f10 ## $f10 = 390.00 -/* 08A20 80A63D10 C7B2009C */ lwc1 $f18, 0x009C($sp) -/* 08A24 80A63D14 46005102 */ mul.s $f4, $f10, $f0 -/* 08A28 80A63D18 46049200 */ add.s $f8, $f18, $f4 -/* 08A2C 80A63D1C E7A8009C */ swc1 $f8, 0x009C($sp) -.L80A63D20: -/* 08A30 80A63D20 27AD0094 */ addiu $t5, $sp, 0x0094 ## $t5 = FFFFFFD4 -/* 08A34 80A63D24 8DA80000 */ lw $t0, 0x0000($t5) ## FFFFFFD4 -/* 08A38 80A63D28 27B80050 */ addiu $t8, $sp, 0x0050 ## $t8 = FFFFFF90 -/* 08A3C 80A63D2C 27A50084 */ addiu $a1, $sp, 0x0084 ## $a1 = FFFFFFC4 -/* 08A40 80A63D30 AF080000 */ sw $t0, 0x0000($t8) ## FFFFFF90 -/* 08A44 80A63D34 8DB90004 */ lw $t9, 0x0004($t5) ## FFFFFFD8 -/* 08A48 80A63D38 27A60080 */ addiu $a2, $sp, 0x0080 ## $a2 = FFFFFFC0 -/* 08A4C 80A63D3C 27A70094 */ addiu $a3, $sp, 0x0094 ## $a3 = FFFFFFD4 -/* 08A50 80A63D40 AF190004 */ sw $t9, 0x0004($t8) ## FFFFFF94 -/* 08A54 80A63D44 8DA80008 */ lw $t0, 0x0008($t5) ## FFFFFFDC -/* 08A58 80A63D48 AF080008 */ sw $t0, 0x0008($t8) ## FFFFFF98 -/* 08A5C 80A63D4C 0C00F250 */ jal BgCheck_EntityRaycastFloor3 -/* 08A60 80A63D50 8FA4003C */ lw $a0, 0x003C($sp) -/* 08A64 80A63D54 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 -/* 08A68 80A63D58 44818000 */ mtc1 $at, $f16 ## $f16 = -32000.00 -/* 08A6C 80A63D5C E7A00054 */ swc1 $f0, 0x0054($sp) -/* 08A70 80A63D60 46100032 */ c.eq.s $f0, $f16 -/* 08A74 80A63D64 00000000 */ nop -/* 08A78 80A63D68 4503008B */ bc1tl .L80A63F98 -/* 08A7C 80A63D6C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08A80 80A63D70 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 08A84 80A63D74 8FAB0084 */ lw $t3, 0x0084($sp) -/* 08A88 80A63D78 8FAA0084 */ lw $t2, 0x0084($sp) -/* 08A8C 80A63D7C 46060281 */ sub.s $f10, $f0, $f6 -/* 08A90 80A63D80 11600084 */ beq $t3, $zero, .L80A63F94 -/* 08A94 80A63D84 E7AA0078 */ swc1 $f10, 0x0078($sp) -/* 08A98 80A63D88 8549000A */ lh $t1, 0x000A($t2) ## 0000000A -/* 08A9C 80A63D8C 3C0180A6 */ lui $at, %hi(D_80A66998) ## $at = 80A60000 -/* 08AA0 80A63D90 C4286998 */ lwc1 $f8, %lo(D_80A66998)($at) -/* 08AA4 80A63D94 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 08AA8 80A63D98 3C0180A6 */ lui $at, %hi(D_80A6699C) ## $at = 80A60000 -/* 08AAC 80A63D9C C430699C */ lwc1 $f16, %lo(D_80A6699C)($at) -/* 08AB0 80A63DA0 46809120 */ cvt.s.w $f4, $f18 -/* 08AB4 80A63DA4 8FA4003C */ lw $a0, 0x003C($sp) -/* 08AB8 80A63DA8 01402825 */ or $a1, $t2, $zero ## $a1 = 00000000 -/* 08ABC 80A63DAC 46082002 */ mul.s $f0, $f4, $f8 -/* 08AC0 80A63DB0 4610003C */ c.lt.s $f0, $f16 -/* 08AC4 80A63DB4 00000000 */ nop -/* 08AC8 80A63DB8 4503000C */ bc1tl .L80A63DEC -/* 08ACC 80A63DBC 8FAC0070 */ lw $t4, 0x0070($sp) -/* 08AD0 80A63DC0 0C0107BB */ jal SurfaceType_IsHorseBlocked -/* 08AD4 80A63DC4 8FA60080 */ lw $a2, 0x0080($sp) -/* 08AD8 80A63DC8 14400007 */ bne $v0, $zero, .L80A63DE8 -/* 08ADC 80A63DCC 8FA4003C */ lw $a0, 0x003C($sp) -/* 08AE0 80A63DD0 8FA50084 */ lw $a1, 0x0084($sp) -/* 08AE4 80A63DD4 0C010753 */ jal func_80041D4C -/* 08AE8 80A63DD8 8FA60080 */ lw $a2, 0x0080($sp) -/* 08AEC 80A63DDC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 08AF0 80A63DE0 14410011 */ bne $v0, $at, .L80A63E28 -/* 08AF4 80A63DE4 3C0D8016 */ lui $t5, %hi(gGameInfo) -.L80A63DE8: -/* 08AF8 80A63DE8 8FAC0070 */ lw $t4, 0x0070($sp) -.L80A63DEC: -/* 08AFC 80A63DEC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 08B00 80A63DF0 55810069 */ bnel $t4, $at, .L80A63F98 -/* 08B04 80A63DF4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08B08 80A63DF8 8E0E014C */ lw $t6, 0x014C($s0) ## 0000014C -/* 08B0C 80A63DFC 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 08B10 80A63E00 51C10065 */ beql $t6, $at, .L80A63F98 -/* 08B14 80A63E04 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08B18 80A63E08 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 -/* 08B1C 80A63E0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08B20 80A63E10 35F80010 */ ori $t8, $t7, 0x0010 ## $t8 = 00000010 -/* 08B24 80A63E14 AE1801F0 */ sw $t8, 0x01F0($s0) ## 000001F0 -/* 08B28 80A63E18 0C2978AA */ jal func_80A5E2A8 -/* 08B2C 80A63E1C 8FA500C4 */ lw $a1, 0x00C4($sp) -/* 08B30 80A63E20 1000005D */ beq $zero, $zero, .L80A63F98 -/* 08B34 80A63E24 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A63E28: -/* 08B38 80A63E28 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) -/* 08B3C 80A63E2C C7A60078 */ lwc1 $f6, 0x0078($sp) -/* 08B40 80A63E30 8FAB0070 */ lw $t3, 0x0070($sp) -/* 08B44 80A63E34 85B9055C */ lh $t9, 0x055C($t5) ## 0000055C -/* 08B48 80A63E38 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 08B4C 80A63E3C 8FAE0070 */ lw $t6, 0x0070($sp) -/* 08B50 80A63E40 00194023 */ subu $t0, $zero, $t9 -/* 08B54 80A63E44 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 08B58 80A63E48 00000000 */ nop -/* 08B5C 80A63E4C 468054A0 */ cvt.s.w $f18, $f10 -/* 08B60 80A63E50 4612303C */ c.lt.s $f6, $f18 -/* 08B64 80A63E54 00000000 */ nop -/* 08B68 80A63E58 4500000F */ bc1f .L80A63E98 -/* 08B6C 80A63E5C 00000000 */ nop -/* 08B70 80A63E60 5561004D */ bnel $t3, $at, .L80A63F98 -/* 08B74 80A63E64 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08B78 80A63E68 8E09014C */ lw $t1, 0x014C($s0) ## 0000014C -/* 08B7C 80A63E6C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 08B80 80A63E70 51210049 */ beql $t1, $at, .L80A63F98 -/* 08B84 80A63E74 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08B88 80A63E78 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 -/* 08B8C 80A63E7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08B90 80A63E80 354C0010 */ ori $t4, $t2, 0x0010 ## $t4 = 00000010 -/* 08B94 80A63E84 AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 -/* 08B98 80A63E88 0C2978AA */ jal func_80A5E2A8 -/* 08B9C 80A63E8C 8FA500C4 */ lw $a1, 0x00C4($sp) -/* 08BA0 80A63E90 10000041 */ beq $zero, $zero, .L80A63F98 -/* 08BA4 80A63E94 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A63E98: -/* 08BA8 80A63E98 15C00014 */ bne $t6, $zero, .L80A63EEC -/* 08BAC 80A63E9C C7A0007C */ lwc1 $f0, 0x007C($sp) -/* 08BB0 80A63EA0 3C014198 */ lui $at, 0x4198 ## $at = 41980000 -/* 08BB4 80A63EA4 44812000 */ mtc1 $at, $f4 ## $f4 = 19.00 -/* 08BB8 80A63EA8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 08BBC 80A63EAC 4600203C */ c.lt.s $f4, $f0 -/* 08BC0 80A63EB0 00000000 */ nop -/* 08BC4 80A63EB4 4502000E */ bc1fl .L80A63EF0 -/* 08BC8 80A63EB8 8FB80070 */ lw $t8, 0x0070($sp) -/* 08BCC 80A63EBC 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 08BD0 80A63EC0 00000000 */ nop -/* 08BD4 80A63EC4 4608003E */ c.le.s $f0, $f8 -/* 08BD8 80A63EC8 00000000 */ nop -/* 08BDC 80A63ECC 45020008 */ bc1fl .L80A63EF0 -/* 08BE0 80A63ED0 8FB80070 */ lw $t8, 0x0070($sp) -/* 08BE4 80A63ED4 0C297AD3 */ jal func_80A5EB4C -/* 08BE8 80A63ED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08BEC 80A63EDC 3C0F80A6 */ lui $t7, %hi(func_80A5E9F8) ## $t7 = 80A60000 -/* 08BF0 80A63EE0 25EFE9F8 */ addiu $t7, $t7, %lo(func_80A5E9F8) ## $t7 = 80A5E9F8 -/* 08BF4 80A63EE4 1000002B */ beq $zero, $zero, .L80A63F94 -/* 08BF8 80A63EE8 AE0F0244 */ sw $t7, 0x0244($s0) ## 00000244 -.L80A63EEC: -/* 08BFC 80A63EEC 8FB80070 */ lw $t8, 0x0070($sp) -.L80A63EF0: -/* 08C00 80A63EF0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 08C04 80A63EF4 C7A0007C */ lwc1 $f0, 0x007C($sp) -/* 08C08 80A63EF8 17010013 */ bne $t8, $at, .L80A63F48 -/* 08C0C 80A63EFC 3C0180A6 */ lui $at, %hi(D_80A669A0) ## $at = 80A60000 -/* 08C10 80A63F00 C42A69A0 */ lwc1 $f10, %lo(D_80A669A0)($at) -/* 08C14 80A63F04 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 08C18 80A63F08 3C014198 */ lui $at, 0x4198 ## $at = 41980000 -/* 08C1C 80A63F0C 460A803C */ c.lt.s $f16, $f10 -/* 08C20 80A63F10 00000000 */ nop -/* 08C24 80A63F14 4500000C */ bc1f .L80A63F48 -/* 08C28 80A63F18 00000000 */ nop -/* 08C2C 80A63F1C 44813000 */ mtc1 $at, $f6 ## $f6 = 19.00 -/* 08C30 80A63F20 3C014290 */ lui $at, 0x4290 ## $at = 42900000 -/* 08C34 80A63F24 4600303C */ c.lt.s $f6, $f0 -/* 08C38 80A63F28 00000000 */ nop -/* 08C3C 80A63F2C 45000006 */ bc1f .L80A63F48 -/* 08C40 80A63F30 00000000 */ nop -/* 08C44 80A63F34 44819000 */ mtc1 $at, $f18 ## $f18 = 72.00 -/* 08C48 80A63F38 00000000 */ nop -/* 08C4C 80A63F3C 4612003E */ c.le.s $f0, $f18 -/* 08C50 80A63F40 00000000 */ nop -/* 08C54 80A63F44 4501000E */ bc1t .L80A63F80 -.L80A63F48: -/* 08C58 80A63F48 3C0180A6 */ lui $at, %hi(D_80A669A4) ## $at = 80A60000 -/* 08C5C 80A63F4C C42469A4 */ lwc1 $f4, %lo(D_80A669A4)($at) -/* 08C60 80A63F50 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 08C64 80A63F54 3C0142E0 */ lui $at, 0x42E0 ## $at = 42E00000 -/* 08C68 80A63F58 4608203C */ c.lt.s $f4, $f8 -/* 08C6C 80A63F5C 00000000 */ nop -/* 08C70 80A63F60 4502000D */ bc1fl .L80A63F98 -/* 08C74 80A63F64 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08C78 80A63F68 44818000 */ mtc1 $at, $f16 ## $f16 = 112.00 -/* 08C7C 80A63F6C 00000000 */ nop -/* 08C80 80A63F70 4610003E */ c.le.s $f0, $f16 -/* 08C84 80A63F74 00000000 */ nop -/* 08C88 80A63F78 45020007 */ bc1fl .L80A63F98 -/* 08C8C 80A63F7C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A63F80: -/* 08C90 80A63F80 0C297B9E */ jal func_80A5EE78 -/* 08C94 80A63F84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08C98 80A63F88 3C0D80A6 */ lui $t5, %hi(func_80A5ED18) ## $t5 = 80A60000 -/* 08C9C 80A63F8C 25ADED18 */ addiu $t5, $t5, %lo(func_80A5ED18) ## $t5 = 80A5ED18 -/* 08CA0 80A63F90 AE0D0244 */ sw $t5, 0x0244($s0) ## 00000244 -.L80A63F94: -/* 08CA4 80A63F94 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A63F98: -/* 08CA8 80A63F98 8FB00030 */ lw $s0, 0x0030($sp) -/* 08CAC 80A63F9C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 -/* 08CB0 80A63FA0 03E00008 */ jr $ra -/* 08CB4 80A63FA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s deleted file mode 100644 index 40ec36a14e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s +++ /dev/null @@ -1,121 +0,0 @@ -.late_rodata -glabel D_80A669A8 - .float 0.1 - -.text -glabel func_80A63FA8 -/* 08CB8 80A63FA8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 08CBC 80A63FAC AFBF0024 */ sw $ra, 0x0024($sp) -/* 08CC0 80A63FB0 AFB00020 */ sw $s0, 0x0020($sp) -/* 08CC4 80A63FB4 8C82014C */ lw $v0, 0x014C($a0) ## 0000014C -/* 08CC8 80A63FB8 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 -/* 08CCC 80A63FBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 08CD0 80A63FC0 11020005 */ beq $t0, $v0, .L80A63FD8 -/* 08CD4 80A63FC4 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 08CD8 80A63FC8 10410003 */ beq $v0, $at, .L80A63FD8 -/* 08CDC 80A63FCC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 08CE0 80A63FD0 5441005B */ bnel $v0, $at, .L80A64140 -/* 08CE4 80A63FD4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A63FD8: -/* 08CE8 80A63FD8 94AE0020 */ lhu $t6, 0x0020($a1) ## 00000020 -/* 08CEC 80A63FDC 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 08CF0 80A63FE0 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 08CF4 80A63FE4 01C17827 */ nor $t7, $t6, $at -/* 08CF8 80A63FE8 15E00054 */ bne $t7, $zero, .L80A6413C -/* 08CFC 80A63FEC 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 08D00 80A63FF0 0305C021 */ addu $t8, $t8, $a1 -/* 08D04 80A63FF4 971806DE */ lhu $t8, 0x06DE($t8) ## 000106DE -/* 08D08 80A63FF8 55180051 */ bnel $t0, $t8, .L80A64140 -/* 08D0C 80A63FFC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 08D10 80A64000 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 08D14 80A64004 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000000 -/* 08D18 80A64008 1720004C */ bne $t9, $zero, .L80A6413C -/* 08D1C 80A6400C 30490100 */ andi $t1, $v0, 0x0100 ## $t1 = 00000000 -/* 08D20 80A64010 1520004A */ bne $t1, $zero, .L80A6413C -/* 08D24 80A64014 304A0200 */ andi $t2, $v0, 0x0200 ## $t2 = 00000000 -/* 08D28 80A64018 55400049 */ bnel $t2, $zero, .L80A64140 -/* 08D2C 80A6401C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 08D30 80A64020 920B0238 */ lbu $t3, 0x0238($s0) ## 00000238 -/* 08D34 80A64024 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 08D38 80A64028 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 08D3C 80A6402C 59600029 */ blezl $t3, .L80A640D4 -/* 08D40 80A64030 8E0A0228 */ lw $t2, 0x0228($s0) ## 00000228 -/* 08D44 80A64034 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 08D48 80A64038 0C02A800 */ jal func_800AA000 -/* 08D4C 80A6403C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 08D50 80A64040 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 -/* 08D54 80A64044 92090238 */ lbu $t1, 0x0238($s0) ## 00000238 -/* 08D58 80A64048 3C030040 */ lui $v1, 0x0040 ## $v1 = 00400000 -/* 08D5C 80A6404C 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 08D60 80A64050 01A37825 */ or $t7, $t5, $v1 ## $t7 = 00400001 -/* 08D64 80A64054 AE0D01F0 */ sw $t5, 0x01F0($s0) ## 000001F0 -/* 08D68 80A64058 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 08D6C 80A6405C AE0F01F0 */ sw $t7, 0x01F0($s0) ## 000001F0 -/* 08D70 80A64060 35F90100 */ ori $t9, $t7, 0x0100 ## $t9 = 00400101 -/* 08D74 80A64064 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 000000FF -/* 08D78 80A64068 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 -/* 08D7C 80A6406C AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 08D80 80A64070 A20A0238 */ sb $t2, 0x0238($s0) ## 00000238 -/* 08D84 80A64074 15600004 */ bne $t3, $zero, .L80A64088 -/* 08D88 80A64078 AE000240 */ sw $zero, 0x0240($s0) ## 00000240 -/* 08D8C 80A6407C 240C008C */ addiu $t4, $zero, 0x008C ## $t4 = 0000008C -/* 08D90 80A64080 1000002E */ beq $zero, $zero, .L80A6413C -/* 08D94 80A64084 AE0C023C */ sw $t4, 0x023C($s0) ## 0000023C -.L80A64088: -/* 08D98 80A64088 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -/* 08D9C 80A6408C 24190046 */ addiu $t9, $zero, 0x0046 ## $t9 = 00000046 -/* 08DA0 80A64090 15A0000D */ bne $t5, $zero, .L80A640C8 -/* 08DA4 80A64094 00000000 */ nop -/* 08DA8 80A64098 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 08DAC 80A6409C 3C01FFBF */ lui $at, 0xFFBF ## $at = FFBF0000 -/* 08DB0 80A640A0 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 08DB4 80A640A4 00437024 */ and $t6, $v0, $v1 -/* 08DB8 80A640A8 11C00005 */ beq $t6, $zero, .L80A640C0 -/* 08DBC 80A640AC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFBFFFFF -/* 08DC0 80A640B0 0041C024 */ and $t8, $v0, $at -/* 08DC4 80A640B4 AE0F023C */ sw $t7, 0x023C($s0) ## 0000023C -/* 08DC8 80A640B8 10000020 */ beq $zero, $zero, .L80A6413C -/* 08DCC 80A640BC AE1801F0 */ sw $t8, 0x01F0($s0) ## 000001F0 -.L80A640C0: -/* 08DD0 80A640C0 1000001E */ beq $zero, $zero, .L80A6413C -/* 08DD4 80A640C4 AE08023C */ sw $t0, 0x023C($s0) ## 0000023C -.L80A640C8: -/* 08DD8 80A640C8 1000001C */ beq $zero, $zero, .L80A6413C -/* 08DDC 80A640CC AE19023C */ sw $t9, 0x023C($s0) ## 0000023C -/* 08DE0 80A640D0 8E0A0228 */ lw $t2, 0x0228($s0) ## 00000228 -.L80A640D4: -/* 08DE4 80A640D4 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 08DE8 80A640D8 ACAA0000 */ sw $t2, 0x0000($a1) ## 0000021C -/* 08DEC 80A640DC 8E09022C */ lw $t1, 0x022C($s0) ## 0000022C -/* 08DF0 80A640E0 ACA90004 */ sw $t1, 0x0004($a1) ## 00000220 -/* 08DF4 80A640E4 8E0A0230 */ lw $t2, 0x0230($s0) ## 00000230 -/* 08DF8 80A640E8 ACAA0008 */ sw $t2, 0x0008($a1) ## 00000224 -/* 08DFC 80A640EC 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 08E00 80A640F0 000B6100 */ sll $t4, $t3, 4 -/* 08E04 80A640F4 05830012 */ bgezl $t4, .L80A64140 -/* 08E08 80A640F8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 08E0C 80A640FC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 08E10 80A64100 AFA50028 */ sw $a1, 0x0028($sp) -/* 08E14 80A64104 3C0180A6 */ lui $at, %hi(D_80A669A8) ## $at = 80A60000 -/* 08E18 80A64108 C42469A8 */ lwc1 $f4, %lo(D_80A669A8)($at) -/* 08E1C 80A6410C 3C078013 */ lui $a3, %hi(D_801333E0) -/* 08E20 80A64110 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 08E24 80A64114 4604003C */ c.lt.s $f0, $f4 -/* 08E28 80A64118 8FA50028 */ lw $a1, 0x0028($sp) -/* 08E2C 80A6411C 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 08E30 80A64120 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 08E34 80A64124 45000005 */ bc1f .L80A6413C -/* 08E38 80A64128 3C0D8013 */ lui $t5, %hi(D_801333E8) -/* 08E3C 80A6412C 25AD33E8 */ addiu $t5, %lo(D_801333E8) -/* 08E40 80A64130 AFAD0014 */ sw $t5, 0x0014($sp) -/* 08E44 80A64134 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 08E48 80A64138 AFA70010 */ sw $a3, 0x0010($sp) -.L80A6413C: -/* 08E4C 80A6413C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A64140: -/* 08E50 80A64140 8FB00020 */ lw $s0, 0x0020($sp) -/* 08E54 80A64144 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 08E58 80A64148 03E00008 */ jr $ra -/* 08E5C 80A6414C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s deleted file mode 100644 index 73faf795df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s +++ /dev/null @@ -1,155 +0,0 @@ -glabel func_80A64150 -/* 08E60 80A64150 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 08E64 80A64154 AFBF0024 */ sw $ra, 0x0024($sp) -/* 08E68 80A64158 AFB00020 */ sw $s0, 0x0020($sp) -/* 08E6C 80A6415C AFA5002C */ sw $a1, 0x002C($sp) -/* 08E70 80A64160 90820238 */ lbu $v0, 0x0238($a0) ## 00000238 -/* 08E74 80A64164 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 08E78 80A64168 28410006 */ slti $at, $v0, 0x0006 -/* 08E7C 80A6416C 10200030 */ beq $at, $zero, .L80A64230 -/* 08E80 80A64170 00000000 */ nop -/* 08E84 80A64174 1840002E */ blez $v0, .L80A64230 -/* 08E88 80A64178 00000000 */ nop -/* 08E8C 80A6417C 8C8E023C */ lw $t6, 0x023C($a0) ## 0000023C -/* 08E90 80A64180 8C980240 */ lw $t8, 0x0240($a0) ## 00000240 -/* 08E94 80A64184 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 08E98 80A64188 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 08E9C 80A6418C AC8F023C */ sw $t7, 0x023C($a0) ## 0000023C -/* 08EA0 80A64190 1DE0004F */ bgtz $t7, .L80A642D0 -/* 08EA4 80A64194 AC990240 */ sw $t9, 0x0240($a0) ## 00000240 -/* 08EA8 80A64198 90890238 */ lbu $t1, 0x0238($a0) ## 00000238 -/* 08EAC 80A6419C 8C82014C */ lw $v0, 0x014C($a0) ## 0000014C -/* 08EB0 80A641A0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 08EB4 80A641A4 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 08EB8 80A641A8 10410005 */ beq $v0, $at, .L80A641C0 -/* 08EBC 80A641AC A08A0238 */ sb $t2, 0x0238($a0) ## 00000238 -/* 08EC0 80A641B0 10400003 */ beq $v0, $zero, .L80A641C0 -/* 08EC4 80A641B4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 08EC8 80A641B8 5441000A */ bnel $v0, $at, .L80A641E4 -/* 08ECC 80A641BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A641C0: -/* 08ED0 80A641C0 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 08ED4 80A641C4 00025B00 */ sll $t3, $v0, 12 -/* 08ED8 80A641C8 05600005 */ bltz $t3, .L80A641E0 -/* 08EDC 80A641CC 00026180 */ sll $t4, $v0, 6 -/* 08EE0 80A641D0 05820004 */ bltzl $t4, .L80A641E4 -/* 08EE4 80A641D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 08EE8 80A641D8 10000002 */ beq $zero, $zero, .L80A641E4 -/* 08EEC 80A641DC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A641E0: -/* 08EF0 80A641E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A641E4: -/* 08EF4 80A641E4 1440000B */ bne $v0, $zero, .L80A64214 -/* 08EF8 80A641E8 3C078013 */ lui $a3, %hi(D_801333E0) -/* 08EFC 80A641EC 3C0D8013 */ lui $t5, %hi(D_801333E8) -/* 08F00 80A641F0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 08F04 80A641F4 25AD33E8 */ addiu $t5, %lo(D_801333E8) -/* 08F08 80A641F8 3C058013 */ lui $a1, %hi(D_801333D4) -/* 08F0C 80A641FC 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 08F10 80A64200 AFAD0014 */ sw $t5, 0x0014($sp) -/* 08F14 80A64204 AFA70010 */ sw $a3, 0x0010($sp) -/* 08F18 80A64208 24044845 */ addiu $a0, $zero, 0x4845 ## $a0 = 00004845 -/* 08F1C 80A6420C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 08F20 80A64210 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80A64214: -/* 08F24 80A64214 920E0238 */ lbu $t6, 0x0238($s0) ## 00000238 -/* 08F28 80A64218 240F000B */ addiu $t7, $zero, 0x000B ## $t7 = 0000000B -/* 08F2C 80A6421C 29C10006 */ slti $at, $t6, 0x0006 -/* 08F30 80A64220 5020002C */ beql $at, $zero, .L80A642D4 -/* 08F34 80A64224 8E180240 */ lw $t8, 0x0240($s0) ## 00000240 -/* 08F38 80A64228 10000029 */ beq $zero, $zero, .L80A642D0 -/* 08F3C 80A6422C AE0F023C */ sw $t7, 0x023C($s0) ## 0000023C -.L80A64230: -/* 08F40 80A64230 54400028 */ bnel $v0, $zero, .L80A642D4 -/* 08F44 80A64234 8E180240 */ lw $t8, 0x0240($s0) ## 00000240 -/* 08F48 80A64238 8E18023C */ lw $t8, 0x023C($s0) ## 0000023C -/* 08F4C 80A6423C 8E080240 */ lw $t0, 0x0240($s0) ## 00000240 -/* 08F50 80A64240 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 -/* 08F54 80A64244 2719FFFF */ addiu $t9, $t8, 0xFFFF ## $t9 = FFFFFFFF -/* 08F58 80A64248 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 08F5C 80A6424C AE19023C */ sw $t9, 0x023C($s0) ## 0000023C -/* 08F60 80A64250 1F20001F */ bgtz $t9, .L80A642D0 -/* 08F64 80A64254 AE090240 */ sw $t1, 0x0240($s0) ## 00000240 -/* 08F68 80A64258 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C -/* 08F6C 80A6425C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 08F70 80A64260 AE00023C */ sw $zero, 0x023C($s0) ## 0000023C -/* 08F74 80A64264 10410005 */ beq $v0, $at, .L80A6427C -/* 08F78 80A64268 A20B0238 */ sb $t3, 0x0238($s0) ## 00000238 -/* 08F7C 80A6426C 10400003 */ beq $v0, $zero, .L80A6427C -/* 08F80 80A64270 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 08F84 80A64274 5441000A */ bnel $v0, $at, .L80A642A0 -/* 08F88 80A64278 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A6427C: -/* 08F8C 80A6427C 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 -/* 08F90 80A64280 00026300 */ sll $t4, $v0, 12 -/* 08F94 80A64284 05800005 */ bltz $t4, .L80A6429C -/* 08F98 80A64288 00026980 */ sll $t5, $v0, 6 -/* 08F9C 80A6428C 05A20004 */ bltzl $t5, .L80A642A0 -/* 08FA0 80A64290 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 08FA4 80A64294 10000002 */ beq $zero, $zero, .L80A642A0 -/* 08FA8 80A64298 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A6429C: -/* 08FAC 80A6429C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A642A0: -/* 08FB0 80A642A0 1440000B */ bne $v0, $zero, .L80A642D0 -/* 08FB4 80A642A4 24044845 */ addiu $a0, $zero, 0x4845 ## $a0 = 00004845 -/* 08FB8 80A642A8 3C0E8013 */ lui $t6, %hi(D_801333E0) -/* 08FBC 80A642AC 3C0F8013 */ lui $t7, %hi(D_801333E8) -/* 08FC0 80A642B0 25EF33E8 */ addiu $t7, %lo(D_801333E8) -/* 08FC4 80A642B4 25C733E0 */ addiu $a3, $t6, %lo(D_801333E0) -/* 08FC8 80A642B8 3C058013 */ lui $a1, %hi(D_801333D4) -/* 08FCC 80A642BC 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 08FD0 80A642C0 AFA70010 */ sw $a3, 0x0010($sp) -/* 08FD4 80A642C4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 08FD8 80A642C8 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 08FDC 80A642CC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80A642D0: -/* 08FE0 80A642D0 8E180240 */ lw $t8, 0x0240($s0) ## 00000240 -.L80A642D4: -/* 08FE4 80A642D4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 08FE8 80A642D8 5701001F */ bnel $t8, $at, .L80A64358 -/* 08FEC 80A642DC 8FAE002C */ lw $t6, 0x002C($sp) -/* 08FF0 80A642E0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 08FF4 80A642E4 00000000 */ nop -/* 08FF8 80A642E8 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 08FFC 80A642EC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.25 -/* 09000 80A642F0 00000000 */ nop -/* 09004 80A642F4 4604003C */ c.lt.s $f0, $f4 -/* 09008 80A642F8 00000000 */ nop -/* 0900C 80A642FC 45020016 */ bc1fl .L80A64358 -/* 09010 80A64300 8FAE002C */ lw $t6, 0x002C($sp) -/* 09014 80A64304 8E080228 */ lw $t0, 0x0228($s0) ## 00000228 -/* 09018 80A64308 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C -/* 0901C 80A6430C 3C0B8013 */ lui $t3, %hi(D_801333E0) -/* 09020 80A64310 ACA80000 */ sw $t0, 0x0000($a1) ## 0000021C -/* 09024 80A64314 8E19022C */ lw $t9, 0x022C($s0) ## 0000022C -/* 09028 80A64318 3C0C8013 */ lui $t4, %hi(D_801333E8) -/* 0902C 80A6431C 258C33E8 */ addiu $t4, %lo(D_801333E8) -/* 09030 80A64320 ACB90004 */ sw $t9, 0x0004($a1) ## 00000220 -/* 09034 80A64324 8E080230 */ lw $t0, 0x0230($s0) ## 00000230 -/* 09038 80A64328 256733E0 */ addiu $a3, $t3, %lo(D_801333E0) -/* 0903C 80A6432C 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 09040 80A64330 ACA80008 */ sw $t0, 0x0008($a1) ## 00000224 -/* 09044 80A64334 8E0901F0 */ lw $t1, 0x01F0($s0) ## 000001F0 -/* 09048 80A64338 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0904C 80A6433C 00095100 */ sll $t2, $t1, 4 -/* 09050 80A64340 05430005 */ bgezl $t2, .L80A64358 -/* 09054 80A64344 8FAE002C */ lw $t6, 0x002C($sp) -/* 09058 80A64348 AFA70010 */ sw $a3, 0x0010($sp) -/* 0905C 80A6434C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 09060 80A64350 AFAC0014 */ sw $t4, 0x0014($sp) -/* 09064 80A64354 8FAE002C */ lw $t6, 0x002C($sp) -.L80A64358: -/* 09068 80A64358 920D0238 */ lbu $t5, 0x0238($s0) ## 00000238 -/* 0906C 80A6435C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 09070 80A64360 002E0821 */ addu $at, $at, $t6 -/* 09074 80A64364 A02D072A */ sb $t5, 0x072A($at) ## 0001072A -/* 09078 80A64368 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0907C 80A6436C 8FB00020 */ lw $s0, 0x0020($sp) -/* 09080 80A64370 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 09084 80A64374 03E00008 */ jr $ra -/* 09088 80A64378 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s deleted file mode 100644 index e1c1c4dc6e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s +++ /dev/null @@ -1,80 +0,0 @@ -.late_rodata -glabel D_80A669AC - .word 0x3F5DB3D7 -glabel D_80A669B0 - .word 0xBF5DB3D7 - -.text -glabel func_80A6437C -/* 0908C 80A6437C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 09090 80A64380 AFBF001C */ sw $ra, 0x001C($sp) -/* 09094 80A64384 AFB00018 */ sw $s0, 0x0018($sp) -/* 09098 80A64388 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0909C 80A6438C 0C00B69E */ jal Actor_WorldYawTowardActor -/* 090A0 80A64390 8CA51C44 */ lw $a1, 0x1C44($a1) ## 00001C44 -/* 090A4 80A64394 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 090A8 80A64398 004E2023 */ subu $a0, $v0, $t6 -/* 090AC 80A6439C 00042400 */ sll $a0, $a0, 16 -/* 090B0 80A643A0 00042403 */ sra $a0, $a0, 16 -/* 090B4 80A643A4 0C01DE1C */ jal Math_SinS - ## sins? -/* 090B8 80A643A8 A7A4002A */ sh $a0, 0x002A($sp) -/* 090BC 80A643AC 87A4002A */ lh $a0, 0x002A($sp) -/* 090C0 80A643B0 0C01DE0D */ jal Math_CosS - ## coss? -/* 090C4 80A643B4 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 090C8 80A643B8 3C0180A6 */ lui $at, %hi(D_80A669AC) ## $at = 80A60000 -/* 090CC 80A643BC C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 090D0 80A643C0 C42469AC */ lwc1 $f4, %lo(D_80A669AC)($at) -/* 090D4 80A643C4 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 090D8 80A643C8 3C0180A6 */ lui $at, %hi(D_80A669B0) ## $at = 80A60000 -/* 090DC 80A643CC 4602203C */ c.lt.s $f4, $f2 -/* 090E0 80A643D0 00000000 */ nop -/* 090E4 80A643D4 45000003 */ bc1f .L80A643E4 -/* 090E8 80A643D8 00000000 */ nop -/* 090EC 80A643DC 10000023 */ beq $zero, $zero, .L80A6446C -/* 090F0 80A643E0 AE0F0370 */ sw $t7, 0x0370($s0) ## 00000370 -.L80A643E4: -/* 090F4 80A643E4 C42669B0 */ lwc1 $f6, %lo(D_80A669B0)($at) -/* 090F8 80A643E8 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 090FC 80A643EC 4606103C */ c.lt.s $f2, $f6 -/* 09100 80A643F0 00000000 */ nop -/* 09104 80A643F4 45020004 */ bc1fl .L80A64408 -/* 09108 80A643F8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0910C 80A643FC 1000001B */ beq $zero, $zero, .L80A6446C -/* 09110 80A64400 AE180370 */ sw $t8, 0x0370($s0) ## 00000370 -/* 09114 80A64404 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -.L80A64408: -/* 09118 80A64408 00000000 */ nop -/* 0911C 80A6440C 4600403C */ c.lt.s $f8, $f0 -/* 09120 80A64410 00000000 */ nop -/* 09124 80A64414 4502000C */ bc1fl .L80A64448 -/* 09128 80A64418 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0912C 80A6441C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 09130 80A64420 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 09134 80A64424 4602503C */ c.lt.s $f10, $f2 -/* 09138 80A64428 00000000 */ nop -/* 0913C 80A6442C 45000003 */ bc1f .L80A6443C -/* 09140 80A64430 00000000 */ nop -/* 09144 80A64434 1000000D */ beq $zero, $zero, .L80A6446C -/* 09148 80A64438 AE190370 */ sw $t9, 0x0370($s0) ## 00000370 -.L80A6443C: -/* 0914C 80A6443C 1000000B */ beq $zero, $zero, .L80A6446C -/* 09150 80A64440 AE000370 */ sw $zero, 0x0370($s0) ## 00000370 -/* 09154 80A64444 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -.L80A64448: -/* 09158 80A64448 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 0915C 80A6444C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 09160 80A64450 4602803C */ c.lt.s $f16, $f2 -/* 09164 80A64454 00000000 */ nop -/* 09168 80A64458 45020004 */ bc1fl .L80A6446C -/* 0916C 80A6445C AE090370 */ sw $t1, 0x0370($s0) ## 00000370 -/* 09170 80A64460 10000002 */ beq $zero, $zero, .L80A6446C -/* 09174 80A64464 AE080370 */ sw $t0, 0x0370($s0) ## 00000370 -/* 09178 80A64468 AE090370 */ sw $t1, 0x0370($s0) ## 00000370 -.L80A6446C: -/* 0917C 80A6446C 8FBF001C */ lw $ra, 0x001C($sp) -/* 09180 80A64470 8FB00018 */ lw $s0, 0x0018($sp) -/* 09184 80A64474 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 09188 80A64478 03E00008 */ jr $ra -/* 0918C 80A6447C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64480.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64480.s deleted file mode 100644 index ea92df1743..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64480.s +++ /dev/null @@ -1,73 +0,0 @@ -.late_rodata -glabel D_80A669B4 - .word 0x43F00001 -glabel D_80A669B8 - .word 0x44E38000 - -.text -glabel func_80A64480 -/* 09190 80A64480 AFA50004 */ sw $a1, 0x0004($sp) -/* 09194 80A64484 8C8E0208 */ lw $t6, 0x0208($a0) ## 00000208 -/* 09198 80A64488 84980200 */ lh $t8, 0x0200($a0) ## 00000200 -/* 0919C 80A6448C 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 091A0 80A64490 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 091A4 80A64494 C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 091A8 80A64498 01F81023 */ subu $v0, $t7, $t8 -/* 091AC 80A6449C 46803220 */ cvt.s.w $f8, $f6 -/* 091B0 80A644A0 00021400 */ sll $v0, $v0, 16 -/* 091B4 80A644A4 00021403 */ sra $v0, $v0, 16 -/* 091B8 80A644A8 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 091BC 80A644AC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 091C0 80A644B0 44817000 */ mtc1 $at, $f14 ## $f14 = 100.00 -/* 091C4 80A644B4 46082083 */ div.s $f2, $f4, $f8 -/* 091C8 80A644B8 3C0180A6 */ lui $at, %hi(D_80A669B4) ## $at = 80A60000 -/* 091CC 80A644BC C43269B4 */ lwc1 $f18, %lo(D_80A669B4)($at) -/* 091D0 80A644C0 3C0180A6 */ lui $at, %hi(D_80A669B8) ## $at = 80A60000 -/* 091D4 80A644C4 46805420 */ cvt.s.w $f16, $f10 -/* 091D8 80A644C8 C42469B8 */ lwc1 $f4, %lo(D_80A669B8)($at) -/* 091DC 80A644CC 84850034 */ lh $a1, 0x0034($a0) ## 00000034 -/* 091E0 80A644D0 46128183 */ div.s $f6, $f16, $f18 -/* 091E4 80A644D4 46022202 */ mul.s $f8, $f4, $f2 -/* 091E8 80A644D8 00000000 */ nop -/* 091EC 80A644DC 46064282 */ mul.s $f10, $f8, $f6 -/* 091F0 80A644E0 4600540D */ trunc.w.s $f16, $f10 -/* 091F4 80A644E4 44038000 */ mfc1 $v1, $f16 -/* 091F8 80A644E8 00000000 */ nop -/* 091FC 80A644EC 00031C00 */ sll $v1, $v1, 16 -/* 09200 80A644F0 00031C03 */ sra $v1, $v1, 16 -/* 09204 80A644F4 00031823 */ subu $v1, $zero, $v1 -/* 09208 80A644F8 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 0920C 80A644FC 00654023 */ subu $t0, $v1, $a1 -/* 09210 80A64500 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 -/* 09214 80A64504 46802020 */ cvt.s.w $f0, $f4 -/* 09218 80A64508 46809320 */ cvt.s.w $f12, $f18 -/* 0921C 80A6450C 46000005 */ abs.s $f0, $f0 -/* 09220 80A64510 460E003C */ c.lt.s $f0, $f14 -/* 09224 80A64514 00000000 */ nop -/* 09228 80A64518 45000003 */ bc1f .L80A64528 -/* 0922C 80A6451C 00000000 */ nop -/* 09230 80A64520 10000012 */ beq $zero, $zero, .L80A6456C -/* 09234 80A64524 A4800034 */ sh $zero, 0x0034($a0) ## 00000034 -.L80A64528: -/* 09238 80A64528 46006005 */ abs.s $f0, $f12 -/* 0923C 80A6452C 460E003C */ c.lt.s $f0, $f14 -/* 09240 80A64530 00000000 */ nop -/* 09244 80A64534 45020004 */ bc1fl .L80A64548 -/* 09248 80A64538 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0924C 80A6453C 1000000B */ beq $zero, $zero, .L80A6456C -/* 09250 80A64540 A4830034 */ sh $v1, 0x0034($a0) ## 00000034 -/* 09254 80A64544 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -.L80A64548: -/* 09258 80A64548 24A90064 */ addiu $t1, $a1, 0x0064 ## $t1 = 00000064 -/* 0925C 80A6454C 24AAFF9C */ addiu $t2, $a1, 0xFF9C ## $t2 = FFFFFF9C -/* 09260 80A64550 460C403C */ c.lt.s $f8, $f12 -/* 09264 80A64554 00000000 */ nop -/* 09268 80A64558 45020004 */ bc1fl .L80A6456C -/* 0926C 80A6455C A48A0034 */ sh $t2, 0x0034($a0) ## 00000034 -/* 09270 80A64560 10000002 */ beq $zero, $zero, .L80A6456C -/* 09274 80A64564 A4890034 */ sh $t1, 0x0034($a0) ## 00000034 -/* 09278 80A64568 A48A0034 */ sh $t2, 0x0034($a0) ## 00000034 -.L80A6456C: -/* 0927C 80A6456C 848B0034 */ lh $t3, 0x0034($a0) ## 00000034 -/* 09280 80A64570 03E00008 */ jr $ra -/* 09284 80A64574 A48B00B8 */ sh $t3, 0x00B8($a0) ## 000000B8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64578.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64578.s deleted file mode 100644 index fc711300b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64578.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_80A64578 -/* 09288 80A64578 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0928C 80A6457C AFBF0014 */ sw $ra, 0x0014($sp) -/* 09290 80A64580 AFA5002C */ sw $a1, 0x002C($sp) -/* 09294 80A64584 8C8F0078 */ lw $t7, 0x0078($a0) ## 00000078 -/* 09298 80A64588 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 0929C 80A6458C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 092A0 80A64590 15E00006 */ bne $t7, $zero, .L80A645AC -/* 092A4 80A64594 AFAF001C */ sw $t7, 0x001C($sp) -/* 092A8 80A64598 8C590440 */ lw $t9, 0x0440($v0) ## 00000440 -/* 092AC 80A6459C 50990004 */ beql $a0, $t9, .L80A645B0 -/* 092B0 80A645A0 8FA4002C */ lw $a0, 0x002C($sp) -/* 092B4 80A645A4 10000031 */ beq $zero, $zero, .L80A6466C -/* 092B8 80A645A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A645AC: -/* 092BC 80A645AC 8FA4002C */ lw $a0, 0x002C($sp) -.L80A645B0: -/* 092C0 80A645B0 90E6007D */ lbu $a2, 0x007D($a3) ## 0000007D -/* 092C4 80A645B4 AFA70028 */ sw $a3, 0x0028($sp) -/* 092C8 80A645B8 8FA5001C */ lw $a1, 0x001C($sp) -/* 092CC 80A645BC 0C010839 */ jal SurfaceType_GetConveyorDirection -/* 092D0 80A645C0 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 092D4 80A645C4 8FA70028 */ lw $a3, 0x0028($sp) -/* 092D8 80A645C8 00025280 */ sll $t2, $v0, 10 -/* 092DC 80A645CC 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 092E0 80A645D0 84E30032 */ lh $v1, 0x0032($a3) ## 00000032 -/* 092E4 80A645D4 44811000 */ mtc1 $at, $f2 ## $f2 = 800.00 -/* 092E8 80A645D8 3C01C448 */ lui $at, 0xC448 ## $at = C4480000 -/* 092EC 80A645DC 01432023 */ subu $a0, $t2, $v1 -/* 092F0 80A645E0 00042400 */ sll $a0, $a0, 16 -/* 092F4 80A645E4 00042403 */ sra $a0, $a0, 16 -/* 092F8 80A645E8 44842000 */ mtc1 $a0, $f4 ## $f4 = 0.00 -/* 092FC 80A645EC 00000000 */ nop -/* 09300 80A645F0 46802020 */ cvt.s.w $f0, $f4 -/* 09304 80A645F4 4600103C */ c.lt.s $f2, $f0 -/* 09308 80A645F8 00000000 */ nop -/* 0930C 80A645FC 4502000A */ bc1fl .L80A64628 -/* 09310 80A64600 44819000 */ mtc1 $at, $f18 ## $f18 = -800.00 -/* 09314 80A64604 44833000 */ mtc1 $v1, $f6 ## $f6 = 0.00 -/* 09318 80A64608 00000000 */ nop -/* 0931C 80A6460C 46803220 */ cvt.s.w $f8, $f6 -/* 09320 80A64610 46024280 */ add.s $f10, $f8, $f2 -/* 09324 80A64614 4600540D */ trunc.w.s $f16, $f10 -/* 09328 80A64618 440C8000 */ mfc1 $t4, $f16 -/* 0932C 80A6461C 10000010 */ beq $zero, $zero, .L80A64660 -/* 09330 80A64620 A4EC0032 */ sh $t4, 0x0032($a3) ## 00000032 -/* 09334 80A64624 44819000 */ mtc1 $at, $f18 ## $f18 = -800.00 -.L80A64628: -/* 09338 80A64628 00647821 */ addu $t7, $v1, $a0 -/* 0933C 80A6462C 4612003C */ c.lt.s $f0, $f18 -/* 09340 80A64630 00000000 */ nop -/* 09344 80A64634 4502000A */ bc1fl .L80A64660 -/* 09348 80A64638 A4EF0032 */ sh $t7, 0x0032($a3) ## 00000032 -/* 0934C 80A6463C 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 09350 80A64640 00000000 */ nop -/* 09354 80A64644 468021A0 */ cvt.s.w $f6, $f4 -/* 09358 80A64648 46023201 */ sub.s $f8, $f6, $f2 -/* 0935C 80A6464C 4600428D */ trunc.w.s $f10, $f8 -/* 09360 80A64650 440E5000 */ mfc1 $t6, $f10 -/* 09364 80A64654 10000002 */ beq $zero, $zero, .L80A64660 -/* 09368 80A64658 A4EE0032 */ sh $t6, 0x0032($a3) ## 00000032 -/* 0936C 80A6465C A4EF0032 */ sh $t7, 0x0032($a3) ## 00000032 -.L80A64660: -/* 09370 80A64660 84F80032 */ lh $t8, 0x0032($a3) ## 00000032 -/* 09374 80A64664 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 09378 80A64668 A4F800B6 */ sh $t8, 0x00B6($a3) ## 000000B6 -.L80A6466C: -/* 0937C 80A6466C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09380 80A64670 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 09384 80A64674 03E00008 */ jr $ra -/* 09388 80A64678 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s deleted file mode 100644 index 181fa77349..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80A6467C -/* 0938C 80A6467C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 09390 80A64680 AFBF0014 */ sw $ra, 0x0014($sp) -/* 09394 80A64684 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 09398 80A64688 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 0939C 80A6468C C7A40018 */ lwc1 $f4, 0x0018($sp) -/* 093A0 80A64690 8FBF0014 */ lw $ra, 0x0014($sp) -/* 093A4 80A64694 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 093A8 80A64698 46040182 */ mul.s $f6, $f0, $f4 -/* 093AC 80A6469C 4600320D */ trunc.w.s $f8, $f6 -/* 093B0 80A646A0 44024000 */ mfc1 $v0, $f8 -/* 093B4 80A646A4 03E00008 */ jr $ra -/* 093B8 80A646A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64ED4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64ED4.s deleted file mode 100644 index 4bae0cee78..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64ED4.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80A64ED4 -/* 09BE4 80A64ED4 AFA50004 */ sw $a1, 0x0004($sp) -/* 09BE8 80A64ED8 AFA60008 */ sw $a2, 0x0008($sp) -/* 09BEC 80A64EDC 8C820370 */ lw $v0, 0x0370($a0) ## 00000370 -/* 09BF0 80A64EE0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 09BF4 80A64EE4 54410004 */ bnel $v0, $at, .L80A64EF8 -/* 09BF8 80A64EE8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 09BFC 80A64EEC 03E00008 */ jr $ra -/* 09C00 80A64EF0 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80A64EF4: -/* 09C04 80A64EF4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -.L80A64EF8: -/* 09C08 80A64EF8 54410004 */ bnel $v0, $at, .L80A64F0C -/* 09C0C 80A64EFC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09C10 80A64F00 03E00008 */ jr $ra -/* 09C14 80A64F04 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A64F08: -/* 09C18 80A64F08 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A64F0C: -/* 09C1C 80A64F0C 03E00008 */ jr $ra -/* 09C20 80A64F10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s deleted file mode 100644 index d30d321d29..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s +++ /dev/null @@ -1,76 +0,0 @@ -.late_rodata -glabel D_80A669C0 - .word 0x3E31D0D4 - -.text -glabel func_80A64F14 -/* 09C24 80A64F14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 09C28 80A64F18 AFBF001C */ sw $ra, 0x001C($sp) -/* 09C2C 80A64F1C AFB00018 */ sw $s0, 0x0018($sp) -/* 09C30 80A64F20 AFA50024 */ sw $a1, 0x0024($sp) -/* 09C34 80A64F24 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 09C38 80A64F28 AFA40020 */ sw $a0, 0x0020($sp) -/* 09C3C 80A64F2C 0C00B6E3 */ jal Actor_WorldDistXZToActor -/* 09C40 80A64F30 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 09C44 80A64F34 3C014296 */ lui $at, 0x4296 ## $at = 42960000 -/* 09C48 80A64F38 44812000 */ mtc1 $at, $f4 ## $f4 = 75.00 -/* 09C4C 80A64F3C 8FA50020 */ lw $a1, 0x0020($sp) -/* 09C50 80A64F40 4600203C */ c.lt.s $f4, $f0 -/* 09C54 80A64F44 00000000 */ nop -/* 09C58 80A64F48 45020004 */ bc1fl .L80A64F5C -/* 09C5C 80A64F4C C4A60028 */ lwc1 $f6, 0x0028($a1) ## 00000028 -/* 09C60 80A64F50 1000002B */ beq $zero, $zero, .L80A65000 -/* 09C64 80A64F54 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09C68 80A64F58 C4A60028 */ lwc1 $f6, 0x0028($a1) ## 00000028 -.L80A64F5C: -/* 09C6C 80A64F5C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 09C70 80A64F60 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 09C74 80A64F64 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 -/* 09C78 80A64F68 46083001 */ sub.s $f0, $f6, $f8 -/* 09C7C 80A64F6C 46000005 */ abs.s $f0, $f0 -/* 09C80 80A64F70 4600503C */ c.lt.s $f10, $f0 -/* 09C84 80A64F74 00000000 */ nop -/* 09C88 80A64F78 45000003 */ bc1f .L80A64F88 -/* 09C8C 80A64F7C 00000000 */ nop -/* 09C90 80A64F80 1000001F */ beq $zero, $zero, .L80A65000 -/* 09C94 80A64F84 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A64F88: -/* 09C98 80A64F88 0C00B69E */ jal Actor_WorldYawTowardActor -/* 09C9C 80A64F8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09CA0 80A64F90 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 09CA4 80A64F94 004E2023 */ subu $a0, $v0, $t6 -/* 09CA8 80A64F98 00042400 */ sll $a0, $a0, 16 -/* 09CAC 80A64F9C 0C01DE0D */ jal Math_CosS - ## coss? -/* 09CB0 80A64FA0 00042403 */ sra $a0, $a0, 16 -/* 09CB4 80A64FA4 3C0180A6 */ lui $at, %hi(D_80A669C0) ## $at = 80A60000 -/* 09CB8 80A64FA8 C43069C0 */ lwc1 $f16, %lo(D_80A669C0)($at) -/* 09CBC 80A64FAC 8FA40020 */ lw $a0, 0x0020($sp) -/* 09CC0 80A64FB0 8FA50024 */ lw $a1, 0x0024($sp) -/* 09CC4 80A64FB4 4610003C */ c.lt.s $f0, $f16 -/* 09CC8 80A64FB8 00000000 */ nop -/* 09CCC 80A64FBC 45000003 */ bc1f .L80A64FCC -/* 09CD0 80A64FC0 00000000 */ nop -/* 09CD4 80A64FC4 1000000E */ beq $zero, $zero, .L80A65000 -/* 09CD8 80A64FC8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A64FCC: -/* 09CDC 80A64FCC 0C2993B5 */ jal func_80A64ED4 -/* 09CE0 80A64FD0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 09CE4 80A64FD4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 09CE8 80A64FD8 54410004 */ bnel $v0, $at, .L80A64FEC -/* 09CEC 80A64FDC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09CF0 80A64FE0 10000007 */ beq $zero, $zero, .L80A65000 -/* 09CF4 80A64FE4 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 09CF8 80A64FE8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80A64FEC: -/* 09CFC 80A64FEC 54410004 */ bnel $v0, $at, .L80A65000 -/* 09D00 80A64FF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09D04 80A64FF4 10000002 */ beq $zero, $zero, .L80A65000 -/* 09D08 80A64FF8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 09D0C 80A64FFC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A65000: -/* 09D10 80A65000 8FBF001C */ lw $ra, 0x001C($sp) -/* 09D14 80A65004 8FB00018 */ lw $s0, 0x0018($sp) -/* 09D18 80A65008 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 09D1C 80A6500C 03E00008 */ jr $ra -/* 09D20 80A65010 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65014.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65014.s deleted file mode 100644 index 7bc525180c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65014.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A65014 -/* 09D24 80A65014 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 09D28 80A65018 AFBF0014 */ sw $ra, 0x0014($sp) -/* 09D2C 80A6501C 8C8E014C */ lw $t6, 0x014C($a0) ## 0000014C -/* 09D30 80A65020 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09D34 80A65024 51C10004 */ beql $t6, $at, .L80A65038 -/* 09D38 80A65028 8C820210 */ lw $v0, 0x0210($a0) ## 00000210 -/* 09D3C 80A6502C 1000000B */ beq $zero, $zero, .L80A6505C -/* 09D40 80A65030 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09D44 80A65034 8C820210 */ lw $v0, 0x0210($a0) ## 00000210 -.L80A65038: -/* 09D48 80A65038 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09D4C 80A6503C 10400005 */ beq $v0, $zero, .L80A65054 -/* 09D50 80A65040 00000000 */ nop -/* 09D54 80A65044 10410003 */ beq $v0, $at, .L80A65054 -/* 09D58 80A65048 00000000 */ nop -/* 09D5C 80A6504C 10000003 */ beq $zero, $zero, .L80A6505C -/* 09D60 80A65050 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A65054: -/* 09D64 80A65054 0C2993C5 */ jal func_80A64F14 -/* 09D68 80A65058 8CA61C44 */ lw $a2, 0x1C44($a1) ## 00001C44 -.L80A6505C: -/* 09D6C 80A6505C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09D70 80A65060 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 09D74 80A65064 03E00008 */ jr $ra -/* 09D78 80A65068 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s deleted file mode 100644 index 99167d77fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80A6506C -/* 09D7C 80A6506C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 09D80 80A65070 F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 09D84 80A65074 4485A000 */ mtc1 $a1, $f20 ## $f20 = 0.00 -/* 09D88 80A65078 AFBF001C */ sw $ra, 0x001C($sp) -/* 09D8C 80A6507C AFA40028 */ sw $a0, 0x0028($sp) -/* 09D90 80A65080 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 09D94 80A65084 AFA60030 */ sw $a2, 0x0030($sp) -/* 09D98 80A65088 4614A080 */ add.s $f2, $f20, $f20 -/* 09D9C 80A6508C 8FAE0028 */ lw $t6, 0x0028($sp) -/* 09DA0 80A65090 8FAF0030 */ lw $t7, 0x0030($sp) -/* 09DA4 80A65094 46020102 */ mul.s $f4, $f0, $f2 -/* 09DA8 80A65098 C5C60000 */ lwc1 $f6, 0x0000($t6) ## 00000000 -/* 09DAC 80A6509C 46062200 */ add.s $f8, $f4, $f6 -/* 09DB0 80A650A0 46144281 */ sub.s $f10, $f8, $f20 -/* 09DB4 80A650A4 E5EA0000 */ swc1 $f10, 0x0000($t7) ## 00000000 -/* 09DB8 80A650A8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 09DBC 80A650AC E7A20024 */ swc1 $f2, 0x0024($sp) -/* 09DC0 80A650B0 C7B00024 */ lwc1 $f16, 0x0024($sp) -/* 09DC4 80A650B4 8FB80028 */ lw $t8, 0x0028($sp) -/* 09DC8 80A650B8 8FB90030 */ lw $t9, 0x0030($sp) -/* 09DCC 80A650BC 46100482 */ mul.s $f18, $f0, $f16 -/* 09DD0 80A650C0 C7040004 */ lwc1 $f4, 0x0004($t8) ## 00000004 -/* 09DD4 80A650C4 46049180 */ add.s $f6, $f18, $f4 -/* 09DD8 80A650C8 46143201 */ sub.s $f8, $f6, $f20 -/* 09DDC 80A650CC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 09DE0 80A650D0 E7280004 */ swc1 $f8, 0x0004($t9) ## 00000004 -/* 09DE4 80A650D4 C7AA0024 */ lwc1 $f10, 0x0024($sp) -/* 09DE8 80A650D8 8FA80028 */ lw $t0, 0x0028($sp) -/* 09DEC 80A650DC 8FA90030 */ lw $t1, 0x0030($sp) -/* 09DF0 80A650E0 460A0402 */ mul.s $f16, $f0, $f10 -/* 09DF4 80A650E4 C5120008 */ lwc1 $f18, 0x0008($t0) ## 00000008 -/* 09DF8 80A650E8 46128100 */ add.s $f4, $f16, $f18 -/* 09DFC 80A650EC 46142181 */ sub.s $f6, $f4, $f20 -/* 09E00 80A650F0 E5260008 */ swc1 $f6, 0x0008($t1) ## 00000008 -/* 09E04 80A650F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 09E08 80A650F8 D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 09E0C 80A650FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 09E10 80A65100 03E00008 */ jr $ra -/* 09E14 80A65104 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s deleted file mode 100644 index e8976d3e87..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s +++ /dev/null @@ -1,770 +0,0 @@ -.late_rodata -glabel D_80A669C4 - .float 0.6 - -glabel D_80A669C8 - .float 0.7 - -glabel D_80A669CC - .float 0.7 - -glabel D_80A669D0 - .float 0.7 - -glabel D_80A669D4 - .float 0.7 - -glabel D_80A669D8 - .word 0x3D70F0F1 -glabel D_80A669DC - .float 0.04 - -.text -glabel func_80A65108 -/* 09E18 80A65108 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 -/* 09E1C 80A6510C 3C0F80A6 */ lui $t7, %hi(D_80A667A0) ## $t7 = 80A60000 -/* 09E20 80A65110 AFBF001C */ sw $ra, 0x001C($sp) -/* 09E24 80A65114 AFB00018 */ sw $s0, 0x0018($sp) -/* 09E28 80A65118 AFA500AC */ sw $a1, 0x00AC($sp) -/* 09E2C 80A6511C AFA600B0 */ sw $a2, 0x00B0($sp) -/* 09E30 80A65120 25EF67A0 */ addiu $t7, $t7, %lo(D_80A667A0) ## $t7 = 80A667A0 -/* 09E34 80A65124 8DF90000 */ lw $t9, 0x0000($t7) ## 80A667A0 -/* 09E38 80A65128 27AE0094 */ addiu $t6, $sp, 0x0094 ## $t6 = FFFFFFEC -/* 09E3C 80A6512C 8DF80004 */ lw $t8, 0x0004($t7) ## 80A667A4 -/* 09E40 80A65130 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFEC -/* 09E44 80A65134 8DF90008 */ lw $t9, 0x0008($t7) ## 80A667A8 -/* 09E48 80A65138 3C0A80A6 */ lui $t2, %hi(D_80A667AC) ## $t2 = 80A60000 -/* 09E4C 80A6513C 254A67AC */ addiu $t2, $t2, %lo(D_80A667AC) ## $t2 = 80A667AC -/* 09E50 80A65140 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF0 -/* 09E54 80A65144 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF4 -/* 09E58 80A65148 8D4C0000 */ lw $t4, 0x0000($t2) ## 80A667AC -/* 09E5C 80A6514C 27A90088 */ addiu $t1, $sp, 0x0088 ## $t1 = FFFFFFE0 -/* 09E60 80A65150 8D4B0004 */ lw $t3, 0x0004($t2) ## 80A667B0 -/* 09E64 80A65154 AD2C0000 */ sw $t4, 0x0000($t1) ## FFFFFFE0 -/* 09E68 80A65158 8D4C0008 */ lw $t4, 0x0008($t2) ## 80A667B4 -/* 09E6C 80A6515C 3C0E80A6 */ lui $t6, %hi(D_80A667B8) ## $t6 = 80A60000 -/* 09E70 80A65160 25CE67B8 */ addiu $t6, $t6, %lo(D_80A667B8) ## $t6 = 80A667B8 -/* 09E74 80A65164 AD2B0004 */ sw $t3, 0x0004($t1) ## FFFFFFE4 -/* 09E78 80A65168 AD2C0008 */ sw $t4, 0x0008($t1) ## FFFFFFE8 -/* 09E7C 80A6516C 8DD80000 */ lw $t8, 0x0000($t6) ## 80A667B8 -/* 09E80 80A65170 27AD007C */ addiu $t5, $sp, 0x007C ## $t5 = FFFFFFD4 -/* 09E84 80A65174 8DCF0004 */ lw $t7, 0x0004($t6) ## 80A667BC -/* 09E88 80A65178 ADB80000 */ sw $t8, 0x0000($t5) ## FFFFFFD4 -/* 09E8C 80A6517C 8DD80008 */ lw $t8, 0x0008($t6) ## 80A667C0 -/* 09E90 80A65180 3C0980A6 */ lui $t1, %hi(D_80A667C4) ## $t1 = 80A60000 -/* 09E94 80A65184 252967C4 */ addiu $t1, $t1, %lo(D_80A667C4) ## $t1 = 80A667C4 -/* 09E98 80A65188 ADAF0004 */ sw $t7, 0x0004($t5) ## FFFFFFD8 -/* 09E9C 80A6518C ADB80008 */ sw $t8, 0x0008($t5) ## FFFFFFDC -/* 09EA0 80A65190 8D2B0000 */ lw $t3, 0x0000($t1) ## 80A667C4 -/* 09EA4 80A65194 27B90064 */ addiu $t9, $sp, 0x0064 ## $t9 = FFFFFFBC -/* 09EA8 80A65198 8D2A0004 */ lw $t2, 0x0004($t1) ## 80A667C8 -/* 09EAC 80A6519C AF2B0000 */ sw $t3, 0x0000($t9) ## FFFFFFBC -/* 09EB0 80A651A0 8D2B0008 */ lw $t3, 0x0008($t1) ## 80A667CC -/* 09EB4 80A651A4 3C0D80A6 */ lui $t5, %hi(D_80A667D0) ## $t5 = 80A60000 -/* 09EB8 80A651A8 25AD67D0 */ addiu $t5, $t5, %lo(D_80A667D0) ## $t5 = 80A667D0 -/* 09EBC 80A651AC AF2A0004 */ sw $t2, 0x0004($t9) ## FFFFFFC0 -/* 09EC0 80A651B0 AF2B0008 */ sw $t3, 0x0008($t9) ## FFFFFFC4 -/* 09EC4 80A651B4 8DAF0000 */ lw $t7, 0x0000($t5) ## 80A667D0 -/* 09EC8 80A651B8 27AC0058 */ addiu $t4, $sp, 0x0058 ## $t4 = FFFFFFB0 -/* 09ECC 80A651BC 8DAE0004 */ lw $t6, 0x0004($t5) ## 80A667D4 -/* 09ED0 80A651C0 AD8F0000 */ sw $t7, 0x0000($t4) ## FFFFFFB0 -/* 09ED4 80A651C4 8DAF0008 */ lw $t7, 0x0008($t5) ## 80A667D8 -/* 09ED8 80A651C8 AD8E0004 */ sw $t6, 0x0004($t4) ## FFFFFFB4 -/* 09EDC 80A651CC 2401FFF7 */ addiu $at, $zero, 0xFFF7 ## $at = FFFFFFF7 -/* 09EE0 80A651D0 AD8F0008 */ sw $t7, 0x0008($t4) ## FFFFFFB8 -/* 09EE4 80A651D4 8C8201F0 */ lw $v0, 0x01F0($a0) ## 000001F0 -/* 09EE8 80A651D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 09EEC 80A651DC C48201C4 */ lwc1 $f2, 0x01C4($a0) ## 000001C4 -/* 09EF0 80A651E0 30580008 */ andi $t8, $v0, 0x0008 ## $t8 = 00000000 -/* 09EF4 80A651E4 17000015 */ bne $t8, $zero, .L80A6523C -/* 09EF8 80A651E8 0041C824 */ and $t9, $v0, $at -/* 09EFC 80A651EC 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 09F00 80A651F0 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 09F04 80A651F4 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFD4 -/* 09F08 80A651F8 26070258 */ addiu $a3, $s0, 0x0258 ## $a3 = 00000258 -/* 09F0C 80A651FC 0C029902 */ jal func_800A6408 -/* 09F10 80A65200 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 09F14 80A65204 C6040258 */ lwc1 $f4, 0x0258($s0) ## 00000258 -/* 09F18 80A65208 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 09F1C 80A6520C C60A025C */ lwc1 $f10, 0x025C($s0) ## 0000025C -/* 09F20 80A65210 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 09F24 80A65214 46062201 */ sub.s $f8, $f4, $f6 -/* 09F28 80A65218 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 09F2C 80A6521C C6040260 */ lwc1 $f4, 0x0260($s0) ## 00000260 -/* 09F30 80A65220 C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 09F34 80A65224 E6080258 */ swc1 $f8, 0x0258($s0) ## 00000258 -/* 09F38 80A65228 46105481 */ sub.s $f18, $f10, $f16 -/* 09F3C 80A6522C 46062201 */ sub.s $f8, $f4, $f6 -/* 09F40 80A65230 E612025C */ swc1 $f18, 0x025C($s0) ## 0000025C -/* 09F44 80A65234 10000002 */ beq $zero, $zero, .L80A65240 -/* 09F48 80A65238 E6080260 */ swc1 $f8, 0x0260($s0) ## 00000260 -.L80A6523C: -/* 09F4C 80A6523C AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -.L80A65240: -/* 09F50 80A65240 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 09F54 80A65244 2405000D */ addiu $a1, $zero, 0x000D ## $a1 = 0000000D -/* 09F58 80A65248 27A60094 */ addiu $a2, $sp, 0x0094 ## $a2 = FFFFFFEC -/* 09F5C 80A6524C 27A7002C */ addiu $a3, $sp, 0x002C ## $a3 = FFFFFF84 -/* 09F60 80A65250 0C029902 */ jal func_800A6408 -/* 09F64 80A65254 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 09F68 80A65258 8FA400AC */ lw $a0, 0x00AC($sp) -/* 09F6C 80A6525C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 09F70 80A65260 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 09F74 80A65264 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFF84 -/* 09F78 80A65268 26060228 */ addiu $a2, $s0, 0x0228 ## $a2 = 00000228 -/* 09F7C 80A6526C 27A70028 */ addiu $a3, $sp, 0x0028 ## $a3 = FFFFFF80 -/* 09F80 80A65270 0C029B84 */ jal SkinMatrix_Vec3fMtxFMultXYZW -/* 09F84 80A65274 00812021 */ addu $a0, $a0, $at -/* 09F88 80A65278 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 -/* 09F8C 80A6527C C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 09F90 80A65280 5460003B */ bnel $v1, $zero, .L80A65370 -/* 09F94 80A65284 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C -/* 09F98 80A65288 8E09014C */ lw $t1, 0x014C($s0) ## 0000014C -/* 09F9C 80A6528C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 09FA0 80A65290 51200037 */ beql $t1, $zero, .L80A65370 -/* 09FA4 80A65294 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C -/* 09FA8 80A65298 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 09FAC 80A6529C 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 09FB0 80A652A0 4602503C */ c.lt.s $f10, $f2 -/* 09FB4 80A652A4 00000000 */ nop -/* 09FB8 80A652A8 4502000A */ bc1fl .L80A652D4 -/* 09FBC 80A652AC 3C0141E0 */ lui $at, 0x41E0 ## $at = 41E00000 -/* 09FC0 80A652B0 44818000 */ mtc1 $at, $f16 ## $f16 = 28.00 -/* 09FC4 80A652B4 00000000 */ nop -/* 09FC8 80A652B8 4610103C */ c.lt.s $f2, $f16 -/* 09FCC 80A652BC 00000000 */ nop -/* 09FD0 80A652C0 45020004 */ bc1fl .L80A652D4 -/* 09FD4 80A652C4 3C0141E0 */ lui $at, 0x41E0 ## $at = 41E00000 -/* 09FD8 80A652C8 8E0A0158 */ lw $t2, 0x0158($s0) ## 00000158 -/* 09FDC 80A652CC 11400011 */ beq $t2, $zero, .L80A65314 -/* 09FE0 80A652D0 3C0141E0 */ lui $at, 0x41E0 ## $at = 41E00000 -.L80A652D4: -/* 09FE4 80A652D4 44819000 */ mtc1 $at, $f18 ## $f18 = 28.00 -/* 09FE8 80A652D8 3C014204 */ lui $at, 0x4204 ## $at = 42040000 -/* 09FEC 80A652DC 4602903C */ c.lt.s $f18, $f2 -/* 09FF0 80A652E0 00000000 */ nop -/* 09FF4 80A652E4 45020022 */ bc1fl .L80A65370 -/* 09FF8 80A652E8 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C -/* 09FFC 80A652EC 44812000 */ mtc1 $at, $f4 ## $f4 = 33.00 -/* 0A000 80A652F0 00000000 */ nop -/* 0A004 80A652F4 4604103C */ c.lt.s $f2, $f4 -/* 0A008 80A652F8 00000000 */ nop -/* 0A00C 80A652FC 4502001C */ bc1fl .L80A65370 -/* 0A010 80A65300 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C -/* 0A014 80A65304 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 -/* 0A018 80A65308 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0A01C 80A6530C 55610018 */ bnel $t3, $at, .L80A65370 -/* 0A020 80A65310 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C -.L80A65314: -/* 0A024 80A65314 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A028 80A65318 00000000 */ nop -/* 0A02C 80A6531C 3C0180A6 */ lui $at, %hi(D_80A669C4) ## $at = 80A60000 -/* 0A030 80A65320 C42669C4 */ lwc1 $f6, %lo(D_80A669C4)($at) -/* 0A034 80A65324 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 0A038 80A65328 4606003C */ c.lt.s $f0, $f6 -/* 0A03C 80A6532C 00000000 */ nop -/* 0A040 80A65330 450201D8 */ bc1fl .L80A65A94 -/* 0A044 80A65334 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A048 80A65338 960C03C8 */ lhu $t4, 0x03C8($s0) ## 000003C8 -/* 0A04C 80A6533C 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A050 80A65340 260703CC */ addiu $a3, $s0, 0x03CC ## $a3 = 000003CC -/* 0A054 80A65344 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 0A058 80A65348 A60D03C8 */ sh $t5, 0x03C8($s0) ## 000003C8 -/* 0A05C 80A6534C 0C029902 */ jal func_800A6408 -/* 0A060 80A65350 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A064 80A65354 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0A068 80A65358 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 0A06C 80A6535C C60803D0 */ lwc1 $f8, 0x03D0($s0) ## 000003D0 -/* 0A070 80A65360 460A4401 */ sub.s $f16, $f8, $f10 -/* 0A074 80A65364 100001CA */ beq $zero, $zero, .L80A65A90 -/* 0A078 80A65368 E61003D0 */ swc1 $f16, 0x03D0($s0) ## 000003D0 -/* 0A07C 80A6536C 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C -.L80A65370: -/* 0A080 80A65370 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 0A084 80A65374 144100A6 */ bne $v0, $at, .L80A65610 -/* 0A088 80A65378 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0A08C 80A6537C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 0A090 80A65380 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 0A094 80A65384 4602903C */ c.lt.s $f18, $f2 -/* 0A098 80A65388 00000000 */ nop -/* 0A09C 80A6538C 45020007 */ bc1fl .L80A653AC -/* 0A0A0 80A65390 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 0A0A4 80A65394 44812000 */ mtc1 $at, $f4 ## $f4 = 25.00 -/* 0A0A8 80A65398 00000000 */ nop -/* 0A0AC 80A6539C 4604103C */ c.lt.s $f2, $f4 -/* 0A0B0 80A653A0 00000000 */ nop -/* 0A0B4 80A653A4 4501000D */ bc1t .L80A653DC -/* 0A0B8 80A653A8 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -.L80A653AC: -/* 0A0BC 80A653AC 44813000 */ mtc1 $at, $f6 ## $f6 = 25.00 -/* 0A0C0 80A653B0 3C014204 */ lui $at, 0x4204 ## $at = 42040000 -/* 0A0C4 80A653B4 4602303C */ c.lt.s $f6, $f2 -/* 0A0C8 80A653B8 00000000 */ nop -/* 0A0CC 80A653BC 45020036 */ bc1fl .L80A65498 -/* 0A0D0 80A653C0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 0A0D4 80A653C4 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 0A0D8 80A653C8 00000000 */ nop -/* 0A0DC 80A653CC 4608103C */ c.lt.s $f2, $f8 -/* 0A0E0 80A653D0 00000000 */ nop -/* 0A0E4 80A653D4 45020030 */ bc1fl .L80A65498 -/* 0A0E8 80A653D8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -.L80A653DC: -/* 0A0EC 80A653DC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A0F0 80A653E0 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 0A0F4 80A653E4 3C0180A6 */ lui $at, %hi(D_80A669C8) ## $at = 80A60000 -/* 0A0F8 80A653E8 C42A69C8 */ lwc1 $f10, %lo(D_80A669C8)($at) -/* 0A0FC 80A653EC C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 0A100 80A653F0 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 0A104 80A653F4 460A003C */ c.lt.s $f0, $f10 -/* 0A108 80A653F8 00000000 */ nop -/* 0A10C 80A653FC 4500000E */ bc1f .L80A65438 -/* 0A110 80A65400 00000000 */ nop -/* 0A114 80A65404 960E03C8 */ lhu $t6, 0x03C8($s0) ## 000003C8 -/* 0A118 80A65408 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A11C 80A6540C 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A120 80A65410 35CF0002 */ ori $t7, $t6, 0x0002 ## $t7 = 00000002 -/* 0A124 80A65414 A60F03C8 */ sh $t7, 0x03C8($s0) ## 000003C8 -/* 0A128 80A65418 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 0A12C 80A6541C 0C029902 */ jal func_800A6408 -/* 0A130 80A65420 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A134 80A65424 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A138 80A65428 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A13C 80A6542C 0C29941B */ jal func_80A6506C -/* 0A140 80A65430 260603D8 */ addiu $a2, $s0, 0x03D8 ## $a2 = 000003D8 -/* 0A144 80A65434 C7A20054 */ lwc1 $f2, 0x0054($sp) -.L80A65438: -/* 0A148 80A65438 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A14C 80A6543C E7A20054 */ swc1 $f2, 0x0054($sp) -/* 0A150 80A65440 3C0180A6 */ lui $at, %hi(D_80A669CC) ## $at = 80A60000 -/* 0A154 80A65444 C43069CC */ lwc1 $f16, %lo(D_80A669CC)($at) -/* 0A158 80A65448 C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 0A15C 80A6544C 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 0A160 80A65450 4610003C */ c.lt.s $f0, $f16 -/* 0A164 80A65454 00000000 */ nop -/* 0A168 80A65458 4502000F */ bc1fl .L80A65498 -/* 0A16C 80A6545C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 0A170 80A65460 961803C8 */ lhu $t8, 0x03C8($s0) ## 000003C8 -/* 0A174 80A65464 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A178 80A65468 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A17C 80A6546C 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0A180 80A65470 A61903C8 */ sh $t9, 0x03C8($s0) ## 000003C8 -/* 0A184 80A65474 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 0A188 80A65478 0C029902 */ jal func_800A6408 -/* 0A18C 80A6547C 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A190 80A65480 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A194 80A65484 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A198 80A65488 0C29941B */ jal func_80A6506C -/* 0A19C 80A6548C 260603CC */ addiu $a2, $s0, 0x03CC ## $a2 = 000003CC -/* 0A1A0 80A65490 C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 0A1A4 80A65494 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -.L80A65498: -/* 0A1A8 80A65498 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 -/* 0A1AC 80A6549C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0A1B0 80A654A0 4602903C */ c.lt.s $f18, $f2 -/* 0A1B4 80A654A4 00000000 */ nop -/* 0A1B8 80A654A8 45020007 */ bc1fl .L80A654C8 -/* 0A1BC 80A654AC 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 0A1C0 80A654B0 44812000 */ mtc1 $at, $f4 ## $f4 = 23.00 -/* 0A1C4 80A654B4 00000000 */ nop -/* 0A1C8 80A654B8 4604103C */ c.lt.s $f2, $f4 -/* 0A1CC 80A654BC 00000000 */ nop -/* 0A1D0 80A654C0 4501000D */ bc1t .L80A654F8 -/* 0A1D4 80A654C4 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -.L80A654C8: -/* 0A1D8 80A654C8 44813000 */ mtc1 $at, $f6 ## $f6 = 23.00 -/* 0A1DC 80A654CC 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 0A1E0 80A654D0 4602303C */ c.lt.s $f6, $f2 -/* 0A1E4 80A654D4 00000000 */ nop -/* 0A1E8 80A654D8 4502001F */ bc1fl .L80A65558 -/* 0A1EC 80A654DC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 0A1F0 80A654E0 44814000 */ mtc1 $at, $f8 ## $f8 = 7.00 -/* 0A1F4 80A654E4 00000000 */ nop -/* 0A1F8 80A654E8 4608103C */ c.lt.s $f2, $f8 -/* 0A1FC 80A654EC 00000000 */ nop -/* 0A200 80A654F0 45020019 */ bc1fl .L80A65558 -/* 0A204 80A654F4 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -.L80A654F8: -/* 0A208 80A654F8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A20C 80A654FC E7A20054 */ swc1 $f2, 0x0054($sp) -/* 0A210 80A65500 3C0180A6 */ lui $at, %hi(D_80A669D0) ## $at = 80A60000 -/* 0A214 80A65504 C42A69D0 */ lwc1 $f10, %lo(D_80A669D0)($at) -/* 0A218 80A65508 C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 0A21C 80A6550C 24050025 */ addiu $a1, $zero, 0x0025 ## $a1 = 00000025 -/* 0A220 80A65510 460A003C */ c.lt.s $f0, $f10 -/* 0A224 80A65514 00000000 */ nop -/* 0A228 80A65518 4502000F */ bc1fl .L80A65558 -/* 0A22C 80A6551C 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 0A230 80A65520 960903C8 */ lhu $t1, 0x03C8($s0) ## 000003C8 -/* 0A234 80A65524 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A238 80A65528 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A23C 80A6552C 352A0008 */ ori $t2, $t1, 0x0008 ## $t2 = 00000008 -/* 0A240 80A65530 A60A03C8 */ sh $t2, 0x03C8($s0) ## 000003C8 -/* 0A244 80A65534 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 0A248 80A65538 0C029902 */ jal func_800A6408 -/* 0A24C 80A6553C 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A250 80A65540 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A254 80A65544 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A258 80A65548 0C29941B */ jal func_80A6506C -/* 0A25C 80A6554C 260603F0 */ addiu $a2, $s0, 0x03F0 ## $a2 = 000003F0 -/* 0A260 80A65550 C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 0A264 80A65554 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -.L80A65558: -/* 0A268 80A65558 44818000 */ mtc1 $at, $f16 ## $f16 = 7.00 -/* 0A26C 80A6555C 3C014160 */ lui $at, 0x4160 ## $at = 41600000 -/* 0A270 80A65560 4602803C */ c.lt.s $f16, $f2 -/* 0A274 80A65564 00000000 */ nop -/* 0A278 80A65568 45020007 */ bc1fl .L80A65588 -/* 0A27C 80A6556C 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 0A280 80A65570 44819000 */ mtc1 $at, $f18 ## $f18 = 26.00 -/* 0A284 80A65574 00000000 */ nop -/* 0A288 80A65578 4612103C */ c.lt.s $f2, $f18 -/* 0A28C 80A6557C 00000000 */ nop -/* 0A290 80A65580 4501000D */ bc1t .L80A655B8 -/* 0A294 80A65584 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -.L80A65588: -/* 0A298 80A65588 44812000 */ mtc1 $at, $f4 ## $f4 = 26.00 -/* 0A29C 80A6558C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0A2A0 80A65590 4602203C */ c.lt.s $f4, $f2 -/* 0A2A4 80A65594 00000000 */ nop -/* 0A2A8 80A65598 4502013E */ bc1fl .L80A65A94 -/* 0A2AC 80A6559C 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A2B0 80A655A0 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 0A2B4 80A655A4 00000000 */ nop -/* 0A2B8 80A655A8 4606103C */ c.lt.s $f2, $f6 -/* 0A2BC 80A655AC 00000000 */ nop -/* 0A2C0 80A655B0 45020138 */ bc1fl .L80A65A94 -/* 0A2C4 80A655B4 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -.L80A655B8: -/* 0A2C8 80A655B8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A2CC 80A655BC 00000000 */ nop -/* 0A2D0 80A655C0 3C0180A6 */ lui $at, %hi(D_80A669D4) ## $at = 80A60000 -/* 0A2D4 80A655C4 C42869D4 */ lwc1 $f8, %lo(D_80A669D4)($at) -/* 0A2D8 80A655C8 2405002D */ addiu $a1, $zero, 0x002D ## $a1 = 0000002D -/* 0A2DC 80A655CC 4608003C */ c.lt.s $f0, $f8 -/* 0A2E0 80A655D0 00000000 */ nop -/* 0A2E4 80A655D4 4502012F */ bc1fl .L80A65A94 -/* 0A2E8 80A655D8 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A2EC 80A655DC 960B03C8 */ lhu $t3, 0x03C8($s0) ## 000003C8 -/* 0A2F0 80A655E0 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A2F4 80A655E4 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A2F8 80A655E8 356C0004 */ ori $t4, $t3, 0x0004 ## $t4 = 00000004 -/* 0A2FC 80A655EC A60C03C8 */ sh $t4, 0x03C8($s0) ## 000003C8 -/* 0A300 80A655F0 0C029902 */ jal func_800A6408 -/* 0A304 80A655F4 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A308 80A655F8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A30C 80A655FC 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A310 80A65600 0C29941B */ jal func_80A6506C -/* 0A314 80A65604 260603E4 */ addiu $a2, $s0, 0x03E4 ## $a2 = 000003E4 -/* 0A318 80A65608 10000122 */ beq $zero, $zero, .L80A65A94 -/* 0A31C 80A6560C 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -.L80A65610: -/* 0A320 80A65610 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0A324 80A65614 14610068 */ bne $v1, $at, .L80A657B8 -/* 0A328 80A65618 3C014160 */ lui $at, 0x4160 ## $at = 41600000 -/* 0A32C 80A6561C 44815000 */ mtc1 $at, $f10 ## $f10 = 14.00 -/* 0A330 80A65620 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 0A334 80A65624 4602503C */ c.lt.s $f10, $f2 -/* 0A338 80A65628 00000000 */ nop -/* 0A33C 80A6562C 45020015 */ bc1fl .L80A65684 -/* 0A340 80A65630 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0A344 80A65634 44818000 */ mtc1 $at, $f16 ## $f16 = 8.00 -/* 0A348 80A65638 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 0A34C 80A6563C 4610103C */ c.lt.s $f2, $f16 -/* 0A350 80A65640 00000000 */ nop -/* 0A354 80A65644 4502000F */ bc1fl .L80A65684 -/* 0A358 80A65648 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0A35C 80A6564C 960D03C8 */ lhu $t5, 0x03C8($s0) ## 000003C8 -/* 0A360 80A65650 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A364 80A65654 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A368 80A65658 35AE0001 */ ori $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 0A36C 80A6565C A60E03C8 */ sh $t6, 0x03C8($s0) ## 000003C8 -/* 0A370 80A65660 0C029902 */ jal func_800A6408 -/* 0A374 80A65664 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A378 80A65668 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A37C 80A6566C 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 0A380 80A65670 0C29941B */ jal func_80A6506C -/* 0A384 80A65674 260603CC */ addiu $a2, $s0, 0x03CC ## $a2 = 000003CC -/* 0A388 80A65678 10000106 */ beq $zero, $zero, .L80A65A94 -/* 0A38C 80A6567C 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A390 80A65680 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -.L80A65684: -/* 0A394 80A65684 44819000 */ mtc1 $at, $f18 ## $f18 = 8.00 -/* 0A398 80A65688 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0A39C 80A6568C 4602903C */ c.lt.s $f18, $f2 -/* 0A3A0 80A65690 00000000 */ nop -/* 0A3A4 80A65694 45020015 */ bc1fl .L80A656EC -/* 0A3A8 80A65698 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0A3AC 80A6569C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0A3B0 80A656A0 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 0A3B4 80A656A4 4604103C */ c.lt.s $f2, $f4 -/* 0A3B8 80A656A8 00000000 */ nop -/* 0A3BC 80A656AC 4502000F */ bc1fl .L80A656EC -/* 0A3C0 80A656B0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0A3C4 80A656B4 960F03C8 */ lhu $t7, 0x03C8($s0) ## 000003C8 -/* 0A3C8 80A656B8 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A3CC 80A656BC 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A3D0 80A656C0 35F80002 */ ori $t8, $t7, 0x0002 ## $t8 = 00000002 -/* 0A3D4 80A656C4 A61803C8 */ sh $t8, 0x03C8($s0) ## 000003C8 -/* 0A3D8 80A656C8 0C029902 */ jal func_800A6408 -/* 0A3DC 80A656CC 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A3E0 80A656D0 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A3E4 80A656D4 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A3E8 80A656D8 0C29941B */ jal func_80A6506C -/* 0A3EC 80A656DC 260603D8 */ addiu $a2, $s0, 0x03D8 ## $a2 = 000003D8 -/* 0A3F0 80A656E0 100000EC */ beq $zero, $zero, .L80A65A94 -/* 0A3F4 80A656E4 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A3F8 80A656E8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L80A656EC: -/* 0A3FC 80A656EC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0A400 80A656F0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 0A404 80A656F4 4602303C */ c.lt.s $f6, $f2 -/* 0A408 80A656F8 00000000 */ nop -/* 0A40C 80A656FC 45020015 */ bc1fl .L80A65754 -/* 0A410 80A65700 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 0A414 80A65704 44814000 */ mtc1 $at, $f8 ## $f8 = 26.00 -/* 0A418 80A65708 2405002D */ addiu $a1, $zero, 0x002D ## $a1 = 0000002D -/* 0A41C 80A6570C 4608103C */ c.lt.s $f2, $f8 -/* 0A420 80A65710 00000000 */ nop -/* 0A424 80A65714 4502000F */ bc1fl .L80A65754 -/* 0A428 80A65718 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 0A42C 80A6571C 961903C8 */ lhu $t9, 0x03C8($s0) ## 000003C8 -/* 0A430 80A65720 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A434 80A65724 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A438 80A65728 37290004 */ ori $t1, $t9, 0x0004 ## $t1 = 00000004 -/* 0A43C 80A6572C A60903C8 */ sh $t1, 0x03C8($s0) ## 000003C8 -/* 0A440 80A65730 0C029902 */ jal func_800A6408 -/* 0A444 80A65734 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A448 80A65738 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A44C 80A6573C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A450 80A65740 0C29941B */ jal func_80A6506C -/* 0A454 80A65744 260603E4 */ addiu $a2, $s0, 0x03E4 ## $a2 = 000003E4 -/* 0A458 80A65748 100000D2 */ beq $zero, $zero, .L80A65A94 -/* 0A45C 80A6574C 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A460 80A65750 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -.L80A65754: -/* 0A464 80A65754 44815000 */ mtc1 $at, $f10 ## $f10 = 26.00 -/* 0A468 80A65758 3C0141E0 */ lui $at, 0x41E0 ## $at = 41E00000 -/* 0A46C 80A6575C 4602503C */ c.lt.s $f10, $f2 -/* 0A470 80A65760 00000000 */ nop -/* 0A474 80A65764 450200CB */ bc1fl .L80A65A94 -/* 0A478 80A65768 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A47C 80A6576C 44818000 */ mtc1 $at, $f16 ## $f16 = 28.00 -/* 0A480 80A65770 24050025 */ addiu $a1, $zero, 0x0025 ## $a1 = 00000025 -/* 0A484 80A65774 4610103C */ c.lt.s $f2, $f16 -/* 0A488 80A65778 00000000 */ nop -/* 0A48C 80A6577C 450200C5 */ bc1fl .L80A65A94 -/* 0A490 80A65780 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A494 80A65784 960A03C8 */ lhu $t2, 0x03C8($s0) ## 000003C8 -/* 0A498 80A65788 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A49C 80A6578C 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A4A0 80A65790 354B0008 */ ori $t3, $t2, 0x0008 ## $t3 = 00000008 -/* 0A4A4 80A65794 A60B03C8 */ sh $t3, 0x03C8($s0) ## 000003C8 -/* 0A4A8 80A65798 0C029902 */ jal func_800A6408 -/* 0A4AC 80A6579C 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A4B0 80A657A0 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A4B4 80A657A4 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A4B8 80A657A8 0C29941B */ jal func_80A6506C -/* 0A4BC 80A657AC 260603F0 */ addiu $a2, $s0, 0x03F0 ## $a2 = 000003F0 -/* 0A4C0 80A657B0 100000B8 */ beq $zero, $zero, .L80A65A94 -/* 0A4C4 80A657B4 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -.L80A657B8: -/* 0A4C8 80A657B8 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 0A4CC 80A657BC 14410041 */ bne $v0, $at, .L80A658C4 -/* 0A4D0 80A657C0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 0A4D4 80A657C4 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 -/* 0A4D8 80A657C8 00000000 */ nop -/* 0A4DC 80A657CC 4602903C */ c.lt.s $f18, $f2 -/* 0A4E0 80A657D0 00000000 */ nop -/* 0A4E4 80A657D4 4502003C */ bc1fl .L80A658C8 -/* 0A4E8 80A657D8 8E18014C */ lw $t8, 0x014C($s0) ## 0000014C -/* 0A4EC 80A657DC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A4F0 80A657E0 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 0A4F4 80A657E4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 0A4F8 80A657E8 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 0A4FC 80A657EC C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 0A500 80A657F0 3C0180A6 */ lui $at, %hi(D_80A669D8) ## $at = 80A60000 -/* 0A504 80A657F4 C42869D8 */ lwc1 $f8, %lo(D_80A669D8)($at) -/* 0A508 80A657F8 46041181 */ sub.s $f6, $f2, $f4 -/* 0A50C 80A657FC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0A510 80A65800 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 0A514 80A65804 46083282 */ mul.s $f10, $f6, $f8 -/* 0A518 80A65808 460A8481 */ sub.s $f18, $f16, $f10 -/* 0A51C 80A6580C 4612003C */ c.lt.s $f0, $f18 -/* 0A520 80A65810 00000000 */ nop -/* 0A524 80A65814 4502002C */ bc1fl .L80A658C8 -/* 0A528 80A65818 8E18014C */ lw $t8, 0x014C($s0) ## 0000014C -/* 0A52C 80A6581C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A530 80A65820 00000000 */ nop -/* 0A534 80A65824 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0A538 80A65828 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 0A53C 80A6582C 24050025 */ addiu $a1, $zero, 0x0025 ## $a1 = 00000025 -/* 0A540 80A65830 4604003C */ c.lt.s $f0, $f4 -/* 0A544 80A65834 00000000 */ nop -/* 0A548 80A65838 4500000C */ bc1f .L80A6586C -/* 0A54C 80A6583C 00000000 */ nop -/* 0A550 80A65840 960C03C8 */ lhu $t4, 0x03C8($s0) ## 000003C8 -/* 0A554 80A65844 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A558 80A65848 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A55C 80A6584C 358D0008 */ ori $t5, $t4, 0x0008 ## $t5 = 00000008 -/* 0A560 80A65850 A60D03C8 */ sh $t5, 0x03C8($s0) ## 000003C8 -/* 0A564 80A65854 0C029902 */ jal func_800A6408 -/* 0A568 80A65858 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A56C 80A6585C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A570 80A65860 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A574 80A65864 0C29941B */ jal func_80A6506C -/* 0A578 80A65868 260603F0 */ addiu $a2, $s0, 0x03F0 ## $a2 = 000003F0 -.L80A6586C: -/* 0A57C 80A6586C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A580 80A65870 00000000 */ nop -/* 0A584 80A65874 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0A588 80A65878 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 0A58C 80A6587C 2405002D */ addiu $a1, $zero, 0x002D ## $a1 = 0000002D -/* 0A590 80A65880 4606003C */ c.lt.s $f0, $f6 -/* 0A594 80A65884 00000000 */ nop -/* 0A598 80A65888 45020082 */ bc1fl .L80A65A94 -/* 0A59C 80A6588C 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A5A0 80A65890 960E03C8 */ lhu $t6, 0x03C8($s0) ## 000003C8 -/* 0A5A4 80A65894 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A5A8 80A65898 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A5AC 80A6589C 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 0A5B0 80A658A0 A60F03C8 */ sh $t7, 0x03C8($s0) ## 000003C8 -/* 0A5B4 80A658A4 0C029902 */ jal func_800A6408 -/* 0A5B8 80A658A8 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A5BC 80A658AC 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A5C0 80A658B0 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A5C4 80A658B4 0C29941B */ jal func_80A6506C -/* 0A5C8 80A658B8 260603E4 */ addiu $a2, $s0, 0x03E4 ## $a2 = 000003E4 -/* 0A5CC 80A658BC 10000075 */ beq $zero, $zero, .L80A65A94 -/* 0A5D0 80A658C0 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -.L80A658C4: -/* 0A5D4 80A658C4 8E18014C */ lw $t8, 0x014C($s0) ## 0000014C -.L80A658C8: -/* 0A5D8 80A658C8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0A5DC 80A658CC 17010041 */ bne $t8, $at, .L80A659D4 -/* 0A5E0 80A658D0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0A5E4 80A658D4 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 0A5E8 80A658D8 00000000 */ nop -/* 0A5EC 80A658DC 4602403C */ c.lt.s $f8, $f2 -/* 0A5F0 80A658E0 00000000 */ nop -/* 0A5F4 80A658E4 4502003C */ bc1fl .L80A659D8 -/* 0A5F8 80A658E8 8E0C014C */ lw $t4, 0x014C($s0) ## 0000014C -/* 0A5FC 80A658EC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A600 80A658F0 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 0A604 80A658F4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0A608 80A658F8 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 0A60C 80A658FC C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 0A610 80A65900 3C0180A6 */ lui $at, %hi(D_80A669DC) ## $at = 80A60000 -/* 0A614 80A65904 C43269DC */ lwc1 $f18, %lo(D_80A669DC)($at) -/* 0A618 80A65908 46101281 */ sub.s $f10, $f2, $f16 -/* 0A61C 80A6590C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0A620 80A65910 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0A624 80A65914 46125102 */ mul.s $f4, $f10, $f18 -/* 0A628 80A65918 46043201 */ sub.s $f8, $f6, $f4 -/* 0A62C 80A6591C 4608003C */ c.lt.s $f0, $f8 -/* 0A630 80A65920 00000000 */ nop -/* 0A634 80A65924 4502002C */ bc1fl .L80A659D8 -/* 0A638 80A65928 8E0C014C */ lw $t4, 0x014C($s0) ## 0000014C -/* 0A63C 80A6592C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A640 80A65930 00000000 */ nop -/* 0A644 80A65934 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0A648 80A65938 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 0A64C 80A6593C 24050025 */ addiu $a1, $zero, 0x0025 ## $a1 = 00000025 -/* 0A650 80A65940 4610003C */ c.lt.s $f0, $f16 -/* 0A654 80A65944 00000000 */ nop -/* 0A658 80A65948 4500000C */ bc1f .L80A6597C -/* 0A65C 80A6594C 00000000 */ nop -/* 0A660 80A65950 961903C8 */ lhu $t9, 0x03C8($s0) ## 000003C8 -/* 0A664 80A65954 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A668 80A65958 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A66C 80A6595C 37290008 */ ori $t1, $t9, 0x0008 ## $t1 = 00000008 -/* 0A670 80A65960 A60903C8 */ sh $t1, 0x03C8($s0) ## 000003C8 -/* 0A674 80A65964 0C029902 */ jal func_800A6408 -/* 0A678 80A65968 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A67C 80A6596C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A680 80A65970 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A684 80A65974 0C29941B */ jal func_80A6506C -/* 0A688 80A65978 260603F0 */ addiu $a2, $s0, 0x03F0 ## $a2 = 000003F0 -.L80A6597C: -/* 0A68C 80A6597C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A690 80A65980 00000000 */ nop -/* 0A694 80A65984 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0A698 80A65988 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 0A69C 80A6598C 2405002D */ addiu $a1, $zero, 0x002D ## $a1 = 0000002D -/* 0A6A0 80A65990 460A003C */ c.lt.s $f0, $f10 -/* 0A6A4 80A65994 00000000 */ nop -/* 0A6A8 80A65998 4502003E */ bc1fl .L80A65A94 -/* 0A6AC 80A6599C 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A6B0 80A659A0 960A03C8 */ lhu $t2, 0x03C8($s0) ## 000003C8 -/* 0A6B4 80A659A4 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A6B8 80A659A8 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A6BC 80A659AC 354B0004 */ ori $t3, $t2, 0x0004 ## $t3 = 00000004 -/* 0A6C0 80A659B0 A60B03C8 */ sh $t3, 0x03C8($s0) ## 000003C8 -/* 0A6C4 80A659B4 0C029902 */ jal func_800A6408 -/* 0A6C8 80A659B8 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A6CC 80A659BC 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A6D0 80A659C0 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A6D4 80A659C4 0C29941B */ jal func_80A6506C -/* 0A6D8 80A659C8 260603E4 */ addiu $a2, $s0, 0x03E4 ## $a2 = 000003E4 -/* 0A6DC 80A659CC 10000031 */ beq $zero, $zero, .L80A65A94 -/* 0A6E0 80A659D0 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -.L80A659D4: -/* 0A6E4 80A659D4 8E0C014C */ lw $t4, 0x014C($s0) ## 0000014C -.L80A659D8: -/* 0A6E8 80A659D8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 0A6EC 80A659DC 5581002D */ bnel $t4, $at, .L80A65A94 -/* 0A6F0 80A659E0 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A6F4 80A659E4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A6F8 80A659E8 00000000 */ nop -/* 0A6FC 80A659EC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0A700 80A659F0 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 0A704 80A659F4 00000000 */ nop -/* 0A708 80A659F8 4612003C */ c.lt.s $f0, $f18 -/* 0A70C 80A659FC 00000000 */ nop -/* 0A710 80A65A00 45020024 */ bc1fl .L80A65A94 -/* 0A714 80A65A04 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A718 80A65A08 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0A71C 80A65A0C 00000000 */ nop -/* 0A720 80A65A10 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0A724 80A65A14 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 0A728 80A65A18 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A72C 80A65A1C 2405002D */ addiu $a1, $zero, 0x002D ## $a1 = 0000002D -/* 0A730 80A65A20 4606003C */ c.lt.s $f0, $f6 -/* 0A734 80A65A24 00000000 */ nop -/* 0A738 80A65A28 4502000F */ bc1fl .L80A65A68 -/* 0A73C 80A65A2C 960F03C8 */ lhu $t7, 0x03C8($s0) ## 000003C8 -/* 0A740 80A65A30 960D03C8 */ lhu $t5, 0x03C8($s0) ## 000003C8 -/* 0A744 80A65A34 24050025 */ addiu $a1, $zero, 0x0025 ## $a1 = 00000025 -/* 0A748 80A65A38 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A74C 80A65A3C 35AE0008 */ ori $t6, $t5, 0x0008 ## $t6 = 00000008 -/* 0A750 80A65A40 A60E03C8 */ sh $t6, 0x03C8($s0) ## 000003C8 -/* 0A754 80A65A44 0C029902 */ jal func_800A6408 -/* 0A758 80A65A48 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A75C 80A65A4C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A760 80A65A50 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A764 80A65A54 0C29941B */ jal func_80A6506C -/* 0A768 80A65A58 260603F0 */ addiu $a2, $s0, 0x03F0 ## $a2 = 000003F0 -/* 0A76C 80A65A5C 1000000D */ beq $zero, $zero, .L80A65A94 -/* 0A770 80A65A60 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -/* 0A774 80A65A64 960F03C8 */ lhu $t7, 0x03C8($s0) ## 000003C8 -.L80A65A68: -/* 0A778 80A65A68 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFE0 -/* 0A77C 80A65A6C 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFC8 -/* 0A780 80A65A70 35F80004 */ ori $t8, $t7, 0x0004 ## $t8 = 00000004 -/* 0A784 80A65A74 A61803C8 */ sh $t8, 0x03C8($s0) ## 000003C8 -/* 0A788 80A65A78 0C029902 */ jal func_800A6408 -/* 0A78C 80A65A7C 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A790 80A65A80 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFC8 -/* 0A794 80A65A84 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 0A798 80A65A88 0C29941B */ jal func_80A6506C -/* 0A79C 80A65A8C 260603E4 */ addiu $a2, $s0, 0x03E4 ## $a2 = 000003E4 -.L80A65A90: -/* 0A7A0 80A65A90 8E190328 */ lw $t9, 0x0328($s0) ## 00000328 -.L80A65A94: -/* 0A7A4 80A65A94 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 -/* 0A7A8 80A65A98 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A7AC 80A65A9C 5B200048 */ blezl $t9, .L80A65BC0 -/* 0A7B0 80A65AA0 8FA400AC */ lw $a0, 0x00AC($sp) -/* 0A7B4 80A65AA4 8E09032C */ lw $t1, 0x032C($s0) ## 0000032C -.L80A65AA8: -/* 0A7B8 80A65AA8 8FA400B0 */ lw $a0, 0x00B0($sp) -/* 0A7BC 80A65AAC 27A60048 */ addiu $a2, $sp, 0x0048 ## $a2 = FFFFFFA0 -/* 0A7C0 80A65AB0 01225021 */ addu $t2, $t1, $v0 -/* 0A7C4 80A65AB4 854B0028 */ lh $t3, 0x0028($t2) ## 00000028 -/* 0A7C8 80A65AB8 27A7003C */ addiu $a3, $sp, 0x003C ## $a3 = FFFFFF94 -/* 0A7CC 80A65ABC 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 0A7D0 80A65AC0 00000000 */ nop -/* 0A7D4 80A65AC4 46802220 */ cvt.s.w $f8, $f4 -/* 0A7D8 80A65AC8 E7A80048 */ swc1 $f8, 0x0048($sp) -/* 0A7DC 80A65ACC 8E0C032C */ lw $t4, 0x032C($s0) ## 0000032C -/* 0A7E0 80A65AD0 01826821 */ addu $t5, $t4, $v0 -/* 0A7E4 80A65AD4 85AE002A */ lh $t6, 0x002A($t5) ## 0000002A -/* 0A7E8 80A65AD8 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 0A7EC 80A65ADC 00000000 */ nop -/* 0A7F0 80A65AE0 468082A0 */ cvt.s.w $f10, $f16 -/* 0A7F4 80A65AE4 E7AA004C */ swc1 $f10, 0x004C($sp) -/* 0A7F8 80A65AE8 8E0F032C */ lw $t7, 0x032C($s0) ## 0000032C -/* 0A7FC 80A65AEC 01E2C021 */ addu $t8, $t7, $v0 -/* 0A800 80A65AF0 8719002C */ lh $t9, 0x002C($t8) ## 0000002C -/* 0A804 80A65AF4 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 0A808 80A65AF8 00000000 */ nop -/* 0A80C 80A65AFC 468091A0 */ cvt.s.w $f6, $f18 -/* 0A810 80A65B00 E7A60050 */ swc1 $f6, 0x0050($sp) -/* 0A814 80A65B04 8E09032C */ lw $t1, 0x032C($s0) ## 0000032C -/* 0A818 80A65B08 01225021 */ addu $t2, $t1, $v0 -/* 0A81C 80A65B0C 9145003C */ lbu $a1, 0x003C($t2) ## 0000003C -/* 0A820 80A65B10 AFA80038 */ sw $t0, 0x0038($sp) -/* 0A824 80A65B14 0C029902 */ jal func_800A6408 -/* 0A828 80A65B18 AFA20024 */ sw $v0, 0x0024($sp) -/* 0A82C 80A65B1C C7A4003C */ lwc1 $f4, 0x003C($sp) -/* 0A830 80A65B20 8FA20024 */ lw $v0, 0x0024($sp) -/* 0A834 80A65B24 8E0D032C */ lw $t5, 0x032C($s0) ## 0000032C -/* 0A838 80A65B28 4600220D */ trunc.w.s $f8, $f4 -/* 0A83C 80A65B2C 8FA80038 */ lw $t0, 0x0038($sp) -/* 0A840 80A65B30 01A27021 */ addu $t6, $t5, $v0 -/* 0A844 80A65B34 440C4000 */ mfc1 $t4, $f8 -/* 0A848 80A65B38 25080001 */ addiu $t0, $t0, 0x0001 ## $t0 = 00000001 -/* 0A84C 80A65B3C A5CC0030 */ sh $t4, 0x0030($t6) ## 00000030 -/* 0A850 80A65B40 C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 0A854 80A65B44 8E19032C */ lw $t9, 0x032C($s0) ## 0000032C -/* 0A858 80A65B48 4600828D */ trunc.w.s $f10, $f16 -/* 0A85C 80A65B4C 03224821 */ addu $t1, $t9, $v0 -/* 0A860 80A65B50 44185000 */ mfc1 $t8, $f10 -/* 0A864 80A65B54 00000000 */ nop -/* 0A868 80A65B58 A5380032 */ sh $t8, 0x0032($t1) ## 00000032 -/* 0A86C 80A65B5C C7B20044 */ lwc1 $f18, 0x0044($sp) -/* 0A870 80A65B60 8E0D032C */ lw $t5, 0x032C($s0) ## 0000032C -/* 0A874 80A65B64 4600918D */ trunc.w.s $f6, $f18 -/* 0A878 80A65B68 01A26021 */ addu $t4, $t5, $v0 -/* 0A87C 80A65B6C 440B3000 */ mfc1 $t3, $f6 -/* 0A880 80A65B70 00000000 */ nop -/* 0A884 80A65B74 A58B0034 */ sh $t3, 0x0034($t4) ## 00000034 -/* 0A888 80A65B78 8E0E032C */ lw $t6, 0x032C($s0) ## 0000032C -/* 0A88C 80A65B7C 01C21821 */ addu $v1, $t6, $v0 -/* 0A890 80A65B80 846F002E */ lh $t7, 0x002E($v1) ## 0000002E -/* 0A894 80A65B84 C4640038 */ lwc1 $f4, 0x0038($v1) ## 00000038 -/* 0A898 80A65B88 24420040 */ addiu $v0, $v0, 0x0040 ## $v0 = 00000040 -/* 0A89C 80A65B8C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 0A8A0 80A65B90 00000000 */ nop -/* 0A8A4 80A65B94 46804420 */ cvt.s.w $f16, $f8 -/* 0A8A8 80A65B98 46102282 */ mul.s $f10, $f4, $f16 -/* 0A8AC 80A65B9C 4600548D */ trunc.w.s $f18, $f10 -/* 0A8B0 80A65BA0 44189000 */ mfc1 $t8, $f18 -/* 0A8B4 80A65BA4 00000000 */ nop -/* 0A8B8 80A65BA8 A4780036 */ sh $t8, 0x0036($v1) ## 00000036 -/* 0A8BC 80A65BAC 8E090328 */ lw $t1, 0x0328($s0) ## 00000328 -/* 0A8C0 80A65BB0 0109082A */ slt $at, $t0, $t1 -/* 0A8C4 80A65BB4 5420FFBC */ bnel $at, $zero, .L80A65AA8 -/* 0A8C8 80A65BB8 8E09032C */ lw $t1, 0x032C($s0) ## 0000032C -/* 0A8CC 80A65BBC 8FA400AC */ lw $a0, 0x00AC($sp) -.L80A65BC0: -/* 0A8D0 80A65BC0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0A8D4 80A65BC4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 0A8D8 80A65BC8 26060310 */ addiu $a2, $s0, 0x0310 ## $a2 = 00000310 -/* 0A8DC 80A65BCC 00812821 */ addu $a1, $a0, $at -/* 0A8E0 80A65BD0 AFA50024 */ sw $a1, 0x0024($sp) -/* 0A8E4 80A65BD4 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 0A8E8 80A65BD8 AFA60020 */ sw $a2, 0x0020($sp) -/* 0A8EC 80A65BDC 8FA50024 */ lw $a1, 0x0024($sp) -/* 0A8F0 80A65BE0 8FA60020 */ lw $a2, 0x0020($sp) -/* 0A8F4 80A65BE4 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 0A8F8 80A65BE8 8FA400AC */ lw $a0, 0x00AC($sp) -/* 0A8FC 80A65BEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 0A900 80A65BF0 8FB00018 */ lw $s0, 0x0018($sp) -/* 0A904 80A65BF4 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 -/* 0A908 80A65BF8 03E00008 */ jr $ra -/* 0A90C 80A65BFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s deleted file mode 100644 index 4b77a5d013..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s +++ /dev/null @@ -1,96 +0,0 @@ -.rdata -glabel D_80A6682C - .asciz "../z_en_horse.c" - .balign 4 - -glabel D_80A6683C - .asciz "../z_en_horse.c" - .balign 4 - -.text -glabel func_80A65C00 -/* 0A910 80A65C00 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0A914 80A65C04 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0A918 80A65C08 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0A91C 80A65C0C AFB00020 */ sw $s0, 0x0020($sp) -/* 0A920 80A65C10 AFA50054 */ sw $a1, 0x0054($sp) -/* 0A924 80A65C14 AFA60058 */ sw $a2, 0x0058($sp) -/* 0A928 80A65C18 AFA7005C */ sw $a3, 0x005C($sp) -/* 0A92C 80A65C1C AFAE0048 */ sw $t6, 0x0048($sp) -/* 0A930 80A65C20 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0A934 80A65C24 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A938 80A65C28 3C0680A6 */ lui $a2, %hi(D_80A6682C) ## $a2 = 80A60000 -/* 0A93C 80A65C2C 24C6682C */ addiu $a2, $a2, %lo(D_80A6682C) ## $a2 = 80A6682C -/* 0A940 80A65C30 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 0A944 80A65C34 24072186 */ addiu $a3, $zero, 0x2186 ## $a3 = 00002186 -/* 0A948 80A65C38 0C031AB1 */ jal Graph_OpenDisps -/* 0A94C 80A65C3C AFA50044 */ sw $a1, 0x0044($sp) -/* 0A950 80A65C40 8FA60058 */ lw $a2, 0x0058($sp) -/* 0A954 80A65C44 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 0A958 80A65C48 8FA80044 */ lw $t0, 0x0044($sp) -/* 0A95C 80A65C4C 54C10020 */ bnel $a2, $at, .L80A65CD0 -/* 0A960 80A65C50 8E0A0158 */ lw $t2, 0x0158($s0) ## 00000158 -/* 0A964 80A65C54 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 -/* 0A968 80A65C58 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 0A96C 80A65C5C 3C0580A6 */ lui $a1, %hi(D_80A667F8) ## $a1 = 80A60000 -/* 0A970 80A65C60 1700001A */ bne $t8, $zero, .L80A65CCC -/* 0A974 80A65C64 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 0A978 80A65C68 9219037A */ lbu $t9, 0x037A($s0) ## 0000037A -/* 0A97C 80A65C6C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 0A980 80A65C70 3C0480A6 */ lui $a0, %hi(D_80A667EC) ## $a0 = 80A60000 -/* 0A984 80A65C74 00B92821 */ addu $a1, $a1, $t9 -/* 0A988 80A65C78 90A567F8 */ lbu $a1, %lo(D_80A667F8)($a1) -/* 0A98C 80A65C7C 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 0A990 80A65C80 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 0A994 80A65C84 00055880 */ sll $t3, $a1, 2 -/* 0A998 80A65C88 008B2021 */ addu $a0, $a0, $t3 -/* 0A99C 80A65C8C AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 0A9A0 80A65C90 8C8467EC */ lw $a0, %lo(D_80A667EC)($a0) -/* 0A9A4 80A65C94 3C188016 */ lui $t8, %hi(gSegments) -/* 0A9A8 80A65C98 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0A9AC 80A65C9C 00046900 */ sll $t5, $a0, 4 -/* 0A9B0 80A65CA0 000D7702 */ srl $t6, $t5, 28 -/* 0A9B4 80A65CA4 000E7880 */ sll $t7, $t6, 2 -/* 0A9B8 80A65CA8 030FC021 */ addu $t8, $t8, $t7 -/* 0A9BC 80A65CAC 8F186FA8 */ lw $t8, %lo(gSegments)($t8) -/* 0A9C0 80A65CB0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0A9C4 80A65CB4 00816024 */ and $t4, $a0, $at -/* 0A9C8 80A65CB8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A9CC 80A65CBC 0198C821 */ addu $t9, $t4, $t8 -/* 0A9D0 80A65CC0 03214821 */ addu $t1, $t9, $at -/* 0A9D4 80A65CC4 10000013 */ beq $zero, $zero, .L80A65D14 -/* 0A9D8 80A65CC8 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 -.L80A65CCC: -/* 0A9DC 80A65CCC 8E0A0158 */ lw $t2, 0x0158($s0) ## 00000158 -.L80A65CD0: -/* 0A9E0 80A65CD0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0A9E4 80A65CD4 55410010 */ bnel $t2, $at, .L80A65D18 -/* 0A9E8 80A65CD8 8FAF0054 */ lw $t7, 0x0054($sp) -/* 0A9EC 80A65CDC 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 0A9F0 80A65CE0 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 0A9F4 80A65CE4 000B6B40 */ sll $t5, $t3, 13 -/* 0A9F8 80A65CE8 05A3000B */ bgezl $t5, .L80A65D18 -/* 0A9FC 80A65CEC 8FAF0054 */ lw $t7, 0x0054($sp) -/* 0AA00 80A65CF0 14C10008 */ bne $a2, $at, .L80A65D14 -/* 0AA04 80A65CF4 8FAE0054 */ lw $t6, 0x0054($sp) -/* 0AA08 80A65CF8 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 0AA0C 80A65CFC 3C070600 */ lui $a3, %hi(D_06006530) ## $a3 = 06000000 -/* 0AA10 80A65D00 24E76530 */ addiu $a3, $a3, %lo(D_06006530) ## $a3 = 06006530 -/* 0AA14 80A65D04 AFA00010 */ sw $zero, 0x0010($sp) -/* 0AA18 80A65D08 0C0297D8 */ jal func_800A5F60 -/* 0AA1C 80A65D0C 26050160 */ addiu $a1, $s0, 0x0160 ## $a1 = 00000160 -/* 0AA20 80A65D10 AFA00048 */ sw $zero, 0x0048($sp) -.L80A65D14: -/* 0AA24 80A65D14 8FAF0054 */ lw $t7, 0x0054($sp) -.L80A65D18: -/* 0AA28 80A65D18 3C0680A6 */ lui $a2, %hi(D_80A6683C) ## $a2 = 80A60000 -/* 0AA2C 80A65D1C 24C6683C */ addiu $a2, $a2, %lo(D_80A6683C) ## $a2 = 80A6683C -/* 0AA30 80A65D20 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 0AA34 80A65D24 24072199 */ addiu $a3, $zero, 0x2199 ## $a3 = 00002199 -/* 0AA38 80A65D28 0C031AD5 */ jal Graph_CloseDisps -/* 0AA3C 80A65D2C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 0AA40 80A65D30 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0AA44 80A65D34 8FA20048 */ lw $v0, 0x0048($sp) -/* 0AA48 80A65D38 8FB00020 */ lw $s0, 0x0020($sp) -/* 0AA4C 80A65D3C 03E00008 */ jr $ra -/* 0AA50 80A65D40 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/data/overlays/actors/z_en_horse.data.s b/data/overlays/actors/z_en_horse.data.s deleted file mode 100644 index 9b785c1009..0000000000 --- a/data/overlays/actors/z_en_horse.data.s +++ /dev/null @@ -1,135 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80A65E10 - .word 0x06006D50, 0x06005584, 0x06004DEC, 0x06003CEC, 0x060075F0, 0x060032B0, 0x06001E2C, 0x06002470, 0x06002C38 -glabel D_80A65E34 - .word 0x06009FC4, 0x0600A6B4, 0x0600901C, 0x060085E0, 0x0600AF60, 0x06007B54, 0x0600506C, 0x06005684, 0x06005E20 -glabel D_80A65E58 - .word D_80A65E10 -.word D_80A65E34 -glabel D_80A65E60 - .word 0x3F2AAAAB, 0x3F2AAAAB, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000 -glabel D_80A65E78 - .word 0x3F800000, 0x3F2AAAAB, 0x3F2AAAAB -glabel D_80A65E84 - .word 0x06009D74, 0x06004A24 -glabel En_Horse_InitVars - .word 0x00140100, 0x00000010, 0x001A0000, 0x000003FC -.word EnHorse_Init -.word EnHorse_Destroy -.word EnHorse_Update -.word EnHorse_Draw -glabel D_80A65EAC - .word 0x0A080039, 0x12010000, 0x00000000, 0x00000400, 0x00040000, 0xFFCFFFFF, 0x00000000, 0x19000100, 0x00140046, 0x00000000, 0x00000000 -glabel D_80A65ED8 - .word 0x0A000039, 0x12010000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00000100, 0x00140046, 0x00000000, 0x00000000 -glabel D_80A65F04 - .word 0x00000000, 0x00000000, 0x00000000, 0x0001F824, 0x00000000, 0x00790100, 0x0D000000, 0x00000000, 0x00140064 -glabel D_80A65F28 - .word 0x0A000939, 0x12000000, 0x00000001 -.word D_80A65F04 -glabel D_80A65F38 - .word 0x0A000023, 0x0064FE00 -glabel D_80A65F40 - .byte 0x00, 0x51, 0x00, 0x10, 0x00, 0x00, 0x05, 0x3D, 0x00, 0x00, 0x00, 0x51, 0xFA, 0xEF, 0x00, 0x00, 0x05, 0xB3, 0x00, 0x00, 0x00, 0x51, 0xEA, 0xD8, 0xFE, 0xD4, 0x05, 0x10, 0x00, 0x00, 0x00, 0x51, 0xED, 0xC5, 0xFE, 0xD4, 0x0E, 0x24, 0x00, 0x00, 0x00, 0x51, 0xF1, 0x03, 0x00, 0x51, 0x15, 0xA1, 0x00, 0x00, 0x00, 0x51, 0xEC, 0x1B, 0xFF, 0x1E, 0x1A, 0x05, 0x00, 0x00, 0x00, 0x51, 0xE6, 0x44, 0xFF, 0xB1, 0x13, 0xBD, 0x00, 0x00, 0x00, 0x51, 0xE4, 0x60, 0xFE, 0x0C, 0x1D, 0x72, 0x00, 0x00, 0x00, 0x51, 0xE8, 0x05, 0xFE, 0x0C, 0x22, 0xCE, 0x00, 0x00, 0x00, 0x51, 0xDE, 0xCF, 0xFE, 0xD4, 0x1E, 0x7A, 0x00, 0x00, 0x00, 0x51, 0xEA, 0x97, 0xFE, 0x0D, 0x2F, 0x5F, 0x00, 0x00, 0x00, 0x51, 0xED, 0x38, 0xFD, 0x44, 0x35, 0x0F, 0x00, 0x00, 0x00, 0x51, 0xF2, 0xA8, 0xFE, 0x16, 0x2F, 0x3C, 0x00, 0x00, 0x00, 0x51, 0xF4, 0x9D, 0x00, 0x64, 0x20, 0x93, 0x00, 0x00, 0x00, 0x51, 0xF7, 0x1B, 0xFE, 0x0C, 0x33, 0xBF, 0x00, 0x00, 0x00, 0x51, 0xFB, 0xFE, 0xFE, 0x0C, 0x2F, 0x45, 0x00, 0x00, 0x00, 0x51, 0x05, 0x93, 0xFE, 0x0C, 0x34, 0x1D, 0x00, 0x00, 0x00, 0x51, 0xFF, 0x38, 0xFE, 0x1A, 0x27, 0xDD, 0x00, 0x00, 0x00, 0x51, 0xFA, 0x43, 0x00, 0x64, 0x1D, 0x48, 0x00, 0x00, 0x00, 0x51, 0xFC, 0x1D, 0x00, 0xA8, 0x16, 0x14, 0x00, 0x00, 0x00, 0x51, 0x07, 0x92, 0x00, 0x59, 0x18, 0x58, 0x00, 0x00, 0x00, 0x51, 0x05, 0x6B, 0xFF, 0x97, 0x23, 0xF6, 0x00, 0x00, 0x00, 0x51, 0x06, 0x23, 0xFF, 0x21, 0x1E, 0x15, 0x00, 0x00, 0x00, 0x51, 0x0F, 0x35, 0xFF, 0x87, 0x1B, 0x9C, 0x00, 0x00, 0x00, 0x51, 0x0C, 0x6B, 0x01, 0x75, 0x14, 0x65, 0x00, 0x00, 0x00, 0x51, 0x12, 0x46, 0xFF, 0xEC, 0x0F, 0x1D, 0x00, 0x00, 0x00, 0x51, 0x0D, 0x84, 0x00, 0xF6, 0x10, 0x6F, 0x00, 0x00, 0x00, 0x51, 0x0E, 0x66, 0x00, 0x80, 0x09, 0x3E, 0x00, 0x00, 0x00, 0x51, 0x06, 0xFF, 0x00, 0x12, 0x00, 0x98, 0x00, 0x00, 0x00, 0x51, 0x0E, 0x53, 0xFF, 0xF0, 0x05, 0x77, 0x00, 0x00, 0x00, 0x51, 0x07, 0x23, 0xFF, 0xF1, 0x03, 0xD7, 0x00, 0x00, 0x00, 0x51, 0x06, 0x26, 0x01, 0x8F, 0x10, 0xDE, 0x00, 0x00, 0x00, 0x51, 0x02, 0xCC, 0x00, 0x5F, 0x0D, 0x3F, 0x00, 0x00, 0x00, 0x51, 0xFB, 0x5B, 0xFF, 0xD7, 0x12, 0x83, 0x00, 0x00, 0x00, 0x51, 0xF8, 0x48, 0xFF, 0x55, 0x10, 0x4C, 0x00, 0x00, 0x00, 0x51, 0x05, 0x22, 0x01, 0x87, 0x16, 0x21, 0x00, 0x00, 0x00, 0x51, 0x00, 0x70, 0x00, 0x00, 0x07, 0xA7, 0x00, 0x00, 0x00, 0x51, 0xF4, 0x3D, 0xFF, 0x91, 0x24, 0xB5, 0x00, 0x00, 0x00, 0x51, 0xE9, 0xD6, 0xFE, 0xF2, 0x21, 0x89, 0x00, 0x00, 0x00, 0x51, 0xDD, 0x63, 0xFE, 0xD4, 0x1E, 0x9C, 0x00, 0x00, 0x00, 0x51, 0xE8, 0x58, 0xFE, 0x0C, 0x1E, 0x82, 0x00, 0x00, 0x00, 0x51, 0xE3, 0x76, 0xFE, 0x0C, 0x17, 0x6A, 0x00, 0x00, 0x00, 0x51, 0xE3, 0x77, 0xFE, 0x0C, 0x1D, 0xB5, 0x00, 0x00, 0x00, 0x51, 0xE2, 0xF1, 0xFE, 0xD4, 0x1D, 0xB0, 0x00, 0x00, 0x00, 0x51, 0xE2, 0xD8, 0xFE, 0xD4, 0x18, 0x7C, 0x00, 0x00, 0x00, 0x51, 0xE0, 0x70, 0xFE, 0xD4, 0x1D, 0x81, 0x00, 0x00, 0x00, 0x51, 0xE0, 0x65, 0xFE, 0xD4, 0x1C, 0xB5, 0x00, 0x00, 0x00, 0x51, 0xDD, 0xAF, 0xFE, 0xD4, 0x1C, 0xD7, 0x00, 0x00, 0x00, 0x51, 0xDD, 0xD7, 0xFE, 0xD4, 0x1D, 0x54, 0x00, 0x00, 0x00, 0x51, 0xDD, 0xB7, 0xFE, 0xD4, 0x1E, 0x6C, 0x00, 0x00, 0x00, 0x51, 0xE0, 0x90, 0xFE, 0xD5, 0x1E, 0x3A, 0x00, 0x00, 0x00, 0x51, 0xE3, 0x53, 0xFF, 0x48, 0x1E, 0x32, 0x00, 0x00, 0x00, 0x51, 0xE6, 0xF6, 0xFE, 0xE0, 0x1E, 0x90, 0x00, 0x00, 0x00, 0x51, 0xE7, 0x4A, 0xFE, 0xDE, 0x20, 0x0D, 0x00, 0x00, 0x00, 0x51, 0xE6, 0x6E, 0xFE, 0xDC, 0x20, 0xD0, 0x00, 0x00, 0x00, 0x51, 0xE2, 0x93, 0xFF, 0x4C, 0x21, 0x0B, 0x00, 0x00, 0x00, 0x51, 0xE0, 0xA8, 0xFE, 0xD9, 0x1E, 0xDF, 0x00, 0x00, 0x00, 0x51, 0xE0, 0x72, 0xFE, 0xCC, 0x1F, 0x3A, 0x00, 0x00, 0x00, 0x51, 0xDB, 0x2F, 0xFE, 0xE1, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x51, 0xDB, 0x96, 0xFE, 0xDC, 0x1D, 0x99, 0x00, 0x00, 0x00, 0x51, 0xDA, 0x7E, 0xFF, 0x39, 0x1B, 0xF8, 0x00, 0x00, 0x00, 0x51, 0xDB, 0xA5, 0xFE, 0xD4, 0x1E, 0x4E, 0x00, 0x00, 0x00, 0x51, 0xDB, 0xF2, 0xFE, 0xD4, 0x1D, 0xDA, 0x00, 0x00, 0x00, 0x51, 0xE2, 0x7C, 0xFE, 0x0D, 0x21, 0xF7, 0x00, 0x00, 0x00, 0x51, 0xE6, 0xDA, 0xFE, 0x0C, 0x21, 0x9E, 0x00, 0x00, 0x00, 0x51, 0xE8, 0x42, 0xFE, 0x0C, 0x20, 0x42, 0x00, 0x00, 0x00, 0x51, 0xE7, 0xA7, 0xFE, 0x0C, 0x1D, 0xBD, 0x00, 0x00, 0x00, 0x51, 0xEC, 0x55, 0xFF, 0x33, 0x1E, 0x86, 0x00, 0x00, 0x00, 0x51, 0xE8, 0xAD, 0xFE, 0x0C, 0x21, 0x35, 0x00, 0x00, 0x00, 0x51, 0xE9, 0xA4, 0xFE, 0x0E, 0x27, 0x8B, 0x00, 0x00, 0x00, 0x51, 0xEC, 0x1A, 0xFE, 0x78, 0x2B, 0x62, 0x00, 0x00, 0x00, 0x51, 0xEC, 0x0F, 0xFE, 0x77, 0x2C, 0x30, 0x00, 0x00, 0x00, 0x51, 0xEE, 0x83, 0xFE, 0xC6, 0x2B, 0x7C, 0x00, 0x00, 0x00, 0x51, 0xF0, 0xE5, 0xFE, 0x84, 0x2C, 0x9B, 0x00, 0x00, 0x00, 0x51, 0xF4, 0x78, 0xFE, 0x0C, 0x2E, 0xA8, 0x00, 0x00, 0x00, 0x51, 0xF4, 0xC9, 0xFE, 0x18, 0x2D, 0xDF, 0x00, 0x00, 0x00, 0x51, 0xF1, 0x0B, 0xFE, 0x8C, 0x2C, 0x3F, 0x00, 0x00, 0x00, 0x51, 0xEE, 0xA9, 0xFE, 0xDB, 0x2A, 0xED, 0x00, 0x00, 0x00, 0x51, 0xEC, 0x6A, 0xFE, 0x83, 0x2B, 0x4E, 0x00, 0x00, 0x00, 0x51, 0xEC, 0x07, 0xFF, 0x44, 0x2A, 0xD8, 0x00, 0x00, 0x00, 0x51, 0xEB, 0x6B, 0xFF, 0x44, 0x2B, 0x94, 0x00, 0x00, 0x00, 0x51, 0xEA, 0x24, 0xFF, 0x4E, 0x26, 0xF4, 0x00, 0x00, 0x00, 0x51, 0xE9, 0x57, 0xFE, 0xE0, 0x21, 0x46, 0x00, 0x00, 0x00, 0x51, 0xEC, 0xD2, 0xFF, 0x4E, 0x1E, 0xFB, 0x00, 0x00, 0x00, 0x51, 0xF1, 0xFE, 0x00, 0x49, 0x1F, 0xCC, 0x00, 0x00, 0x00, 0x51, 0xEE, 0x79, 0xFF, 0x96, 0x24, 0x92, 0x00, 0x00, 0x00, 0x51, 0xEF, 0x0D, 0xFF, 0x90, 0x19, 0x0C, 0x00, 0x00, 0x00, 0x51, 0xF2, 0xA7, 0x00, 0x69, 0x20, 0x02, 0x00, 0x00, 0x00, 0x51, 0xEE, 0x67, 0xFF, 0xEC, 0x19, 0xD0, 0x00, 0x00, 0x00, 0x51, 0xEC, 0x52, 0xFF, 0x39, 0x19, 0xCB, 0x00, 0x00, 0x00, 0x51, 0xEE, 0x7F, 0x00, 0x01, 0x19, 0x30, 0x00, 0x00, 0x00, 0x51, 0xEC, 0x58, 0xFF, 0x58, 0x19, 0x12, 0x00, 0x00, 0x00, 0x51, 0xEB, 0x78, 0xFD, 0x44, 0x37, 0xF9, 0x00, 0x00, 0x00, 0x51, 0xE9, 0x8B, 0xFC, 0xCC, 0x3C, 0x14, 0x00, 0x00, 0x00, 0x51, 0xF3, 0xCE, 0xFD, 0x44, 0x35, 0x28, 0x00, 0x00, 0x00, 0x51, 0xF1, 0x52, 0xFD, 0xF3, 0x33, 0xAC, 0x00, 0x00, 0x00, 0x51, 0xF1, 0xAA, 0xFE, 0x0C, 0x33, 0x43, 0x00, 0x00, 0x00, 0x51, 0xF4, 0x94, 0xFE, 0x0C, 0x34, 0xD6, 0x00, 0x00, 0x00, 0x51, 0x05, 0x6D, 0xFF, 0x8D, 0x24, 0x9A, 0x00, 0x00, 0x00, 0x51, 0x02, 0x24, 0xFF, 0x8C, 0x22, 0xB9, 0x00, 0x00, 0x00, 0x51, 0xFF, 0x96, 0xFF, 0x95, 0x21, 0x52, 0x00, 0x00, 0x00, 0x51, 0xF9, 0xB8, 0x00, 0x55, 0x1D, 0xDE, 0x00, 0x00, 0x00, 0x51, 0xEB, 0x4C, 0xFD, 0x44, 0x35, 0xCC, 0x00, 0x00, 0x00, 0x51, 0xEC, 0x06, 0xFD, 0x44, 0x34, 0x58, 0x00, 0x00, 0x00, 0x51, 0xEE, 0x2F, 0xFD, 0x44, 0x35, 0x84, 0x00, 0x00, 0x00, 0x51, 0xED, 0x66, 0xFD, 0x44, 0x37, 0x04, 0x00, 0x00, 0x00, 0x51, 0xF4, 0x76, 0x00, 0x64, 0x20, 0x18, 0x00, 0x00, 0x00, 0x51, 0x05, 0xB4, 0xFF, 0x98, 0x24, 0x1E, 0x00, 0x00, 0x00, 0x51, 0x02, 0x75, 0xFF, 0x97, 0x22, 0x57, 0x00, 0x00, 0x00, 0x51, 0xFF, 0xF6, 0xFF, 0xA6, 0x20, 0xE3, 0x00, 0x00, 0x00, 0x51, 0xFA, 0x4A, 0x00, 0x64, 0x1D, 0x50, 0x00, 0x00, 0x00, 0x51, 0xF4, 0x36, 0xFE, 0x0C, 0x30, 0xCD, 0x00, 0x00, 0x00, 0x51, 0xF4, 0x4E, 0xFE, 0xC9, 0x28, 0x5B, 0x00, 0x00, 0x00, 0x51, 0xF0, 0x5A, 0xFD, 0x44, 0x37, 0x48, 0x00, 0x00, 0x00, 0x51, 0xEF, 0x0B, 0xFE, 0x0C, 0x31, 0xC7, 0x00, 0x00, 0x00, 0x51, 0xE9, 0x09, 0xFE, 0x0F, 0x1A, 0x8F, 0x00, 0x00, 0x00, 0x51, 0x00, 0x16, 0xFE, 0x27, 0x27, 0x77, 0x00, 0x00, 0x00, 0x51, 0xFA, 0x93, 0xFF, 0x40, 0x22, 0xAA, 0x00, 0x00, 0x00, 0x51, 0xFF, 0xFC, 0x00, 0x5C, 0x1A, 0xD2, 0x00, 0x00, 0x00, 0x51, 0x01, 0xE3, 0x00, 0x68, 0x19, 0xED, 0x00, 0x00, 0x00, 0x51, 0x06, 0x2C, 0x00, 0xB7, 0x17, 0x63, 0x00, 0x00, 0x00, 0x51, 0x06, 0x0C, 0x01, 0x34, 0x13, 0xD5, 0x00, 0x00, 0x00, 0x51, 0x05, 0xE7, 0x01, 0x8F, 0x10, 0xAB, 0x00, 0x00, 0x00, 0x51, 0x05, 0x4E, 0x01, 0x81, 0x10, 0xAF, 0x00, 0x00, 0x00, 0x51, 0x05, 0x63, 0x01, 0x8B, 0x13, 0xC7, 0x00, 0x00, 0x00, 0x51, 0x05, 0x50, 0x01, 0x8A, 0x16, 0xEE, 0x00, 0x00, 0x00, 0x51, 0x03, 0x2D, 0x01, 0x1B, 0x18, 0x32, 0x00, 0x00, 0x00, 0x51, 0xFF, 0xC7, 0x00, 0x65, 0x1A, 0x57, 0x00, 0x00, 0x00, 0x51, 0x00, 0x5B, 0x01, 0x45, 0x14, 0x17, 0x00, 0x00, 0x00, 0x51, 0x05, 0x91, 0xFF, 0x2A, 0x1D, 0xEB, 0x00, 0x00, 0x00, 0x51, 0x0D, 0x9F, 0xFF, 0xED, 0x03, 0x70, 0x00, 0x00, 0x00, 0x51, 0x0B, 0x75, 0x00, 0x98, 0x08, 0x2E, 0x00, 0x00, 0x00, 0x51, 0x0B, 0x48, 0xFF, 0x6F, 0x1A, 0xCE, 0x00, 0x00, 0x00, 0x51, 0x05, 0xE7, 0x00, 0x43, 0x19, 0x47, 0x00, 0x00, 0x00, 0x51, 0x0F, 0xD3, 0xFF, 0xD1, 0x06, 0xBA, 0x00, 0x00, 0x00, 0x51, 0xE3, 0x59, 0xFE, 0x0C, 0x21, 0xB3, 0x00, 0x00, 0x00, 0x51, 0xE1, 0xD0, 0xFE, 0x32, 0x21, 0x32, 0x00, 0x00, 0x00, 0x51, 0xE1, 0x91, 0xFE, 0x42, 0x22, 0x80, 0x00, 0x00, 0x00, 0x51, 0xF4, 0x9D, 0xFE, 0x4D, 0x2C, 0x46, 0x00, 0x00, 0x00, 0x51, 0x00, 0xA5, 0xFE, 0xEA, 0x0D, 0x18, 0x00, 0x00, 0x00, 0x57, 0xF7, 0xC3, 0xFC, 0x8E, 0x06, 0xBC, 0x00, 0x00, 0x00, 0x57, 0xFE, 0xB8, 0xFB, 0x2A, 0x0A, 0x91, 0x00, 0x00, 0x00, 0x57, 0xF3, 0xEC, 0xFB, 0xF7, 0x0D, 0xC7, 0x00, 0x00, 0x00, 0x5A, 0x0A, 0x7F, 0xFE, 0xF3, 0x02, 0xF1, 0x00, 0x00, 0x00, 0x5A, 0x08, 0x12, 0xFF, 0x7C, 0x01, 0x3D, 0x00, 0x00, 0x00, 0x5A, 0x02, 0x0B, 0xFF, 0xF8, 0x02, 0x7B, 0x00, 0x00, 0x00, 0x5A, 0x02, 0x2E, 0x00, 0x24, 0xFE, 0xBD, 0x00, 0x00, 0x00, 0x5A, 0x02, 0x67, 0x00, 0x33, 0xFC, 0xB9, 0x00, 0x00, 0x00, 0x5A, 0xFD, 0x9A, 0x00, 0x20, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x5A, 0xFD, 0x81, 0xFF, 0xFD, 0x02, 0x29, 0x00, 0x00, 0x00, 0x5A, 0xFD, 0xE4, 0x00, 0x0A, 0xFC, 0x87, 0x00, 0x00, 0x00, 0x5A, 0xF9, 0x7E, 0x00, 0x3A, 0x01, 0x7A, 0x00, 0x00, 0x00, 0x5A, 0xF4, 0x1C, 0x00, 0xD2, 0xFD, 0x78, 0x00, 0x00, 0x00, 0x5D, 0xFD, 0x5A, 0x00, 0x15, 0xFD, 0x91, 0x00, 0x00, 0x00, 0x5D, 0x00, 0x95, 0x01, 0x4D, 0xF6, 0x3D, 0x00, 0x00, 0x00, 0x5D, 0x01, 0xF3, 0x02, 0x45, 0xFD, 0xDD, 0x00, 0x00, 0x00, 0x5D, 0x0C, 0x73, 0x05, 0x85, 0xF1, 0x41, 0x00, 0x00, 0x00, 0x5D, 0x0C, 0x7E, 0x05, 0x85, 0x01, 0x33, 0x00, 0x00, 0x00, 0x5D, 0x0D, 0x34, 0x05, 0x85, 0xFB, 0x50, 0x00, 0x00, 0x00, 0x5D, 0xFC, 0x3A, 0x00, 0x01, 0xFF, 0xC8, 0x00, 0x00, 0x00, 0x5D, 0xFC, 0x3A, 0x00, 0x18, 0xFD, 0x07, 0x00, 0x00, 0x00, 0x5D, 0xFD, 0x4A, 0x00, 0xAE, 0xF4, 0xFC, 0x00, 0x00, 0x00, 0x63, 0x04, 0x0F, 0x00, 0x00, 0x08, 0x03, 0x00, 0x00, 0x00, 0x63, 0xFA, 0x5D, 0x00, 0x00, 0x05, 0x95, 0x00, 0x00, 0x00, 0x63, 0x03, 0x58, 0x00, 0x00, 0xFC, 0x6A, 0x00, 0x00, 0x00, 0x63, 0x03, 0x72, 0x00, 0x00, 0xF7, 0x30, 0x00, 0x00, 0x00, 0x63, 0xFC, 0x15, 0x00, 0x00, 0xFD, 0x0D, 0x00, 0x00, 0x00, 0x63, 0xF7, 0x32, 0x00, 0x00, 0xFD, 0x8B, 0x00, 0x00, 0x00, 0x63, 0x03, 0x8B, 0x00, 0x00, 0xF6, 0xE0, 0x00, 0x00 -glabel D_80A665DA - .byte 0x00, 0x00 -glabel D_80A665DC - .word 0xFF3DFFD8, 0x00E10078, 0x0168C000, 0x07D0FEF2 -glabel D_80A665EC - .word 0xFFCCFF8B, 0xFF3DFFD8, 0xFF10FF88, 0xFE984000, 0x07D0010E, 0xFFCCFF8B -glabel D_80A66604 - .word 0x04200001, 0xF9FC000B, 0x2A8D0639, 0x0001FC27, 0x000AFC27, 0x066D0001, 0xFF23000B, 0xE89103D9, 0x00010193, 0x000ABB9C, 0xFC010001, 0x0162000B, 0xA37DF971, 0x0001FF2B, 0x000A889C, 0xF9F00001, 0xFC10000B, 0x638DFC4D, 0xFFFFF9BC, 0x000A4002 -glabel D_80A66654 - .word 0x00000008 -.word D_80A66604 -glabel D_80A6665C - .word 0x00000000, 0x00000010 -glabel D_80A66664 - .word 0xB0F80258, 0x30FC012C -glabel D_80A6666C - .word 0x00000000, 0x01010101, 0x01010100 -glabel D_80A66678 - .word 0x00000001, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x00000000 -glabel D_80A66690 - .word 0x00070006, 0x00020002 -glabel D_80A66698 - .byte 0x00, 0x01 -glabel D_80A6669A - .byte 0x00, 0x01 -glabel D_80A6669C - .byte 0x00, 0x00 -glabel D_80A6669E - .byte 0x00, 0x00 -glabel D_80A666A0 - .word 0x00000000 -glabel D_80A666A4 - .word 0x00000000 -.word func_80A60294 -.word func_80A605A4 -.word func_80A60838 -.word func_80A60AFC -.word func_80A60D28 -glabel D_80A666BC - .word 0x00000000 -.word func_80A60300 -.word func_80A605E0 -.word func_80A60954 -.word func_80A60BDC -.word func_80A60EB0 -glabel D_80A666D4 - .word 0x00000024, 0x00000001, 0x00000025, 0x00000002, 0x00000026, 0x00000003, 0x00000040, 0x00000004, 0x00000041, 0x00000005 -glabel D_80A666FC - .word 0x0E100585, 0xEC41000B, 0x80010D20, 0x0585EB9C, 0x0005C000, 0x0C1C0585, 0xECDC0005, 0x00000E10, 0x0585EFFC, 0x000B0000, 0x0E100585, 0x0168000B, 0x00000000 -glabel D_80A66730 - .word 0x00000005 -.word D_80A666FC -glabel D_80A66738 - .word func_80A5C97C -.word func_80A5F08C -.word func_80A5F414 -.word func_80A5F890 -.word func_80A600E8 -.word func_80A5D0A0 -.word func_80A5D2C0 -.word func_80A5D468 -.word func_80A5D79C -.word func_80A5DB58 -.word func_80A5DE38 -.word func_80A5E12C -.word func_80A5E39C -.word func_80A5E650 -.word func_80A5EB54 -.word func_80A5EE80 -.word func_80A627A4 -.word func_80A610C8 -.word func_80A61778 -.word func_80A61A28 -glabel D_80A66788 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A66794 - .word 0x00000000, 0x3F800000, 0x00000000 -glabel D_80A667A0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A667AC - .word 0x40A00000, 0xC0800000, 0x40A00000 -glabel D_80A667B8 - .word 0x44160000, 0xC4D0C000, 0x00000000 -glabel D_80A667C4 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A667D0 - .word 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x00000003, 0x00000007, 0x0000000E -glabel D_80A667EC - .word 0x06009F80, 0x0600A180, 0x0600A380 -glabel D_80A667F8 - .word 0x00010201, 0x00000000 - diff --git a/data/overlays/actors/z_en_horse.reloc.s b/data/overlays/actors/z_en_horse.reloc.s deleted file mode 100644 index 576b451c3f..0000000000 --- a/data/overlays/actors/z_en_horse.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80A669E0 - .incbin "baserom/ovl_En_Horse", 0xB6F0, 0x00000B70 diff --git a/include/functions.h b/include/functions.h index 79077e8242..a9ac0e9d6a 100644 --- a/include/functions.h +++ b/include/functions.h @@ -405,7 +405,7 @@ s32 func_8002DDE4(GlobalContext* globalCtx); s32 func_8002DDF4(GlobalContext* globalCtx); void func_8002DE04(GlobalContext* globalCtx, Actor* actorA, Actor* actorB); void func_8002DE74(GlobalContext* globalCtx, Player* player); -void func_8002DECC(GlobalContext* globalCtx, Player* player, Actor* horse); +void Actor_MountHorse(GlobalContext* globalCtx, Player* player, Actor* horse); s32 func_8002DEEC(Player* player); void func_8002DF18(GlobalContext* globalCtx, Player* player); s32 func_8002DF38(GlobalContext* globalCtx, Actor* actor, u8 csMode); @@ -440,9 +440,9 @@ void func_8002F580(Actor* actor, GlobalContext* globalCtx); u32 Actor_HasNoParent(Actor* actor, GlobalContext* globalCtx); void func_8002F5C4(Actor* actorA, Actor* actorB, GlobalContext* globalCtx); void func_8002F5F0(Actor* actor, GlobalContext* globalCtx); -u32 Actor_HasChild(GlobalContext* globalCtx, Actor* actor); -u32 func_8002F63C(GlobalContext* globalCtx, Actor* horse, s32 arg2); -u32 Actor_HasNoChild(GlobalContext* globalCtx, Actor* actor); +s32 Actor_IsMounted(GlobalContext* globalCtx, Actor* horse); +u32 Actor_SetRideActor(GlobalContext* globalCtx, Actor* horse, s32 arg2); +s32 Actor_NotMounted(GlobalContext* globalCtx, Actor* horse); void func_8002F698(GlobalContext* globalCtx, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6); void func_8002F6D4(GlobalContext* globalCtx, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); void func_8002F71C(GlobalContext* globalCtx, Actor* actor, f32 arg2, s16 arg3, f32 arg4); @@ -2277,6 +2277,7 @@ void func_800F574C(f32 arg0, UNK_TYPE arg2); void func_800F5918(void); void func_800F595C(u16); void func_800F59E8(u16); +s32 func_800F5A58(s32, GlobalContext*); void func_800F5ACC(u32 bgmID); void func_800F5B58(void); void func_800F5BF0(u8 arg0); diff --git a/include/z64.h b/include/z64.h index 38cc58ebb3..bdc311ca40 100644 --- a/include/z64.h +++ b/include/z64.h @@ -385,7 +385,7 @@ typedef struct { /* 0x022E */ s16 unk_22E; /* 0x0230 */ s16 unk_230; /* 0x0232 */ s16 counterDigits[4]; // used for key and rupee counters - /* 0x023A */ u8 unk_23A; + /* 0x023A */ u8 numHorseBoosts; /* 0x023C */ u16 unk_23C; /* 0x023E */ u16 hbaAmmo; // ammo while playing the horseback archery minigame /* 0x0240 */ u16 unk_240; diff --git a/include/z64player.h b/include/z64player.h index 48dbd92137..7d9285084c 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -253,7 +253,7 @@ typedef struct Player { /* 0x0434 */ s8 getItemId; /* 0x0436 */ u16 getItemDirection; /* 0x0438 */ Actor* interactRangeActor; - /* 0x043C */ s8 unk_43C; + /* 0x043C */ s8 mountSide; /* 0x043D */ char unk_43D[0x003]; /* 0x0440 */ Actor* rideActor; /* 0x0444 */ u8 csMode; diff --git a/spec b/spec index df1e00dcc7..8735c4dd4d 100644 --- a/spec +++ b/spec @@ -2408,8 +2408,7 @@ endseg beginseg name "ovl_En_Horse" include "build/src/overlays/actors/ovl_En_Horse/z_en_horse.o" - include "build/data/overlays/actors/z_en_horse.data.o" - include "build/data/overlays/actors/z_en_horse.reloc.o" + include "build/src/overlays/actors/ovl_En_Horse/ovl_En_Horse_reloc.o" endseg beginseg diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 16f28bc820..7bf8662065 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1020,7 +1020,7 @@ void func_8002DE74(GlobalContext* globalCtx, Player* player) { } } -void func_8002DECC(GlobalContext* globalCtx, Player* player, Actor* horse) { +void Actor_MountHorse(GlobalContext* globalCtx, Player* player, Actor* horse) { player->rideActor = horse; player->stateFlags1 |= 0x800000; horse->child = &player->actor; @@ -1607,28 +1607,28 @@ void func_8002F5F0(Actor* actor, GlobalContext* globalCtx) { } } -u32 Actor_HasChild(GlobalContext* globalCtx, Actor* actor) { - if (actor->child != NULL) { +s32 Actor_IsMounted(GlobalContext* globalCtx, Actor* horse) { + if (horse->child != NULL) { return true; } else { return false; } } -u32 func_8002F63C(GlobalContext* globalCtx, Actor* horse, s32 arg2) { +u32 Actor_SetRideActor(GlobalContext* globalCtx, Actor* horse, s32 mountSide) { Player* player = PLAYER; if (!(player->stateFlags1 & 0x003C7880)) { player->rideActor = horse; - player->unk_43C = arg2; + player->mountSide = mountSide; return true; } return false; } -u32 Actor_HasNoChild(GlobalContext* globalCtx, Actor* actor) { - if (actor->child == NULL) { +s32 Actor_NotMounted(GlobalContext* globalCtx, Actor* horse) { + if (horse->child == NULL) { return true; } else { return false; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index b746da9026..144d7314f5 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -1184,7 +1184,7 @@ s32 Camera_CalcAtForHorse(Camera* camera, VecSph* eyeAtDir, f32 yOffset, f32* yP player = camera->player; Actor_GetWorldPosShapeRot(&horsePosRot, player->rideActor); - if (EN_HORSE_CHECK_5((EnHorse*)player->rideActor)) { + if (EN_HORSE_CHECK_JUMPING((EnHorse*)player->rideActor)) { horsePosRot.pos.y -= 49.f; *yPosOffset = Camera_LERPCeilF(horsePosRot.pos.y, *yPosOffset, 0.1f, 0.2f); camera->atLERPStepScale = Camera_LERPCeilF(0.4f, camera->atLERPStepScale, 0.2f, 0.02f); diff --git a/src/code/z_horse.c b/src/code/z_horse.c index db2443033c..b83477c399 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -42,9 +42,9 @@ typedef struct { void func_8006D0EC(GlobalContext* globalCtx, Player* player) { s32 i; HorseSpawn horseSpawns[] = { - { 81, 0xFE34, 0x0064, 0x19F0, 0, 2 }, { 87, 0xF877, 0xFBFF, 0x0300, 0, 2 }, - { 90, 0x0A06, 0xFEFD, 0x02FF, 0, 2 }, { 93, 0xFEB8, 0x000A, 0x03B9, 0, 2 }, - { 99, 0x03A0, 0x0000, 0xF718, 0, 2 }, + { SCENE_SPOT00, -460, 100, 6640, 0, 2 }, { SCENE_SPOT06, -1929, -1025, 768, 0, 2 }, + { SCENE_SPOT09, 2566, -259, 767, 0, 2 }, { SCENE_SPOT12, -328, 10, 953, 0, 2 }, + { SCENE_SPOT20, 928, 0, -2280, 0, 2 }, }; if ((AREG(6) != 0) && (Flags_GetEventChkInf(0x18) || (DREG(1) != 0))) { @@ -55,7 +55,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) { __assert("player->ride.actor != NULL", "../z_horse.c", 343); } - func_8002DECC(globalCtx, player, player->rideActor); + Actor_MountHorse(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); gSaveContext.horseData.scene = globalCtx->sceneNum; @@ -168,7 +168,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { __assert("player->ride.actor != NULL", "../z_horse.c", 561); } - func_8002DECC(globalCtx, player, player->rideActor); + Actor_MountHorse(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); gSaveContext.horseData.scene = globalCtx->sceneNum; } else if ((globalCtx->sceneNum == SCENE_SPOT20) && ((gSaveContext.eventInf[0] & 0xF) == 6) && @@ -179,7 +179,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { __assert("player->ride.actor != NULL", "../z_horse.c", 582); } - func_8002DECC(globalCtx, player, player->rideActor); + Actor_MountHorse(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); gSaveContext.horseData.scene = globalCtx->sceneNum; @@ -211,7 +211,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { __assert("player->ride.actor != NULL", "../z_horse.c", 628); } - func_8002DECC(globalCtx, player, player->rideActor); + Actor_MountHorse(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); } else if ((D_8011F9B8[i].type == 5) || (D_8011F9B8[i].type == 6) || (D_8011F9B8[i].type == 8)) { Vec3f sp54; @@ -234,7 +234,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { player->actor.shape.rot.x = player->actor.shape.rot.z = 0; player->actor.shape.rot.y = D_8011F9B8[i].angle; - func_8002DECC(globalCtx, player, player->rideActor); + Actor_MountHorse(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); sp54.x = player->actor.world.pos.x - 200.0f; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 634009a4e2..8592708753 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3332,7 +3332,7 @@ void Interface_Draw(GlobalContext* globalCtx) { phi_s1 = ZREG(14); for (phi_s3 = 1; phi_s3 < 7; phi_s3++) { // Carrot Color (based on availability) - if ((interfaceCtx->unk_23A == 0) || (interfaceCtx->unk_23A < phi_s3)) { + if ((interfaceCtx->numHorseBoosts == 0) || (interfaceCtx->numHorseBoosts < phi_s3)) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 0, 150, 255, interfaceCtx->aAlpha); } else { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, interfaceCtx->aAlpha); diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index e720bfffc3..bdbe10e5ff 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -1,19 +1,65 @@ #include "z_en_horse.h" +#include "overlays/actors/ovl_En_In/z_en_in.h" #define FLAGS 0x00000010 #define THIS ((EnHorse*)thisx) +typedef void (*EnHorseCsFunc)(EnHorse*, GlobalContext*, CsCmdActorAction*); +typedef void (*EnHorseActionFunc)(EnHorse*, GlobalContext*); + void EnHorse_Init(Actor* thisx, GlobalContext* globalCtx); void EnHorse_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnHorse_Update(Actor* thisx, GlobalContext* globalCtx); void EnHorse_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_02000230; -extern UNK_TYPE D_02002AC0; -extern UNK_TYPE D_06006530; +void EnHorse_InitCutscene(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_InitHorsebackArchery(EnHorse* this); +void EnHorse_InitFleePlayer(EnHorse* this); +void EnHorse_ResetIdleAnimation(EnHorse* this); +void EnHorse_StartIdleRidable(EnHorse* this); +void EnHorse_InitInactive(EnHorse* this); +void EnHorse_InitIngoHorse(EnHorse* this); + +void EnHorse_Frozen(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_Inactive(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_Idle(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_FollowPlayer(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_UpdateIngoRace(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_MountedIdle(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_MountedIdleWhinneying(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_MountedTurn(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_MountedWalk(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_MountedTrot(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_MountedGallop(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_MountedRearing(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_Stopping(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_Reverse(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_LowJump(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_HighJump(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_BridgeJump(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_CutsceneUpdate(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_UpdateHorsebackArchery(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_FleePlayer(EnHorse* this, GlobalContext* globalCtx); + +extern CutsceneData D_02000230[]; +extern CutsceneData D_02002AC0[]; +extern Gfx D_06006530[]; + +static AnimationHeader* sEponaAnimHeaders[] = { + 0x06006D50, 0x06005584, 0x06004DEC, 0x06003CEC, 0x060075F0, 0x060032B0, 0x06001E2C, 0x06002470, 0x06002C38, +}; + +static AnimationHeader* sHniAnimHeaders[] = { + 0x06009FC4, 0x0600A6B4, 0x0600901C, 0x060085E0, 0x0600AF60, 0x06007B54, 0x0600506C, 0x06005684, 0x06005E20, +}; + +static AnimationHeader** sAnimationHeaders[] = { sEponaAnimHeaders, sHniAnimHeaders }; + +static f32 sPlaybackSpeeds[] = { 0.6666667f, 0.6666667f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.6666667f, 0.6666667f }; + +static SkeletonHeader* sSkeletonHeaders[] = { 0x06009D74, 0x06004A24 }; -/* const ActorInit En_Horse_InitVars = { ACTOR_EN_HORSE, ACTORCAT_BG, @@ -26,7 +72,7 @@ const ActorInit En_Horse_InitVars = { (ActorFunc)EnHorse_Draw, }; -static ColliderCylinderInit D_80A65EAC = { +static ColliderCylinderInit sCylinderInit1 = { { COLTYPE_NONE, AT_TYPE_PLAYER, @@ -46,7 +92,7 @@ static ColliderCylinderInit D_80A65EAC = { { 20, 70, 0, { 0, 0, 0 } }, }; -static ColliderCylinderInit D_80A65ED8 = { +static ColliderCylinderInit sCylinderInit2 = { { COLTYPE_NONE, AT_NONE, @@ -66,7 +112,7 @@ static ColliderCylinderInit D_80A65ED8 = { { 20, 70, 0, { 0, 0, 0 } }, }; -static ColliderJntSphElementInit D_80A65F04[1] = { +static ColliderJntSphElementInit sJntSphItemsInit[1] = { { { ELEMTYPE_UNK0, @@ -80,7 +126,7 @@ static ColliderJntSphElementInit D_80A65F04[1] = { }, }; -static ColliderJntSphInit D_80A65F28 = { +static ColliderJntSphInit sJntSphInit = { { COLTYPE_NONE, AT_NONE, @@ -90,253 +136,3611 @@ static ColliderJntSphInit D_80A65F28 = { COLSHAPE_JNTSPH, }, 1, - D_80A65F04, + sJntSphItemsInit, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B2F0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B450.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B590.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B5E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B61C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5B9C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BA84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BACC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BB90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BBBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BC68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BD94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5BFF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C0C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C888.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C8FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5C97C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CAEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D0A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D2C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D468.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D628.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D678.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D79C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DC8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DE38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E12C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E39C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E588.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E650.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E9F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EB54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EE80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F044.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F08C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F380.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F3DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F414.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F760.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FCAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FD30.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A600E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6044C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61058.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61078.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A610C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6121C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6140C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61778.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A624AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6255C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A626B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A627E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62868.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A629A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6304C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A631D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63364.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63FA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64150.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6437C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64480.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64578.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6467C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64ED4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A64F14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65014.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A6506C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Draw.s") +static CollisionCheckInfoInit D_80A65F38 = { 10, 35, 100, MASS_HEAVY }; + +typedef struct { + s16 scene; + Vec3s pos; + s16 angle; +} EnHorseSpawnpoint; + +static EnHorseSpawnpoint sHorseSpawns[] = { + // Hyrule Field + { SCENE_SPOT00, 16, 0, 1341, 0 }, { SCENE_SPOT00, -1297, 0, 1459, 0 }, + { SCENE_SPOT00, -5416, -300, 1296, 0 }, { SCENE_SPOT00, -4667, -300, 3620, 0 }, + { SCENE_SPOT00, -3837, 81, 5537, 0 }, { SCENE_SPOT00, -5093, -226, 6661, 0 }, + { SCENE_SPOT00, -6588, -79, 5053, 0 }, { SCENE_SPOT00, -7072, -500, 7538, 0 }, + { SCENE_SPOT00, -6139, -500, 8910, 0 }, { SCENE_SPOT00, -8497, -300, 7802, 0 }, + { SCENE_SPOT00, -5481, -499, 12127, 0 }, { SCENE_SPOT00, -4808, -700, 13583, 0 }, + { SCENE_SPOT00, -3416, -490, 12092, 0 }, { SCENE_SPOT00, -2915, 100, 8339, 0 }, + { SCENE_SPOT00, -2277, -500, 13247, 0 }, { SCENE_SPOT00, -1026, -500, 12101, 0 }, + { SCENE_SPOT00, 1427, -500, 13341, 0 }, { SCENE_SPOT00, -200, -486, 10205, 0 }, + { SCENE_SPOT00, -1469, 100, 7496, 0 }, { SCENE_SPOT00, -995, 168, 5652, 0 }, + { SCENE_SPOT00, 1938, 89, 6232, 0 }, { SCENE_SPOT00, 1387, -105, 9206, 0 }, + { SCENE_SPOT00, 1571, -223, 7701, 0 }, { SCENE_SPOT00, 3893, -121, 7068, 0 }, + { SCENE_SPOT00, 3179, 373, 5221, 0 }, { SCENE_SPOT00, 4678, -20, 3869, 0 }, + { SCENE_SPOT00, 3460, 246, 4207, 0 }, { SCENE_SPOT00, 3686, 128, 2366, 0 }, + { SCENE_SPOT00, 1791, 18, 152, 0 }, { SCENE_SPOT00, 3667, -16, 1399, 0 }, + { SCENE_SPOT00, 1827, -15, 983, 0 }, { SCENE_SPOT00, 1574, 399, 4318, 0 }, + { SCENE_SPOT00, 716, 95, 3391, 0 }, { SCENE_SPOT00, -1189, -41, 4739, 0 }, + { SCENE_SPOT00, -1976, -171, 4172, 0 }, { SCENE_SPOT00, 1314, 391, 5665, 0 }, + { SCENE_SPOT00, 112, 0, 1959, 0 }, { SCENE_SPOT00, -3011, -111, 9397, 0 }, + { SCENE_SPOT00, -5674, -270, 8585, 0 }, { SCENE_SPOT00, -8861, -300, 7836, 0 }, + { SCENE_SPOT00, -6056, -500, 7810, 0 }, { SCENE_SPOT00, -7306, -500, 5994, 0 }, + { SCENE_SPOT00, -7305, -500, 7605, 0 }, { SCENE_SPOT00, -7439, -300, 7600, 0 }, + { SCENE_SPOT00, -7464, -300, 6268, 0 }, { SCENE_SPOT00, -8080, -300, 7553, 0 }, + { SCENE_SPOT00, -8091, -300, 7349, 0 }, { SCENE_SPOT00, -8785, -300, 7383, 0 }, + { SCENE_SPOT00, -8745, -300, 7508, 0 }, { SCENE_SPOT00, -8777, -300, 7788, 0 }, + { SCENE_SPOT00, -8048, -299, 7738, 0 }, { SCENE_SPOT00, -7341, -184, 7730, 0 }, + { SCENE_SPOT00, -6410, -288, 7824, 0 }, { SCENE_SPOT00, -6326, -290, 8205, 0 }, + { SCENE_SPOT00, -6546, -292, 8400, 0 }, { SCENE_SPOT00, -7533, -180, 8459, 0 }, + { SCENE_SPOT00, -8024, -295, 7903, 0 }, { SCENE_SPOT00, -8078, -308, 7994, 0 }, + { SCENE_SPOT00, -9425, -287, 7696, 0 }, { SCENE_SPOT00, -9322, -292, 7577, 0 }, + { SCENE_SPOT00, -9602, -199, 7160, 0 }, { SCENE_SPOT00, -9307, -300, 7758, 0 }, + { SCENE_SPOT00, -9230, -300, 7642, 0 }, { SCENE_SPOT00, -7556, -499, 8695, 0 }, + { SCENE_SPOT00, -6438, -500, 8606, 0 }, { SCENE_SPOT00, -6078, -500, 8258, 0 }, + { SCENE_SPOT00, -6233, -500, 7613, 0 }, { SCENE_SPOT00, -5035, -205, 7814, 0 }, + { SCENE_SPOT00, -5971, -500, 8501, 0 }, { SCENE_SPOT00, -5724, -498, 10123, 0 }, + { SCENE_SPOT00, -5094, -392, 11106, 0 }, { SCENE_SPOT00, -5105, -393, 11312, 0 }, + { SCENE_SPOT00, -4477, -314, 11132, 0 }, { SCENE_SPOT00, -3867, -380, 11419, 0 }, + { SCENE_SPOT00, -2952, -500, 11944, 0 }, { SCENE_SPOT00, -2871, -488, 11743, 0 }, + { SCENE_SPOT00, -3829, -372, 11327, 0 }, { SCENE_SPOT00, -4439, -293, 10989, 0 }, + { SCENE_SPOT00, -5014, -381, 11086, 0 }, { SCENE_SPOT00, -5113, -188, 10968, 0 }, + { SCENE_SPOT00, -5269, -188, 11156, 0 }, { SCENE_SPOT00, -5596, -178, 9972, 0 }, + { SCENE_SPOT00, -5801, -288, 8518, 0 }, { SCENE_SPOT00, -4910, -178, 7931, 0 }, + { SCENE_SPOT00, -3586, 73, 8140, 0 }, { SCENE_SPOT00, -4487, -106, 9362, 0 }, + { SCENE_SPOT00, -4339, -112, 6412, 0 }, { SCENE_SPOT00, -3417, 105, 8194, 0 }, + { SCENE_SPOT00, -4505, -20, 6608, 0 }, { SCENE_SPOT00, -5038, -199, 6603, 0 }, + { SCENE_SPOT00, -4481, 1, 6448, 0 }, { SCENE_SPOT00, -5032, -168, 6418, 0 }, + { SCENE_SPOT00, -5256, -700, 14329, 0 }, { SCENE_SPOT00, -5749, -820, 15380, 0 }, + { SCENE_SPOT00, -3122, -700, 13608, 0 }, { SCENE_SPOT00, -3758, -525, 13228, 0 }, + { SCENE_SPOT00, -3670, -500, 13123, 0 }, { SCENE_SPOT00, -2924, -500, 13526, 0 }, + { SCENE_SPOT00, 1389, -115, 9370, 0 }, { SCENE_SPOT00, 548, -116, 8889, 0 }, + { SCENE_SPOT00, -106, -107, 8530, 0 }, { SCENE_SPOT00, -1608, 85, 7646, 0 }, + { SCENE_SPOT00, -5300, -700, 13772, 0 }, { SCENE_SPOT00, -5114, -700, 13400, 0 }, + { SCENE_SPOT00, -4561, -700, 13700, 0 }, { SCENE_SPOT00, -4762, -700, 14084, 0 }, + { SCENE_SPOT00, -2954, 100, 8216, 0 }, { SCENE_SPOT00, 1460, -104, 9246, 0 }, + { SCENE_SPOT00, 629, -105, 8791, 0 }, { SCENE_SPOT00, -10, -90, 8419, 0 }, + { SCENE_SPOT00, -1462, 100, 7504, 0 }, { SCENE_SPOT00, -3018, -500, 12493, 0 }, + { SCENE_SPOT00, -2994, -311, 10331, 0 }, { SCENE_SPOT00, -4006, -700, 14152, 0 }, + { SCENE_SPOT00, -4341, -500, 12743, 0 }, { SCENE_SPOT00, -5879, -497, 6799, 0 }, + { SCENE_SPOT00, 22, -473, 10103, 0 }, { SCENE_SPOT00, -1389, -192, 8874, 0 }, + { SCENE_SPOT00, -4, 92, 6866, 0 }, { SCENE_SPOT00, 483, 104, 6637, 0 }, + { SCENE_SPOT00, 1580, 183, 5987, 0 }, { SCENE_SPOT00, 1548, 308, 5077, 0 }, + { SCENE_SPOT00, 1511, 399, 4267, 0 }, { SCENE_SPOT00, 1358, 385, 4271, 0 }, + { SCENE_SPOT00, 1379, 395, 5063, 0 }, { SCENE_SPOT00, 1360, 394, 5870, 0 }, + { SCENE_SPOT00, 813, 283, 6194, 0 }, { SCENE_SPOT00, -57, 101, 6743, 0 }, + { SCENE_SPOT00, 91, 325, 5143, 0 }, { SCENE_SPOT00, 1425, -214, 7659, 0 }, + { SCENE_SPOT00, 3487, -19, 880, 0 }, { SCENE_SPOT00, 2933, 152, 2094, 0 }, + { SCENE_SPOT00, 2888, -145, 6862, 0 }, { SCENE_SPOT00, 1511, 67, 6471, 0 }, + { SCENE_SPOT00, 4051, -47, 1722, 0 }, { SCENE_SPOT00, -7335, -500, 8627, 0 }, + { SCENE_SPOT00, -7728, -462, 8498, 0 }, { SCENE_SPOT00, -7791, -446, 8832, 0 }, + { SCENE_SPOT00, -2915, -435, 11334, 0 }, { SCENE_SPOT00, 165, -278, 3352, 0 }, + + // Lake Hylia + { SCENE_SPOT06, -2109, -882, 1724, 0 }, { SCENE_SPOT06, -328, -1238, 2705, 0 }, + { SCENE_SPOT06, -3092, -1033, 3527, 0 }, + + // Gerudo Valley + { SCENE_SPOT09, 2687, -269, 753, 0 }, { SCENE_SPOT09, 2066, -132, 317, 0 }, + { SCENE_SPOT09, 523, -8, 635, 0 }, { SCENE_SPOT09, 558, 36, -323, 0 }, + { SCENE_SPOT09, 615, 51, -839, 0 }, { SCENE_SPOT09, -614, 32, 29, 0 }, + { SCENE_SPOT09, -639, -3, 553, 0 }, { SCENE_SPOT09, -540, 10, -889, 0 }, + { SCENE_SPOT09, -1666, 58, 378, 0 }, { SCENE_SPOT09, -3044, 210, -648, 0 }, + + // Gerudo's Fortress + { SCENE_SPOT12, -678, 21, -623, 0 }, { SCENE_SPOT12, 149, 333, -2499, 0 }, + { SCENE_SPOT12, 499, 581, -547, 0 }, { SCENE_SPOT12, 3187, 1413, -3775, 0 }, + { SCENE_SPOT12, 3198, 1413, 307, 0 }, { SCENE_SPOT12, 3380, 1413, -1200, 0 }, + { SCENE_SPOT12, -966, 1, -56, 0 }, { SCENE_SPOT12, -966, 24, -761, 0 }, + { SCENE_SPOT12, -694, 174, -2820, 0 }, + + /* Lon Lon Ranch */ + { SCENE_SPOT20, 1039, 0, 2051, 0 }, { SCENE_SPOT20, -1443, 0, 1429, 0 }, + { SCENE_SPOT20, 856, 0, -918, 0 }, // Hardcoded to always load in lon lon + { SCENE_SPOT20, 882, 0, -2256, 0 }, + { SCENE_SPOT20, -1003, 0, -755, 0 }, // Hardcoded to always load in lon lon + { SCENE_SPOT20, -2254, 0, -629, 0 }, + { SCENE_SPOT20, 907, 0, -2336, 0 }, +}; + +typedef struct { + s16 zMin; + s16 zMax; + + s16 xMin; + s16 xMax; + s16 xOffset; + + s16 angle; + s16 angleRange; + + Vec3s pos; +} BridgeJumpPoint; + +static BridgeJumpPoint sBridgeJumps[] = { + { -195, -40, 225, 120, 360, -0x4000, 0x7D0, -270, -52, -117 }, + { -195, -40, -240, -120, -360, 0x4000, 0x7D0, 270, -52, -117 }, +}; + +typedef struct { + s16 x; + s16 y; + s16 z; + s16 speed; + s16 angle; +} RaceWaypoint; + +typedef struct { + s32 numWaypoints; + RaceWaypoint* waypoints; +} RaceInfo; + +static RaceWaypoint sIngoRaceWaypoints[] = { + { 1056, 1, -1540, 11, 0x2A8D, }, + { 1593, 1, -985, 10, 0xFC27, }, + { 1645, 1, -221, 11, 0xE891, }, + { 985, 1, 403, 10, 0xBB9C, }, + { -1023, 1, 354, 11, 0xA37D, }, + { -1679, 1, -213, 10, 0x889C, }, + { -1552, 1, -1008, 11, 0x638D, }, + { -947, -1, -1604, 10, 0x4002, }, +}; + +static RaceInfo sIngoRace = { 8, sIngoRaceWaypoints }; +static s32 sAnimSoundFrames[] = { 0, 16 }; + +static InitChainEntry sInitChain[] = { + ICHAIN_F32(uncullZoneScale, 600, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), +}; + +static u8 sResetNoInput[] = { 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0 }; + +static s32 sIdleAnimIds[] = { 1, 3, 0, 3, 1, 0 }; + +static s16 sIngoAnimations[] = { 7, 6, 2, 2, 1, 1, 0, 0, 0, 0 }; + +void EnHorse_CsMoveInit(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action); +void EnHorse_CsJumpInit(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action); +void EnHorse_CsRearingInit(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action); +void EnHorse_WarpMoveInit(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action); +void EnHorse_CsWarpRearingInit(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action); + +static EnHorseCsFunc sCutsceneInitFuncs[] = { + NULL, + EnHorse_CsMoveInit, + EnHorse_CsJumpInit, + EnHorse_CsRearingInit, + EnHorse_WarpMoveInit, + EnHorse_CsWarpRearingInit, +}; + +void EnHorse_CsMoveToPoint(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action); +void EnHorse_CsJump(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action); +void EnHorse_CsRearing(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action); +void EnHorse_CsWarpMoveToPoint(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action); +void EnHorse_CsWarpRearing(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action); + +static EnHorseCsFunc sCutsceneActionFuncs[] = { + NULL, EnHorse_CsMoveToPoint, EnHorse_CsJump, EnHorse_CsRearing, EnHorse_CsWarpMoveToPoint, EnHorse_CsWarpRearing, +}; + +typedef struct { + s32 csAction; + s32 csFuncIdx; +} CsActionEntry; + +static CsActionEntry sCsActionTable[] = { + { 36, 1, }, { 37, 2, }, + { 38, 3, }, { 64, 4, }, + { 65, 5, }, +}; + +static RaceWaypoint sHbaWaypoints[] = { + { 3600, 1413, -5055, 11, 0x8001, }, + { 3360, 1413, -5220, 5, 0xC000, }, + { 3100, 1413, -4900, 5, 0x0000, }, + { 3600, 1413, -4100, 11, 0x0000, }, + { 3600, 1413, 360, 11, 0x0000, }, +}; + +static RaceInfo sHbaInfo = { 5, sHbaWaypoints }; + +static EnHorseActionFunc sActionFuncs[] = { + EnHorse_Frozen, + EnHorse_Inactive, + EnHorse_Idle, + EnHorse_FollowPlayer, + EnHorse_UpdateIngoRace, + EnHorse_MountedIdle, + EnHorse_MountedIdleWhinneying, + EnHorse_MountedTurn, + EnHorse_MountedWalk, + EnHorse_MountedTrot, + EnHorse_MountedGallop, + EnHorse_MountedRearing, + EnHorse_Stopping, + EnHorse_Reverse, + EnHorse_LowJump, + EnHorse_HighJump, + EnHorse_BridgeJump, + EnHorse_CutsceneUpdate, + EnHorse_UpdateHorsebackArchery, + EnHorse_FleePlayer, +}; + +s32 EnHorse_BgCheckBridgeJumpPoint(EnHorse* this, GlobalContext* globalCtx) { + f32 xMin; + f32 xMax; + s32 i; + + if (globalCtx->sceneNum != SCENE_SPOT09) { + return false; + } + if (this->actor.speedXZ < 12.8f) { + return false; + } + if ((gSaveContext.eventChkInf[9] & 0xF) == 0xF) { + return false; + } + + for (i = 0; i < 2; i++) { + xMin = sBridgeJumps[i].xMin; + xMax = (xMin + sBridgeJumps[i].xMax) + sBridgeJumps[i].xOffset; + if (xMax < xMin) { + f32 temp = xMin; + xMin = xMax; + xMax = temp; + } + if (sBridgeJumps[i].zMin < this->actor.world.pos.z && this->actor.world.pos.z < sBridgeJumps[i].zMax) { + if (xMin < this->actor.world.pos.x && this->actor.world.pos.x < xMax) { + if (sBridgeJumps[i].angle - sBridgeJumps[i].angleRange < this->actor.world.rot.y && + this->actor.world.rot.y < sBridgeJumps[i].angle + sBridgeJumps[i].angleRange) { + return true; + } + } + } + } + return false; +} + +void EnHorse_StartBridgeJump(EnHorse* this, GlobalContext* globalCtx); + +s32 EnHorse_CheckBridgeJumps(EnHorse* this, GlobalContext* globalCtx) { + f32 xMin; + f32 xMax; + s32 i; + + if (this->actor.speedXZ < 12.8f) { + return false; + } + + for (i = 0; i != 2; i++) { + xMin = sBridgeJumps[i].xMin; + xMax = sBridgeJumps[i].xMax + xMin; + + if (xMax < xMin) { + f32 temp = xMin; + xMin = xMax; + xMax = temp; + } + + if (sBridgeJumps[i].zMin < this->actor.world.pos.z && this->actor.world.pos.z < sBridgeJumps[i].zMax) { + if (xMin < this->actor.world.pos.x && this->actor.world.pos.x < xMax) { + if (sBridgeJumps[i].angle - sBridgeJumps[i].angleRange < this->actor.world.rot.y && + this->actor.world.rot.y < sBridgeJumps[i].angle + sBridgeJumps[i].angleRange) { + this->bridgeJumpIdx = i; + EnHorse_StartBridgeJump(this, globalCtx); + return true; + } + } + } + } + + return false; +} + +void EnHorse_RaceWaypointPos(RaceWaypoint* waypoints, s32 idx, Vec3f* pos) { + pos->x = waypoints[idx].x; + pos->y = waypoints[idx].y; + pos->z = waypoints[idx].z; +} + +void EnHorse_RotateToPoint(EnHorse* this, GlobalContext* globalCtx, Vec3f* pos, s16 turnAmount) { + func_8006DD9C(&this->actor, pos, turnAmount); +} + +void EnHorse_UpdateIngoRaceInfo(EnHorse* this, GlobalContext* globalCtx, RaceInfo* raceInfo) { + Vec3f curWaypointPos; + Vec3f prevWaypointPos; + f32 playerDist; + f32 sp50; + s16 relPlayerYaw; + f32 px; + f32 pz; + f32 d; + f32 dist; + s32 prevWaypoint; + + EnHorse_RaceWaypointPos(raceInfo->waypoints, this->curRaceWaypoint, &curWaypointPos); + Math3D_RotateXZPlane(&curWaypointPos, raceInfo->waypoints[this->curRaceWaypoint].angle, &px, &pz, &d); + if (((this->actor.world.pos.x * px) + (pz * this->actor.world.pos.z) + d) > 0.0f) { + this->curRaceWaypoint++; + if (this->curRaceWaypoint >= raceInfo->numWaypoints) { + this->curRaceWaypoint = 0; + } + } + + EnHorse_RaceWaypointPos(raceInfo->waypoints, this->curRaceWaypoint, &curWaypointPos); + + prevWaypoint = this->curRaceWaypoint - 1; + if (prevWaypoint < 0) { + prevWaypoint = raceInfo->numWaypoints - 1; + } + EnHorse_RaceWaypointPos(raceInfo->waypoints, prevWaypoint, &prevWaypointPos); + Math3D_PointDistToLine2D(this->actor.world.pos.x, this->actor.world.pos.z, prevWaypointPos.x, prevWaypointPos.z, + curWaypointPos.x, curWaypointPos.z, &dist); + EnHorse_RotateToPoint(this, globalCtx, &curWaypointPos, 400); + + if (dist < 90000.0f) { + playerDist = this->actor.xzDistToPlayer; + if (playerDist < 130.0f || this->jntSph.elements[0].info.ocElemFlags & 2) { + if (Math_SinS(this->actor.yawTowardsPlayer - this->actor.world.rot.y) > 0.0f) { + this->actor.world.rot.y = this->actor.world.rot.y - 280; + } else { + this->actor.world.rot.y = this->actor.world.rot.y + 280; + } + } else if (playerDist < 300.0f) { + if (Math_SinS(this->actor.yawTowardsPlayer - this->actor.world.rot.y) > 0.0f) { + this->actor.world.rot.y = this->actor.world.rot.y + 280; + } else { + this->actor.world.rot.y = this->actor.world.rot.y - 280; + } + } + this->actor.shape.rot.y = this->actor.world.rot.y; + } + + sp50 = Actor_WorldDistXZToActor(&this->actor, &PLAYER->actor); + relPlayerYaw = Actor_WorldYawTowardActor(&this->actor, &PLAYER->actor) - this->actor.world.rot.y; + if (sp50 <= 200.0f || (fabsf(Math_SinS(relPlayerYaw)) < 0.8f && Math_CosS(relPlayerYaw) > 0.0f)) { + if (this->actor.speedXZ < this->ingoHorseMaxSpeed) { + this->actor.speedXZ += 0.47f; + } else { + this->actor.speedXZ -= 0.47f; + } + this->ingoRaceFlags |= 1; + return; + } + + if (this->actor.speedXZ < raceInfo->waypoints[this->curRaceWaypoint].speed) { + this->actor.speedXZ = this->actor.speedXZ + 0.4f; + } else { + this->actor.speedXZ = this->actor.speedXZ - 0.4f; + } + this->ingoRaceFlags &= ~0x1; +} + +void EnHorse_PlayWalkingSound(EnHorse* this) { + if (sAnimSoundFrames[this->soundTimer] < this->curFrame) { + if (this->soundTimer == 0 && (sAnimSoundFrames[1] < this->curFrame)) { + return; + } + + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + if (++this->soundTimer > 1) { + this->soundTimer = 0; + } + } +} + +void EnHorse_PlayTrottingSound(EnHorse* this) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); +} + +void EnHorse_PlayGallopingSound(EnHorse* this) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); +} + +f32 EnHorse_SlopeSpeedMultiplier(EnHorse* this, GlobalContext* globalCtx) { + f32 multiplier = 1.0f; + + if (Math_CosS(this->actor.shape.rot.x) < 0.939262f && Math_SinS(this->actor.shape.rot.x) < 0.0f) { + multiplier = 0.7f; + } + return multiplier; +} + +void func_80A5BB90(GlobalContext* globalCtx, Vec3f* vec, Vec3f* arg2, f32* arg3) { + SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, vec, arg2, arg3); +} + +s32 func_80A5BBBC(GlobalContext* globalCtx, EnHorse* this, Vec3f* pos) { + Vec3f sp24; + f32 sp20; + f32 eyeDist; + + func_80A5BB90(globalCtx, pos, &sp24, &sp20); + if (fabsf(sp20) < 0.008f) { + return false; + } + eyeDist = Math3D_Vec3f_DistXYZ(pos, &globalCtx->view.eye); + return func_800314D4(globalCtx, &this->actor, &sp24, sp20) || eyeDist < 100.0f; +} + +void EnHorse_IdleAnimSounds(EnHorse* this, GlobalContext* globalCtx) { + if (this->animationIdx == ENHORSE_ANIM_IDLE && + ((this->curFrame > 35.0f && this->type == HORSE_EPONA) || + (this->curFrame > 28.0f && this->type == HORSE_HNI)) && + !(this->stateFlags & ENHORSE_SANDDUST_SOUND)) { + this->stateFlags |= ENHORSE_SANDDUST_SOUND; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } else if (this->animationIdx == ENHORSE_ANIM_REARING && this->curFrame > 25.0f && + !(this->stateFlags & ENHORSE_LAND2_SOUND)) { + this->stateFlags |= ENHORSE_LAND2_SOUND; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } +} + +s32 EnHorse_Spawn(EnHorse* this, GlobalContext* globalCtx) { + f32 minDist = 1e38f; + s32 spawn = false; + f32 dist; + s32 i; + Player* player; + Vec3f spawnPos; + + for (i = 0; i < 169; i++) { + if (sHorseSpawns[i].scene == globalCtx->sceneNum) { + player = PLAYER; + if (globalCtx->sceneNum != SCENE_SPOT20 || + //! Same flag checked twice + (Flags_GetEventChkInf(0x18) && ((gSaveContext.eventInf[0] & 0xF) != 6 || Flags_GetEventChkInf(0x18))) || + // always load two spawns inside lon lon + ((sHorseSpawns[i].pos.x == 856 && sHorseSpawns[i].pos.y == 0 && sHorseSpawns[i].pos.z == -918) || + (sHorseSpawns[i].pos.x == -1003 && sHorseSpawns[i].pos.y == 0 && sHorseSpawns[i].pos.z == -755))) { + + spawnPos.x = sHorseSpawns[i].pos.x; + spawnPos.y = sHorseSpawns[i].pos.y; + spawnPos.z = sHorseSpawns[i].pos.z; + dist = Math3D_Vec3f_DistXYZ(&player->actor.world.pos, &spawnPos); + + if (globalCtx->sceneNum) {} + if (!(minDist < dist) && !func_80A5BBBC(globalCtx, this, &spawnPos)) { + minDist = dist; + this->actor.world.pos.x = sHorseSpawns[i].pos.x; + this->actor.world.pos.y = sHorseSpawns[i].pos.y; + this->actor.world.pos.z = sHorseSpawns[i].pos.z; + this->actor.prevPos = this->actor.world.pos; + this->actor.world.rot.y = sHorseSpawns[i].angle; + this->actor.shape.rot.y = Actor_WorldYawTowardActor(&this->actor, &PLAYER->actor); + spawn = true; + SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, &this->actor.world.pos, + &this->actor.projectedPos, &this->actor.projectedW); + } + } + } + } + + return spawn; +} + +void EnHorse_ResetCutscene(EnHorse* this, GlobalContext* globalCtx) { + this->cutsceneAction = -1; + this->cutsceneFlags = 0; +} + +void EnHorse_ResetRace(EnHorse* this, GlobalContext* globalCtx) { + this->inRace = false; +} + +s32 EnHorse_PlayerCanMove(EnHorse* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if ((player->stateFlags1 & 1) || func_8002DD78(PLAYER) == 1 || (player->stateFlags1 & 0x100000) || + ((this->stateFlags & ENHORSE_FLAG_19) && !this->inRace) || this->action == ENHORSE_ACT_HBA || + player->actor.flags & 0x100 || globalCtx->csCtx.state != 0) { + return false; + } + return true; +} + +void EnHorse_ResetHorsebackArchery(EnHorse* this, GlobalContext* globalCtx) { + this->unk_39C = 0; + this->hbaStarted = 0; + this->hbaFlags = 0; +} + +void EnHorse_ClearDustFlags(u16* dustFlags) { + *dustFlags = 0; +} + +void EnHorse_Init(Actor* thisx, GlobalContext* globalCtx2) { + EnHorse* this = THIS; + GlobalContext* globalCtx = globalCtx2; + + AREG(6) = 0; + Actor_ProcessInitChain(&this->actor, sInitChain); + EnHorse_ClearDustFlags(&this->dustFlags); + DREG(53) = 0; + this->riderPos = this->actor.world.pos; + this->noInputTimer = 0; + this->noInputTimerMax = 0; + this->riderPos.y = this->riderPos.y + 70.0f; + + if (DREG(4) == 0) { + DREG(4) = 70; + } + + if (this->actor.params & 0x8000) { + this->actor.params &= ~0x8000; + this->type = HORSE_HNI; + + if ((this->bankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_HNI)) < 0) { + Actor_Kill(&this->actor); + return; + } + + do { + } while (!Object_IsLoaded(&globalCtx->objectCtx, this->bankIndex)); + + this->actor.objBankIndex = this->bankIndex; + Actor_SetObjectDependency(globalCtx, &this->actor); + this->boostSpeed = 12; + } else { + this->type = HORSE_EPONA; + this->boostSpeed = 14; + } + + // params was -1 + if (this->actor.params == 0x7FFF) { + this->actor.params = 1; + } + + if (globalCtx->sceneNum == SCENE_SOUKO) { + this->stateFlags = ENHORSE_UNRIDEABLE; + } else if (globalCtx->sceneNum == SCENE_SPOT12 && this->type == HORSE_HNI) { + this->stateFlags = ENHORSE_FLAG_18 | ENHORSE_UNRIDEABLE; + } else { + if (this->actor.params == 3) { + this->stateFlags = ENHORSE_FLAG_19 | ENHORSE_CANT_JUMP | ENHORSE_UNRIDEABLE; + } else if (this->actor.params == 6) { + this->stateFlags = ENHORSE_FLAG_19 | ENHORSE_CANT_JUMP; + if (Flags_GetEventChkInf(0x18) || DREG(1) != 0) { + this->stateFlags &= ~ENHORSE_CANT_JUMP; + this->stateFlags |= ENHORSE_FLAG_26; + } else if (gSaveContext.eventInf[0] & 0x40 && this->type == HORSE_HNI) { + this->stateFlags |= ENHORSE_FLAG_21 | ENHORSE_FLAG_20; + } + } else if (this->actor.params == 1) { + this->stateFlags = ENHORSE_FLAG_7; + } else { + this->stateFlags = 0; + } + } + + if (globalCtx->sceneNum == SCENE_SPOT20 && (gSaveContext.eventInf[0] & 0xF) == 6 && + Flags_GetEventChkInf(0x18) == 0 && !DREG(1)) { + this->stateFlags |= ENHORSE_FLAG_25; + } + + Actor_SetScale(&this->actor, 0.01f); + this->actor.gravity = -3.5f; + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawHorse, 20.0f); + this->action = ENHORSE_ACT_IDLE; + this->actor.speedXZ = 0.0f; + Collider_InitCylinder(globalCtx, &this->cyl1); + Collider_SetCylinder(globalCtx, &this->cyl1, &this->actor, &sCylinderInit1); + Collider_InitCylinder(globalCtx, &this->cyl2); + Collider_SetCylinder(globalCtx, &this->cyl2, &this->actor, &sCylinderInit2); + Collider_InitJntSph(globalCtx, &this->jntSph); + Collider_SetJntSph(globalCtx, &this->jntSph, &this->actor, &sJntSphInit, &this->jntSphList); + CollisionCheck_SetInfo(&this->actor.colChkInfo, DamageTable_Get(0xB), &D_80A65F38); + this->actor.focus.pos = this->actor.world.pos; + this->actor.focus.pos.y += 70.0f; + this->playerControlled = false; + + if ((globalCtx->sceneNum == SCENE_SPOT20) && (gSaveContext.sceneSetupIndex < 4)) { + if (this->type == HORSE_HNI) { + if (this->actor.world.rot.z == 0 || gSaveContext.nightFlag) { + Actor_Kill(&this->actor); + return; + } + if (Flags_GetEventChkInf(0x18)) { + Actor_Kill(&this->actor); + return; + } + if (this->actor.world.rot.z != 5) { + Actor_Kill(&this->actor); + return; + } + } else if (!Flags_GetEventChkInf(0x18) && !DREG(1) && gSaveContext.nightFlag) { + Actor_Kill(&this->actor); + return; + } + } else if (globalCtx->sceneNum == SCENE_MALON_STABLE) { + if (!gSaveContext.nightFlag || Flags_GetEventChkInf(0x18) || DREG(1) != 0 || LINK_IS_CHILD) { + Actor_Kill(&this->actor); + return; + } + this->stateFlags |= ENHORSE_UNRIDEABLE; + } + + func_800A663C(globalCtx, &this->skin, sSkeletonHeaders[this->type], + sAnimationHeaders[this->type][ENHORSE_ANIM_IDLE]); + this->animationIdx = ENHORSE_ANIM_IDLE; + Animation_PlayOnce(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx]); + this->numBoosts = 6; + this->blinkTimer = this->postDrawFunc = this->boostRegenTime = 0; + EnHorse_ResetCutscene(this, globalCtx); + EnHorse_ResetRace(this, globalCtx); + EnHorse_ResetHorsebackArchery(this, globalCtx); + + if (this->actor.params == 2) { + EnHorse_InitInactive(this); + } else if (this->actor.params == 3) { + EnHorse_InitIngoHorse(this); + this->rider = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_IN, this->actor.world.pos.x, + this->actor.world.pos.y, this->actor.world.pos.z, this->actor.shape.rot.x, + this->actor.shape.rot.y, 1, 1); + if (this->rider == NULL) { + __assert("this->race.rider != NULL", "../z_en_horse.c", 3077); + } + if (!(gSaveContext.eventInf[0] & 0x40)) { + this->ingoHorseMaxSpeed = 12.07f; + } else { + this->ingoHorseMaxSpeed = 12.625f; + } + } else if (this->actor.params == 7) { + EnHorse_InitCutscene(this, globalCtx); + } else if (this->actor.params == 8) { + EnHorse_InitHorsebackArchery(this); + Interface_InitHorsebackArchery(globalCtx); + } else if (globalCtx->sceneNum == SCENE_SPOT20 && !Flags_GetEventChkInf(0x18) && !DREG(1)) { + EnHorse_InitFleePlayer(this); + } else { + if (globalCtx->sceneNum == SCENE_SOUKO) { + EnHorse_ResetIdleAnimation(this); + } else if (globalCtx->sceneNum == SCENE_SPOT12 && this->type == HORSE_HNI) { + EnHorse_ResetIdleAnimation(this); + } else { + EnHorse_StartIdleRidable(this); + } + } + this->actor.home.rot.z = this->actor.world.rot.z = this->actor.shape.rot.z = 0; +} + +void EnHorse_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnHorse* this = THIS; + + if (this->stateFlags & ENHORSE_DRAW) { + func_800F89E8(&this->unk_21C); + } + func_800A6888(globalCtx, &this->skin); + Collider_DestroyCylinder(globalCtx, &this->cyl1); + Collider_DestroyCylinder(globalCtx, &this->cyl2); + Collider_DestroyJntSph(globalCtx, &this->jntSph); +} + +void EnHorse_RotateToPlayer(EnHorse* this, GlobalContext* globalCtx) { + EnHorse_RotateToPoint(this, globalCtx, &PLAYER->actor.world.pos, 400); + if (this->stateFlags & ENHORSE_OBSTACLE) { + this->actor.world.rot.y += 800.0f; + } + this->actor.shape.rot.y = this->actor.world.rot.y; +} + +void EnHorse_Freeze(EnHorse* this) { + if (this->action != ENHORSE_ACT_CS_UPDATE && this->action != ENHORSE_ACT_HBA) { + if (sResetNoInput[this->actor.params] != 0 && this->actor.params != 4) { + this->noInputTimer = 0; + this->noInputTimerMax = 0; + } + this->prevAction = this->action; + this->action = ENHORSE_ACT_FROZEN; + this->cyl1.base.ocFlags1 &= ~OC1_ON; + this->cyl2.base.ocFlags1 &= ~OC1_ON; + this->jntSph.base.ocFlags1 &= ~OC1_ON; + this->animationIdx = ENHORSE_ANIM_IDLE; + } +} + +void EnHorse_ChangeIdleAnimation(EnHorse* this, s32 arg1, f32 arg2); +void EnHorse_StartMountedIdleResetAnim(EnHorse* this); +void EnHorse_StartMountedIdle(EnHorse* this); +void EnHorse_StartGalloping(EnHorse* this); + +void EnHorse_Frozen(EnHorse* this, GlobalContext* globalCtx) { + this->actor.speedXZ = 0.0f; + this->noInputTimer--; + if (this->noInputTimer < 0) { + this->cyl1.base.ocFlags1 |= OC1_ON; + this->cyl2.base.ocFlags1 |= OC1_ON; + this->jntSph.base.ocFlags1 |= OC1_ON; + if (this->playerControlled == true) { + this->stateFlags &= ~ENHORSE_FLAG_7; + if (this->actor.params == 4) { + EnHorse_StartMountedIdleResetAnim(this); + } else if (this->actor.params == 9) { + this->actor.params = 5; + if (globalCtx->csCtx.state != 0) { + EnHorse_StartMountedIdle(this); + } else { + this->actor.speedXZ = 8.0f; + EnHorse_StartGalloping(this); + } + } else if (this->prevAction == 2) { + EnHorse_StartMountedIdle(this); + } else { + EnHorse_StartMountedIdleResetAnim(this); + } + if (this->actor.params != 0) { + this->actor.params = 0; + return; + } + } else { + if (this->prevAction == 5) { + EnHorse_ChangeIdleAnimation(this, 0, 0); + return; + } + if (this->prevAction == 6) { + EnHorse_ChangeIdleAnimation(this, 0, 0); + return; + } + EnHorse_ChangeIdleAnimation(this, 0, 0); + } + } +} + +void EnHorse_StickDirection(Vec2f* curStick, f32* stickMag, s16* angle); + +void EnHorse_UpdateSpeed(EnHorse* this, GlobalContext* globalCtx, f32 brakeDecel, f32 brakeAngle, f32 minStickMag, + f32 decel, f32 baseSpeed, s16 turnSpeed) { + s16* stickAnglePtr; // probably fake + f32 stickMag; + s16 stickAngle; + f32 temp_f12; + f32 traction; + s16 turn; + if (!EnHorse_PlayerCanMove(this, globalCtx)) { + if (this->actor.speedXZ > 8) { + this->actor.speedXZ -= decel; + } else if (this->actor.speedXZ < 0) { + this->actor.speedXZ = 0; + } + + return; + } + + stickAnglePtr = &stickAngle; + + baseSpeed *= EnHorse_SlopeSpeedMultiplier(this, globalCtx); + EnHorse_StickDirection(&this->curStick, &stickMag, &stickAngle); + if (Math_CosS(stickAngle) <= brakeAngle) { + this->actor.speedXZ -= brakeDecel; + this->actor.speedXZ = this->actor.speedXZ < 0.0f ? 0.0f : this->actor.speedXZ; + return; + } + + if (stickMag < minStickMag) { + this->stateFlags &= ~ENHORSE_BOOST; + this->stateFlags &= ~ENHORSE_BOOST_DECEL; + this->actor.speedXZ -= decel; + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ = 0.0f; + } + + return; + } + + if (this->stateFlags & ENHORSE_BOOST) { + if ((16 - this->boostTimer) > 0) { + this->actor.speedXZ = + (EnHorse_SlopeSpeedMultiplier(this, globalCtx) * this->boostSpeed - this->actor.speedXZ) / + (16 - this->boostTimer) + + this->actor.speedXZ; + } else { + this->actor.speedXZ = EnHorse_SlopeSpeedMultiplier(this, globalCtx) * this->boostSpeed; + } + + if ((EnHorse_SlopeSpeedMultiplier(this, globalCtx) * this->boostSpeed) <= this->actor.speedXZ) { + this->stateFlags &= ~ENHORSE_BOOST; + this->stateFlags |= ENHORSE_BOOST_DECEL; + } + + } else if (this->stateFlags & ENHORSE_BOOST_DECEL) { + if (baseSpeed < this->actor.speedXZ) { + temp_f12 = this->actor.speedXZ; + this->actor.speedXZ = temp_f12 - 0.06f; + } else if (this->actor.speedXZ < baseSpeed) { + this->actor.speedXZ = baseSpeed; + this->stateFlags &= ~ENHORSE_BOOST_DECEL; + } + } else { + this->actor.speedXZ += + (this->actor.speedXZ <= baseSpeed * (1.0f / 54.0f) * stickMag ? 1.0f : -1.0f) * 50.0f * 0.01f; + if (baseSpeed < this->actor.speedXZ) { + this->actor.speedXZ = this->actor.speedXZ - decel; + if (this->actor.speedXZ < baseSpeed) { + this->actor.speedXZ = baseSpeed; + } + } + } + + temp_f12 = *stickAnglePtr * (1 / 32236.f); + traction = 2.2f - (this->actor.speedXZ * (1.0f / this->boostSpeed)); + turn = *stickAnglePtr * temp_f12 * temp_f12 * traction; + turn = CLAMP(turn, -turnSpeed * traction, turnSpeed * traction); + this->actor.world.rot.y += turn; + this->actor.shape.rot.y = this->actor.world.rot.y; +} + +void EnHorse_StartMountedIdleResetAnim(EnHorse* this) { + this->skin.skelAnime.curFrame = 0.0f; + EnHorse_StartMountedIdle(this); + this->stateFlags &= ~ENHORSE_SANDDUST_SOUND; +} + +void EnHorse_StartMountedIdle(EnHorse* this) { + f32 curFrame; + + this->action = ENHORSE_ACT_MOUNTED_IDLE; + this->animationIdx = ENHORSE_ANIM_IDLE; + if ((this->curFrame > 35.0f && this->type == HORSE_EPONA) || (this->curFrame > 28.0f && this->type == HORSE_HNI)) { + if (!(this->stateFlags & ENHORSE_SANDDUST_SOUND)) { + this->stateFlags |= ENHORSE_SANDDUST_SOUND; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } + curFrame = this->skin.skelAnime.curFrame; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, curFrame, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); +} + +void EnHorse_StartReversingInterruptable(EnHorse* this); +void EnHorse_StartTurning(EnHorse* this); +void EnHorse_StartWalkingFromIdle(EnHorse* this); +void EnHorse_MountedIdleAnim(EnHorse* this); +void EnHorse_StartReversing(EnHorse* this); +void EnHorse_StartWalkingInterruptable(EnHorse* this); +void EnHorse_MountedIdleWhinney(EnHorse* this); +void EnHorse_StartWalking(EnHorse* this); + +void EnHorse_MountedIdle(EnHorse* this, GlobalContext* globalCtx) { + f32 mag; + s16 angle = 0; + + this->actor.speedXZ = 0; + EnHorse_StickDirection(&this->curStick, &mag, &angle); + if (mag > 10.0f && EnHorse_PlayerCanMove(this, globalCtx) == true) { + if (Math_CosS(angle) <= -0.5f) { + EnHorse_StartReversingInterruptable(this); + } else if (Math_CosS(angle) <= 0.7071) { + EnHorse_StartTurning(this); + } else { + EnHorse_StartWalkingFromIdle(this); + } + } + if (SkelAnime_Update(&this->skin.skelAnime)) { + EnHorse_MountedIdleAnim(this); + } +} + +void EnHorse_MountedIdleAnim(EnHorse* this) { + this->skin.skelAnime.curFrame = 0.0f; + EnHorse_MountedIdleWhinney(this); +} + +void EnHorse_MountedIdleWhinney(EnHorse* this) { + f32 curFrame; + + this->action = ENHORSE_ACT_MOUNTED_IDLE_WHINNEYING; + this->animationIdx = ENHORSE_ANIM_WHINNEY; + curFrame = this->skin.skelAnime.curFrame; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, curFrame, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } +} + +void EnHorse_MountedIdleWhinneying(EnHorse* this, GlobalContext* globalCtx) { + f32 stickMag; + s16 stickAngle = 0; + + this->actor.speedXZ = 0; + EnHorse_StickDirection(&this->curStick, &stickMag, &stickAngle); + if (stickMag > 10.0f && EnHorse_PlayerCanMove(this, globalCtx) == true) { + if (Math_CosS(stickAngle) <= -0.5f) { + EnHorse_StartReversingInterruptable(this); + } else if (Math_CosS(stickAngle) <= 0.7071) { + EnHorse_StartTurning(this); + } else { + EnHorse_StartWalkingFromIdle(this); + } + } + if (SkelAnime_Update(&this->skin.skelAnime)) { + EnHorse_StartMountedIdleResetAnim(this); + } +} + +void EnHorse_StartTurning(EnHorse* this) { + this->action = ENHORSE_ACT_MOUNTED_TURN; + this->soundTimer = 0; + this->animationIdx = ENHORSE_ANIM_WALK; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); +} + +void EnHorse_MountedTurn(EnHorse* this, GlobalContext* globalCtx) { + f32 stickMag; + s16 clampedYaw; + s16 stickAngle; + + this->actor.speedXZ = 0; + EnHorse_PlayWalkingSound(this); + EnHorse_StickDirection(&this->curStick, &stickMag, &stickAngle); + if (stickMag > 10.0f) { + if (!EnHorse_PlayerCanMove(this, globalCtx)) { + EnHorse_StartMountedIdleResetAnim(this); + } else if (Math_CosS(stickAngle) <= -0.5f) { + EnHorse_StartReversingInterruptable(this); + } else if (Math_CosS(stickAngle) <= 0.7071) { + clampedYaw = CLAMP(stickAngle, -800.0f, 800.0f); + this->actor.world.rot.y = this->actor.world.rot.y + clampedYaw; + this->actor.shape.rot.y = this->actor.world.rot.y; + } else { + EnHorse_StartWalkingInterruptable(this); + } + } + + if (SkelAnime_Update(&this->skin.skelAnime)) { + if (Math_CosS(stickAngle) <= 0.7071) { + EnHorse_StartTurning(this); + } else { + EnHorse_StartMountedIdleResetAnim(this); + } + } +} + +void EnHorse_StartWalkingFromIdle(EnHorse* this) { + EnHorse_StartWalkingInterruptable(this); + + if (!(this->stateFlags & ENHORSE_FLAG_8) && !(this->stateFlags & ENHORSE_FLAG_9)) { + this->stateFlags |= ENHORSE_FLAG_9; + this->waitTimer = 8; + return; + } + this->waitTimer = 0; +} + +void EnHorse_StartWalkingInterruptable(EnHorse* this) { + this->noInputTimer = 0; + this->noInputTimerMax = 0; + EnHorse_StartWalking(this); +} + +void EnHorse_StartWalking(EnHorse* this) { + this->action = ENHORSE_ACT_MOUNTED_WALK; + this->soundTimer = 0; + this->animationIdx = ENHORSE_ANIM_WALK; + this->waitTimer = 0; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); +} + +void EnHorse_MountedWalkingReset(EnHorse* this) { + this->action = ENHORSE_ACT_MOUNTED_WALK; + this->soundTimer = 0; + this->animationIdx = ENHORSE_ANIM_WALK; + this->waitTimer = 0; + Animation_PlayOnce(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx]); +} + +void EnHorse_StartTrotting(EnHorse* this); + +void EnHorse_MountedWalk(EnHorse* this, GlobalContext* globalCtx) { + f32 stickMag; + s16 stickAngle; + + EnHorse_PlayWalkingSound(this); + EnHorse_StickDirection(&this->curStick, &stickMag, &stickAngle); + if (this->noInputTimerMax == 0.0f || + (this->noInputTimer > 0.0f && this->noInputTimer < this->noInputTimerMax - 20.0f)) { + EnHorse_UpdateSpeed(this, globalCtx, 0.3f, -0.5f, 10.0f, 0.06f, 3.0f, 400); + } else { + this->actor.speedXZ = 3.0f; + } + + if (this->actor.speedXZ == 0.0f) { + this->stateFlags &= ~ENHORSE_FLAG_9; + EnHorse_StartMountedIdleResetAnim(this); + this->noInputTimer = 0; + this->noInputTimerMax = 0; + } else if (this->actor.speedXZ > 3.0f) { + this->stateFlags &= ~ENHORSE_FLAG_9; + EnHorse_StartTrotting(this); + this->noInputTimer = 0; + this->noInputTimerMax = 0; + } + + if (this->noInputTimer > 0.0f) { + this->noInputTimer--; + if (this->noInputTimer <= 0.0f) { + this->noInputTimerMax = 0; + } + } + + if (this->waitTimer <= 0) { + this->stateFlags &= ~ENHORSE_FLAG_9; + this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.75f; + if (SkelAnime_Update(&this->skin.skelAnime) || this->actor.speedXZ == 0.0f) { + if (this->noInputTimer <= 0.0f) { + if (this->actor.speedXZ > 3.0f) { + EnHorse_StartTrotting(this); + this->noInputTimer = 0; + this->noInputTimerMax = 0; + } else if ((stickMag < 10.0f) || (Math_CosS(stickAngle) <= -0.5f)) { + EnHorse_StartMountedIdleResetAnim(this); + this->noInputTimer = 0; + this->noInputTimerMax = 0; + } else { + EnHorse_MountedWalkingReset(this); + } + } + } + } else { + this->actor.speedXZ = 0.0f; + this->waitTimer--; + } +} + +void EnHorse_StartTrotting(EnHorse* this) { + this->action = ENHORSE_ACT_MOUNTED_TROT; + this->animationIdx = ENHORSE_ANIM_TROT; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); +} + +void EnHorse_MountedTrotReset(EnHorse* this) { + this->action = ENHORSE_ACT_MOUNTED_TROT; + this->animationIdx = ENHORSE_ANIM_TROT; + Animation_PlayOnce(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx]); +} + +void EnHorse_StartGallopingInterruptable(EnHorse* this); + +void EnHorse_MountedTrot(EnHorse* this, GlobalContext* globalCtx) { + f32 stickMag; + s16 stickAngle; + + EnHorse_UpdateSpeed(this, globalCtx, 0.3f, -0.5f, 10.0f, 0.06f, 6.0f, 400); + EnHorse_StickDirection(&this->curStick, &stickMag, &stickAngle); + if (this->actor.speedXZ < 3.0f) { + EnHorse_StartWalkingInterruptable(this); + } + + this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.375f; + if (SkelAnime_Update(&this->skin.skelAnime)) { + EnHorse_PlayTrottingSound(this); + func_800AA000(0.0f, 60, 8, 255); + if (this->actor.speedXZ >= 6.0f) { + EnHorse_StartGallopingInterruptable(this); + } else if (this->actor.speedXZ < 3.0f) { + EnHorse_StartWalkingInterruptable(this); + } else { + EnHorse_MountedTrotReset(this); + } + } +} + +void EnHorse_StartGallopingInterruptable(EnHorse* this) { + this->noInputTimerMax = 0; + this->noInputTimer = 0; + EnHorse_StartGalloping(this); +} + +void EnHorse_StartGalloping(EnHorse* this) { + this->action = ENHORSE_ACT_MOUNTED_GALLOP; + this->animationIdx = ENHORSE_ANIM_GALLOP; + this->unk_234 = 0; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); +} + +void EnHorse_MountedGallopReset(EnHorse* this) { + this->noInputTimerMax = 0; + this->noInputTimer = 0; + this->action = ENHORSE_ACT_MOUNTED_GALLOP; + this->animationIdx = ENHORSE_ANIM_GALLOP; + this->unk_234 = 0; + Animation_PlayOnce(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx]); +} + +void EnHorse_JumpLanding(EnHorse* this, GlobalContext* globalCtx) { + Vec3s* jointTable; + f32 y; + + this->action = ENHORSE_ACT_MOUNTED_GALLOP; + this->animationIdx = ENHORSE_ANIM_GALLOP; + Animation_PlayOnce(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx]); + jointTable = this->skin.skelAnime.jointTable; + y = jointTable->y; + this->riderPos.y += y * 0.01f; + this->postDrawFunc = NULL; +} + +void EnHorse_StartBraking(EnHorse* this, GlobalContext* globalCtx); + +void EnHorse_MountedGallop(EnHorse* this, GlobalContext* globalCtx) { + f32 stickMag; + s16 stickAngle; + + EnHorse_StickDirection(&this->curStick, &stickMag, &stickAngle); + + if (this->noInputTimer <= 0.0f) { + EnHorse_UpdateSpeed(this, globalCtx, 0.3f, -0.5f, 10.0f, 0.06f, 8.0f, 0x190); + } else if (this->noInputTimer > 0.0f) { + this->noInputTimer -= 1; + this->actor.speedXZ = 8.0f; + } + if (this->actor.speedXZ < 6.0f) { + EnHorse_StartTrotting(this); + } + + this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.3f; + if (SkelAnime_Update(&this->skin.skelAnime)) { + EnHorse_PlayGallopingSound(this); + func_800AA000(0, 120, 8, 255); + if (EnHorse_PlayerCanMove(this, globalCtx) == true) { + if (stickMag >= 10.0f && Math_CosS(stickAngle) <= -0.5f) { + EnHorse_StartBraking(this, globalCtx); + } else if (this->actor.speedXZ < 6.0f) { + EnHorse_StartTrotting(this); + } else { + EnHorse_MountedGallopReset(this); + } + return; + } + EnHorse_MountedGallopReset(this); + } +} + +void EnHorse_StartRearing(EnHorse* this) { + this->action = ENHORSE_ACT_MOUNTED_REARING; + this->animationIdx = ENHORSE_ANIM_REARING; + this->stateFlags &= ~ENHORSE_LAND2_SOUND; + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + func_800AA000(0.0f, 180, 20, 100); + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); +} + +void EnHorse_MountedRearing(EnHorse* this, GlobalContext* globalCtx) { + f32 stickMag; + s16 stickAngle; + + this->actor.speedXZ = 0; + if (this->curFrame > 25.0f) { + if (!(this->stateFlags & ENHORSE_LAND2_SOUND)) { + this->stateFlags |= ENHORSE_LAND2_SOUND; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + func_800AA000(0, 180, 20, 100); + } + } + + EnHorse_StickDirection(&this->curStick, &stickMag, &stickAngle); + if (SkelAnime_Update(&this->skin.skelAnime)) { + if (EnHorse_PlayerCanMove(this, globalCtx) == true) { + if (this->stateFlags & ENHORSE_FORCE_REVERSING) { + this->noInputTimer = 100; + this->noInputTimerMax = 100; + this->stateFlags &= ~ENHORSE_FORCE_REVERSING; + EnHorse_StartReversing(this); + } else if (this->stateFlags & ENHORSE_FORCE_WALKING) { + this->noInputTimer = 100; + this->noInputTimerMax = 100; + this->stateFlags &= ~ENHORSE_FORCE_WALKING; + EnHorse_StartWalking(this); + } else if (Math_CosS(stickAngle) <= -0.5f) { + EnHorse_StartReversingInterruptable(this); + } else { + EnHorse_StartMountedIdleResetAnim(this); + } + return; + } + EnHorse_StartMountedIdleResetAnim(this); + } +} + +void EnHorse_StartBraking(EnHorse* this, GlobalContext* globalCtx) { + this->action = ENHORSE_ACT_STOPPING; + this->animationIdx = ENHORSE_ANIM_STOPPING; + + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SLIP, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.5f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); + + this->stateFlags |= ENHORSE_STOPPING_NEIGH_SOUND; + this->stateFlags &= ~ENHORSE_BOOST; +} + +void EnHorse_Stopping(EnHorse* this, GlobalContext* globalCtx) { + if (this->actor.speedXZ > 0.0f) { + this->actor.speedXZ = this->actor.speedXZ - 0.6f; + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ = 0.0f; + } + } + + if (this->stateFlags & ENHORSE_STOPPING_NEIGH_SOUND && this->skin.skelAnime.curFrame > 29.0f) { + this->actor.speedXZ = 0.0f; + if (Rand_ZeroOne() > 0.5) { + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + func_800AA000(0.0f, 180, 20, 100); + this->stateFlags &= ~ENHORSE_STOPPING_NEIGH_SOUND; + } else { + EnHorse_StartMountedIdleResetAnim(this); + } + } + + if (this->skin.skelAnime.curFrame > 29.0f) { + this->actor.speedXZ = 0.0f; + } else if (this->actor.speedXZ > 3.0f && this->stateFlags & ENHORSE_FORCE_REVERSING) { + this->actor.speedXZ = 3.0f; + } + + if (SkelAnime_Update(&this->skin.skelAnime)) { + if (this->stateFlags & ENHORSE_FORCE_REVERSING) { + this->noInputTimer = 100; + this->noInputTimerMax = 100; + EnHorse_StartReversing(this); + this->stateFlags &= ~ENHORSE_FORCE_REVERSING; + } else { + EnHorse_StartMountedIdleResetAnim(this); + } + } +} + +void EnHorse_StartReversingInterruptable(EnHorse* this) { + this->noInputTimerMax = 0; + this->noInputTimer = 0; + EnHorse_StartReversing(this); +} + +void EnHorse_StartReversing(EnHorse* this) { + this->action = ENHORSE_ACT_REVERSE; + this->animationIdx = ENHORSE_ANIM_WALK; + this->soundTimer = 0; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_LOOP, -3.0f); +} + +void EnHorse_Reverse(EnHorse* this, GlobalContext* globalCtx) { + f32 stickMag; + s16 stickAngle; + s16 turnAmount; + Player* player = PLAYER; + + EnHorse_PlayWalkingSound(this); + EnHorse_StickDirection(&this->curStick, &stickMag, &stickAngle); + if (EnHorse_PlayerCanMove(this, globalCtx) == true) { + if (this->noInputTimerMax == 0.0f || + (this->noInputTimer > 0.0f && this->noInputTimer < this->noInputTimerMax - 20.0f)) { + if (stickMag < 10.0f && this->noInputTimer <= 0.0f) { + EnHorse_StartMountedIdleResetAnim(this); + this->actor.speedXZ = 0.0f; + return; + } + if (stickMag < 10.0f) { + stickAngle = -0x7FFF; + } else if (Math_CosS(stickAngle) > -0.5f) { + this->noInputTimerMax = 0; + EnHorse_StartMountedIdleResetAnim(this); + this->actor.speedXZ = 0.0f; + return; + } + } else if (stickMag < 10.0f) { + stickAngle = -0x7FFF; + } + } else if (player->actor.flags & 0x100) { + EnHorse_StartMountedIdleResetAnim(this); + this->actor.speedXZ = 0.0f; + return; + } else { + stickAngle = -0x7FFF; + } + + this->actor.speedXZ = -2.0f; + turnAmount = 0x7FFF - stickAngle; + turnAmount = CLAMP(turnAmount, -1200.0f, 1200.0f); + this->actor.world.rot.y += turnAmount; + this->actor.shape.rot.y = this->actor.world.rot.y; + + if (this->noInputTimer > 0.0f) { + this->noInputTimer--; + if (this->noInputTimer <= 0.0f) { + this->noInputTimerMax = 0; + } + } + this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.5f * 1.5f; + if (SkelAnime_Update(&this->skin.skelAnime) && (f32)this->noInputTimer <= 0.0f && + EnHorse_PlayerCanMove(this, globalCtx) == true) { + if (stickMag > 10.0f && Math_CosS(stickAngle) <= -0.5f) { + this->noInputTimerMax = 0; + EnHorse_StartReversingInterruptable(this); + } else if (stickMag < 10.0f) { + this->noInputTimerMax = 0; + EnHorse_StartMountedIdleResetAnim(this); + } else { + EnHorse_StartReversing(this); + } + } +} + +void EnHorse_StartLowJump(EnHorse* this, GlobalContext* globalCtx); + +void EnHorse_LowJumpInit(EnHorse* this, GlobalContext* globalCtx) { + this->skin.skelAnime.curFrame = 0.0f; + EnHorse_StartLowJump(this, globalCtx); +} + +void EnHorse_StartLowJump(EnHorse* this, GlobalContext* globalCtx) { + f32 curFrame; + Vec3s* jointTable; + f32 y; + + this->action = ENHORSE_ACT_LOW_JUMP; + this->animationIdx = ENHORSE_ANIM_LOW_JUMP; + curFrame = this->skin.skelAnime.curFrame; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.5f, curFrame, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); + + this->postDrawFunc = NULL; + this->jumpStartY = this->actor.world.pos.y; + + this->actor.gravity = 0.0f; + this->actor.velocity.y = 0; + + jointTable = this->skin.skelAnime.jointTable; + y = jointTable->y; + this->riderPos.y -= y * 0.01f; + + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + func_800AA000(0.0f, 170, 10, 10); +} + +void EnHorse_Stub1(EnHorse* this) { +} + +void EnHorse_LowJump(EnHorse* this, GlobalContext* globalCtx) { + Vec3f pad; + Vec3s* jointTable; + f32 curFrame; + f32 y; + + curFrame = this->skin.skelAnime.curFrame; + this->stateFlags |= ENHORSE_JUMPING; + this->actor.speedXZ = 12.0f; + if (curFrame > 17.0f) { + this->actor.gravity = -3.5f; + if (this->actor.velocity.y == 0) { + this->actor.velocity.y = -6.0f; + } + if (this->actor.world.pos.y < this->actor.floorHeight + 90.0f) { + this->skin.skelAnime.playSpeed = 1.5f; + } else { + this->skin.skelAnime.playSpeed = 0; + } + } else { + jointTable = this->skin.skelAnime.jointTable; + y = jointTable->y; + this->actor.world.pos.y = this->jumpStartY + y * 0.01f; + } + + if (SkelAnime_Update(&this->skin.skelAnime) || + (curFrame > 17.0f && this->actor.world.pos.y < this->actor.floorHeight - this->actor.velocity.y + 80.0f)) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + func_800AA000(0.0f, 255, 10, 80); + this->stateFlags &= ~ENHORSE_JUMPING; + this->actor.gravity = -3.5f; + this->actor.world.pos.y = this->actor.floorHeight; + func_80028A54(globalCtx, 25.0f, &this->actor.world.pos); + EnHorse_JumpLanding(this, globalCtx); + } +} + +void EnHorse_StartHighJump(EnHorse* this, GlobalContext* globalCtx); + +void EnHorse_HighJumpInit(EnHorse* this, GlobalContext* globalCtx) { + this->skin.skelAnime.curFrame = 0.0f; + EnHorse_StartHighJump(this, globalCtx); +} + +void EnHorse_StartHighJump(EnHorse* this, GlobalContext* globalCtx) { + f32 curFrame; + Vec3s* jointTable; + f32 y; + + this->action = ENHORSE_ACT_HIGH_JUMP; + this->animationIdx = ENHORSE_ANIM_HIGH_JUMP; + curFrame = this->skin.skelAnime.curFrame; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.5f, curFrame, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); + + this->jumpStartY = this->actor.world.pos.y; + this->postDrawFunc = NULL; + + this->actor.gravity = 0; + this->actor.velocity.y = 0.0f; + + jointTable = this->skin.skelAnime.jointTable; + y = jointTable->y; + this->riderPos.y -= y * 0.01f; + + this->stateFlags |= ENHORSE_CALC_RIDER_POS; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + func_800AA000(0.0f, 170, 10, 10); +} + +void EnHorse_Stub2(EnHorse* this) { +} + +void EnHorse_HighJump(EnHorse* this, GlobalContext* globalCtx) { + Vec3f pad; + Vec3s* jointTable; + f32 curFrame; + f32 y; + + curFrame = this->skin.skelAnime.curFrame; + this->stateFlags |= ENHORSE_JUMPING; + this->actor.speedXZ = 13.0f; + if (curFrame > 23.0f) { + this->actor.gravity = -3.5f; + if (this->actor.velocity.y == 0) { + this->actor.velocity.y = -10.5f; + } + + if (this->actor.world.pos.y < this->actor.floorHeight + 90.0f) { + this->skin.skelAnime.playSpeed = 1.5f; + } else { + this->skin.skelAnime.playSpeed = 0; + } + } else { + jointTable = this->skin.skelAnime.jointTable; + y = jointTable->y; + this->actor.world.pos.y = this->jumpStartY + y * 0.01f; + } + + if (SkelAnime_Update(&this->skin.skelAnime) || + (curFrame > 23.0f && this->actor.world.pos.y < this->actor.floorHeight - this->actor.velocity.y + 80.0f)) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + func_800AA000(0.0f, 255, 10, 80); + this->stateFlags &= ~ENHORSE_JUMPING; + this->actor.gravity = -3.5f; + this->actor.world.pos.y = this->actor.floorHeight; + func_80028A54(globalCtx, 25.0f, &this->actor.world.pos); + EnHorse_JumpLanding(this, globalCtx); + } +} + +void EnHorse_InitInactive(EnHorse* this) { + this->cyl1.base.ocFlags1 &= ~OC1_ON; + this->cyl2.base.ocFlags1 &= ~OC1_ON; + this->jntSph.base.ocFlags1 &= ~OC1_ON; + this->action = ENHORSE_ACT_INACTIVE; + this->animationIdx = ENHORSE_ANIM_WALK; + this->stateFlags |= ENHORSE_INACTIVE; + this->followTimer = 0; +} + +void EnHorse_SetFollowAnimation(EnHorse* this, GlobalContext* globalCtx); + +void EnHorse_Inactive(EnHorse* this, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + + if (DREG(53) != 0 && this->type == HORSE_EPONA) { + DREG(53) = 0; + if (EnHorse_Spawn(this, globalCtx) != 0) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + this->stateFlags &= ~ENHORSE_INACTIVE; + gSaveContext.horseData.scene = globalCtx->sceneNum; + + // Focus the camera on Epona + Camera_SetParam(globalCtx->cameraPtrs[0], 8, this); + Camera_ChangeSetting(globalCtx->cameraPtrs[0], 0x38); + Camera_SetCameraData(globalCtx->cameraPtrs[0], 4, NULL, NULL, 0x51, 0, 0); + } + } + if (!(this->stateFlags & ENHORSE_INACTIVE)) { + this->followTimer = 0; + EnHorse_SetFollowAnimation(this, globalCtx); + this->actor.params = 0; + this->cyl1.base.ocFlags1 |= OC1_ON; + this->cyl2.base.ocFlags1 |= OC1_ON; + this->jntSph.base.ocFlags1 |= OC1_ON; + } +} + +void EnHorse_PlayIdleAnimation(EnHorse* this, s32 anim, f32 morphFrames, f32 startFrame) { + this->action = ENHORSE_ACT_IDLE; + this->actor.speedXZ = 0.0f; + if (anim != ENHORSE_ANIM_IDLE && anim != ENHORSE_ANIM_WHINNEY && anim != ENHORSE_ANIM_REARING) { + anim = ENHORSE_ANIM_IDLE; + } + if (anim != this->animationIdx) { + this->animationIdx = anim; + if (this->animationIdx == ENHORSE_ANIM_IDLE) { + this->stateFlags &= ~ENHORSE_SANDDUST_SOUND; + } else if (this->animationIdx == ENHORSE_ANIM_WHINNEY) { + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + } else if (this->animationIdx == ENHORSE_ANIM_REARING) { + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + this->stateFlags &= ~ENHORSE_LAND2_SOUND; + } + + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, startFrame, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, + morphFrames); + } +} + +void EnHorse_ChangeIdleAnimation(EnHorse* this, s32 anim, f32 morphFrames) { + EnHorse_PlayIdleAnimation(this, anim, morphFrames, this->curFrame); +} + +void EnHorse_ResetIdleAnimation(EnHorse* this) { + this->animationIdx = ENHORSE_ANIM_WALK; // this forces anim 0 to play from the beginning + EnHorse_PlayIdleAnimation(this, this->animationIdx, 0, 0); +} + +void EnHorse_StartIdleRidable(EnHorse* this) { + EnHorse_ResetIdleAnimation(this); + this->stateFlags &= ~ENHORSE_UNRIDEABLE; +} + +void EnHorse_StartMovingAnimation(EnHorse* this, s32 arg1, f32 arg2, f32 arg3); + +void EnHorse_Idle(EnHorse* this, GlobalContext* globalCtx) { + this->actor.speedXZ = 0.0f; + EnHorse_IdleAnimSounds(this, globalCtx); + + if (DREG(53) && this->type == HORSE_EPONA) { + DREG(53) = 0; + if (!func_80A5BBBC(globalCtx, this, &this->actor.world.pos)) { + if (EnHorse_Spawn(this, globalCtx)) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + this->followTimer = 0; + EnHorse_SetFollowAnimation(this, globalCtx); + Camera_SetParam(globalCtx->cameraPtrs[0], 8, this); + Camera_ChangeSetting(globalCtx->cameraPtrs[0], 0x38); + Camera_SetCameraData(globalCtx->cameraPtrs[0], 4, NULL, NULL, 0x51, 0, 0); + } + } else { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + this->followTimer = 0; + EnHorse_StartMovingAnimation(this, 6, -3.0f, 0.0f); + } + } + + if (SkelAnime_Update(&this->skin.skelAnime)) { + s32 idleAnimIdx = 0; + + if (this->animationIdx != ENHORSE_ANIM_IDLE) { + if (this->animationIdx == ENHORSE_ANIM_WHINNEY) { + idleAnimIdx = 1; + } else if (this->animationIdx == ENHORSE_ANIM_REARING) { + idleAnimIdx = 2; + } + } + + // Play one of the two other idle animations + EnHorse_PlayIdleAnimation(this, sIdleAnimIds[(Rand_ZeroOne() > 0.5f ? 0 : 1) + idleAnimIdx * 2], 0.0f, 0.0f); + } +} + +void EnHorse_StartMovingAnimation(EnHorse* this, s32 animId, f32 morphFrames, f32 startFrame) { + this->action = ENHORSE_ACT_FOLLOW_PLAYER; + this->stateFlags &= ~ENHORSE_TURNING_TO_PLAYER; + if (animId != ENHORSE_ANIM_TROT && animId != ENHORSE_ANIM_GALLOP && animId != ENHORSE_ANIM_WALK) { + animId = ENHORSE_ANIM_WALK; + } + if (this->animationIdx != animId) { + this->animationIdx = animId; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, startFrame, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, + morphFrames); + } else { + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, startFrame, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, + 0.0f); + } +} + +void EnHorse_SetFollowAnimation(EnHorse* this, GlobalContext* globalCtx) { + s32 animId = ENHORSE_ANIM_WALK; + f32 distToPlayer; + + distToPlayer = Actor_WorldDistXZToActor(&this->actor, &PLAYER->actor); + if (distToPlayer > 400.0f) { + animId = ENHORSE_ANIM_GALLOP; + } else if (!(distToPlayer <= 300.0f)) { + if (distToPlayer <= 400.0f) { + animId = ENHORSE_ANIM_TROT; + } + } + + if (this->animationIdx == ENHORSE_ANIM_GALLOP) { + if (distToPlayer > 400.0f) { + animId = ENHORSE_ANIM_GALLOP; + } else { + animId = ENHORSE_ANIM_TROT; + } + } else if (this->animationIdx == ENHORSE_ANIM_TROT) { + if (distToPlayer > 400.0f) { + animId = ENHORSE_ANIM_GALLOP; + } else if (distToPlayer < 300.0f) { + animId = ENHORSE_ANIM_WALK; + } else { + animId = ENHORSE_ANIM_TROT; + } + } else if (this->animationIdx == ENHORSE_ANIM_WALK) { + if (distToPlayer > 300.0f) { + animId = ENHORSE_ANIM_TROT; + } else { + animId = ENHORSE_ANIM_WALK; + } + } + EnHorse_StartMovingAnimation(this, animId, -3.0f, 0.0f); +} + +void EnHorse_FollowPlayer(EnHorse* this, GlobalContext* globalCtx) { + f32 distToPlayer; + f32 angleDiff; + + DREG(53) = 0; + distToPlayer = Actor_WorldDistXZToActor(&this->actor, &PLAYER->actor); + + // First rotate if the player is behind + if ((this->playerDir == PLAYER_DIR_BACK_R || this->playerDir == PLAYER_DIR_BACK_L) && + (distToPlayer > 300.0f && !(this->stateFlags & ENHORSE_TURNING_TO_PLAYER))) { + this->animationIdx = ENHORSE_ANIM_REARING; + this->stateFlags |= ENHORSE_TURNING_TO_PLAYER; + this->angleToPlayer = Actor_WorldYawTowardActor(&this->actor, &PLAYER->actor); + angleDiff = (f32)this->angleToPlayer - (f32)this->actor.world.rot.y; + if (angleDiff > 32767.f) { + angleDiff -= 32767.0f; + } else if (angleDiff < -32767) { + angleDiff += 32767; + } + + this->followPlayerTurnSpeed = + angleDiff / Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]); + Animation_PlayOnce(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx]); + this->skin.skelAnime.playSpeed = 1.0f; + this->stateFlags &= ~ENHORSE_LAND2_SOUND; + this->unk_21C = this->unk_228; + } else if (this->stateFlags & ENHORSE_TURNING_TO_PLAYER) { + this->actor.world.rot.y = this->actor.world.rot.y + this->followPlayerTurnSpeed; + this->actor.shape.rot.y = this->actor.world.rot.y; + if (this->curFrame > 25.0f) { + if (!(this->stateFlags & ENHORSE_LAND2_SOUND)) { + this->stateFlags |= ENHORSE_LAND2_SOUND; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } + } else { + EnHorse_RotateToPlayer(this, globalCtx); + } + + if (this->animationIdx == ENHORSE_ANIM_GALLOP) { + this->actor.speedXZ = 8; + this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.3f; + } else if (this->animationIdx == ENHORSE_ANIM_TROT) { + this->actor.speedXZ = 6; + this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.375f; + } else if (this->animationIdx == ENHORSE_ANIM_WALK) { + this->actor.speedXZ = 3; + EnHorse_PlayWalkingSound(this); + this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.75f; + } else { + this->actor.speedXZ = 0; + this->skin.skelAnime.playSpeed = 1.0f; + } + + if (!(this->stateFlags & ENHORSE_TURNING_TO_PLAYER) && ++this->followTimer > 300) { + EnHorse_StartIdleRidable(this); + this->unk_21C = this->unk_228; + + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + } + + if (SkelAnime_Update(&this->skin.skelAnime)) { + if (this->animationIdx == ENHORSE_ANIM_GALLOP) { + EnHorse_PlayGallopingSound(this); + } else if (this->animationIdx == ENHORSE_ANIM_TROT) { + EnHorse_PlayTrottingSound(this); + } + this->stateFlags &= ~ENHORSE_TURNING_TO_PLAYER; + if (distToPlayer < 100.0f) { + EnHorse_StartIdleRidable(this); + } else { + EnHorse_SetFollowAnimation(this, globalCtx); + } + } +} + +void EnHorse_UpdateIngoHorseAnim(EnHorse* this); + +void EnHorse_InitIngoHorse(EnHorse* this) { + this->curRaceWaypoint = 0; + this->soundTimer = 0; + this->actor.speedXZ = 0.0f; + EnHorse_UpdateIngoHorseAnim(this); + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_IT_INGO_HORSE_NEIGH, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } +} + +void EnHorse_SetIngoAnimation(s32 idx, f32 curFrame, s32 arg2, s16* animIdxOut, f32* curFrameOut) { + *animIdxOut = sIngoAnimations[idx]; + *curFrameOut = curFrame; + if (idx == 3 || idx == 7 || idx == 8 || idx == 4) { + *curFrameOut = 0.0f; + } + if (arg2 == 1) { + if (idx == 5) { + *animIdxOut = 4; + *curFrameOut = curFrame; + } else if (idx == 6) { + *animIdxOut = 3; + *curFrameOut = curFrame; + } + } +} + +void EnHorse_UpdateIngoHorseAnim(EnHorse* this) { + s32 animChanged = 0; + f32 animSpeed; + + this->action = ENHORSE_ACT_INGO_RACE; + this->stateFlags &= ~ENHORSE_SANDDUST_SOUND; + if (this->actor.speedXZ == 0.0f) { + if (this->animationIdx != ENHORSE_ANIM_IDLE) { + animChanged = true; + } + this->animationIdx = ENHORSE_ANIM_IDLE; + } else if (this->actor.speedXZ <= 3.0f) { + if (this->animationIdx != ENHORSE_ANIM_WALK) { + animChanged = true; + } + this->animationIdx = ENHORSE_ANIM_WALK; + } else if (this->actor.speedXZ <= 6.0f) { + if (this->animationIdx != ENHORSE_ANIM_TROT) { + animChanged = true; + } + this->animationIdx = ENHORSE_ANIM_TROT; + } else { + if (this->animationIdx != ENHORSE_ANIM_GALLOP) { + animChanged = true; + } + this->animationIdx = ENHORSE_ANIM_GALLOP; + } + + if (this->animationIdx == ENHORSE_ANIM_WALK) { + animSpeed = this->actor.speedXZ * 0.5f; + } else if (this->animationIdx == ENHORSE_ANIM_TROT) { + animSpeed = this->actor.speedXZ * 0.25f; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } else if (this->animationIdx == ENHORSE_ANIM_GALLOP) { + animSpeed = this->actor.speedXZ * 0.2f; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } else { + animSpeed = 1.0f; + } + + if (animChanged == true) { + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], + sPlaybackSpeeds[this->animationIdx] * animSpeed * 1.5f, 0, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3); + } else { + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], + sPlaybackSpeeds[this->animationIdx] * animSpeed * 1.5f, 0, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, 0); + } +} + +void EnHorse_UpdateIngoRace(EnHorse* this, GlobalContext* globalCtx) { + f32 playSpeed; + + if (this->animationIdx == ENHORSE_ANIM_IDLE || this->animationIdx == ENHORSE_ANIM_WHINNEY) { + EnHorse_IdleAnimSounds(this, globalCtx); + } else if (this->animationIdx == ENHORSE_ANIM_WALK) { + EnHorse_PlayWalkingSound(this); + } + + EnHorse_UpdateIngoRaceInfo(this, globalCtx, &sIngoRace); + if (!this->inRace) { + this->actor.speedXZ = 0.0f; + this->rider->speedXZ = 0.0f; + if (this->animationIdx != ENHORSE_ANIM_IDLE) { + EnHorse_UpdateIngoHorseAnim(this); + } + } + + if (this->animationIdx == ENHORSE_ANIM_WALK) { + playSpeed = this->actor.speedXZ * 0.5f; + } else if (this->animationIdx == ENHORSE_ANIM_TROT) { + playSpeed = this->actor.speedXZ * 0.25f; + } else if (this->animationIdx == ENHORSE_ANIM_GALLOP) { + playSpeed = this->actor.speedXZ * 0.2f; + } else { + playSpeed = 1.0f; + } + this->skin.skelAnime.playSpeed = playSpeed; + if (SkelAnime_Update(&this->skin.skelAnime) || + (this->animationIdx == ENHORSE_ANIM_IDLE && this->actor.speedXZ != 0.0f)) { + EnHorse_UpdateIngoHorseAnim(this); + } + + if (this->stateFlags & ENHORSE_INGO_WON) { + ((EnIn*)this->rider)->animationIdx = 7; + ((EnIn*)this->rider)->unk_1E0 = 0; + return; + } + + EnHorse_SetIngoAnimation(this->animationIdx, this->skin.skelAnime.curFrame, this->ingoRaceFlags & 1, + &((EnIn*)this->rider)->animationIdx, &((EnIn*)this->rider)->unk_1E0); +} + +void EnHorse_CsMoveInit(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action) { + this->animationIdx = ENHORSE_ANIM_GALLOP; + this->cutsceneAction = 1; + Animation_PlayOnceSetSpeed(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], + this->actor.speedXZ * 0.3f); +} + +void EnHorse_CsPlayHighJumpAnim(EnHorse* this, GlobalContext* globalCtx); + +void EnHorse_CsMoveToPoint(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action) { + Vec3f endPos; + f32 speed = 8.0f; + + endPos.x = action->endPos.x; + endPos.y = action->endPos.y; + endPos.z = action->endPos.z; + if (Math3D_Vec3f_DistXYZ(&endPos, &this->actor.world.pos) > speed) { + EnHorse_RotateToPoint(this, globalCtx, &endPos, 400); + this->actor.speedXZ = speed; + this->skin.skelAnime.playSpeed = speed * 0.3f; + } else { + this->actor.world.pos = endPos; + this->actor.speedXZ = 0.0f; + } + + if (SkelAnime_Update(&this->skin.skelAnime)) { + EnHorse_PlayGallopingSound(this); + func_800AA000(0.0f, 120, 8, 255); + Animation_PlayOnceSetSpeed(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], + this->actor.speedXZ * 0.3f); + } +} + +void EnHorse_CsSetAnimHighJump(EnHorse* this, GlobalContext* globalCtx) { + this->skin.skelAnime.curFrame = 0.0f; + EnHorse_CsPlayHighJumpAnim(this, globalCtx); +} + +void EnHorse_CsPlayHighJumpAnim(EnHorse* this, GlobalContext* globalCtx) { + f32 curFrame; + f32 y; + Vec3s* jointTable; + + this->animationIdx = ENHORSE_ANIM_HIGH_JUMP; + curFrame = this->skin.skelAnime.curFrame; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.5f, curFrame, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); + this->postDrawFunc = NULL; + this->jumpStartY = this->actor.world.pos.y; + this->actor.gravity = 0.0f; + this->actor.velocity.y = 0; + + jointTable = this->skin.skelAnime.jointTable; + y = jointTable->y; + this->riderPos.y -= y * 0.01f; + + this->stateFlags |= ENHORSE_CALC_RIDER_POS; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + func_800AA000(0.0f, 170, 10, 10); +} + +void EnHorse_CsJumpInit(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action) { + EnHorse_CsSetAnimHighJump(this, globalCtx); + this->cutsceneAction = 2; + this->cutsceneFlags &= ~1; +} + +void EnHorse_CsJump(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action) { + f32 temp_f2; + + if (this->cutsceneFlags & 1) { + EnHorse_CsMoveToPoint(this, globalCtx, action); + return; + } + temp_f2 = this->skin.skelAnime.curFrame; + this->stateFlags |= ENHORSE_JUMPING; + this->actor.speedXZ = 13.0f; + if (temp_f2 > 19.0f) { + this->actor.gravity = -3.5f; + if (this->actor.velocity.y == 0.0f) { + this->actor.velocity.y = -10.5f; + } + if (this->actor.world.pos.y < (this->actor.floorHeight + 90.0f)) { + this->skin.skelAnime.playSpeed = 1.5f; + } else { + this->skin.skelAnime.playSpeed = 0.0f; + } + } else { + Vec3s* jointTable; + f32 y; + + jointTable = this->skin.skelAnime.jointTable; + y = jointTable->y; + this->actor.world.pos.y = this->jumpStartY + y * 0.01f; + } + if (SkelAnime_Update(&this->skin.skelAnime) || + (temp_f2 > 19.0f && this->actor.world.pos.y < (this->actor.floorHeight - this->actor.velocity.y) + 80.0f)) { + Vec3s* jointTable; + f32 y; + + this->cutsceneFlags |= 1; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + func_800AA000(0.0f, 255, 10, 80); + this->stateFlags &= ~ENHORSE_JUMPING; + this->actor.gravity = -3.5f; + this->actor.velocity.y = 0; + this->actor.world.pos.y = this->actor.floorHeight; + func_80028A54(globalCtx, 25.0f, &this->actor.world.pos); + this->animationIdx = ENHORSE_ANIM_GALLOP; + Animation_PlayOnceSetSpeed(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], + sPlaybackSpeeds[6]); + jointTable = this->skin.skelAnime.jointTable; + y = jointTable->y; + this->riderPos.y += y * 0.01f; + this->postDrawFunc = NULL; + } +} + +void EnHorse_CsRearingInit(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action) { + this->animationIdx = ENHORSE_ANIM_REARING; + this->cutsceneAction = 3; + this->cutsceneFlags &= ~4; + this->stateFlags &= ~ENHORSE_LAND2_SOUND; + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); +} + +void EnHorse_CsRearing(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action) { + this->actor.speedXZ = 0.0f; + if (this->curFrame > 25.0f) { + if (!(this->stateFlags & ENHORSE_LAND2_SOUND)) { + this->stateFlags |= ENHORSE_LAND2_SOUND; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } + if (SkelAnime_Update(&this->skin.skelAnime)) { + this->animationIdx = ENHORSE_ANIM_IDLE; + if (!(this->cutsceneFlags & 4)) { + this->cutsceneFlags |= 4; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, + -3.0f); + } else { + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), 0, 0.0f); + } + } +} + +void EnHorse_WarpMoveInit(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action) { + this->actor.world.pos.x = action->startPos.x; + this->actor.world.pos.y = action->startPos.y; + this->actor.world.pos.z = action->startPos.z; + this->actor.prevPos = this->actor.world.pos; + this->actor.world.rot.y = action->urot.y; + this->actor.shape.rot = this->actor.world.rot; + this->animationIdx = ENHORSE_ANIM_GALLOP; + this->cutsceneAction = 4; + Animation_PlayOnceSetSpeed(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], + this->actor.speedXZ * 0.3f); +} + +void EnHorse_CsWarpMoveToPoint(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action) { + Vec3f endPos; + f32 speed = 8.0f; + + endPos.x = action->endPos.x; + endPos.y = action->endPos.y; + endPos.z = action->endPos.z; + if (Math3D_Vec3f_DistXYZ(&endPos, &this->actor.world.pos) > speed) { + EnHorse_RotateToPoint(this, globalCtx, &endPos, 400); + this->actor.speedXZ = speed; + this->skin.skelAnime.playSpeed = speed * 0.3f; + } else { + this->actor.world.pos = endPos; + this->actor.speedXZ = 0.0f; + } + + if (SkelAnime_Update(&this->skin.skelAnime)) { + EnHorse_PlayGallopingSound(this); + func_800AA000(0.0f, 120, 8, 255); + Animation_PlayOnceSetSpeed(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], + this->actor.speedXZ * 0.3f); + } +} + +void EnHorse_CsWarpRearingInit(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action) { + this->actor.world.pos.x = action->startPos.x; + this->actor.world.pos.y = action->startPos.y; + this->actor.world.pos.z = action->startPos.z; + this->actor.prevPos = this->actor.world.pos; + this->actor.world.rot.y = action->urot.y; + this->actor.shape.rot = this->actor.world.rot; + this->animationIdx = ENHORSE_ANIM_REARING; + this->cutsceneAction = 5; + this->cutsceneFlags &= ~4; + this->stateFlags &= ~ENHORSE_LAND2_SOUND; + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); +} + +void EnHorse_CsWarpRearing(EnHorse* this, GlobalContext* globalCtx, CsCmdActorAction* action) { + this->actor.speedXZ = 0.0f; + if (this->curFrame > 25.0f) { + if (!(this->stateFlags & ENHORSE_LAND2_SOUND)) { + this->stateFlags |= ENHORSE_LAND2_SOUND; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } + if (SkelAnime_Update(&this->skin.skelAnime)) { + this->animationIdx = ENHORSE_ANIM_IDLE; + if (!(this->cutsceneFlags & 4)) { + this->cutsceneFlags |= 4; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, + -3.0f); + } else { + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), 0, 0.0f); + } + } +} + +void EnHorse_InitCutscene(EnHorse* this, GlobalContext* globalCtx) { + this->playerControlled = false; + this->action = ENHORSE_ACT_CS_UPDATE; + this->cutsceneAction = 0; + this->actor.speedXZ = 0.0f; +} + +s32 EnHorse_GetCutsceneFunctionIndex(s32 csAction) { + s32 numActions = ARRAY_COUNT(sCsActionTable); // prevents unrolling + s32 i; + + for (i = 0; i < numActions; i++) { + if (csAction == sCsActionTable[i].csAction) { + return sCsActionTable[i].csFuncIdx; + } + if (csAction < sCsActionTable[i].csAction) { + return 0; + } + } + return 0; +} + +void EnHorse_CutsceneUpdate(EnHorse* this, GlobalContext* globalCtx) { + s32 csFunctionIdx; + CsCmdActorAction* linkCsAction = globalCtx->csCtx.linkAction; + + if (globalCtx->csCtx.state == 3) { + this->playerControlled = 1; + this->actor.params = 10; + this->action = ENHORSE_ACT_IDLE; + EnHorse_Freeze(this); + return; + } + if (linkCsAction != 0) { + csFunctionIdx = EnHorse_GetCutsceneFunctionIndex(linkCsAction->action); + if (csFunctionIdx != 0) { + if (this->cutsceneAction != csFunctionIdx) { + if (this->cutsceneAction == 0) { + this->actor.world.pos.x = linkCsAction->startPos.x; + this->actor.world.pos.y = linkCsAction->startPos.y; + this->actor.world.pos.z = linkCsAction->startPos.z; + this->actor.world.rot.y = linkCsAction->urot.y; + this->actor.shape.rot = this->actor.world.rot; + this->actor.prevPos = this->actor.world.pos; + } + this->cutsceneAction = csFunctionIdx; + sCutsceneInitFuncs[this->cutsceneAction](this, globalCtx, linkCsAction); + } + sCutsceneActionFuncs[this->cutsceneAction](this, globalCtx, linkCsAction); + } + } +} + +s32 EnHorse_UpdateHbaRaceInfo(EnHorse* this, GlobalContext* globalCtx, RaceInfo* raceInfo) { + Vec3f pos; + f32 px; + f32 pz; + f32 d; + + EnHorse_RaceWaypointPos(raceInfo->waypoints, this->curRaceWaypoint, &pos); + Math3D_RotateXZPlane(&pos, raceInfo->waypoints[this->curRaceWaypoint].angle, &px, &pz, &d); + + if (this->curRaceWaypoint >= raceInfo->numWaypoints - 1 && + Math3D_Vec3f_DistXYZ(&pos, &this->actor.world.pos) < DREG(8)) { + this->hbaFlags |= 2; + } + + if (((this->actor.world.pos.x * px) + (pz * this->actor.world.pos.z) + d) > 0.0f) { + this->curRaceWaypoint++; + if (this->curRaceWaypoint >= raceInfo->numWaypoints) { + this->hbaFlags |= 1; + return 1; + } + } + + if (!(this->hbaFlags & 1)) { + EnHorse_RotateToPoint(this, globalCtx, &pos, 800); + } + + this->actor.shape.rot.y = this->actor.world.rot.y; + if (this->actor.speedXZ < raceInfo->waypoints[this->curRaceWaypoint].speed && !(this->hbaFlags & 1)) { + this->actor.speedXZ += 0.4f; + } else { + this->actor.speedXZ -= 0.4f; + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ = 0.0f; + } + } + return 0; +} + +void EnHorse_UpdateHbaAnim(EnHorse* this); + +void EnHorse_InitHorsebackArchery(EnHorse* this) { + this->hbaStarted = 0; + this->soundTimer = 0; + this->curRaceWaypoint = 0; + this->hbaTimer = 0; + this->actor.speedXZ = 0.0f; + EnHorse_UpdateHbaAnim(this); +} + +void EnHorse_UpdateHbaAnim(EnHorse* this) { + s32 animChanged = 0; + f32 animSpeed; + + this->action = ENHORSE_ACT_HBA; + if (this->actor.speedXZ == 0.0f) { + if (this->animationIdx != ENHORSE_ANIM_IDLE) { + animChanged = true; + } + this->animationIdx = ENHORSE_ANIM_IDLE; + } else if (this->actor.speedXZ <= 3.0f) { + if (this->animationIdx != ENHORSE_ANIM_WALK) { + animChanged = true; + } + this->animationIdx = ENHORSE_ANIM_WALK; + } else if (this->actor.speedXZ <= 6.0f) { + if (this->animationIdx != ENHORSE_ANIM_TROT) { + animChanged = true; + } + this->animationIdx = ENHORSE_ANIM_TROT; + } else { + if (this->animationIdx != ENHORSE_ANIM_GALLOP) { + animChanged = true; + } + this->animationIdx = ENHORSE_ANIM_GALLOP; + } + + if (this->animationIdx == ENHORSE_ANIM_WALK) { + animSpeed = this->actor.speedXZ * 0.5f; + } else if (this->animationIdx == ENHORSE_ANIM_TROT) { + animSpeed = this->actor.speedXZ * 0.25f; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + func_800AA000(0.0f, 60, 8, 255); + } else if (this->animationIdx == ENHORSE_ANIM_GALLOP) { + animSpeed = this->actor.speedXZ * 0.2f; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + func_800AA000(0.0f, 120, 8, 255); + } else { + animSpeed = 1.0f; + } + + if (animChanged == true) { + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], + sPlaybackSpeeds[this->animationIdx] * animSpeed * 1.5f, 0, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, + -3.0f); + } else { + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], + sPlaybackSpeeds[this->animationIdx] * animSpeed * 1.5f, 0, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, 0); + } +} + +void EnHorse_UpdateHorsebackArchery(EnHorse* this, GlobalContext* globalCtx) { + f32 playSpeed; + s32 sp20; + + if (this->animationIdx == ENHORSE_ANIM_WALK) { + EnHorse_PlayWalkingSound(this); + } + if (globalCtx->interfaceCtx.hbaAmmo == 0) { + this->hbaTimer++; + } + + sp20 = func_800F5A58(65, globalCtx); + EnHorse_UpdateHbaRaceInfo(this, globalCtx, &sHbaInfo); + if (this->hbaFlags & 1 || this->hbaTimer >= 46) { + if (sp20 != 1 && gSaveContext.minigameState != 3) { + gSaveContext.cutsceneIndex = 0; + globalCtx->nextEntranceIndex = 0x3B0; + globalCtx->sceneLoadFlag = 0x14; + globalCtx->fadeTransition = 0x20; + } + } + + if (globalCtx->interfaceCtx.hbaAmmo != 0) { + if (!(this->hbaFlags & 2)) { + if (gSaveContext.infTable[25] & 1) { + if ((s32)gSaveContext.minigameScore >= 1500) { + this->hbaFlags |= 4; + } + } else { + if ((s32)gSaveContext.minigameScore >= 1000) { + this->hbaFlags |= 4; + } + } + } + } + + if ((globalCtx->interfaceCtx.hbaAmmo == 0) || (this->hbaFlags & 2)) { + if (this->hbaFlags & 4) { + this->hbaFlags &= ~4; + Audio_SetBGM(65); + } + } + + if (!this->hbaStarted) { + this->actor.speedXZ = 0.0f; + if (this->animationIdx != ENHORSE_ANIM_IDLE) { + EnHorse_UpdateHbaAnim(this); + } + } + + if (this->animationIdx == ENHORSE_ANIM_WALK) { + playSpeed = this->actor.speedXZ * 0.5f; + } else if (this->animationIdx == ENHORSE_ANIM_TROT) { + playSpeed = this->actor.speedXZ * 0.25f; + } else if (this->animationIdx == ENHORSE_ANIM_GALLOP) { + playSpeed = this->actor.speedXZ * 0.2f; + } else { + playSpeed = 1.0f; + } + + this->skin.skelAnime.playSpeed = playSpeed; + if (SkelAnime_Update(&this->skin.skelAnime) || + (this->animationIdx == ENHORSE_ANIM_IDLE && this->actor.speedXZ != 0.0f)) { + EnHorse_UpdateHbaAnim(this); + } +} + +void EnHorse_InitFleePlayer(EnHorse* this) { + this->action = ENHORSE_ACT_FLEE_PLAYER; + this->stateFlags |= ENHORSE_UNRIDEABLE; + this->actor.speedXZ = 0.0f; +} + +void EnHorse_FleePlayer(EnHorse* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 distToHome; + f32 playerDistToHome; + f32 distToPlayer; + s32 nextAnim = this->animationIdx; + s32 animFinished; + s16 yaw; + + if (DREG(53) || this->type == HORSE_HNI) { + EnHorse_StartIdleRidable(this); + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + + distToHome = Math3D_Vec3f_DistXYZ(&this->actor.home.pos, &this->actor.world.pos); + playerDistToHome = Math3D_Vec3f_DistXYZ(&player->actor.world.pos, &this->actor.home.pos); + distToPlayer = Math3D_Vec3f_DistXYZ(&player->actor.world.pos, &this->actor.world.pos); + + // Run home + if (playerDistToHome > 300.0f) { + if (distToHome > 150.0f) { + this->actor.speedXZ += 0.4f; + if (this->actor.speedXZ > 8.0f) { + this->actor.speedXZ = 8.0f; + } + } else { + this->actor.speedXZ -= 0.47f; + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ = 0.0f; + } + } + } else { + // Run away from Link + if (distToPlayer < 300.0f) { + this->actor.speedXZ += 0.4f; + if (this->actor.speedXZ > 8.0f) { + this->actor.speedXZ = 8.0f; + } + } else { + this->actor.speedXZ -= 0.47f; + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ = 0.0f; + } + } + } + + if (this->actor.speedXZ >= 6.0f) { // hoof it + this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.3f; + nextAnim = ENHORSE_ANIM_GALLOP; + } else if (this->actor.speedXZ >= 3.0f) { // trot + this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.375f; + nextAnim = ENHORSE_ANIM_TROT; + } else if (this->actor.speedXZ > 0.1f) { // walk + this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.75f; + nextAnim = ENHORSE_ANIM_WALK; + EnHorse_PlayWalkingSound(this); + } else { // idle + nextAnim = Rand_ZeroOne() > 0.5f ? 1 : 0; + EnHorse_IdleAnimSounds(this, globalCtx); + this->skin.skelAnime.playSpeed = 1.0f; + } + + // Turn away from Link, or towards home + if (nextAnim == ENHORSE_ANIM_GALLOP || nextAnim == ENHORSE_ANIM_TROT || nextAnim == ENHORSE_ANIM_WALK) { + if (playerDistToHome < 300.0f) { + yaw = player->actor.shape.rot.y; + yaw += (Actor_WorldYawTowardActor(&this->actor, &player->actor) > 0 ? 1 : -1) * 0x3FFF; + } else { + yaw = Math_Vec3f_Yaw(&this->actor.world.pos, &this->actor.home.pos) - this->actor.world.rot.y; + } + + if (yaw > 400) { + this->actor.world.rot.y += 400; + } else if (yaw < -400) { + this->actor.world.rot.y -= 400; + } else { + this->actor.world.rot.y += yaw; + } + + this->actor.shape.rot.y = this->actor.world.rot.y; + } + + animFinished = SkelAnime_Update(&this->skin.skelAnime); + + if (this->animationIdx == ENHORSE_ANIM_IDLE || this->animationIdx == ENHORSE_ANIM_WHINNEY) { + if (nextAnim == ENHORSE_ANIM_GALLOP || nextAnim == ENHORSE_ANIM_TROT || nextAnim == ENHORSE_ANIM_WALK) { + this->animationIdx = nextAnim; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, + -3.0f); + if (this->animationIdx == ENHORSE_ANIM_GALLOP) { + EnHorse_PlayGallopingSound(this); + } else if (this->animationIdx == ENHORSE_ANIM_TROT) { + EnHorse_PlayTrottingSound(this); + } + return; + } + } + + if (animFinished) { + if (nextAnim == ENHORSE_ANIM_GALLOP) { + EnHorse_PlayGallopingSound(this); + } else if (nextAnim == ENHORSE_ANIM_TROT) { + EnHorse_PlayTrottingSound(this); + } + + if (this->animationIdx == ENHORSE_ANIM_IDLE || this->animationIdx == ENHORSE_ANIM_WHINNEY) { + if (nextAnim != this->animationIdx) { + this->animationIdx = nextAnim; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), + ANIMMODE_ONCE, -3.0f); + return; + } else { + if (Rand_ZeroOne() > 0.5f) { + this->animationIdx = ENHORSE_ANIM_IDLE; + this->stateFlags &= ~ENHORSE_SANDDUST_SOUND; + } else { + this->animationIdx = ENHORSE_ANIM_WHINNEY; + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->unk_21C, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), + ANIMMODE_ONCE, -3.0f); + return; + } + } + + if (nextAnim != this->animationIdx) { + this->animationIdx = nextAnim; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, + -3.0f); + } else { + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, + 0.0f); + } + return; + } + + if (this->animationIdx == ENHORSE_ANIM_WALK) { + if (nextAnim == ENHORSE_ANIM_IDLE || nextAnim == ENHORSE_ANIM_WHINNEY) { + this->animationIdx = nextAnim; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, + -3.0f); + } + } +} + +void EnHorse_BridgeJumpInit(EnHorse* this, GlobalContext* globalCtx) { + f32 y; + + func_80028A54(globalCtx, 25.0f, &this->actor.world.pos); + this->action = ENHORSE_ACT_BRIDGE_JUMP; + this->stateFlags |= ENHORSE_JUMPING; + this->animationIdx = ENHORSE_ANIM_HIGH_JUMP; + y = this->skin.skelAnime.jointTable->y; + y = y * 0.01f; + this->bridgeJumpStart = this->actor.world.pos; + this->bridgeJumpStart.y += y; + this->bridgeJumpYVel = + (((sBridgeJumps[this->bridgeJumpIdx].pos.y + 48.7f) - this->bridgeJumpStart.y) - -360.0f) / 30.0f; + this->riderPos.y -= y; + this->stateFlags |= ENHORSE_CALC_RIDER_POS; + this->bridgeJumpRelAngle = this->actor.world.rot.y - sBridgeJumps[this->bridgeJumpIdx].angle; + this->bridgeJumpTimer = 0; + this->actor.gravity = 0.0f; + this->actor.speedXZ = 0; + Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.5f, 0.0f, + Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + func_800AA000(0.0f, 170, 10, 10); + this->postDrawFunc = NULL; +} + +void EnHorse_StartBridgeJump(EnHorse* this, GlobalContext* globalCtx) { + this->postDrawFunc = EnHorse_BridgeJumpInit; + if (this->bridgeJumpIdx == 0) { + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_02002AC0); + gSaveContext.cutsceneTrigger = 1; + } else { + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_02000230); + gSaveContext.cutsceneTrigger = 1; + } +} + +void EnHorse_BridgeJumpMove(EnHorse* this, GlobalContext* globalCtx) { + f32 interp; + f32 timeSq; + + interp = this->bridgeJumpTimer / 30.0f; + timeSq = (this->bridgeJumpTimer * this->bridgeJumpTimer); + + this->actor.world.pos.x = + ((sBridgeJumps[this->bridgeJumpIdx].pos.x - this->bridgeJumpStart.x) * interp) + this->bridgeJumpStart.x; + this->actor.world.pos.z = + ((sBridgeJumps[this->bridgeJumpIdx].pos.z - this->bridgeJumpStart.z) * interp) + this->bridgeJumpStart.z; + + this->actor.world.pos.y = + (this->bridgeJumpStart.y + (this->bridgeJumpYVel * this->bridgeJumpTimer) + (-0.4f * timeSq)); + + this->actor.world.rot.y = this->actor.shape.rot.y = + (sBridgeJumps[this->bridgeJumpIdx].angle + ((1.0f - interp) * this->bridgeJumpRelAngle)); + this->skin.skelAnime.curFrame = 23.0f * interp; + SkelAnime_Update(&this->skin.skelAnime); + if (this->bridgeJumpTimer < 30) { + this->stateFlags |= ENHORSE_FLAG_24; + } +} + +void EnHorse_CheckBridgeJumpLanding(EnHorse* this, GlobalContext* globalCtx) { + this->actor.speedXZ = 8.0f; + this->skin.skelAnime.playSpeed = 1.5f; + if (SkelAnime_Update(&this->skin.skelAnime)) { + this->stateFlags &= ~ENHORSE_JUMPING; + this->actor.gravity = -3.5f; + this->actor.world.pos.y = sBridgeJumps[this->bridgeJumpIdx].pos.y; + func_80028A54(globalCtx, 25.0f, &this->actor.world.pos); + EnHorse_JumpLanding(this, globalCtx); + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + func_800AA000(0.0f, 255, 10, 80); + } +} + +void EnHorse_BridgeJump(EnHorse* this, GlobalContext* globalCtx) { + this->bridgeJumpTimer++; + if (this->bridgeJumpTimer < 30) { + EnHorse_BridgeJumpMove(this, globalCtx); + return; + } + EnHorse_CheckBridgeJumpLanding(this, globalCtx); +} + +void EnHorse_Vec3fOffset(Vec3f* src, s16 yaw, f32 dist, f32 height, Vec3f* dst) { + dst->x = src->x + Math_SinS(yaw) * dist; + dst->y = src->y + height; + dst->z = src->z + Math_CosS(yaw) * dist; +} + +s32 EnHorse_CalcFloorHeight(EnHorse* this, GlobalContext* globalCtx, Vec3f* pos, CollisionPoly** floorPoly, + f32* floorHeight) { + s32 bgId; + f32 waterY; + WaterBox* waterBox; + + *floorPoly = NULL; + *floorHeight = BgCheck_EntityRaycastFloor3(&globalCtx->colCtx, floorPoly, &bgId, pos); + + if (*floorHeight == BGCHECK_Y_MIN) { + return 1; // No floor + } + + if (WaterBox_GetSurfaceImpl(globalCtx, &globalCtx->colCtx, pos->x, pos->z, &waterY, &waterBox) == 1 && + *floorHeight < waterY) { + return 2; // Water + } + + if ((*floorPoly)->normal.y * 0.00003051851f < 0.81915206f || + SurfaceType_IsHorseBlocked(&globalCtx->colCtx, *floorPoly, bgId) || + func_80041D4C(&globalCtx->colCtx, *floorPoly, bgId) == 7) { + return 3; // Horse blocked surface + } + return 0; +} + +/** + * obstacleType: + * 1: Water in front + * 2: Water behind? + * 3: ? + * 4: Obstructed in front + * 5: Obstructed behind + */ +void EnHorse_ObstructMovement(EnHorse* this, GlobalContext* globalCtx, s32 obstacleType, s32 galloping) { + if (this->action == ENHORSE_ACT_CS_UPDATE || EnHorse_BgCheckBridgeJumpPoint(this, globalCtx)) { + return; + } + + this->actor.world.pos = this->lastPos; + this->actor.shape.rot.y = this->lastYaw; + this->actor.world.rot.y = this->lastYaw; + this->stateFlags |= ENHORSE_OBSTACLE; + + if (!this->playerControlled) { + if (this->animationIdx != ENHORSE_ANIM_REARING) { + return; + } + } else if (this->action != ENHORSE_ACT_MOUNTED_REARING) { + if (this->stateFlags & ENHORSE_JUMPING) { + this->stateFlags &= ~ENHORSE_JUMPING; + this->actor.gravity = -3.5f; + this->actor.world.pos.y = this->actor.floorHeight; + } + if (obstacleType == 1 || obstacleType == 4) { + this->stateFlags |= ENHORSE_FORCE_REVERSING; + } else if (obstacleType == 2 || obstacleType == 5) { + this->stateFlags |= ENHORSE_FORCE_WALKING; + } + if (galloping == true) { + EnHorse_StartRearing(this); + } + } +} + +void EnHorse_CheckFloors(EnHorse* this, GlobalContext* globalCtx) { + s32 status; + CollisionPoly* frontFloor; + CollisionPoly* backFloor; + s16 floorSlope; + Vec3f frontPos; + Vec3f backPos; + Vec3f pos; + f32 nx; + f32 ny; + f32 nz; + s32 galloping = this->actor.speedXZ > 8; + f32 dist; + f32 waterHeight; + WaterBox* waterBox; + s32 pad; + + if (WaterBox_GetSurfaceImpl(globalCtx, &globalCtx->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, + &waterHeight, &waterBox) == 1 && + this->actor.floorHeight < waterHeight) { + EnHorse_ObstructMovement(this, globalCtx, 1, galloping); + return; + } + + EnHorse_Vec3fOffset(&this->actor.world.pos, this->actor.shape.rot.y, 30.0f, 60.0f, &frontPos); + status = EnHorse_CalcFloorHeight(this, globalCtx, &frontPos, &frontFloor, &this->yFront); + if (status == 1) { + this->actor.shape.rot.x = 0; + EnHorse_ObstructMovement(this, globalCtx, 4, galloping); + return; + } + if (status == 2) { + EnHorse_ObstructMovement(this, globalCtx, 4, galloping); + return; + } + if (status == 3) { + EnHorse_ObstructMovement(this, globalCtx, 4, galloping); + return; + } + + EnHorse_Vec3fOffset(&this->actor.world.pos, this->actor.shape.rot.y, -30.0f, 60.0f, &backPos); + status = EnHorse_CalcFloorHeight(this, globalCtx, &backPos, &backFloor, &this->yBack); + if (status == 1) { + this->actor.shape.rot.x = 0; + EnHorse_ObstructMovement(this, globalCtx, 5, galloping); + return; + } + if (status == 2) { + EnHorse_ObstructMovement(this, globalCtx, 5, galloping); + return; + } + if (status == 3) { + EnHorse_ObstructMovement(this, globalCtx, 5, galloping); + return; + } + + floorSlope = Math_FAtan2F(this->yBack - this->yFront, 60.0f) * 10430.378f; + if (this->actor.floorPoly != 0) { + nx = this->actor.floorPoly->normal.x * COLPOLY_NORMAL_FRAC; + ny = this->actor.floorPoly->normal.y * COLPOLY_NORMAL_FRAC; + nz = this->actor.floorPoly->normal.z * COLPOLY_NORMAL_FRAC; + pos = frontPos; + pos.y = this->yFront; + dist = Math3D_DistPlaneToPos(nx, ny, nz, this->actor.floorPoly->dist, &pos); + if ((frontFloor != this->actor.floorPoly) && (this->actor.speedXZ >= 0.0f)) { + if ((!(this->stateFlags & ENHORSE_JUMPING) && dist < -40.0f) || + (this->stateFlags & ENHORSE_JUMPING && dist < -200.0f)) { + EnHorse_ObstructMovement(this, globalCtx, 4, galloping); + return; + } + } + + pos = backPos; + pos.y = this->yBack; + dist = Math3D_DistPlaneToPos(nx, ny, nz, this->actor.floorPoly->dist, &pos); + if (((backFloor != this->actor.floorPoly) && (this->actor.speedXZ <= 0.0f) && + !(this->stateFlags & ENHORSE_JUMPING) && (dist < -40.0f)) || + (this->stateFlags & ENHORSE_JUMPING && dist < -200.0f)) { + EnHorse_ObstructMovement(this, globalCtx, 5, galloping); + return; + } + + if (ny < 0.81915206f || + SurfaceType_IsHorseBlocked(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId) || + func_80041D4C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId) == 7) { + if ((this->actor.speedXZ >= 0.0f)) { + EnHorse_ObstructMovement(this, globalCtx, 4, galloping); + } else { + EnHorse_ObstructMovement(this, globalCtx, 5, galloping); + } + return; + } + + if (this->stateFlags & ENHORSE_JUMPING) { + this->actor.shape.rot.x = 0; + return; + } + + if (this->actor.floorHeight + 4.0f < this->actor.world.pos.y) { + this->actor.shape.rot.x = 0; + return; + } + + if (fabsf(floorSlope) > 8191.0f) { + return; + } + + this->actor.shape.rot.x = floorSlope; + this->actor.shape.yOffset = + (this->yFront + (((this->yBack - this->yFront) * 20.0f) / 45.0f)) - this->actor.floorHeight; + } +} + +s32 EnHorse_GetMountSide(EnHorse* this, GlobalContext* globalCtx); + +void EnHorse_MountDismount(EnHorse* this, GlobalContext* globalCtx) { + s32 pad[2]; + s32 mountSide; + Player* player = PLAYER; + + mountSide = EnHorse_GetMountSide(this, globalCtx); + if (mountSide != 0 && !(this->stateFlags & ENHORSE_UNRIDEABLE) && player->rideActor == NULL) { + Actor_SetRideActor(globalCtx, &this->actor, mountSide); + } + + if (this->playerControlled == false && Actor_IsMounted(globalCtx, &this->actor) == true) { + this->noInputTimer = 55; + this->noInputTimerMax = 55; + this->playerControlled = 1; + EnHorse_Freeze(this); + } else if (this->playerControlled == true && Actor_NotMounted(globalCtx, &this->actor) == true) { + this->noInputTimer = 35; + this->noInputTimerMax = 35; + this->stateFlags &= ~ENHORSE_UNRIDEABLE; + this->playerControlled = 0; + EnHorse_Freeze(this); + } +} + +void EnHorse_StickDirection(Vec2f* curStick, f32* stickMag, s16* angle) { + f32 dist; + f32 y; + f32 x; + + x = curStick->x; + y = curStick->y; + dist = sqrtf(SQ(x) + SQ(y)); + + *stickMag = dist; + if (dist > 60.0f) { + *stickMag = 60.0f; + } else { + *stickMag = *stickMag; + } + + *angle = Math_FAtan2F(-curStick->x, curStick->y) * (32768.0f / M_PI); +} + +void EnHorse_UpdateStick(EnHorse* this, GlobalContext* globalCtx) { + this->lastStick = this->curStick; + this->curStick.x = globalCtx->state.input[0].rel.stick_x; + this->curStick.y = globalCtx->state.input[0].rel.stick_y; +} + +void EnHorse_ResolveCollision(EnHorse* this, GlobalContext* globalCtx, CollisionPoly* colPoly) { + f32 dist; + f32 nx; + f32 ny; + f32 nz; + f32 offset; + + nx = colPoly->normal.x * 0.00003051851f; + ny = colPoly->normal.y * 0.00003051851f; + nz = colPoly->normal.z * 0.00003051851f; + if (!(Math_CosS(this->actor.world.rot.y - (s16)(Math_FAtan2F(colPoly->normal.x, colPoly->normal.z) * 10430.378f) - + 0x7FFF) < 0.7071f)) { + dist = Math3D_DistPlaneToPos(nx, ny, nz, colPoly->dist, &this->actor.world.pos); + offset = (1.0f / sqrtf(SQ(nx) + SQ(nz))); + offset = (30.0f - dist) * offset; + this->actor.world.pos.x += offset * nx; + this->actor.world.pos.z += offset * nz; + } +} + +void EnHorse_BgCheckSlowMoving(EnHorse* this, GlobalContext* globalCtx) { + f32 yOffset; + Vec3f start; + Vec3f end; + Vec3f intersect; + CollisionPoly* colPoly; + s32 bgId; + + if (globalCtx->sceneNum == SCENE_SPOT20) { + yOffset = 19.0f; + } else { + yOffset = 40.0f; + } + Math_Vec3f_Copy(&start, &this->actor.world.pos); + start.y = start.y + yOffset; + + Math_Vec3f_Copy(&end, &start); + end.x += 30.0f * Math_SinS(this->actor.world.rot.y); + end.y += 30.0f * Math_SinS(-this->actor.shape.rot.x); + end.z += 30.0f * Math_CosS(this->actor.world.rot.y); + if (BgCheck_EntityLineTest1(&globalCtx->colCtx, &start, &end, &intersect, &colPoly, 1, 0, 0, 1, &bgId) != 0) { + EnHorse_ResolveCollision(this, globalCtx, colPoly); + } +} + +void EnHorse_HighJumpInit(EnHorse* this, GlobalContext* globalCtx); +void EnHorse_Stub2(EnHorse* this); +void EnHorse_Stub1(EnHorse* this); + +void EnHorse_UpdateBgCheckInfo(EnHorse* this, GlobalContext* globalCtx) { + s32 pad; + s32 pad2; + Vec3f startPos; + Vec3f endPos; + Vec3f obstaclePos; + f32 pad3; + f32 intersectDist; + CollisionPoly* wall = NULL; + CollisionPoly* obstacleFloor = NULL; + s32 bgId; + f32 obstacleHeight; + f32 behindObstacleHeight; + f32 ny; + s32 movingFast; + s32 pad5; + DynaPolyActor* dynaPoly; + Vec3f intersect; + Vec3f obstacleTop; + + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, globalCtx->sceneNum == SCENE_SPOT20 ? 19.0f : 40.0f, 35.0f, 100.0f, + 29); + + if (EnHorse_BgCheckBridgeJumpPoint(this, globalCtx)) { + return; + } + + // void 0 trick required to match, but is surely not real. revisit at a later time + if (this->actor.bgCheckFlags & 8 && Math_CosS(this->actor.wallYaw - ((void)0, this->actor.world).rot.y) < -0.3f) { + if (this->actor.speedXZ > 4.0f) { + this->actor.speedXZ -= 1.0f; + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } + + if (this->stateFlags & ENHORSE_JUMPING || !this->playerControlled) { + return; + } + + if (this->actor.speedXZ < 0.0f) { + return; + } + + // Braking or rearing from obstacle + if (this->action == ENHORSE_ACT_STOPPING || this->action == ENHORSE_ACT_MOUNTED_REARING) { + return; + } + + if (this->actor.speedXZ > 8.0f) { + if (this->actor.speedXZ < 12.8f) { + intersectDist = 160.0f; + movingFast = 0; + } else { + intersectDist = 230.0f; + movingFast = 1; + } + } else { + EnHorse_BgCheckSlowMoving(this, globalCtx); + return; + } + + startPos = this->actor.world.pos; + startPos.y += 19.0f; + endPos = startPos; + endPos.x += (intersectDist * Math_SinS(this->actor.world.rot.y)); + endPos.y += (intersectDist * Math_SinS(-this->actor.shape.rot.x)); + endPos.z += (intersectDist * Math_CosS(this->actor.world.rot.y)); + intersect = endPos; + wall = NULL; + if (BgCheck_EntityLineTest1(&globalCtx->colCtx, &startPos, &endPos, &intersect, &wall, 1, 0, 0, 1, &bgId) == 1) { + intersectDist = sqrt(Math3D_Vec3fDistSq(&startPos, &intersect)); + this->stateFlags |= ENHORSE_OBSTACLE; + } + + if (wall != NULL) { + if (intersectDist < 30.0f) { + EnHorse_ResolveCollision(this, globalCtx, wall); + } + if ((Math_CosS(this->actor.world.rot.y - (s16)(Math_FAtan2F(wall->normal.x, wall->normal.z) * 10430.378f) - + 0x7FFF) < 0.5f) || + SurfaceType_IsHorseBlocked(&globalCtx->colCtx, wall, bgId) != 0) { + return; + } + + // too close to jump + if ((movingFast == false && intersectDist < 80.0f) || (movingFast == true && intersectDist < 150.0f)) { + if (movingFast == false) { + this->stateFlags |= ENHORSE_FORCE_REVERSING; + } else if (movingFast == true) { + this->stateFlags |= ENHORSE_FORCE_REVERSING; + EnHorse_StartBraking(this, globalCtx); + } + return; + } + + dynaPoly = DynaPoly_GetActor(&globalCtx->colCtx, bgId); + if ((this->stateFlags & ENHORSE_FLAG_26) && ((dynaPoly && dynaPoly->actor.id != 0x108) || dynaPoly == 0)) { + if (movingFast == false) { + this->stateFlags |= ENHORSE_FORCE_REVERSING; + } else if (movingFast == true) { + this->stateFlags |= ENHORSE_FORCE_REVERSING; + EnHorse_StartBraking(this, globalCtx); + } + return; + } + } + + // Get obstacle's height + intersectDist += 5.0f; + obstaclePos = startPos; + obstaclePos.x += intersectDist * Math_SinS(this->actor.world.rot.y); + obstaclePos.y = this->actor.world.pos.y + 120.0f; + obstaclePos.z += intersectDist * Math_CosS(this->actor.world.rot.y); + obstacleTop = obstaclePos; + obstacleTop.y = BgCheck_EntityRaycastFloor3(&globalCtx->colCtx, &obstacleFloor, &bgId, &obstaclePos); + if (obstacleTop.y == -32000.0f) { + return; + } + obstacleHeight = obstacleTop.y - this->actor.world.pos.y; + if (this->actor.floorPoly == NULL || obstacleFloor == NULL) { + return; + } + + if (Math3D_DistPlaneToPos(this->actor.floorPoly->normal.x * COLPOLY_NORMAL_FRAC, + this->actor.floorPoly->normal.y * COLPOLY_NORMAL_FRAC, + this->actor.floorPoly->normal.z * COLPOLY_NORMAL_FRAC, this->actor.floorPoly->dist, + &obstacleTop) < -40.0f && + Math3D_DistPlaneToPos( + obstacleFloor->normal.x * COLPOLY_NORMAL_FRAC, obstacleFloor->normal.y * COLPOLY_NORMAL_FRAC, + obstacleFloor->normal.z * COLPOLY_NORMAL_FRAC, obstacleFloor->dist, &this->actor.world.pos) > 40.0f) { + if (movingFast == true && this->action != ENHORSE_ACT_STOPPING) { + this->stateFlags |= ENHORSE_FORCE_REVERSING; + EnHorse_StartBraking(this, globalCtx); + } + this->stateFlags |= ENHORSE_OBSTACLE; + return; + } + + ny = obstacleFloor->normal.y * COLPOLY_NORMAL_FRAC; + if (ny < 0.81915206f || (SurfaceType_IsHorseBlocked(&globalCtx->colCtx, obstacleFloor, bgId) != 0) || + (func_80041D4C(&globalCtx->colCtx, obstacleFloor, bgId) == 7)) { + if (movingFast == true && this->action != ENHORSE_ACT_STOPPING) { + this->stateFlags |= ENHORSE_FORCE_REVERSING; + EnHorse_StartBraking(this, globalCtx); + } + return; + } + + if (wall == NULL || obstacleTop.y < intersect.y || (this->stateFlags & ENHORSE_CANT_JUMP)) { + return; + } + + obstaclePos = startPos; + obstaclePos.y = this->actor.world.pos.y + 120.0f; + if (movingFast == false) { + obstaclePos.x += (276.0f * Math_SinS(this->actor.world.rot.y)); + obstaclePos.z += (276.0f * Math_CosS(this->actor.world.rot.y)); + } else { + obstaclePos.x += (390.0f * Math_SinS(this->actor.world.rot.y)); + obstaclePos.z += (390.0f * Math_CosS(this->actor.world.rot.y)); + } + + obstacleTop = obstaclePos; + obstacleTop.y = BgCheck_EntityRaycastFloor3(&globalCtx->colCtx, &obstacleFloor, &bgId, &obstaclePos); + if (obstacleTop.y == -32000.0f) { + return; + } + + behindObstacleHeight = obstacleTop.y - this->actor.world.pos.y; + + if (obstacleFloor == NULL) { + return; + } + + ny = obstacleFloor->normal.y * COLPOLY_NORMAL_FRAC; + if (ny < 0.81915206f || SurfaceType_IsHorseBlocked(&globalCtx->colCtx, obstacleFloor, bgId) || + func_80041D4C(&globalCtx->colCtx, obstacleFloor, bgId) == 7) { + if (movingFast == true && this->action != ENHORSE_ACT_STOPPING) { + this->stateFlags |= ENHORSE_FORCE_REVERSING; + EnHorse_StartBraking(this, globalCtx); + } + } else if (behindObstacleHeight < -DREG(4)) { // -70 + if (movingFast == true && this->action != ENHORSE_ACT_STOPPING) { + this->stateFlags |= ENHORSE_FORCE_REVERSING; + EnHorse_StartBraking(this, globalCtx); + } + } else if (movingFast == false && obstacleHeight > 19.0f && obstacleHeight <= 40.0f) { + EnHorse_Stub1(this); + this->postDrawFunc = EnHorse_LowJumpInit; + } else if ((movingFast == true && this->actor.speedXZ < 13.8f && obstacleHeight > 19.0f && + obstacleHeight <= 72.0f) || + (this->actor.speedXZ > 13.8f && obstacleHeight <= 112.0f)) { + + EnHorse_Stub2(this); + this->postDrawFunc = EnHorse_HighJumpInit; + } +} + +void EnHorse_CheckBoost(EnHorse* thisx, GlobalContext* globalCtx) { + EnHorse* this = THIS; + GlobalContext* globalCtx2 = globalCtx; + s32 pad; + + if (this->action == ENHORSE_ACT_MOUNTED_WALK || this->action == ENHORSE_ACT_MOUNTED_TROT || + this->action == ENHORSE_ACT_MOUNTED_GALLOP) { + if (CHECK_BTN_ALL(globalCtx2->state.input[0].press.button, BTN_A) && (globalCtx2->interfaceCtx.unk_1EE == 8)) { + if (!(this->stateFlags & ENHORSE_BOOST) && !(this->stateFlags & ENHORSE_FLAG_8) && !(this->stateFlags & ENHORSE_FLAG_9)) { + if (this->numBoosts > 0) { + func_800AA000(0.0f, 180, 20, 100); + this->stateFlags |= ENHORSE_BOOST; + this->stateFlags |= ENHORSE_FIRST_BOOST_REGEN; + this->stateFlags |= ENHORSE_FLAG_8; + this->numBoosts--; + this->boostTimer = 0; + if (this->numBoosts == 0) { + this->boostRegenTime = 140; + return; + } + if (this->type == HORSE_EPONA) { + if (this->stateFlags & ENHORSE_FIRST_BOOST_REGEN) { + this->boostRegenTime = 60; + this->stateFlags &= ~ENHORSE_FIRST_BOOST_REGEN; + } else { + this->boostRegenTime = 8; // Never happens + } + } else { + this->boostRegenTime = 70; + } + return; + } + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + if (Rand_ZeroOne() < 0.1f) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } + } + } + } +} + +void EnHorse_RegenBoost(EnHorse* this, GlobalContext* globalCtx) { + if (this->numBoosts < 6 && this->numBoosts > 0) { + this->boostRegenTime--; + this->boostTimer++; + + if (this->boostRegenTime <= 0) { + this->numBoosts = this->numBoosts + 1; + + if (!EN_HORSE_CHECK_4(this)) { + Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + + if (this->numBoosts < 6) { + this->boostRegenTime = 11; + } + } + } else if (this->numBoosts == 0) { + this->boostRegenTime--; + this->boostTimer++; + + if (this->boostRegenTime <= 0) { + this->boostRegenTime = 0; + this->numBoosts = 6; + + if (!EN_HORSE_CHECK_4(this)) { + Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + } + } + + if (this->boostTimer == 8 && Rand_ZeroOne() < 0.25f) { + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + } + globalCtx->interfaceCtx.numHorseBoosts = this->numBoosts; +} + +void EnHorse_UpdatePlayerDir(EnHorse* this, GlobalContext* globalCtx) { + EnHorse* pad; + s16 angle; + f32 s; + f32 c; + + angle = Actor_WorldYawTowardActor(&this->actor, &PLAYER->actor) - this->actor.world.rot.y; + s = Math_SinS(angle); + c = Math_CosS(angle); + if (s > 0.8660254f) { + this->playerDir = PLAYER_DIR_SIDE_L; + return; + } + if (s < -0.8660254f) { + this->playerDir = PLAYER_DIR_SIDE_R; + return; + } + if (c > 0.0f) { + if (s > 0) { + this->playerDir = PLAYER_DIR_FRONT_L; + } else { + this->playerDir = PLAYER_DIR_FRONT_R; + } + } else { + if (s > 0) { + this->playerDir = PLAYER_DIR_BACK_L; + } else { + this->playerDir = PLAYER_DIR_BACK_R; + } + } +} + +void EnHorse_TiltBody(EnHorse* this, GlobalContext* globalCtx) { + f32 speed; + f32 rollDiff; + s32 targetRoll; + s16 turnVel; + + speed = this->actor.speedXZ / this->boostSpeed; + turnVel = this->actor.shape.rot.y - this->lastYaw; + targetRoll = -((s16)((1820.0f * speed) * (turnVel / 480.00003f))); + rollDiff = targetRoll - this->actor.world.rot.z; + + if (fabsf(targetRoll) < 100.0f) { + this->actor.world.rot.z = 0; + } else if (fabsf(rollDiff) < 100.0f) { + this->actor.world.rot.z = targetRoll; + } else if (rollDiff > 0.0f) { + this->actor.world.rot.z += 100; + } else { + this->actor.world.rot.z -= 100; + } + + this->actor.shape.rot.z = this->actor.world.rot.z; +} + +s32 EnHorse_UpdateConveyors(EnHorse* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 conveyorDir; + + if ((this->actor.floorPoly == NULL) && (this != (EnHorse*)player->rideActor)) { + return 0; + } + conveyorDir = SurfaceType_GetConveyorDirection(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId); + conveyorDir = (conveyorDir << 10) - this->actor.world.rot.y; + if (conveyorDir > 800.0f) { + this->actor.world.rot.y += 800.0f; + } else if (conveyorDir < -800.0f) { + this->actor.world.rot.y -= 800.0f; + } else { + this->actor.world.rot.y += conveyorDir; + } + this->actor.shape.rot.y = this->actor.world.rot.y; + + return 1; +} + +s32 EnHorse_RandInt(f32 range) { + return Rand_ZeroOne() * range; +} + +void EnHorse_Update(Actor* thisx, GlobalContext* globalCtx) { + EnHorse* this = THIS; + GlobalContext* globalCtx2 = globalCtx; + Vec3f dustAcc = { 0.0f, 0.0f, 0.0f }; + Vec3f dustVel = { 0.0f, 1.0f, 0.0f }; + Player* player = PLAYER; + + this->lastYaw = thisx->shape.rot.y; + EnHorse_UpdateStick(this, globalCtx2); + EnHorse_UpdatePlayerDir(this, globalCtx2); + + if (!(this->stateFlags & ENHORSE_INACTIVE)) { + EnHorse_MountDismount(this, globalCtx2); + } + + if (this->stateFlags & ENHORSE_FLAG_19) { + if (this->stateFlags & ENHORSE_FLAG_20 && this->inRace == true) { + this->stateFlags &= ~ENHORSE_FLAG_20; + EnHorse_StartRearing(this); + } else if (!(this->stateFlags & ENHORSE_FLAG_20) && this->stateFlags & ENHORSE_FLAG_21 && + this->action != ENHORSE_ACT_MOUNTED_REARING && this->inRace == true) { + this->stateFlags &= ~ENHORSE_FLAG_21; + EnHorse_StartRearing(this); + } + } + + sActionFuncs[this->action](this, globalCtx2); + this->stateFlags &= ~ENHORSE_OBSTACLE; + this->curFrame = this->skin.skelAnime.curFrame; + this->lastPos = thisx->world.pos; + if (!(this->stateFlags & ENHORSE_INACTIVE)) { + if (this->action == ENHORSE_ACT_MOUNTED_GALLOP || this->action == ENHORSE_ACT_MOUNTED_TROT || + this->action == ENHORSE_ACT_MOUNTED_WALK) { + EnHorse_CheckBoost(this, globalCtx2); + } + if (this->playerControlled == true) { + EnHorse_RegenBoost(this, globalCtx2); + } + Actor_MoveForward(thisx); + if (this->action == ENHORSE_ACT_INGO_RACE) { + if (this->rider != NULL) { + this->rider->world.pos.x = thisx->world.pos.x; + this->rider->world.pos.y = thisx->world.pos.y + 10.0f; + this->rider->world.pos.z = thisx->world.pos.z; + this->rider->shape.rot.x = thisx->shape.rot.x; + this->rider->shape.rot.y = thisx->shape.rot.y; + } + } + if (this->jntSph.elements[0].info.ocElemFlags & 2) { + if (thisx->speedXZ > 6.0f) { + thisx->speedXZ -= 1.0f; + } + } + if (this->jntSph.base.acFlags & 2) { + this->unk_21C = this->unk_228; + if (this->stateFlags & ENHORSE_DRAW) { + Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + } + if (this->action != ENHORSE_ACT_INGO_RACE) { + EnHorse_TiltBody(this, globalCtx2); + } + Collider_UpdateCylinder(thisx, &this->cyl1); + Collider_UpdateCylinder(thisx, &this->cyl2); + + // Required to match + this->cyl1.dim.pos.x = this->cyl1.dim.pos.x + (s16)(Math_SinS(thisx->shape.rot.y) * 11.0f); + this->cyl1.dim.pos.z = this->cyl1.dim.pos.z + (s16)(Math_CosS(thisx->shape.rot.y) * 11.0f); + this->cyl2.dim.pos.x = this->cyl2.dim.pos.x + (s16)(Math_SinS(thisx->shape.rot.y) * -18.0f); + this->cyl2.dim.pos.z = this->cyl2.dim.pos.z + (s16)(Math_CosS(thisx->shape.rot.y) * -18.0f); + CollisionCheck_SetAT(globalCtx2, &globalCtx2->colChkCtx, &this->cyl1.base); + CollisionCheck_SetOC(globalCtx2, &globalCtx2->colChkCtx, &this->cyl1.base); + CollisionCheck_SetOC(globalCtx2, &globalCtx2->colChkCtx, &this->cyl2.base); + if ((player->stateFlags1 & 1) && player->rideActor != NULL) { + if (globalCtx2->sceneNum != SCENE_SPOT20 || + (globalCtx2->sceneNum == SCENE_SPOT20 && (thisx->world.pos.z < -2400.0f))) { + EnHorse_UpdateConveyors(this, globalCtx2); + } + } + if (!(this->stateFlags & ENHORSE_FLAG_24)) { + EnHorse_UpdateBgCheckInfo(this, globalCtx2); + EnHorse_CheckFloors(this, globalCtx2); + if (thisx->world.pos.y < this->yFront && thisx->world.pos.y < this->yBack) { + if (this->yBack < this->yFront) { + thisx->world.pos.y = this->yBack; + } else { + thisx->world.pos.y = this->yFront; + } + } + + } else { + this->stateFlags &= ~ENHORSE_FLAG_24; + } + + if (globalCtx2->sceneNum == SCENE_SPOT09 && (gSaveContext.eventChkInf[9] & 0xF) != 0xF) { + EnHorse_CheckBridgeJumps(this, globalCtx2); + } + + thisx->focus.pos = thisx->world.pos; + thisx->focus.pos.y += 70.0f; + if ((Rand_ZeroOne() < 0.025f) && this->blinkTimer == 0) { + this->blinkTimer++; + } else if (this->blinkTimer > 0) { + this->blinkTimer++; + if (this->blinkTimer >= 4) { + this->blinkTimer = 0; + } + } + + if (thisx->speedXZ == 0.0f && !(this->stateFlags & ENHORSE_FLAG_19)) { + thisx->colChkInfo.mass = 0xFF; + } else { + thisx->colChkInfo.mass = 0xFE; + } + + if (thisx->speedXZ >= 5.0f) { + this->cyl1.base.atFlags |= 1; + } else { + this->cyl1.base.atFlags &= ~1; + } + + if (gSaveContext.entranceIndex != 343 || gSaveContext.sceneSetupIndex != 9) { + if (this->dustFlags & 1) { + this->dustFlags &= ~1; + func_800287AC(globalCtx2, &this->frontRightHoof, &dustVel, &dustAcc, EnHorse_RandInt(100) + 200, + EnHorse_RandInt(10) + 30, EnHorse_RandInt(20) + 30); + } else if (this->dustFlags & 2) { + this->dustFlags &= ~2; + func_800287AC(globalCtx2, &this->frontLeftHoof, &dustVel, &dustAcc, EnHorse_RandInt(100) + 200, + EnHorse_RandInt(10) + 30, EnHorse_RandInt(20) + 30); + } else if (this->dustFlags & 4) { + this->dustFlags &= ~4; + func_800287AC(globalCtx2, &this->backRightHoof, &dustVel, &dustAcc, EnHorse_RandInt(100) + 200, + EnHorse_RandInt(10) + 30, EnHorse_RandInt(20) + 30); + } else if (this->dustFlags & 8) { + this->dustFlags &= ~8; + func_800287AC(globalCtx2, &this->backLeftHoof, &dustVel, &dustAcc, EnHorse_RandInt(100) + 200, + EnHorse_RandInt(10) + 30, EnHorse_RandInt(20) + 30); + } + } + this->stateFlags &= ~ENHORSE_DRAW; + } +} + +s32 EnHorse_PlayerDirToMountSide(EnHorse* this, GlobalContext* globalCtx, Player* player) { + if (this->playerDir == PLAYER_DIR_SIDE_L) { + return -1; + } + if (this->playerDir == PLAYER_DIR_SIDE_R) { + return 1; + } + return 0; +} + +s32 EnHorse_MountSideCheck(EnHorse* this, GlobalContext* globalCtx, Player* player) { + s32 mountSide; + + if (Actor_WorldDistXZToActor(&this->actor, &player->actor) > 75.0f) { + return 0; + } else if (fabsf(this->actor.world.pos.y - player->actor.world.pos.y) > 30.0f) { + return 0; + } else if (Math_CosS(Actor_WorldYawTowardActor(&player->actor, &this->actor) - player->actor.world.rot.y) < + 0.17364818f) { + return 0; + } else { + mountSide = EnHorse_PlayerDirToMountSide(this, globalCtx, player); + if (mountSide == -1) { + return -1; + } + if (mountSide == 1) { + return 1; + } + } + return 0; +} + +s32 EnHorse_GetMountSide(EnHorse* this, GlobalContext* globalCtx) { + if (this->action != ENHORSE_ACT_IDLE) { + return 0; + } + if ((this->animationIdx != ENHORSE_ANIM_IDLE) && (this->animationIdx != ENHORSE_ANIM_WHINNEY)) { + return 0; + } + return EnHorse_MountSideCheck(this, globalCtx, PLAYER); +} + +void EnHorse_RandomOffset(Vec3f* src, f32 dist, Vec3f* dst) { + dst->x = (Rand_ZeroOne() * (dist * 2.0f) + src->x) - dist; + dst->y = (Rand_ZeroOne() * (dist * 2.0f) + src->y) - dist; + dst->z = (Rand_ZeroOne() * (dist * 2.0f) + src->z) - dist; +} + +void EnHorse_SkinCallback1(Actor* thisx, GlobalContext* globalCtx, PSkinAwb* skin) { + EnHorse* this = THIS; + s32 pad; + Vec3f sp94 = { 0.0f, 0.0f, 0.0f }; + Vec3f hoofOffset = { 5.0f, -4.0f, 5.0f }; + Vec3f riderOffset = { 600.0f, -1670.0f, 0.0f }; + Vec3f sp70; + Vec3f sp64 = { 0.0f, 0.0f, 0.0f }; + Vec3f sp58 = { 0.0f, -1.0f, 0.0f }; + + f32 frame = this->skin.skelAnime.curFrame; + Vec3f center; + Vec3f newCenter; + s32 i; + Vec3f sp2C; + f32 sp28; + + if (!(this->stateFlags & ENHORSE_CALC_RIDER_POS)) { + func_800A6408(skin, 30, &riderOffset, &this->riderPos); + this->riderPos.x = this->riderPos.x - this->actor.world.pos.x; + this->riderPos.y = this->riderPos.y - this->actor.world.pos.y; + this->riderPos.z = this->riderPos.z - this->actor.world.pos.z; + } else { + this->stateFlags &= ~ENHORSE_CALC_RIDER_POS; + } + + func_800A6408(skin, 13, &sp94, &sp2C); + SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, &sp2C, &this->unk_228, &sp28); + if ((this->animationIdx == ENHORSE_ANIM_IDLE && this->action != ENHORSE_ACT_FROZEN) && + ((frame > 40.0f && frame < 45.0f && this->type == HORSE_EPONA) || + (frame > 28.0f && frame < 33.0f && this->type == HORSE_HNI))) { + if (Rand_ZeroOne() < 0.6f) { + this->dustFlags |= 1; + func_800A6408(skin, 28, &hoofOffset, &this->frontRightHoof); + this->frontRightHoof.y = this->frontRightHoof.y - 5.0f; + } + } else { + if (this->action == ENHORSE_ACT_STOPPING) { + if ((frame > 10.0f && frame < 13.0f) || (frame > 25.0f && frame < 33.0f)) { + if (Rand_ZeroOne() < 0.7f) { + this->dustFlags |= 2; + func_800A6408(skin, 20, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->frontLeftHoof); + } + if (Rand_ZeroOne() < 0.7f) { + this->dustFlags |= 1; + func_800A6408(skin, 28, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->frontRightHoof); + } + } + + if ((frame > 6.0f && frame < 10.0f) || (frame > 23.0f && frame < 29.0f)) { + if (Rand_ZeroOne() < 0.7f) { + this->dustFlags |= 8; + func_800A6408(skin, 37, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->backLeftHoof); + } + } + + if ((frame > 7.0f && frame < 14.0f) || (frame > 26.0f && frame < 30.0f)) { + if (Rand_ZeroOne() < 0.7f) { + this->dustFlags |= 4; + func_800A6408(skin, 45, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->backRightHoof); + } + } + } else if (this->animationIdx == ENHORSE_ANIM_GALLOP) { + if ((frame > 14.0f) && (frame < 16.0f)) { + this->dustFlags |= 1; + func_800A6408(skin, 28, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 5.0f, &this->frontRightHoof); + } else if (frame > 8.0f && frame < 10.0f) { + this->dustFlags |= 2; + func_800A6408(skin, 20, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->frontLeftHoof); + } else if (frame > 1.0f && frame < 3.0f) { + this->dustFlags |= 4; + func_800A6408(skin, 45, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->backRightHoof); + } else if ((frame > 26.0f) && (frame < 28.0f)) { + this->dustFlags |= 8; + func_800A6408(skin, 37, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->backLeftHoof); + } + } else if (this->action == ENHORSE_ACT_LOW_JUMP && frame > 6.0f && + Rand_ZeroOne() < 1.0f - (frame - 6.0f) * 0.05882353f) { + if (Rand_ZeroOne() < 0.5f) { + this->dustFlags |= 8; + func_800A6408(skin, 37, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->backLeftHoof); + } + if (Rand_ZeroOne() < 0.5f) { + this->dustFlags |= 4; + func_800A6408(skin, 45, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->backRightHoof); + } + } else if (this->action == ENHORSE_ACT_HIGH_JUMP && frame > 5.0f && + Rand_ZeroOne() < 1.0f - (frame - 5.0f) * 0.04f) { + if (Rand_ZeroOne() < 0.5f) { + this->dustFlags |= 8; + func_800A6408(skin, 37, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->backLeftHoof); + } + if (Rand_ZeroOne() < 0.5f) { + this->dustFlags |= 4; + func_800A6408(skin, 45, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->backRightHoof); + } + } else if (this->action == ENHORSE_ACT_BRIDGE_JUMP && Rand_ZeroOne() < 0.5f) { + if (Rand_ZeroOne() < 0.5f) { + this->dustFlags |= 8; + func_800A6408(skin, 37, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->backLeftHoof); + } else { + this->dustFlags |= 4; + func_800A6408(skin, 45, &hoofOffset, &sp70); + EnHorse_RandomOffset(&sp70, 10.0f, &this->backRightHoof); + } + } + } + + for (i = 0; i < this->jntSph.count; i++) { + center.x = this->jntSph.elements[i].dim.modelSphere.center.x; + center.y = this->jntSph.elements[i].dim.modelSphere.center.y; + center.z = this->jntSph.elements[i].dim.modelSphere.center.z; + + func_800A6408(skin, this->jntSph.elements[i].dim.limb, ¢er, &newCenter); + this->jntSph.elements[i].dim.worldSphere.center.x = newCenter.x; + this->jntSph.elements[i].dim.worldSphere.center.y = newCenter.y; + this->jntSph.elements[i].dim.worldSphere.center.z = newCenter.z; + this->jntSph.elements[i].dim.worldSphere.radius = + this->jntSph.elements[i].dim.modelSphere.radius * this->jntSph.elements[i].dim.scale; + } + + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->jntSph.base); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->jntSph.base); +} + +static s32 unk_80A667DC[] = { 0, 3, 7, 14 }; +static UNK_PTR D_80A667EC[] = { 0x06009F80, 0x0600A180, 0x0600A380 }; +static u8 sBlinkTextures[] = { 0, 1, 2, 1 }; + +s32 EnHorse_SkinCallback2(Actor* thisx, GlobalContext* globalCtx, s32 arg2, PSkinAwb* arg3) { + EnHorse* this = THIS; + s32 sp48; + + sp48 = 1; + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_horse.c", 8582); + if (arg2 == 13 && this->type == HORSE_EPONA) { + u8 index = sBlinkTextures[this->blinkTimer]; + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80A667EC[index])); + } else if (this->type == HORSE_HNI && this->stateFlags & ENHORSE_FLAG_18 && arg2 == 30) { + func_800A5F60(globalCtx->state.gfxCtx, &this->skin, arg2, D_06006530, 0); + sp48 = 0; + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_horse.c", 8601); + return sp48; +} + +void EnHorse_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnHorse* this = THIS; + + if (!(this->stateFlags & ENHORSE_INACTIVE)) { + func_80093D18(globalCtx->state.gfxCtx); + this->stateFlags |= ENHORSE_DRAW; + if (this->stateFlags & ENHORSE_JUMPING) { + func_800A6360(thisx, globalCtx, &this->skin, &EnHorse_SkinCallback1, &EnHorse_SkinCallback2, 0); + } else { + func_800A6360(thisx, globalCtx, &this->skin, &EnHorse_SkinCallback1, &EnHorse_SkinCallback2, 1); + } + if (this->postDrawFunc != NULL) { + this->postDrawFunc(this, globalCtx); + } + } +} diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h index 8c91ff0b8c..8ddf67f160 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h @@ -4,50 +4,187 @@ #include "ultra64.h" #include "global.h" +typedef enum { + /* 0 */ ENHORSE_ACT_FROZEN, + /* 1 */ ENHORSE_ACT_INACTIVE, + /* 2 */ ENHORSE_ACT_IDLE, + /* 3 */ ENHORSE_ACT_FOLLOW_PLAYER, + /* 4 */ ENHORSE_ACT_INGO_RACE, + /* 5 */ ENHORSE_ACT_MOUNTED_IDLE, + /* 6 */ ENHORSE_ACT_MOUNTED_IDLE_WHINNEYING, + /* 7 */ ENHORSE_ACT_MOUNTED_TURN, + /* 8 */ ENHORSE_ACT_MOUNTED_WALK, + /* 9 */ ENHORSE_ACT_MOUNTED_TROT, + /* 10 */ ENHORSE_ACT_MOUNTED_GALLOP, + /* 11 */ ENHORSE_ACT_MOUNTED_REARING, + /* 12 */ ENHORSE_ACT_STOPPING, + /* 13 */ ENHORSE_ACT_REVERSE, + /* 14 */ ENHORSE_ACT_LOW_JUMP, + /* 15 */ ENHORSE_ACT_HIGH_JUMP, + /* 16 */ ENHORSE_ACT_BRIDGE_JUMP, + /* 17 */ ENHORSE_ACT_CS_UPDATE, + /* 18 */ ENHORSE_ACT_HBA, + /* 19 */ ENHORSE_ACT_FLEE_PLAYER +} EnHorseAction; + + +#define ENHORSE_BOOST (1 << 0) /* 0x1 */ +#define ENHORSE_BOOST_DECEL (1 << 1) /* 0x2 */ +#define ENHORSE_JUMPING (1 << 2) /* 0x4 */ +#define ENHORSE_CALC_RIDER_POS (1 << 3) /* 0x8 */ +#define ENHORSE_FORCE_REVERSING (1 << 4) /* 0x10 */ +#define ENHORSE_FORCE_WALKING (1 << 5) /* 0x20 */ +#define ENHORSE_FLAG_6 (1 << 6) /* 0x40 */ +#define ENHORSE_FLAG_7 (1 << 7) /* 0x80 */ +#define ENHORSE_FLAG_8 (1 << 8) /* 0x100 */ +#define ENHORSE_FLAG_9 (1 << 9) /* 0x200 */ +#define ENHORSE_STOPPING_NEIGH_SOUND (1 << 10) /* 0x400 */ +#define ENHORSE_LAND2_SOUND (1 << 11) /* 0x800 */ +#define ENHORSE_SANDDUST_SOUND (1 << 12) /* 0x1000 */ +#define ENHORSE_INACTIVE (1 << 13) /* 0x2000 */ +#define ENHORSE_OBSTACLE (1 << 14) /* 0x4000 */ +#define ENHORSE_TURNING_TO_PLAYER (1 << 15) /* 0x8000 */ +#define ENHORSE_UNRIDEABLE (1 << 16) /* 0x1 0000 */ +#define ENHORSE_CANT_JUMP (1 << 17) /* 0x2 0000 */ +#define ENHORSE_FLAG_18 (1 << 18) /* 0x4 0000 */ +#define ENHORSE_FLAG_19 (1 << 19) /* 0x8 0000 */ +#define ENHORSE_FLAG_20 (1 << 20) /* 0x10 0000 */ +#define ENHORSE_FLAG_21 (1 << 21) /* 0x20 0000 */ +#define ENHORSE_FIRST_BOOST_REGEN (1 << 22) /* 0x40 0000 */ +#define ENHORSE_INGO_WON (1 << 23) /* 0x80 0000 */ +#define ENHORSE_FLAG_24 (1 << 24) /* 0x100 0000 */ +#define ENHORSE_FLAG_25 (1 << 25) /* 0x200 0000 */ +#define ENHORSE_FLAG_26 (1 << 26) /* 0x400 0000 */ +#define ENHORSE_DRAW (1 << 27) /* 0x800 0000 */ +#define ENHORSE_FLAG_28 (1 << 28) /* 0x1000 0000 */ +#define ENHORSE_FLAG_29 (1 << 29) /* 0x2000 0000 */ +#define ENHORSE_FLAG_30 (1 << 30) /* 0x4000 0000 */ +#define ENHORSE_FLAG_31 (1 << 31) /* 0x8000 0000 */ + struct EnHorse; +typedef enum { + /* 0 */ PLAYER_DIR_FRONT_R, + /* 1 */ PLAYER_DIR_FRONT_L, + /* 2 */ PLAYER_DIR_BACK_R, + /* 3 */ PLAYER_DIR_BACK_L, + /* 4 */ PLAYER_DIR_SIDE_R, + /* 5 */ PLAYER_DIR_SIDE_L +} EnHorsePlayerDir; + +typedef enum { + /* 0 */ ENHORSE_ANIM_IDLE, + /* 1 */ ENHORSE_ANIM_WHINNEY, + /* 2 */ ENHORSE_ANIM_STOPPING, + /* 3 */ ENHORSE_ANIM_REARING, + /* 4 */ ENHORSE_ANIM_WALK, + /* 5 */ ENHORSE_ANIM_TROT, + /* 6 */ ENHORSE_ANIM_GALLOP, + /* 7 */ ENHORSE_ANIM_LOW_JUMP, + /* 8 */ ENHORSE_ANIM_HIGH_JUMP +} EnHorseAnimationIndex; + +typedef enum { + /* 0 */ HORSE_EPONA, + /* 1 */ HORSE_HNI +} HorseType; + +typedef void (*EnHorsePostdrawFunc)(struct EnHorse*, GlobalContext*); + typedef struct EnHorse { - /* 0x000 */ Actor actor; - /* 0x014C */ s32 unk_14C; - /* 0x0150 */ char unk_150[0x008]; - /* 0x0150 */ s32 unk_158; - /* 0x0150 */ char unk_15C[0x094]; - /* 0x01F0 */ u32 unk_1F0; - /* 0x01F4 */ char unk_1F4[0x01C]; - /* 0x0210 */ s32 unk_210; - /* 0x0214 */ f32 unk_214; - /* 0x0218 */ char unk_218[0x040]; - /* 0x0258 */ Vec3f unk_258; - /* 0x0264 */ char unk_264[0x124]; - /* 0x0388 */ s32 unk_388; - /* 0x038C */ char unk_38C[0x14]; - /* 0x03A0 */ s32 unk_3A0; - /* 0x03A4 */ char unk_3A4[0x58]; + /* 0x0000 */ Actor actor; + /* 0x014C */ EnHorseAction action; + /* 0x0150 */ s32 noInputTimer; + /* 0x0154 */ s32 noInputTimerMax; + /* 0x0158 */ s32 type; + /* 0x015C */ s8 bankIndex; + /* 0x0160 */ PSkinAwb skin; + /* 0x01F0 */ u32 stateFlags; + /* 0x01F4 */ Vec3f lastPos; + /* 0x0200 */ s16 lastYaw; + /* 0x0204 */ s32 curRaceWaypoint; + /* 0x0208 */ s32 boostSpeed; + /* 0x020C */ s32 playerControlled; + /* 0x0210 */ s32 animationIdx; + /* 0x0214 */ f32 curFrame; + /* 0x0218 */ s32 soundTimer; + /* 0x021C */ Vec3f unk_21C; + /* 0x0228 */ Vec3f unk_228; + /* 0x0234 */ s32 unk_234; + /* 0x0238 */ u8 numBoosts; + /* 0x023C */ s32 boostRegenTime; + /* 0x0240 */ s32 boostTimer; + /* 0x0244 */ EnHorsePostdrawFunc postDrawFunc; + /* 0x0248 */ f32 yFront; // The y coordinate of the floor under the front feet + /* 0x024C */ f32 yBack; // The y coordinate of the floor under the back feet + /* 0x0250 */ s16 followTimer; + /* 0x0252 */ s16 unk_252; + /* 0x0254 */ EnHorseAction prevAction; + /* 0x0258 */ Vec3f riderPos; + /* 0x0264 */ Vec2f curStick; + /* 0x026C */ Vec2f lastStick; + /* 0x0274 */ f32 jumpStartY; + /* 0x0278 */ ColliderCylinder cyl1; + /* 0x02C4 */ ColliderCylinder cyl2; + /* 0x0310 */ ColliderJntSph jntSph; + /* 0x0330 */ ColliderJntSphElement jntSphList; + /* 0x0370 */ u32 playerDir; + /* 0x0374 */ s16 unk_374; + /* 0x0376 */ s16 angleToPlayer; + /* 0x0378 */ s16 followPlayerTurnSpeed; + /* 0x037A */ u8 blinkTimer; + /* 0x037C */ s16 waitTimer; + /* 0x037E */ s16 unk_37E; + /* 0x0380 */ s32 cutsceneAction; + /* 0x0384 */ u16 cutsceneFlags; + // struct { + /* 0x0388 */ s32 inRace; + /* 0x038C */ Actor* rider; + /* 0x0390 */ u32 unk_390; + /* 0x0394 */ u16 ingoRaceFlags; + /* 0x0398 */ f32 ingoHorseMaxSpeed; + // } race; //? + /* 0x039C */ s32 unk_39C; // probably hbaAction + /* 0x03A0 */ s32 hbaStarted; + /* 0x03A4 */ s32 hbaFlags; + /* 0x03A8 */ s32 hbaTimer; + /* 0x03AC */ u8 bridgeJumpIdx; + /* 0x03B0 */ Vec3f bridgeJumpStart; + /* 0x03BC */ s32 bridgeJumpTimer; + /* 0x03C0 */ f32 bridgeJumpYVel; + /* 0x03C4 */ s16 bridgeJumpRelAngle; + /* 0x03C6 */ s16 unk_3C6; // pad + // sub struct? + /* 0x03C8 */ u16 dustFlags; + /* 0x03CC */ Vec3f frontRightHoof; + /* 0x03D8 */ Vec3f frontLeftHoof; + /* 0x03E4 */ Vec3f backRightHoof; + /* 0x03F0 */ Vec3f backLeftHoof; } EnHorse; // size = 0x03FC #define EN_HORSE_CHECK_1(horseActor) \ - (((horseActor)->unk_1F0 & 0x40) \ + (((horseActor)->stateFlags & ENHORSE_FLAG_6) \ ? true \ : false) #define EN_HORSE_CHECK_2(horseActor) \ - (((horseActor)->unk_1F0 & 0x100) \ + (((horseActor)->stateFlags & ENHORSE_FLAG_8) \ ? true \ : false) #define EN_HORSE_CHECK_3(horseActor) \ - (((horseActor)->unk_1F0 & 0x200) \ + (((horseActor)->stateFlags & ENHORSE_FLAG_9) \ ? true \ : false) -#define EN_HORSE_CHECK_4(horseActor) \ - (((((horseActor)->unk_14C == 5) || ((horseActor)->unk_14C == 0) || ((horseActor)->unk_14C == 6)) && \ - !((horseActor)->unk_1F0 & 0x80000) && !((horseActor)->unk_1F0 & 0x2000000)) \ - ? true \ +#define EN_HORSE_CHECK_4(horseActor) \ + (((((horseActor)->action == ENHORSE_ACT_MOUNTED_IDLE) || ((horseActor)->action == ENHORSE_ACT_FROZEN) || ((horseActor)->action == ENHORSE_ACT_MOUNTED_IDLE_WHINNEYING)) && \ + !((horseActor)->stateFlags & ENHORSE_FLAG_19) && !((horseActor)->stateFlags & ENHORSE_FLAG_25)) \ + ? true \ : false) -#define EN_HORSE_CHECK_5(horseActor) \ - (((horseActor)->unk_1F0 & 0x4) \ +#define EN_HORSE_CHECK_JUMPING(horseActor) \ + (((horseActor)->stateFlags & ENHORSE_JUMPING) \ ? true \ : false) diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 6401a2cb3f..18d0240075 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -146,11 +146,11 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, GlobalContext* g } else if ((this->startTimer > 80) && (player->rideActor != NULL) && !(this->startFlags & INGORACE_PLAYER_MOVE)) { this->startFlags |= INGORACE_PLAYER_MOVE; horse = (EnHorse*)player->rideActor; - horse->unk_388 = 1; + horse->inRace = 1; } else if ((this->startTimer > 81) && !(this->startFlags & INGORACE_INGO_MOVE)) { ingoHorse = (EnHorse*)this->ingoHorse; - ingoHorse->unk_388 = 1; + ingoHorse->inRace = 1; this->startFlags |= INGORACE_INGO_MOVE; Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } @@ -197,7 +197,7 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, GlobalContext* g this->result = INGORACE_INGO_WIN; this->finishTimer = 70; - ingoHorse->unk_1F0 |= 0x800000; + ingoHorse->stateFlags |= ENHORSE_INGO_WON; Audio_SetBGM(0x41); Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } @@ -249,7 +249,7 @@ s32 EnHorseGameCheck_UpdateGerudoArchery(EnHorseGameCheckBase* base, GlobalConte if (this->startTimer > 90) { if (globalCtx) {} - horse->unk_3A0 = 1; + horse->hbaStarted = 1; } this->startTimer++; return true; @@ -332,7 +332,7 @@ s32 EnHorseGameCheck_UpdateMalonRace(EnHorseGameCheckBase* base, GlobalContext* this->raceFlags |= MALONRACE_PLAYER_MOVE; horse = (EnHorse*)player->rideActor; - horse->unk_388 = 1; + horse->inRace = 1; } else if ((this->startTimer > 81) && !(this->raceFlags & MALONRACE_START_SFX)) { this->raceFlags |= MALONRACE_START_SFX; Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); @@ -351,7 +351,7 @@ s32 EnHorseGameCheck_UpdateMalonRace(EnHorseGameCheckBase* base, GlobalContext* if ((player->rideActor != NULL) && (dist < 250.0f)) { horse = (EnHorse*)player2->rideActor; - if (horse->unk_1F0 & 4) { + if (horse->stateFlags & ENHORSE_JUMPING) { if ((i > 0) && (this->fenceCheck[i - 1] == 1)) { this->fenceCheck[i] = 1; } else if (i == 0) { diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 9c0e3eda96..a7cf58fc2c 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -334,10 +334,10 @@ s32 func_80A7975C(EnIn* this, GlobalContext* globalCtx) { if (this->actor.params != 1 || this->actor.shape.rot.z != 1 || LINK_IS_CHILD) { return 0; } - this->unk_1E6 = 1; + this->animationIdx = 1; this->collider.base.ocFlags1 &= ~OC1_ON; - Animation_Change(&this->skelAnime, D_80A7B918[this->unk_1E6], 1.0f, 0.0f, - Animation_GetLastFrame(D_80A7B918[this->unk_1E6]), 2, 0.0f); + Animation_Change(&this->skelAnime, D_80A7B918[this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(D_80A7B918[this->animationIdx]), 2, 0.0f); this->actionFunc = func_80A7A304; return 1; } @@ -604,17 +604,17 @@ void func_80A7A304(EnIn* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_VO_IN_CRY_0); } if (SkelAnime_Update(&this->skelAnime) != 0) { - this->unk_1E6 %= 8; - this->unk_1E8 = this->unk_1E6; - if (this->unk_1E6 == 3 || this->unk_1E6 == 4) { + this->animationIdx %= 8; + this->unk_1E8 = this->animationIdx; + if (this->animationIdx == 3 || this->animationIdx == 4) { Audio_PlaySoundGeneral(NA_SE_IT_LASH, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); if (Rand_ZeroOne() < 0.3f) { Audio_PlaySoundGeneral(NA_SE_IT_INGO_HORSE_NEIGH, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); } } - Animation_Change(&this->skelAnime, D_80A7B918[this->unk_1E6], 1.0f, 0.0f, - Animation_GetLastFrame(D_80A7B918[this->unk_1E6]), 2, -10.0f); + Animation_Change(&this->skelAnime, D_80A7B918[this->animationIdx], 1.0f, 0.0f, + Animation_GetLastFrame(D_80A7B918[this->animationIdx]), 2, -10.0f); } } @@ -656,7 +656,7 @@ void func_80A7A568(EnIn* this, GlobalContext* globalCtx) { return; } gSaveContext.eventInf[0] = - (gSaveContext.eventInf[0] & ~0x10) | (((EnHorse*)PLAYER->rideActor)->unk_158 << 4); + (gSaveContext.eventInf[0] & ~0x10) | (((EnHorse*)PLAYER->rideActor)->type << 4); gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0xF) | 2; phi_a2 = 2; phi_a3 = 2; diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h index 93c2a5890f..a27a5370a9 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.h +++ b/src/overlays/actors/ovl_En_In/z_en_in.h @@ -15,8 +15,8 @@ typedef struct EnIn { /* 0x0194 */ ColliderCylinder collider; /* 0x01E0 */ f32 unk_1E0; /* 0x01E4 */ s8 ingoObjBankIndex; - /* 0x01E6 */ s16 unk_1E6; - /* 0x01E6 */ s16 unk_1E8; + /* 0x01E6 */ s16 animationIdx; + /* 0x01E8 */ s16 unk_1E8; /* 0x01EA */ s16 unk_1EA; /* 0x01EC */ s16 unk_1EC; /* 0x01EE */ s16 unk_1EE; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 9fb1415beb..0feb74af44 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -5721,7 +5721,7 @@ s32 func_8083E0FC(Player* this, GlobalContext* globalCtx) { this->stateFlags1 |= 0x800000; this->actor.bgCheckFlags &= ~0x20; - if (this->unk_43C < 0) { + if (this->mountSide < 0) { temp = 0; } else { temp = 1; @@ -5730,14 +5730,14 @@ s32 func_8083E0FC(Player* this, GlobalContext* globalCtx) { unk_04 = D_80854578[temp].unk_04; unk_08 = D_80854578[temp].unk_08; this->actor.world.pos.x = - rideActor->actor.world.pos.x + rideActor->unk_258.x + ((unk_04 * sp38) + (unk_08 * sp34)); + rideActor->actor.world.pos.x + rideActor->riderPos.x + ((unk_04 * sp38) + (unk_08 * sp34)); this->actor.world.pos.z = - rideActor->actor.world.pos.z + rideActor->unk_258.z + ((unk_08 * sp38) - (unk_04 * sp34)); + rideActor->actor.world.pos.z + rideActor->riderPos.z + ((unk_08 * sp38) - (unk_04 * sp34)); this->unk_878 = rideActor->actor.world.pos.y - this->actor.world.pos.y; this->currentYaw = this->actor.shape.rot.y = rideActor->actor.shape.rot.y; - func_8002DECC(globalCtx, this, &rideActor->actor); + Actor_MountHorse(globalCtx, this, &rideActor->actor); func_80832264(globalCtx, this, D_80854578[temp].anim); func_80832F54(globalCtx, this, 0x9B); this->actor.parent = this->rideActor; @@ -11176,13 +11176,13 @@ s32 func_8084C9BC(Player* this, GlobalContext* globalCtx) { if (this->unk_850 < 0) { this->unk_850 = 99; } else { - sp38 = (this->unk_43C < 0) ? 0 : 1; + sp38 = (this->mountSide < 0) ? 0 : 1; if (!func_8084C89C(globalCtx, this, sp38, &sp34)) { sp38 ^= 1; if (!func_8084C89C(globalCtx, this, sp38, &sp34)) { return 0; } else { - this->unk_43C = -this->unk_43C; + this->mountSide = -this->mountSide; } } @@ -11195,7 +11195,7 @@ s32 func_8084C9BC(Player* this, GlobalContext* globalCtx) { rideActor->actor.child = NULL; func_80835DAC(globalCtx, this, func_8084D3E4, 0); this->unk_878 = sp34 - rideActor->actor.world.pos.y; - func_80832264(globalCtx, this, (this->unk_43C < 0) ? &gPlayerAnim_003390 : &gPlayerAnim_0033A0); + func_80832264(globalCtx, this, (this->mountSide < 0) ? &gPlayerAnim_003390 : &gPlayerAnim_0033A0); return 1; } } @@ -11282,7 +11282,7 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { return; } - arr = D_80854998[(this->unk_43C < 0) ? 0 : 1]; + arr = D_80854998[(this->mountSide < 0) ? 0 : 1]; if (LinkAnimation_OnFrame(&this->skelAnime, arr[0])) { func_8002F7DC(&this->actor, NA_SE_PL_CLIMB_CLIFF); @@ -11301,8 +11301,8 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { func_8002DE74(globalCtx, this); this->skelAnime.prevTransl = D_8085499C; - if ((rideActor->unk_210 != this->unk_850) && ((rideActor->unk_210 >= 2) || (this->unk_850 >= 2))) { - if ((this->unk_850 = rideActor->unk_210) < 2) { + if ((rideActor->animationIdx != this->unk_850) && ((rideActor->animationIdx >= 2) || (this->unk_850 >= 2))) { + if ((this->unk_850 = rideActor->animationIdx) < 2) { f32 rand = Rand_ZeroOne(); s32 temp = 0; @@ -11333,7 +11333,7 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { func_80832924(this, D_808549A4); } } else { - this->skelAnime.curFrame = rideActor->unk_214; + this->skelAnime.curFrame = rideActor->curFrame; LinkAnimation_AnimateFrame(globalCtx, &this->skelAnime); } @@ -11353,9 +11353,9 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { } } - this->actor.world.pos.x = rideActor->actor.world.pos.x + rideActor->unk_258.x; - this->actor.world.pos.y = (rideActor->actor.world.pos.y + rideActor->unk_258.y) - 27.0f; - this->actor.world.pos.z = rideActor->actor.world.pos.z + rideActor->unk_258.z; + this->actor.world.pos.x = rideActor->actor.world.pos.x + rideActor->riderPos.x; + this->actor.world.pos.y = (rideActor->actor.world.pos.y + rideActor->riderPos.y) - 27.0f; + this->actor.world.pos.z = rideActor->actor.world.pos.z + rideActor->riderPos.z; this->currentYaw = this->actor.shape.rot.y = rideActor->actor.shape.rot.y; @@ -11365,7 +11365,7 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { if (D_808535E0 == 0) { if (this->unk_84F != 0) { if (LinkAnimation_Update(globalCtx, &this->skelAnime2)) { - rideActor->unk_1F0 &= ~0x100; + rideActor->stateFlags &= ~ENHORSE_FLAG_8; this->unk_84F = 0; } @@ -11466,7 +11466,7 @@ void func_8084D3E4(Player* this, GlobalContext* globalCtx) { } else { Camera_ChangeSetting(Gameplay_GetCamera(globalCtx, 0), CAM_SET_NORMAL0); - if (this->unk_43C < 0) { + if (this->mountSide < 0) { D_808549C4[0].field = 0x2828; } else { D_808549C4[0].field = 0x281D;