From 3fd05c9147116c9d0c0b5366cb24105c9ead7427 Mon Sep 17 00:00:00 2001 From: mzxrules Date: Sun, 4 Jul 2021 11:23:18 -0400 Subject: [PATCH] z_En_Ossan and dependencies (#824) * fix colliderinit typo * fix initchain * reloc * progress * progress * Pick off a few easy functions, reduce number of warnings * more tough OKs * Getting closer to all OK, fix en_girla header * some hard OKs, 7 to go * two funcs remaining * func_80AC7094 OK! * Fix warnings, begin documentation * get most of object_ossan documented, document some of en_ossan * improve en_girla function names * more EnOssan documentation * more documentation * en_tana basically complete, en_girla vars all named, en_ossan documentation improvements * delete TIME ITSELF * object_oF1d_map OK * more names, fixed a poition typo * Nearly all en_ossan functions named, all variables named * format.sh * forgot to delete data * implement pr changes * EnOssan OK! implement most of Roman's suggestions * ugh * implement figs suggestions * implement roman's suggestion * Can't tell my left from my other left Co-authored-by: fig02 --- .../actors/ovl_En_Ossan/EnOssan_Destroy.s | 16 - .../actors/ovl_En_Ossan/EnOssan_Init.s | 305 -- .../actors/ovl_En_Ossan/EnOssan_Update.s | 12 - .../actors/ovl_En_Ossan/func_80AC2CA0.s | 3 - .../actors/ovl_En_Ossan/func_80AC2CA8.s | 5 - .../actors/ovl_En_Ossan/func_80AC2CB8.s | 14 - .../actors/ovl_En_Ossan/func_80AC2CE8.s | 14 - .../actors/ovl_En_Ossan/func_80AC2D18.s | 14 - .../actors/ovl_En_Ossan/func_80AC2D48.s | 14 - .../actors/ovl_En_Ossan/func_80AC2D78.s | 14 - .../actors/ovl_En_Ossan/func_80AC2DA8.s | 14 - .../actors/ovl_En_Ossan/func_80AC2DD8.s | 91 - .../actors/ovl_En_Ossan/func_80AC2F2C.s | 97 - .../actors/ovl_En_Ossan/func_80AC3098.s | 9 - .../actors/ovl_En_Ossan/func_80AC30B8.s | 20 - .../actors/ovl_En_Ossan/func_80AC30FC.s | 9 - .../actors/ovl_En_Ossan/func_80AC311C.s | 9 - .../actors/ovl_En_Ossan/func_80AC313C.s | 20 - .../actors/ovl_En_Ossan/func_80AC3180.s | 9 - .../actors/ovl_En_Ossan/func_80AC31A0.s | 26 - .../actors/ovl_En_Ossan/func_80AC31F4.s | 60 - .../actors/ovl_En_Ossan/func_80AC32C4.s | 40 - .../actors/ovl_En_Ossan/func_80AC3350.s | 25 - .../actors/ovl_En_Ossan/func_80AC33B0.s | 55 - .../actors/ovl_En_Ossan/func_80AC3744.s | 26 - .../actors/ovl_En_Ossan/func_80AC37A8.s | 67 - .../actors/ovl_En_Ossan/func_80AC3884.s | 19 - .../actors/ovl_En_Ossan/func_80AC38C8.s | 26 - .../actors/ovl_En_Ossan/func_80AC3928.s | 36 - .../actors/ovl_En_Ossan/func_80AC39AC.s | 58 - .../actors/ovl_En_Ossan/func_80AC3A80.s | 25 - .../actors/ovl_En_Ossan/func_80AC3AE0.s | 15 - .../actors/ovl_En_Ossan/func_80AC3B18.s | 55 - .../actors/ovl_En_Ossan/func_80AC3BCC.s | 97 - .../actors/ovl_En_Ossan/func_80AC3D18.s | 96 - .../actors/ovl_En_Ossan/func_80AC3E50.s | 39 - .../actors/ovl_En_Ossan/func_80AC3ED8.s | 29 - .../actors/ovl_En_Ossan/func_80AC3F38.s | 87 - .../actors/ovl_En_Ossan/func_80AC4074.s | 135 - .../actors/ovl_En_Ossan/func_80AC4220.s | 30 - .../actors/ovl_En_Ossan/func_80AC4288.s | 76 - .../actors/ovl_En_Ossan/func_80AC43A0.s | 23 - .../actors/ovl_En_Ossan/func_80AC43F0.s | 64 - .../actors/ovl_En_Ossan/func_80AC44DC.s | 64 - .../actors/ovl_En_Ossan/func_80AC45C8.s | 160 - .../actors/ovl_En_Ossan/func_80AC47DC.s | 164 - .../actors/ovl_En_Ossan/func_80AC4978.s | 139 - .../actors/ovl_En_Ossan/func_80AC4B4C.s | 139 - .../actors/ovl_En_Ossan/func_80AC4D20.s | 51 - .../actors/ovl_En_Ossan/func_80AC4DDC.s | 75 - .../actors/ovl_En_Ossan/func_80AC4EC8.s | 70 - .../actors/ovl_En_Ossan/func_80AC4FAC.s | 14 - .../actors/ovl_En_Ossan/func_80AC4FE0.s | 14 - .../actors/ovl_En_Ossan/func_80AC5014.s | 126 - .../actors/ovl_En_Ossan/func_80AC51B8.s | 73 - .../actors/ovl_En_Ossan/func_80AC52C0.s | 83 - .../actors/ovl_En_Ossan/func_80AC53F4.s | 69 - .../actors/ovl_En_Ossan/func_80AC54F4.s | 48 - .../actors/ovl_En_Ossan/func_80AC5594.s | 76 - .../actors/ovl_En_Ossan/func_80AC5680.s | 76 - .../actors/ovl_En_Ossan/func_80AC576C.s | 76 - .../actors/ovl_En_Ossan/func_80AC5858.s | 57 - .../actors/ovl_En_Ossan/func_80AC5900.s | 97 - .../actors/ovl_En_Ossan/func_80AC5A28.s | 162 - .../actors/ovl_En_Ossan/func_80AC5C24.s | 32 - .../actors/ovl_En_Ossan/func_80AC5C9C.s | 43 - .../actors/ovl_En_Ossan/func_80AC5D40.s | 30 - .../actors/ovl_En_Ossan/func_80AC5DAC.s | 86 - .../actors/ovl_En_Ossan/func_80AC5EF0.s | 143 - .../actors/ovl_En_Ossan/func_80AC60E4.s | 28 - .../actors/ovl_En_Ossan/func_80AC6148.s | 31 - .../actors/ovl_En_Ossan/func_80AC61B8.s | 23 - .../actors/ovl_En_Ossan/func_80AC6208.s | 23 - .../actors/ovl_En_Ossan/func_80AC6258.s | 30 - .../actors/ovl_En_Ossan/func_80AC62C4.s | 13 - .../actors/ovl_En_Ossan/func_80AC62F4.s | 38 - .../actors/ovl_En_Ossan/func_80AC6384.s | 59 - .../actors/ovl_En_Ossan/func_80AC646C.s | 10 - .../actors/ovl_En_Ossan/func_80AC6490.s | 48 - .../actors/ovl_En_Ossan/func_80AC652C.s | 44 - .../actors/ovl_En_Ossan/func_80AC65B8.s | 87 - .../actors/ovl_En_Ossan/func_80AC66F4.s | 64 - .../actors/ovl_En_Ossan/func_80AC67C4.s | 125 - .../actors/ovl_En_Ossan/func_80AC6970.s | 16 - .../actors/ovl_En_Ossan/func_80AC69A4.s | 45 - .../actors/ovl_En_Ossan/func_80AC6A44.s | 46 - .../actors/ovl_En_Ossan/func_80AC6ADC.s | 25 - .../actors/ovl_En_Ossan/func_80AC6B3C.s | 74 - .../actors/ovl_En_Ossan/func_80AC6C54.s | 58 - .../actors/ovl_En_Ossan/func_80AC6D30.s | 58 - .../actors/ovl_En_Ossan/func_80AC6E0C.s | 25 - .../actors/ovl_En_Ossan/func_80AC6E6C.s | 25 - .../actors/ovl_En_Ossan/func_80AC6ECC.s | 25 - .../actors/ovl_En_Ossan/func_80AC6F2C.s | 105 - .../actors/ovl_En_Ossan/func_80AC7094.s | 217 -- .../actors/ovl_En_Ossan/func_80AC7380.s | 14 - .../actors/ovl_En_Ossan/func_80AC73B4.s | 77 - .../actors/ovl_En_Ossan/func_80AC74F4.s | 15 - .../actors/ovl_En_Ossan/func_80AC7528.s | 181 -- .../actors/ovl_En_Ossan/func_80AC77CC.s | 138 - .../actors/ovl_En_Ossan/func_80AC79C8.s | 265 -- .../actors/ovl_En_Ossan/func_80AC7DAC.s | 84 - .../actors/ovl_En_Ossan/func_80AC7ED0.s | 95 - .../actors/ovl_En_Ossan/func_80AC801C.s | 13 - .../actors/ovl_En_Ossan/func_80AC8048.s | 29 - .../actors/ovl_En_Ossan/func_80AC80B4.s | 111 - .../actors/ovl_En_Ossan/func_80AC8244.s | 100 - .../actors/ovl_En_Ossan/func_80AC83A8.s | 15 - .../actors/ovl_En_Ossan/func_80AC83DC.s | 103 - .../actors/ovl_En_Ossan/func_80AC854C.s | 82 - .../actors/ovl_En_Ossan/func_80AC8668.s | 82 - .../actors/ovl_En_Ossan/func_80AC8784.s | 82 - assets/xml/objects/object_ds2.xml | 4 +- assets/xml/objects/object_oF1d_map.xml | 35 + assets/xml/objects/object_os.xml | 3 +- assets/xml/objects/object_ossan.xml | 12 + assets/xml/objects/object_rs.xml | 4 +- assets/xml/objects/object_shop_dungen.xml | 11 +- data/overlays/actors/z_en_ossan.data.s | 163 - data/overlays/actors/z_en_ossan.reloc.s | 13 - include/functions.h | 2 +- spec | 9 +- src/code/z_actor.c | 6 +- src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 11 +- src/overlays/actors/ovl_Demo_Go/z_demo_go.c | 37 +- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 1134 +++---- src/overlays/actors/ovl_En_GirlA/z_en_girla.h | 104 +- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 9 +- src/overlays/actors/ovl_En_Go/z_en_go.c | 52 +- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 64 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 2732 +++++++++++++++-- src/overlays/actors/ovl_En_Ossan/z_en_ossan.h | 129 +- .../ovl_En_Syateki_Man/z_en_syateki_man.c | 15 +- src/overlays/actors/ovl_En_Tana/z_en_tana.c | 35 +- 134 files changed, 3479 insertions(+), 7998 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DD8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2F2C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3098.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC311C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC313C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3180.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3350.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC33B0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3744.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3884.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC38C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3A80.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3AE0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3B18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3BCC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3D18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3E50.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3ED8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4074.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4220.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4288.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC45C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC47DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4978.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4B4C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4EC8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FAC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FE0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC51B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC52C0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC53F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5594.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5680.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC576C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5858.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C24.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C9C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5EF0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC61B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6208.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6384.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC646C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC65B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC66F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC67C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6970.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6A44.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC74F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC801C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8048.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83A8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s create mode 100644 assets/xml/objects/object_oF1d_map.xml create mode 100644 assets/xml/objects/object_ossan.xml delete mode 100644 data/overlays/actors/z_en_ossan.data.s delete mode 100644 data/overlays/actors/z_en_ossan.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s deleted file mode 100644 index 10a8965726..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel EnOssan_Destroy -/* 00A6C 80AC370C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A70 80AC3710 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A74 80AC3714 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A78 80AC3718 AFA5001C */ sw $a1, 0x001C($sp) -/* 00A7C 80AC371C 0C0295BC */ jal SkelAnime_Free -/* 00A80 80AC3720 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A84 80AC3724 8FA50018 */ lw $a1, 0x0018($sp) -/* 00A88 80AC3728 8FA4001C */ lw $a0, 0x001C($sp) -/* 00A8C 80AC372C 0C0170EB */ jal Collider_DestroyCylinder - -/* 00A90 80AC3730 24A50198 */ addiu $a1, $a1, 0x0198 ## $a1 = 00000198 -/* 00A94 80AC3734 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A98 80AC3738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A9C 80AC373C 03E00008 */ jr $ra -/* 00AA0 80AC3740 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s deleted file mode 100644 index cd4af5f88c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s +++ /dev/null @@ -1,305 +0,0 @@ -.rdata -glabel D_80AC8EF0 - .asciz "コキリの店 " - .balign 4 - -glabel D_80AC8F00 - .asciz "薬屋 " - .balign 4 - -glabel D_80AC8F10 - .asciz "夜の店 " - .balign 4 - -glabel D_80AC8F20 - .asciz "路地裏の店 " - .balign 4 - -glabel D_80AC8F30 - .asciz "盾の店 " - .balign 4 - -glabel D_80AC8F40 - .asciz "大人の店 " - .balign 4 - -glabel D_80AC8F50 - .asciz "タロンの店 " - .balign 4 - -glabel D_80AC8F60 - .asciz "ゾーラの店 " - .balign 4 - -glabel D_80AC8F70 - .asciz "ゴロン夜の店" - .balign 4 - -glabel D_80AC8F80 - .asciz "インゴーの店" - .balign 4 - -glabel D_80AC8F90 - .asciz "お面屋 " - .balign 4 - -glabel D_80AC8FA0 - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80AC8FAC - .asciz "引数がおかしいよ(arg_data=%d)！！\n" - .balign 4 - -glabel D_80AC8FD0 - .asciz "\x1b[m" - .balign 4 - -glabel D_80AC8FD4 - .asciz "0" - .balign 4 - -glabel D_80AC8FD8 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC8FE8 - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80AC8FF4 - .asciz "バンクが無いよ！！(%s)\n" - .balign 4 - -glabel D_80AC900C - .asciz "\x1b[m" - .balign 4 - -glabel D_80AC9010 - .asciz "0" - .balign 4 - -glabel D_80AC9014 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC9024 - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80AC9030 - .asciz "予備バンクが無いよ！！(%s)\n" - .balign 4 - -glabel D_80AC904C - .asciz "\x1b[m" - .balign 4 - -glabel D_80AC9050 - .asciz "0" - .balign 4 - -glabel D_80AC9054 - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel EnOssan_Init -/* 007D0 80AC3470 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 007D4 80AC3474 AFBF001C */ sw $ra, 0x001C($sp) -/* 007D8 80AC3478 AFB00018 */ sw $s0, 0x0018($sp) -/* 007DC 80AC347C AFA50034 */ sw $a1, 0x0034($sp) -/* 007E0 80AC3480 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 007E4 80AC3484 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007E8 80AC3488 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 007EC 80AC348C 14E3000D */ bne $a3, $v1, .L80AC34C4 -/* 007F0 80AC3490 3C048016 */ lui $a0, %hi(gSaveContext) -/* 007F4 80AC3494 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 007F8 80AC3498 8C8E0004 */ lw $t6, 0x0004($a0) ## 8015E664 -/* 007FC 80AC349C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00800 80AC34A0 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 00804 80AC34A4 11C00003 */ beq $t6, $zero, .L80AC34B4 -/* 00808 80AC34A8 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 -/* 0080C 80AC34AC 10000001 */ beq $zero, $zero, .L80AC34B4 -/* 00810 80AC34B0 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80AC34B4: -/* 00814 80AC34B4 10410003 */ beq $v0, $at, .L80AC34C4 -/* 00818 80AC34B8 00000000 */ nop -/* 0081C 80AC34BC A60F001C */ sh $t7, 0x001C($s0) ## 0000001C -/* 00820 80AC34C0 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -.L80AC34C4: -/* 00824 80AC34C4 3C048016 */ lui $a0, %hi(gSaveContext) -/* 00828 80AC34C8 2861000B */ slti $at, $v1, 0x000B -/* 0082C 80AC34CC 14200017 */ bne $at, $zero, .L80AC352C -/* 00830 80AC34D0 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 00834 80AC34D4 04630016 */ bgezl $v1, .L80AC3530 -/* 00838 80AC34D8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0083C 80AC34DC 0C00B55C */ jal Actor_Kill - -/* 00840 80AC34E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00844 80AC34E4 3C0480AD */ lui $a0, %hi(D_80AC8FA0) ## $a0 = 80AD0000 -/* 00848 80AC34E8 0C00084C */ jal osSyncPrintf - -/* 0084C 80AC34EC 24848FA0 */ addiu $a0, $a0, %lo(D_80AC8FA0) ## $a0 = 80AC8FA0 -/* 00850 80AC34F0 3C0480AD */ lui $a0, %hi(D_80AC8FAC) ## $a0 = 80AD0000 -/* 00854 80AC34F4 24848FAC */ addiu $a0, $a0, %lo(D_80AC8FAC) ## $a0 = 80AC8FAC -/* 00858 80AC34F8 0C00084C */ jal osSyncPrintf - -/* 0085C 80AC34FC 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00860 80AC3500 3C0480AD */ lui $a0, %hi(D_80AC8FD0) ## $a0 = 80AD0000 -/* 00864 80AC3504 0C00084C */ jal osSyncPrintf - -/* 00868 80AC3508 24848FD0 */ addiu $a0, $a0, %lo(D_80AC8FD0) ## $a0 = 80AC8FD0 -/* 0086C 80AC350C 3C0480AD */ lui $a0, %hi(D_80AC8FD4) ## $a0 = 80AD0000 -/* 00870 80AC3510 3C0580AD */ lui $a1, %hi(D_80AC8FD8) ## $a1 = 80AD0000 -/* 00874 80AC3514 24A58FD8 */ addiu $a1, $a1, %lo(D_80AC8FD8) ## $a1 = 80AC8FD8 -/* 00878 80AC3518 24848FD4 */ addiu $a0, $a0, %lo(D_80AC8FD4) ## $a0 = 80AC8FD4 -/* 0087C 80AC351C 0C0007FC */ jal __assert - -/* 00880 80AC3520 240604DE */ addiu $a2, $zero, 0x04DE ## $a2 = 000004DE -/* 00884 80AC3524 10000075 */ beq $zero, $zero, .L80AC36FC -/* 00888 80AC3528 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC352C: -/* 0088C 80AC352C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -.L80AC3530: -/* 00890 80AC3530 5461000A */ bnel $v1, $at, .L80AC355C -/* 00894 80AC3534 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00898 80AC3538 94980F06 */ lhu $t8, 0x0F06($a0) ## 00000F06 -/* 0089C 80AC353C 33190040 */ andi $t9, $t8, 0x0040 ## $t9 = 00000000 -/* 008A0 80AC3540 57200006 */ bnel $t9, $zero, .L80AC355C -/* 008A4 80AC3544 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 008A8 80AC3548 0C00B55C */ jal Actor_Kill - -/* 008AC 80AC354C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008B0 80AC3550 1000006A */ beq $zero, $zero, .L80AC36FC -/* 008B4 80AC3554 8FBF001C */ lw $ra, 0x001C($sp) -/* 008B8 80AC3558 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80AC355C: -/* 008BC 80AC355C 5461000F */ bnel $v1, $at, .L80AC359C -/* 008C0 80AC3560 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 008C4 80AC3564 8C880004 */ lw $t0, 0x0004($a0) ## 00000004 -/* 008C8 80AC3568 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 008CC 80AC356C 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 008D0 80AC3570 11000003 */ beq $t0, $zero, .L80AC3580 -/* 008D4 80AC3574 00000000 */ nop -/* 008D8 80AC3578 10000001 */ beq $zero, $zero, .L80AC3580 -/* 008DC 80AC357C 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80AC3580: -/* 008E0 80AC3580 54410006 */ bnel $v0, $at, .L80AC359C -/* 008E4 80AC3584 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 008E8 80AC3588 0C00B55C */ jal Actor_Kill - -/* 008EC 80AC358C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008F0 80AC3590 1000005A */ beq $zero, $zero, .L80AC36FC -/* 008F4 80AC3594 8FBF001C */ lw $ra, 0x001C($sp) -/* 008F8 80AC3598 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80AC359C: -/* 008FC 80AC359C 14610009 */ bne $v1, $at, .L80AC35C4 -/* 00900 80AC35A0 00000000 */ nop -/* 00904 80AC35A4 94890ED8 */ lhu $t1, 0x0ED8($a0) ## 00000ED8 -/* 00908 80AC35A8 312A0020 */ andi $t2, $t1, 0x0020 ## $t2 = 00000000 -/* 0090C 80AC35AC 15400005 */ bne $t2, $zero, .L80AC35C4 -/* 00910 80AC35B0 00000000 */ nop -/* 00914 80AC35B4 0C00B55C */ jal Actor_Kill - -/* 00918 80AC35B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0091C 80AC35BC 1000004F */ beq $zero, $zero, .L80AC36FC -/* 00920 80AC35C0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC35C4: -/* 00924 80AC35C4 00670019 */ multu $v1, $a3 -/* 00928 80AC35C8 3C0C80AD */ lui $t4, %hi(D_80AC8940) ## $t4 = 80AD0000 -/* 0092C 80AC35CC 258C8940 */ addiu $t4, $t4, %lo(D_80AC8940) ## $t4 = 80AC8940 -/* 00930 80AC35D0 8FA40034 */ lw $a0, 0x0034($sp) -/* 00934 80AC35D4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00938 80AC35D8 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0093C 80AC35DC 00812021 */ addu $a0, $a0, $at -/* 00940 80AC35E0 00005812 */ mflo $t3 -/* 00944 80AC35E4 016C3021 */ addu $a2, $t3, $t4 -/* 00948 80AC35E8 84C50000 */ lh $a1, 0x0000($a2) ## 00000000 -/* 0094C 80AC35EC 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00950 80AC35F0 AFA60024 */ sw $a2, 0x0024($sp) -/* 00954 80AC35F4 8FA60024 */ lw $a2, 0x0024($sp) -/* 00958 80AC35F8 A20201E8 */ sb $v0, 0x01E8($s0) ## 000001E8 -/* 0095C 80AC35FC 820D01E8 */ lb $t5, 0x01E8($s0) ## 000001E8 -/* 00960 80AC3600 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00964 80AC3604 05A10019 */ bgez $t5, .L80AC366C -/* 00968 80AC3608 00000000 */ nop -/* 0096C 80AC360C 0C00B55C */ jal Actor_Kill - -/* 00970 80AC3610 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00974 80AC3614 3C0480AD */ lui $a0, %hi(D_80AC8FE8) ## $a0 = 80AD0000 -/* 00978 80AC3618 0C00084C */ jal osSyncPrintf - -/* 0097C 80AC361C 24848FE8 */ addiu $a0, $a0, %lo(D_80AC8FE8) ## $a0 = 80AC8FE8 -/* 00980 80AC3620 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00984 80AC3624 3C0580AD */ lui $a1, %hi(D_80AC8914) ## $a1 = 80AD0000 -/* 00988 80AC3628 3C0480AD */ lui $a0, %hi(D_80AC8FF4) ## $a0 = 80AD0000 -/* 0098C 80AC362C 000E7880 */ sll $t7, $t6, 2 -/* 00990 80AC3630 00AF2821 */ addu $a1, $a1, $t7 -/* 00994 80AC3634 8CA58914 */ lw $a1, %lo(D_80AC8914)($a1) -/* 00998 80AC3638 0C00084C */ jal osSyncPrintf - -/* 0099C 80AC363C 24848FF4 */ addiu $a0, $a0, %lo(D_80AC8FF4) ## $a0 = 80AC8FF4 -/* 009A0 80AC3640 3C0480AD */ lui $a0, %hi(D_80AC900C) ## $a0 = 80AD0000 -/* 009A4 80AC3644 0C00084C */ jal osSyncPrintf - -/* 009A8 80AC3648 2484900C */ addiu $a0, $a0, %lo(D_80AC900C) ## $a0 = 80AC900C -/* 009AC 80AC364C 3C0480AD */ lui $a0, %hi(D_80AC9010) ## $a0 = 80AD0000 -/* 009B0 80AC3650 3C0580AD */ lui $a1, %hi(D_80AC9014) ## $a1 = 80AD0000 -/* 009B4 80AC3654 24A59014 */ addiu $a1, $a1, %lo(D_80AC9014) ## $a1 = 80AC9014 -/* 009B8 80AC3658 24849010 */ addiu $a0, $a0, %lo(D_80AC9010) ## $a0 = 80AC9010 -/* 009BC 80AC365C 0C0007FC */ jal __assert - -/* 009C0 80AC3660 24060504 */ addiu $a2, $zero, 0x0504 ## $a2 = 00000504 -/* 009C4 80AC3664 10000025 */ beq $zero, $zero, .L80AC36FC -/* 009C8 80AC3668 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC366C: -/* 009CC 80AC366C 0C2B0CEC */ jal func_80AC33B0 -/* 009D0 80AC3670 8FA50034 */ lw $a1, 0x0034($sp) -/* 009D4 80AC3674 14400019 */ bne $v0, $zero, .L80AC36DC -/* 009D8 80AC3678 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009DC 80AC367C 0C00B55C */ jal Actor_Kill - -/* 009E0 80AC3680 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009E4 80AC3684 3C0480AD */ lui $a0, %hi(D_80AC9024) ## $a0 = 80AD0000 -/* 009E8 80AC3688 0C00084C */ jal osSyncPrintf - -/* 009EC 80AC368C 24849024 */ addiu $a0, $a0, %lo(D_80AC9024) ## $a0 = 80AC9024 -/* 009F0 80AC3690 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 009F4 80AC3694 3C0580AD */ lui $a1, %hi(D_80AC8914) ## $a1 = 80AD0000 -/* 009F8 80AC3698 3C0480AD */ lui $a0, %hi(D_80AC9030) ## $a0 = 80AD0000 -/* 009FC 80AC369C 0018C880 */ sll $t9, $t8, 2 -/* 00A00 80AC36A0 00B92821 */ addu $a1, $a1, $t9 -/* 00A04 80AC36A4 8CA58914 */ lw $a1, %lo(D_80AC8914)($a1) -/* 00A08 80AC36A8 0C00084C */ jal osSyncPrintf - -/* 00A0C 80AC36AC 24849030 */ addiu $a0, $a0, %lo(D_80AC9030) ## $a0 = 80AC9030 -/* 00A10 80AC36B0 3C0480AD */ lui $a0, %hi(D_80AC904C) ## $a0 = 80AD0000 -/* 00A14 80AC36B4 0C00084C */ jal osSyncPrintf - -/* 00A18 80AC36B8 2484904C */ addiu $a0, $a0, %lo(D_80AC904C) ## $a0 = 80AC904C -/* 00A1C 80AC36BC 3C0480AD */ lui $a0, %hi(D_80AC9050) ## $a0 = 80AD0000 -/* 00A20 80AC36C0 3C0580AD */ lui $a1, %hi(D_80AC9054) ## $a1 = 80AD0000 -/* 00A24 80AC36C4 24A59054 */ addiu $a1, $a1, %lo(D_80AC9054) ## $a1 = 80AC9054 -/* 00A28 80AC36C8 24849050 */ addiu $a0, $a0, %lo(D_80AC9050) ## $a0 = 80AC9050 -/* 00A2C 80AC36CC 0C0007FC */ jal __assert - -/* 00A30 80AC36D0 2406050F */ addiu $a2, $zero, 0x050F ## $a2 = 0000050F -/* 00A34 80AC36D4 10000009 */ beq $zero, $zero, .L80AC36FC -/* 00A38 80AC36D8 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC36DC: -/* 00A3C 80AC36DC 3C0580AD */ lui $a1, %hi(D_80AC8D64) ## $a1 = 80AD0000 -/* 00A40 80AC36E0 0C01E037 */ jal Actor_ProcessInitChain - -/* 00A44 80AC36E4 24A58D64 */ addiu $a1, $a1, %lo(D_80AC8D64) ## $a1 = 80AC8D64 -/* 00A48 80AC36E8 3C0580AC */ lui $a1, %hi(func_80AC7094) ## $a1 = 80AC0000 -/* 00A4C 80AC36EC 24A57094 */ addiu $a1, $a1, %lo(func_80AC7094) ## $a1 = 80AC7094 -/* 00A50 80AC36F0 0C2B0B28 */ jal func_80AC2CA0 -/* 00A54 80AC36F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A58 80AC36F8 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC36FC: -/* 00A5C 80AC36FC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A60 80AC3700 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A64 80AC3704 03E00008 */ jr $ra -/* 00A68 80AC3708 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Update.s deleted file mode 100644 index 9beae1459b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Update.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnOssan_Update -/* 04828 80AC74C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0482C 80AC74CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 04830 80AC74D0 848E01E4 */ lh $t6, 0x01E4($a0) ## 000001E4 -/* 04834 80AC74D4 8C990190 */ lw $t9, 0x0190($a0) ## 00000190 -/* 04838 80AC74D8 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0483C 80AC74DC 0320F809 */ jalr $ra, $t9 -/* 04840 80AC74E0 A48F01E4 */ sh $t7, 0x01E4($a0) ## 000001E4 -/* 04844 80AC74E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04848 80AC74E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0484C 80AC74EC 03E00008 */ jr $ra -/* 04850 80AC74F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA0.s deleted file mode 100644 index 95daf065c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA0.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80AC2CA0 -/* 00000 80AC2CA0 03E00008 */ jr $ra -/* 00004 80AC2CA4 AC850190 */ sw $a1, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA8.s deleted file mode 100644 index 0b97468c97..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA8.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80AC2CA8 -/* 00008 80AC2CA8 AFA40000 */ sw $a0, 0x0000($sp) -/* 0000C 80AC2CAC 00042400 */ sll $a0, $a0, 16 -/* 00010 80AC2CB0 03E00008 */ jr $ra -/* 00014 80AC2CB4 00041403 */ sra $v0, $a0, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s deleted file mode 100644 index f178e739f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AC2CB8 -/* 00018 80AC2CB8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) -/* 0001C 80AC2CBC 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) -/* 00020 80AC2CC0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00024 80AC2CC4 00042400 */ sll $a0, $a0, 16 -/* 00028 80AC2CC8 31CF0200 */ andi $t7, $t6, 0x0200 ## $t7 = 00000000 -/* 0002C 80AC2CCC 11E00003 */ beq $t7, $zero, .L80AC2CDC -/* 00030 80AC2CD0 00042403 */ sra $a0, $a0, 16 -/* 00034 80AC2CD4 03E00008 */ jr $ra -/* 00038 80AC2CD8 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -.L80AC2CDC: -/* 0003C 80AC2CDC 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 00040 80AC2CE0 03E00008 */ jr $ra -/* 00044 80AC2CE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s deleted file mode 100644 index 226143ac69..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AC2CE8 -/* 00048 80AC2CE8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) -/* 0004C 80AC2CEC 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) -/* 00050 80AC2CF0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00054 80AC2CF4 00042400 */ sll $a0, $a0, 16 -/* 00058 80AC2CF8 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 -/* 0005C 80AC2CFC 11E00003 */ beq $t7, $zero, .L80AC2D0C -/* 00060 80AC2D00 00042403 */ sra $a0, $a0, 16 -/* 00064 80AC2D04 03E00008 */ jr $ra -/* 00068 80AC2D08 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -.L80AC2D0C: -/* 0006C 80AC2D0C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 00070 80AC2D10 03E00008 */ jr $ra -/* 00074 80AC2D14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s deleted file mode 100644 index 4155c49d4c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AC2D18 -/* 00078 80AC2D18 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) -/* 0007C 80AC2D1C 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) -/* 00080 80AC2D20 AFA40000 */ sw $a0, 0x0000($sp) -/* 00084 80AC2D24 00042400 */ sll $a0, $a0, 16 -/* 00088 80AC2D28 31CF0400 */ andi $t7, $t6, 0x0400 ## $t7 = 00000000 -/* 0008C 80AC2D2C 11E00003 */ beq $t7, $zero, .L80AC2D3C -/* 00090 80AC2D30 00042403 */ sra $a0, $a0, 16 -/* 00094 80AC2D34 03E00008 */ jr $ra -/* 00098 80AC2D38 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -.L80AC2D3C: -/* 0009C 80AC2D3C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 000A0 80AC2D40 03E00008 */ jr $ra -/* 000A4 80AC2D44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s deleted file mode 100644 index 403a1e26ba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AC2D48 -/* 000A8 80AC2D48 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) -/* 000AC 80AC2D4C 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) -/* 000B0 80AC2D50 AFA40000 */ sw $a0, 0x0000($sp) -/* 000B4 80AC2D54 00042400 */ sll $a0, $a0, 16 -/* 000B8 80AC2D58 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 -/* 000BC 80AC2D5C 11E00003 */ beq $t7, $zero, .L80AC2D6C -/* 000C0 80AC2D60 00042403 */ sra $a0, $a0, 16 -/* 000C4 80AC2D64 03E00008 */ jr $ra -/* 000C8 80AC2D68 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -.L80AC2D6C: -/* 000CC 80AC2D6C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 000D0 80AC2D70 03E00008 */ jr $ra -/* 000D4 80AC2D74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s deleted file mode 100644 index fa0af500c1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AC2D78 -/* 000D8 80AC2D78 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) -/* 000DC 80AC2D7C 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) -/* 000E0 80AC2D80 AFA40000 */ sw $a0, 0x0000($sp) -/* 000E4 80AC2D84 00042400 */ sll $a0, $a0, 16 -/* 000E8 80AC2D88 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 -/* 000EC 80AC2D8C 11E00003 */ beq $t7, $zero, .L80AC2D9C -/* 000F0 80AC2D90 00042403 */ sra $a0, $a0, 16 -/* 000F4 80AC2D94 03E00008 */ jr $ra -/* 000F8 80AC2D98 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -.L80AC2D9C: -/* 000FC 80AC2D9C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 00100 80AC2DA0 03E00008 */ jr $ra -/* 00104 80AC2DA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s deleted file mode 100644 index 0f32a6da4e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AC2DA8 -/* 00108 80AC2DA8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef6) -/* 0010C 80AC2DAC 95CEF556 */ lhu $t6, %lo(gSaveContext+0xef6)($t6) -/* 00110 80AC2DB0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00114 80AC2DB4 00042400 */ sll $a0, $a0, 16 -/* 00118 80AC2DB8 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 -/* 0011C 80AC2DBC 11E00003 */ beq $t7, $zero, .L80AC2DCC -/* 00120 80AC2DC0 00042403 */ sra $a0, $a0, 16 -/* 00124 80AC2DC4 03E00008 */ jr $ra -/* 00128 80AC2DC8 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -.L80AC2DCC: -/* 0012C 80AC2DCC 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 00130 80AC2DD0 03E00008 */ jr $ra -/* 00134 80AC2DD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DD8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DD8.s deleted file mode 100644 index 69aba60f4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DD8.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_80AC2DD8 -/* 00138 80AC2DD8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0013C 80AC2DDC AFB70048 */ sw $s7, 0x0048($sp) -/* 00140 80AC2DE0 AFB60044 */ sw $s6, 0x0044($sp) -/* 00144 80AC2DE4 AFB50040 */ sw $s5, 0x0040($sp) -/* 00148 80AC2DE8 AFB4003C */ sw $s4, 0x003C($sp) -/* 0014C 80AC2DEC AFB30038 */ sw $s3, 0x0038($sp) -/* 00150 80AC2DF0 AFB20034 */ sw $s2, 0x0034($sp) -/* 00154 80AC2DF4 AFB10030 */ sw $s1, 0x0030($sp) -/* 00158 80AC2DF8 AFB0002C */ sw $s0, 0x002C($sp) -/* 0015C 80AC2DFC 3C1680AD */ lui $s6, %hi(D_80AC8C9C) ## $s6 = 80AD0000 -/* 00160 80AC2E00 3C1780AD */ lui $s7, %hi(D_80AC88F4) ## $s7 = 80AD0000 -/* 00164 80AC2E04 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00168 80AC2E08 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 0016C 80AC2E0C 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 -/* 00170 80AC2E10 AFBF004C */ sw $ra, 0x004C($sp) -/* 00174 80AC2E14 26F788F4 */ addiu $s7, $s7, %lo(D_80AC88F4) ## $s7 = 80AC88F4 -/* 00178 80AC2E18 26D68C9C */ addiu $s6, $s6, %lo(D_80AC8C9C) ## $s6 = 80AC8C9C -/* 0017C 80AC2E1C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00180 80AC2E20 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 00184 80AC2E24 24150008 */ addiu $s5, $zero, 0x0008 ## $s5 = 00000008 -.L80AC2E28: -/* 00188 80AC2E28 86040000 */ lh $a0, 0x0000($s0) ## 00000000 -/* 0018C 80AC2E2C 04810003 */ bgez $a0, .L80AC2E3C -/* 00190 80AC2E30 00047080 */ sll $t6, $a0, 2 -/* 00194 80AC2E34 1000002E */ beq $zero, $zero, .L80AC2EF0 -/* 00198 80AC2E38 AE200200 */ sw $zero, 0x0200($s1) ## 00000200 -.L80AC2E3C: -/* 0019C 80AC2E3C 02CE7821 */ addu $t7, $s6, $t6 -/* 001A0 80AC2E40 8DF90000 */ lw $t9, 0x0000($t7) ## 00000000 -/* 001A4 80AC2E44 0320F809 */ jalr $ra, $t9 -/* 001A8 80AC2E48 00000000 */ nop -/* 001AC 80AC2E4C 00021C00 */ sll $v1, $v0, 16 -/* 001B0 80AC2E50 04410003 */ bgez $v0, .L80AC2E60 -/* 001B4 80AC2E54 00031C03 */ sra $v1, $v1, 16 -/* 001B8 80AC2E58 10000025 */ beq $zero, $zero, .L80AC2EF0 -/* 001BC 80AC2E5C AE200200 */ sw $zero, 0x0200($s1) ## 00000200 -.L80AC2E60: -/* 001C0 80AC2E60 86180002 */ lh $t8, 0x0002($s0) ## 00000002 -/* 001C4 80AC2E64 86080004 */ lh $t0, 0x0004($s0) ## 00000004 -/* 001C8 80AC2E68 8E820220 */ lw $v0, 0x0220($s4) ## 00000220 -/* 001CC 80AC2E6C 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 001D0 80AC2E70 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 -/* 001D4 80AC2E74 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 001D8 80AC2E78 46803220 */ cvt.s.w $f8, $f6 -/* 001DC 80AC2E7C C4500028 */ lwc1 $f16, 0x0028($v0) ## 00000028 -/* 001E0 80AC2E80 00125840 */ sll $t3, $s2, 1 -/* 001E4 80AC2E84 02EB6021 */ addu $t4, $s7, $t3 -/* 001E8 80AC2E88 858D0000 */ lh $t5, 0x0000($t4) ## 00000000 -/* 001EC 80AC2E8C 468091A0 */ cvt.s.w $f6, $f18 -/* 001F0 80AC2E90 26641C24 */ addiu $a0, $s3, 0x1C24 ## $a0 = 00001C24 -/* 001F4 80AC2E94 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 001F8 80AC2E98 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 001FC 80AC2E9C 46082280 */ add.s $f10, $f4, $f8 -/* 00200 80AC2EA0 46068100 */ add.s $f4, $f16, $f6 -/* 00204 80AC2EA4 44075000 */ mfc1 $a3, $f10 -/* 00208 80AC2EA8 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0020C 80AC2EAC 86090006 */ lh $t1, 0x0006($s0) ## 00000006 -/* 00210 80AC2EB0 C448002C */ lwc1 $f8, 0x002C($v0) ## 0000002C -/* 00214 80AC2EB4 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 00218 80AC2EB8 00000000 */ nop -/* 0021C 80AC2EBC 468054A0 */ cvt.s.w $f18, $f10 -/* 00220 80AC2EC0 46124400 */ add.s $f16, $f8, $f18 -/* 00224 80AC2EC4 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 00228 80AC2EC8 844A00B4 */ lh $t2, 0x00B4($v0) ## 000000B4 -/* 0022C 80AC2ECC AFAA0018 */ sw $t2, 0x0018($sp) -/* 00230 80AC2ED0 844E00B6 */ lh $t6, 0x00B6($v0) ## 000000B6 -/* 00234 80AC2ED4 01AE7821 */ addu $t7, $t5, $t6 -/* 00238 80AC2ED8 AFAF001C */ sw $t7, 0x001C($sp) -/* 0023C 80AC2EDC 845900B8 */ lh $t9, 0x00B8($v0) ## 000000B8 -/* 00240 80AC2EE0 AFA30024 */ sw $v1, 0x0024($sp) -/* 00244 80AC2EE4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00248 80AC2EE8 AFB90020 */ sw $t9, 0x0020($sp) -/* 0024C 80AC2EEC AE220200 */ sw $v0, 0x0200($s1) ## 00000200 -.L80AC2EF0: -/* 00250 80AC2EF0 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 -/* 00254 80AC2EF4 26310004 */ addiu $s1, $s1, 0x0004 ## $s1 = 00000004 -/* 00258 80AC2EF8 1655FFCB */ bne $s2, $s5, .L80AC2E28 -/* 0025C 80AC2EFC 26100008 */ addiu $s0, $s0, 0x0008 ## $s0 = 00000008 -/* 00260 80AC2F00 8FBF004C */ lw $ra, 0x004C($sp) -/* 00264 80AC2F04 8FB0002C */ lw $s0, 0x002C($sp) -/* 00268 80AC2F08 8FB10030 */ lw $s1, 0x0030($sp) -/* 0026C 80AC2F0C 8FB20034 */ lw $s2, 0x0034($sp) -/* 00270 80AC2F10 8FB30038 */ lw $s3, 0x0038($sp) -/* 00274 80AC2F14 8FB4003C */ lw $s4, 0x003C($sp) -/* 00278 80AC2F18 8FB50040 */ lw $s5, 0x0040($sp) -/* 0027C 80AC2F1C 8FB60044 */ lw $s6, 0x0044($sp) -/* 00280 80AC2F20 8FB70048 */ lw $s7, 0x0048($sp) -/* 00284 80AC2F24 03E00008 */ jr $ra -/* 00288 80AC2F28 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2F2C.s deleted file mode 100644 index cad1effe42..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2F2C.s +++ /dev/null @@ -1,97 +0,0 @@ -glabel func_80AC2F2C -/* 0028C 80AC2F2C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00290 80AC2F30 AFBF004C */ sw $ra, 0x004C($sp) -/* 00294 80AC2F34 AFB70048 */ sw $s7, 0x0048($sp) -/* 00298 80AC2F38 AFB60044 */ sw $s6, 0x0044($sp) -/* 0029C 80AC2F3C AFB50040 */ sw $s5, 0x0040($sp) -/* 002A0 80AC2F40 AFB4003C */ sw $s4, 0x003C($sp) -/* 002A4 80AC2F44 AFB30038 */ sw $s3, 0x0038($sp) -/* 002A8 80AC2F48 AFB20034 */ sw $s2, 0x0034($sp) -/* 002AC 80AC2F4C AFB10030 */ sw $s1, 0x0030($sp) -/* 002B0 80AC2F50 AFB0002C */ sw $s0, 0x002C($sp) -/* 002B4 80AC2F54 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 002B8 80AC2F58 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 002BC 80AC2F5C 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 002C0 80AC2F60 14410042 */ bne $v0, $at, .L80AC306C -/* 002C4 80AC2F64 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 002C8 80AC2F68 3C0F80AD */ lui $t7, %hi(D_80AC89DC) ## $t7 = 80AD0000 -/* 002CC 80AC2F6C 25EF89DC */ addiu $t7, $t7, %lo(D_80AC89DC) ## $t7 = 80AC89DC -/* 002D0 80AC2F70 00027180 */ sll $t6, $v0, 6 -/* 002D4 80AC2F74 3C1680AD */ lui $s6, %hi(D_80AC88F4) ## $s6 = 80AD0000 -/* 002D8 80AC2F78 3C1580AD */ lui $s5, %hi(D_80AC8C9C) ## $s5 = 80AD0000 -/* 002DC 80AC2F7C 01CF8021 */ addu $s0, $t6, $t7 -/* 002E0 80AC2F80 26B58C9C */ addiu $s5, $s5, %lo(D_80AC8C9C) ## $s5 = 80AC8C9C -/* 002E4 80AC2F84 26D688F4 */ addiu $s6, $s6, %lo(D_80AC88F4) ## $s6 = 80AC88F4 -/* 002E8 80AC2F88 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 002EC 80AC2F8C 24170008 */ addiu $s7, $zero, 0x0008 ## $s7 = 00000008 -.L80AC2F90: -/* 002F0 80AC2F90 86040000 */ lh $a0, 0x0000($s0) ## 00000000 -/* 002F4 80AC2F94 0011C080 */ sll $t8, $s1, 2 -/* 002F8 80AC2F98 02789021 */ addu $s2, $s3, $t8 -/* 002FC 80AC2F9C 04820031 */ bltzl $a0, .L80AC3064 -/* 00300 80AC2FA0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00304 80AC2FA4 8E590200 */ lw $t9, 0x0200($s2) ## 00000200 -/* 00308 80AC2FA8 00044080 */ sll $t0, $a0, 2 -/* 0030C 80AC2FAC 02A84821 */ addu $t1, $s5, $t0 -/* 00310 80AC2FB0 5720002C */ bnel $t9, $zero, .L80AC3064 -/* 00314 80AC2FB4 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 -/* 00318 80AC2FB8 8D390000 */ lw $t9, 0x0000($t1) ## 00000000 -/* 0031C 80AC2FBC 0320F809 */ jalr $ra, $t9 -/* 00320 80AC2FC0 00000000 */ nop -/* 00324 80AC2FC4 00021C00 */ sll $v1, $v0, 16 -/* 00328 80AC2FC8 04400025 */ bltz $v0, .L80AC3060 -/* 0032C 80AC2FCC 00031C03 */ sra $v1, $v1, 16 -/* 00330 80AC2FD0 860A0002 */ lh $t2, 0x0002($s0) ## 00000002 -/* 00334 80AC2FD4 860B0004 */ lh $t3, 0x0004($s0) ## 00000004 -/* 00338 80AC2FD8 8E620220 */ lw $v0, 0x0220($s3) ## 00000220 -/* 0033C 80AC2FDC 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 00340 80AC2FE0 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 00344 80AC2FE4 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 00348 80AC2FE8 46803220 */ cvt.s.w $f8, $f6 -/* 0034C 80AC2FEC C4500028 */ lwc1 $f16, 0x0028($v0) ## 00000028 -/* 00350 80AC2FF0 00117040 */ sll $t6, $s1, 1 -/* 00354 80AC2FF4 02CE7821 */ addu $t7, $s6, $t6 -/* 00358 80AC2FF8 85F80000 */ lh $t8, 0x0000($t7) ## 00000000 -/* 0035C 80AC2FFC 468091A0 */ cvt.s.w $f6, $f18 -/* 00360 80AC3000 26841C24 */ addiu $a0, $s4, 0x1C24 ## $a0 = 00001C24 -/* 00364 80AC3004 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 00368 80AC3008 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0036C 80AC300C 46082280 */ add.s $f10, $f4, $f8 -/* 00370 80AC3010 46068100 */ add.s $f4, $f16, $f6 -/* 00374 80AC3014 44075000 */ mfc1 $a3, $f10 -/* 00378 80AC3018 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0037C 80AC301C 860C0006 */ lh $t4, 0x0006($s0) ## 00000006 -/* 00380 80AC3020 C448002C */ lwc1 $f8, 0x002C($v0) ## 0000002C -/* 00384 80AC3024 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 00388 80AC3028 00000000 */ nop -/* 0038C 80AC302C 468054A0 */ cvt.s.w $f18, $f10 -/* 00390 80AC3030 46124400 */ add.s $f16, $f8, $f18 -/* 00394 80AC3034 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 00398 80AC3038 844D00B4 */ lh $t5, 0x00B4($v0) ## 000000B4 -/* 0039C 80AC303C AFAD0018 */ sw $t5, 0x0018($sp) -/* 003A0 80AC3040 844800B6 */ lh $t0, 0x00B6($v0) ## 000000B6 -/* 003A4 80AC3044 03084821 */ addu $t1, $t8, $t0 -/* 003A8 80AC3048 AFA9001C */ sw $t1, 0x001C($sp) -/* 003AC 80AC304C 845900B8 */ lh $t9, 0x00B8($v0) ## 000000B8 -/* 003B0 80AC3050 AFA30024 */ sw $v1, 0x0024($sp) -/* 003B4 80AC3054 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 003B8 80AC3058 AFB90020 */ sw $t9, 0x0020($sp) -/* 003BC 80AC305C AE420200 */ sw $v0, 0x0200($s2) ## 00000200 -.L80AC3060: -/* 003C0 80AC3060 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000003 -.L80AC3064: -/* 003C4 80AC3064 1637FFCA */ bne $s1, $s7, .L80AC2F90 -/* 003C8 80AC3068 26100008 */ addiu $s0, $s0, 0x0008 ## $s0 = 00000008 -.L80AC306C: -/* 003CC 80AC306C 8FBF004C */ lw $ra, 0x004C($sp) -/* 003D0 80AC3070 8FB0002C */ lw $s0, 0x002C($sp) -/* 003D4 80AC3074 8FB10030 */ lw $s1, 0x0030($sp) -/* 003D8 80AC3078 8FB20034 */ lw $s2, 0x0034($sp) -/* 003DC 80AC307C 8FB30038 */ lw $s3, 0x0038($sp) -/* 003E0 80AC3080 8FB4003C */ lw $s4, 0x003C($sp) -/* 003E4 80AC3084 8FB50040 */ lw $s5, 0x0040($sp) -/* 003E8 80AC3088 8FB60044 */ lw $s6, 0x0044($sp) -/* 003EC 80AC308C 8FB70048 */ lw $s7, 0x0048($sp) -/* 003F0 80AC3090 03E00008 */ jr $ra -/* 003F4 80AC3094 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3098.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3098.s deleted file mode 100644 index 426738e587..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3098.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AC3098 -/* 003F8 80AC3098 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003FC 80AC309C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00400 80AC30A0 0C042DC8 */ jal func_8010B720 -/* 00404 80AC30A4 2405009E */ addiu $a1, $zero, 0x009E ## $a1 = 0000009E -/* 00408 80AC30A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0040C 80AC30AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00410 80AC30B0 03E00008 */ jr $ra -/* 00414 80AC30B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30B8.s deleted file mode 100644 index e714ab1af3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30B8.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AC30B8 -/* 00418 80AC30B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0041C 80AC30BC 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 00420 80AC30C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00424 80AC30C4 01C47021 */ addu $t6, $t6, $a0 -/* 00428 80AC30C8 91CE1DEA */ lbu $t6, 0x1DEA($t6) ## 00011DEA -/* 0042C 80AC30CC 15C00005 */ bne $t6, $zero, .L80AC30E4 -/* 00430 80AC30D0 00000000 */ nop -/* 00434 80AC30D4 0C042DC8 */ jal func_8010B720 -/* 00438 80AC30D8 24055046 */ addiu $a1, $zero, 0x5046 ## $a1 = 00005046 -/* 0043C 80AC30DC 10000004 */ beq $zero, $zero, .L80AC30F0 -/* 00440 80AC30E0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC30E4: -/* 00444 80AC30E4 0C042DC8 */ jal func_8010B720 -/* 00448 80AC30E8 2405504E */ addiu $a1, $zero, 0x504E ## $a1 = 0000504E -/* 0044C 80AC30EC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC30F0: -/* 00450 80AC30F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00454 80AC30F4 03E00008 */ jr $ra -/* 00458 80AC30F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30FC.s deleted file mode 100644 index ef45866142..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30FC.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AC30FC -/* 0045C 80AC30FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00460 80AC3100 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00464 80AC3104 0C042DC8 */ jal func_8010B720 -/* 00468 80AC3108 2405504E */ addiu $a1, $zero, 0x504E ## $a1 = 0000504E -/* 0046C 80AC310C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00470 80AC3110 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00474 80AC3114 03E00008 */ jr $ra -/* 00478 80AC3118 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC311C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC311C.s deleted file mode 100644 index a6202101c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC311C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AC311C -/* 0047C 80AC311C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00480 80AC3120 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00484 80AC3124 0C042DC8 */ jal func_8010B720 -/* 00488 80AC3128 240510BA */ addiu $a1, $zero, 0x10BA ## $a1 = 000010BA -/* 0048C 80AC312C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00490 80AC3130 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00494 80AC3134 03E00008 */ jr $ra -/* 00498 80AC3138 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC313C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC313C.s deleted file mode 100644 index 244ab10ba1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC313C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AC313C -/* 0049C 80AC313C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004A0 80AC3140 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 004A4 80AC3144 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004A8 80AC3148 01C47021 */ addu $t6, $t6, $a0 -/* 004AC 80AC314C 91CE1DEA */ lbu $t6, 0x1DEA($t6) ## 00011DEA -/* 004B0 80AC3150 15C00005 */ bne $t6, $zero, .L80AC3168 -/* 004B4 80AC3154 00000000 */ nop -/* 004B8 80AC3158 0C042DC8 */ jal func_8010B720 -/* 004BC 80AC315C 2405009D */ addiu $a1, $zero, 0x009D ## $a1 = 0000009D -/* 004C0 80AC3160 10000004 */ beq $zero, $zero, .L80AC3174 -/* 004C4 80AC3164 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC3168: -/* 004C8 80AC3168 0C042DC8 */ jal func_8010B720 -/* 004CC 80AC316C 2405009C */ addiu $a1, $zero, 0x009C ## $a1 = 0000009C -/* 004D0 80AC3170 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC3174: -/* 004D4 80AC3174 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004D8 80AC3178 03E00008 */ jr $ra -/* 004DC 80AC317C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3180.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3180.s deleted file mode 100644 index 5461433cea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3180.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AC3180 -/* 004E0 80AC3180 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004E4 80AC3184 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004E8 80AC3188 0C042DC8 */ jal func_8010B720 -/* 004EC 80AC318C 24057076 */ addiu $a1, $zero, 0x7076 ## $a1 = 00007076 -/* 004F0 80AC3190 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004F4 80AC3194 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004F8 80AC3198 03E00008 */ jr $ra -/* 004FC 80AC319C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s deleted file mode 100644 index d52e899f2a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AC31A0 -/* 00500 80AC31A0 3C0E8016 */ lui $t6, %hi(gSaveContext+4) -/* 00504 80AC31A4 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) -/* 00508 80AC31A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0050C 80AC31AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00510 80AC31B0 11C00003 */ beq $t6, $zero, .L80AC31C0 -/* 00514 80AC31B4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00518 80AC31B8 10000002 */ beq $zero, $zero, .L80AC31C4 -/* 0051C 80AC31BC 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80AC31C0: -/* 00520 80AC31C0 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -.L80AC31C4: -/* 00524 80AC31C4 14410005 */ bne $v0, $at, .L80AC31DC -/* 00528 80AC31C8 00000000 */ nop -/* 0052C 80AC31CC 0C042DC8 */ jal func_8010B720 -/* 00530 80AC31D0 2405403A */ addiu $a1, $zero, 0x403A ## $a1 = 0000403A -/* 00534 80AC31D4 10000004 */ beq $zero, $zero, .L80AC31E8 -/* 00538 80AC31D8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC31DC: -/* 0053C 80AC31DC 0C042DC8 */ jal func_8010B720 -/* 00540 80AC31E0 2405403B */ addiu $a1, $zero, 0x403B ## $a1 = 0000403B -/* 00544 80AC31E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC31E8: -/* 00548 80AC31E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0054C 80AC31EC 03E00008 */ jr $ra -/* 00550 80AC31F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s deleted file mode 100644 index d8469c75a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80AC31F4 -/* 00554 80AC31F4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00558 80AC31F8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0055C 80AC31FC 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 -/* 00560 80AC3200 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00564 80AC3204 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00568 80AC3208 11C00003 */ beq $t6, $zero, .L80AC3218 -/* 0056C 80AC320C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00570 80AC3210 10000002 */ beq $zero, $zero, .L80AC321C -/* 00574 80AC3214 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80AC3218: -/* 00578 80AC3218 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -.L80AC321C: -/* 0057C 80AC321C 1441001A */ bne $v0, $at, .L80AC3288 -/* 00580 80AC3220 3C0C8012 */ lui $t4, %hi(gBitFlags+4) -/* 00584 80AC3224 946F0ED8 */ lhu $t7, 0x0ED8($v1) ## 8015F538 -/* 00588 80AC3228 3C088012 */ lui $t0, %hi(gUpgradeMasks+8) -/* 0058C 80AC322C 3C0A8012 */ lui $t2, %hi(gUpgradeShifts+2) -/* 00590 80AC3230 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 00594 80AC3234 53000006 */ beql $t8, $zero, .L80AC3250 -/* 00598 80AC3238 8C7900A0 */ lw $t9, 0x00A0($v1) ## 8015E700 -/* 0059C 80AC323C 0C042DC8 */ jal func_8010B720 -/* 005A0 80AC3240 24053028 */ addiu $a1, $zero, 0x3028 ## $a1 = 00003028 -/* 005A4 80AC3244 1000001C */ beq $zero, $zero, .L80AC32B8 -/* 005A8 80AC3248 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005AC 80AC324C 8C7900A0 */ lw $t9, 0x00A0($v1) ## 000000A0 -.L80AC3250: -/* 005B0 80AC3250 8D0871B8 */ lw $t0, %lo(gUpgradeMasks+8)($t0) -/* 005B4 80AC3254 914A71F6 */ lbu $t2, %lo(gUpgradeShifts+2)($t2) -/* 005B8 80AC3258 03284824 */ and $t1, $t9, $t0 -/* 005BC 80AC325C 01495807 */ srav $t3, $t1, $t2 -/* 005C0 80AC3260 11600005 */ beq $t3, $zero, .L80AC3278 -/* 005C4 80AC3264 00000000 */ nop -/* 005C8 80AC3268 0C042DC8 */ jal func_8010B720 -/* 005CC 80AC326C 2405302D */ addiu $a1, $zero, 0x302D ## $a1 = 0000302D -/* 005D0 80AC3270 10000011 */ beq $zero, $zero, .L80AC32B8 -/* 005D4 80AC3274 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC3278: -/* 005D8 80AC3278 0C042DC8 */ jal func_8010B720 -/* 005DC 80AC327C 2405300F */ addiu $a1, $zero, 0x300F ## $a1 = 0000300F -/* 005E0 80AC3280 1000000D */ beq $zero, $zero, .L80AC32B8 -/* 005E4 80AC3284 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC3288: -/* 005E8 80AC3288 8D8C7124 */ lw $t4, %lo(gBitFlags+4)($t4) -/* 005EC 80AC328C 8C6D00A4 */ lw $t5, 0x00A4($v1) ## 000000A4 -/* 005F0 80AC3290 018D7024 */ and $t6, $t4, $t5 -/* 005F4 80AC3294 15C00005 */ bne $t6, $zero, .L80AC32AC -/* 005F8 80AC3298 00000000 */ nop -/* 005FC 80AC329C 0C042DC8 */ jal func_8010B720 -/* 00600 80AC32A0 24053057 */ addiu $a1, $zero, 0x3057 ## $a1 = 00003057 -/* 00604 80AC32A4 10000004 */ beq $zero, $zero, .L80AC32B8 -/* 00608 80AC32A8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC32AC: -/* 0060C 80AC32AC 0C042DC8 */ jal func_8010B720 -/* 00610 80AC32B0 2405305B */ addiu $a1, $zero, 0x305B ## $a1 = 0000305B -/* 00614 80AC32B4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC32B8: -/* 00618 80AC32B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0061C 80AC32BC 03E00008 */ jr $ra -/* 00620 80AC32C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s deleted file mode 100644 index 0744029ea5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AC32C4 -/* 00624 80AC32C4 3C028016 */ lui $v0, %hi(gSaveContext+0xef6) -/* 00628 80AC32C8 9442F556 */ lhu $v0, %lo(gSaveContext+0xef6)($v0) -/* 0062C 80AC32CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00630 80AC32D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00634 80AC32D4 304E0100 */ andi $t6, $v0, 0x0100 ## $t6 = 00000000 -/* 00638 80AC32D8 11C0000B */ beq $t6, $zero, .L80AC3308 -/* 0063C 80AC32DC 304F0200 */ andi $t7, $v0, 0x0200 ## $t7 = 00000000 -/* 00640 80AC32E0 11E00009 */ beq $t7, $zero, .L80AC3308 -/* 00644 80AC32E4 30580400 */ andi $t8, $v0, 0x0400 ## $t8 = 00000000 -/* 00648 80AC32E8 13000007 */ beq $t8, $zero, .L80AC3308 -/* 0064C 80AC32EC 30590800 */ andi $t9, $v0, 0x0800 ## $t9 = 00000000 -/* 00650 80AC32F0 53200006 */ beql $t9, $zero, .L80AC330C -/* 00654 80AC32F4 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00658 80AC32F8 0C042DC8 */ jal func_8010B720 -/* 0065C 80AC32FC 240570AE */ addiu $a1, $zero, 0x70AE ## $a1 = 000070AE -/* 00660 80AC3300 10000010 */ beq $zero, $zero, .L80AC3344 -/* 00664 80AC3304 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC3308: -/* 00668 80AC3308 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -.L80AC330C: -/* 0066C 80AC330C 00441021 */ addu $v0, $v0, $a0 -/* 00670 80AC3310 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00674 80AC3314 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00678 80AC3318 10400007 */ beq $v0, $zero, .L80AC3338 -/* 0067C 80AC331C 00000000 */ nop -/* 00680 80AC3320 54410008 */ bnel $v0, $at, .L80AC3344 -/* 00684 80AC3324 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00688 80AC3328 0C042DC8 */ jal func_8010B720 -/* 0068C 80AC332C 240570A4 */ addiu $a1, $zero, 0x70A4 ## $a1 = 000070A4 -/* 00690 80AC3330 10000004 */ beq $zero, $zero, .L80AC3344 -/* 00694 80AC3334 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC3338: -/* 00698 80AC3338 0C042DC8 */ jal func_8010B720 -/* 0069C 80AC333C 240570A3 */ addiu $a1, $zero, 0x70A3 ## $a1 = 000070A3 -/* 006A0 80AC3340 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC3344: -/* 006A4 80AC3344 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006A8 80AC3348 03E00008 */ jr $ra -/* 006AC 80AC334C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3350.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3350.s deleted file mode 100644 index 82a27000f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3350.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AC3350 -/* 006B0 80AC3350 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006B4 80AC3354 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 006B8 80AC3358 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006BC 80AC335C AFA40028 */ sw $a0, 0x0028($sp) -/* 006C0 80AC3360 AFA5002C */ sw $a1, 0x002C($sp) -/* 006C4 80AC3364 E48C02D4 */ swc1 $f12, 0x02D4($a0) ## 000002D4 -/* 006C8 80AC3368 8FAF002C */ lw $t7, 0x002C($sp) -/* 006CC 80AC336C 4600610D */ trunc.w.s $f4, $f12 -/* 006D0 80AC3370 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C -/* 006D4 80AC3374 85F807A0 */ lh $t8, 0x07A0($t7) ## 000007A0 -/* 006D8 80AC3378 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 006DC 80AC337C 440A2000 */ mfc1 $t2, $f4 -/* 006E0 80AC3380 0018C880 */ sll $t9, $t8, 2 -/* 006E4 80AC3384 01F94021 */ addu $t0, $t7, $t9 -/* 006E8 80AC3388 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 006EC 80AC338C AFA00018 */ sw $zero, 0x0018($sp) -/* 006F0 80AC3390 AFA00014 */ sw $zero, 0x0014($sp) -/* 006F4 80AC3394 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 006F8 80AC3398 0C016BF5 */ jal Camera_SetCameraData ## setCameraData -/* 006FC 80AC339C AFAA0010 */ sw $t2, 0x0010($sp) -/* 00700 80AC33A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00704 80AC33A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00708 80AC33A8 03E00008 */ jr $ra -/* 0070C 80AC33AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC33B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC33B0.s deleted file mode 100644 index c24b542d28..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC33B0.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80AC33B0 -/* 00710 80AC33B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00714 80AC33B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00718 80AC33B8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0071C 80AC33BC 84CE0002 */ lh $t6, 0x0002($a2) ## 00000002 -/* 00720 80AC33C0 24010192 */ addiu $at, $zero, 0x0192 ## $at = 00000192 -/* 00724 80AC33C4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00728 80AC33C8 11C10010 */ beq $t6, $at, .L80AC340C -/* 0072C 80AC33CC AFAE001C */ sw $t6, 0x001C($sp) -/* 00730 80AC33D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00734 80AC33D4 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00738 80AC33D8 00A12021 */ addu $a0, $a1, $at -/* 0073C 80AC33DC 87A5001E */ lh $a1, 0x001E($sp) -/* 00740 80AC33E0 AFA60028 */ sw $a2, 0x0028($sp) -/* 00744 80AC33E4 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00748 80AC33E8 AFA70020 */ sw $a3, 0x0020($sp) -/* 0074C 80AC33EC 8FA70020 */ lw $a3, 0x0020($sp) -/* 00750 80AC33F0 8FA60028 */ lw $a2, 0x0028($sp) -/* 00754 80AC33F4 A0E201E9 */ sb $v0, 0x01E9($a3) ## 000001E9 -/* 00758 80AC33F8 80F801E9 */ lb $t8, 0x01E9($a3) ## 000001E9 -/* 0075C 80AC33FC 07030006 */ bgezl $t8, .L80AC3418 -/* 00760 80AC3400 84C50004 */ lh $a1, 0x0004($a2) ## 00000004 -/* 00764 80AC3404 10000016 */ beq $zero, $zero, .L80AC3460 -/* 00768 80AC3408 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AC340C: -/* 0076C 80AC340C 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 00770 80AC3410 A0F901E9 */ sb $t9, 0x01E9($a3) ## 000001E9 -/* 00774 80AC3414 84C50004 */ lh $a1, 0x0004($a2) ## 00000004 -.L80AC3418: -/* 00778 80AC3418 24010192 */ addiu $at, $zero, 0x0192 ## $at = 00000192 -/* 0077C 80AC341C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00780 80AC3420 10A1000D */ beq $a1, $at, .L80AC3458 -/* 00784 80AC3424 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 00788 80AC3428 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0078C 80AC342C 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00790 80AC3430 00812021 */ addu $a0, $a0, $at -/* 00794 80AC3434 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00798 80AC3438 AFA70020 */ sw $a3, 0x0020($sp) -/* 0079C 80AC343C 8FA70020 */ lw $a3, 0x0020($sp) -/* 007A0 80AC3440 A0E201EA */ sb $v0, 0x01EA($a3) ## 000001EA -/* 007A4 80AC3444 80E801EA */ lb $t0, 0x01EA($a3) ## 000001EA -/* 007A8 80AC3448 05030005 */ bgezl $t0, .L80AC3460 -/* 007AC 80AC344C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 007B0 80AC3450 10000003 */ beq $zero, $zero, .L80AC3460 -/* 007B4 80AC3454 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AC3458: -/* 007B8 80AC3458 A0E901EA */ sb $t1, 0x01EA($a3) ## 000001EA -/* 007BC 80AC345C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AC3460: -/* 007C0 80AC3460 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007C4 80AC3464 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 007C8 80AC3468 03E00008 */ jr $ra -/* 007CC 80AC346C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3744.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3744.s deleted file mode 100644 index 475c02ca15..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3744.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AC3744 -/* 00AA4 80AC3744 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00AA8 80AC3748 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AAC 80AC374C AFA50024 */ sw $a1, 0x0024($sp) -/* 00AB0 80AC3750 90AF0252 */ lbu $t7, 0x0252($a1) ## 00000252 -/* 00AB4 80AC3754 27A6001E */ addiu $a2, $sp, 0x001E ## $a2 = FFFFFFFE -/* 00AB8 80AC3758 27A7001C */ addiu $a3, $sp, 0x001C ## $a3 = FFFFFFFC -/* 00ABC 80AC375C 000FC080 */ sll $t8, $t7, 2 -/* 00AC0 80AC3760 00B8C821 */ addu $t9, $a1, $t8 -/* 00AC4 80AC3764 0C00BCDD */ jal func_8002F374 -/* 00AC8 80AC3768 8F250200 */ lw $a1, 0x0200($t9) ## 00000200 -/* 00ACC 80AC376C 87A8001E */ lh $t0, 0x001E($sp) -/* 00AD0 80AC3770 8FA20024 */ lw $v0, 0x0024($sp) -/* 00AD4 80AC3774 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 00AD8 80AC3778 00000000 */ nop -/* 00ADC 80AC377C 468021A0 */ cvt.s.w $f6, $f4 -/* 00AE0 80AC3780 E4460230 */ swc1 $f6, 0x0230($v0) ## 00000230 -/* 00AE4 80AC3784 87A9001C */ lh $t1, 0x001C($sp) -/* 00AE8 80AC3788 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 00AEC 80AC378C 00000000 */ nop -/* 00AF0 80AC3790 468042A0 */ cvt.s.w $f10, $f8 -/* 00AF4 80AC3794 E44A0234 */ swc1 $f10, 0x0234($v0) ## 00000234 -/* 00AF8 80AC3798 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AFC 80AC379C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00B00 80AC37A0 03E00008 */ jr $ra -/* 00B04 80AC37A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s deleted file mode 100644 index 5e7ad2fa77..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s +++ /dev/null @@ -1,67 +0,0 @@ -.rdata -glabel D_80AC9064 - .asciz "\x1b[33m%s[%d]:★★★ 会話終了！！ ★★★\x1b[m\n" - .balign 4 - -glabel D_80AC9090 - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC37A8 -/* 00B08 80AC37A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00B0C 80AC37AC AFBF001C */ sw $ra, 0x001C($sp) -/* 00B10 80AC37B0 AFB10018 */ sw $s1, 0x0018($sp) -/* 00B14 80AC37B4 AFB00014 */ sw $s0, 0x0014($sp) -/* 00B18 80AC37B8 8C8E1C44 */ lw $t6, 0x1C44($a0) ## 00001C44 -/* 00B1C 80AC37BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B20 80AC37C0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00B24 80AC37C4 3C0580AD */ lui $a1, %hi(D_80AC9090) ## $a1 = 80AD0000 -/* 00B28 80AC37C8 3C0480AD */ lui $a0, %hi(D_80AC9064) ## $a0 = 80AD0000 -/* 00B2C 80AC37CC 24849064 */ addiu $a0, $a0, %lo(D_80AC9064) ## $a0 = 80AC9064 -/* 00B30 80AC37D0 24A59090 */ addiu $a1, $a1, %lo(D_80AC9090) ## $a1 = 80AC9090 -/* 00B34 80AC37D4 24060539 */ addiu $a2, $zero, 0x0539 ## $a2 = 00000539 -/* 00B38 80AC37D8 0C00084C */ jal osSyncPrintf - -/* 00B3C 80AC37DC AFAE0024 */ sw $t6, 0x0024($sp) -/* 00B40 80AC37E0 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 00B44 80AC37E4 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 00B48 80AC37E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B4C 80AC37EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B50 80AC37F0 0C00BC65 */ jal func_8002F194 -/* 00B54 80AC37F4 A5E004D2 */ sh $zero, 0x04D2($t7) ## 801604D2 -/* 00B58 80AC37F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B5C 80AC37FC 8FA30024 */ lw $v1, 0x0024($sp) -/* 00B60 80AC3800 00300821 */ addu $at, $at, $s0 -/* 00B64 80AC3804 24180036 */ addiu $t8, $zero, 0x0036 ## $t8 = 00000036 -/* 00B68 80AC3808 A03803DC */ sb $t8, 0x03DC($at) ## 000103DC -/* 00B6C 80AC380C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B70 80AC3810 00300821 */ addu $at, $at, $s0 -/* 00B74 80AC3814 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 00B78 80AC3818 A03904BF */ sb $t9, 0x04BF($at) ## 000104BF -/* 00B7C 80AC381C 8C680680 */ lw $t0, 0x0680($v1) ## 00000680 -/* 00B80 80AC3820 3C01DFFF */ lui $at, 0xDFFF ## $at = DFFF0000 -/* 00B84 80AC3824 3421FFFF */ ori $at, $at, 0xFFFF ## $at = DFFFFFFF -/* 00B88 80AC3828 01014824 */ and $t1, $t0, $at -/* 00B8C 80AC382C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B90 80AC3830 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00B94 80AC3834 0C02F124 */ jal func_800BC490 -/* 00B98 80AC3838 AC690680 */ sw $t1, 0x0680($v1) ## 00000680 -/* 00B9C 80AC383C 0C020978 */ jal Interface_ChangeAlpha -/* 00BA0 80AC3840 24040032 */ addiu $a0, $zero, 0x0032 ## $a0 = 00000032 -/* 00BA4 80AC3844 A2200251 */ sb $zero, 0x0251($s1) ## 00000251 -/* 00BA8 80AC3848 AE200288 */ sw $zero, 0x0288($s1) ## 00000288 -/* 00BAC 80AC384C AE2002C0 */ sw $zero, 0x02C0($s1) ## 000002C0 -/* 00BB0 80AC3850 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00BB4 80AC3854 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00BB8 80AC3858 0C2B0CD4 */ jal func_80AC3350 -/* 00BBC 80AC385C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00BC0 80AC3860 0C2B1BCB */ jal func_80AC6F2C -/* 00BC4 80AC3864 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00BC8 80AC3868 A622010E */ sh $v0, 0x010E($s1) ## 0000010E -/* 00BCC 80AC386C A62001FC */ sh $zero, 0x01FC($s1) ## 000001FC -/* 00BD0 80AC3870 8FBF001C */ lw $ra, 0x001C($sp) -/* 00BD4 80AC3874 8FB10018 */ lw $s1, 0x0018($sp) -/* 00BD8 80AC3878 8FB00014 */ lw $s0, 0x0014($sp) -/* 00BDC 80AC387C 03E00008 */ jr $ra -/* 00BE0 80AC3880 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3884.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3884.s deleted file mode 100644 index 08db724771..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3884.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AC3884 -/* 00BE4 80AC3884 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BE8 80AC3888 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BEC 80AC388C AFA40018 */ sw $a0, 0x0018($sp) -/* 00BF0 80AC3890 94CE000C */ lhu $t6, 0x000C($a2) ## 0000000C -/* 00BF4 80AC3894 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 00BF8 80AC3898 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00BFC 80AC389C 01C17827 */ nor $t7, $t6, $at -/* 00C00 80AC38A0 15E00005 */ bne $t7, $zero, .L80AC38B8 -/* 00C04 80AC38A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00C08 80AC38A8 0C2B0DEA */ jal func_80AC37A8 -/* 00C0C 80AC38AC 8FA50018 */ lw $a1, 0x0018($sp) -/* 00C10 80AC38B0 10000001 */ beq $zero, $zero, .L80AC38B8 -/* 00C14 80AC38B4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AC38B8: -/* 00C18 80AC38B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C1C 80AC38BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C20 80AC38C0 03E00008 */ jr $ra -/* 00C24 80AC38C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC38C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC38C8.s deleted file mode 100644 index e7226b8bc9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC38C8.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AC38C8 -/* 00C28 80AC38C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C2C 80AC38CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C30 80AC38D0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C34 80AC38D4 94CE000C */ lhu $t6, 0x000C($a2) ## 0000000C -/* 00C38 80AC38D8 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 00C3C 80AC38DC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00C40 80AC38E0 01C17827 */ nor $t7, $t6, $at -/* 00C44 80AC38E4 15E0000C */ bne $t7, $zero, .L80AC3918 -/* 00C48 80AC38E8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00C4C 80AC38EC 849801FE */ lh $t8, 0x01FE($a0) ## 000001FE -/* 00C50 80AC38F0 A49801FC */ sh $t8, 0x01FC($a0) ## 000001FC -/* 00C54 80AC38F4 90F90252 */ lbu $t9, 0x0252($a3) ## 00000252 -/* 00C58 80AC38F8 8FA4001C */ lw $a0, 0x001C($sp) -/* 00C5C 80AC38FC 00194080 */ sll $t0, $t9, 2 -/* 00C60 80AC3900 00E84821 */ addu $t1, $a3, $t0 -/* 00C64 80AC3904 8D2A0200 */ lw $t2, 0x0200($t1) ## 00000200 -/* 00C68 80AC3908 0C042DC8 */ jal func_8010B720 -/* 00C6C 80AC390C 9545010E */ lhu $a1, 0x010E($t2) ## 0000010E -/* 00C70 80AC3910 10000001 */ beq $zero, $zero, .L80AC3918 -/* 00C74 80AC3914 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AC3918: -/* 00C78 80AC3918 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C7C 80AC391C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C80 80AC3920 03E00008 */ jr $ra -/* 00C84 80AC3924 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s deleted file mode 100644 index 24f991801e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AC3928 -/* 00C88 80AC3928 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C8C 80AC392C 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 00C90 80AC3930 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 00C94 80AC3934 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C98 80AC3938 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C9C 80AC393C AFA60020 */ sw $a2, 0x0020($sp) -/* 00CA0 80AC3940 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00CA4 80AC3944 A5EE04D2 */ sh $t6, 0x04D2($t7) ## 801604D2 -/* 00CA8 80AC3948 A4A001F0 */ sh $zero, 0x01F0($a1) ## 000001F0 -/* 00CAC 80AC394C 84B801F0 */ lh $t8, 0x01F0($a1) ## 000001F0 -/* 00CB0 80AC3950 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00CB4 80AC3954 A4B801EE */ sh $t8, 0x01EE($a1) ## 000001EE -/* 00CB8 80AC3958 AFA7001C */ sw $a3, 0x001C($sp) -/* 00CBC 80AC395C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CC0 80AC3960 0C021BC0 */ jal Interface_SetDoAction -/* 00CC4 80AC3964 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 00CC8 80AC3968 8FA4001C */ lw $a0, 0x001C($sp) -/* 00CCC 80AC396C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00CD0 80AC3970 0C2B0CD4 */ jal func_80AC3350 -/* 00CD4 80AC3974 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00CD8 80AC3978 93B90023 */ lbu $t9, 0x0023($sp) -/* 00CDC 80AC397C 8FA7001C */ lw $a3, 0x001C($sp) -/* 00CE0 80AC3980 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00CE4 80AC3984 17200003 */ bne $t9, $zero, .L80AC3994 -/* 00CE8 80AC3988 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CEC 80AC398C 10000003 */ beq $zero, $zero, .L80AC399C -/* 00CF0 80AC3990 A4E801FC */ sh $t0, 0x01FC($a3) ## 000001FC -.L80AC3994: -/* 00CF4 80AC3994 0C2B0E6B */ jal func_80AC39AC -/* 00CF8 80AC3998 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -.L80AC399C: -/* 00CFC 80AC399C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D00 80AC39A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D04 80AC39A4 03E00008 */ jr $ra -/* 00D08 80AC39A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s deleted file mode 100644 index c5be8d18c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80AC39AC -/* 00D0C 80AC39AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00D10 80AC39B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00D14 80AC39B4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00D18 80AC39B8 84AF001C */ lh $t7, 0x001C($a1) ## 0000001C -/* 00D1C 80AC39BC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00D20 80AC39C0 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00D24 80AC39C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D28 80AC39C8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00D2C 80AC39CC 15E10017 */ bne $t7, $at, .L80AC3A2C -/* 00D30 80AC39D0 A4AE01FC */ sh $t6, 0x01FC($a1) ## 000001FC -/* 00D34 80AC39D4 3C028016 */ lui $v0, %hi(gSaveContext+0xef6) -/* 00D38 80AC39D8 9442F556 */ lhu $v0, %lo(gSaveContext+0xef6)($v0) -/* 00D3C 80AC39DC 240570A2 */ addiu $a1, $zero, 0x70A2 ## $a1 = 000070A2 -/* 00D40 80AC39E0 30580100 */ andi $t8, $v0, 0x0100 ## $t8 = 00000000 -/* 00D44 80AC39E4 1300000C */ beq $t8, $zero, .L80AC3A18 -/* 00D48 80AC39E8 30590200 */ andi $t9, $v0, 0x0200 ## $t9 = 00000000 -/* 00D4C 80AC39EC 1320000A */ beq $t9, $zero, .L80AC3A18 -/* 00D50 80AC39F0 30480400 */ andi $t0, $v0, 0x0400 ## $t0 = 00000000 -/* 00D54 80AC39F4 11000008 */ beq $t0, $zero, .L80AC3A18 -/* 00D58 80AC39F8 30490800 */ andi $t1, $v0, 0x0800 ## $t1 = 00000000 -/* 00D5C 80AC39FC 51200007 */ beql $t1, $zero, .L80AC3A1C -/* 00D60 80AC3A00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D64 80AC3A04 240570AD */ addiu $a1, $zero, 0x70AD ## $a1 = 000070AD -/* 00D68 80AC3A08 0C042DC8 */ jal func_8010B720 -/* 00D6C 80AC3A0C AFA70024 */ sw $a3, 0x0024($sp) -/* 00D70 80AC3A10 1000000B */ beq $zero, $zero, .L80AC3A40 -/* 00D74 80AC3A14 8FA70024 */ lw $a3, 0x0024($sp) -.L80AC3A18: -/* 00D78 80AC3A18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AC3A1C: -/* 00D7C 80AC3A1C 0C042DC8 */ jal func_8010B720 -/* 00D80 80AC3A20 AFA70024 */ sw $a3, 0x0024($sp) -/* 00D84 80AC3A24 10000006 */ beq $zero, $zero, .L80AC3A40 -/* 00D88 80AC3A28 8FA70024 */ lw $a3, 0x0024($sp) -.L80AC3A2C: -/* 00D8C 80AC3A2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D90 80AC3A30 24050083 */ addiu $a1, $zero, 0x0083 ## $a1 = 00000083 -/* 00D94 80AC3A34 0C042DC8 */ jal func_8010B720 -/* 00D98 80AC3A38 AFA70024 */ sw $a3, 0x0024($sp) -/* 00D9C 80AC3A3C 8FA70024 */ lw $a3, 0x0024($sp) -.L80AC3A40: -/* 00DA0 80AC3A40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DA4 80AC3A44 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 00DA8 80AC3A48 0C021BC0 */ jal Interface_SetDoAction -/* 00DAC 80AC3A4C AFA70024 */ sw $a3, 0x0024($sp) -/* 00DB0 80AC3A50 8FA40024 */ lw $a0, 0x0024($sp) -/* 00DB4 80AC3A54 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00DB8 80AC3A58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00DBC 80AC3A5C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00DC0 80AC3A60 AC8202C0 */ sw $v0, 0x02C0($a0) ## 000002C0 -/* 00DC4 80AC3A64 0C2B0CD4 */ jal func_80AC3350 -/* 00DC8 80AC3A68 AC820288 */ sw $v0, 0x0288($a0) ## 00000288 -/* 00DCC 80AC3A6C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00DD0 80AC3A70 8FB00018 */ lw $s0, 0x0018($sp) -/* 00DD4 80AC3A74 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00DD8 80AC3A78 03E00008 */ jr $ra -/* 00DDC 80AC3A7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3A80.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3A80.s deleted file mode 100644 index 1cf1304eea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3A80.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AC3A80 -/* 00DE0 80AC3A80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00DE4 80AC3A84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00DE8 80AC3A88 AFA40018 */ sw $a0, 0x0018($sp) -/* 00DEC 80AC3A8C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00DF0 80AC3A90 A4AE01FC */ sh $t6, 0x01FC($a1) ## 000001FC -/* 00DF4 80AC3A94 AFA5001C */ sw $a1, 0x001C($sp) -/* 00DF8 80AC3A98 84AF001C */ lh $t7, 0x001C($a1) ## 0000001C -/* 00DFC 80AC3A9C 3C1980AD */ lui $t9, %hi(D_80AC8984) ## $t9 = 80AD0000 -/* 00E00 80AC3AA0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E04 80AC3AA4 000FC080 */ sll $t8, $t7, 2 -/* 00E08 80AC3AA8 0338C821 */ addu $t9, $t9, $t8 -/* 00E0C 80AC3AAC 8F398984 */ lw $t9, %lo(D_80AC8984)($t9) -/* 00E10 80AC3AB0 0320F809 */ jalr $ra, $t9 -/* 00E14 80AC3AB4 00000000 */ nop -/* 00E18 80AC3AB8 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E1C 80AC3ABC 0C021BC0 */ jal Interface_SetDoAction -/* 00E20 80AC3AC0 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 00E24 80AC3AC4 8FA6001C */ lw $a2, 0x001C($sp) -/* 00E28 80AC3AC8 ACC00288 */ sw $zero, 0x0288($a2) ## 00000288 -/* 00E2C 80AC3ACC ACC002C0 */ sw $zero, 0x02C0($a2) ## 000002C0 -/* 00E30 80AC3AD0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E34 80AC3AD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E38 80AC3AD8 03E00008 */ jr $ra -/* 00E3C 80AC3ADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3AE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3AE0.s deleted file mode 100644 index fb5cd1b7fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3AE0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AC3AE0 -/* 00E40 80AC3AE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E44 80AC3AE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E48 80AC3AE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00E4C 80AC3AEC AFA5001C */ sw $a1, 0x001C($sp) -/* 00E50 80AC3AF0 0C01E221 */ jal func_80078884 -/* 00E54 80AC3AF4 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 -/* 00E58 80AC3AF8 8FA2001C */ lw $v0, 0x001C($sp) -/* 00E5C 80AC3AFC 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00E60 80AC3B00 A0400251 */ sb $zero, 0x0251($v0) ## 00000251 -/* 00E64 80AC3B04 A44E01FC */ sh $t6, 0x01FC($v0) ## 000001FC -/* 00E68 80AC3B08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E6C 80AC3B0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E70 80AC3B10 03E00008 */ jr $ra -/* 00E74 80AC3B14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3B18.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3B18.s deleted file mode 100644 index 7ce8a8781d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3B18.s +++ /dev/null @@ -1,55 +0,0 @@ -.rdata -glabel D_80AC90A0 - .asciz "\x1b[33m★★★ 会話開始！！ ★★★\x1b[m\n" - .balign 4 - -.text -glabel func_80AC3B18 -/* 00E78 80AC3B18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E7C 80AC3B1C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E80 80AC3B20 AFA5001C */ sw $a1, 0x001C($sp) -/* 00E84 80AC3B24 AFA60020 */ sw $a2, 0x0020($sp) -/* 00E88 80AC3B28 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 00E8C 80AC3B2C 848E008A */ lh $t6, 0x008A($a0) ## 0000008A -/* 00E90 80AC3B30 01CFC023 */ subu $t8, $t6, $t7 -/* 00E94 80AC3B34 A49801F0 */ sh $t8, 0x01F0($a0) ## 000001F0 -/* 00E98 80AC3B38 AFA40018 */ sw $a0, 0x0018($sp) -/* 00E9C 80AC3B3C 0C00BC65 */ jal func_8002F194 -/* 00EA0 80AC3B40 8FA5001C */ lw $a1, 0x001C($sp) -/* 00EA4 80AC3B44 10400012 */ beq $v0, $zero, .L80AC3B90 -/* 00EA8 80AC3B48 8FA70018 */ lw $a3, 0x0018($sp) -/* 00EAC 80AC3B4C 3C0480AD */ lui $a0, %hi(D_80AC90A0) ## $a0 = 80AD0000 -/* 00EB0 80AC3B50 248490A0 */ addiu $a0, $a0, %lo(D_80AC90A0) ## $a0 = 80AC90A0 -/* 00EB4 80AC3B54 0C00084C */ jal osSyncPrintf - -/* 00EB8 80AC3B58 AFA70018 */ sw $a3, 0x0018($sp) -/* 00EBC 80AC3B5C 8FA20020 */ lw $v0, 0x0020($sp) -/* 00EC0 80AC3B60 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 00EC4 80AC3B64 8C590680 */ lw $t9, 0x0680($v0) ## 00000680 -/* 00EC8 80AC3B68 03214025 */ or $t0, $t9, $at ## $t0 = 20000000 -/* 00ECC 80AC3B6C AC480680 */ sw $t0, 0x0680($v0) ## 00000680 -/* 00ED0 80AC3B70 0C02F164 */ jal func_800BC590 -/* 00ED4 80AC3B74 8FA4001C */ lw $a0, 0x001C($sp) -/* 00ED8 80AC3B78 8FA50018 */ lw $a1, 0x0018($sp) -/* 00EDC 80AC3B7C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00EE0 80AC3B80 0C2B0E4A */ jal func_80AC3928 -/* 00EE4 80AC3B84 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00EE8 80AC3B88 1000000D */ beq $zero, $zero, .L80AC3BC0 -/* 00EEC 80AC3B8C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC3B90: -/* 00EF0 80AC3B90 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00EF4 80AC3B94 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 00EF8 80AC3B98 C4E40090 */ lwc1 $f4, 0x0090($a3) ## 00000090 -/* 00EFC 80AC3B9C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00F00 80AC3BA0 8FA5001C */ lw $a1, 0x001C($sp) -/* 00F04 80AC3BA4 4606203C */ c.lt.s $f4, $f6 -/* 00F08 80AC3BA8 00000000 */ nop -/* 00F0C 80AC3BAC 45020004 */ bc1fl .L80AC3BC0 -/* 00F10 80AC3BB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F14 80AC3BB4 0C00BCB3 */ jal func_8002F2CC -/* 00F18 80AC3BB8 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 00F1C 80AC3BBC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC3BC0: -/* 00F20 80AC3BC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F24 80AC3BC4 03E00008 */ jr $ra -/* 00F28 80AC3BC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3BCC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3BCC.s deleted file mode 100644 index 44ac3e30a5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3BCC.s +++ /dev/null @@ -1,97 +0,0 @@ -glabel func_80AC3BCC -/* 00F2C 80AC3BCC 8CA60224 */ lw $a2, 0x0224($a1) ## 00000224 -/* 00F30 80AC3BD0 80820028 */ lb $v0, 0x0028($a0) ## 00000028 -/* 00F34 80AC3BD4 80830029 */ lb $v1, 0x0029($a0) ## 00000029 -/* 00F38 80AC3BD8 A0A0022C */ sb $zero, 0x022C($a1) ## 0000022C -/* 00F3C 80AC3BDC 14C0000A */ bne $a2, $zero, .L80AC3C08 -/* 00F40 80AC3BE0 A0A0022D */ sb $zero, 0x022D($a1) ## 0000022D -/* 00F44 80AC3BE4 2841001F */ slti $at, $v0, 0x001F -/* 00F48 80AC3BE8 10200004 */ beq $at, $zero, .L80AC3BFC -/* 00F4C 80AC3BEC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00F50 80AC3BF0 2841FFE2 */ slti $at, $v0, 0xFFE2 -/* 00F54 80AC3BF4 50200020 */ beql $at, $zero, .L80AC3C78 -/* 00F58 80AC3BF8 8CA20228 */ lw $v0, 0x0228($a1) ## 00000228 -.L80AC3BFC: -/* 00F5C 80AC3BFC ACA20224 */ sw $v0, 0x0224($a1) ## 00000224 -/* 00F60 80AC3C00 1000001C */ beq $zero, $zero, .L80AC3C74 -/* 00F64 80AC3C04 A0AF022C */ sb $t7, 0x022C($a1) ## 0000022C -.L80AC3C08: -/* 00F68 80AC3C08 2841001F */ slti $at, $v0, 0x001F -/* 00F6C 80AC3C0C 10200005 */ beq $at, $zero, .L80AC3C24 -/* 00F70 80AC3C10 2841FFE2 */ slti $at, $v0, 0xFFE2 -/* 00F74 80AC3C14 14200003 */ bne $at, $zero, .L80AC3C24 -/* 00F78 80AC3C18 00000000 */ nop -/* 00F7C 80AC3C1C 10000015 */ beq $zero, $zero, .L80AC3C74 -/* 00F80 80AC3C20 ACA00224 */ sw $zero, 0x0224($a1) ## 00000224 -.L80AC3C24: -/* 00F84 80AC3C24 00C20019 */ multu $a2, $v0 -/* 00F88 80AC3C28 00C24021 */ addu $t0, $a2, $v0 -/* 00F8C 80AC3C2C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00F90 80AC3C30 01003025 */ or $a2, $t0, $zero ## $a2 = 00000000 -/* 00F94 80AC3C34 290107D1 */ slti $at, $t0, 0x07D1 -/* 00F98 80AC3C38 0000C012 */ mflo $t8 -/* 00F9C 80AC3C3C 07010004 */ bgez $t8, .L80AC3C50 -/* 00FA0 80AC3C40 00000000 */ nop -/* 00FA4 80AC3C44 ACA20224 */ sw $v0, 0x0224($a1) ## 00000224 -/* 00FA8 80AC3C48 1000000A */ beq $zero, $zero, .L80AC3C74 -/* 00FAC 80AC3C4C A0B9022C */ sb $t9, 0x022C($a1) ## 0000022C -.L80AC3C50: -/* 00FB0 80AC3C50 14200004 */ bne $at, $zero, .L80AC3C64 -/* 00FB4 80AC3C54 ACA80224 */ sw $t0, 0x0224($a1) ## 00000224 -/* 00FB8 80AC3C58 240907D0 */ addiu $t1, $zero, 0x07D0 ## $t1 = 000007D0 -/* 00FBC 80AC3C5C 10000005 */ beq $zero, $zero, .L80AC3C74 -/* 00FC0 80AC3C60 ACA90224 */ sw $t1, 0x0224($a1) ## 00000224 -.L80AC3C64: -/* 00FC4 80AC3C64 28C1F830 */ slti $at, $a2, 0xF830 -/* 00FC8 80AC3C68 10200002 */ beq $at, $zero, .L80AC3C74 -/* 00FCC 80AC3C6C 240AF830 */ addiu $t2, $zero, 0xF830 ## $t2 = FFFFF830 -/* 00FD0 80AC3C70 ACAA0224 */ sw $t2, 0x0224($a1) ## 00000224 -.L80AC3C74: -/* 00FD4 80AC3C74 8CA20228 */ lw $v0, 0x0228($a1) ## 00000228 -.L80AC3C78: -/* 00FD8 80AC3C78 2861001F */ slti $at, $v1, 0x001F -/* 00FDC 80AC3C7C 1440000A */ bne $v0, $zero, .L80AC3CA8 -/* 00FE0 80AC3C80 00000000 */ nop -/* 00FE4 80AC3C84 2861001F */ slti $at, $v1, 0x001F -/* 00FE8 80AC3C88 10200004 */ beq $at, $zero, .L80AC3C9C -/* 00FEC 80AC3C8C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00FF0 80AC3C90 2861FFE2 */ slti $at, $v1, 0xFFE2 -/* 00FF4 80AC3C94 1020001E */ beq $at, $zero, .L80AC3D10 -/* 00FF8 80AC3C98 00000000 */ nop -.L80AC3C9C: -/* 00FFC 80AC3C9C ACA30228 */ sw $v1, 0x0228($a1) ## 00000228 -/* 01000 80AC3CA0 03E00008 */ jr $ra -/* 01004 80AC3CA4 A0AB022D */ sb $t3, 0x022D($a1) ## 0000022D -.L80AC3CA8: -/* 01008 80AC3CA8 10200005 */ beq $at, $zero, .L80AC3CC0 -/* 0100C 80AC3CAC 2861FFE2 */ slti $at, $v1, 0xFFE2 -/* 01010 80AC3CB0 14200003 */ bne $at, $zero, .L80AC3CC0 -/* 01014 80AC3CB4 00000000 */ nop -/* 01018 80AC3CB8 03E00008 */ jr $ra -/* 0101C 80AC3CBC ACA00228 */ sw $zero, 0x0228($a1) ## 00000228 -.L80AC3CC0: -/* 01020 80AC3CC0 00430019 */ multu $v0, $v1 -/* 01024 80AC3CC4 00437021 */ addu $t6, $v0, $v1 -/* 01028 80AC3CC8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 0102C 80AC3CCC 01C01025 */ or $v0, $t6, $zero ## $v0 = 00000000 -/* 01030 80AC3CD0 29C107D1 */ slti $at, $t6, 0x07D1 -/* 01034 80AC3CD4 00006012 */ mflo $t4 -/* 01038 80AC3CD8 05810004 */ bgez $t4, .L80AC3CEC -/* 0103C 80AC3CDC 00000000 */ nop -/* 01040 80AC3CE0 ACA30228 */ sw $v1, 0x0228($a1) ## 00000228 -/* 01044 80AC3CE4 03E00008 */ jr $ra -/* 01048 80AC3CE8 A0AD022D */ sb $t5, 0x022D($a1) ## 0000022D -.L80AC3CEC: -/* 0104C 80AC3CEC 14200004 */ bne $at, $zero, .L80AC3D00 -/* 01050 80AC3CF0 ACAE0228 */ sw $t6, 0x0228($a1) ## 00000228 -/* 01054 80AC3CF4 240F07D0 */ addiu $t7, $zero, 0x07D0 ## $t7 = 000007D0 -/* 01058 80AC3CF8 03E00008 */ jr $ra -/* 0105C 80AC3CFC ACAF0228 */ sw $t7, 0x0228($a1) ## 00000228 -.L80AC3D00: -/* 01060 80AC3D00 2841F830 */ slti $at, $v0, 0xF830 -/* 01064 80AC3D04 10200002 */ beq $at, $zero, .L80AC3D10 -/* 01068 80AC3D08 2418F830 */ addiu $t8, $zero, 0xF830 ## $t8 = FFFFF830 -/* 0106C 80AC3D0C ACB80228 */ sw $t8, 0x0228($a1) ## 00000228 -.L80AC3D10: -/* 01070 80AC3D10 03E00008 */ jr $ra -/* 01074 80AC3D14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3D18.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3D18.s deleted file mode 100644 index 7b99f51d58..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3D18.s +++ /dev/null @@ -1,96 +0,0 @@ -glabel func_80AC3D18 -/* 01078 80AC3D18 AFA50004 */ sw $a1, 0x0004($sp) -/* 0107C 80AC3D1C 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -/* 01080 80AC3D20 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 00000000 -/* 01084 80AC3D24 30A300FF */ andi $v1, $a1, 0x00FF ## $v1 = 00000000 -/* 01088 80AC3D28 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 0108C 80AC3D2C 11E00025 */ beq $t7, $zero, .L80AC3DC4 -/* 01090 80AC3D30 24A70004 */ addiu $a3, $a1, 0x0004 ## $a3 = 00000004 -/* 01094 80AC3D34 24A60001 */ addiu $a2, $a1, 0x0001 ## $a2 = 00000001 -/* 01098 80AC3D38 30D800FF */ andi $t8, $a2, 0x00FF ## $t8 = 00000001 -/* 0109C 80AC3D3C 24A70004 */ addiu $a3, $a1, 0x0004 ## $a3 = 00000004 -/* 010A0 80AC3D40 0307082A */ slt $at, $t8, $a3 -/* 010A4 80AC3D44 30C300FF */ andi $v1, $a2, 0x00FF ## $v1 = 00000001 -/* 010A8 80AC3D48 1020000D */ beq $at, $zero, .L80AC3D80 -/* 010AC 80AC3D4C 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 -/* 010B0 80AC3D50 0003C880 */ sll $t9, $v1, 2 -.L80AC3D54: -/* 010B4 80AC3D54 00994021 */ addu $t0, $a0, $t9 -/* 010B8 80AC3D58 8D090200 */ lw $t1, 0x0200($t0) ## 00000200 -/* 010BC 80AC3D5C 51200004 */ beql $t1, $zero, .L80AC3D70 -/* 010C0 80AC3D60 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000003 -/* 010C4 80AC3D64 03E00008 */ jr $ra -/* 010C8 80AC3D68 00601025 */ or $v0, $v1, $zero ## $v0 = 00000003 -.L80AC3D6C: -/* 010CC 80AC3D6C 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000005 -.L80AC3D70: -/* 010D0 80AC3D70 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000005 -/* 010D4 80AC3D74 0067082A */ slt $at, $v1, $a3 -/* 010D8 80AC3D78 5420FFF6 */ bnel $at, $zero, .L80AC3D54 -/* 010DC 80AC3D7C 0003C880 */ sll $t9, $v1, 2 -.L80AC3D80: -/* 010E0 80AC3D80 0047082A */ slt $at, $v0, $a3 -/* 010E4 80AC3D84 1020002F */ beq $at, $zero, .L80AC3E44 -/* 010E8 80AC3D88 30A300FF */ andi $v1, $a1, 0x00FF ## $v1 = 00000000 -/* 010EC 80AC3D8C 00035080 */ sll $t2, $v1, 2 -.L80AC3D90: -/* 010F0 80AC3D90 008A5821 */ addu $t3, $a0, $t2 -/* 010F4 80AC3D94 8D6C0200 */ lw $t4, 0x0200($t3) ## 00000200 -/* 010F8 80AC3D98 51800004 */ beql $t4, $zero, .L80AC3DAC -/* 010FC 80AC3D9C 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000002 -/* 01100 80AC3DA0 03E00008 */ jr $ra -/* 01104 80AC3DA4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000002 -.L80AC3DA8: -/* 01108 80AC3DA8 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000004 -.L80AC3DAC: -/* 0110C 80AC3DAC 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000004 -/* 01110 80AC3DB0 0067082A */ slt $at, $v1, $a3 -/* 01114 80AC3DB4 5420FFF6 */ bnel $at, $zero, .L80AC3D90 -/* 01118 80AC3DB8 00035080 */ sll $t2, $v1, 2 -/* 0111C 80AC3DBC 10000022 */ beq $zero, $zero, .L80AC3E48 -/* 01120 80AC3DC0 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -.L80AC3DC4: -/* 01124 80AC3DC4 00A7082A */ slt $at, $a1, $a3 -/* 01128 80AC3DC8 1020000D */ beq $at, $zero, .L80AC3E00 -/* 0112C 80AC3DCC 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 -/* 01130 80AC3DD0 00036880 */ sll $t5, $v1, 2 -.L80AC3DD4: -/* 01134 80AC3DD4 008D7021 */ addu $t6, $a0, $t5 -/* 01138 80AC3DD8 8DCF0200 */ lw $t7, 0x0200($t6) ## 00000200 -/* 0113C 80AC3DDC 51E00004 */ beql $t7, $zero, .L80AC3DF0 -/* 01140 80AC3DE0 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000006 -/* 01144 80AC3DE4 03E00008 */ jr $ra -/* 01148 80AC3DE8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000006 -.L80AC3DEC: -/* 0114C 80AC3DEC 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000008 -.L80AC3DF0: -/* 01150 80AC3DF0 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000008 -/* 01154 80AC3DF4 0067082A */ slt $at, $v1, $a3 -/* 01158 80AC3DF8 5420FFF6 */ bnel $at, $zero, .L80AC3DD4 -/* 0115C 80AC3DFC 00036880 */ sll $t5, $v1, 2 -.L80AC3E00: -/* 01160 80AC3E00 24460001 */ addiu $a2, $v0, 0x0001 ## $a2 = 00000007 -/* 01164 80AC3E04 30D800FF */ andi $t8, $a2, 0x00FF ## $t8 = 00000007 -/* 01168 80AC3E08 0307082A */ slt $at, $t8, $a3 -/* 0116C 80AC3E0C 1020000D */ beq $at, $zero, .L80AC3E44 -/* 01170 80AC3E10 30C300FF */ andi $v1, $a2, 0x00FF ## $v1 = 00000007 -/* 01174 80AC3E14 0003C880 */ sll $t9, $v1, 2 -.L80AC3E18: -/* 01178 80AC3E18 00994021 */ addu $t0, $a0, $t9 -/* 0117C 80AC3E1C 8D090200 */ lw $t1, 0x0200($t0) ## 00000200 -/* 01180 80AC3E20 51200004 */ beql $t1, $zero, .L80AC3E34 -/* 01184 80AC3E24 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000009 -/* 01188 80AC3E28 03E00008 */ jr $ra -/* 0118C 80AC3E2C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000009 -.L80AC3E30: -/* 01190 80AC3E30 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 0000000B -.L80AC3E34: -/* 01194 80AC3E34 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 0000000B -/* 01198 80AC3E38 0067082A */ slt $at, $v1, $a3 -/* 0119C 80AC3E3C 5420FFF6 */ bnel $at, $zero, .L80AC3E18 -/* 011A0 80AC3E40 0003C880 */ sll $t9, $v1, 2 -.L80AC3E44: -/* 011A4 80AC3E44 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -.L80AC3E48: -/* 011A8 80AC3E48 03E00008 */ jr $ra -/* 011AC 80AC3E4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3E50.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3E50.s deleted file mode 100644 index d4f504aca1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3E50.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80AC3E50 -/* 011B0 80AC3E50 AFA50004 */ sw $a1, 0x0004($sp) -/* 011B4 80AC3E54 30C300FF */ andi $v1, $a2, 0x00FF ## $v1 = 00000000 -/* 011B8 80AC3E58 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 00000000 -/* 011BC 80AC3E5C 24670004 */ addiu $a3, $v1, 0x0004 ## $a3 = 00000004 -/* 011C0 80AC3E60 00A3082A */ slt $at, $a1, $v1 -/* 011C4 80AC3E64 AFA60008 */ sw $a2, 0x0008($sp) -/* 011C8 80AC3E68 30E200FF */ andi $v0, $a3, 0x00FF ## $v0 = 00000004 -/* 011CC 80AC3E6C 14200017 */ bne $at, $zero, .L80AC3ECC -/* 011D0 80AC3E70 00A04025 */ or $t0, $a1, $zero ## $t0 = 00000000 -/* 011D4 80AC3E74 30E600FF */ andi $a2, $a3, 0x00FF ## $a2 = 00000004 -/* 011D8 80AC3E78 00A6082A */ slt $at, $a1, $a2 -/* 011DC 80AC3E7C 10200013 */ beq $at, $zero, .L80AC3ECC -/* 011E0 80AC3E80 2505FFFE */ addiu $a1, $t0, 0xFFFE ## $a1 = FFFFFFFE -.L80AC3E84: -/* 011E4 80AC3E84 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FE -/* 011E8 80AC3E88 00A3082A */ slt $at, $a1, $v1 -/* 011EC 80AC3E8C 1420000A */ bne $at, $zero, .L80AC3EB8 -/* 011F0 80AC3E90 00A04025 */ or $t0, $a1, $zero ## $t0 = 000000FE -/* 011F4 80AC3E94 00A6082A */ slt $at, $a1, $a2 -/* 011F8 80AC3E98 10200007 */ beq $at, $zero, .L80AC3EB8 -/* 011FC 80AC3E9C 00057080 */ sll $t6, $a1, 2 -/* 01200 80AC3EA0 008E7821 */ addu $t7, $a0, $t6 -/* 01204 80AC3EA4 8DF80200 */ lw $t8, 0x0200($t7) ## 00000200 -/* 01208 80AC3EA8 53000004 */ beql $t8, $zero, .L80AC3EBC -/* 0120C 80AC3EAC 0103082A */ slt $at, $t0, $v1 -/* 01210 80AC3EB0 03E00008 */ jr $ra -/* 01214 80AC3EB4 00A01025 */ or $v0, $a1, $zero ## $v0 = 000000FE -.L80AC3EB8: -/* 01218 80AC3EB8 0103082A */ slt $at, $t0, $v1 -.L80AC3EBC: -/* 0121C 80AC3EBC 14200003 */ bne $at, $zero, .L80AC3ECC -/* 01220 80AC3EC0 0102082A */ slt $at, $t0, $v0 -/* 01224 80AC3EC4 5420FFEF */ bnel $at, $zero, .L80AC3E84 -/* 01228 80AC3EC8 2505FFFE */ addiu $a1, $t0, 0xFFFE ## $a1 = 000000FC -.L80AC3ECC: -/* 0122C 80AC3ECC 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 01230 80AC3ED0 03E00008 */ jr $ra -/* 01234 80AC3ED4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3ED8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3ED8.s deleted file mode 100644 index 19fb19e707..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3ED8.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80AC3ED8 -/* 01238 80AC3ED8 30A200FF */ andi $v0, $a1, 0x00FF ## $v0 = 00000000 -/* 0123C 80AC3EDC 30C300FF */ andi $v1, $a2, 0x00FF ## $v1 = 00000000 -/* 01240 80AC3EE0 0043082A */ slt $at, $v0, $v1 -/* 01244 80AC3EE4 AFA50004 */ sw $a1, 0x0004($sp) -/* 01248 80AC3EE8 10200010 */ beq $at, $zero, .L80AC3F2C -/* 0124C 80AC3EEC AFA60008 */ sw $a2, 0x0008($sp) -/* 01250 80AC3EF0 24450002 */ addiu $a1, $v0, 0x0002 ## $a1 = 00000002 -.L80AC3EF4: -/* 01254 80AC3EF4 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 00000002 -/* 01258 80AC3EF8 00A3082A */ slt $at, $a1, $v1 -/* 0125C 80AC3EFC 10200008 */ beq $at, $zero, .L80AC3F20 -/* 01260 80AC3F00 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000002 -/* 01264 80AC3F04 00057080 */ sll $t6, $a1, 2 -/* 01268 80AC3F08 008E7821 */ addu $t7, $a0, $t6 -/* 0126C 80AC3F0C 8DF80200 */ lw $t8, 0x0200($t7) ## 00000200 -/* 01270 80AC3F10 53000004 */ beql $t8, $zero, .L80AC3F24 -/* 01274 80AC3F14 0043082A */ slt $at, $v0, $v1 -/* 01278 80AC3F18 03E00008 */ jr $ra -/* 0127C 80AC3F1C 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000002 -.L80AC3F20: -/* 01280 80AC3F20 0043082A */ slt $at, $v0, $v1 -.L80AC3F24: -/* 01284 80AC3F24 5420FFF3 */ bnel $at, $zero, .L80AC3EF4 -/* 01288 80AC3F28 24450002 */ addiu $a1, $v0, 0x0002 ## $a1 = 00000004 -.L80AC3F2C: -/* 0128C 80AC3F2C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 01290 80AC3F30 03E00008 */ jr $ra -/* 01294 80AC3F34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s deleted file mode 100644 index 06abc51e15..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_80AC3F38 -/* 01298 80AC3F38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0129C 80AC3F3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 012A0 80AC3F40 908E01EB */ lbu $t6, 0x01EB($a0) ## 000001EB -/* 012A4 80AC3F44 3C038016 */ lui $v1, %hi(gSaveContext) -/* 012A8 80AC3F48 3C0280AD */ lui $v0, %hi(D_80AC88EC) ## $v0 = 80AD0000 -/* 012AC 80AC3F4C 000E7840 */ sll $t7, $t6, 1 -/* 012B0 80AC3F50 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 012B4 80AC3F54 004F1021 */ addu $v0, $v0, $t7 -/* 012B8 80AC3F58 844288EC */ lh $v0, %lo(D_80AC88EC)($v0) -/* 012BC 80AC3F5C 84780034 */ lh $t8, 0x0034($v1) ## 8015E694 -/* 012C0 80AC3F60 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 012C4 80AC3F64 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 012C8 80AC3F68 0302082A */ slt $at, $t8, $v0 -/* 012CC 80AC3F6C 1020000B */ beq $at, $zero, .L80AC3F9C -/* 012D0 80AC3F70 00022023 */ subu $a0, $zero, $v0 -/* 012D4 80AC3F74 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 012D8 80AC3F78 240570A8 */ addiu $a1, $zero, 0x70A8 ## $a1 = 000070A8 -/* 012DC 80AC3F7C 0C042DC8 */ jal func_8010B720 -/* 012E0 80AC3F80 AFA60018 */ sw $a2, 0x0018($sp) -/* 012E4 80AC3F84 8FA60018 */ lw $a2, 0x0018($sp) -/* 012E8 80AC3F88 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 012EC 80AC3F8C 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 012F0 80AC3F90 A0D901EC */ sb $t9, 0x01EC($a2) ## 000001EC -/* 012F4 80AC3F94 10000031 */ beq $zero, $zero, .L80AC405C -/* 012F8 80AC3F98 A0C801EB */ sb $t0, 0x01EB($a2) ## 000001EB -.L80AC3F9C: -/* 012FC 80AC3F9C 00042400 */ sll $a0, $a0, 16 -/* 01300 80AC3FA0 00042403 */ sra $a0, $a0, 16 -/* 01304 80AC3FA4 AFA60018 */ sw $a2, 0x0018($sp) -/* 01308 80AC3FA8 0C021CC3 */ jal Rupees_ChangeBy -/* 0130C 80AC3FAC AFA7001C */ sw $a3, 0x001C($sp) -/* 01310 80AC3FB0 8FA60018 */ lw $a2, 0x0018($sp) -/* 01314 80AC3FB4 8FA7001C */ lw $a3, 0x001C($sp) -/* 01318 80AC3FB8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0131C 80AC3FBC 90C201EB */ lbu $v0, 0x01EB($a2) ## 000001EB -/* 01320 80AC3FC0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01324 80AC3FC4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01328 80AC3FC8 1441000C */ bne $v0, $at, .L80AC3FFC -/* 0132C 80AC3FCC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01330 80AC3FD0 94690EE4 */ lhu $t1, 0x0EE4($v1) ## 8015F544 -/* 01334 80AC3FD4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01338 80AC3FD8 240570A9 */ addiu $a1, $zero, 0x70A9 ## $a1 = 000070A9 -/* 0133C 80AC3FDC 352A8000 */ ori $t2, $t1, 0x8000 ## $t2 = 00008000 -/* 01340 80AC3FE0 A46A0EE4 */ sh $t2, 0x0EE4($v1) ## 8015F544 -/* 01344 80AC3FE4 0C042DC8 */ jal func_8010B720 -/* 01348 80AC3FE8 AFA60018 */ sw $a2, 0x0018($sp) -/* 0134C 80AC3FEC 8FA60018 */ lw $a2, 0x0018($sp) -/* 01350 80AC3FF0 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 -/* 01354 80AC3FF4 1000001B */ beq $zero, $zero, .L80AC4064 -/* 01358 80AC3FF8 A0CB01EB */ sb $t3, 0x01EB($a2) ## 000001EB -.L80AC3FFC: -/* 0135C 80AC3FFC 14400005 */ bne $v0, $zero, .L80AC4014 -/* 01360 80AC4000 240570A7 */ addiu $a1, $zero, 0x70A7 ## $a1 = 000070A7 -/* 01364 80AC4004 946C0EE4 */ lhu $t4, 0x0EE4($v1) ## 00000EE4 -/* 01368 80AC4008 358D1000 */ ori $t5, $t4, 0x1000 ## $t5 = 00001000 -/* 0136C 80AC400C 1000000E */ beq $zero, $zero, .L80AC4048 -/* 01370 80AC4010 A46D0EE4 */ sh $t5, 0x0EE4($v1) ## 00000EE4 -.L80AC4014: -/* 01374 80AC4014 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01378 80AC4018 54410006 */ bnel $v0, $at, .L80AC4034 -/* 0137C 80AC401C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01380 80AC4020 946E0EE4 */ lhu $t6, 0x0EE4($v1) ## 00000EE4 -/* 01384 80AC4024 35CF4000 */ ori $t7, $t6, 0x4000 ## $t7 = 00004000 -/* 01388 80AC4028 10000007 */ beq $zero, $zero, .L80AC4048 -/* 0138C 80AC402C A46F0EE4 */ sh $t7, 0x0EE4($v1) ## 00000EE4 -/* 01390 80AC4030 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80AC4034: -/* 01394 80AC4034 14410004 */ bne $v0, $at, .L80AC4048 -/* 01398 80AC4038 00000000 */ nop -/* 0139C 80AC403C 94780EE4 */ lhu $t8, 0x0EE4($v1) ## 00000EE4 -/* 013A0 80AC4040 37192000 */ ori $t9, $t8, 0x2000 ## $t9 = 00002000 -/* 013A4 80AC4044 A4790EE4 */ sh $t9, 0x0EE4($v1) ## 00000EE4 -.L80AC4048: -/* 013A8 80AC4048 0C042DC8 */ jal func_8010B720 -/* 013AC 80AC404C AFA60018 */ sw $a2, 0x0018($sp) -/* 013B0 80AC4050 8FA60018 */ lw $a2, 0x0018($sp) -/* 013B4 80AC4054 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 -/* 013B8 80AC4058 A0C801EB */ sb $t0, 0x01EB($a2) ## 000001EB -.L80AC405C: -/* 013BC 80AC405C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 013C0 80AC4060 A4C901FC */ sh $t1, 0x01FC($a2) ## 000001FC -.L80AC4064: -/* 013C4 80AC4064 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013C8 80AC4068 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013CC 80AC406C 03E00008 */ jr $ra -/* 013D0 80AC4070 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4074.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4074.s deleted file mode 100644 index 0dbdcd4aca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4074.s +++ /dev/null @@ -1,135 +0,0 @@ -.rdata -glabel D_80AC90C4 - .asciz "「スティック左右で品物みてくれ！」\n" - .balign 4 - -.late_rodata -glabel jtbl_80AC94FC -.word L80AC4198 -.word L80AC4198 -.word L80AC4198 -.word L80AC4198 -.word L80AC4184 -.word L80AC41AC -.word L80AC4168 - -.text -glabel func_80AC4074 -/* 013D4 80AC4074 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 013D8 80AC4078 AFBF001C */ sw $ra, 0x001C($sp) -/* 013DC 80AC407C AFB00018 */ sw $s0, 0x0018($sp) -/* 013E0 80AC4080 AFA40020 */ sw $a0, 0x0020($sp) -/* 013E4 80AC4084 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 013E8 80AC4088 AFA60028 */ sw $a2, 0x0028($sp) -/* 013EC 80AC408C 0C042F6F */ jal func_8010BDBC -/* 013F0 80AC4090 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 013F4 80AC4094 8FA70020 */ lw $a3, 0x0020($sp) -/* 013F8 80AC4098 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 013FC 80AC409C 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 01400 80AC40A0 15C1001E */ bne $t6, $at, .L80AC411C -/* 01404 80AC40A4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01408 80AC40A8 1441001C */ bne $v0, $at, .L80AC411C -/* 0140C 80AC40AC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01410 80AC40B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01414 80AC40B4 0C2B0E21 */ jal func_80AC3884 -/* 01418 80AC40B8 26060014 */ addiu $a2, $s0, 0x0014 ## $a2 = 00000014 -/* 0141C 80AC40BC 54400054 */ bnel $v0, $zero, .L80AC4210 -/* 01420 80AC40C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01424 80AC40C4 0C041AF2 */ jal func_80106BC8 -/* 01428 80AC40C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0142C 80AC40CC 1040004F */ beq $v0, $zero, .L80AC420C -/* 01430 80AC40D0 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 01434 80AC40D4 00501021 */ addu $v0, $v0, $s0 -/* 01438 80AC40D8 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 0143C 80AC40DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01440 80AC40E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01444 80AC40E4 10400005 */ beq $v0, $zero, .L80AC40FC -/* 01448 80AC40E8 00000000 */ nop -/* 0144C 80AC40EC 10410007 */ beq $v0, $at, .L80AC410C -/* 01450 80AC40F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01454 80AC40F4 10000046 */ beq $zero, $zero, .L80AC4210 -/* 01458 80AC40F8 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC40FC: -/* 0145C 80AC40FC 0C2B0E6B */ jal func_80AC39AC -/* 01460 80AC4100 8FA50020 */ lw $a1, 0x0020($sp) -/* 01464 80AC4104 10000042 */ beq $zero, $zero, .L80AC4210 -/* 01468 80AC4108 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC410C: -/* 0146C 80AC410C 0C2B0DEA */ jal func_80AC37A8 -/* 01470 80AC4110 8FA50020 */ lw $a1, 0x0020($sp) -/* 01474 80AC4114 1000003E */ beq $zero, $zero, .L80AC4210 -/* 01478 80AC4118 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC411C: -/* 0147C 80AC411C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01480 80AC4120 5441003B */ bnel $v0, $at, .L80AC4210 -/* 01484 80AC4124 8FBF001C */ lw $ra, 0x001C($sp) -/* 01488 80AC4128 0C041AF2 */ jal func_80106BC8 -/* 0148C 80AC412C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01490 80AC4130 50400037 */ beql $v0, $zero, .L80AC4210 -/* 01494 80AC4134 8FBF001C */ lw $ra, 0x001C($sp) -/* 01498 80AC4138 0C01E221 */ jal func_80078884 -/* 0149C 80AC413C 24044818 */ addiu $a0, $zero, 0x4818 ## $a0 = 00004818 -/* 014A0 80AC4140 8FA70020 */ lw $a3, 0x0020($sp) -/* 014A4 80AC4144 90EF01EB */ lbu $t7, 0x01EB($a3) ## 000001EB -/* 014A8 80AC4148 2DE10007 */ sltiu $at, $t7, 0x0007 -/* 014AC 80AC414C 10200024 */ beq $at, $zero, .L80AC41E0 -/* 014B0 80AC4150 000F7880 */ sll $t7, $t7, 2 -/* 014B4 80AC4154 3C0180AD */ lui $at, %hi(jtbl_80AC94FC) ## $at = 80AD0000 -/* 014B8 80AC4158 002F0821 */ addu $at, $at, $t7 -/* 014BC 80AC415C 8C2F94FC */ lw $t7, %lo(jtbl_80AC94FC)($at) -/* 014C0 80AC4160 01E00008 */ jr $t7 -/* 014C4 80AC4164 00000000 */ nop -glabel L80AC4168 -/* 014C8 80AC4168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014CC 80AC416C 0C042DC8 */ jal func_8010B720 -/* 014D0 80AC4170 240570AA */ addiu $a1, $zero, 0x70AA ## $a1 = 000070AA -/* 014D4 80AC4174 8FB90020 */ lw $t9, 0x0020($sp) -/* 014D8 80AC4178 24180019 */ addiu $t8, $zero, 0x0019 ## $t8 = 00000019 -/* 014DC 80AC417C 10000023 */ beq $zero, $zero, .L80AC420C -/* 014E0 80AC4180 A73801FC */ sh $t8, 0x01FC($t9) ## 000001FC -glabel L80AC4184 -/* 014E4 80AC4184 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014E8 80AC4188 0C2B0DEA */ jal func_80AC37A8 -/* 014EC 80AC418C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 014F0 80AC4190 1000001F */ beq $zero, $zero, .L80AC4210 -/* 014F4 80AC4194 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80AC4198 -/* 014F8 80AC4198 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 014FC 80AC419C 0C2B0FCE */ jal func_80AC3F38 -/* 01500 80AC41A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01504 80AC41A4 1000001A */ beq $zero, $zero, .L80AC4210 -/* 01508 80AC41A8 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80AC41AC -/* 0150C 80AC41AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01510 80AC41B0 00300821 */ addu $at, $at, $s0 -/* 01514 80AC41B4 240801D1 */ addiu $t0, $zero, 0x01D1 ## $t0 = 000001D1 -/* 01518 80AC41B8 A4281E1A */ sh $t0, 0x1E1A($at) ## 00011E1A -/* 0151C 80AC41BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01520 80AC41C0 00300821 */ addu $at, $at, $s0 -/* 01524 80AC41C4 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 01528 80AC41C8 A0291E15 */ sb $t1, 0x1E15($at) ## 00011E15 -/* 0152C 80AC41CC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01530 80AC41D0 00300821 */ addu $at, $at, $s0 -/* 01534 80AC41D4 240A002E */ addiu $t2, $zero, 0x002E ## $t2 = 0000002E -/* 01538 80AC41D8 1000000C */ beq $zero, $zero, .L80AC420C -/* 0153C 80AC41DC A02A1E5E */ sb $t2, 0x1E5E($at) ## 00011E5E -.L80AC41E0: -/* 01540 80AC41E0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01544 80AC41E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01548 80AC41E8 0C2B0E21 */ jal func_80AC3884 -/* 0154C 80AC41EC 26060014 */ addiu $a2, $s0, 0x0014 ## $a2 = 00000014 -/* 01550 80AC41F0 14400006 */ bne $v0, $zero, .L80AC420C -/* 01554 80AC41F4 3C0480AD */ lui $a0, %hi(D_80AC90C4) ## $a0 = 80AD0000 -/* 01558 80AC41F8 0C00084C */ jal osSyncPrintf - -/* 0155C 80AC41FC 248490C4 */ addiu $a0, $a0, %lo(D_80AC90C4) ## $a0 = 80AC90C4 -/* 01560 80AC4200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01564 80AC4204 0C2B0E6B */ jal func_80AC39AC -/* 01568 80AC4208 8FA50020 */ lw $a1, 0x0020($sp) -.L80AC420C: -/* 0156C 80AC420C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC4210: -/* 01570 80AC4210 8FB00018 */ lw $s0, 0x0018($sp) -/* 01574 80AC4214 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01578 80AC4218 03E00008 */ jr $ra -/* 0157C 80AC421C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4220.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4220.s deleted file mode 100644 index e8641e98c4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4220.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AC4220 -/* 01580 80AC4220 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01584 80AC4224 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 01588 80AC4228 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0158C 80AC422C 00451021 */ addu $v0, $v0, $a1 -/* 01590 80AC4230 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 01594 80AC4234 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01598 80AC4238 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 0159C 80AC423C 10400006 */ beq $v0, $zero, .L80AC4258 -/* 015A0 80AC4240 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 015A4 80AC4244 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 015A8 80AC4248 10410007 */ beq $v0, $at, .L80AC4268 -/* 015AC 80AC424C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 015B0 80AC4250 10000009 */ beq $zero, $zero, .L80AC4278 -/* 015B4 80AC4254 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AC4258: -/* 015B8 80AC4258 0C2B0EA0 */ jal func_80AC3A80 -/* 015BC 80AC425C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 015C0 80AC4260 10000005 */ beq $zero, $zero, .L80AC4278 -/* 015C4 80AC4264 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AC4268: -/* 015C8 80AC4268 0C2B0DEA */ jal func_80AC37A8 -/* 015CC 80AC426C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 015D0 80AC4270 10000001 */ beq $zero, $zero, .L80AC4278 -/* 015D4 80AC4274 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AC4278: -/* 015D8 80AC4278 8FBF0014 */ lw $ra, 0x0014($sp) -/* 015DC 80AC427C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 015E0 80AC4280 03E00008 */ jr $ra -/* 015E4 80AC4284 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4288.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4288.s deleted file mode 100644 index 0408c62baa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4288.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_80AC4288 -/* 015E8 80AC4288 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 015EC 80AC428C AFB00014 */ sw $s0, 0x0014($sp) -/* 015F0 80AC4290 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015F4 80AC4294 AFBF001C */ sw $ra, 0x001C($sp) -/* 015F8 80AC4298 AFB10018 */ sw $s1, 0x0018($sp) -/* 015FC 80AC429C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01600 80AC42A0 AFA60028 */ sw $a2, 0x0028($sp) -/* 01604 80AC42A4 0C042F6F */ jal func_8010BDBC -/* 01608 80AC42A8 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 0160C 80AC42AC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01610 80AC42B0 14410036 */ bne $v0, $at, .L80AC438C -/* 01614 80AC42B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01618 80AC42B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0161C 80AC42BC 0C2B0E21 */ jal func_80AC3884 -/* 01620 80AC42C0 26260014 */ addiu $a2, $s1, 0x0014 ## $a2 = 00000014 -/* 01624 80AC42C4 54400032 */ bnel $v0, $zero, .L80AC4390 -/* 01628 80AC42C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0162C 80AC42CC 0C041AF2 */ jal func_80106BC8 -/* 01630 80AC42D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01634 80AC42D4 10400009 */ beq $v0, $zero, .L80AC42FC -/* 01638 80AC42D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0163C 80AC42DC 0C2B1088 */ jal func_80AC4220 -/* 01640 80AC42E0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01644 80AC42E4 50400006 */ beql $v0, $zero, .L80AC4300 -/* 01648 80AC42E8 8E020224 */ lw $v0, 0x0224($s0) ## 00000224 -/* 0164C 80AC42EC 0C01E221 */ jal func_80078884 -/* 01650 80AC42F0 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 -/* 01654 80AC42F4 10000026 */ beq $zero, $zero, .L80AC4390 -/* 01658 80AC42F8 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC42FC: -/* 0165C 80AC42FC 8E020224 */ lw $v0, 0x0224($s0) ## 00000224 -.L80AC4300: -/* 01660 80AC4300 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01664 80AC4304 04410011 */ bgez $v0, .L80AC434C -/* 01668 80AC4308 00000000 */ nop -/* 0166C 80AC430C 0C2B0F46 */ jal func_80AC3D18 -/* 01670 80AC4310 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01674 80AC4314 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01678 80AC4318 1041001C */ beq $v0, $at, .L80AC438C -/* 0167C 80AC431C 304300FF */ andi $v1, $v0, 0x00FF ## $v1 = 00000000 -/* 01680 80AC4320 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 01684 80AC4324 A2030252 */ sb $v1, 0x0252($s0) ## 00000252 -/* 01688 80AC4328 A60E01FC */ sh $t6, 0x01FC($s0) ## 000001FC -/* 0168C 80AC432C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01690 80AC4330 0C021BC0 */ jal Interface_SetDoAction -/* 01694 80AC4334 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 01698 80AC4338 AE000288 */ sw $zero, 0x0288($s0) ## 00000288 -/* 0169C 80AC433C 0C01E221 */ jal func_80078884 -/* 016A0 80AC4340 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 -/* 016A4 80AC4344 10000012 */ beq $zero, $zero, .L80AC4390 -/* 016A8 80AC4348 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC434C: -/* 016AC 80AC434C 1840000F */ blez $v0, .L80AC438C -/* 016B0 80AC4350 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016B4 80AC4354 0C2B0F46 */ jal func_80AC3D18 -/* 016B8 80AC4358 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 016BC 80AC435C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 016C0 80AC4360 1041000A */ beq $v0, $at, .L80AC438C -/* 016C4 80AC4364 304300FF */ andi $v1, $v0, 0x00FF ## $v1 = 00000000 -/* 016C8 80AC4368 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 016CC 80AC436C A2030252 */ sb $v1, 0x0252($s0) ## 00000252 -/* 016D0 80AC4370 A60F01FC */ sh $t7, 0x01FC($s0) ## 000001FC -/* 016D4 80AC4374 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 016D8 80AC4378 0C021BC0 */ jal Interface_SetDoAction -/* 016DC 80AC437C 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 016E0 80AC4380 AE0002C0 */ sw $zero, 0x02C0($s0) ## 000002C0 -/* 016E4 80AC4384 0C01E221 */ jal func_80078884 -/* 016E8 80AC4388 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 -.L80AC438C: -/* 016EC 80AC438C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC4390: -/* 016F0 80AC4390 8FB00014 */ lw $s0, 0x0014($sp) -/* 016F4 80AC4394 8FB10018 */ lw $s1, 0x0018($sp) -/* 016F8 80AC4398 03E00008 */ jr $ra -/* 016FC 80AC439C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43A0.s deleted file mode 100644 index 884607c9ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43A0.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AC43A0 -/* 01700 80AC43A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01704 80AC43A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01708 80AC43A8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0170C 80AC43AC AFA5001C */ sw $a1, 0x001C($sp) -/* 01710 80AC43B0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01714 80AC43B4 0C042F6F */ jal func_8010BDBC -/* 01718 80AC43B8 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 0171C 80AC43BC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01720 80AC43C0 54410008 */ bnel $v0, $at, .L80AC43E4 -/* 01724 80AC43C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01728 80AC43C8 0C041AF2 */ jal func_80106BC8 -/* 0172C 80AC43CC 8FA4001C */ lw $a0, 0x001C($sp) -/* 01730 80AC43D0 10400003 */ beq $v0, $zero, .L80AC43E0 -/* 01734 80AC43D4 8FA4001C */ lw $a0, 0x001C($sp) -/* 01738 80AC43D8 0C2B0E6B */ jal func_80AC39AC -/* 0173C 80AC43DC 8FA50018 */ lw $a1, 0x0018($sp) -.L80AC43E0: -/* 01740 80AC43E0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC43E4: -/* 01744 80AC43E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01748 80AC43E8 03E00008 */ jr $ra -/* 0174C 80AC43EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s deleted file mode 100644 index 13facbd059..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80AC43F0 -/* 01750 80AC43F0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01754 80AC43F4 AFB10018 */ sw $s1, 0x0018($sp) -/* 01758 80AC43F8 AFB00014 */ sw $s0, 0x0014($sp) -/* 0175C 80AC43FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01760 80AC4400 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01764 80AC4404 AFBF001C */ sw $ra, 0x001C($sp) -/* 01768 80AC4408 AFA60028 */ sw $a2, 0x0028($sp) -/* 0176C 80AC440C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01770 80AC4410 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 01774 80AC4414 248402D4 */ addiu $a0, $a0, 0x02D4 ## $a0 = 000002D4 -/* 01778 80AC4418 0C01E107 */ jal Math_ApproachF - -/* 0177C 80AC441C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01780 80AC4420 3C0141EC */ lui $at, 0x41EC ## $at = 41EC0000 -/* 01784 80AC4424 44812000 */ mtc1 $at, $f4 ## $f4 = 29.50 -/* 01788 80AC4428 C60002D4 */ lwc1 $f0, 0x02D4($s0) ## 000002D4 -/* 0178C 80AC442C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01790 80AC4430 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01794 80AC4434 4600203C */ c.lt.s $f4, $f0 -/* 01798 80AC4438 00000000 */ nop -/* 0179C 80AC443C 45020005 */ bc1fl .L80AC4454 -/* 017A0 80AC4440 44060000 */ mfc1 $a2, $f0 -/* 017A4 80AC4444 0C2B0CD4 */ jal func_80AC3350 -/* 017A8 80AC4448 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 -/* 017AC 80AC444C C60002D4 */ lwc1 $f0, 0x02D4($s0) ## 000002D4 -/* 017B0 80AC4450 44060000 */ mfc1 $a2, $f0 -.L80AC4454: -/* 017B4 80AC4454 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017B8 80AC4458 0C2B0CD4 */ jal func_80AC3350 -/* 017BC 80AC445C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 017C0 80AC4460 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 017C4 80AC4464 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 017C8 80AC4468 C60602D4 */ lwc1 $f6, 0x02D4($s0) ## 000002D4 -/* 017CC 80AC446C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017D0 80AC4470 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 017D4 80AC4474 4606403E */ c.le.s $f8, $f6 -/* 017D8 80AC4478 00000000 */ nop -/* 017DC 80AC447C 45020012 */ bc1fl .L80AC44C8 -/* 017E0 80AC4480 AE000224 */ sw $zero, 0x0224($s0) ## 00000224 -/* 017E4 80AC4484 0C2B0CD4 */ jal func_80AC3350 -/* 017E8 80AC4488 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 -/* 017EC 80AC448C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 017F0 80AC4490 0C2B0DD1 */ jal func_80AC3744 -/* 017F4 80AC4494 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 017F8 80AC4498 920F0252 */ lbu $t7, 0x0252($s0) ## 00000252 -/* 017FC 80AC449C 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 01800 80AC44A0 A60E01FC */ sh $t6, 0x01FC($s0) ## 000001FC -/* 01804 80AC44A4 000FC080 */ sll $t8, $t7, 2 -/* 01808 80AC44A8 0218C821 */ addu $t9, $s0, $t8 -/* 0180C 80AC44AC 8F280200 */ lw $t0, 0x0200($t9) ## 00000200 -/* 01810 80AC44B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01814 80AC44B4 0C042DC8 */ jal func_8010B720 -/* 01818 80AC44B8 9505010E */ lhu $a1, 0x010E($t0) ## 0000010E -/* 0181C 80AC44BC 10000003 */ beq $zero, $zero, .L80AC44CC -/* 01820 80AC44C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01824 80AC44C4 AE000224 */ sw $zero, 0x0224($s0) ## 00000224 -.L80AC44C8: -/* 01828 80AC44C8 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC44CC: -/* 0182C 80AC44CC 8FB00014 */ lw $s0, 0x0014($sp) -/* 01830 80AC44D0 8FB10018 */ lw $s1, 0x0018($sp) -/* 01834 80AC44D4 03E00008 */ jr $ra -/* 01838 80AC44D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s deleted file mode 100644 index f93ad8b368..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80AC44DC -/* 0183C 80AC44DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01840 80AC44E0 AFB10018 */ sw $s1, 0x0018($sp) -/* 01844 80AC44E4 AFB00014 */ sw $s0, 0x0014($sp) -/* 01848 80AC44E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0184C 80AC44EC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01850 80AC44F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01854 80AC44F4 AFA60028 */ sw $a2, 0x0028($sp) -/* 01858 80AC44F8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 0185C 80AC44FC 3C05C1F0 */ lui $a1, 0xC1F0 ## $a1 = C1F00000 -/* 01860 80AC4500 248402D4 */ addiu $a0, $a0, 0x02D4 ## $a0 = 000002D4 -/* 01864 80AC4504 0C01E107 */ jal Math_ApproachF - -/* 01868 80AC4508 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 0186C 80AC450C 3C01C1EC */ lui $at, 0xC1EC ## $at = C1EC0000 -/* 01870 80AC4510 44812000 */ mtc1 $at, $f4 ## $f4 = -29.50 -/* 01874 80AC4514 C60002D4 */ lwc1 $f0, 0x02D4($s0) ## 000002D4 -/* 01878 80AC4518 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0187C 80AC451C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01880 80AC4520 4604003C */ c.lt.s $f0, $f4 -/* 01884 80AC4524 00000000 */ nop -/* 01888 80AC4528 45020005 */ bc1fl .L80AC4540 -/* 0188C 80AC452C 44060000 */ mfc1 $a2, $f0 -/* 01890 80AC4530 0C2B0CD4 */ jal func_80AC3350 -/* 01894 80AC4534 3C06C1F0 */ lui $a2, 0xC1F0 ## $a2 = C1F00000 -/* 01898 80AC4538 C60002D4 */ lwc1 $f0, 0x02D4($s0) ## 000002D4 -/* 0189C 80AC453C 44060000 */ mfc1 $a2, $f0 -.L80AC4540: -/* 018A0 80AC4540 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018A4 80AC4544 0C2B0CD4 */ jal func_80AC3350 -/* 018A8 80AC4548 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 018AC 80AC454C 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 -/* 018B0 80AC4550 44813000 */ mtc1 $at, $f6 ## $f6 = -30.00 -/* 018B4 80AC4554 C60802D4 */ lwc1 $f8, 0x02D4($s0) ## 000002D4 -/* 018B8 80AC4558 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018BC 80AC455C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 018C0 80AC4560 4606403E */ c.le.s $f8, $f6 -/* 018C4 80AC4564 00000000 */ nop -/* 018C8 80AC4568 45020012 */ bc1fl .L80AC45B4 -/* 018CC 80AC456C AE000224 */ sw $zero, 0x0224($s0) ## 00000224 -/* 018D0 80AC4570 0C2B0CD4 */ jal func_80AC3350 -/* 018D4 80AC4574 3C06C1F0 */ lui $a2, 0xC1F0 ## $a2 = C1F00000 -/* 018D8 80AC4578 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 018DC 80AC457C 0C2B0DD1 */ jal func_80AC3744 -/* 018E0 80AC4580 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 018E4 80AC4584 920F0252 */ lbu $t7, 0x0252($s0) ## 00000252 -/* 018E8 80AC4588 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 018EC 80AC458C A60E01FC */ sh $t6, 0x01FC($s0) ## 000001FC -/* 018F0 80AC4590 000FC080 */ sll $t8, $t7, 2 -/* 018F4 80AC4594 0218C821 */ addu $t9, $s0, $t8 -/* 018F8 80AC4598 8F280200 */ lw $t0, 0x0200($t9) ## 00000200 -/* 018FC 80AC459C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01900 80AC45A0 0C042DC8 */ jal func_8010B720 -/* 01904 80AC45A4 9505010E */ lhu $a1, 0x010E($t0) ## 0000010E -/* 01908 80AC45A8 10000003 */ beq $zero, $zero, .L80AC45B8 -/* 0190C 80AC45AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01910 80AC45B0 AE000224 */ sw $zero, 0x0224($s0) ## 00000224 -.L80AC45B4: -/* 01914 80AC45B4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC45B8: -/* 01918 80AC45B8 8FB00014 */ lw $s0, 0x0014($sp) -/* 0191C 80AC45BC 8FB10018 */ lw $s1, 0x0018($sp) -/* 01920 80AC45C0 03E00008 */ jr $ra -/* 01924 80AC45C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC45C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC45C8.s deleted file mode 100644 index a7ba62b38e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC45C8.s +++ /dev/null @@ -1,160 +0,0 @@ -glabel func_80AC45C8 -/* 01928 80AC45C8 8C830228 */ lw $v1, 0x0228($a0) ## 00000228 -/* 0192C 80AC45CC 90820252 */ lbu $v0, 0x0252($a0) ## 00000252 -/* 01930 80AC45D0 04610041 */ bgez $v1, .L80AC46D8 -/* 01934 80AC45D4 00000000 */ nop -/* 01938 80AC45D8 304200FE */ andi $v0, $v0, 0x00FE ## $v0 = 00000000 -/* 0193C 80AC45DC 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 01940 80AC45E0 00027080 */ sll $t6, $v0, 2 -/* 01944 80AC45E4 008E7821 */ addu $t7, $a0, $t6 -/* 01948 80AC45E8 8DF80200 */ lw $t8, 0x0200($t7) ## 00000200 -/* 0194C 80AC45EC 28410004 */ slti $at, $v0, 0x0004 -/* 01950 80AC45F0 13000003 */ beq $t8, $zero, .L80AC4600 -/* 01954 80AC45F4 00000000 */ nop -/* 01958 80AC45F8 03E00008 */ jr $ra -/* 0195C 80AC45FC A0820252 */ sb $v0, 0x0252($a0) ## 00000252 -.L80AC4600: -/* 01960 80AC4600 1020001B */ beq $at, $zero, .L80AC4670 -/* 01964 80AC4604 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 01968 80AC4608 24450002 */ addiu $a1, $v0, 0x0002 ## $a1 = 00000002 -/* 0196C 80AC460C 30B900FF */ andi $t9, $a1, 0x00FF ## $t9 = 00000002 -/* 01970 80AC4610 2B210004 */ slti $at, $t9, 0x0004 -/* 01974 80AC4614 14200002 */ bne $at, $zero, .L80AC4620 -/* 01978 80AC4618 30A200FF */ andi $v0, $a1, 0x00FF ## $v0 = 00000002 -/* 0197C 80AC461C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AC4620: -/* 01980 80AC4620 1062006C */ beq $v1, $v0, .L80AC47D4 -/* 01984 80AC4624 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 01988 80AC4628 00024080 */ sll $t0, $v0, 2 -.L80AC462C: -/* 0198C 80AC462C 00884821 */ addu $t1, $a0, $t0 -/* 01990 80AC4630 8D2A0200 */ lw $t2, 0x0200($t1) ## 00000200 -/* 01994 80AC4634 51400004 */ beql $t2, $zero, .L80AC4648 -/* 01998 80AC4638 24A20002 */ addiu $v0, $a1, 0x0002 ## $v0 = 00000002 -/* 0199C 80AC463C 03E00008 */ jr $ra -/* 019A0 80AC4640 A0820252 */ sb $v0, 0x0252($a0) ## 00000252 -.L80AC4644: -/* 019A4 80AC4644 24A20002 */ addiu $v0, $a1, 0x0002 ## $v0 = 00000002 -.L80AC4648: -/* 019A8 80AC4648 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000002 -/* 019AC 80AC464C 28410004 */ slti $at, $v0, 0x0004 -/* 019B0 80AC4650 14200003 */ bne $at, $zero, .L80AC4660 -/* 019B4 80AC4654 00402825 */ or $a1, $v0, $zero ## $a1 = 00000002 -/* 019B8 80AC4658 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 019BC 80AC465C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L80AC4660: -/* 019C0 80AC4660 5465FFF2 */ bnel $v1, $a1, .L80AC462C -/* 019C4 80AC4664 00024080 */ sll $t0, $v0, 2 -/* 019C8 80AC4668 03E00008 */ jr $ra -/* 019CC 80AC466C 00000000 */ nop -.L80AC4670: -/* 019D0 80AC4670 24650002 */ addiu $a1, $v1, 0x0002 ## $a1 = 00000002 -/* 019D4 80AC4674 30AB00FF */ andi $t3, $a1, 0x00FF ## $t3 = 00000002 -/* 019D8 80AC4678 29610008 */ slti $at, $t3, 0x0008 -/* 019DC 80AC467C 14200002 */ bne $at, $zero, .L80AC4688 -/* 019E0 80AC4680 30A200FF */ andi $v0, $a1, 0x00FF ## $v0 = 00000002 -/* 019E4 80AC4684 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80AC4688: -/* 019E8 80AC4688 10620052 */ beq $v1, $v0, .L80AC47D4 -/* 019EC 80AC468C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000004 -/* 019F0 80AC4690 00026080 */ sll $t4, $v0, 2 -.L80AC4694: -/* 019F4 80AC4694 008C6821 */ addu $t5, $a0, $t4 -/* 019F8 80AC4698 8DAE0200 */ lw $t6, 0x0200($t5) ## 00000200 -/* 019FC 80AC469C 51C00004 */ beql $t6, $zero, .L80AC46B0 -/* 01A00 80AC46A0 24A20002 */ addiu $v0, $a1, 0x0002 ## $v0 = 00000006 -/* 01A04 80AC46A4 03E00008 */ jr $ra -/* 01A08 80AC46A8 A0820252 */ sb $v0, 0x0252($a0) ## 00000252 -.L80AC46AC: -/* 01A0C 80AC46AC 24A20002 */ addiu $v0, $a1, 0x0002 ## $v0 = 00000006 -.L80AC46B0: -/* 01A10 80AC46B0 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000006 -/* 01A14 80AC46B4 28410008 */ slti $at, $v0, 0x0008 -/* 01A18 80AC46B8 14200003 */ bne $at, $zero, .L80AC46C8 -/* 01A1C 80AC46BC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000006 -/* 01A20 80AC46C0 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 01A24 80AC46C4 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -.L80AC46C8: -/* 01A28 80AC46C8 5465FFF2 */ bnel $v1, $a1, .L80AC4694 -/* 01A2C 80AC46CC 00026080 */ sll $t4, $v0, 2 -/* 01A30 80AC46D0 03E00008 */ jr $ra -/* 01A34 80AC46D4 00000000 */ nop -.L80AC46D8: -/* 01A38 80AC46D8 1860003E */ blez $v1, .L80AC47D4 -/* 01A3C 80AC46DC 34420001 */ ori $v0, $v0, 0x0001 ## $v0 = 00000005 -/* 01A40 80AC46E0 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000005 -/* 01A44 80AC46E4 00027880 */ sll $t7, $v0, 2 -/* 01A48 80AC46E8 008FC021 */ addu $t8, $a0, $t7 -/* 01A4C 80AC46EC 8F190200 */ lw $t9, 0x0200($t8) ## 00000200 -/* 01A50 80AC46F0 28410004 */ slti $at, $v0, 0x0004 -/* 01A54 80AC46F4 13200003 */ beq $t9, $zero, .L80AC4704 -/* 01A58 80AC46F8 00000000 */ nop -/* 01A5C 80AC46FC 03E00008 */ jr $ra -/* 01A60 80AC4700 A0820252 */ sb $v0, 0x0252($a0) ## 00000252 -.L80AC4704: -/* 01A64 80AC4704 1020001B */ beq $at, $zero, .L80AC4774 -/* 01A68 80AC4708 00401825 */ or $v1, $v0, $zero ## $v1 = 00000005 -/* 01A6C 80AC470C 24450002 */ addiu $a1, $v0, 0x0002 ## $a1 = 00000007 -/* 01A70 80AC4710 30A800FF */ andi $t0, $a1, 0x00FF ## $t0 = 00000007 -/* 01A74 80AC4714 29010004 */ slti $at, $t0, 0x0004 -/* 01A78 80AC4718 14200002 */ bne $at, $zero, .L80AC4724 -/* 01A7C 80AC471C 30A200FF */ andi $v0, $a1, 0x00FF ## $v0 = 00000007 -/* 01A80 80AC4720 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AC4724: -/* 01A84 80AC4724 1062002B */ beq $v1, $v0, .L80AC47D4 -/* 01A88 80AC4728 00402825 */ or $a1, $v0, $zero ## $a1 = 00000001 -/* 01A8C 80AC472C 00024880 */ sll $t1, $v0, 2 -.L80AC4730: -/* 01A90 80AC4730 00895021 */ addu $t2, $a0, $t1 -/* 01A94 80AC4734 8D4B0200 */ lw $t3, 0x0200($t2) ## 00000200 -/* 01A98 80AC4738 51600004 */ beql $t3, $zero, .L80AC474C -/* 01A9C 80AC473C 24A20002 */ addiu $v0, $a1, 0x0002 ## $v0 = 00000003 -/* 01AA0 80AC4740 03E00008 */ jr $ra -/* 01AA4 80AC4744 A0820252 */ sb $v0, 0x0252($a0) ## 00000252 -.L80AC4748: -/* 01AA8 80AC4748 24A20002 */ addiu $v0, $a1, 0x0002 ## $v0 = 00000003 -.L80AC474C: -/* 01AAC 80AC474C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000003 -/* 01AB0 80AC4750 28410004 */ slti $at, $v0, 0x0004 -/* 01AB4 80AC4754 14200003 */ bne $at, $zero, .L80AC4764 -/* 01AB8 80AC4758 00402825 */ or $a1, $v0, $zero ## $a1 = 00000003 -/* 01ABC 80AC475C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01AC0 80AC4760 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -.L80AC4764: -/* 01AC4 80AC4764 5465FFF2 */ bnel $v1, $a1, .L80AC4730 -/* 01AC8 80AC4768 00024880 */ sll $t1, $v0, 2 -/* 01ACC 80AC476C 03E00008 */ jr $ra -/* 01AD0 80AC4770 00000000 */ nop -.L80AC4774: -/* 01AD4 80AC4774 24650002 */ addiu $a1, $v1, 0x0002 ## $a1 = 00000007 -/* 01AD8 80AC4778 30AC00FF */ andi $t4, $a1, 0x00FF ## $t4 = 00000007 -/* 01ADC 80AC477C 29810008 */ slti $at, $t4, 0x0008 -/* 01AE0 80AC4780 14200002 */ bne $at, $zero, .L80AC478C -/* 01AE4 80AC4784 30A200FF */ andi $v0, $a1, 0x00FF ## $v0 = 00000007 -/* 01AE8 80AC4788 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80AC478C: -/* 01AEC 80AC478C 10620011 */ beq $v1, $v0, .L80AC47D4 -/* 01AF0 80AC4790 00402825 */ or $a1, $v0, $zero ## $a1 = 00000005 -/* 01AF4 80AC4794 00026880 */ sll $t5, $v0, 2 -.L80AC4798: -/* 01AF8 80AC4798 008D7021 */ addu $t6, $a0, $t5 -/* 01AFC 80AC479C 8DCF0200 */ lw $t7, 0x0200($t6) ## 00000200 -/* 01B00 80AC47A0 51E00004 */ beql $t7, $zero, .L80AC47B4 -/* 01B04 80AC47A4 24A20002 */ addiu $v0, $a1, 0x0002 ## $v0 = 00000007 -/* 01B08 80AC47A8 03E00008 */ jr $ra -/* 01B0C 80AC47AC A0820252 */ sb $v0, 0x0252($a0) ## 00000252 -.L80AC47B0: -/* 01B10 80AC47B0 24A20002 */ addiu $v0, $a1, 0x0002 ## $v0 = 00000007 -.L80AC47B4: -/* 01B14 80AC47B4 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000007 -/* 01B18 80AC47B8 28410008 */ slti $at, $v0, 0x0008 -/* 01B1C 80AC47BC 14200003 */ bne $at, $zero, .L80AC47CC -/* 01B20 80AC47C0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000007 -/* 01B24 80AC47C4 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -/* 01B28 80AC47C8 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -.L80AC47CC: -/* 01B2C 80AC47CC 5465FFF2 */ bnel $v1, $a1, .L80AC4798 -/* 01B30 80AC47D0 00026880 */ sll $t5, $v0, 2 -.L80AC47D4: -/* 01B34 80AC47D4 03E00008 */ jr $ra -/* 01B38 80AC47D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC47DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC47DC.s deleted file mode 100644 index 434b18c1c4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC47DC.s +++ /dev/null @@ -1,164 +0,0 @@ -.late_rodata -.late_rodata_alignment 8 -glabel jtbl_80AC9518 -.word L80AC4918 -.word L80AC4934 -.word L80AC4934 -.word L80AC4918 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC48C4 -.word L80AC48E0 -.word L80AC48FC -.word L80AC48FC -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC48A8 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4934 -.word L80AC4918 -.word L80AC4918 -.word L80AC4918 - -.text -glabel func_80AC47DC -/* 01B3C 80AC47DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01B40 80AC47E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01B44 80AC47E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01B48 80AC47E8 AFA40028 */ sw $a0, 0x0028($sp) -/* 01B4C 80AC47EC 90AE0252 */ lbu $t6, 0x0252($a1) ## 00000252 -/* 01B50 80AC47F0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01B54 80AC47F4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01B58 80AC47F8 000E7880 */ sll $t7, $t6, 2 -/* 01B5C 80AC47FC 00AFC021 */ addu $t8, $a1, $t7 -/* 01B60 80AC4800 8F190200 */ lw $t9, 0x0200($t8) ## 00000200 -/* 01B64 80AC4804 8FA50028 */ lw $a1, 0x0028($sp) -/* 01B68 80AC4808 0C2B0E21 */ jal func_80AC3884 -/* 01B6C 80AC480C AFB90024 */ sw $t9, 0x0024($sp) -/* 01B70 80AC4810 10400003 */ beq $v0, $zero, .L80AC4820 -/* 01B74 80AC4814 00000000 */ nop -/* 01B78 80AC4818 10000052 */ beq $zero, $zero, .L80AC4964 -/* 01B7C 80AC481C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AC4820: -/* 01B80 80AC4820 0C041AF2 */ jal func_80106BC8 -/* 01B84 80AC4824 8FA40028 */ lw $a0, 0x0028($sp) -/* 01B88 80AC4828 5040004E */ beql $v0, $zero, .L80AC4964 -/* 01B8C 80AC482C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01B90 80AC4830 8FA20024 */ lw $v0, 0x0024($sp) -/* 01B94 80AC4834 24010026 */ addiu $at, $zero, 0x0026 ## $at = 00000026 -/* 01B98 80AC4838 8448001C */ lh $t0, 0x001C($v0) ## 0000001C -/* 01B9C 80AC483C 11010044 */ beq $t0, $at, .L80AC4950 -/* 01BA0 80AC4840 00000000 */ nop -/* 01BA4 80AC4844 844901A8 */ lh $t1, 0x01A8($v0) ## 000001A8 -/* 01BA8 80AC4848 15200041 */ bne $t1, $zero, .L80AC4950 -/* 01BAC 80AC484C 00000000 */ nop -/* 01BB0 80AC4850 920B0252 */ lbu $t3, 0x0252($s0) ## 00000252 -/* 01BB4 80AC4854 860A01FC */ lh $t2, 0x01FC($s0) ## 000001FC -/* 01BB8 80AC4858 000B6080 */ sll $t4, $t3, 2 -/* 01BBC 80AC485C 020C6821 */ addu $t5, $s0, $t4 -/* 01BC0 80AC4860 A60A01FE */ sh $t2, 0x01FE($s0) ## 000001FE -/* 01BC4 80AC4864 8DAE0200 */ lw $t6, 0x0200($t5) ## 00000200 -/* 01BC8 80AC4868 8FA40028 */ lw $a0, 0x0028($sp) -/* 01BCC 80AC486C 0C042DC8 */ jal func_8010B720 -/* 01BD0 80AC4870 95C501A0 */ lhu $a1, 0x01A0($t6) ## 000001A0 -/* 01BD4 80AC4874 AE000288 */ sw $zero, 0x0288($s0) ## 00000288 -/* 01BD8 80AC4878 AE0002C0 */ sw $zero, 0x02C0($s0) ## 000002C0 -/* 01BDC 80AC487C 8FAF0024 */ lw $t7, 0x0024($sp) -/* 01BE0 80AC4880 85F8001C */ lh $t8, 0x001C($t7) ## 0000001C -/* 01BE4 80AC4884 2719FFFD */ addiu $t9, $t8, 0xFFFD ## $t9 = FFFFFFFD -/* 01BE8 80AC4888 2F21002D */ sltiu $at, $t9, 0x002D -/* 01BEC 80AC488C 10200029 */ beq $at, $zero, .L80AC4934 -/* 01BF0 80AC4890 0019C880 */ sll $t9, $t9, 2 -/* 01BF4 80AC4894 3C0180AD */ lui $at, %hi(jtbl_80AC9518) ## $at = 80AD0000 -/* 01BF8 80AC4898 00390821 */ addu $at, $at, $t9 -/* 01BFC 80AC489C 8C399518 */ lw $t9, %lo(jtbl_80AC9518)($at) -/* 01C00 80AC48A0 03200008 */ jr $t9 -/* 01C04 80AC48A4 00000000 */ nop -glabel L80AC48A8 -/* 01C08 80AC48A8 0C01E221 */ jal func_80078884 -/* 01C0C 80AC48AC 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 -/* 01C10 80AC48B0 24080018 */ addiu $t0, $zero, 0x0018 ## $t0 = 00000018 -/* 01C14 80AC48B4 A2000251 */ sb $zero, 0x0251($s0) ## 00000251 -/* 01C18 80AC48B8 A60801FC */ sh $t0, 0x01FC($s0) ## 000001FC -/* 01C1C 80AC48BC 10000029 */ beq $zero, $zero, .L80AC4964 -/* 01C20 80AC48C0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -glabel L80AC48C4 -/* 01C24 80AC48C4 0C01E221 */ jal func_80078884 -/* 01C28 80AC48C8 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 -/* 01C2C 80AC48CC 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 01C30 80AC48D0 A2000251 */ sb $zero, 0x0251($s0) ## 00000251 -/* 01C34 80AC48D4 A60901FC */ sh $t1, 0x01FC($s0) ## 000001FC -/* 01C38 80AC48D8 10000022 */ beq $zero, $zero, .L80AC4964 -/* 01C3C 80AC48DC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -glabel L80AC48E0 -/* 01C40 80AC48E0 0C01E221 */ jal func_80078884 -/* 01C44 80AC48E4 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 -/* 01C48 80AC48E8 240A000B */ addiu $t2, $zero, 0x000B ## $t2 = 0000000B -/* 01C4C 80AC48EC A2000251 */ sb $zero, 0x0251($s0) ## 00000251 -/* 01C50 80AC48F0 A60A01FC */ sh $t2, 0x01FC($s0) ## 000001FC -/* 01C54 80AC48F4 1000001B */ beq $zero, $zero, .L80AC4964 -/* 01C58 80AC48F8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -glabel L80AC48FC -/* 01C5C 80AC48FC 0C01E221 */ jal func_80078884 -/* 01C60 80AC4900 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 01C64 80AC4904 240B000C */ addiu $t3, $zero, 0x000C ## $t3 = 0000000C -/* 01C68 80AC4908 A2000251 */ sb $zero, 0x0251($s0) ## 00000251 -/* 01C6C 80AC490C A60B01FC */ sh $t3, 0x01FC($s0) ## 000001FC -/* 01C70 80AC4910 10000014 */ beq $zero, $zero, .L80AC4964 -/* 01C74 80AC4914 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -glabel L80AC4918 -/* 01C78 80AC4918 0C01E221 */ jal func_80078884 -/* 01C7C 80AC491C 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 -/* 01C80 80AC4920 240C000D */ addiu $t4, $zero, 0x000D ## $t4 = 0000000D -/* 01C84 80AC4924 A2000251 */ sb $zero, 0x0251($s0) ## 00000251 -/* 01C88 80AC4928 A60C01FC */ sh $t4, 0x01FC($s0) ## 000001FC -/* 01C8C 80AC492C 1000000D */ beq $zero, $zero, .L80AC4964 -/* 01C90 80AC4930 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -glabel L80AC4934 -.L80AC4934: -/* 01C94 80AC4934 0C01E221 */ jal func_80078884 -/* 01C98 80AC4938 24044808 */ addiu $a0, $zero, 0x4808 ## $a0 = 00004808 -/* 01C9C 80AC493C 240D0009 */ addiu $t5, $zero, 0x0009 ## $t5 = 00000009 -/* 01CA0 80AC4940 A2000251 */ sb $zero, 0x0251($s0) ## 00000251 -/* 01CA4 80AC4944 A60D01FC */ sh $t5, 0x01FC($s0) ## 000001FC -/* 01CA8 80AC4948 10000006 */ beq $zero, $zero, .L80AC4964 -/* 01CAC 80AC494C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AC4950: -/* 01CB0 80AC4950 0C01E221 */ jal func_80078884 -/* 01CB4 80AC4954 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 01CB8 80AC4958 10000002 */ beq $zero, $zero, .L80AC4964 -/* 01CBC 80AC495C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01CC0 80AC4960 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AC4964: -/* 01CC4 80AC4964 8FBF001C */ lw $ra, 0x001C($sp) -/* 01CC8 80AC4968 8FB00018 */ lw $s0, 0x0018($sp) -/* 01CCC 80AC496C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01CD0 80AC4970 03E00008 */ jr $ra -/* 01CD4 80AC4974 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4978.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4978.s deleted file mode 100644 index 385b24d311..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4978.s +++ /dev/null @@ -1,139 +0,0 @@ -.rdata -glabel D_80AC90E8 - .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" - .balign 4 - -glabel D_80AC9108 - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC4978 -/* 01CD8 80AC4978 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01CDC 80AC497C AFBF001C */ sw $ra, 0x001C($sp) -/* 01CE0 80AC4980 AFB00018 */ sw $s0, 0x0018($sp) -/* 01CE4 80AC4984 AFA50034 */ sw $a1, 0x0034($sp) -/* 01CE8 80AC4988 AFA60038 */ sw $a2, 0x0038($sp) -/* 01CEC 80AC498C 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -/* 01CF0 80AC4990 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01CF4 80AC4994 0C2B194B */ jal func_80AC652C -/* 01CF8 80AC4998 A3AE0027 */ sb $t6, 0x0027($sp) -/* 01CFC 80AC499C 14400009 */ bne $v0, $zero, .L80AC49C4 -/* 01D00 80AC49A0 3C0480AD */ lui $a0, %hi(D_80AC90E8) ## $a0 = 80AD0000 -/* 01D04 80AC49A4 3C0580AD */ lui $a1, %hi(D_80AC9108) ## $a1 = 80AD0000 -/* 01D08 80AC49A8 24A59108 */ addiu $a1, $a1, %lo(D_80AC9108) ## $a1 = 80AC9108 -/* 01D0C 80AC49AC 248490E8 */ addiu $a0, $a0, %lo(D_80AC90E8) ## $a0 = 80AC90E8 -/* 01D10 80AC49B0 0C00084C */ jal osSyncPrintf - -/* 01D14 80AC49B4 24060868 */ addiu $a2, $zero, 0x0868 ## $a2 = 00000868 -/* 01D18 80AC49B8 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 01D1C 80AC49BC 1000005E */ beq $zero, $zero, .L80AC4B38 -/* 01D20 80AC49C0 A60F01E6 */ sh $t7, 0x01E6($s0) ## 000001E6 -.L80AC49C4: -/* 01D24 80AC49C4 860201E6 */ lh $v0, 0x01E6($s0) ## 000001E6 -/* 01D28 80AC49C8 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01D2C 80AC49CC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01D30 80AC49D0 10400004 */ beq $v0, $zero, .L80AC49E4 -/* 01D34 80AC49D4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01D38 80AC49D8 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 01D3C 80AC49DC 10000056 */ beq $zero, $zero, .L80AC4B38 -/* 01D40 80AC49E0 A61801E6 */ sh $t8, 0x01E6($s0) ## 000001E6 -.L80AC49E4: -/* 01D44 80AC49E4 A2190251 */ sb $t9, 0x0251($s0) ## 00000251 -/* 01D48 80AC49E8 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 01D4C 80AC49EC 0C2B0DD1 */ jal func_80AC3744 -/* 01D50 80AC49F0 8FA40034 */ lw $a0, 0x0034($sp) -/* 01D54 80AC49F4 8FA40034 */ lw $a0, 0x0034($sp) -/* 01D58 80AC49F8 0C042F6F */ jal func_8010BDBC -/* 01D5C 80AC49FC 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01D60 80AC4A00 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01D64 80AC4A04 1441004C */ bne $v0, $at, .L80AC4B38 -/* 01D68 80AC4A08 8FA40034 */ lw $a0, 0x0034($sp) -/* 01D6C 80AC4A0C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01D70 80AC4A10 0C2B11F7 */ jal func_80AC47DC -/* 01D74 80AC4A14 24860014 */ addiu $a2, $a0, 0x0014 ## $a2 = 00000014 -/* 01D78 80AC4A18 54400048 */ bnel $v0, $zero, .L80AC4B3C -/* 01D7C 80AC4A1C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D80 80AC4A20 9209022C */ lbu $t1, 0x022C($s0) ## 0000022C -/* 01D84 80AC4A24 5120001C */ beql $t1, $zero, .L80AC4A98 -/* 01D88 80AC4A28 8E020224 */ lw $v0, 0x0224($s0) ## 00000224 -/* 01D8C 80AC4A2C 8E020224 */ lw $v0, 0x0224($s0) ## 00000224 -/* 01D90 80AC4A30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D94 80AC4A34 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01D98 80AC4A38 1840000C */ blez $v0, .L80AC4A6C -/* 01D9C 80AC4A3C 00000000 */ nop -/* 01DA0 80AC4A40 0C2B0F94 */ jal func_80AC3E50 -/* 01DA4 80AC4A44 92050252 */ lbu $a1, 0x0252($s0) ## 00000252 -/* 01DA8 80AC4A48 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01DAC 80AC4A4C 10410003 */ beq $v0, $at, .L80AC4A5C -/* 01DB0 80AC4A50 8FA40034 */ lw $a0, 0x0034($sp) -/* 01DB4 80AC4A54 1000002B */ beq $zero, $zero, .L80AC4B04 -/* 01DB8 80AC4A58 A2020252 */ sb $v0, 0x0252($s0) ## 00000252 -.L80AC4A5C: -/* 01DBC 80AC4A5C 0C2B0EB8 */ jal func_80AC3AE0 -/* 01DC0 80AC4A60 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01DC4 80AC4A64 10000035 */ beq $zero, $zero, .L80AC4B3C -/* 01DC8 80AC4A68 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC4A6C: -/* 01DCC 80AC4A6C 04410025 */ bgez $v0, .L80AC4B04 -/* 01DD0 80AC4A70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DD4 80AC4A74 92050252 */ lbu $a1, 0x0252($s0) ## 00000252 -/* 01DD8 80AC4A78 0C2B0FB6 */ jal func_80AC3ED8 -/* 01DDC 80AC4A7C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 01DE0 80AC4A80 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01DE4 80AC4A84 1041001F */ beq $v0, $at, .L80AC4B04 -/* 01DE8 80AC4A88 00000000 */ nop -/* 01DEC 80AC4A8C 1000001D */ beq $zero, $zero, .L80AC4B04 -/* 01DF0 80AC4A90 A2020252 */ sb $v0, 0x0252($s0) ## 00000252 -/* 01DF4 80AC4A94 8E020224 */ lw $v0, 0x0224($s0) ## 00000224 -.L80AC4A98: -/* 01DF8 80AC4A98 1840000F */ blez $v0, .L80AC4AD8 -/* 01DFC 80AC4A9C 284101F5 */ slti $at, $v0, 0x01F5 -/* 01E00 80AC4AA0 1420000D */ bne $at, $zero, .L80AC4AD8 -/* 01E04 80AC4AA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E08 80AC4AA8 92050252 */ lbu $a1, 0x0252($s0) ## 00000252 -/* 01E0C 80AC4AAC 0C2B0F94 */ jal func_80AC3E50 -/* 01E10 80AC4AB0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01E14 80AC4AB4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01E18 80AC4AB8 10410003 */ beq $v0, $at, .L80AC4AC8 -/* 01E1C 80AC4ABC 8FA40034 */ lw $a0, 0x0034($sp) -/* 01E20 80AC4AC0 10000010 */ beq $zero, $zero, .L80AC4B04 -/* 01E24 80AC4AC4 A2020252 */ sb $v0, 0x0252($s0) ## 00000252 -.L80AC4AC8: -/* 01E28 80AC4AC8 0C2B0EB8 */ jal func_80AC3AE0 -/* 01E2C 80AC4ACC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01E30 80AC4AD0 1000001A */ beq $zero, $zero, .L80AC4B3C -/* 01E34 80AC4AD4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC4AD8: -/* 01E38 80AC4AD8 0441000A */ bgez $v0, .L80AC4B04 -/* 01E3C 80AC4ADC 2841FE0C */ slti $at, $v0, 0xFE0C -/* 01E40 80AC4AE0 10200008 */ beq $at, $zero, .L80AC4B04 -/* 01E44 80AC4AE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E48 80AC4AE8 92050252 */ lbu $a1, 0x0252($s0) ## 00000252 -/* 01E4C 80AC4AEC 0C2B0FB6 */ jal func_80AC3ED8 -/* 01E50 80AC4AF0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 01E54 80AC4AF4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01E58 80AC4AF8 10410002 */ beq $v0, $at, .L80AC4B04 -/* 01E5C 80AC4AFC 00000000 */ nop -/* 01E60 80AC4B00 A2020252 */ sb $v0, 0x0252($s0) ## 00000252 -.L80AC4B04: -/* 01E64 80AC4B04 0C2B1172 */ jal func_80AC45C8 -/* 01E68 80AC4B08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E6C 80AC4B0C 92020252 */ lbu $v0, 0x0252($s0) ## 00000252 -/* 01E70 80AC4B10 93AA0027 */ lbu $t2, 0x0027($sp) -/* 01E74 80AC4B14 00025880 */ sll $t3, $v0, 2 -/* 01E78 80AC4B18 11420007 */ beq $t2, $v0, .L80AC4B38 -/* 01E7C 80AC4B1C 020B6021 */ addu $t4, $s0, $t3 -/* 01E80 80AC4B20 8D8D0200 */ lw $t5, 0x0200($t4) ## 00000200 -/* 01E84 80AC4B24 8FA40034 */ lw $a0, 0x0034($sp) -/* 01E88 80AC4B28 0C042DC8 */ jal func_8010B720 -/* 01E8C 80AC4B2C 95A5010E */ lhu $a1, 0x010E($t5) ## 0000010E -/* 01E90 80AC4B30 0C01E221 */ jal func_80078884 -/* 01E94 80AC4B34 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 -.L80AC4B38: -/* 01E98 80AC4B38 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC4B3C: -/* 01E9C 80AC4B3C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01EA0 80AC4B40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01EA4 80AC4B44 03E00008 */ jr $ra -/* 01EA8 80AC4B48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4B4C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4B4C.s deleted file mode 100644 index d77b381336..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4B4C.s +++ /dev/null @@ -1,139 +0,0 @@ -.rdata -glabel D_80AC9118 - .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" - .balign 4 - -glabel D_80AC9138 - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC4B4C -/* 01EAC 80AC4B4C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01EB0 80AC4B50 AFBF001C */ sw $ra, 0x001C($sp) -/* 01EB4 80AC4B54 AFB00018 */ sw $s0, 0x0018($sp) -/* 01EB8 80AC4B58 AFA50034 */ sw $a1, 0x0034($sp) -/* 01EBC 80AC4B5C AFA60038 */ sw $a2, 0x0038($sp) -/* 01EC0 80AC4B60 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -/* 01EC4 80AC4B64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01EC8 80AC4B68 0C2B194B */ jal func_80AC652C -/* 01ECC 80AC4B6C A3AE0027 */ sb $t6, 0x0027($sp) -/* 01ED0 80AC4B70 14400009 */ bne $v0, $zero, .L80AC4B98 -/* 01ED4 80AC4B74 3C0480AD */ lui $a0, %hi(D_80AC9118) ## $a0 = 80AD0000 -/* 01ED8 80AC4B78 3C0580AD */ lui $a1, %hi(D_80AC9138) ## $a1 = 80AD0000 -/* 01EDC 80AC4B7C 24A59138 */ addiu $a1, $a1, %lo(D_80AC9138) ## $a1 = 80AC9138 -/* 01EE0 80AC4B80 24849118 */ addiu $a0, $a0, %lo(D_80AC9118) ## $a0 = 80AC9118 -/* 01EE4 80AC4B84 0C00084C */ jal osSyncPrintf - -/* 01EE8 80AC4B88 240608C4 */ addiu $a2, $zero, 0x08C4 ## $a2 = 000008C4 -/* 01EEC 80AC4B8C 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 01EF0 80AC4B90 1000005E */ beq $zero, $zero, .L80AC4D0C -/* 01EF4 80AC4B94 A60F01E6 */ sh $t7, 0x01E6($s0) ## 000001E6 -.L80AC4B98: -/* 01EF8 80AC4B98 860201E6 */ lh $v0, 0x01E6($s0) ## 000001E6 -/* 01EFC 80AC4B9C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01F00 80AC4BA0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01F04 80AC4BA4 10400004 */ beq $v0, $zero, .L80AC4BB8 -/* 01F08 80AC4BA8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01F0C 80AC4BAC 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 01F10 80AC4BB0 10000056 */ beq $zero, $zero, .L80AC4D0C -/* 01F14 80AC4BB4 A61801E6 */ sh $t8, 0x01E6($s0) ## 000001E6 -.L80AC4BB8: -/* 01F18 80AC4BB8 A2190251 */ sb $t9, 0x0251($s0) ## 00000251 -/* 01F1C 80AC4BBC AE080288 */ sw $t0, 0x0288($s0) ## 00000288 -/* 01F20 80AC4BC0 0C2B0DD1 */ jal func_80AC3744 -/* 01F24 80AC4BC4 8FA40034 */ lw $a0, 0x0034($sp) -/* 01F28 80AC4BC8 8FA40034 */ lw $a0, 0x0034($sp) -/* 01F2C 80AC4BCC 0C042F6F */ jal func_8010BDBC -/* 01F30 80AC4BD0 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01F34 80AC4BD4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01F38 80AC4BD8 1441004C */ bne $v0, $at, .L80AC4D0C -/* 01F3C 80AC4BDC 8FA40034 */ lw $a0, 0x0034($sp) -/* 01F40 80AC4BE0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01F44 80AC4BE4 0C2B11F7 */ jal func_80AC47DC -/* 01F48 80AC4BE8 24860014 */ addiu $a2, $a0, 0x0014 ## $a2 = 00000014 -/* 01F4C 80AC4BEC 54400048 */ bnel $v0, $zero, .L80AC4D10 -/* 01F50 80AC4BF0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01F54 80AC4BF4 9209022C */ lbu $t1, 0x022C($s0) ## 0000022C -/* 01F58 80AC4BF8 5120001C */ beql $t1, $zero, .L80AC4C6C -/* 01F5C 80AC4BFC 8E020224 */ lw $v0, 0x0224($s0) ## 00000224 -/* 01F60 80AC4C00 8E020224 */ lw $v0, 0x0224($s0) ## 00000224 -/* 01F64 80AC4C04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F68 80AC4C08 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01F6C 80AC4C0C 0441000C */ bgez $v0, .L80AC4C40 -/* 01F70 80AC4C10 00000000 */ nop -/* 01F74 80AC4C14 0C2B0F94 */ jal func_80AC3E50 -/* 01F78 80AC4C18 92050252 */ lbu $a1, 0x0252($s0) ## 00000252 -/* 01F7C 80AC4C1C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01F80 80AC4C20 10410003 */ beq $v0, $at, .L80AC4C30 -/* 01F84 80AC4C24 8FA40034 */ lw $a0, 0x0034($sp) -/* 01F88 80AC4C28 1000002B */ beq $zero, $zero, .L80AC4CD8 -/* 01F8C 80AC4C2C A2020252 */ sb $v0, 0x0252($s0) ## 00000252 -.L80AC4C30: -/* 01F90 80AC4C30 0C2B0EB8 */ jal func_80AC3AE0 -/* 01F94 80AC4C34 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01F98 80AC4C38 10000035 */ beq $zero, $zero, .L80AC4D10 -/* 01F9C 80AC4C3C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC4C40: -/* 01FA0 80AC4C40 18400025 */ blez $v0, .L80AC4CD8 -/* 01FA4 80AC4C44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FA8 80AC4C48 92050252 */ lbu $a1, 0x0252($s0) ## 00000252 -/* 01FAC 80AC4C4C 0C2B0FB6 */ jal func_80AC3ED8 -/* 01FB0 80AC4C50 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01FB4 80AC4C54 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01FB8 80AC4C58 1041001F */ beq $v0, $at, .L80AC4CD8 -/* 01FBC 80AC4C5C 00000000 */ nop -/* 01FC0 80AC4C60 1000001D */ beq $zero, $zero, .L80AC4CD8 -/* 01FC4 80AC4C64 A2020252 */ sb $v0, 0x0252($s0) ## 00000252 -/* 01FC8 80AC4C68 8E020224 */ lw $v0, 0x0224($s0) ## 00000224 -.L80AC4C6C: -/* 01FCC 80AC4C6C 0441000F */ bgez $v0, .L80AC4CAC -/* 01FD0 80AC4C70 2841FE0C */ slti $at, $v0, 0xFE0C -/* 01FD4 80AC4C74 1020000D */ beq $at, $zero, .L80AC4CAC -/* 01FD8 80AC4C78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FDC 80AC4C7C 92050252 */ lbu $a1, 0x0252($s0) ## 00000252 -/* 01FE0 80AC4C80 0C2B0F94 */ jal func_80AC3E50 -/* 01FE4 80AC4C84 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01FE8 80AC4C88 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01FEC 80AC4C8C 10410003 */ beq $v0, $at, .L80AC4C9C -/* 01FF0 80AC4C90 8FA40034 */ lw $a0, 0x0034($sp) -/* 01FF4 80AC4C94 10000010 */ beq $zero, $zero, .L80AC4CD8 -/* 01FF8 80AC4C98 A2020252 */ sb $v0, 0x0252($s0) ## 00000252 -.L80AC4C9C: -/* 01FFC 80AC4C9C 0C2B0EB8 */ jal func_80AC3AE0 -/* 02000 80AC4CA0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02004 80AC4CA4 1000001A */ beq $zero, $zero, .L80AC4D10 -/* 02008 80AC4CA8 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC4CAC: -/* 0200C 80AC4CAC 1840000A */ blez $v0, .L80AC4CD8 -/* 02010 80AC4CB0 284101F5 */ slti $at, $v0, 0x01F5 -/* 02014 80AC4CB4 14200008 */ bne $at, $zero, .L80AC4CD8 -/* 02018 80AC4CB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0201C 80AC4CBC 92050252 */ lbu $a1, 0x0252($s0) ## 00000252 -/* 02020 80AC4CC0 0C2B0FB6 */ jal func_80AC3ED8 -/* 02024 80AC4CC4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 02028 80AC4CC8 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0202C 80AC4CCC 10410002 */ beq $v0, $at, .L80AC4CD8 -/* 02030 80AC4CD0 00000000 */ nop -/* 02034 80AC4CD4 A2020252 */ sb $v0, 0x0252($s0) ## 00000252 -.L80AC4CD8: -/* 02038 80AC4CD8 0C2B1172 */ jal func_80AC45C8 -/* 0203C 80AC4CDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02040 80AC4CE0 92020252 */ lbu $v0, 0x0252($s0) ## 00000252 -/* 02044 80AC4CE4 93AA0027 */ lbu $t2, 0x0027($sp) -/* 02048 80AC4CE8 00025880 */ sll $t3, $v0, 2 -/* 0204C 80AC4CEC 11420007 */ beq $t2, $v0, .L80AC4D0C -/* 02050 80AC4CF0 020B6021 */ addu $t4, $s0, $t3 -/* 02054 80AC4CF4 8D8D0200 */ lw $t5, 0x0200($t4) ## 00000200 -/* 02058 80AC4CF8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0205C 80AC4CFC 0C042DC8 */ jal func_8010B720 -/* 02060 80AC4D00 95A5010E */ lhu $a1, 0x010E($t5) ## 0000010E -/* 02064 80AC4D04 0C01E221 */ jal func_80078884 -/* 02068 80AC4D08 24044809 */ addiu $a0, $zero, 0x4809 ## $a0 = 00004809 -.L80AC4D0C: -/* 0206C 80AC4D0C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC4D10: -/* 02070 80AC4D10 8FB00018 */ lw $s0, 0x0018($sp) -/* 02074 80AC4D14 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02078 80AC4D18 03E00008 */ jr $ra -/* 0207C 80AC4D1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s deleted file mode 100644 index 17b21da54b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80AC4D20 -/* 02080 80AC4D20 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02084 80AC4D24 AFB00018 */ sw $s0, 0x0018($sp) -/* 02088 80AC4D28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0208C 80AC4D2C AFBF001C */ sw $ra, 0x001C($sp) -/* 02090 80AC4D30 AFA50024 */ sw $a1, 0x0024($sp) -/* 02094 80AC4D34 AFA60028 */ sw $a2, 0x0028($sp) -/* 02098 80AC4D38 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 0209C 80AC4D3C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 020A0 80AC4D40 248402D4 */ addiu $a0, $a0, 0x02D4 ## $a0 = 000002D4 -/* 020A4 80AC4D44 0C01E107 */ jal Math_ApproachF - -/* 020A8 80AC4D48 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 020AC 80AC4D4C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 020B0 80AC4D50 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 020B4 80AC4D54 C60002D4 */ lwc1 $f0, 0x02D4($s0) ## 000002D4 -/* 020B8 80AC4D58 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 020BC 80AC4D5C 4604003C */ c.lt.s $f0, $f4 -/* 020C0 80AC4D60 00000000 */ nop -/* 020C4 80AC4D64 4502000C */ bc1fl .L80AC4D98 -/* 020C8 80AC4D68 44060000 */ mfc1 $a2, $f0 -/* 020CC 80AC4D6C 44813000 */ mtc1 $at, $f6 ## $f6 = -0.50 -/* 020D0 80AC4D70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020D4 80AC4D74 8FA50024 */ lw $a1, 0x0024($sp) -/* 020D8 80AC4D78 4600303C */ c.lt.s $f6, $f0 -/* 020DC 80AC4D7C 00000000 */ nop -/* 020E0 80AC4D80 45020005 */ bc1fl .L80AC4D98 -/* 020E4 80AC4D84 44060000 */ mfc1 $a2, $f0 -/* 020E8 80AC4D88 0C2B0CD4 */ jal func_80AC3350 -/* 020EC 80AC4D8C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 020F0 80AC4D90 C60002D4 */ lwc1 $f0, 0x02D4($s0) ## 000002D4 -/* 020F4 80AC4D94 44060000 */ mfc1 $a2, $f0 -.L80AC4D98: -/* 020F8 80AC4D98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020FC 80AC4D9C 0C2B0CD4 */ jal func_80AC3350 -/* 02100 80AC4DA0 8FA50024 */ lw $a1, 0x0024($sp) -/* 02104 80AC4DA4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 02108 80AC4DA8 C60A02D4 */ lwc1 $f10, 0x02D4($s0) ## 000002D4 -/* 0210C 80AC4DAC 8FA40024 */ lw $a0, 0x0024($sp) -/* 02110 80AC4DB0 460A4032 */ c.eq.s $f8, $f10 -/* 02114 80AC4DB4 00000000 */ nop -/* 02118 80AC4DB8 45020004 */ bc1fl .L80AC4DCC -/* 0211C 80AC4DBC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02120 80AC4DC0 0C2B0E6B */ jal func_80AC39AC -/* 02124 80AC4DC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02128 80AC4DC8 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC4DCC: -/* 0212C 80AC4DCC 8FB00018 */ lw $s0, 0x0018($sp) -/* 02130 80AC4DD0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02134 80AC4DD4 03E00008 */ jr $ra -/* 02138 80AC4DD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s deleted file mode 100644 index b0abc7fe76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s +++ /dev/null @@ -1,75 +0,0 @@ -.rdata -glabel D_80AC9148 - .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" - .balign 4 - -glabel D_80AC9168 - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC4DDC -/* 0213C 80AC4DDC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02140 80AC4DE0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02144 80AC4DE4 AFB00018 */ sw $s0, 0x0018($sp) -/* 02148 80AC4DE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0214C 80AC4DEC AFA50024 */ sw $a1, 0x0024($sp) -/* 02150 80AC4DF0 0C2B194B */ jal func_80AC652C -/* 02154 80AC4DF4 AFA60028 */ sw $a2, 0x0028($sp) -/* 02158 80AC4DF8 14400009 */ bne $v0, $zero, .L80AC4E20 -/* 0215C 80AC4DFC 260402D4 */ addiu $a0, $s0, 0x02D4 ## $a0 = 000002D4 -/* 02160 80AC4E00 3C0480AD */ lui $a0, %hi(D_80AC9148) ## $a0 = 80AD0000 -/* 02164 80AC4E04 3C0580AD */ lui $a1, %hi(D_80AC9168) ## $a1 = 80AD0000 -/* 02168 80AC4E08 24A59168 */ addiu $a1, $a1, %lo(D_80AC9168) ## $a1 = 80AC9168 -/* 0216C 80AC4E0C 24849148 */ addiu $a0, $a0, %lo(D_80AC9148) ## $a0 = 80AC9148 -/* 02170 80AC4E10 0C00084C */ jal osSyncPrintf - -/* 02174 80AC4E14 24060933 */ addiu $a2, $zero, 0x0933 ## $a2 = 00000933 -/* 02178 80AC4E18 10000027 */ beq $zero, $zero, .L80AC4EB8 -/* 0217C 80AC4E1C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC4E20: -/* 02180 80AC4E20 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02184 80AC4E24 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 02188 80AC4E28 0C01E107 */ jal Math_ApproachF - -/* 0218C 80AC4E2C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 02190 80AC4E30 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 02194 80AC4E34 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 02198 80AC4E38 C60002D4 */ lwc1 $f0, 0x02D4($s0) ## 000002D4 -/* 0219C 80AC4E3C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 021A0 80AC4E40 4604003C */ c.lt.s $f0, $f4 -/* 021A4 80AC4E44 00000000 */ nop -/* 021A8 80AC4E48 4502000C */ bc1fl .L80AC4E7C -/* 021AC 80AC4E4C 44060000 */ mfc1 $a2, $f0 -/* 021B0 80AC4E50 44813000 */ mtc1 $at, $f6 ## $f6 = -0.50 -/* 021B4 80AC4E54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021B8 80AC4E58 8FA50024 */ lw $a1, 0x0024($sp) -/* 021BC 80AC4E5C 4600303C */ c.lt.s $f6, $f0 -/* 021C0 80AC4E60 00000000 */ nop -/* 021C4 80AC4E64 45020005 */ bc1fl .L80AC4E7C -/* 021C8 80AC4E68 44060000 */ mfc1 $a2, $f0 -/* 021CC 80AC4E6C 0C2B0CD4 */ jal func_80AC3350 -/* 021D0 80AC4E70 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 021D4 80AC4E74 C60002D4 */ lwc1 $f0, 0x02D4($s0) ## 000002D4 -/* 021D8 80AC4E78 44060000 */ mfc1 $a2, $f0 -.L80AC4E7C: -/* 021DC 80AC4E7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021E0 80AC4E80 0C2B0CD4 */ jal func_80AC3350 -/* 021E4 80AC4E84 8FA50024 */ lw $a1, 0x0024($sp) -/* 021E8 80AC4E88 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 021EC 80AC4E8C C60A02D4 */ lwc1 $f10, 0x02D4($s0) ## 000002D4 -/* 021F0 80AC4E90 8FA40024 */ lw $a0, 0x0024($sp) -/* 021F4 80AC4E94 460A4032 */ c.eq.s $f8, $f10 -/* 021F8 80AC4E98 00000000 */ nop -/* 021FC 80AC4E9C 45020006 */ bc1fl .L80AC4EB8 -/* 02200 80AC4EA0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02204 80AC4EA4 0C042DC8 */ jal func_8010B720 -/* 02208 80AC4EA8 24053010 */ addiu $a1, $zero, 0x3010 ## $a1 = 00003010 -/* 0220C 80AC4EAC 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 02210 80AC4EB0 A60E01FC */ sh $t6, 0x01FC($s0) ## 000001FC -/* 02214 80AC4EB4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC4EB8: -/* 02218 80AC4EB8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0221C 80AC4EBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02220 80AC4EC0 03E00008 */ jr $ra -/* 02224 80AC4EC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4EC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4EC8.s deleted file mode 100644 index a1586a6b6f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4EC8.s +++ /dev/null @@ -1,70 +0,0 @@ -.rdata -glabel D_80AC9178 - .asciz "\n\x1b[33m初めて手にいれた！！\x1b[m\n\n" - .balign 4 - -glabel D_80AC9198 - .asciz "\x1b[33m持ち上げ開始！！\x1b[m\n\n" - .balign 4 - -.text -glabel func_80AC4EC8 -/* 02228 80AC4EC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0222C 80AC4ECC AFBF0024 */ sw $ra, 0x0024($sp) -/* 02230 80AC4ED0 AFB10020 */ sw $s1, 0x0020($sp) -/* 02234 80AC4ED4 AFB0001C */ sw $s0, 0x001C($sp) -/* 02238 80AC4ED8 8C8E1C44 */ lw $t6, 0x1C44($a0) ## 00001C44 -/* 0223C 80AC4EDC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02240 80AC4EE0 3C0480AD */ lui $a0, %hi(D_80AC9178) ## $a0 = 80AD0000 -/* 02244 80AC4EE4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02248 80AC4EE8 24849178 */ addiu $a0, $a0, %lo(D_80AC9178) ## $a0 = 80AC9178 -/* 0224C 80AC4EEC 0C00084C */ jal osSyncPrintf - -/* 02250 80AC4EF0 AFAE002C */ sw $t6, 0x002C($sp) -/* 02254 80AC4EF4 922F0252 */ lbu $t7, 0x0252($s1) ## 00000252 -/* 02258 80AC4EF8 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 0225C 80AC4EFC 44810000 */ mtc1 $at, $f0 ## $f0 = 120.00 -/* 02260 80AC4F00 000FC080 */ sll $t8, $t7, 2 -/* 02264 80AC4F04 0238C821 */ addu $t9, $s1, $t8 -/* 02268 80AC4F08 8F280200 */ lw $t0, 0x0200($t9) ## 00000200 -/* 0226C 80AC4F0C 44070000 */ mfc1 $a3, $f0 -/* 02270 80AC4F10 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02274 80AC4F14 8D0601A4 */ lw $a2, 0x01A4($t0) ## 000001A4 -/* 02278 80AC4F18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0227C 80AC4F1C 0C00BD0D */ jal func_8002F434 -/* 02280 80AC4F20 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02284 80AC4F24 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02288 80AC4F28 8FA2002C */ lw $v0, 0x002C($sp) -/* 0228C 80AC4F2C 00300821 */ addu $at, $at, $s0 -/* 02290 80AC4F30 24090036 */ addiu $t1, $zero, 0x0036 ## $t1 = 00000036 -/* 02294 80AC4F34 A02903DC */ sb $t1, 0x03DC($at) ## 000103DC -/* 02298 80AC4F38 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0229C 80AC4F3C 00300821 */ addu $at, $at, $s0 -/* 022A0 80AC4F40 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 022A4 80AC4F44 A02A04BF */ sb $t2, 0x04BF($at) ## 000104BF -/* 022A8 80AC4F48 8C4B0680 */ lw $t3, 0x0680($v0) ## 00000680 -/* 022AC 80AC4F4C 3C01DFFF */ lui $at, 0xDFFF ## $at = DFFF0000 -/* 022B0 80AC4F50 3421FFFF */ ori $at, $at, 0xFFFF ## $at = DFFFFFFF -/* 022B4 80AC4F54 01616024 */ and $t4, $t3, $at -/* 022B8 80AC4F58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022BC 80AC4F5C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 022C0 80AC4F60 0C02F124 */ jal func_800BC490 -/* 022C4 80AC4F64 AC4C0680 */ sw $t4, 0x0680($v0) ## 00000680 -/* 022C8 80AC4F68 0C020978 */ jal Interface_ChangeAlpha -/* 022CC 80AC4F6C 24040032 */ addiu $a0, $zero, 0x0032 ## $a0 = 00000032 -/* 022D0 80AC4F70 A2200251 */ sb $zero, 0x0251($s1) ## 00000251 -/* 022D4 80AC4F74 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 022D8 80AC4F78 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 022DC 80AC4F7C 0C2B0CD4 */ jal func_80AC3350 -/* 022E0 80AC4F80 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 022E4 80AC4F84 240D000F */ addiu $t5, $zero, 0x000F ## $t5 = 0000000F -/* 022E8 80AC4F88 3C0480AD */ lui $a0, %hi(D_80AC9198) ## $a0 = 80AD0000 -/* 022EC 80AC4F8C A62D01FC */ sh $t5, 0x01FC($s1) ## 000001FC -/* 022F0 80AC4F90 0C00084C */ jal osSyncPrintf - -/* 022F4 80AC4F94 24849198 */ addiu $a0, $a0, %lo(D_80AC9198) ## $a0 = 80AC9198 -/* 022F8 80AC4F98 8FBF0024 */ lw $ra, 0x0024($sp) -/* 022FC 80AC4F9C 8FB0001C */ lw $s0, 0x001C($sp) -/* 02300 80AC4FA0 8FB10020 */ lw $s1, 0x0020($sp) -/* 02304 80AC4FA4 03E00008 */ jr $ra -/* 02308 80AC4FA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FAC.s deleted file mode 100644 index 618a7f53da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FAC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AC4FAC -/* 0230C 80AC4FAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02310 80AC4FB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02314 80AC4FB4 AFA5001C */ sw $a1, 0x001C($sp) -/* 02318 80AC4FB8 AFA60020 */ sw $a2, 0x0020($sp) -/* 0231C 80AC4FBC 0C042DC8 */ jal func_8010B720 -/* 02320 80AC4FC0 30C5FFFF */ andi $a1, $a2, 0xFFFF ## $a1 = 00000000 -/* 02324 80AC4FC4 8FAF001C */ lw $t7, 0x001C($sp) -/* 02328 80AC4FC8 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 0232C 80AC4FCC A5EE01FC */ sh $t6, 0x01FC($t7) ## 000001FC -/* 02330 80AC4FD0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02334 80AC4FD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02338 80AC4FD8 03E00008 */ jr $ra -/* 0233C 80AC4FDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FE0.s deleted file mode 100644 index 018e11fd3a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FE0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AC4FE0 -/* 02340 80AC4FE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02344 80AC4FE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02348 80AC4FE8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0234C 80AC4FEC AFA60020 */ sw $a2, 0x0020($sp) -/* 02350 80AC4FF0 0C042DC8 */ jal func_8010B720 -/* 02354 80AC4FF4 30C5FFFF */ andi $a1, $a2, 0xFFFF ## $a1 = 00000000 -/* 02358 80AC4FF8 8FAF001C */ lw $t7, 0x001C($sp) -/* 0235C 80AC4FFC 240E0017 */ addiu $t6, $zero, 0x0017 ## $t6 = 00000017 -/* 02360 80AC5000 A5EE01FC */ sh $t6, 0x01FC($t7) ## 000001FC -/* 02364 80AC5004 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02368 80AC5008 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0236C 80AC500C 03E00008 */ jr $ra -/* 02370 80AC5010 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s deleted file mode 100644 index 9b607683dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s +++ /dev/null @@ -1,126 +0,0 @@ -.late_rodata -glabel jtbl_80AC95CC -.word L80AC5070 -.word L80AC50DC -.word L80AC512C -.word L80AC514C -.word L80AC516C -.word L80AC518C - -.text -glabel func_80AC5014 -/* 02374 80AC5014 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02378 80AC5018 AFBF001C */ sw $ra, 0x001C($sp) -/* 0237C 80AC501C AFB10018 */ sw $s1, 0x0018($sp) -/* 02380 80AC5020 AFB00014 */ sw $s0, 0x0014($sp) -/* 02384 80AC5024 90AE0252 */ lbu $t6, 0x0252($a1) ## 00000252 -/* 02388 80AC5028 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0238C 80AC502C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 02390 80AC5030 000E7880 */ sll $t7, $t6, 2 -/* 02394 80AC5034 00AFC021 */ addu $t8, $a1, $t7 -/* 02398 80AC5038 8F050200 */ lw $a1, 0x0200($t8) ## 00000200 -/* 0239C 80AC503C AFA50024 */ sw $a1, 0x0024($sp) -/* 023A0 80AC5040 8CB901BC */ lw $t9, 0x01BC($a1) ## 000001BC -/* 023A4 80AC5044 0320F809 */ jalr $ra, $t9 -/* 023A8 80AC5048 00000000 */ nop -/* 023AC 80AC504C 2C410006 */ sltiu $at, $v0, 0x0006 -/* 023B0 80AC5050 10200054 */ beq $at, $zero, .L80AC51A4 -/* 023B4 80AC5054 8FA70024 */ lw $a3, 0x0024($sp) -/* 023B8 80AC5058 00024080 */ sll $t0, $v0, 2 -/* 023BC 80AC505C 3C0180AD */ lui $at, %hi(jtbl_80AC95CC) ## $at = 80AD0000 -/* 023C0 80AC5060 00280821 */ addu $at, $at, $t0 -/* 023C4 80AC5064 8C2895CC */ lw $t0, %lo(jtbl_80AC95CC)($at) -/* 023C8 80AC5068 01000008 */ jr $t0 -/* 023CC 80AC506C 00000000 */ nop -glabel L80AC5070 -/* 023D0 80AC5070 84E9001C */ lh $t1, 0x001C($a3) ## 0000001C -/* 023D4 80AC5074 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 023D8 80AC5078 3C0A8016 */ lui $t2, %hi(gSaveContext+0xf06) -/* 023DC 80AC507C 1521000A */ bne $t1, $at, .L80AC50A8 -/* 023E0 80AC5080 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 023E4 80AC5084 954AF566 */ lhu $t2, %lo(gSaveContext+0xf06)($t2) -/* 023E8 80AC5088 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 023EC 80AC508C 314B0040 */ andi $t3, $t2, 0x0040 ## $t3 = 00000000 -/* 023F0 80AC5090 51600006 */ beql $t3, $zero, .L80AC50AC -/* 023F4 80AC5094 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 023F8 80AC5098 0C2B18B1 */ jal func_80AC62C4 -/* 023FC 80AC509C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02400 80AC50A0 10000041 */ beq $zero, $zero, .L80AC51A8 -/* 02404 80AC50A4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC50A8: -/* 02408 80AC50A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80AC50AC: -/* 0240C 80AC50AC 0C2B13B2 */ jal func_80AC4EC8 -/* 02410 80AC50B0 AFA70024 */ sw $a3, 0x0024($sp) -/* 02414 80AC50B4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02418 80AC50B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0241C 80AC50BC A2000251 */ sb $zero, 0x0251($s0) ## 00000251 -/* 02420 80AC50C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02424 80AC50C4 E60402D0 */ swc1 $f4, 0x02D0($s0) ## 000002D0 -/* 02428 80AC50C8 8CB901AC */ lw $t9, 0x01AC($a1) ## 000001AC -/* 0242C 80AC50CC 0320F809 */ jalr $ra, $t9 -/* 02430 80AC50D0 00000000 */ nop -/* 02434 80AC50D4 10000034 */ beq $zero, $zero, .L80AC51A8 -/* 02438 80AC50D8 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80AC50DC -/* 0243C 80AC50DC AFA70024 */ sw $a3, 0x0024($sp) -/* 02440 80AC50E0 8CF901C0 */ lw $t9, 0x01C0($a3) ## 000001C0 -/* 02444 80AC50E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02448 80AC50E8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0244C 80AC50EC 0320F809 */ jalr $ra, $t9 -/* 02450 80AC50F0 00000000 */ nop -/* 02454 80AC50F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02458 80AC50F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0245C 80AC50FC 0C2B13F8 */ jal func_80AC4FE0 -/* 02460 80AC5100 24060084 */ addiu $a2, $zero, 0x0084 ## $a2 = 00000084 -/* 02464 80AC5104 8FA50024 */ lw $a1, 0x0024($sp) -/* 02468 80AC5108 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0246C 80AC510C A2000251 */ sb $zero, 0x0251($s0) ## 00000251 -/* 02470 80AC5110 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02474 80AC5114 E60602D0 */ swc1 $f6, 0x02D0($s0) ## 000002D0 -/* 02478 80AC5118 8CB901AC */ lw $t9, 0x01AC($a1) ## 000001AC -/* 0247C 80AC511C 0320F809 */ jalr $ra, $t9 -/* 02480 80AC5120 00000000 */ nop -/* 02484 80AC5124 10000020 */ beq $zero, $zero, .L80AC51A8 -/* 02488 80AC5128 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80AC512C -/* 0248C 80AC512C 0C01E221 */ jal func_80078884 -/* 02490 80AC5130 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 02494 80AC5134 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02498 80AC5138 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0249C 80AC513C 0C2B13EB */ jal func_80AC4FAC -/* 024A0 80AC5140 24060086 */ addiu $a2, $zero, 0x0086 ## $a2 = 00000086 -/* 024A4 80AC5144 10000018 */ beq $zero, $zero, .L80AC51A8 -/* 024A8 80AC5148 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80AC514C -/* 024AC 80AC514C 0C01E221 */ jal func_80078884 -/* 024B0 80AC5150 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 024B4 80AC5154 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 024B8 80AC5158 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 024BC 80AC515C 0C2B13EB */ jal func_80AC4FAC -/* 024C0 80AC5160 24060096 */ addiu $a2, $zero, 0x0096 ## $a2 = 00000096 -/* 024C4 80AC5164 10000010 */ beq $zero, $zero, .L80AC51A8 -/* 024C8 80AC5168 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80AC516C -/* 024CC 80AC516C 0C01E221 */ jal func_80078884 -/* 024D0 80AC5170 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 024D4 80AC5174 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 024D8 80AC5178 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 024DC 80AC517C 0C2B13EB */ jal func_80AC4FAC -/* 024E0 80AC5180 24060085 */ addiu $a2, $zero, 0x0085 ## $a2 = 00000085 -/* 024E4 80AC5184 10000008 */ beq $zero, $zero, .L80AC51A8 -/* 024E8 80AC5188 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80AC518C -/* 024EC 80AC518C 0C01E221 */ jal func_80078884 -/* 024F0 80AC5190 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 024F4 80AC5194 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 024F8 80AC5198 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 024FC 80AC519C 0C2B13EB */ jal func_80AC4FAC -/* 02500 80AC51A0 24060086 */ addiu $a2, $zero, 0x0086 ## $a2 = 00000086 -.L80AC51A4: -/* 02504 80AC51A4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC51A8: -/* 02508 80AC51A8 8FB00014 */ lw $s0, 0x0014($sp) -/* 0250C 80AC51AC 8FB10018 */ lw $s1, 0x0018($sp) -/* 02510 80AC51B0 03E00008 */ jr $ra -/* 02514 80AC51B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC51B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC51B8.s deleted file mode 100644 index 62a05a61ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC51B8.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_80AC51B8 -/* 02518 80AC51B8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0251C 80AC51BC AFBF0024 */ sw $ra, 0x0024($sp) -/* 02520 80AC51C0 AFB20020 */ sw $s2, 0x0020($sp) -/* 02524 80AC51C4 AFB1001C */ sw $s1, 0x001C($sp) -/* 02528 80AC51C8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0252C 80AC51CC 90AE0252 */ lbu $t6, 0x0252($a1) ## 00000252 -/* 02530 80AC51D0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02534 80AC51D4 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 02538 80AC51D8 000E7880 */ sll $t7, $t6, 2 -/* 0253C 80AC51DC 00AFC021 */ addu $t8, $a1, $t7 -/* 02540 80AC51E0 8F100200 */ lw $s0, 0x0200($t8) ## 00000200 -/* 02544 80AC51E4 8E1901BC */ lw $t9, 0x01BC($s0) ## 000001BC -/* 02548 80AC51E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0254C 80AC51EC 0320F809 */ jalr $ra, $t9 -/* 02550 80AC51F0 00000000 */ nop -/* 02554 80AC51F4 1040000B */ beq $v0, $zero, .L80AC5224 -/* 02558 80AC51F8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0255C 80AC51FC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02560 80AC5200 1041000E */ beq $v0, $at, .L80AC523C -/* 02564 80AC5204 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02568 80AC5208 1041001F */ beq $v0, $at, .L80AC5288 -/* 0256C 80AC520C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02570 80AC5210 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02574 80AC5214 10410021 */ beq $v0, $at, .L80AC529C -/* 02578 80AC5218 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0257C 80AC521C 10000023 */ beq $zero, $zero, .L80AC52AC -/* 02580 80AC5220 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC5224: -/* 02584 80AC5224 0C042DC8 */ jal func_8010B720 -/* 02588 80AC5228 2405009C */ addiu $a1, $zero, 0x009C ## $a1 = 0000009C -/* 0258C 80AC522C 24080012 */ addiu $t0, $zero, 0x0012 ## $t0 = 00000012 -/* 02590 80AC5230 A62801FC */ sh $t0, 0x01FC($s1) ## 000001FC -/* 02594 80AC5234 1000001C */ beq $zero, $zero, .L80AC52A8 -/* 02598 80AC5238 A2200251 */ sb $zero, 0x0251($s1) ## 00000251 -.L80AC523C: -/* 0259C 80AC523C 8E1901C0 */ lw $t9, 0x01C0($s0) ## 000001C0 -/* 025A0 80AC5240 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 025A4 80AC5244 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 025A8 80AC5248 0320F809 */ jalr $ra, $t9 -/* 025AC 80AC524C 00000000 */ nop -/* 025B0 80AC5250 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 025B4 80AC5254 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 025B8 80AC5258 0C2B13F8 */ jal func_80AC4FE0 -/* 025BC 80AC525C 24060098 */ addiu $a2, $zero, 0x0098 ## $a2 = 00000098 -/* 025C0 80AC5260 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 025C4 80AC5264 A2200251 */ sb $zero, 0x0251($s1) ## 00000251 -/* 025C8 80AC5268 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 025CC 80AC526C E62402D0 */ swc1 $f4, 0x02D0($s1) ## 000002D0 -/* 025D0 80AC5270 8E1901AC */ lw $t9, 0x01AC($s0) ## 000001AC -/* 025D4 80AC5274 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 025D8 80AC5278 0320F809 */ jalr $ra, $t9 -/* 025DC 80AC527C 00000000 */ nop -/* 025E0 80AC5280 1000000A */ beq $zero, $zero, .L80AC52AC -/* 025E4 80AC5284 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC5288: -/* 025E8 80AC5288 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 025EC 80AC528C 0C2B13EB */ jal func_80AC4FAC -/* 025F0 80AC5290 24060096 */ addiu $a2, $zero, 0x0096 ## $a2 = 00000096 -/* 025F4 80AC5294 10000005 */ beq $zero, $zero, .L80AC52AC -/* 025F8 80AC5298 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC529C: -/* 025FC 80AC529C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02600 80AC52A0 0C2B13EB */ jal func_80AC4FAC -/* 02604 80AC52A4 24060085 */ addiu $a2, $zero, 0x0085 ## $a2 = 00000085 -.L80AC52A8: -/* 02608 80AC52A8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC52AC: -/* 0260C 80AC52AC 8FB00018 */ lw $s0, 0x0018($sp) -/* 02610 80AC52B0 8FB1001C */ lw $s1, 0x001C($sp) -/* 02614 80AC52B4 8FB20020 */ lw $s2, 0x0020($sp) -/* 02618 80AC52B8 03E00008 */ jr $ra -/* 0261C 80AC52BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC52C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC52C0.s deleted file mode 100644 index 57b546df88..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC52C0.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_80AC52C0 -/* 02620 80AC52C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02624 80AC52C4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02628 80AC52C8 AFB20020 */ sw $s2, 0x0020($sp) -/* 0262C 80AC52CC AFB1001C */ sw $s1, 0x001C($sp) -/* 02630 80AC52D0 AFB00018 */ sw $s0, 0x0018($sp) -/* 02634 80AC52D4 90AE0252 */ lbu $t6, 0x0252($a1) ## 00000252 -/* 02638 80AC52D8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0263C 80AC52DC 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 02640 80AC52E0 000E7880 */ sll $t7, $t6, 2 -/* 02644 80AC52E4 00AFC021 */ addu $t8, $a1, $t7 -/* 02648 80AC52E8 8F100200 */ lw $s0, 0x0200($t8) ## 00000200 -/* 0264C 80AC52EC 8E1901BC */ lw $t9, 0x01BC($s0) ## 000001BC -/* 02650 80AC52F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02654 80AC52F4 0320F809 */ jalr $ra, $t9 -/* 02658 80AC52F8 00000000 */ nop -/* 0265C 80AC52FC 1040000A */ beq $v0, $zero, .L80AC5328 -/* 02660 80AC5300 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02664 80AC5304 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02668 80AC5308 10410013 */ beq $v0, $at, .L80AC5358 -/* 0266C 80AC530C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02670 80AC5310 10410024 */ beq $v0, $at, .L80AC53A4 -/* 02674 80AC5314 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02678 80AC5318 1041002A */ beq $v0, $at, .L80AC53C4 -/* 0267C 80AC531C 00000000 */ nop -/* 02680 80AC5320 1000002F */ beq $zero, $zero, .L80AC53E0 -/* 02684 80AC5324 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC5328: -/* 02688 80AC5328 0C2B13B2 */ jal func_80AC4EC8 -/* 0268C 80AC532C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02690 80AC5330 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02694 80AC5334 A2200251 */ sb $zero, 0x0251($s1) ## 00000251 -/* 02698 80AC5338 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0269C 80AC533C E62402D0 */ swc1 $f4, 0x02D0($s1) ## 000002D0 -/* 026A0 80AC5340 8E1901AC */ lw $t9, 0x01AC($s0) ## 000001AC -/* 026A4 80AC5344 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 026A8 80AC5348 0320F809 */ jalr $ra, $t9 -/* 026AC 80AC534C 00000000 */ nop -/* 026B0 80AC5350 10000023 */ beq $zero, $zero, .L80AC53E0 -/* 026B4 80AC5354 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC5358: -/* 026B8 80AC5358 8E1901C0 */ lw $t9, 0x01C0($s0) ## 000001C0 -/* 026BC 80AC535C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 026C0 80AC5360 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 026C4 80AC5364 0320F809 */ jalr $ra, $t9 -/* 026C8 80AC5368 00000000 */ nop -/* 026CC 80AC536C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 026D0 80AC5370 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 026D4 80AC5374 0C2B13F8 */ jal func_80AC4FE0 -/* 026D8 80AC5378 2406009A */ addiu $a2, $zero, 0x009A ## $a2 = 0000009A -/* 026DC 80AC537C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 026E0 80AC5380 A2200251 */ sb $zero, 0x0251($s1) ## 00000251 -/* 026E4 80AC5384 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 026E8 80AC5388 E62602D0 */ swc1 $f6, 0x02D0($s1) ## 000002D0 -/* 026EC 80AC538C 8E1901AC */ lw $t9, 0x01AC($s0) ## 000001AC -/* 026F0 80AC5390 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 026F4 80AC5394 0320F809 */ jalr $ra, $t9 -/* 026F8 80AC5398 00000000 */ nop -/* 026FC 80AC539C 10000010 */ beq $zero, $zero, .L80AC53E0 -/* 02700 80AC53A0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC53A4: -/* 02704 80AC53A4 0C01E221 */ jal func_80078884 -/* 02708 80AC53A8 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 0270C 80AC53AC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02710 80AC53B0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02714 80AC53B4 0C2B13EB */ jal func_80AC4FAC -/* 02718 80AC53B8 2406009D */ addiu $a2, $zero, 0x009D ## $a2 = 0000009D -/* 0271C 80AC53BC 10000008 */ beq $zero, $zero, .L80AC53E0 -/* 02720 80AC53C0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC53C4: -/* 02724 80AC53C4 0C01E221 */ jal func_80078884 -/* 02728 80AC53C8 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 0272C 80AC53CC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02730 80AC53D0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02734 80AC53D4 0C2B13EB */ jal func_80AC4FAC -/* 02738 80AC53D8 24060085 */ addiu $a2, $zero, 0x0085 ## $a2 = 00000085 -/* 0273C 80AC53DC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC53E0: -/* 02740 80AC53E0 8FB00018 */ lw $s0, 0x0018($sp) -/* 02744 80AC53E4 8FB1001C */ lw $s1, 0x001C($sp) -/* 02748 80AC53E8 8FB20020 */ lw $s2, 0x0020($sp) -/* 0274C 80AC53EC 03E00008 */ jr $ra -/* 02750 80AC53F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC53F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC53F4.s deleted file mode 100644 index 0528a2c996..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC53F4.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80AC53F4 -/* 02754 80AC53F4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02758 80AC53F8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0275C 80AC53FC AFB20020 */ sw $s2, 0x0020($sp) -/* 02760 80AC5400 AFB1001C */ sw $s1, 0x001C($sp) -/* 02764 80AC5404 AFB00018 */ sw $s0, 0x0018($sp) -/* 02768 80AC5408 90AE0252 */ lbu $t6, 0x0252($a1) ## 00000252 -/* 0276C 80AC540C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02770 80AC5410 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 02774 80AC5414 000E7880 */ sll $t7, $t6, 2 -/* 02778 80AC5418 00AFC021 */ addu $t8, $a1, $t7 -/* 0277C 80AC541C 8F100200 */ lw $s0, 0x0200($t8) ## 00000200 -/* 02780 80AC5420 8E1901BC */ lw $t9, 0x01BC($s0) ## 000001BC -/* 02784 80AC5424 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02788 80AC5428 0320F809 */ jalr $ra, $t9 -/* 0278C 80AC542C 00000000 */ nop -/* 02790 80AC5430 10400009 */ beq $v0, $zero, .L80AC5458 -/* 02794 80AC5434 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02798 80AC5438 10410007 */ beq $v0, $at, .L80AC5458 -/* 0279C 80AC543C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 027A0 80AC5440 10410018 */ beq $v0, $at, .L80AC54A4 -/* 027A4 80AC5444 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 027A8 80AC5448 1041001E */ beq $v0, $at, .L80AC54C4 -/* 027AC 80AC544C 00000000 */ nop -/* 027B0 80AC5450 10000023 */ beq $zero, $zero, .L80AC54E0 -/* 027B4 80AC5454 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC5458: -/* 027B8 80AC5458 8E1901C0 */ lw $t9, 0x01C0($s0) ## 000001C0 -/* 027BC 80AC545C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 027C0 80AC5460 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 027C4 80AC5464 0320F809 */ jalr $ra, $t9 -/* 027C8 80AC5468 00000000 */ nop -/* 027CC 80AC546C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 027D0 80AC5470 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 027D4 80AC5474 0C2B13F8 */ jal func_80AC4FE0 -/* 027D8 80AC5478 24060084 */ addiu $a2, $zero, 0x0084 ## $a2 = 00000084 -/* 027DC 80AC547C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 027E0 80AC5480 A2200251 */ sb $zero, 0x0251($s1) ## 00000251 -/* 027E4 80AC5484 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 027E8 80AC5488 E62402D0 */ swc1 $f4, 0x02D0($s1) ## 000002D0 -/* 027EC 80AC548C 8E1901AC */ lw $t9, 0x01AC($s0) ## 000001AC -/* 027F0 80AC5490 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 027F4 80AC5494 0320F809 */ jalr $ra, $t9 -/* 027F8 80AC5498 00000000 */ nop -/* 027FC 80AC549C 10000010 */ beq $zero, $zero, .L80AC54E0 -/* 02800 80AC54A0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC54A4: -/* 02804 80AC54A4 0C01E221 */ jal func_80078884 -/* 02808 80AC54A8 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 0280C 80AC54AC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02810 80AC54B0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02814 80AC54B4 0C2B13EB */ jal func_80AC4FAC -/* 02818 80AC54B8 24060086 */ addiu $a2, $zero, 0x0086 ## $a2 = 00000086 -/* 0281C 80AC54BC 10000008 */ beq $zero, $zero, .L80AC54E0 -/* 02820 80AC54C0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC54C4: -/* 02824 80AC54C4 0C01E221 */ jal func_80078884 -/* 02828 80AC54C8 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 0282C 80AC54CC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02830 80AC54D0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02834 80AC54D4 0C2B13EB */ jal func_80AC4FAC -/* 02838 80AC54D8 24060085 */ addiu $a2, $zero, 0x0085 ## $a2 = 00000085 -/* 0283C 80AC54DC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AC54E0: -/* 02840 80AC54E0 8FB00018 */ lw $s0, 0x0018($sp) -/* 02844 80AC54E4 8FB1001C */ lw $s1, 0x001C($sp) -/* 02848 80AC54E8 8FB20020 */ lw $s2, 0x0020($sp) -/* 0284C 80AC54EC 03E00008 */ jr $ra -/* 02850 80AC54F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s deleted file mode 100644 index bf09105ec3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80AC54F4 -/* 02854 80AC54F4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 02858 80AC54F8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0285C 80AC54FC 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 -/* 02860 80AC5500 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02864 80AC5504 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02868 80AC5508 11C00003 */ beq $t6, $zero, .L80AC5518 -/* 0286C 80AC550C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02870 80AC5510 10000002 */ beq $zero, $zero, .L80AC551C -/* 02874 80AC5514 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80AC5518: -/* 02878 80AC5518 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -.L80AC551C: -/* 0287C 80AC551C 14410017 */ bne $v0, $at, .L80AC557C -/* 02880 80AC5520 00000000 */ nop -/* 02884 80AC5524 946F0ED8 */ lhu $t7, 0x0ED8($v1) ## 8015F538 -/* 02888 80AC5528 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 0288C 80AC552C 1700000F */ bne $t8, $zero, .L80AC556C -/* 02890 80AC5530 00000000 */ nop -/* 02894 80AC5534 94790F16 */ lhu $t9, 0x0F16($v1) ## 8015F576 -/* 02898 80AC5538 24090013 */ addiu $t1, $zero, 0x0013 ## $t1 = 00000013 -/* 0289C 80AC553C 33281000 */ andi $t0, $t9, 0x1000 ## $t0 = 00000000 -/* 028A0 80AC5540 51000006 */ beql $t0, $zero, .L80AC555C -/* 028A4 80AC5544 ACA00288 */ sw $zero, 0x0288($a1) ## 00000288 -/* 028A8 80AC5548 0C2B13EB */ jal func_80AC4FAC -/* 028AC 80AC554C 2406302E */ addiu $a2, $zero, 0x302E ## $a2 = 0000302E -/* 028B0 80AC5550 1000000D */ beq $zero, $zero, .L80AC5588 -/* 028B4 80AC5554 8FBF0014 */ lw $ra, 0x0014($sp) -/* 028B8 80AC5558 ACA00288 */ sw $zero, 0x0288($a1) ## 00000288 -.L80AC555C: -/* 028BC 80AC555C ACA002C0 */ sw $zero, 0x02C0($a1) ## 000002C0 -/* 028C0 80AC5560 A0A00251 */ sb $zero, 0x0251($a1) ## 00000251 -/* 028C4 80AC5564 10000007 */ beq $zero, $zero, .L80AC5584 -/* 028C8 80AC5568 A4A901FC */ sh $t1, 0x01FC($a1) ## 000001FC -.L80AC556C: -/* 028CC 80AC556C 0C2B14FD */ jal func_80AC53F4 -/* 028D0 80AC5570 00000000 */ nop -/* 028D4 80AC5574 10000004 */ beq $zero, $zero, .L80AC5588 -/* 028D8 80AC5578 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC557C: -/* 028DC 80AC557C 0C2B14FD */ jal func_80AC53F4 -/* 028E0 80AC5580 00000000 */ nop -.L80AC5584: -/* 028E4 80AC5584 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC5588: -/* 028E8 80AC5588 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 028EC 80AC558C 03E00008 */ jr $ra -/* 028F0 80AC5590 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5594.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5594.s deleted file mode 100644 index c55a7379b4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5594.s +++ /dev/null @@ -1,76 +0,0 @@ -.rdata -glabel D_80AC91B4 - .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" - .balign 4 - -glabel D_80AC91D4 - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC5594 -/* 028F4 80AC5594 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 028F8 80AC5598 AFBF001C */ sw $ra, 0x001C($sp) -/* 028FC 80AC559C AFB10018 */ sw $s1, 0x0018($sp) -/* 02900 80AC55A0 AFB00014 */ sw $s0, 0x0014($sp) -/* 02904 80AC55A4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02908 80AC55A8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0290C 80AC55AC 0C2B1924 */ jal func_80AC6490 -/* 02910 80AC55B0 AFA60028 */ sw $a2, 0x0028($sp) -/* 02914 80AC55B4 14400008 */ bne $v0, $zero, .L80AC55D8 -/* 02918 80AC55B8 3C0480AD */ lui $a0, %hi(D_80AC91B4) ## $a0 = 80AD0000 -/* 0291C 80AC55BC 3C0580AD */ lui $a1, %hi(D_80AC91D4) ## $a1 = 80AD0000 -/* 02920 80AC55C0 24A591D4 */ addiu $a1, $a1, %lo(D_80AC91D4) ## $a1 = 80AC91D4 -/* 02924 80AC55C4 248491B4 */ addiu $a0, $a0, %lo(D_80AC91B4) ## $a0 = 80AC91B4 -/* 02928 80AC55C8 0C00084C */ jal osSyncPrintf - -/* 0292C 80AC55CC 24060A5E */ addiu $a2, $zero, 0x0A5E ## $a2 = 00000A5E -/* 02930 80AC55D0 10000027 */ beq $zero, $zero, .L80AC5670 -/* 02934 80AC55D4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC55D8: -/* 02938 80AC55D8 0C042F6F */ jal func_8010BDBC -/* 0293C 80AC55DC 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 02940 80AC55E0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02944 80AC55E4 14410021 */ bne $v0, $at, .L80AC566C -/* 02948 80AC55E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0294C 80AC55EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02950 80AC55F0 0C2B0E32 */ jal func_80AC38C8 -/* 02954 80AC55F4 26060014 */ addiu $a2, $s0, 0x0014 ## $a2 = 00000014 -/* 02958 80AC55F8 5440001D */ bnel $v0, $zero, .L80AC5670 -/* 0295C 80AC55FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02960 80AC5600 0C041AF2 */ jal func_80106BC8 -/* 02964 80AC5604 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02968 80AC5608 10400018 */ beq $v0, $zero, .L80AC566C -/* 0296C 80AC560C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 02970 80AC5610 00501021 */ addu $v0, $v0, $s0 -/* 02974 80AC5614 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 02978 80AC5618 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0297C 80AC561C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02980 80AC5620 10400005 */ beq $v0, $zero, .L80AC5638 -/* 02984 80AC5624 00000000 */ nop -/* 02988 80AC5628 50410008 */ beql $v0, $at, .L80AC564C -/* 0298C 80AC562C 922F0252 */ lbu $t7, 0x0252($s1) ## 00000252 -/* 02990 80AC5630 1000000F */ beq $zero, $zero, .L80AC5670 -/* 02994 80AC5634 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5638: -/* 02998 80AC5638 0C2B1405 */ jal func_80AC5014 -/* 0299C 80AC563C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 029A0 80AC5640 1000000B */ beq $zero, $zero, .L80AC5670 -/* 029A4 80AC5644 8FBF001C */ lw $ra, 0x001C($sp) -/* 029A8 80AC5648 922F0252 */ lbu $t7, 0x0252($s1) ## 00000252 -.L80AC564C: -/* 029AC 80AC564C 862E01FE */ lh $t6, 0x01FE($s1) ## 000001FE -/* 029B0 80AC5650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029B4 80AC5654 000FC080 */ sll $t8, $t7, 2 -/* 029B8 80AC5658 0238C821 */ addu $t9, $s1, $t8 -/* 029BC 80AC565C A62E01FC */ sh $t6, 0x01FC($s1) ## 000001FC -/* 029C0 80AC5660 8F280200 */ lw $t0, 0x0200($t9) ## 00000200 -/* 029C4 80AC5664 0C042DC8 */ jal func_8010B720 -/* 029C8 80AC5668 9505010E */ lhu $a1, 0x010E($t0) ## 0000010E -.L80AC566C: -/* 029CC 80AC566C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5670: -/* 029D0 80AC5670 8FB00014 */ lw $s0, 0x0014($sp) -/* 029D4 80AC5674 8FB10018 */ lw $s1, 0x0018($sp) -/* 029D8 80AC5678 03E00008 */ jr $ra -/* 029DC 80AC567C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5680.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5680.s deleted file mode 100644 index 95fd9fe136..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5680.s +++ /dev/null @@ -1,76 +0,0 @@ -.rdata -glabel D_80AC91E4 - .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" - .balign 4 - -glabel D_80AC9204 - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC5680 -/* 029E0 80AC5680 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 029E4 80AC5684 AFBF001C */ sw $ra, 0x001C($sp) -/* 029E8 80AC5688 AFB10018 */ sw $s1, 0x0018($sp) -/* 029EC 80AC568C AFB00014 */ sw $s0, 0x0014($sp) -/* 029F0 80AC5690 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 029F4 80AC5694 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 029F8 80AC5698 0C2B1924 */ jal func_80AC6490 -/* 029FC 80AC569C AFA60028 */ sw $a2, 0x0028($sp) -/* 02A00 80AC56A0 14400008 */ bne $v0, $zero, .L80AC56C4 -/* 02A04 80AC56A4 3C0480AD */ lui $a0, %hi(D_80AC91E4) ## $a0 = 80AD0000 -/* 02A08 80AC56A8 3C0580AD */ lui $a1, %hi(D_80AC9204) ## $a1 = 80AD0000 -/* 02A0C 80AC56AC 24A59204 */ addiu $a1, $a1, %lo(D_80AC9204) ## $a1 = 80AC9204 -/* 02A10 80AC56B0 248491E4 */ addiu $a0, $a0, %lo(D_80AC91E4) ## $a0 = 80AC91E4 -/* 02A14 80AC56B4 0C00084C */ jal osSyncPrintf - -/* 02A18 80AC56B8 24060A85 */ addiu $a2, $zero, 0x0A85 ## $a2 = 00000A85 -/* 02A1C 80AC56BC 10000027 */ beq $zero, $zero, .L80AC575C -/* 02A20 80AC56C0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC56C4: -/* 02A24 80AC56C4 0C042F6F */ jal func_8010BDBC -/* 02A28 80AC56C8 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 02A2C 80AC56CC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02A30 80AC56D0 14410021 */ bne $v0, $at, .L80AC5758 -/* 02A34 80AC56D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02A38 80AC56D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02A3C 80AC56DC 0C2B0E32 */ jal func_80AC38C8 -/* 02A40 80AC56E0 26060014 */ addiu $a2, $s0, 0x0014 ## $a2 = 00000014 -/* 02A44 80AC56E4 5440001D */ bnel $v0, $zero, .L80AC575C -/* 02A48 80AC56E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 02A4C 80AC56EC 0C041AF2 */ jal func_80106BC8 -/* 02A50 80AC56F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A54 80AC56F4 10400018 */ beq $v0, $zero, .L80AC5758 -/* 02A58 80AC56F8 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 02A5C 80AC56FC 00501021 */ addu $v0, $v0, $s0 -/* 02A60 80AC5700 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 02A64 80AC5704 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02A68 80AC5708 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A6C 80AC570C 10400005 */ beq $v0, $zero, .L80AC5724 -/* 02A70 80AC5710 00000000 */ nop -/* 02A74 80AC5714 50410008 */ beql $v0, $at, .L80AC5738 -/* 02A78 80AC5718 922F0252 */ lbu $t7, 0x0252($s1) ## 00000252 -/* 02A7C 80AC571C 1000000F */ beq $zero, $zero, .L80AC575C -/* 02A80 80AC5720 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5724: -/* 02A84 80AC5724 0C2B146E */ jal func_80AC51B8 -/* 02A88 80AC5728 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02A8C 80AC572C 1000000B */ beq $zero, $zero, .L80AC575C -/* 02A90 80AC5730 8FBF001C */ lw $ra, 0x001C($sp) -/* 02A94 80AC5734 922F0252 */ lbu $t7, 0x0252($s1) ## 00000252 -.L80AC5738: -/* 02A98 80AC5738 862E01FE */ lh $t6, 0x01FE($s1) ## 000001FE -/* 02A9C 80AC573C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AA0 80AC5740 000FC080 */ sll $t8, $t7, 2 -/* 02AA4 80AC5744 0238C821 */ addu $t9, $s1, $t8 -/* 02AA8 80AC5748 A62E01FC */ sh $t6, 0x01FC($s1) ## 000001FC -/* 02AAC 80AC574C 8F280200 */ lw $t0, 0x0200($t9) ## 00000200 -/* 02AB0 80AC5750 0C042DC8 */ jal func_8010B720 -/* 02AB4 80AC5754 9505010E */ lhu $a1, 0x010E($t0) ## 0000010E -.L80AC5758: -/* 02AB8 80AC5758 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC575C: -/* 02ABC 80AC575C 8FB00014 */ lw $s0, 0x0014($sp) -/* 02AC0 80AC5760 8FB10018 */ lw $s1, 0x0018($sp) -/* 02AC4 80AC5764 03E00008 */ jr $ra -/* 02AC8 80AC5768 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC576C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC576C.s deleted file mode 100644 index 377774e6b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC576C.s +++ /dev/null @@ -1,76 +0,0 @@ -.rdata -glabel D_80AC9214 - .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" - .balign 4 - -glabel D_80AC9234 - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC576C -/* 02ACC 80AC576C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02AD0 80AC5770 AFBF001C */ sw $ra, 0x001C($sp) -/* 02AD4 80AC5774 AFB10018 */ sw $s1, 0x0018($sp) -/* 02AD8 80AC5778 AFB00014 */ sw $s0, 0x0014($sp) -/* 02ADC 80AC577C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02AE0 80AC5780 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 02AE4 80AC5784 0C2B1924 */ jal func_80AC6490 -/* 02AE8 80AC5788 AFA60028 */ sw $a2, 0x0028($sp) -/* 02AEC 80AC578C 14400008 */ bne $v0, $zero, .L80AC57B0 -/* 02AF0 80AC5790 3C0480AD */ lui $a0, %hi(D_80AC9214) ## $a0 = 80AD0000 -/* 02AF4 80AC5794 3C0580AD */ lui $a1, %hi(D_80AC9234) ## $a1 = 80AD0000 -/* 02AF8 80AC5798 24A59234 */ addiu $a1, $a1, %lo(D_80AC9234) ## $a1 = 80AC9234 -/* 02AFC 80AC579C 24849214 */ addiu $a0, $a0, %lo(D_80AC9214) ## $a0 = 80AC9214 -/* 02B00 80AC57A0 0C00084C */ jal osSyncPrintf - -/* 02B04 80AC57A4 24060AAC */ addiu $a2, $zero, 0x0AAC ## $a2 = 00000AAC -/* 02B08 80AC57A8 10000027 */ beq $zero, $zero, .L80AC5848 -/* 02B0C 80AC57AC 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC57B0: -/* 02B10 80AC57B0 0C042F6F */ jal func_8010BDBC -/* 02B14 80AC57B4 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 02B18 80AC57B8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02B1C 80AC57BC 14410021 */ bne $v0, $at, .L80AC5844 -/* 02B20 80AC57C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02B24 80AC57C4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02B28 80AC57C8 0C2B0E32 */ jal func_80AC38C8 -/* 02B2C 80AC57CC 26060014 */ addiu $a2, $s0, 0x0014 ## $a2 = 00000014 -/* 02B30 80AC57D0 5440001D */ bnel $v0, $zero, .L80AC5848 -/* 02B34 80AC57D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02B38 80AC57D8 0C041AF2 */ jal func_80106BC8 -/* 02B3C 80AC57DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B40 80AC57E0 10400018 */ beq $v0, $zero, .L80AC5844 -/* 02B44 80AC57E4 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 02B48 80AC57E8 00501021 */ addu $v0, $v0, $s0 -/* 02B4C 80AC57EC 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 02B50 80AC57F0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02B54 80AC57F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B58 80AC57F8 10400005 */ beq $v0, $zero, .L80AC5810 -/* 02B5C 80AC57FC 00000000 */ nop -/* 02B60 80AC5800 50410008 */ beql $v0, $at, .L80AC5824 -/* 02B64 80AC5804 922F0252 */ lbu $t7, 0x0252($s1) ## 00000252 -/* 02B68 80AC5808 1000000F */ beq $zero, $zero, .L80AC5848 -/* 02B6C 80AC580C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5810: -/* 02B70 80AC5810 0C2B14B0 */ jal func_80AC52C0 -/* 02B74 80AC5814 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02B78 80AC5818 1000000B */ beq $zero, $zero, .L80AC5848 -/* 02B7C 80AC581C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02B80 80AC5820 922F0252 */ lbu $t7, 0x0252($s1) ## 00000252 -.L80AC5824: -/* 02B84 80AC5824 862E01FE */ lh $t6, 0x01FE($s1) ## 000001FE -/* 02B88 80AC5828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B8C 80AC582C 000FC080 */ sll $t8, $t7, 2 -/* 02B90 80AC5830 0238C821 */ addu $t9, $s1, $t8 -/* 02B94 80AC5834 A62E01FC */ sh $t6, 0x01FC($s1) ## 000001FC -/* 02B98 80AC5838 8F280200 */ lw $t0, 0x0200($t9) ## 00000200 -/* 02B9C 80AC583C 0C042DC8 */ jal func_8010B720 -/* 02BA0 80AC5840 9505010E */ lhu $a1, 0x010E($t0) ## 0000010E -.L80AC5844: -/* 02BA4 80AC5844 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5848: -/* 02BA8 80AC5848 8FB00014 */ lw $s0, 0x0014($sp) -/* 02BAC 80AC584C 8FB10018 */ lw $s1, 0x0018($sp) -/* 02BB0 80AC5850 03E00008 */ jr $ra -/* 02BB4 80AC5854 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5858.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5858.s deleted file mode 100644 index 9b7908c167..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5858.s +++ /dev/null @@ -1,57 +0,0 @@ -.rdata -glabel D_80AC9244 - .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" - .balign 4 - -glabel D_80AC9264 - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC5858 -/* 02BB8 80AC5858 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02BBC 80AC585C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02BC0 80AC5860 AFA40018 */ sw $a0, 0x0018($sp) -/* 02BC4 80AC5864 AFA5001C */ sw $a1, 0x001C($sp) -/* 02BC8 80AC5868 AFA60020 */ sw $a2, 0x0020($sp) -/* 02BCC 80AC586C 0C2B1924 */ jal func_80AC6490 -/* 02BD0 80AC5870 AFA40018 */ sw $a0, 0x0018($sp) -/* 02BD4 80AC5874 14400009 */ bne $v0, $zero, .L80AC589C -/* 02BD8 80AC5878 8FA60018 */ lw $a2, 0x0018($sp) -/* 02BDC 80AC587C 3C0480AD */ lui $a0, %hi(D_80AC9244) ## $a0 = 80AD0000 -/* 02BE0 80AC5880 3C0580AD */ lui $a1, %hi(D_80AC9264) ## $a1 = 80AD0000 -/* 02BE4 80AC5884 24A59264 */ addiu $a1, $a1, %lo(D_80AC9264) ## $a1 = 80AC9264 -/* 02BE8 80AC5888 24849244 */ addiu $a0, $a0, %lo(D_80AC9244) ## $a0 = 80AC9244 -/* 02BEC 80AC588C 0C00084C */ jal osSyncPrintf - -/* 02BF0 80AC5890 24060AD3 */ addiu $a2, $zero, 0x0AD3 ## $a2 = 00000AD3 -/* 02BF4 80AC5894 10000017 */ beq $zero, $zero, .L80AC58F4 -/* 02BF8 80AC5898 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC589C: -/* 02BFC 80AC589C 8FA4001C */ lw $a0, 0x001C($sp) -/* 02C00 80AC58A0 AFA60018 */ sw $a2, 0x0018($sp) -/* 02C04 80AC58A4 0C042F6F */ jal func_8010BDBC -/* 02C08 80AC58A8 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 02C0C 80AC58AC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02C10 80AC58B0 1441000F */ bne $v0, $at, .L80AC58F0 -/* 02C14 80AC58B4 8FA60018 */ lw $a2, 0x0018($sp) -/* 02C18 80AC58B8 8FA4001C */ lw $a0, 0x001C($sp) -/* 02C1C 80AC58BC 0C041AF2 */ jal func_80106BC8 -/* 02C20 80AC58C0 AFA60018 */ sw $a2, 0x0018($sp) -/* 02C24 80AC58C4 1040000A */ beq $v0, $zero, .L80AC58F0 -/* 02C28 80AC58C8 8FA60018 */ lw $a2, 0x0018($sp) -/* 02C2C 80AC58CC 90CF0252 */ lbu $t7, 0x0252($a2) ## 00000252 -/* 02C30 80AC58D0 84CE01FE */ lh $t6, 0x01FE($a2) ## 000001FE -/* 02C34 80AC58D4 000FC080 */ sll $t8, $t7, 2 -/* 02C38 80AC58D8 00D8C821 */ addu $t9, $a2, $t8 -/* 02C3C 80AC58DC A4CE01FC */ sh $t6, 0x01FC($a2) ## 000001FC -/* 02C40 80AC58E0 8F280200 */ lw $t0, 0x0200($t9) ## 00000200 -/* 02C44 80AC58E4 8FA4001C */ lw $a0, 0x001C($sp) -/* 02C48 80AC58E8 0C042DC8 */ jal func_8010B720 -/* 02C4C 80AC58EC 9505010E */ lhu $a1, 0x010E($t0) ## 0000010E -.L80AC58F0: -/* 02C50 80AC58F0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC58F4: -/* 02C54 80AC58F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02C58 80AC58F8 03E00008 */ jr $ra -/* 02C5C 80AC58FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s deleted file mode 100644 index 057b4f5cf7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s +++ /dev/null @@ -1,97 +0,0 @@ -.rdata -glabel D_80AC9274 - .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" - .balign 4 - -glabel D_80AC9294 - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC92A4 - .asciz "店主の依頼 ( %d )\n" - .balign 4 - -.text -glabel func_80AC5900 -/* 02C60 80AC5900 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02C64 80AC5904 AFBF001C */ sw $ra, 0x001C($sp) -/* 02C68 80AC5908 AFB10018 */ sw $s1, 0x0018($sp) -/* 02C6C 80AC590C AFB00014 */ sw $s0, 0x0014($sp) -/* 02C70 80AC5910 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02C74 80AC5914 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02C78 80AC5918 0C2B1924 */ jal func_80AC6490 -/* 02C7C 80AC591C AFA60028 */ sw $a2, 0x0028($sp) -/* 02C80 80AC5920 14400009 */ bne $v0, $zero, .L80AC5948 -/* 02C84 80AC5924 3C0480AD */ lui $a0, %hi(D_80AC92A4) ## $a0 = 80AD0000 -/* 02C88 80AC5928 3C0480AD */ lui $a0, %hi(D_80AC9274) ## $a0 = 80AD0000 -/* 02C8C 80AC592C 3C0580AD */ lui $a1, %hi(D_80AC9294) ## $a1 = 80AD0000 -/* 02C90 80AC5930 24A59294 */ addiu $a1, $a1, %lo(D_80AC9294) ## $a1 = 80AC9294 -/* 02C94 80AC5934 24849274 */ addiu $a0, $a0, %lo(D_80AC9274) ## $a0 = 80AC9274 -/* 02C98 80AC5938 0C00084C */ jal osSyncPrintf - -/* 02C9C 80AC593C 24060AEE */ addiu $a2, $zero, 0x0AEE ## $a2 = 00000AEE -/* 02CA0 80AC5940 10000035 */ beq $zero, $zero, .L80AC5A18 -/* 02CA4 80AC5944 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5948: -/* 02CA8 80AC5948 3C058016 */ lui $a1, %hi(gSaveContext+0xf16) -/* 02CAC 80AC594C 94A5F576 */ lhu $a1, %lo(gSaveContext+0xf16)($a1) -/* 02CB0 80AC5950 248492A4 */ addiu $a0, $a0, %lo(D_80AC92A4) ## $a0 = FFFF92A4 -/* 02CB4 80AC5954 0C00084C */ jal osSyncPrintf - -/* 02CB8 80AC5958 30A51000 */ andi $a1, $a1, 0x1000 ## $a1 = 00000000 -/* 02CBC 80AC595C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 02CC0 80AC5960 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 02CC4 80AC5964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CC8 80AC5968 11C10005 */ beq $t6, $at, .L80AC5980 -/* 02CCC 80AC596C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02CD0 80AC5970 0C2B1565 */ jal func_80AC5594 -/* 02CD4 80AC5974 8FA60028 */ lw $a2, 0x0028($sp) -/* 02CD8 80AC5978 10000027 */ beq $zero, $zero, .L80AC5A18 -/* 02CDC 80AC597C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5980: -/* 02CE0 80AC5980 0C042F6F */ jal func_8010BDBC -/* 02CE4 80AC5984 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 02CE8 80AC5988 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02CEC 80AC598C 14410021 */ bne $v0, $at, .L80AC5A14 -/* 02CF0 80AC5990 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CF4 80AC5994 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02CF8 80AC5998 0C2B0E32 */ jal func_80AC38C8 -/* 02CFC 80AC599C 26260014 */ addiu $a2, $s1, 0x0014 ## $a2 = 00000014 -/* 02D00 80AC59A0 5440001D */ bnel $v0, $zero, .L80AC5A18 -/* 02D04 80AC59A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02D08 80AC59A8 0C041AF2 */ jal func_80106BC8 -/* 02D0C 80AC59AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02D10 80AC59B0 10400018 */ beq $v0, $zero, .L80AC5A14 -/* 02D14 80AC59B4 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 02D18 80AC59B8 00511021 */ addu $v0, $v0, $s1 -/* 02D1C 80AC59BC 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 02D20 80AC59C0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02D24 80AC59C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02D28 80AC59C8 10400005 */ beq $v0, $zero, .L80AC59E0 -/* 02D2C 80AC59CC 00000000 */ nop -/* 02D30 80AC59D0 50410008 */ beql $v0, $at, .L80AC59F4 -/* 02D34 80AC59D4 92180252 */ lbu $t8, 0x0252($s0) ## 00000252 -/* 02D38 80AC59D8 1000000F */ beq $zero, $zero, .L80AC5A18 -/* 02D3C 80AC59DC 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC59E0: -/* 02D40 80AC59E0 0C2B153D */ jal func_80AC54F4 -/* 02D44 80AC59E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02D48 80AC59E8 1000000B */ beq $zero, $zero, .L80AC5A18 -/* 02D4C 80AC59EC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02D50 80AC59F0 92180252 */ lbu $t8, 0x0252($s0) ## 00000252 -.L80AC59F4: -/* 02D54 80AC59F4 860F01FE */ lh $t7, 0x01FE($s0) ## 000001FE -/* 02D58 80AC59F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02D5C 80AC59FC 0018C880 */ sll $t9, $t8, 2 -/* 02D60 80AC5A00 02194021 */ addu $t0, $s0, $t9 -/* 02D64 80AC5A04 A60F01FC */ sh $t7, 0x01FC($s0) ## 000001FC -/* 02D68 80AC5A08 8D090200 */ lw $t1, 0x0200($t0) ## 00000200 -/* 02D6C 80AC5A0C 0C042DC8 */ jal func_8010B720 -/* 02D70 80AC5A10 9525010E */ lhu $a1, 0x010E($t1) ## 0000010E -.L80AC5A14: -/* 02D74 80AC5A14 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5A18: -/* 02D78 80AC5A18 8FB00014 */ lw $s0, 0x0014($sp) -/* 02D7C 80AC5A1C 8FB10018 */ lw $s1, 0x0018($sp) -/* 02D80 80AC5A20 03E00008 */ jr $ra -/* 02D84 80AC5A24 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s deleted file mode 100644 index 4712560c0d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s +++ /dev/null @@ -1,162 +0,0 @@ -.rdata -glabel D_80AC92B8 - .asciz "%s[%d]:\x1b[32mズーム中！！\x1b[m\n" - .balign 4 - -glabel D_80AC92D8 - .asciz "../z_en_oB1.c" - .balign 4 - -.late_rodata -glabel jtbl_80AC95E4 -.word L80AC5B5C -.word L80AC5B74 -.word L80AC5B8C -.word L80AC5BA4 -.word L80AC5BB8 -.word L80AC5BB8 -.word L80AC5BB8 -.word L80AC5BB8 - -.text -glabel func_80AC5A28 -/* 02D88 80AC5A28 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02D8C 80AC5A2C AFB00014 */ sw $s0, 0x0014($sp) -/* 02D90 80AC5A30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D94 80AC5A34 AFBF001C */ sw $ra, 0x001C($sp) -/* 02D98 80AC5A38 AFB10018 */ sw $s1, 0x0018($sp) -/* 02D9C 80AC5A3C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02DA0 80AC5A40 AFA60030 */ sw $a2, 0x0030($sp) -/* 02DA4 80AC5A44 0C042F6F */ jal func_8010BDBC -/* 02DA8 80AC5A48 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 02DAC 80AC5A4C A3A20027 */ sb $v0, 0x0027($sp) -/* 02DB0 80AC5A50 920E0252 */ lbu $t6, 0x0252($s0) ## 00000252 -/* 02DB4 80AC5A54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02DB8 80AC5A58 000E7880 */ sll $t7, $t6, 2 -/* 02DBC 80AC5A5C 020FC021 */ addu $t8, $s0, $t7 -/* 02DC0 80AC5A60 8F190200 */ lw $t9, 0x0200($t8) ## 00000200 -/* 02DC4 80AC5A64 0C2B1924 */ jal func_80AC6490 -/* 02DC8 80AC5A68 AFB90020 */ sw $t9, 0x0020($sp) -/* 02DCC 80AC5A6C 14400009 */ bne $v0, $zero, .L80AC5A94 -/* 02DD0 80AC5A70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02DD4 80AC5A74 3C0480AD */ lui $a0, %hi(D_80AC92B8) ## $a0 = 80AD0000 -/* 02DD8 80AC5A78 3C0580AD */ lui $a1, %hi(D_80AC92D8) ## $a1 = 80AD0000 -/* 02DDC 80AC5A7C 24A592D8 */ addiu $a1, $a1, %lo(D_80AC92D8) ## $a1 = 80AC92D8 -/* 02DE0 80AC5A80 248492B8 */ addiu $a0, $a0, %lo(D_80AC92B8) ## $a0 = 80AC92B8 -/* 02DE4 80AC5A84 0C00084C */ jal osSyncPrintf - -/* 02DE8 80AC5A88 24060B1D */ addiu $a2, $zero, 0x0B1D ## $a2 = 00000B1D -/* 02DEC 80AC5A8C 10000061 */ beq $zero, $zero, .L80AC5C14 -/* 02DF0 80AC5A90 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5A94: -/* 02DF4 80AC5A94 93A20027 */ lbu $v0, 0x0027($sp) -/* 02DF8 80AC5A98 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02DFC 80AC5A9C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02E00 80AC5AA0 54410011 */ bnel $v0, $at, .L80AC5AE8 -/* 02E04 80AC5AA4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02E08 80AC5AA8 0C041AF2 */ jal func_80106BC8 -/* 02E0C 80AC5AAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02E10 80AC5AB0 50400058 */ beql $v0, $zero, .L80AC5C14 -/* 02E14 80AC5AB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E18 80AC5AB8 92090252 */ lbu $t1, 0x0252($s0) ## 00000252 -/* 02E1C 80AC5ABC 860801FE */ lh $t0, 0x01FE($s0) ## 000001FE -/* 02E20 80AC5AC0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02E24 80AC5AC4 00095080 */ sll $t2, $t1, 2 -/* 02E28 80AC5AC8 020A5821 */ addu $t3, $s0, $t2 -/* 02E2C 80AC5ACC A60801FC */ sh $t0, 0x01FC($s0) ## 000001FC -/* 02E30 80AC5AD0 8D6C0200 */ lw $t4, 0x0200($t3) ## 00000200 -/* 02E34 80AC5AD4 0C042DC8 */ jal func_8010B720 -/* 02E38 80AC5AD8 9585010E */ lhu $a1, 0x010E($t4) ## 0000010E -/* 02E3C 80AC5ADC 1000004D */ beq $zero, $zero, .L80AC5C14 -/* 02E40 80AC5AE0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E44 80AC5AE4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -.L80AC5AE8: -/* 02E48 80AC5AE8 5441004A */ bnel $v0, $at, .L80AC5C14 -/* 02E4C 80AC5AEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E50 80AC5AF0 0C2B0E32 */ jal func_80AC38C8 -/* 02E54 80AC5AF4 26260014 */ addiu $a2, $s1, 0x0014 ## $a2 = 00000014 -/* 02E58 80AC5AF8 54400046 */ bnel $v0, $zero, .L80AC5C14 -/* 02E5C 80AC5AFC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E60 80AC5B00 0C041AF2 */ jal func_80106BC8 -/* 02E64 80AC5B04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02E68 80AC5B08 10400041 */ beq $v0, $zero, .L80AC5C10 -/* 02E6C 80AC5B0C 8FAD0020 */ lw $t5, 0x0020($sp) -/* 02E70 80AC5B10 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 02E74 80AC5B14 00511021 */ addu $v0, $v0, $s1 -/* 02E78 80AC5B18 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 02E7C 80AC5B1C 10400005 */ beq $v0, $zero, .L80AC5B34 -/* 02E80 80AC5B20 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02E84 80AC5B24 50410032 */ beql $v0, $at, .L80AC5BF0 -/* 02E88 80AC5B28 92180252 */ lbu $t8, 0x0252($s0) ## 00000252 -/* 02E8C 80AC5B2C 10000039 */ beq $zero, $zero, .L80AC5C14 -/* 02E90 80AC5B30 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5B34: -/* 02E94 80AC5B34 85AE001C */ lh $t6, 0x001C($t5) ## 0000001C -/* 02E98 80AC5B38 25CFFFE2 */ addiu $t7, $t6, 0xFFE2 ## $t7 = FFFFFFE2 -/* 02E9C 80AC5B3C 2DE10008 */ sltiu $at, $t7, 0x0008 -/* 02EA0 80AC5B40 1020001D */ beq $at, $zero, .L80AC5BB8 -/* 02EA4 80AC5B44 000F7880 */ sll $t7, $t7, 2 -/* 02EA8 80AC5B48 3C0180AD */ lui $at, %hi(jtbl_80AC95E4) ## $at = 80AD0000 -/* 02EAC 80AC5B4C 002F0821 */ addu $at, $at, $t7 -/* 02EB0 80AC5B50 8C2F95E4 */ lw $t7, %lo(jtbl_80AC95E4)($at) -/* 02EB4 80AC5B54 01E00008 */ jr $t7 -/* 02EB8 80AC5B58 00000000 */ nop -glabel L80AC5B5C -/* 02EBC 80AC5B5C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 02EC0 80AC5B60 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 02EC4 80AC5B64 94580EF4 */ lhu $t8, 0x0EF4($v0) ## 8015F554 -/* 02EC8 80AC5B68 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 -/* 02ECC 80AC5B6C 10000012 */ beq $zero, $zero, .L80AC5BB8 -/* 02ED0 80AC5B70 A4590EF4 */ sh $t9, 0x0EF4($v0) ## 8015F554 -glabel L80AC5B74 -/* 02ED4 80AC5B74 3C028016 */ lui $v0, %hi(gSaveContext) -/* 02ED8 80AC5B78 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 02EDC 80AC5B7C 94480EF4 */ lhu $t0, 0x0EF4($v0) ## 8015F554 -/* 02EE0 80AC5B80 35090020 */ ori $t1, $t0, 0x0020 ## $t1 = 00000020 -/* 02EE4 80AC5B84 1000000C */ beq $zero, $zero, .L80AC5BB8 -/* 02EE8 80AC5B88 A4490EF4 */ sh $t1, 0x0EF4($v0) ## 8015F554 -glabel L80AC5B8C -/* 02EEC 80AC5B8C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 02EF0 80AC5B90 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 02EF4 80AC5B94 944A0EF4 */ lhu $t2, 0x0EF4($v0) ## 8015F554 -/* 02EF8 80AC5B98 354B0010 */ ori $t3, $t2, 0x0010 ## $t3 = 00000010 -/* 02EFC 80AC5B9C 10000006 */ beq $zero, $zero, .L80AC5BB8 -/* 02F00 80AC5BA0 A44B0EF4 */ sh $t3, 0x0EF4($v0) ## 8015F554 -glabel L80AC5BA4 -/* 02F04 80AC5BA4 3C028016 */ lui $v0, %hi(gSaveContext) -/* 02F08 80AC5BA8 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 02F0C 80AC5BAC 944C0EF4 */ lhu $t4, 0x0EF4($v0) ## 8015F554 -/* 02F10 80AC5BB0 358D0040 */ ori $t5, $t4, 0x0040 ## $t5 = 00000040 -/* 02F14 80AC5BB4 A44D0EF4 */ sh $t5, 0x0EF4($v0) ## 8015F554 -glabel L80AC5BB8 -.L80AC5BB8: -/* 02F18 80AC5BB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02F1C 80AC5BBC 0C2B13B2 */ jal func_80AC4EC8 -/* 02F20 80AC5BC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02F24 80AC5BC4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02F28 80AC5BC8 A2000251 */ sb $zero, 0x0251($s0) ## 00000251 -/* 02F2C 80AC5BCC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02F30 80AC5BD0 E60402D0 */ swc1 $f4, 0x02D0($s0) ## 000002D0 -/* 02F34 80AC5BD4 8FA50020 */ lw $a1, 0x0020($sp) -/* 02F38 80AC5BD8 8CB901AC */ lw $t9, 0x01AC($a1) ## 000001AC -/* 02F3C 80AC5BDC 0320F809 */ jalr $ra, $t9 -/* 02F40 80AC5BE0 00000000 */ nop -/* 02F44 80AC5BE4 1000000B */ beq $zero, $zero, .L80AC5C14 -/* 02F48 80AC5BE8 8FBF001C */ lw $ra, 0x001C($sp) -/* 02F4C 80AC5BEC 92180252 */ lbu $t8, 0x0252($s0) ## 00000252 -.L80AC5BF0: -/* 02F50 80AC5BF0 860F01FE */ lh $t7, 0x01FE($s0) ## 000001FE -/* 02F54 80AC5BF4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02F58 80AC5BF8 00184080 */ sll $t0, $t8, 2 -/* 02F5C 80AC5BFC 02084821 */ addu $t1, $s0, $t0 -/* 02F60 80AC5C00 A60F01FC */ sh $t7, 0x01FC($s0) ## 000001FC -/* 02F64 80AC5C04 8D2A0200 */ lw $t2, 0x0200($t1) ## 00000200 -/* 02F68 80AC5C08 0C042DC8 */ jal func_8010B720 -/* 02F6C 80AC5C0C 9545010E */ lhu $a1, 0x010E($t2) ## 0000010E -.L80AC5C10: -/* 02F70 80AC5C10 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5C14: -/* 02F74 80AC5C14 8FB00014 */ lw $s0, 0x0014($sp) -/* 02F78 80AC5C18 8FB10018 */ lw $s1, 0x0018($sp) -/* 02F7C 80AC5C1C 03E00008 */ jr $ra -/* 02F80 80AC5C20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C24.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C24.s deleted file mode 100644 index 77af0761a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C24.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AC5C24 -/* 02F84 80AC5C24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02F88 80AC5C28 AFA60020 */ sw $a2, 0x0020($sp) -/* 02F8C 80AC5C2C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02F90 80AC5C30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F94 80AC5C34 AFA40018 */ sw $a0, 0x0018($sp) -/* 02F98 80AC5C38 AFA5001C */ sw $a1, 0x001C($sp) -/* 02F9C 80AC5C3C AFA60018 */ sw $a2, 0x0018($sp) -/* 02FA0 80AC5C40 0C042F6F */ jal func_8010BDBC -/* 02FA4 80AC5C44 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 02FA8 80AC5C48 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02FAC 80AC5C4C 1441000F */ bne $v0, $at, .L80AC5C8C -/* 02FB0 80AC5C50 8FA60018 */ lw $a2, 0x0018($sp) -/* 02FB4 80AC5C54 8FA4001C */ lw $a0, 0x001C($sp) -/* 02FB8 80AC5C58 0C041AF2 */ jal func_80106BC8 -/* 02FBC 80AC5C5C AFA60018 */ sw $a2, 0x0018($sp) -/* 02FC0 80AC5C60 1040000A */ beq $v0, $zero, .L80AC5C8C -/* 02FC4 80AC5C64 8FA60018 */ lw $a2, 0x0018($sp) -/* 02FC8 80AC5C68 90CF0252 */ lbu $t7, 0x0252($a2) ## 00000252 -/* 02FCC 80AC5C6C 84CE01FE */ lh $t6, 0x01FE($a2) ## 000001FE -/* 02FD0 80AC5C70 000FC080 */ sll $t8, $t7, 2 -/* 02FD4 80AC5C74 00D8C821 */ addu $t9, $a2, $t8 -/* 02FD8 80AC5C78 A4CE01FC */ sh $t6, 0x01FC($a2) ## 000001FC -/* 02FDC 80AC5C7C 8F280200 */ lw $t0, 0x0200($t9) ## 00000200 -/* 02FE0 80AC5C80 8FA4001C */ lw $a0, 0x001C($sp) -/* 02FE4 80AC5C84 0C042DC8 */ jal func_8010B720 -/* 02FE8 80AC5C88 9505010E */ lhu $a1, 0x010E($t0) ## 0000010E -.L80AC5C8C: -/* 02FEC 80AC5C8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02FF0 80AC5C90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02FF4 80AC5C94 03E00008 */ jr $ra -/* 02FF8 80AC5C98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C9C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C9C.s deleted file mode 100644 index e58f9704e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C9C.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AC5C9C -/* 02FFC 80AC5C9C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03000 80AC5CA0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03004 80AC5CA4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03008 80AC5CA8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0300C 80AC5CAC AFA50024 */ sw $a1, 0x0024($sp) -/* 03010 80AC5CB0 AFA60028 */ sw $a2, 0x0028($sp) -/* 03014 80AC5CB4 0C042F6F */ jal func_8010BDBC -/* 03018 80AC5CB8 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 0301C 80AC5CBC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 03020 80AC5CC0 5441001B */ bnel $v0, $at, .L80AC5D30 -/* 03024 80AC5CC4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03028 80AC5CC8 0C041AF2 */ jal func_80106BC8 -/* 0302C 80AC5CCC 8FA40024 */ lw $a0, 0x0024($sp) -/* 03030 80AC5CD0 50400017 */ beql $v0, $zero, .L80AC5D30 -/* 03034 80AC5CD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03038 80AC5CD8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0303C 80AC5CDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03040 80AC5CE0 0C2B191B */ jal func_80AC646C -/* 03044 80AC5CE4 E60402D0 */ swc1 $f4, 0x02D0($s0) ## 000002D0 -/* 03048 80AC5CE8 920E0252 */ lbu $t6, 0x0252($s0) ## 00000252 -/* 0304C 80AC5CEC 8FA40024 */ lw $a0, 0x0024($sp) -/* 03050 80AC5CF0 000E7880 */ sll $t7, $t6, 2 -/* 03054 80AC5CF4 020FC021 */ addu $t8, $s0, $t7 -/* 03058 80AC5CF8 8F050200 */ lw $a1, 0x0200($t8) ## 00000200 -/* 0305C 80AC5CFC 8CB901B0 */ lw $t9, 0x01B0($a1) ## 000001B0 -/* 03060 80AC5D00 0320F809 */ jalr $ra, $t9 -/* 03064 80AC5D04 00000000 */ nop -/* 03068 80AC5D08 92090252 */ lbu $t1, 0x0252($s0) ## 00000252 -/* 0306C 80AC5D0C 860801FE */ lh $t0, 0x01FE($s0) ## 000001FE -/* 03070 80AC5D10 00095080 */ sll $t2, $t1, 2 -/* 03074 80AC5D14 020A5821 */ addu $t3, $s0, $t2 -/* 03078 80AC5D18 A60801FC */ sh $t0, 0x01FC($s0) ## 000001FC -/* 0307C 80AC5D1C 8D6C0200 */ lw $t4, 0x0200($t3) ## 00000200 -/* 03080 80AC5D20 8FA40024 */ lw $a0, 0x0024($sp) -/* 03084 80AC5D24 0C042DC8 */ jal func_8010B720 -/* 03088 80AC5D28 9585010E */ lhu $a1, 0x010E($t4) ## 0000010E -/* 0308C 80AC5D2C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5D30: -/* 03090 80AC5D30 8FB00018 */ lw $s0, 0x0018($sp) -/* 03094 80AC5D34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03098 80AC5D38 03E00008 */ jr $ra -/* 0309C 80AC5D3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s deleted file mode 100644 index a9725d1b86..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AC5D40 -/* 030A0 80AC5D40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 030A4 80AC5D44 AFBF001C */ sw $ra, 0x001C($sp) -/* 030A8 80AC5D48 AFA50024 */ sw $a1, 0x0024($sp) -/* 030AC 80AC5D4C AFA60028 */ sw $a2, 0x0028($sp) -/* 030B0 80AC5D50 0C00BD04 */ jal Actor_HasParent -/* 030B4 80AC5D54 AFA40020 */ sw $a0, 0x0020($sp) -/* 030B8 80AC5D58 10400005 */ beq $v0, $zero, .L80AC5D70 -/* 030BC 80AC5D5C 8FA40020 */ lw $a0, 0x0020($sp) -/* 030C0 80AC5D60 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 030C4 80AC5D64 AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 030C8 80AC5D68 1000000C */ beq $zero, $zero, .L80AC5D9C -/* 030CC 80AC5D6C A48E01FC */ sh $t6, 0x01FC($a0) ## 000001FC -.L80AC5D70: -/* 030D0 80AC5D70 908F0252 */ lbu $t7, 0x0252($a0) ## 00000252 -/* 030D4 80AC5D74 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 030D8 80AC5D78 44810000 */ mtc1 $at, $f0 ## $f0 = 120.00 -/* 030DC 80AC5D7C 000FC080 */ sll $t8, $t7, 2 -/* 030E0 80AC5D80 0098C821 */ addu $t9, $a0, $t8 -/* 030E4 80AC5D84 8F280200 */ lw $t0, 0x0200($t9) ## 00000200 -/* 030E8 80AC5D88 44070000 */ mfc1 $a3, $f0 -/* 030EC 80AC5D8C 8FA50024 */ lw $a1, 0x0024($sp) -/* 030F0 80AC5D90 8D0601A4 */ lw $a2, 0x01A4($t0) ## 000001A4 -/* 030F4 80AC5D94 0C00BD0D */ jal func_8002F434 -/* 030F8 80AC5D98 E7A00010 */ swc1 $f0, 0x0010($sp) -.L80AC5D9C: -/* 030FC 80AC5D9C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03100 80AC5DA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03104 80AC5DA4 03E00008 */ jr $ra -/* 03108 80AC5DA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s deleted file mode 100644 index 655e05a901..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_80AC5DAC -/* 0310C 80AC5DAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03110 80AC5DB0 AFB00014 */ sw $s0, 0x0014($sp) -/* 03114 80AC5DB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03118 80AC5DB8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0311C 80AC5DBC AFB10018 */ sw $s1, 0x0018($sp) -/* 03120 80AC5DC0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03124 80AC5DC4 AFA60030 */ sw $a2, 0x0030($sp) -/* 03128 80AC5DC8 0C042F6F */ jal func_8010BDBC -/* 0312C 80AC5DCC 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 03130 80AC5DD0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 03134 80AC5DD4 54410042 */ bnel $v0, $at, .L80AC5EE0 -/* 03138 80AC5DD8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0313C 80AC5DDC 0C041AF2 */ jal func_80106BC8 -/* 03140 80AC5DE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03144 80AC5DE4 5040003E */ beql $v0, $zero, .L80AC5EE0 -/* 03148 80AC5DE8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0314C 80AC5DEC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 03150 80AC5DF0 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 03154 80AC5DF4 55C1002D */ bnel $t6, $at, .L80AC5EAC -/* 03158 80AC5DF8 92090252 */ lbu $t1, 0x0252($s0) ## 00000252 -/* 0315C 80AC5DFC 920F0252 */ lbu $t7, 0x0252($s0) ## 00000252 -/* 03160 80AC5E00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03164 80AC5E04 000FC080 */ sll $t8, $t7, 2 -/* 03168 80AC5E08 0218C821 */ addu $t9, $s0, $t8 -/* 0316C 80AC5E0C 8F280200 */ lw $t0, 0x0200($t9) ## 00000200 -/* 03170 80AC5E10 0C2B191B */ jal func_80AC646C -/* 03174 80AC5E14 AFA80020 */ sw $t0, 0x0020($sp) -/* 03178 80AC5E18 92090252 */ lbu $t1, 0x0252($s0) ## 00000252 -/* 0317C 80AC5E1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03180 80AC5E20 00095080 */ sll $t2, $t1, 2 -/* 03184 80AC5E24 020A5821 */ addu $t3, $s0, $t2 -/* 03188 80AC5E28 8D650200 */ lw $a1, 0x0200($t3) ## 00000200 -/* 0318C 80AC5E2C 8CB901B0 */ lw $t9, 0x01B0($a1) ## 000001B0 -/* 03190 80AC5E30 0320F809 */ jalr $ra, $t9 -/* 03194 80AC5E34 00000000 */ nop -/* 03198 80AC5E38 8FAC0020 */ lw $t4, 0x0020($sp) -/* 0319C 80AC5E3C 24010022 */ addiu $at, $zero, 0x0022 ## $at = 00000022 -/* 031A0 80AC5E40 3C038016 */ lui $v1, %hi(gSaveContext) -/* 031A4 80AC5E44 858D001C */ lh $t5, 0x001C($t4) ## 0000001C -/* 031A8 80AC5E48 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 031AC 80AC5E4C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 031B0 80AC5E50 15A10011 */ bne $t5, $at, .L80AC5E98 -/* 031B4 80AC5E54 00000000 */ nop -/* 031B8 80AC5E58 94620EF6 */ lhu $v0, 0x0EF6($v1) ## 8015F556 -/* 031BC 80AC5E5C 240570AB */ addiu $a1, $zero, 0x70AB ## $a1 = 000070AB -/* 031C0 80AC5E60 304E8000 */ andi $t6, $v0, 0x8000 ## $t6 = 00000000 -/* 031C4 80AC5E64 15C0000C */ bne $t6, $zero, .L80AC5E98 -/* 031C8 80AC5E68 344F8000 */ ori $t7, $v0, 0x8000 ## $t7 = 00008000 -/* 031CC 80AC5E6C A46F0EF6 */ sh $t7, 0x0EF6($v1) ## 8015F556 -/* 031D0 80AC5E70 0C042DC8 */ jal func_8010B720 -/* 031D4 80AC5E74 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 031D8 80AC5E78 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 031DC 80AC5E7C A21801EB */ sb $t8, 0x01EB($s0) ## 000001EB -/* 031E0 80AC5E80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031E4 80AC5E84 0C2B0BCB */ jal func_80AC2F2C -/* 031E8 80AC5E88 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 031EC 80AC5E8C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 031F0 80AC5E90 10000012 */ beq $zero, $zero, .L80AC5EDC -/* 031F4 80AC5E94 A60801FC */ sh $t0, 0x01FC($s0) ## 000001FC -.L80AC5E98: -/* 031F8 80AC5E98 0C2B0DEA */ jal func_80AC37A8 -/* 031FC 80AC5E9C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03200 80AC5EA0 1000000F */ beq $zero, $zero, .L80AC5EE0 -/* 03204 80AC5EA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03208 80AC5EA8 92090252 */ lbu $t1, 0x0252($s0) ## 00000252 -.L80AC5EAC: -/* 0320C 80AC5EAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03210 80AC5EB0 00095080 */ sll $t2, $t1, 2 -/* 03214 80AC5EB4 020A5821 */ addu $t3, $s0, $t2 -/* 03218 80AC5EB8 8D650200 */ lw $a1, 0x0200($t3) ## 00000200 -/* 0321C 80AC5EBC 8CB901C4 */ lw $t9, 0x01C4($a1) ## 000001C4 -/* 03220 80AC5EC0 0320F809 */ jalr $ra, $t9 -/* 03224 80AC5EC4 00000000 */ nop -/* 03228 80AC5EC8 240C0011 */ addiu $t4, $zero, 0x0011 ## $t4 = 00000011 -/* 0322C 80AC5ECC A60C01FC */ sh $t4, 0x01FC($s0) ## 000001FC -/* 03230 80AC5ED0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03234 80AC5ED4 0C042DC8 */ jal func_8010B720 -/* 03238 80AC5ED8 2405006B */ addiu $a1, $zero, 0x006B ## $a1 = 0000006B -.L80AC5EDC: -/* 0323C 80AC5EDC 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC5EE0: -/* 03240 80AC5EE0 8FB00014 */ lw $s0, 0x0014($sp) -/* 03244 80AC5EE4 8FB10018 */ lw $s1, 0x0018($sp) -/* 03248 80AC5EE8 03E00008 */ jr $ra -/* 0324C 80AC5EEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5EF0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5EF0.s deleted file mode 100644 index 71f221418d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5EF0.s +++ /dev/null @@ -1,143 +0,0 @@ -.rdata -glabel D_80AC92E8 - .asciz "\x1b[33m★★★ 続けるよ！！ ★★★\x1b[m\n" - .balign 4 - -glabel D_80AC930C - .asciz "\x1b[33m★★★ やめるよ！！ ★★★\x1b[m\n" - .balign 4 - -.text -glabel func_80AC5EF0 -/* 03250 80AC5EF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03254 80AC5EF4 AFB10018 */ sw $s1, 0x0018($sp) -/* 03258 80AC5EF8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0325C 80AC5EFC AFBF001C */ sw $ra, 0x001C($sp) -/* 03260 80AC5F00 AFB00014 */ sw $s0, 0x0014($sp) -/* 03264 80AC5F04 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03268 80AC5F08 AFA60028 */ sw $a2, 0x0028($sp) -/* 0326C 80AC5F0C 0C042F6F */ jal func_8010BDBC -/* 03270 80AC5F10 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 03274 80AC5F14 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03278 80AC5F18 14410043 */ bne $v0, $at, .L80AC6028 -/* 0327C 80AC5F1C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 03280 80AC5F20 0C041AF2 */ jal func_80106BC8 -/* 03284 80AC5F24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03288 80AC5F28 5040006A */ beql $v0, $zero, .L80AC60D4 -/* 0328C 80AC5F2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03290 80AC5F30 0C2B191B */ jal func_80AC646C -/* 03294 80AC5F34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03298 80AC5F38 922E0252 */ lbu $t6, 0x0252($s1) ## 00000252 -/* 0329C 80AC5F3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032A0 80AC5F40 000E7880 */ sll $t7, $t6, 2 -/* 032A4 80AC5F44 022FC021 */ addu $t8, $s1, $t7 -/* 032A8 80AC5F48 8F050200 */ lw $a1, 0x0200($t8) ## 00000200 -/* 032AC 80AC5F4C 8CB901B0 */ lw $t9, 0x01B0($a1) ## 000001B0 -/* 032B0 80AC5F50 0320F809 */ jalr $ra, $t9 -/* 032B4 80AC5F54 00000000 */ nop -/* 032B8 80AC5F58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 032BC 80AC5F5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 032C0 80AC5F60 0C2B0E21 */ jal func_80AC3884 -/* 032C4 80AC5F64 26060014 */ addiu $a2, $s0, 0x0014 ## $a2 = 00000014 -/* 032C8 80AC5F68 14400059 */ bne $v0, $zero, .L80AC60D0 -/* 032CC 80AC5F6C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 032D0 80AC5F70 00501021 */ addu $v0, $v0, $s0 -/* 032D4 80AC5F74 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 032D8 80AC5F78 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 032DC 80AC5F7C 3C0480AD */ lui $a0, %hi(D_80AC92E8) ## $a0 = 80AD0000 -/* 032E0 80AC5F80 10400005 */ beq $v0, $zero, .L80AC5F98 -/* 032E4 80AC5F84 00000000 */ nop -/* 032E8 80AC5F88 10410020 */ beq $v0, $at, .L80AC600C -/* 032EC 80AC5F8C 3C0480AD */ lui $a0, %hi(D_80AC930C) ## $a0 = 80AD0000 -/* 032F0 80AC5F90 1000001E */ beq $zero, $zero, .L80AC600C -/* 032F4 80AC5F94 00000000 */ nop -.L80AC5F98: -/* 032F8 80AC5F98 0C00084C */ jal osSyncPrintf - -/* 032FC 80AC5F9C 248492E8 */ addiu $a0, $a0, %lo(D_80AC92E8) ## $a0 = 80AC92E8 -/* 03300 80AC5FA0 8FA20028 */ lw $v0, 0x0028($sp) -/* 03304 80AC5FA4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 03308 80AC5FA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0330C 80AC5FAC 844800B6 */ lh $t0, 0x00B6($v0) ## 000000B6 -/* 03310 80AC5FB0 8C4A0680 */ lw $t2, 0x0680($v0) ## 00000680 -/* 03314 80AC5FB4 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 03318 80AC5FB8 01014821 */ addu $t1, $t0, $at -/* 0331C 80AC5FBC 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 03320 80AC5FC0 01415825 */ or $t3, $t2, $at ## $t3 = 20000000 -/* 03324 80AC5FC4 A44900B6 */ sh $t1, 0x00B6($v0) ## 000000B6 -/* 03328 80AC5FC8 0C02F124 */ jal func_800BC490 -/* 0332C 80AC5FCC AC4B0680 */ sw $t3, 0x0680($v0) ## 00000680 -/* 03330 80AC5FD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03334 80AC5FD4 9625010E */ lhu $a1, 0x010E($s1) ## 0000010E -/* 03338 80AC5FD8 0C042DA0 */ jal func_8010B680 -/* 0333C 80AC5FDC 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 03340 80AC5FE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03344 80AC5FE4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03348 80AC5FE8 0C2B0E4A */ jal func_80AC3928 -/* 0334C 80AC5FEC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03350 80AC5FF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03354 80AC5FF4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03358 80AC5FF8 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 0335C 80AC5FFC 0C00BCA6 */ jal func_8002F298 -/* 03360 80AC6000 2407FFFF */ addiu $a3, $zero, 0xFFFF ## $a3 = FFFFFFFF -/* 03364 80AC6004 10000033 */ beq $zero, $zero, .L80AC60D4 -/* 03368 80AC6008 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC600C: -/* 0336C 80AC600C 0C00084C */ jal osSyncPrintf - -/* 03370 80AC6010 2484930C */ addiu $a0, $a0, %lo(D_80AC930C) ## $a0 = FFFF930C -/* 03374 80AC6014 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03378 80AC6018 0C2B0DEA */ jal func_80AC37A8 -/* 0337C 80AC601C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03380 80AC6020 1000002C */ beq $zero, $zero, .L80AC60D4 -/* 03384 80AC6024 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC6028: -/* 03388 80AC6028 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0338C 80AC602C 54610029 */ bnel $v1, $at, .L80AC60D4 -/* 03390 80AC6030 8FBF001C */ lw $ra, 0x001C($sp) -/* 03394 80AC6034 0C041AF2 */ jal func_80106BC8 -/* 03398 80AC6038 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0339C 80AC603C 50400025 */ beql $v0, $zero, .L80AC60D4 -/* 033A0 80AC6040 8FBF001C */ lw $ra, 0x001C($sp) -/* 033A4 80AC6044 0C2B191B */ jal func_80AC646C -/* 033A8 80AC6048 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 033AC 80AC604C 922C0252 */ lbu $t4, 0x0252($s1) ## 00000252 -/* 033B0 80AC6050 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 033B4 80AC6054 000C6880 */ sll $t5, $t4, 2 -/* 033B8 80AC6058 022D7021 */ addu $t6, $s1, $t5 -/* 033BC 80AC605C 8DC50200 */ lw $a1, 0x0200($t6) ## 00000200 -/* 033C0 80AC6060 8CB901B0 */ lw $t9, 0x01B0($a1) ## 000001B0 -/* 033C4 80AC6064 0320F809 */ jalr $ra, $t9 -/* 033C8 80AC6068 00000000 */ nop -/* 033CC 80AC606C 8FA20028 */ lw $v0, 0x0028($sp) -/* 033D0 80AC6070 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 033D4 80AC6074 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 033D8 80AC6078 844F00B6 */ lh $t7, 0x00B6($v0) ## 000000B6 -/* 033DC 80AC607C 8C480680 */ lw $t0, 0x0680($v0) ## 00000680 -/* 033E0 80AC6080 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 033E4 80AC6084 01E1C021 */ addu $t8, $t7, $at -/* 033E8 80AC6088 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 033EC 80AC608C 01014825 */ or $t1, $t0, $at ## $t1 = 20000000 -/* 033F0 80AC6090 A45800B6 */ sh $t8, 0x00B6($v0) ## 000000B6 -/* 033F4 80AC6094 0C02F124 */ jal func_800BC490 -/* 033F8 80AC6098 AC490680 */ sw $t1, 0x0680($v0) ## 00000680 -/* 033FC 80AC609C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03400 80AC60A0 9625010E */ lhu $a1, 0x010E($s1) ## 0000010E -/* 03404 80AC60A4 0C042DA0 */ jal func_8010B680 -/* 03408 80AC60A8 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 0340C 80AC60AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03410 80AC60B0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03414 80AC60B4 0C2B0E4A */ jal func_80AC3928 -/* 03418 80AC60B8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0341C 80AC60BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03420 80AC60C0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03424 80AC60C4 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 03428 80AC60C8 0C00BCA6 */ jal func_8002F298 -/* 0342C 80AC60CC 2407FFFF */ addiu $a3, $zero, 0xFFFF ## $a3 = FFFFFFFF -.L80AC60D0: -/* 03430 80AC60D0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC60D4: -/* 03434 80AC60D4 8FB00014 */ lw $s0, 0x0014($sp) -/* 03438 80AC60D8 8FB10018 */ lw $s1, 0x0018($sp) -/* 0343C 80AC60DC 03E00008 */ jr $ra -/* 03440 80AC60E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s deleted file mode 100644 index 11733b558f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AC60E4 -/* 03444 80AC60E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03448 80AC60E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0344C 80AC60EC AFA40018 */ sw $a0, 0x0018($sp) -/* 03450 80AC60F0 AFA5001C */ sw $a1, 0x001C($sp) -/* 03454 80AC60F4 AFA60020 */ sw $a2, 0x0020($sp) -/* 03458 80AC60F8 0C042F6F */ jal func_8010BDBC -/* 0345C 80AC60FC 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 03460 80AC6100 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 03464 80AC6104 5441000D */ bnel $v0, $at, .L80AC613C -/* 03468 80AC6108 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0346C 80AC610C 0C041AF2 */ jal func_80106BC8 -/* 03470 80AC6110 8FA4001C */ lw $a0, 0x001C($sp) -/* 03474 80AC6114 10400008 */ beq $v0, $zero, .L80AC6138 -/* 03478 80AC6118 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0347C 80AC611C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 03480 80AC6120 944E0F16 */ lhu $t6, 0x0F16($v0) ## 8015F576 -/* 03484 80AC6124 8FA4001C */ lw $a0, 0x001C($sp) -/* 03488 80AC6128 8FA50018 */ lw $a1, 0x0018($sp) -/* 0348C 80AC612C 35CF1000 */ ori $t7, $t6, 0x1000 ## $t7 = 00001000 -/* 03490 80AC6130 0C2B0E6B */ jal func_80AC39AC -/* 03494 80AC6134 A44F0F16 */ sh $t7, 0x0F16($v0) ## 8015F576 -.L80AC6138: -/* 03498 80AC6138 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC613C: -/* 0349C 80AC613C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 034A0 80AC6140 03E00008 */ jr $ra -/* 034A4 80AC6144 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s deleted file mode 100644 index e801f31259..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80AC6148 -/* 034A8 80AC6148 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 034AC 80AC614C AFBF0014 */ sw $ra, 0x0014($sp) -/* 034B0 80AC6150 AFA40018 */ sw $a0, 0x0018($sp) -/* 034B4 80AC6154 AFA5001C */ sw $a1, 0x001C($sp) -/* 034B8 80AC6158 AFA60020 */ sw $a2, 0x0020($sp) -/* 034BC 80AC615C 0C042F6F */ jal func_8010BDBC -/* 034C0 80AC6160 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 034C4 80AC6164 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 034C8 80AC6168 54410010 */ bnel $v0, $at, .L80AC61AC -/* 034CC 80AC616C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 034D0 80AC6170 0C041AF2 */ jal func_80106BC8 -/* 034D4 80AC6174 8FA4001C */ lw $a0, 0x001C($sp) -/* 034D8 80AC6178 1040000B */ beq $v0, $zero, .L80AC61A8 -/* 034DC 80AC617C 8FAF0018 */ lw $t7, 0x0018($sp) -/* 034E0 80AC6180 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 -/* 034E4 80AC6184 A5EE01FC */ sh $t6, 0x01FC($t7) ## 000001FC -/* 034E8 80AC6188 8FA4001C */ lw $a0, 0x001C($sp) -/* 034EC 80AC618C 0C042DC8 */ jal func_8010B720 -/* 034F0 80AC6190 24053012 */ addiu $a1, $zero, 0x3012 ## $a1 = 00003012 -/* 034F4 80AC6194 3C028016 */ lui $v0, %hi(gSaveContext) -/* 034F8 80AC6198 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 034FC 80AC619C 94580F16 */ lhu $t8, 0x0F16($v0) ## 8015F576 -/* 03500 80AC61A0 37191000 */ ori $t9, $t8, 0x1000 ## $t9 = 00001000 -/* 03504 80AC61A4 A4590F16 */ sh $t9, 0x0F16($v0) ## 8015F576 -.L80AC61A8: -/* 03508 80AC61A8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC61AC: -/* 0350C 80AC61AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03510 80AC61B0 03E00008 */ jr $ra -/* 03514 80AC61B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC61B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC61B8.s deleted file mode 100644 index 0f6a38eeec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC61B8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AC61B8 -/* 03518 80AC61B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0351C 80AC61BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03520 80AC61C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 03524 80AC61C4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03528 80AC61C8 AFA60020 */ sw $a2, 0x0020($sp) -/* 0352C 80AC61CC 0C042F6F */ jal func_8010BDBC -/* 03530 80AC61D0 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 03534 80AC61D4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 03538 80AC61D8 54410008 */ bnel $v0, $at, .L80AC61FC -/* 0353C 80AC61DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03540 80AC61E0 0C041AF2 */ jal func_80106BC8 -/* 03544 80AC61E4 8FA4001C */ lw $a0, 0x001C($sp) -/* 03548 80AC61E8 10400003 */ beq $v0, $zero, .L80AC61F8 -/* 0354C 80AC61EC 8FA4001C */ lw $a0, 0x001C($sp) -/* 03550 80AC61F0 0C2B0E6B */ jal func_80AC39AC -/* 03554 80AC61F4 8FA50018 */ lw $a1, 0x0018($sp) -.L80AC61F8: -/* 03558 80AC61F8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC61FC: -/* 0355C 80AC61FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03560 80AC6200 03E00008 */ jr $ra -/* 03564 80AC6204 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6208.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6208.s deleted file mode 100644 index 525890d499..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6208.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AC6208 -/* 03568 80AC6208 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0356C 80AC620C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03570 80AC6210 AFA40018 */ sw $a0, 0x0018($sp) -/* 03574 80AC6214 AFA5001C */ sw $a1, 0x001C($sp) -/* 03578 80AC6218 AFA60020 */ sw $a2, 0x0020($sp) -/* 0357C 80AC621C 0C042F6F */ jal func_8010BDBC -/* 03580 80AC6220 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 03584 80AC6224 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 03588 80AC6228 54410008 */ bnel $v0, $at, .L80AC624C -/* 0358C 80AC622C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03590 80AC6230 0C041AF2 */ jal func_80106BC8 -/* 03594 80AC6234 8FA4001C */ lw $a0, 0x001C($sp) -/* 03598 80AC6238 10400003 */ beq $v0, $zero, .L80AC6248 -/* 0359C 80AC623C 8FA4001C */ lw $a0, 0x001C($sp) -/* 035A0 80AC6240 0C2B13B2 */ jal func_80AC4EC8 -/* 035A4 80AC6244 8FA50018 */ lw $a1, 0x0018($sp) -.L80AC6248: -/* 035A8 80AC6248 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC624C: -/* 035AC 80AC624C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 035B0 80AC6250 03E00008 */ jr $ra -/* 035B4 80AC6254 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s deleted file mode 100644 index 45f630ee41..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AC6258 -/* 035B8 80AC6258 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 035BC 80AC625C AFBF0014 */ sw $ra, 0x0014($sp) -/* 035C0 80AC6260 AFA40018 */ sw $a0, 0x0018($sp) -/* 035C4 80AC6264 AFA5001C */ sw $a1, 0x001C($sp) -/* 035C8 80AC6268 AFA60020 */ sw $a2, 0x0020($sp) -/* 035CC 80AC626C 0C042F6F */ jal func_8010BDBC -/* 035D0 80AC6270 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 035D4 80AC6274 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 035D8 80AC6278 5441000F */ bnel $v0, $at, .L80AC62B8 -/* 035DC 80AC627C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 035E0 80AC6280 0C041AF2 */ jal func_80106BC8 -/* 035E4 80AC6284 8FA4001C */ lw $a0, 0x001C($sp) -/* 035E8 80AC6288 1040000A */ beq $v0, $zero, .L80AC62B4 -/* 035EC 80AC628C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 035F0 80AC6290 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 035F4 80AC6294 944E0EF4 */ lhu $t6, 0x0EF4($v0) ## 8015F554 -/* 035F8 80AC6298 8FA50018 */ lw $a1, 0x0018($sp) -/* 035FC 80AC629C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 03600 80AC62A0 35CF0400 */ ori $t7, $t6, 0x0400 ## $t7 = 00000400 -/* 03604 80AC62A4 A44F0EF4 */ sh $t7, 0x0EF4($v0) ## 8015F554 -/* 03608 80AC62A8 A0B80252 */ sb $t8, 0x0252($a1) ## 00000252 -/* 0360C 80AC62AC 0C2B13B2 */ jal func_80AC4EC8 -/* 03610 80AC62B0 8FA4001C */ lw $a0, 0x001C($sp) -.L80AC62B4: -/* 03614 80AC62B4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AC62B8: -/* 03618 80AC62B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0361C 80AC62BC 03E00008 */ jr $ra -/* 03620 80AC62C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62C4.s deleted file mode 100644 index 78ff5b3d08..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62C4.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AC62C4 -/* 03624 80AC62C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03628 80AC62C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0362C 80AC62CC AFA5001C */ sw $a1, 0x001C($sp) -/* 03630 80AC62D0 0C042DC8 */ jal func_8010B720 -/* 03634 80AC62D4 240571B2 */ addiu $a1, $zero, 0x71B2 ## $a1 = 000071B2 -/* 03638 80AC62D8 8FAF001C */ lw $t7, 0x001C($sp) -/* 0363C 80AC62DC 240E001A */ addiu $t6, $zero, 0x001A ## $t6 = 0000001A -/* 03640 80AC62E0 A5EE01FC */ sh $t6, 0x01FC($t7) ## 000001FC -/* 03644 80AC62E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03648 80AC62E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0364C 80AC62EC 03E00008 */ jr $ra -/* 03650 80AC62F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62F4.s deleted file mode 100644 index 80a01aab21..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62F4.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80AC62F4 -/* 03654 80AC62F4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03658 80AC62F8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0365C 80AC62FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03660 80AC6300 AFBF001C */ sw $ra, 0x001C($sp) -/* 03664 80AC6304 AFA5002C */ sw $a1, 0x002C($sp) -/* 03668 80AC6308 AFA60030 */ sw $a2, 0x0030($sp) -/* 0366C 80AC630C 0C042F6F */ jal func_8010BDBC -/* 03670 80AC6310 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 03674 80AC6314 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 03678 80AC6318 54410016 */ bnel $v0, $at, .L80AC6374 -/* 0367C 80AC631C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03680 80AC6320 0C041AF2 */ jal func_80106BC8 -/* 03684 80AC6324 8FA4002C */ lw $a0, 0x002C($sp) -/* 03688 80AC6328 50400012 */ beql $v0, $zero, .L80AC6374 -/* 0368C 80AC632C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03690 80AC6330 920E0252 */ lbu $t6, 0x0252($s0) ## 00000252 -/* 03694 80AC6334 8FA4002C */ lw $a0, 0x002C($sp) -/* 03698 80AC6338 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0369C 80AC633C 000E7880 */ sll $t7, $t6, 2 -/* 036A0 80AC6340 020FC021 */ addu $t8, $s0, $t7 -/* 036A4 80AC6344 8F060200 */ lw $a2, 0x0200($t8) ## 00000200 -/* 036A8 80AC6348 0C2B13B2 */ jal func_80AC4EC8 -/* 036AC 80AC634C AFA60024 */ sw $a2, 0x0024($sp) -/* 036B0 80AC6350 8FA50024 */ lw $a1, 0x0024($sp) -/* 036B4 80AC6354 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 036B8 80AC6358 A2000251 */ sb $zero, 0x0251($s0) ## 00000251 -/* 036BC 80AC635C E60402D0 */ swc1 $f4, 0x02D0($s0) ## 000002D0 -/* 036C0 80AC6360 8CB901AC */ lw $t9, 0x01AC($a1) ## 000001AC -/* 036C4 80AC6364 8FA4002C */ lw $a0, 0x002C($sp) -/* 036C8 80AC6368 0320F809 */ jalr $ra, $t9 -/* 036CC 80AC636C 00000000 */ nop -/* 036D0 80AC6370 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC6374: -/* 036D4 80AC6374 8FB00018 */ lw $s0, 0x0018($sp) -/* 036D8 80AC6378 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 036DC 80AC637C 03E00008 */ jr $ra -/* 036E0 80AC6380 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6384.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6384.s deleted file mode 100644 index 377d9b53ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6384.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_80AC6384 -/* 036E4 80AC6384 90820252 */ lbu $v0, 0x0252($a0) ## 00000252 -/* 036E8 80AC6388 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 036EC 80AC638C 3C0880AD */ lui $t0, %hi(D_80AC89DC) ## $t0 = 80AD0000 -/* 036F0 80AC6390 0002C0C0 */ sll $t8, $v0, 3 -/* 036F4 80AC6394 000E7980 */ sll $t7, $t6, 6 -/* 036F8 80AC6398 01F8C821 */ addu $t9, $t7, $t8 -/* 036FC 80AC639C 250889DC */ addiu $t0, $t0, %lo(D_80AC89DC) ## $t0 = 80AC89DC -/* 03700 80AC63A0 03281821 */ addu $v1, $t9, $t0 -/* 03704 80AC63A4 846F0002 */ lh $t7, 0x0002($v1) ## 00000002 -/* 03708 80AC63A8 00025883 */ sra $t3, $v0, 2 -/* 0370C 80AC63AC 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 03710 80AC63B0 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 03714 80AC63B4 000C6880 */ sll $t5, $t4, 2 -/* 03718 80AC63B8 01AC6823 */ subu $t5, $t5, $t4 -/* 0371C 80AC63BC 468020A0 */ cvt.s.w $f2, $f4 -/* 03720 80AC63C0 3C0E80AD */ lui $t6, %hi(D_80AC8D6C) ## $t6 = 80AD0000 -/* 03724 80AC63C4 25CE8D6C */ addiu $t6, $t6, %lo(D_80AC8D6C) ## $t6 = 80AC8D6C -/* 03728 80AC63C8 000D6880 */ sll $t5, $t5, 2 -/* 0372C 80AC63CC 84780004 */ lh $t8, 0x0004($v1) ## 00000004 -/* 03730 80AC63D0 01AE3021 */ addu $a2, $t5, $t6 -/* 03734 80AC63D4 C4C60000 */ lwc1 $f6, 0x0000($a2) ## 00000000 -/* 03738 80AC63D8 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0373C 80AC63DC C48C02D0 */ lwc1 $f12, 0x02D0($a0) ## 000002D0 -/* 03740 80AC63E0 46023201 */ sub.s $f8, $f6, $f2 -/* 03744 80AC63E4 C4C60004 */ lwc1 $f6, 0x0004($a2) ## 00000004 -/* 03748 80AC63E8 84790006 */ lh $t9, 0x0006($v1) ## 00000006 -/* 0374C 80AC63EC 46802420 */ cvt.s.w $f16, $f4 -/* 03750 80AC63F0 460C4282 */ mul.s $f10, $f8, $f12 -/* 03754 80AC63F4 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 03758 80AC63F8 00024880 */ sll $t1, $v0, 2 -/* 0375C 80AC63FC 00895021 */ addu $t2, $a0, $t1 -/* 03760 80AC6400 8D450200 */ lw $a1, 0x0200($t2) ## 00000200 -/* 03764 80AC6404 46103201 */ sub.s $f8, $f6, $f16 -/* 03768 80AC6408 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0376C 80AC640C 46025000 */ add.s $f0, $f10, $f2 -/* 03770 80AC6410 460C4282 */ mul.s $f10, $f8, $f12 -/* 03774 80AC6414 C4C80008 */ lwc1 $f8, 0x0008($a2) ## 00000008 -/* 03778 80AC6418 468021A0 */ cvt.s.w $f6, $f4 -/* 0377C 80AC641C 46105380 */ add.s $f14, $f10, $f16 -/* 03780 80AC6420 E7A60000 */ swc1 $f6, 0x0000($sp) -/* 03784 80AC6424 C7AA0000 */ lwc1 $f10, 0x0000($sp) -/* 03788 80AC6428 8C880220 */ lw $t0, 0x0220($a0) ## 00000220 -/* 0378C 80AC642C 460A4101 */ sub.s $f4, $f8, $f10 -/* 03790 80AC6430 C5080024 */ lwc1 $f8, 0x0024($t0) ## 80AC8A00 -/* 03794 80AC6434 460C2182 */ mul.s $f6, $f4, $f12 -/* 03798 80AC6438 46004100 */ add.s $f4, $f8, $f0 -/* 0379C 80AC643C E4A40024 */ swc1 $f4, 0x0024($a1) ## 00000024 -/* 037A0 80AC6440 8C890220 */ lw $t1, 0x0220($a0) ## 00000220 -/* 037A4 80AC6444 460A3480 */ add.s $f18, $f6, $f10 -/* 037A8 80AC6448 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 -/* 037AC 80AC644C 460E3280 */ add.s $f10, $f6, $f14 -/* 037B0 80AC6450 E4AA0028 */ swc1 $f10, 0x0028($a1) ## 00000028 -/* 037B4 80AC6454 8C8A0220 */ lw $t2, 0x0220($a0) ## 00000220 -/* 037B8 80AC6458 C548002C */ lwc1 $f8, 0x002C($t2) ## 0000002C -/* 037BC 80AC645C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 037C0 80AC6460 46124100 */ add.s $f4, $f8, $f18 -/* 037C4 80AC6464 03E00008 */ jr $ra -/* 037C8 80AC6468 E4A4002C */ swc1 $f4, 0x002C($a1) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC646C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC646C.s deleted file mode 100644 index b35e416886..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC646C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AC646C -/* 037CC 80AC646C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 037D0 80AC6470 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 037D4 80AC6474 AFBF0014 */ sw $ra, 0x0014($sp) -/* 037D8 80AC6478 0C2B18E1 */ jal func_80AC6384 -/* 037DC 80AC647C E48402D0 */ swc1 $f4, 0x02D0($a0) ## 000002D0 -/* 037E0 80AC6480 8FBF0014 */ lw $ra, 0x0014($sp) -/* 037E4 80AC6484 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 037E8 80AC6488 03E00008 */ jr $ra -/* 037EC 80AC648C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s deleted file mode 100644 index b67a3edced..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s +++ /dev/null @@ -1,48 +0,0 @@ -.late_rodata -glabel D_80AC9604 - .float 0.85 - -.text -glabel func_80AC6490 -/* 037F0 80AC6490 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 037F4 80AC6494 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 037F8 80AC6498 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 037FC 80AC649C AFB00018 */ sw $s0, 0x0018($sp) -/* 03800 80AC64A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03804 80AC64A4 AFBF001C */ sw $ra, 0x001C($sp) -/* 03808 80AC64A8 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 -/* 0380C 80AC64AC 44050000 */ mfc1 $a1, $f0 -/* 03810 80AC64B0 44060000 */ mfc1 $a2, $f0 -/* 03814 80AC64B4 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A -/* 03818 80AC64B8 0C01E107 */ jal Math_ApproachF - -/* 0381C 80AC64BC 248402D0 */ addiu $a0, $a0, 0x02D0 ## $a0 = 000002D0 -/* 03820 80AC64C0 3C0180AD */ lui $at, %hi(D_80AC9604) ## $at = 80AD0000 -/* 03824 80AC64C4 C4269604 */ lwc1 $f6, %lo(D_80AC9604)($at) -/* 03828 80AC64C8 C60402D0 */ lwc1 $f4, 0x02D0($s0) ## 000002D0 -/* 0382C 80AC64CC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03830 80AC64D0 4604303E */ c.le.s $f6, $f4 -/* 03834 80AC64D4 00000000 */ nop -/* 03838 80AC64D8 45000004 */ bc1f .L80AC64EC -/* 0383C 80AC64DC 00000000 */ nop -/* 03840 80AC64E0 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 03844 80AC64E4 00000000 */ nop -/* 03848 80AC64E8 E60802D0 */ swc1 $f8, 0x02D0($s0) ## 000002D0 -.L80AC64EC: -/* 0384C 80AC64EC 0C2B18E1 */ jal func_80AC6384 -/* 03850 80AC64F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03854 80AC64F4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03858 80AC64F8 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 0385C 80AC64FC C61002D0 */ lwc1 $f16, 0x02D0($s0) ## 000002D0 -/* 03860 80AC6500 8FBF001C */ lw $ra, 0x001C($sp) -/* 03864 80AC6504 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03868 80AC6508 46105032 */ c.eq.s $f10, $f16 -/* 0386C 80AC650C 00000000 */ nop -/* 03870 80AC6510 45000003 */ bc1f .L80AC6520 -/* 03874 80AC6514 00000000 */ nop -/* 03878 80AC6518 10000001 */ beq $zero, $zero, .L80AC6520 -/* 0387C 80AC651C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AC6520: -/* 03880 80AC6520 8FB00018 */ lw $s0, 0x0018($sp) -/* 03884 80AC6524 03E00008 */ jr $ra -/* 03888 80AC6528 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s deleted file mode 100644 index 40a4e41cd3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s +++ /dev/null @@ -1,44 +0,0 @@ -.late_rodata -glabel D_80AC9608 - .float 0.15 - -.text -glabel func_80AC652C -/* 0388C 80AC652C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03890 80AC6530 AFB00018 */ sw $s0, 0x0018($sp) -/* 03894 80AC6534 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03898 80AC6538 AFBF001C */ sw $ra, 0x001C($sp) -/* 0389C 80AC653C 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 -/* 038A0 80AC6540 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A -/* 038A4 80AC6544 248402D0 */ addiu $a0, $a0, 0x02D0 ## $a0 = 000002D0 -/* 038A8 80AC6548 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 038AC 80AC654C 0C01E107 */ jal Math_ApproachF - -/* 038B0 80AC6550 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 038B4 80AC6554 3C0180AD */ lui $at, %hi(D_80AC9608) ## $at = 80AD0000 -/* 038B8 80AC6558 C4249608 */ lwc1 $f4, %lo(D_80AC9608)($at) -/* 038BC 80AC655C C60602D0 */ lwc1 $f6, 0x02D0($s0) ## 000002D0 -/* 038C0 80AC6560 4604303E */ c.le.s $f6, $f4 -/* 038C4 80AC6564 00000000 */ nop -/* 038C8 80AC6568 45000004 */ bc1f .L80AC657C -/* 038CC 80AC656C 00000000 */ nop -/* 038D0 80AC6570 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 038D4 80AC6574 00000000 */ nop -/* 038D8 80AC6578 E60802D0 */ swc1 $f8, 0x02D0($s0) ## 000002D0 -.L80AC657C: -/* 038DC 80AC657C 0C2B18E1 */ jal func_80AC6384 -/* 038E0 80AC6580 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 038E4 80AC6584 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 038E8 80AC6588 C61002D0 */ lwc1 $f16, 0x02D0($s0) ## 000002D0 -/* 038EC 80AC658C 8FBF001C */ lw $ra, 0x001C($sp) -/* 038F0 80AC6590 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 038F4 80AC6594 46105032 */ c.eq.s $f10, $f16 -/* 038F8 80AC6598 00000000 */ nop -/* 038FC 80AC659C 45000003 */ bc1f .L80AC65AC -/* 03900 80AC65A0 00000000 */ nop -/* 03904 80AC65A4 10000001 */ beq $zero, $zero, .L80AC65AC -/* 03908 80AC65A8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AC65AC: -/* 0390C 80AC65AC 8FB00018 */ lw $s0, 0x0018($sp) -/* 03910 80AC65B0 03E00008 */ jr $ra -/* 03914 80AC65B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC65B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC65B8.s deleted file mode 100644 index beb7004af0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC65B8.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_80AC65B8 -/* 03918 80AC65B8 27BDFFF8 */ addiu $sp, $sp, 0xFFF8 ## $sp = FFFFFFF8 -/* 0391C 80AC65BC AFB00004 */ sw $s0, 0x0004($sp) -/* 03920 80AC65C0 24820200 */ addiu $v0, $a0, 0x0200 ## $v0 = 00000200 -/* 03924 80AC65C4 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 -/* 03928 80AC65C8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 0392C 80AC65CC 240D000E */ addiu $t5, $zero, 0x000E ## $t5 = 0000000E -/* 03930 80AC65D0 240C0018 */ addiu $t4, $zero, 0x0018 ## $t4 = 00000018 -/* 03934 80AC65D4 240B000D */ addiu $t3, $zero, 0x000D ## $t3 = 0000000D -/* 03938 80AC65D8 240A000C */ addiu $t2, $zero, 0x000C ## $t2 = 0000000C -/* 0393C 80AC65DC 2409000B */ addiu $t1, $zero, 0x000B ## $t1 = 0000000B -/* 03940 80AC65E0 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 03944 80AC65E4 24070009 */ addiu $a3, $zero, 0x0009 ## $a3 = 00000009 -.L80AC65E8: -/* 03948 80AC65E8 8C450000 */ lw $a1, 0x0000($v0) ## 00000200 -/* 0394C 80AC65EC 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 03950 80AC65F0 50A0001C */ beql $a1, $zero, .L80AC6664 -/* 03954 80AC65F4 8C450004 */ lw $a1, 0x0004($v0) ## 00000204 -/* 03958 80AC65F8 848601FC */ lh $a2, 0x01FC($a0) ## 000001FC -/* 0395C 80AC65FC 50E60013 */ beql $a3, $a2, .L80AC664C -/* 03960 80AC6600 908F0252 */ lbu $t7, 0x0252($a0) ## 00000252 -/* 03964 80AC6604 51060011 */ beql $t0, $a2, .L80AC664C -/* 03968 80AC6608 908F0252 */ lbu $t7, 0x0252($a0) ## 00000252 -/* 0396C 80AC660C 5126000F */ beql $t1, $a2, .L80AC664C -/* 03970 80AC6610 908F0252 */ lbu $t7, 0x0252($a0) ## 00000252 -/* 03974 80AC6614 5146000D */ beql $t2, $a2, .L80AC664C -/* 03978 80AC6618 908F0252 */ lbu $t7, 0x0252($a0) ## 00000252 -/* 0397C 80AC661C 5166000B */ beql $t3, $a2, .L80AC664C -/* 03980 80AC6620 908F0252 */ lbu $t7, 0x0252($a0) ## 00000252 -/* 03984 80AC6624 51860009 */ beql $t4, $a2, .L80AC664C -/* 03988 80AC6628 908F0252 */ lbu $t7, 0x0252($a0) ## 00000252 -/* 0398C 80AC662C 51A60007 */ beql $t5, $a2, .L80AC664C -/* 03990 80AC6630 908F0252 */ lbu $t7, 0x0252($a0) ## 00000252 -/* 03994 80AC6634 908E0251 */ lbu $t6, 0x0251($a0) ## 00000251 -/* 03998 80AC6638 55C00004 */ bnel $t6, $zero, .L80AC664C -/* 0399C 80AC663C 908F0252 */ lbu $t7, 0x0252($a0) ## 00000252 -/* 039A0 80AC6640 10000007 */ beq $zero, $zero, .L80AC6660 -/* 039A4 80AC6644 A4A001B4 */ sh $zero, 0x01B4($a1) ## 000001B4 -/* 039A8 80AC6648 908F0252 */ lbu $t7, 0x0252($a0) ## 00000252 -.L80AC664C: -/* 039AC 80AC664C 546F0004 */ bnel $v1, $t7, .L80AC6660 -/* 039B0 80AC6650 A4A001B4 */ sh $zero, 0x01B4($a1) ## 000001B4 -/* 039B4 80AC6654 10000002 */ beq $zero, $zero, .L80AC6660 -/* 039B8 80AC6658 A4B001B4 */ sh $s0, 0x01B4($a1) ## 000001B4 -/* 039BC 80AC665C A4A001B4 */ sh $zero, 0x01B4($a1) ## 000001B4 -.L80AC6660: -/* 039C0 80AC6660 8C450004 */ lw $a1, 0x0004($v0) ## 00000204 -.L80AC6664: -/* 039C4 80AC6664 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000204 -/* 039C8 80AC6668 50A0001D */ beql $a1, $zero, .L80AC66E0 -/* 039CC 80AC666C 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000002 -/* 039D0 80AC6670 848601FC */ lh $a2, 0x01FC($a0) ## 000001FC -/* 039D4 80AC6674 50E60013 */ beql $a3, $a2, .L80AC66C4 -/* 039D8 80AC6678 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -/* 039DC 80AC667C 51060011 */ beql $t0, $a2, .L80AC66C4 -/* 039E0 80AC6680 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -/* 039E4 80AC6684 5126000F */ beql $t1, $a2, .L80AC66C4 -/* 039E8 80AC6688 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -/* 039EC 80AC668C 5146000D */ beql $t2, $a2, .L80AC66C4 -/* 039F0 80AC6690 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -/* 039F4 80AC6694 5166000B */ beql $t3, $a2, .L80AC66C4 -/* 039F8 80AC6698 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -/* 039FC 80AC669C 51860009 */ beql $t4, $a2, .L80AC66C4 -/* 03A00 80AC66A0 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -/* 03A04 80AC66A4 51A60007 */ beql $t5, $a2, .L80AC66C4 -/* 03A08 80AC66A8 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -/* 03A0C 80AC66AC 90980251 */ lbu $t8, 0x0251($a0) ## 00000251 -/* 03A10 80AC66B0 57000004 */ bnel $t8, $zero, .L80AC66C4 -/* 03A14 80AC66B4 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -/* 03A18 80AC66B8 10000008 */ beq $zero, $zero, .L80AC66DC -/* 03A1C 80AC66BC A4A001B4 */ sh $zero, 0x01B4($a1) ## 000001B4 -/* 03A20 80AC66C0 908E0252 */ lbu $t6, 0x0252($a0) ## 00000252 -.L80AC66C4: -/* 03A24 80AC66C4 24790001 */ addiu $t9, $v1, 0x0001 ## $t9 = 00000003 -/* 03A28 80AC66C8 572E0004 */ bnel $t9, $t6, .L80AC66DC -/* 03A2C 80AC66CC A4A001B4 */ sh $zero, 0x01B4($a1) ## 000001B4 -/* 03A30 80AC66D0 10000002 */ beq $zero, $zero, .L80AC66DC -/* 03A34 80AC66D4 A4B001B4 */ sh $s0, 0x01B4($a1) ## 000001B4 -/* 03A38 80AC66D8 A4A001B4 */ sh $zero, 0x01B4($a1) ## 000001B4 -.L80AC66DC: -/* 03A3C 80AC66DC 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000004 -.L80AC66E0: -/* 03A40 80AC66E0 1461FFC1 */ bne $v1, $at, .L80AC65E8 -/* 03A44 80AC66E4 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000208 -/* 03A48 80AC66E8 8FB00004 */ lw $s0, 0x0004($sp) -/* 03A4C 80AC66EC 03E00008 */ jr $ra -/* 03A50 80AC66F0 27BD0008 */ addiu $sp, $sp, 0x0008 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC66F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC66F4.s deleted file mode 100644 index 6383c85a2b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC66F4.s +++ /dev/null @@ -1,64 +0,0 @@ -.late_rodata -glabel D_80AC960C - .float 0.05 - -glabel D_80AC9610 - .float 0.05 - -.text -glabel func_80AC66F4 -/* 03A54 80AC66F4 908E0250 */ lbu $t6, 0x0250($a0) ## 00000250 -/* 03A58 80AC66F8 C480024C */ lwc1 $f0, 0x024C($a0) ## 0000024C -/* 03A5C 80AC66FC 3C0180AD */ lui $at, %hi(D_80AC9610) ## $at = 80AD0000 -/* 03A60 80AC6700 15C00010 */ bne $t6, $zero, .L80AC6744 -/* 03A64 80AC6704 00000000 */ nop -/* 03A68 80AC6708 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03A6C 80AC670C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 03A70 80AC6710 3C0180AD */ lui $at, %hi(D_80AC960C) ## $at = 80AD0000 -/* 03A74 80AC6714 C424960C */ lwc1 $f4, %lo(D_80AC960C)($at) -/* 03A78 80AC6718 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03A7C 80AC671C 46040000 */ add.s $f0, $f0, $f4 -/* 03A80 80AC6720 4600103E */ c.le.s $f2, $f0 -/* 03A84 80AC6724 00000000 */ nop -/* 03A88 80AC6728 45020004 */ bc1fl .L80AC673C -/* 03A8C 80AC672C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 03A90 80AC6730 46001006 */ mov.s $f0, $f2 -/* 03A94 80AC6734 A08F0250 */ sb $t7, 0x0250($a0) ## 00000250 -/* 03A98 80AC6738 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -.L80AC673C: -/* 03A9C 80AC673C 1000000B */ beq $zero, $zero, .L80AC676C -/* 03AA0 80AC6740 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -.L80AC6744: -/* 03AA4 80AC6744 C4269610 */ lwc1 $f6, %lo(D_80AC9610)($at) -/* 03AA8 80AC6748 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 03AAC 80AC674C 46060001 */ sub.s $f0, $f0, $f6 -/* 03AB0 80AC6750 4602003E */ c.le.s $f0, $f2 -/* 03AB4 80AC6754 00000000 */ nop -/* 03AB8 80AC6758 45020004 */ bc1fl .L80AC676C -/* 03ABC 80AC675C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 03AC0 80AC6760 46001006 */ mov.s $f0, $f2 -/* 03AC4 80AC6764 A0800250 */ sb $zero, 0x0250($a0) ## 00000250 -/* 03AC8 80AC6768 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -.L80AC676C: -/* 03ACC 80AC676C 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 -/* 03AD0 80AC6770 4600120D */ trunc.w.s $f8, $f2 -/* 03AD4 80AC6774 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 03AD8 80AC6778 46005402 */ mul.s $f16, $f10, $f0 -/* 03ADC 80AC677C 240D0050 */ addiu $t5, $zero, 0x0050 ## $t5 = 00000050 -/* 03AE0 80AC6780 44024000 */ mfc1 $v0, $f8 -/* 03AE4 80AC6784 E480024C */ swc1 $f0, 0x024C($a0) ## 0000024C -/* 03AE8 80AC6788 0002C823 */ subu $t9, $zero, $v0 -/* 03AEC 80AC678C 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 03AF0 80AC6790 4600848D */ trunc.w.s $f18, $f16 -/* 03AF4 80AC6794 01A27023 */ subu $t6, $t5, $v0 -/* 03AF8 80AC6798 0062C023 */ subu $t8, $v1, $v0 -/* 03AFC 80AC679C 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 03B00 80AC67A0 440A9000 */ mfc1 $t2, $f18 -/* 03B04 80AC67A4 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 03B08 80AC67A8 AC88023C */ sw $t0, 0x023C($a0) ## 0000023C -/* 03B0C 80AC67AC 006A5823 */ subu $t3, $v1, $t2 -/* 03B10 80AC67B0 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 03B14 80AC67B4 AC8C0240 */ sw $t4, 0x0240($a0) ## 00000240 -/* 03B18 80AC67B8 AC8F0244 */ sw $t7, 0x0244($a0) ## 00000244 -/* 03B1C 80AC67BC 03E00008 */ jr $ra -/* 03B20 80AC67C0 AC990248 */ sw $t9, 0x0248($a0) ## 00000248 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC67C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC67C4.s deleted file mode 100644 index 23468fd8c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC67C4.s +++ /dev/null @@ -1,125 +0,0 @@ -.late_rodata -glabel D_80AC9614 - .float 0.05 - -glabel D_80AC9618 - .float 0.05 - -glabel D_80AC961C - .float 0.1 - -.text -glabel func_80AC67C4 -/* 03B24 80AC67C4 908E02CC */ lbu $t6, 0x02CC($a0) ## 000002CC -/* 03B28 80AC67C8 C48202C4 */ lwc1 $f2, 0x02C4($a0) ## 000002C4 -/* 03B2C 80AC67CC C48002C8 */ lwc1 $f0, 0x02C8($a0) ## 000002C8 -/* 03B30 80AC67D0 15C00010 */ bne $t6, $zero, .L80AC6814 -/* 03B34 80AC67D4 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 03B38 80AC67D8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03B3C 80AC67DC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 03B40 80AC67E0 3C0180AD */ lui $at, %hi(D_80AC9614) ## $at = 80AD0000 -/* 03B44 80AC67E4 C4249614 */ lwc1 $f4, %lo(D_80AC9614)($at) -/* 03B48 80AC67E8 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 03B4C 80AC67EC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03B50 80AC67F0 46041080 */ add.s $f2, $f2, $f4 -/* 03B54 80AC67F4 4602603C */ c.lt.s $f12, $f2 -/* 03B58 80AC67F8 00000000 */ nop -/* 03B5C 80AC67FC 45000003 */ bc1f .L80AC680C -/* 03B60 80AC6800 00000000 */ nop -/* 03B64 80AC6804 46006086 */ mov.s $f2, $f12 -/* 03B68 80AC6808 A08F02CC */ sb $t7, 0x02CC($a0) ## 000002CC -.L80AC680C: -/* 03B6C 80AC680C 1000000C */ beq $zero, $zero, .L80AC6840 -/* 03B70 80AC6810 909802CD */ lbu $t8, 0x02CD($a0) ## 000002CD -.L80AC6814: -/* 03B74 80AC6814 3C0180AD */ lui $at, %hi(D_80AC9618) ## $at = 80AD0000 -/* 03B78 80AC6818 C4269618 */ lwc1 $f6, %lo(D_80AC9618)($at) -/* 03B7C 80AC681C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 03B80 80AC6820 46061081 */ sub.s $f2, $f2, $f6 -/* 03B84 80AC6824 460E103C */ c.lt.s $f2, $f14 -/* 03B88 80AC6828 00000000 */ nop -/* 03B8C 80AC682C 45020004 */ bc1fl .L80AC6840 -/* 03B90 80AC6830 909802CD */ lbu $t8, 0x02CD($a0) ## 000002CD -/* 03B94 80AC6834 46007086 */ mov.s $f2, $f14 -/* 03B98 80AC6838 A08002CC */ sb $zero, 0x02CC($a0) ## 000002CC -/* 03B9C 80AC683C 909802CD */ lbu $t8, 0x02CD($a0) ## 000002CD -.L80AC6840: -/* 03BA0 80AC6840 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03BA4 80AC6844 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 03BA8 80AC6848 1700000C */ bne $t8, $zero, .L80AC687C -/* 03BAC 80AC684C E48202C4 */ swc1 $f2, 0x02C4($a0) ## 000002C4 -/* 03BB0 80AC6850 3C0180AD */ lui $at, %hi(D_80AC961C) ## $at = 80AD0000 -/* 03BB4 80AC6854 C428961C */ lwc1 $f8, %lo(D_80AC961C)($at) -/* 03BB8 80AC6858 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 03BBC 80AC685C 46080000 */ add.s $f0, $f0, $f8 -/* 03BC0 80AC6860 4600603C */ c.lt.s $f12, $f0 -/* 03BC4 80AC6864 00000000 */ nop -/* 03BC8 80AC6868 45020007 */ bc1fl .L80AC6888 -/* 03BCC 80AC686C 3C01431B */ lui $at, 0x431B ## $at = 431B0000 -/* 03BD0 80AC6870 46006006 */ mov.s $f0, $f12 -/* 03BD4 80AC6874 10000003 */ beq $zero, $zero, .L80AC6884 -/* 03BD8 80AC6878 A09902CD */ sb $t9, 0x02CD($a0) ## 000002CD -.L80AC687C: -/* 03BDC 80AC687C 46007006 */ mov.s $f0, $f14 -/* 03BE0 80AC6880 A08002CD */ sb $zero, 0x02CD($a0) ## 000002CD -.L80AC6884: -/* 03BE4 80AC6884 3C01431B */ lui $at, 0x431B ## $at = 431B0000 -.L80AC6888: -/* 03BE8 80AC6888 44815000 */ mtc1 $at, $f10 ## $f10 = 155.00 -/* 03BEC 80AC688C 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 -/* 03BF0 80AC6890 44812000 */ mtc1 $at, $f4 ## $f4 = -100.00 -/* 03BF4 80AC6894 46025402 */ mul.s $f16, $f10, $f2 -/* 03BF8 80AC6898 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 03BFC 80AC689C 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 03C00 80AC68A0 46022182 */ mul.s $f6, $f4, $f2 -/* 03C04 80AC68A4 3C014391 */ lui $at, 0x4391 ## $at = 43910000 -/* 03C08 80AC68A8 44812000 */ mtc1 $at, $f4 ## $f4 = 290.00 -/* 03C0C 80AC68AC 3C0142B6 */ lui $at, 0x42B6 ## $at = 42B60000 -/* 03C10 80AC68B0 44816000 */ mtc1 $at, $f12 ## $f12 = 91.00 -/* 03C14 80AC68B4 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 -/* 03C18 80AC68B8 4600848D */ trunc.w.s $f18, $f16 -/* 03C1C 80AC68BC 46025402 */ mul.s $f16, $f10, $f2 -/* 03C20 80AC68C0 44817000 */ mtc1 $at, $f14 ## $f14 = 95.00 -/* 03C24 80AC68C4 3C014204 */ lui $at, 0x4204 ## $at = 42040000 -/* 03C28 80AC68C8 44029000 */ mfc1 $v0, $f18 -/* 03C2C 80AC68CC E48402B4 */ swc1 $f4, 0x02B4($a0) ## 000002B4 -/* 03C30 80AC68D0 240C00C8 */ addiu $t4, $zero, 0x00C8 ## $t4 = 000000C8 -/* 03C34 80AC68D4 4600320D */ trunc.w.s $f8, $f6 -/* 03C38 80AC68D8 44813000 */ mtc1 $at, $f6 ## $f6 = 33.00 -/* 03C3C 80AC68DC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 03C40 80AC68E0 4600848D */ trunc.w.s $f18, $f16 -/* 03C44 80AC68E4 44054000 */ mfc1 $a1, $f8 -/* 03C48 80AC68E8 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 -/* 03C4C 80AC68EC 3C014389 */ lui $at, 0x4389 ## $at = 43890000 -/* 03C50 80AC68F0 44815000 */ mtc1 $at, $f10 ## $f10 = 274.00 -/* 03C54 80AC68F4 46004082 */ mul.s $f2, $f8, $f0 -/* 03C58 80AC68F8 440B9000 */ mfc1 $t3, $f18 -/* 03C5C 80AC68FC 3C014244 */ lui $at, 0x4244 ## $at = 42440000 -/* 03C60 80AC6900 44819000 */ mtc1 $at, $f18 ## $f18 = 49.00 -/* 03C64 80AC6904 00E21823 */ subu $v1, $a3, $v0 -/* 03C68 80AC6908 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000000 -/* 03C6C 80AC690C AC83026C */ sw $v1, 0x026C($a0) ## 0000026C -/* 03C70 80AC6910 46025400 */ add.s $f16, $f10, $f2 -/* 03C74 80AC6914 00E21823 */ subu $v1, $a3, $v0 -/* 03C78 80AC6918 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000000 -/* 03C7C 80AC691C 46029101 */ sub.s $f4, $f18, $f2 -/* 03C80 80AC6920 00052823 */ subu $a1, $zero, $a1 -/* 03C84 80AC6924 018B3023 */ subu $a2, $t4, $t3 -/* 03C88 80AC6928 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 00000000 -/* 03C8C 80AC692C 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 -/* 03C90 80AC6930 E48002C8 */ swc1 $f0, 0x02C8($a0) ## 000002C8 -/* 03C94 80AC6934 AC830270 */ sw $v1, 0x0270($a0) ## 00000270 -/* 03C98 80AC6938 AC850274 */ sw $a1, 0x0274($a0) ## 00000274 -/* 03C9C 80AC693C AC860278 */ sw $a2, 0x0278($a0) ## 00000278 -/* 03CA0 80AC6940 AC8302A4 */ sw $v1, 0x02A4($a0) ## 000002A4 -/* 03CA4 80AC6944 AC8302A8 */ sw $v1, 0x02A8($a0) ## 000002A8 -/* 03CA8 80AC6948 AC8502AC */ sw $a1, 0x02AC($a0) ## 000002AC -/* 03CAC 80AC694C AC8602B0 */ sw $a2, 0x02B0($a0) ## 000002B0 -/* 03CB0 80AC6950 E490029C */ swc1 $f16, 0x029C($a0) ## 0000029C -/* 03CB4 80AC6954 E4840264 */ swc1 $f4, 0x0264($a0) ## 00000264 -/* 03CB8 80AC6958 E48C02B8 */ swc1 $f12, 0x02B8($a0) ## 000002B8 -/* 03CBC 80AC695C E48C0280 */ swc1 $f12, 0x0280($a0) ## 00000280 -/* 03CC0 80AC6960 E48E02A0 */ swc1 $f14, 0x02A0($a0) ## 000002A0 -/* 03CC4 80AC6964 E48E0268 */ swc1 $f14, 0x0268($a0) ## 00000268 -/* 03CC8 80AC6968 03E00008 */ jr $ra -/* 03CCC 80AC696C E486027C */ swc1 $f6, 0x027C($a0) ## 0000027C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6970.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6970.s deleted file mode 100644 index 502c4c667e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6970.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80AC6970 -/* 03CD0 80AC6970 848201F4 */ lh $v0, 0x01F4($a0) ## 000001F4 -/* 03CD4 80AC6974 3C0E80AC */ lui $t6, %hi(func_80AC69A4) ## $t6 = 80AC0000 -/* 03CD8 80AC6978 25CE69A4 */ addiu $t6, $t6, %lo(func_80AC69A4) ## $t6 = 80AC69A4 -/* 03CDC 80AC697C 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF -/* 03CE0 80AC6980 00021400 */ sll $v0, $v0, 16 -/* 03CE4 80AC6984 00021403 */ sra $v0, $v0, 16 -/* 03CE8 80AC6988 50400004 */ beql $v0, $zero, .L80AC699C -/* 03CEC 80AC698C AC8E01F8 */ sw $t6, 0x01F8($a0) ## 000001F8 -/* 03CF0 80AC6990 03E00008 */ jr $ra -/* 03CF4 80AC6994 A48201F4 */ sh $v0, 0x01F4($a0) ## 000001F4 -.L80AC6998: -/* 03CF8 80AC6998 AC8E01F8 */ sw $t6, 0x01F8($a0) ## 000001F8 -.L80AC699C: -/* 03CFC 80AC699C 03E00008 */ jr $ra -/* 03D00 80AC69A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s deleted file mode 100644 index 107a960233..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80AC69A4 -/* 03D04 80AC69A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03D08 80AC69A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03D0C 80AC69AC 848201F4 */ lh $v0, 0x01F4($a0) ## 000001F4 -/* 03D10 80AC69B0 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF -/* 03D14 80AC69B4 00021400 */ sll $v0, $v0, 16 -/* 03D18 80AC69B8 00021403 */ sra $v0, $v0, 16 -/* 03D1C 80AC69BC 50400004 */ beql $v0, $zero, .L80AC69D0 -/* 03D20 80AC69C0 848201F2 */ lh $v0, 0x01F2($a0) ## 000001F2 -/* 03D24 80AC69C4 1000001B */ beq $zero, $zero, .L80AC6A34 -/* 03D28 80AC69C8 A48201F4 */ sh $v0, 0x01F4($a0) ## 000001F4 -/* 03D2C 80AC69CC 848201F2 */ lh $v0, 0x01F2($a0) ## 000001F2 -.L80AC69D0: -/* 03D30 80AC69D0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 03D34 80AC69D4 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000000 -/* 03D38 80AC69D8 00021400 */ sll $v0, $v0, 16 -/* 03D3C 80AC69DC 00021403 */ sra $v0, $v0, 16 -/* 03D40 80AC69E0 28410003 */ slti $at, $v0, 0x0003 -/* 03D44 80AC69E4 54200012 */ bnel $at, $zero, .L80AC6A30 -/* 03D48 80AC69E8 A48201F2 */ sh $v0, 0x01F2($a0) ## 000001F2 -/* 03D4C 80AC69EC A48001F2 */ sh $zero, 0x01F2($a0) ## 000001F2 -/* 03D50 80AC69F0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 03D54 80AC69F4 AFA40018 */ sw $a0, 0x0018($sp) -/* 03D58 80AC69F8 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 03D5C 80AC69FC 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 03D60 80AC6A00 8FA40018 */ lw $a0, 0x0018($sp) -/* 03D64 80AC6A04 3C1980AC */ lui $t9, %hi(func_80AC6970) ## $t9 = 80AC0000 -/* 03D68 80AC6A08 46040182 */ mul.s $f6, $f0, $f4 -/* 03D6C 80AC6A0C 27396970 */ addiu $t9, $t9, %lo(func_80AC6970) ## $t9 = 80AC6970 -/* 03D70 80AC6A10 AC9901F8 */ sw $t9, 0x01F8($a0) ## 000001F8 -/* 03D74 80AC6A14 4600320D */ trunc.w.s $f8, $f6 -/* 03D78 80AC6A18 440F4000 */ mfc1 $t7, $f8 -/* 03D7C 80AC6A1C 00000000 */ nop -/* 03D80 80AC6A20 25F80014 */ addiu $t8, $t7, 0x0014 ## $t8 = 00000014 -/* 03D84 80AC6A24 10000003 */ beq $zero, $zero, .L80AC6A34 -/* 03D88 80AC6A28 A49801F4 */ sh $t8, 0x01F4($a0) ## 000001F4 -/* 03D8C 80AC6A2C A48201F2 */ sh $v0, 0x01F2($a0) ## 000001F2 -.L80AC6A30: -/* 03D90 80AC6A30 A48801F4 */ sh $t0, 0x01F4($a0) ## 000001F4 -.L80AC6A34: -/* 03D94 80AC6A34 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03D98 80AC6A38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03D9C 80AC6A3C 03E00008 */ jr $ra -/* 03DA0 80AC6A40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6A44.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6A44.s deleted file mode 100644 index 538e7f5ea1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6A44.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80AC6A44 -/* 03DA4 80AC6A44 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03DA8 80AC6A48 AFA40020 */ sw $a0, 0x0020($sp) -/* 03DAC 80AC6A4C 8FAE0020 */ lw $t6, 0x0020($sp) -/* 03DB0 80AC6A50 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03DB4 80AC6A54 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 03DB8 80AC6A58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03DBC 80AC6A5C 00A12021 */ addu $a0, $a1, $at -/* 03DC0 80AC6A60 81C501E8 */ lb $a1, 0x01E8($t6) ## 000001E8 -/* 03DC4 80AC6A64 0C026062 */ jal Object_IsLoaded - -/* 03DC8 80AC6A68 AFA4001C */ sw $a0, 0x001C($sp) -/* 03DCC 80AC6A6C 10400016 */ beq $v0, $zero, .L80AC6AC8 -/* 03DD0 80AC6A70 8FAF0020 */ lw $t7, 0x0020($sp) -/* 03DD4 80AC6A74 81E501E9 */ lb $a1, 0x01E9($t7) ## 000001E9 -/* 03DD8 80AC6A78 04A20008 */ bltzl $a1, .L80AC6A9C -/* 03DDC 80AC6A7C 8FB80020 */ lw $t8, 0x0020($sp) -/* 03DE0 80AC6A80 0C026062 */ jal Object_IsLoaded - -/* 03DE4 80AC6A84 8FA4001C */ lw $a0, 0x001C($sp) -/* 03DE8 80AC6A88 54400004 */ bnel $v0, $zero, .L80AC6A9C -/* 03DEC 80AC6A8C 8FB80020 */ lw $t8, 0x0020($sp) -/* 03DF0 80AC6A90 1000000E */ beq $zero, $zero, .L80AC6ACC -/* 03DF4 80AC6A94 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03DF8 80AC6A98 8FB80020 */ lw $t8, 0x0020($sp) -.L80AC6A9C: -/* 03DFC 80AC6A9C 830501EA */ lb $a1, 0x01EA($t8) ## 000001EA -/* 03E00 80AC6AA0 04A00007 */ bltz $a1, .L80AC6AC0 -/* 03E04 80AC6AA4 00000000 */ nop -/* 03E08 80AC6AA8 0C026062 */ jal Object_IsLoaded - -/* 03E0C 80AC6AAC 8FA4001C */ lw $a0, 0x001C($sp) -/* 03E10 80AC6AB0 14400003 */ bne $v0, $zero, .L80AC6AC0 -/* 03E14 80AC6AB4 00000000 */ nop -/* 03E18 80AC6AB8 10000004 */ beq $zero, $zero, .L80AC6ACC -/* 03E1C 80AC6ABC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AC6AC0: -/* 03E20 80AC6AC0 10000002 */ beq $zero, $zero, .L80AC6ACC -/* 03E24 80AC6AC4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AC6AC8: -/* 03E28 80AC6AC8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AC6ACC: -/* 03E2C 80AC6ACC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03E30 80AC6AD0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03E34 80AC6AD4 03E00008 */ jr $ra -/* 03E38 80AC6AD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s deleted file mode 100644 index 8d2292b0d6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AC6ADC -/* 03E3C 80AC6ADC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03E40 80AC6AE0 AFA40028 */ sw $a0, 0x0028($sp) -/* 03E44 80AC6AE4 AFA5002C */ sw $a1, 0x002C($sp) -/* 03E48 80AC6AE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03E4C 80AC6AEC 8FA50028 */ lw $a1, 0x0028($sp) -/* 03E50 80AC6AF0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03E54 80AC6AF4 3C060601 */ lui $a2, %hi(D_06009B38) ## $a2 = 06010000 -/* 03E58 80AC6AF8 3C070600 */ lui $a3, %hi(D_06000338) ## $a3 = 06000000 -/* 03E5C 80AC6AFC 24E70338 */ addiu $a3, $a3, %lo(D_06000338) ## $a3 = 06000338 -/* 03E60 80AC6B00 24C69B38 */ addiu $a2, $a2, %lo(D_06009B38) ## $a2 = 06009B38 -/* 03E64 80AC6B04 AFA00010 */ sw $zero, 0x0010($sp) -/* 03E68 80AC6B08 AFA00014 */ sw $zero, 0x0014($sp) -/* 03E6C 80AC6B0C AFA00018 */ sw $zero, 0x0018($sp) -/* 03E70 80AC6B10 0C0291BE */ jal SkelAnime_InitFlex -/* 03E74 80AC6B14 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 03E78 80AC6B18 8FA20028 */ lw $v0, 0x0028($sp) -/* 03E7C 80AC6B1C 3C0E80AC */ lui $t6, %hi(func_80AC7DAC) ## $t6 = 80AC0000 -/* 03E80 80AC6B20 25CE7DAC */ addiu $t6, $t6, %lo(func_80AC7DAC) ## $t6 = 80AC7DAC -/* 03E84 80AC6B24 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 -/* 03E88 80AC6B28 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 03E8C 80AC6B2C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03E90 80AC6B30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03E94 80AC6B34 03E00008 */ jr $ra -/* 03E98 80AC6B38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s deleted file mode 100644 index c8be793795..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_80AC6B3C -/* 03E9C 80AC6B3C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 03EA0 80AC6B40 AFB00038 */ sw $s0, 0x0038($sp) -/* 03EA4 80AC6B44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03EA8 80AC6B48 AFA5004C */ sw $a1, 0x004C($sp) -/* 03EAC 80AC6B4C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03EB0 80AC6B50 AFBF003C */ sw $ra, 0x003C($sp) -/* 03EB4 80AC6B54 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 03EB8 80AC6B58 3C060600 */ lui $a2, %hi(D_060000F0) ## $a2 = 06000000 -/* 03EBC 80AC6B5C 24C600F0 */ addiu $a2, $a2, %lo(D_060000F0) ## $a2 = 060000F0 -/* 03EC0 80AC6B60 AFA50040 */ sw $a1, 0x0040($sp) -/* 03EC4 80AC6B64 AFA00010 */ sw $zero, 0x0010($sp) -/* 03EC8 80AC6B68 AFA00014 */ sw $zero, 0x0014($sp) -/* 03ECC 80AC6B6C AFA00018 */ sw $zero, 0x0018($sp) -/* 03ED0 80AC6B70 0C0291BE */ jal SkelAnime_InitFlex -/* 03ED4 80AC6B74 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03ED8 80AC6B78 820F01EA */ lb $t7, 0x01EA($s0) ## 000001EA -/* 03EDC 80AC6B7C 8FAE004C */ lw $t6, 0x004C($sp) -/* 03EE0 80AC6B80 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 03EE4 80AC6B84 000FC100 */ sll $t8, $t7, 4 -/* 03EE8 80AC6B88 030FC021 */ addu $t8, $t8, $t7 -/* 03EEC 80AC6B8C 0018C080 */ sll $t8, $t8, 2 -/* 03EF0 80AC6B90 01D8C821 */ addu $t9, $t6, $t8 -/* 03EF4 80AC6B94 01194021 */ addu $t0, $t0, $t9 -/* 03EF8 80AC6B98 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 -/* 03EFC 80AC6B9C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03F00 80AC6BA0 3C040600 */ lui $a0, %hi(D_060004A8) ## $a0 = 06000000 -/* 03F04 80AC6BA4 01014821 */ addu $t1, $t0, $at -/* 03F08 80AC6BA8 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 03F0C 80AC6BAC AC296FC0 */ sw $t1, %lo(gSegments+0x18)($at) -/* 03F10 80AC6BB0 0C028800 */ jal Animation_GetLastFrame - -/* 03F14 80AC6BB4 248404A8 */ addiu $a0, $a0, %lo(D_060004A8) ## $a0 = 060004A8 -/* 03F18 80AC6BB8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03F1C 80AC6BBC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03F20 80AC6BC0 3C050600 */ lui $a1, %hi(D_060004A8) ## $a1 = 06000000 -/* 03F24 80AC6BC4 468021A0 */ cvt.s.w $f6, $f4 -/* 03F28 80AC6BC8 44070000 */ mfc1 $a3, $f0 -/* 03F2C 80AC6BCC 24A504A8 */ addiu $a1, $a1, %lo(D_060004A8) ## $a1 = 060004A8 -/* 03F30 80AC6BD0 8FA40040 */ lw $a0, 0x0040($sp) -/* 03F34 80AC6BD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03F38 80AC6BD8 AFA00014 */ sw $zero, 0x0014($sp) -/* 03F3C 80AC6BDC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03F40 80AC6BE0 0C029468 */ jal Animation_Change - -/* 03F44 80AC6BE4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 03F48 80AC6BE8 8FA6004C */ lw $a2, 0x004C($sp) -/* 03F4C 80AC6BEC C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 03F50 80AC6BF0 3C0A80AD */ lui $t2, %hi(func_80AC80B4) ## $t2 = 80AD0000 -/* 03F54 80AC6BF4 3C0B80AC */ lui $t3, %hi(func_80AC7380) ## $t3 = 80AC0000 -/* 03F58 80AC6BF8 254A80B4 */ addiu $t2, $t2, %lo(func_80AC80B4) ## $t2 = 80AC80B4 -/* 03F5C 80AC6BFC 256B7380 */ addiu $t3, $t3, %lo(func_80AC7380) ## $t3 = 80AC7380 -/* 03F60 80AC6C00 AE0A0134 */ sw $t2, 0x0134($s0) ## 00000134 -/* 03F64 80AC6C04 AE0B0194 */ sw $t3, 0x0194($s0) ## 00000194 -/* 03F68 80AC6C08 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 03F6C 80AC6C0C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 03F70 80AC6C10 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 03F74 80AC6C14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03F78 80AC6C18 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 03F7C 80AC6C1C C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 03F80 80AC6C20 AFAC0028 */ sw $t4, 0x0028($sp) -/* 03F84 80AC6C24 AFA00024 */ sw $zero, 0x0024($sp) -/* 03F88 80AC6C28 AFA00020 */ sw $zero, 0x0020($sp) -/* 03F8C 80AC6C2C AFA0001C */ sw $zero, 0x001C($sp) -/* 03F90 80AC6C30 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 -/* 03F94 80AC6C34 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 03F98 80AC6C38 0C00C916 */ jal Actor_SpawnAsChild - -/* 03F9C 80AC6C3C E7B00018 */ swc1 $f16, 0x0018($sp) -/* 03FA0 80AC6C40 8FBF003C */ lw $ra, 0x003C($sp) -/* 03FA4 80AC6C44 8FB00038 */ lw $s0, 0x0038($sp) -/* 03FA8 80AC6C48 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 03FAC 80AC6C4C 03E00008 */ jr $ra -/* 03FB0 80AC6C50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s deleted file mode 100644 index ba8dc712cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80AC6C54 -/* 03FB4 80AC6C54 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03FB8 80AC6C58 AFA40030 */ sw $a0, 0x0030($sp) -/* 03FBC 80AC6C5C AFA50034 */ sw $a1, 0x0034($sp) -/* 03FC0 80AC6C60 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03FC4 80AC6C64 8FA50030 */ lw $a1, 0x0030($sp) -/* 03FC8 80AC6C68 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03FCC 80AC6C6C 3C060601 */ lui $a2, %hi(D_0600FEF0) ## $a2 = 06010000 -/* 03FD0 80AC6C70 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 03FD4 80AC6C74 AFA50028 */ sw $a1, 0x0028($sp) -/* 03FD8 80AC6C78 24C6FEF0 */ addiu $a2, $a2, %lo(D_0600FEF0) ## $a2 = 0600FEF0 -/* 03FDC 80AC6C7C AFA00010 */ sw $zero, 0x0010($sp) -/* 03FE0 80AC6C80 AFA00014 */ sw $zero, 0x0014($sp) -/* 03FE4 80AC6C84 AFA00018 */ sw $zero, 0x0018($sp) -/* 03FE8 80AC6C88 0C0291BE */ jal SkelAnime_InitFlex -/* 03FEC 80AC6C8C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03FF0 80AC6C90 8FAF0030 */ lw $t7, 0x0030($sp) -/* 03FF4 80AC6C94 8FAE0034 */ lw $t6, 0x0034($sp) -/* 03FF8 80AC6C98 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 03FFC 80AC6C9C 81F801EA */ lb $t8, 0x01EA($t7) ## 000001EA -/* 04000 80AC6CA0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04004 80AC6CA4 3C040600 */ lui $a0, %hi(D_060000FC) ## $a0 = 06000000 -/* 04008 80AC6CA8 0018C900 */ sll $t9, $t8, 4 -/* 0400C 80AC6CAC 0338C821 */ addu $t9, $t9, $t8 -/* 04010 80AC6CB0 0019C880 */ sll $t9, $t9, 2 -/* 04014 80AC6CB4 01D94021 */ addu $t0, $t6, $t9 -/* 04018 80AC6CB8 01284821 */ addu $t1, $t1, $t0 -/* 0401C 80AC6CBC 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 04020 80AC6CC0 248400FC */ addiu $a0, $a0, %lo(D_060000FC) ## $a0 = 060000FC -/* 04024 80AC6CC4 01215021 */ addu $t2, $t1, $at -/* 04028 80AC6CC8 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 0402C 80AC6CCC 0C028800 */ jal Animation_GetLastFrame - -/* 04030 80AC6CD0 AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) -/* 04034 80AC6CD4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04038 80AC6CD8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0403C 80AC6CDC 3C050600 */ lui $a1, %hi(D_060000FC) ## $a1 = 06000000 -/* 04040 80AC6CE0 468021A0 */ cvt.s.w $f6, $f4 -/* 04044 80AC6CE4 44070000 */ mfc1 $a3, $f0 -/* 04048 80AC6CE8 24A500FC */ addiu $a1, $a1, %lo(D_060000FC) ## $a1 = 060000FC -/* 0404C 80AC6CEC 8FA40028 */ lw $a0, 0x0028($sp) -/* 04050 80AC6CF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04054 80AC6CF4 AFA00014 */ sw $zero, 0x0014($sp) -/* 04058 80AC6CF8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0405C 80AC6CFC 0C029468 */ jal Animation_Change - -/* 04060 80AC6D00 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04064 80AC6D04 8FA20030 */ lw $v0, 0x0030($sp) -/* 04068 80AC6D08 3C0B80AD */ lui $t3, %hi(func_80AC8244) ## $t3 = 80AD0000 -/* 0406C 80AC6D0C 3C0C80AC */ lui $t4, %hi(func_80AC7380) ## $t4 = 80AC0000 -/* 04070 80AC6D10 256B8244 */ addiu $t3, $t3, %lo(func_80AC8244) ## $t3 = 80AC8244 -/* 04074 80AC6D14 258C7380 */ addiu $t4, $t4, %lo(func_80AC7380) ## $t4 = 80AC7380 -/* 04078 80AC6D18 AC4B0134 */ sw $t3, 0x0134($v0) ## 00000134 -/* 0407C 80AC6D1C AC4C0194 */ sw $t4, 0x0194($v0) ## 00000194 -/* 04080 80AC6D20 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04084 80AC6D24 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04088 80AC6D28 03E00008 */ jr $ra -/* 0408C 80AC6D2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s deleted file mode 100644 index d96acdbdb1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80AC6D30 -/* 04090 80AC6D30 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04094 80AC6D34 AFA40030 */ sw $a0, 0x0030($sp) -/* 04098 80AC6D38 AFA50034 */ sw $a1, 0x0034($sp) -/* 0409C 80AC6D3C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 040A0 80AC6D40 8FA50030 */ lw $a1, 0x0030($sp) -/* 040A4 80AC6D44 AFBF0024 */ sw $ra, 0x0024($sp) -/* 040A8 80AC6D48 3C060601 */ lui $a2, %hi(D_0600BFA8) ## $a2 = 06010000 -/* 040AC 80AC6D4C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 040B0 80AC6D50 AFA50028 */ sw $a1, 0x0028($sp) -/* 040B4 80AC6D54 24C6BFA8 */ addiu $a2, $a2, %lo(D_0600BFA8) ## $a2 = 0600BFA8 -/* 040B8 80AC6D58 AFA00010 */ sw $zero, 0x0010($sp) -/* 040BC 80AC6D5C AFA00014 */ sw $zero, 0x0014($sp) -/* 040C0 80AC6D60 AFA00018 */ sw $zero, 0x0018($sp) -/* 040C4 80AC6D64 0C0291BE */ jal SkelAnime_InitFlex -/* 040C8 80AC6D68 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 040CC 80AC6D6C 8FAF0030 */ lw $t7, 0x0030($sp) -/* 040D0 80AC6D70 8FAE0034 */ lw $t6, 0x0034($sp) -/* 040D4 80AC6D74 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 040D8 80AC6D78 81F801EA */ lb $t8, 0x01EA($t7) ## 000001EA -/* 040DC 80AC6D7C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 040E0 80AC6D80 3C040600 */ lui $a0, %hi(D_0600078C) ## $a0 = 06000000 -/* 040E4 80AC6D84 0018C900 */ sll $t9, $t8, 4 -/* 040E8 80AC6D88 0338C821 */ addu $t9, $t9, $t8 -/* 040EC 80AC6D8C 0019C880 */ sll $t9, $t9, 2 -/* 040F0 80AC6D90 01D94021 */ addu $t0, $t6, $t9 -/* 040F4 80AC6D94 01284821 */ addu $t1, $t1, $t0 -/* 040F8 80AC6D98 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 040FC 80AC6D9C 2484078C */ addiu $a0, $a0, %lo(D_0600078C) ## $a0 = 0600078C -/* 04100 80AC6DA0 01215021 */ addu $t2, $t1, $at -/* 04104 80AC6DA4 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 04108 80AC6DA8 0C028800 */ jal Animation_GetLastFrame - -/* 0410C 80AC6DAC AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) -/* 04110 80AC6DB0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04114 80AC6DB4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04118 80AC6DB8 3C050600 */ lui $a1, %hi(D_0600078C) ## $a1 = 06000000 -/* 0411C 80AC6DBC 468021A0 */ cvt.s.w $f6, $f4 -/* 04120 80AC6DC0 44070000 */ mfc1 $a3, $f0 -/* 04124 80AC6DC4 24A5078C */ addiu $a1, $a1, %lo(D_0600078C) ## $a1 = 0600078C -/* 04128 80AC6DC8 8FA40028 */ lw $a0, 0x0028($sp) -/* 0412C 80AC6DCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04130 80AC6DD0 AFA00014 */ sw $zero, 0x0014($sp) -/* 04134 80AC6DD4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04138 80AC6DD8 0C029468 */ jal Animation_Change - -/* 0413C 80AC6DDC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04140 80AC6DE0 8FA20030 */ lw $v0, 0x0030($sp) -/* 04144 80AC6DE4 3C0B80AD */ lui $t3, %hi(func_80AC83DC) ## $t3 = 80AD0000 -/* 04148 80AC6DE8 3C0C80AC */ lui $t4, %hi(func_80AC7380) ## $t4 = 80AC0000 -/* 0414C 80AC6DEC 256B83DC */ addiu $t3, $t3, %lo(func_80AC83DC) ## $t3 = 80AC83DC -/* 04150 80AC6DF0 258C7380 */ addiu $t4, $t4, %lo(func_80AC7380) ## $t4 = 80AC7380 -/* 04154 80AC6DF4 AC4B0134 */ sw $t3, 0x0134($v0) ## 00000134 -/* 04158 80AC6DF8 AC4C0194 */ sw $t4, 0x0194($v0) ## 00000194 -/* 0415C 80AC6DFC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04160 80AC6E00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04164 80AC6E04 03E00008 */ jr $ra -/* 04168 80AC6E08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s deleted file mode 100644 index ecc6e2e07e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AC6E0C -/* 0416C 80AC6E0C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04170 80AC6E10 AFA40028 */ sw $a0, 0x0028($sp) -/* 04174 80AC6E14 AFA5002C */ sw $a1, 0x002C($sp) -/* 04178 80AC6E18 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0417C 80AC6E1C 8FA50028 */ lw $a1, 0x0028($sp) -/* 04180 80AC6E20 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04184 80AC6E24 3C060600 */ lui $a2, %hi(D_06004258) ## $a2 = 06000000 -/* 04188 80AC6E28 3C070600 */ lui $a3, %hi(D_060002E4) ## $a3 = 06000000 -/* 0418C 80AC6E2C 24E702E4 */ addiu $a3, $a3, %lo(D_060002E4) ## $a3 = 060002E4 -/* 04190 80AC6E30 24C64258 */ addiu $a2, $a2, %lo(D_06004258) ## $a2 = 06004258 -/* 04194 80AC6E34 AFA00010 */ sw $zero, 0x0010($sp) -/* 04198 80AC6E38 AFA00014 */ sw $zero, 0x0014($sp) -/* 0419C 80AC6E3C AFA00018 */ sw $zero, 0x0018($sp) -/* 041A0 80AC6E40 0C0291BE */ jal SkelAnime_InitFlex -/* 041A4 80AC6E44 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 041A8 80AC6E48 8FA20028 */ lw $v0, 0x0028($sp) -/* 041AC 80AC6E4C 3C0E80AD */ lui $t6, %hi(func_80AC854C) ## $t6 = 80AD0000 -/* 041B0 80AC6E50 25CE854C */ addiu $t6, $t6, %lo(func_80AC854C) ## $t6 = 80AC854C -/* 041B4 80AC6E54 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 -/* 041B8 80AC6E58 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 041BC 80AC6E5C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 041C0 80AC6E60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 041C4 80AC6E64 03E00008 */ jr $ra -/* 041C8 80AC6E68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s deleted file mode 100644 index 906ae26cdf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AC6E6C -/* 041CC 80AC6E6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 041D0 80AC6E70 AFA40028 */ sw $a0, 0x0028($sp) -/* 041D4 80AC6E74 AFA5002C */ sw $a1, 0x002C($sp) -/* 041D8 80AC6E78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 041DC 80AC6E7C 8FA50028 */ lw $a1, 0x0028($sp) -/* 041E0 80AC6E80 AFBF0024 */ sw $ra, 0x0024($sp) -/* 041E4 80AC6E84 3C060600 */ lui $a2, %hi(D_06004658) ## $a2 = 06000000 -/* 041E8 80AC6E88 3C070600 */ lui $a3, %hi(D_060002E4) ## $a3 = 06000000 -/* 041EC 80AC6E8C 24E702E4 */ addiu $a3, $a3, %lo(D_060002E4) ## $a3 = 060002E4 -/* 041F0 80AC6E90 24C64658 */ addiu $a2, $a2, %lo(D_06004658) ## $a2 = 06004658 -/* 041F4 80AC6E94 AFA00010 */ sw $zero, 0x0010($sp) -/* 041F8 80AC6E98 AFA00014 */ sw $zero, 0x0014($sp) -/* 041FC 80AC6E9C AFA00018 */ sw $zero, 0x0018($sp) -/* 04200 80AC6EA0 0C0291BE */ jal SkelAnime_InitFlex -/* 04204 80AC6EA4 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 04208 80AC6EA8 8FA20028 */ lw $v0, 0x0028($sp) -/* 0420C 80AC6EAC 3C0E80AD */ lui $t6, %hi(func_80AC8668) ## $t6 = 80AD0000 -/* 04210 80AC6EB0 25CE8668 */ addiu $t6, $t6, %lo(func_80AC8668) ## $t6 = 80AC8668 -/* 04214 80AC6EB4 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 -/* 04218 80AC6EB8 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 0421C 80AC6EBC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04220 80AC6EC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04224 80AC6EC4 03E00008 */ jr $ra -/* 04228 80AC6EC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s deleted file mode 100644 index bdba2cfb4c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AC6ECC -/* 0422C 80AC6ECC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04230 80AC6ED0 AFA40028 */ sw $a0, 0x0028($sp) -/* 04234 80AC6ED4 AFA5002C */ sw $a1, 0x002C($sp) -/* 04238 80AC6ED8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0423C 80AC6EDC 8FA50028 */ lw $a1, 0x0028($sp) -/* 04240 80AC6EE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04244 80AC6EE4 3C060600 */ lui $a2, %hi(D_06004868) ## $a2 = 06000000 -/* 04248 80AC6EE8 3C070600 */ lui $a3, %hi(D_0600065C) ## $a3 = 06000000 -/* 0424C 80AC6EEC 24E7065C */ addiu $a3, $a3, %lo(D_0600065C) ## $a3 = 0600065C -/* 04250 80AC6EF0 24C64868 */ addiu $a2, $a2, %lo(D_06004868) ## $a2 = 06004868 -/* 04254 80AC6EF4 AFA00010 */ sw $zero, 0x0010($sp) -/* 04258 80AC6EF8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0425C 80AC6EFC AFA00018 */ sw $zero, 0x0018($sp) -/* 04260 80AC6F00 0C0291BE */ jal SkelAnime_InitFlex -/* 04264 80AC6F04 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 04268 80AC6F08 8FA20028 */ lw $v0, 0x0028($sp) -/* 0426C 80AC6F0C 3C0E80AD */ lui $t6, %hi(func_80AC8784) ## $t6 = 80AD0000 -/* 04270 80AC6F10 25CE8784 */ addiu $t6, $t6, %lo(func_80AC8784) ## $t6 = 80AC8784 -/* 04274 80AC6F14 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 -/* 04278 80AC6F18 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 0427C 80AC6F1C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04280 80AC6F20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04284 80AC6F24 03E00008 */ jr $ra -/* 04288 80AC6F28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s deleted file mode 100644 index 7788bef7cc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_80AC6F2C -/* 0428C 80AC6F2C 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 04290 80AC6F30 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 04294 80AC6F34 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 04298 80AC6F38 15E10053 */ bne $t7, $at, .L80AC7088 -/* 0429C 80AC6F3C A08E01EB */ sb $t6, 0x01EB($a0) ## 000001EB -/* 042A0 80AC6F40 3C188012 */ lui $t8, %hi(gItemSlots+0x21) -/* 042A4 80AC6F44 93187485 */ lbu $t8, %lo(gItemSlots+0x21)($t8) -/* 042A8 80AC6F48 3C058016 */ lui $a1, %hi(gSaveContext) -/* 042AC 80AC6F4C 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 042B0 80AC6F50 00B8C821 */ addu $t9, $a1, $t8 -/* 042B4 80AC6F54 93280074 */ lbu $t0, 0x0074($t9) ## 00000074 -/* 042B8 80AC6F58 2401002C */ addiu $at, $zero, 0x002C ## $at = 0000002C -/* 042BC 80AC6F5C 55010033 */ bnel $t0, $at, .L80AC702C -/* 042C0 80AC6F60 94A20EF6 */ lhu $v0, 0x0EF6($a1) ## 8015F556 -/* 042C4 80AC6F64 94A20EF6 */ lhu $v0, 0x0EF6($a1) ## 8015F556 -/* 042C8 80AC6F68 30490800 */ andi $t1, $v0, 0x0800 ## $t1 = 00000000 -/* 042CC 80AC6F6C 1120000B */ beq $t1, $zero, .L80AC6F9C -/* 042D0 80AC6F70 304D0400 */ andi $t5, $v0, 0x0400 ## $t5 = 00000000 -/* 042D4 80AC6F74 94AA0EE4 */ lhu $t2, 0x0EE4($a1) ## 8015F544 -/* 042D8 80AC6F78 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 042DC 80AC6F7C 240270C6 */ addiu $v0, $zero, 0x70C6 ## $v0 = 000070C6 -/* 042E0 80AC6F80 314B8000 */ andi $t3, $t2, 0x8000 ## $t3 = 00000000 -/* 042E4 80AC6F84 15600003 */ bne $t3, $zero, .L80AC6F94 -/* 042E8 80AC6F88 00000000 */ nop -/* 042EC 80AC6F8C 03E00008 */ jr $ra -/* 042F0 80AC6F90 A08C01EB */ sb $t4, 0x01EB($a0) ## 000001EB -.L80AC6F94: -/* 042F4 80AC6F94 03E00008 */ jr $ra -/* 042F8 80AC6F98 240270AC */ addiu $v0, $zero, 0x70AC ## $v0 = 000070AC -.L80AC6F9C: -/* 042FC 80AC6F9C 11A0000B */ beq $t5, $zero, .L80AC6FCC -/* 04300 80AC6FA0 30590200 */ andi $t9, $v0, 0x0200 ## $t9 = 00000000 -/* 04304 80AC6FA4 94AE0EE4 */ lhu $t6, 0x0EE4($a1) ## 8015F544 -/* 04308 80AC6FA8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0430C 80AC6FAC 240270C5 */ addiu $v0, $zero, 0x70C5 ## $v0 = 000070C5 -/* 04310 80AC6FB0 31CF4000 */ andi $t7, $t6, 0x4000 ## $t7 = 00000000 -/* 04314 80AC6FB4 15E00003 */ bne $t7, $zero, .L80AC6FC4 -/* 04318 80AC6FB8 00000000 */ nop -/* 0431C 80AC6FBC 03E00008 */ jr $ra -/* 04320 80AC6FC0 A09801EB */ sb $t8, 0x01EB($a0) ## 000001EB -.L80AC6FC4: -/* 04324 80AC6FC4 03E00008 */ jr $ra -/* 04328 80AC6FC8 240270AC */ addiu $v0, $zero, 0x70AC ## $v0 = 000070AC -.L80AC6FCC: -/* 0432C 80AC6FCC 1320000B */ beq $t9, $zero, .L80AC6FFC -/* 04330 80AC6FD0 304B0100 */ andi $t3, $v0, 0x0100 ## $t3 = 00000000 -/* 04334 80AC6FD4 94A80EE4 */ lhu $t0, 0x0EE4($a1) ## 8015F544 -/* 04338 80AC6FD8 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 0433C 80AC6FDC 240270C4 */ addiu $v0, $zero, 0x70C4 ## $v0 = 000070C4 -/* 04340 80AC6FE0 31092000 */ andi $t1, $t0, 0x2000 ## $t1 = 00000000 -/* 04344 80AC6FE4 15200003 */ bne $t1, $zero, .L80AC6FF4 -/* 04348 80AC6FE8 00000000 */ nop -/* 0434C 80AC6FEC 03E00008 */ jr $ra -/* 04350 80AC6FF0 A08A01EB */ sb $t2, 0x01EB($a0) ## 000001EB -.L80AC6FF4: -/* 04354 80AC6FF4 03E00008 */ jr $ra -/* 04358 80AC6FF8 240270AC */ addiu $v0, $zero, 0x70AC ## $v0 = 000070AC -.L80AC6FFC: -/* 0435C 80AC6FFC 51600023 */ beql $t3, $zero, .L80AC708C -/* 04360 80AC7000 2402009E */ addiu $v0, $zero, 0x009E ## $v0 = 0000009E -/* 04364 80AC7004 94AC0EE4 */ lhu $t4, 0x0EE4($a1) ## 8015F544 -/* 04368 80AC7008 240270A5 */ addiu $v0, $zero, 0x70A5 ## $v0 = 000070A5 -/* 0436C 80AC700C 318D1000 */ andi $t5, $t4, 0x1000 ## $t5 = 00000000 -/* 04370 80AC7010 15A00003 */ bne $t5, $zero, .L80AC7020 -/* 04374 80AC7014 00000000 */ nop -/* 04378 80AC7018 03E00008 */ jr $ra -/* 0437C 80AC701C A08001EB */ sb $zero, 0x01EB($a0) ## 000001EB -.L80AC7020: -/* 04380 80AC7020 03E00008 */ jr $ra -/* 04384 80AC7024 240270AC */ addiu $v0, $zero, 0x70AC ## $v0 = 000070AC -.L80AC7028: -/* 04388 80AC7028 94A20EF6 */ lhu $v0, 0x0EF6($a1) ## 8015F556 -.L80AC702C: -/* 0438C 80AC702C 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 -/* 04390 80AC7030 11C00003 */ beq $t6, $zero, .L80AC7040 -/* 04394 80AC7034 304F0400 */ andi $t7, $v0, 0x0400 ## $t7 = 00000000 -/* 04398 80AC7038 03E00008 */ jr $ra -/* 0439C 80AC703C 240270AC */ addiu $v0, $zero, 0x70AC ## $v0 = 000070AC -.L80AC7040: -/* 043A0 80AC7040 15E0000F */ bne $t7, $zero, .L80AC7080 -/* 043A4 80AC7044 00000000 */ nop -/* 043A8 80AC7048 94A30EF4 */ lhu $v1, 0x0EF4($a1) ## 8015F554 -/* 043AC 80AC704C 30590100 */ andi $t9, $v0, 0x0100 ## $t9 = 00000000 -/* 043B0 80AC7050 30780010 */ andi $t8, $v1, 0x0010 ## $t8 = 00000000 -/* 043B4 80AC7054 1700000A */ bne $t8, $zero, .L80AC7080 -/* 043B8 80AC7058 00000000 */ nop -/* 043BC 80AC705C 17200008 */ bne $t9, $zero, .L80AC7080 -/* 043C0 80AC7060 30680008 */ andi $t0, $v1, 0x0008 ## $t0 = 00000000 -/* 043C4 80AC7064 15000003 */ bne $t0, $zero, .L80AC7074 -/* 043C8 80AC7068 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 043CC 80AC706C 03E00008 */ jr $ra -/* 043D0 80AC7070 240270A1 */ addiu $v0, $zero, 0x70A1 ## $v0 = 000070A1 -.L80AC7074: -/* 043D4 80AC7074 A08901EB */ sb $t1, 0x01EB($a0) ## 000001EB -/* 043D8 80AC7078 03E00008 */ jr $ra -/* 043DC 80AC707C 240270A6 */ addiu $v0, $zero, 0x70A6 ## $v0 = 000070A6 -.L80AC7080: -/* 043E0 80AC7080 03E00008 */ jr $ra -/* 043E4 80AC7084 240270C7 */ addiu $v0, $zero, 0x70C7 ## $v0 = 000070C7 -.L80AC7088: -/* 043E8 80AC7088 2402009E */ addiu $v0, $zero, 0x009E ## $v0 = 0000009E -.L80AC708C: -/* 043EC 80AC708C 03E00008 */ jr $ra -/* 043F0 80AC7090 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s deleted file mode 100644 index a32a64b70e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s +++ /dev/null @@ -1,217 +0,0 @@ -.rdata -glabel D_80AC9330 - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80AC933C - .asciz "★★★ 警告！！ 棚がないよ！！ ★★★\n" - .balign 4 - -glabel D_80AC9364 - .asciz "\x1b[m" - .balign 4 - -glabel D_80AC9368 - .asciz "\x1b[33m◇◇◇ 店のおやじ( %d ) 初期設定 ◇◇◇\x1b[m\n" - .balign 4 - -.text -glabel func_80AC7094 -/* 043F4 80AC7094 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 043F8 80AC7098 AFBF001C */ sw $ra, 0x001C($sp) -/* 043FC 80AC709C AFB00018 */ sw $s0, 0x0018($sp) -/* 04400 80AC70A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04404 80AC70A4 0C2B1A91 */ jal func_80AC6A44 -/* 04408 80AC70A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0440C 80AC70AC 104000AF */ beq $v0, $zero, .L80AC736C -/* 04410 80AC70B0 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 04414 80AC70B4 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 04418 80AC70B8 821801E8 */ lb $t8, 0x01E8($s0) ## 000001E8 -/* 0441C 80AC70BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04420 80AC70C0 01C17824 */ and $t7, $t6, $at -/* 04424 80AC70C4 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 04428 80AC70C8 A218001E */ sb $t8, 0x001E($s0) ## 0000001E -/* 0442C 80AC70CC 0C00B591 */ jal Actor_SetObjectDependency - -/* 04430 80AC70D0 8FA4002C */ lw $a0, 0x002C($sp) -/* 04434 80AC70D4 8FA4002C */ lw $a0, 0x002C($sp) -/* 04438 80AC70D8 240500C2 */ addiu $a1, $zero, 0x00C2 ## $a1 = 000000C2 -/* 0443C 80AC70DC 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 04440 80AC70E0 0C00CB0F */ jal Actor_Find - -/* 04444 80AC70E4 24841C24 */ addiu $a0, $a0, 0x1C24 ## $a0 = 00001C24 -/* 04448 80AC70E8 1440000C */ bne $v0, $zero, .L80AC711C -/* 0444C 80AC70EC AE020220 */ sw $v0, 0x0220($s0) ## 00000220 -/* 04450 80AC70F0 3C0480AD */ lui $a0, %hi(D_80AC9330) ## $a0 = 80AD0000 -/* 04454 80AC70F4 0C00084C */ jal osSyncPrintf - -/* 04458 80AC70F8 24849330 */ addiu $a0, $a0, %lo(D_80AC9330) ## $a0 = 80AC9330 -/* 0445C 80AC70FC 3C0480AD */ lui $a0, %hi(D_80AC933C) ## $a0 = 80AD0000 -/* 04460 80AC7100 0C00084C */ jal osSyncPrintf - -/* 04464 80AC7104 2484933C */ addiu $a0, $a0, %lo(D_80AC933C) ## $a0 = 80AC933C -/* 04468 80AC7108 3C0480AD */ lui $a0, %hi(D_80AC9364) ## $a0 = 80AD0000 -/* 0446C 80AC710C 0C00084C */ jal osSyncPrintf - -/* 04470 80AC7110 24849364 */ addiu $a0, $a0, %lo(D_80AC9364) ## $a0 = 80AC9364 -/* 04474 80AC7114 10000096 */ beq $zero, $zero, .L80AC7370 -/* 04478 80AC7118 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC711C: -/* 0447C 80AC711C 3C0480AD */ lui $a0, %hi(D_80AC9368) ## $a0 = 80AD0000 -/* 04480 80AC7120 24849368 */ addiu $a0, $a0, %lo(D_80AC9368) ## $a0 = 80AC9368 -/* 04484 80AC7124 0C00084C */ jal osSyncPrintf - -/* 04488 80AC7128 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 0448C 80AC712C 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 04490 80AC7130 3C0880AD */ lui $t0, %hi(D_80AC8DB0) ## $t0 = 80AD0000 -/* 04494 80AC7134 25088DB0 */ addiu $t0, $t0, %lo(D_80AC8DB0) ## $t0 = 80AC8DB0 -/* 04498 80AC7138 0003C880 */ sll $t9, $v1, 2 -/* 0449C 80AC713C 0323C823 */ subu $t9, $t9, $v1 -/* 044A0 80AC7140 0019C880 */ sll $t9, $t9, 2 -/* 044A4 80AC7144 03281021 */ addu $v0, $t9, $t0 -/* 044A8 80AC7148 C4460000 */ lwc1 $f6, 0x0000($v0) ## 00000000 -/* 044AC 80AC714C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 044B0 80AC7150 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 044B4 80AC7154 3C0A80AD */ lui $t2, %hi(D_80AC89DC) ## $t2 = 80AD0000 -/* 044B8 80AC7158 46062200 */ add.s $f8, $f4, $f6 -/* 044BC 80AC715C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 044C0 80AC7160 254A89DC */ addiu $t2, $t2, %lo(D_80AC89DC) ## $t2 = 80AC89DC -/* 044C4 80AC7164 00034980 */ sll $t1, $v1, 6 -/* 044C8 80AC7168 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 044CC 80AC716C C4500004 */ lwc1 $f16, 0x0004($v0) ## 00000004 -/* 044D0 80AC7170 012A5821 */ addu $t3, $t1, $t2 -/* 044D4 80AC7174 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 044D8 80AC7178 46105480 */ add.s $f18, $f10, $f16 -/* 044DC 80AC717C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 044E0 80AC7180 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 044E4 80AC7184 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 044E8 80AC7188 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 044EC 80AC718C C4460008 */ lwc1 $f6, 0x0008($v0) ## 00000008 -/* 044F0 80AC7190 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 044F4 80AC7194 46062200 */ add.s $f8, $f4, $f6 -/* 044F8 80AC7198 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 044FC 80AC719C 0C00AC78 */ jal ActorShape_Init - -/* 04500 80AC71A0 AFAB0024 */ sw $t3, 0x0024($sp) -/* 04504 80AC71A4 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 04508 80AC71A8 3C1980AD */ lui $t9, %hi(D_80AC8D84) ## $t9 = 80AD0000 -/* 0450C 80AC71AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04510 80AC71B0 000C6880 */ sll $t5, $t4, 2 -/* 04514 80AC71B4 032DC821 */ addu $t9, $t9, $t5 -/* 04518 80AC71B8 8F398D84 */ lw $t9, %lo(D_80AC8D84)($t9) -/* 0451C 80AC71BC 8FA5002C */ lw $a1, 0x002C($sp) -/* 04520 80AC71C0 0320F809 */ jalr $ra, $t9 -/* 04524 80AC71C4 00000000 */ nop -/* 04528 80AC71C8 0C2B1BCB */ jal func_80AC6F2C -/* 0452C 80AC71CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04530 80AC71D0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 04534 80AC71D4 44811000 */ mtc1 $at, $f2 ## $f2 = 100.00 -/* 04538 80AC71D8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0453C 80AC71DC 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 -/* 04540 80AC71E0 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 -/* 04544 80AC71E4 E6020230 */ swc1 $f2, 0x0230($s0) ## 00000230 -/* 04548 80AC71E8 E6020234 */ swc1 $f2, 0x0234($s0) ## 00000234 -/* 0454C 80AC71EC 44811000 */ mtc1 $at, $f2 ## $f2 = 95.00 -/* 04550 80AC71F0 3C0142B6 */ lui $at, 0x42B6 ## $at = 42B60000 -/* 04554 80AC71F4 44816000 */ mtc1 $at, $f12 ## $f12 = 91.00 -/* 04558 80AC71F8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0455C 80AC71FC 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 -/* 04560 80AC7200 3C014244 */ lui $at, 0x4244 ## $at = 42440000 -/* 04564 80AC7204 44818000 */ mtc1 $at, $f16 ## $f16 = 49.00 -/* 04568 80AC7208 A602010E */ sh $v0, 0x010E($s0) ## 0000010E -/* 0456C 80AC720C 240200C8 */ addiu $v0, $zero, 0x00C8 ## $v0 = 000000C8 -/* 04570 80AC7210 3C014204 */ lui $at, 0x4204 ## $at = 42040000 -/* 04574 80AC7214 44819000 */ mtc1 $at, $f18 ## $f18 = 33.00 -/* 04578 80AC7218 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 0457C 80AC721C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04580 80AC7220 3C014389 */ lui $at, 0x4389 ## $at = 43890000 -/* 04584 80AC7224 44812000 */ mtc1 $at, $f4 ## $f4 = 274.00 -/* 04588 80AC7228 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 0458C 80AC722C 3C014391 */ lui $at, 0x4391 ## $at = 43910000 -/* 04590 80AC7230 44813000 */ mtc1 $at, $f6 ## $f6 = 290.00 -/* 04594 80AC7234 240400B4 */ addiu $a0, $zero, 0x00B4 ## $a0 = 000000B4 -/* 04598 80AC7238 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 0459C 80AC723C 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 -/* 045A0 80AC7240 3C0580AD */ lui $a1, %hi(D_80AC89B0) ## $a1 = 80AD0000 -/* 045A4 80AC7244 00184080 */ sll $t0, $t8, 2 -/* 045A8 80AC7248 A20300AE */ sb $v1, 0x00AE($s0) ## 000000AE -/* 045AC 80AC724C A60E00A8 */ sh $t6, 0x00A8($s0) ## 000000A8 -/* 045B0 80AC7250 A60001FC */ sh $zero, 0x01FC($s0) ## 000001FC -/* 045B4 80AC7254 AE000228 */ sw $zero, 0x0228($s0) ## 00000228 -/* 045B8 80AC7258 AE000224 */ sw $zero, 0x0224($s0) ## 00000224 -/* 045BC 80AC725C A2000252 */ sb $zero, 0x0252($s0) ## 00000252 -/* 045C0 80AC7260 AE00023C */ sw $zero, 0x023C($s0) ## 0000023C -/* 045C4 80AC7264 AE030240 */ sw $v1, 0x0240($s0) ## 00000240 -/* 045C8 80AC7268 AE0F0244 */ sw $t7, 0x0244($s0) ## 00000244 -/* 045CC 80AC726C AE030248 */ sw $v1, 0x0248($s0) ## 00000248 -/* 045D0 80AC7270 A2000250 */ sb $zero, 0x0250($s0) ## 00000250 -/* 045D4 80AC7274 A2000251 */ sb $zero, 0x0251($s0) ## 00000251 -/* 045D8 80AC7278 A20001EC */ sb $zero, 0x01EC($s0) ## 000001EC -/* 045DC 80AC727C AE020254 */ sw $v0, 0x0254($s0) ## 00000254 -/* 045E0 80AC7280 AE020258 */ sw $v0, 0x0258($s0) ## 00000258 -/* 045E4 80AC7284 AE02025C */ sw $v0, 0x025C($s0) ## 0000025C -/* 045E8 80AC7288 AE040260 */ sw $a0, 0x0260($s0) ## 00000260 -/* 045EC 80AC728C AE03026C */ sw $v1, 0x026C($s0) ## 0000026C -/* 045F0 80AC7290 AE030270 */ sw $v1, 0x0270($s0) ## 00000270 -/* 045F4 80AC7294 AE000274 */ sw $zero, 0x0274($s0) ## 00000274 -/* 045F8 80AC7298 AE020278 */ sw $v0, 0x0278($s0) ## 00000278 -/* 045FC 80AC729C AE000288 */ sw $zero, 0x0288($s0) ## 00000288 -/* 04600 80AC72A0 AE02028C */ sw $v0, 0x028C($s0) ## 0000028C -/* 04604 80AC72A4 AE020290 */ sw $v0, 0x0290($s0) ## 00000290 -/* 04608 80AC72A8 AE020294 */ sw $v0, 0x0294($s0) ## 00000294 -/* 0460C 80AC72AC AE040298 */ sw $a0, 0x0298($s0) ## 00000298 -/* 04610 80AC72B0 AE0302A4 */ sw $v1, 0x02A4($s0) ## 000002A4 -/* 04614 80AC72B4 AE0302A8 */ sw $v1, 0x02A8($s0) ## 000002A8 -/* 04618 80AC72B8 AE0002AC */ sw $zero, 0x02AC($s0) ## 000002AC -/* 0461C 80AC72BC AE0202B0 */ sw $v0, 0x02B0($s0) ## 000002B0 -/* 04620 80AC72C0 AE0002C0 */ sw $zero, 0x02C0($s0) ## 000002C0 -/* 04624 80AC72C4 A20002CC */ sb $zero, 0x02CC($s0) ## 000002CC -/* 04628 80AC72C8 A20002CD */ sb $zero, 0x02CD($s0) ## 000002CD -/* 0462C 80AC72CC 00A82821 */ addu $a1, $a1, $t0 -/* 04630 80AC72D0 E60A0238 */ swc1 $f10, 0x0238($s0) ## 00000238 -/* 04634 80AC72D4 E6020268 */ swc1 $f2, 0x0268($s0) ## 00000268 -/* 04638 80AC72D8 E60202A0 */ swc1 $f2, 0x02A0($s0) ## 000002A0 -/* 0463C 80AC72DC E60C0280 */ swc1 $f12, 0x0280($s0) ## 00000280 -/* 04640 80AC72E0 E60C02B8 */ swc1 $f12, 0x02B8($s0) ## 000002B8 -/* 04644 80AC72E4 E60E0284 */ swc1 $f14, 0x0284($s0) ## 00000284 -/* 04648 80AC72E8 E60E02BC */ swc1 $f14, 0x02BC($s0) ## 000002BC -/* 0464C 80AC72EC E6100264 */ swc1 $f16, 0x0264($s0) ## 00000264 -/* 04650 80AC72F0 E612027C */ swc1 $f18, 0x027C($s0) ## 0000027C -/* 04654 80AC72F4 E600024C */ swc1 $f0, 0x024C($s0) ## 0000024C -/* 04658 80AC72F8 E60002C4 */ swc1 $f0, 0x02C4($s0) ## 000002C4 -/* 0465C 80AC72FC E60002C8 */ swc1 $f0, 0x02C8($s0) ## 000002C8 -/* 04660 80AC7300 E60002D0 */ swc1 $f0, 0x02D0($s0) ## 000002D0 -/* 04664 80AC7304 E604029C */ swc1 $f4, 0x029C($s0) ## 0000029C -/* 04668 80AC7308 E60602B4 */ swc1 $f6, 0x02B4($s0) ## 000002B4 -/* 0466C 80AC730C 8CA589B0 */ lw $a1, %lo(D_80AC89B0)($a1) -/* 04670 80AC7310 0C00B58B */ jal Actor_SetScale - -/* 04674 80AC7314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04678 80AC7318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0467C 80AC731C 8FA5002C */ lw $a1, 0x002C($sp) -/* 04680 80AC7320 0C2B0B76 */ jal func_80AC2DD8 -/* 04684 80AC7324 8FA60024 */ lw $a2, 0x0024($sp) -/* 04688 80AC7328 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 0468C 80AC732C A60001F0 */ sh $zero, 0x01F0($s0) ## 000001F0 -/* 04690 80AC7330 860901F0 */ lh $t1, 0x01F0($s0) ## 000001F0 -/* 04694 80AC7334 3C0B80AC */ lui $t3, %hi(func_80AC6970) ## $t3 = 80AC0000 -/* 04698 80AC7338 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0469C 80AC733C 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 046A0 80AC7340 256B6970 */ addiu $t3, $t3, %lo(func_80AC6970) ## $t3 = 80AC6970 -/* 046A4 80AC7344 3C0580AC */ lui $a1, %hi(func_80AC73B4) ## $a1 = 80AC0000 -/* 046A8 80AC7348 01816824 */ and $t5, $t4, $at -/* 046AC 80AC734C A60A01F4 */ sh $t2, 0x01F4($s0) ## 000001F4 -/* 046B0 80AC7350 A60001F2 */ sh $zero, 0x01F2($s0) ## 000001F2 -/* 046B4 80AC7354 AE0B01F8 */ sw $t3, 0x01F8($s0) ## 000001F8 -/* 046B8 80AC7358 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 046BC 80AC735C 24A573B4 */ addiu $a1, $a1, %lo(func_80AC73B4) ## $a1 = 80AC73B4 -/* 046C0 80AC7360 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 046C4 80AC7364 0C2B0B28 */ jal func_80AC2CA0 -/* 046C8 80AC7368 A60901EE */ sh $t1, 0x01EE($s0) ## 000001EE -.L80AC736C: -/* 046CC 80AC736C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AC7370: -/* 046D0 80AC7370 8FB00018 */ lw $s0, 0x0018($sp) -/* 046D4 80AC7374 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 046D8 80AC7378 03E00008 */ jr $ra -/* 046DC 80AC737C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s deleted file mode 100644 index d0f7ddcd84..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AC7380 -/* 046E0 80AC7380 808E01EA */ lb $t6, 0x01EA($a0) ## 000001EA -/* 046E4 80AC7384 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 046E8 80AC7388 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 046EC 80AC738C 000E7900 */ sll $t7, $t6, 4 -/* 046F0 80AC7390 01EE7821 */ addu $t7, $t7, $t6 -/* 046F4 80AC7394 000F7880 */ sll $t7, $t7, 2 -/* 046F8 80AC7398 00AFC021 */ addu $t8, $a1, $t7 -/* 046FC 80AC739C 0338C821 */ addu $t9, $t9, $t8 -/* 04700 80AC73A0 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 -/* 04704 80AC73A4 03214021 */ addu $t0, $t9, $at -/* 04708 80AC73A8 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 0470C 80AC73AC 03E00008 */ jr $ra -/* 04710 80AC73B0 AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s deleted file mode 100644 index 66f3015bdd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_80AC73B4 -/* 04714 80AC73B4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04718 80AC73B8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0471C 80AC73BC AFB00020 */ sw $s0, 0x0020($sp) -/* 04720 80AC73C0 AFA50034 */ sw $a1, 0x0034($sp) -/* 04724 80AC73C4 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 04728 80AC73C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0472C 80AC73CC AFAF002C */ sw $t7, 0x002C($sp) -/* 04730 80AC73D0 8E1901F8 */ lw $t9, 0x01F8($s0) ## 000001F8 -/* 04734 80AC73D4 0320F809 */ jalr $ra, $t9 -/* 04738 80AC73D8 00000000 */ nop -/* 0473C 80AC73DC 8FA40034 */ lw $a0, 0x0034($sp) -/* 04740 80AC73E0 0C2B0EF3 */ jal func_80AC3BCC -/* 04744 80AC73E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04748 80AC73E8 0C2B196E */ jal func_80AC65B8 -/* 0474C 80AC73EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04750 80AC73F0 0C2B19F1 */ jal func_80AC67C4 -/* 04754 80AC73F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04758 80AC73F8 0C2B19BD */ jal func_80AC66F4 -/* 0475C 80AC73FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04760 80AC7400 260401EE */ addiu $a0, $s0, 0x01EE ## $a0 = 000001EE -/* 04764 80AC7404 860501F0 */ lh $a1, 0x01F0($s0) ## 000001F0 -/* 04768 80AC7408 0C01DE5F */ jal Math_StepToS - -/* 0476C 80AC740C 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 -/* 04770 80AC7410 8FA6002C */ lw $a2, 0x002C($sp) -/* 04774 80AC7414 10C0000A */ beq $a2, $zero, .L80AC7440 -/* 04778 80AC7418 00000000 */ nop -/* 0477C 80AC741C 861801FC */ lh $t8, 0x01FC($s0) ## 000001FC -/* 04780 80AC7420 3C1980AD */ lui $t9, %hi(D_80AC8E34) ## $t9 = 80AD0000 -/* 04784 80AC7424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04788 80AC7428 00184080 */ sll $t0, $t8, 2 -/* 0478C 80AC742C 0328C821 */ addu $t9, $t9, $t0 -/* 04790 80AC7430 8F398E34 */ lw $t9, %lo(D_80AC8E34)($t9) -/* 04794 80AC7434 8FA50034 */ lw $a1, 0x0034($sp) -/* 04798 80AC7438 0320F809 */ jalr $ra, $t9 -/* 0479C 80AC743C 00000000 */ nop -.L80AC7440: -/* 047A0 80AC7440 0C00B638 */ jal Actor_MoveForward - -/* 047A4 80AC7444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 047A8 80AC7448 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 047AC 80AC744C 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 047B0 80AC7450 AFA90014 */ sw $t1, 0x0014($sp) -/* 047B4 80AC7454 8FA40034 */ lw $a0, 0x0034($sp) -/* 047B8 80AC7458 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 047BC 80AC745C 3C0641D0 */ lui $a2, 0x41D0 ## $a2 = 41D00000 -/* 047C0 80AC7460 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 047C4 80AC7464 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 047C8 80AC7468 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 047CC 80AC746C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 047D0 80AC7470 0C00B56E */ jal Actor_SetFocus - -/* 047D4 80AC7474 3C0542B4 */ lui $a1, 0x42B4 ## $a1 = 42B40000 -/* 047D8 80AC7478 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 047DC 80AC747C 3C0580AD */ lui $a1, %hi(D_80AC89B0) ## $a1 = 80AD0000 -/* 047E0 80AC7480 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 047E4 80AC7484 000A5880 */ sll $t3, $t2, 2 -/* 047E8 80AC7488 00AB2821 */ addu $a1, $a1, $t3 -/* 047EC 80AC748C 0C00B58B */ jal Actor_SetScale - -/* 047F0 80AC7490 8CA589B0 */ lw $a1, %lo(D_80AC89B0)($a1) -/* 047F4 80AC7494 8E020194 */ lw $v0, 0x0194($s0) ## 00000194 -/* 047F8 80AC7498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 047FC 80AC749C 10400003 */ beq $v0, $zero, .L80AC74AC -/* 04800 80AC74A0 00000000 */ nop -/* 04804 80AC74A4 0040F809 */ jalr $ra, $v0 -/* 04808 80AC74A8 8FA50034 */ lw $a1, 0x0034($sp) -.L80AC74AC: -/* 0480C 80AC74AC 0C02927F */ jal SkelAnime_Update - -/* 04810 80AC74B0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04814 80AC74B4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04818 80AC74B8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0481C 80AC74BC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04820 80AC74C0 03E00008 */ jr $ra -/* 04824 80AC74C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC74F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC74F4.s deleted file mode 100644 index 96b4c4ebfc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC74F4.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AC74F4 -/* 04854 80AC74F4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 04858 80AC74F8 AFA40000 */ sw $a0, 0x0000($sp) -/* 0485C 80AC74FC AFA60008 */ sw $a2, 0x0008($sp) -/* 04860 80AC7500 14A10007 */ bne $a1, $at, .L80AC7520 -/* 04864 80AC7504 AFA7000C */ sw $a3, 0x000C($sp) -/* 04868 80AC7508 8FA20010 */ lw $v0, 0x0010($sp) -/* 0486C 80AC750C 8FAF0014 */ lw $t7, 0x0014($sp) -/* 04870 80AC7510 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 04874 80AC7514 85F801EE */ lh $t8, 0x01EE($t7) ## 000001EE -/* 04878 80AC7518 01D8C821 */ addu $t9, $t6, $t8 -/* 0487C 80AC751C A4590000 */ sh $t9, 0x0000($v0) ## 00000000 -.L80AC7520: -/* 04880 80AC7520 03E00008 */ jr $ra -/* 04884 80AC7524 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s deleted file mode 100644 index 631230fdb9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s +++ /dev/null @@ -1,181 +0,0 @@ -.rdata -glabel D_80AC939C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC93AC - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC7528 -/* 04888 80AC7528 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 0488C 80AC752C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04890 80AC7530 AFA40078 */ sw $a0, 0x0078($sp) -/* 04894 80AC7534 AFA5007C */ sw $a1, 0x007C($sp) -/* 04898 80AC7538 AFA60080 */ sw $a2, 0x0080($sp) -/* 0489C 80AC753C AFA70084 */ sw $a3, 0x0084($sp) -/* 048A0 80AC7540 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 048A4 80AC7544 3C0680AD */ lui $a2, %hi(D_80AC939C) ## $a2 = 80AD0000 -/* 048A8 80AC7548 24C6939C */ addiu $a2, $a2, %lo(D_80AC939C) ## $a2 = 80AC939C -/* 048AC 80AC754C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 -/* 048B0 80AC7550 24071060 */ addiu $a3, $zero, 0x1060 ## $a3 = 00001060 -/* 048B4 80AC7554 0C031AB1 */ jal Graph_OpenDisps -/* 048B8 80AC7558 AFA5005C */ sw $a1, 0x005C($sp) -/* 048BC 80AC755C 93AF008F */ lbu $t7, 0x008F($sp) -/* 048C0 80AC7560 8FA8005C */ lw $t0, 0x005C($sp) -/* 048C4 80AC7564 8FB80078 */ lw $t8, 0x0078($sp) -/* 048C8 80AC7568 51E0008E */ beql $t7, $zero, .L80AC77A4 -/* 048CC 80AC756C 8FAB0078 */ lw $t3, 0x0078($sp) -/* 048D0 80AC7570 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 048D4 80AC7574 0C025148 */ jal func_80094520 -/* 048D8 80AC7578 AFA8005C */ sw $t0, 0x005C($sp) -/* 048DC 80AC757C 8FA8005C */ lw $t0, 0x005C($sp) -/* 048E0 80AC7580 8FA5007C */ lw $a1, 0x007C($sp) -/* 048E4 80AC7584 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 048E8 80AC7588 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 048EC 80AC758C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 048F0 80AC7590 44811000 */ mtc1 $at, $f2 ## $f2 = 4.00 -/* 048F4 80AC7594 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 048F8 80AC7598 AD1902B0 */ sw $t9, 0x02B0($t0) ## 000002B0 -/* 048FC 80AC759C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 04900 80AC75A0 8CAD0240 */ lw $t5, 0x0240($a1) ## 00000240 -/* 04904 80AC75A4 8CB90244 */ lw $t9, 0x0244($a1) ## 00000244 -/* 04908 80AC75A8 8CAB023C */ lw $t3, 0x023C($a1) ## 0000023C -/* 0490C 80AC75AC 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 04910 80AC75B0 8CAD0248 */ lw $t5, 0x0248($a1) ## 00000248 -/* 04914 80AC75B4 000E7C00 */ sll $t7, $t6, 16 -/* 04918 80AC75B8 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000008 -/* 0491C 80AC75BC 000B6600 */ sll $t4, $t3, 24 -/* 04920 80AC75C0 018FC025 */ or $t8, $t4, $t7 ## $t8 = 00000000 -/* 04924 80AC75C4 00095200 */ sll $t2, $t1, 8 -/* 04928 80AC75C8 030A5825 */ or $t3, $t8, $t2 ## $t3 = 00000000 -/* 0492C 80AC75CC 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 04930 80AC75D0 016E6025 */ or $t4, $t3, $t6 ## $t4 = 00000000 -/* 04934 80AC75D4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 04938 80AC75D8 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 0493C 80AC75DC 3C090401 */ lui $t1, %hi(gSelectionCursorTex) ## $t1 = 04010000 -/* 04940 80AC75E0 2529CDC0 */ addiu $t1, $t1, %lo(gSelectionCursorTex) ## $t1 = 0400CDC0 -/* 04944 80AC75E4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 04948 80AC75E8 AD0F02B0 */ sw $t7, 0x02B0($t0) ## 000002B0 -/* 0494C 80AC75EC 3C19FD70 */ lui $t9, 0xFD70 ## $t9 = FD700000 -/* 04950 80AC75F0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04954 80AC75F4 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 04958 80AC75F8 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 0495C 80AC75FC 3C0D0705 */ lui $t5, 0x0705 ## $t5 = 07050000 -/* 04960 80AC7600 35AD0140 */ ori $t5, $t5, 0x0140 ## $t5 = 07050140 -/* 04964 80AC7604 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 04968 80AC7608 AD1802B0 */ sw $t8, 0x02B0($t0) ## 000002B0 -/* 0496C 80AC760C 3C0AF570 */ lui $t2, 0xF570 ## $t2 = F5700000 -/* 04970 80AC7610 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 04974 80AC7614 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 04978 80AC7618 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 0497C 80AC761C 3C0EE600 */ lui $t6, 0xE600 ## $t6 = E6000000 -/* 04980 80AC7620 3C190703 */ lui $t9, 0x0703 ## $t9 = 07030000 -/* 04984 80AC7624 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 04988 80AC7628 AD0B02B0 */ sw $t3, 0x02B0($t0) ## 000002B0 -/* 0498C 80AC762C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 04990 80AC7630 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 04994 80AC7634 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04998 80AC7638 3739F800 */ ori $t9, $t9, 0xF800 ## $t9 = 0703F800 -/* 0499C 80AC763C 3C0FF300 */ lui $t7, 0xF300 ## $t7 = F3000000 -/* 049A0 80AC7640 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 049A4 80AC7644 AD0C02B0 */ sw $t4, 0x02B0($t0) ## 000002B0 -/* 049A8 80AC7648 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 049AC 80AC764C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 049B0 80AC7650 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 049B4 80AC7654 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 -/* 049B8 80AC7658 3C0B0005 */ lui $t3, 0x0005 ## $t3 = 00050000 -/* 049BC 80AC765C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 049C0 80AC7660 AD0902B0 */ sw $t1, 0x02B0($t0) ## 000002B0 -/* 049C4 80AC7664 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 049C8 80AC7668 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 049CC 80AC766C 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 049D0 80AC7670 3C0DF560 */ lui $t5, 0xF560 ## $t5 = F5600000 -/* 049D4 80AC7674 35AD0200 */ ori $t5, $t5, 0x0200 ## $t5 = F5600200 -/* 049D8 80AC7678 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 049DC 80AC767C AD0A02B0 */ sw $t2, 0x02B0($t0) ## 000002B0 -/* 049E0 80AC7680 356B0140 */ ori $t3, $t3, 0x0140 ## $t3 = 00050140 -/* 049E4 80AC7684 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 049E8 80AC7688 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 049EC 80AC768C 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 049F0 80AC7690 3C0F0003 */ lui $t7, 0x0003 ## $t7 = 00030000 -/* 049F4 80AC7694 35EFC03C */ ori $t7, $t7, 0xC03C ## $t7 = 0003C03C -/* 049F8 80AC7698 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 049FC 80AC769C AD0E02B0 */ sw $t6, 0x02B0($t0) ## 000002B0 -/* 04A00 80AC76A0 3C0CF200 */ lui $t4, 0xF200 ## $t4 = F2000000 -/* 04A04 80AC76A4 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 04A08 80AC76A8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 04A0C 80AC76AC AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 04A10 80AC76B0 C7AC0088 */ lwc1 $f12, 0x0088($sp) -/* 04A14 80AC76B4 44812000 */ mtc1 $at, $f4 ## $f4 = 16.00 -/* 04A18 80AC76B8 C7AE0080 */ lwc1 $f14, 0x0080($sp) -/* 04A1C 80AC76BC C7B00084 */ lwc1 $f16, 0x0084($sp) -/* 04A20 80AC76C0 460C2002 */ mul.s $f0, $f4, $f12 -/* 04A24 80AC76C4 3C01E400 */ lui $at, 0xE400 ## $at = E4000000 -/* 04A28 80AC76C8 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04A2C 80AC76CC 3C09E100 */ lui $t1, 0xE100 ## $t1 = E1000000 -/* 04A30 80AC76D0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 04A34 80AC76D4 AD1902B0 */ sw $t9, 0x02B0($t0) ## 000002B0 -/* 04A38 80AC76D8 46007180 */ add.s $f6, $f14, $f0 -/* 04A3C 80AC76DC 46008480 */ add.s $f18, $f16, $f0 -/* 04A40 80AC76E0 46023202 */ mul.s $f8, $f6, $f2 -/* 04A44 80AC76E4 4600428D */ trunc.w.s $f10, $f8 -/* 04A48 80AC76E8 46029102 */ mul.s $f4, $f18, $f2 -/* 04A4C 80AC76EC 46007201 */ sub.s $f8, $f14, $f0 -/* 04A50 80AC76F0 44185000 */ mfc1 $t8, $f10 -/* 04A54 80AC76F4 46024282 */ mul.s $f10, $f8, $f2 -/* 04A58 80AC76F8 330A0FFF */ andi $t2, $t8, 0x0FFF ## $t2 = 00000000 -/* 04A5C 80AC76FC 000A6B00 */ sll $t5, $t2, 12 -/* 04A60 80AC7700 01A15825 */ or $t3, $t5, $at ## $t3 = F5600200 -/* 04A64 80AC7704 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04A68 80AC7708 4600218D */ trunc.w.s $f6, $f4 -/* 04A6C 80AC770C 4600548D */ trunc.w.s $f18, $f10 -/* 04A70 80AC7710 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 04A74 80AC7714 440C3000 */ mfc1 $t4, $f6 -/* 04A78 80AC7718 46008101 */ sub.s $f4, $f16, $f0 -/* 04A7C 80AC771C 44189000 */ mfc1 $t8, $f18 -/* 04A80 80AC7720 3C014480 */ lui $at, 0x4480 ## $at = 44800000 -/* 04A84 80AC7724 460C5483 */ div.s $f18, $f10, $f12 -/* 04A88 80AC7728 318F0FFF */ andi $t7, $t4, 0x0FFF ## $t7 = 00000000 -/* 04A8C 80AC772C 016FC825 */ or $t9, $t3, $t7 ## $t9 = F5600200 -/* 04A90 80AC7730 330A0FFF */ andi $t2, $t8, 0x0FFF ## $t2 = 00000000 -/* 04A94 80AC7734 46022182 */ mul.s $f6, $f4, $f2 -/* 04A98 80AC7738 44812000 */ mtc1 $at, $f4 ## $f4 = 1024.00 -/* 04A9C 80AC773C 000A6B00 */ sll $t5, $t2, 12 -/* 04AA0 80AC7740 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04AA4 80AC7744 3C0AF100 */ lui $t2, 0xF100 ## $t2 = F1000000 -/* 04AA8 80AC7748 4600320D */ trunc.w.s $f8, $f6 -/* 04AAC 80AC774C 46049182 */ mul.s $f6, $f18, $f4 -/* 04AB0 80AC7750 440C4000 */ mfc1 $t4, $f8 -/* 04AB4 80AC7754 00000000 */ nop -/* 04AB8 80AC7758 318B0FFF */ andi $t3, $t4, 0x0FFF ## $t3 = 00000000 -/* 04ABC 80AC775C 01AB7825 */ or $t7, $t5, $t3 ## $t7 = F5600200 -/* 04AC0 80AC7760 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 04AC4 80AC7764 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04AC8 80AC7768 4600320D */ trunc.w.s $f8, $f6 -/* 04ACC 80AC776C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 04AD0 80AC7770 AD1902B0 */ sw $t9, 0x02B0($t0) ## 000002B0 -/* 04AD4 80AC7774 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 04AD8 80AC7778 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 04ADC 80AC777C 44044000 */ mfc1 $a0, $f8 -/* 04AE0 80AC7780 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04AE4 80AC7784 3084FFFF */ andi $a0, $a0, 0xFFFF ## $a0 = 00000000 -/* 04AE8 80AC7788 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 04AEC 80AC778C 00046400 */ sll $t4, $a0, 16 -/* 04AF0 80AC7790 AD1802B0 */ sw $t8, 0x02B0($t0) ## 000002B0 -/* 04AF4 80AC7794 01846825 */ or $t5, $t4, $a0 ## $t5 = F2000000 -/* 04AF8 80AC7798 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 04AFC 80AC779C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 04B00 80AC77A0 8FAB0078 */ lw $t3, 0x0078($sp) -.L80AC77A4: -/* 04B04 80AC77A4 3C0680AD */ lui $a2, %hi(D_80AC93AC) ## $a2 = 80AD0000 -/* 04B08 80AC77A8 24C693AC */ addiu $a2, $a2, %lo(D_80AC93AC) ## $a2 = 80AC93AC -/* 04B0C 80AC77AC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 -/* 04B10 80AC77B0 24071077 */ addiu $a3, $zero, 0x1077 ## $a3 = 00001077 -/* 04B14 80AC77B4 0C031AD5 */ jal Graph_CloseDisps -/* 04B18 80AC77B8 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 04B1C 80AC77BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04B20 80AC77C0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 04B24 80AC77C4 03E00008 */ jr $ra -/* 04B28 80AC77C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s deleted file mode 100644 index 81737d6ce2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s +++ /dev/null @@ -1,138 +0,0 @@ -.rdata -glabel D_80AC93BC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC93CC - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC77CC -/* 04B2C 80AC77CC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 04B30 80AC77D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B34 80AC77D4 AFA40070 */ sw $a0, 0x0070($sp) -/* 04B38 80AC77D8 AFA50074 */ sw $a1, 0x0074($sp) -/* 04B3C 80AC77DC AFA60078 */ sw $a2, 0x0078($sp) -/* 04B40 80AC77E0 AFA7007C */ sw $a3, 0x007C($sp) -/* 04B44 80AC77E4 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 04B48 80AC77E8 3C0680AD */ lui $a2, %hi(D_80AC93BC) ## $a2 = 80AD0000 -/* 04B4C 80AC77EC 24C693BC */ addiu $a2, $a2, %lo(D_80AC93BC) ## $a2 = 80AC93BC -/* 04B50 80AC77F0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFC8 -/* 04B54 80AC77F4 24071084 */ addiu $a3, $zero, 0x1084 ## $a3 = 00001084 -/* 04B58 80AC77F8 0C031AB1 */ jal Graph_OpenDisps -/* 04B5C 80AC77FC AFA50048 */ sw $a1, 0x0048($sp) -/* 04B60 80AC7800 8FA80048 */ lw $t0, 0x0048($sp) -/* 04B64 80AC7804 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 -/* 04B68 80AC7808 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 04B6C 80AC780C 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04B70 80AC7810 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 04B74 80AC7814 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 04B78 80AC7818 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 04B7C 80AC781C AD0F02B0 */ sw $t7, 0x02B0($t0) ## 000002B0 -/* 04B80 80AC7820 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 04B84 80AC7824 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 04B88 80AC7828 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04B8C 80AC782C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 04B90 80AC7830 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 04B94 80AC7834 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 04B98 80AC7838 AD1902B0 */ sw $t9, 0x02B0($t0) ## 000002B0 -/* 04B9C 80AC783C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 04BA0 80AC7840 8FAD0078 */ lw $t5, 0x0078($sp) -/* 04BA4 80AC7844 8FB9007C */ lw $t9, 0x007C($sp) -/* 04BA8 80AC7848 8FAB0074 */ lw $t3, 0x0074($sp) -/* 04BAC 80AC784C 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 04BB0 80AC7850 8FAD0080 */ lw $t5, 0x0080($sp) -/* 04BB4 80AC7854 000E7C00 */ sll $t7, $t6, 16 -/* 04BB8 80AC7858 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000008 -/* 04BBC 80AC785C 000B6600 */ sll $t4, $t3, 24 -/* 04BC0 80AC7860 018FC025 */ or $t8, $t4, $t7 ## $t8 = 00000008 -/* 04BC4 80AC7864 00095200 */ sll $t2, $t1, 8 -/* 04BC8 80AC7868 030A5825 */ or $t3, $t8, $t2 ## $t3 = 00000008 -/* 04BCC 80AC786C 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 04BD0 80AC7870 016E6025 */ or $t4, $t3, $t6 ## $t4 = 00000008 -/* 04BD4 80AC7874 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 04BD8 80AC7878 C7AE008C */ lwc1 $f14, 0x008C($sp) -/* 04BDC 80AC787C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 04BE0 80AC7880 44813000 */ mtc1 $at, $f6 ## $f6 = 12.00 -/* 04BE4 80AC7884 460E2002 */ mul.s $f0, $f4, $f14 -/* 04BE8 80AC7888 C7B00084 */ lwc1 $f16, 0x0084($sp) -/* 04BEC 80AC788C C7B20088 */ lwc1 $f18, 0x0088($sp) -/* 04BF0 80AC7890 460E3082 */ mul.s $f2, $f6, $f14 -/* 04BF4 80AC7894 3C01E400 */ lui $at, 0xE400 ## $at = E4000000 -/* 04BF8 80AC7898 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04BFC 80AC789C 3C19E100 */ lui $t9, 0xE100 ## $t9 = E1000000 -/* 04C00 80AC78A0 3C0680AD */ lui $a2, %hi(D_80AC93CC) ## $a2 = 80AD0000 -/* 04C04 80AC78A4 46008200 */ add.s $f8, $f16, $f0 -/* 04C08 80AC78A8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 04C0C 80AC78AC AD0F02B0 */ sw $t7, 0x02B0($t0) ## 000002B0 -/* 04C10 80AC78B0 46029180 */ add.s $f6, $f18, $f2 -/* 04C14 80AC78B4 460C4282 */ mul.s $f10, $f8, $f12 -/* 04C18 80AC78B8 24C693CC */ addiu $a2, $a2, %lo(D_80AC93CC) ## $a2 = 80AC93CC -/* 04C1C 80AC78BC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFC8 -/* 04C20 80AC78C0 460C3202 */ mul.s $f8, $f6, $f12 -/* 04C24 80AC78C4 24071092 */ addiu $a3, $zero, 0x1092 ## $a3 = 00001092 -/* 04C28 80AC78C8 4600510D */ trunc.w.s $f4, $f10 -/* 04C2C 80AC78CC 4600428D */ trunc.w.s $f10, $f8 -/* 04C30 80AC78D0 44092000 */ mfc1 $t1, $f4 -/* 04C34 80AC78D4 46008101 */ sub.s $f4, $f16, $f0 -/* 04C38 80AC78D8 440E5000 */ mfc1 $t6, $f10 -/* 04C3C 80AC78DC 31380FFF */ andi $t8, $t1, 0x0FFF ## $t8 = 00000008 -/* 04C40 80AC78E0 46029281 */ sub.s $f10, $f18, $f2 -/* 04C44 80AC78E4 460C2182 */ mul.s $f6, $f4, $f12 -/* 04C48 80AC78E8 00185300 */ sll $t2, $t8, 12 -/* 04C4C 80AC78EC 01416825 */ or $t5, $t2, $at ## $t5 = E4000000 -/* 04C50 80AC78F0 460C5102 */ mul.s $f4, $f10, $f12 -/* 04C54 80AC78F4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04C58 80AC78F8 31CC0FFF */ andi $t4, $t6, 0x0FFF ## $t4 = 00000000 -/* 04C5C 80AC78FC 01AC7825 */ or $t7, $t5, $t4 ## $t7 = E4000000 -/* 04C60 80AC7900 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 04C64 80AC7904 4600320D */ trunc.w.s $f8, $f6 -/* 04C68 80AC7908 4600218D */ trunc.w.s $f6, $f4 -/* 04C6C 80AC790C 44094000 */ mfc1 $t1, $f8 -/* 04C70 80AC7910 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 04C74 80AC7914 3C014480 */ lui $at, 0x4480 ## $at = 44800000 -/* 04C78 80AC7918 440E3000 */ mfc1 $t6, $f6 -/* 04C7C 80AC791C 460E4283 */ div.s $f10, $f8, $f14 -/* 04C80 80AC7920 31380FFF */ andi $t8, $t1, 0x0FFF ## $t8 = 00000008 -/* 04C84 80AC7924 00185300 */ sll $t2, $t8, 12 -/* 04C88 80AC7928 31CD0FFF */ andi $t5, $t6, 0x0FFF ## $t5 = 00000000 -/* 04C8C 80AC792C 014D6025 */ or $t4, $t2, $t5 ## $t4 = 00000000 -/* 04C90 80AC7930 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 04C94 80AC7934 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04C98 80AC7938 44812000 */ mtc1 $at, $f4 ## $f4 = 1024.00 -/* 04C9C 80AC793C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 04CA0 80AC7940 AD0F02B0 */ sw $t7, 0x02B0($t0) ## 000002B0 -/* 04CA4 80AC7944 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04CA8 80AC7948 8FAE0094 */ lw $t6, 0x0094($sp) -/* 04CAC 80AC794C 8FB80090 */ lw $t8, 0x0090($sp) -/* 04CB0 80AC7950 3C0FF100 */ lui $t7, 0xF100 ## $t7 = F1000000 -/* 04CB4 80AC7954 31CAFFFF */ andi $t2, $t6, 0xFFFF ## $t2 = 00000000 -/* 04CB8 80AC7958 00185C00 */ sll $t3, $t8, 16 -/* 04CBC 80AC795C 016A6825 */ or $t5, $t3, $t2 ## $t5 = 00000008 -/* 04CC0 80AC7960 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 04CC4 80AC7964 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04CC8 80AC7968 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 04CCC 80AC796C 46045002 */ mul.s $f0, $f10, $f4 -/* 04CD0 80AC7970 AD0C02B0 */ sw $t4, 0x02B0($t0) ## 000002B0 -/* 04CD4 80AC7974 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 04CD8 80AC7978 C7A60098 */ lwc1 $f6, 0x0098($sp) -/* 04CDC 80AC797C C7A4009C */ lwc1 $f4, 0x009C($sp) -/* 04CE0 80AC7980 46060202 */ mul.s $f8, $f0, $f6 -/* 04CE4 80AC7984 00000000 */ nop -/* 04CE8 80AC7988 46002182 */ mul.s $f6, $f4, $f0 -/* 04CEC 80AC798C 4600428D */ trunc.w.s $f10, $f8 -/* 04CF0 80AC7990 4600320D */ trunc.w.s $f8, $f6 -/* 04CF4 80AC7994 44185000 */ mfc1 $t8, $f10 -/* 04CF8 80AC7998 440A4000 */ mfc1 $t2, $f8 -/* 04CFC 80AC799C 00187400 */ sll $t6, $t8, 16 -/* 04D00 80AC79A0 314DFFFF */ andi $t5, $t2, 0xFFFF ## $t5 = 00000000 -/* 04D04 80AC79A4 01CD6025 */ or $t4, $t6, $t5 ## $t4 = 00000000 -/* 04D08 80AC79A8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 04D0C 80AC79AC 8FAF0070 */ lw $t7, 0x0070($sp) -/* 04D10 80AC79B0 0C031AD5 */ jal Graph_CloseDisps -/* 04D14 80AC79B4 8DE50000 */ lw $a1, 0x0000($t7) ## F1000000 -/* 04D18 80AC79B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04D1C 80AC79BC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 04D20 80AC79C0 03E00008 */ jr $ra -/* 04D24 80AC79C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s deleted file mode 100644 index 643735974a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s +++ /dev/null @@ -1,265 +0,0 @@ -.rdata -glabel D_80AC93DC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC93EC - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC79C8 -/* 04D28 80AC79C8 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 04D2C 80AC79CC AFBF003C */ sw $ra, 0x003C($sp) -/* 04D30 80AC79D0 AFB00038 */ sw $s0, 0x0038($sp) -/* 04D34 80AC79D4 AFA400A0 */ sw $a0, 0x00A0($sp) -/* 04D38 80AC79D8 8CAE0288 */ lw $t6, 0x0288($a1) ## 00000288 -/* 04D3C 80AC79DC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 04D40 80AC79E0 3C0680AD */ lui $a2, %hi(D_80AC93DC) ## $a2 = 80AD0000 -/* 04D44 80AC79E4 AFAE009C */ sw $t6, 0x009C($sp) -/* 04D48 80AC79E8 8CAF02C0 */ lw $t7, 0x02C0($a1) ## 000002C0 -/* 04D4C 80AC79EC 24C693DC */ addiu $a2, $a2, %lo(D_80AC93DC) ## $a2 = 80AC93DC -/* 04D50 80AC79F0 2407109C */ addiu $a3, $zero, 0x109C ## $a3 = 0000109C -/* 04D54 80AC79F4 AFAF0098 */ sw $t7, 0x0098($sp) -/* 04D58 80AC79F8 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 04D5C 80AC79FC 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 -/* 04D60 80AC7A00 0C031AB1 */ jal Graph_OpenDisps -/* 04D64 80AC7A04 AFA50094 */ sw $a1, 0x0094($sp) -/* 04D68 80AC7A08 8FB9009C */ lw $t9, 0x009C($sp) -/* 04D6C 80AC7A0C 8FA80094 */ lw $t0, 0x0094($sp) -/* 04D70 80AC7A10 8FA90098 */ lw $t1, 0x0098($sp) -/* 04D74 80AC7A14 17200003 */ bne $t9, $zero, .L80AC7A24 -/* 04D78 80AC7A18 8FAA00A0 */ lw $t2, 0x00A0($sp) -/* 04D7C 80AC7A1C 512000D8 */ beql $t1, $zero, .L80AC7D80 -/* 04D80 80AC7A20 8FAF00A0 */ lw $t7, 0x00A0($sp) -.L80AC7A24: -/* 04D84 80AC7A24 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 04D88 80AC7A28 0C025148 */ jal func_80094520 -/* 04D8C 80AC7A2C AFA80094 */ sw $t0, 0x0094($sp) -/* 04D90 80AC7A30 8FA80094 */ lw $t0, 0x0094($sp) -/* 04D94 80AC7A34 3C0CFC11 */ lui $t4, 0xFC11 ## $t4 = FC110000 -/* 04D98 80AC7A38 3C0DFF2F */ lui $t5, 0xFF2F ## $t5 = FF2F0000 -/* 04D9C 80AC7A3C 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04DA0 80AC7A40 35ADFFFF */ ori $t5, $t5, 0xFFFF ## $t5 = FF2FFFFF -/* 04DA4 80AC7A44 358C9623 */ ori $t4, $t4, 0x9623 ## $t4 = FC119623 -/* 04DA8 80AC7A48 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 04DAC 80AC7A4C AD0B02B0 */ sw $t3, 0x02B0($t0) ## 000002B0 -/* 04DB0 80AC7A50 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 04DB4 80AC7A54 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 04DB8 80AC7A58 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04DBC 80AC7A5C 3C180401 */ lui $t8, %hi(gArrowCursorTex) ## $t8 = 04010000 -/* 04DC0 80AC7A60 2718CF40 */ addiu $t8, $t8, %lo(gArrowCursorTex) ## $t8 = 0400CF40 -/* 04DC4 80AC7A64 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 04DC8 80AC7A68 AD0E02B0 */ sw $t6, 0x02B0($t0) ## 000002B0 -/* 04DCC 80AC7A6C 3C0FFD70 */ lui $t7, 0xFD70 ## $t7 = FD700000 -/* 04DD0 80AC7A70 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 04DD4 80AC7A74 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 04DD8 80AC7A78 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04DDC 80AC7A7C 3C0A0700 */ lui $t2, 0x0700 ## $t2 = 07000000 -/* 04DE0 80AC7A80 354A0040 */ ori $t2, $t2, 0x0040 ## $t2 = 07000040 -/* 04DE4 80AC7A84 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 04DE8 80AC7A88 AD1902B0 */ sw $t9, 0x02B0($t0) ## 000002B0 -/* 04DEC 80AC7A8C 3C09F570 */ lui $t1, 0xF570 ## $t1 = F5700000 -/* 04DF0 80AC7A90 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 04DF4 80AC7A94 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 04DF8 80AC7A98 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04DFC 80AC7A9C 3C0CE600 */ lui $t4, 0xE600 ## $t4 = E6000000 -/* 04E00 80AC7AA0 3C0F070B */ lui $t7, 0x070B ## $t7 = 070B0000 -/* 04E04 80AC7AA4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 04E08 80AC7AA8 AD0B02B0 */ sw $t3, 0x02B0($t0) ## 000002B0 -/* 04E0C 80AC7AAC AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 04E10 80AC7AB0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 04E14 80AC7AB4 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04E18 80AC7AB8 35EFF400 */ ori $t7, $t7, 0xF400 ## $t7 = 070BF400 -/* 04E1C 80AC7ABC 3C0EF300 */ lui $t6, 0xF300 ## $t6 = F3000000 -/* 04E20 80AC7AC0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 04E24 80AC7AC4 AD0D02B0 */ sw $t5, 0x02B0($t0) ## 000002B0 -/* 04E28 80AC7AC8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 04E2C 80AC7ACC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 04E30 80AC7AD0 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04E34 80AC7AD4 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 04E38 80AC7AD8 3C0AF568 */ lui $t2, 0xF568 ## $t2 = F5680000 -/* 04E3C 80AC7ADC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 04E40 80AC7AE0 AD1802B0 */ sw $t8, 0x02B0($t0) ## 000002B0 -/* 04E44 80AC7AE4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 04E48 80AC7AE8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04E4C 80AC7AEC 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04E50 80AC7AF0 354A0400 */ ori $t2, $t2, 0x0400 ## $t2 = F5680400 -/* 04E54 80AC7AF4 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 -/* 04E58 80AC7AF8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 04E5C 80AC7AFC AD0902B0 */ sw $t1, 0x02B0($t0) ## 000002B0 -/* 04E60 80AC7B00 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 04E64 80AC7B04 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 04E68 80AC7B08 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04E6C 80AC7B0C 3C0E0003 */ lui $t6, 0x0003 ## $t6 = 00030000 -/* 04E70 80AC7B10 35CEC05C */ ori $t6, $t6, 0xC05C ## $t6 = 0003C05C -/* 04E74 80AC7B14 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 04E78 80AC7B18 AD0C02B0 */ sw $t4, 0x02B0($t0) ## 000002B0 -/* 04E7C 80AC7B1C 3C0DF200 */ lui $t5, 0xF200 ## $t5 = F2000000 -/* 04E80 80AC7B20 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 04E84 80AC7B24 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 04E88 80AC7B28 8FAF009C */ lw $t7, 0x009C($sp) -/* 04E8C 80AC7B2C 8FA400A0 */ lw $a0, 0x00A0($sp) -/* 04E90 80AC7B30 51E00018 */ beql $t7, $zero, .L80AC7B94 -/* 04E94 80AC7B34 8FB90098 */ lw $t9, 0x0098($sp) -/* 04E98 80AC7B38 8E180278 */ lw $t8, 0x0278($s0) ## 00000278 -/* 04E9C 80AC7B3C 8E05026C */ lw $a1, 0x026C($s0) ## 0000026C -/* 04EA0 80AC7B40 8E060270 */ lw $a2, 0x0270($s0) ## 00000270 -/* 04EA4 80AC7B44 8E070274 */ lw $a3, 0x0274($s0) ## 00000274 -/* 04EA8 80AC7B48 AFB80010 */ sw $t8, 0x0010($sp) -/* 04EAC 80AC7B4C C604027C */ lwc1 $f4, 0x027C($s0) ## 0000027C -/* 04EB0 80AC7B50 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 04EB4 80AC7B54 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 -/* 04EB8 80AC7B58 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 04EBC 80AC7B5C C6060280 */ lwc1 $f6, 0x0280($s0) ## 00000280 -/* 04EC0 80AC7B60 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04EC4 80AC7B64 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 04EC8 80AC7B68 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 04ECC 80AC7B6C C6080284 */ lwc1 $f8, 0x0284($s0) ## 00000284 -/* 04ED0 80AC7B70 AFA80094 */ sw $t0, 0x0094($sp) -/* 04ED4 80AC7B74 AFA00024 */ sw $zero, 0x0024($sp) -/* 04ED8 80AC7B78 AFA00020 */ sw $zero, 0x0020($sp) -/* 04EDC 80AC7B7C E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 04EE0 80AC7B80 E7B0002C */ swc1 $f16, 0x002C($sp) -/* 04EE4 80AC7B84 0C2B1DF3 */ jal func_80AC77CC -/* 04EE8 80AC7B88 E7A8001C */ swc1 $f8, 0x001C($sp) -/* 04EEC 80AC7B8C 8FA80094 */ lw $t0, 0x0094($sp) -/* 04EF0 80AC7B90 8FB90098 */ lw $t9, 0x0098($sp) -.L80AC7B94: -/* 04EF4 80AC7B94 53200017 */ beql $t9, $zero, .L80AC7BF4 -/* 04EF8 80AC7B98 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04EFC 80AC7B9C 8E0902B0 */ lw $t1, 0x02B0($s0) ## 000002B0 -/* 04F00 80AC7BA0 8E0502A4 */ lw $a1, 0x02A4($s0) ## 000002A4 -/* 04F04 80AC7BA4 8E0602A8 */ lw $a2, 0x02A8($s0) ## 000002A8 -/* 04F08 80AC7BA8 8E0702AC */ lw $a3, 0x02AC($s0) ## 000002AC -/* 04F0C 80AC7BAC AFA90010 */ sw $t1, 0x0010($sp) -/* 04F10 80AC7BB0 C61202B4 */ lwc1 $f18, 0x02B4($s0) ## 000002B4 -/* 04F14 80AC7BB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04F18 80AC7BB8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 04F1C 80AC7BBC E7B20014 */ swc1 $f18, 0x0014($sp) -/* 04F20 80AC7BC0 C60402B8 */ lwc1 $f4, 0x02B8($s0) ## 000002B8 -/* 04F24 80AC7BC4 8FA400A0 */ lw $a0, 0x00A0($sp) -/* 04F28 80AC7BC8 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 04F2C 80AC7BCC C60602BC */ lwc1 $f6, 0x02BC($s0) ## 000002BC -/* 04F30 80AC7BD0 AFA80094 */ sw $t0, 0x0094($sp) -/* 04F34 80AC7BD4 AFA00024 */ sw $zero, 0x0024($sp) -/* 04F38 80AC7BD8 AFA00020 */ sw $zero, 0x0020($sp) -/* 04F3C 80AC7BDC E7A0002C */ swc1 $f0, 0x002C($sp) -/* 04F40 80AC7BE0 E7A00028 */ swc1 $f0, 0x0028($sp) -/* 04F44 80AC7BE4 0C2B1DF3 */ jal func_80AC77CC -/* 04F48 80AC7BE8 E7A6001C */ swc1 $f6, 0x001C($sp) -/* 04F4C 80AC7BEC 8FA80094 */ lw $t0, 0x0094($sp) -/* 04F50 80AC7BF0 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -.L80AC7BF4: -/* 04F54 80AC7BF4 3C0C0401 */ lui $t4, %hi(gControlStickTex) ## $t4 = 04010000 -/* 04F58 80AC7BF8 258CCE40 */ addiu $t4, $t4, %lo(gControlStickTex) ## $t4 = 0400CE40 -/* 04F5C 80AC7BFC 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 04F60 80AC7C00 AD0A02B0 */ sw $t2, 0x02B0($t0) ## 000002B0 -/* 04F64 80AC7C04 3C0BFD70 */ lui $t3, 0xFD70 ## $t3 = FD700000 -/* 04F68 80AC7C08 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 04F6C 80AC7C0C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 04F70 80AC7C10 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04F74 80AC7C14 3C0F0700 */ lui $t7, 0x0700 ## $t7 = 07000000 -/* 04F78 80AC7C18 35EF0040 */ ori $t7, $t7, 0x0040 ## $t7 = 07000040 -/* 04F7C 80AC7C1C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 04F80 80AC7C20 AD0D02B0 */ sw $t5, 0x02B0($t0) ## 000002B0 -/* 04F84 80AC7C24 3C0EF570 */ lui $t6, 0xF570 ## $t6 = F5700000 -/* 04F88 80AC7C28 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 04F8C 80AC7C2C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 04F90 80AC7C30 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04F94 80AC7C34 3C19E600 */ lui $t9, 0xE600 ## $t9 = E6000000 -/* 04F98 80AC7C38 3C0B0707 */ lui $t3, 0x0707 ## $t3 = 07070000 -/* 04F9C 80AC7C3C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 04FA0 80AC7C40 AD1802B0 */ sw $t8, 0x02B0($t0) ## 000002B0 -/* 04FA4 80AC7C44 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 04FA8 80AC7C48 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04FAC 80AC7C4C 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04FB0 80AC7C50 356BF400 */ ori $t3, $t3, 0xF400 ## $t3 = 0707F400 -/* 04FB4 80AC7C54 3C0AF300 */ lui $t2, 0xF300 ## $t2 = F3000000 -/* 04FB8 80AC7C58 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 04FBC 80AC7C5C AD0902B0 */ sw $t1, 0x02B0($t0) ## 000002B0 -/* 04FC0 80AC7C60 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 04FC4 80AC7C64 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 04FC8 80AC7C68 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04FCC 80AC7C6C 3C0DE700 */ lui $t5, 0xE700 ## $t5 = E7000000 -/* 04FD0 80AC7C70 3C0FF568 */ lui $t7, 0xF568 ## $t7 = F5680000 -/* 04FD4 80AC7C74 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 04FD8 80AC7C78 AD0C02B0 */ sw $t4, 0x02B0($t0) ## 000002B0 -/* 04FDC 80AC7C7C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 04FE0 80AC7C80 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 04FE4 80AC7C84 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 04FE8 80AC7C88 35EF0400 */ ori $t7, $t7, 0x0400 ## $t7 = F5680400 -/* 04FEC 80AC7C8C 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 04FF0 80AC7C90 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 04FF4 80AC7C94 AD0E02B0 */ sw $t6, 0x02B0($t0) ## 000002B0 -/* 04FF8 80AC7C98 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 04FFC 80AC7C9C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 05000 80AC7CA0 8D0202B0 */ lw $v0, 0x02B0($t0) ## 000002B0 -/* 05004 80AC7CA4 3C0A0003 */ lui $t2, 0x0003 ## $t2 = 00030000 -/* 05008 80AC7CA8 354AC03C */ ori $t2, $t2, 0xC03C ## $t2 = 0003C03C -/* 0500C 80AC7CAC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 05010 80AC7CB0 AD1902B0 */ sw $t9, 0x02B0($t0) ## 000002B0 -/* 05014 80AC7CB4 3C09F200 */ lui $t1, 0xF200 ## $t1 = F2000000 -/* 05018 80AC7CB8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0501C 80AC7CBC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 05020 80AC7CC0 8FAB009C */ lw $t3, 0x009C($sp) -/* 05024 80AC7CC4 8FA400A0 */ lw $a0, 0x00A0($sp) -/* 05028 80AC7CC8 51600016 */ beql $t3, $zero, .L80AC7D24 -/* 0502C 80AC7CCC 8FAD0098 */ lw $t5, 0x0098($sp) -/* 05030 80AC7CD0 8E0C0260 */ lw $t4, 0x0260($s0) ## 00000260 -/* 05034 80AC7CD4 8E050254 */ lw $a1, 0x0254($s0) ## 00000254 -/* 05038 80AC7CD8 8E060258 */ lw $a2, 0x0258($s0) ## 00000258 -/* 0503C 80AC7CDC 8E07025C */ lw $a3, 0x025C($s0) ## 0000025C -/* 05040 80AC7CE0 AFAC0010 */ sw $t4, 0x0010($sp) -/* 05044 80AC7CE4 C6080264 */ lwc1 $f8, 0x0264($s0) ## 00000264 -/* 05048 80AC7CE8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0504C 80AC7CEC 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 -/* 05050 80AC7CF0 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 05054 80AC7CF4 C60A0268 */ lwc1 $f10, 0x0268($s0) ## 00000268 -/* 05058 80AC7CF8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0505C 80AC7CFC 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 05060 80AC7D00 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 05064 80AC7D04 C6100284 */ lwc1 $f16, 0x0284($s0) ## 00000284 -/* 05068 80AC7D08 AFA00024 */ sw $zero, 0x0024($sp) -/* 0506C 80AC7D0C AFA00020 */ sw $zero, 0x0020($sp) -/* 05070 80AC7D10 E7B20028 */ swc1 $f18, 0x0028($sp) -/* 05074 80AC7D14 E7A4002C */ swc1 $f4, 0x002C($sp) -/* 05078 80AC7D18 0C2B1DF3 */ jal func_80AC77CC -/* 0507C 80AC7D1C E7B0001C */ swc1 $f16, 0x001C($sp) -/* 05080 80AC7D20 8FAD0098 */ lw $t5, 0x0098($sp) -.L80AC7D24: -/* 05084 80AC7D24 51A00016 */ beql $t5, $zero, .L80AC7D80 -/* 05088 80AC7D28 8FAF00A0 */ lw $t7, 0x00A0($sp) -/* 0508C 80AC7D2C 8E0E0298 */ lw $t6, 0x0298($s0) ## 00000298 -/* 05090 80AC7D30 8E05028C */ lw $a1, 0x028C($s0) ## 0000028C -/* 05094 80AC7D34 8E060290 */ lw $a2, 0x0290($s0) ## 00000290 -/* 05098 80AC7D38 8E070294 */ lw $a3, 0x0294($s0) ## 00000294 -/* 0509C 80AC7D3C AFAE0010 */ sw $t6, 0x0010($sp) -/* 050A0 80AC7D40 C606029C */ lwc1 $f6, 0x029C($s0) ## 0000029C -/* 050A4 80AC7D44 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 050A8 80AC7D48 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 050AC 80AC7D4C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 050B0 80AC7D50 C60802A0 */ lwc1 $f8, 0x02A0($s0) ## 000002A0 -/* 050B4 80AC7D54 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 050B8 80AC7D58 8FA400A0 */ lw $a0, 0x00A0($sp) -/* 050BC 80AC7D5C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 050C0 80AC7D60 C60A02BC */ lwc1 $f10, 0x02BC($s0) ## 000002BC -/* 050C4 80AC7D64 AFA00024 */ sw $zero, 0x0024($sp) -/* 050C8 80AC7D68 AFA00020 */ sw $zero, 0x0020($sp) -/* 050CC 80AC7D6C E7B00028 */ swc1 $f16, 0x0028($sp) -/* 050D0 80AC7D70 E7B2002C */ swc1 $f18, 0x002C($sp) -/* 050D4 80AC7D74 0C2B1DF3 */ jal func_80AC77CC -/* 050D8 80AC7D78 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 050DC 80AC7D7C 8FAF00A0 */ lw $t7, 0x00A0($sp) -.L80AC7D80: -/* 050E0 80AC7D80 3C0680AD */ lui $a2, %hi(D_80AC93EC) ## $a2 = 80AD0000 -/* 050E4 80AC7D84 24C693EC */ addiu $a2, $a2, %lo(D_80AC93EC) ## $a2 = 80AC93EC -/* 050E8 80AC7D88 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 -/* 050EC 80AC7D8C 240710CC */ addiu $a3, $zero, 0x10CC ## $a3 = 000010CC -/* 050F0 80AC7D90 0C031AD5 */ jal Graph_CloseDisps -/* 050F4 80AC7D94 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 050F8 80AC7D98 8FBF003C */ lw $ra, 0x003C($sp) -/* 050FC 80AC7D9C 8FB00038 */ lw $s0, 0x0038($sp) -/* 05100 80AC7DA0 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 -/* 05104 80AC7DA4 03E00008 */ jr $ra -/* 05108 80AC7DA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s deleted file mode 100644 index 01d9625f43..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s +++ /dev/null @@ -1,84 +0,0 @@ -.rdata -glabel D_80AC93FC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC940C - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC7DAC -/* 0510C 80AC7DAC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 05110 80AC7DB0 AFB10028 */ sw $s1, 0x0028($sp) -/* 05114 80AC7DB4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05118 80AC7DB8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0511C 80AC7DBC AFB00024 */ sw $s0, 0x0024($sp) -/* 05120 80AC7DC0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05124 80AC7DC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05128 80AC7DC8 3C0680AD */ lui $a2, %hi(D_80AC93FC) ## $a2 = 80AD0000 -/* 0512C 80AC7DCC 24C693FC */ addiu $a2, $a2, %lo(D_80AC93FC) ## $a2 = 80AC93FC -/* 05130 80AC7DD0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 05134 80AC7DD4 240710E0 */ addiu $a3, $zero, 0x10E0 ## $a3 = 000010E0 -/* 05138 80AC7DD8 0C031AB1 */ jal Graph_OpenDisps -/* 0513C 80AC7DDC AFA5004C */ sw $a1, 0x004C($sp) -/* 05140 80AC7DE0 0C024F46 */ jal func_80093D18 -/* 05144 80AC7DE4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 05148 80AC7DE8 8FA5004C */ lw $a1, 0x004C($sp) -/* 0514C 80AC7DEC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 05150 80AC7DF0 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 05154 80AC7DF4 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 05158 80AC7DF8 3C0480AD */ lui $a0, %hi(D_80AC8EA0) ## $a0 = 80AD0000 -/* 0515C 80AC7DFC 3C0C8016 */ lui $t4, %hi(gSegments) -/* 05160 80AC7E00 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 05164 80AC7E04 ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 -/* 05168 80AC7E08 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 0516C 80AC7E0C 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 -/* 05170 80AC7E10 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 05174 80AC7E14 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05178 80AC7E18 0018C880 */ sll $t9, $t8, 2 -/* 0517C 80AC7E1C 00992021 */ addu $a0, $a0, $t9 -/* 05180 80AC7E20 8C848EA0 */ lw $a0, %lo(D_80AC8EA0)($a0) -/* 05184 80AC7E24 3C0F80AC */ lui $t7, %hi(func_80AC74F4) ## $t7 = 80AC0000 -/* 05188 80AC7E28 25EF74F4 */ addiu $t7, $t7, %lo(func_80AC74F4) ## $t7 = 80AC74F4 -/* 0518C 80AC7E2C 00044900 */ sll $t1, $a0, 4 -/* 05190 80AC7E30 00095702 */ srl $t2, $t1, 28 -/* 05194 80AC7E34 000A5880 */ sll $t3, $t2, 2 -/* 05198 80AC7E38 018B6021 */ addu $t4, $t4, $t3 -/* 0519C 80AC7E3C 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 051A0 80AC7E40 00814024 */ and $t0, $a0, $at -/* 051A4 80AC7E44 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 051A8 80AC7E48 010C6821 */ addu $t5, $t0, $t4 -/* 051AC 80AC7E4C 01A17021 */ addu $t6, $t5, $at -/* 051B0 80AC7E50 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 051B4 80AC7E54 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 051B8 80AC7E58 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 051BC 80AC7E5C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 051C0 80AC7E60 AFB00018 */ sw $s0, 0x0018($sp) -/* 051C4 80AC7E64 AFA00014 */ sw $zero, 0x0014($sp) -/* 051C8 80AC7E68 AFAF0010 */ sw $t7, 0x0010($sp) -/* 051CC 80AC7E6C 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 051D0 80AC7E70 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 051D4 80AC7E74 C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 -/* 051D8 80AC7E78 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 -/* 051DC 80AC7E7C 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 051E0 80AC7E80 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 051E4 80AC7E84 92180251 */ lbu $t8, 0x0251($s0) ## 00000251 -/* 051E8 80AC7E88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 051EC 80AC7E8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 051F0 80AC7E90 0C2B1D4A */ jal func_80AC7528 -/* 051F4 80AC7E94 AFB80014 */ sw $t8, 0x0014($sp) -/* 051F8 80AC7E98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 051FC 80AC7E9C 0C2B1E72 */ jal func_80AC79C8 -/* 05200 80AC7EA0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05204 80AC7EA4 3C0680AD */ lui $a2, %hi(D_80AC940C) ## $a2 = 80AD0000 -/* 05208 80AC7EA8 24C6940C */ addiu $a2, $a2, %lo(D_80AC940C) ## $a2 = 80AC940C -/* 0520C 80AC7EAC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 05210 80AC7EB0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05214 80AC7EB4 0C031AD5 */ jal Graph_CloseDisps -/* 05218 80AC7EB8 240710F4 */ addiu $a3, $zero, 0x10F4 ## $a3 = 000010F4 -/* 0521C 80AC7EBC 8FBF002C */ lw $ra, 0x002C($sp) -/* 05220 80AC7EC0 8FB00024 */ lw $s0, 0x0024($sp) -/* 05224 80AC7EC4 8FB10028 */ lw $s1, 0x0028($sp) -/* 05228 80AC7EC8 03E00008 */ jr $ra -/* 0522C 80AC7ECC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s deleted file mode 100644 index f4f65756a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s +++ /dev/null @@ -1,95 +0,0 @@ -.rdata -glabel D_80AC941C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC942C - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC7ED0 -/* 05230 80AC7ED0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 05234 80AC7ED4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05238 80AC7ED8 AFA40040 */ sw $a0, 0x0040($sp) -/* 0523C 80AC7EDC AFA50044 */ sw $a1, 0x0044($sp) -/* 05240 80AC7EE0 AFA60048 */ sw $a2, 0x0048($sp) -/* 05244 80AC7EE4 AFA7004C */ sw $a3, 0x004C($sp) -/* 05248 80AC7EE8 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 0524C 80AC7EEC 3C0680AD */ lui $a2, %hi(D_80AC941C) ## $a2 = 80AD0000 -/* 05250 80AC7EF0 24C6941C */ addiu $a2, $a2, %lo(D_80AC941C) ## $a2 = 80AC941C -/* 05254 80AC7EF4 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 -/* 05258 80AC7EF8 24071102 */ addiu $a3, $zero, 0x1102 ## $a3 = 00001102 -/* 0525C 80AC7EFC 0C031AB1 */ jal Graph_OpenDisps -/* 05260 80AC7F00 AFA50034 */ sw $a1, 0x0034($sp) -/* 05264 80AC7F04 8FAF0044 */ lw $t7, 0x0044($sp) -/* 05268 80AC7F08 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0526C 80AC7F0C 8FA80034 */ lw $t0, 0x0034($sp) -/* 05270 80AC7F10 15E10037 */ bne $t7, $at, .L80AC7FF0 -/* 05274 80AC7F14 8FA90040 */ lw $t1, 0x0040($sp) -/* 05278 80AC7F18 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 0527C 80AC7F1C 8FA50054 */ lw $a1, 0x0054($sp) -/* 05280 80AC7F20 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 05284 80AC7F24 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 05288 80AC7F28 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 0528C 80AC7F2C 37390018 */ ori $t9, $t9, 0x0018 ## $t9 = DB060018 -/* 05290 80AC7F30 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 05294 80AC7F34 80AA01E9 */ lb $t2, 0x01E9($a1) ## 000001E9 -/* 05298 80AC7F38 24040044 */ addiu $a0, $zero, 0x0044 ## $a0 = 00000044 -/* 0529C 80AC7F3C 3C060001 */ lui $a2, 0x0001 ## $a2 = 00010000 -/* 052A0 80AC7F40 01440019 */ multu $t2, $a0 -/* 052A4 80AC7F44 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 052A8 80AC7F48 00005812 */ mflo $t3 -/* 052AC 80AC7F4C 012B6021 */ addu $t4, $t1, $t3 -/* 052B0 80AC7F50 01866821 */ addu $t5, $t4, $a2 -/* 052B4 80AC7F54 8DAE17B4 */ lw $t6, 0x17B4($t5) ## 000017B4 -/* 052B8 80AC7F58 3C0D0600 */ lui $t5, %hi(D_06002820) ## $t5 = 06000000 -/* 052BC 80AC7F5C 25AD2820 */ addiu $t5, $t5, %lo(D_06002820) ## $t5 = 06002820 -/* 052C0 80AC7F60 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 052C4 80AC7F64 80AF01E9 */ lb $t7, 0x01E9($a1) ## 000001E9 -/* 052C8 80AC7F68 8FAE0048 */ lw $t6, 0x0048($sp) -/* 052CC 80AC7F6C 01E40019 */ multu $t7, $a0 -/* 052D0 80AC7F70 3C0480AD */ lui $a0, %hi(D_80AC8EAC) ## $a0 = 80AD0000 -/* 052D4 80AC7F74 0000C012 */ mflo $t8 -/* 052D8 80AC7F78 0138C821 */ addu $t9, $t1, $t8 -/* 052DC 80AC7F7C 03265021 */ addu $t2, $t9, $a2 -/* 052E0 80AC7F80 8D4B17B4 */ lw $t3, 0x17B4($t2) ## 000017B4 -/* 052E4 80AC7F84 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 052E8 80AC7F88 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 052EC 80AC7F8C 01616021 */ addu $t4, $t3, $at -/* 052F0 80AC7F90 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 052F4 80AC7F94 AC2C6FC0 */ sw $t4, %lo(gSegments+0x18)($at) -/* 052F8 80AC7F98 ADCD0000 */ sw $t5, 0x0000($t6) ## 00000000 -/* 052FC 80AC7F9C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 05300 80AC7FA0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 05304 80AC7FA4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05308 80AC7FA8 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 0530C 80AC7FAC AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 05310 80AC7FB0 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 05314 80AC7FB4 84B901F2 */ lh $t9, 0x01F2($a1) ## 000001F2 -/* 05318 80AC7FB8 3C0F8016 */ lui $t7, %hi(gSegments) -/* 0531C 80AC7FBC 00195080 */ sll $t2, $t9, 2 -/* 05320 80AC7FC0 008A2021 */ addu $a0, $a0, $t2 -/* 05324 80AC7FC4 8C848EAC */ lw $a0, %lo(D_80AC8EAC)($a0) -/* 05328 80AC7FC8 00046100 */ sll $t4, $a0, 4 -/* 0532C 80AC7FCC 000C6F02 */ srl $t5, $t4, 28 -/* 05330 80AC7FD0 000D7080 */ sll $t6, $t5, 2 -/* 05334 80AC7FD4 01EE7821 */ addu $t7, $t7, $t6 -/* 05338 80AC7FD8 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) -/* 0533C 80AC7FDC 00815824 */ and $t3, $a0, $at -/* 05340 80AC7FE0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05344 80AC7FE4 016FC021 */ addu $t8, $t3, $t7 -/* 05348 80AC7FE8 0301C821 */ addu $t9, $t8, $at -/* 0534C 80AC7FEC AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -.L80AC7FF0: -/* 05350 80AC7FF0 3C0680AD */ lui $a2, %hi(D_80AC942C) ## $a2 = 80AD0000 -/* 05354 80AC7FF4 24C6942C */ addiu $a2, $a2, %lo(D_80AC942C) ## $a2 = 80AC942C -/* 05358 80AC7FF8 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 -/* 0535C 80AC7FFC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 05360 80AC8000 0C031AD5 */ jal Graph_CloseDisps -/* 05364 80AC8004 24071116 */ addiu $a3, $zero, 0x1116 ## $a3 = 00001116 -/* 05368 80AC8008 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0536C 80AC800C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 05370 80AC8010 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 05374 80AC8014 03E00008 */ jr $ra -/* 05378 80AC8018 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC801C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC801C.s deleted file mode 100644 index b6ecb8577e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC801C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AC801C -/* 0537C 80AC801C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05380 80AC8020 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05384 80AC8024 0C031A73 */ jal Graph_Alloc - -/* 05388 80AC8028 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 0538C 80AC802C 3C0EDF00 */ lui $t6, 0xDF00 ## $t6 = DF000000 -/* 05390 80AC8030 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 05394 80AC8034 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 05398 80AC8038 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0539C 80AC803C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 053A0 80AC8040 03E00008 */ jr $ra -/* 053A4 80AC8044 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8048.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8048.s deleted file mode 100644 index b143211272..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8048.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80AC8048 -/* 053A8 80AC8048 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 053AC 80AC804C AFBF0014 */ sw $ra, 0x0014($sp) -/* 053B0 80AC8050 AFA5001C */ sw $a1, 0x001C($sp) -/* 053B4 80AC8054 AFA60020 */ sw $a2, 0x0020($sp) -/* 053B8 80AC8058 AFA70024 */ sw $a3, 0x0024($sp) -/* 053BC 80AC805C 0C031A73 */ jal Graph_Alloc - -/* 053C0 80AC8060 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 053C4 80AC8064 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 053C8 80AC8068 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 053CC 80AC806C 93A90023 */ lbu $t1, 0x0023($sp) -/* 053D0 80AC8070 93B8001F */ lbu $t8, 0x001F($sp) -/* 053D4 80AC8074 93AD0027 */ lbu $t5, 0x0027($sp) -/* 053D8 80AC8078 93A8002B */ lbu $t0, 0x002B($sp) -/* 053DC 80AC807C 00095400 */ sll $t2, $t1, 16 -/* 053E0 80AC8080 0018CE00 */ sll $t9, $t8, 24 -/* 053E4 80AC8084 032A5825 */ or $t3, $t9, $t2 ## $t3 = 00000000 -/* 053E8 80AC8088 000D7200 */ sll $t6, $t5, 8 -/* 053EC 80AC808C 016E7825 */ or $t7, $t3, $t6 ## $t7 = FB000000 -/* 053F0 80AC8090 3C19DF00 */ lui $t9, 0xDF00 ## $t9 = DF000000 -/* 053F4 80AC8094 01E84825 */ or $t1, $t7, $t0 ## $t1 = FB000000 -/* 053F8 80AC8098 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 053FC 80AC809C AC590008 */ sw $t9, 0x0008($v0) ## 00000008 -/* 05400 80AC80A0 AC40000C */ sw $zero, 0x000C($v0) ## 0000000C -/* 05404 80AC80A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05408 80AC80A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0540C 80AC80AC 03E00008 */ jr $ra -/* 05410 80AC80B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s deleted file mode 100644 index 30bb318ea9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s +++ /dev/null @@ -1,111 +0,0 @@ -.rdata -glabel D_80AC943C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC944C - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC80B4 -/* 05414 80AC80B4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 05418 80AC80B8 AFB20030 */ sw $s2, 0x0030($sp) -/* 0541C 80AC80BC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 05420 80AC80C0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 05424 80AC80C4 AFB1002C */ sw $s1, 0x002C($sp) -/* 05428 80AC80C8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0542C 80AC80CC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05430 80AC80D0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 05434 80AC80D4 3C0680AD */ lui $a2, %hi(D_80AC943C) ## $a2 = 80AD0000 -/* 05438 80AC80D8 24C6943C */ addiu $a2, $a2, %lo(D_80AC943C) ## $a2 = 80AC943C -/* 0543C 80AC80DC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 -/* 05440 80AC80E0 24071139 */ addiu $a3, $zero, 0x1139 ## $a3 = 00001139 -/* 05444 80AC80E4 0C031AB1 */ jal Graph_OpenDisps -/* 05448 80AC80E8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0544C 80AC80EC 0C024F46 */ jal func_80093D18 -/* 05450 80AC80F0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 05454 80AC80F4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 05458 80AC80F8 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 0545C 80AC80FC 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 05460 80AC8100 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 05464 80AC8104 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 05468 80AC8108 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0546C 80AC810C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 05470 80AC8110 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 05474 80AC8114 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 05478 80AC8118 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 -/* 0547C 80AC811C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 05480 80AC8120 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 05484 80AC8124 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 05488 80AC8128 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0548C 80AC812C 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 05490 80AC8130 AFA90010 */ sw $t1, 0x0010($sp) -/* 05494 80AC8134 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05498 80AC8138 24060082 */ addiu $a2, $zero, 0x0082 ## $a2 = 00000082 -/* 0549C 80AC813C 24070046 */ addiu $a3, $zero, 0x0046 ## $a3 = 00000046 -/* 054A0 80AC8140 0C2B2012 */ jal func_80AC8048 -/* 054A4 80AC8144 AFA20044 */ sw $v0, 0x0044($sp) -/* 054A8 80AC8148 8FA30044 */ lw $v1, 0x0044($sp) -/* 054AC 80AC814C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 054B0 80AC8150 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 054B4 80AC8154 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 054B8 80AC8158 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 054BC 80AC815C 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 054C0 80AC8160 2405006E */ addiu $a1, $zero, 0x006E ## $a1 = 0000006E -/* 054C4 80AC8164 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 054C8 80AC8168 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 054CC 80AC816C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 054D0 80AC8170 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 054D4 80AC8174 AFAC0010 */ sw $t4, 0x0010($sp) -/* 054D8 80AC8178 240600AA */ addiu $a2, $zero, 0x00AA ## $a2 = 000000AA -/* 054DC 80AC817C 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 054E0 80AC8180 0C2B2012 */ jal func_80AC8048 -/* 054E4 80AC8184 AFA20040 */ sw $v0, 0x0040($sp) -/* 054E8 80AC8188 8FA30040 */ lw $v1, 0x0040($sp) -/* 054EC 80AC818C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 054F0 80AC8190 35CE0030 */ ori $t6, $t6, 0x0030 ## $t6 = DB060030 -/* 054F4 80AC8194 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 054F8 80AC8198 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 054FC 80AC819C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 05500 80AC81A0 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 05504 80AC81A4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 05508 80AC81A8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0550C 80AC81AC 0C2B2007 */ jal func_80AC801C -/* 05510 80AC81B0 AFA2003C */ sw $v0, 0x003C($sp) -/* 05514 80AC81B4 8FA3003C */ lw $v1, 0x003C($sp) -/* 05518 80AC81B8 3C0F80AC */ lui $t7, %hi(func_80AC7ED0) ## $t7 = 80AC0000 -/* 0551C 80AC81BC 25EF7ED0 */ addiu $t7, $t7, %lo(func_80AC7ED0) ## $t7 = 80AC7ED0 -/* 05520 80AC81C0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 05524 80AC81C4 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E -/* 05528 80AC81C8 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 0552C 80AC81CC 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 05530 80AC81D0 AFB10018 */ sw $s1, 0x0018($sp) -/* 05534 80AC81D4 AFA00014 */ sw $zero, 0x0014($sp) -/* 05538 80AC81D8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0553C 80AC81DC 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 05540 80AC81E0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 05544 80AC81E4 C6240238 */ lwc1 $f4, 0x0238($s1) ## 00000238 -/* 05548 80AC81E8 8E260230 */ lw $a2, 0x0230($s1) ## 00000230 -/* 0554C 80AC81EC 8E270234 */ lw $a3, 0x0234($s1) ## 00000234 -/* 05550 80AC81F0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 05554 80AC81F4 92380251 */ lbu $t8, 0x0251($s1) ## 00000251 -/* 05558 80AC81F8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0555C 80AC81FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05560 80AC8200 0C2B1D4A */ jal func_80AC7528 -/* 05564 80AC8204 AFB80014 */ sw $t8, 0x0014($sp) -/* 05568 80AC8208 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0556C 80AC820C 0C2B1E72 */ jal func_80AC79C8 -/* 05570 80AC8210 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05574 80AC8214 3C0680AD */ lui $a2, %hi(D_80AC944C) ## $a2 = 80AD0000 -/* 05578 80AC8218 24C6944C */ addiu $a2, $a2, %lo(D_80AC944C) ## $a2 = 80AC944C -/* 0557C 80AC821C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 -/* 05580 80AC8220 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 05584 80AC8224 0C031AD5 */ jal Graph_CloseDisps -/* 05588 80AC8228 24071152 */ addiu $a3, $zero, 0x1152 ## $a3 = 00001152 -/* 0558C 80AC822C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 05590 80AC8230 8FB00028 */ lw $s0, 0x0028($sp) -/* 05594 80AC8234 8FB1002C */ lw $s1, 0x002C($sp) -/* 05598 80AC8238 8FB20030 */ lw $s2, 0x0030($sp) -/* 0559C 80AC823C 03E00008 */ jr $ra -/* 055A0 80AC8240 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s deleted file mode 100644 index bbd177e691..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s +++ /dev/null @@ -1,100 +0,0 @@ -.rdata -glabel D_80AC945C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC946C - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC8244 -/* 055A4 80AC8244 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 055A8 80AC8248 AFB10028 */ sw $s1, 0x0028($sp) -/* 055AC 80AC824C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 055B0 80AC8250 AFBF002C */ sw $ra, 0x002C($sp) -/* 055B4 80AC8254 AFB00024 */ sw $s0, 0x0024($sp) -/* 055B8 80AC8258 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 055BC 80AC825C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 055C0 80AC8260 3C0680AD */ lui $a2, %hi(D_80AC945C) ## $a2 = 80AD0000 -/* 055C4 80AC8264 24C6945C */ addiu $a2, $a2, %lo(D_80AC945C) ## $a2 = 80AC945C -/* 055C8 80AC8268 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 055CC 80AC826C 24071167 */ addiu $a3, $zero, 0x1167 ## $a3 = 00001167 -/* 055D0 80AC8270 0C031AB1 */ jal Graph_OpenDisps -/* 055D4 80AC8274 AFA5004C */ sw $a1, 0x004C($sp) -/* 055D8 80AC8278 0C024F46 */ jal func_80093D18 -/* 055DC 80AC827C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 055E0 80AC8280 8FA8004C */ lw $t0, 0x004C($sp) -/* 055E4 80AC8284 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 055E8 80AC8288 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 055EC 80AC828C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 055F0 80AC8290 3C0480AD */ lui $a0, %hi(D_80AC8EB8) ## $a0 = 80AD0000 -/* 055F4 80AC8294 3C068016 */ lui $a2, %hi(gSegments) -/* 055F8 80AC8298 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 055FC 80AC829C AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 05600 80AC82A0 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 05604 80AC82A4 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 -/* 05608 80AC82A8 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 0560C 80AC82AC 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 05610 80AC82B0 0018C880 */ sll $t9, $t8, 2 -/* 05614 80AC82B4 00992021 */ addu $a0, $a0, $t9 -/* 05618 80AC82B8 8C848EB8 */ lw $a0, %lo(D_80AC8EB8)($a0) -/* 0561C 80AC82BC 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 05620 80AC82C0 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 05624 80AC82C4 00045100 */ sll $t2, $a0, 4 -/* 05628 80AC82C8 000A5F02 */ srl $t3, $t2, 28 -/* 0562C 80AC82CC 000B6080 */ sll $t4, $t3, 2 -/* 05630 80AC82D0 00CC6821 */ addu $t5, $a2, $t4 -/* 05634 80AC82D4 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 -/* 05638 80AC82D8 00854824 */ and $t1, $a0, $a1 -/* 0563C 80AC82DC 3C040601 */ lui $a0, %hi(D_0600DE80) ## $a0 = 06010000 -/* 05640 80AC82E0 012E7821 */ addu $t7, $t1, $t6 -/* 05644 80AC82E4 01E7C021 */ addu $t8, $t7, $a3 -/* 05648 80AC82E8 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 0564C 80AC82EC 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 05650 80AC82F0 2484DE80 */ addiu $a0, $a0, %lo(D_0600DE80) ## $a0 = 0600DE80 -/* 05654 80AC82F4 00045900 */ sll $t3, $a0, 4 -/* 05658 80AC82F8 000B6702 */ srl $t4, $t3, 28 -/* 0565C 80AC82FC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 05660 80AC8300 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 05664 80AC8304 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 -/* 05668 80AC8308 000C6880 */ sll $t5, $t4, 2 -/* 0566C 80AC830C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 05670 80AC8310 00CD4821 */ addu $t1, $a2, $t5 -/* 05674 80AC8314 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 05678 80AC8318 8D2E0000 */ lw $t6, 0x0000($t1) ## 00000000 -/* 0567C 80AC831C 00857824 */ and $t7, $a0, $a1 -/* 05680 80AC8320 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05684 80AC8324 01CFC021 */ addu $t8, $t6, $t7 -/* 05688 80AC8328 0307C821 */ addu $t9, $t8, $a3 -/* 0568C 80AC832C AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 05690 80AC8330 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 05694 80AC8334 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 05698 80AC8338 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 0569C 80AC833C AFB00018 */ sw $s0, 0x0018($sp) -/* 056A0 80AC8340 AFA00014 */ sw $zero, 0x0014($sp) -/* 056A4 80AC8344 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 056A8 80AC8348 AFA00010 */ sw $zero, 0x0010($sp) -/* 056AC 80AC834C C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 -/* 056B0 80AC8350 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 -/* 056B4 80AC8354 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 056B8 80AC8358 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 056BC 80AC835C 920A0251 */ lbu $t2, 0x0251($s0) ## 00000251 -/* 056C0 80AC8360 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 056C4 80AC8364 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 056C8 80AC8368 0C2B1D4A */ jal func_80AC7528 -/* 056CC 80AC836C AFAA0014 */ sw $t2, 0x0014($sp) -/* 056D0 80AC8370 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 056D4 80AC8374 0C2B1E72 */ jal func_80AC79C8 -/* 056D8 80AC8378 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 056DC 80AC837C 3C0680AD */ lui $a2, %hi(D_80AC946C) ## $a2 = 80AD0000 -/* 056E0 80AC8380 24C6946C */ addiu $a2, $a2, %lo(D_80AC946C) ## $a2 = 80AC946C -/* 056E4 80AC8384 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 056E8 80AC8388 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 056EC 80AC838C 0C031AD5 */ jal Graph_CloseDisps -/* 056F0 80AC8390 2407117C */ addiu $a3, $zero, 0x117C ## $a3 = 0000117C -/* 056F4 80AC8394 8FBF002C */ lw $ra, 0x002C($sp) -/* 056F8 80AC8398 8FB00024 */ lw $s0, 0x0024($sp) -/* 056FC 80AC839C 8FB10028 */ lw $s1, 0x0028($sp) -/* 05700 80AC83A0 03E00008 */ jr $ra -/* 05704 80AC83A4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83A8.s deleted file mode 100644 index 6f6f2a696c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83A8.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AC83A8 -/* 05708 80AC83A8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0570C 80AC83AC AFA40000 */ sw $a0, 0x0000($sp) -/* 05710 80AC83B0 AFA60008 */ sw $a2, 0x0008($sp) -/* 05714 80AC83B4 14A10007 */ bne $a1, $at, .L80AC83D4 -/* 05718 80AC83B8 AFA7000C */ sw $a3, 0x000C($sp) -/* 0571C 80AC83BC 8FA20010 */ lw $v0, 0x0010($sp) -/* 05720 80AC83C0 8FAF0014 */ lw $t7, 0x0014($sp) -/* 05724 80AC83C4 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 05728 80AC83C8 85F801EE */ lh $t8, 0x01EE($t7) ## 000001EE -/* 0572C 80AC83CC 01D8C821 */ addu $t9, $t6, $t8 -/* 05730 80AC83D0 A4590000 */ sh $t9, 0x0000($v0) ## 00000000 -.L80AC83D4: -/* 05734 80AC83D4 03E00008 */ jr $ra -/* 05738 80AC83D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s deleted file mode 100644 index 709a4fb1c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s +++ /dev/null @@ -1,103 +0,0 @@ -.rdata -glabel D_80AC947C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC948C - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC83DC -/* 0573C 80AC83DC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 05740 80AC83E0 AFB20030 */ sw $s2, 0x0030($sp) -/* 05744 80AC83E4 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 05748 80AC83E8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0574C 80AC83EC AFB1002C */ sw $s1, 0x002C($sp) -/* 05750 80AC83F0 AFB00028 */ sw $s0, 0x0028($sp) -/* 05754 80AC83F4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05758 80AC83F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0575C 80AC83FC 3C0680AD */ lui $a2, %hi(D_80AC947C) ## $a2 = 80AD0000 -/* 05760 80AC8400 24C6947C */ addiu $a2, $a2, %lo(D_80AC947C) ## $a2 = 80AC947C -/* 05764 80AC8404 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 -/* 05768 80AC8408 2407119A */ addiu $a3, $zero, 0x119A ## $a3 = 0000119A -/* 0576C 80AC840C 0C031AB1 */ jal Graph_OpenDisps -/* 05770 80AC8410 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05774 80AC8414 0C024F46 */ jal func_80093D18 -/* 05778 80AC8418 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0577C 80AC841C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 05780 80AC8420 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 05784 80AC8424 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 05788 80AC8428 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 0578C 80AC842C AE2E02C0 */ sw $t6, 0x02C0($s1) ## 000002C0 -/* 05790 80AC8430 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 05794 80AC8434 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 05798 80AC8438 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 0579C 80AC843C 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 057A0 80AC8440 35080030 */ ori $t0, $t0, 0x0030 ## $t0 = DB060030 -/* 057A4 80AC8444 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 057A8 80AC8448 AE3902C0 */ sw $t9, 0x02C0($s1) ## 000002C0 -/* 057AC 80AC844C AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 057B0 80AC8450 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 057B4 80AC8454 0C2B2007 */ jal func_80AC801C -/* 057B8 80AC8458 AFA20044 */ sw $v0, 0x0044($sp) -/* 057BC 80AC845C 8FA30044 */ lw $v1, 0x0044($sp) -/* 057C0 80AC8460 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 057C4 80AC8464 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 057C8 80AC8468 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 057CC 80AC846C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 057D0 80AC8470 3C0480AD */ lui $a0, %hi(D_80AC8EC4) ## $a0 = 80AD0000 -/* 057D4 80AC8474 3C198016 */ lui $t9, %hi(gSegments) -/* 057D8 80AC8478 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 057DC 80AC847C AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 -/* 057E0 80AC8480 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 057E4 80AC8484 860B01F2 */ lh $t3, 0x01F2($s0) ## 000001F2 -/* 057E8 80AC8488 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 057EC 80AC848C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 057F0 80AC8490 000B6080 */ sll $t4, $t3, 2 -/* 057F4 80AC8494 008C2021 */ addu $a0, $a0, $t4 -/* 057F8 80AC8498 8C848EC4 */ lw $a0, %lo(D_80AC8EC4)($a0) -/* 057FC 80AC849C 3C0A80AD */ lui $t2, %hi(func_80AC83A8) ## $t2 = 80AD0000 -/* 05800 80AC84A0 254A83A8 */ addiu $t2, $t2, %lo(func_80AC83A8) ## $t2 = 80AC83A8 -/* 05804 80AC84A4 00047100 */ sll $t6, $a0, 4 -/* 05808 80AC84A8 000E7F02 */ srl $t7, $t6, 28 -/* 0580C 80AC84AC 000FC080 */ sll $t8, $t7, 2 -/* 05810 80AC84B0 0338C821 */ addu $t9, $t9, $t8 -/* 05814 80AC84B4 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 05818 80AC84B8 00816824 */ and $t5, $a0, $at -/* 0581C 80AC84BC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05820 80AC84C0 01B94021 */ addu $t0, $t5, $t9 -/* 05824 80AC84C4 01014821 */ addu $t1, $t0, $at -/* 05828 80AC84C8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 0582C 80AC84CC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 05830 80AC84D0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 05834 80AC84D4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05838 80AC84D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0583C 80AC84DC AFA00014 */ sw $zero, 0x0014($sp) -/* 05840 80AC84E0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 05844 80AC84E4 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 05848 80AC84E8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0584C 80AC84EC C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 -/* 05850 80AC84F0 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 -/* 05854 80AC84F4 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05858 80AC84F8 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0585C 80AC84FC 920B0251 */ lbu $t3, 0x0251($s0) ## 00000251 -/* 05860 80AC8500 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 05864 80AC8504 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05868 80AC8508 0C2B1D4A */ jal func_80AC7528 -/* 0586C 80AC850C AFAB0014 */ sw $t3, 0x0014($sp) -/* 05870 80AC8510 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 05874 80AC8514 0C2B1E72 */ jal func_80AC79C8 -/* 05878 80AC8518 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0587C 80AC851C 3C0680AD */ lui $a2, %hi(D_80AC948C) ## $a2 = 80AD0000 -/* 05880 80AC8520 24C6948C */ addiu $a2, $a2, %lo(D_80AC948C) ## $a2 = 80AC948C -/* 05884 80AC8524 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 -/* 05888 80AC8528 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0588C 80AC852C 0C031AD5 */ jal Graph_CloseDisps -/* 05890 80AC8530 240711B3 */ addiu $a3, $zero, 0x11B3 ## $a3 = 000011B3 -/* 05894 80AC8534 8FBF0034 */ lw $ra, 0x0034($sp) -/* 05898 80AC8538 8FB00028 */ lw $s0, 0x0028($sp) -/* 0589C 80AC853C 8FB1002C */ lw $s1, 0x002C($sp) -/* 058A0 80AC8540 8FB20030 */ lw $s2, 0x0030($sp) -/* 058A4 80AC8544 03E00008 */ jr $ra -/* 058A8 80AC8548 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s deleted file mode 100644 index 4ab850aab5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s +++ /dev/null @@ -1,82 +0,0 @@ -.rdata -glabel D_80AC949C - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC94AC - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC854C -/* 058AC 80AC854C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 058B0 80AC8550 AFB10028 */ sw $s1, 0x0028($sp) -/* 058B4 80AC8554 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 058B8 80AC8558 AFBF002C */ sw $ra, 0x002C($sp) -/* 058BC 80AC855C AFB00024 */ sw $s0, 0x0024($sp) -/* 058C0 80AC8560 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 058C4 80AC8564 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 058C8 80AC8568 3C0680AD */ lui $a2, %hi(D_80AC949C) ## $a2 = 80AD0000 -/* 058CC 80AC856C 24C6949C */ addiu $a2, $a2, %lo(D_80AC949C) ## $a2 = 80AC949C -/* 058D0 80AC8570 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 058D4 80AC8574 240711C0 */ addiu $a3, $zero, 0x11C0 ## $a3 = 000011C0 -/* 058D8 80AC8578 0C031AB1 */ jal Graph_OpenDisps -/* 058DC 80AC857C AFA5004C */ sw $a1, 0x004C($sp) -/* 058E0 80AC8580 0C024F46 */ jal func_80093D18 -/* 058E4 80AC8584 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 058E8 80AC8588 8FA5004C */ lw $a1, 0x004C($sp) -/* 058EC 80AC858C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 058F0 80AC8590 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 058F4 80AC8594 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 058F8 80AC8598 3C0480AD */ lui $a0, %hi(D_80AC8ED0) ## $a0 = 80AD0000 -/* 058FC 80AC859C 3C0C8016 */ lui $t4, %hi(gSegments) -/* 05900 80AC85A0 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 05904 80AC85A4 ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 -/* 05908 80AC85A8 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 0590C 80AC85AC 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 -/* 05910 80AC85B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 05914 80AC85B4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05918 80AC85B8 0018C880 */ sll $t9, $t8, 2 -/* 0591C 80AC85BC 00992021 */ addu $a0, $a0, $t9 -/* 05920 80AC85C0 8C848ED0 */ lw $a0, %lo(D_80AC8ED0)($a0) -/* 05924 80AC85C4 00044900 */ sll $t1, $a0, 4 -/* 05928 80AC85C8 00095702 */ srl $t2, $t1, 28 -/* 0592C 80AC85CC 000A5880 */ sll $t3, $t2, 2 -/* 05930 80AC85D0 018B6021 */ addu $t4, $t4, $t3 -/* 05934 80AC85D4 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 05938 80AC85D8 00814024 */ and $t0, $a0, $at -/* 0593C 80AC85DC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05940 80AC85E0 010C6821 */ addu $t5, $t0, $t4 -/* 05944 80AC85E4 01A17021 */ addu $t6, $t5, $at -/* 05948 80AC85E8 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 0594C 80AC85EC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 05950 80AC85F0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 05954 80AC85F4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05958 80AC85F8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0595C 80AC85FC AFA00014 */ sw $zero, 0x0014($sp) -/* 05960 80AC8600 AFA00010 */ sw $zero, 0x0010($sp) -/* 05964 80AC8604 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 05968 80AC8608 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0596C 80AC860C C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 -/* 05970 80AC8610 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 -/* 05974 80AC8614 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05978 80AC8618 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0597C 80AC861C 920F0251 */ lbu $t7, 0x0251($s0) ## 00000251 -/* 05980 80AC8620 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05984 80AC8624 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05988 80AC8628 0C2B1D4A */ jal func_80AC7528 -/* 0598C 80AC862C AFAF0014 */ sw $t7, 0x0014($sp) -/* 05990 80AC8630 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05994 80AC8634 0C2B1E72 */ jal func_80AC79C8 -/* 05998 80AC8638 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0599C 80AC863C 3C0680AD */ lui $a2, %hi(D_80AC94AC) ## $a2 = 80AD0000 -/* 059A0 80AC8640 24C694AC */ addiu $a2, $a2, %lo(D_80AC94AC) ## $a2 = 80AC94AC -/* 059A4 80AC8644 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 059A8 80AC8648 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 059AC 80AC864C 0C031AD5 */ jal Graph_CloseDisps -/* 059B0 80AC8650 240711D4 */ addiu $a3, $zero, 0x11D4 ## $a3 = 000011D4 -/* 059B4 80AC8654 8FBF002C */ lw $ra, 0x002C($sp) -/* 059B8 80AC8658 8FB00024 */ lw $s0, 0x0024($sp) -/* 059BC 80AC865C 8FB10028 */ lw $s1, 0x0028($sp) -/* 059C0 80AC8660 03E00008 */ jr $ra -/* 059C4 80AC8664 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s deleted file mode 100644 index 84796fbf20..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s +++ /dev/null @@ -1,82 +0,0 @@ -.rdata -glabel D_80AC94BC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC94CC - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC8668 -/* 059C8 80AC8668 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 059CC 80AC866C AFB10028 */ sw $s1, 0x0028($sp) -/* 059D0 80AC8670 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 059D4 80AC8674 AFBF002C */ sw $ra, 0x002C($sp) -/* 059D8 80AC8678 AFB00024 */ sw $s0, 0x0024($sp) -/* 059DC 80AC867C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 059E0 80AC8680 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 059E4 80AC8684 3C0680AD */ lui $a2, %hi(D_80AC94BC) ## $a2 = 80AD0000 -/* 059E8 80AC8688 24C694BC */ addiu $a2, $a2, %lo(D_80AC94BC) ## $a2 = 80AC94BC -/* 059EC 80AC868C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 059F0 80AC8690 240711E2 */ addiu $a3, $zero, 0x11E2 ## $a3 = 000011E2 -/* 059F4 80AC8694 0C031AB1 */ jal Graph_OpenDisps -/* 059F8 80AC8698 AFA5004C */ sw $a1, 0x004C($sp) -/* 059FC 80AC869C 0C024F46 */ jal func_80093D18 -/* 05A00 80AC86A0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 05A04 80AC86A4 8FA5004C */ lw $a1, 0x004C($sp) -/* 05A08 80AC86A8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 05A0C 80AC86AC 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 05A10 80AC86B0 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 05A14 80AC86B4 3C0480AD */ lui $a0, %hi(D_80AC8EDC) ## $a0 = 80AD0000 -/* 05A18 80AC86B8 3C0C8016 */ lui $t4, %hi(gSegments) -/* 05A1C 80AC86BC 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 05A20 80AC86C0 ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 -/* 05A24 80AC86C4 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 05A28 80AC86C8 921801EC */ lbu $t8, 0x01EC($s0) ## 000001EC -/* 05A2C 80AC86CC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 05A30 80AC86D0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05A34 80AC86D4 0018C880 */ sll $t9, $t8, 2 -/* 05A38 80AC86D8 00992021 */ addu $a0, $a0, $t9 -/* 05A3C 80AC86DC 8C848EDC */ lw $a0, %lo(D_80AC8EDC)($a0) -/* 05A40 80AC86E0 00044900 */ sll $t1, $a0, 4 -/* 05A44 80AC86E4 00095702 */ srl $t2, $t1, 28 -/* 05A48 80AC86E8 000A5880 */ sll $t3, $t2, 2 -/* 05A4C 80AC86EC 018B6021 */ addu $t4, $t4, $t3 -/* 05A50 80AC86F0 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 05A54 80AC86F4 00814024 */ and $t0, $a0, $at -/* 05A58 80AC86F8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05A5C 80AC86FC 010C6821 */ addu $t5, $t0, $t4 -/* 05A60 80AC8700 01A17021 */ addu $t6, $t5, $at -/* 05A64 80AC8704 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 05A68 80AC8708 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 05A6C 80AC870C 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 05A70 80AC8710 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05A74 80AC8714 AFB00018 */ sw $s0, 0x0018($sp) -/* 05A78 80AC8718 AFA00014 */ sw $zero, 0x0014($sp) -/* 05A7C 80AC871C AFA00010 */ sw $zero, 0x0010($sp) -/* 05A80 80AC8720 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 05A84 80AC8724 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05A88 80AC8728 C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 -/* 05A8C 80AC872C 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 -/* 05A90 80AC8730 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05A94 80AC8734 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 05A98 80AC8738 920F0251 */ lbu $t7, 0x0251($s0) ## 00000251 -/* 05A9C 80AC873C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05AA0 80AC8740 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05AA4 80AC8744 0C2B1D4A */ jal func_80AC7528 -/* 05AA8 80AC8748 AFAF0014 */ sw $t7, 0x0014($sp) -/* 05AAC 80AC874C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05AB0 80AC8750 0C2B1E72 */ jal func_80AC79C8 -/* 05AB4 80AC8754 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05AB8 80AC8758 3C0680AD */ lui $a2, %hi(D_80AC94CC) ## $a2 = 80AD0000 -/* 05ABC 80AC875C 24C694CC */ addiu $a2, $a2, %lo(D_80AC94CC) ## $a2 = 80AC94CC -/* 05AC0 80AC8760 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 05AC4 80AC8764 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05AC8 80AC8768 0C031AD5 */ jal Graph_CloseDisps -/* 05ACC 80AC876C 240711F6 */ addiu $a3, $zero, 0x11F6 ## $a3 = 000011F6 -/* 05AD0 80AC8770 8FBF002C */ lw $ra, 0x002C($sp) -/* 05AD4 80AC8774 8FB00024 */ lw $s0, 0x0024($sp) -/* 05AD8 80AC8778 8FB10028 */ lw $s1, 0x0028($sp) -/* 05ADC 80AC877C 03E00008 */ jr $ra -/* 05AE0 80AC8780 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s deleted file mode 100644 index 7ac18577b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s +++ /dev/null @@ -1,82 +0,0 @@ -.rdata -glabel D_80AC94DC - .asciz "../z_en_oB1.c" - .balign 4 - -glabel D_80AC94EC - .asciz "../z_en_oB1.c" - .balign 4 - -.text -glabel func_80AC8784 -/* 05AE4 80AC8784 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 05AE8 80AC8788 AFB10028 */ sw $s1, 0x0028($sp) -/* 05AEC 80AC878C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05AF0 80AC8790 AFBF002C */ sw $ra, 0x002C($sp) -/* 05AF4 80AC8794 AFB00024 */ sw $s0, 0x0024($sp) -/* 05AF8 80AC8798 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05AFC 80AC879C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05B00 80AC87A0 3C0680AD */ lui $a2, %hi(D_80AC94DC) ## $a2 = 80AD0000 -/* 05B04 80AC87A4 24C694DC */ addiu $a2, $a2, %lo(D_80AC94DC) ## $a2 = 80AC94DC -/* 05B08 80AC87A8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 05B0C 80AC87AC 24071203 */ addiu $a3, $zero, 0x1203 ## $a3 = 00001203 -/* 05B10 80AC87B0 0C031AB1 */ jal Graph_OpenDisps -/* 05B14 80AC87B4 AFA5004C */ sw $a1, 0x004C($sp) -/* 05B18 80AC87B8 0C024F46 */ jal func_80093D18 -/* 05B1C 80AC87BC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 05B20 80AC87C0 8FA5004C */ lw $a1, 0x004C($sp) -/* 05B24 80AC87C4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 05B28 80AC87C8 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 05B2C 80AC87CC 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 05B30 80AC87D0 3C0480AD */ lui $a0, %hi(D_80AC8EE4) ## $a0 = 80AD0000 -/* 05B34 80AC87D4 3C0C8016 */ lui $t4, %hi(gSegments) -/* 05B38 80AC87D8 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 05B3C 80AC87DC ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 -/* 05B40 80AC87E0 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 05B44 80AC87E4 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 -/* 05B48 80AC87E8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 05B4C 80AC87EC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05B50 80AC87F0 0018C880 */ sll $t9, $t8, 2 -/* 05B54 80AC87F4 00992021 */ addu $a0, $a0, $t9 -/* 05B58 80AC87F8 8C848EE4 */ lw $a0, %lo(D_80AC8EE4)($a0) -/* 05B5C 80AC87FC 00044900 */ sll $t1, $a0, 4 -/* 05B60 80AC8800 00095702 */ srl $t2, $t1, 28 -/* 05B64 80AC8804 000A5880 */ sll $t3, $t2, 2 -/* 05B68 80AC8808 018B6021 */ addu $t4, $t4, $t3 -/* 05B6C 80AC880C 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 05B70 80AC8810 00814024 */ and $t0, $a0, $at -/* 05B74 80AC8814 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05B78 80AC8818 010C6821 */ addu $t5, $t0, $t4 -/* 05B7C 80AC881C 01A17021 */ addu $t6, $t5, $at -/* 05B80 80AC8820 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 05B84 80AC8824 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 05B88 80AC8828 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 05B8C 80AC882C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05B90 80AC8830 AFB00018 */ sw $s0, 0x0018($sp) -/* 05B94 80AC8834 AFA00014 */ sw $zero, 0x0014($sp) -/* 05B98 80AC8838 AFA00010 */ sw $zero, 0x0010($sp) -/* 05B9C 80AC883C 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 05BA0 80AC8840 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05BA4 80AC8844 C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 -/* 05BA8 80AC8848 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 -/* 05BAC 80AC884C 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05BB0 80AC8850 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 05BB4 80AC8854 920F0251 */ lbu $t7, 0x0251($s0) ## 00000251 -/* 05BB8 80AC8858 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05BBC 80AC885C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05BC0 80AC8860 0C2B1D4A */ jal func_80AC7528 -/* 05BC4 80AC8864 AFAF0014 */ sw $t7, 0x0014($sp) -/* 05BC8 80AC8868 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05BCC 80AC886C 0C2B1E72 */ jal func_80AC79C8 -/* 05BD0 80AC8870 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05BD4 80AC8874 3C0680AD */ lui $a2, %hi(D_80AC94EC) ## $a2 = 80AD0000 -/* 05BD8 80AC8878 24C694EC */ addiu $a2, $a2, %lo(D_80AC94EC) ## $a2 = 80AC94EC -/* 05BDC 80AC887C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 05BE0 80AC8880 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05BE4 80AC8884 0C031AD5 */ jal Graph_CloseDisps -/* 05BE8 80AC8888 24071217 */ addiu $a3, $zero, 0x1217 ## $a3 = 00001217 -/* 05BEC 80AC888C 8FBF002C */ lw $ra, 0x002C($sp) -/* 05BF0 80AC8890 8FB00024 */ lw $s0, 0x0024($sp) -/* 05BF4 80AC8894 8FB10028 */ lw $s1, 0x0028($sp) -/* 05BF8 80AC8898 03E00008 */ jr $ra -/* 05BFC 80AC889C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/assets/xml/objects/object_ds2.xml b/assets/xml/objects/object_ds2.xml index 5224a09e39..2c7c64897a 100644 --- a/assets/xml/objects/object_ds2.xml +++ b/assets/xml/objects/object_ds2.xml @@ -14,7 +14,9 @@ - + + + diff --git a/assets/xml/objects/object_oF1d_map.xml b/assets/xml/objects/object_oF1d_map.xml new file mode 100644 index 0000000000..c4f3a41f82 --- /dev/null +++ b/assets/xml/objects/object_oF1d_map.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_os.xml b/assets/xml/objects/object_os.xml index 82cc45a60f..f3d0dff416 100644 --- a/assets/xml/objects/object_os.xml +++ b/assets/xml/objects/object_os.xml @@ -16,7 +16,8 @@ - + + diff --git a/assets/xml/objects/object_ossan.xml b/assets/xml/objects/object_ossan.xml new file mode 100644 index 0000000000..12cbe6f139 --- /dev/null +++ b/assets/xml/objects/object_ossan.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/xml/objects/object_rs.xml b/assets/xml/objects/object_rs.xml index 33d4844709..d0c5b357ab 100644 --- a/assets/xml/objects/object_rs.xml +++ b/assets/xml/objects/object_rs.xml @@ -13,7 +13,9 @@ - + + + diff --git a/assets/xml/objects/object_shop_dungen.xml b/assets/xml/objects/object_shop_dungen.xml index 64f22e3812..e0d2ae1e5a 100644 --- a/assets/xml/objects/object_shop_dungen.xml +++ b/assets/xml/objects/object_shop_dungen.xml @@ -1,9 +1,10 @@ - - - - - + + + + + + diff --git a/data/overlays/actors/z_en_ossan.data.s b/data/overlays/actors/z_en_ossan.data.s deleted file mode 100644 index ffdbbc6ab8..0000000000 --- a/data/overlays/actors/z_en_ossan.data.s +++ /dev/null @@ -1,163 +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 En_Ossan_InitVars - .word 0x003D0400, 0x00000019, 0x00010000, 0x000002D8 -.word EnOssan_Init -.word EnOssan_Destroy -.word EnOssan_Update -.word 0x00000000, 0x0A000039, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x001E0050, 0x00000000, 0x00000000 -glabel D_80AC88EC - .word 0x000A001E, 0x00140032 -glabel D_80AC88F4 - .word 0xEAACEAAC, 0xEAACEAAC, 0x15541554, 0x15541554, 0x001E001F, 0x00200021, 0x00220023, 0x00240025 -glabel D_80AC8914 - .word D_80AC8EF0 -.word D_80AC8F00 -.word D_80AC8F10 -.word D_80AC8F20 -.word D_80AC8F30 -.word D_80AC8F40 -.word D_80AC8F50 -.word D_80AC8F60 -.word D_80AC8F70 -.word D_80AC8F80 -.word D_80AC8F90 -glabel D_80AC8940 - .word 0x00FC0102, 0x01010159, 0x01920192, 0x01650192, 0x01920159, 0x01920192, 0x005B0192, 0x0192005B, 0x01920192, 0x005B0192, 0x019200FE, 0x01920104, 0x00C90192, 0x0103005B, 0x01920192, 0x013E0192, 0x01920000 -glabel D_80AC8984 - .word func_80AC311C -.word func_80AC30B8 -.word func_80AC3180 -.word func_80AC30FC -.word func_80AC313C -.word func_80AC3098 -.word func_80AC3098 -.word func_80AC31A0 -.word func_80AC31F4 -.word func_80AC3098 -.word func_80AC32C4 -glabel D_80AC89B0 - .word 0x3C23D70A, 0x3C343958, 0x3C2C0831, 0x3C343958, 0x3C23D70A, 0x3C23D70A, 0x3C23D70A, 0x3C23D70A, 0x3C23D70A, 0x3C23D70A, 0x3C23D70A -glabel D_80AC89DC - .word 0x000D0032, 0x0034FFEC, 0x00000032, 0x004CFFEC, 0x00040050, 0x0034FFFD, 0x00050050, 0x004CFFFD, 0x001DFFCE, 0x0034FFEC, 0x002CFFCE, 0x004CFFEC, 0x0001FFB0, 0x0034FFFD, 0x0010FFB0, 0x004CFFFD, 0x00090032, 0x0034FFEC, 0x00270032, 0x004CFFEC, 0x00080050, 0x0034FFFD, 0x002B0050, 0x004CFFFD, 0x0000FFCE, 0x0034FFEC, 0x0028FFCE, 0x004CFFEC, 0x002AFFB0, 0x0034FFFD, 0x0007FFB0, 0x004CFFFD, 0x00180032, 0x0034FFEC, 0x001C0032, 0x004CFFEC, 0x00190050, 0x0034FFFD, 0x00150050, 0x004CFFFD, 0x001AFFCE, 0x0034FFEC, 0x0016FFCE, 0x004CFFEC, 0x001BFFB0, 0x0034FFFD, 0x0017FFB0, 0x004CFFFD, 0x00090032, 0x0034FFEC, 0x00270032, 0x004CFFEC, 0x00080050, 0x0034FFFD, 0x002B0050, 0x004CFFFD, 0x0000FFCE, 0x0034FFEC, 0x0028FFCE, 0x004CFFEC, 0x002AFFB0, 0x0034FFFD, 0x0007FFB0, 0x004CFFFD, 0x000C0032, 0x0034FFEC, 0x002F0032, 0x004CFFEC, 0x00000050, 0x0034FFFD, 0x00100050, 0x004CFFFD, 0x002CFFCE, 0x0034FFEC, 0x0002FFCE, 0x004CFFEC, 0x0005FFB0, 0x0034FFFD, 0x0001FFB0, 0x004CFFFD, 0x000C0032, 0x0034FFEC, 0x00030032, 0x004CFFEC, 0x00000050, 0x0034FFFD, 0x00100050, 0x004CFFFD, 0x002CFFCE, 0x0034FFEC, 0x0002FFCE, 0x004CFFEC, 0x0005FFB0, 0x0034FFFD, 0x0001FFB0, 0x004CFFFD, 0x00110032, 0x0034FFEC, 0x00000032, 0x004CFFEC, 0x00040050, 0x0034FFFD, 0x00100050, 0x004CFFFD, 0x0012FFCE, 0x0034FFEC, 0x0005FFCE, 0x004CFFEC, 0x0010FFB0, 0x0034FFFD, 0x0010FFB0, 0x004CFFFD, 0x000F0032, 0x0034FFEC, 0x002C0032, 0x004CFFEC, 0x00100050, 0x0034FFFD, 0x00010050, 0x004CFFFD, 0x0000FFCE, 0x0034FFEC, 0x0002FFCE, 0x004CFFEC, 0x0007FFB0, 0x0034FFFD, 0x0031FFB0, 0x004CFFFD, 0x00030032, 0x0034FFEC, 0x00060032, 0x004CFFEC, 0x002D0050, 0x0034FFFD, 0x002E0050, 0x004CFFFD, 0x000EFFCE, 0x0034FFEC, 0x0010FFCE, 0x004CFFEC, 0x0030FFB0, 0x0034FFFD, 0x0010FFB0, 0x004CFFFD, 0x00130032, 0x0034FFEC, 0x00130032, 0x004CFFEC, 0x00130050, 0x0034FFFD, 0x00130050, 0x004CFFFD, 0x0014FFCE, 0x0034FFEC, 0x0014FFCE, 0x004CFFEC, 0x0014FFB0, 0x0034FFFD, 0x0014FFB0, 0x004CFFFD, 0x00250032, 0x0034FFEC, 0x00230032, 0x004CFFEC, 0x00220050, 0x0034FFFD, 0x00240050, 0x004CFFFD, 0x0020FFCE, 0x0034FFEC, 0x001EFFCE, 0x004CFFEC, 0x0021FFB0, 0x0034FFFD, 0x001FFFB0, 0x004CFFFD -glabel D_80AC8C9C - .word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CB8 -.word func_80AC2CE8 -.word func_80AC2D18 -.word func_80AC2CA8 -.word func_80AC2D48 -.word func_80AC2D78 -.word func_80AC2DA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -.word func_80AC2CA8 -glabel D_80AC8D64 - .word 0x801F0002, 0x304C01F4 -glabel D_80AC8D6C - .word 0x41880000, 0x42680000, 0x41F00000, 0xC1880000, 0x42680000, 0x41F00000 -glabel D_80AC8D84 - .word func_80AC6B3C -.word func_80AC6E0C -.word func_80AC6ECC -.word func_80AC6E0C -.word func_80AC6ADC -.word func_80AC6ADC -.word func_80AC6ADC -.word func_80AC6D30 -.word func_80AC6C54 -.word func_80AC6ADC -.word func_80AC6E6C -glabel D_80AC8DB0 - .word 0x00000000, 0x00000000, 0x42040000, 0x00000000, 0x00000000, 0x41F80000, 0x00000000, 0x00000000, 0x41F80000, 0x00000000, 0x00000000, 0x41F80000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x42100000, 0x00000000, 0x00000000, 0x41700000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x41D00000 -glabel D_80AC8E34 - .word func_80AC3B18 -.word func_80AC4074 -.word func_80AC4288 -.word func_80AC43A0 -.word func_80AC43F0 -.word func_80AC44DC -.word func_80AC4978 -.word func_80AC4B4C -.word func_80AC4D20 -.word func_80AC5594 -.word func_80AC5680 -.word func_80AC576C -.word func_80AC5858 -.word func_80AC5900 -.word func_80AC5C24 -.word func_80AC5D40 -.word func_80AC5DAC -.word func_80AC5EF0 -.word func_80AC6208 -.word func_80AC4DDC -.word func_80AC60E4 -.word func_80AC6148 -.word func_80AC61B8 -.word func_80AC5C9C -.word func_80AC5A28 -.word func_80AC6258 -.word func_80AC62F4 -glabel D_80AC8EA0 - .word 0x06004878, 0x060052B8, 0x060056B8 -glabel D_80AC8EAC - .word 0x06001570, 0x060001F0, 0x06000B30 -glabel D_80AC8EB8 - .word 0x0600CE80, 0x0600D280, 0x0600D680 -glabel D_80AC8EC4 - .word 0x06003E40, 0x06004640, 0x06004E40 -glabel D_80AC8ED0 - .word 0x060030D8, 0x060034D8, 0x060038D8 -glabel D_80AC8EDC - .word 0x060035D8, 0x060039D8 -glabel D_80AC8EE4 - .word 0x06003968, 0x06003D68, 0x06004168 - diff --git a/data/overlays/actors/z_en_ossan.reloc.s b/data/overlays/actors/z_en_ossan.reloc.s deleted file mode 100644 index c1a8a98fd6..0000000000 --- a/data/overlays/actors/z_en_ossan.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_80AC9620 - .incbin "baserom/ovl_En_Ossan", 0x6980, 0x00000900 diff --git a/include/functions.h b/include/functions.h index 7afea19bae..29012f5321 100644 --- a/include/functions.h +++ b/include/functions.h @@ -435,7 +435,7 @@ s32 func_8002F2CC(Actor* actor, GlobalContext* globalCtx, f32 arg2); s32 func_8002F2F4(Actor* actor, GlobalContext* globalCtx); u32 func_8002F334(Actor* actor, GlobalContext* globalCtx); s8 func_8002F368(GlobalContext* globalCtx); -void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* arg2, s16* arg3); +void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* x, s16* y); u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx); s32 func_8002F434(Actor* actor, GlobalContext* globalCtx, s32 getItemId, f32 xzRange, f32 yRange); void func_8002F554(Actor* actor, GlobalContext* globalCtx, s32 getItemId); diff --git a/spec b/spec index 8227646db2..fcdb411ab2 100644 --- a/spec +++ b/spec @@ -2708,8 +2708,7 @@ endseg beginseg name "ovl_En_Ossan" include "build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o" - include "build/data/overlays/actors/z_en_ossan.data.o" - include "build/data/overlays/actors/z_en_ossan.reloc.o" + include "build/src/overlays/actors/ovl_En_Ossan/ovl_En_Ossan_reloc.o" endseg beginseg @@ -4017,7 +4016,8 @@ endseg beginseg name "object_ossan" romalign 0x1000 - include "build/baserom/object_ossan.o" + include "build/assets/objects/object_ossan/object_ossan.o" + number 6 endseg beginseg @@ -4687,7 +4687,8 @@ endseg beginseg name "object_oF1d_map" romalign 0x1000 - include "build/baserom/object_oF1d_map.o" + include "build/assets/objects/object_oF1d_map/object_oF1d_map.o" + number 6 endseg beginseg diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 5625384661..37613baf41 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1560,13 +1560,13 @@ s8 func_8002F368(GlobalContext* globalCtx) { return player->exchangeItemId; } -void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* arg2, s16* arg3) { +void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* x, s16* y) { Vec3f sp1C; f32 sp18; func_8002BE04(globalCtx, &actor->focus.pos, &sp1C, &sp18); - *arg2 = sp1C.x * sp18 * 160.0f + 160.0f; - *arg3 = sp1C.y * sp18 * -120.0f + 120.0f; + *x = sp1C.x * sp18 * 160.0f + 160.0f; + *y = sp1C.y * sp18 * -120.0f + 120.0f; } u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 057f1a8dc6..aedd0368a8 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -8,6 +8,7 @@ #include "vt.h" #include "objects/object_zo/object_zo.h" #include "objects/object_ec/object_ec.h" +#include "objects/object_oF1d_map/object_oF1d_map.h" #define FLAGS 0x00000010 @@ -139,9 +140,6 @@ extern FlexSkeletonHeader D_060085F8; // Object_RS extern FlexSkeletonHeader D_06004868; -// Object_OF1D_MAP -extern FlexSkeletonHeader D_0600FEF0; - // Object_MA2 extern FlexSkeletonHeader D_06008D90; @@ -158,7 +156,6 @@ extern u8 D_06007AC0[]; extern u8 D_06006920[]; extern u8 D_060004C8[]; extern u8 D_060035D8[]; -extern u8 D_0600DE80[]; extern u8 D_06003770[]; // PostLimbDraw display lists @@ -1114,7 +1111,7 @@ void DemoEc_InitGorons(DemoEc* this, GlobalContext* globalCtx) { Vec3f* scale = &this->actor.scale; DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_0600FEF0); + DemoEc_InitSkelAnime(this, globalCtx, &gGoronSkel); DemoEc_UseAnimationObject(this, globalCtx); if (this->actor.params == 30) { @@ -1151,11 +1148,11 @@ void DemoEc_UpdateGorons(DemoEc* this, GlobalContext* globalCtx) { } void DemoEc_DrawGorons(DemoEc* this, GlobalContext* globalCtx) { - static void* eyeTextures[] = { 0x0600CE80, 0x0600D280, 0x0600D680 }; + static void* eyeTextures[] = { gGoronCsEyeOpenTex, gGoronCsEyeHalfTex, gGoronCsEyeClosedTex }; s32 eyeTexIndex = this->eyeTexIndex; void* eyeTexture = eyeTextures[eyeTexIndex]; - DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, &D_0600DE80, NULL, NULL); + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, &gGoronCsMouthNeutralTex, NULL, NULL); } void DemoEc_InitMalon(DemoEc* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 07a7515afa..d6dcd182be 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -5,6 +5,7 @@ */ #include "z_demo_go.h" +#include "objects/object_oF1d_map/object_oF1d_map.h" #include "vt.h" #define FLAGS 0x00000010 @@ -27,7 +28,7 @@ void func_8097D130(DemoGo* this, GlobalContext* globalCtx); void func_8097D290(DemoGo* this, GlobalContext* globalCtx); void func_8097D29C(DemoGo* this, GlobalContext* globalCtx); -static u64* D_8097D440[] = { 0x0600CE80, 0x0600D280, 0x0600D680 }; +static void* sEyeTextures[] = { gGoronCsEyeOpenTex, gGoronCsEyeHalfTex, gGoronCsEyeClosedTex }; static DemoGoActionFunc D_8097D44C[] = { func_8097CFDC, func_8097CFFC, func_8097D01C, func_8097D058, func_8097D088, func_8097D0D0, func_8097D130, @@ -50,11 +51,6 @@ const ActorInit Demo_Go_InitVars = { (ActorFunc)DemoGo_Draw, }; -extern AnimationHeader D_060029A8; -extern AnimationHeader D_06004930; -extern u64 D_0600E680[]; -extern FlexSkeletonHeader D_0600FEF0; - s32 func_8097C870(DemoGo* this) { s32 ret; @@ -147,9 +143,9 @@ void func_8097CB0C(DemoGo* this, GlobalContext* globalCtx) { endPos.x = npcAction->endPos.x; endPos.y = npcAction->endPos.y; endPos.z = npcAction->endPos.z; - world->pos.x = (((endPos.x - startPos.x) * temp_ret) + startPos.x); - world->pos.y = (((endPos.y - startPos.y) * temp_ret) + startPos.y); - world->pos.z = (((endPos.z - startPos.z) * temp_ret) + startPos.z); + world->pos.x = (endPos.x - startPos.x) * temp_ret + startPos.x; + world->pos.y = (endPos.y - startPos.y) * temp_ret + startPos.y; + world->pos.z = (endPos.z - startPos.z) * temp_ret + startPos.z; world->rot.y = thisx->shape.rot.y = npcAction->rot.y; } } @@ -195,7 +191,7 @@ void func_8097CCE0(DemoGo* this, GlobalContext* globalCtx) { } } -UNK_TYPE DemoGo_FrameUpdateMatrix(DemoGo* this) { +s32 DemoGo_FrameUpdateMatrix(DemoGo* this) { return SkelAnime_Update(&this->skelAnime); } @@ -242,8 +238,8 @@ void func_8097CEEC(DemoGo* this, GlobalContext* globalCtx) { } } -void func_8097CF20(DemoGo* this, GlobalContext* globalCtx, UNK_TYPE arg2) { - AnimationHeader* animation = &D_060029A8; +void func_8097CF20(DemoGo* this, GlobalContext* globalCtx, s32 arg2) { + AnimationHeader* animation = &gGoronAnim_0029A8; if (arg2 != 0) { Animation_Change(&this->skelAnime, animation, 1.0f, 0.0f, Animation_GetLastFrame(animation), ANIMMODE_LOOP, -8.0f); @@ -279,7 +275,8 @@ void func_8097D058(DemoGo* this, GlobalContext* globalCtx) { } void func_8097D088(DemoGo* this, GlobalContext* globalCtx) { - UNK_TYPE something; + s32 something; + func_8097CA30(this, globalCtx); something = DemoGo_FrameUpdateMatrix(this); func_8097C930(this); @@ -316,10 +313,10 @@ void DemoGo_Update(Actor* thisx, GlobalContext* globalCtx) { void DemoGo_Init(Actor* thisx, GlobalContext* globalCtx) { DemoGo* this = THIS; - AnimationHeader* animation = &D_06004930; + AnimationHeader* animation = &gGoronAnim_004930; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600FEF0, NULL, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGoronSkel, NULL, NULL, NULL, 0); Animation_Change(&this->skelAnime, animation, 1.0f, 0.0f, Animation_GetLastFrame(animation), ANIMMODE_ONCE, 0.0f); this->action = 0; } @@ -329,16 +326,16 @@ void func_8097D290(DemoGo* this, GlobalContext* globalCtx) { void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) { s32 pad; - s16 temp = this->unk_190; + s16 eyeTexIdx = this->unk_190; SkelAnime* skelAnime = &this->skelAnime; - void* srcSegment8 = D_8097D440[temp]; - void* srcSegment9 = &D_0600E680; + void* eyeTexture = sEyeTextures[eyeTexIdx]; + void* mouthTexture = &gGoronCsMouthSmileTex; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_go.c", 732); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(srcSegment8)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(srcSegment9)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(mouthTexture)); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, this); diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index b14e25c93e..e85d1dc5a2 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -15,59 +15,59 @@ void EnGirlA_Init(Actor* thisx, GlobalContext* globalCtx); void EnGirlA_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnGirlA_Update(Actor* thisx, GlobalContext* globalCtx); -void func_80A3BEAC(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3BEE0(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3BFE4(EnGirlA* this, GlobalContext* globalCtx); -void func_80A3C3BC(EnGirlA* this, GlobalContext* globalCtx); +void EnGirlA_SetItemOutOfStock(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_UpdateStockedItem(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_InitializeItemAction(EnGirlA* this, GlobalContext* globalCtx); +void EnGirlA_Update2(EnGirlA* this, GlobalContext* globalCtx); void func_80A3C498(Actor* thisx, GlobalContext* globalCtx, s32 flags); -void func_80A3C4D4(Actor* thisx, GlobalContext* globalCtx); +void EnGirlA_Draw(Actor* thisx, GlobalContext* globalCtx); -s32 func_80A3AAA8(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3AB58(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3ABF8(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3ACAC(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3AD60(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3ADD4(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3AE48(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3AEBC(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3AF30(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3AFC4(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B040(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B0BC(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B160(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B204(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B250(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B2AC(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B308(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B318(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B328(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B3A8(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B454(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B464(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B4D8(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B54C(GlobalContext* globalCtx, EnGirlA* this); -s32 func_80A3B5C0(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_Arrows(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_Bombs(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_DekuNuts(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_DekuSticks(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_Fish(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_RedPotion(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_GreenPotion(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_BluePotion(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_Longsword(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_HylianShield(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_DekuShield(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_GoronTunic(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_ZoraTunic(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_Health(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_MilkBottle(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_WeirdEgg(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_Unk19(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_Unk20(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_Bombchus(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_DekuSeeds(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_SoldOut(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_BlueFire(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_Bugs(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_Poe(GlobalContext* globalCtx, EnGirlA* this); +s32 EnGirlA_CanBuy_Fairy(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B714(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B634(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B678(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B780(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3BA40(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B7BC(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B800(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B83C(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B878(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B8B4(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B8F0(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B92C(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B968(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B9A4(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3B9D4(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3BA04(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3BB6C(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3BC0C(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3BC3C(GlobalContext* globalCtx, EnGirlA* this); -void func_80A3BC6C(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_DekuNuts(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_Arrows(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_Bombs(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_DekuSticks(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_BottledItem(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_Longsword(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_HylianShield(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_DekuShield(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_GoronTunic(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_ZoraTunic(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_Health(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_MilkBottle(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_WeirdEgg(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_Unk19(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_Unk20(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_ItemGive_DekuSeeds(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_BuyEvent_ShieldDiscount(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_BuyEvent_ObtainBombchuPack(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_BuyEvent_GoronTunic(GlobalContext* globalCtx, EnGirlA* this); +void EnGirlA_BuyEvent_ZoraTunic(GlobalContext* globalCtx, EnGirlA* this); const ActorInit En_GirlA_InitVars = { ACTOR_EN_GIRLA, @@ -81,212 +81,306 @@ const ActorInit En_GirlA_InitVars = { NULL, }; -static char* D_80A3C590[] = { - "デクの実×5 ", "矢×30 ", "矢×50 ", "爆弾×5 ", "デクの実×10 ", "デクの棒 ", - "爆弾×10 ", "さかな ", "赤クスリ ", "緑クスリ ", "青クスリ ", "巨人のナイフ ", - "ハイリアの盾 ", "デクの盾 ", "ゴロンの服 ", "ゾ─ラの服 ", "回復のハート ", "ロンロン牛乳 ", - "鶏の卵 ", "インゴー牛乳 ", "インゴー卵 ", "もだえ石 ", "大人の財布 ", "ハートの欠片 ", - "ボムチュウ ", "ボムチュウ ", "ボムチュウ ", "ボムチュウ ", "ボムチュウ ", "デクのタネ ", - "キータンのお面", "こわそなお面 ", "ドクロのお面 ", "ウサギずきん ", "まことの仮面 ", "ゾーラのお面 ", - "ゴロンのお面 ", "ゲルドのお面 ", "ＳＯＬＤＯＵＴ", "炎 ", "虫 ", "チョウチョ ", - "ポウ ", "妖精の魂 ", "矢×10 ", "爆弾×20 ", "爆弾×30 ", "爆弾×5 ", - "赤クスリ ", "赤クスリ ", +static char* sShopItemDescriptions[] = { + "デクの実×5 ", // Deku nut x5 + "矢×30 ", // Arrow x30 + "矢×50 ", // Arrow x50 + "爆弾×5 ", // bomb + "デクの実×10 ", // Deku nut x10 + "デクの棒 ", // Deku stick + "爆弾×10 ", // Bomb x10 + "さかな ", // Fish + "赤クスリ ", // Red medicine + "緑クスリ ", // Green medicine + "青クスリ ", // Blue medicine + "巨人のナイフ ", // Giant knife + "ハイリアの盾 ", // Hyria Shield + "デクの盾 ", // Deku Shield + "ゴロンの服 ", // Goron's clothes + "ゾ─ラの服 ", // Zora's clothes + "回復のハート ", // Heart of recovery + "ロンロン牛乳 ", // Ron Ron milk + "鶏の卵 ", // Chicken egg + "インゴー牛乳 ", // Ingo milk + "インゴー卵 ", // Ingo egg + "もだえ石 ", // Modae stone + "大人の財布 ", // Adult wallet + "ハートの欠片 ", // Heart fragment + "ボムチュウ ", // Bombchu + "ボムチュウ ", // Bombchu + "ボムチュウ ", // Bombchu + "ボムチュウ ", // Bombchu + "ボムチュウ ", // Bombchu + "デクのタネ ", // Deku seeds + "キータンのお面", // Ketan's mask + "こわそなお面 ", // Scary face + "ドクロのお面 ", // Skull mask + "ウサギずきん ", // Rabbit hood + "まことの仮面 ", // True mask + "ゾーラのお面 ", // Zora's mask + "ゴロンのお面 ", // Goron's mask + "ゲルドのお面 ", // Gerd's mask + "ＳＯＬＤＯＵＴ", // + "炎 ", // Flame + "虫 ", // Bugs + "チョウチョ ", // Butterfly + "ポウ ", // Poe + "妖精の魂 ", // Fairy soul + "矢×10 ", // Arrow + "爆弾×20 ", // Bomb x20 + "爆弾×30 ", // Bomb x30 + "爆弾×5 ", // Bomb x5 + "赤クスリ ", // Red medicine + "赤クスリ " // Red medicine }; -static s16 D_80A3C658[8] = { ITEM_MASK_KEATON, ITEM_MASK_SPOOKY, ITEM_MASK_SKULL, ITEM_MASK_BUNNY, - ITEM_MASK_TRUTH, ITEM_MASK_ZORA, ITEM_MASK_GORON, ITEM_MASK_GERUDO }; +static s16 sMaskShopItems[8] = { + ITEM_MASK_KEATON, ITEM_MASK_SPOOKY, ITEM_MASK_SKULL, ITEM_MASK_BUNNY, + ITEM_MASK_TRUTH, ITEM_MASK_ZORA, ITEM_MASK_GORON, ITEM_MASK_GERUDO, +}; -static u16 D_80A3C668[5] = { 0x70B6, 0x70B5, 0x70B4, 0x70B7, 0x70BB }; +static u16 sMaskShopFreeToBorrowTextIds[5] = { 0x70B6, 0x70B5, 0x70B4, 0x70B7, 0x70BB }; typedef struct { /* 0x00 */ s16 objID; /* 0x02 */ s16 giDrawId; - /* 0x04 */ void (*unk_04)(Actor*, GlobalContext*, s32); - /* 0x08 */ s16 unk_08; - /* 0x0A */ s16 unk_0A; - /* 0x0C */ u16 unk_0C; - /* 0x0C */ u16 unk_0E; - /* 0x10 */ s32 unk_10; - /* 0x14 */ s32 (*unk_14)(GlobalContext*, EnGirlA*); - /* 0x18 */ void (*unk_18)(GlobalContext*, EnGirlA*); - /* 0x1C */ void (*unk_1C)(GlobalContext*, EnGirlA*); + /* 0x04 */ void (*hiliteFunc)(Actor*, GlobalContext*, s32); + /* 0x08 */ s16 price; + /* 0x0A */ s16 count; + /* 0x0C */ u16 itemDescTextId; + /* 0x0C */ u16 itemBuyPromptTextId; + /* 0x10 */ s32 getItemId; + /* 0x14 */ s32 (*canBuyFunc)(GlobalContext*, EnGirlA*); + /* 0x18 */ void (*itemGiveFunc)(GlobalContext*, EnGirlA*); + /* 0x1C */ void (*buyEventFunc)(GlobalContext*, EnGirlA*); } ShopItemEntry; // size = 0x20 -static ShopItemEntry D_80A3C674[] = { - { OBJECT_GI_NUTS, GID_NUTS, func_8002ED80, 0x000F, 0x0005, 0x00B2, 0x007F, GI_NUTS_5_2, func_80A3ABF8, - func_80A3B714, func_80A3BB6C }, - { OBJECT_GI_ARROW, GID_ARROWS_MEDIUM, func_8002EBCC, 0x003C, 0x001E, 0x00C1, 0x009B, GI_ARROWS_MEDIUM, - func_80A3AAA8, func_80A3B634, func_80A3BB6C }, - { OBJECT_GI_ARROW, GID_ARROWS_LARGE, func_8002EBCC, 0x005A, 0x0032, 0x00B0, 0x007D, GI_ARROWS_LARGE, func_80A3AAA8, - func_80A3B634, func_80A3BB6C }, - { OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 0x0019, 0x0005, 0x00A3, 0x008B, GI_BOMBS_5, func_80A3AB58, - func_80A3B678, func_80A3BB6C }, - { OBJECT_GI_NUTS, GID_NUTS, func_8002ED80, 0x001E, 0x000A, 0x00A2, 0x0087, GI_NUTS_10, func_80A3ABF8, func_80A3B714, - func_80A3BB6C }, - { OBJECT_GI_STICK, GID_STICK, NULL, 0x000A, 0x0001, 0x00A1, 0x0088, GI_STICKS_1, func_80A3ACAC, func_80A3B780, - func_80A3BB6C }, - { OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 0x0032, 0x000A, 0x00B1, 0x007C, GI_BOMBS_10, func_80A3AB58, - func_80A3B678, func_80A3BB6C }, - { OBJECT_GI_FISH, GID_FISH, func_8002ED80, 0x00C8, 0x0001, 0x00B3, 0x007E, GI_FISH, func_80A3AD60, NULL, - func_80A3BB6C }, - { OBJECT_GI_LIQUID, GID_POTION_RED, func_8002EBCC, 0x001E, 0x0001, 0x00A5, 0x008E, GI_POTION_RED, func_80A3ADD4, - func_80A3BA40, func_80A3BB6C }, - { OBJECT_GI_LIQUID, GID_POTION_GREEN, func_8002EBCC, 0x001E, 0x0001, 0x00A6, 0x008F, GI_POTION_GREEN, func_80A3AE48, - func_80A3BA40, func_80A3BB6C }, - { OBJECT_GI_LIQUID, GID_POTION_BLUE, func_8002EBCC, 0x003C, 0x0001, 0x00A7, 0x0090, GI_POTION_BLUE, func_80A3AEBC, - func_80A3BA40, func_80A3BB6C }, - { OBJECT_GI_LONGSWORD, GID_SWORD_BGS, func_8002EBCC, 0x03E8, 0x0001, 0x00A8, 0x0091, GI_SWORD_KNIFE, func_80A3AF30, - func_80A3B7BC, func_80A3BB6C }, - { OBJECT_GI_SHIELD_2, GID_SHIELD_HYLIAN, func_8002EBCC, 0x0050, 0x0001, 0x00A9, 0x0092, GI_SHIELD_HYLIAN, - func_80A3AFC4, func_80A3B800, func_80A3BB6C }, - { OBJECT_GI_SHIELD_1, GID_SHIELD_DEKU, func_8002EBCC, 0x0028, 0x0001, 0x009F, 0x0089, GI_SHIELD_DEKU, func_80A3B040, - func_80A3B83C, func_80A3BB6C }, - { OBJECT_GI_CLOTHES, GID_TUNIC_GORON, NULL, 0x00C8, 0x0001, 0x00AA, 0x0093, GI_TUNIC_GORON, func_80A3B0BC, - func_80A3B878, func_80A3BC0C }, - { OBJECT_GI_CLOTHES, GID_TUNIC_ZORA, NULL, 0x012C, 0x0001, 0x00AB, 0x0094, GI_TUNIC_ZORA, func_80A3B160, - func_80A3B8B4, func_80A3BC3C }, - { OBJECT_GI_HEART, GID_HEART, NULL, 0x000A, 0x0010, 0x00AC, 0x0095, GI_HEART, func_80A3B204, func_80A3B8F0, - func_80A3BB6C }, - { OBJECT_GI_MILK, GID_MILK, func_80A3C498, 0x0064, 0x0001, 0x00AD, 0x0097, GI_MILK_BOTTLE, func_80A3B250, - func_80A3B92C, func_80A3BB6C }, - { OBJECT_GI_EGG, GID_EGG, func_8002EBCC, 0x0064, 0x0001, 0x00AE, 0x0099, GI_WEIRD_EGG, func_80A3B2AC, func_80A3B968, - func_80A3BB6C }, - { OBJECT_GI_MILK, GID_MILK, func_80A3C498, 0x2710, 0x0001, 0x00B4, 0x0085, GI_NONE, func_80A3B308, func_80A3B9A4, - func_80A3BB6C }, - { OBJECT_GI_EGG, GID_EGG, func_8002EBCC, 0x2710, 0x0001, 0x00B5, 0x0085, GI_NONE, func_80A3B318, func_80A3B9D4, - func_80A3BB6C }, - { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 0x0064, 0x000A, 0x00BC, 0x008C, GI_BOMBCHUS_10, func_80A3B328, NULL, - func_80A3BC6C }, - { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 0x00B4, 0x0014, 0x0061, 0x002A, GI_BOMBCHUS_20, func_80A3B328, NULL, - func_80A3BC6C }, - { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 0x00B4, 0x0014, 0x0061, 0x002A, GI_BOMBCHUS_20, func_80A3B328, NULL, - func_80A3BC6C }, - { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 0x0064, 0x000A, 0x00BC, 0x008C, GI_BOMBCHUS_10, func_80A3B328, NULL, - func_80A3BC6C }, - { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 0x0064, 0x000A, 0x00BC, 0x008C, GI_BOMBCHUS_10, func_80A3B328, NULL, - func_80A3BC6C }, - { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 0x00B4, 0x0014, 0x0061, 0x002A, GI_BOMBCHUS_20, func_80A3B328, NULL, - func_80A3BC6C }, - { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 0x00B4, 0x0014, 0x0061, 0x002A, GI_BOMBCHUS_20, func_80A3B328, NULL, - func_80A3BC6C }, - { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 0x0064, 0x000A, 0x00BC, 0x008C, GI_BOMBCHUS_10, func_80A3B328, NULL, - func_80A3BC6C }, - { OBJECT_GI_SEED, GID_SEEDS, func_8002EBCC, 0x001E, 0x001E, 0x00DF, 0x00DE, GI_SEEDS_30, func_80A3B3A8, - func_80A3BA04, func_80A3BB6C }, - { OBJECT_GI_KI_TAN_MASK, GID_MASK_KEATON, func_8002EBCC, 0x0000, 0x0001, 0x70B2, 0x70BE, GI_MASK_KEATON, - func_80A3B3A8, func_80A3BA04, func_80A3BB6C }, - { OBJECT_GI_REDEAD_MASK, GID_MASK_SPOOKY, func_8002EBCC, 0x0000, 0x0001, 0x70B1, 0x70BD, GI_MASK_SPOOKY, - func_80A3B3A8, func_80A3BA04, func_80A3BB6C }, - { OBJECT_GI_SKJ_MASK, GID_MASK_SKULL, func_8002EBCC, 0x0000, 0x0001, 0x70B0, 0x70BC, GI_MASK_SKULL, func_80A3B3A8, - func_80A3BA04, func_80A3BB6C }, - { OBJECT_GI_RABIT_MASK, GID_MASK_BUNNY, func_8002EBCC, 0x0000, 0x0001, 0x70B3, 0x70BF, GI_MASK_BUNNY, func_80A3B3A8, - func_80A3BA04, func_80A3BB6C }, - { OBJECT_GI_TRUTH_MASK, GID_MASK_TRUTH, func_80A3C498, 0x0000, 0x0001, 0x70AF, 0x70C3, GI_MASK_TRUTH, func_80A3B3A8, - func_80A3BA04, func_80A3BB6C }, - { OBJECT_GI_ZORAMASK, GID_MASK_ZORA, NULL, 0x0000, 0x0001, 0x70B9, 0x70C1, GI_MASK_ZORA, func_80A3B3A8, - func_80A3BA04, func_80A3BB6C }, - { OBJECT_GI_GOLONMASK, GID_MASK_GORON, NULL, 0x0000, 0x0001, 0x70B8, 0x70C0, GI_MASK_GORON, func_80A3B3A8, - func_80A3BA04, func_80A3BB6C }, - { OBJECT_GI_GERUDOMASK, GID_MASK_GERUDO, NULL, 0x0000, 0x0001, 0x70BA, 0x70C2, GI_MASK_GERUDO, func_80A3B3A8, - func_80A3BA04, func_80A3BB6C }, - { OBJECT_GI_SOLDOUT, GID_SOLDOUT, func_8002EBCC, 0x0000, 0x0000, 0x00BD, 0x70C2, GI_MASK_GERUDO, func_80A3B454, - NULL, NULL }, - { OBJECT_GI_FIRE, GID_BLUE_FIRE, func_8002EBCC, 0x012C, 0x0001, 0x00B9, 0x00B8, GI_BLUE_FIRE, func_80A3B464, - func_80A3BA40, func_80A3BB6C }, - { OBJECT_GI_INSECT, GID_BUG, func_80A3C498, 0x0032, 0x0001, 0x00BB, 0x00BA, GI_BUGS, func_80A3B4D8, func_80A3BA40, - func_80A3BB6C }, - { OBJECT_GI_GHOST, GID_BIG_POE, func_80A3C498, 0x0032, 0x0001, 0x506F, 0x5070, GI_BIG_POE, func_80A3B54C, - func_80A3BA40, func_80A3BB6C }, - { OBJECT_GI_GHOST, GID_POE, func_80A3C498, 0x001E, 0x0001, 0x506D, 0x506E, GI_POE, func_80A3B54C, func_80A3BA40, - func_80A3BB6C }, - { OBJECT_GI_SOUL, GID_FAIRY, func_80A3C498, 0x0032, 0x0001, 0x00B7, 0x00B6, GI_FAIRY, func_80A3B5C0, func_80A3BA40, - func_80A3BB6C }, - { OBJECT_GI_ARROW, GID_ARROWS_SMALL, func_8002EBCC, 0x0014, 0x000A, 0x00A0, 0x008A, GI_ARROWS_SMALL, func_80A3AAA8, - func_80A3B634, func_80A3BB6C }, - { OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 0x0050, 0x0014, 0x001C, 0x0006, GI_BOMBS_20, func_80A3AB58, - func_80A3B678, func_80A3BB6C }, - { OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 0x0078, 0x001E, 0x001D, 0x001E, GI_BOMBS_30, func_80A3AB58, - func_80A3B678, func_80A3BB6C }, - { OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 0x0023, 0x0005, 0x00CB, 0x00CA, GI_BOMBS_5, func_80A3AB58, - func_80A3B678, func_80A3BB6C }, - { OBJECT_GI_LIQUID, GID_POTION_RED, func_8002EBCC, 0x0028, 0x0001, 0x0064, 0x0062, GI_POTION_RED, func_80A3ADD4, - func_80A3BA40, func_80A3BB6C }, - { OBJECT_GI_LIQUID, GID_POTION_RED, func_8002EBCC, 0x0032, 0x0001, 0x0065, 0x0063, GI_POTION_RED, func_80A3ADD4, - func_80A3BA40, func_80A3BB6C }, +static ShopItemEntry shopItemEntries[] = { + // SI_DEKU_NUTS_5 + { OBJECT_GI_NUTS, GID_NUTS, func_8002ED80, 15, 5, 0x00B2, 0x007F, GI_NUTS_5_2, EnGirlA_CanBuy_DekuNuts, + EnGirlA_ItemGive_DekuNuts, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_ARROWS_30 */ + { OBJECT_GI_ARROW, GID_ARROWS_MEDIUM, func_8002EBCC, 60, 30, 0x00C1, 0x009B, GI_ARROWS_MEDIUM, + EnGirlA_CanBuy_Arrows, EnGirlA_ItemGive_Arrows, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_ARROWS_50 */ + { OBJECT_GI_ARROW, GID_ARROWS_LARGE, func_8002EBCC, 90, 50, 0x00B0, 0x007D, GI_ARROWS_LARGE, EnGirlA_CanBuy_Arrows, + EnGirlA_ItemGive_Arrows, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_BOMBS_5_R25 */ + { OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 25, 5, 0x00A3, 0x008B, GI_BOMBS_5, EnGirlA_CanBuy_Bombs, + EnGirlA_ItemGive_Bombs, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_DEKU_NUTS_10 */ + { OBJECT_GI_NUTS, GID_NUTS, func_8002ED80, 30, 10, 0x00A2, 0x0087, GI_NUTS_10, EnGirlA_CanBuy_DekuNuts, + EnGirlA_ItemGive_DekuNuts, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_DEKU_STICK */ + { OBJECT_GI_STICK, GID_STICK, NULL, 10, 1, 0x00A1, 0x0088, GI_STICKS_1, EnGirlA_CanBuy_DekuSticks, + EnGirlA_ItemGive_DekuSticks, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_BOMBS_10 */ + { OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 50, 10, 0x00B1, 0x007C, GI_BOMBS_10, EnGirlA_CanBuy_Bombs, + EnGirlA_ItemGive_Bombs, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_FISH */ + { OBJECT_GI_FISH, GID_FISH, func_8002ED80, 200, 1, 0x00B3, 0x007E, GI_FISH, EnGirlA_CanBuy_Fish, NULL, + EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_RED_POTION_R30 */ + { OBJECT_GI_LIQUID, GID_POTION_RED, func_8002EBCC, 30, 1, 0x00A5, 0x008E, GI_POTION_RED, EnGirlA_CanBuy_RedPotion, + EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_GREEN_POTION */ + { OBJECT_GI_LIQUID, GID_POTION_GREEN, func_8002EBCC, 30, 1, 0x00A6, 0x008F, GI_POTION_GREEN, + EnGirlA_CanBuy_GreenPotion, EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_BLUE_POTION */ + { OBJECT_GI_LIQUID, GID_POTION_BLUE, func_8002EBCC, 60, 1, 0x00A7, 0x0090, GI_POTION_BLUE, + EnGirlA_CanBuy_BluePotion, EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_LONGSWORD */ + { OBJECT_GI_LONGSWORD, GID_SWORD_BGS, func_8002EBCC, 1000, 1, 0x00A8, 0x0091, GI_SWORD_KNIFE, + EnGirlA_CanBuy_Longsword, EnGirlA_ItemGive_Longsword, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_HYLIAN_SHIELD */ + { OBJECT_GI_SHIELD_2, GID_SHIELD_HYLIAN, func_8002EBCC, 80, 1, 0x00A9, 0x0092, GI_SHIELD_HYLIAN, + EnGirlA_CanBuy_HylianShield, EnGirlA_ItemGive_HylianShield, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_DEKU_SHIELD */ + { OBJECT_GI_SHIELD_1, GID_SHIELD_DEKU, func_8002EBCC, 40, 1, 0x009F, 0x0089, GI_SHIELD_DEKU, + EnGirlA_CanBuy_DekuShield, EnGirlA_ItemGive_DekuShield, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_GORON_TUNIC */ + { OBJECT_GI_CLOTHES, GID_TUNIC_GORON, NULL, 200, 1, 0x00AA, 0x0093, GI_TUNIC_GORON, EnGirlA_CanBuy_GoronTunic, + EnGirlA_ItemGive_GoronTunic, EnGirlA_BuyEvent_GoronTunic }, + /* SI_ZORA_TUNIC */ + { OBJECT_GI_CLOTHES, GID_TUNIC_ZORA, NULL, 300, 1, 0x00AB, 0x0094, GI_TUNIC_ZORA, EnGirlA_CanBuy_ZoraTunic, + EnGirlA_ItemGive_ZoraTunic, EnGirlA_BuyEvent_ZoraTunic }, + /* SI_HEART */ + { OBJECT_GI_HEART, GID_HEART, NULL, 10, 16, 0x00AC, 0x0095, GI_HEART, EnGirlA_CanBuy_Health, + EnGirlA_ItemGive_Health, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_MILK_BOTTLE */ + { OBJECT_GI_MILK, GID_MILK, func_80A3C498, 100, 1, 0x00AD, 0x0097, GI_MILK_BOTTLE, EnGirlA_CanBuy_MilkBottle, + EnGirlA_ItemGive_MilkBottle, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_WEIRD_EGG */ + { OBJECT_GI_EGG, GID_EGG, func_8002EBCC, 100, 1, 0x00AE, 0x0099, GI_WEIRD_EGG, EnGirlA_CanBuy_WeirdEgg, + EnGirlA_ItemGive_WeirdEgg, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_19 */ + { OBJECT_GI_MILK, GID_MILK, func_80A3C498, 10000, 1, 0x00B4, 0x0085, GI_NONE, EnGirlA_CanBuy_Unk19, + EnGirlA_ItemGive_Unk19, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_20 */ + { OBJECT_GI_EGG, GID_EGG, func_8002EBCC, 10000, 1, 0x00B5, 0x0085, GI_NONE, EnGirlA_CanBuy_Unk20, + EnGirlA_ItemGive_Unk20, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_BOMBCHU_10_1 */ + { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 100, 10, 0x00BC, 0x008C, GI_BOMBCHUS_10, EnGirlA_CanBuy_Bombchus, + NULL, EnGirlA_BuyEvent_ObtainBombchuPack }, + /* SI_BOMBCHU_20_1 */ + { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 180, 20, 0x0061, 0x002A, GI_BOMBCHUS_20, EnGirlA_CanBuy_Bombchus, + NULL, EnGirlA_BuyEvent_ObtainBombchuPack }, + /* SI_BOMBCHU_20_2 */ + { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 180, 20, 0x0061, 0x002A, GI_BOMBCHUS_20, EnGirlA_CanBuy_Bombchus, + NULL, EnGirlA_BuyEvent_ObtainBombchuPack }, + /* SI_BOMBCHU_10_2 */ + { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 100, 10, 0x00BC, 0x008C, GI_BOMBCHUS_10, EnGirlA_CanBuy_Bombchus, + NULL, EnGirlA_BuyEvent_ObtainBombchuPack }, + /* SI_BOMBCHU_10_3 */ + { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 100, 10, 0x00BC, 0x008C, GI_BOMBCHUS_10, EnGirlA_CanBuy_Bombchus, + NULL, EnGirlA_BuyEvent_ObtainBombchuPack }, + /* SI_BOMBCHU_20_3 */ + { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 180, 20, 0x0061, 0x002A, GI_BOMBCHUS_20, EnGirlA_CanBuy_Bombchus, + NULL, EnGirlA_BuyEvent_ObtainBombchuPack }, + /* SI_BOMBCHU_20_4 */ + { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 180, 20, 0x0061, 0x002A, GI_BOMBCHUS_20, EnGirlA_CanBuy_Bombchus, + NULL, EnGirlA_BuyEvent_ObtainBombchuPack }, + /* SI_BOMBCHU_10_4 */ + { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 100, 10, 0x00BC, 0x008C, GI_BOMBCHUS_10, EnGirlA_CanBuy_Bombchus, + NULL, EnGirlA_BuyEvent_ObtainBombchuPack }, + /* SI_DEKU_SEEDS_30 */ + { OBJECT_GI_SEED, GID_SEEDS, func_8002EBCC, 30, 30, 0x00DF, 0x00DE, GI_SEEDS_30, EnGirlA_CanBuy_DekuSeeds, + EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_KEATON_MASK */ + { OBJECT_GI_KI_TAN_MASK, GID_MASK_KEATON, func_8002EBCC, 0, 1, 0x70B2, 0x70BE, GI_MASK_KEATON, + EnGirlA_CanBuy_DekuSeeds, EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_SPOOKY_MASK */ + { OBJECT_GI_REDEAD_MASK, GID_MASK_SPOOKY, func_8002EBCC, 0, 1, 0x70B1, 0x70BD, GI_MASK_SPOOKY, + EnGirlA_CanBuy_DekuSeeds, EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_SKULL_MASK */ + { OBJECT_GI_SKJ_MASK, GID_MASK_SKULL, func_8002EBCC, 0, 1, 0x70B0, 0x70BC, GI_MASK_SKULL, EnGirlA_CanBuy_DekuSeeds, + EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_BUNNY_HOOD */ + { OBJECT_GI_RABIT_MASK, GID_MASK_BUNNY, func_8002EBCC, 0, 1, 0x70B3, 0x70BF, GI_MASK_BUNNY, + EnGirlA_CanBuy_DekuSeeds, EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_MASK_OF_TRUTH */ + { OBJECT_GI_TRUTH_MASK, GID_MASK_TRUTH, func_80A3C498, 0, 1, 0x70AF, 0x70C3, GI_MASK_TRUTH, + EnGirlA_CanBuy_DekuSeeds, EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_ZORA_MASK */ + { OBJECT_GI_ZORAMASK, GID_MASK_ZORA, NULL, 0, 1, 0x70B9, 0x70C1, GI_MASK_ZORA, EnGirlA_CanBuy_DekuSeeds, + EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_GORON_MASK */ + { OBJECT_GI_GOLONMASK, GID_MASK_GORON, NULL, 0, 1, 0x70B8, 0x70C0, GI_MASK_GORON, EnGirlA_CanBuy_DekuSeeds, + EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_GERUDO_MASK */ + { OBJECT_GI_GERUDOMASK, GID_MASK_GERUDO, NULL, 0, 1, 0x70BA, 0x70C2, GI_MASK_GERUDO, EnGirlA_CanBuy_DekuSeeds, + EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_SOLD_OUT */ + { OBJECT_GI_SOLDOUT, GID_SOLDOUT, func_8002EBCC, 0, 0, 0x00BD, 0x70C2, GI_MASK_GERUDO, EnGirlA_CanBuy_SoldOut, NULL, + NULL }, + /* SI_BLUE_FIRE */ + { OBJECT_GI_FIRE, GID_BLUE_FIRE, func_8002EBCC, 300, 1, 0x00B9, 0x00B8, GI_BLUE_FIRE, EnGirlA_CanBuy_BlueFire, + EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_BUGS */ + { OBJECT_GI_INSECT, GID_BUG, func_80A3C498, 50, 1, 0x00BB, 0x00BA, GI_BUGS, EnGirlA_CanBuy_Bugs, + EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_BIG_POE */ + { OBJECT_GI_GHOST, GID_BIG_POE, func_80A3C498, 50, 1, 0x506F, 0x5070, GI_BIG_POE, EnGirlA_CanBuy_Poe, + EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_POE */ + { OBJECT_GI_GHOST, GID_POE, func_80A3C498, 30, 1, 0x506D, 0x506E, GI_POE, EnGirlA_CanBuy_Poe, + EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_FAIRY */ + { OBJECT_GI_SOUL, GID_FAIRY, func_80A3C498, 50, 1, 0x00B7, 0x00B6, GI_FAIRY, EnGirlA_CanBuy_Fairy, + EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_ARROWS_10 */ + { OBJECT_GI_ARROW, GID_ARROWS_SMALL, func_8002EBCC, 20, 10, 0x00A0, 0x008A, GI_ARROWS_SMALL, EnGirlA_CanBuy_Arrows, + EnGirlA_ItemGive_Arrows, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_BOMBS_20 */ + { OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 80, 20, 0x001C, 0x0006, GI_BOMBS_20, EnGirlA_CanBuy_Bombs, + EnGirlA_ItemGive_Bombs, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_BOMBS_30 */ + { OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 120, 30, 0x001D, 0x001E, GI_BOMBS_30, EnGirlA_CanBuy_Bombs, + EnGirlA_ItemGive_Bombs, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_BOMBS_5_R35 */ + { OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 35, 5, 0x00CB, 0x00CA, GI_BOMBS_5, EnGirlA_CanBuy_Bombs, + EnGirlA_ItemGive_Bombs, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_RED_POTION_R40 */ + { OBJECT_GI_LIQUID, GID_POTION_RED, func_8002EBCC, 40, 1, 0x0064, 0x0062, GI_POTION_RED, EnGirlA_CanBuy_RedPotion, + EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount }, + /* SI_RED_POTION_R50 */ + { OBJECT_GI_LIQUID, GID_POTION_RED, func_8002EBCC, 50, 1, 0x0065, 0x0063, GI_POTION_RED, EnGirlA_CanBuy_RedPotion, + EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount } }; -static s16 D_80A3CCB4[8] = { 0x0005, 0x000A, 0x000F, 0x0014, 0x0019, 0x001E, 0x0023, 0x0028 }; +// Defines the Hylian Shield discount amount +static s16 sShieldDiscounts[] = { 5, 10, 15, 20, 25, 30, 35, 40 }; -void func_80A3A750(EnGirlA* this, EnGirlAActionFunc func) { +void EnGirlA_SetupAction(EnGirlA* this, EnGirlAActionFunc func) { this->actionFunc = func; } -s32 func_80A3A758(EnGirlA* this) { +s32 EnGirlA_TryChangeShopItem(EnGirlA* this) { switch (this->actor.params) { - case 17: + case SI_MILK_BOTTLE: if (gSaveContext.itemGetInf[0] & 0x4) { - this->actor.params = 16; - return 1; + this->actor.params = SI_HEART; + return true; } break; - case 24: + case SI_BOMBCHU_10_2: if (gSaveContext.itemGetInf[0] & 0x40) { - this->actor.params = 38; - return 1; + this->actor.params = SI_SOLD_OUT; + return true; } break; - case 25: + case SI_BOMBCHU_10_3: if (gSaveContext.itemGetInf[0] & 0x80) { - this->actor.params = 38; - return 1; + this->actor.params = SI_SOLD_OUT; + return true; } break; - case 26: + case SI_BOMBCHU_20_3: if (gSaveContext.itemGetInf[0] & 0x100) { - this->actor.params = 38; - return 1; + this->actor.params = SI_SOLD_OUT; + return true; } break; - case 27: + case SI_BOMBCHU_20_4: if (gSaveContext.itemGetInf[0] & 0x200) { - this->actor.params = 38; - return 1; + this->actor.params = SI_SOLD_OUT; + return true; } break; - case 28: + case SI_BOMBCHU_10_4: if (gSaveContext.itemGetInf[0] & 0x400) { - this->actor.params = 38; - return 1; + this->actor.params = SI_SOLD_OUT; + return true; } break; - case 21: + case SI_BOMBCHU_10_1: if (gSaveContext.itemGetInf[0] & 0x8) { - this->actor.params = 38; - return 1; + this->actor.params = SI_SOLD_OUT; + return true; } break; - case 22: + case SI_BOMBCHU_20_1: if (gSaveContext.itemGetInf[0] & 0x10) { - this->actor.params = 38; - return 1; + this->actor.params = SI_SOLD_OUT; + return true; } break; - case 23: + case SI_BOMBCHU_20_2: if (gSaveContext.itemGetInf[0] & 0x20) { - this->actor.params = 38; - return 1; + this->actor.params = SI_SOLD_OUT; + return true; } break; } - return 0; + return false; } -void func_80A3A8D0(EnGirlA* this, GlobalContext* globalCtx) { +void EnGirlA_InitItem(EnGirlA* this, GlobalContext* globalCtx) { s16 params = this->actor.params; - osSyncPrintf("%s(%2d)初期設定\n", D_80A3C590[params], params); + osSyncPrintf("%s(%2d)初期設定\n", sShopItemDescriptions[params], params); - if ((params >= 50) && (params < 0)) { + if ((params >= SI_MAX) && (params < 0)) { Actor_Kill(&this->actor); osSyncPrintf(VT_COL(RED, WHITE)); osSyncPrintf("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); @@ -295,339 +389,339 @@ void func_80A3A8D0(EnGirlA* this, GlobalContext* globalCtx) { return; } - this->unk_194 = Object_GetIndex(&globalCtx->objectCtx, D_80A3C674[params].objID); + this->objBankIndex = Object_GetIndex(&globalCtx->objectCtx, shopItemEntries[params].objID); - if (this->unk_194 < 0) { + if (this->objBankIndex < 0) { Actor_Kill(&this->actor); osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("バンクが無いよ！！(%s)\n", D_80A3C590[params]); + osSyncPrintf("バンクが無いよ！！(%s)\n", sShopItemDescriptions[params]); osSyncPrintf(VT_RST); ASSERT(0, "0", "../z_en_girlA.c", 1434); return; } this->actor.params = params; - this->unk_198 = func_80A3BFE4; + this->actionFunc2 = EnGirlA_InitializeItemAction; } void EnGirlA_Init(Actor* thisx, GlobalContext* globalCtx) { EnGirlA* this = THIS; - func_80A3A758(this); - func_80A3A8D0(this, globalCtx); - osSyncPrintf("%s(%2d)初期設定\n", D_80A3C590[this->actor.params], this->actor.params); + EnGirlA_TryChangeShopItem(this); + EnGirlA_InitItem(this, globalCtx); + osSyncPrintf("%s(%2d)初期設定\n", sShopItemDescriptions[this->actor.params], this->actor.params); } void EnGirlA_Destroy(Actor* thisx, GlobalContext* globalCtx) { EnGirlA* this = THIS; - if (this->unk_19C != 0) { + if (this->isInitialized) { SkelAnime_Free(&this->skelAnime, globalCtx); } } -s32 func_80A3AAA8(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_Arrows(GlobalContext* globalCtx, EnGirlA* this) { if (Item_CheckObtainability(ITEM_BOW) == ITEM_NONE) { - return 5; + return CANBUY_RESULT_CANT_GET_NOW_5; } if (AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3AB58(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_Bombs(GlobalContext* globalCtx, EnGirlA* this) { if (!CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } if (AMMO(ITEM_BOMB) >= CUR_CAPACITY(UPG_BOMB_BAG)) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3ABF8(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_DekuNuts(GlobalContext* globalCtx, EnGirlA* this) { if ((CUR_CAPACITY(UPG_NUTS) != 0) && (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS))) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_NUT) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3ACAC(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_DekuSticks(GlobalContext* globalCtx, EnGirlA* this) { if ((CUR_CAPACITY(UPG_STICKS) != 0) && (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS))) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_STICK) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3AD60(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_Fish(GlobalContext* globalCtx, EnGirlA* this) { if (!Inventory_HasEmptyBottle()) { - return 3; + return CANBUY_RESULT_NEED_BOTTLE; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_FISH) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3ADD4(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_RedPotion(GlobalContext* globalCtx, EnGirlA* this) { if (!Inventory_HasEmptyBottle()) { - return 3; + return CANBUY_RESULT_NEED_BOTTLE; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_POTION_RED) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3AE48(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_GreenPotion(GlobalContext* globalCtx, EnGirlA* this) { if (!Inventory_HasEmptyBottle()) { - return 3; + return CANBUY_RESULT_NEED_BOTTLE; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_POTION_GREEN) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3AEBC(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_BluePotion(GlobalContext* globalCtx, EnGirlA* this) { if (!Inventory_HasEmptyBottle()) { - return 3; + return CANBUY_RESULT_NEED_BOTTLE; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_POTION_BLUE) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3AF30(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_Longsword(GlobalContext* globalCtx, EnGirlA* this) { if ((gBitFlags[2] & gSaveContext.inventory.equipment) && !(gBitFlags[3] & gSaveContext.inventory.equipment)) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_SWORD_BGS) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3AFC4(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_HylianShield(GlobalContext* globalCtx, EnGirlA* this) { if (gBitFlags[5] & gSaveContext.inventory.equipment) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_SHIELD_HYLIAN) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B040(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_DekuShield(GlobalContext* globalCtx, EnGirlA* this) { if (gBitFlags[4] & gSaveContext.inventory.equipment) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_SHIELD_DEKU) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B0BC(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_GoronTunic(GlobalContext* globalCtx, EnGirlA* this) { if (LINK_AGE_IN_YEARS == YEARS_CHILD) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } if (gBitFlags[9] & gSaveContext.inventory.equipment) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_TUNIC_GORON) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B160(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_ZoraTunic(GlobalContext* globalCtx, EnGirlA* this) { if (LINK_AGE_IN_YEARS == YEARS_CHILD) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } if (gBitFlags[10] & gSaveContext.inventory.equipment) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_TUNIC_ZORA) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B204(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_Health(GlobalContext* globalCtx, EnGirlA* this) { if (gSaveContext.healthCapacity == gSaveContext.health) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B250(GlobalContext* globalCtx, EnGirlA* this) { - if (gSaveContext.rupees < this->unk_1C8) { - return 4; +s32 EnGirlA_CanBuy_MilkBottle(GlobalContext* globalCtx, EnGirlA* this) { + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_MILK_BOTTLE) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B2AC(GlobalContext* globalCtx, EnGirlA* this) { - if (gSaveContext.rupees < this->unk_1C8) { - return 4; +s32 EnGirlA_CanBuy_WeirdEgg(GlobalContext* globalCtx, EnGirlA* this) { + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_LETTER_ZELDA) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B308(GlobalContext* globalCtx, EnGirlA* this) { - return 4; +s32 EnGirlA_CanBuy_Unk19(GlobalContext* globalCtx, EnGirlA* this) { + return CANBUY_RESULT_NEED_RUPEES; } -s32 func_80A3B318(GlobalContext* globalCtx, EnGirlA* this) { - return 4; +s32 EnGirlA_CanBuy_Unk20(GlobalContext* globalCtx, EnGirlA* this) { + return CANBUY_RESULT_NEED_RUPEES; } -s32 func_80A3B328(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_Bombchus(GlobalContext* globalCtx, EnGirlA* this) { if (AMMO(ITEM_BOMBCHU) >= 50) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_BOMBCHU) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B3A8(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_DekuSeeds(GlobalContext* globalCtx, EnGirlA* this) { if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) { - return 2; + return CANBUY_RESULT_CANT_GET_NOW; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_SEEDS) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B454(GlobalContext* globalCtx, EnGirlA* this) { - return 5; +s32 EnGirlA_CanBuy_SoldOut(GlobalContext* globalCtx, EnGirlA* this) { + return CANBUY_RESULT_CANT_GET_NOW_5; } -s32 func_80A3B464(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_BlueFire(GlobalContext* globalCtx, EnGirlA* this) { if (!Inventory_HasEmptyBottle()) { - return 3; + return CANBUY_RESULT_NEED_BOTTLE; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_BLUE_FIRE) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B4D8(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_Bugs(GlobalContext* globalCtx, EnGirlA* this) { if (!Inventory_HasEmptyBottle()) { - return 3; + return CANBUY_RESULT_NEED_BOTTLE; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_BUG) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B54C(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_Poe(GlobalContext* globalCtx, EnGirlA* this) { if (!Inventory_HasEmptyBottle()) { - return 3; + return CANBUY_RESULT_NEED_BOTTLE; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_POE) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -s32 func_80A3B5C0(GlobalContext* globalCtx, EnGirlA* this) { +s32 EnGirlA_CanBuy_Fairy(GlobalContext* globalCtx, EnGirlA* this) { if (!Inventory_HasEmptyBottle()) { - return 3; + return CANBUY_RESULT_NEED_BOTTLE; } - if (gSaveContext.rupees < this->unk_1C8) { - return 4; + if (gSaveContext.rupees < this->basePrice) { + return CANBUY_RESULT_NEED_RUPEES; } if (Item_CheckObtainability(ITEM_FAIRY) == ITEM_NONE) { - return 0; + return CANBUY_RESULT_SUCCESS_FANFARE; } - return 1; + return CANBUY_RESULT_SUCCESS; } -void func_80A3B634(GlobalContext* globalCtx, EnGirlA* this) { - Inventory_ChangeAmmo(ITEM_BOW, this->unk_1CA); - Rupees_ChangeBy(-this->unk_1C8); +void EnGirlA_ItemGive_Arrows(GlobalContext* globalCtx, EnGirlA* this) { + Inventory_ChangeAmmo(ITEM_BOW, this->itemCount); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B678(GlobalContext* globalCtx, EnGirlA* this) { - switch (this->unk_1CA) { +void EnGirlA_ItemGive_Bombs(GlobalContext* globalCtx, EnGirlA* this) { + switch (this->itemCount) { case 5: Item_Give(globalCtx, ITEM_BOMBS_5); break; @@ -641,11 +735,11 @@ void func_80A3B678(GlobalContext* globalCtx, EnGirlA* this) { Item_Give(globalCtx, ITEM_BOMBS_30); break; } - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B714(GlobalContext* globalCtx, EnGirlA* this) { - switch (this->unk_1CA) { +void EnGirlA_ItemGive_DekuNuts(GlobalContext* globalCtx, EnGirlA* this) { + switch (this->itemCount) { case 5: Item_Give(globalCtx, ITEM_NUTS_5); break; @@ -653,347 +747,345 @@ void func_80A3B714(GlobalContext* globalCtx, EnGirlA* this) { Item_Give(globalCtx, ITEM_NUTS_10); break; } - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B780(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_ItemGive_DekuSticks(GlobalContext* globalCtx, EnGirlA* this) { Item_Give(globalCtx, ITEM_STICK); - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B7BC(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_ItemGive_Longsword(GlobalContext* globalCtx, EnGirlA* this) { func_800849EC(globalCtx); gSaveContext.swordHealth = 8; - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B800(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_ItemGive_HylianShield(GlobalContext* globalCtx, EnGirlA* this) { Item_Give(globalCtx, ITEM_SHIELD_HYLIAN); - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B83C(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_ItemGive_DekuShield(GlobalContext* globalCtx, EnGirlA* this) { Item_Give(globalCtx, ITEM_SHIELD_DEKU); - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B878(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_ItemGive_GoronTunic(GlobalContext* globalCtx, EnGirlA* this) { Item_Give(globalCtx, ITEM_TUNIC_GORON); - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B8B4(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_ItemGive_ZoraTunic(GlobalContext* globalCtx, EnGirlA* this) { Item_Give(globalCtx, ITEM_TUNIC_ZORA); - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B8F0(GlobalContext* globalCtx, EnGirlA* this) { - Health_ChangeBy(globalCtx, this->unk_1CA); - Rupees_ChangeBy(-this->unk_1C8); +void EnGirlA_ItemGive_Health(GlobalContext* globalCtx, EnGirlA* this) { + Health_ChangeBy(globalCtx, this->itemCount); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B92C(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_ItemGive_MilkBottle(GlobalContext* globalCtx, EnGirlA* this) { Item_Give(globalCtx, ITEM_MILK_BOTTLE); - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B968(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_ItemGive_WeirdEgg(GlobalContext* globalCtx, EnGirlA* this) { Item_Give(globalCtx, ITEM_WEIRD_EGG); - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B9A4(GlobalContext* globalCtx, EnGirlA* this) { - Rupees_ChangeBy(-this->unk_1C8); +void EnGirlA_ItemGive_Unk19(GlobalContext* globalCtx, EnGirlA* this) { + Rupees_ChangeBy(-this->basePrice); } -void func_80A3B9D4(GlobalContext* globalCtx, EnGirlA* this) { - Rupees_ChangeBy(-this->unk_1C8); +void EnGirlA_ItemGive_Unk20(GlobalContext* globalCtx, EnGirlA* this) { + Rupees_ChangeBy(-this->basePrice); } -void func_80A3BA04(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_ItemGive_DekuSeeds(GlobalContext* globalCtx, EnGirlA* this) { Item_Give(globalCtx, ITEM_SEEDS_30); - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3BA40(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_ItemGive_BottledItem(GlobalContext* globalCtx, EnGirlA* this) { switch (this->actor.params) { - case 7: + case SI_FISH: Item_Give(globalCtx, ITEM_FISH); break; - case 8: + case SI_RED_POTION_R30: Item_Give(globalCtx, ITEM_POTION_RED); break; - case 9: + case SI_GREEN_POTION: Item_Give(globalCtx, ITEM_POTION_GREEN); break; - case 10: + case SI_BLUE_POTION: Item_Give(globalCtx, ITEM_POTION_BLUE); break; - case 39: + case SI_BLUE_FIRE: Item_Give(globalCtx, ITEM_BLUE_FIRE); break; - case 40: + case SI_BUGS: Item_Give(globalCtx, ITEM_BUG); break; - case 41: + case SI_BIG_POE: Item_Give(globalCtx, ITEM_BIG_POE); break; - case 42: + case SI_POE: Item_Give(globalCtx, ITEM_POE); break; - case 43: + case SI_FAIRY: Item_Give(globalCtx, ITEM_FAIRY); break; } - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3BB6C(GlobalContext* globalCtx, EnGirlA* this) { - if (this->actor.params == 12) { +void EnGirlA_BuyEvent_ShieldDiscount(GlobalContext* globalCtx, EnGirlA* this) { + if (this->actor.params == SI_HYLIAN_SHIELD) { if (gSaveContext.infTable[7] & 0x40) { - Rupees_ChangeBy(-(this->unk_1C8 - D_80A3CCB4[(s32)Rand_ZeroFloat(7.9f)])); + Rupees_ChangeBy(-(this->basePrice - sShieldDiscounts[(s32)Rand_ZeroFloat(7.9f)])); return; } } - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3BC0C(GlobalContext* globalCtx, EnGirlA* this) { - Rupees_ChangeBy(-this->unk_1C8); +void EnGirlA_BuyEvent_GoronTunic(GlobalContext* globalCtx, EnGirlA* this) { + Rupees_ChangeBy(-this->basePrice); } -void func_80A3BC3C(GlobalContext* globalCtx, EnGirlA* this) { - Rupees_ChangeBy(-this->unk_1C8); +void EnGirlA_BuyEvent_ZoraTunic(GlobalContext* globalCtx, EnGirlA* this) { + Rupees_ChangeBy(-this->basePrice); } -void func_80A3BC6C(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_BuyEvent_ObtainBombchuPack(GlobalContext* globalCtx, EnGirlA* this) { switch (this->actor.params) { - case 24: + case SI_BOMBCHU_10_2: gSaveContext.itemGetInf[0] |= 0x40; break; - case 25: + case SI_BOMBCHU_10_3: gSaveContext.itemGetInf[0] |= 0x80; break; - case 26: + case SI_BOMBCHU_20_3: gSaveContext.itemGetInf[0] |= 0x100; break; - case 27: + case SI_BOMBCHU_20_4: gSaveContext.itemGetInf[0] |= 0x200; break; - case 28: + case SI_BOMBCHU_10_4: gSaveContext.itemGetInf[0] |= 0x400; break; - case 21: + case SI_BOMBCHU_10_1: gSaveContext.itemGetInf[0] |= 0x8; break; - case 22: + case SI_BOMBCHU_20_1: gSaveContext.itemGetInf[0] |= 0x10; break; - case 23: + case SI_BOMBCHU_20_2: gSaveContext.itemGetInf[0] |= 0x20; break; } - Rupees_ChangeBy(-this->unk_1C8); + Rupees_ChangeBy(-this->basePrice); } -void func_80A3BD80(EnGirlA* this, GlobalContext* globalCtx) { +void EnGirlA_Noop(EnGirlA* this, GlobalContext* globalCtx) { } -void func_80A3BD8C(GlobalContext* globalCtx, EnGirlA* this) { - ShopItemEntry* tmp = &D_80A3C674[this->actor.params]; +void EnGirlA_SetItemDescription(GlobalContext* globalCtx, EnGirlA* this) { + ShopItemEntry* tmp = &shopItemEntries[this->actor.params]; s32 params = this->actor.params; - s32 params2; - s32 tmp3; + s32 maskId; + s32 isMaskFreeToBorrow; - if ((this->actor.params >= 30) && (this->actor.params < 35)) { - params2 = this->actor.params - 30; - tmp3 = 0; + if ((this->actor.params >= SI_KEATON_MASK) && (this->actor.params <= SI_MASK_OF_TRUTH)) { + maskId = this->actor.params - SI_KEATON_MASK; + isMaskFreeToBorrow = false; switch (this->actor.params) { - case 30: + case SI_KEATON_MASK: if (gSaveContext.itemGetInf[3] & 0x100) { - tmp3 = 1; + isMaskFreeToBorrow = true; } break; - case 31: + case SI_SPOOKY_MASK: if (gSaveContext.itemGetInf[3] & 0x400) { - tmp3 = 1; + isMaskFreeToBorrow = true; } break; - case 32: + case SI_SKULL_MASK: if (gSaveContext.itemGetInf[3] & 0x200) { - tmp3 = 1; + isMaskFreeToBorrow = true; } break; - case 33: + case SI_BUNNY_HOOD: if (gSaveContext.itemGetInf[3] & 0x800) { - tmp3 = 1; + isMaskFreeToBorrow = true; } break; - case 34: + case SI_MASK_OF_TRUTH: if (gSaveContext.itemGetInf[3] & 0x800) { - tmp3 = 1; + isMaskFreeToBorrow = true; } break; } - if (tmp3 != 0) { - this->actor.textId = D_80A3C668[params2]; + if (isMaskFreeToBorrow) { + this->actor.textId = sMaskShopFreeToBorrowTextIds[maskId]; } else { - this->actor.textId = tmp->unk_0C; + this->actor.textId = tmp->itemDescTextId; } } else { - this->actor.textId = tmp->unk_0C; + this->actor.textId = tmp->itemDescTextId; } - this->unk_1A8 = 0; - this->actor.draw = func_80A3C4D4; + this->isInvisible = false; + this->actor.draw = EnGirlA_Draw; } -void func_80A3BEAC(GlobalContext* globalCtx, EnGirlA* this) { - this->unk_1A8 = 1; +void EnGirlA_SetItemOutOfStock(GlobalContext* globalCtx, EnGirlA* this) { + this->isInvisible = true; this->actor.draw = NULL; - if ((this->actor.params >= 30) && (this->actor.params < 38)) { + if ((this->actor.params >= SI_KEATON_MASK) && (this->actor.params <= SI_GERUDO_MASK)) { this->actor.textId = 0xBD; } } -void func_80A3BEE0(GlobalContext* globalCtx, EnGirlA* this) { +void EnGirlA_UpdateStockedItem(GlobalContext* globalCtx, EnGirlA* this) { ShopItemEntry* itemEntry; - if (func_80A3A758(this)) { - func_80A3A8D0(this, globalCtx); - itemEntry = &D_80A3C674[this->actor.params]; - this->actor.textId = itemEntry->unk_0C; + if (EnGirlA_TryChangeShopItem(this)) { + EnGirlA_InitItem(this, globalCtx); + itemEntry = &shopItemEntries[this->actor.params]; + this->actor.textId = itemEntry->itemDescTextId; } else { - this->unk_1A8 = 0; - this->actor.draw = func_80A3C4D4; + this->isInvisible = false; + this->actor.draw = EnGirlA_Draw; } } -s32 func_80A3BF54(EnGirlA* this, GlobalContext* globalCtx) { +s32 EnGirlA_TrySetMaskItemDescription(EnGirlA* this, GlobalContext* globalCtx) { s32 params; - if ((this->actor.params >= 30) && (this->actor.params < 38)) { - params = this->actor.params - 30; - if (INV_CONTENT(ITEM_TRADE_CHILD) == D_80A3C658[params]) { - func_80A3BEAC(globalCtx, this); + if ((this->actor.params >= SI_KEATON_MASK) && (this->actor.params <= SI_GERUDO_MASK)) { + params = this->actor.params - SI_KEATON_MASK; + if (INV_CONTENT(ITEM_TRADE_CHILD) == sMaskShopItems[params]) { + EnGirlA_SetItemOutOfStock(globalCtx, this); } else { - func_80A3BD8C(globalCtx, this); + EnGirlA_SetItemDescription(globalCtx, this); } - return 1; + return true; } - return 0; + return false; } -void func_80A3BFE4(EnGirlA* this, GlobalContext* globalCtx) { +void EnGirlA_InitializeItemAction(EnGirlA* this, GlobalContext* globalCtx) { s16 params = this->actor.params; - ShopItemEntry* tmp = &D_80A3C674[params]; + ShopItemEntry* itemEntry = &shopItemEntries[params]; - if (Object_IsLoaded(&globalCtx->objectCtx, this->unk_194)) { + if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) { this->actor.flags &= ~0x10; - this->actor.objBankIndex = this->unk_194; - switch (this->actor.params - 30) { - case 0: + this->actor.objBankIndex = this->objBankIndex; + switch (this->actor.params) { + case SI_KEATON_MASK: if (gSaveContext.itemGetInf[3] & 0x100) { this->actor.textId = 0x70B6; } else { - this->actor.textId = tmp->unk_0C; + this->actor.textId = itemEntry->itemDescTextId; } - this->unk_1A0 = tmp->unk_0E; + this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId; break; - case 1: + case SI_SPOOKY_MASK: if (gSaveContext.itemGetInf[3] & 0x400) { this->actor.textId = 0x70B5; } else { - this->actor.textId = tmp->unk_0C; + this->actor.textId = itemEntry->itemDescTextId; } - this->unk_1A0 = tmp->unk_0E; + this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId; break; - case 2: + case SI_SKULL_MASK: if (gSaveContext.itemGetInf[3] & 0x200) { this->actor.textId = 0x70B4; } else { - this->actor.textId = tmp->unk_0C; + this->actor.textId = itemEntry->itemDescTextId; } - - this->unk_1A0 = tmp->unk_0E; + this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId; break; - case 3: + case SI_BUNNY_HOOD: if (gSaveContext.itemGetInf[3] & 0x800) { this->actor.textId = 0x70B7; } else { - this->actor.textId = tmp->unk_0C; + this->actor.textId = itemEntry->itemDescTextId; } - - this->unk_1A0 = tmp->unk_0E; + this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId; break; - case 4: + case SI_MASK_OF_TRUTH: if (gSaveContext.itemGetInf[3] & 0x800) { this->actor.textId = 0x70BB; - this->unk_1A0 = tmp->unk_0E; + this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId; } else { - this->actor.textId = tmp->unk_0C; - this->unk_1A0 = 0xEB; + this->actor.textId = itemEntry->itemDescTextId; + this->itemBuyPromptTextId = 0xEB; } break; - case 5: - this->actor.textId = tmp->unk_0C; - this->unk_1A0 = tmp->unk_0E; + case SI_ZORA_MASK: + this->actor.textId = itemEntry->itemDescTextId; + this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId; break; - case 6: - this->actor.textId = tmp->unk_0C; - this->unk_1A0 = tmp->unk_0E; + case SI_GORON_MASK: + this->actor.textId = itemEntry->itemDescTextId; + this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId; break; - case 7: - this->actor.textId = tmp->unk_0C; - this->unk_1A0 = tmp->unk_0E; + case SI_GERUDO_MASK: + this->actor.textId = itemEntry->itemDescTextId; + this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId; break; default: - this->actor.textId = tmp->unk_0C; - this->unk_1A0 = tmp->unk_0E; + this->actor.textId = itemEntry->itemDescTextId; + this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId; break; } - if (func_80A3BF54(this, globalCtx) == 0) { - func_80A3BD8C(globalCtx, this); + if (!EnGirlA_TrySetMaskItemDescription(this, globalCtx)) { + EnGirlA_SetItemDescription(globalCtx, this); } - this->unk_1AC = func_80A3BEAC; - this->unk_1B0 = func_80A3BEE0; - this->unk_1A4 = tmp->unk_10; - this->unk_1BC = tmp->unk_14; - this->unk_1C0 = tmp->unk_18; - this->unk_1C4 = tmp->unk_1C; - this->unk_1C8 = tmp->unk_08; - this->unk_1CA = tmp->unk_0A; - this->unk_1D0 = tmp->unk_04; - this->giDrawId = tmp->giDrawId; - osSyncPrintf("%s(%2d)\n", D_80A3C590[params], params); + this->setOutOfStockFunc = EnGirlA_SetItemOutOfStock; + this->updateStockedItemFunc = EnGirlA_UpdateStockedItem; + this->getItemId = itemEntry->getItemId; + this->canBuyFunc = itemEntry->canBuyFunc; + this->itemGiveFunc = itemEntry->itemGiveFunc; + this->buyEventFunc = itemEntry->buyEventFunc; + this->basePrice = itemEntry->price; + this->itemCount = itemEntry->count; + this->hiliteFunc = itemEntry->hiliteFunc; + this->giDrawId = itemEntry->giDrawId; + osSyncPrintf("%s(%2d)\n", sShopItemDescriptions[params], params); this->actor.flags &= ~1; Actor_SetScale(&this->actor, 0.25f); this->actor.shape.yOffset = 24.0f; this->actor.shape.shadowScale = 4.0f; this->actor.floorHeight = this->actor.home.pos.y; this->actor.gravity = 0.0f; - func_80A3A750(this, func_80A3BD80); - this->unk_19C = 1; - this->unk_198 = func_80A3C3BC; - this->unk_1B4 = 0; - this->unk_1B8 = 0; - this->unk_1B6 = this->actor.shape.rot.y; + EnGirlA_SetupAction(this, EnGirlA_Noop); + this->isInitialized = true; + this->actionFunc2 = EnGirlA_Update2; + this->isSelected = false; + this->yRotation = 0; + this->yRotationInit = this->actor.shape.rot.y; } } -void func_80A3C3BC(EnGirlA* this, GlobalContext* globalCtx) { +void EnGirlA_Update2(EnGirlA* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.25f); this->actor.shape.yOffset = 24.0f; this->actor.shape.shadowScale = 4.0f; - func_80A3BF54(this, globalCtx); + EnGirlA_TrySetMaskItemDescription(this, globalCtx); this->actionFunc(this, globalCtx); Actor_SetFocus(&this->actor, 5.0f); this->actor.shape.rot.x = 0.0f; - if (this->actor.params != 38) { - if (this->unk_1B4 != 0) { - this->unk_1B8 += 0x1F4; + if (this->actor.params != SI_SOLD_OUT) { + if (this->isSelected) { + this->yRotation += 0x1F4; } else { - Math_SmoothStepToS(&this->unk_1B8, 0, 10, 0x7D0, 0); + Math_SmoothStepToS(&this->yRotation, 0, 10, 0x7D0, 0); } } } @@ -1001,7 +1093,7 @@ void func_80A3C3BC(EnGirlA* this, GlobalContext* globalCtx) { void EnGirlA_Update(Actor* thisx, GlobalContext* globalCtx) { EnGirlA* this = THIS; - this->unk_198(this, globalCtx); + this->actionFunc2(this, globalCtx); } void func_80A3C498(Actor* thisx, GlobalContext* globalCtx, s32 flags) { @@ -1009,12 +1101,12 @@ void func_80A3C498(Actor* thisx, GlobalContext* globalCtx, s32 flags) { func_8002ED80(thisx, globalCtx, 0); } -void func_80A3C4D4(Actor* thisx, GlobalContext* globalCtx) { +void EnGirlA_Draw(Actor* thisx, GlobalContext* globalCtx) { EnGirlA* this = THIS; - Matrix_RotateY(((this->unk_1B8 * 360.0f) / 65536.0f) * (M_PI / 180.0f), MTXMODE_APPLY); - if (this->unk_1D0 != NULL) { - this->unk_1D0(thisx, globalCtx, 0); + Matrix_RotateY(((this->yRotation * 360.0f) / 65536.0f) * (M_PI / 180.0f), MTXMODE_APPLY); + if (this->hiliteFunc != NULL) { + this->hiliteFunc(thisx, globalCtx, 0); } GetItem_Draw(globalCtx, this->giDrawId); } diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h index 97c94a62bc..74e1d785b4 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h @@ -9,37 +9,95 @@ struct EnGirlA; typedef void (*EnGirlAActionFunc)(struct EnGirlA*, GlobalContext*); typedef void (*EnGirlA2Func)(GlobalContext*, struct EnGirlA*); typedef void (*EnGirlA3Func)(Actor*, GlobalContext*, s32); +typedef s32 (*EnGirlA4Func)(GlobalContext*, struct EnGirlA*); typedef struct EnGirlA { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; /* 0x0190 */ EnGirlAActionFunc actionFunc; - /* 0x0194 */ s8 unk_194; - /* 0x0195 */ s8 unk_195; - /* 0x0196 */ s16 unk_196; - /* 0x0198 */ EnGirlAActionFunc unk_198; - /* 0x019C */ s32 unk_19C; - /* 0x01A0 */ s16 unk_1A0; - /* 0x01A2 */ s16 unk_1A2; - /* 0x01A4 */ s32 unk_1A4; - /* 0x01A8 */ s16 unk_1A8; - /* 0x01AA */ s16 unk_1AA; - /* 0x01AC */ EnGirlA2Func unk_1AC; - /* 0x01B0 */ EnGirlA2Func unk_1B0; - /* 0x01B4 */ s16 unk_1B4; - /* 0x01B6 */ s16 unk_1B6; - /* 0x01B8 */ s16 unk_1B8; - /* 0x01BA */ s16 unk_1BA; - /* 0x01BC */ void* unk_1BC; - /* 0x01C0 */ void* unk_1C0; - /* 0x01C4 */ void* unk_1C4; - /* 0x01C8 */ s16 unk_1C8; - /* 0x01CA */ s16 unk_1CA; + /* 0x0194 */ s8 objBankIndex; + /* 0x0198 */ EnGirlAActionFunc actionFunc2; + /* 0x019C */ s32 isInitialized; + /* 0x01A0 */ s16 itemBuyPromptTextId; + /* 0x01A4 */ s32 getItemId; + /* 0x01A8 */ s16 isInvisible; + /* 0x01AC */ EnGirlA2Func setOutOfStockFunc; + /* 0x01B0 */ EnGirlA2Func updateStockedItemFunc; + /* 0x01B4 */ s16 isSelected; + /* 0x01B6 */ s16 yRotationInit; + /* 0x01B8 */ s16 yRotation; + /* 0x01BC */ EnGirlA4Func canBuyFunc; + /* 0x01C0 */ EnGirlA2Func itemGiveFunc; + /* 0x01C4 */ EnGirlA2Func buyEventFunc; + /* 0x01C8 */ s16 basePrice; + /* 0x01CA */ s16 itemCount; /* 0x01CC */ s16 giDrawId; - /* 0x01CE */ s16 unk_1CE; - /* 0x01D0 */ EnGirlA3Func unk_1D0; + /* 0x01D0 */ EnGirlA3Func hiliteFunc; } EnGirlA; // size = 0x01D4 extern const ActorInit En_GirlA_InitVars; +typedef enum { + /* 0x00 */ SI_DEKU_NUTS_5, + /* 0x01 */ SI_ARROWS_30, + /* 0x02 */ SI_ARROWS_50, + /* 0x03 */ SI_BOMBS_5_R25, + /* 0x04 */ SI_DEKU_NUTS_10, + /* 0x05 */ SI_DEKU_STICK, + /* 0x06 */ SI_BOMBS_10, + /* 0x07 */ SI_FISH, + /* 0x08 */ SI_RED_POTION_R30, + /* 0x09 */ SI_GREEN_POTION, + /* 0x0A */ SI_BLUE_POTION, + /* 0x0B */ SI_LONGSWORD, + /* 0x0C */ SI_HYLIAN_SHIELD, + /* 0x0D */ SI_DEKU_SHIELD, + /* 0x0E */ SI_GORON_TUNIC, + /* 0x0F */ SI_ZORA_TUNIC, + /* 0x10 */ SI_HEART, + /* 0x11 */ SI_MILK_BOTTLE, + /* 0x12 */ SI_WEIRD_EGG, + /* 0x13 */ SI_19, + /* 0x14 */ SI_20, + /* 0x15 */ SI_BOMBCHU_10_1, + /* 0x16 */ SI_BOMBCHU_20_1, + /* 0x17 */ SI_BOMBCHU_20_2, + /* 0x18 */ SI_BOMBCHU_10_2, + /* 0x19 */ SI_BOMBCHU_10_3, + /* 0x1A */ SI_BOMBCHU_20_3, + /* 0x1B */ SI_BOMBCHU_20_4, + /* 0x1C */ SI_BOMBCHU_10_4, + /* 0x1D */ SI_DEKU_SEEDS_30, + /* 0x1E */ SI_KEATON_MASK, + /* 0x1F */ SI_SPOOKY_MASK, + /* 0x20 */ SI_SKULL_MASK, + /* 0x21 */ SI_BUNNY_HOOD, + /* 0x22 */ SI_MASK_OF_TRUTH, + /* 0x23 */ SI_ZORA_MASK, + /* 0x24 */ SI_GORON_MASK, + /* 0x25 */ SI_GERUDO_MASK, + /* 0x26 */ SI_SOLD_OUT, + /* 0x27 */ SI_BLUE_FIRE, + /* 0x28 */ SI_BUGS, + /* 0x29 */ SI_BIG_POE, + /* 0x2A */ SI_POE, + /* 0x2B */ SI_FAIRY, + /* 0x2C */ SI_ARROWS_10, + /* 0x2D */ SI_BOMBS_20, + /* 0x2E */ SI_BOMBS_30, + /* 0x2F */ SI_BOMBS_5_R35, + /* 0x30 */ SI_RED_POTION_R40, + /* 0x31 */ SI_RED_POTION_R50, + /* 0x32 */ SI_MAX +} EnGirlAShopItem; + +typedef enum { + /* 0 */ CANBUY_RESULT_SUCCESS_FANFARE, + /* 1 */ CANBUY_RESULT_SUCCESS, + /* 2 */ CANBUY_RESULT_CANT_GET_NOW, + /* 3 */ CANBUY_RESULT_NEED_BOTTLE, + /* 4 */ CANBUY_RESULT_NEED_RUPEES, + /* 5 */ CANBUY_RESULT_CANT_GET_NOW_5 +} EnGirlACanBuyResult; + #endif diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index a5e36179b7..9258153d1d 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -5,6 +5,7 @@ */ #include "z_en_gm.h" +#include "objects/object_oF1d_map/object_oF1d_map.h" #include "vt.h" #define FLAGS 0x00000019 @@ -26,8 +27,6 @@ void EnGm_ProcessChoiceIndex(EnGm* this, GlobalContext* globalCtx); void func_80A3DF00(EnGm* this, GlobalContext* globalCtx); void func_80A3DF60(EnGm* this, GlobalContext* globalCtx); -extern UNK_TYPE D_0600DE80[]; -extern FlexSkeletonHeader D_0600FEF0; extern AnimationHeader D_060002B8; const ActorInit En_Gm_InitVars = { @@ -108,7 +107,7 @@ s32 func_80A3D7C8(void) { void func_80A3D838(EnGm* this, GlobalContext* globalCtx) { if (Object_IsLoaded(&globalCtx->objectCtx, this->objGmBankIndex)) { this->actor.flags &= ~0x10; - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600FEF0, NULL, this->jointTable, this->morphTable, 18); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGoronSkel, NULL, this->jointTable, this->morphTable, 18); gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objGmBankIndex].segment); Animation_Change(&this->skelAnime, &D_060002B8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060002B8), ANIMMODE_LOOP, 0.0f); @@ -319,7 +318,7 @@ void func_80A3E090(EnGm* this) { } void EnGm_Draw(Actor* thisx, GlobalContext* globalCtx) { - static UNK_PTR eyeTextures[] = { 0x0600CE80, 0x0600D280, 0x0600D680 }; + static UNK_PTR eyeTextures[] = { gGoronCsEyeOpenTex, gGoronCsEyeHalfTex, gGoronCsEyeClosedTex }; EnGm* this = THIS; s32 pad; @@ -327,7 +326,7 @@ void EnGm_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexIndex])); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_0600DE80)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gGoronCsMouthNeutralTex)); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, NULL, NULL, &this->actor); diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 1f5f2fe55a..bab39a21a8 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -1,6 +1,7 @@ #include "z_en_go.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_oF1d_map/object_oF1d_map.h" #define FLAGS 0x00000039 @@ -34,17 +35,6 @@ void EnGo_AddDust(EnGo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 init void EnGo_UpdateDust(EnGo* this); void EnGo_DrawDust(EnGo* this, GlobalContext* globalCtx); -extern AnimationHeader D_060029A8; -extern AnimationHeader D_06004930; -extern Gfx D_0600BD80[]; -extern Gfx D_0600C140[]; -extern u64 D_0600CE80[]; -extern u64 D_0600DE80[]; -extern Gfx D_0600FD40[]; -extern Gfx D_0600FD50[]; -extern FlexSkeletonHeader D_0600FEF0; -extern AnimationHeader D_06010590; - const ActorInit En_Go_InitVars = { ACTOR_EN_GO, ACTORCAT_NPC, @@ -89,10 +79,10 @@ typedef struct { } EnGoAnimation; static EnGoAnimation sAnimationEntries[] = { - { &D_06004930, 0.0f, ANIMMODE_LOOP_INTERP, 0.0f }, - { &D_06004930, 0.0f, ANIMMODE_LOOP_INTERP, -10.0f }, - { &D_060029A8, 1.0f, ANIMMODE_LOOP_INTERP, -10.0f }, - { &D_06010590, 1.0f, ANIMMODE_LOOP_INTERP, -10.0f }, + { &gGoronAnim_004930, 0.0f, ANIMMODE_LOOP_INTERP, 0.0f }, + { &gGoronAnim_004930, 0.0f, ANIMMODE_LOOP_INTERP, -10.0f }, + { &gGoronAnim_0029A8, 1.0f, ANIMMODE_LOOP_INTERP, -10.0f }, + { &gGoronAnim_010590, 1.0f, ANIMMODE_LOOP_INTERP, -10.0f }, }; void EnGo_SetupAction(EnGo* this, EnGoActionFunc actionFunc) { @@ -463,10 +453,10 @@ void EnGo_ReverseAnimation(EnGo* this) { void EnGo_UpdateShadow(EnGo* this) { s16 shadowAlpha; f32 currentFrame = this->skelAnime.curFrame; - s16 shadowAlphaTarget = - (this->skelAnime.animation == &D_06004930 && currentFrame > 32.0f) || this->skelAnime.animation != &D_06004930 - ? 255 - : 0; + s16 shadowAlphaTarget = (this->skelAnime.animation == &gGoronAnim_004930 && currentFrame > 32.0f) || + this->skelAnime.animation != &gGoronAnim_004930 + ? 255 + : 0; shadowAlpha = this->actor.shape.shadowAlpha; Math_SmoothStepToS(&shadowAlpha, shadowAlphaTarget, 10, 60, 1); @@ -636,7 +626,7 @@ void EnGo_Init(Actor* thisx, GlobalContext* globalCtx) { Vec3f D_80A41BA8 = { 0.0f, 0.0f, 0.0f }; // unused ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600FEF0, NULL, 0, 0, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGoronSkel, NULL, 0, 0, 0); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(0x16), &sColChkInfoInit); @@ -669,7 +659,7 @@ void EnGo_Init(Actor* thisx, GlobalContext* globalCtx) { } break; case 0x10: - this->skelAnime.curFrame = Animation_GetLastFrame(&D_06004930); + this->skelAnime.curFrame = Animation_GetLastFrame(&gGoronAnim_004930); Actor_SetScale(&this->actor, 0.01f); EnGo_SetupAction(this, EnGo_FireGenericActionFunc); break; @@ -846,7 +836,7 @@ void func_80A405CC(EnGo* this, GlobalContext* globalCtx) { f32 lastFrame; f32 frame; - lastFrame = Animation_GetLastFrame(&D_06004930); + lastFrame = Animation_GetLastFrame(&gGoronAnim_004930); Math_SmoothStepToF(&this->skelAnime.playSpeed, (this->actor.params & 0xF0) == 0x90 ? 0.5f : 1.0f, 0.1f, 1000.0f, 0.1f); @@ -931,13 +921,13 @@ void func_80A408D8(EnGo* this, GlobalContext* globalCtx) { } void func_80A40A54(EnGo* this, GlobalContext* globalCtx) { - f32 float1 = ((f32)0x8000 / Animation_GetLastFrame(&D_06010590)); + f32 float1 = ((f32)0x8000 / Animation_GetLastFrame(&gGoronAnim_010590)); f32 float2 = this->skelAnime.curFrame * float1; this->actor.speedXZ = Math_SinS((s16)float2); if (EnGo_FollowPath(this, globalCtx) && this->unk_218 == 0) { EnGo_ChangeAnimation(this, 1); - this->skelAnime.curFrame = Animation_GetLastFrame(&D_06004930); + this->skelAnime.curFrame = Animation_GetLastFrame(&gGoronAnim_004930); this->actor.speedXZ = 0.0f; EnGo_SetupAction(this, EnGo_BiggoronActionFunc); } @@ -1019,7 +1009,7 @@ void EnGo_Eyedrops(EnGo* this, GlobalContext* globalCtx) { void func_80A40DCC(EnGo* this, GlobalContext* globalCtx) { if (this->unk_1E0.unk_00 == 2) { EnGo_ChangeAnimation(this, 1); - this->skelAnime.curFrame = Animation_GetLastFrame(&D_06004930); + this->skelAnime.curFrame = Animation_GetLastFrame(&gGoronAnim_004930); func_80106CCC(globalCtx); EnGo_SetupAction(this, EnGo_GetItem); EnGo_GetItem(this, globalCtx); @@ -1063,7 +1053,7 @@ void EnGo_DrawCurledUp(EnGo* this, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go.c", 2326), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_0600BD80); + gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00BD80); Matrix_MultVec3f(&D_80A41BB4, &this->actor.focus.pos); Matrix_Pop(); @@ -1082,7 +1072,7 @@ void EnGo_DrawRolling(EnGo* this, GlobalContext* globalCtx) { MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go.c", 2368), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_0600C140); + gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00C140); Matrix_MultVec3f(&D_80A41BC0, &this->actor.focus.pos); Matrix_Pop(); @@ -1151,8 +1141,8 @@ void EnGo_Draw(Actor* thisx, GlobalContext* globalCtx) { } else { func_800943C8(globalCtx->state.gfxCtx); - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_0600CE80)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_0600DE80)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gGoronCsEyeOpenTex)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gGoronCsMouthNeutralTex)); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnGo_OverrideLimbDraw, EnGo_PostLimbDraw, &this->actor); @@ -1225,7 +1215,7 @@ void EnGo_DrawDust(EnGo* this, GlobalContext* globalCtx) { if (dustEffect->type) { if (!firstDone) { POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0); - gSPDisplayList(POLY_XLU_DISP++, D_0600FD40); + gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD40); gDPSetEnvColor(POLY_XLU_DISP++, 100, 60, 20, 0); firstDone = true; } @@ -1241,7 +1231,7 @@ void EnGo_DrawDust(EnGo* this, GlobalContext* globalCtx) { index = dustEffect->timer * (8.0f / dustEffect->initialTimer); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[index])); - gSPDisplayList(POLY_XLU_DISP++, D_0600FD50); + gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD50); } } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2678); diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index f4cbba440f..6a33e363e7 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -1,6 +1,7 @@ #include "z_en_go2.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_oF1d_map/object_oF1d_map.h" #define FLAGS 0x00000039 @@ -65,30 +66,6 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, GlobalContext* globalCtx); void EnGo2_GoronLinkStopRolling(EnGo2* this, GlobalContext* globalCtx); void EnGo2_GoronFireGenericAction(EnGo2* this, GlobalContext* globalCtx); -extern AnimationHeader D_06000750; -extern AnimationHeader D_06000D5C; -extern AnimationHeader D_0600161C; -extern AnimationHeader D_06001A00; -extern AnimationHeader D_060021D0; -extern AnimationHeader D_060029A8; -extern AnimationHeader D_06002D80; -extern AnimationHeader D_06003768; -extern AnimationHeader D_060038E4; -extern AnimationHeader D_06004930; -extern AnimationHeader D_06010590; -extern Gfx D_0600BD80[]; -extern Gfx D_0600C140[]; -extern u64 D_0600CE80[]; -extern u64 D_0600D280[]; -extern u64 D_0600D680[]; -extern u64 D_0600DA80[]; -extern u64 D_0600DE80[]; -extern u64 D_0600E680[]; -extern Gfx D_0600FD40[]; -extern Gfx D_0600FD50[]; - -extern FlexSkeletonHeader D_0600FEF0; - static u64* sDustTex[] = { gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex }; static Vec3f sPos = { 0.0f, 0.0f, 0.0f }; @@ -151,13 +128,13 @@ static f32 D_80A482D8[14][2] = { }; static struct_80034EC0_Entry sAnimations[] = { - { &D_06004930, 0.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &D_06004930, 0.0f, 0.0f, -1.0f, 0x00, -8.0f }, - { &D_060029A8, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &D_06010590, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, - { &D_06003768, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &D_060038E4, 1.0f, 0.0f, -1.0f, 0x02, -8.0f }, - { &D_06002D80, 1.0f, 0.0f, -1.0f, 0x02, -8.0f }, { &D_0600161C, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, - { &D_06001A00, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &D_060021D0, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, - { &D_06004930, 0.0f, 0.0f, -1.0f, 0x01, -8.0f }, { &D_06000750, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, - { &D_06000D5C, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &gGoronAnim_004930, 0.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gGoronAnim_004930, 0.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &gGoronAnim_0029A8, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &gGoronAnim_010590, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &gGoronAnim_003768, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &gGoronAnim_0038E4, 1.0f, 0.0f, -1.0f, 0x02, -8.0f }, + { &gGoronAnim_002D80, 1.0f, 0.0f, -1.0f, 0x02, -8.0f }, { &gGoronAnim_00161C, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &gGoronAnim_001A00, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &gGoronAnim_0021D0, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &gGoronAnim_004930, 0.0f, 0.0f, -1.0f, 0x01, -8.0f }, { &gGoronAnim_000750, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, + { &gGoronAnim_000D5C, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, }; static EnGo2DustEffectData sDustEffectData[2][4] = { @@ -241,7 +218,7 @@ void EnGo2_DrawDust(EnGo2* this, GlobalContext* globalCtx) { if (dustEffect->type) { if (!firstDone) { POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0); - gSPDisplayList(POLY_XLU_DISP++, D_0600FD40); + gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD40); gDPSetEnvColor(POLY_XLU_DISP++, 100, 60, 20, 0); firstDone = true; } @@ -256,7 +233,7 @@ void EnGo2_DrawDust(EnGo2* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); index = dustEffect->timer * (8.0f / dustEffect->initialTimer); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sDustTex[index])); - gSPDisplayList(POLY_XLU_DISP++, D_0600FD50); + gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD50); } } @@ -1092,7 +1069,8 @@ void func_80A45288(EnGo2* this, GlobalContext* globalCtx) { } void func_80A45360(EnGo2* this, f32* alpha) { - f32 alphaTarget = (this->skelAnime.animation == &D_06004930) && (this->skelAnime.curFrame <= 32.0f) ? 0.0f : 255.0f; + f32 alphaTarget = + (this->skelAnime.animation == &gGoronAnim_004930) && (this->skelAnime.curFrame <= 32.0f) ? 0.0f : 255.0f; Math_ApproachF(alpha, alphaTarget, 0.4f, 100.0f); this->actor.shape.shadowAlpha = (u8)(u32)*alpha; @@ -1257,7 +1235,7 @@ void EnGo2_EyeMouthTexState(EnGo2* this) { } void EnGo2_SitDownAnimation(EnGo2* this) { - if ((this->skelAnime.playSpeed != 0.0f) && (this->skelAnime.animation == &D_06004930)) { + if ((this->skelAnime.playSpeed != 0.0f) && (this->skelAnime.animation == &gGoronAnim_004930)) { if (this->skelAnime.playSpeed > 0.0f && this->skelAnime.curFrame == 14.0f) { if ((this->actor.params & 0x1F) != GORON_DMT_BIGGORON) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_SIT_DOWN); @@ -1436,7 +1414,7 @@ void EnGo2_GoronLinkAnimation(EnGo2* this, GlobalContext* globalCtx) { if ((this->actor.params & 0x1F) == GORON_CITY_LINK) { if ((this->actor.textId == 0x3035 && this->unk_20C == 0) || (this->actor.textId == 0x3036 && this->unk_20C == 0)) { - if (this->skelAnime.animation != &D_06000D5C) { + if (this->skelAnime.animation != &gGoronAnim_000D5C) { animation = 12; this->eyeMouthTexState = 0; } @@ -1444,13 +1422,13 @@ void EnGo2_GoronLinkAnimation(EnGo2* this, GlobalContext* globalCtx) { if ((this->actor.textId == 0x3032 && this->unk_20C == 12) || (this->actor.textId == 0x3033) || (this->actor.textId == 0x3035 && this->unk_20C == 6)) { - if (this->skelAnime.animation != &D_06000750) { + if (this->skelAnime.animation != &gGoronAnim_000750) { animation = 11; this->eyeMouthTexState = 1; } } - if (this->skelAnime.animation == &D_06000750) { + if (this->skelAnime.animation == &gGoronAnim_000750) { if (this->skelAnime.curFrame == 20.0f) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_CRY); } @@ -1499,7 +1477,7 @@ void EnGo2_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 28.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600FEF0, NULL, this->jointTable, this->morphTable, 18); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGoronSkel, NULL, this->jointTable, this->morphTable, 18); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit); @@ -1978,7 +1956,7 @@ s32 EnGo2_DrawCurledUp(EnGo2* this, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go2.c", 2884), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_0600BD80); + gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00BD80); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go2.c", 2889); Matrix_MultVec3f(&D_80A48554, &this->actor.focus.pos); @@ -1996,7 +1974,7 @@ s32 EnGo2_DrawRolling(EnGo2* this, GlobalContext* globalCtx) { Matrix_RotateRPY((globalCtx->state.frames * ((s16)speedXZ * 1400)), 0, this->actor.shape.rot.z, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go2.c", 2926), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_0600C140); + gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00C140); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go2.c", 2930); Matrix_MultVec3f(&D_80A48560, &this->actor.focus.pos); return 1; @@ -2043,8 +2021,8 @@ void EnGo2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve void EnGo2_Draw(Actor* thisx, GlobalContext* globalCtx) { EnGo2* this = THIS; - u64* eyeTextures[] = { D_0600DA80, D_0600CE80, D_0600D280, D_0600D680 }; - u64* mouthTextures[] = { D_0600DE80, D_0600E680 }; + u64* eyeTextures[] = { gGoronCsEyeClosed2Tex, gGoronCsEyeOpenTex, gGoronCsEyeHalfTex, gGoronCsEyeClosedTex }; + u64* mouthTextures[] = { gGoronCsMouthNeutralTex, gGoronCsMouthSmileTex }; EnGo2_UpdateDust(this); Matrix_Push(); diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 5cc7250a4d..5ae2978b20 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -1,5 +1,14 @@ #include "z_en_ossan.h" +#include "vt.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_ossan/object_ossan.h" +#include "objects/object_oF1d_map/object_oF1d_map.h" +#include "objects/object_os/object_os.h" +#include "objects/object_zo/object_zo.h" +#include "objects/object_rs/object_rs.h" +#include "objects/object_ds2/object_ds2.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" +#include "objects/object_masterkokiri/object_masterkokiri.h" #define FLAGS 0x00000019 @@ -8,24 +17,92 @@ void EnOssan_Init(Actor* thisx, GlobalContext* globalCtx); void EnOssan_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnOssan_Update(Actor* thisx, GlobalContext* globalCtx); +void EnOssan_DrawKokiriShopkeeper(Actor* thisx, GlobalContext* globalCtx); +void EnOssan_DrawPotionShopkeeper(Actor* thisx, GlobalContext* globalCtx); +void EnOssan_DrawBombchuShopkeeper(Actor* thisx, GlobalContext* globalCtx); +void EnOssan_DrawBazaarShopkeeper(Actor* thisx, GlobalContext* globalCtx); +void EnOssan_DrawZoraShopkeeper(Actor* thisx, GlobalContext* globalCtx); +void EnOssan_DrawGoronShopkeeper(Actor* thisx, GlobalContext* globalCtx); +void EnOssan_DrawHappyMaskShopkeeper(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_060000F0; -extern UNK_TYPE D_060000FC; -extern UNK_TYPE D_060002E4; -extern UNK_TYPE D_06000338; -extern UNK_TYPE D_060004A8; -extern UNK_TYPE D_0600065C; -extern UNK_TYPE D_0600078C; -extern UNK_TYPE D_06002820; -extern UNK_TYPE D_06004258; -extern UNK_TYPE D_06004658; -extern UNK_TYPE D_06004868; -extern UNK_TYPE D_06009B38; -extern UNK_TYPE D_0600BFA8; -extern UNK_TYPE D_0600DE80; -extern UNK_TYPE D_0600FEF0; +extern FlexSkeletonHeader D_060000F0; +extern AnimationHeader D_060000FC; +extern AnimationHeader D_0600078C; +extern Gfx D_06002820[]; + +void EnOssan_InitActionFunc(EnOssan* this, GlobalContext* globalCtx); +void EnOssan_MainActionFunc(EnOssan* this, GlobalContext* globalCtx); + +void EnOssan_TalkDefaultShopkeeper(GlobalContext* globalCtx); +void EnOssan_TalkKokiriShopkeeper(GlobalContext* globalCtx); +void EnOssan_TalkKakarikoPotionShopkeeper(GlobalContext* globalCtx); +void EnOssan_TalkBombchuShopkeeper(GlobalContext* globalCtx); +void EnOssan_TalkMarketPotionShopkeeper(GlobalContext* globalCtx); +void EnOssan_TalkBazaarShopkeeper(GlobalContext* globalCtx); +void EnOssan_TalkZoraShopkeeper(GlobalContext* globalCtx); +void EnOssan_TalkGoronShopkeeper(GlobalContext* globalCtx); +void EnOssan_TalkHappyMaskShopkeeper(GlobalContext* globalCtx); + +s16 ShopItemDisp_Default(s16 v); +s16 ShopItemDisp_SpookyMask(s16 v); +s16 ShopItemDisp_SkullMask(s16 v); +s16 ShopItemDisp_BunnyHood(s16 v); +s16 ShopItemDisp_ZoraMask(s16 v); +s16 ShopItemDisp_GoronMask(s16 v); +s16 ShopItemDisp_GerudoMask(s16 v); + +void EnOssan_InitKokiriShopkeeper(EnOssan* this, GlobalContext* globalCtx); +void EnOssan_InitPotionShopkeeper(EnOssan* this, GlobalContext* globalCtx); +void EnOssan_InitBombchuShopkeeper(EnOssan* this, GlobalContext* globalCtx); +void EnOssan_InitBazaarShopkeeper(EnOssan* this, GlobalContext* globalCtx); +void EnOssan_InitZoraShopkeeper(EnOssan* this, GlobalContext* globalCtx); +void EnOssan_InitGoronShopkeeper(EnOssan* this, GlobalContext* globalCtx); +void EnOssan_InitHappyMaskShopkeeper(EnOssan* this, GlobalContext* globalCtx); + +void EnOssan_State_Idle(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_StartConversation(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_FacingShopkeeper(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_TalkingToShopkeeper(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_LookToLeftShelf(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_LookToRightShelf(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_BrowseLeftShelf(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_BrowseRightShelf(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_LookFromShelfToShopkeeper(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_ItemSelected(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_SelectMilkBottle(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_SelectWeirdEgg(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_SelectUnimplementedItem(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_SelectBombs(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_CantGetItem(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_GiveItemWithFanfare(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_ItemPurchased(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_ContinueShoppingPrompt(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_GiveLonLonMilk(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_DisplayOnlyBombDialog(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_WaitForDisplayOnlyBombDialog(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_21(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_22(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_QuickBuyDialog(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_SelectMaskItem(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_LendMaskOfTruth(EnOssan* this, GlobalContext* globalCtx, Player* player); +void EnOssan_State_GiveDiscountDialog(EnOssan* this, GlobalContext* globalCtx, Player* player); + +void EnOssan_Obj3ToSeg6(EnOssan* this, GlobalContext* globalCtx); + +void EnOssan_StartShopping(GlobalContext* globalCtx, EnOssan* this); + +void EnOssan_WaitForBlink(EnOssan* this); +void EnOssan_Blink(EnOssan* this); + +u16 EnOssan_SetupHelloDialog(EnOssan* this); + +s32 EnOssan_TakeItemOffShelf(EnOssan* this); +s32 EnOssan_ReturnItemToShelf(EnOssan* this); +void EnOssan_ResetItemPosition(EnOssan* this); +void EnOssan_SetStateGiveDiscountDialog(GlobalContext* globalCtx, EnOssan* this); + +#define CURSOR_INVALID 0xFF -/* const ActorInit En_Ossan_InitVars = { ACTOR_EN_OSSAN, ACTORCAT_NPC, @@ -37,227 +114,2408 @@ const ActorInit En_Ossan_InitVars = { (ActorFunc)EnOssan_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CA8.s") +// Unused collider +static ColliderCylinderInitType1 sCylinderInit = { + { + COLTYPE_NONE, + AT_NONE, + AC_NONE, + OC1_ON | OC1_TYPE_ALL, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0x00000000, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_NONE, + OCELEM_ON, + }, + { 30, 80, 0, { 0, 0, 0 } }, +}; + +// Rupees to pay back to Happy Mask Shop +static s16 sMaskPaymentPrice[] = { 10, 30, 20, 50 }; + +// item yaw offsets +static s16 sItemShelfRot[] = { 0xEAAC, 0xEAAC, 0xEAAC, 0xEAAC, 0x1554, 0x1554, 0x1554, 0x1554 }; + +// unused values? +static s16 D_80AC8904[] = { 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025 }; + +static char* sShopkeeperPrintName[] = { + "コキリの店 ", // "Kokiri Shop" + "薬屋 ", // "Potion Shop" + "夜の店 ", // "Night Shop" + "路地裏の店 ", // "Back Alley Shop" + "盾の店 ", // "Shield Shop" + "大人の店 ", // "Adult Shop" + "タロンの店 ", // "Talon Shop" + "ゾーラの店 ", // "Zora Shop" + "ゴロン夜の店", // "Goron Night Shop" + "インゴーの店", // "Ingo Store" + "お面屋 ", // "Mask Shop" +}; + +typedef struct { + /* 0x00 */ s16 objId; + /* 0x02 */ s16 unk_02; + /* 0x04 */ s16 unk_04; +} ShopkeeperObjInfo; + +static s16 sShopkeeperObjectIds[][3] = { + { OBJECT_KM1, OBJECT_MASTERKOKIRIHEAD, OBJECT_MASTERKOKIRI }, + { OBJECT_DS2, OBJECT_ID_MAX, OBJECT_ID_MAX }, + { OBJECT_RS, OBJECT_ID_MAX, OBJECT_ID_MAX }, + { OBJECT_DS2, OBJECT_ID_MAX, OBJECT_ID_MAX }, + { OBJECT_OSSAN, OBJECT_ID_MAX, OBJECT_ID_MAX }, + { OBJECT_OSSAN, OBJECT_ID_MAX, OBJECT_ID_MAX }, + { OBJECT_OSSAN, OBJECT_ID_MAX, OBJECT_ID_MAX }, + { OBJECT_ZO, OBJECT_ID_MAX, OBJECT_MASTERZOORA }, + { OBJECT_OF1D_MAP, OBJECT_ID_MAX, OBJECT_MASTERGOLON }, + { OBJECT_OSSAN, OBJECT_ID_MAX, OBJECT_ID_MAX }, + { OBJECT_OS, OBJECT_ID_MAX, OBJECT_ID_MAX }, +}; + +static EnOssanTalkOwnerFunc sShopkeeperTalkOwner[] = { + EnOssan_TalkKokiriShopkeeper, EnOssan_TalkKakarikoPotionShopkeeper, EnOssan_TalkBombchuShopkeeper, + EnOssan_TalkMarketPotionShopkeeper, EnOssan_TalkBazaarShopkeeper, EnOssan_TalkDefaultShopkeeper, + EnOssan_TalkDefaultShopkeeper, EnOssan_TalkZoraShopkeeper, EnOssan_TalkGoronShopkeeper, + EnOssan_TalkDefaultShopkeeper, EnOssan_TalkHappyMaskShopkeeper, +}; + +static f32 sShopkeeperScale[] = { + 0.01f, 0.011f, 0.0105f, 0.011f, 0.01f, 0.01f, 0.01f, 0.01f, 0.01f, 0.01f, 0.01f, +}; + +typedef struct { + /* 0x00 */ s16 shopItemIndex; + /* 0x02 */ s16 xOffset; + /* 0x04 */ s16 yOffset; + /* 0x06 */ s16 zOffset; +} ShopItem; // size 0x08 + +ShopItem sShopkeeperStores[][8] = { + { { SI_DEKU_SHIELD, 50, 52, -20 }, + { SI_DEKU_NUTS_5, 50, 76, -20 }, + { SI_DEKU_NUTS_10, 80, 52, -3 }, + { SI_DEKU_STICK, 80, 76, -3 }, + { SI_DEKU_SEEDS_30, -50, 52, -20 }, + { SI_ARROWS_10, -50, 76, -20 }, + { SI_ARROWS_30, -80, 52, -3 }, + { SI_HEART, -80, 76, -3 } }, + + { { SI_GREEN_POTION, 50, 52, -20 }, + { SI_BLUE_FIRE, 50, 76, -20 }, + { SI_RED_POTION_R30, 80, 52, -3 }, + { SI_FAIRY, 80, 76, -3 }, + { SI_DEKU_NUTS_5, -50, 52, -20 }, + { SI_BUGS, -50, 76, -20 }, + { SI_POE, -80, 52, -3 }, + { SI_FISH, -80, 76, -3 } }, + + { { SI_BOMBCHU_10_2, 50, 52, -20 }, + { SI_BOMBCHU_10_4, 50, 76, -20 }, + { SI_BOMBCHU_10_3, 80, 52, -3 }, + { SI_BOMBCHU_10_1, 80, 76, -3 }, + { SI_BOMBCHU_20_3, -50, 52, -20 }, + { SI_BOMBCHU_20_1, -50, 76, -20 }, + { SI_BOMBCHU_20_4, -80, 52, -3 }, + { SI_BOMBCHU_20_2, -80, 76, -3 } }, + + { { SI_GREEN_POTION, 50, 52, -20 }, + { SI_BLUE_FIRE, 50, 76, -20 }, + { SI_RED_POTION_R30, 80, 52, -3 }, + { SI_FAIRY, 80, 76, -3 }, + { SI_DEKU_NUTS_5, -50, 52, -20 }, + { SI_BUGS, -50, 76, -20 }, + { SI_POE, -80, 52, -3 }, + { SI_FISH, -80, 76, -3 } }, + + { { SI_HYLIAN_SHIELD, 50, 52, -20 }, + { SI_BOMBS_5_R35, 50, 76, -20 }, + { SI_DEKU_NUTS_5, 80, 52, -3 }, + { SI_HEART, 80, 76, -3 }, + { SI_ARROWS_10, -50, 52, -20 }, + { SI_ARROWS_50, -50, 76, -20 }, + { SI_DEKU_STICK, -80, 52, -3 }, + { SI_ARROWS_30, -80, 76, -3 } }, + + { { SI_HYLIAN_SHIELD, 50, 52, -20 }, + { SI_BOMBS_5_R25, 50, 76, -20 }, + { SI_DEKU_NUTS_5, 80, 52, -3 }, + { SI_HEART, 80, 76, -3 }, + { SI_ARROWS_10, -50, 52, -20 }, + { SI_ARROWS_50, -50, 76, -20 }, + { SI_DEKU_STICK, -80, 52, -3 }, + { SI_ARROWS_30, -80, 76, -3 } }, + + { { SI_MILK_BOTTLE, 50, 52, -20 }, + { SI_DEKU_NUTS_5, 50, 76, -20 }, + { SI_DEKU_NUTS_10, 80, 52, -3 }, + { SI_HEART, 80, 76, -3 }, + { SI_WEIRD_EGG, -50, 52, -20 }, + { SI_DEKU_STICK, -50, 76, -20 }, + { SI_HEART, -80, 52, -3 }, + { SI_HEART, -80, 76, -3 } }, + + { { SI_ZORA_TUNIC, 50, 52, -20 }, + { SI_ARROWS_10, 50, 76, -20 }, + { SI_HEART, 80, 52, -3 }, + { SI_ARROWS_30, 80, 76, -3 }, + { SI_DEKU_NUTS_5, -50, 52, -20 }, + { SI_ARROWS_50, -50, 76, -20 }, + { SI_FISH, -80, 52, -3 }, + { SI_RED_POTION_R50, -80, 76, -3 } }, + + { { SI_BOMBS_5_R25, 50, 52, -20 }, + { SI_BOMBS_10, 50, 76, -20 }, + { SI_BOMBS_20, 80, 52, -3 }, + { SI_BOMBS_30, 80, 76, -3 }, + { SI_GORON_TUNIC, -50, 52, -20 }, + { SI_HEART, -50, 76, -20 }, + { SI_RED_POTION_R40, -80, 52, -3 }, + { SI_HEART, -80, 76, -3 } }, + + { { SI_19, 50, 52, -20 }, + { SI_19, 50, 76, -20 }, + { SI_19, 80, 52, -3 }, + { SI_19, 80, 76, -3 }, + { SI_20, -50, 52, -20 }, + { SI_20, -50, 76, -20 }, + { SI_20, -80, 52, -3 }, + { SI_20, -80, 76, -3 } }, + + { { SI_GERUDO_MASK, 50, 52, -20 }, + { SI_ZORA_MASK, 50, 76, -20 }, + { SI_MASK_OF_TRUTH, 80, 52, -3 }, + { SI_GORON_MASK, 80, 76, -3 }, + { SI_SKULL_MASK, -50, 52, -20 }, + { SI_KEATON_MASK, -50, 76, -20 }, + { SI_BUNNY_HOOD, -80, 52, -3 }, + { SI_SPOOKY_MASK, -80, 76, -3 } }, +}; +static EnOssanGetGirlAParamsFunc sShopItemReplaceFunc[] = { + ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, + ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, + ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, + ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, + ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, + ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, + ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, + ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_SpookyMask, + ShopItemDisp_SkullMask, ShopItemDisp_BunnyHood, ShopItemDisp_Default, ShopItemDisp_ZoraMask, + ShopItemDisp_GoronMask, ShopItemDisp_GerudoMask, ShopItemDisp_Default, ShopItemDisp_Default, + ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, + ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, ShopItemDisp_Default, + ShopItemDisp_Default, ShopItemDisp_Default, +}; + +static InitChainEntry sInitChain[] = { + ICHAIN_U8(targetMode, 2, ICHAIN_CONTINUE), + ICHAIN_F32(targetArrowOffset, 500, ICHAIN_STOP), +}; + +// When selecting an item to buy, this is the position the item moves to +static Vec3f sSelectedItemPosition[] = { { 17.0f, 58.0f, 30.0f }, { -17.0f, 58.0f, 30.0f } }; + +static EnOssanInitFunc sInitFuncs[] = { + EnOssan_InitKokiriShopkeeper, EnOssan_InitPotionShopkeeper, EnOssan_InitBombchuShopkeeper, + EnOssan_InitPotionShopkeeper, EnOssan_InitBazaarShopkeeper, EnOssan_InitBazaarShopkeeper, + EnOssan_InitBazaarShopkeeper, EnOssan_InitZoraShopkeeper, EnOssan_InitGoronShopkeeper, + EnOssan_InitBazaarShopkeeper, EnOssan_InitHappyMaskShopkeeper, +}; + +static Vec3f sShopkeeperPositionOffsets[] = { + { 0.0f, 0.0f, 33.0f }, { 0.0f, 0.0f, 31.0f }, { 0.0f, 0.0f, 31.0f }, { 0.0f, 0.0f, 31.0f }, + { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 36.0f }, + { 0.0f, 0.0f, 15.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 26.0f }, +}; + +static EnOssanStateFunc sStateFunc[] = { + EnOssan_State_Idle, + EnOssan_State_StartConversation, + EnOssan_State_FacingShopkeeper, + EnOssan_State_TalkingToShopkeeper, + EnOssan_State_LookToLeftShelf, + EnOssan_State_LookToRightShelf, + EnOssan_State_BrowseLeftShelf, + EnOssan_State_BrowseRightShelf, + EnOssan_State_LookFromShelfToShopkeeper, + EnOssan_State_ItemSelected, + EnOssan_State_SelectMilkBottle, + EnOssan_State_SelectWeirdEgg, + EnOssan_State_SelectUnimplementedItem, + EnOssan_State_SelectBombs, + EnOssan_State_CantGetItem, + EnOssan_State_GiveItemWithFanfare, + EnOssan_State_ItemPurchased, + EnOssan_State_ContinueShoppingPrompt, + EnOssan_State_GiveLonLonMilk, + EnOssan_State_DisplayOnlyBombDialog, + EnOssan_State_WaitForDisplayOnlyBombDialog, + EnOssan_State_21, + EnOssan_State_22, + EnOssan_State_QuickBuyDialog, + EnOssan_State_SelectMaskItem, + EnOssan_State_LendMaskOfTruth, + EnOssan_State_GiveDiscountDialog, +}; + +void EnOssan_SetupAction(EnOssan* this, EnOssanActionFunc actionFunc) { + this->actionFunc = actionFunc; +} + +s16 ShopItemDisp_Default(s16 v) { + return v; +} + +s16 ShopItemDisp_SpookyMask(s16 v) { + // Sold Skull Mask + if (gSaveContext.itemGetInf[3] & 0x200) { + return v; + } + return -1; +} + +s16 ShopItemDisp_SkullMask(s16 v) { + // Sold Keaton Mask + if (gSaveContext.itemGetInf[3] & 0x100) { + return v; + } + return -1; +} + +s16 ShopItemDisp_BunnyHood(s16 v) { + // Sold Spooky Mask + if (gSaveContext.itemGetInf[3] & 0x400) { + return v; + } + return -1; +} + +s16 ShopItemDisp_ZoraMask(s16 v) { + // Obtained Mask of Truth + if (gSaveContext.itemGetInf[3] & 0x8000) { + return v; + } + return -1; +} + +s16 ShopItemDisp_GoronMask(s16 v) { + // Obtained Mask of Truth + if (gSaveContext.itemGetInf[3] & 0x8000) { + return v; + } + return -1; +} + +s16 ShopItemDisp_GerudoMask(s16 v) { + // Obtained Mask of Truth + if (gSaveContext.itemGetInf[3] & 0x8000) { + return v; + } + return -1; +} + +void EnOssan_SpawnItemsOnShelves(EnOssan* this, GlobalContext* globalCtx, ShopItem* shopItems) { + EnTana* shelves; + s16 itemParams; + s32 i; + + for (i = 0; i < 8; i++, shopItems++) { + if (shopItems->shopItemIndex < 0) { + this->shelfSlots[i] = NULL; + } else { + itemParams = sShopItemReplaceFunc[shopItems->shopItemIndex](shopItems->shopItemIndex); + + if (itemParams < 0) { + this->shelfSlots[i] = NULL; + } else { + shelves = this->shelves; + this->shelfSlots[i] = (EnGirlA*)Actor_Spawn( + &globalCtx->actorCtx, globalCtx, ACTOR_EN_GIRLA, shelves->actor.world.pos.x + shopItems->xOffset, + shelves->actor.world.pos.y + shopItems->yOffset, shelves->actor.world.pos.z + shopItems->zOffset, + shelves->actor.shape.rot.x, shelves->actor.shape.rot.y + sItemShelfRot[i], + shelves->actor.shape.rot.z, itemParams); + } + } + } +} + +void EnOssan_UpdateShopOfferings(EnOssan* this, GlobalContext* globalCtx) { + s32 i; + ShopItem* storeItems; + ShopItem* shopItem; + + if (this->actor.params == OSSAN_TYPE_MASK) { + storeItems = sShopkeeperStores[this->actor.params]; + if (1) {} + for (i = 0; i < 8; i++) { + shopItem = &storeItems[i]; + if (shopItem->shopItemIndex >= 0 && this->shelfSlots[i] == NULL) { + s16 params = sShopItemReplaceFunc[shopItem->shopItemIndex](shopItem->shopItemIndex); + if (params >= 0) { + this->shelfSlots[i] = (EnGirlA*)Actor_Spawn( + &globalCtx->actorCtx, globalCtx, ACTOR_EN_GIRLA, + this->shelves->actor.world.pos.x + shopItem->xOffset, + this->shelves->actor.world.pos.y + shopItem->yOffset, + this->shelves->actor.world.pos.z + shopItem->zOffset, this->shelves->actor.shape.rot.x, + this->shelves->actor.shape.rot.y + sItemShelfRot[i], this->shelves->actor.shape.rot.z, params); + } + } + } + } +} + +void EnOssan_TalkDefaultShopkeeper(GlobalContext* globalCtx) { + func_8010B720(globalCtx, 0x9E); +} + +void EnOssan_TalkKakarikoPotionShopkeeper(GlobalContext* globalCtx) { + if (globalCtx->curSpawn == 0) { + func_8010B720(globalCtx, 0x5046); + } else { + func_8010B720(globalCtx, 0x504E); + } +} + +void EnOssan_TalkMarketPotionShopkeeper(GlobalContext* globalCtx) { + func_8010B720(globalCtx, 0x504E); +} + +void EnOssan_TalkKokiriShopkeeper(GlobalContext* globalCtx) { + func_8010B720(globalCtx, 0x10BA); +} + +void EnOssan_TalkBazaarShopkeeper(GlobalContext* globalCtx) { + if (globalCtx->curSpawn == 0) { + func_8010B720(globalCtx, 0x9D); + } else { + func_8010B720(globalCtx, 0x9C); + } +} + +void EnOssan_TalkBombchuShopkeeper(GlobalContext* globalCtx) { + func_8010B720(globalCtx, 0x7076); +} + +void EnOssan_TalkZoraShopkeeper(GlobalContext* globalCtx) { + if (LINK_AGE_IN_YEARS == YEARS_CHILD) { + func_8010B720(globalCtx, 0x403A); + } else { + func_8010B720(globalCtx, 0x403B); + } +} + +// Goron City, Goron +void EnOssan_TalkGoronShopkeeper(GlobalContext* globalCtx) { + if (LINK_AGE_IN_YEARS == YEARS_CHILD) { + if (gSaveContext.eventChkInf[2] & 0x20) { + func_8010B720(globalCtx, 0x3028); + } else if (CUR_UPG_VALUE(UPG_STRENGTH)) { + func_8010B720(globalCtx, 0x302D); + } else { + func_8010B720(globalCtx, 0x300F); + } + } else if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) { + func_8010B720(globalCtx, 0x3057); + } else { + func_8010B720(globalCtx, 0x305B); + } +} + +// Happy Mask Shop +void EnOssan_TalkHappyMaskShopkeeper(GlobalContext* globalCtx) { + if ((gSaveContext.itemGetInf[3] & 0x100) // Sold Keaton Mask + && (gSaveContext.itemGetInf[3] & 0x200) // Sold Skull Mask + && (gSaveContext.itemGetInf[3] & 0x400) // Sold Spooky Mask + && (gSaveContext.itemGetInf[3] & 0x800)) { // Sold Bunny Hood + func_8010B720(globalCtx, 0x70AE); + } else { + switch (globalCtx->msgCtx.choiceIndex) { + case 1: + func_8010B720(globalCtx, 0x70A4); + break; + case 0: + func_8010B720(globalCtx, 0x70A3); + break; + } + } +} + +void EnOssan_UpdateCameraDirection(EnOssan* this, GlobalContext* globalCtx, f32 cameraFaceAngle) { + this->cameraFaceAngle = cameraFaceAngle; + Camera_SetCameraData(ACTIVE_CAM, 0xC, NULL, NULL, cameraFaceAngle, 0, 0); +} + +s32 EnOssan_TryGetObjBankIndexes(EnOssan* this, GlobalContext* globalCtx, s16* objectIds) { + if (objectIds[1] != OBJECT_ID_MAX) { + this->objBankIndex2 = Object_GetIndex(&globalCtx->objectCtx, objectIds[1]); + if (this->objBankIndex2 < 0) { + return false; + } + } else { + this->objBankIndex2 = -1; + } + if (objectIds[2] != OBJECT_ID_MAX) { + this->objBankIndex3 = Object_GetIndex(&globalCtx->objectCtx, objectIds[2]); + if (this->objBankIndex3 < 0) { + return false; + } + } else { + this->objBankIndex3 = -1; + } + return true; +} + +void EnOssan_Init(Actor* thisx, GlobalContext* globalCtx) { + EnOssan* this = THIS; + s32 pad; + s16* objectIds; + + if (this->actor.params == OSSAN_TYPE_TALON && (LINK_AGE_IN_YEARS != YEARS_CHILD)) { + this->actor.params = OSSAN_TYPE_INGO; + } + + //! @bug This check will always evaluate to false, it should be || not && + if (this->actor.params > OSSAN_TYPE_MASK && this->actor.params < OSSAN_TYPE_KOKIRI) { + Actor_Kill(&this->actor); + osSyncPrintf(VT_COL(RED, WHITE)); + osSyncPrintf("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); + osSyncPrintf(VT_RST); + ASSERT(0, "0", "../z_en_oB1.c", 1246); + return; + } + + // If you've given Zelda's Letter to the Kakariko Guard + if (this->actor.params == OSSAN_TYPE_MASK && !(gSaveContext.infTable[7] & 0x40)) { + Actor_Kill(&this->actor); + return; + } + + if (this->actor.params == OSSAN_TYPE_KAKARIKO_POTION && (LINK_AGE_IN_YEARS == YEARS_CHILD)) { + Actor_Kill(&this->actor); + return; + } + + // Completed Dodongo's Cavern + if (this->actor.params == OSSAN_TYPE_BOMBCHUS && !(gSaveContext.eventChkInf[2] & 0x20)) { + Actor_Kill(&this->actor); + return; + } + + objectIds = sShopkeeperObjectIds[this->actor.params]; + this->objBankIndex1 = Object_GetIndex(&globalCtx->objectCtx, objectIds[0]); + + if (this->objBankIndex1 < 0) { + Actor_Kill(&this->actor); + osSyncPrintf(VT_COL(RED, WHITE)); + osSyncPrintf("バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]); + osSyncPrintf(VT_RST); + ASSERT(0, "0", "../z_en_oB1.c", 1284); + return; + } + + if (EnOssan_TryGetObjBankIndexes(this, globalCtx, objectIds) == 0) { + Actor_Kill(&this->actor); + osSyncPrintf(VT_COL(RED, WHITE)); + osSyncPrintf("予備バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]); + osSyncPrintf(VT_RST); + ASSERT(0, "0", "../z_en_oB1.c", 1295); + return; + } + + Actor_ProcessInitChain(&this->actor, sInitChain); + EnOssan_SetupAction(this, EnOssan_InitActionFunc); +} + +void EnOssan_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnOssan* this = THIS; + SkelAnime_Free(&this->skelAnime, globalCtx); + Collider_DestroyCylinder(globalCtx, &this->collider); +} + +void EnOssan_UpdateCursorPos(GlobalContext* globalCtx, EnOssan* this) { + s16 x; + s16 y; + + func_8002F374(globalCtx, &this->shelfSlots[this->cursorIndex]->actor, &x, &y); + this->cursorX = x; + this->cursorY = y; +} + +void EnOssan_EndInteraction(GlobalContext* globalCtx, EnOssan* this) { + Player* player = PLAYER; + + // "End of conversation!" + osSyncPrintf(VT_FGCOL(YELLOW) "%s[%d]:★★★ 会話終了！！ ★★★" VT_RST "\n", "../z_en_oB1.c", 1337); + YREG(31) = 0; + func_8002F194(&this->actor, globalCtx); + globalCtx->msgCtx.msgMode = 0x36; + globalCtx->msgCtx.unk_E3E7 = 4; + player->stateFlags2 &= ~0x20000000; + func_800BC490(globalCtx, 1); + Interface_ChangeAlpha(50); + this->drawCursor = 0; + this->stickLeftPrompt.isEnabled = false; + this->stickRightPrompt.isEnabled = false; + EnOssan_UpdateCameraDirection(this, globalCtx, 0.0f); + this->actor.textId = EnOssan_SetupHelloDialog(this); + this->stateFlag = OSSAN_STATE_IDLE; +} + +s32 EnOssan_TestEndInteraction(EnOssan* this, GlobalContext* globalCtx, Input* controller1) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_B)) { + EnOssan_EndInteraction(globalCtx, this); + return true; + } else { + return false; + } +} + +s32 EnOssan_TestCancelOption(EnOssan* this, GlobalContext* globalCtx, Input* controller1) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_B)) { + this->stateFlag = this->tempStateFlag; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + return true; + } else { + return false; + } +} + +void EnOssan_SetStateStartShopping(GlobalContext* globalCtx, EnOssan* this, u8 skipHelloState) { + YREG(31) = 1; + this->headRot = this->headTargetRot = 0; + Interface_SetDoAction(globalCtx, 0x10); + EnOssan_UpdateCameraDirection(this, globalCtx, 0); + + if (!skipHelloState) { + this->stateFlag = OSSAN_STATE_START_CONVERSATION; + } else { + EnOssan_StartShopping(globalCtx, this); + } +} + +void EnOssan_StartShopping(GlobalContext* globalCtx, EnOssan* this) { + this->stateFlag = OSSAN_STATE_FACING_SHOPKEEPER; + + if (this->actor.params == OSSAN_TYPE_MASK) { + // if all masks have been sold, give the option to ask about the mask of truth + if ((gSaveContext.itemGetInf[3] & 0x100) && (gSaveContext.itemGetInf[3] & 0x200) && + (gSaveContext.itemGetInf[3] & 0x400) && (gSaveContext.itemGetInf[3] & 0x800)) { + func_8010B720(globalCtx, 0x70AD); + } else { + func_8010B720(globalCtx, 0x70A2); + } + } else { + func_8010B720(globalCtx, 0x83); + } + + Interface_SetDoAction(globalCtx, 6); + this->stickRightPrompt.isEnabled = true; + this->stickLeftPrompt.isEnabled = true; + EnOssan_UpdateCameraDirection(this, globalCtx, 0.0f); +} + +void EnOssan_ChooseTalkToOwner(GlobalContext* globalCtx, EnOssan* this) { + this->stateFlag = OSSAN_STATE_TALKING_TO_SHOPKEEPER; + sShopkeeperTalkOwner[this->actor.params](globalCtx); + Interface_SetDoAction(globalCtx, 6); + this->stickLeftPrompt.isEnabled = false; + this->stickRightPrompt.isEnabled = false; +} + +void EnOssan_SetLookToShopkeeperFromShelf(GlobalContext* globalCtx, EnOssan* this) { + func_80078884(NA_SE_SY_CURSOR); + this->drawCursor = 0; + this->stateFlag = OSSAN_STATE_LOOK_SHOPKEEPER; +} + +void EnOssan_State_Idle(EnOssan* this, GlobalContext* globalCtx, Player* player) { + this->headTargetRot = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; + + if (func_8002F194(&this->actor, globalCtx)) { + // "Start conversation!!" + osSyncPrintf(VT_FGCOL(YELLOW) "★★★ 会話開始！！ ★★★" VT_RST "\n"); + player->stateFlags2 |= 0x20000000; + func_800BC590(globalCtx); + EnOssan_SetStateStartShopping(globalCtx, this, false); + } else if (this->actor.xzDistToPlayer < 100.0f) { + func_8002F2CC(&this->actor, globalCtx, 100); + } +} + +void EnOssan_UpdateJoystickInputState(GlobalContext* globalCtx, EnOssan* this) { + Input* controller1 = &globalCtx->state.input[0]; + s8 stickX = controller1->rel.stick_x; + s8 stickY = controller1->rel.stick_y; + + this->moveHorizontal = this->moveVertical = false; + + if (this->stickAccumX == 0) { + if (stickX > 30 || stickX < -30) { + this->stickAccumX = stickX; + this->moveHorizontal = true; + } + } else if (stickX <= 30 && stickX >= -30) { + this->stickAccumX = 0; + } else if (this->stickAccumX * stickX < 0) { // Stick has swapped directions + this->stickAccumX = stickX; + this->moveHorizontal = true; + } else { + this->stickAccumX += stickX; + + if (this->stickAccumX > 2000) { + this->stickAccumX = 2000; + } else if (this->stickAccumX < -2000) { + this->stickAccumX = -2000; + } + } + + if (this->stickAccumY == 0) { + if (stickY > 30 || stickY < -30) { + this->stickAccumY = stickY; + this->moveVertical = true; + } + } else if (stickY <= 30 && stickY >= -30) { + this->stickAccumY = 0; + } else if (this->stickAccumY * stickY < 0) { // Stick has swapped directions + this->stickAccumY = stickY; + this->moveVertical = true; + } else { + this->stickAccumY += stickY; + + if (this->stickAccumY > 2000) { + this->stickAccumY = 2000; + } else if (this->stickAccumY < -2000) { + this->stickAccumY = -2000; + } + } +} + +u8 EnOssan_SetCursorIndexFromNeutral(EnOssan* this, u8 shelfOffset) { + u8 i; + + // if cursor is on the top shelf + if (this->cursorIndex & 1) { + // scan top shelf for non-null item + for (i = shelfOffset + 1; i < shelfOffset + 4; i += 2) { + if (this->shelfSlots[i] != NULL) { + return i; + } + } + // scan bottom shelf for non-null item + for (i = shelfOffset; i < shelfOffset + 4; i += 2) { + if (this->shelfSlots[i] != NULL) { + return i; + } + } + } else { + // scan bottom shelf for non-null item + for (i = shelfOffset; i < shelfOffset + 4; i += 2) { + if (this->shelfSlots[i] != NULL) { + return i; + } + } + // scan top shelf for non-null item + for (i = shelfOffset + 1; i < shelfOffset + 4; i += 2) { + if (this->shelfSlots[i] != NULL) { + return i; + } + } + } + return CURSOR_INVALID; +} + +u8 EnOssan_CursorRight(EnOssan* this, u8 cursorIndex, u8 shelfSlotMin) { + u8 c = shelfSlotMin + 4; + + while (cursorIndex >= shelfSlotMin && cursorIndex < c) { + cursorIndex -= 2; + if (cursorIndex >= shelfSlotMin && cursorIndex < c) { + if (this->shelfSlots[cursorIndex] != NULL) { + return cursorIndex; + } + } + } + return CURSOR_INVALID; +} + +u8 EnOssan_CursorLeft(EnOssan* this, u8 cursorIndex, u8 shelfSlotMax) { + + while (cursorIndex < shelfSlotMax) { + cursorIndex += 2; + if ((cursorIndex < shelfSlotMax) && this->shelfSlots[cursorIndex] != NULL) { + return cursorIndex; + } + } + return CURSOR_INVALID; +} + +// pay salesman back +void EnOssan_TryPaybackMask(EnOssan* this, GlobalContext* globalCtx) { + s16 price = sMaskPaymentPrice[this->happyMaskShopState]; + + if (gSaveContext.rupees < price) { + func_8010B720(globalCtx, 0x70A8); + this->happyMaskShopkeeperEyeIdx = 1; + this->happyMaskShopState = OSSAN_HAPPY_STATE_ANGRY; + } else { + Rupees_ChangeBy(-price); + + if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_BUNNY_HOOD) { + gSaveContext.eventChkInf[8] |= 0x8000; + func_8010B720(globalCtx, 0x70A9); + this->happyMaskShopState = OSSAN_HAPPY_STATE_ALL_MASKS_SOLD; + return; + } + + if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_KEATON_MASK) { + gSaveContext.eventChkInf[8] |= 0x1000; + } else if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SPOOKY_MASK) { + gSaveContext.eventChkInf[8] |= 0x4000; + } else if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SKULL_MASK) { + gSaveContext.eventChkInf[8] |= 0x2000; + } + + func_8010B720(globalCtx, 0x70A7); + this->happyMaskShopState = OSSAN_HAPPY_STATE_NONE; + } + this->stateFlag = OSSAN_STATE_START_CONVERSATION; +} + +void EnOssan_State_StartConversation(EnOssan* this, GlobalContext* globalCtx, Player* player) { + u8 dialogState = func_8010BDBC(&globalCtx->msgCtx); + + if (this->actor.params == OSSAN_TYPE_MASK && dialogState == 4) { + if (!EnOssan_TestEndInteraction(this, globalCtx, &globalCtx->state.input[0]) && func_80106BC8(globalCtx)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + EnOssan_StartShopping(globalCtx, this); + break; + case 1: + EnOssan_EndInteraction(globalCtx, this); + break; + } + } + } else if (dialogState == 5 && func_80106BC8(globalCtx)) { + func_80078884(NA_SE_SY_MESSAGE_PASS); + + switch (this->happyMaskShopState) { + case OSSAN_HAPPY_STATE_ALL_MASKS_SOLD: + func_8010B720(globalCtx, 0x70AA); + this->stateFlag = OSSAN_STATE_LEND_MASK_OF_TRUTH; + return; + case OSSAN_HAPPY_STATE_BORROWED_FIRST_MASK: + EnOssan_EndInteraction(globalCtx, this); + return; + case OSSAN_HAPPY_STATE_REQUEST_PAYMENT_KEATON_MASK: + case OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SPOOKY_MASK: + case OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SKULL_MASK: + case OSSAN_HAPPY_STATE_REQUEST_PAYMENT_BUNNY_HOOD: + EnOssan_TryPaybackMask(this, globalCtx); + return; + case OSSAN_HAPPY_STATE_ANGRY: + globalCtx->nextEntranceIndex = 0x1D1; + globalCtx->sceneLoadFlag = 0x14; + globalCtx->fadeTransition = 0x2E; + return; + } + + if (!EnOssan_TestEndInteraction(this, globalCtx, &globalCtx->state.input[0])) { + // "Shop around by moving the stick left and right" + osSyncPrintf("「スティック左右で品物みてくれ！」\n"); + EnOssan_StartShopping(globalCtx, this); + } + } + + if (1) {} +} + +s32 EnOssan_FacingShopkeeperDialogResult(EnOssan* this, GlobalContext* globalCtx) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + EnOssan_ChooseTalkToOwner(globalCtx, this); + return true; + case 1: + EnOssan_EndInteraction(globalCtx, this); + return true; + default: + return false; + } +} + +void EnOssan_State_FacingShopkeeper(EnOssan* this, GlobalContext* globalCtx, Player* player) { + u8 nextIndex; + + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && + !EnOssan_TestEndInteraction(this, globalCtx, &globalCtx->state.input[0])) { + if (func_80106BC8(globalCtx) && EnOssan_FacingShopkeeperDialogResult(this, globalCtx)) { + func_80078884(NA_SE_SY_DECIDE); + return; + } + // Stick Left + if (this->stickAccumX < 0) { + nextIndex = EnOssan_SetCursorIndexFromNeutral(this, 4); + if (nextIndex != CURSOR_INVALID) { + this->cursorIndex = nextIndex; + this->stateFlag = OSSAN_STATE_LOOK_SHELF_LEFT; + Interface_SetDoAction(globalCtx, 6); + this->stickLeftPrompt.isEnabled = false; + func_80078884(NA_SE_SY_CURSOR); + } + } else if (this->stickAccumX > 0) { + nextIndex = EnOssan_SetCursorIndexFromNeutral(this, 0); + if (nextIndex != CURSOR_INVALID) { + this->cursorIndex = nextIndex; + this->stateFlag = OSSAN_STATE_LOOK_SHELF_RIGHT; + Interface_SetDoAction(globalCtx, 6); + this->stickRightPrompt.isEnabled = false; + func_80078884(NA_SE_SY_CURSOR); + } + } + } +} + +void EnOssan_State_TalkingToShopkeeper(EnOssan* this, GlobalContext* globalCtx, Player* player) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) { + EnOssan_StartShopping(globalCtx, this); + } +} + +void EnOssan_State_LookToLeftShelf(EnOssan* this, GlobalContext* globalCtx, Player* player) { + Math_ApproachF(&this->cameraFaceAngle, 30.0f, 0.5f, 10.0f); + + if (this->cameraFaceAngle > 29.5f) { + EnOssan_UpdateCameraDirection(this, globalCtx, 30.0f); + } + + EnOssan_UpdateCameraDirection(this, globalCtx, this->cameraFaceAngle); + + if (this->cameraFaceAngle >= 30.0f) { + EnOssan_UpdateCameraDirection(this, globalCtx, 30.0f); + EnOssan_UpdateCursorPos(globalCtx, this); + this->stateFlag = OSSAN_STATE_BROWSE_LEFT_SHELF; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + } else { + this->stickAccumX = 0; + } +} + +void EnOssan_State_LookToRightShelf(EnOssan* this, GlobalContext* globalCtx, Player* player) { + Math_ApproachF(&this->cameraFaceAngle, -30.0f, 0.5f, 10.0f); + + if (this->cameraFaceAngle < -29.5f) { + EnOssan_UpdateCameraDirection(this, globalCtx, -30.0f); + } + + EnOssan_UpdateCameraDirection(this, globalCtx, this->cameraFaceAngle); + + if (this->cameraFaceAngle <= -30.0f) { + EnOssan_UpdateCameraDirection(this, globalCtx, -30.0f); + EnOssan_UpdateCursorPos(globalCtx, this); + this->stateFlag = OSSAN_STATE_BROWSE_RIGHT_SHELF; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + } else { + this->stickAccumX = 0; + } +} + +void EnOssan_CursorUpDown(EnOssan* this) { + u8 curTemp = this->cursorIndex; + u8 curScanTemp; + + if (this->stickAccumY < 0) { + curTemp &= 0xFE; + if (this->shelfSlots[curTemp] != NULL) { + this->cursorIndex = curTemp; + return; + } + // cursorIndex on right shelf + if (curTemp < 4) { + curScanTemp = curTemp + 2; + if (curScanTemp >= 4) { + curScanTemp = 0; + } + while (curScanTemp != curTemp) { + if (this->shelfSlots[curScanTemp] != NULL) { + this->cursorIndex = curScanTemp; + return; + } + curScanTemp += 2; + if (curScanTemp >= 4) { + curScanTemp = 0; + } + } + } else { + // cursorIndex on left shelf + curScanTemp = curTemp + 2; + if (curScanTemp >= 8) { + curScanTemp = 4; + } + while (curScanTemp != curTemp) { + if (this->shelfSlots[curScanTemp] != NULL) { + this->cursorIndex = curScanTemp; + return; + } + curScanTemp += 2; + if (curScanTemp >= 8) { + curScanTemp = 4; + } + } + } + } else if (this->stickAccumY > 0) { + curTemp |= 1; + if (this->shelfSlots[curTemp] != NULL) { + this->cursorIndex = curTemp; + return; + } + // cursorIndex on right shelf + if (curTemp < 4) { + curScanTemp = curTemp + 2; + if (curScanTemp >= 4) { + curScanTemp = 1; + } + while (curScanTemp != curTemp) { + if (this->shelfSlots[curScanTemp] != NULL) { + this->cursorIndex = curScanTemp; + return; + } + curScanTemp += 2; + if (curScanTemp >= 4) { + curScanTemp = 1; + } + } + } else { + // cursorIndex on left shelf + curScanTemp = curTemp + 2; + if (curScanTemp >= 8) { + curScanTemp = 5; + } + while (curScanTemp != curTemp) { + if (this->shelfSlots[curScanTemp] != NULL) { + this->cursorIndex = curScanTemp; + return; + } + curScanTemp += 2; + if (curScanTemp >= 8) { + curScanTemp = 5; + } + } + } + } +} + +s32 EnOssan_HasPlayerSelectedItem(GlobalContext* globalCtx, EnOssan* this, Input* input) { + EnGirlA* selectedItem = this->shelfSlots[this->cursorIndex]; + + if (EnOssan_TestEndInteraction(this, globalCtx, input)) { + return true; + } + if (func_80106BC8(globalCtx)) { + if (selectedItem->actor.params != SI_SOLD_OUT && selectedItem->isInvisible == 0) { + this->tempStateFlag = this->stateFlag; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->itemBuyPromptTextId); + this->stickLeftPrompt.isEnabled = false; + this->stickRightPrompt.isEnabled = false; + switch (selectedItem->actor.params) { + case SI_KEATON_MASK: + case SI_SPOOKY_MASK: + case SI_SKULL_MASK: + case SI_BUNNY_HOOD: + case SI_MASK_OF_TRUTH: + case SI_ZORA_MASK: + case SI_GORON_MASK: + case SI_GERUDO_MASK: + func_80078884(NA_SE_SY_DECIDE); + this->drawCursor = 0; + this->stateFlag = OSSAN_STATE_SELECT_ITEM_MASK; + return true; + case SI_MILK_BOTTLE: + func_80078884(NA_SE_SY_DECIDE); + this->drawCursor = 0; + this->stateFlag = OSSAN_STATE_SELECT_ITEM_MILK_BOTTLE; + return true; + case SI_WEIRD_EGG: + func_80078884(NA_SE_SY_DECIDE); + this->drawCursor = 0; + this->stateFlag = OSSAN_STATE_SELECT_ITEM_WEIRD_EGG; + return true; + case SI_19: + case SI_20: + func_80078884(NA_SE_SY_ERROR); + this->drawCursor = 0; + this->stateFlag = OSSAN_STATE_SELECT_ITEM_UNIMPLEMENTED; + return true; + case SI_BOMBS_5_R25: + case SI_BOMBS_10: + case SI_BOMBS_20: + case SI_BOMBS_30: + case SI_BOMBS_5_R35: + func_80078884(NA_SE_SY_DECIDE); + this->drawCursor = 0; + this->stateFlag = OSSAN_STATE_SELECT_ITEM_BOMBS; + return true; + default: + func_80078884(NA_SE_SY_DECIDE); + this->drawCursor = 0; + this->stateFlag = OSSAN_STATE_SELECT_ITEM; + return true; + } + } + func_80078884(NA_SE_SY_ERROR); + return true; + } + return false; +} + +void EnOssan_State_BrowseLeftShelf(EnOssan* this, GlobalContext* globalCtx, Player* player) { + s32 a; + s32 b; + u8 prevIndex = this->cursorIndex; + s32 c; + s32 d; + + if (!EnOssan_ReturnItemToShelf(this)) { + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2152); + this->delayTimer = 3; + return; + } + if (this->delayTimer != 0) { + this->delayTimer--; + return; + } + this->drawCursor = 0xFF; + this->stickRightPrompt.isEnabled = true; + EnOssan_UpdateCursorPos(globalCtx, this); + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && + !EnOssan_HasPlayerSelectedItem(globalCtx, this, &globalCtx->state.input[0])) { + if (this->moveHorizontal) { + if (this->stickAccumX > 0) { + a = EnOssan_CursorRight(this, this->cursorIndex, 4); + if (a != CURSOR_INVALID) { + this->cursorIndex = a; + } else { + EnOssan_SetLookToShopkeeperFromShelf(globalCtx, this); + return; + } + } else if (this->stickAccumX < 0) { + b = EnOssan_CursorLeft(this, this->cursorIndex, 8); + if (b != CURSOR_INVALID) { + this->cursorIndex = b; + } + } + } else { + if (this->stickAccumX > 0 && this->stickAccumX > 500) { + c = EnOssan_CursorRight(this, this->cursorIndex, 4); + if (c != CURSOR_INVALID) { + this->cursorIndex = c; + } else { + EnOssan_SetLookToShopkeeperFromShelf(globalCtx, this); + return; + } + } else if (this->stickAccumX < 0 && this->stickAccumX < -500) { + d = EnOssan_CursorLeft(this, this->cursorIndex, 8); + if (d != CURSOR_INVALID) { + this->cursorIndex = d; + } + } + } + EnOssan_CursorUpDown(this); + if (this->cursorIndex != prevIndex) { + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + func_80078884(NA_SE_SY_CURSOR); + } + } +} + +void EnOssan_State_BrowseRightShelf(EnOssan* this, GlobalContext* globalCtx, Player* player) { + s32 pad[2]; + u8 prevIndex; + u8 nextIndex; + + prevIndex = this->cursorIndex; + if (!EnOssan_ReturnItemToShelf(this)) { + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2244); + this->delayTimer = 3; + return; + } + if (this->delayTimer != 0) { + this->delayTimer--; + return; + } + this->drawCursor = 0xFF; + this->stickLeftPrompt.isEnabled = true; + EnOssan_UpdateCursorPos(globalCtx, this); + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && + !EnOssan_HasPlayerSelectedItem(globalCtx, this, &globalCtx->state.input[0])) { + if (this->moveHorizontal) { + if (this->stickAccumX < 0) { + nextIndex = EnOssan_CursorRight(this, this->cursorIndex, 0); + if (nextIndex != CURSOR_INVALID) { + this->cursorIndex = nextIndex; + } else { + EnOssan_SetLookToShopkeeperFromShelf(globalCtx, this); + return; + } + } else if (this->stickAccumX > 0) { + nextIndex = EnOssan_CursorLeft(this, this->cursorIndex, 4); + if (nextIndex != CURSOR_INVALID) { + this->cursorIndex = nextIndex; + } + } + } else { + if (this->stickAccumX < 0 && this->stickAccumX < -500) { + nextIndex = EnOssan_CursorRight(this, this->cursorIndex, 0); + if (nextIndex != CURSOR_INVALID) { + this->cursorIndex = nextIndex; + } else { + EnOssan_SetLookToShopkeeperFromShelf(globalCtx, this); + return; + } + } else if (this->stickAccumX > 0 && this->stickAccumX > 500) { + nextIndex = EnOssan_CursorLeft(this, this->cursorIndex, 4); + if (nextIndex != CURSOR_INVALID) { + this->cursorIndex = nextIndex; + } + } + } + EnOssan_CursorUpDown(this); + if (this->cursorIndex != prevIndex) { + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + func_80078884(NA_SE_SY_CURSOR); + } + } +} + +void EnOssan_State_LookFromShelfToShopkeeper(EnOssan* this, GlobalContext* globalCtx, Player* player) { + Math_ApproachF(&this->cameraFaceAngle, 0.0f, 0.5f, 10.0f); + if ((this->cameraFaceAngle < 0.5f) && (this->cameraFaceAngle > -0.5f)) { + EnOssan_UpdateCameraDirection(this, globalCtx, 0.0f); + } + EnOssan_UpdateCameraDirection(this, globalCtx, this->cameraFaceAngle); + if (this->cameraFaceAngle == 0.0f) { + EnOssan_StartShopping(globalCtx, this); + } +} + +void EnOssan_State_DisplayOnlyBombDialog(EnOssan* this, GlobalContext* globalCtx, Player* player) { + if (!EnOssan_ReturnItemToShelf(this)) { + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2355); + return; + } + Math_ApproachF(&this->cameraFaceAngle, 0.0f, 0.5f, 10.0f); + if (this->cameraFaceAngle < 0.5f && this->cameraFaceAngle > -0.5f) { + EnOssan_UpdateCameraDirection(this, globalCtx, 0.0f); + } + EnOssan_UpdateCameraDirection(this, globalCtx, this->cameraFaceAngle); + if (this->cameraFaceAngle == 0.0f) { + func_8010B720(globalCtx, 0x3010); + this->stateFlag = OSSAN_STATE_WAIT_FOR_DISPLAY_ONLY_BOMB_DIALOG; + } +} + +void EnOssan_GiveItemWithFanfare(GlobalContext* globalCtx, EnOssan* this) { + Player* player = PLAYER; + + osSyncPrintf("\n" VT_FGCOL(YELLOW) "初めて手にいれた！！" VT_RST "\n\n"); + func_8002F434(&this->actor, globalCtx, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f); + globalCtx->msgCtx.msgMode = 0x36; + globalCtx->msgCtx.unk_E3E7 = 4; + player->stateFlags2 &= ~0x20000000; + func_800BC490(globalCtx, 1); + Interface_ChangeAlpha(50); + this->drawCursor = 0; + EnOssan_UpdateCameraDirection(this, globalCtx, 0.0f); + this->stateFlag = OSSAN_STATE_GIVE_ITEM_FANFARE; + osSyncPrintf(VT_FGCOL(YELLOW) "持ち上げ開始！！" VT_RST "\n\n"); +} + +void EnOssan_SetStateCantGetItem(GlobalContext* globalCtx, EnOssan* this, u16 textId) { + func_8010B720(globalCtx, textId); + this->stateFlag = OSSAN_STATE_CANT_GET_ITEM; +} + +void EnOssan_SetStateQuickBuyDialog(GlobalContext* globalCtx, EnOssan* this, u16 textId) { + func_8010B720(globalCtx, textId); + this->stateFlag = OSSAN_STATE_QUICK_BUY; +} + +void EnOssan_HandleCanBuyItem(GlobalContext* globalCtx, EnOssan* this) { + EnGirlA* selectedItem = this->shelfSlots[this->cursorIndex]; + + switch (selectedItem->canBuyFunc(globalCtx, selectedItem)) { + case CANBUY_RESULT_SUCCESS_FANFARE: + if (selectedItem->actor.params == SI_HYLIAN_SHIELD && gSaveContext.infTable[7] & 0x40) { + EnOssan_SetStateGiveDiscountDialog(globalCtx, this); + } else { + EnOssan_GiveItemWithFanfare(globalCtx, this); + this->drawCursor = 0; + this->shopItemSelectedTween = 0.0f; + selectedItem->setOutOfStockFunc(globalCtx, selectedItem); + } + break; + case CANBUY_RESULT_SUCCESS: + selectedItem->itemGiveFunc(globalCtx, selectedItem); + EnOssan_SetStateQuickBuyDialog(globalCtx, this, 0x84); + this->drawCursor = 0; + this->shopItemSelectedTween = 0.0f; + selectedItem->setOutOfStockFunc(globalCtx, selectedItem); + break; + case CANBUY_RESULT_CANT_GET_NOW: + func_80078884(NA_SE_SY_ERROR); + EnOssan_SetStateCantGetItem(globalCtx, this, 0x86); + break; + case CANBUY_RESULT_NEED_BOTTLE: + func_80078884(NA_SE_SY_ERROR); + EnOssan_SetStateCantGetItem(globalCtx, this, 0x96); + break; + case CANBUY_RESULT_NEED_RUPEES: + func_80078884(NA_SE_SY_ERROR); + EnOssan_SetStateCantGetItem(globalCtx, this, 0x85); + break; + case CANBUY_RESULT_CANT_GET_NOW_5: + func_80078884(NA_SE_SY_ERROR); + EnOssan_SetStateCantGetItem(globalCtx, this, 0x86); + break; + } +} + +void EnOssan_HandleCanBuyLonLonMilk(GlobalContext* globalCtx, EnOssan* this) { + EnGirlA* item = this->shelfSlots[this->cursorIndex]; + + switch (item->canBuyFunc(globalCtx, item)) { + case CANBUY_RESULT_SUCCESS_FANFARE: + func_8010B720(globalCtx, 0x9C); + this->stateFlag = OSSAN_STATE_GIVE_LON_LON_MILK; + this->drawCursor = 0; + break; + case CANBUY_RESULT_SUCCESS: + item->itemGiveFunc(globalCtx, item); + EnOssan_SetStateQuickBuyDialog(globalCtx, this, 0x98); + this->drawCursor = 0; + this->shopItemSelectedTween = 0.0f; + item->setOutOfStockFunc(globalCtx, item); + break; + case CANBUY_RESULT_NEED_BOTTLE: + EnOssan_SetStateCantGetItem(globalCtx, this, 0x96); + break; + case CANBUY_RESULT_NEED_RUPEES: + EnOssan_SetStateCantGetItem(globalCtx, this, 0x85); + break; + } +} + +void EnOssan_HandleCanBuyWeirdEgg(GlobalContext* globalCtx, EnOssan* this) { + EnGirlA* item = this->shelfSlots[this->cursorIndex]; + + switch (item->canBuyFunc(globalCtx, item)) { + case CANBUY_RESULT_SUCCESS_FANFARE: + EnOssan_GiveItemWithFanfare(globalCtx, this); + this->drawCursor = 0; + this->shopItemSelectedTween = 0.0f; + item->setOutOfStockFunc(globalCtx, item); + break; + case CANBUY_RESULT_SUCCESS: + item->itemGiveFunc(globalCtx, item); + EnOssan_SetStateQuickBuyDialog(globalCtx, this, 0x9A); + this->drawCursor = 0; + this->shopItemSelectedTween = 0.0f; + item->setOutOfStockFunc(globalCtx, item); + break; + case CANBUY_RESULT_CANT_GET_NOW: + func_80078884(NA_SE_SY_ERROR); + EnOssan_SetStateCantGetItem(globalCtx, this, 0x9D); + break; + case CANBUY_RESULT_NEED_RUPEES: + func_80078884(NA_SE_SY_ERROR); + EnOssan_SetStateCantGetItem(globalCtx, this, 0x85); + break; + } +} + +void EnOssan_HandleCanBuyBombs(GlobalContext* globalCtx, EnOssan* this) { + EnGirlA* item = this->shelfSlots[this->cursorIndex]; + + switch (item->canBuyFunc(globalCtx, item)) { + case CANBUY_RESULT_SUCCESS_FANFARE: + case CANBUY_RESULT_SUCCESS: + item->itemGiveFunc(globalCtx, item); + EnOssan_SetStateQuickBuyDialog(globalCtx, this, 0x84); + this->drawCursor = 0; + this->shopItemSelectedTween = 0.0f; + item->setOutOfStockFunc(globalCtx, item); + break; + case CANBUY_RESULT_CANT_GET_NOW: + func_80078884(NA_SE_SY_ERROR); + EnOssan_SetStateCantGetItem(globalCtx, this, 0x86); + break; + case CANBUY_RESULT_NEED_RUPEES: + func_80078884(NA_SE_SY_ERROR); + EnOssan_SetStateCantGetItem(globalCtx, this, 0x85); + break; + } +} + +void EnOssan_BuyGoronCityBombs(GlobalContext* globalCtx, EnOssan* this) { + if (LINK_AGE_IN_YEARS == YEARS_CHILD) { + if (!(gSaveContext.eventChkInf[2] & 0x20)) { + if (gSaveContext.infTable[15] & 0x1000) { + EnOssan_SetStateCantGetItem(globalCtx, this, 0x302E); + } else { + this->stickLeftPrompt.isEnabled = false; + this->stickRightPrompt.isEnabled = false; + this->drawCursor = 0; + this->stateFlag = OSSAN_STATE_DISPLAY_ONLY_BOMB_DIALOG; + } + } else { + EnOssan_HandleCanBuyBombs(globalCtx, this); + } + } else { + EnOssan_HandleCanBuyBombs(globalCtx, this); + } +} + +void EnOssan_State_ItemSelected(EnOssan* this, GlobalContext* globalCtx2, Player* player) { + GlobalContext* globalCtx = globalCtx2; // Necessary for OKs + + if (!EnOssan_TakeItemOffShelf(this)) { + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2654); + return; + } + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && + !EnOssan_TestCancelOption(this, globalCtx, &globalCtx->state.input[0]) && func_80106BC8(globalCtx)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + EnOssan_HandleCanBuyItem(globalCtx, this); + break; + case 1: + this->stateFlag = this->tempStateFlag; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + break; + } + } +} + +void EnOssan_State_SelectMilkBottle(EnOssan* this, GlobalContext* globalCtx2, Player* player) { + GlobalContext* globalCtx = globalCtx2; // Need for OK + + if (!EnOssan_TakeItemOffShelf(this)) { + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2693); + return; + } + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && + !EnOssan_TestCancelOption(this, globalCtx, &globalCtx->state.input[0]) && func_80106BC8(globalCtx)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + EnOssan_HandleCanBuyLonLonMilk(globalCtx, this); + break; + case 1: + this->stateFlag = this->tempStateFlag; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + break; + } + } +} + +void EnOssan_State_SelectWeirdEgg(EnOssan* this, GlobalContext* globalCtx2, Player* player) { + GlobalContext* globalCtx = globalCtx2; // Needed for OK + + if (!EnOssan_TakeItemOffShelf(this)) { + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2732); + return; + } + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && + !EnOssan_TestCancelOption(this, globalCtx, &globalCtx->state.input[0]) && func_80106BC8(globalCtx)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + EnOssan_HandleCanBuyWeirdEgg(globalCtx, this); + break; + case 1: + this->stateFlag = this->tempStateFlag; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + break; + } + } +} + +void EnOssan_State_SelectUnimplementedItem(EnOssan* this, GlobalContext* globalCtx, Player* player) { + if (!EnOssan_TakeItemOffShelf(this)) { + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2771); + return; + } + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx)) { + this->stateFlag = this->tempStateFlag; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + } +} + +void EnOssan_State_SelectBombs(EnOssan* this, GlobalContext* globalCtx, Player* player) { + if (!EnOssan_TakeItemOffShelf(this)) { + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2798); + return; + } + osSyncPrintf("店主の依頼 ( %d )\n", gSaveContext.infTable[15] & 0x1000); + if (this->actor.params != OSSAN_TYPE_GORON) { + EnOssan_State_ItemSelected(this, globalCtx, player); + return; + } + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && + !EnOssan_TestCancelOption(this, globalCtx, &globalCtx->state.input[0]) && func_80106BC8(globalCtx)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + EnOssan_BuyGoronCityBombs(globalCtx, this); + break; + case 1: + this->stateFlag = this->tempStateFlag; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + break; + } + } +} + +void EnOssan_State_SelectMaskItem(EnOssan* this, GlobalContext* globalCtx, Player* player) { + u8 talkState = func_8010BDBC(&globalCtx->msgCtx); + EnGirlA* item = this->shelfSlots[this->cursorIndex]; + + if (!EnOssan_TakeItemOffShelf(this)) { + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2845); + return; + } + if (talkState == 5) { + if (func_80106BC8(globalCtx)) { + this->stateFlag = this->tempStateFlag; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + } + } else if (talkState == 4 && !EnOssan_TestCancelOption(this, globalCtx, &globalCtx->state.input[0]) && + func_80106BC8(globalCtx)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + switch (item->actor.params) { + case SI_KEATON_MASK: + gSaveContext.itemGetInf[2] |= 0x08; + break; + case SI_SPOOKY_MASK: + gSaveContext.itemGetInf[2] |= 0x20; + break; + case SI_SKULL_MASK: + gSaveContext.itemGetInf[2] |= 0x10; + break; + case SI_BUNNY_HOOD: + gSaveContext.itemGetInf[2] |= 0x40; + break; + case SI_MASK_OF_TRUTH: + case SI_ZORA_MASK: + case SI_GORON_MASK: + case SI_GERUDO_MASK: + break; + } + EnOssan_GiveItemWithFanfare(globalCtx, this); + this->drawCursor = 0; + this->shopItemSelectedTween = 0.0f; + item->setOutOfStockFunc(globalCtx, item); + break; + case 1: + this->stateFlag = this->tempStateFlag; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + break; + } + } +} + +void EnOssan_State_CantGetItem(EnOssan* this, GlobalContext* globalCtx, Player* player) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx)) { + this->stateFlag = this->tempStateFlag; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + } +} + +void EnOssan_State_QuickBuyDialog(EnOssan* this, GlobalContext* globalCtx, Player* player) { + EnGirlA* item; + + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx)) { + this->shopItemSelectedTween = 0.0f; + EnOssan_ResetItemPosition(this); + item = this->shelfSlots[this->cursorIndex]; + item->updateStockedItemFunc(globalCtx, item); + this->stateFlag = this->tempStateFlag; + func_8010B720(globalCtx, this->shelfSlots[this->cursorIndex]->actor.textId); + } +} + +void EnOssan_State_GiveItemWithFanfare(EnOssan* this, GlobalContext* globalCtx, Player* player) { + // The player sets itself as the parent actor to signal that it has obtained the give item request + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; + this->stateFlag = OSSAN_STATE_ITEM_PURCHASED; + return; + } + func_8002F434(&this->actor, globalCtx, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f); +} + +void EnOssan_State_ItemPurchased(EnOssan* this, GlobalContext* globalCtx, Player* player) { + EnGirlA* item; + EnGirlA* itemTemp; + + if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && func_80106BC8(globalCtx)) { + if (this->actor.params == OSSAN_TYPE_MASK) { + itemTemp = this->shelfSlots[this->cursorIndex]; + EnOssan_ResetItemPosition(this); + item = this->shelfSlots[this->cursorIndex]; + item->updateStockedItemFunc(globalCtx, item); + if (itemTemp->actor.params == SI_MASK_OF_TRUTH && !(gSaveContext.itemGetInf[3] & 0x8000)) { + gSaveContext.itemGetInf[3] |= 0x8000; + func_8010B720(globalCtx, 0x70AB); + this->happyMaskShopState = OSSAN_HAPPY_STATE_BORROWED_FIRST_MASK; + EnOssan_UpdateShopOfferings(this, globalCtx); + this->stateFlag = OSSAN_STATE_START_CONVERSATION; + return; + } else { + EnOssan_EndInteraction(globalCtx, this); + return; + } + } + item = this->shelfSlots[this->cursorIndex]; + item->buyEventFunc(globalCtx, item); + this->stateFlag = OSSAN_STATE_CONTINUE_SHOPPING_PROMPT; + func_8010B720(globalCtx, 0x6B); + } +} + +void EnOssan_State_ContinueShoppingPrompt(EnOssan* this, GlobalContext* globalCtx, Player* player) { + EnGirlA* selectedItem; + u8 talkState = func_8010BDBC(&globalCtx->msgCtx); + + if (talkState == 4) { + if (func_80106BC8(globalCtx)) { + EnOssan_ResetItemPosition(this); + selectedItem = this->shelfSlots[this->cursorIndex]; + selectedItem->updateStockedItemFunc(globalCtx, selectedItem); + if (!EnOssan_TestEndInteraction(this, globalCtx, &globalCtx->state.input[0])) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + osSyncPrintf(VT_FGCOL(YELLOW) "★★★ 続けるよ！！ ★★★" VT_RST "\n"); + player->actor.shape.rot.y += 0x8000; + player->stateFlags2 |= 0x20000000; + func_800BC490(globalCtx, 2); + func_8010B680(globalCtx, this->actor.textId, &this->actor); + EnOssan_SetStateStartShopping(globalCtx, this, true); + func_8002F298(&this->actor, globalCtx, 100.0f, -1); + break; + case 1: + default: + osSyncPrintf(VT_FGCOL(YELLOW) "★★★ やめるよ！！ ★★★" VT_RST "\n"); + EnOssan_EndInteraction(globalCtx, this); + break; + } + } + } + } else if (talkState == 5 && func_80106BC8(globalCtx)) { + EnOssan_ResetItemPosition(this); + selectedItem = this->shelfSlots[this->cursorIndex]; + selectedItem->updateStockedItemFunc(globalCtx, selectedItem); + player->actor.shape.rot.y += 0x8000; + player->stateFlags2 |= 0x20000000; + func_800BC490(globalCtx, 2); + func_8010B680(globalCtx, this->actor.textId, &this->actor); + EnOssan_SetStateStartShopping(globalCtx, this, true); + func_8002F298(&this->actor, globalCtx, 100.0f, -1); + } +} + +void EnOssan_State_WaitForDisplayOnlyBombDialog(EnOssan* this, GlobalContext* globalCtx, Player* player) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx)) { + gSaveContext.infTable[15] |= 0x1000; + EnOssan_StartShopping(globalCtx, this); + } +} + +// Unreachable +void EnOssan_State_21(EnOssan* this, GlobalContext* globalCtx, Player* player) { + if (func_8010BDBC(&globalCtx->msgCtx) == 1 && func_80106BC8(globalCtx)) { + this->stateFlag = OSSAN_STATE_22; + func_8010B720(globalCtx, 0x3012); + gSaveContext.infTable[15] |= 0x1000; + } +} + +// Unreachable +void EnOssan_State_22(EnOssan* this, GlobalContext* globalCtx, Player* player) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx)) { + EnOssan_StartShopping(globalCtx, this); + } +} + +void EnOssan_State_GiveLonLonMilk(EnOssan* this, GlobalContext* globalCtx, Player* player) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx)) { + EnOssan_GiveItemWithFanfare(globalCtx, this); + } +} + +// For giving Mask of Truth when you first sell all masks +void EnOssan_State_LendMaskOfTruth(EnOssan* this, GlobalContext* globalCtx, Player* player) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx)) { + gSaveContext.itemGetInf[2] |= 0x400; + this->cursorIndex = 2; + EnOssan_GiveItemWithFanfare(globalCtx, this); + } +} + +// Hylian Shield discount dialog +void EnOssan_SetStateGiveDiscountDialog(GlobalContext* globalCtx, EnOssan* this) { + func_8010B720(globalCtx, 0x71B2); + this->stateFlag = OSSAN_STATE_DISCOUNT_DIALOG; +} + +void EnOssan_State_GiveDiscountDialog(EnOssan* this, GlobalContext* globalCtx, Player* player) { + EnGirlA* selectedItem; + + if (func_8010BDBC(&globalCtx->msgCtx) == 6 && func_80106BC8(globalCtx)) { + selectedItem = this->shelfSlots[this->cursorIndex]; + EnOssan_GiveItemWithFanfare(globalCtx, this); + this->drawCursor = 0; + this->shopItemSelectedTween = 0.0f; + selectedItem->setOutOfStockFunc(globalCtx, selectedItem); + } +} + +void EnOssan_PositionSelectedItem(EnOssan* this) { + EnGirlA* item; + u8 i; + u8 i2; + ShopItem* shopItem; + f32 tx; + f32 ty; + f32 tz; + + i = this->cursorIndex; + shopItem = &sShopkeeperStores[this->actor.params][i]; + item = this->shelfSlots[i]; + + i2 = i >> 2; + tx = (sSelectedItemPosition[i2].x - shopItem->xOffset) * this->shopItemSelectedTween + shopItem->xOffset; + ty = (sSelectedItemPosition[i2].y - shopItem->yOffset) * this->shopItemSelectedTween + shopItem->yOffset; + tz = (sSelectedItemPosition[i2].z - shopItem->zOffset) * this->shopItemSelectedTween + shopItem->zOffset; + + item->actor.world.pos.x = this->shelves->actor.world.pos.x + tx; + item->actor.world.pos.y = this->shelves->actor.world.pos.y + ty; + item->actor.world.pos.z = this->shelves->actor.world.pos.z + tz; +} + +void EnOssan_ResetItemPosition(EnOssan* this) { + this->shopItemSelectedTween = 0.0f; + EnOssan_PositionSelectedItem(this); +} + +// returns true if animation has completed +s32 EnOssan_TakeItemOffShelf(EnOssan* this) { + Math_ApproachF(&this->shopItemSelectedTween, 1.0f, 1.0f, 0.15f); + if (this->shopItemSelectedTween >= 0.85f) { + this->shopItemSelectedTween = 1.0f; + } + EnOssan_PositionSelectedItem(this); + if (this->shopItemSelectedTween == 1.0f) { + return true; + } else { + return false; + } +} + +// returns true if animation has completed +s32 EnOssan_ReturnItemToShelf(EnOssan* this) { + Math_ApproachF(&this->shopItemSelectedTween, 0.0f, 1.0f, 0.15f); + if (this->shopItemSelectedTween <= 0.15f) { + this->shopItemSelectedTween = 0.0f; + } + EnOssan_PositionSelectedItem(this); + if (this->shopItemSelectedTween == 0.0f) { + return true; + } else { + return false; + } +} + +void EnOssan_UpdateItemSelectedProperty(EnOssan* this) { + EnGirlA** temp_a1 = this->shelfSlots; + s32 i; + + for (i = 0; i < 8; i++) { + if (temp_a1[0] != NULL) { + if (this->stateFlag != OSSAN_STATE_SELECT_ITEM && this->stateFlag != OSSAN_STATE_SELECT_ITEM_MILK_BOTTLE && + this->stateFlag != OSSAN_STATE_SELECT_ITEM_WEIRD_EGG && + this->stateFlag != OSSAN_STATE_SELECT_ITEM_UNIMPLEMENTED && + this->stateFlag != OSSAN_STATE_SELECT_ITEM_BOMBS && this->stateFlag != OSSAN_STATE_SELECT_ITEM_MASK && + this->stateFlag != OSSAN_STATE_CANT_GET_ITEM && this->drawCursor == 0) { + temp_a1[0]->isSelected = false; + } else { + if (this->cursorIndex == i) { + temp_a1[0]->isSelected = true; + } else { + temp_a1[0]->isSelected = false; + } + } + } + temp_a1++; + } +} + +void EnOssan_UpdateCursorAnim(EnOssan* this) { + f32 t; + + t = this->cursorAnimTween; + if (this->cursorAnimState == 0) { + t += 0.05f; + if (t >= 1.0f) { + t = 1.0f; + this->cursorAnimState = 1; + } + } else { + t -= 0.05f; + if (t <= 0.0f) { + t = 0.0f; + this->cursorAnimState = 0; + } + } + this->cursorColorR = ColChanMix(0, 0.0f, t); + this->cursorColorG = ColChanMix(255, 80.0f, t); + this->cursorColorB = ColChanMix(80, 0.0f, t); + this->cursorColorA = ColChanMix(255, 0.0f, t); + this->cursorAnimTween = t; +} + +void EnOssan_UpdateStickDirectionPromptAnim(EnOssan* this) { + f32 arrowAnimTween; + f32 new_var3; // likely fake temp + s32 new_var2 = 255; // likely fake temp + f32 stickAnimTween; + + arrowAnimTween = this->arrowAnimTween; + stickAnimTween = this->stickAnimTween; + if (this->arrowAnimState == 0) { + arrowAnimTween += 0.05f; + if (arrowAnimTween > 1.0f) { + arrowAnimTween = 1.0f; + this->arrowAnimState = 1; + } + + } else { + arrowAnimTween -= 0.05f; + if (arrowAnimTween < 0.0f) { + arrowAnimTween = 0.0f; + this->arrowAnimState = 0; + } + } + + this->arrowAnimTween = arrowAnimTween; + if (this->stickAnimState == 0) { + stickAnimTween += 0.1f; + if (stickAnimTween > 1.0f) { + stickAnimTween = 1.0f; + this->stickAnimState = 1; + } + + } else { + stickAnimTween = 0.0f; + this->stickAnimState = 0; + } + + this->stickAnimTween = stickAnimTween; + this->stickLeftPrompt.arrowColorR = (u8)(255 - ((s32)(155.0f * arrowAnimTween))); + this->stickLeftPrompt.arrowColorG = (u8)(new_var2 - (s32)(155.0f * arrowAnimTween)); + new_var3 = (155.0f * arrowAnimTween); + this->stickLeftPrompt.arrowColorB = (u8)(0 - ((s32)((-100.0f) * arrowAnimTween))); + this->stickLeftPrompt.arrowColorA = (u8)(200 - ((s32)(50.0f * arrowAnimTween))); + this->stickRightPrompt.arrowColorR = (u8)(new_var2 - (s32)new_var3); + this->stickRightPrompt.arrowColorG = (u8)(255 - (s32)new_var3); + this->stickRightPrompt.arrowColorB = (u8)(0 - ((s32)((-100.0f) * arrowAnimTween))); + this->stickRightPrompt.arrowColorA = (u8)(200 - ((s32)(50.0f * arrowAnimTween))); + this->stickRightPrompt.arrowTexX = 290.0f; + this->stickLeftPrompt.arrowTexX = 33.0f; + this->stickRightPrompt.stickTexX = 274.0f; + this->stickLeftPrompt.stickTexX = 49.0f; + this->stickRightPrompt.stickTexX += (8.0f * stickAnimTween); + this->stickLeftPrompt.stickTexX -= (8.0f * stickAnimTween); + this->stickLeftPrompt.arrowTexY = this->stickRightPrompt.arrowTexY = 91.0f; + this->stickLeftPrompt.stickTexY = this->stickRightPrompt.stickTexY = 95.0f; +} + +void EnOssan_WaitForBlink(EnOssan* this) { + s16 decr = this->blinkTimer - 1; + + if (decr != 0) { + this->blinkTimer = decr; + } else { + this->blinkFunc = EnOssan_Blink; + } +} + +void EnOssan_Blink(EnOssan* this) { + s16 decr; + s16 eyeTextureIdxTemp; + + decr = this->blinkTimer - 1; + if (decr != 0) { + this->blinkTimer = decr; + return; + } + eyeTextureIdxTemp = this->eyeTextureIdx + 1; + if (eyeTextureIdxTemp > 2) { + this->eyeTextureIdx = 0; + this->blinkTimer = (s32)(Rand_ZeroOne() * 60.0f) + 20; + this->blinkFunc = EnOssan_WaitForBlink; + } else { + this->eyeTextureIdx = eyeTextureIdxTemp; + this->blinkTimer = 1; + } +} + +s32 EnOssan_AreShopkeeperObjectsLoaded(EnOssan* this, GlobalContext* globalCtx) { + if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex1)) { + if (this->objBankIndex2 >= 0 && !Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex2)) { + return false; + } + if (this->objBankIndex3 >= 0 && !Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex3)) { + return false; + } + return true; + } + return false; +} + +void EnOssan_InitBazaarShopkeeper(EnOssan* this, GlobalContext* globalCtx) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gObjectOssanSkel, &gObjectOssanAnim_000338, NULL, NULL, 0); + this->actor.draw = EnOssan_DrawBazaarShopkeeper; + this->obj3ToSeg6Func = NULL; +} + +void EnOssan_InitKokiriShopkeeper(EnOssan* this, GlobalContext* globalCtx) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060000F0, NULL, NULL, NULL, 0); + gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objBankIndex3].segment); + Animation_Change(&this->skelAnime, &object_masterkokiri_Anim_0004A8, 1.0f, 0.0f, + Animation_GetLastFrame(&object_masterkokiri_Anim_0004A8), 0, 0.0f); + this->actor.draw = EnOssan_DrawKokiriShopkeeper; + this->obj3ToSeg6Func = EnOssan_Obj3ToSeg6; + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, this->actor.world.pos.x, + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, FAIRY_KOKIRI); +} + +void EnOssan_InitGoronShopkeeper(EnOssan* this, GlobalContext* globalCtx) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGoronSkel, NULL, NULL, NULL, 0); + gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objBankIndex3].segment); + Animation_Change(&this->skelAnime, &D_060000FC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060000FC), 0, 0.0f); + this->actor.draw = EnOssan_DrawGoronShopkeeper; + this->obj3ToSeg6Func = EnOssan_Obj3ToSeg6; +} + +void EnOssan_InitZoraShopkeeper(EnOssan* this, GlobalContext* globalCtx) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gZoraSkel, NULL, NULL, NULL, 0); + gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objBankIndex3].segment); + Animation_Change(&this->skelAnime, &D_0600078C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600078C), 0, 0.0f); + this->actor.draw = EnOssan_DrawZoraShopkeeper; + this->obj3ToSeg6Func = EnOssan_Obj3ToSeg6; +} + +void EnOssan_InitPotionShopkeeper(EnOssan* this, GlobalContext* globalCtx) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ds2_Skel_004258, &object_ds2_Anim_0002E4, 0, 0, 0); + this->actor.draw = EnOssan_DrawPotionShopkeeper; + this->obj3ToSeg6Func = NULL; +} + +void EnOssan_InitHappyMaskShopkeeper(EnOssan* this, GlobalContext* globalCtx) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_os_Skel_004658, &object_os_Anim_0002E4, NULL, NULL, 0); + this->actor.draw = EnOssan_DrawHappyMaskShopkeeper; + this->obj3ToSeg6Func = NULL; +} + +void EnOssan_InitBombchuShopkeeper(EnOssan* this, GlobalContext* globalCtx) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rs_Skel_004868, &object_rs_Anim_00065C, 0, 0, 0); + this->actor.draw = EnOssan_DrawBombchuShopkeeper; + this->obj3ToSeg6Func = NULL; +} + +u16 EnOssan_SetupHelloDialog(EnOssan* this) { + this->happyMaskShopState = OSSAN_HAPPY_STATE_NONE; + // mask shop messages + if (this->actor.params == OSSAN_TYPE_MASK) { + if (INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_SOLD_OUT) { + if (gSaveContext.itemGetInf[3] & 0x800) { + if (!(gSaveContext.eventChkInf[8] & 0x8000)) { + // Pay back Bunny Hood + this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_BUNNY_HOOD; + return 0x70C6; + } else { + return 0x70AC; + } + } + if (gSaveContext.itemGetInf[3] & 0x400) { + if (!(gSaveContext.eventChkInf[8] & 0x4000)) { + // Pay back Spooky Mask + this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SPOOKY_MASK; + return 0x70C5; + } else { + return 0x70AC; + } + } + if (gSaveContext.itemGetInf[3] & 0x200) { + if (!(gSaveContext.eventChkInf[8] & 0x2000)) { + // Pay back Skull Mask + this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SKULL_MASK; + return 0x70C4; + } else { + return 0x70AC; + } + } + if (gSaveContext.itemGetInf[3] & 0x100) { + if (!(gSaveContext.eventChkInf[8] & 0x1000)) { + // Pay back Keaton Mask + this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_KEATON_MASK; + return 0x70A5; + } else { + return 0x70AC; + } + } + } else { + if (gSaveContext.itemGetInf[3] & 0x800) { + return 0x70AC; + } else if (!(gSaveContext.itemGetInf[3] & 0x400) && !(gSaveContext.itemGetInf[2] & 0x10) && + !(gSaveContext.itemGetInf[3] & 0x100)) { + // Haven't borrowed the Keaton Mask + if (!(gSaveContext.itemGetInf[2] & 0x8)) { + return 0x70A1; + } else { + // Haven't sold the Keaton Mask + this->happyMaskShopState = OSSAN_HAPPY_STATE_BORROWED_FIRST_MASK; + return 0x70A6; + } + } else { + return 0x70C7; + } + } + } + + return 0x9E; +} + +void EnOssan_InitActionFunc(EnOssan* this, GlobalContext* globalCtx) { + ShopItem* items; + + if (EnOssan_AreShopkeeperObjectsLoaded(this, globalCtx)) { + this->actor.flags &= ~0x10; + this->actor.objBankIndex = this->objBankIndex1; + Actor_SetObjectDependency(globalCtx, &this->actor); + + this->shelves = (EnTana*)Actor_Find(&globalCtx->actorCtx, ACTOR_EN_TANA, ACTORCAT_PROP); + + if (this->shelves == NULL) { + osSyncPrintf(VT_COL(RED, WHITE)); + // "Warning!! There are no shelves!!" + osSyncPrintf("★★★ 警告！！ 棚がないよ！！ ★★★\n"); + osSyncPrintf(VT_RST); + return; + } + + // "Shopkeeper (params) init" + osSyncPrintf(VT_FGCOL(YELLOW) "◇◇◇ 店のおやじ( %d ) 初期設定 ◇◇◇" VT_RST "\n", this->actor.params); + + this->actor.world.pos.x += sShopkeeperPositionOffsets[this->actor.params].x; + this->actor.world.pos.y += sShopkeeperPositionOffsets[this->actor.params].y; + this->actor.world.pos.z += sShopkeeperPositionOffsets[this->actor.params].z; + + items = sShopkeeperStores[this->actor.params]; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f); + sInitFuncs[this->actor.params](this, globalCtx); + this->actor.textId = EnOssan_SetupHelloDialog(this); + this->cursorY = this->cursorX = 100.0f; + this->actor.colChkInfo.mass = MASS_IMMOVABLE; + this->actor.colChkInfo.cylRadius = 50; + this->stateFlag = OSSAN_STATE_IDLE; + this->stickAccumX = this->stickAccumY = 0; + + this->cursorIndex = 0; + this->cursorZ = 1.5f; + this->cursorColorR = 0; + this->cursorColorG = 255; + this->cursorColorB = 80; + this->cursorColorA = 255; + this->cursorAnimTween = 0; + + this->cursorAnimState = 0; + this->drawCursor = 0; + this->happyMaskShopkeeperEyeIdx = 0; + + this->stickLeftPrompt.stickColorR = 200; + this->stickLeftPrompt.stickColorG = 200; + this->stickLeftPrompt.stickColorB = 200; + this->stickLeftPrompt.stickColorA = 180; + this->stickLeftPrompt.stickTexX = 49; + this->stickLeftPrompt.stickTexY = 95; + this->stickLeftPrompt.arrowColorR = 255; + this->stickLeftPrompt.arrowColorG = 255; + this->stickLeftPrompt.arrowColorB = 0; + this->stickLeftPrompt.arrowColorA = 200; + this->stickLeftPrompt.arrowTexX = 33; + this->stickLeftPrompt.arrowTexY = 91; + this->stickLeftPrompt.z = 1; + this->stickLeftPrompt.isEnabled = false; + + this->stickRightPrompt.stickColorR = 200; + this->stickRightPrompt.stickColorG = 200; + this->stickRightPrompt.stickColorB = 200; + this->stickRightPrompt.stickColorA = 180; + this->stickRightPrompt.stickTexX = 274; + this->stickRightPrompt.stickTexY = 95; + this->stickRightPrompt.arrowColorR = 255; + this->stickRightPrompt.arrowColorG = 255; + this->stickRightPrompt.arrowColorB = 0; + this->stickRightPrompt.arrowColorA = 200; + this->stickRightPrompt.arrowTexX = 290; + this->stickRightPrompt.arrowTexY = 91; + this->stickRightPrompt.z = 1; + this->stickRightPrompt.isEnabled = false; + + this->arrowAnimState = 0; + this->stickAnimState = 0; + this->arrowAnimTween = 0; + this->stickAnimTween = 0; + this->shopItemSelectedTween = 0; + Actor_SetScale(&this->actor, sShopkeeperScale[this->actor.params]); + EnOssan_SpawnItemsOnShelves(this, globalCtx, items); + this->headRot = this->headTargetRot = 0; + this->blinkTimer = 20; + this->eyeTextureIdx = 0; + this->blinkFunc = EnOssan_WaitForBlink; + this->actor.flags &= ~1; + EnOssan_SetupAction(this, EnOssan_MainActionFunc); + } +} + +void EnOssan_Obj3ToSeg6(EnOssan* this, GlobalContext* globalCtx) { + gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objBankIndex3].segment); +} + +void EnOssan_MainActionFunc(EnOssan* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->blinkFunc(this); + EnOssan_UpdateJoystickInputState(globalCtx, this); + EnOssan_UpdateItemSelectedProperty(this); + EnOssan_UpdateStickDirectionPromptAnim(this); + EnOssan_UpdateCursorAnim(this); + Math_StepToS(&this->headRot, this->headTargetRot, 0x190); + + if (player != NULL) { + sStateFunc[this->stateFlag](this, globalCtx, player); + } + + Actor_MoveForward(&this->actor); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 26.0f, 10.0f, 0.0f, 5); + Actor_SetFocus(&this->actor, 90.0f); + Actor_SetScale(&this->actor, sShopkeeperScale[this->actor.params]); + + // use animation object if needed + if (this->obj3ToSeg6Func != NULL) { + this->obj3ToSeg6Func(this, globalCtx); + } + + SkelAnime_Update(&this->skelAnime); +} + +void EnOssan_Update(Actor* thisx, GlobalContext* globalCtx) { + EnOssan* this = THIS; + + this->timer++; + this->actionFunc(this, globalCtx); +} + +s32 EnOssan_OverrideLimbDrawDefaultShopkeeper(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, + Vec3s* rot, void* thisx) { + EnOssan* this = THIS; + + if (limbIndex == 8) { + rot->x += this->headRot; + } + return 0; +} + +void EnOssan_DrawCursor(GlobalContext* globalCtx, EnOssan* this, f32 x, f32 y, f32 z, u8 drawCursor) { + s32 ulx, uly, lrx, lry; + f32 w; + s32 dsdx; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4192); + if (drawCursor != 0) { + func_80094520(globalCtx->state.gfxCtx); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, this->cursorColorR, this->cursorColorG, this->cursorColorB, + this->cursorColorA); + do { + gDPLoadTextureBlock_4b(OVERLAY_DISP++, &gSelectionCursorTex, G_IM_FMT_IA, 16, 16, 0, + G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); + } while (0); + w = 16.0f * z; + ulx = (x - w) * 4.0f; + uly = (y - w) * 4.0f; + lrx = (x + w) * 4.0f; + lry = (y + w) * 4.0f; + dsdx = (1.0f / z) * 1024.0f; + gSPTextureRectangle(OVERLAY_DISP++, ulx, uly, lrx, lry, G_TX_RENDERTILE, 0, 0, dsdx, dsdx); + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4215); +} + +void EnOssan_DrawTextRec(GlobalContext* globalCtx, s32 r, s32 g, s32 b, s32 a, f32 x, f32 y, f32 z, s32 s, s32 t, + f32 dx, f32 dy) { + f32 unk; + s32 ulx, uly, lrx, lry; + f32 w, h; + s32 dsdx, dtdy; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4228); + gDPPipeSync(OVERLAY_DISP++); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, r, g, b, a); + + w = 8.0f * z; + h = 12.0f * z; + unk = (1.0f / z) * 1024; + dsdx = unk * dx; + dtdy = dy * unk; + + ulx = (x - w) * 4.0f; + uly = (y - h) * 4.0f; + lrx = (x + w) * 4.0f; + lry = (y + h) * 4.0f; + gSPTextureRectangle(OVERLAY_DISP++, ulx, uly, lrx, lry, G_TX_RENDERTILE, s, t, dsdx, dtdy); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4242); +} + +void EnOssan_DrawStickDirectionPrompts(GlobalContext* globalCtx, EnOssan* this) { + s32 drawStickLeftPrompt = this->stickLeftPrompt.isEnabled; + s32 drawStickRightPrompt = this->stickRightPrompt.isEnabled; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4252); + if (drawStickLeftPrompt || drawStickRightPrompt) { + func_80094520(globalCtx->state.gfxCtx); + gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &gArrowCursorTex); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD); + gDPLoadSync(OVERLAY_DISP++); + gDPLoadBlock(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, 191, 1024); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD); + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, 15 * 4, 23 * 4); + if (drawStickLeftPrompt) { + EnOssan_DrawTextRec(globalCtx, this->stickLeftPrompt.arrowColorR, this->stickLeftPrompt.arrowColorG, + this->stickLeftPrompt.arrowColorB, this->stickLeftPrompt.arrowColorA, + this->stickLeftPrompt.arrowTexX, this->stickLeftPrompt.arrowTexY, + this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f); + } + if (drawStickRightPrompt) { + EnOssan_DrawTextRec(globalCtx, this->stickRightPrompt.arrowColorR, this->stickRightPrompt.arrowColorG, + this->stickRightPrompt.arrowColorB, this->stickRightPrompt.arrowColorA, + this->stickRightPrompt.arrowTexX, this->stickRightPrompt.arrowTexY, + this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f); + } + gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, &gControlStickTex); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD); + gDPLoadSync(OVERLAY_DISP++); + gDPLoadBlock(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, 127, 1024); + gDPPipeSync(OVERLAY_DISP++); + gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD); + gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, 15 * 4, 15 * 4); + if (drawStickLeftPrompt) { + EnOssan_DrawTextRec(globalCtx, this->stickLeftPrompt.stickColorR, this->stickLeftPrompt.stickColorG, + this->stickLeftPrompt.stickColorB, this->stickLeftPrompt.stickColorA, + this->stickLeftPrompt.stickTexX, this->stickLeftPrompt.stickTexY, + this->stickLeftPrompt.z, 0, 0, -1.0f, 1.0f); + } + if (drawStickRightPrompt) { + EnOssan_DrawTextRec(globalCtx, this->stickRightPrompt.stickColorR, this->stickRightPrompt.stickColorG, + this->stickRightPrompt.stickColorB, this->stickRightPrompt.stickColorA, + this->stickRightPrompt.stickTexX, this->stickRightPrompt.stickTexY, + this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f); + } + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4300); +} + +void EnOssan_DrawBazaarShopkeeper(Actor* thisx, GlobalContext* globalCtx) { + static void* sBazaarShopkeeperEyeTextures[] = { gOssanEyeOpenTex, gOssanEyeHalfTex, gOssanEyeClosedTex }; + EnOssan* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4320); + + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sBazaarShopkeeperEyeTextures[this->eyeTextureIdx])); + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + EnOssan_OverrideLimbDrawDefaultShopkeeper, NULL, this); + EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); + EnOssan_DrawStickDirectionPrompts(globalCtx, this); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4340); +} + +s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, + Vec3s* rot, void* thisx) { + static void* sKokiriShopkeeperEyeTextures[] = { 0x06001570, 0x060001F0, 0x06000B30 }; + EnOssan* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4354); + + if (limbIndex == 15) { + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->objBankIndex2].segment); + gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objBankIndex2].segment); + *dList = D_06002820; + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(sKokiriShopkeeperEyeTextures[this->eyeTextureIdx])); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4374); + + return 0; +} + +Gfx* EnOssan_EndDList(GraphicsContext* gfxCtx) { + Gfx* disp = Graph_Alloc(gfxCtx, sizeof(Gfx)); + + gSPEndDisplayList(disp); + return disp; +} + +Gfx* EnOssan_SetEnvColor(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b, u8 a) { + Gfx* disp = Graph_Alloc(gfxCtx, sizeof(Gfx) * 2); + + gDPSetEnvColor(disp, r, g, b, a); + gSPEndDisplayList(disp + 1); + return disp; +} + +void EnOssan_DrawKokiriShopkeeper(Actor* thisx, GlobalContext* globalCtx) { + EnOssan* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4409); + + func_80093D18(globalCtx->state.gfxCtx); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x08, EnOssan_SetEnvColor(globalCtx->state.gfxCtx, 0, 130, 70, 255)); + gSPSegment(POLY_OPA_DISP++, 0x09, EnOssan_SetEnvColor(globalCtx->state.gfxCtx, 110, 170, 20, 255)); + gSPSegment(POLY_OPA_DISP++, 0x0C, EnOssan_EndDList(globalCtx->state.gfxCtx)); + + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + EnOssan_OverrideLimbDrawKokiriShopkeeper, NULL, this); + EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); + EnOssan_DrawStickDirectionPrompts(globalCtx, this); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4434); +} + +void EnOssan_DrawGoronShopkeeper(Actor* thisx, GlobalContext* globalCtx) { + static void* sGoronShopkeeperEyeTextures[] = { gGoronCsEyeOpenTex, gGoronCsEyeHalfTex, gGoronCsEyeClosedTex }; + EnOssan* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4455); + + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGoronShopkeeperEyeTextures[this->eyeTextureIdx])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gGoronCsMouthNeutralTex)); + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + NULL, NULL, this); + EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); + EnOssan_DrawStickDirectionPrompts(globalCtx, this); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4476); +} + +s32 EnOssan_OverrideLimbDrawZoraShopkeeper(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + EnOssan* this = THIS; + + if (limbIndex == 15) { + rot->x += this->headRot; + } + return 0; +} + +void EnOssan_DrawZoraShopkeeper(Actor* thisx, GlobalContext* globalCtx) { + static void* sZoraShopkeeperEyeTextures[] = { gZoraEyeOpenTex, gZoraEyeHalfTex, gZoraEyeClosedTex }; + EnOssan* this = THIS; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CB8.s") + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4506); + + func_80093D18(globalCtx->state.gfxCtx); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x0C, EnOssan_EndDList(globalCtx->state.gfxCtx)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sZoraShopkeeperEyeTextures[this->eyeTextureIdx])); + + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + EnOssan_OverrideLimbDrawZoraShopkeeper, NULL, this); + EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); + EnOssan_DrawStickDirectionPrompts(globalCtx, this); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2CE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D48.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2D78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2DD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC2F2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3098.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC30FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC311C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC313C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3180.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC31F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC32C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3350.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC33B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3744.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC37A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3884.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC38C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3928.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC39AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3A80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3AE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3B18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3BCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3D18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3E50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3ED8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC3F38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4074.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4220.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4288.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC43F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC44DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC45C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC47DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4978.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4B4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4D20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4DDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4EC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC4FE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5014.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC51B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC52C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC53F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC54F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5594.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5680.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC576C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5858.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5900.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5A28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5C9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5D40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5DAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC5EF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC60E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6148.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC61B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6208.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6258.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC62F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6384.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC646C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6490.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC652C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC65B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC66F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC67C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6970.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC69A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6A44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6F2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7094.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7380.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC73B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC74F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC801C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8048.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s") + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4531); +} + +void EnOssan_DrawPotionShopkeeper(Actor* thisx, GlobalContext* globalCtx) { + static void* sPotionShopkeeperEyeTextures[] = { gPotionShopkeeperEyeOpenTex, gPotionShopkeeperEyeHalfTex, + gPotionShopkeeperEyeClosedTex }; + EnOssan* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4544); + + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sPotionShopkeeperEyeTextures[this->eyeTextureIdx])); + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + NULL, NULL, this); + EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); + EnOssan_DrawStickDirectionPrompts(globalCtx, this); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4564); +} + +void EnOssan_DrawHappyMaskShopkeeper(Actor* thisx, GlobalContext* globalCtx) { + static void* sHappyMaskShopkeeperEyeTextures[] = { gOsEyeClosedTex, gOsEyeOpenTex }; + EnOssan* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4578); + + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(POLY_OPA_DISP++, 0x08, + SEGMENTED_TO_VIRTUAL(sHappyMaskShopkeeperEyeTextures[this->happyMaskShopkeeperEyeIdx])); + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + NULL, NULL, this); + EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); + EnOssan_DrawStickDirectionPrompts(globalCtx, this); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4598); +} + +void EnOssan_DrawBombchuShopkeeper(Actor* thisx, GlobalContext* globalCtx) { + static void* sBombchuShopkeeperEyeTextures[] = { gBombchuShopkeeperEyeOpenTex, gBombchuShopkeeperEyeHalfTex, + gBombchuShopkeeperEyeClosedTex }; + EnOssan* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4611); + + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sBombchuShopkeeperEyeTextures[this->eyeTextureIdx])); + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + NULL, NULL, this); + EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); + EnOssan_DrawStickDirectionPrompts(globalCtx, this); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4631); +} diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h index 429ef58466..bcbce4cf77 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h @@ -3,14 +3,141 @@ #include "ultra64.h" #include "global.h" +#include "overlays/actors/ovl_En_Tana/z_en_tana.h" +#include "overlays/actors/ovl_En_GirlA/z_en_girla.h" struct EnOssan; +typedef void (*EnOssanActionFunc)(struct EnOssan*, GlobalContext*); +typedef void (*EnOssanTalkOwnerFunc)(GlobalContext*); +typedef void (*EnOssanInitFunc)(struct EnOssan*, GlobalContext*); +typedef s16 (*EnOssanGetGirlAParamsFunc)(s16); +typedef void (*EnOssanStateFunc)(struct EnOssan*, GlobalContext*, Player*); + +typedef struct { + /* 0x00 */ u32 stickColorR; + /* 0x04 */ u32 stickColorG; + /* 0x08 */ u32 stickColorB; + /* 0x0C */ u32 stickColorA; + /* 0x10 */ f32 stickTexX; + /* 0x14 */ f32 stickTexY; + /* 0x18 */ u32 arrowColorR; + /* 0x1C */ u32 arrowColorG; + /* 0x20 */ u32 arrowColorB; + /* 0x24 */ u32 arrowColorA; + /* 0x28 */ f32 arrowTexX; + /* 0x2C */ f32 arrowTexY; + /* 0x30 */ f32 z; + /* 0x34 */ s32 isEnabled; +} StickDirectionPrompt; // size = 0x38 + +#define ColChanMix(c1, c2, m) (c1 - (s32)(c2 * m)) & 0xFF + typedef struct EnOssan { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x18C]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnOssanActionFunc actionFunc; + /* 0x0194 */ void (*obj3ToSeg6Func)(struct EnOssan*, GlobalContext*); + /* 0x0198 */ ColliderCylinder collider; // unused + /* 0x01E4 */ s16 timer; + /* 0x01E6 */ s16 delayTimer; + /* 0x01E8 */ s8 objBankIndex1; + /* 0x01E9 */ s8 objBankIndex2; + /* 0x01EA */ s8 objBankIndex3; + /* 0x01EB */ u8 happyMaskShopState; + /* 0x01EC */ u8 happyMaskShopkeeperEyeIdx; + /* 0x01EE */ s16 headRot; + /* 0x01F0 */ s16 headTargetRot; + /* 0x01F2 */ s16 eyeTextureIdx; + /* 0x01F4 */ s16 blinkTimer; + /* 0x01F8 */ void (*blinkFunc)(struct EnOssan*); + /* 0x01FC */ s16 stateFlag; + /* 0x01FE */ s16 tempStateFlag; + /* 0x0200 */ EnGirlA* shelfSlots[8]; + // Shelves are indexed as such: + /* 7 5 3 1 */ + /* 6 4 2 0 */ + /* 0x0220 */ EnTana* shelves; + /* 0x0224 */ s32 stickAccumX; + /* 0x0228 */ s32 stickAccumY; + /* 0x022C */ u8 moveHorizontal; + /* 0x022D */ u8 moveVertical; + /* 0x0230 */ f32 cursorX; + /* 0x0234 */ f32 cursorY; + /* 0x0238 */ f32 cursorZ; + /* 0x023C */ u32 cursorColorR; + /* 0x0240 */ u32 cursorColorG; + /* 0x0244 */ u32 cursorColorB; + /* 0x0248 */ u32 cursorColorA; + /* 0x024C */ f32 cursorAnimTween; + /* 0x0250 */ u8 cursorAnimState; + /* 0x0251 */ u8 drawCursor; + /* 0x0252 */ u8 cursorIndex; + /* 0x0254 */ StickDirectionPrompt stickLeftPrompt; + /* 0x028C */ StickDirectionPrompt stickRightPrompt; + /* 0x02C4 */ f32 arrowAnimTween; + /* 0x02C4 */ f32 stickAnimTween; + /* 0x02CC */ u8 arrowAnimState; + /* 0x02CD */ u8 stickAnimState; + /* 0x02D0 */ f32 shopItemSelectedTween; + /* 0x02D4 */ f32 cameraFaceAngle; // stored in degrees } EnOssan; // size = 0x02D8 extern const ActorInit En_Ossan_InitVars; +typedef enum { + /* 00 */ OSSAN_TYPE_KOKIRI, + /* 01 */ OSSAN_TYPE_KAKARIKO_POTION, + /* 02 */ OSSAN_TYPE_BOMBCHUS, + /* 03 */ OSSAN_TYPE_MARKET_POTION, + /* 04 */ OSSAN_TYPE_BAZAAR, + /* 05 */ OSSAN_TYPE_ADULT, + /* 06 */ OSSAN_TYPE_TALON, + /* 07 */ OSSAN_TYPE_ZORA, + /* 08 */ OSSAN_TYPE_GORON, + /* 09 */ OSSAN_TYPE_INGO, + /* 10 */ OSSAN_TYPE_MASK +} OssanType; + +typedef enum { + /* 00 */ OSSAN_STATE_IDLE, + /* 01 */ OSSAN_STATE_START_CONVERSATION, + /* 02 */ OSSAN_STATE_FACING_SHOPKEEPER, + /* 03 */ OSSAN_STATE_TALKING_TO_SHOPKEEPER, + /* 04 */ OSSAN_STATE_LOOK_SHELF_LEFT, + /* 05 */ OSSAN_STATE_LOOK_SHELF_RIGHT, + /* 06 */ OSSAN_STATE_BROWSE_LEFT_SHELF, + /* 07 */ OSSAN_STATE_BROWSE_RIGHT_SHELF, + /* 08 */ OSSAN_STATE_LOOK_SHOPKEEPER, // From looking at shelf + /* 09 */ OSSAN_STATE_SELECT_ITEM, // Select most items + /* 10 */ OSSAN_STATE_SELECT_ITEM_MILK_BOTTLE, + /* 11 */ OSSAN_STATE_SELECT_ITEM_WEIRD_EGG, + /* 12 */ OSSAN_STATE_SELECT_ITEM_UNIMPLEMENTED, // Handles two unfinished shop items + /* 13 */ OSSAN_STATE_SELECT_ITEM_BOMBS, + /* 14 */ OSSAN_STATE_CANT_GET_ITEM, + /* 15 */ OSSAN_STATE_GIVE_ITEM_FANFARE, // Give Item, hold it up with fanfare + /* 16 */ OSSAN_STATE_ITEM_PURCHASED, + /* 17 */ OSSAN_STATE_CONTINUE_SHOPPING_PROMPT, + /* 18 */ OSSAN_STATE_GIVE_LON_LON_MILK, + /* 19 */ OSSAN_STATE_DISPLAY_ONLY_BOMB_DIALOG, // Turn to shopkeeper, talk about fake bombs + /* 20 */ OSSAN_STATE_WAIT_FOR_DISPLAY_ONLY_BOMB_DIALOG, // Can't Get Goron City Bombs + /* 21 */ OSSAN_STATE_21, // Unused + /* 22 */ OSSAN_STATE_22, // Follows OSSAN_STATE_21 + /* 23 */ OSSAN_STATE_QUICK_BUY, + /* 24 */ OSSAN_STATE_SELECT_ITEM_MASK, + /* 25 */ OSSAN_STATE_LEND_MASK_OF_TRUTH, // First time all masks are sold + /* 26 */ OSSAN_STATE_DISCOUNT_DIALOG // Hylian Shield Discount +} EnOssanState; + +typedef enum { + OSSAN_HAPPY_STATE_REQUEST_PAYMENT_KEATON_MASK, + OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SPOOKY_MASK, + OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SKULL_MASK, + OSSAN_HAPPY_STATE_REQUEST_PAYMENT_BUNNY_HOOD, + OSSAN_HAPPY_STATE_BORROWED_FIRST_MASK, + OSSAN_HAPPY_STATE_ANGRY, // Give me my money man! + OSSAN_HAPPY_STATE_ALL_MASKS_SOLD, // All masks have been sold + OSSAN_HAPPY_STATE_NONE = 8 // No Action / Payment received! +} EnOssanHappyMaskState; + #endif diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 7fce2797bf..f851342575 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -1,6 +1,7 @@ #include "z_en_syateki_man.h" #include "vt.h" #include "overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h" +#include "objects/object_ossan/object_ossan.h" #define FLAGS 0x08000019 @@ -43,10 +44,6 @@ void EnSyatekiMan_Blink(EnSyatekiMan* this); void EnSyatekiMan_SetBgm(void); -extern AnimationHeader D_06000338; -extern Gfx D_06007E28[]; -extern FlexSkeletonHeader D_06009B38; - const ActorInit En_Syateki_Man_InitVars = { ACTOR_EN_SYATEKI_MAN, ACTORCAT_NPC, @@ -66,6 +63,7 @@ static u16 sBgmList[] = { 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x6D, 0x5E, 0x5E, 0x5F, 0x60, 0x61, 0x6D, 0x62, 0x63, 0x64, 0x65, 0x66, }; + static s16 sTextIds[] = { 0x2B, 0x2E, 0xC8, 0x2D }; static s16 sTextBoxCount[] = { 4, 5, 5, 5 }; @@ -79,7 +77,8 @@ void EnSyatekiMan_Init(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 親父登場！！むほほほほほほほーん ☆☆☆☆☆ \n" VT_RST); this->actor.targetMode = 1; Actor_SetScale(&this->actor, 0.01f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06009B38, &D_06000338, this->jointTable, this->morphTable, 9); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gObjectOssanSkel, &gObjectOssanAnim_000338, this->jointTable, + this->morphTable, 9); if (LINK_IS_CHILD) { this->headRot.z = 20; } @@ -94,9 +93,9 @@ void EnSyatekiMan_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void EnSyatekiMan_Start(EnSyatekiMan* this, GlobalContext* globalCtx) { - f32 lastFrame = Animation_GetLastFrame(&D_06000338); + f32 lastFrame = Animation_GetLastFrame(&gObjectOssanAnim_000338); - Animation_Change(&this->skelAnime, &D_06000338, 1.0f, 0.0f, (s16)lastFrame, ANIMMODE_LOOP, -10.0f); + Animation_Change(&this->skelAnime, &gObjectOssanAnim_000338, 1.0f, 0.0f, (s16)lastFrame, ANIMMODE_LOOP, -10.0f); this->actionFunc = EnSyatekiMan_SetupIdle; } @@ -403,7 +402,7 @@ s32 EnSyatekiMan_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** rot->x += this->bodyRot.y; } if (limbIndex == 8) { - *dList = D_06007E28; + *dList = gObjectOssanEnSyatekiManDL_007E28; turnDirection = 1; if (this->gameResult == SYATEKI_RESULT_REFUSE) { turnDirection = -1; diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index 6808f9646e..30980a72a6 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -5,6 +5,7 @@ */ #include "z_en_tana.h" +#include "objects/object_shop_dungen/object_shop_dungen.h" #define FLAGS 0x00000009 @@ -13,8 +14,8 @@ void EnTana_Init(Actor* thisx, GlobalContext* globalCtx); void EnTana_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnTana_Update(Actor* thisx, GlobalContext* globalCtx); -void func_80B17FC4(Actor* thisx, GlobalContext* globalCtx); -void func_80B1809C(Actor* thisx, GlobalContext* globalCtx); +void EnTana_DrawWoodenShelves(Actor* thisx, GlobalContext* globalCtx); +void EnTana_DrawStoneShelves(Actor* thisx, GlobalContext* globalCtx); const ActorInit En_Tana_InitVars = { ACTOR_EN_TANA, @@ -34,21 +35,21 @@ static char* sShelfTypes[] = { }; static const ActorFunc sDrawFuncs[] = { - func_80B17FC4, - func_80B1809C, - func_80B1809C, + EnTana_DrawWoodenShelves, + EnTana_DrawStoneShelves, + EnTana_DrawStoneShelves, }; -static Gfx* sDLists1[] = { - 0x06000B80, - 0x060027E8, - 0x060027E8, +static Gfx* sShelfDLists[] = { + gShopDungenWoodenShelvesDL, + gShopDungenStoneShelvesDL, + gShopDungenStoneShelvesDL, }; -static UNK_PTR sUnkSegments[] = { +static void* sStoneTextures[] = { NULL, - 0x06000E08, - 0x06001608, + gShopDungenStone1Tex, + gShopDungenStone2Tex, }; void EnTana_Init(Actor* thisx, GlobalContext* globalCtx) { @@ -66,7 +67,7 @@ void EnTana_Destroy(Actor* thisx, GlobalContext* globalCtx) { void EnTana_Update(Actor* thisx, GlobalContext* globalCtx) { } -void func_80B17FC4(Actor* thisx, GlobalContext* globalCtx) { +void EnTana_DrawWoodenShelves(Actor* thisx, GlobalContext* globalCtx) { EnTana* this = THIS; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 148); @@ -74,21 +75,21 @@ void func_80B17FC4(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 152), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, sDLists1[thisx->params]); + gSPDisplayList(POLY_OPA_DISP++, sShelfDLists[thisx->params]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 157); } -void func_80B1809C(Actor* thisx, GlobalContext* globalCtx) { +void EnTana_DrawStoneShelves(Actor* thisx, GlobalContext* globalCtx) { EnTana* this = THIS; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 163); func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sUnkSegments[thisx->params])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sStoneTextures[thisx->params])); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 169), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, sDLists1[thisx->params]); + gSPDisplayList(POLY_OPA_DISP++, sShelfDLists[thisx->params]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 174); }