From a072e71c33dc4f78f20f7b4ba8645346af66fd9c Mon Sep 17 00:00:00 2001 From: Erin Moon Date: Thu, 21 Jan 2021 22:16:51 -0600 Subject: [PATCH] Z2AudioLib misc decomp (#75) * Z2SoundHandles: decomp portions * start decomping: Z2SpeechMgr2, Z2SoundHandles * Z2SoundHandles::stopAllSounds(): ok * Z2SoundHandles::getHandleUserData(): ok * Z2SoundInfo: header * Z2SoundObjBase::framework(): ok * Z2SoundObjBase::Z2SoundObjBase(), Z2SoundObjBase::init(): ok * Z2SoundObjBase::~Z2SoundObjBase(): ok * Z2SoundObjBase::stopOK(): ok * Z2SoundObjBase::stopOK, incomplete Z2SoundObjBase::dispose() * clang-format * Z2SoundObjBase::dispose(): ok * JAISound::operator->(): null assert * JAIAudience: stub * Z2SoundObject::{init, deleteObject, isAlive}: ok * Z2SeMgr: elaborate struct (and decl JAISoundHandles to support this) * start subclassing Z2SoundObjBase; nonmatching Z2SoundObjSimple::init() * Z2SeMGr::{incrCrowdSize, decrCrowdSize}: ok * Z2MultiSeMgr::resetMultiSePos(): ok * Z2WolfHowlMgr.h: decls * Z2SoundStarter: move to decls and fix postprocess.py symbol pass * Z2AudioArcLoader: decls * Z2SoundObjMgr: ok some fns - deleteEnemyAll() - isTwilightBattle() - setGhostEnemyState() additionally elaborates parts of the Z2Creature hierarchy * delete unused .s files and add tool to find them (only runs on linux) * run clang-format * postprocess.py: comment out debugging * add python step to ok-check workflow * address review comments * address review comments Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com> Co-authored-by: Pheenoh Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com> --- .github/workflows/ok-check.yml | 5 + Makefile | 6 +- asm/JAudio2/JAISeMgr.s | 10 +- asm/JAudio2/JAISeqMgr.s | 10 +- asm/JAudio2/JAISound.s | 16 +- asm/JAudio2/JAIStreamMgr.s | 8 +- asm/JStudio_JAudio2/object-sound.s | 12 +- asm/clib.s | 6 +- asm/d/a/d_a_npc.s | 2 +- asm/d/a/obj/d_a_obj_item.s | 4 +- asm/d/msg/scrn/d_msg_scrn_howl.s | 16 +- asm/m/Do/m_Do_audio.s | 14 +- .../JSystem/JAudio2/JAIAudience/JAIAudience.h | 6 + include/JSystem/JAudio2/JAISe/JAISe.h | 5 - include/JSystem/JAudio2/JAISound/JAISound.h | 147 ++++++++++++++++++ .../JAudio2/JAISoundHandles/JAISoundHandles.h | 11 ++ include/JSystem/JAudio2/JASGadget/JASGadget.h | 22 +++ .../JAUAudioArcLoader/JAUAudioArcLoader.h | 6 + .../JAudio2/JAUClusterSound/JAUClusterSound.h | 6 - include/JSystem/JGeometry/JGeometry.h | 25 +++ .../JKernel/JKRAram/asm/func_802D1FA4.s | 43 ----- .../JKernel/JKRAram/asm/func_802D2040.s | 74 --------- .../JKernel/JKRAram/asm/func_802D214C.s | 40 ----- .../JKernel/JKRAram/asm/func_802D2248.s | 41 ----- .../JKernel/JKRAram/asm/func_802D22DC.s | 27 ---- .../JKernel/JKRAram/asm/func_802D2C40.s | 45 ------ .../JKernel/JKRAram/asm/func_802D2DAC.s | 19 --- .../JKernel/JKRAram/asm/func_802D2DF0.s | 24 --- .../JKRAramArchive/asm/func_802D7B90.s | 27 ---- .../JKernel/JKRAramHeap/asm/func_802D326C.s | 19 --- .../JKernel/JKRAramHeap/asm/func_802D32B0.s | 24 --- .../JKernel/JKRAramPiece/asm/func_802D3614.s | 92 ----------- .../JKernel/JKRAramPiece/asm/func_802D3B04.s | 19 --- .../JKernel/JKRAramStream/asm/func_802D3B48.s | 32 ---- .../JKernel/JKRAramStream/asm/func_802D3BB8.s | 22 --- .../JKernel/JKRAramStream/asm/func_802D3C08.s | 27 ---- .../JKernel/JKRAramStream/asm/func_802D3C68.s | 33 ---- .../JKernel/JKRAramStream/asm/func_802D3CD8.s | 4 - .../JKernel/JKRAramStream/asm/func_802D3ED0.s | 56 ------- .../JKernel/JKRAramStream/asm/func_802D3FA0.s | 44 ------ .../JKernel/JKRAramStream/asm/func_802D4034.s | 25 --- .../JKernel/JKRAramStream/asm/func_802D4088.s | 5 - .../JKernel/JKRAramStream/asm/func_802D4094.s | 25 --- .../JKernel/JKRArchive/asm/func_802D693C.s | 19 --- .../JKernel/JKRArchive/asm/func_802D6978.s | 20 --- .../JKernel/JKRDecomp/asm/func_802DB680.s | 28 ---- .../JKernel/JKRDecomp/asm/func_802DB6E0.s | 22 --- .../JKernel/JKRDecomp/asm/func_802DB730.s | 27 ---- .../JKernel/JKRDecomp/asm/func_802DB790.s | 56 ------- .../JKernel/JKRDecomp/asm/func_802DB858.s | 33 ---- .../JKernel/JKRDecomp/asm/func_802DB8D0.s | 14 -- .../JKernel/JKRDecomp/asm/func_802DB900.s | 15 -- .../JKernel/JKRDecomp/asm/func_802DB934.s | 25 --- .../JKernel/JKRDecomp/asm/func_802DB988.s | 23 --- .../JKernel/JKRDecomp/asm/func_802DB9DC.s | 35 ----- .../JKernel/JKRDecomp/asm/func_802DBCF8.s | 35 ----- .../JKernel/JKRDecomp/asm/func_802DBD70.s | 22 --- .../JKernel/JKRDecomp/asm/func_802DBDC0.s | 18 --- .../JKernel/JKRDisposer/asm/func_802D147C.s | 27 ---- .../JKernel/JKRDisposer/asm/func_802D14E4.s | 36 ----- .../JKRDvdAramRipper/asm/func_802DB5E8.s | 19 --- .../JKRDvdAramRipper/asm/func_802DB62C.s | 24 --- .../JKernel/JKRDvdArchive/asm/func_802D7BF0.s | 46 ------ .../JKernel/JKRDvdArchive/asm/func_802D7C98.s | 81 ---------- .../JKernel/JKRDvdArchive/asm/func_802D8050.s | 81 ---------- .../JKernel/JKRDvdArchive/asm/func_802D826C.s | 143 ----------------- .../JKernel/JKRDvdArchive/asm/func_802D8474.s | 147 ------------------ .../JKernel/JKRDvdArchive/asm/func_802D8698.s | 86 ---------- .../JKernel/JKRDvdFile/asm/func_802D9584.s | 31 ---- .../JKernel/JKRDvdFile/asm/func_802D95F8.s | 46 ------ .../JKernel/JKRDvdFile/asm/func_802D96A0.s | 46 ------ .../JKernel/JKRDvdFile/asm/func_802D9748.s | 44 ------ .../JKernel/JKRDvdFile/asm/func_802D97E4.s | 29 ---- .../JKernel/JKRDvdFile/asm/func_802D9850.s | 32 ---- .../JKernel/JKRDvdFile/asm/func_802D98C4.s | 32 ---- .../JKernel/JKRDvdFile/asm/func_802D9938.s | 35 ----- .../JKernel/JKRDvdFile/asm/func_802D99B4.s | 50 ------ .../JKernel/JKRDvdFile/asm/func_802D9A68.s | 4 - .../JKernel/JKRDvdFile/asm/func_802D9A70.s | 23 --- .../JKernel/JKRDvdFile/asm/func_802D9AC4.s | 15 -- .../JKernel/JKRDvdFile/asm/func_802D9AF8.s | 4 - .../JKernel/JKRDvdFile/asm/func_802D9B00.s | 19 --- .../JKernel/JKRDvdFile/asm/func_802D9B44.s | 24 --- .../JKernel/JKRDvdRipper/asm/func_802DA7DC.s | 19 --- .../JKernel/JKRDvdRipper/asm/func_802DA820.s | 24 --- .../JKernel/JKRFile/asm/func_802D9518.s | 31 ---- .../JKernel/JKRFileCache/asm/func_802D49B4.s | 73 --------- .../JKernel/JKRFileCache/asm/func_802D4AB4.s | 117 -------------- .../JKernel/JKRFileCache/asm/func_802D4C70.s | 60 ------- .../JKernel/JKRFileCache/asm/func_802D4DD8.s | 70 --------- .../JKernel/JKRFileCache/asm/func_802D4EDC.s | 38 ----- .../JKernel/JKRFileCache/asm/func_802D4F64.s | 60 ------- .../JKernel/JKRFileCache/asm/func_802D503C.s | 42 ----- .../JKernel/JKRFileCache/asm/func_802D5164.s | 43 ----- .../JKernel/JKRFileCache/asm/func_802D51F8.s | 35 ----- .../JKernel/JKRFileCache/asm/func_802D526C.s | 17 -- .../JKernel/JKRFileCache/asm/func_802D52A0.s | 36 ----- .../JKernel/JKRFileCache/asm/func_802D531C.s | 45 ------ .../JKernel/JKRFileCache/asm/func_802D53B8.s | 15 -- .../JKernel/JKRFileCache/asm/func_802D53E4.s | 15 -- .../JKernel/JKRFileCache/asm/func_802D5410.s | 74 --------- .../JKernel/JKRFileCache/asm/func_802D551C.s | 71 --------- .../JKernel/JKRFileCache/asm/func_802D5624.s | 22 --- .../JKernel/JKRFileCache/asm/func_802D566C.s | 25 --- .../JKernel/JKRFileCache/asm/func_802D56C8.s | 13 -- .../JKernel/JKRFileCache/asm/func_802D56F4.s | 13 -- .../JKernel/JKRFileCache/asm/func_802D5720.s | 13 -- .../JKernel/JKRFileCache/asm/func_802D574C.s | 13 -- .../JKernel/JKRFileFinder/asm/func_802D4638.s | 37 ----- .../JKernel/JKRFileFinder/asm/func_802D46C4.s | 46 ------ .../JKernel/JKRFileFinder/asm/func_802D4770.s | 35 ----- .../JKernel/JKRFileFinder/asm/func_802D4910.s | 21 --- .../JKernel/JKRFileLoader/asm/func_802D40F0.s | 24 --- .../JKernel/JKRFileLoader/asm/func_802D4148.s | 40 ----- .../JKernel/JKRFileLoader/asm/func_802D41D4.s | 23 --- .../JKernel/JKRFileLoader/asm/func_802D4224.s | 23 --- .../JKernel/JKRFileLoader/asm/func_802D4270.s | 44 ------ .../JKernel/JKRFileLoader/asm/func_802D4308.s | 45 ------ .../JKernel/JKRFileLoader/asm/func_802D43A0.s | 45 ------ .../JKernel/JKRFileLoader/asm/func_802D4438.s | 42 ----- .../JKernel/JKRFileLoader/asm/func_802D45A0.s | 19 --- .../JKernel/JKRFileLoader/asm/func_802D45E4.s | 24 --- .../JKernel/JKRHeap/asm/func_802CE138.s | 82 ---------- .../JKernel/JKRHeap/asm/func_802CE378.s | 46 ------ .../JKernel/JKRHeap/asm/func_802CE428.s | 4 - .../JKernel/JKRHeap/asm/func_802CE438.s | 4 - .../JKernel/JKRHeap/asm/func_802CE448.s | 11 -- .../JKernel/JKRHeap/asm/func_802CE474.s | 27 ---- .../JKernel/JKRHeap/asm/func_802CE4D4.s | 11 -- .../JKernel/JKRHeap/asm/func_802CE500.s | 20 --- .../JKernel/JKRHeap/asm/func_802CE548.s | 11 -- .../JKernel/JKRHeap/asm/func_802CE5CC.s | 11 -- .../JKernel/JKRHeap/asm/func_802CE5F8.s | 11 -- .../JKernel/JKRHeap/asm/func_802CE624.s | 26 ---- .../JKernel/JKRHeap/asm/func_802CE684.s | 11 -- .../JKernel/JKRHeap/asm/func_802CE6B0.s | 22 --- .../JKernel/JKRHeap/asm/func_802CE700.s | 11 -- .../JKernel/JKRHeap/asm/func_802CE72C.s | 11 -- .../JKernel/JKRHeap/asm/func_802CE758.s | 11 -- .../JKernel/JKRHeap/asm/func_802CE784.s | 11 -- .../JKernel/JKRHeap/asm/func_802CE7B0.s | 11 -- .../JKernel/JKRHeap/asm/func_802CE83C.s | 25 --- .../JKernel/JKRHeap/asm/func_802CE894.s | 48 ------ .../JKernel/JKRHeap/asm/func_802CE93C.s | 48 ------ .../JKernel/JKRHeap/asm/func_802CE9E4.s | 41 ----- .../JKernel/JKRHeap/asm/func_802CEA78.s | 10 -- .../JKernel/JKRHeap/asm/func_802CEAA0.s | 8 - .../JKernel/JKRHeap/asm/func_802CEB18.s | 11 -- .../JKernel/JKRHeap/asm/func_802CEB40.s | 14 -- .../JKernel/JKRHeap/asm/func_802CEB78.s | 4 - .../JKernel/JKRHeap/asm/func_802CEB88.s | 9 -- .../JKernel/JKRHeap/asm/func_802CEBA8.s | 48 ------ .../JKernel/JKRHeap/asm/func_802CEC4C.s | 10 -- .../JKernel/JKRHeap/asm/func_802CEC74.s | 9 -- .../JKernel/JKRHeap/asm/func_802CEC98.s | 11 -- .../JKernel/JKRHeap/asm/func_802CECC4.s | 10 -- .../JKernel/JKRHeap/asm/func_802CECEC.s | 9 -- .../JKernel/JKRHeap/asm/func_802CED10.s | 11 -- .../JKernel/JKRHeap/asm/func_802CED3C.s | 9 -- .../JKernel/JKRHeap/asm/func_802CED60.s | 21 --- .../JKernel/JKRMemArchive/asm/func_802D69B8.s | 49 ------ .../JKernel/JKRMemArchive/asm/func_802D6A6C.s | 50 ------ .../JKernel/JKRMemArchive/asm/func_802D6B24.s | 47 ------ .../JKernel/JKRMemArchive/asm/func_802D6DDC.s | 17 -- .../JKernel/JKRMemArchive/asm/func_802D6E10.s | 57 ------- .../JKernel/JKRMemArchive/asm/func_802D6ED0.s | 25 --- .../JKernel/JKRMemArchive/asm/func_802D6F20.s | 19 --- .../JKernel/JKRMemArchive/asm/func_802D6F5C.s | 61 -------- .../JKernel/JKRMemArchive/asm/func_802D7030.s | 41 ----- .../JKernel/JKRThread/asm/func_802D1568.s | 43 ----- .../JKernel/JKRThread/asm/func_802D1610.s | 43 ----- .../JKernel/JKRThread/asm/func_802D16B8.s | 40 ----- .../JKernel/JKRThread/asm/func_802D1758.s | 58 ------- .../JKernel/JKRThread/asm/func_802D1830.s | 29 ---- .../JKernel/JKRThread/asm/func_802D18A4.s | 36 ----- .../JKernel/JKRThread/asm/func_802D1934.s | 11 -- .../JKernel/JKRThread/asm/func_802D1960.s | 18 --- .../JKernel/JKRThread/asm/func_802D1E14.s | 2 - .../JSupport/JSUList/asm/func_802DBDFC.s | 6 - .../JSupport/JSUList/asm/func_802DBE14.s | 26 ---- .../JSupport/JSUList/asm/func_802DBE74.s | 15 -- .../JSupport/JSUList/asm/func_802DBEAC.s | 29 ---- .../JSupport/JSUList/asm/func_802DBF14.s | 5 - .../JSupport/JSUList/asm/func_802DBF28.s | 9 -- .../JSupport/JSUList/asm/func_802DBF4C.s | 44 ------ .../JSupport/JSUList/asm/func_802DBFF0.s | 44 ------ .../JSupport/JSUList/asm/func_802DC094.s | 56 ------- .../JSupport/JSUList/asm/func_802DC15C.s | 49 ------ .../JSupport/JSUList/asm/func_802DC20C.s | 14 -- .../JUtility/JUTGamePad/asm/func_802E15B4.s | 9 -- .../JUtility/JUTGamePad/asm/func_802E15D8.s | 24 --- .../JUtility/asm/JUTResFont__convertSjis.s | 38 ----- .../JSystem/JUtility/asm/JUTResFont__dtor.s | 38 ----- include/SComponent/c_xyz/asm/func_80267128.s | 10 -- .../Z2AudioArcLoader/Z2AudioArcLoader.h | 16 ++ .../Z2AudioArcLoader/asm/func_802A9A70.s | 2 +- .../Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s | 6 +- .../Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s | 2 +- include/Z2AudioLib/Z2Creature/Z2Creature.h | 22 +++ .../Z2AudioLib/Z2Creature/asm/func_802C0420.s | 6 +- .../Z2AudioLib/Z2Creature/asm/func_802C04E8.s | 6 +- .../Z2AudioLib/Z2Creature/asm/func_802C0C10.s | 2 +- .../Z2AudioLib/Z2Creature/asm/func_802C0F64.s | 2 +- .../Z2AudioLib/Z2Creature/asm/func_802C0FC4.s | 6 +- .../Z2AudioLib/Z2Creature/asm/func_802C1BE8.s | 2 +- .../Z2AudioLib/Z2Creature/asm/func_802C1D10.s | 2 +- .../Z2AudioLib/Z2Creature/asm/func_802C1D4C.s | 2 +- .../Z2AudioLib/Z2Creature/asm/func_802C1FB0.s | 8 +- .../Z2AudioLib/Z2Creature/asm/func_802C24D0.s | 4 +- .../Z2AudioLib/Z2Creature/asm/func_802C25EC.s | 22 +-- .../Z2AudioLib/Z2EnvSeMgr/asm/func_802C58AC.s | 2 +- .../Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s | 8 +- .../Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s | 6 +- include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h | 2 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s | 2 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s | 2 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s | 2 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s | 4 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s | 4 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s | 2 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s | 2 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C48E8.s | 2 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s | 14 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s | 2 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C5234.s | 2 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s | 2 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C54B8.s | 2 +- .../Z2AudioLib/Z2LinkMgr/asm/func_802C54FC.s | 2 +- .../Z2AudioLib/Z2SceneMgr/asm/func_802B68B0.s | 13 -- .../Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s | 58 +++---- .../Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s | 2 +- include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h | 41 ++++- .../Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s | 9 -- .../Z2AudioLib/Z2SeMgr/asm/func_802AB960.s | 9 -- .../Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s | 2 +- .../Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s | 4 +- .../Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s | 9 -- include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h | 5 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s | 6 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s | 6 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s | 10 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s | 10 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s | 4 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s | 4 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s | 4 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s | 4 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s | 4 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s | 4 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802B327C.s | 2 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802B4128.s | 2 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s | 8 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s | 8 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s | 4 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s | 6 +- .../Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s | 10 +- .../Z2SoundHandles/Z2SoundHandles.h | 34 ++++ .../Z2SoundHandles/asm/func_802AB07C.s | 14 -- .../Z2SoundHandles/asm/func_802AB0B4.s | 27 ---- .../Z2SoundHandles/asm/func_802AB118.s | 2 - .../Z2SoundHandles/asm/func_802AB120.s | 2 +- .../Z2SoundHandles/asm/func_802AB254.s | 23 --- .../Z2SoundHandles/asm/func_802AB2A0.s | 17 -- .../Z2SoundHandles/asm/func_802AB4A0.s | 28 ---- .../Z2SoundHandles/asm/func_802AB504.s | 16 -- .../Z2SoundHandles/asm/func_802AB538.s | 2 +- include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h | 17 ++ .../Z2SoundInfo/asm/func_802BB158.s | 22 +-- .../Z2SoundInfo/asm/func_802BB448.s | 22 +-- .../Z2SoundInfo/asm/func_802BB6DC.s | 4 +- .../Z2SoundInfo/asm/func_802BBCBC.s | 2 +- .../Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s | 2 +- .../Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h | 42 +++++ .../Z2SoundObjMgr/asm/func_802BF920.s | 4 +- .../Z2SoundObjMgr/asm/func_802BF994.s | 6 +- .../Z2SoundObjMgr/asm/func_802BFFEC.s | 37 ----- .../Z2SoundObjMgr/asm/func_802C013C.s | 23 --- .../Z2SoundObjMgr/asm/func_802C01E4.s | 2 - .../Z2AudioLib/Z2SoundObject/Z2SoundObject.h | 50 ++++++ .../Z2SoundObject/asm/func_802BDEF0.s | 22 --- .../Z2SoundObject/asm/func_802BDF48.s | 27 ---- .../Z2SoundObject/asm/func_802BDFB0.s | 18 --- .../Z2SoundObject/asm/func_802BDFF8.s | 16 -- .../Z2SoundObject/asm/func_802BE038.s | 15 -- .../Z2SoundObject/asm/func_802BE070.s | 41 ----- .../Z2SoundObject/asm/func_802BE104.s | 16 -- .../Z2SoundObject/asm/func_802BE144.s | 4 +- .../Z2SoundObject/asm/func_802BE2D4.s | 4 +- .../Z2SoundObject/asm/func_802BE4A4.s | 2 +- .../Z2SoundObject/asm/func_802BE5A0.s | 2 +- .../Z2SoundObject/asm/func_802BE5FC.s | 2 +- .../Z2SoundObject/asm/func_802BE65C.s | 2 +- .../Z2SoundObject/asm/func_802BE6B8.s | 2 +- .../Z2SoundObject/asm/func_802BE844.s | 2 +- .../Z2SoundObject/asm/func_802BE880.s | 2 +- .../Z2SoundObject/asm/func_802BEB74.s | 2 +- .../Z2SoundObject/asm/func_802BEB94.s | 2 +- .../Z2SoundObject/asm/func_802BEBDC.s | 2 +- .../Z2SoundObject/asm/func_802BED68.s | 4 +- .../Z2SoundObject/asm/func_802BF304.s | 6 +- .../Z2SoundObject/asm/func_802BF660.s | 2 +- .../Z2SoundStarter/Z2SoundStarter.h | 31 ++++ .../Z2SoundStarter/asm/func_802AABF4.s | 2 +- .../Z2SoundStarter/asm/func_802AAC3C.s | 2 +- .../Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h | 42 +++++ .../Z2SpeechMgr2/asm/func_802CBC60.s | 2 +- .../Z2SpeechMgr2/asm/func_802CC190.s | 2 +- .../Z2SpeechMgr2/asm/func_802CC4C0.s | 2 +- .../Z2SpeechMgr2/asm/func_802CCA18.s | 4 +- .../Z2SpeechMgr2/asm/func_802CCFB8.s | 2 +- .../Z2SpeechMgr2/asm/func_802CCFF8.s | 2 +- include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h | 2 + .../Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h | 25 +++ .../Z2WolfHowlMgr/asm/func_802CACD4.s | 2 +- .../Z2WolfHowlMgr/asm/func_802CAED4.s | 14 +- .../Z2WolfHowlMgr/asm/func_802CB100.s | 8 +- .../Z2WolfHowlMgr/asm/func_802CB38C.s | 12 +- .../Z2WolfHowlMgr/asm/func_802CB650.s | 2 +- .../Z2WolfHowlMgr/asm/func_802CB6EC.s | 4 +- .../Z2WolfHowlMgr/asm/func_802CBA88.s | 2 +- include/d/d_a/d_a_alink/asm/func_800C12DC.s | 2 +- include/d/d_a/d_a_alink/asm/func_800CD7AC.s | 8 +- include/d/d_a/d_a_alink/asm/func_800CF380.s | 2 +- include/d/d_a/d_a_alink/asm/func_80130700.s | 14 +- include/d/d_a/d_a_alink/asm/func_80130BC4.s | 4 +- include/d/d_item/d_item/asm/func_80097E8C.s | 21 --- include/d/d_item/d_item/asm/func_80097EE0.s | 20 --- include/d/d_item/d_item/asm/func_80099C20.s | 17 -- .../d/d_lib/asm/CSTControl_NS_getAngleStick.s | 4 - .../d/d_lib/asm/CSTControl_NS_getValueStick.s | 4 - include/d/d_lib/asm/STControl.s | 17 -- include/d/d_lib/asm/STControl_NS_Xinit.s | 12 -- .../d_lib/asm/STControl_NS_checkDownTrigger.s | 34 ---- .../d_lib/asm/STControl_NS_checkLeftTrigger.s | 34 ---- .../asm/STControl_NS_checkRightTrigger.s | 34 ---- .../d/d_lib/asm/STControl_NS_checkUpTrigger.s | 34 ---- include/d/d_lib/asm/STControl_NS_init.s | 20 --- .../d/d_lib/asm/STControl_NS_setWaitParm.s | 9 -- include/d/d_lib/asm/getAngleStick.s | 4 - include/d/d_lib/asm/getValueStick.s | 4 - include/d/d_save/d_save/asm/func_8000585C.s | 24 --- include/d/d_save/d_save/asm/func_80032AF8.s | 24 --- include/d/d_save/d_save/asm/func_80032BB0.s | 8 - include/d/d_save/d_save/asm/func_80032BEC.s | 8 - include/d/d_save/d_save/asm/func_80032CC8.s | 21 --- include/d/d_save/d_save/asm/func_80032D1C.s | 17 -- include/d/d_save/d_save/asm/func_80032E78.s | 15 -- include/d/d_save/d_save/asm/func_80032FB8 .s | 0 include/d/d_save/d_save/asm/func_80032FB8.s | 33 ---- include/d/d_save/d_save/asm/func_800336BC.s | 9 -- include/d/d_save/d_save/asm/func_80033754.s | 41 ----- include/d/d_save/d_save/asm/func_80033BEC.s | 18 --- include/d/d_save/d_save/asm/func_80033CBC.s | 39 ----- include/d/d_save/d_save/asm/func_80033D40.s | 73 --------- include/d/d_save/d_save/asm/func_80033F9C.s | 40 ----- include/d/d_save/d_save/asm/func_80034040.s | 31 ---- include/d/d_save/d_save/asm/func_800340B8.s | 20 --- include/d/d_save/d_save/asm/func_800340F8.s | 52 ------- include/d/d_save/d_save/asm/func_800341AC.s | 16 -- include/d/d_save/d_save/asm/func_800341E8.s | 8 - include/d/d_save/d_save/asm/func_80034428.s | 9 -- include/d/d_save/d_save/asm/func_8003444C.s | 10 -- include/d/d_save/d_save/asm/func_80034474.s | 10 -- include/d/d_save/d_save/asm/func_8003449C.s | 11 -- include/d/d_save/d_save/asm/func_800344FC.s | 7 - include/d/d_save/d_save/asm/func_80034644.s | 18 --- include/d/d_save/d_save/asm/func_800347A0.s | 9 -- include/d/d_save/d_save/asm/func_800347C4.s | 9 -- include/d/d_save/d_save/asm/func_800347E8.s | 10 -- include/d/d_save/d_save/asm/func_80034810.s | 10 -- include/d/d_save/d_save/asm/func_80034838.s | 10 -- include/d/d_save/d_save/asm/func_80034860.s | 11 -- include/d/d_save/d_save/asm/func_800348C4.s | 10 -- include/d/d_save/d_save/asm/func_800348EC.s | 11 -- include/d/d_save/d_save/asm/func_8003498C.s | 6 - include/d/d_save/d_save/asm/func_800349A4.s | 6 - include/d/d_save/d_save/asm/func_800349BC.s | 10 -- include/d/d_save/d_save/asm/func_80034AA4.s | 9 -- include/d/d_save/d_save/asm/func_80034AC8.s | 9 -- include/d/d_save/d_save/asm/func_80034AEC.s | 10 -- include/d/d_save/d_save/asm/func_80034B98.s | 10 -- include/d/d_save/d_save/asm/func_80034BC0.s | 10 -- include/d/d_save/d_save/asm/func_80034BE8.s | 11 -- include/d/d_save/d_save/asm/func_80034C14.s | 14 -- include/d/d_save/d_save/asm/func_80034C4C.s | 10 -- include/d/d_save/d_save/asm/func_80034C74.s | 11 -- include/d/d_save/d_save/asm/func_80034D04.s | 10 -- include/d/d_save/d_save/asm/func_80034D2C.s | 9 -- include/d/d_save/d_save/asm/func_80034D50.s | 10 -- include/d/d_save/d_save/asm/func_8003501C.s | 37 ----- include/d/d_save/d_save/asm/func_800350A8.s | 5 - include/d/d_save/d_save/asm/func_8003514C.s | 23 --- include/d/d_save/d_save/asm/func_800351A4.s | 26 ---- include/d/d_save/d_save/asm/func_80035200.s | 49 ------ include/d/d_save/d_save/asm/func_80035360.s | 59 ------- include/d/d_save/d_save/asm/func_8003542C.s | 51 ------ include/d/d_save/d_save/asm/func_80035590.s | 51 ------ include/d/d_save/d_save/asm/func_800356B4.s | 30 ---- include/d/d_save/d_save/asm/func_80035724.s | 32 ---- include/d/d_stage/asm/func_80023E94.s | 12 -- include/d/d_stage/asm/func_80023EC4.s | 12 -- include/d/d_stage/asm/func_8002419C.s | 19 --- include/d/d_stage/asm/func_80027524.s | 2 - include/d/d_stage/asm/func_8002752C.s | 2 - include/d/d_stage/asm/func_80027534.s | 2 - include/d/d_stage/asm/func_8002753C.s | 2 - include/d/d_stage/asm/func_80027544.s | 2 - include/d/d_stage/asm/func_8002754C.s | 2 - include/d/d_stage/asm/func_80027554.s | 2 - include/d/d_stage/asm/func_8002755C.s | 13 -- include/d/d_stage/asm/func_80027590.s | 13 -- include/d/d_stage/asm/func_800275C4.s | 2 - include/d/d_stage/asm/func_800275CC.s | 2 - include/d/d_stage/asm/func_800275D4.s | 2 - include/d/d_stage/asm/func_800275DC.s | 13 -- include/d/d_stage/asm/func_80027610.s | 13 -- include/d/d_stage/asm/func_80027644.s | 13 -- include/d/d_stage/asm/func_80027678.s | 13 -- include/d/d_stage/asm/func_800276AC.s | 13 -- include/d/d_stage/asm/func_800276E0.s | 13 -- include/d/d_stage/asm/func_80027714.s | 2 - include/d/d_stage/asm/func_8002771C.s | 2 - include/d/d_stage/asm/func_80027724.s | 2 - include/d/d_stage/asm/func_8002772C.s | 2 - include/d/d_stage/asm/func_80027734.s | 13 -- include/d/d_stage/asm/func_80027768.s | 13 -- include/d/d_stage/asm/func_8002779C.s | 13 -- include/d/d_stage/asm/func_800277D0.s | 13 -- include/d/d_stage/asm/func_80027804.s | 13 -- include/d/d_stage/asm/func_80027838.s | 13 -- include/d/d_stage/asm/func_8002786C.s | 13 -- include/d/d_stage/asm/func_800278A0.s | 13 -- include/d/d_stage/asm/func_800278D4.s | 2 - include/d/d_stage/asm/func_800278DC.s | 2 - include/d/d_stage/asm/func_800278E4.s | 2 - include/d/d_stage/asm/func_800278EC.s | 2 - include/d/d_stage/asm/func_800278F4.s | 13 -- include/d/d_stage/asm/func_80027928.s | 13 -- include/d/d_stage/asm/func_8002795C.s | 2 - include/d/d_stage/asm/func_80027964.s | 2 - include/d/d_stage/asm/func_8002796C.s | 2 - include/d/d_stage/asm/func_80027974.s | 2 - include/d/d_stage/asm/func_8002797C.s | 13 -- include/d/d_stage/asm/func_800279B0.s | 13 -- include/d/d_stage/asm/func_800279E4.s | 2 - include/d/d_stage/asm/func_800279EC.s | 13 -- include/d/d_stage/asm/func_80027A20.s | 13 -- include/d/d_stage/asm/func_80027A54.s | 13 -- include/d/d_stage/asm/func_80027A88.s | 13 -- include/d/d_stage/asm/func_80027ABC.s | 2 - include/d/d_stage/asm/func_80027AC4.s | 2 - include/d/d_stage/asm/func_80027ACC.s | 2 - include/d/d_stage/asm/func_80027AD4.s | 2 - include/d/d_stage/asm/func_80027ADC.s | 2 - include/d/d_stage/asm/func_80027AE4.s | 2 - include/d/d_stage/asm/func_80027AEC.s | 2 - include/d/d_stage/asm/func_80027AF4.s | 2 - include/d/d_stage/asm/func_80027AFC.s | 2 - include/d/d_stage/asm/func_80027B04.s | 2 - include/d/d_stage/asm/func_80027B0C.s | 2 - include/d/d_stage/asm/func_80027B14.s | 2 - include/d/d_stage/asm/func_80027B1C.s | 2 - include/d/d_stage/asm/func_80027B24.s | 2 - include/d/d_stage/asm/func_80027B2C.s | 2 - include/d/d_stage/asm/func_80027B34.s | 12 -- include/d/d_stage/asm/func_80027B64.s | 13 -- include/d/d_stage/asm/func_80027B98.s | 12 -- include/d/d_stage/asm/func_80027BC8.s | 13 -- include/d/d_stage/asm/func_80027BFC.s | 12 -- include/d/d_stage/asm/func_80027C2C.s | 13 -- include/d/d_stage/asm/func_80027C60.s | 12 -- include/d/d_stage/asm/func_80027C90.s | 12 -- include/d/d_stage/asm/func_80027CC0.s | 13 -- include/d/d_stage/asm/func_80027CF4.s | 2 - include/d/d_stage/asm/func_80027CFC.s | 2 - include/d/d_stage/asm/func_80027D04.s | 2 - include/d/d_stage/asm/func_80027D0C.s | 2 - include/d/d_stage/asm/func_80027D14.s | 1 - include/d/d_stage/asm/func_80027D18.s | 2 - include/d/d_stage/asm/func_80027D20.s | 2 - include/d/d_stage/asm/func_80027D28.s | 2 - include/d/d_stage/asm/func_80027D30.s | 2 - include/d/d_stage/asm/func_80027D38.s | 2 - include/d/d_stage/asm/func_80027D40.s | 12 -- include/d/d_stage/asm/func_80027D70.s | 13 -- include/d/d_stage/asm/func_80027DA4.s | 13 -- include/d/d_stage/asm/func_80027DD8.s | 14 -- include/d/d_stage/asm/func_80027E10.s | 2 - include/d/d_stage/asm/func_80027E18.s | 2 - include/d/d_stage/asm/func_80027E20.s | 2 - include/d/d_stage/asm/func_80027E28.s | 2 - include/d/d_stage/asm/func_80027E30.s | 2 - include/d/d_stage/asm/func_80027E38.s | 2 - include/d/d_stage/asm/func_80027E40.s | 2 - include/d/d_stage/asm/func_80027E48.s | 2 - include/d/d_stage/asm/func_80027E50.s | 2 - include/d/d_stage/asm/func_80027E58.s | 2 - include/d/d_stage/asm/func_80027E60.s | 2 - include/d/d_stage/asm/func_80027E68.s | 2 - include/d/d_stage/asm/func_80027E70.s | 2 - include/d/d_stage/asm/func_80027E78.s | 2 - include/d/d_stage/asm/func_80027E80.s | 2 - include/d/d_stage/asm/func_80027E88.s | 2 - include/d/d_stage/asm/func_80027E90.s | 2 - include/d/d_stage/asm/func_80027E98.s | 2 - include/d/d_stage/asm/func_80027EA0.s | 2 - include/d/d_stage/asm/func_80027EA8.s | 2 - include/d/d_stage/asm/func_80027EB0.s | 2 - include/d/d_stage/asm/func_80027EB8.s | 2 - include/d/d_stage/asm/func_80027EC0.s | 2 - include/d/d_stage/asm/func_80027EC8.s | 2 - include/d/d_stage/asm/func_80027ED0.s | 2 - include/d/d_stage/asm/func_80027ED8.s | 2 - include/d/d_stage/asm/func_80027EE0.s | 2 - include/d/d_stage/asm/func_80027EE8.s | 2 - include/d/d_stage/asm/func_80027EF0.s | 2 - include/d/d_stage/asm/func_80027EF8.s | 2 - include/d/d_stage/asm/func_80027F00.s | 2 - include/d/d_stage/asm/func_80027F08.s | 2 - include/d/d_stage/asm/func_80027F10.s | 2 - include/d/d_stage/asm/func_80027F18.s | 13 -- include/d/d_stage/asm/func_80027F4C.s | 13 -- include/d/d_stage/asm/func_80027F80.s | 13 -- include/d/d_stage/asm/func_80027FB4.s | 13 -- include/d/d_stage/asm/func_80027FE8.s | 2 - include/d/d_stage/asm/func_80027FF0.s | 2 - include/d/d_stage/asm/func_80027FF8.s | 2 - include/d/d_stage/asm/func_80028000.s | 2 - include/d/d_stage/asm/func_80028008.s | 2 - include/d/d_stage/asm/func_80028010.s | 2 - include/d/d_stage/asm/func_80028018.s | 2 - include/d/d_stage/asm/func_80028020.s | 2 - include/d/d_stage/asm/func_80028028.s | 2 - include/d/d_stage/asm/func_80028030.s | 2 - include/d/d_stage/asm/func_80028038.s | 2 - include/d/d_stage/asm/func_80028040.s | 2 - include/d/d_stage/asm/func_80028048.s | 2 - include/d/d_stage/asm/func_80028050.s | 2 - include/d/d_stage/asm/func_80028058.s | 2 - include/d/d_stage/asm/func_80028060.s | 2 - include/d/d_stage/asm/func_80028068.s | 2 - include/d/d_stage/asm/func_80028070.s | 2 - include/d/d_stage/asm/func_80028078.s | 13 -- include/d/d_stage/asm/func_800280AC.s | 13 -- include/d/d_stage/asm/func_800280E0.s | 13 -- include/d/d_stage/asm/func_80028114.s | 13 -- include/d/d_stage/asm/func_80028148.s | 2 - include/d/d_stage/asm/func_80028150.s | 2 - include/d/d_stage/asm/func_80028158.s | 2 - include/d/d_stage/asm/func_80028160.s | 2 - include/d/d_stage/asm/func_80028168.s | 2 - include/d/d_stage/asm/func_80028170.s | 2 - include/d/d_stage/asm/func_80028178.s | 2 - include/d/d_stage/asm/func_80028180.s | 2 - include/d/d_stage/asm/func_80028188.s | 2 - include/d/d_stage/asm/func_80028190.s | 13 -- include/d/d_stage/asm/func_800281C4.s | 13 -- include/d/d_stage/asm/func_800281F8.s | 2 - include/d/d_stage/asm/func_80028200.s | 2 - include/d/d_stage/asm/func_80028208.s | 2 - include/d/d_stage/asm/func_80028210.s | 2 - include/d/d_stage/asm/func_80028218.s | 2 - include/d/d_stage/asm/func_80028220.s | 2 - include/d/d_stage/asm/func_80028228.s | 2 - include/d/d_stage/asm/func_80028230.s | 2 - include/d/d_stage/asm/func_80028238.s | 1 - include/d/d_stage/asm/func_8002823C.s | 2 - include/d/d_stage/asm/func_80028244.s | 2 - .../f_pc/f_pc_create_req/asm/func_80020BA0.s | 32 ---- include/functions.h | 108 +++++++------ .../asm/mDoCPd_c_NS_recalibrate.s | 10 -- include/m_Do/m_Do_main/asm/func_80005848.s | 24 --- include/m_Do/m_Do_main/asm/func_800058C4.s | 133 ---------------- include/m_Do/m_Do_main/asm/func_800061C8.s | 55 ------- include/variables.h | 7 +- ldscript.lcf | 20 +-- libs/JSystem/JAudio2/JAUClusterSound.cpp | 8 +- libs/Z2AudioLib/Z2Audience.cpp | 1 + libs/Z2AudioLib/Z2AudioArcLoader.cpp | 12 +- libs/Z2AudioLib/Z2AudioMgr.cpp | 1 + libs/Z2AudioLib/Z2Creature.cpp | 5 +- libs/Z2AudioLib/Z2EnvSeMgr.cpp | 1 + libs/Z2AudioLib/Z2LinkMgr.cpp | 2 + libs/Z2AudioLib/Z2SceneMgr.cpp | 4 +- libs/Z2AudioLib/Z2SeMgr.cpp | 35 +++-- libs/Z2AudioLib/Z2SeqMgr.cpp | 4 +- libs/Z2AudioLib/Z2SoundHandles.cpp | 96 +++++++----- libs/Z2AudioLib/Z2SoundInfo.cpp | 8 +- libs/Z2AudioLib/Z2SoundMgr.cpp | 2 + libs/Z2AudioLib/Z2SoundObjMgr.cpp | 70 ++++++--- libs/Z2AudioLib/Z2SoundObject.cpp | 123 ++++++++------- libs/Z2AudioLib/Z2SoundStarter.cpp | 14 +- libs/Z2AudioLib/Z2SpeechMgr2.cpp | 24 ++- libs/Z2AudioLib/Z2WolfHowlMgr.cpp | 39 ++--- tools/find_unused_asm.py | 32 ++++ tools/postprocess.py | 17 +- 595 files changed, 1228 insertions(+), 9009 deletions(-) create mode 100644 include/JSystem/JAudio2/JAIAudience/JAIAudience.h create mode 100644 include/JSystem/JAudio2/JAISound/JAISound.h create mode 100644 include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h create mode 100644 include/JSystem/JAudio2/JASGadget/JASGadget.h create mode 100644 include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h create mode 100644 include/JSystem/JGeometry/JGeometry.h delete mode 100644 include/JSystem/JKernel/JKRAram/asm/func_802D1FA4.s delete mode 100644 include/JSystem/JKernel/JKRAram/asm/func_802D2040.s delete mode 100644 include/JSystem/JKernel/JKRAram/asm/func_802D214C.s delete mode 100644 include/JSystem/JKernel/JKRAram/asm/func_802D2248.s delete mode 100644 include/JSystem/JKernel/JKRAram/asm/func_802D22DC.s delete mode 100644 include/JSystem/JKernel/JKRAram/asm/func_802D2C40.s delete mode 100644 include/JSystem/JKernel/JKRAram/asm/func_802D2DAC.s delete mode 100644 include/JSystem/JKernel/JKRAram/asm/func_802D2DF0.s delete mode 100644 include/JSystem/JKernel/JKRAramArchive/asm/func_802D7B90.s delete mode 100644 include/JSystem/JKernel/JKRAramHeap/asm/func_802D326C.s delete mode 100644 include/JSystem/JKernel/JKRAramHeap/asm/func_802D32B0.s delete mode 100644 include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s delete mode 100644 include/JSystem/JKernel/JKRAramPiece/asm/func_802D3B04.s delete mode 100644 include/JSystem/JKernel/JKRAramStream/asm/func_802D3B48.s delete mode 100644 include/JSystem/JKernel/JKRAramStream/asm/func_802D3BB8.s delete mode 100644 include/JSystem/JKernel/JKRAramStream/asm/func_802D3C08.s delete mode 100644 include/JSystem/JKernel/JKRAramStream/asm/func_802D3C68.s delete mode 100644 include/JSystem/JKernel/JKRAramStream/asm/func_802D3CD8.s delete mode 100644 include/JSystem/JKernel/JKRAramStream/asm/func_802D3ED0.s delete mode 100644 include/JSystem/JKernel/JKRAramStream/asm/func_802D3FA0.s delete mode 100644 include/JSystem/JKernel/JKRAramStream/asm/func_802D4034.s delete mode 100644 include/JSystem/JKernel/JKRAramStream/asm/func_802D4088.s delete mode 100644 include/JSystem/JKernel/JKRAramStream/asm/func_802D4094.s delete mode 100644 include/JSystem/JKernel/JKRArchive/asm/func_802D693C.s delete mode 100644 include/JSystem/JKernel/JKRArchive/asm/func_802D6978.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DB680.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DB6E0.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DB730.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DB790.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DB858.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DB8D0.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DB900.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DB934.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DB988.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DB9DC.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DBCF8.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DBD70.s delete mode 100644 include/JSystem/JKernel/JKRDecomp/asm/func_802DBDC0.s delete mode 100644 include/JSystem/JKernel/JKRDisposer/asm/func_802D147C.s delete mode 100644 include/JSystem/JKernel/JKRDisposer/asm/func_802D14E4.s delete mode 100644 include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB5E8.s delete mode 100644 include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB62C.s delete mode 100644 include/JSystem/JKernel/JKRDvdArchive/asm/func_802D7BF0.s delete mode 100644 include/JSystem/JKernel/JKRDvdArchive/asm/func_802D7C98.s delete mode 100644 include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8050.s delete mode 100644 include/JSystem/JKernel/JKRDvdArchive/asm/func_802D826C.s delete mode 100644 include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s delete mode 100644 include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8698.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D9584.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D95F8.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D96A0.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D97E4.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D9850.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D98C4.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D9938.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D99B4.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D9A68.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D9A70.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D9AC4.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D9AF8.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D9B00.s delete mode 100644 include/JSystem/JKernel/JKRDvdFile/asm/func_802D9B44.s delete mode 100644 include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA7DC.s delete mode 100644 include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA820.s delete mode 100644 include/JSystem/JKernel/JKRFile/asm/func_802D9518.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D49B4.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D4AB4.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D4C70.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D4DD8.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D4EDC.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D4F64.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D503C.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D5164.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D51F8.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D526C.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D52A0.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D531C.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D53B8.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D53E4.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D5410.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D551C.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D5624.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D566C.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D56C8.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D56F4.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D5720.s delete mode 100644 include/JSystem/JKernel/JKRFileCache/asm/func_802D574C.s delete mode 100644 include/JSystem/JKernel/JKRFileFinder/asm/func_802D4638.s delete mode 100644 include/JSystem/JKernel/JKRFileFinder/asm/func_802D46C4.s delete mode 100644 include/JSystem/JKernel/JKRFileFinder/asm/func_802D4770.s delete mode 100644 include/JSystem/JKernel/JKRFileFinder/asm/func_802D4910.s delete mode 100644 include/JSystem/JKernel/JKRFileLoader/asm/func_802D40F0.s delete mode 100644 include/JSystem/JKernel/JKRFileLoader/asm/func_802D4148.s delete mode 100644 include/JSystem/JKernel/JKRFileLoader/asm/func_802D41D4.s delete mode 100644 include/JSystem/JKernel/JKRFileLoader/asm/func_802D4224.s delete mode 100644 include/JSystem/JKernel/JKRFileLoader/asm/func_802D4270.s delete mode 100644 include/JSystem/JKernel/JKRFileLoader/asm/func_802D4308.s delete mode 100644 include/JSystem/JKernel/JKRFileLoader/asm/func_802D43A0.s delete mode 100644 include/JSystem/JKernel/JKRFileLoader/asm/func_802D4438.s delete mode 100644 include/JSystem/JKernel/JKRFileLoader/asm/func_802D45A0.s delete mode 100644 include/JSystem/JKernel/JKRFileLoader/asm/func_802D45E4.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE138.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE378.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE428.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE438.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE448.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE474.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE4D4.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE500.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE548.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE5CC.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE5F8.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE624.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE684.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE6B0.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE700.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE72C.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE758.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE784.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE7B0.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE83C.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE894.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE93C.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CE9E4.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CEA78.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CEAA0.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CEB18.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CEB40.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CEB78.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CEB88.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CEBA8.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CEC4C.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CEC74.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CEC98.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CECC4.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CECEC.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CED10.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CED3C.s delete mode 100644 include/JSystem/JKernel/JKRHeap/asm/func_802CED60.s delete mode 100644 include/JSystem/JKernel/JKRMemArchive/asm/func_802D69B8.s delete mode 100644 include/JSystem/JKernel/JKRMemArchive/asm/func_802D6A6C.s delete mode 100644 include/JSystem/JKernel/JKRMemArchive/asm/func_802D6B24.s delete mode 100644 include/JSystem/JKernel/JKRMemArchive/asm/func_802D6DDC.s delete mode 100644 include/JSystem/JKernel/JKRMemArchive/asm/func_802D6E10.s delete mode 100644 include/JSystem/JKernel/JKRMemArchive/asm/func_802D6ED0.s delete mode 100644 include/JSystem/JKernel/JKRMemArchive/asm/func_802D6F20.s delete mode 100644 include/JSystem/JKernel/JKRMemArchive/asm/func_802D6F5C.s delete mode 100644 include/JSystem/JKernel/JKRMemArchive/asm/func_802D7030.s delete mode 100644 include/JSystem/JKernel/JKRThread/asm/func_802D1568.s delete mode 100644 include/JSystem/JKernel/JKRThread/asm/func_802D1610.s delete mode 100644 include/JSystem/JKernel/JKRThread/asm/func_802D16B8.s delete mode 100644 include/JSystem/JKernel/JKRThread/asm/func_802D1758.s delete mode 100644 include/JSystem/JKernel/JKRThread/asm/func_802D1830.s delete mode 100644 include/JSystem/JKernel/JKRThread/asm/func_802D18A4.s delete mode 100644 include/JSystem/JKernel/JKRThread/asm/func_802D1934.s delete mode 100644 include/JSystem/JKernel/JKRThread/asm/func_802D1960.s delete mode 100644 include/JSystem/JKernel/JKRThread/asm/func_802D1E14.s delete mode 100644 include/JSystem/JSupport/JSUList/asm/func_802DBDFC.s delete mode 100644 include/JSystem/JSupport/JSUList/asm/func_802DBE14.s delete mode 100644 include/JSystem/JSupport/JSUList/asm/func_802DBE74.s delete mode 100644 include/JSystem/JSupport/JSUList/asm/func_802DBEAC.s delete mode 100644 include/JSystem/JSupport/JSUList/asm/func_802DBF14.s delete mode 100644 include/JSystem/JSupport/JSUList/asm/func_802DBF28.s delete mode 100644 include/JSystem/JSupport/JSUList/asm/func_802DBF4C.s delete mode 100644 include/JSystem/JSupport/JSUList/asm/func_802DBFF0.s delete mode 100644 include/JSystem/JSupport/JSUList/asm/func_802DC094.s delete mode 100644 include/JSystem/JSupport/JSUList/asm/func_802DC15C.s delete mode 100644 include/JSystem/JSupport/JSUList/asm/func_802DC20C.s delete mode 100644 include/JSystem/JUtility/JUTGamePad/asm/func_802E15B4.s delete mode 100644 include/JSystem/JUtility/JUTGamePad/asm/func_802E15D8.s delete mode 100644 include/JSystem/JUtility/asm/JUTResFont__convertSjis.s delete mode 100644 include/JSystem/JUtility/asm/JUTResFont__dtor.s delete mode 100644 include/SComponent/c_xyz/asm/func_80267128.s create mode 100644 include/Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h create mode 100644 include/Z2AudioLib/Z2Creature/Z2Creature.h delete mode 100644 include/Z2AudioLib/Z2SceneMgr/asm/func_802B68B0.s delete mode 100644 include/Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s delete mode 100644 include/Z2AudioLib/Z2SeMgr/asm/func_802AB960.s delete mode 100644 include/Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s create mode 100644 include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h delete mode 100644 include/Z2AudioLib/Z2SoundHandles/asm/func_802AB07C.s delete mode 100644 include/Z2AudioLib/Z2SoundHandles/asm/func_802AB0B4.s delete mode 100644 include/Z2AudioLib/Z2SoundHandles/asm/func_802AB118.s delete mode 100644 include/Z2AudioLib/Z2SoundHandles/asm/func_802AB254.s delete mode 100644 include/Z2AudioLib/Z2SoundHandles/asm/func_802AB2A0.s delete mode 100644 include/Z2AudioLib/Z2SoundHandles/asm/func_802AB4A0.s delete mode 100644 include/Z2AudioLib/Z2SoundHandles/asm/func_802AB504.s create mode 100644 include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h create mode 100644 include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h delete mode 100644 include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BFFEC.s delete mode 100644 include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C013C.s delete mode 100644 include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C01E4.s create mode 100644 include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h delete mode 100644 include/Z2AudioLib/Z2SoundObject/asm/func_802BDEF0.s delete mode 100644 include/Z2AudioLib/Z2SoundObject/asm/func_802BDF48.s delete mode 100644 include/Z2AudioLib/Z2SoundObject/asm/func_802BDFB0.s delete mode 100644 include/Z2AudioLib/Z2SoundObject/asm/func_802BDFF8.s delete mode 100644 include/Z2AudioLib/Z2SoundObject/asm/func_802BE038.s delete mode 100644 include/Z2AudioLib/Z2SoundObject/asm/func_802BE070.s delete mode 100644 include/Z2AudioLib/Z2SoundObject/asm/func_802BE104.s create mode 100644 include/Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h create mode 100644 include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h create mode 100644 include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h delete mode 100644 include/d/d_item/d_item/asm/func_80097E8C.s delete mode 100644 include/d/d_item/d_item/asm/func_80097EE0.s delete mode 100644 include/d/d_item/d_item/asm/func_80099C20.s delete mode 100644 include/d/d_lib/asm/CSTControl_NS_getAngleStick.s delete mode 100644 include/d/d_lib/asm/CSTControl_NS_getValueStick.s delete mode 100644 include/d/d_lib/asm/STControl.s delete mode 100644 include/d/d_lib/asm/STControl_NS_Xinit.s delete mode 100644 include/d/d_lib/asm/STControl_NS_checkDownTrigger.s delete mode 100644 include/d/d_lib/asm/STControl_NS_checkLeftTrigger.s delete mode 100644 include/d/d_lib/asm/STControl_NS_checkRightTrigger.s delete mode 100644 include/d/d_lib/asm/STControl_NS_checkUpTrigger.s delete mode 100644 include/d/d_lib/asm/STControl_NS_init.s delete mode 100644 include/d/d_lib/asm/STControl_NS_setWaitParm.s delete mode 100644 include/d/d_lib/asm/getAngleStick.s delete mode 100644 include/d/d_lib/asm/getValueStick.s delete mode 100644 include/d/d_save/d_save/asm/func_8000585C.s delete mode 100644 include/d/d_save/d_save/asm/func_80032AF8.s delete mode 100644 include/d/d_save/d_save/asm/func_80032BB0.s delete mode 100644 include/d/d_save/d_save/asm/func_80032BEC.s delete mode 100644 include/d/d_save/d_save/asm/func_80032CC8.s delete mode 100644 include/d/d_save/d_save/asm/func_80032D1C.s delete mode 100644 include/d/d_save/d_save/asm/func_80032E78.s delete mode 100644 include/d/d_save/d_save/asm/func_80032FB8 .s delete mode 100644 include/d/d_save/d_save/asm/func_80032FB8.s delete mode 100644 include/d/d_save/d_save/asm/func_800336BC.s delete mode 100644 include/d/d_save/d_save/asm/func_80033754.s delete mode 100644 include/d/d_save/d_save/asm/func_80033BEC.s delete mode 100644 include/d/d_save/d_save/asm/func_80033CBC.s delete mode 100644 include/d/d_save/d_save/asm/func_80033D40.s delete mode 100644 include/d/d_save/d_save/asm/func_80033F9C.s delete mode 100644 include/d/d_save/d_save/asm/func_80034040.s delete mode 100644 include/d/d_save/d_save/asm/func_800340B8.s delete mode 100644 include/d/d_save/d_save/asm/func_800340F8.s delete mode 100644 include/d/d_save/d_save/asm/func_800341AC.s delete mode 100644 include/d/d_save/d_save/asm/func_800341E8.s delete mode 100644 include/d/d_save/d_save/asm/func_80034428.s delete mode 100644 include/d/d_save/d_save/asm/func_8003444C.s delete mode 100644 include/d/d_save/d_save/asm/func_80034474.s delete mode 100644 include/d/d_save/d_save/asm/func_8003449C.s delete mode 100644 include/d/d_save/d_save/asm/func_800344FC.s delete mode 100644 include/d/d_save/d_save/asm/func_80034644.s delete mode 100644 include/d/d_save/d_save/asm/func_800347A0.s delete mode 100644 include/d/d_save/d_save/asm/func_800347C4.s delete mode 100644 include/d/d_save/d_save/asm/func_800347E8.s delete mode 100644 include/d/d_save/d_save/asm/func_80034810.s delete mode 100644 include/d/d_save/d_save/asm/func_80034838.s delete mode 100644 include/d/d_save/d_save/asm/func_80034860.s delete mode 100644 include/d/d_save/d_save/asm/func_800348C4.s delete mode 100644 include/d/d_save/d_save/asm/func_800348EC.s delete mode 100644 include/d/d_save/d_save/asm/func_8003498C.s delete mode 100644 include/d/d_save/d_save/asm/func_800349A4.s delete mode 100644 include/d/d_save/d_save/asm/func_800349BC.s delete mode 100644 include/d/d_save/d_save/asm/func_80034AA4.s delete mode 100644 include/d/d_save/d_save/asm/func_80034AC8.s delete mode 100644 include/d/d_save/d_save/asm/func_80034AEC.s delete mode 100644 include/d/d_save/d_save/asm/func_80034B98.s delete mode 100644 include/d/d_save/d_save/asm/func_80034BC0.s delete mode 100644 include/d/d_save/d_save/asm/func_80034BE8.s delete mode 100644 include/d/d_save/d_save/asm/func_80034C14.s delete mode 100644 include/d/d_save/d_save/asm/func_80034C4C.s delete mode 100644 include/d/d_save/d_save/asm/func_80034C74.s delete mode 100644 include/d/d_save/d_save/asm/func_80034D04.s delete mode 100644 include/d/d_save/d_save/asm/func_80034D2C.s delete mode 100644 include/d/d_save/d_save/asm/func_80034D50.s delete mode 100644 include/d/d_save/d_save/asm/func_8003501C.s delete mode 100644 include/d/d_save/d_save/asm/func_800350A8.s delete mode 100644 include/d/d_save/d_save/asm/func_8003514C.s delete mode 100644 include/d/d_save/d_save/asm/func_800351A4.s delete mode 100644 include/d/d_save/d_save/asm/func_80035200.s delete mode 100644 include/d/d_save/d_save/asm/func_80035360.s delete mode 100644 include/d/d_save/d_save/asm/func_8003542C.s delete mode 100644 include/d/d_save/d_save/asm/func_80035590.s delete mode 100644 include/d/d_save/d_save/asm/func_800356B4.s delete mode 100644 include/d/d_save/d_save/asm/func_80035724.s delete mode 100644 include/d/d_stage/asm/func_80023E94.s delete mode 100644 include/d/d_stage/asm/func_80023EC4.s delete mode 100644 include/d/d_stage/asm/func_8002419C.s delete mode 100644 include/d/d_stage/asm/func_80027524.s delete mode 100644 include/d/d_stage/asm/func_8002752C.s delete mode 100644 include/d/d_stage/asm/func_80027534.s delete mode 100644 include/d/d_stage/asm/func_8002753C.s delete mode 100644 include/d/d_stage/asm/func_80027544.s delete mode 100644 include/d/d_stage/asm/func_8002754C.s delete mode 100644 include/d/d_stage/asm/func_80027554.s delete mode 100644 include/d/d_stage/asm/func_8002755C.s delete mode 100644 include/d/d_stage/asm/func_80027590.s delete mode 100644 include/d/d_stage/asm/func_800275C4.s delete mode 100644 include/d/d_stage/asm/func_800275CC.s delete mode 100644 include/d/d_stage/asm/func_800275D4.s delete mode 100644 include/d/d_stage/asm/func_800275DC.s delete mode 100644 include/d/d_stage/asm/func_80027610.s delete mode 100644 include/d/d_stage/asm/func_80027644.s delete mode 100644 include/d/d_stage/asm/func_80027678.s delete mode 100644 include/d/d_stage/asm/func_800276AC.s delete mode 100644 include/d/d_stage/asm/func_800276E0.s delete mode 100644 include/d/d_stage/asm/func_80027714.s delete mode 100644 include/d/d_stage/asm/func_8002771C.s delete mode 100644 include/d/d_stage/asm/func_80027724.s delete mode 100644 include/d/d_stage/asm/func_8002772C.s delete mode 100644 include/d/d_stage/asm/func_80027734.s delete mode 100644 include/d/d_stage/asm/func_80027768.s delete mode 100644 include/d/d_stage/asm/func_8002779C.s delete mode 100644 include/d/d_stage/asm/func_800277D0.s delete mode 100644 include/d/d_stage/asm/func_80027804.s delete mode 100644 include/d/d_stage/asm/func_80027838.s delete mode 100644 include/d/d_stage/asm/func_8002786C.s delete mode 100644 include/d/d_stage/asm/func_800278A0.s delete mode 100644 include/d/d_stage/asm/func_800278D4.s delete mode 100644 include/d/d_stage/asm/func_800278DC.s delete mode 100644 include/d/d_stage/asm/func_800278E4.s delete mode 100644 include/d/d_stage/asm/func_800278EC.s delete mode 100644 include/d/d_stage/asm/func_800278F4.s delete mode 100644 include/d/d_stage/asm/func_80027928.s delete mode 100644 include/d/d_stage/asm/func_8002795C.s delete mode 100644 include/d/d_stage/asm/func_80027964.s delete mode 100644 include/d/d_stage/asm/func_8002796C.s delete mode 100644 include/d/d_stage/asm/func_80027974.s delete mode 100644 include/d/d_stage/asm/func_8002797C.s delete mode 100644 include/d/d_stage/asm/func_800279B0.s delete mode 100644 include/d/d_stage/asm/func_800279E4.s delete mode 100644 include/d/d_stage/asm/func_800279EC.s delete mode 100644 include/d/d_stage/asm/func_80027A20.s delete mode 100644 include/d/d_stage/asm/func_80027A54.s delete mode 100644 include/d/d_stage/asm/func_80027A88.s delete mode 100644 include/d/d_stage/asm/func_80027ABC.s delete mode 100644 include/d/d_stage/asm/func_80027AC4.s delete mode 100644 include/d/d_stage/asm/func_80027ACC.s delete mode 100644 include/d/d_stage/asm/func_80027AD4.s delete mode 100644 include/d/d_stage/asm/func_80027ADC.s delete mode 100644 include/d/d_stage/asm/func_80027AE4.s delete mode 100644 include/d/d_stage/asm/func_80027AEC.s delete mode 100644 include/d/d_stage/asm/func_80027AF4.s delete mode 100644 include/d/d_stage/asm/func_80027AFC.s delete mode 100644 include/d/d_stage/asm/func_80027B04.s delete mode 100644 include/d/d_stage/asm/func_80027B0C.s delete mode 100644 include/d/d_stage/asm/func_80027B14.s delete mode 100644 include/d/d_stage/asm/func_80027B1C.s delete mode 100644 include/d/d_stage/asm/func_80027B24.s delete mode 100644 include/d/d_stage/asm/func_80027B2C.s delete mode 100644 include/d/d_stage/asm/func_80027B34.s delete mode 100644 include/d/d_stage/asm/func_80027B64.s delete mode 100644 include/d/d_stage/asm/func_80027B98.s delete mode 100644 include/d/d_stage/asm/func_80027BC8.s delete mode 100644 include/d/d_stage/asm/func_80027BFC.s delete mode 100644 include/d/d_stage/asm/func_80027C2C.s delete mode 100644 include/d/d_stage/asm/func_80027C60.s delete mode 100644 include/d/d_stage/asm/func_80027C90.s delete mode 100644 include/d/d_stage/asm/func_80027CC0.s delete mode 100644 include/d/d_stage/asm/func_80027CF4.s delete mode 100644 include/d/d_stage/asm/func_80027CFC.s delete mode 100644 include/d/d_stage/asm/func_80027D04.s delete mode 100644 include/d/d_stage/asm/func_80027D0C.s delete mode 100644 include/d/d_stage/asm/func_80027D14.s delete mode 100644 include/d/d_stage/asm/func_80027D18.s delete mode 100644 include/d/d_stage/asm/func_80027D20.s delete mode 100644 include/d/d_stage/asm/func_80027D28.s delete mode 100644 include/d/d_stage/asm/func_80027D30.s delete mode 100644 include/d/d_stage/asm/func_80027D38.s delete mode 100644 include/d/d_stage/asm/func_80027D40.s delete mode 100644 include/d/d_stage/asm/func_80027D70.s delete mode 100644 include/d/d_stage/asm/func_80027DA4.s delete mode 100644 include/d/d_stage/asm/func_80027DD8.s delete mode 100644 include/d/d_stage/asm/func_80027E10.s delete mode 100644 include/d/d_stage/asm/func_80027E18.s delete mode 100644 include/d/d_stage/asm/func_80027E20.s delete mode 100644 include/d/d_stage/asm/func_80027E28.s delete mode 100644 include/d/d_stage/asm/func_80027E30.s delete mode 100644 include/d/d_stage/asm/func_80027E38.s delete mode 100644 include/d/d_stage/asm/func_80027E40.s delete mode 100644 include/d/d_stage/asm/func_80027E48.s delete mode 100644 include/d/d_stage/asm/func_80027E50.s delete mode 100644 include/d/d_stage/asm/func_80027E58.s delete mode 100644 include/d/d_stage/asm/func_80027E60.s delete mode 100644 include/d/d_stage/asm/func_80027E68.s delete mode 100644 include/d/d_stage/asm/func_80027E70.s delete mode 100644 include/d/d_stage/asm/func_80027E78.s delete mode 100644 include/d/d_stage/asm/func_80027E80.s delete mode 100644 include/d/d_stage/asm/func_80027E88.s delete mode 100644 include/d/d_stage/asm/func_80027E90.s delete mode 100644 include/d/d_stage/asm/func_80027E98.s delete mode 100644 include/d/d_stage/asm/func_80027EA0.s delete mode 100644 include/d/d_stage/asm/func_80027EA8.s delete mode 100644 include/d/d_stage/asm/func_80027EB0.s delete mode 100644 include/d/d_stage/asm/func_80027EB8.s delete mode 100644 include/d/d_stage/asm/func_80027EC0.s delete mode 100644 include/d/d_stage/asm/func_80027EC8.s delete mode 100644 include/d/d_stage/asm/func_80027ED0.s delete mode 100644 include/d/d_stage/asm/func_80027ED8.s delete mode 100644 include/d/d_stage/asm/func_80027EE0.s delete mode 100644 include/d/d_stage/asm/func_80027EE8.s delete mode 100644 include/d/d_stage/asm/func_80027EF0.s delete mode 100644 include/d/d_stage/asm/func_80027EF8.s delete mode 100644 include/d/d_stage/asm/func_80027F00.s delete mode 100644 include/d/d_stage/asm/func_80027F08.s delete mode 100644 include/d/d_stage/asm/func_80027F10.s delete mode 100644 include/d/d_stage/asm/func_80027F18.s delete mode 100644 include/d/d_stage/asm/func_80027F4C.s delete mode 100644 include/d/d_stage/asm/func_80027F80.s delete mode 100644 include/d/d_stage/asm/func_80027FB4.s delete mode 100644 include/d/d_stage/asm/func_80027FE8.s delete mode 100644 include/d/d_stage/asm/func_80027FF0.s delete mode 100644 include/d/d_stage/asm/func_80027FF8.s delete mode 100644 include/d/d_stage/asm/func_80028000.s delete mode 100644 include/d/d_stage/asm/func_80028008.s delete mode 100644 include/d/d_stage/asm/func_80028010.s delete mode 100644 include/d/d_stage/asm/func_80028018.s delete mode 100644 include/d/d_stage/asm/func_80028020.s delete mode 100644 include/d/d_stage/asm/func_80028028.s delete mode 100644 include/d/d_stage/asm/func_80028030.s delete mode 100644 include/d/d_stage/asm/func_80028038.s delete mode 100644 include/d/d_stage/asm/func_80028040.s delete mode 100644 include/d/d_stage/asm/func_80028048.s delete mode 100644 include/d/d_stage/asm/func_80028050.s delete mode 100644 include/d/d_stage/asm/func_80028058.s delete mode 100644 include/d/d_stage/asm/func_80028060.s delete mode 100644 include/d/d_stage/asm/func_80028068.s delete mode 100644 include/d/d_stage/asm/func_80028070.s delete mode 100644 include/d/d_stage/asm/func_80028078.s delete mode 100644 include/d/d_stage/asm/func_800280AC.s delete mode 100644 include/d/d_stage/asm/func_800280E0.s delete mode 100644 include/d/d_stage/asm/func_80028114.s delete mode 100644 include/d/d_stage/asm/func_80028148.s delete mode 100644 include/d/d_stage/asm/func_80028150.s delete mode 100644 include/d/d_stage/asm/func_80028158.s delete mode 100644 include/d/d_stage/asm/func_80028160.s delete mode 100644 include/d/d_stage/asm/func_80028168.s delete mode 100644 include/d/d_stage/asm/func_80028170.s delete mode 100644 include/d/d_stage/asm/func_80028178.s delete mode 100644 include/d/d_stage/asm/func_80028180.s delete mode 100644 include/d/d_stage/asm/func_80028188.s delete mode 100644 include/d/d_stage/asm/func_80028190.s delete mode 100644 include/d/d_stage/asm/func_800281C4.s delete mode 100644 include/d/d_stage/asm/func_800281F8.s delete mode 100644 include/d/d_stage/asm/func_80028200.s delete mode 100644 include/d/d_stage/asm/func_80028208.s delete mode 100644 include/d/d_stage/asm/func_80028210.s delete mode 100644 include/d/d_stage/asm/func_80028218.s delete mode 100644 include/d/d_stage/asm/func_80028220.s delete mode 100644 include/d/d_stage/asm/func_80028228.s delete mode 100644 include/d/d_stage/asm/func_80028230.s delete mode 100644 include/d/d_stage/asm/func_80028238.s delete mode 100644 include/d/d_stage/asm/func_8002823C.s delete mode 100644 include/d/d_stage/asm/func_80028244.s delete mode 100644 include/f/f_pc/f_pc_create_req/asm/func_80020BA0.s delete mode 100644 include/m_Do/m_Do_controller_pad/asm/mDoCPd_c_NS_recalibrate.s delete mode 100644 include/m_Do/m_Do_main/asm/func_80005848.s delete mode 100644 include/m_Do/m_Do_main/asm/func_800058C4.s delete mode 100644 include/m_Do/m_Do_main/asm/func_800061C8.s create mode 100644 tools/find_unused_asm.py diff --git a/.github/workflows/ok-check.yml b/.github/workflows/ok-check.yml index c9da2299e2..3a224488e7 100644 --- a/.github/workflows/ok-check.yml +++ b/.github/workflows/ok-check.yml @@ -14,6 +14,11 @@ jobs: uses: actions/checkout@v1 with: token: ${{secrets.MY_REPO_PAT}} + - name: setup python + uses: actions/setup-python@v2 + with: + python-version: '3.x' + architecture: 'x64' - name: Copy in dol and compilers run: cp /tmp/baserom.dol ./baserom.dol && cp -r /tmp/mwcc_compiler/ tools/mwcc_compiler && chown root /github/home/ - name: Run Make (OK) diff --git a/Makefile b/Makefile index 0bf2cf044b..6f811e056d 100644 --- a/Makefile +++ b/Makefile @@ -84,9 +84,6 @@ LDFLAGS := -map $(MAP) -fp hard -nodefaults -w off # Compiler flags CFLAGS += -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -msgstyle gcc -enum int $(INCLUDES) -# for postprocess.py -PROCFLAGS := -fprologue-fixup=old_stack - # elf2dol needs to know these in order to calculate sbss correctly. SDATA_PDHR := 9 SBSS_PDHR := 10 @@ -138,8 +135,7 @@ $(BUILD_DIR)/%.o: %.c $(BUILD_DIR)/%.o: %.cpp $(CC) $(CFLAGS) -c -o $@ $< - # TODO: See if this is necessary after actually adding some C code - # $(PYTHON) $(POSTPROC) $(PROCFLAGS) $@ + $(PYTHON) $(POSTPROC) -fsymbol-fixup $@ ### Debug Print ### diff --git a/asm/JAudio2/JAISeMgr.s b/asm/JAudio2/JAISeMgr.s index 8eb846d8ec..fbe035d370 100644 --- a/asm/JAudio2/JAISeMgr.s +++ b/asm/JAudio2/JAISeMgr.s @@ -72,7 +72,7 @@ lbl_8029F97C: /* 8029F97C 0029C8BC 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8029F980 0029C8C0 41 82 00 10 */ beq lbl_8029F990 /* 8029F984 0029C8C4 38 64 00 10 */ addi r3, r4, 0x10 -/* 8029F988 0029C8C8 48 00 2C 11 */ bl JAISound_NS_stop_X1_ +/* 8029F988 0029C8C8 48 00 2C 11 */ bl stop__8JAISoundFv /* 8029F98C 0029C8CC 38 A0 00 01 */ li r5, 1 lbl_8029F990: /* 8029F990 0029C8D0 83 BD 00 0C */ lwz r29, 0xc(r29) @@ -417,7 +417,7 @@ lbl_8029FE00: /* 8029FE00 0029CD40 80 7F 00 00 */ lwz r3, 0(r31) /* 8029FE04 0029CD44 38 63 00 10 */ addi r3, r3, 0x10 /* 8029FE08 0029CD48 7F C4 F3 78 */ mr r4, r30 -/* 8029FE0C 0029CD4C 48 00 26 D1 */ bl JAISound_NS_stop +/* 8029FE0C 0029CD4C 48 00 26 D1 */ bl stop__8JAISoundFUl /* 8029FE10 0029CD50 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_8029FE14: /* 8029FE14 0029CD54 28 1F 00 00 */ cmplwi r31, 0 @@ -440,7 +440,7 @@ JAISeCategoryMgr_NS_stop_X1_: lbl_8029FE4C: /* 8029FE4C 0029CD8C 80 7F 00 00 */ lwz r3, 0(r31) /* 8029FE50 0029CD90 38 63 00 10 */ addi r3, r3, 0x10 -/* 8029FE54 0029CD94 48 00 27 45 */ bl JAISound_NS_stop_X1_ +/* 8029FE54 0029CD94 48 00 27 45 */ bl stop__8JAISoundFv /* 8029FE58 0029CD98 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_8029FE5C: /* 8029FE5C 0029CD9C 28 1F 00 00 */ cmplwi r31, 0 @@ -473,7 +473,7 @@ lbl_8029FEA8: /* 8029FEB8 0029CDF8 7C 03 00 40 */ cmplw r3, r0 /* 8029FEBC 0029CDFC 40 82 00 0C */ bne lbl_8029FEC8 /* 8029FEC0 0029CE00 38 64 00 10 */ addi r3, r4, 0x10 -/* 8029FEC4 0029CE04 48 00 26 D5 */ bl JAISound_NS_stop_X1_ +/* 8029FEC4 0029CE04 48 00 26 D5 */ bl stop__8JAISoundFv lbl_8029FEC8: /* 8029FEC8 0029CE08 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_8029FECC: @@ -1134,7 +1134,7 @@ JAISeMgr_NS_startSound: /* 802A0790 0029D6D0 80 7E 00 00 */ lwz r3, 0(r30) /* 802A0794 0029D6D4 28 03 00 00 */ cmplwi r3, 0 /* 802A0798 0029D6D8 41 82 00 08 */ beq lbl_802A07A0 -/* 802A079C 0029D6DC 48 00 1D FD */ bl JAISound_NS_stop_X1_ +/* 802A079C 0029D6DC 48 00 1D FD */ bl stop__8JAISoundFv lbl_802A07A0: /* 802A07A0 0029D6E0 83 6D 85 DC */ lwz r27, lbl_80450B5C-_SDA_BASE_(r13) /* 802A07A4 0029D6E4 28 1B 00 00 */ cmplwi r27, 0 diff --git a/asm/JAudio2/JAISeqMgr.s b/asm/JAudio2/JAISeqMgr.s index 901342a3e8..a57e393bc5 100644 --- a/asm/JAudio2/JAISeqMgr.s +++ b/asm/JAudio2/JAISeqMgr.s @@ -66,7 +66,7 @@ lbl_802A18CC: lbl_802A18D0: /* 802A18D0 0029E810 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 802A18D4 0029E814 41 82 00 0C */ beq lbl_802A18E0 -/* 802A18D8 0029E818 48 00 0C C1 */ bl JAISound_NS_stop_X1_ +/* 802A18D8 0029E818 48 00 0C C1 */ bl stop__8JAISoundFv /* 802A18DC 0029E81C 38 A0 00 01 */ li r5, 1 lbl_802A18E0: /* 802A18E0 0029E820 83 BD 00 0C */ lwz r29, 0xc(r29) @@ -259,7 +259,7 @@ JAISeqMgr_NS_startSound: /* 802A1B70 0029EAB0 80 7B 00 00 */ lwz r3, 0(r27) /* 802A1B74 0029EAB4 28 03 00 00 */ cmplwi r3, 0 /* 802A1B78 0029EAB8 41 82 00 08 */ beq lbl_802A1B80 -/* 802A1B7C 0029EABC 48 00 0A 1D */ bl JAISound_NS_stop_X1_ +/* 802A1B7C 0029EABC 48 00 0A 1D */ bl stop__8JAISoundFv lbl_802A1B80: /* 802A1B80 0029EAC0 83 CD 85 DC */ lwz r30, lbl_80450B5C-_SDA_BASE_(r13) /* 802A1B84 0029EAC4 28 1E 00 00 */ cmplwi r30, 0 @@ -452,7 +452,7 @@ JAISeqMgr_NS_stop: /* 802A1E10 0029ED50 48 00 00 10 */ b lbl_802A1E20 lbl_802A1E14: /* 802A1E14 0029ED54 80 7F 00 00 */ lwz r3, 0(r31) -/* 802A1E18 0029ED58 48 00 07 81 */ bl JAISound_NS_stop_X1_ +/* 802A1E18 0029ED58 48 00 07 81 */ bl stop__8JAISoundFv /* 802A1E1C 0029ED5C 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A1E20: /* 802A1E20 0029ED60 28 1F 00 00 */ cmplwi r31, 0 @@ -476,7 +476,7 @@ JAISeqMgr_NS_stop_X1_: lbl_802A1E5C: /* 802A1E5C 0029ED9C 80 7F 00 00 */ lwz r3, 0(r31) /* 802A1E60 0029EDA0 7F C4 F3 78 */ mr r4, r30 -/* 802A1E64 0029EDA4 48 00 06 79 */ bl JAISound_NS_stop +/* 802A1E64 0029EDA4 48 00 06 79 */ bl stop__8JAISoundFUl /* 802A1E68 0029EDA8 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A1E6C: /* 802A1E6C 0029EDAC 28 1F 00 00 */ cmplwi r31, 0 @@ -509,7 +509,7 @@ lbl_802A1EBC: /* 802A1EC8 0029EE08 80 1E 00 00 */ lwz r0, 0(r30) /* 802A1ECC 0029EE0C 7C 04 00 40 */ cmplw r4, r0 /* 802A1ED0 0029EE10 40 82 00 08 */ bne lbl_802A1ED8 -/* 802A1ED4 0029EE14 48 00 06 C5 */ bl JAISound_NS_stop_X1_ +/* 802A1ED4 0029EE14 48 00 06 C5 */ bl stop__8JAISoundFv lbl_802A1ED8: /* 802A1ED8 0029EE18 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A1EDC: diff --git a/asm/JAudio2/JAISound.s b/asm/JAudio2/JAISound.s index 8d9821ca54..1d8a1dfd2b 100644 --- a/asm/JAudio2/JAISound.s +++ b/asm/JAudio2/JAISound.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a2184 -.global JAISoundHandle_NS_releaseSound -JAISoundHandle_NS_releaseSound: +.global releaseSound__14JAISoundHandleFv +releaseSound__14JAISoundHandleFv: /* 802A2184 0029F0C4 80 83 00 00 */ lwz r4, 0(r3) /* 802A2188 0029F0C8 28 04 00 00 */ cmplwi r4, 0 /* 802A218C 0029F0CC 4D 82 00 20 */ beqlr @@ -35,7 +35,7 @@ JAISound_NS_attachHandle: /* 802A21D8 0029F118 80 64 00 00 */ lwz r3, 0(r4) /* 802A21DC 0029F11C 28 03 00 00 */ cmplwi r3, 0 /* 802A21E0 0029F120 41 82 00 08 */ beq lbl_802A21E8 -/* 802A21E4 0029F124 48 00 03 B5 */ bl JAISound_NS_stop_X1_ +/* 802A21E4 0029F124 48 00 03 B5 */ bl stop__8JAISoundFv lbl_802A21E8: /* 802A21E8 0029F128 80 1E 00 04 */ lwz r0, 4(r30) /* 802A21EC 0029F12C 28 00 00 00 */ cmplwi r0, 0 @@ -256,14 +256,14 @@ lbl_802A249C: /* 802A24D4 0029F414 38 21 00 20 */ addi r1, r1, 0x20 /* 802A24D8 0029F418 4E 80 00 20 */ blr -.global JAISound_NS_stop -JAISound_NS_stop: +.global stop__8JAISoundFUl +stop__8JAISoundFUl: /* 802A24DC 0029F41C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A24E0 0029F420 7C 08 02 A6 */ mflr r0 /* 802A24E4 0029F424 90 01 00 14 */ stw r0, 0x14(r1) /* 802A24E8 0029F428 28 04 00 00 */ cmplwi r4, 0 /* 802A24EC 0029F42C 40 82 00 0C */ bne lbl_802A24F8 -/* 802A24F0 0029F430 48 00 00 A9 */ bl JAISound_NS_stop_X1_ +/* 802A24F0 0029F430 48 00 00 A9 */ bl stop__8JAISoundFv /* 802A24F4 0029F434 48 00 00 94 */ b lbl_802A2588 lbl_802A24F8: /* 802A24F8 0029F438 41 82 00 40 */ beq lbl_802A2538 @@ -310,8 +310,8 @@ lbl_802A2588: /* 802A2590 0029F4D0 38 21 00 10 */ addi r1, r1, 0x10 /* 802A2594 0029F4D4 4E 80 00 20 */ blr -.global JAISound_NS_stop_X1_ -JAISound_NS_stop_X1_: +.global stop__8JAISoundFv +stop__8JAISoundFv: /* 802A2598 0029F4D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A259C 0029F4DC 7C 08 02 A6 */ mflr r0 /* 802A25A0 0029F4E0 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JAIStreamMgr.s b/asm/JAudio2/JAIStreamMgr.s index 8cfbd13dbb..9da09af4eb 100644 --- a/asm/JAudio2/JAIStreamMgr.s +++ b/asm/JAudio2/JAIStreamMgr.s @@ -75,7 +75,7 @@ JAIStreamMgr_NS_startSound: /* 802A3C64 002A0BA4 80 7B 00 00 */ lwz r3, 0(r27) /* 802A3C68 002A0BA8 28 03 00 00 */ cmplwi r3, 0 /* 802A3C6C 002A0BAC 41 82 00 08 */ beq lbl_802A3C74 -/* 802A3C70 002A0BB0 4B FF E9 29 */ bl JAISound_NS_stop_X1_ +/* 802A3C70 002A0BB0 4B FF E9 29 */ bl stop__8JAISoundFv lbl_802A3C74: /* 802A3C74 002A0BB4 80 1A 00 00 */ lwz r0, 0(r26) /* 802A3C78 002A0BB8 90 01 00 14 */ stw r0, 0x14(r1) @@ -360,7 +360,7 @@ JAIStreamMgr_NS_stop: /* 802A403C 002A0F7C 48 00 00 10 */ b lbl_802A404C lbl_802A4040: /* 802A4040 002A0F80 80 7F 00 00 */ lwz r3, 0(r31) -/* 802A4044 002A0F84 4B FF E5 55 */ bl JAISound_NS_stop_X1_ +/* 802A4044 002A0F84 4B FF E5 55 */ bl stop__8JAISoundFv /* 802A4048 002A0F88 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A404C: /* 802A404C 002A0F8C 28 1F 00 00 */ cmplwi r31, 0 @@ -384,7 +384,7 @@ JAIStreamMgr_NS_stop_X1_: lbl_802A4088: /* 802A4088 002A0FC8 80 7F 00 00 */ lwz r3, 0(r31) /* 802A408C 002A0FCC 7F C4 F3 78 */ mr r4, r30 -/* 802A4090 002A0FD0 4B FF E4 4D */ bl JAISound_NS_stop +/* 802A4090 002A0FD0 4B FF E4 4D */ bl stop__8JAISoundFUl /* 802A4094 002A0FD4 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A4098: /* 802A4098 002A0FD8 28 1F 00 00 */ cmplwi r31, 0 @@ -413,7 +413,7 @@ lbl_802A40D8: /* 802A40E4 002A1024 80 1E 00 00 */ lwz r0, 0(r30) /* 802A40E8 002A1028 7C 04 00 40 */ cmplw r4, r0 /* 802A40EC 002A102C 40 82 00 08 */ bne lbl_802A40F4 -/* 802A40F0 002A1030 4B FF E4 A9 */ bl JAISound_NS_stop_X1_ +/* 802A40F0 002A1030 4B FF E4 A9 */ bl stop__8JAISoundFv lbl_802A40F4: /* 802A40F4 002A1034 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A40F8: diff --git a/asm/JStudio_JAudio2/object-sound.s b/asm/JStudio_JAudio2/object-sound.s index 95b4ecd45e..efdc0a1dba 100644 --- a/asm/JStudio_JAudio2/object-sound.s +++ b/asm/JStudio_JAudio2/object-sound.s @@ -151,22 +151,22 @@ JStudio_JAudio2_NS_TAdaptor_sound: /* 8028D92C 0028A86C 88 1E 01 1F */ lbz r0, 0x11f(r30) /* 8028D930 0028A870 28 00 00 00 */ cmplwi r0, 0 /* 8028D934 0028A874 40 82 00 0C */ bne lbl_8028D940 -/* 8028D938 0028A878 48 01 4C 61 */ bl JAISound_NS_stop_X1_ +/* 8028D938 0028A878 48 01 4C 61 */ bl stop__8JAISoundFv /* 8028D93C 0028A87C 48 00 00 20 */ b lbl_8028D95C lbl_8028D940: /* 8028D940 0028A880 88 1E 01 1C */ lbz r0, 0x11c(r30) /* 8028D944 0028A884 28 00 00 00 */ cmplwi r0, 0 /* 8028D948 0028A888 41 82 00 10 */ beq lbl_8028D958 /* 8028D94C 0028A88C 38 7E 01 18 */ addi r3, r30, 0x118 -/* 8028D950 0028A890 48 01 48 35 */ bl JAISoundHandle_NS_releaseSound +/* 8028D950 0028A890 48 01 48 35 */ bl releaseSound__14JAISoundHandleFv /* 8028D954 0028A894 48 00 00 08 */ b lbl_8028D95C lbl_8028D958: -/* 8028D958 0028A898 48 01 4C 41 */ bl JAISound_NS_stop_X1_ +/* 8028D958 0028A898 48 01 4C 41 */ bl stop__8JAISoundFv lbl_8028D95C: /* 8028D95C 0028A89C 34 1E 01 18 */ addic. r0, r30, 0x118 /* 8028D960 0028A8A0 41 82 00 0C */ beq lbl_8028D96C /* 8028D964 0028A8A4 38 7E 01 18 */ addi r3, r30, 0x118 -/* 8028D968 0028A8A8 48 01 48 1D */ bl JAISoundHandle_NS_releaseSound +/* 8028D968 0028A8A8 48 01 48 1D */ bl releaseSound__14JAISoundHandleFv lbl_8028D96C: /* 8028D96C 0028A8AC 7F C3 F3 78 */ mr r3, r30 /* 8028D970 0028A8B0 38 80 00 00 */ li r4, 0 @@ -570,7 +570,7 @@ JStudio_JAudio2_NS_TAdaptor_sound_NS_prepareSound_: /* 8028DF18 0028AE58 80 63 01 18 */ lwz r3, 0x118(r3) /* 8028DF1C 0028AE5C 28 03 00 00 */ cmplwi r3, 0 /* 8028DF20 0028AE60 41 82 00 08 */ beq lbl_8028DF28 -/* 8028DF24 0028AE64 48 01 46 75 */ bl JAISound_NS_stop_X1_ +/* 8028DF24 0028AE64 48 01 46 75 */ bl stop__8JAISoundFv lbl_8028DF28: /* 8028DF28 0028AE68 80 7F 01 14 */ lwz r3, 0x114(r31) /* 8028DF2C 0028AE6C 80 63 00 0C */ lwz r3, 0xc(r3) @@ -667,7 +667,7 @@ JStudio_JAudio2_NS_TAdaptor_sound_NS_endSound_fadeOut_: /* 8028E068 0028AFA8 80 63 01 18 */ lwz r3, 0x118(r3) /* 8028E06C 0028AFAC 28 03 00 00 */ cmplwi r3, 0 /* 8028E070 0028AFB0 41 82 00 10 */ beq lbl_8028E080 -/* 8028E074 0028AFB4 48 01 44 69 */ bl JAISound_NS_stop +/* 8028E074 0028AFB4 48 01 44 69 */ bl stop__8JAISoundFUl /* 8028E078 0028AFB8 38 00 00 00 */ li r0, 0 /* 8028E07C 0028AFBC 98 1F 01 20 */ stb r0, 0x120(r31) lbl_8028E080: diff --git a/asm/clib.s b/asm/clib.s index 627691197b..fb1772f1d9 100644 --- a/asm/clib.s +++ b/asm/clib.s @@ -16481,7 +16481,7 @@ lbl_8036F930: /* 8036F934 0036C874 60 42 32 44 */ ori r2, r2, lbl_803D3244@l /* 8036F938 0036C878 38 60 00 00 */ li r3, 0 /* 8036F93C 0036C87C 98 62 00 0C */ stb r3, 0xc(r2) -/* 8036F940 0036C880 48 00 1A 69 */ bl func_803713A8 +/* 8036F940 0036C880 48 00 1A 69 */ bl TRKRestoreExtended1Block /* 8036F944 0036C884 3C 40 80 44 */ lis r2, lbl_8044F338@h /* 8036F948 0036C888 60 42 F3 38 */ ori r2, r2, lbl_8044F338@l /* 8036F94C 0036C88C BB 62 00 80 */ lmw r27, 0x80(r2) @@ -18352,8 +18352,8 @@ lbl_80371340: /* 803713A0 0036E2E0 93 E2 02 78 */ stw r31, 0x278(r2) /* 803713A4 0036E2E4 4E 80 00 20 */ blr -.global func_803713A8 -func_803713A8: +.global TRKRestoreExtended1Block +TRKRestoreExtended1Block: /* 803713A8 0036E2E8 3C 40 80 44 */ lis r2, lbl_8044F338@h /* 803713AC 0036E2EC 60 42 F3 38 */ ori r2, r2, lbl_8044F338@l /* 803713B0 0036E2F0 3C A0 80 3D */ lis r5, lbl_803D3238@h diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index cc4c6e7a5f..1f601c4128 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -9966,7 +9966,7 @@ daBaseNpc_c: /* 8014E718 0014B658 38 7E 00 14 */ addi r3, r30, 0x14 /* 8014E71C 0014B65C 4B F2 A7 4D */ bl dBgS_PolyPassChk_NS_SetObj /* 8014E720 0014B660 38 7F 07 58 */ addi r3, r31, 0x758 -/* 8014E724 0014B664 48 17 1C A5 */ bl Z2Creature +/* 8014E724 0014B664 48 17 1C A5 */ bl __ct__10Z2CreatureFv /* 8014E728 0014B668 3B DF 07 EC */ addi r30, r31, 0x7ec /* 8014E72C 0014B66C 3C 60 80 3A */ lis r3, lbl_803A3354@ha /* 8014E730 0014B670 38 03 33 54 */ addi r0, r3, lbl_803A3354@l diff --git a/asm/d/a/obj/d_a_obj_item.s b/asm/d/a/obj/d_a_obj_item.s index a7cbffbe5f..73a5fd3972 100644 --- a/asm/d/a/obj/d_a_obj_item.s +++ b/asm/d/a/obj/d_a_obj_item.s @@ -902,7 +902,7 @@ Z2SoundObjSimple_NS_dtor: /* 8015BA60 001589A0 38 04 AD 10 */ addi r0, r4, lbl_803CAD10@l /* 8015BA64 001589A4 90 1E 00 10 */ stw r0, 0x10(r30) /* 8015BA68 001589A8 38 80 00 00 */ li r4, 0 -/* 8015BA6C 001589AC 48 16 24 DD */ bl Z2SoundObjBase_NS_dtor +/* 8015BA6C 001589AC 48 16 24 DD */ bl __dt__14Z2SoundObjBaseFv /* 8015BA70 001589B0 7F E0 07 35 */ extsh. r0, r31 /* 8015BA74 001589B4 40 81 00 0C */ ble lbl_8015BA80 /* 8015BA78 001589B8 7F C3 F3 78 */ mr r3, r30 @@ -1153,7 +1153,7 @@ daItem_c_NS__daItem_delete: /* 8015BDF4 00158D34 93 E1 00 0C */ stw r31, 0xc(r1) /* 8015BDF8 00158D38 7C 7F 1B 78 */ mr r31, r3 /* 8015BDFC 00158D3C 38 7F 09 78 */ addi r3, r31, 0x978 -/* 8015BE00 00158D40 48 16 21 F9 */ bl Z2SoundObjBase_NS_deleteObject +/* 8015BE00 00158D40 48 16 21 F9 */ bl deleteObject__14Z2SoundObjBaseFv /* 8015BE04 00158D44 88 1F 09 2A */ lbz r0, 0x92a(r31) /* 8015BE08 00158D48 28 00 00 06 */ cmplwi r0, 6 /* 8015BE0C 00158D4C 41 82 00 0C */ beq lbl_8015BE18 diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index 43af24786c..72bee1cea8 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -910,7 +910,7 @@ lbl_802415B4: /* 80241720 0023E660 41 80 00 28 */ blt lbl_80241748 /* 80241724 0023E664 80 7D 5D B4 */ lwz r3, 0x5db4(r29) /* 80241728 0023E668 38 63 2D 84 */ addi r3, r3, 0x2d84 -/* 8024172C 0023E66C 48 08 9C 45 */ bl Z2WolfHowlMgr_NS_getCorrectLineNum +/* 8024172C 0023E66C 48 08 9C 45 */ bl getCorrectLineNum__13Z2WolfHowlMgrFv /* 80241730 0023E670 98 7F 21 96 */ stb r3, 0x2196(r31) /* 80241734 0023E674 38 00 00 1E */ li r0, 0x1e /* 80241738 0023E678 98 1F 21 97 */ stb r0, 0x2197(r31) @@ -1427,7 +1427,7 @@ lbl_80241E64: /* 80241EA4 0023EDE4 81 8C 02 98 */ lwz r12, 0x298(r12) /* 80241EA8 0023EDE8 7D 89 03 A6 */ mtctr r12 /* 80241EAC 0023EDEC 4E 80 04 21 */ bctrl -/* 80241EB0 0023EDF0 48 08 8E 1D */ bl Z2WolfHowlMgr_NS_getNowInputValue +/* 80241EB0 0023EDF0 48 08 8E 1D */ bl getNowInputValue__13Z2WolfHowlMgrFv /* 80241EB4 0023EDF4 FC 20 08 50 */ fneg f1, f1 /* 80241EB8 0023EDF8 7F E3 FB 78 */ mr r3, r31 /* 80241EBC 0023EDFC 48 00 20 D9 */ bl dMsgScrnHowl_c_NS_getNowPlotPitch @@ -1499,7 +1499,7 @@ lbl_80241FA0: /* 80241FB4 0023EEF4 7D 89 03 A6 */ mtctr r12 /* 80241FB8 0023EEF8 4E 80 04 21 */ bctrl /* 80241FBC 0023EEFC 7F C4 F3 78 */ mr r4, r30 -/* 80241FC0 0023EF00 48 08 9A C9 */ bl Z2WolfHowlMgr_NS_startGuideMelody +/* 80241FC0 0023EF00 48 08 9A C9 */ bl startGuideMelody__13Z2WolfHowlMgrFb /* 80241FC4 0023EF04 90 7F 01 7C */ stw r3, 0x17c(r31) /* 80241FC8 0023EF08 A8 1F 21 2A */ lha r0, 0x212a(r31) /* 80241FCC 0023EF0C 2C 00 00 1E */ cmpwi r0, 0x1e @@ -3231,7 +3231,7 @@ lbl_80243964: /* 80243974 002408B4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80243978 002408B8 80 7E 5D B4 */ lwz r3, 0x5db4(r30) /* 8024397C 002408BC 38 63 2D 84 */ addi r3, r3, 0x2d84 -/* 80243980 002408C0 48 08 7C D1 */ bl Z2WolfHowlMgr_NS_getOnLineNum +/* 80243980 002408C0 48 08 7C D1 */ bl getOnLineNum__13Z2WolfHowlMgrFv /* 80243984 002408C4 7C 60 07 75 */ extsb. r0, r3 /* 80243988 002408C8 41 80 00 48 */ blt lbl_802439D0 /* 8024398C 002408CC A8 1F 21 2A */ lha r0, 0x212a(r31) @@ -3264,7 +3264,7 @@ lbl_802439E0: /* 802439F0 00240930 81 8C 02 98 */ lwz r12, 0x298(r12) /* 802439F4 00240934 7D 89 03 A6 */ mtctr r12 /* 802439F8 00240938 4E 80 04 21 */ bctrl -/* 802439FC 0024093C 48 08 72 D1 */ bl Z2WolfHowlMgr_NS_getNowInputValue +/* 802439FC 0024093C 48 08 72 D1 */ bl getNowInputValue__13Z2WolfHowlMgrFv /* 80243A00 00240940 FC 20 08 50 */ fneg f1, f1 /* 80243A04 00240944 7F E3 FB 78 */ mr r3, r31 /* 80243A08 00240948 48 00 05 8D */ bl dMsgScrnHowl_c_NS_getNowPlotPitch @@ -3921,7 +3921,7 @@ lbl_80244330: /* 80244330 00241270 80 7F 5D B4 */ lwz r3, 0x5db4(r31) /* 80244334 00241274 38 63 2D 84 */ addi r3, r3, 0x2d84 /* 80244338 00241278 57 A4 06 3E */ clrlwi r4, r29, 0x18 -/* 8024433C 0024127C 48 08 6F E5 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 8024433C 0024127C 48 08 6F E5 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 80244340 00241280 54 60 84 3E */ srwi r0, r3, 0x10 /* 80244344 00241284 B0 01 00 08 */ sth r0, 8(r1) /* 80244348 00241288 B0 01 00 0C */ sth r0, 0xc(r1) @@ -3963,7 +3963,7 @@ lbl_802443C4: /* 802443C4 00241304 80 7F 5D B4 */ lwz r3, 0x5db4(r31) /* 802443C8 00241308 38 63 2D 84 */ addi r3, r3, 0x2d84 /* 802443CC 0024130C 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 802443D0 00241310 48 08 6F 51 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802443D0 00241310 48 08 6F 51 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802443D4 00241314 54 60 84 3E */ srwi r0, r3, 0x10 /* 802443D8 00241318 B0 01 00 0C */ sth r0, 0xc(r1) /* 802443DC 0024131C B0 01 00 14 */ sth r0, 0x14(r1) @@ -3978,7 +3978,7 @@ lbl_802443C4: /* 80244400 00241340 80 7F 5D B4 */ lwz r3, 0x5db4(r31) /* 80244404 00241344 38 63 2D 84 */ addi r3, r3, 0x2d84 /* 80244408 00241348 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 8024440C 0024134C 48 08 6F 15 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 8024440C 0024134C 48 08 6F 15 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 80244410 00241350 54 60 84 3E */ srwi r0, r3, 0x10 /* 80244414 00241354 B0 01 00 08 */ sth r0, 8(r1) /* 80244418 00241358 B0 01 00 10 */ sth r0, 0x10(r1) diff --git a/asm/m/Do/m_Do_audio.s b/asm/m/Do/m_Do_audio.s index 7e602fa179..fcd519d833 100644 --- a/asm/m/Do/m_Do_audio.s +++ b/asm/m/Do/m_Do_audio.s @@ -362,12 +362,12 @@ lbl_80007474: lbl_8000747C: /* 8000747C 000043BC 34 7E 0F 30 */ addic. r3, r30, 0xf30 /* 80007480 000043C0 41 82 00 08 */ beq lbl_80007488 -/* 80007484 000043C4 48 29 AD 01 */ bl JAISoundHandle_NS_releaseSound +/* 80007484 000043C4 48 29 AD 01 */ bl releaseSound__14JAISoundHandleFv lbl_80007488: /* 80007488 000043C8 34 1E 0F 2C */ addic. r0, r30, 0xf2c /* 8000748C 000043CC 41 82 00 0C */ beq lbl_80007498 /* 80007490 000043D0 38 7E 0F 2C */ addi r3, r30, 0xf2c -/* 80007494 000043D4 48 29 AC F1 */ bl JAISoundHandle_NS_releaseSound +/* 80007494 000043D4 48 29 AC F1 */ bl releaseSound__14JAISoundHandleFv lbl_80007498: /* 80007498 000043D8 34 1E 0F 2C */ addic. r0, r30, 0xf2c /* 8000749C 000043DC 41 82 00 1C */ beq lbl_800074B8 @@ -564,20 +564,20 @@ lbl_80007744: /* 80007748 00004688 41 82 00 58 */ beq lbl_800077A0 /* 8000774C 0000468C 34 7E 03 DC */ addic. r3, r30, 0x3dc /* 80007750 00004690 41 82 00 08 */ beq lbl_80007758 -/* 80007754 00004694 48 29 AA 31 */ bl JAISoundHandle_NS_releaseSound +/* 80007754 00004694 48 29 AA 31 */ bl releaseSound__14JAISoundHandleFv lbl_80007758: /* 80007758 00004698 34 7E 03 D8 */ addic. r3, r30, 0x3d8 /* 8000775C 0000469C 41 82 00 08 */ beq lbl_80007764 -/* 80007760 000046A0 48 29 AA 25 */ bl JAISoundHandle_NS_releaseSound +/* 80007760 000046A0 48 29 AA 25 */ bl releaseSound__14JAISoundHandleFv lbl_80007764: /* 80007764 000046A4 34 7E 03 D4 */ addic. r3, r30, 0x3d4 /* 80007768 000046A8 41 82 00 08 */ beq lbl_80007770 -/* 8000776C 000046AC 48 29 AA 19 */ bl JAISoundHandle_NS_releaseSound +/* 8000776C 000046AC 48 29 AA 19 */ bl releaseSound__14JAISoundHandleFv lbl_80007770: /* 80007770 000046B0 34 1E 03 D0 */ addic. r0, r30, 0x3d0 /* 80007774 000046B4 41 82 00 0C */ beq lbl_80007780 /* 80007778 000046B8 38 7E 03 D0 */ addi r3, r30, 0x3d0 -/* 8000777C 000046BC 48 29 AA 09 */ bl JAISoundHandle_NS_releaseSound +/* 8000777C 000046BC 48 29 AA 09 */ bl releaseSound__14JAISoundHandleFv lbl_80007780: /* 80007780 000046C0 34 1E 03 D0 */ addic. r0, r30, 0x3d0 /* 80007784 000046C4 41 82 00 1C */ beq lbl_800077A0 @@ -644,7 +644,7 @@ JAISoundHandle_NS_dtor: /* 8000784C 0000478C 7C 7E 1B 79 */ or. r30, r3, r3 /* 80007850 00004790 7C 9F 23 78 */ mr r31, r4 /* 80007854 00004794 41 82 00 18 */ beq lbl_8000786C -/* 80007858 00004798 48 29 A9 2D */ bl JAISoundHandle_NS_releaseSound +/* 80007858 00004798 48 29 A9 2D */ bl releaseSound__14JAISoundHandleFv /* 8000785C 0000479C 7F E0 07 35 */ extsh. r0, r31 /* 80007860 000047A0 40 81 00 0C */ ble lbl_8000786C /* 80007864 000047A4 7F C3 F3 78 */ mr r3, r30 diff --git a/include/JSystem/JAudio2/JAIAudience/JAIAudience.h b/include/JSystem/JAudio2/JAIAudience/JAIAudience.h new file mode 100644 index 0000000000..bada24f649 --- /dev/null +++ b/include/JSystem/JAudio2/JAIAudience/JAIAudience.h @@ -0,0 +1,6 @@ +#ifndef JAIAUDIENCE_H_ +#define JAIAUDIENCE_H_ + +struct JAIAudience {}; + +#endif // JAIAUDIENCE_H_ \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAISe/JAISe.h b/include/JSystem/JAudio2/JAISe/JAISe.h index 1960eadd76..1a9e7bde40 100644 --- a/include/JSystem/JAudio2/JAISe/JAISe.h +++ b/include/JSystem/JAudio2/JAISe/JAISe.h @@ -3,9 +3,4 @@ #include "global.h" -struct JAISoundID { - u32 soundId; - JAISoundID(JAISoundID const& soundIdToSet); -}; - #endif \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAISound/JAISound.h b/include/JSystem/JAudio2/JAISound/JAISound.h new file mode 100644 index 0000000000..d91674aeec --- /dev/null +++ b/include/JSystem/JAudio2/JAISound/JAISound.h @@ -0,0 +1,147 @@ +#ifndef __JAISOUND_H__ +#define __JAISOUND_H__ + +#include "global.h" + +class JAISoundID { +public: + operator u32() const { return this->mId; } + + JAISoundID(u32 pId) : mId(pId) {} + + JAISoundID(JAISoundID const& other); + +private: + u32 mId; +}; + +struct JAISoundParams { + float field_0x0; + float field_0x4; + float field_0x8; + float field_0xc; + float field_0x10; + float field_0x14; + float field_0x18; + float field_0x1c; +}; + +class JAISoundHandle; +class JAIAudible; +class JAIAudience; +class JAISound { +public: + JAISoundID getID() const { return JAISoundID((u32)this->sound_id); } + + void stop(u32 fadeout); + void stop(); + + u32 getUserData() const { return user_data; } + + // TODO: do proper struct later + void* __vt; + struct JAISoundHandle* handle; + struct JAIAudible* audible; + struct JAIAudience* audience; + s32 field_0xc; + s32 num_prepare_steps; + struct JAISoundID sound_id; + u8 field_0x18; + u8 field_0x19; + u8 field_0x1a; + u8 field_0x1b; + u32 user_data; + float field_0x20; + float field_0x24; + float field_0x28; + s32 field_0x2c; + s32 audience_priority; + s32 field_0x34; + struct JAISoundParams params; + u8 field_0x58; + u8 field_0x59; + u8 field_0x5a; + u8 field_0x5b; + u8 field_0x5c; + u8 field_0x5d; + u8 field_0x5e; + u8 field_0x5f; + u8 field_0x60; + u8 field_0x61; + u8 field_0x62; + u8 field_0x63; + u8 field_0x64; + u8 field_0x65; + u8 field_0x66; + u8 field_0x67; + u8 field_0x68; + u8 field_0x69; + u8 field_0x6a; + u8 field_0x6b; + u8 field_0x6c; + u8 field_0x6d; + u8 field_0x6e; + u8 field_0x6f; + u8 field_0x70; + u8 field_0x71; + u8 field_0x72; + u8 field_0x73; + u8 field_0x74; + u8 field_0x75; + u8 field_0x76; + u8 field_0x77; + u8 field_0x78; + u8 field_0x79; + u8 field_0x7a; + u8 field_0x7b; + u8 field_0x7c; + u8 field_0x7d; + u8 field_0x7e; + u8 field_0x7f; + u8 field_0x80; + u8 field_0x81; + u8 field_0x82; + u8 field_0x83; + u8 field_0x84; + u8 field_0x85; + u8 field_0x86; + u8 field_0x87; + u8 field_0x88; + u8 field_0x89; + u8 field_0x8a; + u8 field_0x8b; + u8 field_0x8c; + u8 field_0x8d; + u8 field_0x8e; + u8 field_0x8f; + u8 field_0x90; + u8 field_0x91; + u8 field_0x92; + u8 field_0x93; +}; + +extern "C" { +void stop__8JAISoundFUl(JAISound*, u32 fadeout); +void stop__8JAISoundFv(JAISound*); +} + +class JAISoundHandle { +public: + JAISoundHandle(); // noninline in JAUClusterSound.cpp + + bool isSoundAttached() const { return mSound != NULL; } + + JAISound* operator->() const { + JUT_ASSERT(mSound != NULL); + return mSound; + } + + operator bool() const { return isSoundAttached(); } + + void releaseSound(); + +private: + JAISound* mSound; +}; + +#endif \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h b/include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h new file mode 100644 index 0000000000..2af4e3d0cb --- /dev/null +++ b/include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h @@ -0,0 +1,11 @@ +#ifndef JAISOUNDHANDLES_H_ +#define JAISOUNDHANDLES_H_ + +#include "JSystem/JAudio2/JAISound/JAISound.h" + +class JAISoundHandles { +public: + JAISoundHandle mHandles[24]; +}; + +#endif // JAISOUNDHANDLES_H_ \ No newline at end of file diff --git a/include/JSystem/JAudio2/JASGadget/JASGadget.h b/include/JSystem/JAudio2/JASGadget/JASGadget.h new file mode 100644 index 0000000000..53e727db59 --- /dev/null +++ b/include/JSystem/JAudio2/JASGadget/JASGadget.h @@ -0,0 +1,22 @@ +#ifndef __JASGADGET_H__ +#define __JASGADGET_H__ + +//! @todo figure out *GlobalInstance singleton handlers once we can properly place statics. +/* +template +class JASGlobalInstance { +public: + JASGlobalInstance(bool p1) { + JASGlobalInstance pJVar1; + if ((p1 == true) && (sInstance != NULL)) { + // assert + pJVar1 = this; + } + sInstance = pJVar1; + } + +private: + static T sInstance; +}; */ + +#endif \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h b/include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h new file mode 100644 index 0000000000..d87285eb64 --- /dev/null +++ b/include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h @@ -0,0 +1,6 @@ +#ifndef JAUAUDIOARCLOADER_H_ +#define JAUAUDIOARCLOADER_H_ + +struct JAUSection; // goes in JAudio2.a JAUAudioArcLoader.o + +#endif // JAUAUDIOARCLOADER_H_ \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h b/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h index 918035371d..b34354b56b 100644 --- a/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h +++ b/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h @@ -3,10 +3,4 @@ #include "dolphin/types.h" -struct JAISoundHandle { - void* unk; // probably JAISound* - - JAISoundHandle(); -}; - #endif \ No newline at end of file diff --git a/include/JSystem/JGeometry/JGeometry.h b/include/JSystem/JGeometry/JGeometry.h new file mode 100644 index 0000000000..d751a616bf --- /dev/null +++ b/include/JSystem/JGeometry/JGeometry.h @@ -0,0 +1,25 @@ +#ifndef __JGEOMETRY_H__ +#define __JGEOMETRY_H__ + +#include "dolphin/types.h" + +namespace JGeometry { + +template +struct TVec3 { + T x; + T y; + T z; +}; +/* +template <> +struct TVec3 { + TVec3(Vec& v) { + + } +}; + */ + +} // namespace JGeometry + +#endif \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D1FA4.s b/include/JSystem/JKernel/JKRAram/asm/func_802D1FA4.s deleted file mode 100644 index 3daaa7c1af..0000000000 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D1FA4.s +++ /dev/null @@ -1,43 +0,0 @@ -/* create__7JKRAramFUlUllll __ct__7JKRAramFUlUll::create(unsigned long, unsigned long, long, long, long) */ -/* JKRAram_NS_create */ -/* 802D1FA4 002CEEE4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D1FA8 002CEEE8 7C 08 02 A6 */ mflr r0 -/* 802D1FAC 002CEEEC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D1FB0 002CEEF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D1FB4 002CEEF4 48 09 02 21 */ bl _savegpr_27 -/* 802D1FB8 002CEEF8 7C 7B 1B 78 */ mr r27, r3 -/* 802D1FBC 002CEEFC 7C 9C 23 78 */ mr r28, r4 -/* 802D1FC0 002CEF00 7C BD 2B 78 */ mr r29, r5 -/* 802D1FC4 002CEF04 7C DE 33 78 */ mr r30, r6 -/* 802D1FC8 002CEF08 7C FF 3B 78 */ mr r31, r7 -/* 802D1FCC 002CEF0C 80 0D 8E 48 */ lwz r0, sAramObject__7JKRAram-_SDA_BASE_(r13) -/* 802D1FD0 002CEF10 28 00 00 00 */ cmplwi r0, 0 -/* 802D1FD4 002CEF14 40 82 00 34 */ bne lbl_802D2008 -/* 802D1FD8 002CEF18 38 60 00 A4 */ li r3, 0xa4 -/* 802D1FDC 002CEF1C 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D1FE0 002CEF20 38 A0 00 00 */ li r5, 0 -/* 802D1FE4 002CEF24 4B FF CC B5 */ bl __nw__FUlP7JKRHeapi -/* 802D1FE8 002CEF28 7C 60 1B 79 */ or. r0, r3, r3 -/* 802D1FEC 002CEF2C 41 82 00 18 */ beq lbl_802D2004 -/* 802D1FF0 002CEF30 7F 64 DB 78 */ mr r4, r27 -/* 802D1FF4 002CEF34 7F 85 E3 78 */ mr r5, r28 -/* 802D1FF8 002CEF38 7F E6 FB 78 */ mr r6, r31 -/* 802D1FFC 002CEF3C 48 00 00 45 */ bl __ct__7JKRAramFUlUll -/* 802D2000 002CEF40 7C 60 1B 78 */ mr r0, r3 -lbl_802D2004: -/* 802D2004 002CEF44 90 0D 8E 48 */ stw r0, sAramObject__7JKRAram-_SDA_BASE_(r13) -lbl_802D2008: -/* 802D2008 002CEF48 7F A3 EB 78 */ mr r3, r29 -/* 802D200C 002CEF4C 48 00 1B 3D */ bl create__13JKRAramStreamFl -/* 802D2010 002CEF50 7F C3 F3 78 */ mr r3, r30 -/* 802D2014 002CEF54 48 00 96 6D */ bl create__9JKRDecompFl -/* 802D2018 002CEF58 80 6D 8E 48 */ lwz r3, sAramObject__7JKRAram-_SDA_BASE_(r13) -/* 802D201C 002CEF5C 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 802D2020 002CEF60 48 06 F7 95 */ bl OSResumeThread -/* 802D2024 002CEF64 80 6D 8E 48 */ lwz r3, sAramObject__7JKRAram-_SDA_BASE_(r13) -/* 802D2028 002CEF68 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D202C 002CEF6C 48 09 01 F5 */ bl _restgpr_27 -/* 802D2030 002CEF70 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D2034 002CEF74 7C 08 03 A6 */ mtlr r0 -/* 802D2038 002CEF78 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D203C 002CEF7C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D2040.s b/include/JSystem/JKernel/JKRAram/asm/func_802D2040.s deleted file mode 100644 index 098cab3084..0000000000 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D2040.s +++ /dev/null @@ -1,74 +0,0 @@ -/* __ct__7JKRAramFUlUll __ct__7JKRAramFUlUll::__ct(unsigned long, unsigned long, long) */ -/* JKRAram */ -/* 802D2040 002CEF80 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D2044 002CEF84 7C 08 02 A6 */ mflr r0 -/* 802D2048 002CEF88 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D204C 002CEF8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2050 002CEF90 48 09 01 89 */ bl _savegpr_28 -/* 802D2054 002CEF94 7C 7C 1B 78 */ mr r28, r3 -/* 802D2058 002CEF98 7C 9D 23 78 */ mr r29, r4 -/* 802D205C 002CEF9C 7C BE 2B 78 */ mr r30, r5 -/* 802D2060 002CEFA0 38 80 0C 00 */ li r4, 0xc00 -/* 802D2064 002CEFA4 38 A0 00 10 */ li r5, 0x10 -/* 802D2068 002CEFA8 4B FF F5 01 */ bl __ct__9JKRThreadFUlii -/* 802D206C 002CEFAC 3C 60 80 3D */ lis r3, lbl_803CC158@ha -/* 802D2070 002CEFB0 38 03 C1 58 */ addi r0, r3, lbl_803CC158@l -/* 802D2074 002CEFB4 90 1C 00 00 */ stw r0, 0(r28) -/* 802D2078 002CEFB8 38 7C 00 98 */ addi r3, r28, 0x98 -/* 802D207C 002CEFBC 38 80 00 03 */ li r4, 3 -/* 802D2080 002CEFC0 48 07 E6 AD */ bl ARInit -/* 802D2084 002CEFC4 7C 7F 1B 78 */ mr r31, r3 -/* 802D2088 002CEFC8 48 08 01 DD */ bl ARQInit -/* 802D208C 002CEFCC 48 07 E7 65 */ bl ARGetSize -/* 802D2090 002CEFD0 93 BC 00 80 */ stw r29, 0x80(r28) -/* 802D2094 002CEFD4 3C 1E 00 01 */ addis r0, r30, 1 -/* 802D2098 002CEFD8 28 00 FF FF */ cmplwi r0, 0xffff -/* 802D209C 002CEFDC 40 82 00 1C */ bne lbl_802D20B8 -/* 802D20A0 002CEFE0 7C 1D 18 50 */ subf r0, r29, r3 -/* 802D20A4 002CEFE4 7C 1F 00 50 */ subf r0, r31, r0 -/* 802D20A8 002CEFE8 90 1C 00 88 */ stw r0, 0x88(r28) -/* 802D20AC 002CEFEC 38 00 00 00 */ li r0, 0 -/* 802D20B0 002CEFF0 90 1C 00 90 */ stw r0, 0x90(r28) -/* 802D20B4 002CEFF4 48 00 00 18 */ b lbl_802D20CC -lbl_802D20B8: -/* 802D20B8 002CEFF8 93 DC 00 88 */ stw r30, 0x88(r28) -/* 802D20BC 002CEFFC 7C 1D F2 14 */ add r0, r29, r30 -/* 802D20C0 002CF000 7C 00 18 50 */ subf r0, r0, r3 -/* 802D20C4 002CF004 7C 1F 00 50 */ subf r0, r31, r0 -/* 802D20C8 002CF008 90 1C 00 90 */ stw r0, 0x90(r28) -lbl_802D20CC: -/* 802D20CC 002CF00C 80 7C 00 80 */ lwz r3, 0x80(r28) -/* 802D20D0 002CF010 48 07 E5 F5 */ bl ARAlloc -/* 802D20D4 002CF014 90 7C 00 7C */ stw r3, 0x7c(r28) -/* 802D20D8 002CF018 80 7C 00 88 */ lwz r3, 0x88(r28) -/* 802D20DC 002CF01C 48 07 E5 E9 */ bl ARAlloc -/* 802D20E0 002CF020 90 7C 00 84 */ stw r3, 0x84(r28) -/* 802D20E4 002CF024 80 7C 00 90 */ lwz r3, 0x90(r28) -/* 802D20E8 002CF028 28 03 00 00 */ cmplwi r3, 0 -/* 802D20EC 002CF02C 41 82 00 10 */ beq lbl_802D20FC -/* 802D20F0 002CF030 48 07 E5 D5 */ bl ARAlloc -/* 802D20F4 002CF034 90 7C 00 8C */ stw r3, 0x8c(r28) -/* 802D20F8 002CF038 48 00 00 0C */ b lbl_802D2104 -lbl_802D20FC: -/* 802D20FC 002CF03C 38 00 00 00 */ li r0, 0 -/* 802D2100 002CF040 90 1C 00 8C */ stw r0, 0x8c(r28) -lbl_802D2104: -/* 802D2104 002CF044 38 60 00 44 */ li r3, 0x44 -/* 802D2108 002CF048 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D210C 002CF04C 38 A0 00 00 */ li r5, 0 -/* 802D2110 002CF050 4B FF CB 89 */ bl __nw__FUlP7JKRHeapi -/* 802D2114 002CF054 7C 60 1B 79 */ or. r0, r3, r3 -/* 802D2118 002CF058 41 82 00 14 */ beq lbl_802D212C -/* 802D211C 002CF05C 80 9C 00 84 */ lwz r4, 0x84(r28) -/* 802D2120 002CF060 80 BC 00 88 */ lwz r5, 0x88(r28) -/* 802D2124 002CF064 48 00 0D 21 */ bl __ct__11JKRAramHeapFUlUl -/* 802D2128 002CF068 7C 60 1B 78 */ mr r0, r3 -lbl_802D212C: -/* 802D212C 002CF06C 90 1C 00 94 */ stw r0, 0x94(r28) -/* 802D2130 002CF070 7F 83 E3 78 */ mr r3, r28 -/* 802D2134 002CF074 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2138 002CF078 48 09 00 ED */ bl _restgpr_28 -/* 802D213C 002CF07C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D2140 002CF080 7C 08 03 A6 */ mtlr r0 -/* 802D2144 002CF084 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D2148 002CF088 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D214C.s b/include/JSystem/JKernel/JKRAram/asm/func_802D214C.s deleted file mode 100644 index 8286c0f646..0000000000 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D214C.s +++ /dev/null @@ -1,40 +0,0 @@ -/* __dt__7JKRAramFv __ct__7JKRAramFUlUll::__dt(void) */ -/* missing reference */ -/* 802D214C 002CF08C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D2150 002CF090 7C 08 02 A6 */ mflr r0 -/* 802D2154 002CF094 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D2158 002CF098 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D215C 002CF09C 93 C1 00 08 */ stw r30, 8(r1) -/* 802D2160 002CF0A0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D2164 002CF0A4 7C 9F 23 78 */ mr r31, r4 -/* 802D2168 002CF0A8 41 82 00 58 */ beq lbl_802D21C0 -/* 802D216C 002CF0AC 3C 60 80 3D */ lis r3, lbl_803CC158@ha -/* 802D2170 002CF0B0 38 03 C1 58 */ addi r0, r3, lbl_803CC158@l -/* 802D2174 002CF0B4 90 1E 00 00 */ stw r0, 0(r30) -/* 802D2178 002CF0B8 38 00 00 00 */ li r0, 0 -/* 802D217C 002CF0BC 90 0D 8E 48 */ stw r0, sAramObject__7JKRAram-_SDA_BASE_(r13) -/* 802D2180 002CF0C0 80 7E 00 94 */ lwz r3, 0x94(r30) -/* 802D2184 002CF0C4 28 03 00 00 */ cmplwi r3, 0 -/* 802D2188 002CF0C8 41 82 00 1C */ beq lbl_802D21A4 -/* 802D218C 002CF0CC 41 82 00 18 */ beq lbl_802D21A4 -/* 802D2190 002CF0D0 38 80 00 01 */ li r4, 1 -/* 802D2194 002CF0D4 81 83 00 00 */ lwz r12, 0(r3) -/* 802D2198 002CF0D8 81 8C 00 08 */ lwz r12, 8(r12) -/* 802D219C 002CF0DC 7D 89 03 A6 */ mtctr r12 -/* 802D21A0 002CF0E0 4E 80 04 21 */ bctrl -lbl_802D21A4: -/* 802D21A4 002CF0E4 7F C3 F3 78 */ mr r3, r30 -/* 802D21A8 002CF0E8 38 80 00 00 */ li r4, 0 -/* 802D21AC 002CF0EC 4B FF F5 AD */ bl __dt__9JKRThreadFv -/* 802D21B0 002CF0F0 7F E0 07 35 */ extsh. r0, r31 -/* 802D21B4 002CF0F4 40 81 00 0C */ ble lbl_802D21C0 -/* 802D21B8 002CF0F8 7F C3 F3 78 */ mr r3, r30 -/* 802D21BC 002CF0FC 4B FF CB 81 */ bl __dl__FPv -lbl_802D21C0: -/* 802D21C0 002CF100 7F C3 F3 78 */ mr r3, r30 -/* 802D21C4 002CF104 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D21C8 002CF108 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D21CC 002CF10C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D21D0 002CF110 7C 08 03 A6 */ mtlr r0 -/* 802D21D4 002CF114 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D21D8 002CF118 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D2248.s b/include/JSystem/JKernel/JKRAram/asm/func_802D2248.s deleted file mode 100644 index 90c431714f..0000000000 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D2248.s +++ /dev/null @@ -1,41 +0,0 @@ -/* checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl __ct__7JKRAramFUlUll::checkOkAddress(unsigned char *, unsigned long, JKRAramBlock *, unsigned long) */ -/* JKRAram_NS_checkOkAddress */ -/* 802D2248 002CF188 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D224C 002CF18C 7C 08 02 A6 */ mflr r0 -/* 802D2250 002CF190 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D2254 002CF194 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D2258 002CF198 93 C1 00 08 */ stw r30, 8(r1) -/* 802D225C 002CF19C 7C BE 2B 78 */ mr r30, r5 -/* 802D2260 002CF1A0 7C DF 33 78 */ mr r31, r6 -/* 802D2264 002CF1A4 54 60 06 FF */ clrlwi. r0, r3, 0x1b -/* 802D2268 002CF1A8 41 82 00 28 */ beq lbl_802D2290 -/* 802D226C 002CF1AC 54 80 06 FF */ clrlwi. r0, r4, 0x1b -/* 802D2270 002CF1B0 41 82 00 20 */ beq lbl_802D2290 -/* 802D2274 002CF1B4 3C 60 80 3A */ lis r3, lbl_8039D078@ha -/* 802D2278 002CF1B8 38 63 D0 78 */ addi r3, r3, lbl_8039D078@l -/* 802D227C 002CF1BC 38 80 00 DB */ li r4, 0xdb -/* 802D2280 002CF1C0 38 A3 00 0C */ addi r5, r3, 0xc -/* 802D2284 002CF1C4 38 C3 00 0F */ addi r6, r3, 0xf -/* 802D2288 002CF1C8 4C C6 31 82 */ crclr 6 -/* 802D228C 002CF1CC 48 00 FF 71 */ bl JUTException_NS_panic_f -lbl_802D2290: -/* 802D2290 002CF1D0 28 1E 00 00 */ cmplwi r30, 0 -/* 802D2294 002CF1D4 41 82 00 30 */ beq lbl_802D22C4 -/* 802D2298 002CF1D8 80 1E 00 14 */ lwz r0, 0x14(r30) -/* 802D229C 002CF1DC 7C 1F 02 14 */ add r0, r31, r0 -/* 802D22A0 002CF1E0 54 00 06 FF */ clrlwi. r0, r0, 0x1b -/* 802D22A4 002CF1E4 41 82 00 20 */ beq lbl_802D22C4 -/* 802D22A8 002CF1E8 3C 60 80 3A */ lis r3, lbl_8039D078@ha -/* 802D22AC 002CF1EC 38 63 D0 78 */ addi r3, r3, lbl_8039D078@l -/* 802D22B0 002CF1F0 38 80 00 E3 */ li r4, 0xe3 -/* 802D22B4 002CF1F4 38 A3 00 0C */ addi r5, r3, 0xc -/* 802D22B8 002CF1F8 38 C3 00 0F */ addi r6, r3, 0xf -/* 802D22BC 002CF1FC 4C C6 31 82 */ crclr 6 -/* 802D22C0 002CF200 48 00 FF 3D */ bl JUTException_NS_panic_f -lbl_802D22C4: -/* 802D22C4 002CF204 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D22C8 002CF208 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D22CC 002CF20C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D22D0 002CF210 7C 08 03 A6 */ mtlr r0 -/* 802D22D4 002CF214 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D22D8 002CF218 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D22DC.s b/include/JSystem/JKernel/JKRAram/asm/func_802D22DC.s deleted file mode 100644 index 00602c7bbe..0000000000 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D22DC.s +++ /dev/null @@ -1,27 +0,0 @@ -/* changeGroupIdIfNeed__7JKRAramFPUci __ct__7JKRAramFUlUll::changeGroupIdIfNeed(unsigned char *, int) */ -/* JKRAram_NS_changeGroupIdIfNeed */ -/* 802D22DC 002CF21C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D22E0 002CF220 7C 08 02 A6 */ mflr r0 -/* 802D22E4 002CF224 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D22E8 002CF228 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D22EC 002CF22C 93 C1 00 08 */ stw r30, 8(r1) -/* 802D22F0 002CF230 7C 7E 1B 78 */ mr r30, r3 -/* 802D22F4 002CF234 7C 9F 23 78 */ mr r31, r4 -/* 802D22F8 002CF238 80 6D 8D F4 */ lwz r3, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D22FC 002CF23C 81 83 00 00 */ lwz r12, 0(r3) -/* 802D2300 002CF240 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802D2304 002CF244 7D 89 03 A6 */ mtctr r12 -/* 802D2308 002CF248 4E 80 04 21 */ bctrl -/* 802D230C 002CF24C 3C 03 BA A8 */ addis r0, r3, 0xbaa8 -/* 802D2310 002CF250 28 00 50 48 */ cmplwi r0, 0x5048 -/* 802D2314 002CF254 40 82 00 10 */ bne lbl_802D2324 -/* 802D2318 002CF258 2C 1F 00 00 */ cmpwi r31, 0 -/* 802D231C 002CF25C 41 80 00 08 */ blt lbl_802D2324 -/* 802D2320 002CF260 9B FE FF F3 */ stb r31, -0xd(r30) -lbl_802D2324: -/* 802D2324 002CF264 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D2328 002CF268 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D232C 002CF26C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D2330 002CF270 7C 08 03 A6 */ mtlr r0 -/* 802D2334 002CF274 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D2338 002CF278 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D2C40.s b/include/JSystem/JKernel/JKRAram/asm/func_802D2C40.s deleted file mode 100644 index f73dfa07ec..0000000000 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D2C40.s +++ /dev/null @@ -1,45 +0,0 @@ -/* firstSrcData__Fv firstSrcData(void) */ -/* firstSrcData */ -/* 802D2C40 002CFB80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D2C44 002CFB84 7C 08 02 A6 */ mflr r0 -/* 802D2C48 002CFB88 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D2C4C 002CFB8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D2C50 002CFB90 93 C1 00 08 */ stw r30, 8(r1) -/* 802D2C54 002CFB94 80 6D 8E 50 */ lwz r3, JKRAram__szpEnd-_SDA_BASE_(r13) -/* 802D2C58 002CFB98 38 03 FF E7 */ addi r0, r3, -25 -/* 802D2C5C 002CFB9C 90 0D 8E 68 */ stw r0, JKRAram__srcLimit-_SDA_BASE_(r13) -/* 802D2C60 002CFBA0 80 0D 8E 4C */ lwz r0, JKRAram__szpBuf-_SDA_BASE_(r13) -/* 802D2C64 002CFBA4 7C 1E 03 78 */ mr r30, r0 -/* 802D2C68 002CFBA8 7C 60 18 50 */ subf r3, r0, r3 -/* 802D2C6C 002CFBAC 80 0D 8E 64 */ lwz r0, JKRAram__transLeft-_SDA_BASE_(r13) -/* 802D2C70 002CFBB0 7C 00 18 40 */ cmplw r0, r3 -/* 802D2C74 002CFBB4 7C 7F 1B 78 */ mr r31, r3 -/* 802D2C78 002CFBB8 40 80 00 08 */ bge lbl_802D2C80 -/* 802D2C7C 002CFBBC 7C 1F 03 78 */ mr r31, r0 -lbl_802D2C80: -/* 802D2C80 002CFBC0 38 60 00 01 */ li r3, 1 -/* 802D2C84 002CFBC4 80 8D 8E 6C */ lwz r4, JKRAram__srcAddress-_SDA_BASE_(r13) -/* 802D2C88 002CFBC8 80 0D 8E 60 */ lwz r0, JKRAram__srcOffset-_SDA_BASE_(r13) -/* 802D2C8C 002CFBCC 7C 84 02 14 */ add r4, r4, r0 -/* 802D2C90 002CFBD0 7F C5 F3 78 */ mr r5, r30 -/* 802D2C94 002CFBD4 38 1F 00 1F */ addi r0, r31, 0x1f -/* 802D2C98 002CFBD8 54 06 00 34 */ rlwinm r6, r0, 0, 0, 0x1a -/* 802D2C9C 002CFBDC 38 E0 00 00 */ li r7, 0 -/* 802D2CA0 002CFBE0 48 00 0B 99 */ bl orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock -/* 802D2CA4 002CFBE4 80 0D 8E 60 */ lwz r0, JKRAram__srcOffset-_SDA_BASE_(r13) -/* 802D2CA8 002CFBE8 7C 00 FA 14 */ add r0, r0, r31 -/* 802D2CAC 002CFBEC 90 0D 8E 60 */ stw r0, JKRAram__srcOffset-_SDA_BASE_(r13) -/* 802D2CB0 002CFBF0 80 0D 8E 64 */ lwz r0, JKRAram__transLeft-_SDA_BASE_(r13) -/* 802D2CB4 002CFBF4 7C 1F 00 51 */ subf. r0, r31, r0 -/* 802D2CB8 002CFBF8 90 0D 8E 64 */ stw r0, JKRAram__transLeft-_SDA_BASE_(r13) -/* 802D2CBC 002CFBFC 40 82 00 0C */ bne lbl_802D2CC8 -/* 802D2CC0 002CFC00 7C 1E FA 14 */ add r0, r30, r31 -/* 802D2CC4 002CFC04 90 0D 8E 68 */ stw r0, JKRAram__srcLimit-_SDA_BASE_(r13) -lbl_802D2CC8: -/* 802D2CC8 002CFC08 7F C3 F3 78 */ mr r3, r30 -/* 802D2CCC 002CFC0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D2CD0 002CFC10 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D2CD4 002CFC14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D2CD8 002CFC18 7C 08 03 A6 */ mtlr r0 -/* 802D2CDC 002CFC1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D2CE0 002CFC20 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D2DAC.s b/include/JSystem/JKernel/JKRAram/asm/func_802D2DAC.s deleted file mode 100644 index 6725c28ec2..0000000000 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D2DAC.s +++ /dev/null @@ -1,19 +0,0 @@ -/* __sinit_JKRAram_cpp __sinit_JKRAram_cpp */ -/* missing reference */ -/* 802D2DAC 002CFCEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D2DB0 002CFCF0 7C 08 02 A6 */ mflr r0 -/* 802D2DB4 002CFCF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D2DB8 002CFCF8 3C 60 80 43 */ lis r3, sAramCommandList__7JKRAram@ha -/* 802D2DBC 002CFCFC 38 63 42 DC */ addi r3, r3, sAramCommandList__7JKRAram@l -/* 802D2DC0 002CFD00 48 00 91 55 */ bl initiate__10JSUPtrListFv -/* 802D2DC4 002CFD04 3C 60 80 43 */ lis r3, sAramCommandList__7JKRAram@ha -/* 802D2DC8 002CFD08 38 63 42 DC */ addi r3, r3, sAramCommandList__7JKRAram@l -/* 802D2DCC 002CFD0C 3C 80 80 2D */ lis r4, JSUList_NS_dtor_X4_@ha -/* 802D2DD0 002CFD10 38 84 2D F0 */ addi r4, r4, JSUList_NS_dtor_X4_@l -/* 802D2DD4 002CFD14 3C A0 80 43 */ lis r5, lbl_804342D0@ha -/* 802D2DD8 002CFD18 38 A5 42 D0 */ addi r5, r5, lbl_804342D0@l -/* 802D2DDC 002CFD1C 48 08 EE 49 */ bl func_80361C24 -/* 802D2DE0 002CFD20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D2DE4 002CFD24 7C 08 03 A6 */ mtlr r0 -/* 802D2DE8 002CFD28 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D2DEC 002CFD2C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D2DF0.s b/include/JSystem/JKernel/JKRAram/asm/func_802D2DF0.s deleted file mode 100644 index 73b96beb4c..0000000000 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D2DF0.s +++ /dev/null @@ -1,24 +0,0 @@ -/* __dt__23JSUList<12JKRAMCommand>Fv JSUList<12JKRAMCommand>::__dt(void) */ -/* JSUList_NS_dtor_X4_ */ -/* 802D2DF0 002CFD30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D2DF4 002CFD34 7C 08 02 A6 */ mflr r0 -/* 802D2DF8 002CFD38 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D2DFC 002CFD3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D2E00 002CFD40 93 C1 00 08 */ stw r30, 8(r1) -/* 802D2E04 002CFD44 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D2E08 002CFD48 7C 9F 23 78 */ mr r31, r4 -/* 802D2E0C 002CFD4C 41 82 00 1C */ beq lbl_802D2E28 -/* 802D2E10 002CFD50 38 80 00 00 */ li r4, 0 -/* 802D2E14 002CFD54 48 00 90 99 */ bl __dt__10JSUPtrListFv -/* 802D2E18 002CFD58 7F E0 07 35 */ extsh. r0, r31 -/* 802D2E1C 002CFD5C 40 81 00 0C */ ble lbl_802D2E28 -/* 802D2E20 002CFD60 7F C3 F3 78 */ mr r3, r30 -/* 802D2E24 002CFD64 4B FF BF 19 */ bl __dl__FPv -lbl_802D2E28: -/* 802D2E28 002CFD68 7F C3 F3 78 */ mr r3, r30 -/* 802D2E2C 002CFD6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D2E30 002CFD70 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D2E34 002CFD74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D2E38 002CFD78 7C 08 03 A6 */ mtlr r0 -/* 802D2E3C 002CFD7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D2E40 002CFD80 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramArchive/asm/func_802D7B90.s b/include/JSystem/JKernel/JKRAramArchive/asm/func_802D7B90.s deleted file mode 100644 index 9db5a2d520..0000000000 --- a/include/JSystem/JKernel/JKRAramArchive/asm/func_802D7B90.s +++ /dev/null @@ -1,27 +0,0 @@ -/* __dt__7JKRFileFv JKRFile::__dt(void) */ -/* missing reference */ -/* 802D7B90 002D4AD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D7B94 002D4AD4 7C 08 02 A6 */ mflr r0 -/* 802D7B98 002D4AD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D7B9C 002D4ADC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D7BA0 002D4AE0 93 C1 00 08 */ stw r30, 8(r1) -/* 802D7BA4 002D4AE4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D7BA8 002D4AE8 7C 9F 23 78 */ mr r31, r4 -/* 802D7BAC 002D4AEC 41 82 00 28 */ beq lbl_802D7BD4 -/* 802D7BB0 002D4AF0 3C 80 80 3D */ lis r4, lbl_803CC328@ha -/* 802D7BB4 002D4AF4 38 04 C3 28 */ addi r0, r4, lbl_803CC328@l -/* 802D7BB8 002D4AF8 90 1E 00 00 */ stw r0, 0(r30) -/* 802D7BBC 002D4AFC 38 80 00 00 */ li r4, 0 -/* 802D7BC0 002D4B00 4B FF 99 25 */ bl __dt__11JKRDisposerFv -/* 802D7BC4 002D4B04 7F E0 07 35 */ extsh. r0, r31 -/* 802D7BC8 002D4B08 40 81 00 0C */ ble lbl_802D7BD4 -/* 802D7BCC 002D4B0C 7F C3 F3 78 */ mr r3, r30 -/* 802D7BD0 002D4B10 4B FF 71 6D */ bl __dl__FPv -lbl_802D7BD4: -/* 802D7BD4 002D4B14 7F C3 F3 78 */ mr r3, r30 -/* 802D7BD8 002D4B18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D7BDC 002D4B1C 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D7BE0 002D4B20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D7BE4 002D4B24 7C 08 03 A6 */ mtlr r0 -/* 802D7BE8 002D4B28 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D7BEC 002D4B2C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramHeap/asm/func_802D326C.s b/include/JSystem/JKernel/JKRAramHeap/asm/func_802D326C.s deleted file mode 100644 index 50499da1c5..0000000000 --- a/include/JSystem/JKernel/JKRAramHeap/asm/func_802D326C.s +++ /dev/null @@ -1,19 +0,0 @@ -/* __sinit_JKRAramHeap_cpp __sinit_JKRAramHeap_cpp */ -/* missing reference */ -/* 802D326C 002D01AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D3270 002D01B0 7C 08 02 A6 */ mflr r0 -/* 802D3274 002D01B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D3278 002D01B8 3C 60 80 43 */ lis r3, lbl_8043430C@ha -/* 802D327C 002D01BC 38 63 43 0C */ addi r3, r3, lbl_8043430C@l -/* 802D3280 002D01C0 48 00 8C 95 */ bl initiate__10JSUPtrListFv -/* 802D3284 002D01C4 3C 60 80 43 */ lis r3, lbl_8043430C@ha -/* 802D3288 002D01C8 38 63 43 0C */ addi r3, r3, lbl_8043430C@l -/* 802D328C 002D01CC 3C 80 80 2D */ lis r4, JSUList_NS_dtor_X5_@ha -/* 802D3290 002D01D0 38 84 32 B0 */ addi r4, r4, JSUList_NS_dtor_X5_@l -/* 802D3294 002D01D4 3C A0 80 43 */ lis r5, lbl_80434300@ha -/* 802D3298 002D01D8 38 A5 43 00 */ addi r5, r5, lbl_80434300@l -/* 802D329C 002D01DC 48 08 E9 89 */ bl func_80361C24 -/* 802D32A0 002D01E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D32A4 002D01E4 7C 08 03 A6 */ mtlr r0 -/* 802D32A8 002D01E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D32AC 002D01EC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramHeap/asm/func_802D32B0.s b/include/JSystem/JKernel/JKRAramHeap/asm/func_802D32B0.s deleted file mode 100644 index 5fb96ef721..0000000000 --- a/include/JSystem/JKernel/JKRAramHeap/asm/func_802D32B0.s +++ /dev/null @@ -1,24 +0,0 @@ -/* __dt__23JSUList<12JKRAramBlock>Fv JSUList<12JKRAramBlock>::__dt(void) */ -/* JSUList_NS_dtor_X5_ */ -/* 802D32B0 002D01F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D32B4 002D01F4 7C 08 02 A6 */ mflr r0 -/* 802D32B8 002D01F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D32BC 002D01FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D32C0 002D0200 93 C1 00 08 */ stw r30, 8(r1) -/* 802D32C4 002D0204 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D32C8 002D0208 7C 9F 23 78 */ mr r31, r4 -/* 802D32CC 002D020C 41 82 00 1C */ beq lbl_802D32E8 -/* 802D32D0 002D0210 38 80 00 00 */ li r4, 0 -/* 802D32D4 002D0214 48 00 8B D9 */ bl __dt__10JSUPtrListFv -/* 802D32D8 002D0218 7F E0 07 35 */ extsh. r0, r31 -/* 802D32DC 002D021C 40 81 00 0C */ ble lbl_802D32E8 -/* 802D32E0 002D0220 7F C3 F3 78 */ mr r3, r30 -/* 802D32E4 002D0224 4B FF BA 59 */ bl __dl__FPv -lbl_802D32E8: -/* 802D32E8 002D0228 7F C3 F3 78 */ mr r3, r30 -/* 802D32EC 002D022C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D32F0 002D0230 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D32F4 002D0234 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D32F8 002D0238 7C 08 03 A6 */ mtlr r0 -/* 802D32FC 002D023C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D3300 002D0240 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s b/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s deleted file mode 100644 index f9b48da470..0000000000 --- a/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s +++ /dev/null @@ -1,92 +0,0 @@ -/* orderAsync__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v JKRAramPiece::orderAsync(int, unsigned long, unsigned long, unsigned long, JKRAramBlock *, void (*)(unsigned long)) */ -/* JKRAramPiece_NS_orderAsync */ -/* 802D3614 002D0554 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802D3618 002D0558 7C 08 02 A6 */ mflr r0 -/* 802D361C 002D055C 90 01 00 34 */ stw r0, 0x34(r1) -/* 802D3620 002D0560 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D3624 002D0564 48 08 EB A9 */ bl _savegpr_25 -/* 802D3628 002D0568 7C 7A 1B 78 */ mr r26, r3 -/* 802D362C 002D056C 7C 9B 23 78 */ mr r27, r4 -/* 802D3630 002D0570 7C BC 2B 78 */ mr r28, r5 -/* 802D3634 002D0574 7C DD 33 78 */ mr r29, r6 -/* 802D3638 002D0578 7C FE 3B 78 */ mr r30, r7 -/* 802D363C 002D057C 7D 1F 43 78 */ mr r31, r8 -/* 802D3640 002D0580 3C 60 80 43 */ lis r3, lbl_80434330@ha -/* 802D3644 002D0584 38 63 43 30 */ addi r3, r3, lbl_80434330@l -/* 802D3648 002D0588 48 06 B9 F9 */ bl OSLockMutex -/* 802D364C 002D058C 57 60 06 FF */ clrlwi. r0, r27, 0x1b -/* 802D3650 002D0590 40 82 00 0C */ bne lbl_802D365C -/* 802D3654 002D0594 57 80 06 FF */ clrlwi. r0, r28, 0x1b -/* 802D3658 002D0598 41 82 00 80 */ beq lbl_802D36D8 -lbl_802D365C: -/* 802D365C 002D059C 3C 60 80 3A */ lis r3, lbl_8039D0B8@ha -/* 802D3660 002D05A0 38 63 D0 B8 */ addi r3, r3, lbl_8039D0B8@l -/* 802D3664 002D05A4 7F 44 D3 78 */ mr r4, r26 -/* 802D3668 002D05A8 4C C6 31 82 */ crclr 6 -/* 802D366C 002D05AC 4B D3 34 51 */ bl OSReport -/* 802D3670 002D05B0 3C 60 80 3A */ lis r3, lbl_8039D0B8@ha -/* 802D3674 002D05B4 38 63 D0 B8 */ addi r3, r3, lbl_8039D0B8@l -/* 802D3678 002D05B8 38 63 00 10 */ addi r3, r3, 0x10 -/* 802D367C 002D05BC 7F 64 DB 78 */ mr r4, r27 -/* 802D3680 002D05C0 4C C6 31 82 */ crclr 6 -/* 802D3684 002D05C4 4B D3 34 39 */ bl OSReport -/* 802D3688 002D05C8 3C 60 80 3A */ lis r3, lbl_8039D0B8@ha -/* 802D368C 002D05CC 38 63 D0 B8 */ addi r3, r3, lbl_8039D0B8@l -/* 802D3690 002D05D0 38 63 00 1D */ addi r3, r3, 0x1d -/* 802D3694 002D05D4 7F 84 E3 78 */ mr r4, r28 -/* 802D3698 002D05D8 4C C6 31 82 */ crclr 6 -/* 802D369C 002D05DC 4B D3 34 21 */ bl OSReport -/* 802D36A0 002D05E0 3C 60 80 3A */ lis r3, lbl_8039D0B8@ha -/* 802D36A4 002D05E4 38 63 D0 B8 */ addi r3, r3, lbl_8039D0B8@l -/* 802D36A8 002D05E8 38 63 00 2F */ addi r3, r3, 0x2f -/* 802D36AC 002D05EC 7F A4 EB 78 */ mr r4, r29 -/* 802D36B0 002D05F0 4C C6 31 82 */ crclr 6 -/* 802D36B4 002D05F4 4B D3 34 09 */ bl OSReport -/* 802D36B8 002D05F8 3C 60 80 3A */ lis r3, lbl_8039D0B8@ha -/* 802D36BC 002D05FC 38 C3 D0 B8 */ addi r6, r3, lbl_8039D0B8@l -/* 802D36C0 002D0600 38 66 00 3C */ addi r3, r6, 0x3c -/* 802D36C4 002D0604 38 80 00 6C */ li r4, 0x6c -/* 802D36C8 002D0608 38 A6 00 4D */ addi r5, r6, 0x4d -/* 802D36CC 002D060C 38 C6 00 50 */ addi r6, r6, 0x50 -/* 802D36D0 002D0610 4C C6 31 82 */ crclr 6 -/* 802D36D4 002D0614 48 00 EB 29 */ bl JUTException_NS_panic_f -lbl_802D36D8: -/* 802D36D8 002D0618 38 60 00 08 */ li r3, 8 -/* 802D36DC 002D061C 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D36E0 002D0620 38 A0 FF FC */ li r5, -4 -/* 802D36E4 002D0624 4B FF B5 B5 */ bl __nw__FUlP7JKRHeapi -/* 802D36E8 002D0628 7C 79 1B 78 */ mr r25, r3 -/* 802D36EC 002D062C 7F 43 D3 78 */ mr r3, r26 -/* 802D36F0 002D0630 7F 64 DB 78 */ mr r4, r27 -/* 802D36F4 002D0634 7F 85 E3 78 */ mr r5, r28 -/* 802D36F8 002D0638 7F A6 EB 78 */ mr r6, r29 -/* 802D36FC 002D063C 7F C7 F3 78 */ mr r7, r30 -/* 802D3700 002D0640 7F E8 FB 78 */ mr r8, r31 -/* 802D3704 002D0644 4B FF FE 71 */ bl prepareCommand__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v -/* 802D3708 002D0648 7C 7A 1B 78 */ mr r26, r3 -/* 802D370C 002D064C 38 00 00 01 */ li r0, 1 -/* 802D3710 002D0650 90 19 00 00 */ stw r0, 0(r25) -/* 802D3714 002D0654 93 59 00 04 */ stw r26, 4(r25) -/* 802D3718 002D0658 3C 60 80 3D */ lis r3, sMessageQueue__7JKRAram@ha -/* 802D371C 002D065C 38 63 C1 38 */ addi r3, r3, sMessageQueue__7JKRAram@l -/* 802D3720 002D0660 7F 24 CB 78 */ mr r4, r25 -/* 802D3724 002D0664 38 A0 00 01 */ li r5, 1 -/* 802D3728 002D0668 48 06 B2 CD */ bl OSSendMessage -/* 802D372C 002D066C 80 1A 00 58 */ lwz r0, 0x58(r26) -/* 802D3730 002D0670 28 00 00 00 */ cmplwi r0, 0 -/* 802D3734 002D0674 41 82 00 14 */ beq lbl_802D3748 -/* 802D3738 002D0678 3C 60 80 43 */ lis r3, lbl_80434324@ha -/* 802D373C 002D067C 38 63 43 24 */ addi r3, r3, lbl_80434324@l -/* 802D3740 002D0680 38 9A 00 20 */ addi r4, r26, 0x20 -/* 802D3744 002D0684 48 00 88 09 */ bl append__10JSUPtrListFP10JSUPtrLink -lbl_802D3748: -/* 802D3748 002D0688 3C 60 80 43 */ lis r3, lbl_80434330@ha -/* 802D374C 002D068C 38 63 43 30 */ addi r3, r3, lbl_80434330@l -/* 802D3750 002D0690 48 06 B9 CD */ bl OSUnlockMutex -/* 802D3754 002D0694 7F 43 D3 78 */ mr r3, r26 -/* 802D3758 002D0698 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D375C 002D069C 48 08 EA BD */ bl _restgpr_25 -/* 802D3760 002D06A0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802D3764 002D06A4 7C 08 03 A6 */ mtlr r0 -/* 802D3768 002D06A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D376C 002D06AC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3B04.s b/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3B04.s deleted file mode 100644 index 099ad7ebce..0000000000 --- a/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3B04.s +++ /dev/null @@ -1,19 +0,0 @@ -/* __sinit_JKRAramPiece_cpp __sinit_JKRAramPiece_cpp */ -/* missing reference */ -/* 802D3B04 002D0A44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D3B08 002D0A48 7C 08 02 A6 */ mflr r0 -/* 802D3B0C 002D0A4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D3B10 002D0A50 3C 60 80 43 */ lis r3, lbl_80434324@ha -/* 802D3B14 002D0A54 38 63 43 24 */ addi r3, r3, lbl_80434324@l -/* 802D3B18 002D0A58 48 00 83 FD */ bl initiate__10JSUPtrListFv -/* 802D3B1C 002D0A5C 3C 60 80 43 */ lis r3, lbl_80434324@ha -/* 802D3B20 002D0A60 38 63 43 24 */ addi r3, r3, lbl_80434324@l -/* 802D3B24 002D0A64 3C 80 80 2D */ lis r4, JSUList_NS_dtor_X4_@ha -/* 802D3B28 002D0A68 38 84 2D F0 */ addi r4, r4, JSUList_NS_dtor_X4_@l -/* 802D3B2C 002D0A6C 3C A0 80 43 */ lis r5, lbl_80434318@ha -/* 802D3B30 002D0A70 38 A5 43 18 */ addi r5, r5, lbl_80434318@l -/* 802D3B34 002D0A74 48 08 E0 F1 */ bl func_80361C24 -/* 802D3B38 002D0A78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D3B3C 002D0A7C 7C 08 03 A6 */ mtlr r0 -/* 802D3B40 002D0A80 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D3B44 002D0A84 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3B48.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3B48.s deleted file mode 100644 index 3c98bc4701..0000000000 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3B48.s +++ /dev/null @@ -1,32 +0,0 @@ -/* create__13JKRAramStreamFl __ct__13JKRAramStreamFl::create(long) */ -/* JKRAramStream_NS_create */ -/* 802D3B48 002D0A88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D3B4C 002D0A8C 7C 08 02 A6 */ mflr r0 -/* 802D3B50 002D0A90 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D3B54 002D0A94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D3B58 002D0A98 7C 7F 1B 78 */ mr r31, r3 -/* 802D3B5C 002D0A9C 80 0D 8E 88 */ lwz r0, sAramStreamObject__13JKRAramStream-_SDA_BASE_(r13) -/* 802D3B60 002D0AA0 28 00 00 00 */ cmplwi r0, 0 -/* 802D3B64 002D0AA4 40 82 00 3C */ bne lbl_802D3BA0 -/* 802D3B68 002D0AA8 38 60 00 7C */ li r3, 0x7c -/* 802D3B6C 002D0AAC 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D3B70 002D0AB0 38 A0 00 00 */ li r5, 0 -/* 802D3B74 002D0AB4 4B FF B1 25 */ bl __nw__FUlP7JKRHeapi -/* 802D3B78 002D0AB8 7C 60 1B 79 */ or. r0, r3, r3 -/* 802D3B7C 002D0ABC 41 82 00 10 */ beq lbl_802D3B8C -/* 802D3B80 002D0AC0 7F E4 FB 78 */ mr r4, r31 -/* 802D3B84 002D0AC4 48 00 00 35 */ bl __ct__13JKRAramStreamFl -/* 802D3B88 002D0AC8 7C 60 1B 78 */ mr r0, r3 -lbl_802D3B8C: -/* 802D3B8C 002D0ACC 90 0D 8E 88 */ stw r0, sAramStreamObject__13JKRAramStream-_SDA_BASE_(r13) -/* 802D3B90 002D0AD0 38 60 00 00 */ li r3, 0 -/* 802D3B94 002D0AD4 38 80 00 00 */ li r4, 0 -/* 802D3B98 002D0AD8 38 A0 00 00 */ li r5, 0 -/* 802D3B9C 002D0ADC 48 00 04 99 */ bl setTransBuffer__13JKRAramStreamFPUcUlP7JKRHeap -lbl_802D3BA0: -/* 802D3BA0 002D0AE0 80 6D 8E 88 */ lwz r3, sAramStreamObject__13JKRAramStream-_SDA_BASE_(r13) -/* 802D3BA4 002D0AE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D3BA8 002D0AE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D3BAC 002D0AEC 7C 08 03 A6 */ mtlr r0 -/* 802D3BB0 002D0AF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D3BB4 002D0AF4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3BB8.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3BB8.s deleted file mode 100644 index b68ac9ab9f..0000000000 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3BB8.s +++ /dev/null @@ -1,22 +0,0 @@ -/* __ct__13JKRAramStreamFl __ct__13JKRAramStreamFl::__ct(long) */ -/* JKRAramStream */ -/* 802D3BB8 002D0AF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D3BBC 002D0AFC 7C 08 02 A6 */ mflr r0 -/* 802D3BC0 002D0B00 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D3BC4 002D0B04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D3BC8 002D0B08 7C 7F 1B 78 */ mr r31, r3 -/* 802D3BCC 002D0B0C 7C 86 23 78 */ mr r6, r4 -/* 802D3BD0 002D0B10 38 80 0C 00 */ li r4, 0xc00 -/* 802D3BD4 002D0B14 38 A0 00 10 */ li r5, 0x10 -/* 802D3BD8 002D0B18 4B FF D9 91 */ bl __ct__9JKRThreadFUlii -/* 802D3BDC 002D0B1C 3C 60 80 3D */ lis r3, lbl_803CC1B8@ha -/* 802D3BE0 002D0B20 38 03 C1 B8 */ addi r0, r3, lbl_803CC1B8@l -/* 802D3BE4 002D0B24 90 1F 00 00 */ stw r0, 0(r31) -/* 802D3BE8 002D0B28 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 802D3BEC 002D0B2C 48 06 DB C9 */ bl OSResumeThread -/* 802D3BF0 002D0B30 7F E3 FB 78 */ mr r3, r31 -/* 802D3BF4 002D0B34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D3BF8 002D0B38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D3BFC 002D0B3C 7C 08 03 A6 */ mtlr r0 -/* 802D3C00 002D0B40 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D3C04 002D0B44 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3C08.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3C08.s deleted file mode 100644 index 489cb191dc..0000000000 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3C08.s +++ /dev/null @@ -1,27 +0,0 @@ -/* __dt__13JKRAramStreamFv __ct__13JKRAramStreamFl::__dt(void) */ -/* missing reference */ -/* 802D3C08 002D0B48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D3C0C 002D0B4C 7C 08 02 A6 */ mflr r0 -/* 802D3C10 002D0B50 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D3C14 002D0B54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D3C18 002D0B58 93 C1 00 08 */ stw r30, 8(r1) -/* 802D3C1C 002D0B5C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D3C20 002D0B60 7C 9F 23 78 */ mr r31, r4 -/* 802D3C24 002D0B64 41 82 00 28 */ beq lbl_802D3C4C -/* 802D3C28 002D0B68 3C 80 80 3D */ lis r4, lbl_803CC1B8@ha -/* 802D3C2C 002D0B6C 38 04 C1 B8 */ addi r0, r4, lbl_803CC1B8@l -/* 802D3C30 002D0B70 90 1E 00 00 */ stw r0, 0(r30) -/* 802D3C34 002D0B74 38 80 00 00 */ li r4, 0 -/* 802D3C38 002D0B78 4B FF DB 21 */ bl __dt__9JKRThreadFv -/* 802D3C3C 002D0B7C 7F E0 07 35 */ extsh. r0, r31 -/* 802D3C40 002D0B80 40 81 00 0C */ ble lbl_802D3C4C -/* 802D3C44 002D0B84 7F C3 F3 78 */ mr r3, r30 -/* 802D3C48 002D0B88 4B FF B0 F5 */ bl __dl__FPv -lbl_802D3C4C: -/* 802D3C4C 002D0B8C 7F C3 F3 78 */ mr r3, r30 -/* 802D3C50 002D0B90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D3C54 002D0B94 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D3C58 002D0B98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D3C5C 002D0B9C 7C 08 03 A6 */ mtlr r0 -/* 802D3C60 002D0BA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D3C64 002D0BA4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3C68.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3C68.s deleted file mode 100644 index a8343425fa..0000000000 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3C68.s +++ /dev/null @@ -1,33 +0,0 @@ -/* run__13JKRAramStreamFv __ct__13JKRAramStreamFl::run(void) */ -/* missing reference */ -/* 802D3C68 002D0BA8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D3C6C 002D0BAC 7C 08 02 A6 */ mflr r0 -/* 802D3C70 002D0BB0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D3C74 002D0BB4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802D3C78 002D0BB8 3C 60 80 3D */ lis r3, sMessageQueue__13JKRAramStream@ha -/* 802D3C7C 002D0BBC 38 63 C1 98 */ addi r3, r3, sMessageQueue__13JKRAramStream@l -/* 802D3C80 002D0BC0 3C 80 80 3D */ lis r4, sMessageBuffer__13JKRAramStream@ha -/* 802D3C84 002D0BC4 38 84 C1 88 */ addi r4, r4, sMessageBuffer__13JKRAramStream@l -/* 802D3C88 002D0BC8 38 A0 00 04 */ li r5, 4 -/* 802D3C8C 002D0BCC 48 06 AD 09 */ bl OSInitMessageQueue -/* 802D3C90 002D0BD0 3C 60 80 3D */ lis r3, sMessageQueue__13JKRAramStream@ha -/* 802D3C94 002D0BD4 3B E3 C1 98 */ addi r31, r3, sMessageQueue__13JKRAramStream@l -lbl_802D3C98: -/* 802D3C98 002D0BD8 7F E3 FB 78 */ mr r3, r31 -/* 802D3C9C 002D0BDC 38 81 00 08 */ addi r4, r1, 8 -/* 802D3CA0 002D0BE0 38 A0 00 01 */ li r5, 1 -/* 802D3CA4 002D0BE4 48 06 AE 19 */ bl OSReceiveMessage -/* 802D3CA8 002D0BE8 80 61 00 08 */ lwz r3, 8(r1) -/* 802D3CAC 002D0BEC 80 03 00 00 */ lwz r0, 0(r3) -/* 802D3CB0 002D0BF0 2C 00 00 02 */ cmpwi r0, 2 -/* 802D3CB4 002D0BF4 41 82 00 1C */ beq lbl_802D3CD0 -/* 802D3CB8 002D0BF8 40 80 FF E0 */ bge lbl_802D3C98 -/* 802D3CBC 002D0BFC 2C 00 00 01 */ cmpwi r0, 1 -/* 802D3CC0 002D0C00 40 80 00 08 */ bge lbl_802D3CC8 -/* 802D3CC4 002D0C04 4B FF FF D4 */ b lbl_802D3C98 -lbl_802D3CC8: -/* 802D3CC8 002D0C08 48 00 00 11 */ bl readFromAram__13JKRAramStreamFv -/* 802D3CCC 002D0C0C 4B FF FF CC */ b lbl_802D3C98 -lbl_802D3CD0: -/* 802D3CD0 002D0C10 48 00 00 11 */ bl writeToAram__13JKRAramStreamFP20JKRAramStreamCommand -/* 802D3CD4 002D0C14 4B FF FF C4 */ b lbl_802D3C98 diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CD8.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CD8.s deleted file mode 100644 index 0789140603..0000000000 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CD8.s +++ /dev/null @@ -1,4 +0,0 @@ -/* readFromAram__13JKRAramStreamFv __ct__13JKRAramStreamFl::readFromAram(void) */ -/* JKRAramStream_NS_readFromAram */ -/* 802D3CD8 002D0C18 38 60 00 01 */ li r3, 1 -/* 802D3CDC 002D0C1C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3ED0.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3ED0.s deleted file mode 100644 index 84f2bb4547..0000000000 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3ED0.s +++ /dev/null @@ -1,56 +0,0 @@ -/* write_StreamToAram_Async__13JKRAramStreamFP18JSUFileInputStreamUlUlUlPUl __ct__13JKRAramStreamFl::write_StreamToAram_Async(JSUFileInputStream *, unsigned long, unsigned long, unsigned long, unsigned long *) */ -/* JKRAramStream_NS_write_StreamToAram_Async */ -/* 802D3ED0 002D0E10 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D3ED4 002D0E14 7C 08 02 A6 */ mflr r0 -/* 802D3ED8 002D0E18 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D3EDC 002D0E1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D3EE0 002D0E20 48 08 E2 F1 */ bl _savegpr_26 -/* 802D3EE4 002D0E24 7C 7A 1B 78 */ mr r26, r3 -/* 802D3EE8 002D0E28 7C 9B 23 78 */ mr r27, r4 -/* 802D3EEC 002D0E2C 7C BC 2B 78 */ mr r28, r5 -/* 802D3EF0 002D0E30 7C DD 33 78 */ mr r29, r6 -/* 802D3EF4 002D0E34 7C FE 3B 78 */ mr r30, r7 -/* 802D3EF8 002D0E38 38 60 00 5C */ li r3, 0x5c -/* 802D3EFC 002D0E3C 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D3F00 002D0E40 38 A0 FF FC */ li r5, -4 -/* 802D3F04 002D0E44 4B FF AD 95 */ bl __nw__FUlP7JKRHeapi -/* 802D3F08 002D0E48 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802D3F0C 002D0E4C 41 82 00 0C */ beq lbl_802D3F18 -/* 802D3F10 002D0E50 48 00 01 79 */ bl __ct__20JKRAramStreamCommandFv -/* 802D3F14 002D0E54 7C 7F 1B 78 */ mr r31, r3 -lbl_802D3F18: -/* 802D3F18 002D0E58 38 00 00 02 */ li r0, 2 -/* 802D3F1C 002D0E5C 90 1F 00 00 */ stw r0, 0(r31) -/* 802D3F20 002D0E60 93 7F 00 04 */ stw r27, 4(r31) -/* 802D3F24 002D0E64 93 9F 00 08 */ stw r28, 8(r31) -/* 802D3F28 002D0E68 93 5F 00 10 */ stw r26, 0x10(r31) -/* 802D3F2C 002D0E6C 38 60 00 00 */ li r3, 0 -/* 802D3F30 002D0E70 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 802D3F34 002D0E74 93 BF 00 14 */ stw r29, 0x14(r31) -/* 802D3F38 002D0E78 80 0D 8E 8C */ lwz r0, transBuffer__13JKRAramStream-_SDA_BASE_(r13) -/* 802D3F3C 002D0E7C 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 802D3F40 002D0E80 80 0D 8E 94 */ lwz r0, transHeap__13JKRAramStream-_SDA_BASE_(r13) -/* 802D3F44 002D0E84 90 1F 00 24 */ stw r0, 0x24(r31) -/* 802D3F48 002D0E88 80 0D 8E 90 */ lwz r0, transSize__13JKRAramStream-_SDA_BASE_(r13) -/* 802D3F4C 002D0E8C 90 1F 00 20 */ stw r0, 0x20(r31) -/* 802D3F50 002D0E90 93 DF 00 18 */ stw r30, 0x18(r31) -/* 802D3F54 002D0E94 28 1E 00 00 */ cmplwi r30, 0 -/* 802D3F58 002D0E98 41 82 00 08 */ beq lbl_802D3F60 -/* 802D3F5C 002D0E9C 90 7E 00 00 */ stw r3, 0(r30) -lbl_802D3F60: -/* 802D3F60 002D0EA0 38 7F 00 30 */ addi r3, r31, 0x30 -/* 802D3F64 002D0EA4 38 9F 00 50 */ addi r4, r31, 0x50 -/* 802D3F68 002D0EA8 38 A0 00 01 */ li r5, 1 -/* 802D3F6C 002D0EAC 48 06 AA 29 */ bl OSInitMessageQueue -/* 802D3F70 002D0EB0 3C 60 80 3D */ lis r3, sMessageQueue__13JKRAramStream@ha -/* 802D3F74 002D0EB4 38 63 C1 98 */ addi r3, r3, sMessageQueue__13JKRAramStream@l -/* 802D3F78 002D0EB8 7F E4 FB 78 */ mr r4, r31 -/* 802D3F7C 002D0EBC 38 A0 00 01 */ li r5, 1 -/* 802D3F80 002D0EC0 48 06 AA 75 */ bl OSSendMessage -/* 802D3F84 002D0EC4 7F E3 FB 78 */ mr r3, r31 -/* 802D3F88 002D0EC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D3F8C 002D0ECC 48 08 E2 91 */ bl _restgpr_26 -/* 802D3F90 002D0ED0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D3F94 002D0ED4 7C 08 03 A6 */ mtlr r0 -/* 802D3F98 002D0ED8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D3F9C 002D0EDC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3FA0.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3FA0.s deleted file mode 100644 index 0b624d0d91..0000000000 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3FA0.s +++ /dev/null @@ -1,44 +0,0 @@ -/* sync__13JKRAramStreamFP20JKRAramStreamCommandi __ct__13JKRAramStreamFl::sync(JKRAramStreamCommand *, int) */ -/* JKRAramStream_NS_sync */ -/* 802D3FA0 002D0EE0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D3FA4 002D0EE4 7C 08 02 A6 */ mflr r0 -/* 802D3FA8 002D0EE8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D3FAC 002D0EEC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802D3FB0 002D0EF0 7C 7F 1B 78 */ mr r31, r3 -/* 802D3FB4 002D0EF4 2C 04 00 00 */ cmpwi r4, 0 -/* 802D3FB8 002D0EF8 40 82 00 30 */ bne lbl_802D3FE8 -/* 802D3FBC 002D0EFC 38 7F 00 30 */ addi r3, r31, 0x30 -/* 802D3FC0 002D0F00 38 81 00 08 */ addi r4, r1, 8 -/* 802D3FC4 002D0F04 38 A0 00 01 */ li r5, 1 -/* 802D3FC8 002D0F08 48 06 AA F5 */ bl OSReceiveMessage -/* 802D3FCC 002D0F0C 80 01 00 08 */ lwz r0, 8(r1) -/* 802D3FD0 002D0F10 28 00 00 00 */ cmplwi r0, 0 -/* 802D3FD4 002D0F14 40 82 00 0C */ bne lbl_802D3FE0 -/* 802D3FD8 002D0F18 38 60 00 00 */ li r3, 0 -/* 802D3FDC 002D0F1C 48 00 00 44 */ b lbl_802D4020 -lbl_802D3FE0: -/* 802D3FE0 002D0F20 7F E3 FB 78 */ mr r3, r31 -/* 802D3FE4 002D0F24 48 00 00 3C */ b lbl_802D4020 -lbl_802D3FE8: -/* 802D3FE8 002D0F28 38 7F 00 30 */ addi r3, r31, 0x30 -/* 802D3FEC 002D0F2C 38 81 00 08 */ addi r4, r1, 8 -/* 802D3FF0 002D0F30 38 A0 00 00 */ li r5, 0 -/* 802D3FF4 002D0F34 48 06 AA C9 */ bl OSReceiveMessage -/* 802D3FF8 002D0F38 2C 03 00 00 */ cmpwi r3, 0 -/* 802D3FFC 002D0F3C 40 82 00 0C */ bne lbl_802D4008 -/* 802D4000 002D0F40 38 60 00 00 */ li r3, 0 -/* 802D4004 002D0F44 48 00 00 1C */ b lbl_802D4020 -lbl_802D4008: -/* 802D4008 002D0F48 80 01 00 08 */ lwz r0, 8(r1) -/* 802D400C 002D0F4C 28 00 00 00 */ cmplwi r0, 0 -/* 802D4010 002D0F50 40 82 00 0C */ bne lbl_802D401C -/* 802D4014 002D0F54 38 60 00 00 */ li r3, 0 -/* 802D4018 002D0F58 48 00 00 08 */ b lbl_802D4020 -lbl_802D401C: -/* 802D401C 002D0F5C 7F E3 FB 78 */ mr r3, r31 -lbl_802D4020: -/* 802D4020 002D0F60 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802D4024 002D0F64 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D4028 002D0F68 7C 08 03 A6 */ mtlr r0 -/* 802D402C 002D0F6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D4030 002D0F70 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D4034.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D4034.s deleted file mode 100644 index f876e50923..0000000000 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D4034.s +++ /dev/null @@ -1,25 +0,0 @@ -/* setTransBuffer__13JKRAramStreamFPUcUlP7JKRHeap __ct__13JKRAramStreamFl::setTransBuffer(unsigned char *, unsigned long, JKRHeap *) */ -/* JKRAramStream_NS_setTransBuffer */ -/* 802D4034 002D0F74 38 E0 00 00 */ li r7, 0 -/* 802D4038 002D0F78 90 ED 8E 8C */ stw r7, transBuffer__13JKRAramStream-_SDA_BASE_(r13) -/* 802D403C 002D0F7C 3C C0 00 01 */ lis r6, 0x00008000@ha -/* 802D4040 002D0F80 38 06 80 00 */ addi r0, r6, 0x00008000@l -/* 802D4044 002D0F84 90 0D 8E 90 */ stw r0, transSize__13JKRAramStream-_SDA_BASE_(r13) -/* 802D4048 002D0F88 90 ED 8E 94 */ stw r7, transHeap__13JKRAramStream-_SDA_BASE_(r13) -/* 802D404C 002D0F8C 28 03 00 00 */ cmplwi r3, 0 -/* 802D4050 002D0F90 41 82 00 10 */ beq lbl_802D4060 -/* 802D4054 002D0F94 38 03 00 1F */ addi r0, r3, 0x1f -/* 802D4058 002D0F98 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a -/* 802D405C 002D0F9C 90 0D 8E 8C */ stw r0, transBuffer__13JKRAramStream-_SDA_BASE_(r13) -lbl_802D4060: -/* 802D4060 002D0FA0 28 04 00 00 */ cmplwi r4, 0 -/* 802D4064 002D0FA4 41 82 00 0C */ beq lbl_802D4070 -/* 802D4068 002D0FA8 54 80 00 34 */ rlwinm r0, r4, 0, 0, 0x1a -/* 802D406C 002D0FAC 90 0D 8E 90 */ stw r0, transSize__13JKRAramStream-_SDA_BASE_(r13) -lbl_802D4070: -/* 802D4070 002D0FB0 28 05 00 00 */ cmplwi r5, 0 -/* 802D4074 002D0FB4 4D 82 00 20 */ beqlr -/* 802D4078 002D0FB8 28 03 00 00 */ cmplwi r3, 0 -/* 802D407C 002D0FBC 4C 82 00 20 */ bnelr -/* 802D4080 002D0FC0 90 AD 8E 94 */ stw r5, transHeap__13JKRAramStream-_SDA_BASE_(r13) -/* 802D4084 002D0FC4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D4088.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D4088.s deleted file mode 100644 index ae3446ced7..0000000000 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D4088.s +++ /dev/null @@ -1,5 +0,0 @@ -/* __ct__20JKRAramStreamCommandFv __ct__20JKRAramStreamCommandFv::__ct(void) */ -/* JKRAramStreamCommand */ -/* 802D4088 002D0FC8 38 00 00 00 */ li r0, 0 -/* 802D408C 002D0FCC 98 03 00 28 */ stb r0, 0x28(r3) -/* 802D4090 002D0FD0 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D4094.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D4094.s deleted file mode 100644 index c0a14ad05e..0000000000 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D4094.s +++ /dev/null @@ -1,25 +0,0 @@ -/* getAvailable__20JSURandomInputStreamCFv JSURandomInputStream::getAvailable( const(void)) */ -/* missing reference */ -/* 802D4094 002D0FD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D4098 002D0FD8 7C 08 02 A6 */ mflr r0 -/* 802D409C 002D0FDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D40A0 002D0FE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D40A4 002D0FE4 93 C1 00 08 */ stw r30, 8(r1) -/* 802D40A8 002D0FE8 7C 7E 1B 78 */ mr r30, r3 -/* 802D40AC 002D0FEC 81 83 00 00 */ lwz r12, 0(r3) -/* 802D40B0 002D0FF0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802D40B4 002D0FF4 7D 89 03 A6 */ mtctr r12 -/* 802D40B8 002D0FF8 4E 80 04 21 */ bctrl -/* 802D40BC 002D0FFC 7C 7F 1B 78 */ mr r31, r3 -/* 802D40C0 002D1000 7F C3 F3 78 */ mr r3, r30 -/* 802D40C4 002D1004 81 9E 00 00 */ lwz r12, 0(r30) -/* 802D40C8 002D1008 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802D40CC 002D100C 7D 89 03 A6 */ mtctr r12 -/* 802D40D0 002D1010 4E 80 04 21 */ bctrl -/* 802D40D4 002D1014 7C 63 F8 50 */ subf r3, r3, r31 -/* 802D40D8 002D1018 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D40DC 002D101C 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D40E0 002D1020 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D40E4 002D1024 7C 08 03 A6 */ mtlr r0 -/* 802D40E8 002D1028 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D40EC 002D102C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRArchive/asm/func_802D693C.s b/include/JSystem/JKernel/JKRArchive/asm/func_802D693C.s deleted file mode 100644 index eab9eaef13..0000000000 --- a/include/JSystem/JKernel/JKRArchive/asm/func_802D693C.s +++ /dev/null @@ -1,19 +0,0 @@ -/* setExpandSize__10JKRArchiveFP12SDIFileEntryUl __ct__10JKRArchiveFlQ210JKRArchive10EMountMode::setExpandSize(__ct__10JKRArchiveFlQ210JKRArchive10EMountMode::SDIFileEntry *, unsigned long) */ -/* missing reference */ -/* 802D693C 002D387C 80 03 00 4C */ lwz r0, 0x4c(r3) -/* 802D6940 002D3880 7C 80 20 50 */ subf r4, r0, r4 -/* 802D6944 002D3884 38 00 00 14 */ li r0, 0x14 -/* 802D6948 002D3888 7C C4 03 D6 */ divw r6, r4, r0 -/* 802D694C 002D388C 80 83 00 50 */ lwz r4, 0x50(r3) -/* 802D6950 002D3890 28 04 00 00 */ cmplwi r4, 0 -/* 802D6954 002D3894 4D 82 00 20 */ beqlr -/* 802D6958 002D3898 80 63 00 44 */ lwz r3, 0x44(r3) -/* 802D695C 002D389C 80 03 00 08 */ lwz r0, 8(r3) -/* 802D6960 002D38A0 7C 06 00 40 */ cmplw r6, r0 -/* 802D6964 002D38A4 41 80 00 08 */ blt lbl_802D696C -/* 802D6968 002D38A8 4E 80 00 20 */ blr -lbl_802D696C: -/* 802D696C 002D38AC 54 C0 10 3A */ slwi r0, r6, 2 -/* 802D6970 002D38B0 7C A4 01 2E */ stwx r5, r4, r0 -/* 802D6974 002D38B4 4E 80 00 20 */ blr - diff --git a/include/JSystem/JKernel/JKRArchive/asm/func_802D6978.s b/include/JSystem/JKernel/JKRArchive/asm/func_802D6978.s deleted file mode 100644 index a1bf66f9bc..0000000000 --- a/include/JSystem/JKernel/JKRArchive/asm/func_802D6978.s +++ /dev/null @@ -1,20 +0,0 @@ -/* getExpandSize__10JKRArchiveCFP12SDIFileEntry __ct__10JKRArchiveFlQ210JKRArchive10EMountMode::getExpandSize( const(__ct__10JKRArchiveFlQ210JKRArchive10EMountMode::SDIFileEntry *)) */ -/* missing reference */ -/* 802D6978 002D38B8 80 03 00 4C */ lwz r0, 0x4c(r3) -/* 802D697C 002D38BC 7C 80 20 50 */ subf r4, r0, r4 -/* 802D6980 002D38C0 38 00 00 14 */ li r0, 0x14 -/* 802D6984 002D38C4 7C A4 03 D6 */ divw r5, r4, r0 -/* 802D6988 002D38C8 80 83 00 50 */ lwz r4, 0x50(r3) -/* 802D698C 002D38CC 28 04 00 00 */ cmplwi r4, 0 -/* 802D6990 002D38D0 41 82 00 14 */ beq lbl_802D69A4 -/* 802D6994 002D38D4 80 63 00 44 */ lwz r3, 0x44(r3) -/* 802D6998 002D38D8 80 03 00 08 */ lwz r0, 8(r3) -/* 802D699C 002D38DC 7C 05 00 40 */ cmplw r5, r0 -/* 802D69A0 002D38E0 41 80 00 0C */ blt lbl_802D69AC -lbl_802D69A4: -/* 802D69A4 002D38E4 38 60 00 00 */ li r3, 0 -/* 802D69A8 002D38E8 4E 80 00 20 */ blr -lbl_802D69AC: -/* 802D69AC 002D38EC 54 A0 10 3A */ slwi r0, r5, 2 -/* 802D69B0 002D38F0 7C 64 00 2E */ lwzx r3, r4, r0 -/* 802D69B4 002D38F4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB680.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DB680.s deleted file mode 100644 index b06049177d..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB680.s +++ /dev/null @@ -1,28 +0,0 @@ -/* create__9JKRDecompFl __ct__9JKRDecompFl::create(long) */ -/* JKRDecomp_NS_create */ -/* 802DB680 002D85C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DB684 002D85C4 7C 08 02 A6 */ mflr r0 -/* 802DB688 002D85C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DB68C 002D85CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DB690 002D85D0 7C 7F 1B 78 */ mr r31, r3 -/* 802DB694 002D85D4 80 0D 8F 30 */ lwz r0, lbl_804514B0-_SDA_BASE_(r13) -/* 802DB698 002D85D8 28 00 00 00 */ cmplwi r0, 0 -/* 802DB69C 002D85DC 40 82 00 2C */ bne lbl_802DB6C8 -/* 802DB6A0 002D85E0 38 60 00 7C */ li r3, 0x7c -/* 802DB6A4 002D85E4 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802DB6A8 002D85E8 38 A0 00 00 */ li r5, 0 -/* 802DB6AC 002D85EC 4B FF 35 ED */ bl __nw__FUlP7JKRHeapi -/* 802DB6B0 002D85F0 7C 60 1B 79 */ or. r0, r3, r3 -/* 802DB6B4 002D85F4 41 82 00 10 */ beq lbl_802DB6C4 -/* 802DB6B8 002D85F8 7F E4 FB 78 */ mr r4, r31 -/* 802DB6BC 002D85FC 48 00 00 25 */ bl __ct__9JKRDecompFl -/* 802DB6C0 002D8600 7C 60 1B 78 */ mr r0, r3 -lbl_802DB6C4: -/* 802DB6C4 002D8604 90 0D 8F 30 */ stw r0, lbl_804514B0-_SDA_BASE_(r13) -lbl_802DB6C8: -/* 802DB6C8 002D8608 80 6D 8F 30 */ lwz r3, lbl_804514B0-_SDA_BASE_(r13) -/* 802DB6CC 002D860C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DB6D0 002D8610 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DB6D4 002D8614 7C 08 03 A6 */ mtlr r0 -/* 802DB6D8 002D8618 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DB6DC 002D861C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB6E0.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DB6E0.s deleted file mode 100644 index 2320137d1e..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB6E0.s +++ /dev/null @@ -1,22 +0,0 @@ -/* __ct__9JKRDecompFl __ct__9JKRDecompFl::__ct(long) */ -/* JKRDecomp */ -/* 802DB6E0 002D8620 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DB6E4 002D8624 7C 08 02 A6 */ mflr r0 -/* 802DB6E8 002D8628 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DB6EC 002D862C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DB6F0 002D8630 7C 7F 1B 78 */ mr r31, r3 -/* 802DB6F4 002D8634 7C 86 23 78 */ mr r6, r4 -/* 802DB6F8 002D8638 38 80 08 00 */ li r4, 0x800 -/* 802DB6FC 002D863C 38 A0 00 10 */ li r5, 0x10 -/* 802DB700 002D8640 4B FF 5E 69 */ bl __ct__9JKRThreadFUlii -/* 802DB704 002D8644 3C 60 80 3D */ lis r3, lbl_803CC4A0@ha -/* 802DB708 002D8648 38 03 C4 A0 */ addi r0, r3, lbl_803CC4A0@l -/* 802DB70C 002D864C 90 1F 00 00 */ stw r0, 0(r31) -/* 802DB710 002D8650 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 802DB714 002D8654 48 06 60 A1 */ bl OSResumeThread -/* 802DB718 002D8658 7F E3 FB 78 */ mr r3, r31 -/* 802DB71C 002D865C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DB720 002D8660 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DB724 002D8664 7C 08 03 A6 */ mtlr r0 -/* 802DB728 002D8668 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DB72C 002D866C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB730.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DB730.s deleted file mode 100644 index 66afe63f54..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB730.s +++ /dev/null @@ -1,27 +0,0 @@ -/* __dt__9JKRDecompFv __ct__9JKRDecompFl::__dt(void) */ -/* missing reference */ -/* 802DB730 002D8670 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DB734 002D8674 7C 08 02 A6 */ mflr r0 -/* 802DB738 002D8678 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DB73C 002D867C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DB740 002D8680 93 C1 00 08 */ stw r30, 8(r1) -/* 802DB744 002D8684 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802DB748 002D8688 7C 9F 23 78 */ mr r31, r4 -/* 802DB74C 002D868C 41 82 00 28 */ beq lbl_802DB774 -/* 802DB750 002D8690 3C 80 80 3D */ lis r4, lbl_803CC4A0@ha -/* 802DB754 002D8694 38 04 C4 A0 */ addi r0, r4, lbl_803CC4A0@l -/* 802DB758 002D8698 90 1E 00 00 */ stw r0, 0(r30) -/* 802DB75C 002D869C 38 80 00 00 */ li r4, 0 -/* 802DB760 002D86A0 4B FF 5F F9 */ bl __dt__9JKRThreadFv -/* 802DB764 002D86A4 7F E0 07 35 */ extsh. r0, r31 -/* 802DB768 002D86A8 40 81 00 0C */ ble lbl_802DB774 -/* 802DB76C 002D86AC 7F C3 F3 78 */ mr r3, r30 -/* 802DB770 002D86B0 4B FF 35 CD */ bl __dl__FPv -lbl_802DB774: -/* 802DB774 002D86B4 7F C3 F3 78 */ mr r3, r30 -/* 802DB778 002D86B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DB77C 002D86BC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802DB780 002D86C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DB784 002D86C4 7C 08 03 A6 */ mtlr r0 -/* 802DB788 002D86C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DB78C 002D86CC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB790.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DB790.s deleted file mode 100644 index 20e402df67..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB790.s +++ /dev/null @@ -1,56 +0,0 @@ -/* run__9JKRDecompFv __ct__9JKRDecompFl::run(void) */ -/* missing reference */ -/* 802DB790 002D86D0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DB794 002D86D4 7C 08 02 A6 */ mflr r0 -/* 802DB798 002D86D8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DB79C 002D86DC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802DB7A0 002D86E0 93 C1 00 18 */ stw r30, 0x18(r1) -/* 802DB7A4 002D86E4 3C 60 80 3D */ lis r3, lbl_803CC480@ha -/* 802DB7A8 002D86E8 38 63 C4 80 */ addi r3, r3, lbl_803CC480@l -/* 802DB7AC 002D86EC 3C 80 80 3D */ lis r4, lbl_803CC460@ha -/* 802DB7B0 002D86F0 38 84 C4 60 */ addi r4, r4, lbl_803CC460@l -/* 802DB7B4 002D86F4 38 A0 00 08 */ li r5, 8 -/* 802DB7B8 002D86F8 48 06 31 DD */ bl OSInitMessageQueue -/* 802DB7BC 002D86FC 3C 60 80 3D */ lis r3, lbl_803CC480@ha -/* 802DB7C0 002D8700 3B E3 C4 80 */ addi r31, r3, lbl_803CC480@l -lbl_802DB7C4: -/* 802DB7C4 002D8704 7F E3 FB 78 */ mr r3, r31 -/* 802DB7C8 002D8708 38 81 00 08 */ addi r4, r1, 8 -/* 802DB7CC 002D870C 38 A0 00 01 */ li r5, 1 -/* 802DB7D0 002D8710 48 06 32 ED */ bl OSReceiveMessage -/* 802DB7D4 002D8714 83 C1 00 08 */ lwz r30, 8(r1) -/* 802DB7D8 002D8718 80 7E 00 04 */ lwz r3, 4(r30) -/* 802DB7DC 002D871C 80 9E 00 08 */ lwz r4, 8(r30) -/* 802DB7E0 002D8720 80 BE 00 0C */ lwz r5, 0xc(r30) -/* 802DB7E4 002D8724 80 DE 00 10 */ lwz r6, 0x10(r30) -/* 802DB7E8 002D8728 48 00 01 F5 */ bl decode__9JKRDecompFPUcPUcUlUl -/* 802DB7EC 002D872C 80 1E 00 20 */ lwz r0, 0x20(r30) -/* 802DB7F0 002D8730 2C 00 00 00 */ cmpwi r0, 0 -/* 802DB7F4 002D8734 41 82 00 18 */ beq lbl_802DB80C -/* 802DB7F8 002D8738 2C 00 00 01 */ cmpwi r0, 1 -/* 802DB7FC 002D873C 40 82 FF C8 */ bne lbl_802DB7C4 -/* 802DB800 002D8740 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 802DB804 002D8744 4B FF 7D F1 */ bl sendCommand__12JKRAramPieceFP12JKRAMCommand -/* 802DB808 002D8748 4B FF FF BC */ b lbl_802DB7C4 -lbl_802DB80C: -/* 802DB80C 002D874C 81 9E 00 14 */ lwz r12, 0x14(r30) -/* 802DB810 002D8750 28 0C 00 00 */ cmplwi r12, 0 -/* 802DB814 002D8754 41 82 00 14 */ beq lbl_802DB828 -/* 802DB818 002D8758 7F C3 F3 78 */ mr r3, r30 -/* 802DB81C 002D875C 7D 89 03 A6 */ mtctr r12 -/* 802DB820 002D8760 4E 80 04 21 */ bctrl -/* 802DB824 002D8764 4B FF FF A0 */ b lbl_802DB7C4 -lbl_802DB828: -/* 802DB828 002D8768 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 802DB82C 002D876C 28 03 00 00 */ cmplwi r3, 0 -/* 802DB830 002D8770 41 82 00 14 */ beq lbl_802DB844 -/* 802DB834 002D8774 38 80 00 01 */ li r4, 1 -/* 802DB838 002D8778 38 A0 00 00 */ li r5, 0 -/* 802DB83C 002D877C 48 06 31 B9 */ bl OSSendMessage -/* 802DB840 002D8780 4B FF FF 84 */ b lbl_802DB7C4 -lbl_802DB844: -/* 802DB844 002D8784 38 7E 00 28 */ addi r3, r30, 0x28 -/* 802DB848 002D8788 38 80 00 01 */ li r4, 1 -/* 802DB84C 002D878C 38 A0 00 00 */ li r5, 0 -/* 802DB850 002D8790 48 06 31 A5 */ bl OSSendMessage -/* 802DB854 002D8794 4B FF FF 70 */ b lbl_802DB7C4 diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB858.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DB858.s deleted file mode 100644 index ccd9fb217c..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB858.s +++ /dev/null @@ -1,33 +0,0 @@ -/* prepareCommand__9JKRDecompFPUcPUcUlUlPFUl_v __ct__9JKRDecompFl::prepareCommand(unsigned char *, unsigned char *, unsigned long, unsigned long, void (*)(unsigned long)) */ -/* JKRDecomp_NS_prepareCommand */ -/* 802DB858 002D8798 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DB85C 002D879C 7C 08 02 A6 */ mflr r0 -/* 802DB860 002D87A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DB864 002D87A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DB868 002D87A8 48 08 69 6D */ bl _savegpr_27 -/* 802DB86C 002D87AC 7C 7B 1B 78 */ mr r27, r3 -/* 802DB870 002D87B0 7C 9C 23 78 */ mr r28, r4 -/* 802DB874 002D87B4 7C BD 2B 78 */ mr r29, r5 -/* 802DB878 002D87B8 7C DE 33 78 */ mr r30, r6 -/* 802DB87C 002D87BC 7C FF 3B 78 */ mr r31, r7 -/* 802DB880 002D87C0 38 60 00 4C */ li r3, 0x4c -/* 802DB884 002D87C4 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802DB888 002D87C8 38 A0 FF FC */ li r5, -4 -/* 802DB88C 002D87CC 4B FF 34 0D */ bl __nw__FUlP7JKRHeapi -/* 802DB890 002D87D0 7C 64 1B 79 */ or. r4, r3, r3 -/* 802DB894 002D87D4 41 82 00 0C */ beq lbl_802DB8A0 -/* 802DB898 002D87D8 48 00 04 D9 */ bl __ct__16JKRDecompCommandFv -/* 802DB89C 002D87DC 7C 64 1B 78 */ mr r4, r3 -lbl_802DB8A0: -/* 802DB8A0 002D87E0 93 64 00 04 */ stw r27, 4(r4) -/* 802DB8A4 002D87E4 93 84 00 08 */ stw r28, 8(r4) -/* 802DB8A8 002D87E8 93 A4 00 0C */ stw r29, 0xc(r4) -/* 802DB8AC 002D87EC 93 C4 00 10 */ stw r30, 0x10(r4) -/* 802DB8B0 002D87F0 93 E4 00 14 */ stw r31, 0x14(r4) -/* 802DB8B4 002D87F4 7C 83 23 78 */ mr r3, r4 -/* 802DB8B8 002D87F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DB8BC 002D87FC 48 08 69 65 */ bl _restgpr_27 -/* 802DB8C0 002D8800 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DB8C4 002D8804 7C 08 03 A6 */ mtlr r0 -/* 802DB8C8 002D8808 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DB8CC 002D880C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB8D0.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DB8D0.s deleted file mode 100644 index 13b9e1962e..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB8D0.s +++ /dev/null @@ -1,14 +0,0 @@ -/* sendCommand__9JKRDecompFP16JKRDecompCommand __ct__9JKRDecompFl::sendCommand(JKRDecompCommand *) */ -/* JKRDecomp_NS_sendCommand */ -/* 802DB8D0 002D8810 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DB8D4 002D8814 7C 08 02 A6 */ mflr r0 -/* 802DB8D8 002D8818 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DB8DC 002D881C 7C 64 1B 78 */ mr r4, r3 -/* 802DB8E0 002D8820 3C 60 80 3D */ lis r3, lbl_803CC480@ha -/* 802DB8E4 002D8824 38 63 C4 80 */ addi r3, r3, lbl_803CC480@l -/* 802DB8E8 002D8828 38 A0 00 00 */ li r5, 0 -/* 802DB8EC 002D882C 48 06 31 09 */ bl OSSendMessage -/* 802DB8F0 002D8830 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DB8F4 002D8834 7C 08 03 A6 */ mtlr r0 -/* 802DB8F8 002D8838 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DB8FC 002D883C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB900.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DB900.s deleted file mode 100644 index c8d3c02862..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB900.s +++ /dev/null @@ -1,15 +0,0 @@ -/* orderAsync__9JKRDecompFPUcPUcUlUlPFUl_v __ct__9JKRDecompFl::orderAsync(unsigned char *, unsigned char *, unsigned long, unsigned long, void (*)(unsigned long)) */ -/* JKRDecomp_NS_orderAsync */ -/* 802DB900 002D8840 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DB904 002D8844 7C 08 02 A6 */ mflr r0 -/* 802DB908 002D8848 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DB90C 002D884C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DB910 002D8850 4B FF FF 49 */ bl prepareCommand__9JKRDecompFPUcPUcUlUlPFUl_v -/* 802DB914 002D8854 7C 7F 1B 78 */ mr r31, r3 -/* 802DB918 002D8858 4B FF FF B9 */ bl sendCommand__9JKRDecompFP16JKRDecompCommand -/* 802DB91C 002D885C 7F E3 FB 78 */ mr r3, r31 -/* 802DB920 002D8860 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DB924 002D8864 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DB928 002D8868 7C 08 03 A6 */ mtlr r0 -/* 802DB92C 002D886C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DB930 002D8870 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB934.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DB934.s deleted file mode 100644 index b4388208c2..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB934.s +++ /dev/null @@ -1,25 +0,0 @@ -/* sync__9JKRDecompFP16JKRDecompCommandi __ct__9JKRDecompFl::sync(JKRDecompCommand *, int) */ -/* JKRDecomp_NS_sync */ -/* 802DB934 002D8874 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DB938 002D8878 7C 08 02 A6 */ mflr r0 -/* 802DB93C 002D887C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DB940 002D8880 2C 04 00 00 */ cmpwi r4, 0 -/* 802DB944 002D8884 40 82 00 1C */ bne lbl_802DB960 -/* 802DB948 002D8888 38 63 00 28 */ addi r3, r3, 0x28 -/* 802DB94C 002D888C 38 81 00 08 */ addi r4, r1, 8 -/* 802DB950 002D8890 38 A0 00 01 */ li r5, 1 -/* 802DB954 002D8894 48 06 31 69 */ bl OSReceiveMessage -/* 802DB958 002D8898 38 60 00 01 */ li r3, 1 -/* 802DB95C 002D889C 48 00 00 1C */ b lbl_802DB978 -lbl_802DB960: -/* 802DB960 002D88A0 38 63 00 28 */ addi r3, r3, 0x28 -/* 802DB964 002D88A4 38 81 00 08 */ addi r4, r1, 8 -/* 802DB968 002D88A8 38 A0 00 00 */ li r5, 0 -/* 802DB96C 002D88AC 48 06 31 51 */ bl OSReceiveMessage -/* 802DB970 002D88B0 30 03 FF FF */ addic r0, r3, -1 -/* 802DB974 002D88B4 7C 60 19 10 */ subfe r3, r0, r3 -lbl_802DB978: -/* 802DB978 002D88B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DB97C 002D88BC 7C 08 03 A6 */ mtlr r0 -/* 802DB980 002D88C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DB984 002D88C4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB988.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DB988.s deleted file mode 100644 index 200bddadba..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB988.s +++ /dev/null @@ -1,23 +0,0 @@ -/* orderSync__9JKRDecompFPUcPUcUlUl __ct__9JKRDecompFl::orderSync(unsigned char *, unsigned char *, unsigned long, unsigned long) */ -/* JKRDecomp_NS_orderSync */ -/* 802DB988 002D88C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DB98C 002D88CC 7C 08 02 A6 */ mflr r0 -/* 802DB990 002D88D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DB994 002D88D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DB998 002D88D8 93 C1 00 08 */ stw r30, 8(r1) -/* 802DB99C 002D88DC 38 E0 00 00 */ li r7, 0 -/* 802DB9A0 002D88E0 4B FF FF 61 */ bl orderAsync__9JKRDecompFPUcPUcUlUlPFUl_v -/* 802DB9A4 002D88E4 7C 7F 1B 78 */ mr r31, r3 -/* 802DB9A8 002D88E8 38 80 00 00 */ li r4, 0 -/* 802DB9AC 002D88EC 4B FF FF 89 */ bl sync__9JKRDecompFP16JKRDecompCommandi -/* 802DB9B0 002D88F0 7C 7E 1B 78 */ mr r30, r3 -/* 802DB9B4 002D88F4 7F E3 FB 78 */ mr r3, r31 -/* 802DB9B8 002D88F8 38 80 00 01 */ li r4, 1 -/* 802DB9BC 002D88FC 48 00 04 05 */ bl __dt__16JKRDecompCommandFv -/* 802DB9C0 002D8900 7F C3 F3 78 */ mr r3, r30 -/* 802DB9C4 002D8904 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DB9C8 002D8908 83 C1 00 08 */ lwz r30, 8(r1) -/* 802DB9CC 002D890C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DB9D0 002D8910 7C 08 03 A6 */ mtlr r0 -/* 802DB9D4 002D8914 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DB9D8 002D8918 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB9DC.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DB9DC.s deleted file mode 100644 index 40b90b258d..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DB9DC.s +++ /dev/null @@ -1,35 +0,0 @@ -/* decode__9JKRDecompFPUcPUcUlUl __ct__9JKRDecompFl::decode(unsigned char *, unsigned char *, unsigned long, unsigned long) */ -/* JKRDecomp_NS_decode */ -/* 802DB9DC 002D891C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DB9E0 002D8920 7C 08 02 A6 */ mflr r0 -/* 802DB9E4 002D8924 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DB9E8 002D8928 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DB9EC 002D892C 48 08 67 ED */ bl _savegpr_28 -/* 802DB9F0 002D8930 7C 7C 1B 78 */ mr r28, r3 -/* 802DB9F4 002D8934 7C 9D 23 78 */ mr r29, r4 -/* 802DB9F8 002D8938 7C BE 2B 78 */ mr r30, r5 -/* 802DB9FC 002D893C 7C DF 33 78 */ mr r31, r6 -/* 802DBA00 002D8940 48 00 02 F9 */ bl checkCompressed__9JKRDecompFPUc -/* 802DBA04 002D8944 2C 03 00 01 */ cmpwi r3, 1 -/* 802DBA08 002D8948 40 82 00 1C */ bne lbl_802DBA24 -/* 802DBA0C 002D894C 7F 83 E3 78 */ mr r3, r28 -/* 802DBA10 002D8950 7F A4 EB 78 */ mr r4, r29 -/* 802DBA14 002D8954 7F C5 F3 78 */ mr r5, r30 -/* 802DBA18 002D8958 7F E6 FB 78 */ mr r6, r31 -/* 802DBA1C 002D895C 48 00 00 3D */ bl decodeSZP__9JKRDecompFPUcPUcUlUl -/* 802DBA20 002D8960 48 00 00 20 */ b lbl_802DBA40 -lbl_802DBA24: -/* 802DBA24 002D8964 2C 03 00 02 */ cmpwi r3, 2 -/* 802DBA28 002D8968 40 82 00 18 */ bne lbl_802DBA40 -/* 802DBA2C 002D896C 7F 83 E3 78 */ mr r3, r28 -/* 802DBA30 002D8970 7F A4 EB 78 */ mr r4, r29 -/* 802DBA34 002D8974 7F C5 F3 78 */ mr r5, r30 -/* 802DBA38 002D8978 7F E6 FB 78 */ mr r6, r31 -/* 802DBA3C 002D897C 48 00 01 D9 */ bl decodeSZS__9JKRDecompFPUcPUcUlUl -lbl_802DBA40: -/* 802DBA40 002D8980 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DBA44 002D8984 48 08 67 E1 */ bl _restgpr_28 -/* 802DBA48 002D8988 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DBA4C 002D898C 7C 08 03 A6 */ mtlr r0 -/* 802DBA50 002D8990 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DBA54 002D8994 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DBCF8.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DBCF8.s deleted file mode 100644 index 60ab20c634..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DBCF8.s +++ /dev/null @@ -1,35 +0,0 @@ -/* checkCompressed__9JKRDecompFPUc __ct__9JKRDecompFl::checkCompressed(unsigned char *) */ -/* JKRDecomp_NS_checkCompressed */ -/* 802DBCF8 002D8C38 88 83 00 00 */ lbz r4, 0(r3) -/* 802DBCFC 002D8C3C 2C 04 00 59 */ cmpwi r4, 0x59 -/* 802DBD00 002D8C40 40 82 00 40 */ bne lbl_802DBD40 -/* 802DBD04 002D8C44 88 03 00 01 */ lbz r0, 1(r3) -/* 802DBD08 002D8C48 2C 00 00 61 */ cmpwi r0, 0x61 -/* 802DBD0C 002D8C4C 40 82 00 34 */ bne lbl_802DBD40 -/* 802DBD10 002D8C50 88 03 00 03 */ lbz r0, 3(r3) -/* 802DBD14 002D8C54 2C 00 00 30 */ cmpwi r0, 0x30 -/* 802DBD18 002D8C58 40 82 00 28 */ bne lbl_802DBD40 -/* 802DBD1C 002D8C5C 88 03 00 02 */ lbz r0, 2(r3) -/* 802DBD20 002D8C60 2C 00 00 79 */ cmpwi r0, 0x79 -/* 802DBD24 002D8C64 40 82 00 0C */ bne lbl_802DBD30 -/* 802DBD28 002D8C68 38 60 00 01 */ li r3, 1 -/* 802DBD2C 002D8C6C 4E 80 00 20 */ blr -lbl_802DBD30: -/* 802DBD30 002D8C70 2C 00 00 7A */ cmpwi r0, 0x7a -/* 802DBD34 002D8C74 40 82 00 0C */ bne lbl_802DBD40 -/* 802DBD38 002D8C78 38 60 00 02 */ li r3, 2 -/* 802DBD3C 002D8C7C 4E 80 00 20 */ blr -lbl_802DBD40: -/* 802DBD40 002D8C80 2C 04 00 41 */ cmpwi r4, 0x41 -/* 802DBD44 002D8C84 40 82 00 24 */ bne lbl_802DBD68 -/* 802DBD48 002D8C88 88 03 00 01 */ lbz r0, 1(r3) -/* 802DBD4C 002D8C8C 2C 00 00 53 */ cmpwi r0, 0x53 -/* 802DBD50 002D8C90 40 82 00 18 */ bne lbl_802DBD68 -/* 802DBD54 002D8C94 88 03 00 02 */ lbz r0, 2(r3) -/* 802DBD58 002D8C98 2C 00 00 52 */ cmpwi r0, 0x52 -/* 802DBD5C 002D8C9C 40 82 00 0C */ bne lbl_802DBD68 -/* 802DBD60 002D8CA0 38 60 00 03 */ li r3, 3 -/* 802DBD64 002D8CA4 4E 80 00 20 */ blr -lbl_802DBD68: -/* 802DBD68 002D8CA8 38 60 00 00 */ li r3, 0 -/* 802DBD6C 002D8CAC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DBD70.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DBD70.s deleted file mode 100644 index 0e70abc294..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DBD70.s +++ /dev/null @@ -1,22 +0,0 @@ -/* __ct__16JKRDecompCommandFv __ct__16JKRDecompCommandFv::__ct(void) */ -/* JKRDecompCommand */ -/* 802DBD70 002D8CB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DBD74 002D8CB4 7C 08 02 A6 */ mflr r0 -/* 802DBD78 002D8CB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DBD7C 002D8CBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DBD80 002D8CC0 7C 7F 1B 78 */ mr r31, r3 -/* 802DBD84 002D8CC4 38 7F 00 28 */ addi r3, r31, 0x28 -/* 802DBD88 002D8CC8 38 9F 00 48 */ addi r4, r31, 0x48 -/* 802DBD8C 002D8CCC 38 A0 00 01 */ li r5, 1 -/* 802DBD90 002D8CD0 48 06 2C 05 */ bl OSInitMessageQueue -/* 802DBD94 002D8CD4 38 00 00 00 */ li r0, 0 -/* 802DBD98 002D8CD8 90 1F 00 14 */ stw r0, 0x14(r31) -/* 802DBD9C 002D8CDC 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 802DBDA0 002D8CE0 93 FF 00 18 */ stw r31, 0x18(r31) -/* 802DBDA4 002D8CE4 90 1F 00 20 */ stw r0, 0x20(r31) -/* 802DBDA8 002D8CE8 7F E3 FB 78 */ mr r3, r31 -/* 802DBDAC 002D8CEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DBDB0 002D8CF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DBDB4 002D8CF4 7C 08 03 A6 */ mtlr r0 -/* 802DBDB8 002D8CF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DBDBC 002D8CFC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDecomp/asm/func_802DBDC0.s b/include/JSystem/JKernel/JKRDecomp/asm/func_802DBDC0.s deleted file mode 100644 index a10b43f57a..0000000000 --- a/include/JSystem/JKernel/JKRDecomp/asm/func_802DBDC0.s +++ /dev/null @@ -1,18 +0,0 @@ -/* __dt__16JKRDecompCommandFv __ct__16JKRDecompCommandFv::__dt(void) */ -/* JKRDecompCommand_NS_dtor */ -/* 802DBDC0 002D8D00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DBDC4 002D8D04 7C 08 02 A6 */ mflr r0 -/* 802DBDC8 002D8D08 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DBDCC 002D8D0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DBDD0 002D8D10 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802DBDD4 002D8D14 41 82 00 10 */ beq lbl_802DBDE4 -/* 802DBDD8 002D8D18 7C 80 07 35 */ extsh. r0, r4 -/* 802DBDDC 002D8D1C 40 81 00 08 */ ble lbl_802DBDE4 -/* 802DBDE0 002D8D20 4B FF 2F 5D */ bl __dl__FPv -lbl_802DBDE4: -/* 802DBDE4 002D8D24 7F E3 FB 78 */ mr r3, r31 -/* 802DBDE8 002D8D28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DBDEC 002D8D2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DBDF0 002D8D30 7C 08 03 A6 */ mtlr r0 -/* 802DBDF4 002D8D34 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DBDF8 002D8D38 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDisposer/asm/func_802D147C.s b/include/JSystem/JKernel/JKRDisposer/asm/func_802D147C.s deleted file mode 100644 index 14f91edca6..0000000000 --- a/include/JSystem/JKernel/JKRDisposer/asm/func_802D147C.s +++ /dev/null @@ -1,27 +0,0 @@ -/* 802D147C 002CE3BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D1480 002CE3C0 7C 08 02 A6 */ mflr r0 -/* 802D1484 002CE3C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D1488 002CE3C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D148C 002CE3CC 7C 7F 1B 78 */ mr r31, r3 -/* 802D1490 002CE3D0 3C 60 80 3D */ lis r3, lbl_803CC0F0@ha -/* 802D1494 002CE3D4 38 03 C0 F0 */ addi r0, r3, lbl_803CC0F0@l -/* 802D1498 002CE3D8 90 1F 00 00 */ stw r0, 0(r31) -/* 802D149C 002CE3DC 7F E4 FB 78 */ mr r4, r31 -/* 802D14A0 002CE3E0 38 64 00 08 */ addi r3, r4, 8 -/* 802D14A4 002CE3E4 48 00 A9 59 */ bl __ct__10JSUPtrLinkFPv -/* 802D14A8 002CE3E8 7F E3 FB 78 */ mr r3, r31 -/* 802D14AC 002CE3EC 4B FF D3 91 */ bl findFromRoot__7JKRHeapFPv -/* 802D14B0 002CE3F0 90 7F 00 04 */ stw r3, 4(r31) -/* 802D14B4 002CE3F4 80 7F 00 04 */ lwz r3, 4(r31) -/* 802D14B8 002CE3F8 28 03 00 00 */ cmplwi r3, 0 -/* 802D14BC 002CE3FC 41 82 00 10 */ beq lbl_802D14CC -/* 802D14C0 002CE400 38 63 00 5C */ addi r3, r3, 0x5c -/* 802D14C4 002CE404 38 9F 00 08 */ addi r4, r31, 8 -/* 802D14C8 002CE408 48 00 AA 85 */ bl append__10JSUPtrListFP10JSUPtrLink -lbl_802D14CC: -/* 802D14CC 002CE40C 7F E3 FB 78 */ mr r3, r31 -/* 802D14D0 002CE410 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D14D4 002CE414 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D14D8 002CE418 7C 08 03 A6 */ mtlr r0 -/* 802D14DC 002CE41C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D14E0 002CE420 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRDisposer/asm/func_802D14E4.s b/include/JSystem/JKernel/JKRDisposer/asm/func_802D14E4.s deleted file mode 100644 index 174f63d4e4..0000000000 --- a/include/JSystem/JKernel/JKRDisposer/asm/func_802D14E4.s +++ /dev/null @@ -1,36 +0,0 @@ -/* 802D14E4 002CE424 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D14E8 002CE428 7C 08 02 A6 */ mflr r0 -/* 802D14EC 002CE42C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D14F0 002CE430 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D14F4 002CE434 93 C1 00 08 */ stw r30, 8(r1) -/* 802D14F8 002CE438 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D14FC 002CE43C 7C 9F 23 78 */ mr r31, r4 -/* 802D1500 002CE440 41 82 00 4C */ beq lbl_802D154C -/* 802D1504 002CE444 3C 60 80 3D */ lis r3, lbl_803CC0F0@ha -/* 802D1508 002CE448 38 03 C0 F0 */ addi r0, r3, lbl_803CC0F0@l -/* 802D150C 002CE44C 90 1E 00 00 */ stw r0, 0(r30) -/* 802D1510 002CE450 80 7E 00 04 */ lwz r3, 4(r30) -/* 802D1514 002CE454 28 03 00 00 */ cmplwi r3, 0 -/* 802D1518 002CE458 41 82 00 10 */ beq lbl_802D1528 -/* 802D151C 002CE45C 38 63 00 5C */ addi r3, r3, 0x5c -/* 802D1520 002CE460 38 9E 00 08 */ addi r4, r30, 8 -/* 802D1524 002CE464 48 00 AC 39 */ bl remove__10JSUPtrListFP10JSUPtrLink -lbl_802D1528: -/* 802D1528 002CE468 34 1E 00 08 */ addic. r0, r30, 8 -/* 802D152C 002CE46C 41 82 00 10 */ beq lbl_802D153C -/* 802D1530 002CE470 38 7E 00 08 */ addi r3, r30, 8 -/* 802D1534 002CE474 38 80 00 00 */ li r4, 0 -/* 802D1538 002CE478 48 00 A8 DD */ bl __dt__10JSUPtrLinkFv -lbl_802D153C: -/* 802D153C 002CE47C 7F E0 07 35 */ extsh. r0, r31 -/* 802D1540 002CE480 40 81 00 0C */ ble lbl_802D154C -/* 802D1544 002CE484 7F C3 F3 78 */ mr r3, r30 -/* 802D1548 002CE488 4B FF D7 F5 */ bl __dl__FPv -lbl_802D154C: -/* 802D154C 002CE48C 7F C3 F3 78 */ mr r3, r30 -/* 802D1550 002CE490 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D1554 002CE494 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D1558 002CE498 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D155C 002CE49C 7C 08 03 A6 */ mtlr r0 -/* 802D1560 002CE4A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D1564 002CE4A4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB5E8.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB5E8.s deleted file mode 100644 index 0bd5cf1d6a..0000000000 --- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB5E8.s +++ /dev/null @@ -1,19 +0,0 @@ -/* __sinit_JKRDvdAramRipper_cpp __sinit_JKRDvdAramRipper_cpp */ -/* missing reference */ -/* 802DB5E8 002D8528 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DB5EC 002D852C 7C 08 02 A6 */ mflr r0 -/* 802DB5F0 002D8530 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DB5F4 002D8534 3C 60 80 43 */ lis r3, lbl_804343B4@ha -/* 802DB5F8 002D8538 38 63 43 B4 */ addi r3, r3, lbl_804343B4@l -/* 802DB5FC 002D853C 48 00 09 19 */ bl initiate__10JSUPtrListFv -/* 802DB600 002D8540 3C 60 80 43 */ lis r3, lbl_804343B4@ha -/* 802DB604 002D8544 38 63 43 B4 */ addi r3, r3, lbl_804343B4@l -/* 802DB608 002D8548 3C 80 80 2E */ lis r4, JSUList_NS_dtor_X9_@ha -/* 802DB60C 002D854C 38 84 B6 2C */ addi r4, r4, JSUList_NS_dtor_X9_@l -/* 802DB610 002D8550 3C A0 80 43 */ lis r5, lbl_804343A8@ha -/* 802DB614 002D8554 38 A5 43 A8 */ addi r5, r5, lbl_804343A8@l -/* 802DB618 002D8558 48 08 66 0D */ bl func_80361C24 -/* 802DB61C 002D855C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DB620 002D8560 7C 08 03 A6 */ mtlr r0 -/* 802DB624 002D8564 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DB628 002D8568 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB62C.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB62C.s deleted file mode 100644 index 506312b54a..0000000000 --- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB62C.s +++ /dev/null @@ -1,24 +0,0 @@ -/* __dt__23JSUList<12JKRADCommand>Fv JSUList<12JKRADCommand>::__dt(void) */ -/* JSUList_NS_dtor_X9_ */ -/* 802DB62C 002D856C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DB630 002D8570 7C 08 02 A6 */ mflr r0 -/* 802DB634 002D8574 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DB638 002D8578 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DB63C 002D857C 93 C1 00 08 */ stw r30, 8(r1) -/* 802DB640 002D8580 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802DB644 002D8584 7C 9F 23 78 */ mr r31, r4 -/* 802DB648 002D8588 41 82 00 1C */ beq lbl_802DB664 -/* 802DB64C 002D858C 38 80 00 00 */ li r4, 0 -/* 802DB650 002D8590 48 00 08 5D */ bl __dt__10JSUPtrListFv -/* 802DB654 002D8594 7F E0 07 35 */ extsh. r0, r31 -/* 802DB658 002D8598 40 81 00 0C */ ble lbl_802DB664 -/* 802DB65C 002D859C 7F C3 F3 78 */ mr r3, r30 -/* 802DB660 002D85A0 4B FF 36 DD */ bl __dl__FPv -lbl_802DB664: -/* 802DB664 002D85A4 7F C3 F3 78 */ mr r3, r30 -/* 802DB668 002D85A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DB66C 002D85AC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802DB670 002D85B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DB674 002D85B4 7C 08 03 A6 */ mtlr r0 -/* 802DB678 002D85B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DB67C 002D85BC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D7BF0.s b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D7BF0.s deleted file mode 100644 index bab2f50a97..0000000000 --- a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D7BF0.s +++ /dev/null @@ -1,46 +0,0 @@ -/* __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection::__ct(long, JKRArchive::EMountDirection) */ -/* JKRDvdArchive */ -/* 802D7BF0 002D4B30 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D7BF4 002D4B34 7C 08 02 A6 */ mflr r0 -/* 802D7BF8 002D4B38 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D7BFC 002D4B3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7C00 002D4B40 48 08 A5 DD */ bl _savegpr_29 -/* 802D7C04 002D4B44 7C 7D 1B 78 */ mr r29, r3 -/* 802D7C08 002D4B48 7C 9E 23 78 */ mr r30, r4 -/* 802D7C0C 002D4B4C 7C BF 2B 78 */ mr r31, r5 -/* 802D7C10 002D4B50 38 A0 00 03 */ li r5, 3 -/* 802D7C14 002D4B54 4B FF E6 81 */ bl __ct__10JKRArchiveFlQ210JKRArchive10EMountMode -/* 802D7C18 002D4B58 3C 60 80 3D */ lis r3, lbl_803CC398@ha -/* 802D7C1C 002D4B5C 38 03 C3 98 */ addi r0, r3, lbl_803CC398@l -/* 802D7C20 002D4B60 90 1D 00 00 */ stw r0, 0(r29) -/* 802D7C24 002D4B64 93 FD 00 60 */ stw r31, 0x60(r29) -/* 802D7C28 002D4B68 7F A3 EB 78 */ mr r3, r29 -/* 802D7C2C 002D4B6C 7F C4 F3 78 */ mr r4, r30 -/* 802D7C30 002D4B70 48 00 01 85 */ bl open__13JKRDvdArchiveFl -/* 802D7C34 002D4B74 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802D7C38 002D4B78 40 82 00 0C */ bne lbl_802D7C44 -/* 802D7C3C 002D4B7C 7F A3 EB 78 */ mr r3, r29 -/* 802D7C40 002D4B80 48 00 00 40 */ b lbl_802D7C80 -lbl_802D7C44: -/* 802D7C44 002D4B84 3C 60 52 41 */ lis r3, 0x52415243@ha -/* 802D7C48 002D4B88 38 03 52 43 */ addi r0, r3, 0x52415243@l -/* 802D7C4C 002D4B8C 90 1D 00 2C */ stw r0, 0x2c(r29) -/* 802D7C50 002D4B90 80 9D 00 54 */ lwz r4, 0x54(r29) -/* 802D7C54 002D4B94 80 7D 00 48 */ lwz r3, 0x48(r29) -/* 802D7C58 002D4B98 80 03 00 04 */ lwz r0, 4(r3) -/* 802D7C5C 002D4B9C 7C 04 02 14 */ add r0, r4, r0 -/* 802D7C60 002D4BA0 90 1D 00 28 */ stw r0, 0x28(r29) -/* 802D7C64 002D4BA4 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D7C68 002D4BA8 38 63 43 54 */ addi r3, r3, sVolumeList__13JKRFileLoader@l -/* 802D7C6C 002D4BAC 38 9D 00 18 */ addi r4, r29, 0x18 -/* 802D7C70 002D4BB0 48 00 43 81 */ bl prepend__10JSUPtrListFP10JSUPtrLink -/* 802D7C74 002D4BB4 38 00 00 01 */ li r0, 1 -/* 802D7C78 002D4BB8 98 1D 00 30 */ stb r0, 0x30(r29) -/* 802D7C7C 002D4BBC 7F A3 EB 78 */ mr r3, r29 -lbl_802D7C80: -/* 802D7C80 002D4BC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7C84 002D4BC4 48 08 A5 A5 */ bl _restgpr_29 -/* 802D7C88 002D4BC8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D7C8C 002D4BCC 7C 08 03 A6 */ mtlr r0 -/* 802D7C90 002D4BD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D7C94 002D4BD4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D7C98.s b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D7C98.s deleted file mode 100644 index b83c46efa7..0000000000 --- a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D7C98.s +++ /dev/null @@ -1,81 +0,0 @@ -/* __dt__13JKRDvdArchiveFv __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection::__dt(void) */ -/* missing reference */ -/* 802D7C98 002D4BD8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D7C9C 002D4BDC 7C 08 02 A6 */ mflr r0 -/* 802D7CA0 002D4BE0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D7CA4 002D4BE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7CA8 002D4BE8 48 08 A5 31 */ bl _savegpr_28 -/* 802D7CAC 002D4BEC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802D7CB0 002D4BF0 7C 9C 23 78 */ mr r28, r4 -/* 802D7CB4 002D4BF4 41 82 00 E4 */ beq lbl_802D7D98 -/* 802D7CB8 002D4BF8 3C 60 80 3D */ lis r3, lbl_803CC398@ha -/* 802D7CBC 002D4BFC 38 03 C3 98 */ addi r0, r3, lbl_803CC398@l -/* 802D7CC0 002D4C00 90 1F 00 00 */ stw r0, 0(r31) -/* 802D7CC4 002D4C04 88 1F 00 30 */ lbz r0, 0x30(r31) -/* 802D7CC8 002D4C08 28 00 00 01 */ cmplwi r0, 1 -/* 802D7CCC 002D4C0C 40 82 00 B0 */ bne lbl_802D7D7C -/* 802D7CD0 002D4C10 80 1F 00 44 */ lwz r0, 0x44(r31) -/* 802D7CD4 002D4C14 28 00 00 00 */ cmplwi r0, 0 -/* 802D7CD8 002D4C18 41 82 00 4C */ beq lbl_802D7D24 -/* 802D7CDC 002D4C1C 83 DF 00 4C */ lwz r30, 0x4c(r31) -/* 802D7CE0 002D4C20 3B A0 00 00 */ li r29, 0 -/* 802D7CE4 002D4C24 48 00 00 20 */ b lbl_802D7D04 -lbl_802D7CE8: -/* 802D7CE8 002D4C28 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 802D7CEC 002D4C2C 28 03 00 00 */ cmplwi r3, 0 -/* 802D7CF0 002D4C30 41 82 00 0C */ beq lbl_802D7CFC -/* 802D7CF4 002D4C34 80 9F 00 38 */ lwz r4, 0x38(r31) -/* 802D7CF8 002D4C38 4B FF 68 09 */ bl free__7JKRHeapFPvP7JKRHeap -lbl_802D7CFC: -/* 802D7CFC 002D4C3C 3B DE 00 14 */ addi r30, r30, 0x14 -/* 802D7D00 002D4C40 3B BD 00 01 */ addi r29, r29, 1 -lbl_802D7D04: -/* 802D7D04 002D4C44 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 802D7D08 002D4C48 80 03 00 08 */ lwz r0, 8(r3) -/* 802D7D0C 002D4C4C 7C 1D 00 40 */ cmplw r29, r0 -/* 802D7D10 002D4C50 41 80 FF D8 */ blt lbl_802D7CE8 -/* 802D7D14 002D4C54 80 9F 00 38 */ lwz r4, 0x38(r31) -/* 802D7D18 002D4C58 4B FF 67 E9 */ bl free__7JKRHeapFPvP7JKRHeap -/* 802D7D1C 002D4C5C 38 00 00 00 */ li r0, 0 -/* 802D7D20 002D4C60 90 1F 00 44 */ stw r0, 0x44(r31) -lbl_802D7D24: -/* 802D7D24 002D4C64 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 802D7D28 002D4C68 28 03 00 00 */ cmplwi r3, 0 -/* 802D7D2C 002D4C6C 41 82 00 14 */ beq lbl_802D7D40 -/* 802D7D30 002D4C70 38 80 00 00 */ li r4, 0 -/* 802D7D34 002D4C74 4B FF 67 CD */ bl free__7JKRHeapFPvP7JKRHeap -/* 802D7D38 002D4C78 38 00 00 00 */ li r0, 0 -/* 802D7D3C 002D4C7C 90 1F 00 50 */ stw r0, 0x50(r31) -lbl_802D7D40: -/* 802D7D40 002D4C80 80 7F 00 68 */ lwz r3, 0x68(r31) -/* 802D7D44 002D4C84 28 03 00 00 */ cmplwi r3, 0 -/* 802D7D48 002D4C88 41 82 00 1C */ beq lbl_802D7D64 -/* 802D7D4C 002D4C8C 41 82 00 18 */ beq lbl_802D7D64 -/* 802D7D50 002D4C90 38 80 00 01 */ li r4, 1 -/* 802D7D54 002D4C94 81 83 00 00 */ lwz r12, 0(r3) -/* 802D7D58 002D4C98 81 8C 00 08 */ lwz r12, 8(r12) -/* 802D7D5C 002D4C9C 7D 89 03 A6 */ mtctr r12 -/* 802D7D60 002D4CA0 4E 80 04 21 */ bctrl -lbl_802D7D64: -/* 802D7D64 002D4CA4 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D7D68 002D4CA8 38 63 43 54 */ addi r3, r3, sVolumeList__13JKRFileLoader@l -/* 802D7D6C 002D4CAC 38 9F 00 18 */ addi r4, r31, 0x18 -/* 802D7D70 002D4CB0 48 00 43 ED */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802D7D74 002D4CB4 38 00 00 00 */ li r0, 0 -/* 802D7D78 002D4CB8 98 1F 00 30 */ stb r0, 0x30(r31) -lbl_802D7D7C: -/* 802D7D7C 002D4CBC 7F E3 FB 78 */ mr r3, r31 -/* 802D7D80 002D4CC0 38 80 00 00 */ li r4, 0 -/* 802D7D84 002D4CC4 4B FF E5 B1 */ bl __dt__10JKRArchiveFv -/* 802D7D88 002D4CC8 7F 80 07 35 */ extsh. r0, r28 -/* 802D7D8C 002D4CCC 40 81 00 0C */ ble lbl_802D7D98 -/* 802D7D90 002D4CD0 7F E3 FB 78 */ mr r3, r31 -/* 802D7D94 002D4CD4 4B FF 6F A9 */ bl __dl__FPv -lbl_802D7D98: -/* 802D7D98 002D4CD8 7F E3 FB 78 */ mr r3, r31 -/* 802D7D9C 002D4CDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7DA0 002D4CE0 48 08 A4 85 */ bl _restgpr_28 -/* 802D7DA4 002D4CE4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D7DA8 002D4CE8 7C 08 03 A6 */ mtlr r0 -/* 802D7DAC 002D4CEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D7DB0 002D4CF0 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8050.s b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8050.s deleted file mode 100644 index 8e793ae490..0000000000 --- a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8050.s +++ /dev/null @@ -1,81 +0,0 @@ -/* fetchResource__13JKRDvdArchiveFP12SDIFileEntryPUl __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection::fetchResource(JKRArchive::SDIFileEntry *, unsigned long *) */ -/* missing reference */ -/* 802D8050 002D4F90 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D8054 002D4F94 7C 08 02 A6 */ mflr r0 -/* 802D8058 002D4F98 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D805C 002D4F9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D8060 002D4FA0 48 08 A1 79 */ bl _savegpr_28 -/* 802D8064 002D4FA4 7C 7C 1B 78 */ mr r28, r3 -/* 802D8068 002D4FA8 7C 9D 23 78 */ mr r29, r4 -/* 802D806C 002D4FAC 7C BE 2B 79 */ or. r30, r5, r5 -/* 802D8070 002D4FB0 40 82 00 08 */ bne lbl_802D8078 -/* 802D8074 002D4FB4 3B C1 00 0C */ addi r30, r1, 0xc -lbl_802D8078: -/* 802D8078 002D4FB8 80 1D 00 04 */ lwz r0, 4(r29) -/* 802D807C 002D4FBC 54 03 46 3E */ srwi r3, r0, 0x18 -/* 802D8080 002D4FC0 54 00 47 7B */ rlwinm. r0, r0, 8, 0x1d, 0x1d -/* 802D8084 002D4FC4 40 82 00 0C */ bne lbl_802D8090 -/* 802D8088 002D4FC8 3B E0 00 00 */ li r31, 0 -/* 802D808C 002D4FCC 48 00 00 18 */ b lbl_802D80A4 -lbl_802D8090: -/* 802D8090 002D4FD0 54 60 06 31 */ rlwinm. r0, r3, 0, 0x18, 0x18 -/* 802D8094 002D4FD4 41 82 00 0C */ beq lbl_802D80A0 -/* 802D8098 002D4FD8 3B E0 00 02 */ li r31, 2 -/* 802D809C 002D4FDC 48 00 00 08 */ b lbl_802D80A4 -lbl_802D80A0: -/* 802D80A0 002D4FE0 3B E0 00 01 */ li r31, 1 -lbl_802D80A4: -/* 802D80A4 002D4FE4 80 1D 00 10 */ lwz r0, 0x10(r29) -/* 802D80A8 002D4FE8 28 00 00 00 */ cmplwi r0, 0 -/* 802D80AC 002D4FEC 40 82 00 70 */ bne lbl_802D811C -/* 802D80B0 002D4FF0 80 7C 00 40 */ lwz r3, 0x40(r28) -/* 802D80B4 002D4FF4 80 9C 00 64 */ lwz r4, 0x64(r28) -/* 802D80B8 002D4FF8 80 1D 00 08 */ lwz r0, 8(r29) -/* 802D80BC 002D4FFC 7C 84 02 14 */ add r4, r4, r0 -/* 802D80C0 002D5000 80 BD 00 0C */ lwz r5, 0xc(r29) -/* 802D80C4 002D5004 80 DC 00 38 */ lwz r6, 0x38(r28) -/* 802D80C8 002D5008 7F E7 FB 78 */ mr r7, r31 -/* 802D80CC 002D500C 81 1C 00 5C */ lwz r8, 0x5c(r28) -/* 802D80D0 002D5010 39 21 00 08 */ addi r9, r1, 8 -/* 802D80D4 002D5014 48 00 03 A1 */ bl fetchResource_subroutine__13JKRDvdArchiveFlUlUlP7JKRHeapiiPPUc -/* 802D80D8 002D5018 90 7E 00 00 */ stw r3, 0(r30) -/* 802D80DC 002D501C 28 03 00 00 */ cmplwi r3, 0 -/* 802D80E0 002D5020 40 82 00 0C */ bne lbl_802D80EC -/* 802D80E4 002D5024 38 60 00 00 */ li r3, 0 -/* 802D80E8 002D5028 48 00 00 68 */ b lbl_802D8150 -lbl_802D80EC: -/* 802D80EC 002D502C 80 01 00 08 */ lwz r0, 8(r1) -/* 802D80F0 002D5030 90 1D 00 10 */ stw r0, 0x10(r29) -/* 802D80F4 002D5034 2C 1F 00 02 */ cmpwi r31, 2 -/* 802D80F8 002D5038 40 82 00 54 */ bne lbl_802D814C -/* 802D80FC 002D503C 7F 83 E3 78 */ mr r3, r28 -/* 802D8100 002D5040 7F A4 EB 78 */ mr r4, r29 -/* 802D8104 002D5044 80 BE 00 00 */ lwz r5, 0(r30) -/* 802D8108 002D5048 81 9C 00 00 */ lwz r12, 0(r28) -/* 802D810C 002D504C 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 802D8110 002D5050 7D 89 03 A6 */ mtctr r12 -/* 802D8114 002D5054 4E 80 04 21 */ bctrl -/* 802D8118 002D5058 48 00 00 34 */ b lbl_802D814C -lbl_802D811C: -/* 802D811C 002D505C 2C 1F 00 02 */ cmpwi r31, 2 -/* 802D8120 002D5060 40 82 00 24 */ bne lbl_802D8144 -/* 802D8124 002D5064 7F 83 E3 78 */ mr r3, r28 -/* 802D8128 002D5068 7F A4 EB 78 */ mr r4, r29 -/* 802D812C 002D506C 81 9C 00 00 */ lwz r12, 0(r28) -/* 802D8130 002D5070 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 802D8134 002D5074 7D 89 03 A6 */ mtctr r12 -/* 802D8138 002D5078 4E 80 04 21 */ bctrl -/* 802D813C 002D507C 90 7E 00 00 */ stw r3, 0(r30) -/* 802D8140 002D5080 48 00 00 0C */ b lbl_802D814C -lbl_802D8144: -/* 802D8144 002D5084 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 802D8148 002D5088 90 1E 00 00 */ stw r0, 0(r30) -lbl_802D814C: -/* 802D814C 002D508C 80 7D 00 10 */ lwz r3, 0x10(r29) -lbl_802D8150: -/* 802D8150 002D5090 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D8154 002D5094 48 08 A0 D1 */ bl _restgpr_28 -/* 802D8158 002D5098 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D815C 002D509C 7C 08 03 A6 */ mtlr r0 -/* 802D8160 002D50A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D8164 002D50A4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D826C.s b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D826C.s deleted file mode 100644 index 6c66977cbb..0000000000 --- a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D826C.s +++ /dev/null @@ -1,143 +0,0 @@ -/* fetchResource_subroutine__13JKRDvdArchiveFlUlUlPUcUlii __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection::fetchResource_subroutine(long, unsigned long, unsigned long, unsigned char *, unsigned long, int, int) */ -/* JKRDvdArchive_NS_fetchResource_subroutine */ -/* 802D826C 002D51AC 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 802D8270 002D51B0 7C 08 02 A6 */ mflr r0 -/* 802D8274 002D51B4 90 01 00 74 */ stw r0, 0x74(r1) -/* 802D8278 002D51B8 39 61 00 70 */ addi r11, r1, 0x70 -/* 802D827C 002D51BC 48 08 9F 55 */ bl _savegpr_26 -/* 802D8280 002D51C0 7C 7D 1B 78 */ mr r29, r3 -/* 802D8284 002D51C4 7C 9E 23 78 */ mr r30, r4 -/* 802D8288 002D51C8 7C BA 2B 78 */ mr r26, r5 -/* 802D828C 002D51CC 7C DF 33 78 */ mr r31, r6 -/* 802D8290 002D51D0 38 1A 00 1F */ addi r0, r26, 0x1f -/* 802D8294 002D51D4 54 1C 00 34 */ rlwinm r28, r0, 0, 0, 0x1a -/* 802D8298 002D51D8 54 FB 00 34 */ rlwinm r27, r7, 0, 0, 0x1a -/* 802D829C 002D51DC 2C 09 00 01 */ cmpwi r9, 1 -/* 802D82A0 002D51E0 41 82 01 80 */ beq lbl_802D8420 -/* 802D82A4 002D51E4 40 80 00 10 */ bge lbl_802D82B4 -/* 802D82A8 002D51E8 2C 09 00 00 */ cmpwi r9, 0 -/* 802D82AC 002D51EC 40 80 00 14 */ bge lbl_802D82C0 -/* 802D82B0 002D51F0 48 00 01 8C */ b lbl_802D843C -lbl_802D82B4: -/* 802D82B4 002D51F4 2C 09 00 03 */ cmpwi r9, 3 -/* 802D82B8 002D51F8 40 80 01 84 */ bge lbl_802D843C -/* 802D82BC 002D51FC 48 00 01 18 */ b lbl_802D83D4 -lbl_802D82C0: -/* 802D82C0 002D5200 2C 08 00 00 */ cmpwi r8, 0 -/* 802D82C4 002D5204 41 82 00 14 */ beq lbl_802D82D8 -/* 802D82C8 002D5208 41 80 01 0C */ blt lbl_802D83D4 -/* 802D82CC 002D520C 2C 08 00 03 */ cmpwi r8, 3 -/* 802D82D0 002D5210 40 80 01 04 */ bge lbl_802D83D4 -/* 802D82D4 002D5214 48 00 00 50 */ b lbl_802D8324 -lbl_802D82D8: -/* 802D82D8 002D5218 7C 1C D8 40 */ cmplw r28, r27 -/* 802D82DC 002D521C 40 81 00 08 */ ble lbl_802D82E4 -/* 802D82E0 002D5220 7F 7C DB 78 */ mr r28, r27 -lbl_802D82E4: -/* 802D82E4 002D5224 38 00 00 00 */ li r0, 0 -/* 802D82E8 002D5228 90 01 00 08 */ stw r0, 8(r1) -/* 802D82EC 002D522C 7F A3 EB 78 */ mr r3, r29 -/* 802D82F0 002D5230 7F E4 FB 78 */ mr r4, r31 -/* 802D82F4 002D5234 38 A0 00 00 */ li r5, 0 -/* 802D82F8 002D5238 7F 86 E3 78 */ mr r6, r28 -/* 802D82FC 002D523C 38 E0 00 00 */ li r7, 0 -/* 802D8300 002D5240 39 00 00 01 */ li r8, 1 -/* 802D8304 002D5244 7F C9 F3 78 */ mr r9, r30 -/* 802D8308 002D5248 39 40 00 00 */ li r10, 0 -/* 802D830C 002D524C 48 00 19 49 */ bl loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl -/* 802D8310 002D5250 7F E3 FB 78 */ mr r3, r31 -/* 802D8314 002D5254 7F 84 E3 78 */ mr r4, r28 -/* 802D8318 002D5258 48 06 32 69 */ bl DCInvalidateRange -/* 802D831C 002D525C 7F 83 E3 78 */ mr r3, r28 -/* 802D8320 002D5260 48 00 01 3C */ b lbl_802D845C -lbl_802D8324: -/* 802D8324 002D5264 38 01 00 2F */ addi r0, r1, 0x2f -/* 802D8328 002D5268 54 1C 00 34 */ rlwinm r28, r0, 0, 0, 0x1a -/* 802D832C 002D526C 38 00 00 00 */ li r0, 0 -/* 802D8330 002D5270 90 01 00 08 */ stw r0, 8(r1) -/* 802D8334 002D5274 7F 84 E3 78 */ mr r4, r28 -/* 802D8338 002D5278 38 A0 00 02 */ li r5, 2 -/* 802D833C 002D527C 38 C0 00 20 */ li r6, 0x20 -/* 802D8340 002D5280 38 E0 00 00 */ li r7, 0 -/* 802D8344 002D5284 39 00 00 01 */ li r8, 1 -/* 802D8348 002D5288 7F C9 F3 78 */ mr r9, r30 -/* 802D834C 002D528C 39 40 00 00 */ li r10, 0 -/* 802D8350 002D5290 48 00 19 05 */ bl loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl -/* 802D8354 002D5294 7F 83 E3 78 */ mr r3, r28 -/* 802D8358 002D5298 38 80 00 20 */ li r4, 0x20 -/* 802D835C 002D529C 48 06 32 25 */ bl DCInvalidateRange -/* 802D8360 002D52A0 88 BC 00 07 */ lbz r5, 7(r28) -/* 802D8364 002D52A4 88 9C 00 06 */ lbz r4, 6(r28) -/* 802D8368 002D52A8 88 7C 00 04 */ lbz r3, 4(r28) -/* 802D836C 002D52AC 88 1C 00 05 */ lbz r0, 5(r28) -/* 802D8370 002D52B0 54 00 80 1E */ slwi r0, r0, 0x10 -/* 802D8374 002D52B4 50 60 C0 0E */ rlwimi r0, r3, 0x18, 0, 7 -/* 802D8378 002D52B8 50 80 44 2E */ rlwimi r0, r4, 8, 0x10, 0x17 -/* 802D837C 002D52BC 7C BC 03 78 */ or r28, r5, r0 -/* 802D8380 002D52C0 38 1C 00 1F */ addi r0, r28, 0x1f -/* 802D8384 002D52C4 54 1A 00 34 */ rlwinm r26, r0, 0, 0, 0x1a -/* 802D8388 002D52C8 7C 1A D8 40 */ cmplw r26, r27 -/* 802D838C 002D52CC 40 81 00 08 */ ble lbl_802D8394 -/* 802D8390 002D52D0 7F 7A DB 78 */ mr r26, r27 -lbl_802D8394: -/* 802D8394 002D52D4 38 00 00 00 */ li r0, 0 -/* 802D8398 002D52D8 90 01 00 08 */ stw r0, 8(r1) -/* 802D839C 002D52DC 7F A3 EB 78 */ mr r3, r29 -/* 802D83A0 002D52E0 7F E4 FB 78 */ mr r4, r31 -/* 802D83A4 002D52E4 38 A0 00 01 */ li r5, 1 -/* 802D83A8 002D52E8 7F 46 D3 78 */ mr r6, r26 -/* 802D83AC 002D52EC 38 E0 00 00 */ li r7, 0 -/* 802D83B0 002D52F0 39 00 00 01 */ li r8, 1 -/* 802D83B4 002D52F4 7F C9 F3 78 */ mr r9, r30 -/* 802D83B8 002D52F8 39 40 00 00 */ li r10, 0 -/* 802D83BC 002D52FC 48 00 18 99 */ bl loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl -/* 802D83C0 002D5300 7F E3 FB 78 */ mr r3, r31 -/* 802D83C4 002D5304 7F 44 D3 78 */ mr r4, r26 -/* 802D83C8 002D5308 48 06 31 B9 */ bl DCInvalidateRange -/* 802D83CC 002D530C 7F 83 E3 78 */ mr r3, r28 -/* 802D83D0 002D5310 48 00 00 8C */ b lbl_802D845C -lbl_802D83D4: -/* 802D83D4 002D5314 7C 1A D8 40 */ cmplw r26, r27 -/* 802D83D8 002D5318 40 81 00 08 */ ble lbl_802D83E0 -/* 802D83DC 002D531C 7F 7A DB 78 */ mr r26, r27 -lbl_802D83E0: -/* 802D83E0 002D5320 38 00 00 00 */ li r0, 0 -/* 802D83E4 002D5324 90 01 00 08 */ stw r0, 8(r1) -/* 802D83E8 002D5328 7F A3 EB 78 */ mr r3, r29 -/* 802D83EC 002D532C 7F E4 FB 78 */ mr r4, r31 -/* 802D83F0 002D5330 38 A0 00 01 */ li r5, 1 -/* 802D83F4 002D5334 7F 46 D3 78 */ mr r6, r26 -/* 802D83F8 002D5338 38 E0 00 00 */ li r7, 0 -/* 802D83FC 002D533C 39 00 00 01 */ li r8, 1 -/* 802D8400 002D5340 7F C9 F3 78 */ mr r9, r30 -/* 802D8404 002D5344 39 40 00 00 */ li r10, 0 -/* 802D8408 002D5348 48 00 18 4D */ bl loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl -/* 802D840C 002D534C 7F E3 FB 78 */ mr r3, r31 -/* 802D8410 002D5350 7F 44 D3 78 */ mr r4, r26 -/* 802D8414 002D5354 48 06 31 6D */ bl DCInvalidateRange -/* 802D8418 002D5358 7F 43 D3 78 */ mr r3, r26 -/* 802D841C 002D535C 48 00 00 40 */ b lbl_802D845C -lbl_802D8420: -/* 802D8420 002D5360 3C 60 80 3A */ lis r3, lbl_8039D1B0@ha -/* 802D8424 002D5364 38 63 D1 B0 */ addi r3, r3, lbl_8039D1B0@l -/* 802D8428 002D5368 38 80 02 89 */ li r4, 0x289 -/* 802D842C 002D536C 38 A3 00 12 */ addi r5, r3, 0x12 -/* 802D8430 002D5370 38 C3 00 15 */ addi r6, r3, 0x15 -/* 802D8434 002D5374 4C C6 31 82 */ crclr 6 -/* 802D8438 002D5378 48 00 9D C5 */ bl JUTException_NS_panic_f -lbl_802D843C: -/* 802D843C 002D537C 3C 60 80 3A */ lis r3, lbl_8039D1B0@ha -/* 802D8440 002D5380 38 63 D1 B0 */ addi r3, r3, lbl_8039D1B0@l -/* 802D8444 002D5384 38 80 02 8D */ li r4, 0x28d -/* 802D8448 002D5388 38 A3 00 12 */ addi r5, r3, 0x12 -/* 802D844C 002D538C 38 C3 00 3A */ addi r6, r3, 0x3a -/* 802D8450 002D5390 4C C6 31 82 */ crclr 6 -/* 802D8454 002D5394 48 00 9D A9 */ bl JUTException_NS_panic_f -/* 802D8458 002D5398 38 60 00 00 */ li r3, 0 -lbl_802D845C: -/* 802D845C 002D539C 39 61 00 70 */ addi r11, r1, 0x70 -/* 802D8460 002D53A0 48 08 9D BD */ bl _restgpr_26 -/* 802D8464 002D53A4 80 01 00 74 */ lwz r0, 0x74(r1) -/* 802D8468 002D53A8 7C 08 03 A6 */ mtlr r0 -/* 802D846C 002D53AC 38 21 00 70 */ addi r1, r1, 0x70 -/* 802D8470 002D53B0 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s deleted file mode 100644 index 1f7728e518..0000000000 --- a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s +++ /dev/null @@ -1,147 +0,0 @@ -/* fetchResource_subroutine__13JKRDvdArchiveFlUlUlP7JKRHeapiiPPUc __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection::fetchResource_subroutine(long, unsigned long, unsigned long, JKRHeap *, int, int, unsigned char **) */ -/* JKRDvdArchive_NS_fetchResource_subroutine_X1_ */ -/* 802D8474 002D53B4 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 802D8478 002D53B8 7C 08 02 A6 */ mflr r0 -/* 802D847C 002D53BC 90 01 00 74 */ stw r0, 0x74(r1) -/* 802D8480 002D53C0 39 61 00 70 */ addi r11, r1, 0x70 -/* 802D8484 002D53C4 48 08 9D 49 */ bl _savegpr_25 -/* 802D8488 002D53C8 7C 7D 1B 78 */ mr r29, r3 -/* 802D848C 002D53CC 7C 9E 23 78 */ mr r30, r4 -/* 802D8490 002D53D0 7C B9 2B 78 */ mr r25, r5 -/* 802D8494 002D53D4 7C DA 33 78 */ mr r26, r6 -/* 802D8498 002D53D8 7D 3F 4B 78 */ mr r31, r9 -/* 802D849C 002D53DC 38 19 00 1F */ addi r0, r25, 0x1f -/* 802D84A0 002D53E0 54 1B 00 34 */ rlwinm r27, r0, 0, 0, 0x1a -/* 802D84A4 002D53E4 2C 08 00 01 */ cmpwi r8, 1 -/* 802D84A8 002D53E8 41 82 01 9C */ beq lbl_802D8644 -/* 802D84AC 002D53EC 40 80 00 10 */ bge lbl_802D84BC -/* 802D84B0 002D53F0 2C 08 00 00 */ cmpwi r8, 0 -/* 802D84B4 002D53F4 40 80 00 14 */ bge lbl_802D84C8 -/* 802D84B8 002D53F8 48 00 01 A8 */ b lbl_802D8660 -lbl_802D84BC: -/* 802D84BC 002D53FC 2C 08 00 03 */ cmpwi r8, 3 -/* 802D84C0 002D5400 40 80 01 A0 */ bge lbl_802D8660 -/* 802D84C4 002D5404 48 00 01 28 */ b lbl_802D85EC -lbl_802D84C8: -/* 802D84C8 002D5408 2C 07 00 00 */ cmpwi r7, 0 -/* 802D84CC 002D540C 41 82 00 14 */ beq lbl_802D84E0 -/* 802D84D0 002D5410 41 80 01 1C */ blt lbl_802D85EC -/* 802D84D4 002D5414 2C 07 00 03 */ cmpwi r7, 3 -/* 802D84D8 002D5418 40 80 01 14 */ bge lbl_802D85EC -/* 802D84DC 002D541C 48 00 00 5C */ b lbl_802D8538 -lbl_802D84E0: -/* 802D84E0 002D5420 7F 63 DB 78 */ mr r3, r27 -/* 802D84E4 002D5424 38 80 00 20 */ li r4, 0x20 -/* 802D84E8 002D5428 7F 45 D3 78 */ mr r5, r26 -/* 802D84EC 002D542C 4B FF 5F 89 */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802D84F0 002D5430 7C 7C 1B 78 */ mr r28, r3 -/* 802D84F4 002D5434 38 00 00 00 */ li r0, 0 -/* 802D84F8 002D5438 90 01 00 08 */ stw r0, 8(r1) -/* 802D84FC 002D543C 7F A3 EB 78 */ mr r3, r29 -/* 802D8500 002D5440 7F 84 E3 78 */ mr r4, r28 -/* 802D8504 002D5444 38 A0 00 00 */ li r5, 0 -/* 802D8508 002D5448 7F 66 DB 78 */ mr r6, r27 -/* 802D850C 002D544C 38 E0 00 00 */ li r7, 0 -/* 802D8510 002D5450 39 00 00 01 */ li r8, 1 -/* 802D8514 002D5454 7F C9 F3 78 */ mr r9, r30 -/* 802D8518 002D5458 39 40 00 00 */ li r10, 0 -/* 802D851C 002D545C 48 00 17 39 */ bl loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl -/* 802D8520 002D5460 7F 83 E3 78 */ mr r3, r28 -/* 802D8524 002D5464 7F 64 DB 78 */ mr r4, r27 -/* 802D8528 002D5468 48 06 30 59 */ bl DCInvalidateRange -/* 802D852C 002D546C 93 9F 00 00 */ stw r28, 0(r31) -/* 802D8530 002D5470 7F 63 DB 78 */ mr r3, r27 -/* 802D8534 002D5474 48 00 01 4C */ b lbl_802D8680 -lbl_802D8538: -/* 802D8538 002D5478 38 01 00 2F */ addi r0, r1, 0x2f -/* 802D853C 002D547C 54 1B 00 34 */ rlwinm r27, r0, 0, 0, 0x1a -/* 802D8540 002D5480 38 00 00 00 */ li r0, 0 -/* 802D8544 002D5484 90 01 00 08 */ stw r0, 8(r1) -/* 802D8548 002D5488 7F 64 DB 78 */ mr r4, r27 -/* 802D854C 002D548C 38 A0 00 02 */ li r5, 2 -/* 802D8550 002D5490 38 C0 00 20 */ li r6, 0x20 -/* 802D8554 002D5494 38 E0 00 00 */ li r7, 0 -/* 802D8558 002D5498 39 00 00 01 */ li r8, 1 -/* 802D855C 002D549C 7F C9 F3 78 */ mr r9, r30 -/* 802D8560 002D54A0 39 40 00 00 */ li r10, 0 -/* 802D8564 002D54A4 48 00 16 F1 */ bl loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl -/* 802D8568 002D54A8 7F 63 DB 78 */ mr r3, r27 -/* 802D856C 002D54AC 38 80 00 20 */ li r4, 0x20 -/* 802D8570 002D54B0 48 06 30 11 */ bl DCInvalidateRange -/* 802D8574 002D54B4 88 BB 00 07 */ lbz r5, 7(r27) -/* 802D8578 002D54B8 88 9B 00 06 */ lbz r4, 6(r27) -/* 802D857C 002D54BC 88 7B 00 04 */ lbz r3, 4(r27) -/* 802D8580 002D54C0 88 1B 00 05 */ lbz r0, 5(r27) -/* 802D8584 002D54C4 54 00 80 1E */ slwi r0, r0, 0x10 -/* 802D8588 002D54C8 50 60 C0 0E */ rlwimi r0, r3, 0x18, 0, 7 -/* 802D858C 002D54CC 50 80 44 2E */ rlwimi r0, r4, 8, 0x10, 0x17 -/* 802D8590 002D54D0 7C BC 03 78 */ or r28, r5, r0 -/* 802D8594 002D54D4 7F 83 E3 78 */ mr r3, r28 -/* 802D8598 002D54D8 38 80 00 20 */ li r4, 0x20 -/* 802D859C 002D54DC 7F 45 D3 78 */ mr r5, r26 -/* 802D85A0 002D54E0 4B FF 5E D5 */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802D85A4 002D54E4 7C 7B 1B 78 */ mr r27, r3 -/* 802D85A8 002D54E8 38 00 00 00 */ li r0, 0 -/* 802D85AC 002D54EC 90 01 00 08 */ stw r0, 8(r1) -/* 802D85B0 002D54F0 7F A3 EB 78 */ mr r3, r29 -/* 802D85B4 002D54F4 7F 64 DB 78 */ mr r4, r27 -/* 802D85B8 002D54F8 38 A0 00 01 */ li r5, 1 -/* 802D85BC 002D54FC 7F 86 E3 78 */ mr r6, r28 -/* 802D85C0 002D5500 38 E0 00 00 */ li r7, 0 -/* 802D85C4 002D5504 39 00 00 01 */ li r8, 1 -/* 802D85C8 002D5508 7F C9 F3 78 */ mr r9, r30 -/* 802D85CC 002D550C 39 40 00 00 */ li r10, 0 -/* 802D85D0 002D5510 48 00 16 85 */ bl loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl -/* 802D85D4 002D5514 7F 63 DB 78 */ mr r3, r27 -/* 802D85D8 002D5518 7F 84 E3 78 */ mr r4, r28 -/* 802D85DC 002D551C 48 06 2F A5 */ bl DCInvalidateRange -/* 802D85E0 002D5520 93 7F 00 00 */ stw r27, 0(r31) -/* 802D85E4 002D5524 7F 83 E3 78 */ mr r3, r28 -/* 802D85E8 002D5528 48 00 00 98 */ b lbl_802D8680 -lbl_802D85EC: -/* 802D85EC 002D552C 7F 63 DB 78 */ mr r3, r27 -/* 802D85F0 002D5530 38 80 00 20 */ li r4, 0x20 -/* 802D85F4 002D5534 7F 45 D3 78 */ mr r5, r26 -/* 802D85F8 002D5538 4B FF 5E 7D */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802D85FC 002D553C 7C 7C 1B 78 */ mr r28, r3 -/* 802D8600 002D5540 38 00 00 00 */ li r0, 0 -/* 802D8604 002D5544 90 01 00 08 */ stw r0, 8(r1) -/* 802D8608 002D5548 7F A3 EB 78 */ mr r3, r29 -/* 802D860C 002D554C 7F 84 E3 78 */ mr r4, r28 -/* 802D8610 002D5550 38 A0 00 01 */ li r5, 1 -/* 802D8614 002D5554 7F 26 CB 78 */ mr r6, r25 -/* 802D8618 002D5558 38 E0 00 00 */ li r7, 0 -/* 802D861C 002D555C 39 00 00 01 */ li r8, 1 -/* 802D8620 002D5560 7F C9 F3 78 */ mr r9, r30 -/* 802D8624 002D5564 39 40 00 00 */ li r10, 0 -/* 802D8628 002D5568 48 00 16 2D */ bl loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl -/* 802D862C 002D556C 7F 83 E3 78 */ mr r3, r28 -/* 802D8630 002D5570 7F 24 CB 78 */ mr r4, r25 -/* 802D8634 002D5574 48 06 2F 4D */ bl DCInvalidateRange -/* 802D8638 002D5578 93 9F 00 00 */ stw r28, 0(r31) -/* 802D863C 002D557C 7F 63 DB 78 */ mr r3, r27 -/* 802D8640 002D5580 48 00 00 40 */ b lbl_802D8680 -lbl_802D8644: -/* 802D8644 002D5584 3C 60 80 3A */ lis r3, lbl_8039D1B0@ha -/* 802D8648 002D5588 38 63 D1 B0 */ addi r3, r3, lbl_8039D1B0@l -/* 802D864C 002D558C 38 80 02 F2 */ li r4, 0x2f2 -/* 802D8650 002D5590 38 A3 00 12 */ addi r5, r3, 0x12 -/* 802D8654 002D5594 38 C3 00 4C */ addi r6, r3, 0x4c -/* 802D8658 002D5598 4C C6 31 82 */ crclr 6 -/* 802D865C 002D559C 48 00 9B A1 */ bl JUTException_NS_panic_f -lbl_802D8660: -/* 802D8660 002D55A0 3C 60 80 3A */ lis r3, lbl_8039D1B0@ha -/* 802D8664 002D55A4 38 63 D1 B0 */ addi r3, r3, lbl_8039D1B0@l -/* 802D8668 002D55A8 38 80 02 F6 */ li r4, 0x2f6 -/* 802D866C 002D55AC 38 A3 00 12 */ addi r5, r3, 0x12 -/* 802D8670 002D55B0 38 C3 00 3A */ addi r6, r3, 0x3a -/* 802D8674 002D55B4 4C C6 31 82 */ crclr 6 -/* 802D8678 002D55B8 48 00 9B 85 */ bl JUTException_NS_panic_f -/* 802D867C 002D55BC 38 60 00 00 */ li r3, 0 -lbl_802D8680: -/* 802D8680 002D55C0 39 61 00 70 */ addi r11, r1, 0x70 -/* 802D8684 002D55C4 48 08 9B 95 */ bl _restgpr_25 -/* 802D8688 002D55C8 80 01 00 74 */ lwz r0, 0x74(r1) -/* 802D868C 002D55CC 7C 08 03 A6 */ mtlr r0 -/* 802D8690 002D55D0 38 21 00 70 */ addi r1, r1, 0x70 -/* 802D8694 002D55D4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8698.s b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8698.s deleted file mode 100644 index 4fe8320948..0000000000 --- a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8698.s +++ /dev/null @@ -1,86 +0,0 @@ -/* getExpandedResSize__13JKRDvdArchiveCFPCv __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection::getExpandedResSize( const(void const *)) */ -/* missing reference */ -/* 802D8698 002D55D8 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 802D869C 002D55DC 7C 08 02 A6 */ mflr r0 -/* 802D86A0 002D55E0 90 01 00 64 */ stw r0, 0x64(r1) -/* 802D86A4 002D55E4 39 61 00 60 */ addi r11, r1, 0x60 -/* 802D86A8 002D55E8 48 08 9B 35 */ bl _savegpr_29 -/* 802D86AC 002D55EC 7C 7F 1B 78 */ mr r31, r3 -/* 802D86B0 002D55F0 7C 9E 23 78 */ mr r30, r4 -/* 802D86B4 002D55F4 80 03 00 50 */ lwz r0, 0x50(r3) -/* 802D86B8 002D55F8 28 00 00 00 */ cmplwi r0, 0 -/* 802D86BC 002D55FC 40 82 00 18 */ bne lbl_802D86D4 -/* 802D86C0 002D5600 81 83 00 00 */ lwz r12, 0(r3) -/* 802D86C4 002D5604 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802D86C8 002D5608 7D 89 03 A6 */ mtctr r12 -/* 802D86CC 002D560C 4E 80 04 21 */ bctrl -/* 802D86D0 002D5610 48 00 00 EC */ b lbl_802D87BC -lbl_802D86D4: -/* 802D86D4 002D5614 4B FF E0 61 */ bl findPtrResource__10JKRArchiveCFPCv -/* 802D86D8 002D5618 7C 7D 1B 79 */ or. r29, r3, r3 -/* 802D86DC 002D561C 40 82 00 0C */ bne lbl_802D86E8 -/* 802D86E0 002D5620 38 60 FF FF */ li r3, -1 -/* 802D86E4 002D5624 48 00 00 D8 */ b lbl_802D87BC -lbl_802D86E8: -/* 802D86E8 002D5628 80 1D 00 04 */ lwz r0, 4(r29) -/* 802D86EC 002D562C 54 00 47 7B */ rlwinm. r0, r0, 8, 0x1d, 0x1d -/* 802D86F0 002D5630 40 82 00 20 */ bne lbl_802D8710 -/* 802D86F4 002D5634 7F E3 FB 78 */ mr r3, r31 -/* 802D86F8 002D5638 7F C4 F3 78 */ mr r4, r30 -/* 802D86FC 002D563C 81 9F 00 00 */ lwz r12, 0(r31) -/* 802D8700 002D5640 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802D8704 002D5644 7D 89 03 A6 */ mtctr r12 -/* 802D8708 002D5648 4E 80 04 21 */ bctrl -/* 802D870C 002D564C 48 00 00 B0 */ b lbl_802D87BC -lbl_802D8710: -/* 802D8710 002D5650 7F E3 FB 78 */ mr r3, r31 -/* 802D8714 002D5654 7F A4 EB 78 */ mr r4, r29 -/* 802D8718 002D5658 81 9F 00 00 */ lwz r12, 0(r31) -/* 802D871C 002D565C 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 802D8720 002D5660 7D 89 03 A6 */ mtctr r12 -/* 802D8724 002D5664 4E 80 04 21 */ bctrl -/* 802D8728 002D5668 28 03 00 00 */ cmplwi r3, 0 -/* 802D872C 002D566C 41 82 00 08 */ beq lbl_802D8734 -/* 802D8730 002D5670 48 00 00 8C */ b lbl_802D87BC -lbl_802D8734: -/* 802D8734 002D5674 38 01 00 2F */ addi r0, r1, 0x2f -/* 802D8738 002D5678 54 1E 00 34 */ rlwinm r30, r0, 0, 0, 0x1a -/* 802D873C 002D567C 38 00 00 00 */ li r0, 0 -/* 802D8740 002D5680 90 01 00 08 */ stw r0, 8(r1) -/* 802D8744 002D5684 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 802D8748 002D5688 7F C4 F3 78 */ mr r4, r30 -/* 802D874C 002D568C 38 A0 00 02 */ li r5, 2 -/* 802D8750 002D5690 38 C0 00 20 */ li r6, 0x20 -/* 802D8754 002D5694 38 E0 00 00 */ li r7, 0 -/* 802D8758 002D5698 39 00 00 01 */ li r8, 1 -/* 802D875C 002D569C 81 3F 00 64 */ lwz r9, 0x64(r31) -/* 802D8760 002D56A0 80 1D 00 08 */ lwz r0, 8(r29) -/* 802D8764 002D56A4 7D 29 02 14 */ add r9, r9, r0 -/* 802D8768 002D56A8 39 40 00 00 */ li r10, 0 -/* 802D876C 002D56AC 48 00 14 E9 */ bl loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl -/* 802D8770 002D56B0 7F C3 F3 78 */ mr r3, r30 -/* 802D8774 002D56B4 38 80 00 20 */ li r4, 0x20 -/* 802D8778 002D56B8 48 06 2E 09 */ bl DCInvalidateRange -/* 802D877C 002D56BC 88 BE 00 07 */ lbz r5, 7(r30) -/* 802D8780 002D56C0 88 9E 00 06 */ lbz r4, 6(r30) -/* 802D8784 002D56C4 88 7E 00 04 */ lbz r3, 4(r30) -/* 802D8788 002D56C8 88 1E 00 05 */ lbz r0, 5(r30) -/* 802D878C 002D56CC 54 00 80 1E */ slwi r0, r0, 0x10 -/* 802D8790 002D56D0 50 60 C0 0E */ rlwimi r0, r3, 0x18, 0, 7 -/* 802D8794 002D56D4 50 80 44 2E */ rlwimi r0, r4, 8, 0x10, 0x17 -/* 802D8798 002D56D8 7C BE 03 78 */ or r30, r5, r0 -/* 802D879C 002D56DC 7F E3 FB 78 */ mr r3, r31 -/* 802D87A0 002D56E0 7F A4 EB 78 */ mr r4, r29 -/* 802D87A4 002D56E4 7F C5 F3 78 */ mr r5, r30 -/* 802D87A8 002D56E8 81 9F 00 00 */ lwz r12, 0(r31) -/* 802D87AC 002D56EC 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 802D87B0 002D56F0 7D 89 03 A6 */ mtctr r12 -/* 802D87B4 002D56F4 4E 80 04 21 */ bctrl -/* 802D87B8 002D56F8 7F C3 F3 78 */ mr r3, r30 -lbl_802D87BC: -/* 802D87BC 002D56FC 39 61 00 60 */ addi r11, r1, 0x60 -/* 802D87C0 002D5700 48 08 9A 69 */ bl _restgpr_29 -/* 802D87C4 002D5704 80 01 00 64 */ lwz r0, 0x64(r1) -/* 802D87C8 002D5708 7C 08 03 A6 */ mtlr r0 -/* 802D87CC 002D570C 38 21 00 60 */ addi r1, r1, 0x60 -/* 802D87D0 002D5710 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9584.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9584.s deleted file mode 100644 index 4fc1be8fa5..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9584.s +++ /dev/null @@ -1,31 +0,0 @@ -/* __ct__10JKRDvdFileFv __ct__10JKRDvdFileFv::__ct(void) */ -/* JKRDvdFile */ -/* 802D9584 002D64C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D9588 002D64C8 7C 08 02 A6 */ mflr r0 -/* 802D958C 002D64CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D9590 002D64D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D9594 002D64D4 93 C1 00 08 */ stw r30, 8(r1) -/* 802D9598 002D64D8 7C 7E 1B 78 */ mr r30, r3 -/* 802D959C 002D64DC 7F C0 F3 78 */ mr r0, r30 -/* 802D95A0 002D64E0 7C 1F 03 78 */ mr r31, r0 -/* 802D95A4 002D64E4 4B FF 7E D9 */ bl __ct__11JKRDisposerFv -/* 802D95A8 002D64E8 3C 60 80 3D */ lis r3, lbl_803CC328@ha -/* 802D95AC 002D64EC 38 03 C3 28 */ addi r0, r3, lbl_803CC328@l -/* 802D95B0 002D64F0 90 1F 00 00 */ stw r0, 0(r31) -/* 802D95B4 002D64F4 38 00 00 00 */ li r0, 0 -/* 802D95B8 002D64F8 98 1F 00 18 */ stb r0, 0x18(r31) -/* 802D95BC 002D64FC 3C 60 80 3D */ lis r3, lbl_803CC438@ha -/* 802D95C0 002D6500 38 03 C4 38 */ addi r0, r3, lbl_803CC438@l -/* 802D95C4 002D6504 90 1E 00 00 */ stw r0, 0(r30) -/* 802D95C8 002D6508 38 7E 00 E4 */ addi r3, r30, 0xe4 -/* 802D95CC 002D650C 7F C4 F3 78 */ mr r4, r30 -/* 802D95D0 002D6510 48 00 28 2D */ bl __ct__10JSUPtrLinkFPv -/* 802D95D4 002D6514 7F C3 F3 78 */ mr r3, r30 -/* 802D95D8 002D6518 48 00 02 0D */ bl initiate__10JKRDvdFileFv -/* 802D95DC 002D651C 7F C3 F3 78 */ mr r3, r30 -/* 802D95E0 002D6520 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D95E4 002D6524 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D95E8 002D6528 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D95EC 002D652C 7C 08 03 A6 */ mtlr r0 -/* 802D95F0 002D6530 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D95F4 002D6534 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D95F8.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D95F8.s deleted file mode 100644 index b001f3bf5e..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D95F8.s +++ /dev/null @@ -1,46 +0,0 @@ -/* __ct__10JKRDvdFileFPCc __ct__10JKRDvdFileFv::__ct(char const *) */ -/* JKRDvdFile_X1_ */ -/* 802D95F8 002D6538 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D95FC 002D653C 7C 08 02 A6 */ mflr r0 -/* 802D9600 002D6540 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D9604 002D6544 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9608 002D6548 48 08 8B D5 */ bl _savegpr_29 -/* 802D960C 002D654C 7C 7D 1B 78 */ mr r29, r3 -/* 802D9610 002D6550 7C 9F 23 78 */ mr r31, r4 -/* 802D9614 002D6554 7F A0 EB 78 */ mr r0, r29 -/* 802D9618 002D6558 7C 1E 03 78 */ mr r30, r0 -/* 802D961C 002D655C 4B FF 7E 61 */ bl __ct__11JKRDisposerFv -/* 802D9620 002D6560 3C 60 80 3D */ lis r3, lbl_803CC328@ha -/* 802D9624 002D6564 38 03 C3 28 */ addi r0, r3, lbl_803CC328@l -/* 802D9628 002D6568 90 1E 00 00 */ stw r0, 0(r30) -/* 802D962C 002D656C 38 00 00 00 */ li r0, 0 -/* 802D9630 002D6570 98 1E 00 18 */ stb r0, 0x18(r30) -/* 802D9634 002D6574 3C 60 80 3D */ lis r3, lbl_803CC438@ha -/* 802D9638 002D6578 38 03 C4 38 */ addi r0, r3, lbl_803CC438@l -/* 802D963C 002D657C 90 1D 00 00 */ stw r0, 0(r29) -/* 802D9640 002D6580 38 7D 00 E4 */ addi r3, r29, 0xe4 -/* 802D9644 002D6584 7F A4 EB 78 */ mr r4, r29 -/* 802D9648 002D6588 48 00 27 B5 */ bl __ct__10JSUPtrLinkFPv -/* 802D964C 002D658C 7F A3 EB 78 */ mr r3, r29 -/* 802D9650 002D6590 48 00 01 95 */ bl initiate__10JKRDvdFileFv -/* 802D9654 002D6594 7F A3 EB 78 */ mr r3, r29 -/* 802D9658 002D6598 7F E4 FB 78 */ mr r4, r31 -/* 802D965C 002D659C 81 9D 00 00 */ lwz r12, 0(r29) -/* 802D9660 002D65A0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802D9664 002D65A4 7D 89 03 A6 */ mtctr r12 -/* 802D9668 002D65A8 4E 80 04 21 */ bctrl -/* 802D966C 002D65AC 98 7D 00 18 */ stb r3, 0x18(r29) -/* 802D9670 002D65B0 88 1D 00 18 */ lbz r0, 0x18(r29) -/* 802D9674 002D65B4 28 00 00 00 */ cmplwi r0, 0 -/* 802D9678 002D65B8 41 82 00 0C */ beq lbl_802D9684 -/* 802D967C 002D65BC 7F A3 EB 78 */ mr r3, r29 -/* 802D9680 002D65C0 48 00 00 08 */ b lbl_802D9688 -lbl_802D9684: -/* 802D9684 002D65C4 7F A3 EB 78 */ mr r3, r29 -lbl_802D9688: -/* 802D9688 002D65C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D968C 002D65CC 48 08 8B 9D */ bl _restgpr_29 -/* 802D9690 002D65D0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D9694 002D65D4 7C 08 03 A6 */ mtlr r0 -/* 802D9698 002D65D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D969C 002D65DC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D96A0.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D96A0.s deleted file mode 100644 index 9f94facee5..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D96A0.s +++ /dev/null @@ -1,46 +0,0 @@ -/* __ct__10JKRDvdFileFl __ct__10JKRDvdFileFv::__ct(long) */ -/* JKRDvdFile_X2_ */ -/* 802D96A0 002D65E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D96A4 002D65E4 7C 08 02 A6 */ mflr r0 -/* 802D96A8 002D65E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D96AC 002D65EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D96B0 002D65F0 48 08 8B 2D */ bl _savegpr_29 -/* 802D96B4 002D65F4 7C 7D 1B 78 */ mr r29, r3 -/* 802D96B8 002D65F8 7C 9F 23 78 */ mr r31, r4 -/* 802D96BC 002D65FC 7F A0 EB 78 */ mr r0, r29 -/* 802D96C0 002D6600 7C 1E 03 78 */ mr r30, r0 -/* 802D96C4 002D6604 4B FF 7D B9 */ bl __ct__11JKRDisposerFv -/* 802D96C8 002D6608 3C 60 80 3D */ lis r3, lbl_803CC328@ha -/* 802D96CC 002D660C 38 03 C3 28 */ addi r0, r3, lbl_803CC328@l -/* 802D96D0 002D6610 90 1E 00 00 */ stw r0, 0(r30) -/* 802D96D4 002D6614 38 00 00 00 */ li r0, 0 -/* 802D96D8 002D6618 98 1E 00 18 */ stb r0, 0x18(r30) -/* 802D96DC 002D661C 3C 60 80 3D */ lis r3, lbl_803CC438@ha -/* 802D96E0 002D6620 38 03 C4 38 */ addi r0, r3, lbl_803CC438@l -/* 802D96E4 002D6624 90 1D 00 00 */ stw r0, 0(r29) -/* 802D96E8 002D6628 38 7D 00 E4 */ addi r3, r29, 0xe4 -/* 802D96EC 002D662C 7F A4 EB 78 */ mr r4, r29 -/* 802D96F0 002D6630 48 00 27 0D */ bl __ct__10JSUPtrLinkFPv -/* 802D96F4 002D6634 7F A3 EB 78 */ mr r3, r29 -/* 802D96F8 002D6638 48 00 00 ED */ bl initiate__10JKRDvdFileFv -/* 802D96FC 002D663C 7F A3 EB 78 */ mr r3, r29 -/* 802D9700 002D6640 7F E4 FB 78 */ mr r4, r31 -/* 802D9704 002D6644 81 9D 00 00 */ lwz r12, 0(r29) -/* 802D9708 002D6648 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 802D970C 002D664C 7D 89 03 A6 */ mtctr r12 -/* 802D9710 002D6650 4E 80 04 21 */ bctrl -/* 802D9714 002D6654 98 7D 00 18 */ stb r3, 0x18(r29) -/* 802D9718 002D6658 88 1D 00 18 */ lbz r0, 0x18(r29) -/* 802D971C 002D665C 28 00 00 00 */ cmplwi r0, 0 -/* 802D9720 002D6660 41 82 00 0C */ beq lbl_802D972C -/* 802D9724 002D6664 7F A3 EB 78 */ mr r3, r29 -/* 802D9728 002D6668 48 00 00 08 */ b lbl_802D9730 -lbl_802D972C: -/* 802D972C 002D666C 7F A3 EB 78 */ mr r3, r29 -lbl_802D9730: -/* 802D9730 002D6670 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9734 002D6674 48 08 8A F5 */ bl _restgpr_29 -/* 802D9738 002D6678 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D973C 002D667C 7C 08 03 A6 */ mtlr r0 -/* 802D9740 002D6680 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D9744 002D6684 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s deleted file mode 100644 index cb8dc37115..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s +++ /dev/null @@ -1,44 +0,0 @@ -/* __dt__10JKRDvdFileFv __ct__10JKRDvdFileFv::__dt(void) */ -/* JKRDvdFile_NS_dtor */ -/* 802D9748 002D6688 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D974C 002D668C 7C 08 02 A6 */ mflr r0 -/* 802D9750 002D6690 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D9754 002D6694 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D9758 002D6698 93 C1 00 08 */ stw r30, 8(r1) -/* 802D975C 002D669C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D9760 002D66A0 7C 9F 23 78 */ mr r31, r4 -/* 802D9764 002D66A4 41 82 00 64 */ beq lbl_802D97C8 -/* 802D9768 002D66A8 3C 80 80 3D */ lis r4, lbl_803CC438@ha -/* 802D976C 002D66AC 38 04 C4 38 */ addi r0, r4, lbl_803CC438@l -/* 802D9770 002D66B0 90 1E 00 00 */ stw r0, 0(r30) -/* 802D9774 002D66B4 81 83 00 00 */ lwz r12, 0(r3) -/* 802D9778 002D66B8 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802D977C 002D66BC 7D 89 03 A6 */ mtctr r12 -/* 802D9780 002D66C0 4E 80 04 21 */ bctrl -/* 802D9784 002D66C4 34 1E 00 E4 */ addic. r0, r30, 0xe4 -/* 802D9788 002D66C8 41 82 00 10 */ beq lbl_802D9798 -/* 802D978C 002D66CC 38 7E 00 E4 */ addi r3, r30, 0xe4 -/* 802D9790 002D66D0 38 80 00 00 */ li r4, 0 -/* 802D9794 002D66D4 48 00 26 81 */ bl __dt__10JSUPtrLinkFv -lbl_802D9798: -/* 802D9798 002D66D8 28 1E 00 00 */ cmplwi r30, 0 -/* 802D979C 002D66DC 41 82 00 1C */ beq lbl_802D97B8 -/* 802D97A0 002D66E0 3C 60 80 3D */ lis r3, lbl_803CC328@ha -/* 802D97A4 002D66E4 38 03 C3 28 */ addi r0, r3, lbl_803CC328@l -/* 802D97A8 002D66E8 90 1E 00 00 */ stw r0, 0(r30) -/* 802D97AC 002D66EC 7F C3 F3 78 */ mr r3, r30 -/* 802D97B0 002D66F0 38 80 00 00 */ li r4, 0 -/* 802D97B4 002D66F4 4B FF 7D 31 */ bl __dt__11JKRDisposerFv -lbl_802D97B8: -/* 802D97B8 002D66F8 7F E0 07 35 */ extsh. r0, r31 -/* 802D97BC 002D66FC 40 81 00 0C */ ble lbl_802D97C8 -/* 802D97C0 002D6700 7F C3 F3 78 */ mr r3, r30 -/* 802D97C4 002D6704 4B FF 55 79 */ bl __dl__FPv -lbl_802D97C8: -/* 802D97C8 002D6708 7F C3 F3 78 */ mr r3, r30 -/* 802D97CC 002D670C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D97D0 002D6710 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D97D4 002D6714 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D97D8 002D6718 7C 08 03 A6 */ mtlr r0 -/* 802D97DC 002D671C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D97E0 002D6720 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D97E4.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D97E4.s deleted file mode 100644 index 901cb8432d..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D97E4.s +++ /dev/null @@ -1,29 +0,0 @@ -/* initiate__10JKRDvdFileFv __ct__10JKRDvdFileFv::initiate(void) */ -/* JKRDvdFile_NS_initiate */ -/* 802D97E4 002D6724 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D97E8 002D6728 7C 08 02 A6 */ mflr r0 -/* 802D97EC 002D672C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D97F0 002D6730 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D97F4 002D6734 7C 7F 1B 78 */ mr r31, r3 -/* 802D97F8 002D6738 93 E3 00 98 */ stw r31, 0x98(r3) -/* 802D97FC 002D673C 38 7F 00 1C */ addi r3, r31, 0x1c -/* 802D9800 002D6740 48 06 58 09 */ bl OSInitMutex -/* 802D9804 002D6744 38 7F 00 34 */ addi r3, r31, 0x34 -/* 802D9808 002D6748 48 06 58 01 */ bl OSInitMutex -/* 802D980C 002D674C 38 7F 00 C0 */ addi r3, r31, 0xc0 -/* 802D9810 002D6750 38 9F 00 E0 */ addi r4, r31, 0xe0 -/* 802D9814 002D6754 38 A0 00 01 */ li r5, 1 -/* 802D9818 002D6758 48 06 51 7D */ bl OSInitMessageQueue -/* 802D981C 002D675C 38 7F 00 9C */ addi r3, r31, 0x9c -/* 802D9820 002D6760 38 9F 00 BC */ addi r4, r31, 0xbc -/* 802D9824 002D6764 38 A0 00 01 */ li r5, 1 -/* 802D9828 002D6768 48 06 51 6D */ bl OSInitMessageQueue -/* 802D982C 002D676C 38 00 00 00 */ li r0, 0 -/* 802D9830 002D6770 90 1F 00 F4 */ stw r0, 0xf4(r31) -/* 802D9834 002D6774 90 1F 00 50 */ stw r0, 0x50(r31) -/* 802D9838 002D6778 90 1F 00 58 */ stw r0, 0x58(r31) -/* 802D983C 002D677C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D9840 002D6780 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D9844 002D6784 7C 08 03 A6 */ mtlr r0 -/* 802D9848 002D6788 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D984C 002D678C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9850.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9850.s deleted file mode 100644 index 5e0ec55423..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9850.s +++ /dev/null @@ -1,32 +0,0 @@ -/* open__10JKRDvdFileFPCc __ct__10JKRDvdFileFv::open(char const *) */ -/* JKRDvdFile_NS_open */ -/* 802D9850 002D6790 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D9854 002D6794 7C 08 02 A6 */ mflr r0 -/* 802D9858 002D6798 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D985C 002D679C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D9860 002D67A0 7C 7F 1B 78 */ mr r31, r3 -/* 802D9864 002D67A4 88 03 00 18 */ lbz r0, 0x18(r3) -/* 802D9868 002D67A8 28 00 00 00 */ cmplwi r0, 0 -/* 802D986C 002D67AC 40 82 00 40 */ bne lbl_802D98AC -/* 802D9870 002D67B0 7C 83 23 78 */ mr r3, r4 -/* 802D9874 002D67B4 38 9F 00 5C */ addi r4, r31, 0x5c -/* 802D9878 002D67B8 48 06 F0 19 */ bl DVDOpen -/* 802D987C 002D67BC 30 03 FF FF */ addic r0, r3, -1 -/* 802D9880 002D67C0 7C 00 19 10 */ subfe r0, r0, r3 -/* 802D9884 002D67C4 98 1F 00 18 */ stb r0, 0x18(r31) -/* 802D9888 002D67C8 88 1F 00 18 */ lbz r0, 0x18(r31) -/* 802D988C 002D67CC 28 00 00 00 */ cmplwi r0, 0 -/* 802D9890 002D67D0 41 82 00 1C */ beq lbl_802D98AC -/* 802D9894 002D67D4 3C 60 80 43 */ lis r3, sDvdList__10JKRDvdFile@ha -/* 802D9898 002D67D8 38 63 43 6C */ addi r3, r3, sDvdList__10JKRDvdFile@l -/* 802D989C 002D67DC 38 9F 00 E4 */ addi r4, r31, 0xe4 -/* 802D98A0 002D67E0 48 00 26 AD */ bl append__10JSUPtrListFP10JSUPtrLink -/* 802D98A4 002D67E4 38 7F 00 5C */ addi r3, r31, 0x5c -/* 802D98A8 002D67E8 48 07 18 D5 */ bl DVDGetCommandBlockStatus -lbl_802D98AC: -/* 802D98AC 002D67EC 88 7F 00 18 */ lbz r3, 0x18(r31) -/* 802D98B0 002D67F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D98B4 002D67F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D98B8 002D67F8 7C 08 03 A6 */ mtlr r0 -/* 802D98BC 002D67FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D98C0 002D6800 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D98C4.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D98C4.s deleted file mode 100644 index 7bda2273f6..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D98C4.s +++ /dev/null @@ -1,32 +0,0 @@ -/* open__10JKRDvdFileFl __ct__10JKRDvdFileFv::open(long) */ -/* JKRDvdFile_NS_open_X1_ */ -/* 802D98C4 002D6804 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D98C8 002D6808 7C 08 02 A6 */ mflr r0 -/* 802D98CC 002D680C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D98D0 002D6810 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D98D4 002D6814 7C 7F 1B 78 */ mr r31, r3 -/* 802D98D8 002D6818 88 03 00 18 */ lbz r0, 0x18(r3) -/* 802D98DC 002D681C 28 00 00 00 */ cmplwi r0, 0 -/* 802D98E0 002D6820 40 82 00 40 */ bne lbl_802D9920 -/* 802D98E4 002D6824 7C 83 23 78 */ mr r3, r4 -/* 802D98E8 002D6828 38 9F 00 5C */ addi r4, r31, 0x5c -/* 802D98EC 002D682C 48 06 EF 31 */ bl DVDFastOpen -/* 802D98F0 002D6830 30 03 FF FF */ addic r0, r3, -1 -/* 802D98F4 002D6834 7C 00 19 10 */ subfe r0, r0, r3 -/* 802D98F8 002D6838 98 1F 00 18 */ stb r0, 0x18(r31) -/* 802D98FC 002D683C 88 1F 00 18 */ lbz r0, 0x18(r31) -/* 802D9900 002D6840 28 00 00 00 */ cmplwi r0, 0 -/* 802D9904 002D6844 41 82 00 1C */ beq lbl_802D9920 -/* 802D9908 002D6848 3C 60 80 43 */ lis r3, sDvdList__10JKRDvdFile@ha -/* 802D990C 002D684C 38 63 43 6C */ addi r3, r3, sDvdList__10JKRDvdFile@l -/* 802D9910 002D6850 38 9F 00 E4 */ addi r4, r31, 0xe4 -/* 802D9914 002D6854 48 00 26 39 */ bl append__10JSUPtrListFP10JSUPtrLink -/* 802D9918 002D6858 38 7F 00 5C */ addi r3, r31, 0x5c -/* 802D991C 002D685C 48 07 18 61 */ bl DVDGetCommandBlockStatus -lbl_802D9920: -/* 802D9920 002D6860 88 7F 00 18 */ lbz r3, 0x18(r31) -/* 802D9924 002D6864 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D9928 002D6868 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D992C 002D686C 7C 08 03 A6 */ mtlr r0 -/* 802D9930 002D6870 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D9934 002D6874 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9938.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9938.s deleted file mode 100644 index 37034cae08..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9938.s +++ /dev/null @@ -1,35 +0,0 @@ -/* close__10JKRDvdFileFv __ct__10JKRDvdFileFv::close(void) */ -/* missing reference */ -/* 802D9938 002D6878 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D993C 002D687C 7C 08 02 A6 */ mflr r0 -/* 802D9940 002D6880 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D9944 002D6884 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D9948 002D6888 7C 7F 1B 78 */ mr r31, r3 -/* 802D994C 002D688C 88 03 00 18 */ lbz r0, 0x18(r3) -/* 802D9950 002D6890 28 00 00 00 */ cmplwi r0, 0 -/* 802D9954 002D6894 41 82 00 4C */ beq lbl_802D99A0 -/* 802D9958 002D6898 38 7F 00 5C */ addi r3, r31, 0x5c -/* 802D995C 002D689C 48 06 EF FD */ bl DVDClose -/* 802D9960 002D68A0 2C 03 00 00 */ cmpwi r3, 0 -/* 802D9964 002D68A4 41 82 00 20 */ beq lbl_802D9984 -/* 802D9968 002D68A8 38 00 00 00 */ li r0, 0 -/* 802D996C 002D68AC 98 1F 00 18 */ stb r0, 0x18(r31) -/* 802D9970 002D68B0 3C 60 80 43 */ lis r3, sDvdList__10JKRDvdFile@ha -/* 802D9974 002D68B4 38 63 43 6C */ addi r3, r3, sDvdList__10JKRDvdFile@l -/* 802D9978 002D68B8 38 9F 00 E4 */ addi r4, r31, 0xe4 -/* 802D997C 002D68BC 48 00 27 E1 */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802D9980 002D68C0 48 00 00 20 */ b lbl_802D99A0 -lbl_802D9984: -/* 802D9984 002D68C4 3C 60 80 3A */ lis r3, lbl_8039D260@ha -/* 802D9988 002D68C8 38 63 D2 60 */ addi r3, r3, lbl_8039D260@l -/* 802D998C 002D68CC 38 80 00 D5 */ li r4, 0xd5 -/* 802D9990 002D68D0 38 A3 00 0F */ addi r5, r3, 0xf -/* 802D9994 002D68D4 38 C3 00 12 */ addi r6, r3, 0x12 -/* 802D9998 002D68D8 4C C6 31 82 */ crclr 6 -/* 802D999C 002D68DC 48 00 88 61 */ bl JUTException_NS_panic_f -lbl_802D99A0: -/* 802D99A0 002D68E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D99A4 002D68E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D99A8 002D68E8 7C 08 03 A6 */ mtlr r0 -/* 802D99AC 002D68EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D99B0 002D68F0 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D99B4.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D99B4.s deleted file mode 100644 index 822963a64d..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D99B4.s +++ /dev/null @@ -1,50 +0,0 @@ -/* readData__10JKRDvdFileFPvll __ct__10JKRDvdFileFv::readData(void *, long, long) */ -/* missing reference */ -/* 802D99B4 002D68F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D99B8 002D68F8 7C 08 02 A6 */ mflr r0 -/* 802D99BC 002D68FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D99C0 002D6900 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D99C4 002D6904 48 08 88 11 */ bl _savegpr_27 -/* 802D99C8 002D6908 7C 7B 1B 78 */ mr r27, r3 -/* 802D99CC 002D690C 7C 9C 23 78 */ mr r28, r4 -/* 802D99D0 002D6910 7C BD 2B 78 */ mr r29, r5 -/* 802D99D4 002D6914 7C DE 33 78 */ mr r30, r6 -/* 802D99D8 002D6918 38 7B 00 1C */ addi r3, r27, 0x1c -/* 802D99DC 002D691C 48 06 56 65 */ bl OSLockMutex -/* 802D99E0 002D6920 80 1B 00 F4 */ lwz r0, 0xf4(r27) -/* 802D99E4 002D6924 28 00 00 00 */ cmplwi r0, 0 -/* 802D99E8 002D6928 41 82 00 14 */ beq lbl_802D99FC -/* 802D99EC 002D692C 38 7B 00 1C */ addi r3, r27, 0x1c -/* 802D99F0 002D6930 48 06 57 2D */ bl OSUnlockMutex -/* 802D99F4 002D6934 38 60 FF FF */ li r3, -1 -/* 802D99F8 002D6938 48 00 00 58 */ b lbl_802D9A50 -lbl_802D99FC: -/* 802D99FC 002D693C 48 06 72 89 */ bl OSGetCurrentThread -/* 802D9A00 002D6940 90 7B 00 F4 */ stw r3, 0xf4(r27) -/* 802D9A04 002D6944 3B E0 FF FF */ li r31, -1 -/* 802D9A08 002D6948 38 7B 00 5C */ addi r3, r27, 0x5c -/* 802D9A0C 002D694C 7F 84 E3 78 */ mr r4, r28 -/* 802D9A10 002D6950 7F A5 EB 78 */ mr r5, r29 -/* 802D9A14 002D6954 7F C6 F3 78 */ mr r6, r30 -/* 802D9A18 002D6958 3C E0 80 2E */ lis r7, doneProcess__10JKRDvdFileFlP11DVDFileInfo@ha -/* 802D9A1C 002D695C 38 E7 9A C4 */ addi r7, r7, doneProcess__10JKRDvdFileFlP11DVDFileInfo@l -/* 802D9A20 002D6960 39 00 00 02 */ li r8, 2 -/* 802D9A24 002D6964 48 06 F3 31 */ bl DVDReadAsyncPrio -/* 802D9A28 002D6968 2C 03 00 00 */ cmpwi r3, 0 -/* 802D9A2C 002D696C 41 82 00 10 */ beq lbl_802D9A3C -/* 802D9A30 002D6970 7F 63 DB 78 */ mr r3, r27 -/* 802D9A34 002D6974 48 00 00 3D */ bl sync__10JKRDvdFileFv -/* 802D9A38 002D6978 7C 7F 1B 78 */ mr r31, r3 -lbl_802D9A3C: -/* 802D9A3C 002D697C 38 00 00 00 */ li r0, 0 -/* 802D9A40 002D6980 90 1B 00 F4 */ stw r0, 0xf4(r27) -/* 802D9A44 002D6984 38 7B 00 1C */ addi r3, r27, 0x1c -/* 802D9A48 002D6988 48 06 56 D5 */ bl OSUnlockMutex -/* 802D9A4C 002D698C 7F E3 FB 78 */ mr r3, r31 -lbl_802D9A50: -/* 802D9A50 002D6990 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9A54 002D6994 48 08 87 CD */ bl _restgpr_27 -/* 802D9A58 002D6998 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D9A5C 002D699C 7C 08 03 A6 */ mtlr r0 -/* 802D9A60 002D69A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D9A64 002D69A4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9A68.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9A68.s deleted file mode 100644 index 1e35c07436..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9A68.s +++ /dev/null @@ -1,4 +0,0 @@ -/* writeData__10JKRDvdFileFPCvll __ct__10JKRDvdFileFv::writeData(void const *, long, long) */ -/* missing reference */ -/* 802D9A68 002D69A8 38 60 FF FF */ li r3, -1 -/* 802D9A6C 002D69AC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9A70.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9A70.s deleted file mode 100644 index 5ec41f84a9..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9A70.s +++ /dev/null @@ -1,23 +0,0 @@ -/* sync__10JKRDvdFileFv __ct__10JKRDvdFileFv::sync(void) */ -/* JKRDvdFile_NS_sync */ -/* 802D9A70 002D69B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D9A74 002D69B4 7C 08 02 A6 */ mflr r0 -/* 802D9A78 002D69B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D9A7C 002D69BC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802D9A80 002D69C0 7C 7F 1B 78 */ mr r31, r3 -/* 802D9A84 002D69C4 38 7F 00 1C */ addi r3, r31, 0x1c -/* 802D9A88 002D69C8 48 06 55 B9 */ bl OSLockMutex -/* 802D9A8C 002D69CC 38 7F 00 C0 */ addi r3, r31, 0xc0 -/* 802D9A90 002D69D0 38 81 00 08 */ addi r4, r1, 8 -/* 802D9A94 002D69D4 38 A0 00 01 */ li r5, 1 -/* 802D9A98 002D69D8 48 06 50 25 */ bl OSReceiveMessage -/* 802D9A9C 002D69DC 38 00 00 00 */ li r0, 0 -/* 802D9AA0 002D69E0 90 1F 00 F4 */ stw r0, 0xf4(r31) -/* 802D9AA4 002D69E4 38 7F 00 1C */ addi r3, r31, 0x1c -/* 802D9AA8 002D69E8 48 06 56 75 */ bl OSUnlockMutex -/* 802D9AAC 002D69EC 80 61 00 08 */ lwz r3, 8(r1) -/* 802D9AB0 002D69F0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802D9AB4 002D69F4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D9AB8 002D69F8 7C 08 03 A6 */ mtlr r0 -/* 802D9ABC 002D69FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D9AC0 002D6A00 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9AC4.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9AC4.s deleted file mode 100644 index 3d00b96265..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9AC4.s +++ /dev/null @@ -1,15 +0,0 @@ -/* doneProcess__10JKRDvdFileFlP11DVDFileInfo __ct__10JKRDvdFileFv::doneProcess(long, DVDFileInfo *) */ -/* JKRDvdFile_NS_doneProcess */ -/* 802D9AC4 002D6A04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D9AC8 002D6A08 7C 08 02 A6 */ mflr r0 -/* 802D9ACC 002D6A0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D9AD0 002D6A10 7C 60 1B 78 */ mr r0, r3 -/* 802D9AD4 002D6A14 80 64 00 3C */ lwz r3, 0x3c(r4) -/* 802D9AD8 002D6A18 38 63 00 C0 */ addi r3, r3, 0xc0 -/* 802D9ADC 002D6A1C 7C 04 03 78 */ mr r4, r0 -/* 802D9AE0 002D6A20 38 A0 00 00 */ li r5, 0 -/* 802D9AE4 002D6A24 48 06 4F 11 */ bl OSSendMessage -/* 802D9AE8 002D6A28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D9AEC 002D6A2C 7C 08 03 A6 */ mtlr r0 -/* 802D9AF0 002D6A30 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D9AF4 002D6A34 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9AF8.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9AF8.s deleted file mode 100644 index 59bb0f5999..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9AF8.s +++ /dev/null @@ -1,4 +0,0 @@ -/* getFileSize__10JKRDvdFileCFv __ct__10JKRDvdFileFv::getFileSize( const(void)) */ -/* missing reference */ -/* 802D9AF8 002D6A38 80 63 00 90 */ lwz r3, 0x90(r3) -/* 802D9AFC 002D6A3C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9B00.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9B00.s deleted file mode 100644 index 1b577014a9..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9B00.s +++ /dev/null @@ -1,19 +0,0 @@ -/* __sinit_JKRDvdFile_cpp __sinit_JKRDvdFile_cpp */ -/* missing reference */ -/* 802D9B00 002D6A40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D9B04 002D6A44 7C 08 02 A6 */ mflr r0 -/* 802D9B08 002D6A48 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D9B0C 002D6A4C 3C 60 80 43 */ lis r3, sDvdList__10JKRDvdFile@ha -/* 802D9B10 002D6A50 38 63 43 6C */ addi r3, r3, sDvdList__10JKRDvdFile@l -/* 802D9B14 002D6A54 48 00 24 01 */ bl initiate__10JSUPtrListFv -/* 802D9B18 002D6A58 3C 60 80 43 */ lis r3, sDvdList__10JKRDvdFile@ha -/* 802D9B1C 002D6A5C 38 63 43 6C */ addi r3, r3, sDvdList__10JKRDvdFile@l -/* 802D9B20 002D6A60 3C 80 80 2E */ lis r4, JSUList_NS_dtor_X7_@ha -/* 802D9B24 002D6A64 38 84 9B 44 */ addi r4, r4, JSUList_NS_dtor_X7_@l -/* 802D9B28 002D6A68 3C A0 80 43 */ lis r5, lbl_80434360@ha -/* 802D9B2C 002D6A6C 38 A5 43 60 */ addi r5, r5, lbl_80434360@l -/* 802D9B30 002D6A70 48 08 80 F5 */ bl func_80361C24 -/* 802D9B34 002D6A74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D9B38 002D6A78 7C 08 03 A6 */ mtlr r0 -/* 802D9B3C 002D6A7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D9B40 002D6A80 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9B44.s b/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9B44.s deleted file mode 100644 index 5d3dd16d5b..0000000000 --- a/include/JSystem/JKernel/JKRDvdFile/asm/func_802D9B44.s +++ /dev/null @@ -1,24 +0,0 @@ -/* __dt__21JSUList<10JKRDvdFile>Fv JSUList<10JKRDvdFile>::__dt(void) */ -/* JSUList_NS_dtor_X7_ */ -/* 802D9B44 002D6A84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D9B48 002D6A88 7C 08 02 A6 */ mflr r0 -/* 802D9B4C 002D6A8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D9B50 002D6A90 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D9B54 002D6A94 93 C1 00 08 */ stw r30, 8(r1) -/* 802D9B58 002D6A98 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D9B5C 002D6A9C 7C 9F 23 78 */ mr r31, r4 -/* 802D9B60 002D6AA0 41 82 00 1C */ beq lbl_802D9B7C -/* 802D9B64 002D6AA4 38 80 00 00 */ li r4, 0 -/* 802D9B68 002D6AA8 48 00 23 45 */ bl __dt__10JSUPtrListFv -/* 802D9B6C 002D6AAC 7F E0 07 35 */ extsh. r0, r31 -/* 802D9B70 002D6AB0 40 81 00 0C */ ble lbl_802D9B7C -/* 802D9B74 002D6AB4 7F C3 F3 78 */ mr r3, r30 -/* 802D9B78 002D6AB8 4B FF 51 C5 */ bl __dl__FPv -lbl_802D9B7C: -/* 802D9B7C 002D6ABC 7F C3 F3 78 */ mr r3, r30 -/* 802D9B80 002D6AC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D9B84 002D6AC4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D9B88 002D6AC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D9B8C 002D6ACC 7C 08 03 A6 */ mtlr r0 -/* 802D9B90 002D6AD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D9B94 002D6AD4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA7DC.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA7DC.s deleted file mode 100644 index 02ee4b465a..0000000000 --- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA7DC.s +++ /dev/null @@ -1,19 +0,0 @@ -/* __sinit_JKRDvdRipper_cpp __sinit_JKRDvdRipper_cpp */ -/* missing reference */ -/* 802DA7DC 002D771C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DA7E0 002D7720 7C 08 02 A6 */ mflr r0 -/* 802DA7E4 002D7724 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DA7E8 002D7728 3C 60 80 43 */ lis r3, lbl_80434384@ha -/* 802DA7EC 002D772C 38 63 43 84 */ addi r3, r3, lbl_80434384@l -/* 802DA7F0 002D7730 48 00 17 25 */ bl initiate__10JSUPtrListFv -/* 802DA7F4 002D7734 3C 60 80 43 */ lis r3, lbl_80434384@ha -/* 802DA7F8 002D7738 38 63 43 84 */ addi r3, r3, lbl_80434384@l -/* 802DA7FC 002D773C 3C 80 80 2E */ lis r4, JSUList_NS_dtor_X8_@ha -/* 802DA800 002D7740 38 84 A8 20 */ addi r4, r4, JSUList_NS_dtor_X8_@l -/* 802DA804 002D7744 3C A0 80 43 */ lis r5, lbl_80434378@ha -/* 802DA808 002D7748 38 A5 43 78 */ addi r5, r5, lbl_80434378@l -/* 802DA80C 002D774C 48 08 74 19 */ bl func_80361C24 -/* 802DA810 002D7750 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DA814 002D7754 7C 08 03 A6 */ mtlr r0 -/* 802DA818 002D7758 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DA81C 002D775C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA820.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA820.s deleted file mode 100644 index 58fef44165..0000000000 --- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA820.s +++ /dev/null @@ -1,24 +0,0 @@ -/* __dt__23JSUList<12JKRDMCommand>Fv JSUList<12JKRDMCommand>::__dt(void) */ -/* JSUList_NS_dtor_X8_ */ -/* 802DA820 002D7760 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DA824 002D7764 7C 08 02 A6 */ mflr r0 -/* 802DA828 002D7768 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DA82C 002D776C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DA830 002D7770 93 C1 00 08 */ stw r30, 8(r1) -/* 802DA834 002D7774 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802DA838 002D7778 7C 9F 23 78 */ mr r31, r4 -/* 802DA83C 002D777C 41 82 00 1C */ beq lbl_802DA858 -/* 802DA840 002D7780 38 80 00 00 */ li r4, 0 -/* 802DA844 002D7784 48 00 16 69 */ bl __dt__10JSUPtrListFv -/* 802DA848 002D7788 7F E0 07 35 */ extsh. r0, r31 -/* 802DA84C 002D778C 40 81 00 0C */ ble lbl_802DA858 -/* 802DA850 002D7790 7F C3 F3 78 */ mr r3, r30 -/* 802DA854 002D7794 4B FF 44 E9 */ bl __dl__FPv -lbl_802DA858: -/* 802DA858 002D7798 7F C3 F3 78 */ mr r3, r30 -/* 802DA85C 002D779C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DA860 002D77A0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802DA864 002D77A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DA868 002D77A8 7C 08 03 A6 */ mtlr r0 -/* 802DA86C 002D77AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DA870 002D77B0 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFile/asm/func_802D9518.s b/include/JSystem/JKernel/JKRFile/asm/func_802D9518.s deleted file mode 100644 index e992b76634..0000000000 --- a/include/JSystem/JKernel/JKRFile/asm/func_802D9518.s +++ /dev/null @@ -1,31 +0,0 @@ -/* read__7JKRFileFPvll JKRFile::read(void *, long, long) */ -/* JKRFile_NS_read */ -/* 802D9518 002D6458 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D951C 002D645C 7C 08 02 A6 */ mflr r0 -/* 802D9520 002D6460 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D9524 002D6464 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9528 002D6468 48 08 8C B1 */ bl _savegpr_28 -/* 802D952C 002D646C 7C 7C 1B 78 */ mr r28, r3 -/* 802D9530 002D6470 7C 9D 23 78 */ mr r29, r4 -/* 802D9534 002D6474 7C BE 2B 78 */ mr r30, r5 -/* 802D9538 002D6478 7C DF 33 78 */ mr r31, r6 -lbl_802D953C: -/* 802D953C 002D647C 7F 83 E3 78 */ mr r3, r28 -/* 802D9540 002D6480 7F A4 EB 78 */ mr r4, r29 -/* 802D9544 002D6484 7F C5 F3 78 */ mr r5, r30 -/* 802D9548 002D6488 7F E6 FB 78 */ mr r6, r31 -/* 802D954C 002D648C 81 9C 00 00 */ lwz r12, 0(r28) -/* 802D9550 002D6490 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802D9554 002D6494 7D 89 03 A6 */ mtctr r12 -/* 802D9558 002D6498 4E 80 04 21 */ bctrl -/* 802D955C 002D649C 7C 1E 18 00 */ cmpw r30, r3 -/* 802D9560 002D64A0 41 82 00 0C */ beq lbl_802D956C -/* 802D9564 002D64A4 48 07 34 61 */ bl VIWaitForRetrace -/* 802D9568 002D64A8 4B FF FF D4 */ b lbl_802D953C -lbl_802D956C: -/* 802D956C 002D64AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9570 002D64B0 48 08 8C B5 */ bl _restgpr_28 -/* 802D9574 002D64B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D9578 002D64B8 7C 08 03 A6 */ mtlr r0 -/* 802D957C 002D64BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D9580 002D64C0 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D49B4.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D49B4.s deleted file mode 100644 index 13e1b5cd16..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D49B4.s +++ /dev/null @@ -1,73 +0,0 @@ - -/* 802D49B4 002D18F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D49B8 002D18F8 7C 08 02 A6 */ mflr r0 -/* 802D49BC 002D18FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D49C0 002D1900 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D49C4 002D1904 48 08 D8 11 */ bl _savegpr_27 -/* 802D49C8 002D1908 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D49CC 002D190C 7C 9B 23 78 */ mr r27, r4 -/* 802D49D0 002D1910 7C BF 2B 78 */ mr r31, r5 -/* 802D49D4 002D1914 41 82 00 10 */ beq lbl_802D49E4 -/* 802D49D8 002D1918 88 1E 00 00 */ lbz r0, 0(r30) -/* 802D49DC 002D191C 2C 00 00 2F */ cmpwi r0, 0x2f -/* 802D49E0 002D1920 41 82 00 0C */ beq lbl_802D49EC -lbl_802D49E4: -/* 802D49E4 002D1924 38 60 00 00 */ li r3, 0 -/* 802D49E8 002D1928 48 00 00 B4 */ b lbl_802D4A9C -lbl_802D49EC: -/* 802D49EC 002D192C 48 09 41 F9 */ bl strlen -/* 802D49F0 002D1930 28 03 00 01 */ cmplwi r3, 1 -/* 802D49F4 002D1934 41 82 00 1C */ beq lbl_802D4A10 -/* 802D49F8 002D1938 7C 7E 1A 14 */ add r3, r30, r3 -/* 802D49FC 002D193C 88 03 FF FF */ lbz r0, -1(r3) -/* 802D4A00 002D1940 2C 00 00 2F */ cmpwi r0, 0x2f -/* 802D4A04 002D1944 40 82 00 0C */ bne lbl_802D4A10 -/* 802D4A08 002D1948 38 60 00 00 */ li r3, 0 -/* 802D4A0C 002D194C 48 00 00 90 */ b lbl_802D4A9C -lbl_802D4A10: -/* 802D4A10 002D1950 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D4A14 002D1954 83 A3 43 54 */ lwz r29, sVolumeList__13JKRFileLoader@l(r3) -/* 802D4A18 002D1958 48 00 00 50 */ b lbl_802D4A68 -lbl_802D4A1C: -/* 802D4A1C 002D195C 80 9D 00 00 */ lwz r4, 0(r29) -/* 802D4A20 002D1960 80 64 00 2C */ lwz r3, 0x2c(r4) -/* 802D4A24 002D1964 3C 03 BC BF */ addis r0, r3, 0xbcbf -/* 802D4A28 002D1968 28 00 53 48 */ cmplwi r0, 0x5348 -/* 802D4A2C 002D196C 40 82 00 38 */ bne lbl_802D4A64 -/* 802D4A30 002D1970 7C 9C 23 78 */ mr r28, r4 -/* 802D4A34 002D1974 80 64 00 48 */ lwz r3, 0x48(r4) -/* 802D4A38 002D1978 28 03 00 00 */ cmplwi r3, 0 -/* 802D4A3C 002D197C 41 82 00 28 */ beq lbl_802D4A64 -/* 802D4A40 002D1980 7F C4 F3 78 */ mr r4, r30 -/* 802D4A44 002D1984 48 09 3F 51 */ bl strcmp -/* 802D4A48 002D1988 2C 03 00 00 */ cmpwi r3, 0 -/* 802D4A4C 002D198C 40 82 00 18 */ bne lbl_802D4A64 -/* 802D4A50 002D1990 80 7C 00 34 */ lwz r3, 0x34(r28) -/* 802D4A54 002D1994 38 03 00 01 */ addi r0, r3, 1 -/* 802D4A58 002D1998 90 1C 00 34 */ stw r0, 0x34(r28) -/* 802D4A5C 002D199C 7F 83 E3 78 */ mr r3, r28 -/* 802D4A60 002D19A0 48 00 00 3C */ b lbl_802D4A9C -lbl_802D4A64: -/* 802D4A64 002D19A4 83 BD 00 0C */ lwz r29, 0xc(r29) -lbl_802D4A68: -/* 802D4A68 002D19A8 28 1D 00 00 */ cmplwi r29, 0 -/* 802D4A6C 002D19AC 40 82 FF B0 */ bne lbl_802D4A1C -/* 802D4A70 002D19B0 38 60 00 54 */ li r3, 0x54 -/* 802D4A74 002D19B4 7F 64 DB 78 */ mr r4, r27 -/* 802D4A78 002D19B8 38 A0 00 00 */ li r5, 0 -/* 802D4A7C 002D19BC 4B FF A2 1D */ bl __nw__FUlP7JKRHeapi -/* 802D4A80 002D19C0 7C 60 1B 79 */ or. r0, r3, r3 -/* 802D4A84 002D19C4 41 82 00 14 */ beq lbl_802D4A98 -/* 802D4A88 002D19C8 7F C4 F3 78 */ mr r4, r30 -/* 802D4A8C 002D19CC 7F E5 FB 78 */ mr r5, r31 -/* 802D4A90 002D19D0 48 00 00 25 */ bl __ct__12JKRFileCacheFPCcPCc -/* 802D4A94 002D19D4 7C 60 1B 78 */ mr r0, r3 -lbl_802D4A98: -/* 802D4A98 002D19D8 7C 03 03 78 */ mr r3, r0 -lbl_802D4A9C: -/* 802D4A9C 002D19DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D4AA0 002D19E0 48 08 D7 81 */ bl _restgpr_27 -/* 802D4AA4 002D19E4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D4AA8 002D19E8 7C 08 03 A6 */ mtlr r0 -/* 802D4AAC 002D19EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D4AB0 002D19F0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D4AB4.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D4AB4.s deleted file mode 100644 index 85c2eef7d7..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D4AB4.s +++ /dev/null @@ -1,117 +0,0 @@ -/* __ct__12JKRFileCacheFPCcPCc __ct__12JKRFileCacheFPCcPCc::__ct(char const *, char const *) */ -/* JKRFileCache */ -/* 802D4AB4 002D19F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D4AB8 002D19F8 7C 08 02 A6 */ mflr r0 -/* 802D4ABC 002D19FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D4AC0 002D1A00 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D4AC4 002D1A04 48 08 D7 15 */ bl _savegpr_28 -/* 802D4AC8 002D1A08 7C 7F 1B 78 */ mr r31, r3 -/* 802D4ACC 002D1A0C 7C 9C 23 78 */ mr r28, r4 -/* 802D4AD0 002D1A10 7C BD 2B 78 */ mr r29, r5 -/* 802D4AD4 002D1A14 4B FF F6 1D */ bl __ct__13JKRFileLoaderFv -/* 802D4AD8 002D1A18 3C 60 80 3D */ lis r3, lbl_803CC238@ha -/* 802D4ADC 002D1A1C 38 03 C2 38 */ addi r0, r3, lbl_803CC238@l -/* 802D4AE0 002D1A20 90 1F 00 00 */ stw r0, 0(r31) -/* 802D4AE4 002D1A24 38 7F 00 3C */ addi r3, r31, 0x3c -/* 802D4AE8 002D1A28 48 00 74 2D */ bl initiate__10JSUPtrListFv -/* 802D4AEC 002D1A2C 7F E3 FB 78 */ mr r3, r31 -/* 802D4AF0 002D1A30 4B FF 9D 4D */ bl findFromRoot__7JKRHeapFPv -/* 802D4AF4 002D1A34 90 7F 00 38 */ stw r3, 0x38(r31) -/* 802D4AF8 002D1A38 38 00 00 01 */ li r0, 1 -/* 802D4AFC 002D1A3C 90 1F 00 34 */ stw r0, 0x34(r31) -/* 802D4B00 002D1A40 3C 60 43 41 */ lis r3, 0x43415348@ha -/* 802D4B04 002D1A44 38 03 53 48 */ addi r0, r3, 0x43415348@l -/* 802D4B08 002D1A48 90 1F 00 2C */ stw r0, 0x2c(r31) -/* 802D4B0C 002D1A4C 7F 83 E3 78 */ mr r3, r28 -/* 802D4B10 002D1A50 48 09 40 D5 */ bl strlen -/* 802D4B14 002D1A54 7C 7E 1B 78 */ mr r30, r3 -/* 802D4B18 002D1A58 38 7E 00 01 */ addi r3, r30, 1 -/* 802D4B1C 002D1A5C 38 80 00 01 */ li r4, 1 -/* 802D4B20 002D1A60 80 BF 00 38 */ lwz r5, 0x38(r31) -/* 802D4B24 002D1A64 4B FF 99 51 */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802D4B28 002D1A68 90 7F 00 48 */ stw r3, 0x48(r31) -/* 802D4B2C 002D1A6C 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D4B30 002D1A70 38 9E 00 02 */ addi r4, r30, 2 -/* 802D4B34 002D1A74 38 A0 00 01 */ li r5, 1 -/* 802D4B38 002D1A78 4B FF 99 9D */ bl alloc__7JKRHeapFUli -/* 802D4B3C 002D1A7C 90 7F 00 4C */ stw r3, 0x4c(r31) -/* 802D4B40 002D1A80 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 802D4B44 002D1A84 7F 84 E3 78 */ mr r4, r28 -/* 802D4B48 002D1A88 48 09 3F E5 */ bl strcpy -/* 802D4B4C 002D1A8C 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 802D4B50 002D1A90 7F 84 E3 78 */ mr r4, r28 -/* 802D4B54 002D1A94 48 09 3F D9 */ bl strcpy -/* 802D4B58 002D1A98 88 1C 00 01 */ lbz r0, 1(r28) -/* 802D4B5C 002D1A9C 7C 00 07 75 */ extsb. r0, r0 -/* 802D4B60 002D1AA0 41 82 00 88 */ beq lbl_802D4BE8 -/* 802D4B64 002D1AA4 7F E3 FB 78 */ mr r3, r31 -/* 802D4B68 002D1AA8 80 9F 00 48 */ lwz r4, 0x48(r31) -/* 802D4B6C 002D1AAC 48 00 0A B9 */ bl convStrLower__12JKRFileCacheCFPc -/* 802D4B70 002D1AB0 7F E3 FB 78 */ mr r3, r31 -/* 802D4B74 002D1AB4 80 9F 00 4C */ lwz r4, 0x4c(r31) -/* 802D4B78 002D1AB8 48 00 0A AD */ bl convStrLower__12JKRFileCacheCFPc -/* 802D4B7C 002D1ABC 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 802D4B80 002D1AC0 3C 80 80 3A */ lis r4, lbl_8039D158@ha -/* 802D4B84 002D1AC4 38 84 D1 58 */ addi r4, r4, lbl_8039D158@l -/* 802D4B88 002D1AC8 48 09 3F 35 */ bl strcat -/* 802D4B8C 002D1ACC 7F BE EB 78 */ mr r30, r29 -/* 802D4B90 002D1AD0 28 1D 00 00 */ cmplwi r29, 0 -/* 802D4B94 002D1AD4 40 82 00 14 */ bne lbl_802D4BA8 -/* 802D4B98 002D1AD8 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 802D4B9C 002D1ADC 38 80 00 2F */ li r4, 0x2f -/* 802D4BA0 002D1AE0 48 09 3D 3D */ bl strrchr -/* 802D4BA4 002D1AE4 3B C3 00 01 */ addi r30, r3, 1 -lbl_802D4BA8: -/* 802D4BA8 002D1AE8 7F C3 F3 78 */ mr r3, r30 -/* 802D4BAC 002D1AEC 48 09 40 39 */ bl strlen -/* 802D4BB0 002D1AF0 38 83 00 01 */ addi r4, r3, 1 -/* 802D4BB4 002D1AF4 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D4BB8 002D1AF8 38 A0 00 00 */ li r5, 0 -/* 802D4BBC 002D1AFC 4B FF 99 19 */ bl alloc__7JKRHeapFUli -/* 802D4BC0 002D1B00 90 7F 00 50 */ stw r3, 0x50(r31) -/* 802D4BC4 002D1B04 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 802D4BC8 002D1B08 7F C4 F3 78 */ mr r4, r30 -/* 802D4BCC 002D1B0C 48 09 3F 61 */ bl strcpy -/* 802D4BD0 002D1B10 7F E3 FB 78 */ mr r3, r31 -/* 802D4BD4 002D1B14 80 9F 00 50 */ lwz r4, 0x50(r31) -/* 802D4BD8 002D1B18 48 00 0A 4D */ bl convStrLower__12JKRFileCacheCFPc -/* 802D4BDC 002D1B1C 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 802D4BE0 002D1B20 90 1F 00 28 */ stw r0, 0x28(r31) -/* 802D4BE4 002D1B24 48 00 00 58 */ b lbl_802D4C3C -lbl_802D4BE8: -/* 802D4BE8 002D1B28 7F BE EB 78 */ mr r30, r29 -/* 802D4BEC 002D1B2C 28 1D 00 00 */ cmplwi r29, 0 -/* 802D4BF0 002D1B30 40 82 00 10 */ bne lbl_802D4C00 -/* 802D4BF4 002D1B34 3C 60 80 3A */ lis r3, lbl_8039D158@ha -/* 802D4BF8 002D1B38 38 63 D1 58 */ addi r3, r3, lbl_8039D158@l -/* 802D4BFC 002D1B3C 3B C3 00 02 */ addi r30, r3, 2 -lbl_802D4C00: -/* 802D4C00 002D1B40 7F C3 F3 78 */ mr r3, r30 -/* 802D4C04 002D1B44 48 09 3F E1 */ bl strlen -/* 802D4C08 002D1B48 38 83 00 01 */ addi r4, r3, 1 -/* 802D4C0C 002D1B4C 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D4C10 002D1B50 38 A0 00 00 */ li r5, 0 -/* 802D4C14 002D1B54 4B FF 98 C1 */ bl alloc__7JKRHeapFUli -/* 802D4C18 002D1B58 90 7F 00 50 */ stw r3, 0x50(r31) -/* 802D4C1C 002D1B5C 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 802D4C20 002D1B60 7F C4 F3 78 */ mr r4, r30 -/* 802D4C24 002D1B64 48 09 3F 09 */ bl strcpy -/* 802D4C28 002D1B68 7F E3 FB 78 */ mr r3, r31 -/* 802D4C2C 002D1B6C 80 9F 00 50 */ lwz r4, 0x50(r31) -/* 802D4C30 002D1B70 48 00 09 F5 */ bl convStrLower__12JKRFileCacheCFPc -/* 802D4C34 002D1B74 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 802D4C38 002D1B78 90 1F 00 28 */ stw r0, 0x28(r31) -lbl_802D4C3C: -/* 802D4C3C 002D1B7C 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D4C40 002D1B80 38 63 43 54 */ addi r3, r3, sVolumeList__13JKRFileLoader@l -/* 802D4C44 002D1B84 38 9F 00 18 */ addi r4, r31, 0x18 -/* 802D4C48 002D1B88 48 00 73 A9 */ bl prepend__10JSUPtrListFP10JSUPtrLink -/* 802D4C4C 002D1B8C 38 00 00 01 */ li r0, 1 -/* 802D4C50 002D1B90 98 1F 00 30 */ stb r0, 0x30(r31) -/* 802D4C54 002D1B94 7F E3 FB 78 */ mr r3, r31 -/* 802D4C58 002D1B98 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D4C5C 002D1B9C 48 08 D5 C9 */ bl _restgpr_28 -/* 802D4C60 002D1BA0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D4C64 002D1BA4 7C 08 03 A6 */ mtlr r0 -/* 802D4C68 002D1BA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D4C6C 002D1BAC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D4C70.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D4C70.s deleted file mode 100644 index 2dd1d1f739..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D4C70.s +++ /dev/null @@ -1,60 +0,0 @@ -/* __dt__12JKRFileCacheFv __ct__12JKRFileCacheFPCcPCc::__dt(void) */ -/* missing reference */ -/* 802D4C70 002D1BB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D4C74 002D1BB4 7C 08 02 A6 */ mflr r0 -/* 802D4C78 002D1BB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D4C7C 002D1BBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D4C80 002D1BC0 93 C1 00 08 */ stw r30, 8(r1) -/* 802D4C84 002D1BC4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D4C88 002D1BC8 7C 9F 23 78 */ mr r31, r4 -/* 802D4C8C 002D1BCC 41 82 00 9C */ beq lbl_802D4D28 -/* 802D4C90 002D1BD0 3C 80 80 3D */ lis r4, lbl_803CC238@ha -/* 802D4C94 002D1BD4 38 04 C2 38 */ addi r0, r4, lbl_803CC238@l -/* 802D4C98 002D1BD8 90 1E 00 00 */ stw r0, 0(r30) -/* 802D4C9C 002D1BDC 81 83 00 00 */ lwz r12, 0(r3) -/* 802D4CA0 002D1BE0 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802D4CA4 002D1BE4 7D 89 03 A6 */ mtctr r12 -/* 802D4CA8 002D1BE8 4E 80 04 21 */ bctrl -/* 802D4CAC 002D1BEC 80 7E 00 48 */ lwz r3, 0x48(r30) -/* 802D4CB0 002D1BF0 28 03 00 00 */ cmplwi r3, 0 -/* 802D4CB4 002D1BF4 41 82 00 0C */ beq lbl_802D4CC0 -/* 802D4CB8 002D1BF8 80 9E 00 38 */ lwz r4, 0x38(r30) -/* 802D4CBC 002D1BFC 4B FF 98 45 */ bl free__7JKRHeapFPvP7JKRHeap -lbl_802D4CC0: -/* 802D4CC0 002D1C00 80 9E 00 4C */ lwz r4, 0x4c(r30) -/* 802D4CC4 002D1C04 28 04 00 00 */ cmplwi r4, 0 -/* 802D4CC8 002D1C08 41 82 00 0C */ beq lbl_802D4CD4 -/* 802D4CCC 002D1C0C 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D4CD0 002D1C10 4B FF 98 79 */ bl free__7JKRHeapFPv -lbl_802D4CD4: -/* 802D4CD4 002D1C14 80 9E 00 50 */ lwz r4, 0x50(r30) -/* 802D4CD8 002D1C18 28 04 00 00 */ cmplwi r4, 0 -/* 802D4CDC 002D1C1C 41 82 00 0C */ beq lbl_802D4CE8 -/* 802D4CE0 002D1C20 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D4CE4 002D1C24 4B FF 98 65 */ bl free__7JKRHeapFPv -lbl_802D4CE8: -/* 802D4CE8 002D1C28 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D4CEC 002D1C2C 38 63 43 54 */ addi r3, r3, sVolumeList__13JKRFileLoader@l -/* 802D4CF0 002D1C30 38 9E 00 18 */ addi r4, r30, 0x18 -/* 802D4CF4 002D1C34 48 00 74 69 */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802D4CF8 002D1C38 34 1E 00 3C */ addic. r0, r30, 0x3c -/* 802D4CFC 002D1C3C 41 82 00 10 */ beq lbl_802D4D0C -/* 802D4D00 002D1C40 38 7E 00 3C */ addi r3, r30, 0x3c -/* 802D4D04 002D1C44 38 80 00 00 */ li r4, 0 -/* 802D4D08 002D1C48 48 00 71 A5 */ bl __dt__10JSUPtrListFv -lbl_802D4D0C: -/* 802D4D0C 002D1C4C 7F C3 F3 78 */ mr r3, r30 -/* 802D4D10 002D1C50 38 80 00 00 */ li r4, 0 -/* 802D4D14 002D1C54 4B FF F4 35 */ bl __dt__13JKRFileLoaderFv -/* 802D4D18 002D1C58 7F E0 07 35 */ extsh. r0, r31 -/* 802D4D1C 002D1C5C 40 81 00 0C */ ble lbl_802D4D28 -/* 802D4D20 002D1C60 7F C3 F3 78 */ mr r3, r30 -/* 802D4D24 002D1C64 4B FF A0 19 */ bl __dl__FPv -lbl_802D4D28: -/* 802D4D28 002D1C68 7F C3 F3 78 */ mr r3, r30 -/* 802D4D2C 002D1C6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D4D30 002D1C70 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D4D34 002D1C74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D4D38 002D1C78 7C 08 03 A6 */ mtlr r0 -/* 802D4D3C 002D1C7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D4D40 002D1C80 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D4DD8.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D4DD8.s deleted file mode 100644 index 74aa8e00f0..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D4DD8.s +++ /dev/null @@ -1,70 +0,0 @@ -/* getResource__12JKRFileCacheFPCc __ct__12JKRFileCacheFPCcPCc::getResource(char const *) */ -/* missing reference */ -/* 802D4DD8 002D1D18 94 21 FE F0 */ stwu r1, -0x110(r1) -/* 802D4DDC 002D1D1C 7C 08 02 A6 */ mflr r0 -/* 802D4DE0 002D1D20 90 01 01 14 */ stw r0, 0x114(r1) -/* 802D4DE4 002D1D24 39 61 01 10 */ addi r11, r1, 0x110 -/* 802D4DE8 002D1D28 48 08 D3 F1 */ bl _savegpr_28 -/* 802D4DEC 002D1D2C 7C 7C 1B 78 */ mr r28, r3 -/* 802D4DF0 002D1D30 3B E0 00 00 */ li r31, 0 -/* 802D4DF4 002D1D34 48 00 07 29 */ bl getDvdPathName__12JKRFileCacheCFPCc -/* 802D4DF8 002D1D38 7C 7E 1B 78 */ mr r30, r3 -/* 802D4DFC 002D1D3C 38 61 00 08 */ addi r3, r1, 8 -/* 802D4E00 002D1D40 7F C4 F3 78 */ mr r4, r30 -/* 802D4E04 002D1D44 48 00 47 F5 */ bl __ct__10JKRDvdFileFPCc -/* 802D4E08 002D1D48 88 01 00 20 */ lbz r0, 0x20(r1) -/* 802D4E0C 002D1D4C 28 00 00 00 */ cmplwi r0, 0 -/* 802D4E10 002D1D50 41 82 00 98 */ beq lbl_802D4EA8 -/* 802D4E14 002D1D54 7F 83 E3 78 */ mr r3, r28 -/* 802D4E18 002D1D58 80 81 00 94 */ lwz r4, 0x94(r1) -/* 802D4E1C 002D1D5C 48 00 05 C9 */ bl findCacheBlock__12JKRFileCacheCFUl -/* 802D4E20 002D1D60 28 03 00 00 */ cmplwi r3, 0 -/* 802D4E24 002D1D64 40 82 00 74 */ bne lbl_802D4E98 -/* 802D4E28 002D1D68 80 61 00 98 */ lwz r3, 0x98(r1) -/* 802D4E2C 002D1D6C 38 03 00 1F */ addi r0, r3, 0x1f -/* 802D4E30 002D1D70 54 1D 00 34 */ rlwinm r29, r0, 0, 0, 0x1a -/* 802D4E34 002D1D74 7F A3 EB 78 */ mr r3, r29 -/* 802D4E38 002D1D78 38 80 00 20 */ li r4, 0x20 -/* 802D4E3C 002D1D7C 80 BC 00 38 */ lwz r5, 0x38(r28) -/* 802D4E40 002D1D80 4B FF 96 35 */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802D4E44 002D1D84 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802D4E48 002D1D88 41 82 00 60 */ beq lbl_802D4EA8 -/* 802D4E4C 002D1D8C 38 61 00 08 */ addi r3, r1, 8 -/* 802D4E50 002D1D90 7F E4 FB 78 */ mr r4, r31 -/* 802D4E54 002D1D94 7F A5 EB 78 */ mr r5, r29 -/* 802D4E58 002D1D98 38 C0 00 00 */ li r6, 0 -/* 802D4E5C 002D1D9C 48 00 46 BD */ bl read__7JKRFileFPvll -/* 802D4E60 002D1DA0 38 60 00 20 */ li r3, 0x20 -/* 802D4E64 002D1DA4 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D4E68 002D1DA8 38 A0 00 00 */ li r5, 0 -/* 802D4E6C 002D1DAC 4B FF 9E 2D */ bl __nw__FUlP7JKRHeapi -/* 802D4E70 002D1DB0 7C 64 1B 79 */ or. r4, r3, r3 -/* 802D4E74 002D1DB4 41 82 00 18 */ beq lbl_802D4E8C -/* 802D4E78 002D1DB8 80 81 00 94 */ lwz r4, 0x94(r1) -/* 802D4E7C 002D1DBC 80 A1 00 98 */ lwz r5, 0x98(r1) -/* 802D4E80 002D1DC0 7F E6 FB 78 */ mr r6, r31 -/* 802D4E84 002D1DC4 48 00 07 E9 */ bl __ct__Q212JKRFileCache11CCacheBlockFUlUlPCv -/* 802D4E88 002D1DC8 7C 64 1B 78 */ mr r4, r3 -lbl_802D4E8C: -/* 802D4E8C 002D1DCC 38 7C 00 3C */ addi r3, r28, 0x3c -/* 802D4E90 002D1DD0 48 00 70 BD */ bl append__10JSUPtrListFP10JSUPtrLink -/* 802D4E94 002D1DD4 48 00 00 14 */ b lbl_802D4EA8 -lbl_802D4E98: -/* 802D4E98 002D1DD8 80 83 00 10 */ lwz r4, 0x10(r3) -/* 802D4E9C 002D1DDC 38 04 00 01 */ addi r0, r4, 1 -/* 802D4EA0 002D1DE0 90 03 00 10 */ stw r0, 0x10(r3) -/* 802D4EA4 002D1DE4 83 E3 00 1C */ lwz r31, 0x1c(r3) -lbl_802D4EA8: -/* 802D4EA8 002D1DE8 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D4EAC 002D1DEC 7F C4 F3 78 */ mr r4, r30 -/* 802D4EB0 002D1DF0 4B FF 96 99 */ bl free__7JKRHeapFPv -/* 802D4EB4 002D1DF4 38 61 00 08 */ addi r3, r1, 8 -/* 802D4EB8 002D1DF8 38 80 FF FF */ li r4, -1 -/* 802D4EBC 002D1DFC 48 00 48 8D */ bl __dt__10JKRDvdFileFv -/* 802D4EC0 002D1E00 7F E3 FB 78 */ mr r3, r31 -/* 802D4EC4 002D1E04 39 61 01 10 */ addi r11, r1, 0x110 -/* 802D4EC8 002D1E08 48 08 D3 5D */ bl _restgpr_28 -/* 802D4ECC 002D1E0C 80 01 01 14 */ lwz r0, 0x114(r1) -/* 802D4ED0 002D1E10 7C 08 03 A6 */ mtlr r0 -/* 802D4ED4 002D1E14 38 21 01 10 */ addi r1, r1, 0x110 -/* 802D4ED8 002D1E18 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D4EDC.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D4EDC.s deleted file mode 100644 index 4c78feec3b..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D4EDC.s +++ /dev/null @@ -1,38 +0,0 @@ -/* getResource__12JKRFileCacheFUlPCc __ct__12JKRFileCacheFPCcPCc::getResource(unsigned long, char const *) */ -/* missing reference */ -/* 802D4EDC 002D1E1C 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 802D4EE0 002D1E20 7C 08 02 A6 */ mflr r0 -/* 802D4EE4 002D1E24 90 01 01 24 */ stw r0, 0x124(r1) -/* 802D4EE8 002D1E28 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D4EEC 002D1E2C 48 08 D2 F1 */ bl _savegpr_29 -/* 802D4EF0 002D1E30 7C 7D 1B 78 */ mr r29, r3 -/* 802D4EF4 002D1E34 7C BE 2B 78 */ mr r30, r5 -/* 802D4EF8 002D1E38 80 63 00 48 */ lwz r3, 0x48(r3) -/* 802D4EFC 002D1E3C 48 09 3C E9 */ bl strlen -/* 802D4F00 002D1E40 3B E1 00 08 */ addi r31, r1, 8 -/* 802D4F04 002D1E44 7F FF 1A 14 */ add r31, r31, r3 -/* 802D4F08 002D1E48 38 61 00 08 */ addi r3, r1, 8 -/* 802D4F0C 002D1E4C 80 9D 00 48 */ lwz r4, 0x48(r29) -/* 802D4F10 002D1E50 48 09 3C 1D */ bl strcpy -/* 802D4F14 002D1E54 7F A3 EB 78 */ mr r3, r29 -/* 802D4F18 002D1E58 38 81 00 08 */ addi r4, r1, 8 -/* 802D4F1C 002D1E5C 7F C5 F3 78 */ mr r5, r30 -/* 802D4F20 002D1E60 48 00 04 F1 */ bl findFile__12JKRFileCacheCFPcPCc -/* 802D4F24 002D1E64 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802D4F28 002D1E68 41 82 00 20 */ beq lbl_802D4F48 -/* 802D4F2C 002D1E6C 7F A3 EB 78 */ mr r3, r29 -/* 802D4F30 002D1E70 7F E4 FB 78 */ mr r4, r31 -/* 802D4F34 002D1E74 81 9D 00 00 */ lwz r12, 0(r29) -/* 802D4F38 002D1E78 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802D4F3C 002D1E7C 7D 89 03 A6 */ mtctr r12 -/* 802D4F40 002D1E80 4E 80 04 21 */ bctrl -/* 802D4F44 002D1E84 48 00 00 08 */ b lbl_802D4F4C -lbl_802D4F48: -/* 802D4F48 002D1E88 38 60 00 00 */ li r3, 0 -lbl_802D4F4C: -/* 802D4F4C 002D1E8C 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D4F50 002D1E90 48 08 D2 D9 */ bl _restgpr_29 -/* 802D4F54 002D1E94 80 01 01 24 */ lwz r0, 0x124(r1) -/* 802D4F58 002D1E98 7C 08 03 A6 */ mtlr r0 -/* 802D4F5C 002D1E9C 38 21 01 20 */ addi r1, r1, 0x120 -/* 802D4F60 002D1EA0 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D4F64.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D4F64.s deleted file mode 100644 index 2f7db4fea1..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D4F64.s +++ /dev/null @@ -1,60 +0,0 @@ -/* readResource__12JKRFileCacheFPvUlPCc __ct__12JKRFileCacheFPCcPCc::readResource(void *, unsigned long, char const *) */ -/* missing reference */ -/* 802D4F64 002D1EA4 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 802D4F68 002D1EA8 7C 08 02 A6 */ mflr r0 -/* 802D4F6C 002D1EAC 90 01 01 24 */ stw r0, 0x124(r1) -/* 802D4F70 002D1EB0 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D4F74 002D1EB4 48 08 D2 61 */ bl _savegpr_27 -/* 802D4F78 002D1EB8 7C 7B 1B 78 */ mr r27, r3 -/* 802D4F7C 002D1EBC 7C 9C 23 78 */ mr r28, r4 -/* 802D4F80 002D1EC0 7C BD 2B 78 */ mr r29, r5 -/* 802D4F84 002D1EC4 7C C4 33 78 */ mr r4, r6 -/* 802D4F88 002D1EC8 48 00 05 95 */ bl getDvdPathName__12JKRFileCacheCFPCc -/* 802D4F8C 002D1ECC 7C 7F 1B 78 */ mr r31, r3 -/* 802D4F90 002D1ED0 38 61 00 08 */ addi r3, r1, 8 -/* 802D4F94 002D1ED4 7F E4 FB 78 */ mr r4, r31 -/* 802D4F98 002D1ED8 48 00 46 61 */ bl __ct__10JKRDvdFileFPCc -/* 802D4F9C 002D1EDC 3B C0 00 00 */ li r30, 0 -lbl_802D4FA0: -/* 802D4FA0 002D1EE0 88 01 00 20 */ lbz r0, 0x20(r1) -/* 802D4FA4 002D1EE4 28 00 00 00 */ cmplwi r0, 0 -/* 802D4FA8 002D1EE8 41 82 00 60 */ beq lbl_802D5008 -/* 802D4FAC 002D1EEC 80 61 00 98 */ lwz r3, 0x98(r1) -/* 802D4FB0 002D1EF0 38 03 00 1F */ addi r0, r3, 0x1f -/* 802D4FB4 002D1EF4 54 1E 00 34 */ rlwinm r30, r0, 0, 0, 0x1a -/* 802D4FB8 002D1EF8 57 BD 00 34 */ rlwinm r29, r29, 0, 0, 0x1a -/* 802D4FBC 002D1EFC 7C 1E E8 40 */ cmplw r30, r29 -/* 802D4FC0 002D1F00 40 81 00 08 */ ble lbl_802D4FC8 -/* 802D4FC4 002D1F04 7F BE EB 78 */ mr r30, r29 -lbl_802D4FC8: -/* 802D4FC8 002D1F08 7F 63 DB 78 */ mr r3, r27 -/* 802D4FCC 002D1F0C 80 81 00 94 */ lwz r4, 0x94(r1) -/* 802D4FD0 002D1F10 48 00 04 15 */ bl findCacheBlock__12JKRFileCacheCFUl -/* 802D4FD4 002D1F14 7C 64 1B 79 */ or. r4, r3, r3 -/* 802D4FD8 002D1F18 40 82 00 1C */ bne lbl_802D4FF4 -/* 802D4FDC 002D1F1C 38 61 00 08 */ addi r3, r1, 8 -/* 802D4FE0 002D1F20 7F 84 E3 78 */ mr r4, r28 -/* 802D4FE4 002D1F24 7F C5 F3 78 */ mr r5, r30 -/* 802D4FE8 002D1F28 38 C0 00 00 */ li r6, 0 -/* 802D4FEC 002D1F2C 48 00 45 2D */ bl read__7JKRFileFPvll -/* 802D4FF0 002D1F30 4B FF FF B0 */ b lbl_802D4FA0 -lbl_802D4FF4: -/* 802D4FF4 002D1F34 7F 83 E3 78 */ mr r3, r28 -/* 802D4FF8 002D1F38 80 84 00 1C */ lwz r4, 0x1c(r4) -/* 802D4FFC 002D1F3C 7F C5 F3 78 */ mr r5, r30 -/* 802D5000 002D1F40 4B D2 E5 41 */ bl memcpy -/* 802D5004 002D1F44 4B FF FF 9C */ b lbl_802D4FA0 -lbl_802D5008: -/* 802D5008 002D1F48 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D500C 002D1F4C 7F E4 FB 78 */ mr r4, r31 -/* 802D5010 002D1F50 4B FF 95 39 */ bl free__7JKRHeapFPv -/* 802D5014 002D1F54 38 61 00 08 */ addi r3, r1, 8 -/* 802D5018 002D1F58 38 80 FF FF */ li r4, -1 -/* 802D501C 002D1F5C 48 00 47 2D */ bl __dt__10JKRDvdFileFv -/* 802D5020 002D1F60 7F C3 F3 78 */ mr r3, r30 -/* 802D5024 002D1F64 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D5028 002D1F68 48 08 D1 F9 */ bl _restgpr_27 -/* 802D502C 002D1F6C 80 01 01 24 */ lwz r0, 0x124(r1) -/* 802D5030 002D1F70 7C 08 03 A6 */ mtlr r0 -/* 802D5034 002D1F74 38 21 01 20 */ addi r1, r1, 0x120 -/* 802D5038 002D1F78 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D503C.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D503C.s deleted file mode 100644 index 5b2d432128..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D503C.s +++ /dev/null @@ -1,42 +0,0 @@ -/* readResource__12JKRFileCacheFPvUlUlPCc __ct__12JKRFileCacheFPCcPCc::readResource(void *, unsigned long, unsigned long, char const *) */ -/* missing reference */ -/* 802D503C 002D1F7C 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 802D5040 002D1F80 7C 08 02 A6 */ mflr r0 -/* 802D5044 002D1F84 90 01 01 24 */ stw r0, 0x124(r1) -/* 802D5048 002D1F88 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D504C 002D1F8C 48 08 D1 89 */ bl _savegpr_27 -/* 802D5050 002D1F90 7C 7B 1B 78 */ mr r27, r3 -/* 802D5054 002D1F94 7C 9C 23 78 */ mr r28, r4 -/* 802D5058 002D1F98 7C BD 2B 78 */ mr r29, r5 -/* 802D505C 002D1F9C 7C FE 3B 78 */ mr r30, r7 -/* 802D5060 002D1FA0 80 63 00 48 */ lwz r3, 0x48(r3) -/* 802D5064 002D1FA4 48 09 3B 81 */ bl strlen -/* 802D5068 002D1FA8 3B E1 00 08 */ addi r31, r1, 8 -/* 802D506C 002D1FAC 7F FF 1A 14 */ add r31, r31, r3 -/* 802D5070 002D1FB0 38 61 00 08 */ addi r3, r1, 8 -/* 802D5074 002D1FB4 80 9B 00 48 */ lwz r4, 0x48(r27) -/* 802D5078 002D1FB8 48 09 3A B5 */ bl strcpy -/* 802D507C 002D1FBC 7F 63 DB 78 */ mr r3, r27 -/* 802D5080 002D1FC0 38 81 00 08 */ addi r4, r1, 8 -/* 802D5084 002D1FC4 7F C5 F3 78 */ mr r5, r30 -/* 802D5088 002D1FC8 48 00 03 89 */ bl findFile__12JKRFileCacheCFPcPCc -/* 802D508C 002D1FCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802D5090 002D1FD0 41 82 00 28 */ beq lbl_802D50B8 -/* 802D5094 002D1FD4 7F 63 DB 78 */ mr r3, r27 -/* 802D5098 002D1FD8 7F 84 E3 78 */ mr r4, r28 -/* 802D509C 002D1FDC 7F A5 EB 78 */ mr r5, r29 -/* 802D50A0 002D1FE0 7F E6 FB 78 */ mr r6, r31 -/* 802D50A4 002D1FE4 81 9B 00 00 */ lwz r12, 0(r27) -/* 802D50A8 002D1FE8 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802D50AC 002D1FEC 7D 89 03 A6 */ mtctr r12 -/* 802D50B0 002D1FF0 4E 80 04 21 */ bctrl -/* 802D50B4 002D1FF4 48 00 00 08 */ b lbl_802D50BC -lbl_802D50B8: -/* 802D50B8 002D1FF8 38 60 00 00 */ li r3, 0 -lbl_802D50BC: -/* 802D50BC 002D1FFC 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D50C0 002D2000 48 08 D1 61 */ bl _restgpr_27 -/* 802D50C4 002D2004 80 01 01 24 */ lwz r0, 0x124(r1) -/* 802D50C8 002D2008 7C 08 03 A6 */ mtlr r0 -/* 802D50CC 002D200C 38 21 01 20 */ addi r1, r1, 0x120 -/* 802D50D0 002D2010 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D5164.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D5164.s deleted file mode 100644 index f15c698a7c..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D5164.s +++ /dev/null @@ -1,43 +0,0 @@ -/* removeResource__12JKRFileCacheFPv __ct__12JKRFileCacheFPCcPCc::removeResource(void *) */ -/* missing reference */ -/* 802D5164 002D20A4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D5168 002D20A8 7C 08 02 A6 */ mflr r0 -/* 802D516C 002D20AC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D5170 002D20B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5174 002D20B4 48 08 D0 69 */ bl _savegpr_29 -/* 802D5178 002D20B8 7C 7D 1B 78 */ mr r29, r3 -/* 802D517C 002D20BC 7C 9E 23 78 */ mr r30, r4 -/* 802D5180 002D20C0 48 00 02 39 */ bl findCacheBlock__12JKRFileCacheCFPCv -/* 802D5184 002D20C4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802D5188 002D20C8 40 82 00 0C */ bne lbl_802D5194 -/* 802D518C 002D20CC 38 60 00 00 */ li r3, 0 -/* 802D5190 002D20D0 48 00 00 50 */ b lbl_802D51E0 -lbl_802D5194: -/* 802D5194 002D20D4 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 802D5198 002D20D8 34 03 FF FF */ addic. r0, r3, -1 -/* 802D519C 002D20DC 90 1F 00 10 */ stw r0, 0x10(r31) -/* 802D51A0 002D20E0 40 82 00 3C */ bne lbl_802D51DC -/* 802D51A4 002D20E4 7F C3 F3 78 */ mr r3, r30 -/* 802D51A8 002D20E8 80 9D 00 38 */ lwz r4, 0x38(r29) -/* 802D51AC 002D20EC 4B FF 93 55 */ bl free__7JKRHeapFPvP7JKRHeap -/* 802D51B0 002D20F0 38 7D 00 3C */ addi r3, r29, 0x3c -/* 802D51B4 002D20F4 7F E4 FB 78 */ mr r4, r31 -/* 802D51B8 002D20F8 48 00 6F A5 */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802D51BC 002D20FC 28 1F 00 00 */ cmplwi r31, 0 -/* 802D51C0 002D2100 41 82 00 1C */ beq lbl_802D51DC -/* 802D51C4 002D2104 41 82 00 10 */ beq lbl_802D51D4 -/* 802D51C8 002D2108 7F E3 FB 78 */ mr r3, r31 -/* 802D51CC 002D210C 38 80 00 00 */ li r4, 0 -/* 802D51D0 002D2110 48 00 6C 45 */ bl __dt__10JSUPtrLinkFv -lbl_802D51D4: -/* 802D51D4 002D2114 7F E3 FB 78 */ mr r3, r31 -/* 802D51D8 002D2118 4B FF 9B 65 */ bl __dl__FPv -lbl_802D51DC: -/* 802D51DC 002D211C 38 60 00 01 */ li r3, 1 -lbl_802D51E0: -/* 802D51E0 002D2120 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D51E4 002D2124 48 08 D0 45 */ bl _restgpr_29 -/* 802D51E8 002D2128 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D51EC 002D212C 7C 08 03 A6 */ mtlr r0 -/* 802D51F0 002D2130 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D51F4 002D2134 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D51F8.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D51F8.s deleted file mode 100644 index 61351f543e..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D51F8.s +++ /dev/null @@ -1,35 +0,0 @@ -/* detachResource__12JKRFileCacheFPv __ct__12JKRFileCacheFPCcPCc::detachResource(void *) */ -/* missing reference */ -/* 802D51F8 002D2138 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D51FC 002D213C 7C 08 02 A6 */ mflr r0 -/* 802D5200 002D2140 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D5204 002D2144 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D5208 002D2148 93 C1 00 08 */ stw r30, 8(r1) -/* 802D520C 002D214C 7C 7E 1B 78 */ mr r30, r3 -/* 802D5210 002D2150 48 00 01 A9 */ bl findCacheBlock__12JKRFileCacheCFPCv -/* 802D5214 002D2154 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802D5218 002D2158 40 82 00 0C */ bne lbl_802D5224 -/* 802D521C 002D215C 38 60 00 00 */ li r3, 0 -/* 802D5220 002D2160 48 00 00 34 */ b lbl_802D5254 -lbl_802D5224: -/* 802D5224 002D2164 38 7E 00 3C */ addi r3, r30, 0x3c -/* 802D5228 002D2168 7F E4 FB 78 */ mr r4, r31 -/* 802D522C 002D216C 48 00 6F 31 */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802D5230 002D2170 28 1F 00 00 */ cmplwi r31, 0 -/* 802D5234 002D2174 41 82 00 1C */ beq lbl_802D5250 -/* 802D5238 002D2178 41 82 00 10 */ beq lbl_802D5248 -/* 802D523C 002D217C 7F E3 FB 78 */ mr r3, r31 -/* 802D5240 002D2180 38 80 00 00 */ li r4, 0 -/* 802D5244 002D2184 48 00 6B D1 */ bl __dt__10JSUPtrLinkFv -lbl_802D5248: -/* 802D5248 002D2188 7F E3 FB 78 */ mr r3, r31 -/* 802D524C 002D218C 4B FF 9A F1 */ bl __dl__FPv -lbl_802D5250: -/* 802D5250 002D2190 38 60 00 01 */ li r3, 1 -lbl_802D5254: -/* 802D5254 002D2194 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D5258 002D2198 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D525C 002D219C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D5260 002D21A0 7C 08 03 A6 */ mtlr r0 -/* 802D5264 002D21A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D5268 002D21A8 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D526C.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D526C.s deleted file mode 100644 index d7bf1393d2..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D526C.s +++ /dev/null @@ -1,17 +0,0 @@ -/* getResSize__12JKRFileCacheCFPCv __ct__12JKRFileCacheFPCcPCc::getResSize( const(void const *)) */ -/* missing reference */ -/* 802D526C 002D21AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D5270 002D21B0 7C 08 02 A6 */ mflr r0 -/* 802D5274 002D21B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D5278 002D21B8 48 00 01 41 */ bl findCacheBlock__12JKRFileCacheCFPCv -/* 802D527C 002D21BC 28 03 00 00 */ cmplwi r3, 0 -/* 802D5280 002D21C0 40 82 00 0C */ bne lbl_802D528C -/* 802D5284 002D21C4 38 60 FF FF */ li r3, -1 -/* 802D5288 002D21C8 48 00 00 08 */ b lbl_802D5290 -lbl_802D528C: -/* 802D528C 002D21CC 80 63 00 18 */ lwz r3, 0x18(r3) -lbl_802D5290: -/* 802D5290 002D21D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D5294 002D21D4 7C 08 03 A6 */ mtlr r0 -/* 802D5298 002D21D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D529C 002D21DC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D52A0.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D52A0.s deleted file mode 100644 index c21e22284c..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D52A0.s +++ /dev/null @@ -1,36 +0,0 @@ -/* countFile__12JKRFileCacheCFPCc __ct__12JKRFileCacheFPCcPCc::countFile( const(char const *)) */ -/* missing reference */ -/* 802D52A0 002D21E0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802D52A4 002D21E4 7C 08 02 A6 */ mflr r0 -/* 802D52A8 002D21E8 90 01 00 34 */ stw r0, 0x34(r1) -/* 802D52AC 002D21EC 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 802D52B0 002D21F0 93 C1 00 28 */ stw r30, 0x28(r1) -/* 802D52B4 002D21F4 3B E0 00 00 */ li r31, 0 -/* 802D52B8 002D21F8 48 00 02 65 */ bl getDvdPathName__12JKRFileCacheCFPCc -/* 802D52BC 002D21FC 7C 7E 1B 78 */ mr r30, r3 -/* 802D52C0 002D2200 38 81 00 14 */ addi r4, r1, 0x14 -/* 802D52C4 002D2204 48 07 3C BD */ bl DVDOpenDir -/* 802D52C8 002D2208 2C 03 00 00 */ cmpwi r3, 0 -/* 802D52CC 002D220C 41 82 00 28 */ beq lbl_802D52F4 -/* 802D52D0 002D2210 48 00 00 08 */ b lbl_802D52D8 -lbl_802D52D4: -/* 802D52D4 002D2214 3B FF 00 01 */ addi r31, r31, 1 -lbl_802D52D8: -/* 802D52D8 002D2218 38 61 00 14 */ addi r3, r1, 0x14 -/* 802D52DC 002D221C 38 81 00 08 */ addi r4, r1, 8 -/* 802D52E0 002D2220 48 07 3D 61 */ bl DVDReadDir -/* 802D52E4 002D2224 2C 03 00 00 */ cmpwi r3, 0 -/* 802D52E8 002D2228 40 82 FF EC */ bne lbl_802D52D4 -/* 802D52EC 002D222C 38 61 00 14 */ addi r3, r1, 0x14 -/* 802D52F0 002D2230 48 07 3D F5 */ bl DVDCloseDir -lbl_802D52F4: -/* 802D52F4 002D2234 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D52F8 002D2238 7F C4 F3 78 */ mr r4, r30 -/* 802D52FC 002D223C 4B FF 92 4D */ bl free__7JKRHeapFPv -/* 802D5300 002D2240 7F E3 FB 78 */ mr r3, r31 -/* 802D5304 002D2244 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 802D5308 002D2248 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 802D530C 002D224C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802D5310 002D2250 7C 08 03 A6 */ mtlr r0 -/* 802D5314 002D2254 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D5318 002D2258 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D531C.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D531C.s deleted file mode 100644 index 4a5797fadb..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D531C.s +++ /dev/null @@ -1,45 +0,0 @@ -/* getFirstFile__12JKRFileCacheCFPCc __ct__12JKRFileCacheFPCcPCc::getFirstFile( const(char const *)) */ -/* missing reference */ -/* 802D531C 002D225C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D5320 002D2260 7C 08 02 A6 */ mflr r0 -/* 802D5324 002D2264 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D5328 002D2268 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D532C 002D226C 93 C1 00 08 */ stw r30, 8(r1) -/* 802D5330 002D2270 48 00 01 ED */ bl getDvdPathName__12JKRFileCacheCFPCc -/* 802D5334 002D2274 7C 7E 1B 78 */ mr r30, r3 -/* 802D5338 002D2278 38 60 00 24 */ li r3, 0x24 -/* 802D533C 002D227C 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D5340 002D2280 38 A0 00 00 */ li r5, 0 -/* 802D5344 002D2284 4B FF 99 55 */ bl __nw__FUlP7JKRHeapi -/* 802D5348 002D2288 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802D534C 002D228C 41 82 00 10 */ beq lbl_802D535C -/* 802D5350 002D2290 7F C4 F3 78 */ mr r4, r30 -/* 802D5354 002D2294 4B FF F4 1D */ bl __ct__12JKRDvdFinderFPCc -/* 802D5358 002D2298 7C 7F 1B 78 */ mr r31, r3 -lbl_802D535C: -/* 802D535C 002D229C 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D5360 002D22A0 7F C4 F3 78 */ mr r4, r30 -/* 802D5364 002D22A4 4B FF 91 E5 */ bl free__7JKRHeapFPv -/* 802D5368 002D22A8 88 1F 00 10 */ lbz r0, 0x10(r31) -/* 802D536C 002D22AC 28 00 00 01 */ cmplwi r0, 1 -/* 802D5370 002D22B0 41 82 00 2C */ beq lbl_802D539C -/* 802D5374 002D22B4 28 1F 00 00 */ cmplwi r31, 0 -/* 802D5378 002D22B8 41 82 00 1C */ beq lbl_802D5394 -/* 802D537C 002D22BC 7F E3 FB 78 */ mr r3, r31 -/* 802D5380 002D22C0 38 80 00 01 */ li r4, 1 -/* 802D5384 002D22C4 81 9F 00 0C */ lwz r12, 0xc(r31) -/* 802D5388 002D22C8 81 8C 00 08 */ lwz r12, 8(r12) -/* 802D538C 002D22CC 7D 89 03 A6 */ mtctr r12 -/* 802D5390 002D22D0 4E 80 04 21 */ bctrl -lbl_802D5394: -/* 802D5394 002D22D4 38 60 00 00 */ li r3, 0 -/* 802D5398 002D22D8 48 00 00 08 */ b lbl_802D53A0 -lbl_802D539C: -/* 802D539C 002D22DC 7F E3 FB 78 */ mr r3, r31 -lbl_802D53A0: -/* 802D53A0 002D22E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D53A4 002D22E4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D53A8 002D22E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D53AC 002D22EC 7C 08 03 A6 */ mtlr r0 -/* 802D53B0 002D22F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D53B4 002D22F4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D53B8.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D53B8.s deleted file mode 100644 index 00fc64a0c5..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D53B8.s +++ /dev/null @@ -1,15 +0,0 @@ -/* findCacheBlock__12JKRFileCacheCFPCv __ct__12JKRFileCacheFPCcPCc::findCacheBlock( const(void const *)) */ -/* JKRFileCache_NS_findCacheBlock */ -/* 802D53B8 002D22F8 80 A3 00 3C */ lwz r5, 0x3c(r3) -/* 802D53BC 002D22FC 48 00 00 18 */ b lbl_802D53D4 -lbl_802D53C0: -/* 802D53C0 002D2300 80 65 00 00 */ lwz r3, 0(r5) -/* 802D53C4 002D2304 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 802D53C8 002D2308 7C 00 20 40 */ cmplw r0, r4 -/* 802D53CC 002D230C 4D 82 00 20 */ beqlr -/* 802D53D0 002D2310 80 A5 00 0C */ lwz r5, 0xc(r5) -lbl_802D53D4: -/* 802D53D4 002D2314 28 05 00 00 */ cmplwi r5, 0 -/* 802D53D8 002D2318 40 82 FF E8 */ bne lbl_802D53C0 -/* 802D53DC 002D231C 38 60 00 00 */ li r3, 0 -/* 802D53E0 002D2320 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D53E4.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D53E4.s deleted file mode 100644 index 09d2111b70..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D53E4.s +++ /dev/null @@ -1,15 +0,0 @@ -/* findCacheBlock__12JKRFileCacheCFUl __ct__12JKRFileCacheFPCcPCc::findCacheBlock( const(unsigned long)) */ -/* JKRFileCache_NS_findCacheBlock_X1_ */ -/* 802D53E4 002D2324 80 A3 00 3C */ lwz r5, 0x3c(r3) -/* 802D53E8 002D2328 48 00 00 18 */ b lbl_802D5400 -lbl_802D53EC: -/* 802D53EC 002D232C 80 65 00 00 */ lwz r3, 0(r5) -/* 802D53F0 002D2330 80 03 00 14 */ lwz r0, 0x14(r3) -/* 802D53F4 002D2334 7C 04 00 40 */ cmplw r4, r0 -/* 802D53F8 002D2338 4D 82 00 20 */ beqlr -/* 802D53FC 002D233C 80 A5 00 0C */ lwz r5, 0xc(r5) -lbl_802D5400: -/* 802D5400 002D2340 28 05 00 00 */ cmplwi r5, 0 -/* 802D5404 002D2344 40 82 FF E8 */ bne lbl_802D53EC -/* 802D5408 002D2348 38 60 00 00 */ li r3, 0 -/* 802D540C 002D234C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D5410.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D5410.s deleted file mode 100644 index c8cde1ba82..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D5410.s +++ /dev/null @@ -1,74 +0,0 @@ -/* findFile__12JKRFileCacheCFPcPCc __ct__12JKRFileCacheFPCcPCc::findFile( const(char *, char const *)) */ -/* JKRFileCache_NS_findFile */ -/* 802D5410 002D2350 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802D5414 002D2354 7C 08 02 A6 */ mflr r0 -/* 802D5418 002D2358 90 01 00 44 */ stw r0, 0x44(r1) -/* 802D541C 002D235C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D5420 002D2360 48 08 CD B1 */ bl _savegpr_26 -/* 802D5424 002D2364 7C 7A 1B 78 */ mr r26, r3 -/* 802D5428 002D2368 7C 9B 23 78 */ mr r27, r4 -/* 802D542C 002D236C 7C BC 2B 78 */ mr r28, r5 -/* 802D5430 002D2370 3B A0 00 00 */ li r29, 0 -/* 802D5434 002D2374 7F 63 DB 78 */ mr r3, r27 -/* 802D5438 002D2378 48 09 37 AD */ bl strlen -/* 802D543C 002D237C 7C 7F 1B 78 */ mr r31, r3 -/* 802D5440 002D2380 7F 63 DB 78 */ mr r3, r27 -/* 802D5444 002D2384 38 81 00 14 */ addi r4, r1, 0x14 -/* 802D5448 002D2388 48 07 3B 39 */ bl DVDOpenDir -/* 802D544C 002D238C 2C 03 00 00 */ cmpwi r3, 0 -/* 802D5450 002D2390 41 82 00 B0 */ beq lbl_802D5500 -/* 802D5454 002D2394 7F DB FA 14 */ add r30, r27, r31 -/* 802D5458 002D2398 3B FE 00 01 */ addi r31, r30, 1 -/* 802D545C 002D239C 48 00 00 88 */ b lbl_802D54E4 -lbl_802D5460: -/* 802D5460 002D23A0 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802D5464 002D23A4 2C 00 00 00 */ cmpwi r0, 0 -/* 802D5468 002D23A8 41 82 00 40 */ beq lbl_802D54A8 -/* 802D546C 002D23AC 38 00 00 2F */ li r0, 0x2f -/* 802D5470 002D23B0 98 1E 00 00 */ stb r0, 0(r30) -/* 802D5474 002D23B4 7F E3 FB 78 */ mr r3, r31 -/* 802D5478 002D23B8 80 81 00 10 */ lwz r4, 0x10(r1) -/* 802D547C 002D23BC 48 09 36 B1 */ bl strcpy -/* 802D5480 002D23C0 7F 43 D3 78 */ mr r3, r26 -/* 802D5484 002D23C4 7F 64 DB 78 */ mr r4, r27 -/* 802D5488 002D23C8 7F 85 E3 78 */ mr r5, r28 -/* 802D548C 002D23CC 4B FF FF 85 */ bl findFile__12JKRFileCacheCFPcPCc -/* 802D5490 002D23D0 7C 7D 1B 78 */ mr r29, r3 -/* 802D5494 002D23D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802D5498 002D23D8 40 82 00 60 */ bne lbl_802D54F8 -/* 802D549C 002D23DC 38 00 00 00 */ li r0, 0 -/* 802D54A0 002D23E0 98 1E 00 00 */ stb r0, 0(r30) -/* 802D54A4 002D23E4 48 00 00 40 */ b lbl_802D54E4 -lbl_802D54A8: -/* 802D54A8 002D23E8 7F 83 E3 78 */ mr r3, r28 -/* 802D54AC 002D23EC 80 81 00 10 */ lwz r4, 0x10(r1) -/* 802D54B0 002D23F0 48 09 34 E5 */ bl strcmp -/* 802D54B4 002D23F4 7C 60 00 34 */ cntlzw r0, r3 -/* 802D54B8 002D23F8 54 1D D9 7E */ srwi r29, r0, 5 -/* 802D54BC 002D23FC 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802D54C0 002D2400 41 82 00 24 */ beq lbl_802D54E4 -/* 802D54C4 002D2404 7F 63 DB 78 */ mr r3, r27 -/* 802D54C8 002D2408 3C 80 80 3A */ lis r4, lbl_8039D158@ha -/* 802D54CC 002D240C 38 84 D1 58 */ addi r4, r4, lbl_8039D158@l -/* 802D54D0 002D2410 48 09 35 ED */ bl strcat -/* 802D54D4 002D2414 7F 63 DB 78 */ mr r3, r27 -/* 802D54D8 002D2418 7F 84 E3 78 */ mr r4, r28 -/* 802D54DC 002D241C 48 09 35 E1 */ bl strcat -/* 802D54E0 002D2420 48 00 00 18 */ b lbl_802D54F8 -lbl_802D54E4: -/* 802D54E4 002D2424 38 61 00 14 */ addi r3, r1, 0x14 -/* 802D54E8 002D2428 38 81 00 08 */ addi r4, r1, 8 -/* 802D54EC 002D242C 48 07 3B 55 */ bl DVDReadDir -/* 802D54F0 002D2430 2C 03 00 00 */ cmpwi r3, 0 -/* 802D54F4 002D2434 40 82 FF 6C */ bne lbl_802D5460 -lbl_802D54F8: -/* 802D54F8 002D2438 38 61 00 14 */ addi r3, r1, 0x14 -/* 802D54FC 002D243C 48 07 3B E9 */ bl DVDCloseDir -lbl_802D5500: -/* 802D5500 002D2440 7F A3 EB 78 */ mr r3, r29 -/* 802D5504 002D2444 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D5508 002D2448 48 08 CD 15 */ bl _restgpr_26 -/* 802D550C 002D244C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802D5510 002D2450 7C 08 03 A6 */ mtlr r0 -/* 802D5514 002D2454 38 21 00 40 */ addi r1, r1, 0x40 -/* 802D5518 002D2458 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D551C.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D551C.s deleted file mode 100644 index e04ecb485d..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D551C.s +++ /dev/null @@ -1,71 +0,0 @@ -/* getDvdPathName__12JKRFileCacheCFPCc __ct__12JKRFileCacheFPCcPCc::getDvdPathName( const(char const *)) */ -/* JKRFileCache_NS_getDvdPathName */ -/* 802D551C 002D245C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D5520 002D2460 7C 08 02 A6 */ mflr r0 -/* 802D5524 002D2464 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D5528 002D2468 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D552C 002D246C 48 08 CC B1 */ bl _savegpr_29 -/* 802D5530 002D2470 7C 7D 1B 78 */ mr r29, r3 -/* 802D5534 002D2474 7C 9E 23 78 */ mr r30, r4 -/* 802D5538 002D2478 88 04 00 00 */ lbz r0, 0(r4) -/* 802D553C 002D247C 2C 00 00 2F */ cmpwi r0, 0x2f -/* 802D5540 002D2480 40 82 00 78 */ bne lbl_802D55B8 -/* 802D5544 002D2484 7F C3 F3 78 */ mr r3, r30 -/* 802D5548 002D2488 48 09 36 9D */ bl strlen -/* 802D554C 002D248C 7C 7F 1B 78 */ mr r31, r3 -/* 802D5550 002D2490 80 7D 00 48 */ lwz r3, 0x48(r29) -/* 802D5554 002D2494 48 09 36 91 */ bl strlen -/* 802D5558 002D2498 38 9F 00 02 */ addi r4, r31, 2 -/* 802D555C 002D249C 7C 83 22 14 */ add r4, r3, r4 -/* 802D5560 002D24A0 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D5564 002D24A4 38 A0 00 01 */ li r5, 1 -/* 802D5568 002D24A8 4B FF 8F 6D */ bl alloc__7JKRHeapFUli -/* 802D556C 002D24AC 7C 60 1B 78 */ mr r0, r3 -/* 802D5570 002D24B0 7C 1F 03 78 */ mr r31, r0 -/* 802D5574 002D24B4 80 9D 00 48 */ lwz r4, 0x48(r29) -/* 802D5578 002D24B8 48 09 35 B5 */ bl strcpy -/* 802D557C 002D24BC 88 1E 00 01 */ lbz r0, 1(r30) -/* 802D5580 002D24C0 7C 00 07 75 */ extsb. r0, r0 -/* 802D5584 002D24C4 41 82 00 78 */ beq lbl_802D55FC -/* 802D5588 002D24C8 80 7D 00 48 */ lwz r3, 0x48(r29) -/* 802D558C 002D24CC 88 03 00 01 */ lbz r0, 1(r3) -/* 802D5590 002D24D0 7C 00 07 75 */ extsb. r0, r0 -/* 802D5594 002D24D4 40 82 00 14 */ bne lbl_802D55A8 -/* 802D5598 002D24D8 7F E3 FB 78 */ mr r3, r31 -/* 802D559C 002D24DC 38 9E 00 01 */ addi r4, r30, 1 -/* 802D55A0 002D24E0 48 09 35 1D */ bl strcat -/* 802D55A4 002D24E4 48 00 00 58 */ b lbl_802D55FC -lbl_802D55A8: -/* 802D55A8 002D24E8 7F E3 FB 78 */ mr r3, r31 -/* 802D55AC 002D24EC 7F C4 F3 78 */ mr r4, r30 -/* 802D55B0 002D24F0 48 09 35 0D */ bl strcat -/* 802D55B4 002D24F4 48 00 00 48 */ b lbl_802D55FC -lbl_802D55B8: -/* 802D55B8 002D24F8 7F C3 F3 78 */ mr r3, r30 -/* 802D55BC 002D24FC 48 09 36 29 */ bl strlen -/* 802D55C0 002D2500 7C 7F 1B 78 */ mr r31, r3 -/* 802D55C4 002D2504 80 7D 00 4C */ lwz r3, 0x4c(r29) -/* 802D55C8 002D2508 48 09 36 1D */ bl strlen -/* 802D55CC 002D250C 38 9F 00 02 */ addi r4, r31, 2 -/* 802D55D0 002D2510 7C 83 22 14 */ add r4, r3, r4 -/* 802D55D4 002D2514 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D55D8 002D2518 38 A0 00 01 */ li r5, 1 -/* 802D55DC 002D251C 4B FF 8E F9 */ bl alloc__7JKRHeapFUli -/* 802D55E0 002D2520 7C 60 1B 78 */ mr r0, r3 -/* 802D55E4 002D2524 7C 1F 03 78 */ mr r31, r0 -/* 802D55E8 002D2528 80 9D 00 4C */ lwz r4, 0x4c(r29) -/* 802D55EC 002D252C 48 09 35 41 */ bl strcpy -/* 802D55F0 002D2530 7F E3 FB 78 */ mr r3, r31 -/* 802D55F4 002D2534 7F C4 F3 78 */ mr r4, r30 -/* 802D55F8 002D2538 48 09 34 C5 */ bl strcat -lbl_802D55FC: -/* 802D55FC 002D253C 7F A3 EB 78 */ mr r3, r29 -/* 802D5600 002D2540 7F E4 FB 78 */ mr r4, r31 -/* 802D5604 002D2544 48 00 00 21 */ bl convStrLower__12JKRFileCacheCFPc -/* 802D5608 002D2548 7F E3 FB 78 */ mr r3, r31 -/* 802D560C 002D254C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5610 002D2550 48 08 CC 19 */ bl _restgpr_29 -/* 802D5614 002D2554 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D5618 002D2558 7C 08 03 A6 */ mtlr r0 -/* 802D561C 002D255C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D5620 002D2560 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D5624.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D5624.s deleted file mode 100644 index b05f063066..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D5624.s +++ /dev/null @@ -1,22 +0,0 @@ -/* convStrLower__12JKRFileCacheCFPc __ct__12JKRFileCacheFPCcPCc::convStrLower( const(char *)) */ -/* JKRFileCache_NS_convStrLower */ -/* 802D5624 002D2564 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D5628 002D2568 7C 08 02 A6 */ mflr r0 -/* 802D562C 002D256C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D5630 002D2570 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D5634 002D2574 7C 9F 23 78 */ mr r31, r4 -/* 802D5638 002D2578 48 00 00 14 */ b lbl_802D564C -lbl_802D563C: -/* 802D563C 002D257C 7C 63 07 74 */ extsb r3, r3 -/* 802D5640 002D2580 48 08 FE 31 */ bl tolower -/* 802D5644 002D2584 98 7F 00 00 */ stb r3, 0(r31) -/* 802D5648 002D2588 3B FF 00 01 */ addi r31, r31, 1 -lbl_802D564C: -/* 802D564C 002D258C 88 7F 00 00 */ lbz r3, 0(r31) -/* 802D5650 002D2590 7C 60 07 75 */ extsb. r0, r3 -/* 802D5654 002D2594 40 82 FF E8 */ bne lbl_802D563C -/* 802D5658 002D2598 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D565C 002D259C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D5660 002D25A0 7C 08 03 A6 */ mtlr r0 -/* 802D5664 002D25A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D5668 002D25A8 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D566C.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D566C.s deleted file mode 100644 index 252ab30c46..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D566C.s +++ /dev/null @@ -1,25 +0,0 @@ -/* __ct__Q212JKRFileCache11CCacheBlockFUlUlPCv __ct__12JKRFileCacheFPCcPCc::CCacheBlock::__ct( (unsigned long, unsigned long, void const *)) */ -/* JKRFileCache_NS_CCacheBlock */ -/* 802D566C 002D25AC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D5670 002D25B0 7C 08 02 A6 */ mflr r0 -/* 802D5674 002D25B4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D5678 002D25B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D567C 002D25BC 48 08 CB 5D */ bl _savegpr_28 -/* 802D5680 002D25C0 7C 7C 1B 78 */ mr r28, r3 -/* 802D5684 002D25C4 7C 9D 23 78 */ mr r29, r4 -/* 802D5688 002D25C8 7C BE 2B 78 */ mr r30, r5 -/* 802D568C 002D25CC 7C DF 33 78 */ mr r31, r6 -/* 802D5690 002D25D0 7F 84 E3 78 */ mr r4, r28 -/* 802D5694 002D25D4 48 00 67 69 */ bl __ct__10JSUPtrLinkFPv -/* 802D5698 002D25D8 38 00 00 01 */ li r0, 1 -/* 802D569C 002D25DC 90 1C 00 10 */ stw r0, 0x10(r28) -/* 802D56A0 002D25E0 93 BC 00 14 */ stw r29, 0x14(r28) -/* 802D56A4 002D25E4 93 DC 00 18 */ stw r30, 0x18(r28) -/* 802D56A8 002D25E8 93 FC 00 1C */ stw r31, 0x1c(r28) -/* 802D56AC 002D25EC 7F 83 E3 78 */ mr r3, r28 -/* 802D56B0 002D25F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D56B4 002D25F4 48 08 CB 71 */ bl _restgpr_28 -/* 802D56B8 002D25F8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D56BC 002D25FC 7C 08 03 A6 */ mtlr r0 -/* 802D56C0 002D2600 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D56C4 002D2604 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D56C8.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D56C8.s deleted file mode 100644 index f39846b28a..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D56C8.s +++ /dev/null @@ -1,13 +0,0 @@ -/* getFsResource__12JKRFileCacheFPCc __ct__12JKRFileCacheFPCcPCc::getFsResource(char const *) */ -/* missing reference */ -/* 802D56C8 002D2608 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D56CC 002D260C 7C 08 02 A6 */ mflr r0 -/* 802D56D0 002D2610 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D56D4 002D2614 81 83 00 00 */ lwz r12, 0(r3) -/* 802D56D8 002D2618 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802D56DC 002D261C 7D 89 03 A6 */ mtctr r12 -/* 802D56E0 002D2620 4E 80 04 21 */ bctrl -/* 802D56E4 002D2624 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D56E8 002D2628 7C 08 03 A6 */ mtlr r0 -/* 802D56EC 002D262C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D56F0 002D2630 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D56F4.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D56F4.s deleted file mode 100644 index 4c1d519c5f..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D56F4.s +++ /dev/null @@ -1,13 +0,0 @@ -/* getNameResource__12JKRFileCacheFUlPCc __ct__12JKRFileCacheFPCcPCc::getNameResource(unsigned long, char const *) */ -/* missing reference */ -/* 802D56F4 002D2634 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D56F8 002D2638 7C 08 02 A6 */ mflr r0 -/* 802D56FC 002D263C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D5700 002D2640 81 83 00 00 */ lwz r12, 0(r3) -/* 802D5704 002D2644 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802D5708 002D2648 7D 89 03 A6 */ mtctr r12 -/* 802D570C 002D264C 4E 80 04 21 */ bctrl -/* 802D5710 002D2650 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D5714 002D2654 7C 08 03 A6 */ mtlr r0 -/* 802D5718 002D2658 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D571C 002D265C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D5720.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D5720.s deleted file mode 100644 index adb29dee01..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D5720.s +++ /dev/null @@ -1,13 +0,0 @@ -/* readFsResource__12JKRFileCacheFPvUlPCc __ct__12JKRFileCacheFPCcPCc::readFsResource(void *, unsigned long, char const *) */ -/* missing reference */ -/* 802D5720 002D2660 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D5724 002D2664 7C 08 02 A6 */ mflr r0 -/* 802D5728 002D2668 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D572C 002D266C 81 83 00 00 */ lwz r12, 0(r3) -/* 802D5730 002D2670 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802D5734 002D2674 7D 89 03 A6 */ mtctr r12 -/* 802D5738 002D2678 4E 80 04 21 */ bctrl -/* 802D573C 002D267C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D5740 002D2680 7C 08 03 A6 */ mtlr r0 -/* 802D5744 002D2684 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D5748 002D2688 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileCache/asm/func_802D574C.s b/include/JSystem/JKernel/JKRFileCache/asm/func_802D574C.s deleted file mode 100644 index f7afaaa7b9..0000000000 --- a/include/JSystem/JKernel/JKRFileCache/asm/func_802D574C.s +++ /dev/null @@ -1,13 +0,0 @@ -/* readNameResource__12JKRFileCacheFPvUlUlPCc __ct__12JKRFileCacheFPCcPCc::readNameResource(void *, unsigned long, unsigned long, char const *) */ -/* missing reference */ -/* 802D574C 002D268C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D5750 002D2690 7C 08 02 A6 */ mflr r0 -/* 802D5754 002D2694 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D5758 002D2698 81 83 00 00 */ lwz r12, 0(r3) -/* 802D575C 002D269C 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 802D5760 002D26A0 7D 89 03 A6 */ mtctr r12 -/* 802D5764 002D26A4 4E 80 04 21 */ bctrl -/* 802D5768 002D26A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D576C 002D26AC 7C 08 03 A6 */ mtlr r0 -/* 802D5770 002D26B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D5774 002D26B4 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileFinder/asm/func_802D4638.s b/include/JSystem/JKernel/JKRFileFinder/asm/func_802D4638.s deleted file mode 100644 index e7f2a9d988..0000000000 --- a/include/JSystem/JKernel/JKRFileFinder/asm/func_802D4638.s +++ /dev/null @@ -1,37 +0,0 @@ -/* __ct__12JKRArcFinderFP10JKRArchivell __ct__12JKRArcFinderFP10JKRArchivell::__ct(JKRArchive *, long, long) */ -/* JKRArcFinder */ -/* 802D4638 002D1578 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D463C 002D157C 7C 08 02 A6 */ mflr r0 -/* 802D4640 002D1580 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D4644 002D1584 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D4648 002D1588 7C 7F 1B 78 */ mr r31, r3 -/* 802D464C 002D158C 3C E0 80 3D */ lis r7, lbl_803CC228@ha -/* 802D4650 002D1590 38 07 C2 28 */ addi r0, r7, lbl_803CC228@l -/* 802D4654 002D1594 90 03 00 0C */ stw r0, 0xc(r3) -/* 802D4658 002D1598 38 00 00 00 */ li r0, 0 -/* 802D465C 002D159C 98 03 00 10 */ stb r0, 0x10(r3) -/* 802D4660 002D15A0 98 03 00 11 */ stb r0, 0x11(r3) -/* 802D4664 002D15A4 3C E0 80 3D */ lis r7, lbl_803CC218@ha -/* 802D4668 002D15A8 38 07 C2 18 */ addi r0, r7, lbl_803CC218@l -/* 802D466C 002D15AC 90 03 00 0C */ stw r0, 0xc(r3) -/* 802D4670 002D15B0 90 83 00 14 */ stw r4, 0x14(r3) -/* 802D4674 002D15B4 7C 06 00 D0 */ neg r0, r6 -/* 802D4678 002D15B8 7C 00 30 78 */ andc r0, r0, r6 -/* 802D467C 002D15BC 54 00 0F FE */ srwi r0, r0, 0x1f -/* 802D4680 002D15C0 98 03 00 10 */ stb r0, 0x10(r3) -/* 802D4684 002D15C4 90 A3 00 18 */ stw r5, 0x18(r3) -/* 802D4688 002D15C8 38 06 FF FF */ addi r0, r6, -1 -/* 802D468C 002D15CC 7C 05 02 14 */ add r0, r5, r0 -/* 802D4690 002D15D0 90 03 00 1C */ stw r0, 0x1c(r3) -/* 802D4694 002D15D4 80 03 00 18 */ lwz r0, 0x18(r3) -/* 802D4698 002D15D8 90 03 00 20 */ stw r0, 0x20(r3) -/* 802D469C 002D15DC 81 83 00 0C */ lwz r12, 0xc(r3) -/* 802D46A0 002D15E0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802D46A4 002D15E4 7D 89 03 A6 */ mtctr r12 -/* 802D46A8 002D15E8 4E 80 04 21 */ bctrl -/* 802D46AC 002D15EC 7F E3 FB 78 */ mr r3, r31 -/* 802D46B0 002D15F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D46B4 002D15F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D46B8 002D15F8 7C 08 03 A6 */ mtlr r0 -/* 802D46BC 002D15FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D46C0 002D1600 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileFinder/asm/func_802D46C4.s b/include/JSystem/JKernel/JKRFileFinder/asm/func_802D46C4.s deleted file mode 100644 index 170ee5cc2e..0000000000 --- a/include/JSystem/JKernel/JKRFileFinder/asm/func_802D46C4.s +++ /dev/null @@ -1,46 +0,0 @@ -/* findNextFile__12JKRArcFinderFv __ct__12JKRArcFinderFP10JKRArchivell::findNextFile(void) */ -/* missing reference */ -/* 802D46C4 002D1604 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D46C8 002D1608 7C 08 02 A6 */ mflr r0 -/* 802D46CC 002D160C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D46D0 002D1610 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802D46D4 002D1614 7C 7F 1B 78 */ mr r31, r3 -/* 802D46D8 002D1618 88 03 00 10 */ lbz r0, 0x10(r3) -/* 802D46DC 002D161C 28 00 00 00 */ cmplwi r0, 0 -/* 802D46E0 002D1620 41 82 00 78 */ beq lbl_802D4758 -/* 802D46E4 002D1624 80 BF 00 20 */ lwz r5, 0x20(r31) -/* 802D46E8 002D1628 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 802D46EC 002D162C 7C 04 FE 70 */ srawi r4, r0, 0x1f -/* 802D46F0 002D1630 54 A3 0F FE */ srwi r3, r5, 0x1f -/* 802D46F4 002D1634 7C 05 00 10 */ subfc r0, r5, r0 -/* 802D46F8 002D1638 7C 04 19 14 */ adde r0, r4, r3 -/* 802D46FC 002D163C 98 1F 00 10 */ stb r0, 0x10(r31) -/* 802D4700 002D1640 88 1F 00 10 */ lbz r0, 0x10(r31) -/* 802D4704 002D1644 28 00 00 00 */ cmplwi r0, 0 -/* 802D4708 002D1648 41 82 00 50 */ beq lbl_802D4758 -/* 802D470C 002D164C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 802D4710 002D1650 38 81 00 08 */ addi r4, r1, 8 -/* 802D4714 002D1654 80 BF 00 20 */ lwz r5, 0x20(r31) -/* 802D4718 002D1658 48 00 13 A9 */ bl getDirEntry__10JKRArchiveCFP9SDirEntryUl -/* 802D471C 002D165C 98 7F 00 10 */ stb r3, 0x10(r31) -/* 802D4720 002D1660 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802D4724 002D1664 90 1F 00 00 */ stw r0, 0(r31) -/* 802D4728 002D1668 80 1F 00 20 */ lwz r0, 0x20(r31) -/* 802D472C 002D166C 90 1F 00 04 */ stw r0, 4(r31) -/* 802D4730 002D1670 A0 01 00 0A */ lhz r0, 0xa(r1) -/* 802D4734 002D1674 B0 1F 00 08 */ sth r0, 8(r31) -/* 802D4738 002D1678 88 01 00 08 */ lbz r0, 8(r1) -/* 802D473C 002D167C B0 1F 00 0A */ sth r0, 0xa(r31) -/* 802D4740 002D1680 A0 1F 00 0A */ lhz r0, 0xa(r31) -/* 802D4744 002D1684 54 00 FF FE */ rlwinm r0, r0, 0x1f, 0x1f, 0x1f -/* 802D4748 002D1688 98 1F 00 11 */ stb r0, 0x11(r31) -/* 802D474C 002D168C 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 802D4750 002D1690 38 03 00 01 */ addi r0, r3, 1 -/* 802D4754 002D1694 90 1F 00 20 */ stw r0, 0x20(r31) -lbl_802D4758: -/* 802D4758 002D1698 88 7F 00 10 */ lbz r3, 0x10(r31) -/* 802D475C 002D169C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802D4760 002D16A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D4764 002D16A4 7C 08 03 A6 */ mtlr r0 -/* 802D4768 002D16A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D476C 002D16AC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileFinder/asm/func_802D4770.s b/include/JSystem/JKernel/JKRFileFinder/asm/func_802D4770.s deleted file mode 100644 index dbb4353cf1..0000000000 --- a/include/JSystem/JKernel/JKRFileFinder/asm/func_802D4770.s +++ /dev/null @@ -1,35 +0,0 @@ -/* __ct__12JKRDvdFinderFPCc __ct__12JKRDvdFinderFPCc::__ct(char const *) */ -/* JKRDvdFinder */ -/* 802D4770 002D16B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D4774 002D16B4 7C 08 02 A6 */ mflr r0 -/* 802D4778 002D16B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D477C 002D16BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D4780 002D16C0 7C 7F 1B 78 */ mr r31, r3 -/* 802D4784 002D16C4 3C 60 80 3D */ lis r3, lbl_803CC228@ha -/* 802D4788 002D16C8 38 03 C2 28 */ addi r0, r3, lbl_803CC228@l -/* 802D478C 002D16CC 90 1F 00 0C */ stw r0, 0xc(r31) -/* 802D4790 002D16D0 38 00 00 00 */ li r0, 0 -/* 802D4794 002D16D4 98 1F 00 10 */ stb r0, 0x10(r31) -/* 802D4798 002D16D8 98 1F 00 11 */ stb r0, 0x11(r31) -/* 802D479C 002D16DC 3C 60 80 3D */ lis r3, lbl_803CC208@ha -/* 802D47A0 002D16E0 38 03 C2 08 */ addi r0, r3, lbl_803CC208@l -/* 802D47A4 002D16E4 90 1F 00 0C */ stw r0, 0xc(r31) -/* 802D47A8 002D16E8 7C 83 23 78 */ mr r3, r4 -/* 802D47AC 002D16EC 38 9F 00 14 */ addi r4, r31, 0x14 -/* 802D47B0 002D16F0 48 07 47 D1 */ bl DVDOpenDir -/* 802D47B4 002D16F4 30 03 FF FF */ addic r0, r3, -1 -/* 802D47B8 002D16F8 7C 00 19 10 */ subfe r0, r0, r3 -/* 802D47BC 002D16FC 98 1F 00 20 */ stb r0, 0x20(r31) -/* 802D47C0 002D1700 88 1F 00 20 */ lbz r0, 0x20(r31) -/* 802D47C4 002D1704 98 1F 00 10 */ stb r0, 0x10(r31) -/* 802D47C8 002D1708 7F E3 FB 78 */ mr r3, r31 -/* 802D47CC 002D170C 81 9F 00 0C */ lwz r12, 0xc(r31) -/* 802D47D0 002D1710 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802D47D4 002D1714 7D 89 03 A6 */ mtctr r12 -/* 802D47D8 002D1718 4E 80 04 21 */ bctrl -/* 802D47DC 002D171C 7F E3 FB 78 */ mr r3, r31 -/* 802D47E0 002D1720 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D47E4 002D1724 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D47E8 002D1728 7C 08 03 A6 */ mtlr r0 -/* 802D47EC 002D172C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D47F0 002D1730 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileFinder/asm/func_802D4910.s b/include/JSystem/JKernel/JKRFileFinder/asm/func_802D4910.s deleted file mode 100644 index 995d339e59..0000000000 --- a/include/JSystem/JKernel/JKRFileFinder/asm/func_802D4910.s +++ /dev/null @@ -1,21 +0,0 @@ -/* __dt__13JKRFileFinderFv JKRFileFinder::__dt(void) */ -/* missing reference */ -/* 802D4910 002D1850 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D4914 002D1854 7C 08 02 A6 */ mflr r0 -/* 802D4918 002D1858 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D491C 002D185C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D4920 002D1860 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802D4924 002D1864 41 82 00 1C */ beq lbl_802D4940 -/* 802D4928 002D1868 3C A0 80 3D */ lis r5, lbl_803CC228@ha -/* 802D492C 002D186C 38 05 C2 28 */ addi r0, r5, lbl_803CC228@l -/* 802D4930 002D1870 90 1F 00 0C */ stw r0, 0xc(r31) -/* 802D4934 002D1874 7C 80 07 35 */ extsh. r0, r4 -/* 802D4938 002D1878 40 81 00 08 */ ble lbl_802D4940 -/* 802D493C 002D187C 4B FF A4 01 */ bl __dl__FPv -lbl_802D4940: -/* 802D4940 002D1880 7F E3 FB 78 */ mr r3, r31 -/* 802D4944 002D1884 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D4948 002D1888 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D494C 002D188C 7C 08 03 A6 */ mtlr r0 -/* 802D4950 002D1890 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D4954 002D1894 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D40F0.s b/include/JSystem/JKernel/JKRFileLoader/asm/func_802D40F0.s deleted file mode 100644 index 5fb44a0f7d..0000000000 --- a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D40F0.s +++ /dev/null @@ -1,24 +0,0 @@ -/* __ct__13JKRFileLoaderFv __ct__13JKRFileLoaderFv::__ct(void) */ -/* JKRFileLoader */ -/* 802D40F0 002D1030 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D40F4 002D1034 7C 08 02 A6 */ mflr r0 -/* 802D40F8 002D1038 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D40FC 002D103C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D4100 002D1040 7C 7F 1B 78 */ mr r31, r3 -/* 802D4104 002D1044 4B FF D3 79 */ bl __ct__11JKRDisposerFv -/* 802D4108 002D1048 3C 60 80 3D */ lis r3, lbl_803CC1C8@ha -/* 802D410C 002D104C 38 03 C1 C8 */ addi r0, r3, lbl_803CC1C8@l -/* 802D4110 002D1050 90 1F 00 00 */ stw r0, 0(r31) -/* 802D4114 002D1054 38 7F 00 18 */ addi r3, r31, 0x18 -/* 802D4118 002D1058 7F E4 FB 78 */ mr r4, r31 -/* 802D411C 002D105C 48 00 7C E1 */ bl __ct__10JSUPtrLinkFPv -/* 802D4120 002D1060 38 00 00 00 */ li r0, 0 -/* 802D4124 002D1064 90 1F 00 28 */ stw r0, 0x28(r31) -/* 802D4128 002D1068 90 1F 00 2C */ stw r0, 0x2c(r31) -/* 802D412C 002D106C 90 1F 00 34 */ stw r0, 0x34(r31) -/* 802D4130 002D1070 7F E3 FB 78 */ mr r3, r31 -/* 802D4134 002D1074 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D4138 002D1078 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D413C 002D107C 7C 08 03 A6 */ mtlr r0 -/* 802D4140 002D1080 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D4144 002D1084 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4148.s b/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4148.s deleted file mode 100644 index 2963b552a3..0000000000 --- a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4148.s +++ /dev/null @@ -1,40 +0,0 @@ -/* __dt__13JKRFileLoaderFv __ct__13JKRFileLoaderFv::__dt(void) */ -/* JKRFileLoader_NS_dtor */ -/* 802D4148 002D1088 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D414C 002D108C 7C 08 02 A6 */ mflr r0 -/* 802D4150 002D1090 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D4154 002D1094 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D4158 002D1098 93 C1 00 08 */ stw r30, 8(r1) -/* 802D415C 002D109C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D4160 002D10A0 7C 9F 23 78 */ mr r31, r4 -/* 802D4164 002D10A4 41 82 00 54 */ beq lbl_802D41B8 -/* 802D4168 002D10A8 3C 60 80 3D */ lis r3, lbl_803CC1C8@ha -/* 802D416C 002D10AC 38 03 C1 C8 */ addi r0, r3, lbl_803CC1C8@l -/* 802D4170 002D10B0 90 1E 00 00 */ stw r0, 0(r30) -/* 802D4174 002D10B4 80 0D 8E 98 */ lwz r0, sCurrentVolume__13JKRFileLoader-_SDA_BASE_(r13) -/* 802D4178 002D10B8 7C 00 F0 40 */ cmplw r0, r30 -/* 802D417C 002D10BC 40 82 00 0C */ bne lbl_802D4188 -/* 802D4180 002D10C0 38 00 00 00 */ li r0, 0 -/* 802D4184 002D10C4 90 0D 8E 98 */ stw r0, sCurrentVolume__13JKRFileLoader-_SDA_BASE_(r13) -lbl_802D4188: -/* 802D4188 002D10C8 34 1E 00 18 */ addic. r0, r30, 0x18 -/* 802D418C 002D10CC 41 82 00 10 */ beq lbl_802D419C -/* 802D4190 002D10D0 38 7E 00 18 */ addi r3, r30, 0x18 -/* 802D4194 002D10D4 38 80 00 00 */ li r4, 0 -/* 802D4198 002D10D8 48 00 7C 7D */ bl __dt__10JSUPtrLinkFv -lbl_802D419C: -/* 802D419C 002D10DC 7F C3 F3 78 */ mr r3, r30 -/* 802D41A0 002D10E0 38 80 00 00 */ li r4, 0 -/* 802D41A4 002D10E4 4B FF D3 41 */ bl __dt__11JKRDisposerFv -/* 802D41A8 002D10E8 7F E0 07 35 */ extsh. r0, r31 -/* 802D41AC 002D10EC 40 81 00 0C */ ble lbl_802D41B8 -/* 802D41B0 002D10F0 7F C3 F3 78 */ mr r3, r30 -/* 802D41B4 002D10F4 4B FF AB 89 */ bl __dl__FPv -lbl_802D41B8: -/* 802D41B8 002D10F8 7F C3 F3 78 */ mr r3, r30 -/* 802D41BC 002D10FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D41C0 002D1100 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D41C4 002D1104 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D41C8 002D1108 7C 08 03 A6 */ mtlr r0 -/* 802D41CC 002D110C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D41D0 002D1110 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D41D4.s b/include/JSystem/JKernel/JKRFileLoader/asm/func_802D41D4.s deleted file mode 100644 index 14d03289c0..0000000000 --- a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D41D4.s +++ /dev/null @@ -1,23 +0,0 @@ -/* unmount__13JKRFileLoaderFv __ct__13JKRFileLoaderFv::unmount(void) */ -/* missing reference */ -/* 802D41D4 002D1114 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D41D8 002D1118 7C 08 02 A6 */ mflr r0 -/* 802D41DC 002D111C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D41E0 002D1120 80 83 00 34 */ lwz r4, 0x34(r3) -/* 802D41E4 002D1124 28 04 00 00 */ cmplwi r4, 0 -/* 802D41E8 002D1128 41 82 00 2C */ beq lbl_802D4214 -/* 802D41EC 002D112C 34 04 FF FF */ addic. r0, r4, -1 -/* 802D41F0 002D1130 90 03 00 34 */ stw r0, 0x34(r3) -/* 802D41F4 002D1134 40 82 00 20 */ bne lbl_802D4214 -/* 802D41F8 002D1138 28 03 00 00 */ cmplwi r3, 0 -/* 802D41FC 002D113C 41 82 00 18 */ beq lbl_802D4214 -/* 802D4200 002D1140 38 80 00 01 */ li r4, 1 -/* 802D4204 002D1144 81 83 00 00 */ lwz r12, 0(r3) -/* 802D4208 002D1148 81 8C 00 08 */ lwz r12, 8(r12) -/* 802D420C 002D114C 7D 89 03 A6 */ mtctr r12 -/* 802D4210 002D1150 4E 80 04 21 */ bctrl -lbl_802D4214: -/* 802D4214 002D1154 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D4218 002D1158 7C 08 03 A6 */ mtlr r0 -/* 802D421C 002D115C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D4220 002D1160 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4224.s b/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4224.s deleted file mode 100644 index bb83a67b7f..0000000000 --- a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4224.s +++ /dev/null @@ -1,23 +0,0 @@ -/* getGlbResource__13JKRFileLoaderFPCc __ct__13JKRFileLoaderFv::getGlbResource(char const *) */ -/* JKRFileLoader_NS_getGlbResource */ -/* 802D4224 002D1164 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D4228 002D1168 7C 08 02 A6 */ mflr r0 -/* 802D422C 002D116C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D4230 002D1170 90 61 00 08 */ stw r3, 8(r1) -/* 802D4234 002D1174 38 61 00 08 */ addi r3, r1, 8 -/* 802D4238 002D1178 48 00 02 01 */ bl findVolume__13JKRFileLoaderFPPCc -/* 802D423C 002D117C 28 03 00 00 */ cmplwi r3, 0 -/* 802D4240 002D1180 40 82 00 0C */ bne lbl_802D424C -/* 802D4244 002D1184 38 60 00 00 */ li r3, 0 -/* 802D4248 002D1188 48 00 00 18 */ b lbl_802D4260 -lbl_802D424C: -/* 802D424C 002D118C 80 81 00 08 */ lwz r4, 8(r1) -/* 802D4250 002D1190 81 83 00 00 */ lwz r12, 0(r3) -/* 802D4254 002D1194 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802D4258 002D1198 7D 89 03 A6 */ mtctr r12 -/* 802D425C 002D119C 4E 80 04 21 */ bctrl -lbl_802D4260: -/* 802D4260 002D11A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D4264 002D11A4 7C 08 03 A6 */ mtlr r0 -/* 802D4268 002D11A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D426C 002D11AC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4270.s b/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4270.s deleted file mode 100644 index d6a2233e50..0000000000 --- a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4270.s +++ /dev/null @@ -1,44 +0,0 @@ -/* getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader __ct__13JKRFileLoaderFv::getGlbResource(char const *, JKRFileLoader *) */ -/* JKRFileLoader_NS_getGlbResource_X1_ */ -/* 802D4270 002D11B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D4274 002D11B4 7C 08 02 A6 */ mflr r0 -/* 802D4278 002D11B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D427C 002D11BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D4280 002D11C0 93 C1 00 08 */ stw r30, 8(r1) -/* 802D4284 002D11C4 7C 7E 1B 78 */ mr r30, r3 -/* 802D4288 002D11C8 38 60 00 00 */ li r3, 0 -/* 802D428C 002D11CC 28 04 00 00 */ cmplwi r4, 0 -/* 802D4290 002D11D0 41 82 00 24 */ beq lbl_802D42B4 -/* 802D4294 002D11D4 7C 83 23 78 */ mr r3, r4 -/* 802D4298 002D11D8 38 80 00 00 */ li r4, 0 -/* 802D429C 002D11DC 7F C5 F3 78 */ mr r5, r30 -/* 802D42A0 002D11E0 81 83 00 00 */ lwz r12, 0(r3) -/* 802D42A4 002D11E4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802D42A8 002D11E8 7D 89 03 A6 */ mtctr r12 -/* 802D42AC 002D11EC 4E 80 04 21 */ bctrl -/* 802D42B0 002D11F0 48 00 00 40 */ b lbl_802D42F0 -lbl_802D42B4: -/* 802D42B4 002D11F4 3C 80 80 43 */ lis r4, sVolumeList__13JKRFileLoader@ha -/* 802D42B8 002D11F8 83 E4 43 54 */ lwz r31, sVolumeList__13JKRFileLoader@l(r4) -/* 802D42BC 002D11FC 48 00 00 2C */ b lbl_802D42E8 -lbl_802D42C0: -/* 802D42C0 002D1200 80 7F 00 00 */ lwz r3, 0(r31) -/* 802D42C4 002D1204 38 80 00 00 */ li r4, 0 -/* 802D42C8 002D1208 7F C5 F3 78 */ mr r5, r30 -/* 802D42CC 002D120C 81 83 00 00 */ lwz r12, 0(r3) -/* 802D42D0 002D1210 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802D42D4 002D1214 7D 89 03 A6 */ mtctr r12 -/* 802D42D8 002D1218 4E 80 04 21 */ bctrl -/* 802D42DC 002D121C 28 03 00 00 */ cmplwi r3, 0 -/* 802D42E0 002D1220 40 82 00 10 */ bne lbl_802D42F0 -/* 802D42E4 002D1224 83 FF 00 0C */ lwz r31, 0xc(r31) -lbl_802D42E8: -/* 802D42E8 002D1228 28 1F 00 00 */ cmplwi r31, 0 -/* 802D42EC 002D122C 40 82 FF D4 */ bne lbl_802D42C0 -lbl_802D42F0: -/* 802D42F0 002D1230 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D42F4 002D1234 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D42F8 002D1238 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D42FC 002D123C 7C 08 03 A6 */ mtlr r0 -/* 802D4300 002D1240 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D4304 002D1244 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4308.s b/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4308.s deleted file mode 100644 index 2e50b745a8..0000000000 --- a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4308.s +++ /dev/null @@ -1,45 +0,0 @@ -/* removeResource__13JKRFileLoaderFPvP13JKRFileLoader __ct__13JKRFileLoaderFv::removeResource(void *, JKRFileLoader *) */ -/* JKRFileLoader_NS_removeResource */ -/* 802D4308 002D1248 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D430C 002D124C 7C 08 02 A6 */ mflr r0 -/* 802D4310 002D1250 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D4314 002D1254 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D4318 002D1258 93 C1 00 08 */ stw r30, 8(r1) -/* 802D431C 002D125C 7C 7E 1B 78 */ mr r30, r3 -/* 802D4320 002D1260 28 04 00 00 */ cmplwi r4, 0 -/* 802D4324 002D1264 41 82 00 20 */ beq lbl_802D4344 -/* 802D4328 002D1268 7C 83 23 78 */ mr r3, r4 -/* 802D432C 002D126C 7F C4 F3 78 */ mr r4, r30 -/* 802D4330 002D1270 81 83 00 00 */ lwz r12, 0(r3) -/* 802D4334 002D1274 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 802D4338 002D1278 7D 89 03 A6 */ mtctr r12 -/* 802D433C 002D127C 4E 80 04 21 */ bctrl -/* 802D4340 002D1280 48 00 00 48 */ b lbl_802D4388 -lbl_802D4344: -/* 802D4344 002D1284 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D4348 002D1288 83 E3 43 54 */ lwz r31, sVolumeList__13JKRFileLoader@l(r3) -/* 802D434C 002D128C 48 00 00 30 */ b lbl_802D437C -lbl_802D4350: -/* 802D4350 002D1290 80 7F 00 00 */ lwz r3, 0(r31) -/* 802D4354 002D1294 7F C4 F3 78 */ mr r4, r30 -/* 802D4358 002D1298 81 83 00 00 */ lwz r12, 0(r3) -/* 802D435C 002D129C 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 802D4360 002D12A0 7D 89 03 A6 */ mtctr r12 -/* 802D4364 002D12A4 4E 80 04 21 */ bctrl -/* 802D4368 002D12A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802D436C 002D12AC 41 82 00 0C */ beq lbl_802D4378 -/* 802D4370 002D12B0 38 60 00 01 */ li r3, 1 -/* 802D4374 002D12B4 48 00 00 14 */ b lbl_802D4388 -lbl_802D4378: -/* 802D4378 002D12B8 83 FF 00 0C */ lwz r31, 0xc(r31) -lbl_802D437C: -/* 802D437C 002D12BC 28 1F 00 00 */ cmplwi r31, 0 -/* 802D4380 002D12C0 40 82 FF D0 */ bne lbl_802D4350 -/* 802D4384 002D12C4 38 60 00 00 */ li r3, 0 -lbl_802D4388: -/* 802D4388 002D12C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D438C 002D12CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D4390 002D12D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D4394 002D12D4 7C 08 03 A6 */ mtlr r0 -/* 802D4398 002D12D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D439C 002D12DC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D43A0.s b/include/JSystem/JKernel/JKRFileLoader/asm/func_802D43A0.s deleted file mode 100644 index 10bddda48e..0000000000 --- a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D43A0.s +++ /dev/null @@ -1,45 +0,0 @@ -/* detachResource__13JKRFileLoaderFPvP13JKRFileLoader __ct__13JKRFileLoaderFv::detachResource(void *, JKRFileLoader *) */ -/* JKRFileLoader_NS_detachResource */ -/* 802D43A0 002D12E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D43A4 002D12E4 7C 08 02 A6 */ mflr r0 -/* 802D43A8 002D12E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D43AC 002D12EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D43B0 002D12F0 93 C1 00 08 */ stw r30, 8(r1) -/* 802D43B4 002D12F4 7C 7E 1B 78 */ mr r30, r3 -/* 802D43B8 002D12F8 28 04 00 00 */ cmplwi r4, 0 -/* 802D43BC 002D12FC 41 82 00 20 */ beq lbl_802D43DC -/* 802D43C0 002D1300 7C 83 23 78 */ mr r3, r4 -/* 802D43C4 002D1304 7F C4 F3 78 */ mr r4, r30 -/* 802D43C8 002D1308 81 83 00 00 */ lwz r12, 0(r3) -/* 802D43CC 002D130C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802D43D0 002D1310 7D 89 03 A6 */ mtctr r12 -/* 802D43D4 002D1314 4E 80 04 21 */ bctrl -/* 802D43D8 002D1318 48 00 00 48 */ b lbl_802D4420 -lbl_802D43DC: -/* 802D43DC 002D131C 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D43E0 002D1320 83 E3 43 54 */ lwz r31, sVolumeList__13JKRFileLoader@l(r3) -/* 802D43E4 002D1324 48 00 00 30 */ b lbl_802D4414 -lbl_802D43E8: -/* 802D43E8 002D1328 80 7F 00 00 */ lwz r3, 0(r31) -/* 802D43EC 002D132C 7F C4 F3 78 */ mr r4, r30 -/* 802D43F0 002D1330 81 83 00 00 */ lwz r12, 0(r3) -/* 802D43F4 002D1334 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802D43F8 002D1338 7D 89 03 A6 */ mtctr r12 -/* 802D43FC 002D133C 4E 80 04 21 */ bctrl -/* 802D4400 002D1340 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802D4404 002D1344 41 82 00 0C */ beq lbl_802D4410 -/* 802D4408 002D1348 38 60 00 01 */ li r3, 1 -/* 802D440C 002D134C 48 00 00 14 */ b lbl_802D4420 -lbl_802D4410: -/* 802D4410 002D1350 83 FF 00 0C */ lwz r31, 0xc(r31) -lbl_802D4414: -/* 802D4414 002D1354 28 1F 00 00 */ cmplwi r31, 0 -/* 802D4418 002D1358 40 82 FF D0 */ bne lbl_802D43E8 -/* 802D441C 002D135C 38 60 00 00 */ li r3, 0 -lbl_802D4420: -/* 802D4420 002D1360 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D4424 002D1364 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D4428 002D1368 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D442C 002D136C 7C 08 03 A6 */ mtlr r0 -/* 802D4430 002D1370 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D4434 002D1374 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4438.s b/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4438.s deleted file mode 100644 index c6e5061602..0000000000 --- a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D4438.s +++ /dev/null @@ -1,42 +0,0 @@ -/* findVolume__13JKRFileLoaderFPPCc __ct__13JKRFileLoaderFv::findVolume(char const **) */ -/* JKRFileLoader_NS_findVolume */ -/* 802D4438 002D1378 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 802D443C 002D137C 7C 08 02 A6 */ mflr r0 -/* 802D4440 002D1380 90 01 01 24 */ stw r0, 0x124(r1) -/* 802D4444 002D1384 93 E1 01 1C */ stw r31, 0x11c(r1) -/* 802D4448 002D1388 7C 7F 1B 78 */ mr r31, r3 -/* 802D444C 002D138C 80 A3 00 00 */ lwz r5, 0(r3) -/* 802D4450 002D1390 88 05 00 00 */ lbz r0, 0(r5) -/* 802D4454 002D1394 2C 00 00 2F */ cmpwi r0, 0x2f -/* 802D4458 002D1398 41 82 00 0C */ beq lbl_802D4464 -/* 802D445C 002D139C 80 6D 8E 98 */ lwz r3, sCurrentVolume__13JKRFileLoader-_SDA_BASE_(r13) -/* 802D4460 002D13A0 48 00 00 50 */ b lbl_802D44B0 -lbl_802D4464: -/* 802D4464 002D13A4 38 61 00 08 */ addi r3, r1, 8 -/* 802D4468 002D13A8 38 80 01 01 */ li r4, 0x101 -/* 802D446C 002D13AC 48 00 00 59 */ bl fetchVolumeName__13JKRFileLoaderFPclPCc -/* 802D4470 002D13B0 90 7F 00 00 */ stw r3, 0(r31) -/* 802D4474 002D13B4 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D4478 002D13B8 83 E3 43 54 */ lwz r31, sVolumeList__13JKRFileLoader@l(r3) -/* 802D447C 002D13BC 48 00 00 28 */ b lbl_802D44A4 -lbl_802D4480: -/* 802D4480 002D13C0 80 9F 00 00 */ lwz r4, 0(r31) -/* 802D4484 002D13C4 38 61 00 08 */ addi r3, r1, 8 -/* 802D4488 002D13C8 80 84 00 28 */ lwz r4, 0x28(r4) -/* 802D448C 002D13CC 48 09 45 09 */ bl strcmp -/* 802D4490 002D13D0 2C 03 00 00 */ cmpwi r3, 0 -/* 802D4494 002D13D4 40 82 00 0C */ bne lbl_802D44A0 -/* 802D4498 002D13D8 80 7F 00 00 */ lwz r3, 0(r31) -/* 802D449C 002D13DC 48 00 00 14 */ b lbl_802D44B0 -lbl_802D44A0: -/* 802D44A0 002D13E0 83 FF 00 0C */ lwz r31, 0xc(r31) -lbl_802D44A4: -/* 802D44A4 002D13E4 28 1F 00 00 */ cmplwi r31, 0 -/* 802D44A8 002D13E8 40 82 FF D8 */ bne lbl_802D4480 -/* 802D44AC 002D13EC 38 60 00 00 */ li r3, 0 -lbl_802D44B0: -/* 802D44B0 002D13F0 83 E1 01 1C */ lwz r31, 0x11c(r1) -/* 802D44B4 002D13F4 80 01 01 24 */ lwz r0, 0x124(r1) -/* 802D44B8 002D13F8 7C 08 03 A6 */ mtlr r0 -/* 802D44BC 002D13FC 38 21 01 20 */ addi r1, r1, 0x120 -/* 802D44C0 002D1400 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D45A0.s b/include/JSystem/JKernel/JKRFileLoader/asm/func_802D45A0.s deleted file mode 100644 index d1de857590..0000000000 --- a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D45A0.s +++ /dev/null @@ -1,19 +0,0 @@ -/* __sinit_JKRFileLoader_cpp __sinit_JKRFileLoader_cpp */ -/* missing reference */ -/* 802D45A0 002D14E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D45A4 002D14E4 7C 08 02 A6 */ mflr r0 -/* 802D45A8 002D14E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D45AC 002D14EC 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D45B0 002D14F0 38 63 43 54 */ addi r3, r3, sVolumeList__13JKRFileLoader@l -/* 802D45B4 002D14F4 48 00 79 61 */ bl initiate__10JSUPtrListFv -/* 802D45B8 002D14F8 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D45BC 002D14FC 38 63 43 54 */ addi r3, r3, sVolumeList__13JKRFileLoader@l -/* 802D45C0 002D1500 3C 80 80 2D */ lis r4, JSUList_NS_dtor_X6_@ha -/* 802D45C4 002D1504 38 84 45 E4 */ addi r4, r4, JSUList_NS_dtor_X6_@l -/* 802D45C8 002D1508 3C A0 80 43 */ lis r5, lbl_80434348@ha -/* 802D45CC 002D150C 38 A5 43 48 */ addi r5, r5, lbl_80434348@l -/* 802D45D0 002D1510 48 08 D6 55 */ bl func_80361C24 -/* 802D45D4 002D1514 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D45D8 002D1518 7C 08 03 A6 */ mtlr r0 -/* 802D45DC 002D151C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D45E0 002D1520 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D45E4.s b/include/JSystem/JKernel/JKRFileLoader/asm/func_802D45E4.s deleted file mode 100644 index f4fa20d2c3..0000000000 --- a/include/JSystem/JKernel/JKRFileLoader/asm/func_802D45E4.s +++ /dev/null @@ -1,24 +0,0 @@ -/* __dt__24JSUList<13JKRFileLoader>Fv JSUList<13JKRFileLoader>::__dt(void) */ -/* JSUList_NS_dtor_X6_ */ -/* 802D45E4 002D1524 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D45E8 002D1528 7C 08 02 A6 */ mflr r0 -/* 802D45EC 002D152C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D45F0 002D1530 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D45F4 002D1534 93 C1 00 08 */ stw r30, 8(r1) -/* 802D45F8 002D1538 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D45FC 002D153C 7C 9F 23 78 */ mr r31, r4 -/* 802D4600 002D1540 41 82 00 1C */ beq lbl_802D461C -/* 802D4604 002D1544 38 80 00 00 */ li r4, 0 -/* 802D4608 002D1548 48 00 78 A5 */ bl __dt__10JSUPtrListFv -/* 802D460C 002D154C 7F E0 07 35 */ extsh. r0, r31 -/* 802D4610 002D1550 40 81 00 0C */ ble lbl_802D461C -/* 802D4614 002D1554 7F C3 F3 78 */ mr r3, r30 -/* 802D4618 002D1558 4B FF A7 25 */ bl __dl__FPv -lbl_802D461C: -/* 802D461C 002D155C 7F C3 F3 78 */ mr r3, r30 -/* 802D4620 002D1560 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D4624 002D1564 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D4628 002D1568 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D462C 002D156C 7C 08 03 A6 */ mtlr r0 -/* 802D4630 002D1570 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D4634 002D1574 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE138.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE138.s deleted file mode 100644 index 8c280fae38..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE138.s +++ /dev/null @@ -1,82 +0,0 @@ -/* 802CE138 002CB078 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE13C 002CB07C 7C 08 02 A6 */ mflr r0 -/* 802CE140 002CB080 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE144 002CB084 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE148 002CB088 48 09 40 89 */ bl _savegpr_26 -/* 802CE14C 002CB08C 7C 7F 1B 78 */ mr r31, r3 -/* 802CE150 002CB090 7C 9B 23 78 */ mr r27, r4 -/* 802CE154 002CB094 7C BC 2B 78 */ mr r28, r5 -/* 802CE158 002CB098 7C DD 33 78 */ mr r29, r6 -/* 802CE15C 002CB09C 7C FE 3B 78 */ mr r30, r7 -/* 802CE160 002CB0A0 48 00 33 1D */ bl __ct__11JKRDisposerFv -/* 802CE164 002CB0A4 3C 60 80 3D */ lis r3, lbl_803CBF70@ha -/* 802CE168 002CB0A8 38 03 BF 70 */ addi r0, r3, lbl_803CBF70@l -/* 802CE16C 002CB0AC 90 1F 00 00 */ stw r0, 0(r31) -/* 802CE170 002CB0B0 3B 5F 00 40 */ addi r26, r31, 0x40 -/* 802CE174 002CB0B4 7F 43 D3 78 */ mr r3, r26 -/* 802CE178 002CB0B8 48 00 DD 9D */ bl initiate__10JSUPtrListFv -/* 802CE17C 002CB0BC 38 7A 00 0C */ addi r3, r26, 0xc -/* 802CE180 002CB0C0 7F E4 FB 78 */ mr r4, r31 -/* 802CE184 002CB0C4 48 00 DC 79 */ bl __ct__10JSUPtrLinkFPv -/* 802CE188 002CB0C8 38 7F 00 5C */ addi r3, r31, 0x5c -/* 802CE18C 002CB0CC 48 00 DD 89 */ bl initiate__10JSUPtrListFv -/* 802CE190 002CB0D0 38 7F 00 18 */ addi r3, r31, 0x18 -/* 802CE194 002CB0D4 48 07 0E 75 */ bl OSInitMutex -/* 802CE198 002CB0D8 93 9F 00 38 */ stw r28, 0x38(r31) -/* 802CE19C 002CB0DC 93 7F 00 30 */ stw r27, 0x30(r31) -/* 802CE1A0 002CB0E0 7C 1B E2 14 */ add r0, r27, r28 -/* 802CE1A4 002CB0E4 90 1F 00 34 */ stw r0, 0x34(r31) -/* 802CE1A8 002CB0E8 28 1D 00 00 */ cmplwi r29, 0 -/* 802CE1AC 002CB0EC 40 82 00 18 */ bne lbl_802CE1C4 -/* 802CE1B0 002CB0F0 7F E3 FB 78 */ mr r3, r31 -/* 802CE1B4 002CB0F4 48 00 02 75 */ bl becomeSystemHeap__7JKRHeapFv -/* 802CE1B8 002CB0F8 7F E3 FB 78 */ mr r3, r31 -/* 802CE1BC 002CB0FC 48 00 02 7D */ bl becomeCurrentHeap__7JKRHeapFv -/* 802CE1C0 002CB100 48 00 00 48 */ b lbl_802CE208 -lbl_802CE1C4: -/* 802CE1C4 002CB104 34 9F 00 40 */ addic. r4, r31, 0x40 -/* 802CE1C8 002CB108 41 82 00 08 */ beq lbl_802CE1D0 -/* 802CE1CC 002CB10C 38 84 00 0C */ addi r4, r4, 0xc -lbl_802CE1D0: -/* 802CE1D0 002CB110 38 7D 00 40 */ addi r3, r29, 0x40 -/* 802CE1D4 002CB114 48 00 DD 79 */ bl append__10JSUPtrListFP10JSUPtrLink -/* 802CE1D8 002CB118 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802CE1DC 002CB11C 80 0D 8D F8 */ lwz r0, sRootHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802CE1E0 002CB120 7C 03 00 40 */ cmplw r3, r0 -/* 802CE1E4 002CB124 40 82 00 0C */ bne lbl_802CE1F0 -/* 802CE1E8 002CB128 7F E3 FB 78 */ mr r3, r31 -/* 802CE1EC 002CB12C 48 00 02 3D */ bl becomeSystemHeap__7JKRHeapFv -lbl_802CE1F0: -/* 802CE1F0 002CB130 80 6D 8D F4 */ lwz r3, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802CE1F4 002CB134 80 0D 8D F8 */ lwz r0, sRootHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802CE1F8 002CB138 7C 03 00 40 */ cmplw r3, r0 -/* 802CE1FC 002CB13C 40 82 00 0C */ bne lbl_802CE208 -/* 802CE200 002CB140 7F E3 FB 78 */ mr r3, r31 -/* 802CE204 002CB144 48 00 02 35 */ bl becomeCurrentHeap__7JKRHeapFv -lbl_802CE208: -/* 802CE208 002CB148 9B DF 00 68 */ stb r30, 0x68(r31) -/* 802CE20C 002CB14C 88 1F 00 68 */ lbz r0, 0x68(r31) -/* 802CE210 002CB150 28 00 00 01 */ cmplwi r0, 1 -/* 802CE214 002CB154 40 82 00 1C */ bne lbl_802CE230 -/* 802CE218 002CB158 80 0D 8D FC */ lwz r0, lbl_8045137C-_SDA_BASE_(r13) -/* 802CE21C 002CB15C 28 00 00 00 */ cmplwi r0, 0 -/* 802CE220 002CB160 40 82 00 10 */ bne lbl_802CE230 -//.global JKRDefaultMemoryErrorRoutine__FPvUli -/* 802CE224 002CB164 3C 60 80 2D */ lis r3, JKRDefaultMemoryErrorRoutine@ha -//.global JKRDefaultMemoryErrorRoutine__FPvUli -/* 802CE228 002CB168 38 03 EB 40 */ addi r0, r3, JKRDefaultMemoryErrorRoutine@l -/* 802CE22C 002CB16C 90 0D 8D FC */ stw r0, lbl_8045137C-_SDA_BASE_(r13) -lbl_802CE230: -/* 802CE230 002CB170 88 0D 83 30 */ lbz r0, lbl_804508B0-_SDA_BASE_(r13) -/* 802CE234 002CB174 98 1F 00 3C */ stb r0, 0x3c(r31) -/* 802CE238 002CB178 88 0D 8E 00 */ lbz r0, lbl_80451380-_SDA_BASE_(r13) -/* 802CE23C 002CB17C 98 1F 00 3D */ stb r0, 0x3d(r31) -/* 802CE240 002CB180 38 00 00 00 */ li r0, 0 -/* 802CE244 002CB184 98 1F 00 69 */ stb r0, 0x69(r31) -/* 802CE248 002CB188 7F E3 FB 78 */ mr r3, r31 -/* 802CE24C 002CB18C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE250 002CB190 48 09 3F CD */ bl _restgpr_26 -/* 802CE254 002CB194 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CE258 002CB198 7C 08 03 A6 */ mtlr r0 -/* 802CE25C 002CB19C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE260 002CB1A0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE378.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE378.s deleted file mode 100644 index 0eb3aaad5b..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE378.s +++ /dev/null @@ -1,46 +0,0 @@ -/* 802CE378 002CB2B8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE37C 002CB2BC 7C 08 02 A6 */ mflr r0 -/* 802CE380 002CB2C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE384 002CB2C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE388 002CB2C8 48 09 3E 4D */ bl _savegpr_27 -/* 802CE38C 002CB2CC 7C 7B 1B 78 */ mr r27, r3 -/* 802CE390 002CB2D0 7C 9C 23 78 */ mr r28, r4 -/* 802CE394 002CB2D4 7C BF 2B 78 */ mr r31, r5 -/* 802CE398 002CB2D8 48 06 CE FD */ bl OSGetArenaLo -/* 802CE39C 002CB2DC 7C 7E 1B 78 */ mr r30, r3 -/* 802CE3A0 002CB2E0 48 06 CE ED */ bl OSGetArenaHi -/* 802CE3A4 002CB2E4 7C 7D 1B 78 */ mr r29, r3 -/* 802CE3A8 002CB2E8 7C 1E E8 40 */ cmplw r30, r29 -/* 802CE3AC 002CB2EC 40 82 00 0C */ bne lbl_802CE3B8 -/* 802CE3B0 002CB2F0 38 60 00 00 */ li r3, 0 -/* 802CE3B4 002CB2F4 48 00 00 5C */ b lbl_802CE410 -lbl_802CE3B8: -/* 802CE3B8 002CB2F8 7F C3 F3 78 */ mr r3, r30 -/* 802CE3BC 002CB2FC 7F A4 EB 78 */ mr r4, r29 -/* 802CE3C0 002CB300 7F E5 FB 78 */ mr r5, r31 -/* 802CE3C4 002CB304 48 06 CD ED */ bl OSInitAlloc -/* 802CE3C8 002CB308 38 03 00 1F */ addi r0, r3, 0x1f -/* 802CE3CC 002CB30C 54 1F 00 34 */ rlwinm r31, r0, 0, 0, 0x1a -/* 802CE3D0 002CB310 57 BE 00 34 */ rlwinm r30, r29, 0, 0, 0x1a -/* 802CE3D4 002CB314 3C 60 80 00 */ lis r3, 0x80000028@ha -/* 802CE3D8 002CB318 90 6D 8E 04 */ stw r3, mCodeStart__7JKRHeap-_SDA_BASE_(r13) -/* 802CE3DC 002CB31C 93 ED 8E 08 */ stw r31, mCodeEnd__7JKRHeap-_SDA_BASE_(r13) -/* 802CE3E0 002CB320 93 ED 8E 0C */ stw r31, mUserRamStart__7JKRHeap-_SDA_BASE_(r13) -/* 802CE3E4 002CB324 93 CD 8E 10 */ stw r30, mUserRamEnd__7JKRHeap-_SDA_BASE_(r13) -/* 802CE3E8 002CB328 80 03 00 28 */ lwz r0, 0x80000028@l(r3) -/* 802CE3EC 002CB32C 90 0D 8E 14 */ stw r0, mMemorySize__7JKRHeap-_SDA_BASE_(r13) -/* 802CE3F0 002CB330 7F C3 F3 78 */ mr r3, r30 -/* 802CE3F4 002CB334 48 06 CE B1 */ bl OSSetArenaLo -/* 802CE3F8 002CB338 7F C3 F3 78 */ mr r3, r30 -/* 802CE3FC 002CB33C 48 06 CE A1 */ bl OSSetArenaHi -/* 802CE400 002CB340 93 FB 00 00 */ stw r31, 0(r27) -/* 802CE404 002CB344 7C 1F F0 50 */ subf r0, r31, r30 -/* 802CE408 002CB348 90 1C 00 00 */ stw r0, 0(r28) -/* 802CE40C 002CB34C 38 60 00 01 */ li r3, 1 -lbl_802CE410: -/* 802CE410 002CB350 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE414 002CB354 48 09 3E 0D */ bl _restgpr_27 -/* 802CE418 002CB358 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CE41C 002CB35C 7C 08 03 A6 */ mtlr r0 -/* 802CE420 002CB360 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE424 002CB364 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE428.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE428.s deleted file mode 100644 index 13a1d0da2e..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE428.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 802CE428 002CB368 80 0D 8D F0 */ lwz r0, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802CE42C 002CB36C 90 6D 8D F0 */ stw r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802CE430 002CB370 7C 03 03 78 */ mr r3, r0 -/* 802CE434 002CB374 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE438.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE438.s deleted file mode 100644 index e7d17a686b..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE438.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 802CE438 002CB378 80 0D 8D F4 */ lwz r0, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802CE43C 002CB37C 90 6D 8D F4 */ stw r3, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802CE440 002CB380 7C 03 03 78 */ mr r3, r0 -/* 802CE444 002CB384 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE448.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE448.s deleted file mode 100644 index 5ffc71fdc8..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE448.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CE448 002CB388 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE44C 002CB38C 7C 08 02 A6 */ mflr r0 -/* 802CE450 002CB390 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE454 002CB394 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE458 002CB398 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 802CE45C 002CB39C 7D 89 03 A6 */ mtctr r12 -/* 802CE460 002CB3A0 4E 80 04 21 */ bctrl -/* 802CE464 002CB3A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE468 002CB3A8 7C 08 03 A6 */ mtlr r0 -/* 802CE46C 002CB3AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE470 002CB3B0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE474.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE474.s deleted file mode 100644 index 47cfa1afe1..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE474.s +++ /dev/null @@ -1,27 +0,0 @@ -/* 802CE474 002CB3B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE478 002CB3B8 7C 08 02 A6 */ mflr r0 -/* 802CE47C 002CB3BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE480 002CB3C0 7C 66 1B 78 */ mr r6, r3 -/* 802CE484 002CB3C4 7C 80 23 78 */ mr r0, r4 -/* 802CE488 002CB3C8 28 05 00 00 */ cmplwi r5, 0 -/* 802CE48C 002CB3CC 41 82 00 18 */ beq lbl_802CE4A4 -/* 802CE490 002CB3D0 7C A3 2B 78 */ mr r3, r5 -/* 802CE494 002CB3D4 7C C4 33 78 */ mr r4, r6 -/* 802CE498 002CB3D8 7C 05 03 78 */ mr r5, r0 -/* 802CE49C 002CB3DC 48 00 00 39 */ bl alloc__7JKRHeapFUli -/* 802CE4A0 002CB3E0 48 00 00 24 */ b lbl_802CE4C4 -lbl_802CE4A4: -/* 802CE4A4 002CB3E4 80 6D 8D F4 */ lwz r3, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802CE4A8 002CB3E8 28 03 00 00 */ cmplwi r3, 0 -/* 802CE4AC 002CB3EC 41 82 00 14 */ beq lbl_802CE4C0 -/* 802CE4B0 002CB3F0 7C C4 33 78 */ mr r4, r6 -/* 802CE4B4 002CB3F4 7C 05 03 78 */ mr r5, r0 -/* 802CE4B8 002CB3F8 48 00 00 1D */ bl alloc__7JKRHeapFUli -/* 802CE4BC 002CB3FC 48 00 00 08 */ b lbl_802CE4C4 -lbl_802CE4C0: -/* 802CE4C0 002CB400 38 60 00 00 */ li r3, 0 -lbl_802CE4C4: -/* 802CE4C4 002CB404 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE4C8 002CB408 7C 08 03 A6 */ mtlr r0 -/* 802CE4CC 002CB40C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE4D0 002CB410 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE4D4.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE4D4.s deleted file mode 100644 index fd95f68073..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE4D4.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CE4D4 002CB414 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE4D8 002CB418 7C 08 02 A6 */ mflr r0 -/* 802CE4DC 002CB41C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE4E0 002CB420 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE4E4 002CB424 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802CE4E8 002CB428 7D 89 03 A6 */ mtctr r12 -/* 802CE4EC 002CB42C 4E 80 04 21 */ bctrl -/* 802CE4F0 002CB430 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE4F4 002CB434 7C 08 03 A6 */ mtlr r0 -/* 802CE4F8 002CB438 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE4FC 002CB43C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE500.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE500.s deleted file mode 100644 index 82c90052d1..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE500.s +++ /dev/null @@ -1,20 +0,0 @@ -/* 802CE500 002CB440 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE504 002CB444 7C 08 02 A6 */ mflr r0 -/* 802CE508 002CB448 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE50C 002CB44C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802CE510 002CB450 7C 7F 1B 78 */ mr r31, r3 -/* 802CE514 002CB454 28 04 00 00 */ cmplwi r4, 0 -/* 802CE518 002CB458 40 82 00 10 */ bne lbl_802CE528 -/* 802CE51C 002CB45C 48 00 03 21 */ bl findFromRoot__7JKRHeapFPv -/* 802CE520 002CB460 7C 64 1B 79 */ or. r4, r3, r3 -/* 802CE524 002CB464 41 82 00 10 */ beq lbl_802CE534 -lbl_802CE528: -/* 802CE528 002CB468 7C 83 23 78 */ mr r3, r4 -/* 802CE52C 002CB46C 7F E4 FB 78 */ mr r4, r31 -/* 802CE530 002CB470 48 00 00 19 */ bl free__7JKRHeapFPv -lbl_802CE534: -/* 802CE534 002CB474 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802CE538 002CB478 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE53C 002CB47C 7C 08 03 A6 */ mtlr r0 -/* 802CE540 002CB480 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE544 002CB484 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE548.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE548.s deleted file mode 100644 index 9b9f9a62eb..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE548.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CE548 002CB488 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE54C 002CB48C 7C 08 02 A6 */ mflr r0 -/* 802CE550 002CB490 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE554 002CB494 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE558 002CB498 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 802CE55C 002CB49C 7D 89 03 A6 */ mtctr r12 -/* 802CE560 002CB4A0 4E 80 04 21 */ bctrl -/* 802CE564 002CB4A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE568 002CB4A8 7C 08 03 A6 */ mtlr r0 -/* 802CE56C 002CB4AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE570 002CB4B0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE5CC.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE5CC.s deleted file mode 100644 index b3a29d643a..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE5CC.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CE5CC 002CB50C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE5D0 002CB510 7C 08 02 A6 */ mflr r0 -/* 802CE5D4 002CB514 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE5D8 002CB518 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE5DC 002CB51C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802CE5E0 002CB520 7D 89 03 A6 */ mtctr r12 -/* 802CE5E4 002CB524 4E 80 04 21 */ bctrl -/* 802CE5E8 002CB528 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE5EC 002CB52C 7C 08 03 A6 */ mtlr r0 -/* 802CE5F0 002CB530 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE5F4 002CB534 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE5F8.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE5F8.s deleted file mode 100644 index fa0b880ec2..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE5F8.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CE5F8 002CB538 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE5FC 002CB53C 7C 08 02 A6 */ mflr r0 -/* 802CE600 002CB540 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE604 002CB544 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE608 002CB548 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802CE60C 002CB54C 7D 89 03 A6 */ mtctr r12 -/* 802CE610 002CB550 4E 80 04 21 */ bctrl -/* 802CE614 002CB554 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE618 002CB558 7C 08 03 A6 */ mtlr r0 -/* 802CE61C 002CB55C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE620 002CB560 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE624.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE624.s deleted file mode 100644 index a5023e188e..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE624.s +++ /dev/null @@ -1,26 +0,0 @@ -/* 802CE624 002CB564 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE628 002CB568 7C 08 02 A6 */ mflr r0 -/* 802CE62C 002CB56C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE630 002CB570 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802CE634 002CB574 93 C1 00 08 */ stw r30, 8(r1) -/* 802CE638 002CB578 7C 7E 1B 78 */ mr r30, r3 -/* 802CE63C 002CB57C 7C 9F 23 78 */ mr r31, r4 -/* 802CE640 002CB580 28 05 00 00 */ cmplwi r5, 0 -/* 802CE644 002CB584 40 82 00 18 */ bne lbl_802CE65C -/* 802CE648 002CB588 48 00 01 F5 */ bl findFromRoot__7JKRHeapFPv -/* 802CE64C 002CB58C 7C 65 1B 79 */ or. r5, r3, r3 -/* 802CE650 002CB590 40 82 00 0C */ bne lbl_802CE65C -/* 802CE654 002CB594 38 60 FF FF */ li r3, -1 -/* 802CE658 002CB598 48 00 00 14 */ b lbl_802CE66C -lbl_802CE65C: -/* 802CE65C 002CB59C 7C A3 2B 78 */ mr r3, r5 -/* 802CE660 002CB5A0 7F C4 F3 78 */ mr r4, r30 -/* 802CE664 002CB5A4 7F E5 FB 78 */ mr r5, r31 -/* 802CE668 002CB5A8 48 00 00 1D */ bl resize__7JKRHeapFPvUl -lbl_802CE66C: -/* 802CE66C 002CB5AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802CE670 002CB5B0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802CE674 002CB5B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE678 002CB5B8 7C 08 03 A6 */ mtlr r0 -/* 802CE67C 002CB5BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE680 002CB5C0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE684.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE684.s deleted file mode 100644 index 0dba38039f..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE684.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CE684 002CB5C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE688 002CB5C8 7C 08 02 A6 */ mflr r0 -/* 802CE68C 002CB5CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE690 002CB5D0 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE694 002CB5D4 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 802CE698 002CB5D8 7D 89 03 A6 */ mtctr r12 -/* 802CE69C 002CB5DC 4E 80 04 21 */ bctrl -/* 802CE6A0 002CB5E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE6A4 002CB5E4 7C 08 03 A6 */ mtlr r0 -/* 802CE6A8 002CB5E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE6AC 002CB5EC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE6B0.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE6B0.s deleted file mode 100644 index e3bce8140a..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE6B0.s +++ /dev/null @@ -1,22 +0,0 @@ -/* 802CE6B0 002CB5F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE6B4 002CB5F4 7C 08 02 A6 */ mflr r0 -/* 802CE6B8 002CB5F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE6BC 002CB5FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802CE6C0 002CB600 7C 7F 1B 78 */ mr r31, r3 -/* 802CE6C4 002CB604 28 04 00 00 */ cmplwi r4, 0 -/* 802CE6C8 002CB608 40 82 00 18 */ bne lbl_802CE6E0 -/* 802CE6CC 002CB60C 48 00 01 71 */ bl findFromRoot__7JKRHeapFPv -/* 802CE6D0 002CB610 7C 64 1B 79 */ or. r4, r3, r3 -/* 802CE6D4 002CB614 40 82 00 0C */ bne lbl_802CE6E0 -/* 802CE6D8 002CB618 38 60 FF FF */ li r3, -1 -/* 802CE6DC 002CB61C 48 00 00 10 */ b lbl_802CE6EC -lbl_802CE6E0: -/* 802CE6E0 002CB620 7C 83 23 78 */ mr r3, r4 -/* 802CE6E4 002CB624 7F E4 FB 78 */ mr r4, r31 -/* 802CE6E8 002CB628 48 00 00 19 */ bl getSize__7JKRHeapCFPv -lbl_802CE6EC: -/* 802CE6EC 002CB62C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802CE6F0 002CB630 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE6F4 002CB634 7C 08 03 A6 */ mtlr r0 -/* 802CE6F8 002CB638 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE6FC 002CB63C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE700.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE700.s deleted file mode 100644 index 05ee718045..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE700.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CE700 002CB640 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE704 002CB644 7C 08 02 A6 */ mflr r0 -/* 802CE708 002CB648 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE70C 002CB64C 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE710 002CB650 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802CE714 002CB654 7D 89 03 A6 */ mtctr r12 -/* 802CE718 002CB658 4E 80 04 21 */ bctrl -/* 802CE71C 002CB65C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE720 002CB660 7C 08 03 A6 */ mtlr r0 -/* 802CE724 002CB664 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE728 002CB668 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE72C.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE72C.s deleted file mode 100644 index 143a08a8c0..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE72C.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CE72C 002CB66C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE730 002CB670 7C 08 02 A6 */ mflr r0 -/* 802CE734 002CB674 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE738 002CB678 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE73C 002CB67C 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 802CE740 002CB680 7D 89 03 A6 */ mtctr r12 -/* 802CE744 002CB684 4E 80 04 21 */ bctrl -/* 802CE748 002CB688 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE74C 002CB68C 7C 08 03 A6 */ mtlr r0 -/* 802CE750 002CB690 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE754 002CB694 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE758.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE758.s deleted file mode 100644 index 4976dcc63d..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE758.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CE758 002CB698 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE75C 002CB69C 7C 08 02 A6 */ mflr r0 -/* 802CE760 002CB6A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE764 002CB6A4 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE768 002CB6A8 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 802CE76C 002CB6AC 7D 89 03 A6 */ mtctr r12 -/* 802CE770 002CB6B0 4E 80 04 21 */ bctrl -/* 802CE774 002CB6B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE778 002CB6B8 7C 08 03 A6 */ mtlr r0 -/* 802CE77C 002CB6BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE780 002CB6C0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE784.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE784.s deleted file mode 100644 index e37bcdabec..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE784.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CE784 002CB6C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE788 002CB6C8 7C 08 02 A6 */ mflr r0 -/* 802CE78C 002CB6CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE790 002CB6D0 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE794 002CB6D4 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 802CE798 002CB6D8 7D 89 03 A6 */ mtctr r12 -/* 802CE79C 002CB6DC 4E 80 04 21 */ bctrl -/* 802CE7A0 002CB6E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE7A4 002CB6E4 7C 08 03 A6 */ mtlr r0 -/* 802CE7A8 002CB6E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE7AC 002CB6EC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE7B0.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE7B0.s deleted file mode 100644 index c1052f1f84..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE7B0.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CE7B0 002CB6F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE7B4 002CB6F4 7C 08 02 A6 */ mflr r0 -/* 802CE7B8 002CB6F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE7BC 002CB6FC 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE7C0 002CB700 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 802CE7C4 002CB704 7D 89 03 A6 */ mtctr r12 -/* 802CE7C8 002CB708 4E 80 04 21 */ bctrl -/* 802CE7CC 002CB70C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE7D0 002CB710 7C 08 03 A6 */ mtlr r0 -/* 802CE7D4 002CB714 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE7D8 002CB718 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE83C.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE83C.s deleted file mode 100644 index 3409ac4f30..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE83C.s +++ /dev/null @@ -1,25 +0,0 @@ -/* 802CE83C 002CB77C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE840 002CB780 7C 08 02 A6 */ mflr r0 -/* 802CE844 002CB784 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE848 002CB788 7C 64 1B 78 */ mr r4, r3 -/* 802CE84C 002CB78C 80 6D 8D F8 */ lwz r3, sRootHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802CE850 002CB790 28 03 00 00 */ cmplwi r3, 0 -/* 802CE854 002CB794 40 82 00 0C */ bne lbl_802CE860 -/* 802CE858 002CB798 38 60 00 00 */ li r3, 0 -/* 802CE85C 002CB79C 48 00 00 28 */ b lbl_802CE884 -lbl_802CE860: -/* 802CE860 002CB7A0 80 03 00 30 */ lwz r0, 0x30(r3) -/* 802CE864 002CB7A4 7C 00 20 40 */ cmplw r0, r4 -/* 802CE868 002CB7A8 41 81 00 18 */ bgt lbl_802CE880 -/* 802CE86C 002CB7AC 80 03 00 34 */ lwz r0, 0x34(r3) -/* 802CE870 002CB7B0 7C 04 00 40 */ cmplw r4, r0 -/* 802CE874 002CB7B4 40 80 00 0C */ bge lbl_802CE880 -/* 802CE878 002CB7B8 48 00 00 1D */ bl find__7JKRHeapCFPv -/* 802CE87C 002CB7BC 48 00 00 08 */ b lbl_802CE884 -lbl_802CE880: -/* 802CE880 002CB7C0 48 00 00 BD */ bl findAllHeap__7JKRHeapCFPv -lbl_802CE884: -/* 802CE884 002CB7C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE888 002CB7C8 7C 08 03 A6 */ mtlr r0 -/* 802CE88C 002CB7CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE890 002CB7D0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE894.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE894.s deleted file mode 100644 index 7ce4858d3e..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE894.s +++ /dev/null @@ -1,48 +0,0 @@ -/* 802CE894 002CB7D4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE898 002CB7D8 7C 08 02 A6 */ mflr r0 -/* 802CE89C 002CB7DC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE8A0 002CB7E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE8A4 002CB7E4 48 09 39 39 */ bl _savegpr_29 -/* 802CE8A8 002CB7E8 7C 7D 1B 78 */ mr r29, r3 -/* 802CE8AC 002CB7EC 7C 9E 23 78 */ mr r30, r4 -/* 802CE8B0 002CB7F0 80 03 00 30 */ lwz r0, 0x30(r3) -/* 802CE8B4 002CB7F4 7C 00 F0 40 */ cmplw r0, r30 -/* 802CE8B8 002CB7F8 41 81 00 68 */ bgt lbl_802CE920 -/* 802CE8BC 002CB7FC 80 1D 00 34 */ lwz r0, 0x34(r29) -/* 802CE8C0 002CB800 7C 1E 00 40 */ cmplw r30, r0 -/* 802CE8C4 002CB804 40 80 00 5C */ bge lbl_802CE920 -/* 802CE8C8 002CB808 80 1D 00 48 */ lwz r0, 0x48(r29) -/* 802CE8CC 002CB80C 28 00 00 00 */ cmplwi r0, 0 -/* 802CE8D0 002CB810 41 82 00 48 */ beq lbl_802CE918 -/* 802CE8D4 002CB814 83 FD 00 40 */ lwz r31, 0x40(r29) -/* 802CE8D8 002CB818 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE8DC 002CB81C 41 82 00 34 */ beq lbl_802CE910 -/* 802CE8E0 002CB820 3B FF FF F4 */ addi r31, r31, -12 -/* 802CE8E4 002CB824 48 00 00 2C */ b lbl_802CE910 -lbl_802CE8E8: -/* 802CE8E8 002CB828 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802CE8EC 002CB82C 7F C4 F3 78 */ mr r4, r30 -/* 802CE8F0 002CB830 4B FF FF A5 */ bl find__7JKRHeapCFPv -/* 802CE8F4 002CB834 28 03 00 00 */ cmplwi r3, 0 -/* 802CE8F8 002CB838 41 82 00 08 */ beq lbl_802CE900 -/* 802CE8FC 002CB83C 48 00 00 28 */ b lbl_802CE924 -lbl_802CE900: -/* 802CE900 002CB840 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802CE904 002CB844 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE908 002CB848 41 82 00 08 */ beq lbl_802CE910 -/* 802CE90C 002CB84C 3B FF FF F4 */ addi r31, r31, -12 -lbl_802CE910: -/* 802CE910 002CB850 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE914 002CB854 40 82 FF D4 */ bne lbl_802CE8E8 -lbl_802CE918: -/* 802CE918 002CB858 7F A3 EB 78 */ mr r3, r29 -/* 802CE91C 002CB85C 48 00 00 08 */ b lbl_802CE924 -lbl_802CE920: -/* 802CE920 002CB860 38 60 00 00 */ li r3, 0 -lbl_802CE924: -/* 802CE924 002CB864 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE928 002CB868 48 09 39 01 */ bl _restgpr_29 -/* 802CE92C 002CB86C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CE930 002CB870 7C 08 03 A6 */ mtlr r0 -/* 802CE934 002CB874 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE938 002CB878 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE93C.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE93C.s deleted file mode 100644 index 1cc54899ea..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE93C.s +++ /dev/null @@ -1,48 +0,0 @@ -/* 802CE93C 002CB87C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE940 002CB880 7C 08 02 A6 */ mflr r0 -/* 802CE944 002CB884 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE948 002CB888 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE94C 002CB88C 48 09 38 91 */ bl _savegpr_29 -/* 802CE950 002CB890 7C 7D 1B 78 */ mr r29, r3 -/* 802CE954 002CB894 7C 9E 23 78 */ mr r30, r4 -/* 802CE958 002CB898 80 03 00 48 */ lwz r0, 0x48(r3) -/* 802CE95C 002CB89C 28 00 00 00 */ cmplwi r0, 0 -/* 802CE960 002CB8A0 41 82 00 48 */ beq lbl_802CE9A8 -/* 802CE964 002CB8A4 83 FD 00 40 */ lwz r31, 0x40(r29) -/* 802CE968 002CB8A8 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE96C 002CB8AC 41 82 00 34 */ beq lbl_802CE9A0 -/* 802CE970 002CB8B0 3B FF FF F4 */ addi r31, r31, -12 -/* 802CE974 002CB8B4 48 00 00 2C */ b lbl_802CE9A0 -lbl_802CE978: -/* 802CE978 002CB8B8 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802CE97C 002CB8BC 7F C4 F3 78 */ mr r4, r30 -/* 802CE980 002CB8C0 4B FF FF BD */ bl findAllHeap__7JKRHeapCFPv -/* 802CE984 002CB8C4 28 03 00 00 */ cmplwi r3, 0 -/* 802CE988 002CB8C8 41 82 00 08 */ beq lbl_802CE990 -/* 802CE98C 002CB8CC 48 00 00 40 */ b lbl_802CE9CC -lbl_802CE990: -/* 802CE990 002CB8D0 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802CE994 002CB8D4 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE998 002CB8D8 41 82 00 08 */ beq lbl_802CE9A0 -/* 802CE99C 002CB8DC 3B FF FF F4 */ addi r31, r31, -12 -lbl_802CE9A0: -/* 802CE9A0 002CB8E0 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE9A4 002CB8E4 40 82 FF D4 */ bne lbl_802CE978 -lbl_802CE9A8: -/* 802CE9A8 002CB8E8 80 1D 00 30 */ lwz r0, 0x30(r29) -/* 802CE9AC 002CB8EC 7C 00 F0 40 */ cmplw r0, r30 -/* 802CE9B0 002CB8F0 41 81 00 18 */ bgt lbl_802CE9C8 -/* 802CE9B4 002CB8F4 80 1D 00 34 */ lwz r0, 0x34(r29) -/* 802CE9B8 002CB8F8 7C 1E 00 40 */ cmplw r30, r0 -/* 802CE9BC 002CB8FC 40 80 00 0C */ bge lbl_802CE9C8 -/* 802CE9C0 002CB900 7F A3 EB 78 */ mr r3, r29 -/* 802CE9C4 002CB904 48 00 00 08 */ b lbl_802CE9CC -lbl_802CE9C8: -/* 802CE9C8 002CB908 38 60 00 00 */ li r3, 0 -lbl_802CE9CC: -/* 802CE9CC 002CB90C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE9D0 002CB910 48 09 38 59 */ bl _restgpr_29 -/* 802CE9D4 002CB914 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CE9D8 002CB918 7C 08 03 A6 */ mtlr r0 -/* 802CE9DC 002CB91C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE9E0 002CB920 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CE9E4.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CE9E4.s deleted file mode 100644 index 83b36b1daf..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CE9E4.s +++ /dev/null @@ -1,41 +0,0 @@ -/* 802CE9E4 002CB924 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE9E8 002CB928 7C 08 02 A6 */ mflr r0 -/* 802CE9EC 002CB92C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE9F0 002CB930 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE9F4 002CB934 48 09 37 E5 */ bl _savegpr_28 -/* 802CE9F8 002CB938 7C 7C 1B 78 */ mr r28, r3 -/* 802CE9FC 002CB93C 7C 9D 23 78 */ mr r29, r4 -/* 802CEA00 002CB940 7C BE 2B 78 */ mr r30, r5 -/* 802CEA04 002CB944 3B E0 00 00 */ li r31, 0 -/* 802CEA08 002CB948 80 83 00 5C */ lwz r4, 0x5c(r3) -/* 802CEA0C 002CB94C 48 00 00 4C */ b lbl_802CEA58 -lbl_802CEA10: -/* 802CEA10 002CB950 80 64 00 00 */ lwz r3, 0(r4) -/* 802CEA14 002CB954 7C 1D 18 40 */ cmplw r29, r3 -/* 802CEA18 002CB958 41 81 00 38 */ bgt lbl_802CEA50 -/* 802CEA1C 002CB95C 7C 03 F0 40 */ cmplw r3, r30 -/* 802CEA20 002CB960 40 80 00 30 */ bge lbl_802CEA50 -/* 802CEA24 002CB964 38 80 FF FF */ li r4, -1 -/* 802CEA28 002CB968 81 83 00 00 */ lwz r12, 0(r3) -/* 802CEA2C 002CB96C 81 8C 00 08 */ lwz r12, 8(r12) -/* 802CEA30 002CB970 7D 89 03 A6 */ mtctr r12 -/* 802CEA34 002CB974 4E 80 04 21 */ bctrl -/* 802CEA38 002CB978 28 1F 00 00 */ cmplwi r31, 0 -/* 802CEA3C 002CB97C 40 82 00 0C */ bne lbl_802CEA48 -/* 802CEA40 002CB980 80 9C 00 5C */ lwz r4, 0x5c(r28) -/* 802CEA44 002CB984 48 00 00 14 */ b lbl_802CEA58 -lbl_802CEA48: -/* 802CEA48 002CB988 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 802CEA4C 002CB98C 48 00 00 0C */ b lbl_802CEA58 -lbl_802CEA50: -/* 802CEA50 002CB990 7C 9F 23 78 */ mr r31, r4 -/* 802CEA54 002CB994 80 84 00 0C */ lwz r4, 0xc(r4) -lbl_802CEA58: -/* 802CEA58 002CB998 28 04 00 00 */ cmplwi r4, 0 -/* 802CEA5C 002CB99C 40 82 FF B4 */ bne lbl_802CEA10 -/* 802CEA60 002CB9A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CEA64 002CB9A4 48 09 37 C1 */ bl _restgpr_28 -/* 802CEA68 002CB9A8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CEA6C 002CB9AC 7C 08 03 A6 */ mtlr r0 -/* 802CEA70 002CB9B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CEA74 002CB9B4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CEA78.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CEA78.s deleted file mode 100644 index 196766d775..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CEA78.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 802CEA78 002CB9B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEA7C 002CB9BC 7C 08 02 A6 */ mflr r0 -/* 802CEA80 002CB9C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEA84 002CB9C4 7C A4 2A 14 */ add r5, r4, r5 -/* 802CEA88 002CB9C8 4B FF FF 5D */ bl dispose_subroutine__7JKRHeapFUlUl -/* 802CEA8C 002CB9CC 38 60 00 00 */ li r3, 0 -/* 802CEA90 002CB9D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEA94 002CB9D4 7C 08 03 A6 */ mtlr r0 -/* 802CEA98 002CB9D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEA9C 002CB9DC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CEAA0.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CEAA0.s deleted file mode 100644 index c47e380724..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CEAA0.s +++ /dev/null @@ -1,8 +0,0 @@ -/* 802CEAA0 002CB9E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEAA4 002CB9E4 7C 08 02 A6 */ mflr r0 -/* 802CEAA8 002CB9E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEAAC 002CB9EC 4B FF FF 39 */ bl dispose_subroutine__7JKRHeapFUlUl -/* 802CEAB0 002CB9F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEAB4 002CB9F4 7C 08 03 A6 */ mtlr r0 -/* 802CEAB8 002CB9F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEABC 002CB9FC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CEB18.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CEB18.s deleted file mode 100644 index 39714ae11a..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CEB18.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CEB18 002CBA58 38 05 00 03 */ addi r0, r5, 3 -/* 802CEB1C 002CBA5C 54 00 F0 BF */ rlwinm. r0, r0, 0x1e, 2, 0x1f -/* 802CEB20 002CBA60 7C 09 03 A6 */ mtctr r0 -/* 802CEB24 002CBA64 4D 82 00 20 */ beqlr -lbl_802CEB28: -/* 802CEB28 002CBA68 80 04 00 00 */ lwz r0, 0(r4) -/* 802CEB2C 002CBA6C 90 03 00 00 */ stw r0, 0(r3) -/* 802CEB30 002CBA70 38 63 00 04 */ addi r3, r3, 4 -/* 802CEB34 002CBA74 38 84 00 04 */ addi r4, r4, 4 -/* 802CEB38 002CBA78 42 00 FF F0 */ bdnz lbl_802CEB28 -/* 802CEB3C 002CBA7C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CEB40.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CEB40.s deleted file mode 100644 index 41b8934edd..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CEB40.s +++ /dev/null @@ -1,14 +0,0 @@ -/* 802CEB40 002CBA80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEB44 002CBA84 7C 08 02 A6 */ mflr r0 -/* 802CEB48 002CBA88 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEB4C 002CBA8C 3C 60 80 3A */ lis r3, lbl_8039CAD8@ha -/* 802CEB50 002CBA90 38 63 CA D8 */ addi r3, r3, lbl_8039CAD8@l -/* 802CEB54 002CBA94 38 80 03 3F */ li r4, 0x33f -/* 802CEB58 002CBA98 38 A3 00 0C */ addi r5, r3, 0xc -/* 802CEB5C 002CBA9C 38 C3 00 0F */ addi r6, r3, 0xf -/* 802CEB60 002CBAA0 4C C6 31 82 */ crclr 6 -/* 802CEB64 002CBAA4 48 01 36 99 */ bl JUTException_NS_panic_f -/* 802CEB68 002CBAA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEB6C 002CBAAC 7C 08 03 A6 */ mtlr r0 -/* 802CEB70 002CBAB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEB74 002CBAB4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CEB78.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CEB78.s deleted file mode 100644 index 2b219da5c6..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CEB78.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 802CEB78 002CBAB8 88 03 00 68 */ lbz r0, 0x68(r3) -/* 802CEB7C 002CBABC 98 83 00 68 */ stb r4, 0x68(r3) -/* 802CEB80 002CBAC0 7C 03 03 78 */ mr r3, r0 -/* 802CEB84 002CBAC4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CEB88.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CEB88.s deleted file mode 100644 index 13ec8a37af..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CEB88.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802CEB88 002CBAC8 80 0D 8D FC */ lwz r0, lbl_8045137C-_SDA_BASE_(r13) -/* 802CEB8C 002CBACC 28 03 00 00 */ cmplwi r3, 0 -/* 802CEB90 002CBAD0 40 82 00 0C */ bne lbl_802CEB9C -/* 802CEB94 002CBAD4 3C 60 80 2D */ lis r3, JKRDefaultMemoryErrorRoutine@ha -/* 802CEB98 002CBAD8 38 63 EB 40 */ addi r3, r3, JKRDefaultMemoryErrorRoutine@l -lbl_802CEB9C: -/* 802CEB9C 002CBADC 90 6D 8D FC */ stw r3, lbl_8045137C-_SDA_BASE_(r13) -/* 802CEBA0 002CBAE0 7C 03 03 78 */ mr r3, r0 -/* 802CEBA4 002CBAE4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CEBA8.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CEBA8.s deleted file mode 100644 index 43f8f0dce4..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CEBA8.s +++ /dev/null @@ -1,48 +0,0 @@ -/* 802CEBA8 002CBAE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEBAC 002CBAEC 7C 08 02 A6 */ mflr r0 -/* 802CEBB0 002CBAF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEBB4 002CBAF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802CEBB8 002CBAF8 93 C1 00 08 */ stw r30, 8(r1) -/* 802CEBBC 002CBAFC 7C 9E 23 79 */ or. r30, r4, r4 -/* 802CEBC0 002CBB00 40 82 00 0C */ bne lbl_802CEBCC -/* 802CEBC4 002CBB04 38 60 00 00 */ li r3, 0 -/* 802CEBC8 002CBB08 48 00 00 6C */ b lbl_802CEC34 -lbl_802CEBCC: -/* 802CEBCC 002CBB0C 80 03 00 48 */ lwz r0, 0x48(r3) -/* 802CEBD0 002CBB10 28 00 00 00 */ cmplwi r0, 0 -/* 802CEBD4 002CBB14 41 82 00 5C */ beq lbl_802CEC30 -/* 802CEBD8 002CBB18 83 E3 00 40 */ lwz r31, 0x40(r3) -/* 802CEBDC 002CBB1C 28 1F 00 00 */ cmplwi r31, 0 -/* 802CEBE0 002CBB20 41 82 00 48 */ beq lbl_802CEC28 -/* 802CEBE4 002CBB24 3B FF FF F4 */ addi r31, r31, -12 -/* 802CEBE8 002CBB28 48 00 00 40 */ b lbl_802CEC28 -lbl_802CEBEC: -/* 802CEBEC 002CBB2C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802CEBF0 002CBB30 7C 03 F0 40 */ cmplw r3, r30 -/* 802CEBF4 002CBB34 40 82 00 0C */ bne lbl_802CEC00 -/* 802CEBF8 002CBB38 38 60 00 01 */ li r3, 1 -/* 802CEBFC 002CBB3C 48 00 00 38 */ b lbl_802CEC34 -lbl_802CEC00: -/* 802CEC00 002CBB40 7F C4 F3 78 */ mr r4, r30 -/* 802CEC04 002CBB44 4B FF FF A5 */ bl isSubHeap__7JKRHeapCFP7JKRHeap -/* 802CEC08 002CBB48 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802CEC0C 002CBB4C 41 82 00 0C */ beq lbl_802CEC18 -/* 802CEC10 002CBB50 38 60 00 01 */ li r3, 1 -/* 802CEC14 002CBB54 48 00 00 20 */ b lbl_802CEC34 -lbl_802CEC18: -/* 802CEC18 002CBB58 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802CEC1C 002CBB5C 28 1F 00 00 */ cmplwi r31, 0 -/* 802CEC20 002CBB60 41 82 00 08 */ beq lbl_802CEC28 -/* 802CEC24 002CBB64 3B FF FF F4 */ addi r31, r31, -12 -lbl_802CEC28: -/* 802CEC28 002CBB68 28 1F 00 00 */ cmplwi r31, 0 -/* 802CEC2C 002CBB6C 40 82 FF C0 */ bne lbl_802CEBEC -lbl_802CEC30: -/* 802CEC30 002CBB70 38 60 00 00 */ li r3, 0 -lbl_802CEC34: -/* 802CEC34 002CBB74 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802CEC38 002CBB78 83 C1 00 08 */ lwz r30, 8(r1) -/* 802CEC3C 002CBB7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEC40 002CBB80 7C 08 03 A6 */ mtlr r0 -/* 802CEC44 002CBB84 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEC48 002CBB88 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CEC4C.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CEC4C.s deleted file mode 100644 index 96429baf31..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CEC4C.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 802CEC4C 002CBB8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEC50 002CBB90 7C 08 02 A6 */ mflr r0 -/* 802CEC54 002CBB94 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEC58 002CBB98 38 80 00 04 */ li r4, 4 -/* 802CEC5C 002CBB9C 38 A0 00 00 */ li r5, 0 -/* 802CEC60 002CBBA0 4B FF F8 15 */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802CEC64 002CBBA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEC68 002CBBA8 7C 08 03 A6 */ mtlr r0 -/* 802CEC6C 002CBBAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEC70 002CBBB0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CEC74.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CEC74.s deleted file mode 100644 index f439d28fea..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CEC74.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802CEC74 002CBBB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEC78 002CBBB8 7C 08 02 A6 */ mflr r0 -/* 802CEC7C 002CBBBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEC80 002CBBC0 38 A0 00 00 */ li r5, 0 -/* 802CEC84 002CBBC4 4B FF F7 F1 */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802CEC88 002CBBC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEC8C 002CBBCC 7C 08 03 A6 */ mtlr r0 -/* 802CEC90 002CBBD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEC94 002CBBD4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CEC98.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CEC98.s deleted file mode 100644 index 1dae5e8190..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CEC98.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CEC98 002CBBD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEC9C 002CBBDC 7C 08 02 A6 */ mflr r0 -/* 802CECA0 002CBBE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CECA4 002CBBE4 7C 80 23 78 */ mr r0, r4 -/* 802CECA8 002CBBE8 7C A4 2B 78 */ mr r4, r5 -/* 802CECAC 002CBBEC 7C 05 03 78 */ mr r5, r0 -/* 802CECB0 002CBBF0 4B FF F7 C5 */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802CECB4 002CBBF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CECB8 002CBBF8 7C 08 03 A6 */ mtlr r0 -/* 802CECBC 002CBBFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CECC0 002CBC00 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CECC4.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CECC4.s deleted file mode 100644 index 5d92bb6d97..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CECC4.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 802CECC4 002CBC04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CECC8 002CBC08 7C 08 02 A6 */ mflr r0 -/* 802CECCC 002CBC0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CECD0 002CBC10 38 80 00 04 */ li r4, 4 -/* 802CECD4 002CBC14 38 A0 00 00 */ li r5, 0 -/* 802CECD8 002CBC18 4B FF F7 9D */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802CECDC 002CBC1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CECE0 002CBC20 7C 08 03 A6 */ mtlr r0 -/* 802CECE4 002CBC24 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CECE8 002CBC28 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CECEC.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CECEC.s deleted file mode 100644 index ae4eb329e8..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CECEC.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802CECEC 002CBC2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CECF0 002CBC30 7C 08 02 A6 */ mflr r0 -/* 802CECF4 002CBC34 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CECF8 002CBC38 38 A0 00 00 */ li r5, 0 -/* 802CECFC 002CBC3C 4B FF F7 79 */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802CED00 002CBC40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CED04 002CBC44 7C 08 03 A6 */ mtlr r0 -/* 802CED08 002CBC48 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CED0C 002CBC4C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CED10.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CED10.s deleted file mode 100644 index b140e1aa32..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CED10.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802CED10 002CBC50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CED14 002CBC54 7C 08 02 A6 */ mflr r0 -/* 802CED18 002CBC58 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CED1C 002CBC5C 7C 80 23 78 */ mr r0, r4 -/* 802CED20 002CBC60 7C A4 2B 78 */ mr r4, r5 -/* 802CED24 002CBC64 7C 05 03 78 */ mr r5, r0 -/* 802CED28 002CBC68 4B FF F7 4D */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802CED2C 002CBC6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CED30 002CBC70 7C 08 03 A6 */ mtlr r0 -/* 802CED34 002CBC74 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CED38 002CBC78 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CED3C.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CED3C.s deleted file mode 100644 index 961e19f001..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CED3C.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802CED3C 002CBC7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CED40 002CBC80 7C 08 02 A6 */ mflr r0 -/* 802CED44 002CBC84 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CED48 002CBC88 38 80 00 00 */ li r4, 0 -/* 802CED4C 002CBC8C 4B FF F7 B5 */ bl free__7JKRHeapFPvP7JKRHeap -/* 802CED50 002CBC90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CED54 002CBC94 7C 08 03 A6 */ mtlr r0 -/* 802CED58 002CBC98 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CED5C 002CBC9C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRHeap/asm/func_802CED60.s b/include/JSystem/JKernel/JKRHeap/asm/func_802CED60.s deleted file mode 100644 index b3dbe03d51..0000000000 --- a/include/JSystem/JKernel/JKRHeap/asm/func_802CED60.s +++ /dev/null @@ -1,21 +0,0 @@ -/* 802CED60 002CBCA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CED64 002CBCA4 7C 08 02 A6 */ mflr r0 -/* 802CED68 002CBCA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CED6C 002CBCAC 38 80 00 00 */ li r4, 0 -/* 802CED70 002CBCB0 4B FF F7 91 */ bl free__7JKRHeapFPvP7JKRHeap -/* 802CED74 002CBCB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CED78 002CBCB8 7C 08 03 A6 */ mtlr r0 -/* 802CED7C 002CBCBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CED80 002CBCC0 4E 80 00 20 */ blr -/* 802CED84 002CBCC4 4E 80 00 20 */ blr -/* 802CED88 002CBCC8 80 64 00 04 */ lwz r3, 4(r4) -/* 802CED8C 002CBCCC 80 05 00 04 */ lwz r0, 4(r5) -/* 802CED90 002CBCD0 7C 03 00 50 */ subf r0, r3, r0 -/* 802CED94 002CBCD4 7C 00 00 34 */ cntlzw r0, r0 -/* 802CED98 002CBCD8 54 03 D9 7E */ srwi r3, r0, 5 -/* 802CED9C 002CBCDC 4E 80 00 20 */ blr -/* 802CEDA0 002CBCE0 4E 80 00 20 */ blr -/* 802CEDA4 002CBCE4 38 60 00 00 */ li r3, 0 -/* 802CEDA8 002CBCE8 4E 80 00 20 */ blr -/* 802CEDAC 002CBCEC 38 60 00 00 */ li r3, 0 -/* 802CEDB0 002CBCF0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D69B8.s b/include/JSystem/JKernel/JKRMemArchive/asm/func_802D69B8.s deleted file mode 100644 index 3e2eb8e2d8..0000000000 --- a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D69B8.s +++ /dev/null @@ -1,49 +0,0 @@ -/* __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection::__ct(long, JKRArchive::EMountDirection) */ -/* JKRMemArchive */ -/* 802D69B8 002D38F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D69BC 002D38FC 7C 08 02 A6 */ mflr r0 -/* 802D69C0 002D3900 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D69C4 002D3904 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D69C8 002D3908 48 08 B8 15 */ bl _savegpr_29 -/* 802D69CC 002D390C 7C 7D 1B 78 */ mr r29, r3 -/* 802D69D0 002D3910 7C 9E 23 78 */ mr r30, r4 -/* 802D69D4 002D3914 7C BF 2B 78 */ mr r31, r5 -/* 802D69D8 002D3918 38 A0 00 01 */ li r5, 1 -/* 802D69DC 002D391C 4B FF F8 B9 */ bl __ct__10JKRArchiveFlQ210JKRArchive10EMountMode -/* 802D69E0 002D3920 3C 60 80 3D */ lis r3, lbl_803CC2D8@ha -/* 802D69E4 002D3924 38 03 C2 D8 */ addi r0, r3, lbl_803CC2D8@l -/* 802D69E8 002D3928 90 1D 00 00 */ stw r0, 0(r29) -/* 802D69EC 002D392C 38 00 00 00 */ li r0, 0 -/* 802D69F0 002D3930 98 1D 00 30 */ stb r0, 0x30(r29) -/* 802D69F4 002D3934 93 FD 00 60 */ stw r31, 0x60(r29) -/* 802D69F8 002D3938 7F A3 EB 78 */ mr r3, r29 -/* 802D69FC 002D393C 7F C4 F3 78 */ mr r4, r30 -/* 802D6A00 002D3940 80 BD 00 60 */ lwz r5, 0x60(r29) -/* 802D6A04 002D3944 48 00 01 C9 */ bl open__13JKRMemArchiveFlQ210JKRArchive15EMountDirection -/* 802D6A08 002D3948 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802D6A0C 002D394C 40 82 00 0C */ bne lbl_802D6A18 -/* 802D6A10 002D3950 7F A3 EB 78 */ mr r3, r29 -/* 802D6A14 002D3954 48 00 00 40 */ b lbl_802D6A54 -lbl_802D6A18: -/* 802D6A18 002D3958 3C 60 52 41 */ lis r3, 0x52415243@ha -/* 802D6A1C 002D395C 38 03 52 43 */ addi r0, r3, 0x52415243@l -/* 802D6A20 002D3960 90 1D 00 2C */ stw r0, 0x2c(r29) -/* 802D6A24 002D3964 80 9D 00 54 */ lwz r4, 0x54(r29) -/* 802D6A28 002D3968 80 7D 00 48 */ lwz r3, 0x48(r29) -/* 802D6A2C 002D396C 80 03 00 04 */ lwz r0, 4(r3) -/* 802D6A30 002D3970 7C 04 02 14 */ add r0, r4, r0 -/* 802D6A34 002D3974 90 1D 00 28 */ stw r0, 0x28(r29) -/* 802D6A38 002D3978 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D6A3C 002D397C 38 63 43 54 */ addi r3, r3, sVolumeList__13JKRFileLoader@l -/* 802D6A40 002D3980 38 9D 00 18 */ addi r4, r29, 0x18 -/* 802D6A44 002D3984 48 00 55 AD */ bl prepend__10JSUPtrListFP10JSUPtrLink -/* 802D6A48 002D3988 38 00 00 01 */ li r0, 1 -/* 802D6A4C 002D398C 98 1D 00 30 */ stb r0, 0x30(r29) -/* 802D6A50 002D3990 7F A3 EB 78 */ mr r3, r29 -lbl_802D6A54: -/* 802D6A54 002D3994 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6A58 002D3998 48 08 B7 D1 */ bl _restgpr_29 -/* 802D6A5C 002D399C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D6A60 002D39A0 7C 08 03 A6 */ mtlr r0 -/* 802D6A64 002D39A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D6A68 002D39A8 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6A6C.s b/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6A6C.s deleted file mode 100644 index accaf35d29..0000000000 --- a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6A6C.s +++ /dev/null @@ -1,50 +0,0 @@ -/* __ct__13JKRMemArchiveFPvUl15JKRMemBreakFlag __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection::__ct(void *, unsigned long, JKRMemBreakFlag) */ -/* JKRMemArchive_X1_ */ -/* 802D6A6C 002D39AC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D6A70 002D39B0 7C 08 02 A6 */ mflr r0 -/* 802D6A74 002D39B4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D6A78 002D39B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6A7C 002D39BC 48 08 B7 5D */ bl _savegpr_28 -/* 802D6A80 002D39C0 7C 7C 1B 78 */ mr r28, r3 -/* 802D6A84 002D39C4 7C 9D 23 78 */ mr r29, r4 -/* 802D6A88 002D39C8 7C BE 2B 78 */ mr r30, r5 -/* 802D6A8C 002D39CC 7C DF 33 78 */ mr r31, r6 -/* 802D6A90 002D39D0 38 A0 00 01 */ li r5, 1 -/* 802D6A94 002D39D4 4B FF F8 01 */ bl __ct__10JKRArchiveFlQ210JKRArchive10EMountMode -/* 802D6A98 002D39D8 3C 60 80 3D */ lis r3, lbl_803CC2D8@ha -/* 802D6A9C 002D39DC 38 03 C2 D8 */ addi r0, r3, lbl_803CC2D8@l -/* 802D6AA0 002D39E0 90 1C 00 00 */ stw r0, 0(r28) -/* 802D6AA4 002D39E4 38 00 00 00 */ li r0, 0 -/* 802D6AA8 002D39E8 98 1C 00 30 */ stb r0, 0x30(r28) -/* 802D6AAC 002D39EC 7F 83 E3 78 */ mr r3, r28 -/* 802D6AB0 002D39F0 7F A4 EB 78 */ mr r4, r29 -/* 802D6AB4 002D39F4 7F C5 F3 78 */ mr r5, r30 -/* 802D6AB8 002D39F8 7F E6 FB 78 */ mr r6, r31 -/* 802D6ABC 002D39FC 48 00 02 75 */ bl open__13JKRMemArchiveFPvUl15JKRMemBreakFlag -/* 802D6AC0 002D3A00 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802D6AC4 002D3A04 40 82 00 0C */ bne lbl_802D6AD0 -/* 802D6AC8 002D3A08 7F 83 E3 78 */ mr r3, r28 -/* 802D6ACC 002D3A0C 48 00 00 40 */ b lbl_802D6B0C -lbl_802D6AD0: -/* 802D6AD0 002D3A10 3C 60 52 41 */ lis r3, 0x52415243@ha -/* 802D6AD4 002D3A14 38 03 52 43 */ addi r0, r3, 0x52415243@l -/* 802D6AD8 002D3A18 90 1C 00 2C */ stw r0, 0x2c(r28) -/* 802D6ADC 002D3A1C 80 9C 00 54 */ lwz r4, 0x54(r28) -/* 802D6AE0 002D3A20 80 7C 00 48 */ lwz r3, 0x48(r28) -/* 802D6AE4 002D3A24 80 03 00 04 */ lwz r0, 4(r3) -/* 802D6AE8 002D3A28 7C 04 02 14 */ add r0, r4, r0 -/* 802D6AEC 002D3A2C 90 1C 00 28 */ stw r0, 0x28(r28) -/* 802D6AF0 002D3A30 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D6AF4 002D3A34 38 63 43 54 */ addi r3, r3, sVolumeList__13JKRFileLoader@l -/* 802D6AF8 002D3A38 38 9C 00 18 */ addi r4, r28, 0x18 -/* 802D6AFC 002D3A3C 48 00 54 F5 */ bl prepend__10JSUPtrListFP10JSUPtrLink -/* 802D6B00 002D3A40 38 00 00 01 */ li r0, 1 -/* 802D6B04 002D3A44 98 1C 00 30 */ stb r0, 0x30(r28) -/* 802D6B08 002D3A48 7F 83 E3 78 */ mr r3, r28 -lbl_802D6B0C: -/* 802D6B0C 002D3A4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6B10 002D3A50 48 08 B7 15 */ bl _restgpr_28 -/* 802D6B14 002D3A54 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D6B18 002D3A58 7C 08 03 A6 */ mtlr r0 -/* 802D6B1C 002D3A5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D6B20 002D3A60 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6B24.s b/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6B24.s deleted file mode 100644 index d1c20dab69..0000000000 --- a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6B24.s +++ /dev/null @@ -1,47 +0,0 @@ -/* __dt__13JKRMemArchiveFv __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection::__dt(void) */ -/* missing reference */ -/* 802D6B24 002D3A64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D6B28 002D3A68 7C 08 02 A6 */ mflr r0 -/* 802D6B2C 002D3A6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D6B30 002D3A70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D6B34 002D3A74 93 C1 00 08 */ stw r30, 8(r1) -/* 802D6B38 002D3A78 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D6B3C 002D3A7C 7C 9F 23 78 */ mr r31, r4 -/* 802D6B40 002D3A80 41 82 00 70 */ beq lbl_802D6BB0 -/* 802D6B44 002D3A84 3C 60 80 3D */ lis r3, lbl_803CC2D8@ha -/* 802D6B48 002D3A88 38 03 C2 D8 */ addi r0, r3, lbl_803CC2D8@l -/* 802D6B4C 002D3A8C 90 1E 00 00 */ stw r0, 0(r30) -/* 802D6B50 002D3A90 88 1E 00 30 */ lbz r0, 0x30(r30) -/* 802D6B54 002D3A94 28 00 00 01 */ cmplwi r0, 1 -/* 802D6B58 002D3A98 40 82 00 3C */ bne lbl_802D6B94 -/* 802D6B5C 002D3A9C 88 1E 00 6C */ lbz r0, 0x6c(r30) -/* 802D6B60 002D3AA0 28 00 00 00 */ cmplwi r0, 0 -/* 802D6B64 002D3AA4 41 82 00 18 */ beq lbl_802D6B7C -/* 802D6B68 002D3AA8 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 802D6B6C 002D3AAC 28 03 00 00 */ cmplwi r3, 0 -/* 802D6B70 002D3AB0 41 82 00 0C */ beq lbl_802D6B7C -/* 802D6B74 002D3AB4 80 9E 00 38 */ lwz r4, 0x38(r30) -/* 802D6B78 002D3AB8 4B FF 79 89 */ bl free__7JKRHeapFPvP7JKRHeap -lbl_802D6B7C: -/* 802D6B7C 002D3ABC 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha -/* 802D6B80 002D3AC0 38 63 43 54 */ addi r3, r3, sVolumeList__13JKRFileLoader@l -/* 802D6B84 002D3AC4 38 9E 00 18 */ addi r4, r30, 0x18 -/* 802D6B88 002D3AC8 48 00 55 D5 */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802D6B8C 002D3ACC 38 00 00 00 */ li r0, 0 -/* 802D6B90 002D3AD0 98 1E 00 30 */ stb r0, 0x30(r30) -lbl_802D6B94: -/* 802D6B94 002D3AD4 7F C3 F3 78 */ mr r3, r30 -/* 802D6B98 002D3AD8 38 80 00 00 */ li r4, 0 -/* 802D6B9C 002D3ADC 4B FF F7 99 */ bl __dt__10JKRArchiveFv -/* 802D6BA0 002D3AE0 7F E0 07 35 */ extsh. r0, r31 -/* 802D6BA4 002D3AE4 40 81 00 0C */ ble lbl_802D6BB0 -/* 802D6BA8 002D3AE8 7F C3 F3 78 */ mr r3, r30 -/* 802D6BAC 002D3AEC 4B FF 81 91 */ bl __dl__FPv -lbl_802D6BB0: -/* 802D6BB0 002D3AF0 7F C3 F3 78 */ mr r3, r30 -/* 802D6BB4 002D3AF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D6BB8 002D3AF8 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D6BBC 002D3AFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D6BC0 002D3B00 7C 08 03 A6 */ mtlr r0 -/* 802D6BC4 002D3B04 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D6BC8 002D3B08 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6DDC.s b/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6DDC.s deleted file mode 100644 index 6cc00990ae..0000000000 --- a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6DDC.s +++ /dev/null @@ -1,17 +0,0 @@ -/* fetchResource__13JKRMemArchiveFP12SDIFileEntryPUl __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection::fetchResource(JKRArchive::SDIFileEntry *, unsigned long *) */ -/* missing reference */ -/* 802D6DDC 002D3D1C 80 04 00 10 */ lwz r0, 0x10(r4) -/* 802D6DE0 002D3D20 28 00 00 00 */ cmplwi r0, 0 -/* 802D6DE4 002D3D24 40 82 00 14 */ bne lbl_802D6DF8 -/* 802D6DE8 002D3D28 80 63 00 68 */ lwz r3, 0x68(r3) -/* 802D6DEC 002D3D2C 80 04 00 08 */ lwz r0, 8(r4) -/* 802D6DF0 002D3D30 7C 03 02 14 */ add r0, r3, r0 -/* 802D6DF4 002D3D34 90 04 00 10 */ stw r0, 0x10(r4) -lbl_802D6DF8: -/* 802D6DF8 002D3D38 28 05 00 00 */ cmplwi r5, 0 -/* 802D6DFC 002D3D3C 41 82 00 0C */ beq lbl_802D6E08 -/* 802D6E00 002D3D40 80 04 00 0C */ lwz r0, 0xc(r4) -/* 802D6E04 002D3D44 90 05 00 00 */ stw r0, 0(r5) -lbl_802D6E08: -/* 802D6E08 002D3D48 80 64 00 10 */ lwz r3, 0x10(r4) -/* 802D6E0C 002D3D4C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6E10.s b/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6E10.s deleted file mode 100644 index 129a0744e3..0000000000 --- a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6E10.s +++ /dev/null @@ -1,57 +0,0 @@ -/* fetchResource__13JKRMemArchiveFPvUlP12SDIFileEntryPUl __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection::fetchResource(void *, unsigned long, JKRArchive::SDIFileEntry *, unsigned long *) */ -/* missing reference */ -/* 802D6E10 002D3D50 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D6E14 002D3D54 7C 08 02 A6 */ mflr r0 -/* 802D6E18 002D3D58 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D6E1C 002D3D5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6E20 002D3D60 48 08 B3 BD */ bl _savegpr_29 -/* 802D6E24 002D3D64 7C 9D 23 78 */ mr r29, r4 -/* 802D6E28 002D3D68 7C A8 2B 78 */ mr r8, r5 -/* 802D6E2C 002D3D6C 7C FE 3B 78 */ mr r30, r7 -/* 802D6E30 002D3D70 83 E6 00 0C */ lwz r31, 0xc(r6) -/* 802D6E34 002D3D74 7C 1F 40 40 */ cmplw r31, r8 -/* 802D6E38 002D3D78 40 81 00 08 */ ble lbl_802D6E40 -/* 802D6E3C 002D3D7C 7D 1F 43 78 */ mr r31, r8 -lbl_802D6E40: -/* 802D6E40 002D3D80 80 86 00 10 */ lwz r4, 0x10(r6) -/* 802D6E44 002D3D84 28 04 00 00 */ cmplwi r4, 0 -/* 802D6E48 002D3D88 41 82 00 14 */ beq lbl_802D6E5C -/* 802D6E4C 002D3D8C 7F A3 EB 78 */ mr r3, r29 -/* 802D6E50 002D3D90 7F E5 FB 78 */ mr r5, r31 -/* 802D6E54 002D3D94 4B D2 C6 ED */ bl memcpy -/* 802D6E58 002D3D98 48 00 00 50 */ b lbl_802D6EA8 -lbl_802D6E5C: -/* 802D6E5C 002D3D9C 80 06 00 04 */ lwz r0, 4(r6) -/* 802D6E60 002D3DA0 54 04 46 3E */ srwi r4, r0, 0x18 -/* 802D6E64 002D3DA4 54 00 47 7B */ rlwinm. r0, r0, 8, 0x1d, 0x1d -/* 802D6E68 002D3DA8 40 82 00 0C */ bne lbl_802D6E74 -/* 802D6E6C 002D3DAC 38 E0 00 00 */ li r7, 0 -/* 802D6E70 002D3DB0 48 00 00 18 */ b lbl_802D6E88 -lbl_802D6E74: -/* 802D6E74 002D3DB4 54 80 06 31 */ rlwinm. r0, r4, 0, 0x18, 0x18 -/* 802D6E78 002D3DB8 41 82 00 0C */ beq lbl_802D6E84 -/* 802D6E7C 002D3DBC 38 E0 00 02 */ li r7, 2 -/* 802D6E80 002D3DC0 48 00 00 08 */ b lbl_802D6E88 -lbl_802D6E84: -/* 802D6E84 002D3DC4 38 E0 00 01 */ li r7, 1 -lbl_802D6E88: -/* 802D6E88 002D3DC8 80 63 00 68 */ lwz r3, 0x68(r3) -/* 802D6E8C 002D3DCC 80 06 00 08 */ lwz r0, 8(r6) -/* 802D6E90 002D3DD0 7C 63 02 14 */ add r3, r3, r0 -/* 802D6E94 002D3DD4 7F E4 FB 78 */ mr r4, r31 -/* 802D6E98 002D3DD8 7F A5 EB 78 */ mr r5, r29 -/* 802D6E9C 002D3DDC 7D 06 43 78 */ mr r6, r8 -/* 802D6EA0 002D3DE0 48 00 00 BD */ bl fetchResource_subroutine__13JKRMemArchiveFPUcUlPUcUli -/* 802D6EA4 002D3DE4 7C 7F 1B 78 */ mr r31, r3 -lbl_802D6EA8: -/* 802D6EA8 002D3DE8 28 1E 00 00 */ cmplwi r30, 0 -/* 802D6EAC 002D3DEC 41 82 00 08 */ beq lbl_802D6EB4 -/* 802D6EB0 002D3DF0 93 FE 00 00 */ stw r31, 0(r30) -lbl_802D6EB4: -/* 802D6EB4 002D3DF4 7F A3 EB 78 */ mr r3, r29 -/* 802D6EB8 002D3DF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6EBC 002D3DFC 48 08 B3 6D */ bl _restgpr_29 -/* 802D6EC0 002D3E00 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D6EC4 002D3E04 7C 08 03 A6 */ mtlr r0 -/* 802D6EC8 002D3E08 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D6ECC 002D3E0C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6ED0.s b/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6ED0.s deleted file mode 100644 index 7cc878c630..0000000000 --- a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6ED0.s +++ /dev/null @@ -1,25 +0,0 @@ -/* removeResourceAll__13JKRMemArchiveFv __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection::removeResourceAll(void) */ -/* missing reference */ -/* 802D6ED0 002D3E10 80 03 00 44 */ lwz r0, 0x44(r3) -/* 802D6ED4 002D3E14 28 00 00 00 */ cmplwi r0, 0 -/* 802D6ED8 002D3E18 4D 82 00 20 */ beqlr -/* 802D6EDC 002D3E1C 88 03 00 3C */ lbz r0, 0x3c(r3) -/* 802D6EE0 002D3E20 28 00 00 01 */ cmplwi r0, 1 -/* 802D6EE4 002D3E24 4D 82 00 20 */ beqlr -/* 802D6EE8 002D3E28 80 C3 00 4C */ lwz r6, 0x4c(r3) -/* 802D6EEC 002D3E2C 38 E0 00 00 */ li r7, 0 -/* 802D6EF0 002D3E30 38 A0 00 00 */ li r5, 0 -/* 802D6EF4 002D3E34 48 00 00 18 */ b lbl_802D6F0C -lbl_802D6EF8: -/* 802D6EF8 002D3E38 80 06 00 10 */ lwz r0, 0x10(r6) -/* 802D6EFC 002D3E3C 28 00 00 00 */ cmplwi r0, 0 -/* 802D6F00 002D3E40 41 82 00 08 */ beq lbl_802D6F08 -/* 802D6F04 002D3E44 90 A6 00 10 */ stw r5, 0x10(r6) -lbl_802D6F08: -/* 802D6F08 002D3E48 38 E7 00 01 */ addi r7, r7, 1 -lbl_802D6F0C: -/* 802D6F0C 002D3E4C 80 83 00 44 */ lwz r4, 0x44(r3) -/* 802D6F10 002D3E50 80 04 00 08 */ lwz r0, 8(r4) -/* 802D6F14 002D3E54 7C 07 00 40 */ cmplw r7, r0 -/* 802D6F18 002D3E58 41 80 FF E0 */ blt lbl_802D6EF8 -/* 802D6F1C 002D3E5C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6F20.s b/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6F20.s deleted file mode 100644 index 9b059d8756..0000000000 --- a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6F20.s +++ /dev/null @@ -1,19 +0,0 @@ -/* removeResource__13JKRMemArchiveFPv __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection::removeResource(void *) */ -/* missing reference */ -/* 802D6F20 002D3E60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D6F24 002D3E64 7C 08 02 A6 */ mflr r0 -/* 802D6F28 002D3E68 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D6F2C 002D3E6C 4B FF F8 09 */ bl findPtrResource__10JKRArchiveCFPCv -/* 802D6F30 002D3E70 28 03 00 00 */ cmplwi r3, 0 -/* 802D6F34 002D3E74 40 82 00 0C */ bne lbl_802D6F40 -/* 802D6F38 002D3E78 38 60 00 00 */ li r3, 0 -/* 802D6F3C 002D3E7C 48 00 00 10 */ b lbl_802D6F4C -lbl_802D6F40: -/* 802D6F40 002D3E80 38 00 00 00 */ li r0, 0 -/* 802D6F44 002D3E84 90 03 00 10 */ stw r0, 0x10(r3) -/* 802D6F48 002D3E88 38 60 00 01 */ li r3, 1 -lbl_802D6F4C: -/* 802D6F4C 002D3E8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D6F50 002D3E90 7C 08 03 A6 */ mtlr r0 -/* 802D6F54 002D3E94 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D6F58 002D3E98 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6F5C.s b/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6F5C.s deleted file mode 100644 index 7f6f9b4032..0000000000 --- a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D6F5C.s +++ /dev/null @@ -1,61 +0,0 @@ -/* fetchResource_subroutine__13JKRMemArchiveFPUcUlPUcUli __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection::fetchResource_subroutine(unsigned char *, unsigned long, unsigned char *, unsigned long, int) */ -/* JKRMemArchive_NS_fetchResource_subroutine */ -/* 802D6F5C 002D3E9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D6F60 002D3EA0 7C 08 02 A6 */ mflr r0 -/* 802D6F64 002D3EA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D6F68 002D3EA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D6F6C 002D3EAC 7C 68 1B 78 */ mr r8, r3 -/* 802D6F70 002D3EB0 7C 9F 23 78 */ mr r31, r4 -/* 802D6F74 002D3EB4 2C 07 00 00 */ cmpwi r7, 0 -/* 802D6F78 002D3EB8 41 82 00 14 */ beq lbl_802D6F8C -/* 802D6F7C 002D3EBC 41 80 00 80 */ blt lbl_802D6FFC -/* 802D6F80 002D3EC0 2C 07 00 03 */ cmpwi r7, 3 -/* 802D6F84 002D3EC4 40 80 00 78 */ bge lbl_802D6FFC -/* 802D6F88 002D3EC8 48 00 00 28 */ b lbl_802D6FB0 -lbl_802D6F8C: -/* 802D6F8C 002D3ECC 7C 1F 30 40 */ cmplw r31, r6 -/* 802D6F90 002D3ED0 40 81 00 08 */ ble lbl_802D6F98 -/* 802D6F94 002D3ED4 7C DF 33 78 */ mr r31, r6 -lbl_802D6F98: -/* 802D6F98 002D3ED8 7C A3 2B 78 */ mr r3, r5 -/* 802D6F9C 002D3EDC 7D 04 43 78 */ mr r4, r8 -/* 802D6FA0 002D3EE0 7F E5 FB 78 */ mr r5, r31 -/* 802D6FA4 002D3EE4 4B D2 C5 9D */ bl memcpy -/* 802D6FA8 002D3EE8 7F E3 FB 78 */ mr r3, r31 -/* 802D6FAC 002D3EEC 48 00 00 70 */ b lbl_802D701C -lbl_802D6FB0: -/* 802D6FB0 002D3EF0 88 E8 00 07 */ lbz r7, 7(r8) -/* 802D6FB4 002D3EF4 88 88 00 06 */ lbz r4, 6(r8) -/* 802D6FB8 002D3EF8 88 68 00 04 */ lbz r3, 4(r8) -/* 802D6FBC 002D3EFC 88 08 00 05 */ lbz r0, 5(r8) -/* 802D6FC0 002D3F00 54 00 80 1E */ slwi r0, r0, 0x10 -/* 802D6FC4 002D3F04 50 60 C0 0E */ rlwimi r0, r3, 0x18, 0, 7 -/* 802D6FC8 002D3F08 50 80 44 2E */ rlwimi r0, r4, 8, 0x10, 0x17 -/* 802D6FCC 002D3F0C 7C E0 03 78 */ or r0, r7, r0 -/* 802D6FD0 002D3F10 7C 1F 03 78 */ mr r31, r0 -/* 802D6FD4 002D3F14 7C 00 30 40 */ cmplw r0, r6 -/* 802D6FD8 002D3F18 40 81 00 08 */ ble lbl_802D6FE0 -/* 802D6FDC 002D3F1C 7C DF 33 78 */ mr r31, r6 -lbl_802D6FE0: -/* 802D6FE0 002D3F20 7D 03 43 78 */ mr r3, r8 -/* 802D6FE4 002D3F24 7C A4 2B 78 */ mr r4, r5 -/* 802D6FE8 002D3F28 7F E5 FB 78 */ mr r5, r31 -/* 802D6FEC 002D3F2C 38 C0 00 00 */ li r6, 0 -/* 802D6FF0 002D3F30 48 00 49 99 */ bl orderSync__9JKRDecompFPUcPUcUlUl -/* 802D6FF4 002D3F34 7F E3 FB 78 */ mr r3, r31 -/* 802D6FF8 002D3F38 48 00 00 24 */ b lbl_802D701C -lbl_802D6FFC: -/* 802D6FFC 002D3F3C 3C 60 80 3A */ lis r3, lbl_8039D160@ha -/* 802D7000 002D3F40 38 63 D1 60 */ addi r3, r3, lbl_8039D160@l -/* 802D7004 002D3F44 38 80 02 D3 */ li r4, 0x2d3 -/* 802D7008 002D3F48 38 A3 00 12 */ addi r5, r3, 0x12 -/* 802D700C 002D3F4C 38 C3 00 15 */ addi r6, r3, 0x15 -/* 802D7010 002D3F50 4C C6 31 82 */ crclr 6 -/* 802D7014 002D3F54 48 00 B1 E9 */ bl JUTException_NS_panic_f -/* 802D7018 002D3F58 38 60 00 00 */ li r3, 0 -lbl_802D701C: -/* 802D701C 002D3F5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D7020 002D3F60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D7024 002D3F64 7C 08 03 A6 */ mtlr r0 -/* 802D7028 002D3F68 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D702C 002D3F6C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D7030.s b/include/JSystem/JKernel/JKRMemArchive/asm/func_802D7030.s deleted file mode 100644 index bf41d79755..0000000000 --- a/include/JSystem/JKernel/JKRMemArchive/asm/func_802D7030.s +++ /dev/null @@ -1,41 +0,0 @@ -/* getExpandedResSize__13JKRMemArchiveCFPCv __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection::getExpandedResSize( const(void const *)) */ -/* missing reference */ -/* 802D7030 002D3F70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D7034 002D3F74 7C 08 02 A6 */ mflr r0 -/* 802D7038 002D3F78 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D703C 002D3F7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D7040 002D3F80 93 C1 00 08 */ stw r30, 8(r1) -/* 802D7044 002D3F84 7C 7E 1B 78 */ mr r30, r3 -/* 802D7048 002D3F88 7C 9F 23 78 */ mr r31, r4 -/* 802D704C 002D3F8C 4B FF F6 E9 */ bl findPtrResource__10JKRArchiveCFPCv -/* 802D7050 002D3F90 28 03 00 00 */ cmplwi r3, 0 -/* 802D7054 002D3F94 40 82 00 0C */ bne lbl_802D7060 -/* 802D7058 002D3F98 38 60 FF FF */ li r3, -1 -/* 802D705C 002D3F9C 48 00 00 4C */ b lbl_802D70A8 -lbl_802D7060: -/* 802D7060 002D3FA0 80 03 00 04 */ lwz r0, 4(r3) -/* 802D7064 002D3FA4 54 00 47 7B */ rlwinm. r0, r0, 8, 0x1d, 0x1d -/* 802D7068 002D3FA8 40 82 00 20 */ bne lbl_802D7088 -/* 802D706C 002D3FAC 7F C3 F3 78 */ mr r3, r30 -/* 802D7070 002D3FB0 7F E4 FB 78 */ mr r4, r31 -/* 802D7074 002D3FB4 81 9E 00 00 */ lwz r12, 0(r30) -/* 802D7078 002D3FB8 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802D707C 002D3FBC 7D 89 03 A6 */ mtctr r12 -/* 802D7080 002D3FC0 4E 80 04 21 */ bctrl -/* 802D7084 002D3FC4 48 00 00 24 */ b lbl_802D70A8 -lbl_802D7088: -/* 802D7088 002D3FC8 88 BF 00 07 */ lbz r5, 7(r31) -/* 802D708C 002D3FCC 88 9F 00 06 */ lbz r4, 6(r31) -/* 802D7090 002D3FD0 88 7F 00 04 */ lbz r3, 4(r31) -/* 802D7094 002D3FD4 88 1F 00 05 */ lbz r0, 5(r31) -/* 802D7098 002D3FD8 54 00 80 1E */ slwi r0, r0, 0x10 -/* 802D709C 002D3FDC 50 60 C0 0E */ rlwimi r0, r3, 0x18, 0, 7 -/* 802D70A0 002D3FE0 50 80 44 2E */ rlwimi r0, r4, 8, 0x10, 0x17 -/* 802D70A4 002D3FE4 7C A3 03 78 */ or r3, r5, r0 -lbl_802D70A8: -/* 802D70A8 002D3FE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D70AC 002D3FEC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D70B0 002D3FF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D70B4 002D3FF4 7C 08 03 A6 */ mtlr r0 -/* 802D70B8 002D3FF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D70BC 002D3FFC 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D1568.s b/include/JSystem/JKernel/JKRThread/asm/func_802D1568.s deleted file mode 100644 index f801a64280..0000000000 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D1568.s +++ /dev/null @@ -1,43 +0,0 @@ -/* 802D1568 002CE4A8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D156C 002CE4AC 7C 08 02 A6 */ mflr r0 -/* 802D1570 002CE4B0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D1574 002CE4B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D1578 002CE4B8 48 09 0C 61 */ bl _savegpr_28 -/* 802D157C 002CE4BC 7C 7C 1B 78 */ mr r28, r3 -/* 802D1580 002CE4C0 7C 9D 23 78 */ mr r29, r4 -/* 802D1584 002CE4C4 7C BE 2B 78 */ mr r30, r5 -/* 802D1588 002CE4C8 7C DF 33 78 */ mr r31, r6 -/* 802D158C 002CE4CC 4B FF FE F1 */ bl __ct__11JKRDisposerFv -/* 802D1590 002CE4D0 3C 60 80 3D */ lis r3, lbl_803CC114@ha -/* 802D1594 002CE4D4 38 03 C1 14 */ addi r0, r3, lbl_803CC114@l -/* 802D1598 002CE4D8 90 1C 00 00 */ stw r0, 0(r28) -/* 802D159C 002CE4DC 38 7C 00 18 */ addi r3, r28, 0x18 -/* 802D15A0 002CE4E0 7F 84 E3 78 */ mr r4, r28 -/* 802D15A4 002CE4E4 48 00 A8 59 */ bl __ct__10JSUPtrLinkFPv -/* 802D15A8 002CE4E8 38 00 00 00 */ li r0, 0 -/* 802D15AC 002CE4EC 90 1C 00 68 */ stw r0, 0x68(r28) -/* 802D15B0 002CE4F0 90 1C 00 64 */ stw r0, 0x64(r28) -/* 802D15B4 002CE4F4 90 1C 00 6C */ stw r0, 0x6c(r28) -/* 802D15B8 002CE4F8 98 1C 00 60 */ stb r0, 0x60(r28) -/* 802D15BC 002CE4FC 90 1C 00 70 */ stw r0, 0x70(r28) -/* 802D15C0 002CE500 7F 83 E3 78 */ mr r3, r28 -/* 802D15C4 002CE504 4B FF D2 79 */ bl findFromRoot__7JKRHeapFPv -/* 802D15C8 002CE508 7C 64 1B 79 */ or. r4, r3, r3 -/* 802D15CC 002CE50C 40 82 00 08 */ bne lbl_802D15D4 -/* 802D15D0 002CE510 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -lbl_802D15D4: -/* 802D15D4 002CE514 7F 83 E3 78 */ mr r3, r28 -/* 802D15D8 002CE518 7F A5 EB 78 */ mr r5, r29 -/* 802D15DC 002CE51C 7F E6 FB 78 */ mr r6, r31 -/* 802D15E0 002CE520 48 00 02 C5 */ bl setCommon_heapSpecified__9JKRThreadFP7JKRHeapUli -/* 802D15E4 002CE524 7F 83 E3 78 */ mr r3, r28 -/* 802D15E8 002CE528 80 9C 00 28 */ lwz r4, 0x28(r28) -/* 802D15EC 002CE52C 7F C5 F3 78 */ mr r5, r30 -/* 802D15F0 002CE530 48 00 02 41 */ bl setCommon_mesgQueue__9JKRThreadFP7JKRHeapi -/* 802D15F4 002CE534 7F 83 E3 78 */ mr r3, r28 -/* 802D15F8 002CE538 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D15FC 002CE53C 48 09 0C 29 */ bl _restgpr_28 -/* 802D1600 002CE540 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D1604 002CE544 7C 08 03 A6 */ mtlr r0 -/* 802D1608 002CE548 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D160C 002CE54C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D1610.s b/include/JSystem/JKernel/JKRThread/asm/func_802D1610.s deleted file mode 100644 index 17eccb5a2a..0000000000 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D1610.s +++ /dev/null @@ -1,43 +0,0 @@ -/* 802D1610 002CE550 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D1614 002CE554 7C 08 02 A6 */ mflr r0 -/* 802D1618 002CE558 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D161C 002CE55C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D1620 002CE560 48 09 0B B5 */ bl _savegpr_27 -/* 802D1624 002CE564 7C 7B 1B 78 */ mr r27, r3 -/* 802D1628 002CE568 7C 9C 23 78 */ mr r28, r4 -/* 802D162C 002CE56C 7C BD 2B 78 */ mr r29, r5 -/* 802D1630 002CE570 7C DE 33 78 */ mr r30, r6 -/* 802D1634 002CE574 7C FF 3B 78 */ mr r31, r7 -/* 802D1638 002CE578 4B FF FE 45 */ bl __ct__11JKRDisposerFv -/* 802D163C 002CE57C 3C 60 80 3D */ lis r3, lbl_803CC114@ha -/* 802D1640 002CE580 38 03 C1 14 */ addi r0, r3, lbl_803CC114@l -/* 802D1644 002CE584 90 1B 00 00 */ stw r0, 0(r27) -/* 802D1648 002CE588 38 7B 00 18 */ addi r3, r27, 0x18 -/* 802D164C 002CE58C 7F 64 DB 78 */ mr r4, r27 -/* 802D1650 002CE590 48 00 A7 AD */ bl __ct__10JSUPtrLinkFPv -/* 802D1654 002CE594 38 00 00 00 */ li r0, 0 -/* 802D1658 002CE598 90 1B 00 68 */ stw r0, 0x68(r27) -/* 802D165C 002CE59C 90 1B 00 64 */ stw r0, 0x64(r27) -/* 802D1660 002CE5A0 90 1B 00 6C */ stw r0, 0x6c(r27) -/* 802D1664 002CE5A4 98 1B 00 60 */ stb r0, 0x60(r27) -/* 802D1668 002CE5A8 90 1B 00 70 */ stw r0, 0x70(r27) -/* 802D166C 002CE5AC 28 1C 00 00 */ cmplwi r28, 0 -/* 802D1670 002CE5B0 40 82 00 08 */ bne lbl_802D1678 -/* 802D1674 002CE5B4 83 8D 8D F4 */ lwz r28, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13) -lbl_802D1678: -/* 802D1678 002CE5B8 7F 63 DB 78 */ mr r3, r27 -/* 802D167C 002CE5BC 7F 84 E3 78 */ mr r4, r28 -/* 802D1680 002CE5C0 7F A5 EB 78 */ mr r5, r29 -/* 802D1684 002CE5C4 7F E6 FB 78 */ mr r6, r31 -/* 802D1688 002CE5C8 48 00 02 1D */ bl setCommon_heapSpecified__9JKRThreadFP7JKRHeapUli -/* 802D168C 002CE5CC 7F 63 DB 78 */ mr r3, r27 -/* 802D1690 002CE5D0 80 9B 00 28 */ lwz r4, 0x28(r27) -/* 802D1694 002CE5D4 7F C5 F3 78 */ mr r5, r30 -/* 802D1698 002CE5D8 48 00 01 99 */ bl setCommon_mesgQueue__9JKRThreadFP7JKRHeapi -/* 802D169C 002CE5DC 7F 63 DB 78 */ mr r3, r27 -/* 802D16A0 002CE5E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D16A4 002CE5E4 48 09 0B 7D */ bl _restgpr_27 -/* 802D16A8 002CE5E8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D16AC 002CE5EC 7C 08 03 A6 */ mtlr r0 -/* 802D16B0 002CE5F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D16B4 002CE5F4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D16B8.s b/include/JSystem/JKernel/JKRThread/asm/func_802D16B8.s deleted file mode 100644 index 6ada92de13..0000000000 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D16B8.s +++ /dev/null @@ -1,40 +0,0 @@ -/* 802D16B8 002CE5F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802D16BC 002CE5FC 7C 08 02 A6 */ mflr r0 -/* 802D16C0 002CE600 90 01 00 24 */ stw r0, 0x24(r1) -/* 802D16C4 002CE604 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D16C8 002CE608 48 09 0B 15 */ bl _savegpr_29 -/* 802D16CC 002CE60C 7C 7D 1B 78 */ mr r29, r3 -/* 802D16D0 002CE610 7C 9E 23 78 */ mr r30, r4 -/* 802D16D4 002CE614 7C BF 2B 78 */ mr r31, r5 -/* 802D16D8 002CE618 4B FF FD A5 */ bl __ct__11JKRDisposerFv -/* 802D16DC 002CE61C 3C 60 80 3D */ lis r3, lbl_803CC114@ha -/* 802D16E0 002CE620 38 03 C1 14 */ addi r0, r3, lbl_803CC114@l -/* 802D16E4 002CE624 90 1D 00 00 */ stw r0, 0(r29) -/* 802D16E8 002CE628 38 7D 00 18 */ addi r3, r29, 0x18 -/* 802D16EC 002CE62C 7F A4 EB 78 */ mr r4, r29 -/* 802D16F0 002CE630 48 00 A7 0D */ bl __ct__10JSUPtrLinkFPv -/* 802D16F4 002CE634 38 00 00 00 */ li r0, 0 -/* 802D16F8 002CE638 90 1D 00 68 */ stw r0, 0x68(r29) -/* 802D16FC 002CE63C 90 1D 00 64 */ stw r0, 0x64(r29) -/* 802D1700 002CE640 90 1D 00 6C */ stw r0, 0x6c(r29) -/* 802D1704 002CE644 98 1D 00 60 */ stb r0, 0x60(r29) -/* 802D1708 002CE648 90 1D 00 70 */ stw r0, 0x70(r29) -/* 802D170C 002CE64C 90 1D 00 28 */ stw r0, 0x28(r29) -/* 802D1710 002CE650 93 DD 00 2C */ stw r30, 0x2c(r29) -/* 802D1714 002CE654 80 7E 03 04 */ lwz r3, 0x304(r30) -/* 802D1718 002CE658 80 1E 03 08 */ lwz r0, 0x308(r30) -/* 802D171C 002CE65C 7C 03 00 50 */ subf r0, r3, r0 -/* 802D1720 002CE660 90 1D 00 5C */ stw r0, 0x5c(r29) -/* 802D1724 002CE664 80 1E 03 04 */ lwz r0, 0x304(r30) -/* 802D1728 002CE668 90 1D 00 58 */ stw r0, 0x58(r29) -/* 802D172C 002CE66C 7F A3 EB 78 */ mr r3, r29 -/* 802D1730 002CE670 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -/* 802D1734 002CE674 7F E5 FB 78 */ mr r5, r31 -/* 802D1738 002CE678 48 00 00 F9 */ bl setCommon_mesgQueue__9JKRThreadFP7JKRHeapi -/* 802D173C 002CE67C 7F A3 EB 78 */ mr r3, r29 -/* 802D1740 002CE680 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D1744 002CE684 48 09 0A E5 */ bl _restgpr_29 -/* 802D1748 002CE688 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802D174C 002CE68C 7C 08 03 A6 */ mtlr r0 -/* 802D1750 002CE690 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D1754 002CE694 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D1758.s b/include/JSystem/JKernel/JKRThread/asm/func_802D1758.s deleted file mode 100644 index 8063508fe0..0000000000 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D1758.s +++ /dev/null @@ -1,58 +0,0 @@ -/* 802D1758 002CE698 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D175C 002CE69C 7C 08 02 A6 */ mflr r0 -/* 802D1760 002CE6A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D1764 002CE6A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D1768 002CE6A8 93 C1 00 08 */ stw r30, 8(r1) -/* 802D176C 002CE6AC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D1770 002CE6B0 7C 9F 23 78 */ mr r31, r4 -/* 802D1774 002CE6B4 41 82 00 A0 */ beq lbl_802D1814 -/* 802D1778 002CE6B8 3C 60 80 3D */ lis r3, lbl_803CC114@ha -/* 802D177C 002CE6BC 38 03 C1 14 */ addi r0, r3, lbl_803CC114@l -/* 802D1780 002CE6C0 90 1E 00 00 */ stw r0, 0(r30) -/* 802D1784 002CE6C4 3C 60 80 43 */ lis r3, sThreadList__9JKRThread@ha -/* 802D1788 002CE6C8 38 63 42 8C */ addi r3, r3, sThreadList__9JKRThread@l -/* 802D178C 002CE6CC 38 9E 00 18 */ addi r4, r30, 0x18 -/* 802D1790 002CE6D0 48 00 A9 CD */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802D1794 002CE6D4 80 1E 00 28 */ lwz r0, 0x28(r30) -/* 802D1798 002CE6D8 28 00 00 00 */ cmplwi r0, 0 -/* 802D179C 002CE6DC 41 82 00 3C */ beq lbl_802D17D8 -/* 802D17A0 002CE6E0 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 802D17A4 002CE6E4 48 06 F4 ED */ bl OSIsThreadTerminated -/* 802D17A8 002CE6E8 2C 03 00 00 */ cmpwi r3, 0 -/* 802D17AC 002CE6EC 40 82 00 14 */ bne lbl_802D17C0 -/* 802D17B0 002CE6F0 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 802D17B4 002CE6F4 48 06 FF 61 */ bl OSDetachThread -/* 802D17B8 002CE6F8 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 802D17BC 002CE6FC 48 06 FD 9D */ bl OSCancelThread -lbl_802D17C0: -/* 802D17C0 002CE700 80 7E 00 58 */ lwz r3, 0x58(r30) -/* 802D17C4 002CE704 80 9E 00 28 */ lwz r4, 0x28(r30) -/* 802D17C8 002CE708 4B FF CD 39 */ bl free__7JKRHeapFPvP7JKRHeap -/* 802D17CC 002CE70C 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 802D17D0 002CE710 80 9E 00 28 */ lwz r4, 0x28(r30) -/* 802D17D4 002CE714 4B FF CD 2D */ bl free__7JKRHeapFPvP7JKRHeap -lbl_802D17D8: -/* 802D17D8 002CE718 80 7E 00 50 */ lwz r3, 0x50(r30) -/* 802D17DC 002CE71C 38 80 00 00 */ li r4, 0 -/* 802D17E0 002CE720 4B FF CD 21 */ bl free__7JKRHeapFPvP7JKRHeap -/* 802D17E4 002CE724 34 1E 00 18 */ addic. r0, r30, 0x18 -/* 802D17E8 002CE728 41 82 00 10 */ beq lbl_802D17F8 -/* 802D17EC 002CE72C 38 7E 00 18 */ addi r3, r30, 0x18 -/* 802D17F0 002CE730 38 80 00 00 */ li r4, 0 -/* 802D17F4 002CE734 48 00 A6 21 */ bl __dt__10JSUPtrLinkFv -lbl_802D17F8: -/* 802D17F8 002CE738 7F C3 F3 78 */ mr r3, r30 -/* 802D17FC 002CE73C 38 80 00 00 */ li r4, 0 -/* 802D1800 002CE740 4B FF FC E5 */ bl __dt__11JKRDisposerFv -/* 802D1804 002CE744 7F E0 07 35 */ extsh. r0, r31 -/* 802D1808 002CE748 40 81 00 0C */ ble lbl_802D1814 -/* 802D180C 002CE74C 7F C3 F3 78 */ mr r3, r30 -/* 802D1810 002CE750 4B FF D5 2D */ bl __dl__FPv -lbl_802D1814: -/* 802D1814 002CE754 7F C3 F3 78 */ mr r3, r30 -/* 802D1818 002CE758 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D181C 002CE75C 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D1820 002CE760 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D1824 002CE764 7C 08 03 A6 */ mtlr r0 -/* 802D1828 002CE768 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D182C 002CE76C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D1830.s b/include/JSystem/JKernel/JKRThread/asm/func_802D1830.s deleted file mode 100644 index 27035c7650..0000000000 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D1830.s +++ /dev/null @@ -1,29 +0,0 @@ -/* 802D1830 002CE770 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D1834 002CE774 7C 08 02 A6 */ mflr r0 -/* 802D1838 002CE778 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D183C 002CE77C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D1840 002CE780 7C 7F 1B 78 */ mr r31, r3 -/* 802D1844 002CE784 7C 86 23 78 */ mr r6, r4 -/* 802D1848 002CE788 90 A3 00 54 */ stw r5, 0x54(r3) -/* 802D184C 002CE78C 80 03 00 54 */ lwz r0, 0x54(r3) -/* 802D1850 002CE790 54 03 10 3A */ slwi r3, r0, 2 -/* 802D1854 002CE794 38 80 00 00 */ li r4, 0 -/* 802D1858 002CE798 7C C5 33 78 */ mr r5, r6 -/* 802D185C 002CE79C 4B FF CC 19 */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802D1860 002CE7A0 90 7F 00 50 */ stw r3, 0x50(r31) -/* 802D1864 002CE7A4 38 7F 00 30 */ addi r3, r31, 0x30 -/* 802D1868 002CE7A8 80 9F 00 50 */ lwz r4, 0x50(r31) -/* 802D186C 002CE7AC 80 BF 00 54 */ lwz r5, 0x54(r31) -/* 802D1870 002CE7B0 48 06 D1 25 */ bl OSInitMessageQueue -/* 802D1874 002CE7B4 3C 60 80 43 */ lis r3, sThreadList__9JKRThread@ha -/* 802D1878 002CE7B8 38 63 42 8C */ addi r3, r3, sThreadList__9JKRThread@l -/* 802D187C 002CE7BC 38 9F 00 18 */ addi r4, r31, 0x18 -/* 802D1880 002CE7C0 48 00 A6 CD */ bl append__10JSUPtrListFP10JSUPtrLink -/* 802D1884 002CE7C4 38 00 00 00 */ li r0, 0 -/* 802D1888 002CE7C8 90 1F 00 74 */ stw r0, 0x74(r31) -/* 802D188C 002CE7CC 90 1F 00 78 */ stw r0, 0x78(r31) -/* 802D1890 002CE7D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D1894 002CE7D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D1898 002CE7D8 7C 08 03 A6 */ mtlr r0 -/* 802D189C 002CE7DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D18A0 002CE7E0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D18A4.s b/include/JSystem/JKernel/JKRThread/asm/func_802D18A4.s deleted file mode 100644 index 63b6d1dcac..0000000000 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D18A4.s +++ /dev/null @@ -1,36 +0,0 @@ -/* 802D18A4 002CE7E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D18A8 002CE7E8 7C 08 02 A6 */ mflr r0 -/* 802D18AC 002CE7EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D18B0 002CE7F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D18B4 002CE7F4 93 C1 00 08 */ stw r30, 8(r1) -/* 802D18B8 002CE7F8 7C 7E 1B 78 */ mr r30, r3 -/* 802D18BC 002CE7FC 7C DF 33 78 */ mr r31, r6 -/* 802D18C0 002CE800 90 83 00 28 */ stw r4, 0x28(r3) -/* 802D18C4 002CE804 54 A0 00 34 */ rlwinm r0, r5, 0, 0, 0x1a -/* 802D18C8 002CE808 90 03 00 5C */ stw r0, 0x5c(r3) -/* 802D18CC 002CE80C 80 63 00 5C */ lwz r3, 0x5c(r3) -/* 802D18D0 002CE810 38 80 00 20 */ li r4, 0x20 -/* 802D18D4 002CE814 80 BE 00 28 */ lwz r5, 0x28(r30) -/* 802D18D8 002CE818 4B FF CB 9D */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802D18DC 002CE81C 90 7E 00 58 */ stw r3, 0x58(r30) -/* 802D18E0 002CE820 38 60 03 18 */ li r3, 0x318 -/* 802D18E4 002CE824 38 80 00 20 */ li r4, 0x20 -/* 802D18E8 002CE828 80 BE 00 28 */ lwz r5, 0x28(r30) -/* 802D18EC 002CE82C 4B FF CB 89 */ bl alloc__7JKRHeapFUliP7JKRHeap -/* 802D18F0 002CE830 90 7E 00 2C */ stw r3, 0x2c(r30) -/* 802D18F4 002CE834 80 FE 00 5C */ lwz r7, 0x5c(r30) -/* 802D18F8 002CE838 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 802D18FC 002CE83C 3C 80 80 2D */ lis r4, start__9JKRThreadFPv@ha -/* 802D1900 002CE840 38 84 19 34 */ addi r4, r4, start__9JKRThreadFPv@l -/* 802D1904 002CE844 7F C5 F3 78 */ mr r5, r30 -/* 802D1908 002CE848 80 1E 00 58 */ lwz r0, 0x58(r30) -/* 802D190C 002CE84C 7C C0 3A 14 */ add r6, r0, r7 -/* 802D1910 002CE850 7F E8 FB 78 */ mr r8, r31 -/* 802D1914 002CE854 39 20 00 01 */ li r9, 1 -/* 802D1918 002CE858 48 06 F9 75 */ bl OSCreateThread -/* 802D191C 002CE85C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D1920 002CE860 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D1924 002CE864 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D1928 002CE868 7C 08 03 A6 */ mtlr r0 -/* 802D192C 002CE86C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D1930 002CE870 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D1934.s b/include/JSystem/JKernel/JKRThread/asm/func_802D1934.s deleted file mode 100644 index 2a7763fc68..0000000000 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D1934.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 802D1934 002CE874 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D1938 002CE878 7C 08 02 A6 */ mflr r0 -/* 802D193C 002CE87C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D1940 002CE880 81 83 00 00 */ lwz r12, 0(r3) -/* 802D1944 002CE884 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802D1948 002CE888 7D 89 03 A6 */ mtctr r12 -/* 802D194C 002CE88C 4E 80 04 21 */ bctrl -/* 802D1950 002CE890 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D1954 002CE894 7C 08 03 A6 */ mtlr r0 -/* 802D1958 002CE898 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D195C 002CE89C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D1960.s b/include/JSystem/JKernel/JKRThread/asm/func_802D1960.s deleted file mode 100644 index 7448a8d482..0000000000 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D1960.s +++ /dev/null @@ -1,18 +0,0 @@ -/* 802D1960 002CE8A0 3C 80 80 43 */ lis r4, sThreadList__9JKRThread@ha -/* 802D1964 002CE8A4 38 84 42 8C */ addi r4, r4, sThreadList__9JKRThread@l -/* 802D1968 002CE8A8 80 84 00 00 */ lwz r4, 0(r4) -/* 802D196C 002CE8AC 48 00 00 20 */ b lbl_802D198C -lbl_802D1970: -/* 802D1970 002CE8B0 80 A4 00 00 */ lwz r5, 0(r4) -/* 802D1974 002CE8B4 80 05 00 2C */ lwz r0, 0x2c(r5) -/* 802D1978 002CE8B8 7C 00 18 40 */ cmplw r0, r3 -/* 802D197C 002CE8BC 40 82 00 0C */ bne lbl_802D1988 -/* 802D1980 002CE8C0 7C A3 2B 78 */ mr r3, r5 -/* 802D1984 002CE8C4 4E 80 00 20 */ blr -lbl_802D1988: -/* 802D1988 002CE8C8 80 84 00 0C */ lwz r4, 0xc(r4) -lbl_802D198C: -/* 802D198C 002CE8CC 28 04 00 00 */ cmplwi r4, 0 -/* 802D1990 002CE8D0 40 82 FF E0 */ bne lbl_802D1970 -/* 802D1994 002CE8D4 38 60 00 00 */ li r3, 0 -/* 802D1998 002CE8D8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D1E14.s b/include/JSystem/JKernel/JKRThread/asm/func_802D1E14.s deleted file mode 100644 index fcf11351e7..0000000000 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D1E14.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 802D1E14 002CED54 38 60 00 00 */ li r3, 0 -/* 802D1E18 002CED58 4E 80 00 20 */ blr diff --git a/include/JSystem/JSupport/JSUList/asm/func_802DBDFC.s b/include/JSystem/JSupport/JSUList/asm/func_802DBDFC.s deleted file mode 100644 index 82e4a6f203..0000000000 --- a/include/JSystem/JSupport/JSUList/asm/func_802DBDFC.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 802DBDFC 002D8D3C 38 00 00 00 */ li r0, 0 -/* 802DBE00 002D8D40 90 03 00 04 */ stw r0, 4(r3) -/* 802DBE04 002D8D44 90 83 00 00 */ stw r4, 0(r3) -/* 802DBE08 002D8D48 90 03 00 08 */ stw r0, 8(r3) -/* 802DBE0C 002D8D4C 90 03 00 0C */ stw r0, 0xc(r3) -/* 802DBE10 002D8D50 4E 80 00 20 */ blr diff --git a/include/JSystem/JSupport/JSUList/asm/func_802DBE14.s b/include/JSystem/JSupport/JSUList/asm/func_802DBE14.s deleted file mode 100644 index 998575f093..0000000000 --- a/include/JSystem/JSupport/JSUList/asm/func_802DBE14.s +++ /dev/null @@ -1,26 +0,0 @@ -/* 802DBE14 002D8D54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DBE18 002D8D58 7C 08 02 A6 */ mflr r0 -/* 802DBE1C 002D8D5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DBE20 002D8D60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DBE24 002D8D64 93 C1 00 08 */ stw r30, 8(r1) -/* 802DBE28 002D8D68 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802DBE2C 002D8D6C 7C 9F 23 78 */ mr r31, r4 -/* 802DBE30 002D8D70 41 82 00 28 */ beq lbl_802DBE58 -/* 802DBE34 002D8D74 80 7E 00 04 */ lwz r3, 4(r30) -/* 802DBE38 002D8D78 28 03 00 00 */ cmplwi r3, 0 -/* 802DBE3C 002D8D7C 41 82 00 0C */ beq lbl_802DBE48 -/* 802DBE40 002D8D80 7F C4 F3 78 */ mr r4, r30 -/* 802DBE44 002D8D84 48 00 03 19 */ bl remove__10JSUPtrListFP10JSUPtrLink -lbl_802DBE48: -/* 802DBE48 002D8D88 7F E0 07 35 */ extsh. r0, r31 -/* 802DBE4C 002D8D8C 40 81 00 0C */ ble lbl_802DBE58 -/* 802DBE50 002D8D90 7F C3 F3 78 */ mr r3, r30 -/* 802DBE54 002D8D94 4B FF 2E E9 */ bl __dl__FPv -lbl_802DBE58: -/* 802DBE58 002D8D98 7F C3 F3 78 */ mr r3, r30 -/* 802DBE5C 002D8D9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DBE60 002D8DA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802DBE64 002D8DA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DBE68 002D8DA8 7C 08 03 A6 */ mtlr r0 -/* 802DBE6C 002D8DAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DBE70 002D8DB0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JSupport/JSUList/asm/func_802DBE74.s b/include/JSystem/JSupport/JSUList/asm/func_802DBE74.s deleted file mode 100644 index 404066b907..0000000000 --- a/include/JSystem/JSupport/JSUList/asm/func_802DBE74.s +++ /dev/null @@ -1,15 +0,0 @@ -/* 802DBE74 002D8DB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DBE78 002D8DB8 7C 08 02 A6 */ mflr r0 -/* 802DBE7C 002D8DBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DBE80 002D8DC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DBE84 002D8DC4 7C 7F 1B 78 */ mr r31, r3 -/* 802DBE88 002D8DC8 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 802DBE8C 002D8DCC 41 82 00 08 */ beq lbl_802DBE94 -/* 802DBE90 002D8DD0 48 00 00 85 */ bl initiate__10JSUPtrListFv -lbl_802DBE94: -/* 802DBE94 002D8DD4 7F E3 FB 78 */ mr r3, r31 -/* 802DBE98 002D8DD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DBE9C 002D8DDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DBEA0 002D8DE0 7C 08 03 A6 */ mtlr r0 -/* 802DBEA4 002D8DE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DBEA8 002D8DE8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JSupport/JSUList/asm/func_802DBEAC.s b/include/JSystem/JSupport/JSUList/asm/func_802DBEAC.s deleted file mode 100644 index c85b5d5801..0000000000 --- a/include/JSystem/JSupport/JSUList/asm/func_802DBEAC.s +++ /dev/null @@ -1,29 +0,0 @@ -/* 802DBEAC 002D8DEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DBEB0 002D8DF0 7C 08 02 A6 */ mflr r0 -/* 802DBEB4 002D8DF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DBEB8 002D8DF8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DBEBC 002D8DFC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802DBEC0 002D8E00 41 82 00 3C */ beq lbl_802DBEFC -/* 802DBEC4 002D8E04 80 BF 00 00 */ lwz r5, 0(r31) -/* 802DBEC8 002D8E08 38 C0 00 00 */ li r6, 0 -/* 802DBECC 002D8E0C 38 60 00 00 */ li r3, 0 -/* 802DBED0 002D8E10 48 00 00 10 */ b lbl_802DBEE0 -lbl_802DBED4: -/* 802DBED4 002D8E14 90 65 00 04 */ stw r3, 4(r5) -/* 802DBED8 002D8E18 80 A5 00 0C */ lwz r5, 0xc(r5) -/* 802DBEDC 002D8E1C 38 C6 00 01 */ addi r6, r6, 1 -lbl_802DBEE0: -/* 802DBEE0 002D8E20 80 1F 00 08 */ lwz r0, 8(r31) -/* 802DBEE4 002D8E24 7C 06 00 40 */ cmplw r6, r0 -/* 802DBEE8 002D8E28 41 80 FF EC */ blt lbl_802DBED4 -/* 802DBEEC 002D8E2C 7C 80 07 35 */ extsh. r0, r4 -/* 802DBEF0 002D8E30 40 81 00 0C */ ble lbl_802DBEFC -/* 802DBEF4 002D8E34 7F E3 FB 78 */ mr r3, r31 -/* 802DBEF8 002D8E38 4B FF 2E 45 */ bl __dl__FPv -lbl_802DBEFC: -/* 802DBEFC 002D8E3C 7F E3 FB 78 */ mr r3, r31 -/* 802DBF00 002D8E40 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DBF04 002D8E44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DBF08 002D8E48 7C 08 03 A6 */ mtlr r0 -/* 802DBF0C 002D8E4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DBF10 002D8E50 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JSupport/JSUList/asm/func_802DBF14.s b/include/JSystem/JSupport/JSUList/asm/func_802DBF14.s deleted file mode 100644 index 948cac4c52..0000000000 --- a/include/JSystem/JSupport/JSUList/asm/func_802DBF14.s +++ /dev/null @@ -1,5 +0,0 @@ -/* 802DBF14 002D8E54 38 00 00 00 */ li r0, 0 -/* 802DBF18 002D8E58 90 03 00 00 */ stw r0, 0(r3) -/* 802DBF1C 002D8E5C 90 03 00 04 */ stw r0, 4(r3) -/* 802DBF20 002D8E60 90 03 00 08 */ stw r0, 8(r3) -/* 802DBF24 002D8E64 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JSupport/JSUList/asm/func_802DBF28.s b/include/JSystem/JSupport/JSUList/asm/func_802DBF28.s deleted file mode 100644 index b222d9d840..0000000000 --- a/include/JSystem/JSupport/JSUList/asm/func_802DBF28.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802DBF28 002D8E68 90 64 00 04 */ stw r3, 4(r4) -/* 802DBF2C 002D8E6C 38 00 00 00 */ li r0, 0 -/* 802DBF30 002D8E70 90 04 00 08 */ stw r0, 8(r4) -/* 802DBF34 002D8E74 90 04 00 0C */ stw r0, 0xc(r4) -/* 802DBF38 002D8E78 90 83 00 04 */ stw r4, 4(r3) -/* 802DBF3C 002D8E7C 90 83 00 00 */ stw r4, 0(r3) -/* 802DBF40 002D8E80 38 00 00 01 */ li r0, 1 -/* 802DBF44 002D8E84 90 03 00 08 */ stw r0, 8(r3) -/* 802DBF48 002D8E88 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JSupport/JSUList/asm/func_802DBF4C.s b/include/JSystem/JSupport/JSUList/asm/func_802DBF4C.s deleted file mode 100644 index 0200801922..0000000000 --- a/include/JSystem/JSupport/JSUList/asm/func_802DBF4C.s +++ /dev/null @@ -1,44 +0,0 @@ -/* 802DBF4C 002D8E8C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DBF50 002D8E90 7C 08 02 A6 */ mflr r0 -/* 802DBF54 002D8E94 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DBF58 002D8E98 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DBF5C 002D8E9C 48 08 62 81 */ bl _savegpr_29 -/* 802DBF60 002D8EA0 7C 7D 1B 78 */ mr r29, r3 -/* 802DBF64 002D8EA4 7C 9E 23 78 */ mr r30, r4 -/* 802DBF68 002D8EA8 80 64 00 04 */ lwz r3, 4(r4) -/* 802DBF6C 002D8EAC 7C 60 00 34 */ cntlzw r0, r3 -/* 802DBF70 002D8EB0 54 1F D9 7E */ srwi r31, r0, 5 -/* 802DBF74 002D8EB4 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802DBF78 002D8EB8 40 82 00 0C */ bne lbl_802DBF84 -/* 802DBF7C 002D8EBC 48 00 01 E1 */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802DBF80 002D8EC0 7C 7F 1B 78 */ mr r31, r3 -lbl_802DBF84: -/* 802DBF84 002D8EC4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802DBF88 002D8EC8 41 82 00 4C */ beq lbl_802DBFD4 -/* 802DBF8C 002D8ECC 80 1D 00 08 */ lwz r0, 8(r29) -/* 802DBF90 002D8ED0 28 00 00 00 */ cmplwi r0, 0 -/* 802DBF94 002D8ED4 40 82 00 14 */ bne lbl_802DBFA8 -/* 802DBF98 002D8ED8 7F A3 EB 78 */ mr r3, r29 -/* 802DBF9C 002D8EDC 7F C4 F3 78 */ mr r4, r30 -/* 802DBFA0 002D8EE0 4B FF FF 89 */ bl setFirst__10JSUPtrListFP10JSUPtrLink -/* 802DBFA4 002D8EE4 48 00 00 30 */ b lbl_802DBFD4 -lbl_802DBFA8: -/* 802DBFA8 002D8EE8 93 BE 00 04 */ stw r29, 4(r30) -/* 802DBFAC 002D8EEC 80 1D 00 04 */ lwz r0, 4(r29) -/* 802DBFB0 002D8EF0 90 1E 00 08 */ stw r0, 8(r30) -/* 802DBFB4 002D8EF4 38 00 00 00 */ li r0, 0 -/* 802DBFB8 002D8EF8 90 1E 00 0C */ stw r0, 0xc(r30) -/* 802DBFBC 002D8EFC 80 7D 00 04 */ lwz r3, 4(r29) -/* 802DBFC0 002D8F00 93 C3 00 0C */ stw r30, 0xc(r3) -/* 802DBFC4 002D8F04 93 DD 00 04 */ stw r30, 4(r29) -/* 802DBFC8 002D8F08 80 7D 00 08 */ lwz r3, 8(r29) -/* 802DBFCC 002D8F0C 38 03 00 01 */ addi r0, r3, 1 -/* 802DBFD0 002D8F10 90 1D 00 08 */ stw r0, 8(r29) -lbl_802DBFD4: -/* 802DBFD4 002D8F14 7F E3 FB 78 */ mr r3, r31 -/* 802DBFD8 002D8F18 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DBFDC 002D8F1C 48 08 62 4D */ bl _restgpr_29 -/* 802DBFE0 002D8F20 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DBFE4 002D8F24 7C 08 03 A6 */ mtlr r0 -/* 802DBFE8 002D8F28 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DBFEC 002D8F2C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JSupport/JSUList/asm/func_802DBFF0.s b/include/JSystem/JSupport/JSUList/asm/func_802DBFF0.s deleted file mode 100644 index d0693789a1..0000000000 --- a/include/JSystem/JSupport/JSUList/asm/func_802DBFF0.s +++ /dev/null @@ -1,44 +0,0 @@ -/* 802DBFF0 002D8F30 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DBFF4 002D8F34 7C 08 02 A6 */ mflr r0 -/* 802DBFF8 002D8F38 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DBFFC 002D8F3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC000 002D8F40 48 08 61 DD */ bl _savegpr_29 -/* 802DC004 002D8F44 7C 7D 1B 78 */ mr r29, r3 -/* 802DC008 002D8F48 7C 9E 23 78 */ mr r30, r4 -/* 802DC00C 002D8F4C 80 64 00 04 */ lwz r3, 4(r4) -/* 802DC010 002D8F50 7C 60 00 34 */ cntlzw r0, r3 -/* 802DC014 002D8F54 54 1F D9 7E */ srwi r31, r0, 5 -/* 802DC018 002D8F58 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802DC01C 002D8F5C 40 82 00 0C */ bne lbl_802DC028 -/* 802DC020 002D8F60 48 00 01 3D */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802DC024 002D8F64 7C 7F 1B 78 */ mr r31, r3 -lbl_802DC028: -/* 802DC028 002D8F68 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802DC02C 002D8F6C 41 82 00 4C */ beq lbl_802DC078 -/* 802DC030 002D8F70 80 1D 00 08 */ lwz r0, 8(r29) -/* 802DC034 002D8F74 28 00 00 00 */ cmplwi r0, 0 -/* 802DC038 002D8F78 40 82 00 14 */ bne lbl_802DC04C -/* 802DC03C 002D8F7C 7F A3 EB 78 */ mr r3, r29 -/* 802DC040 002D8F80 7F C4 F3 78 */ mr r4, r30 -/* 802DC044 002D8F84 4B FF FE E5 */ bl setFirst__10JSUPtrListFP10JSUPtrLink -/* 802DC048 002D8F88 48 00 00 30 */ b lbl_802DC078 -lbl_802DC04C: -/* 802DC04C 002D8F8C 93 BE 00 04 */ stw r29, 4(r30) -/* 802DC050 002D8F90 38 00 00 00 */ li r0, 0 -/* 802DC054 002D8F94 90 1E 00 08 */ stw r0, 8(r30) -/* 802DC058 002D8F98 80 1D 00 00 */ lwz r0, 0(r29) -/* 802DC05C 002D8F9C 90 1E 00 0C */ stw r0, 0xc(r30) -/* 802DC060 002D8FA0 80 7D 00 00 */ lwz r3, 0(r29) -/* 802DC064 002D8FA4 93 C3 00 08 */ stw r30, 8(r3) -/* 802DC068 002D8FA8 93 DD 00 00 */ stw r30, 0(r29) -/* 802DC06C 002D8FAC 80 7D 00 08 */ lwz r3, 8(r29) -/* 802DC070 002D8FB0 38 03 00 01 */ addi r0, r3, 1 -/* 802DC074 002D8FB4 90 1D 00 08 */ stw r0, 8(r29) -lbl_802DC078: -/* 802DC078 002D8FB8 7F E3 FB 78 */ mr r3, r31 -/* 802DC07C 002D8FBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC080 002D8FC0 48 08 61 A9 */ bl _restgpr_29 -/* 802DC084 002D8FC4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DC088 002D8FC8 7C 08 03 A6 */ mtlr r0 -/* 802DC08C 002D8FCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DC090 002D8FD0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JSupport/JSUList/asm/func_802DC094.s b/include/JSystem/JSupport/JSUList/asm/func_802DC094.s deleted file mode 100644 index f33f5e9880..0000000000 --- a/include/JSystem/JSupport/JSUList/asm/func_802DC094.s +++ /dev/null @@ -1,56 +0,0 @@ -/* 802DC094 002D8FD4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DC098 002D8FD8 7C 08 02 A6 */ mflr r0 -/* 802DC09C 002D8FDC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DC0A0 002D8FE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC0A4 002D8FE4 48 08 61 39 */ bl _savegpr_29 -/* 802DC0A8 002D8FE8 7C 7D 1B 78 */ mr r29, r3 -/* 802DC0AC 002D8FEC 7C 9E 23 78 */ mr r30, r4 -/* 802DC0B0 002D8FF0 7C BF 2B 78 */ mr r31, r5 -/* 802DC0B4 002D8FF4 80 03 00 00 */ lwz r0, 0(r3) -/* 802DC0B8 002D8FF8 7C 1E 00 40 */ cmplw r30, r0 -/* 802DC0BC 002D8FFC 40 82 00 10 */ bne lbl_802DC0CC -/* 802DC0C0 002D9000 7F E4 FB 78 */ mr r4, r31 -/* 802DC0C4 002D9004 4B FF FF 2D */ bl prepend__10JSUPtrListFP10JSUPtrLink -/* 802DC0C8 002D9008 48 00 00 7C */ b lbl_802DC144 -lbl_802DC0CC: -/* 802DC0CC 002D900C 28 1E 00 00 */ cmplwi r30, 0 -/* 802DC0D0 002D9010 40 82 00 10 */ bne lbl_802DC0E0 -/* 802DC0D4 002D9014 7F E4 FB 78 */ mr r4, r31 -/* 802DC0D8 002D9018 4B FF FE 75 */ bl append__10JSUPtrListFP10JSUPtrLink -/* 802DC0DC 002D901C 48 00 00 68 */ b lbl_802DC144 -lbl_802DC0E0: -/* 802DC0E0 002D9020 80 1E 00 04 */ lwz r0, 4(r30) -/* 802DC0E4 002D9024 7C 00 E8 40 */ cmplw r0, r29 -/* 802DC0E8 002D9028 41 82 00 0C */ beq lbl_802DC0F4 -/* 802DC0EC 002D902C 38 60 00 00 */ li r3, 0 -/* 802DC0F0 002D9030 48 00 00 54 */ b lbl_802DC144 -lbl_802DC0F4: -/* 802DC0F4 002D9034 80 7F 00 04 */ lwz r3, 4(r31) -/* 802DC0F8 002D9038 7C 60 00 34 */ cntlzw r0, r3 -/* 802DC0FC 002D903C 54 04 D9 7E */ srwi r4, r0, 5 -/* 802DC100 002D9040 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802DC104 002D9044 40 82 00 10 */ bne lbl_802DC114 -/* 802DC108 002D9048 7F E4 FB 78 */ mr r4, r31 -/* 802DC10C 002D904C 48 00 00 51 */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 802DC110 002D9050 7C 64 1B 78 */ mr r4, r3 -lbl_802DC114: -/* 802DC114 002D9054 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 802DC118 002D9058 41 82 00 28 */ beq lbl_802DC140 -/* 802DC11C 002D905C 80 7E 00 08 */ lwz r3, 8(r30) -/* 802DC120 002D9060 93 BF 00 04 */ stw r29, 4(r31) -/* 802DC124 002D9064 90 7F 00 08 */ stw r3, 8(r31) -/* 802DC128 002D9068 93 DF 00 0C */ stw r30, 0xc(r31) -/* 802DC12C 002D906C 93 E3 00 0C */ stw r31, 0xc(r3) -/* 802DC130 002D9070 93 FE 00 08 */ stw r31, 8(r30) -/* 802DC134 002D9074 80 7D 00 08 */ lwz r3, 8(r29) -/* 802DC138 002D9078 38 03 00 01 */ addi r0, r3, 1 -/* 802DC13C 002D907C 90 1D 00 08 */ stw r0, 8(r29) -lbl_802DC140: -/* 802DC140 002D9080 7C 83 23 78 */ mr r3, r4 -lbl_802DC144: -/* 802DC144 002D9084 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC148 002D9088 48 08 60 E1 */ bl _restgpr_29 -/* 802DC14C 002D908C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DC150 002D9090 7C 08 03 A6 */ mtlr r0 -/* 802DC154 002D9094 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DC158 002D9098 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JSupport/JSUList/asm/func_802DC15C.s b/include/JSystem/JSupport/JSUList/asm/func_802DC15C.s deleted file mode 100644 index cfeaa0f9a9..0000000000 --- a/include/JSystem/JSupport/JSUList/asm/func_802DC15C.s +++ /dev/null @@ -1,49 +0,0 @@ -/* 802DC15C 002D909C 80 04 00 04 */ lwz r0, 4(r4) -/* 802DC160 002D90A0 7C 00 18 50 */ subf r0, r0, r3 -/* 802DC164 002D90A4 7C 00 00 34 */ cntlzw r0, r0 -/* 802DC168 002D90A8 54 06 D9 7E */ srwi r6, r0, 5 -/* 802DC16C 002D90AC 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802DC170 002D90B0 41 82 00 94 */ beq lbl_802DC204 -/* 802DC174 002D90B4 80 03 00 08 */ lwz r0, 8(r3) -/* 802DC178 002D90B8 28 00 00 01 */ cmplwi r0, 1 -/* 802DC17C 002D90BC 40 82 00 14 */ bne lbl_802DC190 -/* 802DC180 002D90C0 38 00 00 00 */ li r0, 0 -/* 802DC184 002D90C4 90 03 00 00 */ stw r0, 0(r3) -/* 802DC188 002D90C8 90 03 00 04 */ stw r0, 4(r3) -/* 802DC18C 002D90CC 48 00 00 64 */ b lbl_802DC1F0 -lbl_802DC190: -/* 802DC190 002D90D0 80 03 00 00 */ lwz r0, 0(r3) -/* 802DC194 002D90D4 7C 04 00 40 */ cmplw r4, r0 -/* 802DC198 002D90D8 40 82 00 1C */ bne lbl_802DC1B4 -/* 802DC19C 002D90DC 38 00 00 00 */ li r0, 0 -/* 802DC1A0 002D90E0 80 A4 00 0C */ lwz r5, 0xc(r4) -/* 802DC1A4 002D90E4 90 05 00 08 */ stw r0, 8(r5) -/* 802DC1A8 002D90E8 80 04 00 0C */ lwz r0, 0xc(r4) -/* 802DC1AC 002D90EC 90 03 00 00 */ stw r0, 0(r3) -/* 802DC1B0 002D90F0 48 00 00 40 */ b lbl_802DC1F0 -lbl_802DC1B4: -/* 802DC1B4 002D90F4 80 03 00 04 */ lwz r0, 4(r3) -/* 802DC1B8 002D90F8 7C 04 00 40 */ cmplw r4, r0 -/* 802DC1BC 002D90FC 40 82 00 1C */ bne lbl_802DC1D8 -/* 802DC1C0 002D9100 38 00 00 00 */ li r0, 0 -/* 802DC1C4 002D9104 80 A4 00 08 */ lwz r5, 8(r4) -/* 802DC1C8 002D9108 90 05 00 0C */ stw r0, 0xc(r5) -/* 802DC1CC 002D910C 80 04 00 08 */ lwz r0, 8(r4) -/* 802DC1D0 002D9110 90 03 00 04 */ stw r0, 4(r3) -/* 802DC1D4 002D9114 48 00 00 1C */ b lbl_802DC1F0 -lbl_802DC1D8: -/* 802DC1D8 002D9118 80 04 00 0C */ lwz r0, 0xc(r4) -/* 802DC1DC 002D911C 80 A4 00 08 */ lwz r5, 8(r4) -/* 802DC1E0 002D9120 90 05 00 0C */ stw r0, 0xc(r5) -/* 802DC1E4 002D9124 80 04 00 08 */ lwz r0, 8(r4) -/* 802DC1E8 002D9128 80 A4 00 0C */ lwz r5, 0xc(r4) -/* 802DC1EC 002D912C 90 05 00 08 */ stw r0, 8(r5) -lbl_802DC1F0: -/* 802DC1F0 002D9130 38 00 00 00 */ li r0, 0 -/* 802DC1F4 002D9134 90 04 00 04 */ stw r0, 4(r4) -/* 802DC1F8 002D9138 80 83 00 08 */ lwz r4, 8(r3) -/* 802DC1FC 002D913C 38 04 FF FF */ addi r0, r4, -1 -/* 802DC200 002D9140 90 03 00 08 */ stw r0, 8(r3) -lbl_802DC204: -/* 802DC204 002D9144 7C C3 33 78 */ mr r3, r6 -/* 802DC208 002D9148 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JSupport/JSUList/asm/func_802DC20C.s b/include/JSystem/JSupport/JSUList/asm/func_802DC20C.s deleted file mode 100644 index ffe7dd09c4..0000000000 --- a/include/JSystem/JSupport/JSUList/asm/func_802DC20C.s +++ /dev/null @@ -1,14 +0,0 @@ -/* 802DC20C 002D914C 80 03 00 08 */ lwz r0, 8(r3) -/* 802DC210 002D9150 7C 04 00 40 */ cmplw r4, r0 -/* 802DC214 002D9154 41 80 00 0C */ blt lbl_802DC220 -/* 802DC218 002D9158 38 60 00 00 */ li r3, 0 -/* 802DC21C 002D915C 4E 80 00 20 */ blr -lbl_802DC220: -/* 802DC220 002D9160 80 63 00 00 */ lwz r3, 0(r3) -/* 802DC224 002D9164 7C 89 03 A6 */ mtctr r4 -/* 802DC228 002D9168 28 04 00 00 */ cmplwi r4, 0 -/* 802DC22C 002D916C 4C 81 00 20 */ blelr -lbl_802DC230: -/* 802DC230 002D9170 80 63 00 0C */ lwz r3, 0xc(r3) -/* 802DC234 002D9174 42 00 FF FC */ bdnz lbl_802DC230 -/* 802DC238 002D9178 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JUtility/JUTGamePad/asm/func_802E15B4.s b/include/JSystem/JUtility/JUTGamePad/asm/func_802E15B4.s deleted file mode 100644 index bd3b36d701..0000000000 --- a/include/JSystem/JUtility/JUTGamePad/asm/func_802E15B4.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802E15B4 002DE4F4 38 00 00 00 */ li r0, 0 -/* 802E15B8 002DE4F8 90 03 00 00 */ stw r0, 0(r3) -/* 802E15BC 002DE4FC 90 03 00 04 */ stw r0, 4(r3) -/* 802E15C0 002DE500 90 03 00 08 */ stw r0, 8(r3) -/* 802E15C4 002DE504 90 03 00 0C */ stw r0, 0xc(r3) -/* 802E15C8 002DE508 90 03 00 10 */ stw r0, 0x10(r3) -/* 802E15CC 002DE50C 3C 00 F0 00 */ lis r0, 0xf000 -/* 802E15D0 002DE510 90 0D 8F 68 */ stw r0, lbl_804514E8-_SDA_BASE_(r13) -/* 802E15D4 002DE514 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JUtility/JUTGamePad/asm/func_802E15D8.s b/include/JSystem/JUtility/JUTGamePad/asm/func_802E15D8.s deleted file mode 100644 index 2ac8217cdb..0000000000 --- a/include/JSystem/JUtility/JUTGamePad/asm/func_802E15D8.s +++ /dev/null @@ -1,24 +0,0 @@ -/* 802E15D8 002DE518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E15DC 002DE51C 7C 08 02 A6 */ mflr r0 -/* 802E15E0 002DE520 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E15E4 002DE524 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E15E8 002DE528 7C 7F 1B 78 */ mr r31, r3 -/* 802E15EC 002DE52C A8 04 00 7C */ lha r0, 0x7c(r4) -/* 802E15F0 002DE530 7C 05 07 35 */ extsh. r5, r0 -/* 802E15F4 002DE534 41 80 00 24 */ blt lbl_802E1618 -/* 802E15F8 002DE538 2C 05 00 04 */ cmpwi r5, 4 -/* 802E15FC 002DE53C 40 80 00 1C */ bge lbl_802E1618 -/* 802E1600 002DE540 38 00 00 00 */ li r0, 0 -/* 802E1604 002DE544 38 6D 8F 64 */ addi r3, r13, 0x804514E4-0x80458580/*lbl_804514E4-_SDA_BASE_*/ -/* 802E1608 002DE548 7C 03 29 AE */ stbx r0, r3, r5 -/* 802E160C 002DE54C A8 64 00 7C */ lha r3, 0x7c(r4) -/* 802E1610 002DE550 38 80 00 01 */ li r4, 1 -/* 802E1614 002DE554 48 00 00 79 */ bl stopMotor__Q210JUTGamePad7CRumbleFib -lbl_802E1618: -/* 802E1618 002DE558 7F E3 FB 78 */ mr r3, r31 -/* 802E161C 002DE55C 4B FF FF 99 */ bl clear__Q210JUTGamePad7CRumbleFv -/* 802E1620 002DE560 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E1624 002DE564 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E1628 002DE568 7C 08 03 A6 */ mtlr r0 -/* 802E162C 002DE56C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E1630 002DE570 4E 80 00 20 */ blr diff --git a/include/JSystem/JUtility/asm/JUTResFont__convertSjis.s b/include/JSystem/JUtility/asm/JUTResFont__convertSjis.s deleted file mode 100644 index 82c67638a9..0000000000 --- a/include/JSystem/JUtility/asm/JUTResFont__convertSjis.s +++ /dev/null @@ -1,38 +0,0 @@ -/* 802E00C4 002DD004 54 86 C6 3E */ rlwinm r6, r4, 0x18, 0x18, 0x1f -/* 802E00C8 002DD008 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 802E00CC 002DD00C 38 E3 FF C0 */ addi r7, r3, -64 -/* 802E00D0 002DD010 2C 07 00 40 */ cmpwi r7, 0x40 -/* 802E00D4 002DD014 41 80 00 08 */ blt lbl_802E00DC -/* 802E00D8 002DD018 38 E7 FF FF */ addi r7, r7, -1 -lbl_802E00DC: -/* 802E00DC 002DD01C 38 00 03 1C */ li r0, 0x31c -/* 802E00E0 002DD020 28 05 00 00 */ cmplwi r5, 0 -/* 802E00E4 002DD024 41 82 00 08 */ beq lbl_802E00EC -/* 802E00E8 002DD028 A0 05 00 00 */ lhz r0, 0(r5) -lbl_802E00EC: -/* 802E00EC 002DD02C 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 802E00F0 002DD030 38 06 FF 78 */ addi r0, r6, -136 -/* 802E00F4 002DD034 1C 60 00 BC */ mulli r3, r0, 0xbc -/* 802E00F8 002DD038 38 03 FF A2 */ addi r0, r3, -94 -/* 802E00FC 002DD03C 7C 60 22 14 */ add r3, r0, r4 -/* 802E0100 002DD040 7C 67 1A 14 */ add r3, r7, r3 -/* 802E0104 002DD044 4E 80 00 20 */ blr -/* 802E0108 002DD048 38 60 00 00 */ li r3, 0 -/* 802E010C 002DD04C 4E 80 00 20 */ blr -/* 802E0110 002DD050 38 60 00 01 */ li r3, 1 -/* 802E0114 002DD054 4E 80 00 20 */ blr -/* 802E0118 002DD058 38 00 00 00 */ li r0, 0 -/* 802E011C 002DD05C 2C 03 00 81 */ cmpwi r3, 0x81 -/* 802E0120 002DD060 41 80 00 0C */ blt lbl_802E012C -/* 802E0124 002DD064 2C 03 00 9F */ cmpwi r3, 0x9f -/* 802E0128 002DD068 40 81 00 14 */ ble lbl_802E013C -lbl_802E012C: -/* 802E012C 002DD06C 2C 03 00 E0 */ cmpwi r3, 0xe0 -/* 802E0130 002DD070 41 80 00 10 */ blt lbl_802E0140 -/* 802E0134 002DD074 2C 03 00 FC */ cmpwi r3, 0xfc -/* 802E0138 002DD078 41 81 00 08 */ bgt lbl_802E0140 -lbl_802E013C: -/* 802E013C 002DD07C 38 00 00 01 */ li r0, 1 -lbl_802E0140: -/* 802E0140 002DD080 7C 03 03 78 */ mr r3, r0 -/* 802E0144 002DD084 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSystem/JUtility/asm/JUTResFont__dtor.s b/include/JSystem/JUtility/asm/JUTResFont__dtor.s deleted file mode 100644 index 5b4c35ae31..0000000000 --- a/include/JSystem/JUtility/asm/JUTResFont__dtor.s +++ /dev/null @@ -1,38 +0,0 @@ -/* 802DF000 002DBF40 94 21 FF F0 */ stwu r1,-0x10(r1) -/* 802DF004 002DBF44 7C 08 02 A6 */ mflr r0 -/* 802DF008 002DBF48 90 01 00 14 */ stw r0,0x14(r1) -/* 802DF00C 002DBF4C 93 E1 00 0C */ stw r31,0xc(r1) -/* 802DF010 002DBF50 93 C1 00 08 */ stw r30,8(r1) -/* 802DF014 002DBF54 7C 7E 1B 79 */ or. r30,r3,r3 -/* 802DF018 002DBF58 7C 9F 23 78 */ mr r31,r4 -/* 802DF01C 002DBF5C 41 82 00 54 */ beq lbl_802DF070 -/* 802DF020 002DBF60 3C 80 80 3D */ lis r4,lbl_803CC5A0@ha -/* 802DF024 002DBF64 38 04 C5 A0 */ addi r0,r4,lbl_803CC5A0@l -/* 802DF028 002DBF68 90 1E 00 00 */ stw r0,0(r30) -/* 802DF02C 002DBF6C 88 1E 00 04 */ lbz r0,4(r30) -/* 802DF030 002DBF70 28 00 00 00 */ cmplwi r0,0 -/* 802DF034 002DBF74 41 82 00 18 */ beq lbl_802DF04C -/* 802DF038 002DBF78 48 00 00 55 */ bl deleteMemBlocks_ResFont__10JUTResFontFv -/* 802DF03C 002DBF7C 7F C3 F3 78 */ mr r3,r30 -/* 802DF040 002DBF80 48 00 00 71 */ bl initialize_state__10JUTResFontFv -/* 802DF044 002DBF84 7F C3 F3 78 */ mr r3,r30 -/* 802DF048 002DBF88 4B FF FC DD */ bl initialize_state__7JUTFontFv -lbl_802DF04C: -/* 802DF04C 002DBF8C 28 1E 00 00 */ cmplwi r30,0 -/* 802DF050 002DBF90 41 82 00 10 */ beq lbl_802DF060 -/* 802DF054 002DBF94 3C 60 80 3A */ lis r3,lbl_803A31F0@ha -/* 802DF058 002DBF98 38 03 31 F0 */ addi r0,r3,lbl_803A31F0@l -/* 802DF05C 002DBF9C 90 1E 00 00 */ stw r0,0(r30) -lbl_802DF060: -/* 802DF060 002DBFA0 7F E0 07 35 */ extsh.r0,r31 -/* 802DF064 002DBFA4 40 81 00 0C */ ble lbl_802DF070 -/* 802DF068 002DBFA8 7F C3 F3 78 */ mr r3,r30 -/* 802DF06C 002DBFAC 4B FE FC D1 */ bl __dl__FPv -lbl_802DF070: -/* 802DF070 002DBFB0 7F C3 F3 78 */ mr r3,r30 -/* 802DF074 002DBFB4 83 E1 00 0C */ lwz r31,0xc(r1) -/* 802DF078 002DBFB8 83 C1 00 08 */ lwz r30,8(r1) -/* 802DF07C 002DBFBC 80 01 00 14 */ lwz r0,0x14(r1) -/* 802DF080 002DBFC0 7C 08 03 A6 */ mtlr r0 -/* 802DF084 002DBFC4 38 21 00 10 */ addi r1,r1,0x10 -/* 802DF088 002DBFC8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_xyz/asm/func_80267128.s b/include/SComponent/c_xyz/asm/func_80267128.s deleted file mode 100644 index 6624a48a71..0000000000 --- a/include/SComponent/c_xyz/asm/func_80267128.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80267128 00264068 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026712C 0026406C 7C 08 02 A6 */ mflr r0 -/* 80267130 00264070 90 01 00 14 */ stw r0, 0x14(r1) -/* 80267134 00264074 C0 23 00 00 */ lfs f1, 0(r3) -/* 80267138 00264078 C0 43 00 08 */ lfs f2, 8(r3) -/* 8026713C 0026407C 48 00 05 39 */ bl cM_atan2s__Fff -/* 80267140 00264080 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80267144 00264084 7C 08 03 A6 */ mtlr r0 -/* 80267148 00264088 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026714C 0026408C 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h b/include/Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h new file mode 100644 index 0000000000..de83a57545 --- /dev/null +++ b/include/Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h @@ -0,0 +1,16 @@ +#ifndef Z2AUDIOARCLOADER_H_ +#define Z2AUDIOARCLOADER_H_ + +#include "JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h" +#include "global.h" + +class Z2AudioArcLoader { + Z2AudioArcLoader(JAUSection*); + ~Z2AudioArcLoader(); + + void readCommandMore(u32); + void readBFCA(const void*); + void readBSTN(const void*, u32); +}; + +#endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A70.s b/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A70.s index 19aa6daef7..ae22ca4df1 100644 --- a/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A70.s +++ b/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A70.s @@ -14,7 +14,7 @@ lbl_802A9A94: /* 802A9AA0 002A69E0 90 03 00 04 */ stw r0, 4(r3) /* 802A9AA4 002A69E4 80 03 00 08 */ lwz r0, 8(r3) /* 802A9AA8 002A69E8 7C 80 2A 14 */ add r4, r0, r5 -/* 802A9AAC 002A69EC 48 00 00 1D */ bl Z2AudioArcLoader_NS_readBFCA +/* 802A9AAC 002A69EC 48 00 00 1D */ bl readBFCA__16Z2AudioArcLoaderFPCv /* 802A9AB0 002A69F0 38 C0 00 01 */ li r6, 1 lbl_802A9AB4: /* 802A9AB4 002A69F4 7C C3 33 78 */ mr r3, r6 diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s index 3e191feef9..be76b6ff6a 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s @@ -12,7 +12,7 @@ /* 802CD274 002CA1B4 38 7F 04 C4 */ addi r3, r31, 0x4c4 /* 802CD278 002CA1B8 4B FE 8C A5 */ bl __ct__11Z2StatusMgrFv /* 802CD27C 002CA1BC 38 7F 04 F4 */ addi r3, r31, 0x4f4 -/* 802CD280 002CA1C0 4B FF 26 A1 */ bl Z2SoundObjMgr_NS_ctor +/* 802CD280 002CA1C0 4B FF 26 A1 */ bl __ct__13Z2SoundObjMgrFv /* 802CD284 002CA1C4 3C 60 80 3D */ lis r3, lbl_803CBF38@ha /* 802CD288 002CA1C8 38 03 BF 38 */ addi r0, r3, lbl_803CBF38@l /* 802CD28C 002CA1CC 90 1F 05 14 */ stw r0, 0x514(r31) @@ -20,7 +20,7 @@ /* 802CD294 002CA1D4 4B FC FE 21 */ bl JASAudioReseter /* 802CD298 002CA1D8 38 7F 05 2C */ addi r3, r31, 0x52c /* 802CD29C 002CA1DC 38 80 00 01 */ li r4, 1 -/* 802CD2A0 002CA1E0 4B FD D8 F5 */ bl Z2SoundStarter_NS_ctor +/* 802CD2A0 002CA1E0 4B FD D8 F5 */ bl __ct__14Z2SoundStarterFb /* 802CD2A4 002CA1E4 38 7F 05 30 */ addi r3, r31, 0x530 /* 802CD2A8 002CA1E8 4B FD CB D9 */ bl Z2SoundMgr_NS_ctor /* 802CD2AC 002CA1EC 3B DF 0D 40 */ addi r30, r31, 0xd40 @@ -50,7 +50,7 @@ lbl_802CD2E8: /* 802CD308 002CA248 38 7F 0D 4C */ addi r3, r31, 0xd4c /* 802CD30C 002CA24C 4B FE FE 25 */ bl Z2Audience /* 802CD310 002CA250 38 7F 0F 2C */ addi r3, r31, 0xf2c -/* 802CD314 002CA254 4B FF E9 4D */ bl Z2SpeechMgr2_NS_ctor +/* 802CD314 002CA254 4B FF E9 4D */ bl __ct__12Z2SpeechMgr2Fv /* 802CD318 002CA258 38 7F 13 70 */ addi r3, r31, 0x1370 /* 802CD31C 002CA25C 4B FE D4 C1 */ bl Z2FxLineMgr /* 802CD320 002CA260 93 ED 8D E8 */ stw r31, lbl_80451368-_SDA_BASE_(r13) diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s index e6dd6f871b..9e014d5d3c 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s @@ -253,7 +253,7 @@ lbl_802CD6A8: /* 802CD708 002CA648 4B FD 89 A5 */ bl JAUSectionHeap_NS_newDynamicSeqBlock /* 802CD70C 002CA64C 38 61 00 08 */ addi r3, r1, 8 /* 802CD710 002CA650 7F 24 CB 78 */ mr r4, r25 -/* 802CD714 002CA654 4B FD C3 21 */ bl Z2AudioArcLoader +/* 802CD714 002CA654 4B FD C3 21 */ bl __ct__16Z2AudioArcLoaderFP10JAUSection /* 802CD718 002CA658 38 61 00 08 */ addi r3, r1, 8 /* 802CD71C 002CA65C 7F 44 D3 78 */ mr r4, r26 /* 802CD720 002CA660 4B FD 70 6D */ bl JAUAudioArcLoader_NS_load diff --git a/include/Z2AudioLib/Z2Creature/Z2Creature.h b/include/Z2AudioLib/Z2Creature/Z2Creature.h new file mode 100644 index 0000000000..d4ebd0e597 --- /dev/null +++ b/include/Z2AudioLib/Z2Creature/Z2Creature.h @@ -0,0 +1,22 @@ +#ifndef Z2CREATURE_H_ +#define Z2CREATURE_H_ + +class Z2Creature { +public: + Z2Creature(); + + virtual void deleteObject(); + virtual void setSoundStarter(); + virtual void framework(); + virtual void startCreatureSound(); + virtual void startCreatureSoundLevel(); + virtual void startCreatureVoice(); + virtual void startCreatureVoiceLevel(); + virtual void startCreatureExtraSound(); + virtual void startCreatureExtraSoundLevel(); + virtual void startCollisionSE(); +}; + +class Z2CreatureEnemy : public Z2Creature {}; + +#endif // Z2CREATURE_H_ \ No newline at end of file diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0420.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0420.s index d5b1103ff6..db9cde8f82 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0420.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0420.s @@ -20,7 +20,7 @@ /* 802C046C 002BD3AC 90 1E 00 80 */ stw r0, 0x80(r30) /* 802C0470 002BD3B0 38 7E 00 70 */ addi r3, r30, 0x70 /* 802C0474 002BD3B4 38 80 00 00 */ li r4, 0 -/* 802C0478 002BD3B8 4B FF DA D1 */ bl Z2SoundObjBase_NS_dtor +/* 802C0478 002BD3B8 4B FF DA D1 */ bl __dt__14Z2SoundObjBaseFv lbl_802C047C: /* 802C047C 002BD3BC 34 1E 00 50 */ addic. r0, r30, 0x50 /* 802C0480 002BD3C0 41 82 00 1C */ beq lbl_802C049C @@ -29,7 +29,7 @@ lbl_802C047C: /* 802C048C 002BD3CC 90 1E 00 60 */ stw r0, 0x60(r30) /* 802C0490 002BD3D0 38 7E 00 50 */ addi r3, r30, 0x50 /* 802C0494 002BD3D4 38 80 00 00 */ li r4, 0 -/* 802C0498 002BD3D8 4B FF DA B1 */ bl Z2SoundObjBase_NS_dtor +/* 802C0498 002BD3D8 4B FF DA B1 */ bl __dt__14Z2SoundObjBaseFv lbl_802C049C: /* 802C049C 002BD3DC 34 1E 00 08 */ addic. r0, r30, 8 /* 802C04A0 002BD3E0 41 82 00 1C */ beq lbl_802C04BC @@ -38,7 +38,7 @@ lbl_802C049C: /* 802C04AC 002BD3EC 90 1E 00 18 */ stw r0, 0x18(r30) /* 802C04B0 002BD3F0 38 7E 00 08 */ addi r3, r30, 8 /* 802C04B4 002BD3F4 38 80 00 00 */ li r4, 0 -/* 802C04B8 002BD3F8 4B FF DA 91 */ bl Z2SoundObjBase_NS_dtor +/* 802C04B8 002BD3F8 4B FF DA 91 */ bl __dt__14Z2SoundObjBaseFv lbl_802C04BC: /* 802C04BC 002BD3FC 7F E0 07 35 */ extsh. r0, r31 /* 802C04C0 002BD400 40 81 00 0C */ ble lbl_802C04CC diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C04E8.s b/include/Z2AudioLib/Z2Creature/asm/func_802C04E8.s index 766c5c9611..518480ddbf 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C04E8.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C04E8.s @@ -6,11 +6,11 @@ /* 802C04FC 002BD43C 38 00 00 00 */ li r0, 0 /* 802C0500 002BD440 90 03 00 28 */ stw r0, 0x28(r3) /* 802C0504 002BD444 38 7F 00 08 */ addi r3, r31, 8 -/* 802C0508 002BD448 4B FF DA F1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C0508 002BD448 4B FF DA F1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C050C 002BD44C 38 7F 00 50 */ addi r3, r31, 0x50 -/* 802C0510 002BD450 4B FF DA E9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C0510 002BD450 4B FF DA E9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C0514 002BD454 38 7F 00 70 */ addi r3, r31, 0x70 -/* 802C0518 002BD458 4B FF DA E1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C0518 002BD458 4B FF DA E1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C051C 002BD45C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C0520 002BD460 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C0524 002BD464 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0C10.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0C10.s index aa2fecc605..ac44578064 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0C10.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0C10.s @@ -3,7 +3,7 @@ /* 802C0C18 002BDB58 90 01 00 14 */ stw r0, 0x14(r1) /* 802C0C1C 002BDB5C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C0C20 002BDB60 7C 7F 1B 78 */ mr r31, r3 -/* 802C0C24 002BDB64 4B FF F7 A5 */ bl Z2Creature +/* 802C0C24 002BDB64 4B FF F7 A5 */ bl __ct__10Z2CreatureFv /* 802C0C28 002BDB68 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C0C2C 002BDB6C 7F E4 FB 78 */ mr r4, r31 /* 802C0C30 002BDB70 48 01 B1 CD */ bl __ct__10JSUPtrLinkFPv diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0F64.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0F64.s index 9c3ae5a03c..b386d926f3 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0F64.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0F64.s @@ -3,7 +3,7 @@ /* 802C0F6C 002BDEAC 90 01 00 14 */ stw r0, 0x14(r1) /* 802C0F70 002BDEB0 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C0F74 002BDEB4 7C 7F 1B 78 */ mr r31, r3 -/* 802C0F78 002BDEB8 4B FF F4 51 */ bl Z2Creature +/* 802C0F78 002BDEB8 4B FF F4 51 */ bl __ct__10Z2CreatureFv /* 802C0F7C 002BDEBC 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C0F80 002BDEC0 7F E4 FB 78 */ mr r4, r31 /* 802C0F84 002BDEC4 48 01 AE 79 */ bl __ct__10JSUPtrLinkFPv diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0FC4.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0FC4.s index 9276da0812..cca3340287 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0FC4.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0FC4.s @@ -43,11 +43,11 @@ lbl_802C1060: /* 802C1060 002BDFA0 38 00 00 00 */ li r0, 0 /* 802C1064 002BDFA4 90 1F 00 28 */ stw r0, 0x28(r31) /* 802C1068 002BDFA8 38 7F 00 08 */ addi r3, r31, 8 -/* 802C106C 002BDFAC 4B FF CF 8D */ bl Z2SoundObjBase_NS_deleteObject +/* 802C106C 002BDFAC 4B FF CF 8D */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1070 002BDFB0 38 7F 00 50 */ addi r3, r31, 0x50 -/* 802C1074 002BDFB4 4B FF CF 85 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C1074 002BDFB4 4B FF CF 85 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1078 002BDFB8 38 7F 00 70 */ addi r3, r31, 0x70 -/* 802C107C 002BDFBC 4B FF CF 7D */ bl Z2SoundObjBase_NS_deleteObject +/* 802C107C 002BDFBC 4B FF CF 7D */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1080 002BDFC0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C1084 002BDFC4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C1088 002BDFC8 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1BE8.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1BE8.s index df86dd9691..67a5de8533 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1BE8.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1BE8.s @@ -3,7 +3,7 @@ /* 802C1BF0 002BEB30 90 01 00 14 */ stw r0, 0x14(r1) /* 802C1BF4 002BEB34 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C1BF8 002BEB38 7C 7F 1B 78 */ mr r31, r3 -/* 802C1BFC 002BEB3C 4B FF E7 CD */ bl Z2Creature +/* 802C1BFC 002BEB3C 4B FF E7 CD */ bl __ct__10Z2CreatureFv /* 802C1C00 002BEB40 3C 60 80 3D */ lis r3, lbl_803CB830@ha /* 802C1C04 002BEB44 38 03 B8 30 */ addi r0, r3, lbl_803CB830@l /* 802C1C08 002BEB48 90 1F 00 00 */ stw r0, 0(r31) diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1D10.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1D10.s index 8fb97435a9..35ad5cfb2b 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1D10.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1D10.s @@ -3,7 +3,7 @@ /* 802C1D18 002BEC58 90 01 00 14 */ stw r0, 0x14(r1) /* 802C1D1C 002BEC5C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C1D20 002BEC60 7C 7F 1B 78 */ mr r31, r3 -/* 802C1D24 002BEC64 4B FF C1 CD */ bl Z2SoundObjBase_NS_ctor +/* 802C1D24 002BEC64 4B FF C1 CD */ bl __ct__14Z2SoundObjBaseFv /* 802C1D28 002BEC68 3C 60 80 3D */ lis r3, lbl_803CB810@ha /* 802C1D2C 002BEC6C 38 03 B8 10 */ addi r0, r3, lbl_803CB810@l /* 802C1D30 002BEC70 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1D4C.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1D4C.s index b351927c40..f0ee9adb1d 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1D4C.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1D4C.s @@ -1,7 +1,7 @@ /* 802C1D4C 002BEC8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802C1D50 002BEC90 7C 08 02 A6 */ mflr r0 /* 802C1D54 002BEC94 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1D58 002BEC98 4B FF C2 59 */ bl Z2SoundObjBase_NS_init +/* 802C1D58 002BEC98 4B FF C2 59 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802C1D5C 002BEC9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C1D60 002BECA0 7C 08 03 A6 */ mtlr r0 /* 802C1D64 002BECA4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s index 6d915c1860..efb40157fa 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s @@ -5,13 +5,13 @@ /* 802C1FC0 002BEF00 7C 7F 1B 78 */ mr r31, r3 /* 802C1FC4 002BEF04 4B FF F0 01 */ bl Z2CreatureEnemy_NS_deleteObject /* 802C1FC8 002BEF08 38 7F 00 A4 */ addi r3, r31, 0xa4 -/* 802C1FCC 002BEF0C 4B FF C0 2D */ bl Z2SoundObjBase_NS_deleteObject +/* 802C1FCC 002BEF0C 4B FF C0 2D */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1FD0 002BEF10 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 802C1FD4 002BEF14 4B FF C0 25 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C1FD4 002BEF14 4B FF C0 25 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1FD8 002BEF18 38 7F 00 E4 */ addi r3, r31, 0xe4 -/* 802C1FDC 002BEF1C 4B FF C0 1D */ bl Z2SoundObjBase_NS_deleteObject +/* 802C1FDC 002BEF1C 4B FF C0 1D */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1FE0 002BEF20 38 7F 01 04 */ addi r3, r31, 0x104 -/* 802C1FE4 002BEF24 4B FF C0 15 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C1FE4 002BEF24 4B FF C0 15 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1FE8 002BEF28 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C1FEC 002BEF2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C1FF0 002BEF30 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C24D0.s b/include/Z2AudioLib/Z2Creature/asm/func_802C24D0.s index a1f6145b7a..eb1c978c11 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C24D0.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C24D0.s @@ -11,7 +11,7 @@ /* 802C24F8 002BF438 90 01 00 10 */ stw r0, 0x10(r1) /* 802C24FC 002BF43C 38 7D 00 50 */ addi r3, r29, 0x50 /* 802C2500 002BF440 38 81 00 10 */ addi r4, r1, 0x10 -/* 802C2504 002BF444 4B FE 8D 51 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C2504 002BF444 4B FE 8D 51 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C2508 002BF448 28 03 00 00 */ cmplwi r3, 0 /* 802C250C 002BF44C 40 82 00 24 */ bne lbl_802C2530 /* 802C2510 002BF450 3C 60 00 07 */ lis r3, 0x000701F7@ha @@ -19,7 +19,7 @@ /* 802C2518 002BF458 90 01 00 0C */ stw r0, 0xc(r1) /* 802C251C 002BF45C 38 7D 00 50 */ addi r3, r29, 0x50 /* 802C2520 002BF460 38 81 00 0C */ addi r4, r1, 0xc -/* 802C2524 002BF464 4B FE 8D 31 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C2524 002BF464 4B FE 8D 31 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C2528 002BF468 28 03 00 00 */ cmplwi r3, 0 /* 802C252C 002BF46C 41 82 00 0C */ beq lbl_802C2538 lbl_802C2530: diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s b/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s index 219278d99a..a5672d238d 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s @@ -5,27 +5,27 @@ /* 802C25FC 002BF53C 7C 7F 1B 78 */ mr r31, r3 /* 802C2600 002BF540 4B FF E9 C5 */ bl Z2CreatureEnemy_NS_deleteObject /* 802C2604 002BF544 38 7F 00 A4 */ addi r3, r31, 0xa4 -/* 802C2608 002BF548 4B FF B9 F1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2608 002BF548 4B FF B9 F1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C260C 002BF54C 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 802C2610 002BF550 4B FF B9 E9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2610 002BF550 4B FF B9 E9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C2614 002BF554 38 7F 00 E4 */ addi r3, r31, 0xe4 -/* 802C2618 002BF558 4B FF B9 E1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2618 002BF558 4B FF B9 E1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C261C 002BF55C 38 7F 01 04 */ addi r3, r31, 0x104 -/* 802C2620 002BF560 4B FF B9 D9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2620 002BF560 4B FF B9 D9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C2624 002BF564 38 7F 01 24 */ addi r3, r31, 0x124 -/* 802C2628 002BF568 4B FF B9 D1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2628 002BF568 4B FF B9 D1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C262C 002BF56C 38 7F 01 44 */ addi r3, r31, 0x144 -/* 802C2630 002BF570 4B FF B9 C9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2630 002BF570 4B FF B9 C9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C2634 002BF574 38 7F 01 64 */ addi r3, r31, 0x164 -/* 802C2638 002BF578 4B FF B9 C1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2638 002BF578 4B FF B9 C1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C263C 002BF57C 38 7F 01 84 */ addi r3, r31, 0x184 -/* 802C2640 002BF580 4B FF B9 B9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2640 002BF580 4B FF B9 B9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C2644 002BF584 38 7F 01 A4 */ addi r3, r31, 0x1a4 -/* 802C2648 002BF588 4B FF B9 B1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2648 002BF588 4B FF B9 B1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C264C 002BF58C 38 7F 01 C4 */ addi r3, r31, 0x1c4 -/* 802C2650 002BF590 4B FF B9 A9 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2650 002BF590 4B FF B9 A9 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C2654 002BF594 38 7F 01 E4 */ addi r3, r31, 0x1e4 -/* 802C2658 002BF598 4B FF B9 A1 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C2658 002BF598 4B FF B9 A1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C265C 002BF59C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C2660 002BF5A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C2664 002BF5A4 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C58AC.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C58AC.s index 6aacd0ad8d..e5632277a6 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C58AC.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C58AC.s @@ -9,7 +9,7 @@ /* 802C58CC 002C280C 34 1E 00 04 */ addic. r0, r30, 4 /* 802C58D0 002C2810 41 82 00 0C */ beq lbl_802C58DC /* 802C58D4 002C2814 38 7E 00 04 */ addi r3, r30, 4 -/* 802C58D8 002C2818 4B FD C8 AD */ bl JAISoundHandle_NS_releaseSound +/* 802C58D8 002C2818 4B FD C8 AD */ bl releaseSound__14JAISoundHandleFv lbl_802C58DC: /* 802C58DC 002C281C 7F E0 07 35 */ extsh. r0, r31 /* 802C58E0 002C2820 40 81 00 0C */ ble lbl_802C58EC diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s index ce4997c8db..5859f1d3f1 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s @@ -396,7 +396,7 @@ lbl_802C76AC: /* 802C76C4 002C4604 7C 04 00 40 */ cmplw r4, r0 /* 802C76C8 002C4608 41 82 00 14 */ beq lbl_802C76DC /* 802C76CC 002C460C 38 80 00 1E */ li r4, 0x1e -/* 802C76D0 002C4610 4B FD AE 0D */ bl JAISound_NS_stop +/* 802C76D0 002C4610 4B FD AE 0D */ bl stop__8JAISoundFUl /* 802C76D4 002C4614 80 7F 00 04 */ lwz r3, 4(r31) /* 802C76D8 002C4618 4B FD AA C9 */ bl JAISound_NS_releaseHandle lbl_802C76DC: @@ -410,7 +410,7 @@ lbl_802C76DC: /* 802C76F8 002C4638 7C 04 00 40 */ cmplw r4, r0 /* 802C76FC 002C463C 41 82 00 14 */ beq lbl_802C7710 /* 802C7700 002C4640 38 80 00 1E */ li r4, 0x1e -/* 802C7704 002C4644 4B FD AD D9 */ bl JAISound_NS_stop +/* 802C7704 002C4644 4B FD AD D9 */ bl stop__8JAISoundFUl /* 802C7708 002C4648 80 7C 00 00 */ lwz r3, 0(r28) /* 802C770C 002C464C 4B FD AA 95 */ bl JAISound_NS_releaseHandle lbl_802C7710: @@ -444,7 +444,7 @@ lbl_802C7710: /* 802C777C 002C46BC 88 DF 01 41 */ lbz r6, 0x141(r31) /* 802C7780 002C46C0 7C C6 07 74 */ extsb r6, r6 /* 802C7784 002C46C4 38 E0 FF FF */ li r7, -1 -/* 802C7788 002C46C8 4B FE 37 55 */ bl Z2SoundStarter_NS_setPortData +/* 802C7788 002C46C8 4B FE 37 55 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802C778C: /* 802C778C 002C46CC 80 1C 00 00 */ lwz r0, 0(r28) /* 802C7790 002C46D0 28 00 00 00 */ cmplwi r0, 0 @@ -455,7 +455,7 @@ lbl_802C778C: /* 802C77A4 002C46E4 88 DF 01 41 */ lbz r6, 0x141(r31) /* 802C77A8 002C46E8 7C C6 07 74 */ extsb r6, r6 /* 802C77AC 002C46EC 38 E0 FF FF */ li r7, -1 -/* 802C77B0 002C46F0 4B FE 37 2D */ bl Z2SoundStarter_NS_setPortData +/* 802C77B0 002C46F0 4B FE 37 2D */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802C77B4: /* 802C77B4 002C46F4 38 60 00 00 */ li r3, 0 /* 802C77B8 002C46F8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s index 93425767be..abfa577292 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s @@ -184,7 +184,7 @@ lbl_802C7AD8: /* 802C7AF0 002C4A30 7C 04 00 40 */ cmplw r4, r0 /* 802C7AF4 002C4A34 41 82 00 14 */ beq lbl_802C7B08 /* 802C7AF8 002C4A38 38 80 00 1E */ li r4, 0x1e -/* 802C7AFC 002C4A3C 4B FD A9 E1 */ bl JAISound_NS_stop +/* 802C7AFC 002C4A3C 4B FD A9 E1 */ bl stop__8JAISoundFUl /* 802C7B00 002C4A40 80 7F 00 84 */ lwz r3, 0x84(r31) /* 802C7B04 002C4A44 4B FD A6 9D */ bl JAISound_NS_releaseHandle lbl_802C7B08: @@ -197,7 +197,7 @@ lbl_802C7B08: /* 802C7B20 002C4A60 7C 04 00 40 */ cmplw r4, r0 /* 802C7B24 002C4A64 41 82 00 14 */ beq lbl_802C7B38 /* 802C7B28 002C4A68 38 80 00 1E */ li r4, 0x1e -/* 802C7B2C 002C4A6C 4B FD A9 B1 */ bl JAISound_NS_stop +/* 802C7B2C 002C4A6C 4B FD A9 B1 */ bl stop__8JAISoundFUl /* 802C7B30 002C4A70 80 7F 00 8C */ lwz r3, 0x8c(r31) /* 802C7B34 002C4A74 4B FD A6 6D */ bl JAISound_NS_releaseHandle lbl_802C7B38: @@ -261,7 +261,7 @@ lbl_802C7BB4: /* 802C7C14 002C4B54 7C 04 00 40 */ cmplw r4, r0 /* 802C7C18 002C4B58 41 82 00 14 */ beq lbl_802C7C2C /* 802C7C1C 002C4B5C 38 80 00 1E */ li r4, 0x1e -/* 802C7C20 002C4B60 4B FD A8 BD */ bl JAISound_NS_stop +/* 802C7C20 002C4B60 4B FD A8 BD */ bl stop__8JAISoundFUl /* 802C7C24 002C4B64 80 7F 00 84 */ lwz r3, 0x84(r31) /* 802C7C28 002C4B68 4B FD A5 79 */ bl JAISound_NS_releaseHandle lbl_802C7C2C: diff --git a/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h b/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h index bb5d940e43..71ee62252a 100644 --- a/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h +++ b/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h @@ -1,5 +1,5 @@ #include "JSystem/JAudio2/JAISe/JAISe.h" -#include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h" +#include "JSystem/JAudio2/JAISound/JAISound.h" #include "global.h" struct Z2SoundObjBase {}; diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s index 9baf70da81..e0ee6b708f 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s @@ -3,7 +3,7 @@ /* 802C3344 002C0284 90 01 00 14 */ stw r0, 0x14(r1) /* 802C3348 002C0288 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C334C 002C028C 7C 7F 1B 78 */ mr r31, r3 -/* 802C3350 002C0290 4B FF D0 79 */ bl Z2Creature +/* 802C3350 002C0290 4B FF D0 79 */ bl __ct__10Z2CreatureFv /* 802C3354 002C0294 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C3358 002C0298 48 00 15 91 */ bl Z2LinkSoundStarter_NS_ctor /* 802C335C 002C029C 3C 60 80 3D */ lis r3, lbl_803CB980@ha diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s index 37cb5d143f..721f0535f9 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s @@ -22,7 +22,7 @@ /* 802C3554 002C0494 90 1F 00 A4 */ stw r0, 0xa4(r31) /* 802C3558 002C0498 38 7F 00 94 */ addi r3, r31, 0x94 /* 802C355C 002C049C 38 80 00 00 */ li r4, 0 -/* 802C3560 002C04A0 4B FF A9 E9 */ bl Z2SoundObjBase_NS_dtor +/* 802C3560 002C04A0 4B FF A9 E9 */ bl __dt__14Z2SoundObjBaseFv lbl_802C3564: /* 802C3564 002C04A4 34 1F 00 90 */ addic. r0, r31, 0x90 /* 802C3568 002C04A8 41 82 00 58 */ beq lbl_802C35C0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s index fae5e52714..f94ca8c13f 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s @@ -4,7 +4,7 @@ /* 802C3758 002C0698 38 00 00 00 */ li r0, 0 /* 802C375C 002C069C 98 03 00 C5 */ stb r0, 0xc5(r3) /* 802C3760 002C06A0 38 63 00 94 */ addi r3, r3, 0x94 -/* 802C3764 002C06A4 4B FF A8 95 */ bl Z2SoundObjBase_NS_deleteObject +/* 802C3764 002C06A4 4B FF A8 95 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C3768 002C06A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C376C 002C06AC 7C 08 03 A6 */ mtlr r0 /* 802C3770 002C06B0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s index d8bec59ff0..79b1d1e9fb 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s @@ -26,7 +26,7 @@ /* 802C3B60 002C0AA0 4B FF 72 BD */ bl Z2FxLineMgr_NS_setFxForceOff /* 802C3B64 002C0AA4 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) /* 802C3B68 002C0AA8 38 80 00 20 */ li r4, 0x20 -/* 802C3B6C 002C0AAC 4B FF C4 81 */ bl Z2SoundObjMgr_NS_setGhostEnemyState +/* 802C3B6C 002C0AAC 4B FF C4 81 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc /* 802C3B70 002C0AB0 48 00 00 54 */ b lbl_802C3BC4 lbl_802C3B74: /* 802C3B74 002C0AB4 3C 60 00 02 */ lis r3, 0x00020095@ha @@ -48,7 +48,7 @@ lbl_802C3B74: /* 802C3BB4 002C0AF4 4B FF 72 69 */ bl Z2FxLineMgr_NS_setFxForceOff /* 802C3BB8 002C0AF8 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) /* 802C3BBC 002C0AFC 38 80 00 10 */ li r4, 0x10 -/* 802C3BC0 002C0B00 4B FF C4 2D */ bl Z2SoundObjMgr_NS_setGhostEnemyState +/* 802C3BC0 002C0B00 4B FF C4 2D */ bl setGhostEnemyState__13Z2SoundObjMgrFUc lbl_802C3BC4: /* 802C3BC4 002C0B04 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C3BC8 002C0B08 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s index b7f2bc2e8f..16aa09a6df 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s @@ -53,12 +53,12 @@ lbl_802C3C94: /* 802C3C98 002C0BD8 90 01 00 08 */ stw r0, 8(r1) /* 802C3C9C 002C0BDC 38 7E 00 08 */ addi r3, r30, 8 /* 802C3CA0 002C0BE0 38 81 00 08 */ addi r4, r1, 8 -/* 802C3CA4 002C0BE4 4B FE 75 B1 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C3CA4 002C0BE4 4B FE 75 B1 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C3CA8 002C0BE8 28 03 00 00 */ cmplwi r3, 0 /* 802C3CAC 002C0BEC 41 82 01 90 */ beq lbl_802C3E3C /* 802C3CB0 002C0BF0 80 63 00 00 */ lwz r3, 0(r3) /* 802C3CB4 002C0BF4 38 80 00 00 */ li r4, 0 -/* 802C3CB8 002C0BF8 4B FD E8 25 */ bl JAISound_NS_stop +/* 802C3CB8 002C0BF8 4B FD E8 25 */ bl stop__8JAISoundFUl /* 802C3CBC 002C0BFC 48 00 01 80 */ b lbl_802C3E3C lbl_802C3CC0: /* 802C3CC0 002C0C00 28 1F 00 00 */ cmplwi r31, 0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s index 6d3d8b2cf0..b9bcdb7c49 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s @@ -53,7 +53,7 @@ lbl_802C43D4: /* 802C43D8 002C1318 90 01 00 2C */ stw r0, 0x2c(r1) /* 802C43DC 002C131C 38 7D 00 50 */ addi r3, r29, 0x50 /* 802C43E0 002C1320 38 81 00 2C */ addi r4, r1, 0x2c -/* 802C43E4 002C1324 4B FE 6E 71 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C43E4 002C1324 4B FE 6E 71 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C43E8 002C1328 28 03 00 00 */ cmplwi r3, 0 /* 802C43EC 002C132C 41 82 01 88 */ beq lbl_802C4574 /* 802C43F0 002C1330 38 60 00 00 */ li r3, 0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s index 24681e549a..5efd587f87 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s @@ -67,7 +67,7 @@ lbl_802C4650: /* 802C469C 002C15DC 38 A0 00 08 */ li r5, 8 /* 802C46A0 002C15E0 57 E6 06 3E */ clrlwi r6, r31, 0x18 /* 802C46A4 002C15E4 38 E0 FF FF */ li r7, -1 -/* 802C46A8 002C15E8 4B FE 68 35 */ bl Z2SoundStarter_NS_setPortData +/* 802C46A8 002C15E8 4B FE 68 35 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802C46AC: /* 802C46AC 002C15EC 7F C3 F3 78 */ mr r3, r30 /* 802C46B0 002C15F0 48 00 00 20 */ b lbl_802C46D0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C48E8.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C48E8.s index 76f7ad6726..aa3aae8382 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C48E8.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C48E8.s @@ -4,7 +4,7 @@ /* 802C48F4 002C1834 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C48F8 002C1838 7C 7F 1B 78 */ mr r31, r3 /* 802C48FC 002C183C 38 80 00 00 */ li r4, 0 -/* 802C4900 002C1840 4B FE 62 95 */ bl Z2SoundStarter_NS_ctor +/* 802C4900 002C1840 4B FE 62 95 */ bl __ct__14Z2SoundStarterFb /* 802C4904 002C1844 3C 60 80 3D */ lis r3, lbl_803CB96C@ha /* 802C4908 002C1848 38 03 B9 6C */ addi r0, r3, lbl_803CB96C@l /* 802C490C 002C184C 90 1F 00 00 */ stw r0, 0(r31) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s index 3a3e512193..90c707c391 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s @@ -178,13 +178,13 @@ lbl_802C4B9C: lbl_802C4BAC: /* 802C4BAC 002C1AEC 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4BB0 002C1AF0 38 63 00 50 */ addi r3, r3, 0x50 -/* 802C4BB4 002C1AF4 4B FE 69 51 */ bl Z2SoundHandles_NS_isActive +/* 802C4BB4 002C1AF4 4B FE 69 51 */ bl isActive__14Z2SoundHandlesCFv /* 802C4BB8 002C1AF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802C4BBC 002C1AFC 41 82 01 48 */ beq lbl_802C4D04 /* 802C4BC0 002C1B00 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4BC4 002C1B04 38 63 00 50 */ addi r3, r3, 0x50 /* 802C4BC8 002C1B08 38 80 00 01 */ li r4, 1 -/* 802C4BCC 002C1B0C 4B FE 68 D5 */ bl Z2SoundHandles_NS_stopAllSounds +/* 802C4BCC 002C1B0C 4B FE 68 D5 */ bl stopAllSounds__14Z2SoundHandlesFUl /* 802C4BD0 002C1B10 48 00 01 34 */ b lbl_802C4D04 lbl_802C4BD4: /* 802C4BD4 002C1B14 3B E0 00 01 */ li r31, 1 @@ -225,7 +225,7 @@ lbl_802C4C44: /* 802C4C50 002C1B90 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4C54 002C1B94 38 63 00 50 */ addi r3, r3, 0x50 /* 802C4C58 002C1B98 38 81 00 30 */ addi r4, r1, 0x30 -/* 802C4C5C 002C1B9C 4B FE 65 F9 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C4C5C 002C1B9C 4B FE 65 F9 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C4C60 002C1BA0 28 03 00 00 */ cmplwi r3, 0 /* 802C4C64 002C1BA4 41 82 00 A0 */ beq lbl_802C4D04 /* 802C4C68 002C1BA8 3C 60 00 01 */ lis r3, 0x0001000B@ha @@ -246,7 +246,7 @@ lbl_802C4C90: /* 802C4C9C 002C1BDC 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4CA0 002C1BE0 38 63 00 50 */ addi r3, r3, 0x50 /* 802C4CA4 002C1BE4 38 81 00 28 */ addi r4, r1, 0x28 -/* 802C4CA8 002C1BE8 4B FE 65 AD */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C4CA8 002C1BE8 4B FE 65 AD */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C4CAC 002C1BEC 28 03 00 00 */ cmplwi r3, 0 /* 802C4CB0 002C1BF0 41 82 00 54 */ beq lbl_802C4D04 /* 802C4CB4 002C1BF4 3C 60 00 01 */ lis r3, 0x0001000D@ha @@ -264,12 +264,12 @@ lbl_802C4CD4: /* 802C4CE0 002C1C20 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4CE4 002C1C24 38 63 00 08 */ addi r3, r3, 8 /* 802C4CE8 002C1C28 38 81 00 08 */ addi r4, r1, 8 -/* 802C4CEC 002C1C2C 4B FE 65 69 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802C4CEC 002C1C2C 4B FE 65 69 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802C4CF0 002C1C30 28 03 00 00 */ cmplwi r3, 0 /* 802C4CF4 002C1C34 41 82 00 10 */ beq lbl_802C4D04 /* 802C4CF8 002C1C38 80 63 00 00 */ lwz r3, 0(r3) /* 802C4CFC 002C1C3C 38 80 00 00 */ li r4, 0 -/* 802C4D00 002C1C40 4B FD D7 DD */ bl JAISound_NS_stop +/* 802C4D00 002C1C40 4B FD D7 DD */ bl stop__8JAISoundFUl lbl_802C4D04: /* 802C4D04 002C1C44 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) /* 802C4D08 002C1C48 88 A3 00 CA */ lbz r5, 0xca(r3) @@ -341,7 +341,7 @@ lbl_802C4DD8: /* 802C4E00 002C1D40 FC 80 E8 90 */ fmr f4, f29 /* 802C4E04 002C1D44 FC A0 F0 90 */ fmr f5, f30 /* 802C4E08 002C1D48 7F A8 EB 78 */ mr r8, r29 -/* 802C4E0C 002C1D4C 4B FE 5E 31 */ bl Z2SoundStarter_NS_startSound_X1_ +/* 802C4E0C 002C1D4C 4B FE 5E 31 */ bl startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl /* 802C4E10 002C1D50 7C 7D 1B 78 */ mr r29, r3 /* 802C4E14 002C1D54 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802C4E18 002C1D58 41 82 01 24 */ beq lbl_802C4F3C diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s index 961a5f11a5..3965711c5a 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s @@ -3,7 +3,7 @@ /* 802C5004 002C1F44 90 01 00 14 */ stw r0, 0x14(r1) /* 802C5008 002C1F48 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C500C 002C1F4C 7C 7F 1B 78 */ mr r31, r3 -/* 802C5010 002C1F50 4B FF B3 B9 */ bl Z2Creature +/* 802C5010 002C1F50 4B FF B3 B9 */ bl __ct__10Z2CreatureFv /* 802C5014 002C1F54 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C5018 002C1F58 7F E4 FB 78 */ mr r4, r31 /* 802C501C 002C1F5C 48 00 02 19 */ bl Z2RideSoundStarter diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5234.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5234.s index 4664355482..4574995006 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5234.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5234.s @@ -6,7 +6,7 @@ /* 802C5248 002C2188 7C 7E 1B 78 */ mr r30, r3 /* 802C524C 002C218C 7C 9F 23 78 */ mr r31, r4 /* 802C5250 002C2190 38 80 00 00 */ li r4, 0 -/* 802C5254 002C2194 4B FE 59 41 */ bl Z2SoundStarter_NS_ctor +/* 802C5254 002C2194 4B FE 59 41 */ bl __ct__14Z2SoundStarterFb /* 802C5258 002C2198 3C 60 80 3D */ lis r3, lbl_803CB910@ha /* 802C525C 002C219C 38 03 B9 10 */ addi r0, r3, lbl_803CB910@l /* 802C5260 002C21A0 90 1E 00 00 */ stw r0, 0(r30) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s index 2b21234572..d2076fda3e 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s @@ -42,7 +42,7 @@ lbl_802C5310: /* 802C5314 002C2254 7F A3 EB 78 */ mr r3, r29 /* 802C5318 002C2258 38 81 00 18 */ addi r4, r1, 0x18 /* 802C531C 002C225C FC 20 F8 90 */ fmr f1, f31 -/* 802C5320 002C2260 4B FE 59 1D */ bl Z2SoundStarter_NS_startSound_X1_ +/* 802C5320 002C2260 4B FE 59 1D */ bl startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl /* 802C5324 002C2264 7C 7E 1B 78 */ mr r30, r3 /* 802C5328 002C2268 80 7D 00 04 */ lwz r3, 4(r29) /* 802C532C 002C226C 88 03 00 98 */ lbz r0, 0x98(r3) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54B8.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54B8.s index d7567b9955..272616ed6e 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54B8.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54B8.s @@ -3,7 +3,7 @@ /* 802C54C0 002C2400 90 01 00 14 */ stw r0, 0x14(r1) /* 802C54C4 002C2404 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C54C8 002C2408 7C 7F 1B 78 */ mr r31, r3 -/* 802C54CC 002C240C 4B FF 8A 25 */ bl Z2SoundObjBase_NS_ctor +/* 802C54CC 002C240C 4B FF 8A 25 */ bl __ct__14Z2SoundObjBaseFv /* 802C54D0 002C2410 3C 60 80 3D */ lis r3, lbl_803CB8F0@ha /* 802C54D4 002C2414 38 03 B8 F0 */ addi r0, r3, lbl_803CB8F0@l /* 802C54D8 002C2418 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54FC.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54FC.s index 2b9c6de3a7..a4f0584e9c 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54FC.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C54FC.s @@ -1,7 +1,7 @@ /* 802C54FC 002C243C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802C5500 002C2440 7C 08 02 A6 */ mflr r0 /* 802C5504 002C2444 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C5508 002C2448 4B FF 8A A9 */ bl Z2SoundObjBase_NS_init +/* 802C5508 002C2448 4B FF 8A A9 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802C550C 002C244C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C5510 002C2450 7C 08 03 A6 */ mtlr r0 /* 802C5514 002C2454 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B68B0.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B68B0.s deleted file mode 100644 index 868d91ea82..0000000000 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B68B0.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 802B68B0 002B37F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802B68B4 002B37F4 7C 08 02 A6 */ mflr r0 -/* 802B68B8 002B37F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802B68BC 002B37FC 98 83 00 1E */ stb r4, 0x1e(r3) -/* 802B68C0 002B3800 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 802B68C4 002B3804 40 82 00 0C */ bne lbl_802B68D0 -/* 802B68C8 002B3808 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) -/* 802B68CC 002B380C 4B FF 3B 65 */ bl resetFilterAll__10Z2SoundMgrFv -lbl_802B68D0: -/* 802B68D0 002B3810 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802B68D4 002B3814 7C 08 03 A6 */ mtlr r0 -/* 802B68D8 002B3818 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B68DC 002B381C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s index 0b916e6722..f9dc9297e0 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s @@ -38,7 +38,7 @@ /* 802B6B8C 002B3ACC 48 00 2F 39 */ bl Z2SeMgr_NS_resetCrowdSize /* 802B6B90 002B3AD0 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) /* 802B6B94 002B3AD4 38 80 00 00 */ li r4, 0 -/* 802B6B98 002B3AD8 48 00 94 55 */ bl Z2SoundObjMgr_NS_setGhostEnemyState +/* 802B6B98 002B3AD8 48 00 94 55 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc /* 802B6B9C 002B3ADC 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13) /* 802B6BA0 002B3AE0 4B FF 4C 6D */ bl resetModY__7Z2SeMgrFv /* 802B6BA4 002B3AE4 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13) @@ -1145,7 +1145,7 @@ lbl_802B7B58: /* 802B7BA0 002B4AE0 38 A0 02 BC */ li r5, 0x2bc /* 802B7BA4 002B4AE4 38 C0 04 4C */ li r6, 0x44c /* 802B7BA8 002B4AE8 38 E0 05 DC */ li r7, 0x5dc -/* 802B7BAC 002B4AEC 48 00 7D D5 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B7BAC 002B4AEC 48 00 7D D5 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B7BB0 002B4AF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802B7BB4 002B4AF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802B7BB8 002B4AF8 38 80 00 2E */ li r4, 0x2e @@ -1262,7 +1262,7 @@ lbl_802B7D08: /* 802B7D54 002B4C94 3C E0 00 01 */ lis r7, 0x00009C40@ha /* 802B7D58 002B4C98 38 C7 9C 40 */ addi r6, r7, 0x00009C40@l /* 802B7D5C 002B4C9C 38 E7 C3 50 */ addi r7, r7, -15536 -/* 802B7D60 002B4CA0 48 00 7C 21 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B7D60 002B4CA0 48 00 7C 21 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B7D64 002B4CA4 48 00 19 54 */ b lbl_802B96B8 lbl_802B7D68: /* 802B7D68 002B4CA8 38 60 00 0F */ li r3, 0xf @@ -1775,7 +1775,7 @@ lbl_802B8468: /* 802B849C 002B53DC 38 A0 03 E8 */ li r5, 0x3e8 /* 802B84A0 002B53E0 38 C0 07 D0 */ li r6, 0x7d0 /* 802B84A4 002B53E4 38 E0 23 28 */ li r7, 0x2328 -/* 802B84A8 002B53E8 48 00 74 D9 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B84A8 002B53E8 48 00 74 D9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B84AC 002B53EC 3B E0 00 3D */ li r31, 0x3d /* 802B84B0 002B53F0 3B 20 00 1C */ li r25, 0x1c lbl_802B84B4: @@ -1855,7 +1855,7 @@ lbl_802B8578: /* 802B85B4 002B54F4 38 A0 02 BC */ li r5, 0x2bc /* 802B85B8 002B54F8 38 C0 04 4C */ li r6, 0x44c /* 802B85BC 002B54FC 38 E0 05 DC */ li r7, 0x5dc -/* 802B85C0 002B5500 48 00 73 C1 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B85C0 002B5500 48 00 73 C1 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B85C4 002B5504 48 00 10 F4 */ b lbl_802B96B8 lbl_802B85C8: /* 802B85C8 002B5508 88 1B 00 1E */ lbz r0, 0x1e(r27) @@ -2022,7 +2022,7 @@ lbl_802B87E8: /* 802B8810 002B5750 38 A0 02 BC */ li r5, 0x2bc /* 802B8814 002B5754 38 C0 04 4C */ li r6, 0x44c /* 802B8818 002B5758 38 E0 05 DC */ li r7, 0x5dc -/* 802B881C 002B575C 48 00 71 65 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B881C 002B575C 48 00 71 65 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8820 002B5760 48 00 0E 98 */ b lbl_802B96B8 /* 802B8824 002B5764 3B A0 00 4A */ li r29, 0x4a /* 802B8828 002B5768 2C 13 00 0B */ cmpwi r19, 0xb @@ -2057,7 +2057,7 @@ lbl_802B887C: /* 802B888C 002B57CC 38 A0 02 BC */ li r5, 0x2bc /* 802B8890 002B57D0 38 C0 04 4C */ li r6, 0x44c /* 802B8894 002B57D4 38 E0 05 DC */ li r7, 0x5dc -/* 802B8898 002B57D8 48 00 70 E9 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8898 002B57D8 48 00 70 E9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B889C 002B57DC 48 00 0E 1C */ b lbl_802B96B8 /* 802B88A0 002B57E0 3B A0 00 4A */ li r29, 0x4a /* 802B88A4 002B57E4 48 00 10 F9 */ bl dComIfGs_getStartPoint @@ -2112,7 +2112,7 @@ lbl_802B8938: /* 802B894C 002B588C 38 A0 02 BC */ li r5, 0x2bc /* 802B8950 002B5890 38 C0 04 4C */ li r6, 0x44c /* 802B8954 002B5894 38 E0 05 DC */ li r7, 0x5dc -/* 802B8958 002B5898 48 00 70 29 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8958 002B5898 48 00 70 29 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B895C 002B589C 48 00 0D 5C */ b lbl_802B96B8 /* 802B8960 002B58A0 38 61 00 C8 */ addi r3, r1, 0xc8 /* 802B8964 002B58A4 3C 80 01 00 */ lis r4, 0x01000009@ha @@ -2147,7 +2147,7 @@ lbl_802B8938: /* 802B89D8 002B5918 38 A0 02 BC */ li r5, 0x2bc /* 802B89DC 002B591C 38 C0 04 4C */ li r6, 0x44c /* 802B89E0 002B5920 38 E0 05 DC */ li r7, 0x5dc -/* 802B89E4 002B5924 48 00 6F 9D */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B89E4 002B5924 48 00 6F 9D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B89E8 002B5928 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B89EC 002B592C 88 8D 82 E0 */ lbz r4, lbl_80450860-_SDA_BASE_(r13) /* 802B89F0 002B5930 48 00 0F BD */ bl Z2SeqMgr_NS_unMuteSceneBgm @@ -2192,7 +2192,7 @@ lbl_802B8A6C: /* 802B8A84 002B59C4 38 A0 02 BC */ li r5, 0x2bc /* 802B8A88 002B59C8 38 C0 04 4C */ li r6, 0x44c /* 802B8A8C 002B59CC 38 E0 05 DC */ li r7, 0x5dc -/* 802B8A90 002B59D0 48 00 6E F1 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8A90 002B59D0 48 00 6E F1 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs lbl_802B8A94: /* 802B8A94 002B59D4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B8A98 002B59D8 88 8D 82 E0 */ lbz r4, lbl_80450860-_SDA_BASE_(r13) @@ -2231,7 +2231,7 @@ lbl_802B8A94: /* 802B8B1C 002B5A5C 38 A0 02 BC */ li r5, 0x2bc /* 802B8B20 002B5A60 38 C0 04 4C */ li r6, 0x44c /* 802B8B24 002B5A64 38 E0 05 DC */ li r7, 0x5dc -/* 802B8B28 002B5A68 48 00 6E 59 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8B28 002B5A68 48 00 6E 59 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8B2C 002B5A6C 48 00 0B 8C */ b lbl_802B96B8 /* 802B8B30 002B5A70 3B A0 00 05 */ li r29, 5 /* 802B8B34 002B5A74 38 60 00 03 */ li r3, 3 @@ -2273,7 +2273,7 @@ lbl_802B8BA4: /* 802B8BBC 002B5AFC 38 A0 02 BC */ li r5, 0x2bc /* 802B8BC0 002B5B00 38 C0 04 4C */ li r6, 0x44c /* 802B8BC4 002B5B04 38 E0 05 DC */ li r7, 0x5dc -/* 802B8BC8 002B5B08 48 00 6D B9 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8BC8 002B5B08 48 00 6D B9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8BCC 002B5B0C 48 00 0A EC */ b lbl_802B96B8 /* 802B8BD0 002B5B10 38 61 00 A8 */ addi r3, r1, 0xa8 /* 802B8BD4 002B5B14 3C 80 01 00 */ lis r4, 0x01000020@ha @@ -2305,7 +2305,7 @@ lbl_802B8BA4: /* 802B8C3C 002B5B7C 38 A0 02 BC */ li r5, 0x2bc /* 802B8C40 002B5B80 38 C0 04 4C */ li r6, 0x44c /* 802B8C44 002B5B84 38 E0 05 DC */ li r7, 0x5dc -/* 802B8C48 002B5B88 48 00 6D 39 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8C48 002B5B88 48 00 6D 39 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8C4C 002B5B8C 48 00 0A 6C */ b lbl_802B96B8 /* 802B8C50 002B5B90 3B A0 00 09 */ li r29, 9 /* 802B8C54 002B5B94 38 60 00 04 */ li r3, 4 @@ -2347,7 +2347,7 @@ lbl_802B8CC4: /* 802B8CDC 002B5C1C 38 A0 02 BC */ li r5, 0x2bc /* 802B8CE0 002B5C20 38 C0 04 4C */ li r6, 0x44c /* 802B8CE4 002B5C24 38 E0 05 DC */ li r7, 0x5dc -/* 802B8CE8 002B5C28 48 00 6C 99 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8CE8 002B5C28 48 00 6C 99 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8CEC 002B5C2C 48 00 09 CC */ b lbl_802B96B8 /* 802B8CF0 002B5C30 38 61 00 98 */ addi r3, r1, 0x98 /* 802B8CF4 002B5C34 3C 80 01 00 */ lis r4, 0x0100002D@ha @@ -2367,7 +2367,7 @@ lbl_802B8CC4: /* 802B8D2C 002B5C6C 38 A0 02 BC */ li r5, 0x2bc /* 802B8D30 002B5C70 38 C0 04 4C */ li r6, 0x44c /* 802B8D34 002B5C74 38 E0 05 DC */ li r7, 0x5dc -/* 802B8D38 002B5C78 48 00 6C 49 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8D38 002B5C78 48 00 6C 49 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8D3C 002B5C7C 48 00 09 7C */ b lbl_802B96B8 /* 802B8D40 002B5C80 38 61 00 94 */ addi r3, r1, 0x94 /* 802B8D44 002B5C84 3C 80 01 00 */ lis r4, 0x0100002D@ha @@ -2387,7 +2387,7 @@ lbl_802B8CC4: /* 802B8D7C 002B5CBC 38 A0 02 BC */ li r5, 0x2bc /* 802B8D80 002B5CC0 38 C0 04 4C */ li r6, 0x44c /* 802B8D84 002B5CC4 38 E0 05 DC */ li r7, 0x5dc -/* 802B8D88 002B5CC8 48 00 6B F9 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8D88 002B5CC8 48 00 6B F9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8D8C 002B5CCC 48 00 09 2C */ b lbl_802B96B8 /* 802B8D90 002B5CD0 3B A0 00 0D */ li r29, 0xd /* 802B8D94 002B5CD4 38 60 00 0A */ li r3, 0xa @@ -2429,7 +2429,7 @@ lbl_802B8E04: /* 802B8E1C 002B5D5C 38 A0 02 BC */ li r5, 0x2bc /* 802B8E20 002B5D60 38 C0 04 4C */ li r6, 0x44c /* 802B8E24 002B5D64 38 E0 05 DC */ li r7, 0x5dc -/* 802B8E28 002B5D68 48 00 6B 59 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8E28 002B5D68 48 00 6B 59 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8E2C 002B5D6C 48 00 08 8C */ b lbl_802B96B8 /* 802B8E30 002B5D70 38 61 00 88 */ addi r3, r1, 0x88 /* 802B8E34 002B5D74 3C 80 01 00 */ lis r4, 0x01000037@ha @@ -2464,7 +2464,7 @@ lbl_802B8E04: /* 802B8EA8 002B5DE8 38 A0 02 BC */ li r5, 0x2bc /* 802B8EAC 002B5DEC 38 C0 04 4C */ li r6, 0x44c /* 802B8EB0 002B5DF0 38 E0 05 DC */ li r7, 0x5dc -/* 802B8EB4 002B5DF4 48 00 6A CD */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8EB4 002B5DF4 48 00 6A CD */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8EB8 002B5DF8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B8EBC 002B5DFC 7F 44 D3 78 */ mr r4, r26 /* 802B8EC0 002B5E00 4B FF 70 CD */ bl changeBgmStatus__8Z2SeqMgrFl @@ -2512,7 +2512,7 @@ lbl_802B8F48: /* 802B8F60 002B5EA0 38 A0 02 BC */ li r5, 0x2bc /* 802B8F64 002B5EA4 38 C0 04 4C */ li r6, 0x44c /* 802B8F68 002B5EA8 38 E0 05 DC */ li r7, 0x5dc -/* 802B8F6C 002B5EAC 48 00 6A 15 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8F6C 002B5EAC 48 00 6A 15 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8F70 002B5EB0 48 00 07 48 */ b lbl_802B96B8 /* 802B8F74 002B5EB4 38 61 00 78 */ addi r3, r1, 0x78 /* 802B8F78 002B5EB8 3C 80 01 00 */ lis r4, 0x0100003C@ha @@ -2544,7 +2544,7 @@ lbl_802B8F48: /* 802B8FE0 002B5F20 38 A0 02 BC */ li r5, 0x2bc /* 802B8FE4 002B5F24 38 C0 04 4C */ li r6, 0x44c /* 802B8FE8 002B5F28 38 E0 05 DC */ li r7, 0x5dc -/* 802B8FEC 002B5F2C 48 00 69 95 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B8FEC 002B5F2C 48 00 69 95 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B8FF0 002B5F30 48 00 06 C8 */ b lbl_802B96B8 /* 802B8FF4 002B5F34 3B A0 00 15 */ li r29, 0x15 /* 802B8FF8 002B5F38 38 60 00 07 */ li r3, 7 @@ -2586,7 +2586,7 @@ lbl_802B9068: /* 802B9080 002B5FC0 38 A0 02 BC */ li r5, 0x2bc /* 802B9084 002B5FC4 38 C0 04 4C */ li r6, 0x44c /* 802B9088 002B5FC8 38 E0 05 DC */ li r7, 0x5dc -/* 802B908C 002B5FCC 48 00 68 F5 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B908C 002B5FCC 48 00 68 F5 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B9090 002B5FD0 48 00 06 28 */ b lbl_802B96B8 /* 802B9094 002B5FD4 2C 1A 00 10 */ cmpwi r26, 0x10 /* 802B9098 002B5FD8 40 82 00 28 */ bne lbl_802B90C0 @@ -2630,7 +2630,7 @@ lbl_802B90E0: /* 802B9128 002B6068 38 A0 02 BC */ li r5, 0x2bc /* 802B912C 002B606C 38 C0 04 4C */ li r6, 0x44c /* 802B9130 002B6070 38 E0 05 DC */ li r7, 0x5dc -/* 802B9134 002B6074 48 00 68 4D */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B9134 002B6074 48 00 68 4D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B9138 002B6078 48 00 05 80 */ b lbl_802B96B8 /* 802B913C 002B607C 3B A0 00 19 */ li r29, 0x19 /* 802B9140 002B6080 38 60 00 16 */ li r3, 0x16 @@ -2672,7 +2672,7 @@ lbl_802B91B0: /* 802B91C8 002B6108 38 A0 02 BC */ li r5, 0x2bc /* 802B91CC 002B610C 38 C0 04 4C */ li r6, 0x44c /* 802B91D0 002B6110 38 E0 05 DC */ li r7, 0x5dc -/* 802B91D4 002B6114 48 00 67 AD */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B91D4 002B6114 48 00 67 AD */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B91D8 002B6118 48 00 04 E0 */ b lbl_802B96B8 /* 802B91DC 002B611C 2C 13 00 08 */ cmpwi r19, 8 /* 802B91E0 002B6120 40 82 00 2C */ bne lbl_802B920C @@ -2728,7 +2728,7 @@ lbl_802B924C: /* 802B9294 002B61D4 38 A0 02 BC */ li r5, 0x2bc /* 802B9298 002B61D8 38 C0 04 4C */ li r6, 0x44c /* 802B929C 002B61DC 38 E0 05 DC */ li r7, 0x5dc -/* 802B92A0 002B61E0 48 00 66 E1 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B92A0 002B61E0 48 00 66 E1 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B92A4 002B61E4 48 00 04 14 */ b lbl_802B96B8 /* 802B92A8 002B61E8 2C 13 00 08 */ cmpwi r19, 8 /* 802B92AC 002B61EC 40 82 00 0C */ bne lbl_802B92B8 @@ -2808,7 +2808,7 @@ lbl_802B93A8: /* 802B93B8 002B62F8 38 A0 02 BC */ li r5, 0x2bc /* 802B93BC 002B62FC 38 C0 04 4C */ li r6, 0x44c /* 802B93C0 002B6300 38 E0 05 DC */ li r7, 0x5dc -/* 802B93C4 002B6304 48 00 65 BD */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B93C4 002B6304 48 00 65 BD */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B93C8 002B6308 48 00 02 F0 */ b lbl_802B96B8 /* 802B93CC 002B630C 2C 1A 00 01 */ cmpwi r26, 1 /* 802B93D0 002B6310 41 80 00 30 */ blt lbl_802B9400 @@ -2855,7 +2855,7 @@ lbl_802B944C: /* 802B9464 002B63A4 38 A0 02 BC */ li r5, 0x2bc /* 802B9468 002B63A8 38 C0 04 4C */ li r6, 0x44c /* 802B946C 002B63AC 38 E0 05 DC */ li r7, 0x5dc -/* 802B9470 002B63B0 48 00 65 11 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B9470 002B63B0 48 00 65 11 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B9474 002B63B4 48 00 02 44 */ b lbl_802B96B8 /* 802B9478 002B63B8 2C 1A 00 32 */ cmpwi r26, 0x32 /* 802B947C 002B63BC 40 82 00 58 */ bne lbl_802B94D4 @@ -2893,7 +2893,7 @@ lbl_802B94D4: /* 802B94E8 002B6428 38 A0 02 BC */ li r5, 0x2bc /* 802B94EC 002B642C 38 C0 04 4C */ li r6, 0x44c /* 802B94F0 002B6430 38 E0 05 DC */ li r7, 0x5dc -/* 802B94F4 002B6434 48 00 64 8D */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B94F4 002B6434 48 00 64 8D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B94F8 002B6438 48 00 01 C0 */ b lbl_802B96B8 /* 802B94FC 002B643C 3B E0 00 4B */ li r31, 0x4b /* 802B9500 002B6440 3B C0 00 63 */ li r30, 0x63 @@ -2905,7 +2905,7 @@ lbl_802B94D4: /* 802B9518 002B6458 38 A0 02 BC */ li r5, 0x2bc /* 802B951C 002B645C 38 C0 04 4C */ li r6, 0x44c /* 802B9520 002B6460 38 E0 05 DC */ li r7, 0x5dc -/* 802B9524 002B6464 48 00 64 5D */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B9524 002B6464 48 00 64 5D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B9528 002B6468 48 00 01 90 */ b lbl_802B96B8 /* 802B952C 002B646C 2C 13 00 08 */ cmpwi r19, 8 /* 802B9530 002B6470 40 82 00 10 */ bne lbl_802B9540 @@ -3122,7 +3122,7 @@ lbl_802B9814: lbl_802B9840: /* 802B9840 002B6780 80 70 00 00 */ lwz r3, 0(r16) /* 802B9844 002B6784 88 8D 82 E0 */ lbz r4, lbl_80450860-_SDA_BASE_(r13) -/* 802B9848 002B6788 4B FE 8C 95 */ bl JAISound_NS_stop +/* 802B9848 002B6788 4B FE 8C 95 */ bl stop__8JAISoundFUl lbl_802B984C: /* 802B984C 002B678C 82 10 00 0C */ lwz r16, 0xc(r16) lbl_802B9850: diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s index 7629942f45..85aeaca7b0 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s @@ -6,7 +6,7 @@ /* 802B9D54 002B6C94 38 00 00 00 */ li r0, 0 /* 802B9D58 002B6C98 90 03 00 08 */ stw r0, 8(r3) /* 802B9D5C 002B6C9C 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B9D60 002B6CA0 48 00 63 DD */ bl Z2SoundObjMgr_NS_deleteEnemyAll +/* 802B9D60 002B6CA0 48 00 63 DD */ bl deleteEnemyAll__13Z2SoundObjMgrFv /* 802B9D64 002B6CA4 7F E3 FB 78 */ mr r3, r31 /* 802B9D68 002B6CA8 38 80 00 00 */ li r4, 0 /* 802B9D6C 002B6CAC 4B FF CB 75 */ bl setSceneExist__10Z2SceneMgrFb diff --git a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h index fda7860f9d..9152bae2e2 100644 --- a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h +++ b/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h @@ -2,12 +2,17 @@ #define Z2SEMGR_H_ #include "JSystem/JAudio2/JAISe/JAISe.h" +#include "JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h" #include "Z2AudioLib/Z2Param/Z2Param.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" #include "global.h" struct Z2MultiSeObj { Z2MultiSeObj(); + + u8 unk0[28]; + u32 field_0x1c; + u8 unk1[4]; }; struct Z2SeMgr { @@ -31,6 +36,27 @@ struct Z2SeMgr { void processSeFramework(void); bool isLevelSe(JAISoundID); bool isSoundCulling(JAISoundID); + + JAISoundHandles sound_handles; + Z2SeMgr* se_mgr; + u32 field_0x64; + + Z2MultiSeObj level_object_se[10]; + u8 level_object_se_count; + + u8 padding_1[3]; + + Z2MultiSeObj multi_trigger_se[10]; + u8 multi_trigger_se_count; + + u8 padding_2[3]; + + u8 unk0[128]; + s8 unk1[12]; + + u8 mCrowdSize; + + u8 unk2[3]; }; struct Z2MultiSeMgr { @@ -40,6 +66,17 @@ struct Z2MultiSeMgr { void resetMultiSePos(void); float getPanPower(void); float getDolbyPower(void); + + u8 field_0x0; + u8 field_0x1; + u8 field_0x2; + u8 field_0x3; + f32 field_0x4; + f32 field_0x8; + f32 field_0xc; + f32 field_0x10; + f32 field_0x14; + s8 field_0x18; }; extern "C" { @@ -57,7 +94,7 @@ void Z2Audience_NS_calcOffMicSound(void); void modHeightAtCamera__7Z2SeMgrFPPC3Vec(Vec const**); void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8); -void JAISoundHandle_NS_releaseSound(void); +void releaseSound__14JAISoundHandleFv(void); void seStop__7Z2SeMgrF10JAISoundIDUl(JAISoundID, u32); void JAISeCategoryMgr_NS_stop(void); void seMoveVolumeAll__7Z2SeMgrFfUl(float, u32); @@ -88,7 +125,7 @@ extern float lbl_804558D4; extern double lbl_804558E0; extern float lbl_804558C0; extern float lbl_8045587C; -extern float lbl_80455878; +extern float lbl_80455878; // 0.0f extern float lbl_80455870; extern float lbl_80455874; extern float lbl_80455880; diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s deleted file mode 100644 index 6c390ddd99..0000000000 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802AB93C 002A887C 88 83 03 CC */ lbz r4, 0x3cc(r3) -/* 802AB940 002A8880 38 04 00 01 */ addi r0, r4, 1 -/* 802AB944 002A8884 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB948 002A8888 88 03 03 CC */ lbz r0, 0x3cc(r3) -/* 802AB94C 002A888C 28 00 00 64 */ cmplwi r0, 0x64 -/* 802AB950 002A8890 4C 81 00 20 */ blelr -/* 802AB954 002A8894 38 00 00 64 */ li r0, 0x64 -/* 802AB958 002A8898 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB95C 002A889C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB960.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AB960.s deleted file mode 100644 index 69cb6c1d6e..0000000000 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB960.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802AB960 002A88A0 88 83 03 CC */ lbz r4, 0x3cc(r3) -/* 802AB964 002A88A4 38 04 FF FF */ addi r0, r4, -1 -/* 802AB968 002A88A8 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB96C 002A88AC 88 03 03 CC */ lbz r0, 0x3cc(r3) -/* 802AB970 002A88B0 28 00 00 64 */ cmplwi r0, 0x64 -/* 802AB974 002A88B4 4C 81 00 20 */ blelr -/* 802AB978 002A88B8 38 00 00 00 */ li r0, 0 -/* 802AB97C 002A88BC 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB980 002A88C0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s index 7045b5c12e..88e83b4827 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s @@ -1191,7 +1191,7 @@ lbl_802AD638: /* 802AD64C 002AA58C 38 A0 00 06 */ li r5, 6 /* 802AD650 002AA590 57 86 04 3E */ clrlwi r6, r28, 0x10 /* 802AD654 002AA594 38 E0 FF FF */ li r7, -1 -/* 802AD658 002AA598 4B FF D8 85 */ bl Z2SoundStarter_NS_setPortData +/* 802AD658 002AA598 4B FF D8 85 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802AD65C: /* 802AD65C 002AA59C 7F A0 07 75 */ extsb. r0, r29 /* 802AD660 002AA5A0 41 82 00 40 */ beq lbl_802AD6A0 diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s index 8cb05f26d5..41b89eab9f 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s @@ -24,10 +24,10 @@ lbl_802AD8E8: /* 802AD908 002AA848 7C 04 00 40 */ cmplw r4, r0 /* 802AD90C 002AA84C 40 82 00 18 */ bne lbl_802AD924 /* 802AD910 002AA850 7F A4 EB 78 */ mr r4, r29 -/* 802AD914 002AA854 4B FF 4B C9 */ bl JAISound_NS_stop +/* 802AD914 002AA854 4B FF 4B C9 */ bl stop__8JAISoundFUl /* 802AD918 002AA858 80 1B 00 60 */ lwz r0, 0x60(r27) /* 802AD91C 002AA85C 7C 60 FA 14 */ add r3, r0, r31 -/* 802AD920 002AA860 4B FF 48 65 */ bl JAISoundHandle_NS_releaseSound +/* 802AD920 002AA860 4B FF 48 65 */ bl releaseSound__14JAISoundHandleFv lbl_802AD924: /* 802AD924 002AA864 3B DE 00 01 */ addi r30, r30, 1 lbl_802AD928: diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s deleted file mode 100644 index 23318a9f2a..0000000000 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 802AECBC 002ABBFC 38 00 FF FF */ li r0, -1 -/* 802AECC0 002ABC00 98 03 00 18 */ stb r0, 0x18(r3) -/* 802AECC4 002ABC04 C0 02 BE 78 */ lfs f0, lbl_80455878-_SDA2_BASE_(r2) -/* 802AECC8 002ABC08 D0 03 00 08 */ stfs f0, 8(r3) -/* 802AECCC 002ABC0C D0 03 00 0C */ stfs f0, 0xc(r3) -/* 802AECD0 002ABC10 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 802AECD4 002ABC14 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 802AECD8 002ABC18 D0 03 00 04 */ stfs f0, 4(r3) -/* 802AECDC 002ABC1C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h index aa909c9137..08508124c9 100644 --- a/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h @@ -2,7 +2,7 @@ #define Z2SEQMGR_H_ #include "JSystem/JAudio2/JAISe/JAISe.h" -#include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h" +#include "JSystem/JAudio2/JAISound/JAISound.h" #include "Z2AudioLib/Z2Param/Z2Param.h" #include "global.h" @@ -67,13 +67,12 @@ void JAISeqMgr_NS_stop_X1_(void); void bgmStart__8Z2SeqMgrFUlUll(u32, u32, s32); void bgmStop__8Z2SeqMgrFUll(u32, s32); void bgmStreamCheckReady__8Z2SeqMgrFv(void); -void JAISoundHandle_NS_releaseSound(void); +void releaseSound__14JAISoundHandleFv(void); void Z2SeqMgr_NS_subBgmStop(void); void subBgmStop__8Z2SeqMgrFv(void); void subBgmStopInner__8Z2SeqMgrFv(void); void JAISoundStatus__NS_lockWhenPrepared(); void bgmStreamPrepare__8Z2SeqMgrFUl(u32); -void JAISound_NS_stop_X1_(void); void JAISoundStatus__NS_unlockIfLocked(void); void bgmStreamPlay__8Z2SeqMgrFv(void); void bgmStreamStop__8Z2SeqMgrFUl(u32); diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s index 61dc0b34f7..9f266fe2cc 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s @@ -141,7 +141,7 @@ lbl_802AF210: /* 802AF214 002AC154 28 03 00 00 */ cmplwi r3, 0 /* 802AF218 002AC158 41 82 00 0C */ beq lbl_802AF224 /* 802AF21C 002AC15C 38 80 00 00 */ li r4, 0 -/* 802AF220 002AC160 4B FF 32 BD */ bl JAISound_NS_stop +/* 802AF220 002AC160 4B FF 32 BD */ bl stop__8JAISoundFUl lbl_802AF224: /* 802AF224 002AC164 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2) /* 802AF228 002AC168 D0 1C 00 64 */ stfs f0, 0x64(r28) @@ -159,7 +159,7 @@ lbl_802AF240: /* 802AF254 002AC194 28 03 00 00 */ cmplwi r3, 0 /* 802AF258 002AC198 41 82 00 0C */ beq lbl_802AF264 /* 802AF25C 002AC19C 38 80 00 00 */ li r4, 0 -/* 802AF260 002AC1A0 4B FF 32 7D */ bl JAISound_NS_stop +/* 802AF260 002AC1A0 4B FF 32 7D */ bl stop__8JAISoundFUl lbl_802AF264: /* 802AF264 002AC1A4 2C 1F 00 00 */ cmpwi r31, 0 /* 802AF268 002AC1A8 40 82 00 48 */ bne lbl_802AF2B0 @@ -167,7 +167,7 @@ lbl_802AF264: /* 802AF270 002AC1B0 28 03 00 00 */ cmplwi r3, 0 /* 802AF274 002AC1B4 41 82 00 0C */ beq lbl_802AF280 /* 802AF278 002AC1B8 38 80 00 00 */ li r4, 0 -/* 802AF27C 002AC1BC 4B FF 32 61 */ bl JAISound_NS_stop +/* 802AF27C 002AC1BC 4B FF 32 61 */ bl stop__8JAISoundFUl lbl_802AF280: /* 802AF280 002AC1C0 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2) /* 802AF284 002AC1C4 D0 1C 00 14 */ stfs f0, 0x14(r28) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s index cf6c8ad09b..d79c5c6f58 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s @@ -9,13 +9,13 @@ /* 802AF428 002AC368 80 63 00 00 */ lwz r3, 0(r3) /* 802AF42C 002AC36C 28 03 00 00 */ cmplwi r3, 0 /* 802AF430 002AC370 41 82 00 08 */ beq lbl_802AF438 -/* 802AF434 002AC374 4B FF 30 A9 */ bl JAISound_NS_stop +/* 802AF434 002AC374 4B FF 30 A9 */ bl stop__8JAISoundFUl lbl_802AF438: /* 802AF438 002AC378 80 7D 00 0C */ lwz r3, 0xc(r29) /* 802AF43C 002AC37C 28 03 00 00 */ cmplwi r3, 0 /* 802AF440 002AC380 41 82 00 0C */ beq lbl_802AF44C /* 802AF444 002AC384 7F C4 F3 78 */ mr r4, r30 -/* 802AF448 002AC388 4B FF 30 95 */ bl JAISound_NS_stop +/* 802AF448 002AC388 4B FF 30 95 */ bl stop__8JAISoundFUl lbl_802AF44C: /* 802AF44C 002AC38C 2C 1F 00 00 */ cmpwi r31, 0 /* 802AF450 002AC390 40 82 00 34 */ bne lbl_802AF484 @@ -23,7 +23,7 @@ lbl_802AF44C: /* 802AF458 002AC398 28 03 00 00 */ cmplwi r3, 0 /* 802AF45C 002AC39C 41 82 00 0C */ beq lbl_802AF468 /* 802AF460 002AC3A0 7F C4 F3 78 */ mr r4, r30 -/* 802AF464 002AC3A4 4B FF 30 79 */ bl JAISound_NS_stop +/* 802AF464 002AC3A4 4B FF 30 79 */ bl stop__8JAISoundFUl lbl_802AF468: /* 802AF468 002AC3A8 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2) /* 802AF46C 002AC3AC D0 1D 00 14 */ stfs f0, 0x14(r29) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s index 83f61440ba..bcc3a8c6c4 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s @@ -57,7 +57,7 @@ lbl_802AF51C: /* 802AF570 002AC4B0 28 03 00 00 */ cmplwi r3, 0 /* 802AF574 002AC4B4 41 82 00 0C */ beq lbl_802AF580 /* 802AF578 002AC4B8 38 80 00 00 */ li r4, 0 -/* 802AF57C 002AC4BC 4B FF 2F 61 */ bl JAISound_NS_stop +/* 802AF57C 002AC4BC 4B FF 2F 61 */ bl stop__8JAISoundFUl lbl_802AF580: /* 802AF580 002AC4C0 7F A3 EB 78 */ mr r3, r29 /* 802AF584 002AC4C4 38 80 00 01 */ li r4, 1 @@ -79,13 +79,13 @@ lbl_802AF580: /* 802AF5C4 002AC504 28 03 00 00 */ cmplwi r3, 0 /* 802AF5C8 002AC508 41 82 00 0C */ beq lbl_802AF5D4 /* 802AF5CC 002AC50C 38 80 00 00 */ li r4, 0 -/* 802AF5D0 002AC510 4B FF 2F 0D */ bl JAISound_NS_stop +/* 802AF5D0 002AC510 4B FF 2F 0D */ bl stop__8JAISoundFUl lbl_802AF5D4: /* 802AF5D4 002AC514 80 7D 00 0C */ lwz r3, 0xc(r29) /* 802AF5D8 002AC518 28 03 00 00 */ cmplwi r3, 0 /* 802AF5DC 002AC51C 41 82 00 0C */ beq lbl_802AF5E8 /* 802AF5E0 002AC520 38 80 00 00 */ li r4, 0 -/* 802AF5E4 002AC524 4B FF 2E F9 */ bl JAISound_NS_stop +/* 802AF5E4 002AC524 4B FF 2E F9 */ bl stop__8JAISoundFUl lbl_802AF5E8: /* 802AF5E8 002AC528 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2) /* 802AF5EC 002AC52C D0 1D 00 64 */ stfs f0, 0x64(r29) @@ -125,9 +125,9 @@ lbl_802AF64C: /* 802AF664 002AC5A4 40 82 00 18 */ bne lbl_802AF67C lbl_802AF668: /* 802AF668 002AC5A8 38 80 00 00 */ li r4, 0 -/* 802AF66C 002AC5AC 4B FF 2E 71 */ bl JAISound_NS_stop +/* 802AF66C 002AC5AC 4B FF 2E 71 */ bl stop__8JAISoundFUl /* 802AF670 002AC5B0 38 7D 00 04 */ addi r3, r29, 4 -/* 802AF674 002AC5B4 4B FF 2B 11 */ bl JAISoundHandle_NS_releaseSound +/* 802AF674 002AC5B4 4B FF 2B 11 */ bl releaseSound__14JAISoundHandleFv /* 802AF678 002AC5B8 48 00 00 28 */ b lbl_802AF6A0 lbl_802AF67C: /* 802AF67C 002AC5BC 38 00 FF FF */ li r0, -1 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s index 20edfa47b7..9500b969d4 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s @@ -45,7 +45,7 @@ lbl_802AF8B4: /* 802AF92C 002AC86C 48 00 48 39 */ bl Z2SeqMgr_NS_setBattleBgmOff /* 802AF930 002AC870 80 7F 00 04 */ lwz r3, 4(r31) /* 802AF934 002AC874 38 80 00 17 */ li r4, 0x17 -/* 802AF938 002AC878 4B FF 2B A5 */ bl JAISound_NS_stop +/* 802AF938 002AC878 4B FF 2B A5 */ bl stop__8JAISoundFUl /* 802AF93C 002AC87C 38 00 00 37 */ li r0, 0x37 /* 802AF940 002AC880 B0 1F 00 B8 */ sth r0, 0xb8(r31) /* 802AF944 002AC884 48 00 00 78 */ b lbl_802AF9BC @@ -53,25 +53,25 @@ lbl_802AF8B4: /* 802AF94C 002AC88C B0 1F 00 B8 */ sth r0, 0xb8(r31) /* 802AF950 002AC890 80 7F 00 04 */ lwz r3, 4(r31) /* 802AF954 002AC894 38 80 00 2D */ li r4, 0x2d -/* 802AF958 002AC898 4B FF 2B 85 */ bl JAISound_NS_stop +/* 802AF958 002AC898 4B FF 2B 85 */ bl stop__8JAISoundFUl /* 802AF95C 002AC89C 48 00 00 60 */ b lbl_802AF9BC /* 802AF960 002AC8A0 38 00 01 FE */ li r0, 0x1fe /* 802AF964 002AC8A4 B0 1F 00 B8 */ sth r0, 0xb8(r31) /* 802AF968 002AC8A8 80 7F 00 04 */ lwz r3, 4(r31) /* 802AF96C 002AC8AC 38 80 00 2D */ li r4, 0x2d -/* 802AF970 002AC8B0 4B FF 2B 6D */ bl JAISound_NS_stop +/* 802AF970 002AC8B0 4B FF 2B 6D */ bl stop__8JAISoundFUl /* 802AF974 002AC8B4 48 00 00 48 */ b lbl_802AF9BC /* 802AF978 002AC8B8 38 00 01 68 */ li r0, 0x168 /* 802AF97C 002AC8BC B0 1F 00 B8 */ sth r0, 0xb8(r31) /* 802AF980 002AC8C0 80 7F 00 04 */ lwz r3, 4(r31) /* 802AF984 002AC8C4 38 80 00 2D */ li r4, 0x2d -/* 802AF988 002AC8C8 4B FF 2B 55 */ bl JAISound_NS_stop +/* 802AF988 002AC8C8 4B FF 2B 55 */ bl stop__8JAISoundFUl /* 802AF98C 002AC8CC 48 00 00 30 */ b lbl_802AF9BC /* 802AF990 002AC8D0 38 00 01 A4 */ li r0, 0x1a4 /* 802AF994 002AC8D4 B0 1F 00 B8 */ sth r0, 0xb8(r31) /* 802AF998 002AC8D8 80 7F 00 04 */ lwz r3, 4(r31) /* 802AF99C 002AC8DC 38 80 00 2D */ li r4, 0x2d -/* 802AF9A0 002AC8E0 4B FF 2B 3D */ bl JAISound_NS_stop +/* 802AF9A0 002AC8E0 4B FF 2B 3D */ bl stop__8JAISoundFUl /* 802AF9A4 002AC8E4 48 00 00 18 */ b lbl_802AF9BC /* 802AF9A8 002AC8E8 7F E3 FB 78 */ mr r3, r31 /* 802AF9AC 002AC8EC 38 80 00 00 */ li r4, 0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s index 610ca88cfd..019612d01f 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s @@ -86,9 +86,9 @@ lbl_802AFAEC: lbl_802AFAFC: /* 802AFAFC 002ACA3C 80 7E 00 04 */ lwz r3, 4(r30) /* 802AFB00 002ACA40 7F E4 FB 78 */ mr r4, r31 -/* 802AFB04 002ACA44 4B FF 29 D9 */ bl JAISound_NS_stop +/* 802AFB04 002ACA44 4B FF 29 D9 */ bl stop__8JAISoundFUl /* 802AFB08 002ACA48 38 7E 00 04 */ addi r3, r30, 4 -/* 802AFB0C 002ACA4C 4B FF 26 79 */ bl JAISoundHandle_NS_releaseSound +/* 802AFB0C 002ACA4C 4B FF 26 79 */ bl releaseSound__14JAISoundHandleFv /* 802AFB10 002ACA50 88 0D 82 E2 */ lbz r0, lbl_80450862-_SDA_BASE_(r13) /* 802AFB14 002ACA54 28 00 00 00 */ cmplwi r0, 0 /* 802AFB18 002ACA58 41 82 00 40 */ beq lbl_802AFB58 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s index a41e71052e..9ef353a862 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s @@ -90,14 +90,14 @@ lbl_802AFCD8: /* 802AFCDC 002ACC1C 28 03 00 00 */ cmplwi r3, 0 /* 802AFCE0 002ACC20 41 82 00 F4 */ beq lbl_802AFDD4 /* 802AFCE4 002ACC24 88 8D 82 E2 */ lbz r4, lbl_80450862-_SDA_BASE_(r13) -/* 802AFCE8 002ACC28 4B FF 27 F5 */ bl JAISound_NS_stop +/* 802AFCE8 002ACC28 4B FF 27 F5 */ bl stop__8JAISoundFUl /* 802AFCEC 002ACC2C 48 00 00 E8 */ b lbl_802AFDD4 lbl_802AFCF0: /* 802AFCF0 002ACC30 80 7F 00 00 */ lwz r3, 0(r31) /* 802AFCF4 002ACC34 28 03 00 00 */ cmplwi r3, 0 /* 802AFCF8 002ACC38 41 82 00 0C */ beq lbl_802AFD04 /* 802AFCFC 002ACC3C 38 80 00 00 */ li r4, 0 -/* 802AFD00 002ACC40 4B FF 27 DD */ bl JAISound_NS_stop +/* 802AFD00 002ACC40 4B FF 27 DD */ bl stop__8JAISoundFUl lbl_802AFD04: /* 802AFD04 002ACC44 C0 02 BF 9C */ lfs f0, lbl_8045599C-_SDA2_BASE_(r2) /* 802AFD08 002ACC48 D0 1F 00 64 */ stfs f0, 0x64(r31) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s index 704fa6bcd5..349b5b0b9d 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s @@ -25,7 +25,7 @@ lbl_802AFE5C: /* 802AFE6C 002ACDAC 28 03 00 00 */ cmplwi r3, 0 /* 802AFE70 002ACDB0 41 82 00 58 */ beq lbl_802AFEC8 /* 802AFE74 002ACDB4 38 80 00 1E */ li r4, 0x1e -/* 802AFE78 002ACDB8 4B FF 26 65 */ bl JAISound_NS_stop +/* 802AFE78 002ACDB8 4B FF 26 65 */ bl stop__8JAISoundFUl /* 802AFE7C 002ACDBC 48 00 00 4C */ b lbl_802AFEC8 lbl_802AFE80: /* 802AFE80 002ACDC0 28 03 00 00 */ cmplwi r3, 0 @@ -41,7 +41,7 @@ lbl_802AFE98: /* 802AFEA0 002ACDE0 40 82 00 28 */ bne lbl_802AFEC8 /* 802AFEA4 002ACDE4 28 03 00 00 */ cmplwi r3, 0 /* 802AFEA8 002ACDE8 41 82 00 08 */ beq lbl_802AFEB0 -/* 802AFEAC 002ACDEC 4B FF 26 ED */ bl JAISound_NS_stop_X1_ +/* 802AFEAC 002ACDEC 4B FF 26 ED */ bl stop__8JAISoundFv lbl_802AFEB0: /* 802AFEB0 002ACDF0 7F E3 FB 78 */ mr r3, r31 /* 802AFEB4 002ACDF4 3C 80 01 00 */ lis r4, 0x010000A9@ha diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s index e8cb450f7b..45baf692a1 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s @@ -39,10 +39,10 @@ lbl_802AFF58: /* 802AFF5C 002ACE9C 28 03 00 00 */ cmplwi r3, 0 /* 802AFF60 002ACEA0 41 82 00 0C */ beq lbl_802AFF6C /* 802AFF64 002ACEA4 7F E4 FB 78 */ mr r4, r31 -/* 802AFF68 002ACEA8 4B FF 25 75 */ bl JAISound_NS_stop +/* 802AFF68 002ACEA8 4B FF 25 75 */ bl stop__8JAISoundFUl lbl_802AFF6C: /* 802AFF6C 002ACEAC 38 7E 00 0C */ addi r3, r30, 0xc -/* 802AFF70 002ACEB0 4B FF 22 15 */ bl JAISoundHandle_NS_releaseSound +/* 802AFF70 002ACEB0 4B FF 22 15 */ bl releaseSound__14JAISoundHandleFv /* 802AFF74 002ACEB4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802AFF78 002ACEB8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802AFF7C 002ACEBC 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s index b53b845f56..5528dec328 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s @@ -286,7 +286,7 @@ lbl_802B03AC: /* 802B03BC 002AD2FC 38 A0 05 DC */ li r5, 0x5dc /* 802B03C0 002AD300 38 C0 13 88 */ li r6, 0x1388 /* 802B03C4 002AD304 38 E0 27 10 */ li r7, 0x2710 -/* 802B03C8 002AD308 48 00 F5 B9 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B03C8 002AD308 48 00 F5 B9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs lbl_802B03CC: /* 802B03CC 002AD30C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802B03D0 002AD310 40 82 19 D0 */ bne lbl_802B1DA0 @@ -2023,7 +2023,7 @@ lbl_802B1DA0: /* 802B1DA8 002AECE8 38 A0 00 09 */ li r5, 9 /* 802B1DAC 002AECEC 57 C6 04 3E */ clrlwi r6, r30, 0x10 /* 802B1DB0 002AECF0 38 E0 FF FF */ li r7, -1 -/* 802B1DB4 002AECF4 4B FF 91 29 */ bl Z2SoundStarter_NS_setPortData +/* 802B1DB4 002AECF4 4B FF 91 29 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802B1DB8 002AECF8 9B DD 00 BC */ stb r30, 0xbc(r29) lbl_802B1DBC: /* 802B1DBC 002AECFC E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s index e3c1e8b302..c4b342b023 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s @@ -436,7 +436,7 @@ lbl_802B2464: /* 802B246C 002AF3AC 38 A0 00 09 */ li r5, 9 /* 802B2470 002AF3B0 38 C0 00 01 */ li r6, 1 /* 802B2474 002AF3B4 38 E0 FF FF */ li r7, -1 -/* 802B2478 002AF3B8 4B FF 8A 65 */ bl Z2SoundStarter_NS_setPortData +/* 802B2478 002AF3B8 4B FF 8A 65 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802B247C 002AF3BC 48 00 05 08 */ b lbl_802B2984 lbl_802B2480: /* 802B2480 002AF3C0 7F 83 E3 78 */ mr r3, r28 @@ -763,7 +763,7 @@ lbl_802B2960: /* 802B2970 002AF8B0 38 A0 00 09 */ li r5, 9 /* 802B2974 002AF8B4 57 A6 04 3E */ clrlwi r6, r29, 0x10 /* 802B2978 002AF8B8 38 E0 FF FF */ li r7, -1 -/* 802B297C 002AF8BC 4B FF 85 61 */ bl Z2SoundStarter_NS_setPortData +/* 802B297C 002AF8BC 4B FF 85 61 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802B2980: /* 802B2980 002AF8C0 9B BC 00 BD */ stb r29, 0xbd(r28) lbl_802B2984: diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B327C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B327C.s index 10350c8cd0..9c01776b9e 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B327C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B327C.s @@ -33,7 +33,7 @@ lbl_802B32C4: /* 802B32F8 002B0238 7C 09 03 A6 */ mtctr r0 /* 802B32FC 002B023C 4E 80 04 20 */ bctr /* 802B3300 002B0240 38 80 00 1E */ li r4, 0x1e -/* 802B3304 002B0244 4B FE F1 D9 */ bl JAISound_NS_stop +/* 802B3304 002B0244 4B FE F1 D9 */ bl stop__8JAISoundFUl lbl_802B3308: /* 802B3308 002B0248 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B330C 002B024C 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4128.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4128.s index 8b9c046bce..f301f0f100 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4128.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4128.s @@ -8,7 +8,7 @@ /* 802B4144 002B1084 38 A0 02 BC */ li r5, 0x2bc /* 802B4148 002B1088 38 C0 04 4C */ li r6, 0x44c /* 802B414C 002B108C 38 E0 05 DC */ li r7, 0x5dc -/* 802B4150 002B1090 48 00 B8 31 */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802B4150 002B1090 48 00 B8 31 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs lbl_802B4154: /* 802B4154 002B1094 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B4158 002B1098 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s index 15b8324b10..eb4dd63460 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s @@ -75,7 +75,7 @@ lbl_802B4544: /* 802B45AC 002B14EC D0 5E 00 1C */ stfs f2, 0x1c(r30) lbl_802B45B0: /* 802B45B0 002B14F0 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B45B4 002B14F4 48 00 BC 31 */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B45B4 002B14F4 48 00 BC 31 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B45B8 002B14F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B45BC 002B14FC 41 82 00 2C */ beq lbl_802B45E8 /* 802B45C0 002B1500 80 7E 00 04 */ lwz r3, 4(r30) @@ -92,7 +92,7 @@ lbl_802B45DC: /* 802B45E4 002B1524 41 82 00 3C */ beq lbl_802B4620 lbl_802B45E8: /* 802B45E8 002B1528 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B45EC 002B152C 48 00 BB F9 */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B45EC 002B152C 48 00 BB F9 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B45F0 002B1530 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B45F4 002B1534 40 82 00 40 */ bne lbl_802B4634 /* 802B45F8 002B1538 80 7E 00 04 */ lwz r3, 4(r30) @@ -110,12 +110,12 @@ lbl_802B4614: lbl_802B4620: /* 802B4620 002B1560 80 7E 00 04 */ lwz r3, 4(r30) /* 802B4624 002B1564 38 80 00 1E */ li r4, 0x1e -/* 802B4628 002B1568 4B FE DE B5 */ bl JAISound_NS_stop +/* 802B4628 002B1568 4B FE DE B5 */ bl stop__8JAISoundFUl /* 802B462C 002B156C 80 7E 00 04 */ lwz r3, 4(r30) /* 802B4630 002B1570 4B FE DB 71 */ bl JAISound_NS_releaseHandle lbl_802B4634: /* 802B4634 002B1574 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B4638 002B1578 48 00 BB AD */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B4638 002B1578 48 00 BB AD */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B463C 002B157C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4640 002B1580 40 82 00 2C */ bne lbl_802B466C /* 802B4644 002B1584 80 7E 00 04 */ lwz r3, 4(r30) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s index 3a15821b9e..ad008aae7e 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s @@ -48,7 +48,7 @@ lbl_802B48E8: /* 802B48EC 002B182C 28 00 00 00 */ cmplwi r0, 0 /* 802B48F0 002B1830 40 82 00 14 */ bne lbl_802B4904 /* 802B48F4 002B1834 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B48F8 002B1838 48 00 B8 ED */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B48F8 002B1838 48 00 B8 ED */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B48FC 002B183C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4900 002B1840 41 82 01 E4 */ beq lbl_802B4AE4 lbl_802B4904: @@ -68,7 +68,7 @@ lbl_802B4920: /* 802B4934 002B1874 38 A0 00 09 */ li r5, 9 /* 802B4938 002B1878 38 C0 00 01 */ li r6, 1 /* 802B493C 002B187C 38 E0 FF FF */ li r7, -1 -/* 802B4940 002B1880 4B FF 65 9D */ bl Z2SoundStarter_NS_setPortData +/* 802B4940 002B1880 4B FF 65 9D */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802B4944 002B1884 7F C3 F3 78 */ mr r3, r30 /* 802B4948 002B1888 38 9E 00 04 */ addi r4, r30, 4 /* 802B494C 002B188C 88 AD 82 EC */ lbz r5, lbl_8045086C-_SDA_BASE_(r13) @@ -164,7 +164,7 @@ lbl_802B4A6C: /* 802B4AAC 002B19EC 38 A0 00 09 */ li r5, 9 /* 802B4AB0 002B19F0 38 C0 00 03 */ li r6, 3 /* 802B4AB4 002B19F4 38 E0 FF FF */ li r7, -1 -/* 802B4AB8 002B19F8 4B FF 64 25 */ bl Z2SoundStarter_NS_setPortData +/* 802B4AB8 002B19F8 4B FF 64 25 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802B4ABC 002B19FC 48 00 00 24 */ b lbl_802B4AE0 lbl_802B4AC0: /* 802B4AC0 002B1A00 28 00 00 02 */ cmplwi r0, 2 @@ -174,7 +174,7 @@ lbl_802B4AC0: /* 802B4AD0 002B1A10 38 A0 00 09 */ li r5, 9 /* 802B4AD4 002B1A14 38 C0 00 02 */ li r6, 2 /* 802B4AD8 002B1A18 38 E0 FF FF */ li r7, -1 -/* 802B4ADC 002B1A1C 4B FF 64 01 */ bl Z2SoundStarter_NS_setPortData +/* 802B4ADC 002B1A1C 4B FF 64 01 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802B4AE0: /* 802B4AE0 002B1A20 9B FE 00 BF */ stb r31, 0xbf(r30) lbl_802B4AE4: diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s index 9a83dc2eb5..3ad2be4c0d 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s @@ -36,7 +36,7 @@ lbl_802B4C30: /* 802B4C48 002B1B88 28 00 00 00 */ cmplwi r0, 0 /* 802B4C4C 002B1B8C 40 82 00 14 */ bne lbl_802B4C60 /* 802B4C50 002B1B90 80 7F 00 04 */ lwz r3, 4(r31) -/* 802B4C54 002B1B94 4B FE D9 45 */ bl JAISound_NS_stop_X1_ +/* 802B4C54 002B1B94 4B FE D9 45 */ bl stop__8JAISoundFv /* 802B4C58 002B1B98 38 00 00 00 */ li r0, 0 /* 802B4C5C 002B1B9C 98 1F 00 BF */ stb r0, 0xbf(r31) lbl_802B4C60: @@ -81,7 +81,7 @@ lbl_802B4CE0: /* 802B4CE4 002B1C24 28 00 00 00 */ cmplwi r0, 0 /* 802B4CE8 002B1C28 40 82 00 14 */ bne lbl_802B4CFC /* 802B4CEC 002B1C2C 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B4CF0 002B1C30 48 00 B4 F5 */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B4CF0 002B1C30 48 00 B4 F5 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B4CF4 002B1C34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4CF8 002B1C38 41 82 01 A4 */ beq lbl_802B4E9C lbl_802B4CFC: diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s index 9eecf92da9..b07dd47f57 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s @@ -28,7 +28,7 @@ lbl_802B4F08: /* 802B4F18 002B1E58 28 00 00 00 */ cmplwi r0, 0 /* 802B4F1C 002B1E5C 40 82 00 14 */ bne lbl_802B4F30 /* 802B4F20 002B1E60 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B4F24 002B1E64 48 00 B2 C1 */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B4F24 002B1E64 48 00 B2 C1 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B4F28 002B1E68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4F2C 002B1E6C 41 82 00 14 */ beq lbl_802B4F40 lbl_802B4F30: @@ -63,7 +63,7 @@ lbl_802B4F5C: /* 802B4F94 002B1ED4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4F98 002B1ED8 41 82 02 54 */ beq lbl_802B51EC /* 802B4F9C 002B1EDC 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B4FA0 002B1EE0 48 00 B1 61 */ bl Z2SoundObjMgr_NS_setBattleInit +/* 802B4FA0 002B1EE0 48 00 B1 61 */ bl setBattleInit__13Z2SoundObjMgrFv /* 802B4FA4 002B1EE4 38 00 00 FF */ li r0, 0xff /* 802B4FA8 002B1EE8 98 1C 00 BD */ stb r0, 0xbd(r28) /* 802B4FAC 002B1EEC 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) @@ -147,7 +147,7 @@ lbl_802B50A8: /* 802B50D4 002B2014 48 00 00 30 */ b lbl_802B5104 lbl_802B50D8: /* 802B50D8 002B2018 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B50DC 002B201C 48 00 B1 09 */ bl Z2SoundObjMgr_NS_isTwilightBattle +/* 802B50DC 002B201C 48 00 B1 09 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B50E0 002B2020 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 802B50E4 002B2024 7F 83 E3 78 */ mr r3, r28 /* 802B50E8 002B2028 4B FF CD 0D */ bl changeSubBgmStatus__8Z2SeqMgrFl diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s index 03170bef40..4a84de128a 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s @@ -41,7 +41,7 @@ lbl_802B59CC: /* 802B59DC 002B291C 7F E4 FB 78 */ mr r4, r31 /* 802B59E0 002B2920 38 A0 00 0A */ li r5, 0xa /* 802B59E4 002B2924 38 C0 FF FF */ li r6, -1 -/* 802B59E8 002B2928 4B FF 55 8D */ bl Z2SoundStarter_NS_getPortData +/* 802B59E8 002B2928 4B FF 55 8D */ bl getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc /* 802B59EC 002B292C 98 7F 00 C4 */ stb r3, 0xc4(r31) /* 802B59F0 002B2930 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13) /* 802B59F4 002B2934 88 03 00 0C */ lbz r0, 0xc(r3) @@ -214,9 +214,9 @@ lbl_802B5C28: /* 802B5C48 002B2B88 41 80 00 1C */ blt lbl_802B5C64 /* 802B5C4C 002B2B8C 80 7F 00 00 */ lwz r3, 0(r31) /* 802B5C50 002B2B90 38 80 00 3C */ li r4, 0x3c -/* 802B5C54 002B2B94 4B FE C8 89 */ bl JAISound_NS_stop +/* 802B5C54 002B2B94 4B FE C8 89 */ bl stop__8JAISoundFUl /* 802B5C58 002B2B98 7F E3 FB 78 */ mr r3, r31 -/* 802B5C5C 002B2B9C 4B FE C5 29 */ bl JAISoundHandle_NS_releaseSound +/* 802B5C5C 002B2B9C 4B FE C5 29 */ bl releaseSound__14JAISoundHandleFv /* 802B5C60 002B2BA0 48 00 02 0C */ b lbl_802B5E6C lbl_802B5C64: /* 802B5C64 002B2BA4 2C 04 00 11 */ cmpwi r4, 0x11 @@ -260,9 +260,9 @@ lbl_802B5CC0: /* 802B5CE8 002B2C28 28 00 00 14 */ cmplwi r0, 0x14 /* 802B5CEC 002B2C2C 40 80 01 80 */ bge lbl_802B5E6C /* 802B5CF0 002B2C30 38 80 00 3C */ li r4, 0x3c -/* 802B5CF4 002B2C34 4B FE C7 E9 */ bl JAISound_NS_stop +/* 802B5CF4 002B2C34 4B FE C7 E9 */ bl stop__8JAISoundFUl /* 802B5CF8 002B2C38 7F E3 FB 78 */ mr r3, r31 -/* 802B5CFC 002B2C3C 4B FE C4 89 */ bl JAISoundHandle_NS_releaseSound +/* 802B5CFC 002B2C3C 4B FE C4 89 */ bl releaseSound__14JAISoundHandleFv /* 802B5D00 002B2C40 48 00 01 6C */ b lbl_802B5E6C lbl_802B5D04: /* 802B5D04 002B2C44 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h new file mode 100644 index 0000000000..2edc4bf2e9 --- /dev/null +++ b/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h @@ -0,0 +1,34 @@ +#ifndef __Z2SOUNDHANDLES_H__ +#define __Z2SOUNDHANDLES_H__ + +#include "JSystem/JAudio2/JAISound/JAISound.h" +#include "JSystem/JGeometry/JGeometry.h" +#include "JSystem/JSupport/JSUList/JSUList.h" +#include "dolphin/types.h" + +class Z2SoundHandlePool : public JAISoundHandle, JSULink {}; + +class Z2SoundHandles : protected JSUList { +public: + Z2SoundHandles(); + ~Z2SoundHandles(); + + void initHandlesPool(u8 pNumHandles); + void deleteHandlesPool(); + + bool isActive() const; + + JAISoundHandle* getHandleSoundID(JAISoundID pSoundId); + JAISoundHandle* getHandleUserData(u32 pUserData); + + void stopAllSounds(u32 fadeout); + + void setPos(const JGeometry::TVec3& pos); + + u32 getNumHandles() const { return this->getNumLinks(); } + +private: + u8 mNumHandles; +}; + +#endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB07C.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB07C.s deleted file mode 100644 index 1de2fcd21c..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB07C.s +++ /dev/null @@ -1,14 +0,0 @@ -/* 802AB07C 002A7FBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB080 002A7FC0 7C 08 02 A6 */ mflr r0 -/* 802AB084 002A7FC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AB088 002A7FC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AB08C 002A7FCC 7C 7F 1B 78 */ mr r31, r3 -/* 802AB090 002A7FD0 48 03 0E 85 */ bl initiate__10JSUPtrListFv -/* 802AB094 002A7FD4 38 00 00 00 */ li r0, 0 -/* 802AB098 002A7FD8 98 1F 00 0C */ stb r0, 0xc(r31) -/* 802AB09C 002A7FDC 7F E3 FB 78 */ mr r3, r31 -/* 802AB0A0 002A7FE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AB0A4 002A7FE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AB0A8 002A7FE8 7C 08 03 A6 */ mtlr r0 -/* 802AB0AC 002A7FEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB0B0 002A7FF0 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB0B4.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB0B4.s deleted file mode 100644 index 1cf4f4af22..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB0B4.s +++ /dev/null @@ -1,27 +0,0 @@ -/* 802AB0B4 002A7FF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB0B8 002A7FF8 7C 08 02 A6 */ mflr r0 -/* 802AB0BC 002A7FFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AB0C0 002A8000 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AB0C4 002A8004 93 C1 00 08 */ stw r30, 8(r1) -/* 802AB0C8 002A8008 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802AB0CC 002A800C 7C 9F 23 78 */ mr r31, r4 -/* 802AB0D0 002A8010 41 82 00 2C */ beq lbl_802AB0FC -/* 802AB0D4 002A8014 48 00 00 4D */ bl Z2SoundHandles_NS_deleteHandlesPool -/* 802AB0D8 002A8018 28 1E 00 00 */ cmplwi r30, 0 -/* 802AB0DC 002A801C 41 82 00 10 */ beq lbl_802AB0EC -/* 802AB0E0 002A8020 7F C3 F3 78 */ mr r3, r30 -/* 802AB0E4 002A8024 38 80 00 00 */ li r4, 0 -/* 802AB0E8 002A8028 48 03 0D C5 */ bl __dt__10JSUPtrListFv -lbl_802AB0EC: -/* 802AB0EC 002A802C 7F E0 07 35 */ extsh. r0, r31 -/* 802AB0F0 002A8030 40 81 00 0C */ ble lbl_802AB0FC -/* 802AB0F4 002A8034 7F C3 F3 78 */ mr r3, r30 -/* 802AB0F8 002A8038 48 02 3C 45 */ bl __dl__FPv -lbl_802AB0FC: -/* 802AB0FC 002A803C 7F C3 F3 78 */ mr r3, r30 -/* 802AB100 002A8040 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AB104 002A8044 83 C1 00 08 */ lwz r30, 8(r1) -/* 802AB108 002A8048 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AB10C 002A804C 7C 08 03 A6 */ mtlr r0 -/* 802AB110 002A8050 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB114 002A8054 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB118.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB118.s deleted file mode 100644 index 0eb05fd4b8..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB118.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 802AB118 002A8058 98 83 00 0C */ stb r4, 0xc(r3) -/* 802AB11C 002A805C 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s index c4e63d0b53..687811480f 100644 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s +++ b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s @@ -25,7 +25,7 @@ lbl_802AB174: /* 802AB174 002A80B4 28 1E 00 00 */ cmplwi r30, 0 /* 802AB178 002A80B8 41 82 00 0C */ beq lbl_802AB184 /* 802AB17C 002A80BC 7F C3 F3 78 */ mr r3, r30 -/* 802AB180 002A80C0 4B FF 70 05 */ bl JAISoundHandle_NS_releaseSound +/* 802AB180 002A80C0 4B FF 70 05 */ bl releaseSound__14JAISoundHandleFv lbl_802AB184: /* 802AB184 002A80C4 88 0D 8D C8 */ lbz r0, lbl_80451348-_SDA_BASE_(r13) /* 802AB188 002A80C8 7C 00 07 75 */ extsb. r0, r0 diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB254.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB254.s deleted file mode 100644 index 78a93b0ec2..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB254.s +++ /dev/null @@ -1,23 +0,0 @@ -/* 802AB254 002A8194 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB258 002A8198 80 A3 00 00 */ lwz r5, 0(r3) -/* 802AB25C 002A819C 80 04 00 00 */ lwz r0, 0(r4) -/* 802AB260 002A81A0 48 00 00 2C */ b lbl_802AB28C -lbl_802AB264: -/* 802AB264 002A81A4 80 65 00 00 */ lwz r3, 0(r5) -/* 802AB268 002A81A8 80 83 00 00 */ lwz r4, 0(r3) -/* 802AB26C 002A81AC 28 04 00 00 */ cmplwi r4, 0 -/* 802AB270 002A81B0 41 82 00 18 */ beq lbl_802AB288 -/* 802AB274 002A81B4 80 84 00 18 */ lwz r4, 0x18(r4) -/* 802AB278 002A81B8 90 81 00 08 */ stw r4, 8(r1) -/* 802AB27C 002A81BC 7C 04 00 40 */ cmplw r4, r0 -/* 802AB280 002A81C0 40 82 00 08 */ bne lbl_802AB288 -/* 802AB284 002A81C4 48 00 00 14 */ b lbl_802AB298 -lbl_802AB288: -/* 802AB288 002A81C8 80 A5 00 0C */ lwz r5, 0xc(r5) -lbl_802AB28C: -/* 802AB28C 002A81CC 28 05 00 00 */ cmplwi r5, 0 -/* 802AB290 002A81D0 40 82 FF D4 */ bne lbl_802AB264 -/* 802AB294 002A81D4 38 60 00 00 */ li r3, 0 -lbl_802AB298: -/* 802AB298 002A81D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB29C 002A81DC 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB2A0.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB2A0.s deleted file mode 100644 index 2273e24a00..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB2A0.s +++ /dev/null @@ -1,17 +0,0 @@ -/* 802AB2A0 002A81E0 80 C3 00 00 */ lwz r6, 0(r3) -/* 802AB2A4 002A81E4 48 00 00 24 */ b lbl_802AB2C8 -lbl_802AB2A8: -/* 802AB2A8 002A81E8 80 66 00 00 */ lwz r3, 0(r6) -/* 802AB2AC 002A81EC 80 A3 00 00 */ lwz r5, 0(r3) -/* 802AB2B0 002A81F0 28 05 00 00 */ cmplwi r5, 0 -/* 802AB2B4 002A81F4 41 82 00 10 */ beq lbl_802AB2C4 -/* 802AB2B8 002A81F8 80 05 00 20 */ lwz r0, 0x20(r5) -/* 802AB2BC 002A81FC 7C 04 00 40 */ cmplw r4, r0 -/* 802AB2C0 002A8200 4D 82 00 20 */ beqlr -lbl_802AB2C4: -/* 802AB2C4 002A8204 80 C6 00 0C */ lwz r6, 0xc(r6) -lbl_802AB2C8: -/* 802AB2C8 002A8208 28 06 00 00 */ cmplwi r6, 0 -/* 802AB2CC 002A820C 40 82 FF DC */ bne lbl_802AB2A8 -/* 802AB2D0 002A8210 38 60 00 00 */ li r3, 0 -/* 802AB2D4 002A8214 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB4A0.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB4A0.s deleted file mode 100644 index c44d222516..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB4A0.s +++ /dev/null @@ -1,28 +0,0 @@ -/* 802AB4A0 002A83E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB4A4 002A83E4 7C 08 02 A6 */ mflr r0 -/* 802AB4A8 002A83E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AB4AC 002A83EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AB4B0 002A83F0 93 C1 00 08 */ stw r30, 8(r1) -/* 802AB4B4 002A83F4 7C 9E 23 78 */ mr r30, r4 -/* 802AB4B8 002A83F8 83 E3 00 00 */ lwz r31, 0(r3) -/* 802AB4BC 002A83FC 48 00 00 28 */ b lbl_802AB4E4 -lbl_802AB4C0: -/* 802AB4C0 002A8400 80 7F 00 00 */ lwz r3, 0(r31) -/* 802AB4C4 002A8404 28 03 00 00 */ cmplwi r3, 0 -/* 802AB4C8 002A8408 41 82 00 18 */ beq lbl_802AB4E0 -/* 802AB4CC 002A840C 80 63 00 00 */ lwz r3, 0(r3) -/* 802AB4D0 002A8410 28 03 00 00 */ cmplwi r3, 0 -/* 802AB4D4 002A8414 41 82 00 0C */ beq lbl_802AB4E0 -/* 802AB4D8 002A8418 7F C4 F3 78 */ mr r4, r30 -/* 802AB4DC 002A841C 4B FF 70 01 */ bl JAISound_NS_stop -lbl_802AB4E0: -/* 802AB4E0 002A8420 83 FF 00 0C */ lwz r31, 0xc(r31) -lbl_802AB4E4: -/* 802AB4E4 002A8424 28 1F 00 00 */ cmplwi r31, 0 -/* 802AB4E8 002A8428 40 82 FF D8 */ bne lbl_802AB4C0 -/* 802AB4EC 002A842C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AB4F0 002A8430 83 C1 00 08 */ lwz r30, 8(r1) -/* 802AB4F4 002A8434 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AB4F8 002A8438 7C 08 03 A6 */ mtlr r0 -/* 802AB4FC 002A843C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB500 002A8440 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB504.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB504.s deleted file mode 100644 index 3fcf79eaf6..0000000000 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB504.s +++ /dev/null @@ -1,16 +0,0 @@ -/* 802AB504 002A8444 80 83 00 00 */ lwz r4, 0(r3) -/* 802AB508 002A8448 48 00 00 20 */ b lbl_802AB528 -lbl_802AB50C: -/* 802AB50C 002A844C 80 64 00 00 */ lwz r3, 0(r4) -/* 802AB510 002A8450 80 03 00 00 */ lwz r0, 0(r3) -/* 802AB514 002A8454 28 00 00 00 */ cmplwi r0, 0 -/* 802AB518 002A8458 41 82 00 0C */ beq lbl_802AB524 -/* 802AB51C 002A845C 38 60 00 01 */ li r3, 1 -/* 802AB520 002A8460 4E 80 00 20 */ blr -lbl_802AB524: -/* 802AB524 002A8464 80 84 00 0C */ lwz r4, 0xc(r4) -lbl_802AB528: -/* 802AB528 002A8468 28 04 00 00 */ cmplwi r4, 0 -/* 802AB52C 002A846C 40 82 FF E0 */ bne lbl_802AB50C -/* 802AB530 002A8470 38 60 00 00 */ li r3, 0 -/* 802AB534 002A8474 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s index 48b3a06ec8..6901019bb7 100644 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s +++ b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s @@ -41,7 +41,7 @@ lbl_802AB5C8: /* 802AB5C8 002A8508 28 1F 00 00 */ cmplwi r31, 0 /* 802AB5CC 002A850C 41 82 00 0C */ beq lbl_802AB5D8 /* 802AB5D0 002A8510 7F E3 FB 78 */ mr r3, r31 -/* 802AB5D4 002A8514 4B FF 6B B1 */ bl JAISoundHandle_NS_releaseSound +/* 802AB5D4 002A8514 4B FF 6B B1 */ bl releaseSound__14JAISoundHandleFv lbl_802AB5D8: /* 802AB5D8 002A8518 88 0D 8D C8 */ lbz r0, lbl_80451348-_SDA_BASE_(r13) /* 802AB5DC 002A851C 7C 00 07 75 */ extsb. r0, r0 diff --git a/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h b/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h new file mode 100644 index 0000000000..ce6e15f700 --- /dev/null +++ b/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h @@ -0,0 +1,17 @@ +#ifndef __Z2SOUNDINFO_H__ +#define __Z2SOUNDINFO_H__ + +#include "JSystem/JAudio2/JAISound/JAISound.h" +#include "dolphin/types.h" + +class Z2SoundInfo { +public: + u32 getBgmSeqResourceID(JAISoundID) const; + u32 getCategory(void) const; + + u32 getSwBit(JAISoundID) const; +}; + +extern Z2SoundInfo* lbl_80450B4C; + +#endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s index 429c169466..c3a5a81106 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s @@ -19,7 +19,7 @@ lbl_802BB198: /* 802BB19C 002B80DC 90 01 00 30 */ stw r0, 0x30(r1) /* 802BB1A0 002B80E0 7F C3 F3 78 */ mr r3, r30 /* 802BB1A4 002B80E4 38 81 00 30 */ addi r4, r1, 0x30 -/* 802BB1A8 002B80E8 48 00 09 21 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB1A8 002B80E8 48 00 09 21 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB1AC 002B80EC 88 01 00 38 */ lbz r0, 0x38(r1) /* 802BB1B0 002B80F0 50 60 E6 36 */ rlwimi r0, r3, 0x1c, 0x18, 0x1b /* 802BB1B4 002B80F4 98 01 00 38 */ stb r0, 0x38(r1) @@ -27,7 +27,7 @@ lbl_802BB198: /* 802BB1BC 002B80FC 90 01 00 2C */ stw r0, 0x2c(r1) /* 802BB1C0 002B8100 7F C3 F3 78 */ mr r3, r30 /* 802BB1C4 002B8104 38 81 00 2C */ addi r4, r1, 0x2c -/* 802BB1C8 002B8108 48 00 09 01 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB1C8 002B8108 48 00 09 01 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB1CC 002B810C 54 60 07 FF */ clrlwi. r0, r3, 0x1f /* 802BB1D0 002B8110 41 82 00 18 */ beq lbl_802BB1E8 /* 802BB1D4 002B8114 38 60 00 00 */ li r3, 0 @@ -45,7 +45,7 @@ lbl_802BB1F8: /* 802BB1FC 002B813C 90 01 00 28 */ stw r0, 0x28(r1) /* 802BB200 002B8140 7F C3 F3 78 */ mr r3, r30 /* 802BB204 002B8144 38 81 00 28 */ addi r4, r1, 0x28 -/* 802BB208 002B8148 48 00 08 C1 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB208 002B8148 48 00 08 C1 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB20C 002B814C 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e /* 802BB210 002B8150 41 82 00 18 */ beq lbl_802BB228 /* 802BB214 002B8154 38 60 00 00 */ li r3, 0 @@ -63,7 +63,7 @@ lbl_802BB238: /* 802BB23C 002B817C 90 01 00 24 */ stw r0, 0x24(r1) /* 802BB240 002B8180 7F C3 F3 78 */ mr r3, r30 /* 802BB244 002B8184 38 81 00 24 */ addi r4, r1, 0x24 -/* 802BB248 002B8188 48 00 08 81 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB248 002B8188 48 00 08 81 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB24C 002B818C 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d /* 802BB250 002B8190 41 82 00 18 */ beq lbl_802BB268 /* 802BB254 002B8194 38 60 00 00 */ li r3, 0 @@ -81,7 +81,7 @@ lbl_802BB278: /* 802BB27C 002B81BC 90 01 00 20 */ stw r0, 0x20(r1) /* 802BB280 002B81C0 7F C3 F3 78 */ mr r3, r30 /* 802BB284 002B81C4 38 81 00 20 */ addi r4, r1, 0x20 -/* 802BB288 002B81C8 48 00 08 41 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB288 002B81C8 48 00 08 41 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB28C 002B81CC 54 60 02 11 */ rlwinm. r0, r3, 0, 8, 8 /* 802BB290 002B81D0 41 82 00 18 */ beq lbl_802BB2A8 /* 802BB294 002B81D4 38 60 00 01 */ li r3, 1 @@ -99,7 +99,7 @@ lbl_802BB2B8: /* 802BB2BC 002B81FC 90 01 00 1C */ stw r0, 0x1c(r1) /* 802BB2C0 002B8200 7F C3 F3 78 */ mr r3, r30 /* 802BB2C4 002B8204 38 81 00 1C */ addi r4, r1, 0x1c -/* 802BB2C8 002B8208 48 00 08 01 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB2C8 002B8208 48 00 08 01 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB2CC 002B820C 54 60 04 E7 */ rlwinm. r0, r3, 0, 0x13, 0x13 /* 802BB2D0 002B8210 41 82 00 18 */ beq lbl_802BB2E8 /* 802BB2D4 002B8214 38 60 00 00 */ li r3, 0 @@ -117,7 +117,7 @@ lbl_802BB2F8: /* 802BB2FC 002B823C 90 01 00 18 */ stw r0, 0x18(r1) /* 802BB300 002B8240 7F C3 F3 78 */ mr r3, r30 /* 802BB304 002B8244 38 81 00 18 */ addi r4, r1, 0x18 -/* 802BB308 002B8248 48 00 07 C1 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB308 002B8248 48 00 07 C1 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB30C 002B824C 54 60 04 A5 */ rlwinm. r0, r3, 0, 0x12, 0x12 /* 802BB310 002B8250 41 82 00 18 */ beq lbl_802BB328 /* 802BB314 002B8254 38 60 00 00 */ li r3, 0 @@ -136,7 +136,7 @@ lbl_802BB338: /* 802BB340 002B8280 90 01 00 14 */ stw r0, 0x14(r1) /* 802BB344 002B8284 7F C3 F3 78 */ mr r3, r30 /* 802BB348 002B8288 38 81 00 14 */ addi r4, r1, 0x14 -/* 802BB34C 002B828C 48 00 07 7D */ bl Z2SoundInfo_NS_getSwBit +/* 802BB34C 002B828C 48 00 07 7D */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB350 002B8290 54 60 03 19 */ rlwinm. r0, r3, 0, 0xc, 0xc /* 802BB354 002B8294 41 82 00 08 */ beq lbl_802BB35C /* 802BB358 002B8298 3B 80 00 08 */ li r28, 8 @@ -145,20 +145,20 @@ lbl_802BB35C: /* 802BB360 002B82A0 90 01 00 10 */ stw r0, 0x10(r1) /* 802BB364 002B82A4 7F C3 F3 78 */ mr r3, r30 /* 802BB368 002B82A8 38 81 00 10 */ addi r4, r1, 0x10 -/* 802BB36C 002B82AC 48 00 07 5D */ bl Z2SoundInfo_NS_getSwBit +/* 802BB36C 002B82AC 48 00 07 5D */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB370 002B82B0 54 7D 87 7E */ rlwinm r29, r3, 0x10, 0x1d, 0x1f /* 802BB374 002B82B4 80 1F 00 00 */ lwz r0, 0(r31) /* 802BB378 002B82B8 90 01 00 0C */ stw r0, 0xc(r1) /* 802BB37C 002B82BC 7F C3 F3 78 */ mr r3, r30 /* 802BB380 002B82C0 38 81 00 0C */ addi r4, r1, 0xc -/* 802BB384 002B82C4 48 00 07 45 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB384 002B82C4 48 00 07 45 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB388 002B82C8 54 60 86 76 */ rlwinm r0, r3, 0x10, 0x19, 0x1b /* 802BB38C 002B82CC 7F BD 02 14 */ add r29, r29, r0 /* 802BB390 002B82D0 80 1F 00 00 */ lwz r0, 0(r31) /* 802BB394 002B82D4 90 01 00 08 */ stw r0, 8(r1) /* 802BB398 002B82D8 7F C3 F3 78 */ mr r3, r30 /* 802BB39C 002B82DC 38 81 00 08 */ addi r4, r1, 8 -/* 802BB3A0 002B82E0 48 00 07 29 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB3A0 002B82E0 48 00 07 29 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB3A4 002B82E4 54 60 85 2E */ rlwinm r0, r3, 0x10, 0x14, 0x17 /* 802BB3A8 002B82E8 7F BD 02 14 */ add r29, r29, r0 /* 802BB3AC 002B82EC 88 01 00 39 */ lbz r0, 0x39(r1) diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s index d0c5eeb29f..dabda088a6 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s @@ -19,7 +19,7 @@ lbl_802BB488: /* 802BB48C 002B83CC 90 01 00 30 */ stw r0, 0x30(r1) /* 802BB490 002B83D0 7F C3 F3 78 */ mr r3, r30 /* 802BB494 002B83D4 38 81 00 30 */ addi r4, r1, 0x30 -/* 802BB498 002B83D8 48 00 06 31 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB498 002B83D8 48 00 06 31 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB49C 002B83DC 88 01 00 38 */ lbz r0, 0x38(r1) /* 802BB4A0 002B83E0 50 60 E6 36 */ rlwimi r0, r3, 0x1c, 0x18, 0x1b /* 802BB4A4 002B83E4 98 01 00 38 */ stb r0, 0x38(r1) @@ -27,7 +27,7 @@ lbl_802BB488: /* 802BB4AC 002B83EC 90 01 00 2C */ stw r0, 0x2c(r1) /* 802BB4B0 002B83F0 7F C3 F3 78 */ mr r3, r30 /* 802BB4B4 002B83F4 38 81 00 2C */ addi r4, r1, 0x2c -/* 802BB4B8 002B83F8 48 00 06 11 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB4B8 002B83F8 48 00 06 11 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB4BC 002B83FC 54 60 07 FF */ clrlwi. r0, r3, 0x1f /* 802BB4C0 002B8400 41 82 00 18 */ beq lbl_802BB4D8 /* 802BB4C4 002B8404 38 60 00 00 */ li r3, 0 @@ -45,7 +45,7 @@ lbl_802BB4E8: /* 802BB4EC 002B842C 90 01 00 28 */ stw r0, 0x28(r1) /* 802BB4F0 002B8430 7F C3 F3 78 */ mr r3, r30 /* 802BB4F4 002B8434 38 81 00 28 */ addi r4, r1, 0x28 -/* 802BB4F8 002B8438 48 00 05 D1 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB4F8 002B8438 48 00 05 D1 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB4FC 002B843C 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e /* 802BB500 002B8440 41 82 00 18 */ beq lbl_802BB518 /* 802BB504 002B8444 38 60 00 00 */ li r3, 0 @@ -63,7 +63,7 @@ lbl_802BB528: /* 802BB52C 002B846C 90 01 00 24 */ stw r0, 0x24(r1) /* 802BB530 002B8470 7F C3 F3 78 */ mr r3, r30 /* 802BB534 002B8474 38 81 00 24 */ addi r4, r1, 0x24 -/* 802BB538 002B8478 48 00 05 91 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB538 002B8478 48 00 05 91 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB53C 002B847C 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d /* 802BB540 002B8480 41 82 00 18 */ beq lbl_802BB558 /* 802BB544 002B8484 38 60 00 00 */ li r3, 0 @@ -81,7 +81,7 @@ lbl_802BB568: /* 802BB56C 002B84AC 90 01 00 20 */ stw r0, 0x20(r1) /* 802BB570 002B84B0 7F C3 F3 78 */ mr r3, r30 /* 802BB574 002B84B4 38 81 00 20 */ addi r4, r1, 0x20 -/* 802BB578 002B84B8 48 00 05 51 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB578 002B84B8 48 00 05 51 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB57C 002B84BC 54 60 02 11 */ rlwinm. r0, r3, 0, 8, 8 /* 802BB580 002B84C0 41 82 00 18 */ beq lbl_802BB598 /* 802BB584 002B84C4 38 60 00 01 */ li r3, 1 @@ -99,7 +99,7 @@ lbl_802BB5A8: /* 802BB5AC 002B84EC 90 01 00 1C */ stw r0, 0x1c(r1) /* 802BB5B0 002B84F0 7F C3 F3 78 */ mr r3, r30 /* 802BB5B4 002B84F4 38 81 00 1C */ addi r4, r1, 0x1c -/* 802BB5B8 002B84F8 48 00 05 11 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB5B8 002B84F8 48 00 05 11 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB5BC 002B84FC 54 60 04 E7 */ rlwinm. r0, r3, 0, 0x13, 0x13 /* 802BB5C0 002B8500 41 82 00 18 */ beq lbl_802BB5D8 /* 802BB5C4 002B8504 38 60 00 00 */ li r3, 0 @@ -117,7 +117,7 @@ lbl_802BB5E8: /* 802BB5EC 002B852C 90 01 00 18 */ stw r0, 0x18(r1) /* 802BB5F0 002B8530 7F C3 F3 78 */ mr r3, r30 /* 802BB5F4 002B8534 38 81 00 18 */ addi r4, r1, 0x18 -/* 802BB5F8 002B8538 48 00 04 D1 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB5F8 002B8538 48 00 04 D1 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB5FC 002B853C 54 60 04 A5 */ rlwinm. r0, r3, 0, 0x12, 0x12 /* 802BB600 002B8540 41 82 00 18 */ beq lbl_802BB618 /* 802BB604 002B8544 38 60 00 00 */ li r3, 0 @@ -136,7 +136,7 @@ lbl_802BB628: /* 802BB630 002B8570 90 01 00 14 */ stw r0, 0x14(r1) /* 802BB634 002B8574 7F C3 F3 78 */ mr r3, r30 /* 802BB638 002B8578 38 81 00 14 */ addi r4, r1, 0x14 -/* 802BB63C 002B857C 48 00 04 8D */ bl Z2SoundInfo_NS_getSwBit +/* 802BB63C 002B857C 48 00 04 8D */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB640 002B8580 54 60 03 19 */ rlwinm. r0, r3, 0, 0xc, 0xc /* 802BB644 002B8584 41 82 00 08 */ beq lbl_802BB64C /* 802BB648 002B8588 3B 80 00 08 */ li r28, 8 @@ -145,20 +145,20 @@ lbl_802BB64C: /* 802BB650 002B8590 90 01 00 10 */ stw r0, 0x10(r1) /* 802BB654 002B8594 7F C3 F3 78 */ mr r3, r30 /* 802BB658 002B8598 38 81 00 10 */ addi r4, r1, 0x10 -/* 802BB65C 002B859C 48 00 04 6D */ bl Z2SoundInfo_NS_getSwBit +/* 802BB65C 002B859C 48 00 04 6D */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB660 002B85A0 54 7D 87 7E */ rlwinm r29, r3, 0x10, 0x1d, 0x1f /* 802BB664 002B85A4 80 1F 00 00 */ lwz r0, 0(r31) /* 802BB668 002B85A8 90 01 00 0C */ stw r0, 0xc(r1) /* 802BB66C 002B85AC 7F C3 F3 78 */ mr r3, r30 /* 802BB670 002B85B0 38 81 00 0C */ addi r4, r1, 0xc -/* 802BB674 002B85B4 48 00 04 55 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB674 002B85B4 48 00 04 55 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB678 002B85B8 54 60 86 76 */ rlwinm r0, r3, 0x10, 0x19, 0x1b /* 802BB67C 002B85BC 7F BD 02 14 */ add r29, r29, r0 /* 802BB680 002B85C0 80 1F 00 00 */ lwz r0, 0(r31) /* 802BB684 002B85C4 90 01 00 08 */ stw r0, 8(r1) /* 802BB688 002B85C8 7F C3 F3 78 */ mr r3, r30 /* 802BB68C 002B85CC 38 81 00 08 */ addi r4, r1, 8 -/* 802BB690 002B85D0 48 00 04 39 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB690 002B85D0 48 00 04 39 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB694 002B85D4 54 60 85 2E */ rlwinm r0, r3, 0x10, 0x14, 0x17 /* 802BB698 002B85D8 7F BD 02 14 */ add r29, r29, r0 /* 802BB69C 002B85DC 88 01 00 39 */ lbz r0, 0x39(r1) diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s index ed1b9fe764..9e236bf9a3 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s @@ -43,7 +43,7 @@ lbl_802BB764: /* 802BB77C 002B86BC 90 01 00 0C */ stw r0, 0xc(r1) /* 802BB780 002B86C0 7F 63 DB 78 */ mr r3, r27 /* 802BB784 002B86C4 38 81 00 0C */ addi r4, r1, 0xc -/* 802BB788 002B86C8 48 00 03 41 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB788 002B86C8 48 00 03 41 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB78C 002B86CC 54 7F E7 3E */ rlwinm r31, r3, 0x1c, 0x1c, 0x1f /* 802BB790 002B86D0 28 1F 00 08 */ cmplwi r31, 8 /* 802BB794 002B86D4 40 81 00 58 */ ble lbl_802BB7EC @@ -87,7 +87,7 @@ lbl_802BB820: /* 802BB824 002B8764 90 01 00 08 */ stw r0, 8(r1) /* 802BB828 002B8768 7F 63 DB 78 */ mr r3, r27 /* 802BB82C 002B876C 38 81 00 08 */ addi r4, r1, 8 -/* 802BB830 002B8770 48 00 02 99 */ bl Z2SoundInfo_NS_getSwBit +/* 802BB830 002B8770 48 00 02 99 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BB834 002B8774 54 7E 27 3F */ rlwinm. r30, r3, 4, 0x1c, 0x1f /* 802BB838 002B8778 41 82 00 5C */ beq lbl_802BB894 /* 802BB83C 002B877C 4B FE E0 99 */ bl getRandom_0_1__6Z2CalcFv diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCBC.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCBC.s index 8e1933886e..919de28fec 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCBC.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCBC.s @@ -1,3 +1,3 @@ /* 802BBCBC 002B8BFC 38 63 FF FC */ addi r3, r3, -4 /*.global Z2SoundInfo_NS_getBgmSeqResourceID*/ -/* 802BBCC0 002B8C00 4B FF F3 4C */ b Z2SoundInfo_NS_getBgmSeqResourceID \ No newline at end of file +/* 802BBCC0 002B8C00 4B FF F3 4C */ b getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s index 4837d9c5a6..a978ef225e 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s @@ -30,7 +30,7 @@ lbl_802A9F50: /* 802A9F54 002A6E94 90 01 00 20 */ stw r0, 0x20(r1) /* 802A9F58 002A6E98 80 6D 85 CC */ lwz r3, lbl_80450B4C-_SDA_BASE_(r13) /* 802A9F5C 002A6E9C 38 81 00 20 */ addi r4, r1, 0x20 -/* 802A9F60 002A6EA0 48 01 1B 69 */ bl Z2SoundInfo_NS_getSwBit +/* 802A9F60 002A6EA0 48 01 1B 69 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802A9F64 002A6EA4 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c /* 802A9F68 002A6EA8 41 82 00 4C */ beq lbl_802A9FB4 /* 802A9F6C 002A6EAC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) diff --git a/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h new file mode 100644 index 0000000000..92fcb6dd07 --- /dev/null +++ b/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h @@ -0,0 +1,42 @@ +#ifndef Z2SOUNDOBJMGR_H_ +#define Z2SOUNDOBJMGR_H_ + +#include "JSystem/JSupport/JSUList/JSUList.h" +#include "Z2AudioLib/Z2Creature/Z2Creature.h" +#include "dolphin/types.h" + +class Z2SoundObjMgr : protected JSUList { +public: + Z2SoundObjMgr(); + + void setBattleInit(); + void setForceBattleArea(bool, u16, u16, u16); + void setGhostEnemyState(u8); + + void deleteEnemyAll(); + + bool isTwilightBattle(); + bool isForceBattle() { return mForceBattle; } + +private: + u8 unk0[2]; + + u16 field_0xe; + u16 field_0x10; + u16 field_0x12; + u8 field_0x14; + u8 field_0x15; + u8 field_0x16; + u8 field_0x17; + u8 field_0x18; + u8 field_0x19; + bool field_0x1a; + bool mTwilightBattle; + bool mForceBattle; + + u8 unk1[3]; +}; + +extern Z2SoundObjMgr* lbl_80450B48; // Z2SoundObjMgr sInstance + +#endif // Z2SOUNDOBJMGR_H_ \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF920.s b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF920.s index 4186292d0c..a528b490fa 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF920.s +++ b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF920.s @@ -9,13 +9,13 @@ /* 802BF940 002BC880 98 1F 00 19 */ stb r0, 0x19(r31) /* 802BF944 002BC884 98 1F 00 1B */ stb r0, 0x1b(r31) /* 802BF948 002BC888 7F E3 FB 78 */ mr r3, r31 -/* 802BF94C 002BC88C 48 00 07 B5 */ bl Z2SoundObjMgr_NS_setBattleInit +/* 802BF94C 002BC88C 48 00 07 B5 */ bl setBattleInit__13Z2SoundObjMgrFv /* 802BF950 002BC890 7F E3 FB 78 */ mr r3, r31 /* 802BF954 002BC894 38 80 00 00 */ li r4, 0 /* 802BF958 002BC898 38 A0 02 BC */ li r5, 0x2bc /* 802BF95C 002BC89C 38 C0 04 4C */ li r6, 0x44c /* 802BF960 002BC8A0 38 E0 05 DC */ li r7, 0x5dc -/* 802BF964 002BC8A4 48 00 00 1D */ bl Z2SoundObjMgr_NS_setForceBattleArea +/* 802BF964 002BC8A4 48 00 00 1D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802BF968 002BC8A8 7F E3 FB 78 */ mr r3, r31 /* 802BF96C 002BC8AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802BF970 002BC8B0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s index bdbddc0918..ca5cbf84a8 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s +++ b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s @@ -335,12 +335,12 @@ lbl_802BFE44: /* 802BFE64 002BCDA4 41 80 00 14 */ blt lbl_802BFE78 /* 802BFE68 002BCDA8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802BFE6C 002BCDAC 38 80 00 00 */ li r4, 0 -/* 802BFE70 002BCDB0 4B FF 45 71 */ bl Z2SeqMgr_NS_setBattleGhostMute +/* 802BFE70 002BCDB0 4B FF 45 71 */ bl setBattleGhostMute__8Z2SeqMgrFb /* 802BFE74 002BCDB4 48 00 00 34 */ b lbl_802BFEA8 lbl_802BFE78: /* 802BFE78 002BCDB8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802BFE7C 002BCDBC 38 80 00 01 */ li r4, 1 -/* 802BFE80 002BCDC0 4B FF 45 61 */ bl Z2SeqMgr_NS_setBattleGhostMute +/* 802BFE80 002BCDC0 4B FF 45 61 */ bl setBattleGhostMute__8Z2SeqMgrFb /* 802BFE84 002BCDC4 48 00 00 24 */ b lbl_802BFEA8 lbl_802BFE88: /* 802BFE88 002BCDC8 28 00 00 20 */ cmplwi r0, 0x20 @@ -350,7 +350,7 @@ lbl_802BFE88: /* 802BFE98 002BCDD8 40 82 00 10 */ bne lbl_802BFEA8 /* 802BFE9C 002BCDDC 7E E3 BB 78 */ mr r3, r23 /* 802BFEA0 002BCDE0 38 80 00 00 */ li r4, 0 -/* 802BFEA4 002BCDE4 48 00 01 49 */ bl Z2SoundObjMgr_NS_setGhostEnemyState +/* 802BFEA4 002BCDE4 48 00 01 49 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc lbl_802BFEA8: /* 802BFEA8 002BCDE8 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 802BFEAC 002BCDEC 28 00 00 01 */ cmplwi r0, 1 diff --git a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BFFEC.s b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BFFEC.s deleted file mode 100644 index 6d17f02b1f..0000000000 --- a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BFFEC.s +++ /dev/null @@ -1,37 +0,0 @@ -/* 802BFFEC 002BCF2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BFFF0 002BCF30 7C 08 02 A6 */ mflr r0 -/* 802BFFF4 002BCF34 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BFFF8 002BCF38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BFFFC 002BCF3C 93 C1 00 08 */ stw r30, 8(r1) -/* 802C0000 002BCF40 7C 7E 1B 78 */ mr r30, r3 -/* 802C0004 002BCF44 7C 9F 23 78 */ mr r31, r4 -/* 802C0008 002BCF48 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802C000C 002BCF4C 28 00 00 20 */ cmplwi r0, 0x20 -/* 802C0010 002BCF50 40 82 00 24 */ bne lbl_802C0034 -/* 802C0014 002BCF54 88 7E 00 1A */ lbz r3, 0x1a(r30) -/* 802C0018 002BCF58 88 1E 00 16 */ lbz r0, 0x16(r30) -/* 802C001C 002BCF5C 7C 03 00 40 */ cmplw r3, r0 -/* 802C0020 002BCF60 41 80 00 2C */ blt lbl_802C004C -/* 802C0024 002BCF64 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) -/* 802C0028 002BCF68 38 80 00 01 */ li r4, 1 -/* 802C002C 002BCF6C 4B FF 43 B5 */ bl Z2SeqMgr_NS_setBattleGhostMute -/* 802C0030 002BCF70 48 00 00 1C */ b lbl_802C004C -lbl_802C0034: -/* 802C0034 002BCF74 88 1E 00 1A */ lbz r0, 0x1a(r30) -/* 802C0038 002BCF78 28 00 00 00 */ cmplwi r0, 0 -/* 802C003C 002BCF7C 40 82 00 10 */ bne lbl_802C004C -/* 802C0040 002BCF80 38 00 00 00 */ li r0, 0 -/* 802C0044 002BCF84 98 1E 00 19 */ stb r0, 0x19(r30) -/* 802C0048 002BCF88 48 00 00 14 */ b lbl_802C005C -lbl_802C004C: -/* 802C004C 002BCF8C 88 1E 00 19 */ lbz r0, 0x19(r30) -/* 802C0050 002BCF90 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 802C0054 002BCF94 7C 1F 02 14 */ add r0, r31, r0 -/* 802C0058 002BCF98 98 1E 00 19 */ stb r0, 0x19(r30) -lbl_802C005C: -/* 802C005C 002BCF9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0060 002BCFA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802C0064 002BCFA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0068 002BCFA8 7C 08 03 A6 */ mtlr r0 -/* 802C006C 002BCFAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0070 002BCFB0 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C013C.s b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C013C.s deleted file mode 100644 index baf69e5f35..0000000000 --- a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C013C.s +++ /dev/null @@ -1,23 +0,0 @@ -/* 802C013C 002BD07C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0140 002BD080 7C 08 02 A6 */ mflr r0 -/* 802C0144 002BD084 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0148 002BD088 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C014C 002BD08C 7C 7F 1B 78 */ mr r31, r3 -/* 802C0150 002BD090 48 00 00 20 */ b lbl_802C0170 -lbl_802C0154: -/* 802C0154 002BD094 80 63 00 00 */ lwz r3, 0(r3) -/* 802C0158 002BD098 28 03 00 00 */ cmplwi r3, 0 -/* 802C015C 002BD09C 41 82 00 14 */ beq lbl_802C0170 -/* 802C0160 002BD0A0 81 83 00 00 */ lwz r12, 0(r3) -/* 802C0164 002BD0A4 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C0168 002BD0A8 7D 89 03 A6 */ mtctr r12 -/* 802C016C 002BD0AC 4E 80 04 21 */ bctrl -lbl_802C0170: -/* 802C0170 002BD0B0 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C0174 002BD0B4 28 03 00 00 */ cmplwi r3, 0 -/* 802C0178 002BD0B8 40 82 FF DC */ bne lbl_802C0154 -/* 802C017C 002BD0BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0180 002BD0C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0184 002BD0C4 7C 08 03 A6 */ mtlr r0 -/* 802C0188 002BD0C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C018C 002BD0CC 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C01E4.s b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C01E4.s deleted file mode 100644 index dc31ea10af..0000000000 --- a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802C01E4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 802C01E4 002BD124 88 63 00 1B */ lbz r3, 0x1b(r3) -/* 802C01E8 002BD128 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h new file mode 100644 index 0000000000..f7aed0b1e1 --- /dev/null +++ b/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h @@ -0,0 +1,50 @@ +#ifndef __Z2SOUNDOBJECT_H__ +#define __Z2SOUNDOBJECT_H__ + +#include "JSystem/JGeometry/JGeometry.h" +#include "Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h" +#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" +#include "global.h" + +/* struct Z2SoundObjBase_vtable { + void* field_0x0; + void* field_0x4; + void* framework; + void* dispose; + void* stopOK; + void* init; + void* startSound; + void* startLevelSound; +}; + */ + +class Z2SoundObjBase : protected Z2SoundHandles { +public: + Z2SoundObjBase(); + ~Z2SoundObjBase(); + + void deleteObject(); + + bool isAlive() const { return mIsInitialized; } + + virtual void framework(u32, s8); + virtual void dispose(); + virtual bool stopOK(Z2SoundHandlePool& pool); + virtual void init(Vec* pSoundPos, u8 pNumHandles); + + // Z2SoundObjBase_vtable* vtable; + Z2SoundStarter* mSoundStarter; + Vec* mSoundPos; + u16 field_0x1c; + u8 field_0x1e; + bool mIsInitialized; +}; + +class Z2SoundObjSimple : protected Z2SoundHandles { +public: + virtual void init(Vec* pSoundPos, u8 pNumHandles); +}; + +class Z2DopplerSoundObjBase : protected Z2SoundHandles {}; + +#endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDEF0.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BDEF0.s deleted file mode 100644 index baed7b864e..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDEF0.s +++ /dev/null @@ -1,22 +0,0 @@ -/* 802BDEF0 002BAE30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BDEF4 002BAE34 7C 08 02 A6 */ mflr r0 -/* 802BDEF8 002BAE38 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BDEFC 002BAE3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BDF00 002BAE40 7C 7F 1B 78 */ mr r31, r3 -/* 802BDF04 002BAE44 4B FE D1 79 */ bl Z2SoundHandles -/* 802BDF08 002BAE48 3C 60 80 3D */ lis r3, lbl_803CAD50@ha -/* 802BDF0C 002BAE4C 38 03 AD 50 */ addi r0, r3, lbl_803CAD50@l -/* 802BDF10 002BAE50 90 1F 00 10 */ stw r0, 0x10(r31) -/* 802BDF14 002BAE54 38 60 00 00 */ li r3, 0 -/* 802BDF18 002BAE58 90 7F 00 18 */ stw r3, 0x18(r31) -/* 802BDF1C 002BAE5C 98 7F 00 1F */ stb r3, 0x1f(r31) -/* 802BDF20 002BAE60 80 0D 85 F4 */ lwz r0, lbl_80450B74-_SDA_BASE_(r13) -/* 802BDF24 002BAE64 90 1F 00 14 */ stw r0, 0x14(r31) -/* 802BDF28 002BAE68 B0 7F 00 1C */ sth r3, 0x1c(r31) -/* 802BDF2C 002BAE6C 98 7F 00 1E */ stb r3, 0x1e(r31) -/* 802BDF30 002BAE70 7F E3 FB 78 */ mr r3, r31 -/* 802BDF34 002BAE74 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802BDF38 002BAE78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BDF3C 002BAE7C 7C 08 03 A6 */ mtlr r0 -/* 802BDF40 002BAE80 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDF44 002BAE84 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDF48.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BDF48.s deleted file mode 100644 index 02eb64a46f..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDF48.s +++ /dev/null @@ -1,27 +0,0 @@ -/* 802BDF48 002BAE88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BDF4C 002BAE8C 7C 08 02 A6 */ mflr r0 -/* 802BDF50 002BAE90 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BDF54 002BAE94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BDF58 002BAE98 93 C1 00 08 */ stw r30, 8(r1) -/* 802BDF5C 002BAE9C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802BDF60 002BAEA0 7C 9F 23 78 */ mr r31, r4 -/* 802BDF64 002BAEA4 41 82 00 30 */ beq lbl_802BDF94 -/* 802BDF68 002BAEA8 3C 80 80 3D */ lis r4, lbl_803CAD50@ha -/* 802BDF6C 002BAEAC 38 04 AD 50 */ addi r0, r4, lbl_803CAD50@l -/* 802BDF70 002BAEB0 90 1E 00 10 */ stw r0, 0x10(r30) -/* 802BDF74 002BAEB4 48 00 00 85 */ bl Z2SoundObjBase_NS_deleteObject -/* 802BDF78 002BAEB8 7F C3 F3 78 */ mr r3, r30 -/* 802BDF7C 002BAEBC 38 80 00 00 */ li r4, 0 -/* 802BDF80 002BAEC0 4B FE D1 35 */ bl Z2SoundHandles_NS_dtor -/* 802BDF84 002BAEC4 7F E0 07 35 */ extsh. r0, r31 -/* 802BDF88 002BAEC8 40 81 00 0C */ ble lbl_802BDF94 -/* 802BDF8C 002BAECC 7F C3 F3 78 */ mr r3, r30 -/* 802BDF90 002BAED0 48 01 0D AD */ bl __dl__FPv -lbl_802BDF94: -/* 802BDF94 002BAED4 7F C3 F3 78 */ mr r3, r30 -/* 802BDF98 002BAED8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802BDF9C 002BAEDC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802BDFA0 002BAEE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BDFA4 002BAEE4 7C 08 03 A6 */ mtlr r0 -/* 802BDFA8 002BAEE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDFAC 002BAEEC 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFB0.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFB0.s deleted file mode 100644 index 46b389d23e..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFB0.s +++ /dev/null @@ -1,18 +0,0 @@ -/* 802BDFB0 002BAEF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BDFB4 002BAEF4 7C 08 02 A6 */ mflr r0 -/* 802BDFB8 002BAEF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BDFBC 002BAEFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BDFC0 002BAF00 93 C1 00 08 */ stw r30, 8(r1) -/* 802BDFC4 002BAF04 7C 7E 1B 78 */ mr r30, r3 -/* 802BDFC8 002BAF08 7C 9F 23 78 */ mr r31, r4 -/* 802BDFCC 002BAF0C 7C A4 2B 78 */ mr r4, r5 -/* 802BDFD0 002BAF10 4B FE D1 49 */ bl Z2SoundHandles_NS_initHandlesPool -/* 802BDFD4 002BAF14 93 FE 00 18 */ stw r31, 0x18(r30) -/* 802BDFD8 002BAF18 38 00 00 01 */ li r0, 1 -/* 802BDFDC 002BAF1C 98 1E 00 1F */ stb r0, 0x1f(r30) -/* 802BDFE0 002BAF20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802BDFE4 002BAF24 83 C1 00 08 */ lwz r30, 8(r1) -/* 802BDFE8 002BAF28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BDFEC 002BAF2C 7C 08 03 A6 */ mtlr r0 -/* 802BDFF0 002BAF30 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDFF4 002BAF34 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFF8.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFF8.s deleted file mode 100644 index 2e6600380a..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BDFF8.s +++ /dev/null @@ -1,16 +0,0 @@ -/* 802BDFF8 002BAF38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BDFFC 002BAF3C 7C 08 02 A6 */ mflr r0 -/* 802BE000 002BAF40 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BE004 002BAF44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BE008 002BAF48 7C 7F 1B 78 */ mr r31, r3 -/* 802BE00C 002BAF4C 81 83 00 10 */ lwz r12, 0x10(r3) -/* 802BE010 002BAF50 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802BE014 002BAF54 7D 89 03 A6 */ mtctr r12 -/* 802BE018 002BAF58 4E 80 04 21 */ bctrl -/* 802BE01C 002BAF5C 7F E3 FB 78 */ mr r3, r31 -/* 802BE020 002BAF60 4B FE D1 01 */ bl Z2SoundHandles_NS_deleteHandlesPool -/* 802BE024 002BAF64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802BE028 002BAF68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BE02C 002BAF6C 7C 08 03 A6 */ mtlr r0 -/* 802BE030 002BAF70 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE034 002BAF74 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE038.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE038.s deleted file mode 100644 index 53d62b8b39..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE038.s +++ /dev/null @@ -1,15 +0,0 @@ -/* 802BE038 002BAF78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BE03C 002BAF7C 7C 08 02 A6 */ mflr r0 -/* 802BE040 002BAF80 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BE044 002BAF84 88 03 00 1F */ lbz r0, 0x1f(r3) -/* 802BE048 002BAF88 28 00 00 00 */ cmplwi r0, 0 -/* 802BE04C 002BAF8C 41 82 00 14 */ beq lbl_802BE060 -/* 802BE050 002BAF90 B0 83 00 1C */ sth r4, 0x1c(r3) -/* 802BE054 002BAF94 98 A3 00 1E */ stb r5, 0x1e(r3) -/* 802BE058 002BAF98 80 83 00 18 */ lwz r4, 0x18(r3) -/* 802BE05C 002BAF9C 4B FE D4 DD */ bl Z2SoundHandles_NS_setPos -lbl_802BE060: -/* 802BE060 002BAFA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BE064 002BAFA4 7C 08 03 A6 */ mtlr r0 -/* 802BE068 002BAFA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE06C 002BAFAC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE070.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE070.s deleted file mode 100644 index 51aea37173..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE070.s +++ /dev/null @@ -1,41 +0,0 @@ -/* 802BE070 002BAFB0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802BE074 002BAFB4 7C 08 02 A6 */ mflr r0 -/* 802BE078 002BAFB8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802BE07C 002BAFBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE080 002BAFC0 48 0A 41 5D */ bl _savegpr_29 -/* 802BE084 002BAFC4 7C 7D 1B 78 */ mr r29, r3 -/* 802BE088 002BAFC8 83 C3 00 00 */ lwz r30, 0(r3) -/* 802BE08C 002BAFCC 48 00 00 50 */ b lbl_802BE0DC -lbl_802BE090: -/* 802BE090 002BAFD0 83 FE 00 00 */ lwz r31, 0(r30) -/* 802BE094 002BAFD4 28 1F 00 00 */ cmplwi r31, 0 -/* 802BE098 002BAFD8 41 82 00 40 */ beq lbl_802BE0D8 -/* 802BE09C 002BAFDC 80 7F 00 00 */ lwz r3, 0(r31) -/* 802BE0A0 002BAFE0 28 03 00 00 */ cmplwi r3, 0 -/* 802BE0A4 002BAFE4 41 82 00 34 */ beq lbl_802BE0D8 -/* 802BE0A8 002BAFE8 80 03 00 18 */ lwz r0, 0x18(r3) -/* 802BE0AC 002BAFEC 90 01 00 08 */ stw r0, 8(r1) -/* 802BE0B0 002BAFF0 80 6D 85 CC */ lwz r3, lbl_80450B4C-_SDA_BASE_(r13) -/* 802BE0B4 002BAFF4 38 81 00 08 */ addi r4, r1, 8 -/* 802BE0B8 002BAFF8 4B FF DA 11 */ bl Z2SoundInfo_NS_getSwBit -/* 802BE0BC 002BAFFC 54 60 04 21 */ rlwinm. r0, r3, 0, 0x10, 0x10 -/* 802BE0C0 002BB000 41 82 00 10 */ beq lbl_802BE0D0 -/* 802BE0C4 002BB004 7F E3 FB 78 */ mr r3, r31 -/* 802BE0C8 002BB008 4B FE 40 BD */ bl JAISoundHandle_NS_releaseSound -/* 802BE0CC 002BB00C 48 00 00 0C */ b lbl_802BE0D8 -lbl_802BE0D0: -/* 802BE0D0 002BB010 80 7F 00 00 */ lwz r3, 0(r31) -/* 802BE0D4 002BB014 4B FE 44 C5 */ bl JAISound_NS_stop_X1_ -lbl_802BE0D8: -/* 802BE0D8 002BB018 83 DE 00 0C */ lwz r30, 0xc(r30) -lbl_802BE0DC: -/* 802BE0DC 002BB01C 28 1E 00 00 */ cmplwi r30, 0 -/* 802BE0E0 002BB020 40 82 FF B0 */ bne lbl_802BE090 -/* 802BE0E4 002BB024 38 00 00 00 */ li r0, 0 -/* 802BE0E8 002BB028 98 1D 00 1F */ stb r0, 0x1f(r29) -/* 802BE0EC 002BB02C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE0F0 002BB030 48 0A 41 39 */ bl _restgpr_29 -/* 802BE0F4 002BB034 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802BE0F8 002BB038 7C 08 03 A6 */ mtlr r0 -/* 802BE0FC 002BB03C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BE100 002BB040 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE104.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE104.s deleted file mode 100644 index b688dabe46..0000000000 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE104.s +++ /dev/null @@ -1,16 +0,0 @@ -/* 802BE104 002BB044 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BE108 002BB048 7C 08 02 A6 */ mflr r0 -/* 802BE10C 002BB04C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BE110 002BB050 80 64 00 00 */ lwz r3, 0(r4) -/* 802BE114 002BB054 80 03 00 18 */ lwz r0, 0x18(r3) -/* 802BE118 002BB058 90 01 00 08 */ stw r0, 8(r1) -/* 802BE11C 002BB05C 80 6D 85 CC */ lwz r3, lbl_80450B4C-_SDA_BASE_(r13) -/* 802BE120 002BB060 38 81 00 08 */ addi r4, r1, 8 -/* 802BE124 002BB064 4B FF D9 A5 */ bl Z2SoundInfo_NS_getSwBit -/* 802BE128 002BB068 54 60 04 20 */ rlwinm r0, r3, 0, 0x10, 0x10 -/* 802BE12C 002BB06C 7C 00 00 34 */ cntlzw r0, r0 -/* 802BE130 002BB070 54 03 D9 7E */ srwi r3, r0, 5 -/* 802BE134 002BB074 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BE138 002BB078 7C 08 03 A6 */ mtlr r0 -/* 802BE13C 002BB07C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE140 002BB080 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s index 8e4e980417..635ebce812 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s @@ -47,14 +47,14 @@ lbl_802BE1C0: /* 802BE1EC 002BB12C 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE1F0 002BB130 7F A3 EB 78 */ mr r3, r29 /* 802BE1F4 002BB134 38 81 00 14 */ addi r4, r1, 0x14 -/* 802BE1F8 002BB138 4B FE D0 5D */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802BE1F8 002BB138 4B FE D0 5D */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802BE1FC 002BB13C 7C 7C 1B 79 */ or. r28, r3, r3 /* 802BE200 002BB140 41 82 00 30 */ beq lbl_802BE230 /* 802BE204 002BB144 80 1E 00 00 */ lwz r0, 0(r30) /* 802BE208 002BB148 90 01 00 10 */ stw r0, 0x10(r1) /* 802BE20C 002BB14C 80 6D 85 CC */ lwz r3, lbl_80450B4C-_SDA_BASE_(r13) /* 802BE210 002BB150 38 81 00 10 */ addi r4, r1, 0x10 -/* 802BE214 002BB154 4B FF D8 B5 */ bl Z2SoundInfo_NS_getSwBit +/* 802BE214 002BB154 4B FF D8 B5 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BE218 002BB158 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11 /* 802BE21C 002BB15C 41 82 00 0C */ beq lbl_802BE228 /* 802BE220 002BB160 3B 80 00 00 */ li r28, 0 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s index fd6b845867..be10d18613 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s @@ -36,7 +36,7 @@ lbl_802BE328: /* 802BE354 002BB294 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE358 002BB298 7F C3 F3 78 */ mr r3, r30 /* 802BE35C 002BB29C 38 81 00 14 */ addi r4, r1, 0x14 -/* 802BE360 002BB2A0 4B FE CE F5 */ bl Z2SoundHandles_NS_getHandleSoundID +/* 802BE360 002BB2A0 4B FE CE F5 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID /* 802BE364 002BB2A4 7C 7D 1B 79 */ or. r29, r3, r3 /* 802BE368 002BB2A8 41 82 00 4C */ beq lbl_802BE3B4 /* 802BE36C 002BB2AC 80 7D 00 00 */ lwz r3, 0(r29) @@ -51,7 +51,7 @@ lbl_802BE384: /* 802BE38C 002BB2CC 38 A0 00 06 */ li r5, 6 /* 802BE390 002BB2D0 57 E6 04 3E */ clrlwi r6, r31, 0x10 /* 802BE394 002BB2D4 38 E0 FF FF */ li r7, -1 -/* 802BE398 002BB2D8 4B FE CB 45 */ bl Z2SoundStarter_NS_setPortData +/* 802BE398 002BB2D8 4B FE CB 45 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802BE39C 002BB2DC 80 7D 00 00 */ lwz r3, 0(r29) /* 802BE3A0 002BB2E0 38 63 00 48 */ addi r3, r3, 0x48 /* 802BE3A4 002BB2E4 FC 20 F8 90 */ fmr f1, f31 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s index a13ee5895f..3bbcf698b8 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s @@ -30,7 +30,7 @@ lbl_802BE4F4: /* 802BE50C 002BB44C 7C 1E 00 40 */ cmplw r30, r0 /* 802BE510 002BB450 40 82 00 0C */ bne lbl_802BE51C /* 802BE514 002BB454 38 63 00 10 */ addi r3, r3, 0x10 -/* 802BE518 002BB458 4B FE 40 81 */ bl JAISound_NS_stop_X1_ +/* 802BE518 002BB458 4B FE 40 81 */ bl stop__8JAISoundFv lbl_802BE51C: /* 802BE51C 002BB45C 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802BE520: diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5A0.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5A0.s index 0e1a3444f2..e338c14a3c 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5A0.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5A0.s @@ -3,7 +3,7 @@ /* 802BE5A8 002BB4E8 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE5AC 002BB4EC 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BE5B0 002BB4F0 7C 7F 1B 78 */ mr r31, r3 -/* 802BE5B4 002BB4F4 4B FF F9 3D */ bl Z2SoundObjBase_NS_ctor +/* 802BE5B4 002BB4F4 4B FF F9 3D */ bl __ct__14Z2SoundObjBaseFv /* 802BE5B8 002BB4F8 3C 60 80 3D */ lis r3, lbl_803CAD30@ha /* 802BE5BC 002BB4FC 38 03 AD 30 */ addi r0, r3, lbl_803CAD30@l /* 802BE5C0 002BB500 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5FC.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5FC.s index 0167fd928f..87cd23acc1 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5FC.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE5FC.s @@ -10,7 +10,7 @@ /* 802BE620 002BB560 38 04 AD 30 */ addi r0, r4, lbl_803CAD30@l /* 802BE624 002BB564 90 1E 00 10 */ stw r0, 0x10(r30) /* 802BE628 002BB568 38 80 00 00 */ li r4, 0 -/* 802BE62C 002BB56C 4B FF F9 1D */ bl Z2SoundObjBase_NS_dtor +/* 802BE62C 002BB56C 4B FF F9 1D */ bl __dt__14Z2SoundObjBaseFv /* 802BE630 002BB570 7F E0 07 35 */ extsh. r0, r31 /* 802BE634 002BB574 40 81 00 0C */ ble lbl_802BE640 /* 802BE638 002BB578 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE65C.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE65C.s index e95d5ad530..227b87c2df 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE65C.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE65C.s @@ -3,7 +3,7 @@ /* 802BE664 002BB5A4 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE668 002BB5A8 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BE66C 002BB5AC 7C 7F 1B 78 */ mr r31, r3 -/* 802BE670 002BB5B0 4B FF F9 41 */ bl Z2SoundObjBase_NS_init +/* 802BE670 002BB5B0 4B FF F9 41 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802BE674 002BB5B4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 802BE678 002BB5B8 28 03 00 00 */ cmplwi r3, 0 /* 802BE67C 002BB5BC 41 82 00 28 */ beq lbl_802BE6A4 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE6B8.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE6B8.s index 08f0f6ff4a..5b885aeb76 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE6B8.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE6B8.s @@ -3,7 +3,7 @@ /* 802BE6C0 002BB600 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE6C4 002BB604 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BE6C8 002BB608 7C 7F 1B 78 */ mr r31, r3 -/* 802BE6CC 002BB60C 4B FF F9 6D */ bl Z2SoundObjBase_NS_framework +/* 802BE6CC 002BB60C 4B FF F9 6D */ bl framework__14Z2SoundObjBaseFUlSc /* 802BE6D0 002BB610 80 1F 00 18 */ lwz r0, 0x18(r31) /* 802BE6D4 002BB614 28 00 00 00 */ cmplwi r0, 0 /* 802BE6D8 002BB618 41 82 00 28 */ beq lbl_802BE700 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE844.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE844.s index 8656f708be..21f26d05bb 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE844.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE844.s @@ -3,7 +3,7 @@ /* 802BE84C 002BB78C 90 01 00 14 */ stw r0, 0x14(r1) /* 802BE850 002BB790 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BE854 002BB794 7C 7F 1B 78 */ mr r31, r3 -/* 802BE858 002BB798 4B FF F6 99 */ bl Z2SoundObjBase_NS_ctor +/* 802BE858 002BB798 4B FF F6 99 */ bl __ct__14Z2SoundObjBaseFv /* 802BE85C 002BB79C 3C 60 80 3D */ lis r3, lbl_803CAD10@ha /* 802BE860 002BB7A0 38 03 AD 10 */ addi r0, r3, lbl_803CAD10@l /* 802BE864 002BB7A4 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE880.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE880.s index 7b97d73e5c..0e15d5a9b0 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE880.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE880.s @@ -1,7 +1,7 @@ /* 802BE880 002BB7C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802BE884 002BB7C4 7C 08 02 A6 */ mflr r0 /* 802BE888 002BB7C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BE88C 002BB7CC 4B FF F7 25 */ bl Z2SoundObjBase_NS_init +/* 802BE88C 002BB7CC 4B FF F7 25 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802BE890 002BB7D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BE894 002BB7D4 7C 08 03 A6 */ mtlr r0 /* 802BE898 002BB7D8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB74.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB74.s index d988f9d0a8..438f986db1 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB74.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB74.s @@ -1,7 +1,7 @@ /* 802BEB74 002BBAB4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802BEB78 002BBAB8 7C 08 02 A6 */ mflr r0 /* 802BEB7C 002BBABC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BEB80 002BBAC0 4B FF F4 31 */ bl Z2SoundObjBase_NS_init +/* 802BEB80 002BBAC0 4B FF F4 31 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802BEB84 002BBAC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BEB88 002BBAC8 7C 08 03 A6 */ mtlr r0 /* 802BEB8C 002BBACC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB94.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB94.s index 6bc068f6ad..fb81b52674 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB94.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB94.s @@ -3,7 +3,7 @@ /* 802BEB9C 002BBADC 90 01 00 14 */ stw r0, 0x14(r1) /* 802BEBA0 002BBAE0 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BEBA4 002BBAE4 7C 7F 1B 78 */ mr r31, r3 -/* 802BEBA8 002BBAE8 4B FF F3 49 */ bl Z2SoundObjBase_NS_ctor +/* 802BEBA8 002BBAE8 4B FF F3 49 */ bl __ct__14Z2SoundObjBaseFv /* 802BEBAC 002BBAEC 3C 60 80 3D */ lis r3, lbl_803CACD0@ha /* 802BEBB0 002BBAF0 38 03 AC D0 */ addi r0, r3, lbl_803CACD0@l /* 802BEBB4 002BBAF4 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBDC.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBDC.s index 17dd6840bc..e5399a6878 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBDC.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBDC.s @@ -1,7 +1,7 @@ /* 802BEBDC 002BBB1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802BEBE0 002BBB20 7C 08 02 A6 */ mflr r0 /* 802BEBE4 002BBB24 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BEBE8 002BBB28 4B FF F3 C9 */ bl Z2SoundObjBase_NS_init +/* 802BEBE8 002BBB28 4B FF F3 C9 */ bl init__14Z2SoundObjBaseFP3VecUc /* 802BEBEC 002BBB2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BEBF0 002BBB30 7C 08 03 A6 */ mtlr r0 /* 802BEBF4 002BBB34 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BED68.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BED68.s index 7827e38829..a4874a3bc0 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BED68.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BED68.s @@ -52,7 +52,7 @@ lbl_802BEDFC: /* 802BEE20 002BBD60 38 63 FF FC */ addi r3, r3, -4 lbl_802BEE24: /* 802BEE24 002BBD64 80 63 00 00 */ lwz r3, 0(r3) -/* 802BEE28 002BBD68 4B FE 37 71 */ bl JAISound_NS_stop_X1_ +/* 802BEE28 002BBD68 4B FE 37 71 */ bl stop__8JAISoundFv /* 802BEE2C 002BBD6C 48 00 00 80 */ b lbl_802BEEAC lbl_802BEE30: /* 802BEE30 002BBD70 7F E3 FB 78 */ mr r3, r31 @@ -75,7 +75,7 @@ lbl_802BEE48: /* 802BEE70 002BBDB0 38 63 FF FC */ addi r3, r3, -4 lbl_802BEE74: /* 802BEE74 002BBDB4 80 63 00 00 */ lwz r3, 0(r3) -/* 802BEE78 002BBDB8 4B FE 37 21 */ bl JAISound_NS_stop_X1_ +/* 802BEE78 002BBDB8 4B FE 37 21 */ bl stop__8JAISoundFv /* 802BEE7C 002BBDBC 48 00 00 30 */ b lbl_802BEEAC lbl_802BEE80: /* 802BEE80 002BBDC0 7F E3 FB 78 */ mr r3, r31 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BF304.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BF304.s index 313b552535..59f166aa81 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BF304.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BF304.s @@ -144,7 +144,7 @@ lbl_802BF4EC: /* 802BF500 002BC440 38 63 FF FC */ addi r3, r3, -4 lbl_802BF504: /* 802BF504 002BC444 80 63 00 00 */ lwz r3, 0(r3) -/* 802BF508 002BC448 4B FE 30 91 */ bl JAISound_NS_stop_X1_ +/* 802BF508 002BC448 4B FE 30 91 */ bl stop__8JAISoundFv /* 802BF50C 002BC44C 48 00 01 1C */ b lbl_802BF628 lbl_802BF510: /* 802BF510 002BC450 54 80 06 3F */ clrlwi. r0, r4, 0x18 @@ -157,7 +157,7 @@ lbl_802BF510: /* 802BF52C 002BC46C 38 63 FF FC */ addi r3, r3, -4 lbl_802BF530: /* 802BF530 002BC470 80 63 00 00 */ lwz r3, 0(r3) -/* 802BF534 002BC474 4B FE 30 65 */ bl JAISound_NS_stop_X1_ +/* 802BF534 002BC474 4B FE 30 65 */ bl stop__8JAISoundFv /* 802BF538 002BC478 48 00 00 F0 */ b lbl_802BF628 lbl_802BF53C: /* 802BF53C 002BC47C 54 A0 06 F7 */ rlwinm. r0, r5, 0, 0x1b, 0x1b @@ -227,7 +227,7 @@ lbl_802BF600: /* 802BF61C 002BC55C 38 63 FF FC */ addi r3, r3, -4 lbl_802BF620: /* 802BF620 002BC560 80 63 00 00 */ lwz r3, 0(r3) -/* 802BF624 002BC564 4B FE 2F 75 */ bl JAISound_NS_stop_X1_ +/* 802BF624 002BC564 4B FE 2F 75 */ bl stop__8JAISoundFv lbl_802BF628: /* 802BF628 002BC568 3B DE 00 01 */ addi r30, r30, 1 lbl_802BF62C: diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s index d201110323..4635c44356 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s @@ -66,7 +66,7 @@ lbl_802BF708: /* 802BF750 002BC690 40 82 01 20 */ bne lbl_802BF870 /* 802BF754 002BC694 7F 03 C3 78 */ mr r3, r24 /* 802BF758 002BC698 7F C4 F3 78 */ mr r4, r30 -/* 802BF75C 002BC69C 4B FE BB 45 */ bl Z2SoundHandles_NS_getHandleUserData +/* 802BF75C 002BC69C 4B FE BB 45 */ bl getHandleUserData__14Z2SoundHandlesFUl /* 802BF760 002BC6A0 7C 7D 1B 79 */ or. r29, r3, r3 /* 802BF764 002BC6A4 41 82 00 24 */ beq lbl_802BF788 /* 802BF768 002BC6A8 80 7D 00 00 */ lwz r3, 0(r29) diff --git a/include/Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h b/include/Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h new file mode 100644 index 0000000000..aaebddf148 --- /dev/null +++ b/include/Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h @@ -0,0 +1,31 @@ +#ifndef Z2SOUNDSTARTER_H_ +#define Z2SOUNDSTARTER_H_ + +#include "JSystem/JAudio2/JAISound/JAISound.h" +#include "JSystem/JGeometry/JGeometry.h" + +struct Z2SoundStarter_vtable { + void* field_0x0; + void* field_0x4; + void* dtor; + void* startSound1; + void* startSound2; +}; + +struct Z2SoundStarter { + // Z2SoundStarter_vtable* vtable; + + Z2SoundStarter(bool); + virtual ~Z2SoundStarter(); + + virtual void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); + virtual void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*, u32, float, + float, float, float, float, u32); + + void setPortData(JAISoundHandle*, u32, u16, s8); + void getPortData(JAISoundHandle*, u32, s8); +}; + +extern Z2SoundStarter* lbl_80450B74; + +#endif // Z2SOUNDSTARTER_H_ diff --git a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AABF4.s b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AABF4.s index 5017850dc4..8fc760775a 100644 --- a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AABF4.s +++ b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AABF4.s @@ -11,7 +11,7 @@ /* 802AAC1C 002A7B5C C0 82 BE 60 */ lfs f4, lbl_80455860-_SDA2_BASE_(r2) /* 802AAC20 002A7B60 FC A0 20 90 */ fmr f5, f4 /* 802AAC24 002A7B64 39 00 00 00 */ li r8, 0 -/* 802AAC28 002A7B68 48 00 00 15 */ bl Z2SoundStarter_NS_startSound_X1_ +/* 802AAC28 002A7B68 48 00 00 15 */ bl startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl /* 802AAC2C 002A7B6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802AAC30 002A7B70 7C 08 03 A6 */ mtlr r0 /* 802AAC34 002A7B74 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s index d8c7eb99e8..34a38f9321 100644 --- a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s +++ b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s @@ -116,7 +116,7 @@ lbl_802AADA0: /* 802AADE8 002A7D28 38 A0 00 06 */ li r5, 6 /* 802AADEC 002A7D2C 57 C6 04 3E */ clrlwi r6, r30, 0x10 /* 802AADF0 002A7D30 38 E0 FF FF */ li r7, -1 -/* 802AADF4 002A7D34 48 00 00 E9 */ bl Z2SoundStarter_NS_setPortData +/* 802AADF4 002A7D34 48 00 00 E9 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802AADF8: /* 802AADF8 002A7D38 C0 02 BE 58 */ lfs f0, lbl_80455858-_SDA2_BASE_(r2) /* 802AADFC 002A7D3C FC 1B 00 40 */ fcmpo cr0, f27, f0 diff --git a/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h b/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h new file mode 100644 index 0000000000..4c592210ae --- /dev/null +++ b/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h @@ -0,0 +1,42 @@ +#ifndef __Z2SPEECHMGR2_H__ +#define __Z2SPEECHMGR2_H__ + +#include "JSystem/JAudio2/JAISound/JAISound.h" +#include "JSystem/JMath/random.h" +#include "dolphin/types.h" + +class Z2SpeechStarter { +public: + Z2SpeechStarter(); + +private: + void* __vt; //! @todo vtable +}; + +class Z2SpeechMgr2 { +public: + Z2SpeechMgr2(); + +private: + JAISoundHandle mSoundHandle1; + JAISoundHandle mSoundHandle2; + JMath::TRandom_fast_ mRandom; + Z2SpeechStarter mSpeechStarter; + + u16 field_0x10[500]; + s16 field_0x3f8; + s16 mTextCount; + u16 field_0x3fc; + u8 field_0x3fe; + u8 field_0x3ff; + u8 field_0x400; + u8 field_0x401; + u8 field_0x402[64]; + u16 field_0x442; +}; + +//! @todo: we need to eventually figure out how to get JASGlobalInstance working once +//! const placement is fixed. +extern Z2SpeechMgr2* lbl_80450B70; // m_Do_main::JASGlobalInstance::sInstance + +#endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBC60.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBC60.s index 903a088e9c..41ba8c422e 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBC60.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBC60.s @@ -11,7 +11,7 @@ /* 802CBC88 002C8BC8 38 80 00 00 */ li r4, 0 /* 802CBC8C 002C8BCC 48 06 DE 59 */ bl __ct__Q25JMath13TRandom_fast_FUl /* 802CBC90 002C8BD0 38 7F 00 0C */ addi r3, r31, 0xc -/* 802CBC94 002C8BD4 48 00 13 25 */ bl Z2SpeechStarter +/* 802CBC94 002C8BD4 48 00 13 25 */ bl __ct__15Z2SpeechStarterFv /* 802CBC98 002C8BD8 38 00 00 00 */ li r0, 0 /* 802CBC9C 002C8BDC B0 1F 03 F8 */ sth r0, 0x3f8(r31) /* 802CBCA0 002C8BE0 38 60 FF FF */ li r3, -1 diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s index 96d9bc40cf..9c87051917 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s @@ -79,7 +79,7 @@ lbl_802CC21C: /* 802CC2BC 002C91FC 38 06 00 01 */ addi r0, r6, 1 /* 802CC2C0 002C9200 54 06 04 3E */ clrlwi r6, r0, 0x10 /* 802CC2C4 002C9204 38 E0 FF FF */ li r7, -1 -/* 802CC2C8 002C9208 4B FD EC 15 */ bl Z2SoundStarter_NS_setPortData +/* 802CC2C8 002C9208 4B FD EC 15 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc /* 802CC2CC 002C920C 88 1E 04 00 */ lbz r0, 0x400(r30) /* 802CC2D0 002C9210 28 00 00 00 */ cmplwi r0, 0 /* 802CC2D4 002C9214 40 82 00 10 */ bne lbl_802CC2E4 diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC4C0.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC4C0.s index a18c626e16..f3a0f4fad9 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC4C0.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC4C0.s @@ -5,7 +5,7 @@ /* 802CC4D0 002C9410 28 00 00 40 */ cmplwi r0, 0x40 /* 802CC4D4 002C9414 41 80 00 10 */ blt lbl_802CC4E4 /* 802CC4D8 002C9418 80 63 00 00 */ lwz r3, 0(r3) -/* 802CC4DC 002C941C 4B FD 60 BD */ bl JAISound_NS_stop_X1_ +/* 802CC4DC 002C941C 4B FD 60 BD */ bl stop__8JAISoundFv /* 802CC4E0 002C9420 48 00 02 48 */ b lbl_802CC728 lbl_802CC4E4: /* 802CC4E4 002C9424 3C A0 80 3A */ lis r5, lbl_8039C98C@ha diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s index 7eb82e70ee..0f5c2f773c 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s @@ -354,7 +354,7 @@ lbl_802CCEEC: /* 802CCEF0 002C9E30 28 00 00 00 */ cmplwi r0, 0 /* 802CCEF4 002C9E34 41 82 00 0C */ beq lbl_802CCF00 /* 802CCEF8 002C9E38 7F 83 E3 78 */ mr r3, r28 -/* 802CCEFC 002C9E3C 4B FD 52 89 */ bl JAISoundHandle_NS_releaseSound +/* 802CCEFC 002C9E3C 4B FD 52 89 */ bl releaseSound__14JAISoundHandleFv lbl_802CCF00: /* 802CCF00 002C9E40 80 01 00 80 */ lwz r0, 0x80(r1) /* 802CCF04 002C9E44 90 01 00 08 */ stw r0, 8(r1) @@ -381,7 +381,7 @@ lbl_802CCF00: /* 802CCF58 002C9E98 38 A0 00 08 */ li r5, 8 /* 802CCF5C 002C9E9C 7F C6 F3 78 */ mr r6, r30 /* 802CCF60 002C9EA0 38 E0 FF FF */ li r7, -1 -/* 802CCF64 002C9EA4 4B FD DF 79 */ bl Z2SoundStarter_NS_setPortData +/* 802CCF64 002C9EA4 4B FD DF 79 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802CCF68: /* 802CCF68 002C9EA8 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, 0 /* 802CCF6C 002C9EAC CB E1 00 A0 */ lfd f31, 0xa0(r1) diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFB8.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFB8.s index b0c9df84c0..d37edc65f8 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFB8.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFB8.s @@ -4,7 +4,7 @@ /* 802CCFC4 002C9F04 93 E1 00 0C */ stw r31, 0xc(r1) /* 802CCFC8 002C9F08 7C 7F 1B 78 */ mr r31, r3 /* 802CCFCC 002C9F0C 38 80 00 00 */ li r4, 0 -/* 802CCFD0 002C9F10 4B FD DB C5 */ bl Z2SoundStarter_NS_ctor +/* 802CCFD0 002C9F10 4B FD DB C5 */ bl __ct__14Z2SoundStarterFb /* 802CCFD4 002C9F14 3C 60 80 3D */ lis r3, lbl_803CBF24@ha /* 802CCFD8 002C9F18 38 03 BF 24 */ addi r0, r3, lbl_803CBF24@l /* 802CCFDC 002C9F1C 90 1F 00 00 */ stw r0, 0(r31) diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s index 48379fb143..486770759a 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s @@ -93,7 +93,7 @@ lbl_802CD10C: /* 802CD154 002CA094 38 A0 00 06 */ li r5, 6 /* 802CD158 002CA098 57 66 04 3E */ clrlwi r6, r27, 0x10 /* 802CD15C 002CA09C 38 E0 FF FF */ li r7, -1 -/* 802CD160 002CA0A0 4B FD DD 7D */ bl Z2SoundStarter_NS_setPortData +/* 802CD160 002CA0A0 4B FD DD 7D */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc lbl_802CD164: /* 802CD164 002CA0A4 C0 02 C5 30 */ lfs f0, lbl_80455F30-_SDA2_BASE_(r2) /* 802CD168 002CA0A8 FC 1B 00 40 */ fcmpo cr0, f27, f0 diff --git a/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h index cf6cdade92..69607e5aec 100644 --- a/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h @@ -20,6 +20,8 @@ struct Z2StatusMgr { void setCameraGroupInfo(u8); void setCameraInWaterDepth(float); + //! @todo there are a number of inlines only called from rels: see CHN_debug + u8 hour; u8 minute; u8 weekday; diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h b/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h new file mode 100644 index 0000000000..7ee6268425 --- /dev/null +++ b/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h @@ -0,0 +1,25 @@ +#ifndef Z2WOLFHOWLMGR_H_ +#define Z2WOLFHOWLMGR_H_ + +struct Z2WolfHowlData {}; + +class Z2WolfHowlMgr { + Z2WolfHowlMgr(); + + void resetState(); + void calcVolumeMod(float); + void getNowPitch(); + void getNowInputValue(); + void calcPitchMod(float, float); + void startWolfHowlSound(float, float, bool, float); + void setCorrectData(s8, Z2WolfHowlData*); + void getCorrectLine(u8); + void getCorrectLineNum(); + void checkLine(); + void getOnLineNum(); + void startWindStoneSound(s8, Vec*); + void startGuideMelody(bool); + void skipCorrectDemo(); +}; + +#endif // Z2WOLFHOWLMGR_H_ \ No newline at end of file diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s index c17cb920fc..bdd78c1fa4 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s @@ -9,7 +9,7 @@ /* 802CACF4 002C7C34 7C 7F 1B 78 */ mr r31, r3 /* 802CACF8 002C7C38 FF C0 10 90 */ fmr f30, f2 /* 802CACFC 002C7C3C C3 E2 C4 64 */ lfs f31, lbl_80455E64-_SDA2_BASE_(r2) -/* 802CAD00 002C7C40 4B FF FF B1 */ bl Z2WolfHowlMgr_NS_getNowPitch +/* 802CAD00 002C7C40 4B FF FF B1 */ bl getNowPitch__13Z2WolfHowlMgrFv /* 802CAD04 002C7C44 D0 3F 00 20 */ stfs f1, 0x20(r31) /* 802CAD08 002C7C48 88 1F 00 8C */ lbz r0, 0x8c(r31) /* 802CAD0C 002C7C4C 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAED4.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAED4.s index b7ff46fbbc..6ea78179ae 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAED4.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAED4.s @@ -91,10 +91,10 @@ lbl_802CB00C: /* 802CB018 002C7F58 7F E3 FB 78 */ mr r3, r31 /* 802CB01C 002C7F5C C0 22 C4 60 */ lfs f1, lbl_80455E60-_SDA2_BASE_(r2) /* 802CB020 002C7F60 FC 40 08 90 */ fmr f2, f1 -/* 802CB024 002C7F64 4B FF FC B1 */ bl Z2WolfHowlMgr_NS_calcPitchMod +/* 802CB024 002C7F64 4B FF FC B1 */ bl calcPitchMod__13Z2WolfHowlMgrFff /* 802CB028 002C7F68 7F E3 FB 78 */ mr r3, r31 /* 802CB02C 002C7F6C FC 20 F8 90 */ fmr f1, f31 -/* 802CB030 002C7F70 4B FF FB BD */ bl Z2WolfHowlMgr_NS_calcVolumeMod +/* 802CB030 002C7F70 4B FF FB BD */ bl calcVolumeMod__13Z2WolfHowlMgrFf lbl_802CB034: /* 802CB034 002C7F74 80 7F 00 88 */ lwz r3, 0x88(r31) /* 802CB038 002C7F78 38 03 00 01 */ addi r0, r3, 1 @@ -122,10 +122,10 @@ lbl_802CB044: /* 802CB08C 002C7FCC 7F E3 FB 78 */ mr r3, r31 /* 802CB090 002C7FD0 C0 22 C4 60 */ lfs f1, lbl_80455E60-_SDA2_BASE_(r2) /* 802CB094 002C7FD4 FC 40 08 90 */ fmr f2, f1 -/* 802CB098 002C7FD8 4B FF FC 3D */ bl Z2WolfHowlMgr_NS_calcPitchMod +/* 802CB098 002C7FD8 4B FF FC 3D */ bl calcPitchMod__13Z2WolfHowlMgrFff /* 802CB09C 002C7FDC 7F E3 FB 78 */ mr r3, r31 /* 802CB0A0 002C7FE0 FC 20 F8 90 */ fmr f1, f31 -/* 802CB0A4 002C7FE4 4B FF FB 49 */ bl Z2WolfHowlMgr_NS_calcVolumeMod +/* 802CB0A4 002C7FE4 4B FF FB 49 */ bl calcVolumeMod__13Z2WolfHowlMgrFf lbl_802CB0A8: /* 802CB0A8 002C7FE8 88 7F 00 8C */ lbz r3, 0x8c(r31) /* 802CB0AC 002C7FEC 38 03 00 01 */ addi r0, r3, 1 @@ -136,14 +136,14 @@ lbl_802CB0A8: /* 802CB0C0 002C8000 48 00 00 18 */ b lbl_802CB0D8 lbl_802CB0C4: /* 802CB0C4 002C8004 7F E3 FB 78 */ mr r3, r31 -/* 802CB0C8 002C8008 4B FF FA C5 */ bl Z2WolfHowlMgr_NS_resetState +/* 802CB0C8 002C8008 4B FF FA C5 */ bl resetState__13Z2WolfHowlMgrFv /* 802CB0CC 002C800C 48 00 00 0C */ b lbl_802CB0D8 lbl_802CB0D0: /* 802CB0D0 002C8010 7F E3 FB 78 */ mr r3, r31 -/* 802CB0D4 002C8014 4B FF FA B9 */ bl Z2WolfHowlMgr_NS_resetState +/* 802CB0D4 002C8014 4B FF FA B9 */ bl resetState__13Z2WolfHowlMgrFv lbl_802CB0D8: /* 802CB0D8 002C8018 7F E3 FB 78 */ mr r3, r31 -/* 802CB0DC 002C801C 48 00 02 B1 */ bl Z2WolfHowlMgr_NS_checkLine +/* 802CB0DC 002C801C 48 00 02 B1 */ bl checkLine__13Z2WolfHowlMgrFv /* 802CB0E0 002C8020 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 802CB0E4 002C8024 CB E1 00 20 */ lfd f31, 0x20(r1) /* 802CB0E8 002C8028 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB100.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB100.s index c6338f5165..5867d434bf 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB100.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB100.s @@ -103,14 +103,14 @@ lbl_802CB258: lbl_802CB26C: /* 802CB26C 002C81AC 7F E3 FB 78 */ mr r3, r31 /* 802CB270 002C81B0 7F A4 EB 78 */ mr r4, r29 -/* 802CB274 002C81B4 48 00 00 AD */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB274 002C81B4 48 00 00 AD */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB278 002C81B8 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB27C 002C81BC B0 01 00 10 */ sth r0, 0x10(r1) /* 802CB280 002C81C0 88 01 00 11 */ lbz r0, 0x11(r1) /* 802CB284 002C81C4 7F DE 02 14 */ add r30, r30, r0 /* 802CB288 002C81C8 7F E3 FB 78 */ mr r3, r31 /* 802CB28C 002C81CC 7F A4 EB 78 */ mr r4, r29 -/* 802CB290 002C81D0 48 00 00 91 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB290 002C81D0 48 00 00 91 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB294 002C81D4 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB298 002C81D8 B0 01 00 0C */ sth r0, 0xc(r1) /* 802CB29C 002C81DC 88 01 00 0C */ lbz r0, 0xc(r1) @@ -122,7 +122,7 @@ lbl_802CB26C: /* 802CB2B4 002C81F4 B0 1F 00 BE */ sth r0, 0xbe(r31) /* 802CB2B8 002C81F8 7F E3 FB 78 */ mr r3, r31 /* 802CB2BC 002C81FC 7F A4 EB 78 */ mr r4, r29 -/* 802CB2C0 002C8200 48 00 00 61 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB2C0 002C8200 48 00 00 61 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB2C4 002C8204 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB2C8 002C8208 B0 01 00 08 */ sth r0, 8(r1) /* 802CB2CC 002C820C A0 7F 00 BE */ lhz r3, 0xbe(r31) @@ -133,7 +133,7 @@ lbl_802CB2DC: /* 802CB2DC 002C821C 3B BD 00 01 */ addi r29, r29, 1 lbl_802CB2E0: /* 802CB2E0 002C8220 7F E3 FB 78 */ mr r3, r31 -/* 802CB2E4 002C8224 48 00 00 8D */ bl Z2WolfHowlMgr_NS_getCorrectLineNum +/* 802CB2E4 002C8224 48 00 00 8D */ bl getCorrectLineNum__13Z2WolfHowlMgrFv /* 802CB2E8 002C8228 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 802CB2EC 002C822C 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 802CB2F0 002C8230 7C 00 18 40 */ cmplw r0, r3 diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB38C.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB38C.s index c0ef9f6e69..9a0f722f77 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB38C.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB38C.s @@ -52,7 +52,7 @@ lbl_802CB420: lbl_802CB43C: /* 802CB43C 002C837C 7F E3 FB 78 */ mr r3, r31 /* 802CB440 002C8380 7F A4 EB 78 */ mr r4, r29 -/* 802CB444 002C8384 4B FF FE DD */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB444 002C8384 4B FF FE DD */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB448 002C8388 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB44C 002C838C B0 01 00 10 */ sth r0, 0x10(r1) /* 802CB450 002C8390 88 01 00 11 */ lbz r0, 0x11(r1) @@ -60,7 +60,7 @@ lbl_802CB43C: /* 802CB458 002C8398 3B BD 00 01 */ addi r29, r29, 1 lbl_802CB45C: /* 802CB45C 002C839C 7F E3 FB 78 */ mr r3, r31 -/* 802CB460 002C83A0 4B FF FF 11 */ bl Z2WolfHowlMgr_NS_getCorrectLineNum +/* 802CB460 002C83A0 4B FF FF 11 */ bl getCorrectLineNum__13Z2WolfHowlMgrFv /* 802CB464 002C83A4 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 802CB468 002C83A8 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 802CB46C 002C83AC 7C 00 18 40 */ cmplw r0, r3 @@ -132,7 +132,7 @@ lbl_802CB544: lbl_802CB560: /* 802CB560 002C84A0 7F E3 FB 78 */ mr r3, r31 /* 802CB564 002C84A4 7F 84 E3 78 */ mr r4, r28 -/* 802CB568 002C84A8 4B FF FD B9 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB568 002C84A8 4B FF FD B9 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB56C 002C84AC 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB570 002C84B0 B0 01 00 0C */ sth r0, 0xc(r1) /* 802CB574 002C84B4 88 01 00 0D */ lbz r0, 0xd(r1) @@ -146,7 +146,7 @@ lbl_802CB580: /* 802CB590 002C84D0 7C 1D F0 40 */ cmplw r29, r30 /* 802CB594 002C84D4 40 81 00 80 */ ble lbl_802CB614 /* 802CB598 002C84D8 7F E3 FB 78 */ mr r3, r31 -/* 802CB59C 002C84DC 4B FF FD D5 */ bl Z2WolfHowlMgr_NS_getCorrectLineNum +/* 802CB59C 002C84DC 4B FF FD D5 */ bl getCorrectLineNum__13Z2WolfHowlMgrFv /* 802CB5A0 002C84E0 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 802CB5A4 002C84E4 88 1F 00 BA */ lbz r0, 0xba(r31) /* 802CB5A8 002C84E8 7C 00 18 40 */ cmplw r0, r3 @@ -157,7 +157,7 @@ lbl_802CB580: /* 802CB5BC 002C84FC B0 1F 00 90 */ sth r0, 0x90(r31) /* 802CB5C0 002C8500 7F E3 FB 78 */ mr r3, r31 /* 802CB5C4 002C8504 88 9F 00 BA */ lbz r4, 0xba(r31) -/* 802CB5C8 002C8508 4B FF FD 59 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB5C8 002C8508 4B FF FD 59 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB5CC 002C850C 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB5D0 002C8510 B0 01 00 08 */ sth r0, 8(r1) /* 802CB5D4 002C8514 88 9F 00 BC */ lbz r4, 0xbc(r31) @@ -179,7 +179,7 @@ lbl_802CB5FC: /* 802CB610 002C8550 48 00 00 24 */ b lbl_802CB634 lbl_802CB614: /* 802CB614 002C8554 7F E3 FB 78 */ mr r3, r31 -/* 802CB618 002C8558 48 00 00 39 */ bl Z2WolfHowlMgr_NS_getOnLineNum +/* 802CB618 002C8558 48 00 00 39 */ bl getOnLineNum__13Z2WolfHowlMgrFv /* 802CB61C 002C855C 7C 60 07 74 */ extsb r0, r3 /* 802CB620 002C8560 2C 00 FF FF */ cmpwi r0, -1 /* 802CB624 002C8564 40 81 00 10 */ ble lbl_802CB634 diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB650.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB650.s index 275baa22a7..712e5dda3c 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB650.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB650.s @@ -4,7 +4,7 @@ /* 802CB65C 002C859C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802CB660 002C85A0 7C 7F 1B 78 */ mr r31, r3 /* 802CB664 002C85A4 88 83 00 BA */ lbz r4, 0xba(r3) -/* 802CB668 002C85A8 4B FF FC B9 */ bl Z2WolfHowlMgr_NS_getCorrectLine +/* 802CB668 002C85A8 4B FF FC B9 */ bl getCorrectLine__13Z2WolfHowlMgrFUc /* 802CB66C 002C85AC 54 60 84 3E */ srwi r0, r3, 0x10 /* 802CB670 002C85B0 B0 01 00 08 */ sth r0, 8(r1) /* 802CB674 002C85B4 88 01 00 08 */ lbz r0, 8(r1) diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB6EC.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB6EC.s index 607bfa6b06..06e5c5f39c 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB6EC.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB6EC.s @@ -101,7 +101,7 @@ lbl_802CB848: /* 802CB854 002C8794 80 7D 00 04 */ lwz r3, 4(r29) /* 802CB858 002C8798 28 03 00 00 */ cmplwi r3, 0 /* 802CB85C 002C879C 41 82 00 0C */ beq lbl_802CB868 -/* 802CB860 002C87A0 4B FD 6D 39 */ bl JAISound_NS_stop_X1_ +/* 802CB860 002C87A0 4B FD 6D 39 */ bl stop__8JAISoundFv /* 802CB864 002C87A4 48 00 00 54 */ b lbl_802CB8B8 lbl_802CB868: /* 802CB868 002C87A8 C0 02 C4 C0 */ lfs f0, lbl_80455EC0-_SDA2_BASE_(r2) @@ -138,7 +138,7 @@ lbl_802CB8B8: /* 802CB8E0 002C8820 D0 23 00 2C */ stfs f1, 0x2c(r3) /* 802CB8E4 002C8824 80 7D 00 04 */ lwz r3, 4(r29) /* 802CB8E8 002C8828 38 80 00 1E */ li r4, 0x1e -/* 802CB8EC 002C882C 4B FD 6B F1 */ bl JAISound_NS_stop +/* 802CB8EC 002C882C 4B FD 6B F1 */ bl stop__8JAISoundFUl /* 802CB8F0 002C8830 80 8D 8D E0 */ lwz r4, lbl_80451360-_SDA_BASE_(r13) /* 802CB8F4 002C8834 88 04 00 C0 */ lbz r0, 0xc0(r4) /* 802CB8F8 002C8838 28 00 00 01 */ cmplwi r0, 1 diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBA88.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBA88.s index 8dd8eccca8..237547f42d 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBA88.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBA88.s @@ -41,7 +41,7 @@ lbl_802CBAFC: /* 802CBB24 002C8A64 D0 23 00 2C */ stfs f1, 0x2c(r3) /* 802CBB28 002C8A68 80 7F 00 08 */ lwz r3, 8(r31) /* 802CBB2C 002C8A6C 38 80 00 1E */ li r4, 0x1e -/* 802CBB30 002C8A70 4B FD 69 AD */ bl JAISound_NS_stop +/* 802CBB30 002C8A70 4B FD 69 AD */ bl stop__8JAISoundFUl /* 802CBB34 002C8A74 80 7F 00 08 */ lwz r3, 8(r31) /* 802CBB38 002C8A78 80 63 00 38 */ lwz r3, 0x38(r3) /* 802CBB3C 002C8A7C 48 00 00 08 */ b lbl_802CBB44 diff --git a/include/d/d_a/d_a_alink/asm/func_800C12DC.s b/include/d/d_a/d_a_alink/asm/func_800C12DC.s index 2c29350747..ab96c0b083 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C12DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C12DC.s @@ -279,7 +279,7 @@ lbl_800C1630: /* 800C16D4 000BE614 80 7F 07 6C */ lwz r3, 0x76c(r31) /* 800C16D8 000BE618 28 03 00 00 */ cmplwi r3, 0 /* 800C16DC 000BE61C 41 82 00 10 */ beq lbl_800C16EC -/* 800C16E0 000BE620 48 1F C9 19 */ bl Z2SoundObjBase_NS_deleteObject +/* 800C16E0 000BE620 48 1F C9 19 */ bl deleteObject__14Z2SoundObjBaseFv /* 800C16E4 000BE624 38 00 00 00 */ li r0, 0 /* 800C16E8 000BE628 90 1F 07 6C */ stw r0, 0x76c(r31) lbl_800C16EC: diff --git a/include/d/d_a/d_a_alink/asm/func_800CD7AC.s b/include/d/d_a/d_a_alink/asm/func_800CD7AC.s index cba3ab9ea2..d11ebf3f08 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CD7AC.s +++ b/include/d/d_a/d_a_alink/asm/func_800CD7AC.s @@ -31,7 +31,7 @@ /* 800CD824 000CA764 80 7F 07 6C */ lwz r3, 0x76c(r31) /* 800CD828 000CA768 28 03 00 00 */ cmplwi r3, 0 /* 800CD82C 000CA76C 41 82 00 10 */ beq lbl_800CD83C -/* 800CD830 000CA770 48 1F 07 C9 */ bl Z2SoundObjBase_NS_deleteObject +/* 800CD830 000CA770 48 1F 07 C9 */ bl deleteObject__14Z2SoundObjBaseFv /* 800CD834 000CA774 38 00 00 00 */ li r0, 0 /* 800CD838 000CA778 90 1F 07 6C */ stw r0, 0x76c(r31) lbl_800CD83C: @@ -192,16 +192,16 @@ lbl_800CDA64: /* 800CDA68 000CA9A8 41 82 00 4C */ beq lbl_800CDAB4 /* 800CDA6C 000CA9AC 34 7F 2D 8C */ addic. r3, r31, 0x2d8c /* 800CDA70 000CA9B0 41 82 00 08 */ beq lbl_800CDA78 -/* 800CDA74 000CA9B4 48 1D 47 11 */ bl JAISoundHandle_NS_releaseSound +/* 800CDA74 000CA9B4 48 1D 47 11 */ bl releaseSound__14JAISoundHandleFv lbl_800CDA78: /* 800CDA78 000CA9B8 34 7F 2D 88 */ addic. r3, r31, 0x2d88 /* 800CDA7C 000CA9BC 41 82 00 08 */ beq lbl_800CDA84 -/* 800CDA80 000CA9C0 48 1D 47 05 */ bl JAISoundHandle_NS_releaseSound +/* 800CDA80 000CA9C0 48 1D 47 05 */ bl releaseSound__14JAISoundHandleFv lbl_800CDA84: /* 800CDA84 000CA9C4 34 1F 2D 84 */ addic. r0, r31, 0x2d84 /* 800CDA88 000CA9C8 41 82 00 0C */ beq lbl_800CDA94 /* 800CDA8C 000CA9CC 38 7F 2D 84 */ addi r3, r31, 0x2d84 -/* 800CDA90 000CA9D0 48 1D 46 F5 */ bl JAISoundHandle_NS_releaseSound +/* 800CDA90 000CA9D0 48 1D 46 F5 */ bl releaseSound__14JAISoundHandleFv lbl_800CDA94: /* 800CDA94 000CA9D4 34 1F 2D 84 */ addic. r0, r31, 0x2d84 /* 800CDA98 000CA9D8 41 82 00 1C */ beq lbl_800CDAB4 diff --git a/include/d/d_a/d_a_alink/asm/func_800CF380.s b/include/d/d_a/d_a_alink/asm/func_800CF380.s index aaa6bcc93d..1a14697d9c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CF380.s +++ b/include/d/d_a/d_a_alink/asm/func_800CF380.s @@ -487,7 +487,7 @@ /* 800CFA60 000CC9A0 38 7F 2C A8 */ addi r3, r31, 0x2ca8 /* 800CFA64 000CC9A4 48 1F 38 D9 */ bl __ct__14Z2CreatureLinkFv /* 800CFA68 000CC9A8 38 7F 2D 84 */ addi r3, r31, 0x2d84 -/* 800CFA6C 000CC9AC 48 1F B0 55 */ bl Z2WolfHowlMgr +/* 800CFA6C 000CC9AC 48 1F B0 55 */ bl __ct__13Z2WolfHowlMgrFv /* 800CFA70 000CC9B0 38 7F 2E 44 */ addi r3, r31, 0x2e44 /* 800CFA74 000CC9B4 4B F6 62 19 */ bl dJntCol_c /* 800CFA78 000CC9B8 3C 60 80 3B */ lis r3, lbl_803A8578@ha diff --git a/include/d/d_a/d_a_alink/asm/func_80130700.s b/include/d/d_a/d_a_alink/asm/func_80130700.s index f95ee6d000..b64dee3481 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130700.s +++ b/include/d/d_a/d_a_alink/asm/func_80130700.s @@ -142,7 +142,7 @@ lbl_801308D4: /* 80130914 0012D854 88 1F 04 99 */ lbz r0, 0x499(r31) /* 80130918 0012D858 54 04 06 7E */ clrlwi r4, r0, 0x19 /* 8013091C 0012D85C 38 A0 00 00 */ li r5, 0 -/* 80130920 0012D860 48 19 A7 E1 */ bl Z2WolfHowlMgr_NS_setCorrectData +/* 80130920 0012D860 48 19 A7 E1 */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData /* 80130924 0012D864 80 1F 00 B0 */ lwz r0, 0xb0(r31) /* 80130928 0012D868 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 8013092C 0012D86C B0 1E 30 12 */ sth r0, 0x3012(r30) @@ -169,7 +169,7 @@ lbl_8013096C: /* 80130978 0012D8B8 88 83 05 68 */ lbz r4, 0x568(r3) /* 8013097C 0012D8BC 38 7E 2D 84 */ addi r3, r30, 0x2d84 /* 80130980 0012D8C0 38 A0 00 00 */ li r5, 0 -/* 80130984 0012D8C4 48 19 A7 7D */ bl Z2WolfHowlMgr_NS_setCorrectData +/* 80130984 0012D8C4 48 19 A7 7D */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData /* 80130988 0012D8C8 48 00 00 B4 */ b lbl_80130A3C lbl_8013098C: /* 8013098C 0012D8CC 2C 00 01 8A */ cmpwi r0, 0x18a @@ -180,7 +180,7 @@ lbl_8013098C: /* 801309A0 0012D8E0 7C 04 07 74 */ extsb r4, r0 /* 801309A4 0012D8E4 38 7E 2D 84 */ addi r3, r30, 0x2d84 /* 801309A8 0012D8E8 38 A0 00 00 */ li r5, 0 -/* 801309AC 0012D8EC 48 19 A7 55 */ bl Z2WolfHowlMgr_NS_setCorrectData +/* 801309AC 0012D8EC 48 19 A7 55 */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData /* 801309B0 0012D8F0 80 7E 27 F4 */ lwz r3, 0x27f4(r30) /* 801309B4 0012D8F4 80 03 00 B0 */ lwz r0, 0xb0(r3) /* 801309B8 0012D8F8 54 00 07 3E */ clrlwi r0, r0, 0x1c @@ -194,7 +194,7 @@ lbl_801309CC: /* 801309D4 0012D914 38 7E 2D 84 */ addi r3, r30, 0x2d84 /* 801309D8 0012D918 38 80 00 02 */ li r4, 2 /* 801309DC 0012D91C 38 A0 00 00 */ li r5, 0 -/* 801309E0 0012D920 48 19 A7 21 */ bl Z2WolfHowlMgr_NS_setCorrectData +/* 801309E0 0012D920 48 19 A7 21 */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData /* 801309E4 0012D924 38 00 00 01 */ li r0, 1 /* 801309E8 0012D928 B0 1E 30 10 */ sth r0, 0x3010(r30) /* 801309EC 0012D92C 48 00 00 50 */ b lbl_80130A3C @@ -207,19 +207,19 @@ lbl_801309F0: /* 80130A04 0012D944 7C 04 07 74 */ extsb r4, r0 /* 80130A08 0012D948 38 7E 2D 84 */ addi r3, r30, 0x2d84 /* 80130A0C 0012D94C 38 A0 00 00 */ li r5, 0 -/* 80130A10 0012D950 48 19 A6 F1 */ bl Z2WolfHowlMgr_NS_setCorrectData +/* 80130A10 0012D950 48 19 A6 F1 */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData /* 80130A14 0012D954 48 00 00 28 */ b lbl_80130A3C lbl_80130A18: /* 80130A18 0012D958 38 7E 2D 84 */ addi r3, r30, 0x2d84 /* 80130A1C 0012D95C 38 80 FF FF */ li r4, -1 /* 80130A20 0012D960 38 A0 00 00 */ li r5, 0 -/* 80130A24 0012D964 48 19 A6 DD */ bl Z2WolfHowlMgr_NS_setCorrectData +/* 80130A24 0012D964 48 19 A6 DD */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData /* 80130A28 0012D968 48 00 00 14 */ b lbl_80130A3C lbl_80130A2C: /* 80130A2C 0012D96C 38 7E 2D 84 */ addi r3, r30, 0x2d84 /* 80130A30 0012D970 38 80 FF FF */ li r4, -1 /* 80130A34 0012D974 38 A0 00 00 */ li r5, 0 -/* 80130A38 0012D978 48 19 A6 C9 */ bl Z2WolfHowlMgr_NS_setCorrectData +/* 80130A38 0012D978 48 19 A6 C9 */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData lbl_80130A3C: /* 80130A3C 0012D97C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80130A40 0012D980 D0 1E 33 98 */ stfs f0, 0x3398(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80130BC4.s b/include/d/d_a/d_a_alink/asm/func_80130BC4.s index 8e4eda04bb..ce64ddcf5a 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130BC4.s +++ b/include/d/d_a/d_a_alink/asm/func_80130BC4.s @@ -18,7 +18,7 @@ /* 80130C08 0012DB48 54 1B 06 3F */ clrlwi. r27, r0, 0x18 /* 80130C0C 0012DB4C 41 82 00 0C */ beq lbl_80130C18 /* 80130C10 0012DB50 38 7F 2D 84 */ addi r3, r31, 0x2d84 -/* 80130C14 0012DB54 48 19 AF 45 */ bl Z2WolfHowlMgr_NS_skipCorrectDemo +/* 80130C14 0012DB54 48 19 AF 45 */ bl skipCorrectDemo__13Z2WolfHowlMgrFv lbl_80130C18: /* 80130C18 0012DB58 7F E3 FB 78 */ mr r3, r31 /* 80130C1C 0012DB5C 80 9F 32 CC */ lwz r4, 0x32cc(r31) @@ -260,7 +260,7 @@ lbl_80130F50: /* 80130F68 0012DEA8 FC 40 F8 90 */ fmr f2, f31 /* 80130F6C 0012DEAC 7F 44 D3 78 */ mr r4, r26 /* 80130F70 0012DEB0 FC 60 08 90 */ fmr f3, f1 -/* 80130F74 0012DEB4 48 19 9F 61 */ bl Z2WolfHowlMgr_NS_startWolfHowlSound +/* 80130F74 0012DEB4 48 19 9F 61 */ bl startWolfHowlSound__13Z2WolfHowlMgrFffbf /* 80130F78 0012DEB8 7C 60 07 74 */ extsb r0, r3 /* 80130F7C 0012DEBC B0 1F 30 0E */ sth r0, 0x300e(r31) /* 80130F80 0012DEC0 3B 40 00 00 */ li r26, 0 diff --git a/include/d/d_item/d_item/asm/func_80097E8C.s b/include/d/d_item/d_item/asm/func_80097E8C.s deleted file mode 100644 index fdf96800f0..0000000000 --- a/include/d/d_item/d_item/asm/func_80097E8C.s +++ /dev/null @@ -1,21 +0,0 @@ -/* 80097E8C 00094DCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80097E90 00094DD0 7C 08 02 A6 */ mflr r0 -/* 80097E94 00094DD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80097E98 00094DD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80097E9C 00094DDC 7C 7F 1B 78 */ mr r31, r3 -/* 80097EA0 00094DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80097EA4 00094DE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80097EA8 00094DE8 38 63 00 CC */ addi r3, r3, 0xcc -/* 80097EAC 00094DEC 7F E4 FB 78 */ mr r4, r31 -/* 80097EB0 00094DF0 4B F9 BF B1 */ bl onFirstBit__21dSv_player_get_item_cFUc -/* 80097EB4 00094DF4 57 E0 15 BA */ rlwinm r0, r31, 2, 0x16, 0x1d -/* 80097EB8 00094DF8 3C 60 80 3B */ lis r3, item_func_ptr@ha -/* 80097EBC 00094DFC 38 63 F1 78 */ addi r3, r3, item_func_ptr@l -/* 80097EC0 00094E00 7D 83 00 2E */ lwzx r12, r3, r0 -/* 80097EC4 00094E04 7D 89 03 A6 */ mtctr r12 -/* 80097EC8 00094E08 4E 80 04 21 */ bctrl -/* 80097ECC 00094E0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80097ED0 00094E10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80097ED4 00094E14 7C 08 03 A6 */ mtlr r0 -/* 80097ED8 00094E18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80097EDC 00094E1C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80097EE0.s b/include/d/d_item/d_item/asm/func_80097EE0.s deleted file mode 100644 index 3cf5b0aa85..0000000000 --- a/include/d/d_item/d_item/asm/func_80097EE0.s +++ /dev/null @@ -1,20 +0,0 @@ -/* 80097EE0 00094E20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80097EE4 00094E24 7C 08 02 A6 */ mflr r0 -/* 80097EE8 00094E28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80097EEC 00094E2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80097EF0 00094E30 7C 9F 23 78 */ mr r31, r4 -/* 80097EF4 00094E34 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 80097EF8 00094E38 3C 60 80 3B */ lis r3, item_getcheck_func_ptr@ha -/* 80097EFC 00094E3C 38 63 F5 78 */ addi r3, r3, item_getcheck_func_ptr@l -/* 80097F00 00094E40 7D 83 00 2E */ lwzx r12, r3, r0 -/* 80097F04 00094E44 7D 89 03 A6 */ mtctr r12 -/* 80097F08 00094E48 4E 80 04 21 */ bctrl -/* 80097F0C 00094E4C 2C 03 FF FF */ cmpwi r3, -1 -/* 80097F10 00094E50 40 82 00 08 */ bne lbl_80097F18 -/* 80097F14 00094E54 7F E3 FB 78 */ mr r3, r31 -lbl_80097F18: -/* 80097F18 00094E58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80097F1C 00094E5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80097F20 00094E60 7C 08 03 A6 */ mtlr r0 -/* 80097F24 00094E64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80097F28 00094E68 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099C20.s b/include/d/d_item/d_item/asm/func_80099C20.s deleted file mode 100644 index e1cd52aaea..0000000000 --- a/include/d/d_item/d_item/asm/func_80099C20.s +++ /dev/null @@ -1,17 +0,0 @@ -/* 80099C20 00096B60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099C24 00096B64 7C 08 02 A6 */ mflr r0 -/* 80099C28 00096B68 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099C2C 00096B6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80099C30 00096B70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80099C34 00096B74 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099C38 00096B78 38 80 00 12 */ li r4, 0x12 -/* 80099C3C 00096B7C 38 A0 00 01 */ li r5, 1 -/* 80099C40 00096B80 4B F9 93 F1 */ bl getItem__17dSv_player_item_cCFib -/* 80099C44 00096B84 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099C48 00096B88 20 00 00 2D */ subfic r0, r0, 0x2d -/* 80099C4C 00096B8C 7C 00 00 34 */ cntlzw r0, r0 -/* 80099C50 00096B90 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099C54 00096B94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099C58 00096B98 7C 08 03 A6 */ mtlr r0 -/* 80099C5C 00096B9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099C60 00096BA0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/CSTControl_NS_getAngleStick.s b/include/d/d_lib/asm/CSTControl_NS_getAngleStick.s deleted file mode 100644 index 7a1506f518..0000000000 --- a/include/d/d_lib/asm/CSTControl_NS_getAngleStick.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 8003218C 0002F0CC 3C 60 80 3E */ lis r3, m_gamePad@ha -/* 80032190 0002F0D0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l -/* 80032194 0002F0D4 A8 63 00 1C */ lha r3, 0x1c(r3) -/* 80032198 0002F0D8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/CSTControl_NS_getValueStick.s b/include/d/d_lib/asm/CSTControl_NS_getValueStick.s deleted file mode 100644 index 527d15f68e..0000000000 --- a/include/d/d_lib/asm/CSTControl_NS_getValueStick.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 8003217C 0002F0BC 3C 60 80 3E */ lis r3, m_gamePad@ha -/* 80032180 0002F0C0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l -/* 80032184 0002F0C4 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80032188 0002F0C8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl.s b/include/d/d_lib/asm/STControl.s deleted file mode 100644 index da4ddb2070..0000000000 --- a/include/d/d_lib/asm/STControl.s +++ /dev/null @@ -1,17 +0,0 @@ -/* 80032044 0002EF84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032048 0002EF88 7C 08 02 A6 */ mflr r0 -/* 8003204C 0002EF8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032050 0002EF90 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80032054 0002EF94 7C 7F 1B 78 */ mr r31, r3 -/* 80032058 0002EF98 3D 40 80 3A */ lis r10, lbl_803A7260@ha -/* 8003205C 0002EF9C 38 0A 72 60 */ addi r0, r10, lbl_803A7260@l -/* 80032060 0002EFA0 90 03 00 00 */ stw r0, 0(r3) -/* 80032064 0002EFA4 48 00 00 25 */ bl setWaitParm__9STControlFssssffss -/* 80032068 0002EFA8 7F E3 FB 78 */ mr r3, r31 -/* 8003206C 0002EFAC 48 00 00 41 */ bl init__9STControlFv -/* 80032070 0002EFB0 7F E3 FB 78 */ mr r3, r31 -/* 80032074 0002EFB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80032078 0002EFB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003207C 0002EFBC 7C 08 03 A6 */ mtlr r0 -/* 80032080 0002EFC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032084 0002EFC4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_Xinit.s b/include/d/d_lib/asm/STControl_NS_Xinit.s deleted file mode 100644 index e3ad6d6a0d..0000000000 --- a/include/d/d_lib/asm/STControl_NS_Xinit.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 800320FC 0002F03C 38 00 00 00 */ li r0, 0 -/* 80032100 0002F040 B0 03 00 0E */ sth r0, 0xe(r3) -/* 80032104 0002F044 88 03 00 0C */ lbz r0, 0xc(r3) -/* 80032108 0002F048 54 00 06 3A */ rlwinm r0, r0, 0, 0x18, 0x1d -/* 8003210C 0002F04C 98 03 00 0C */ stb r0, 0xc(r3) -/* 80032110 0002F050 A8 03 00 12 */ lha r0, 0x12(r3) -/* 80032114 0002F054 B0 03 00 18 */ sth r0, 0x18(r3) -/* 80032118 0002F058 A8 03 00 1C */ lha r0, 0x1c(r3) -/* 8003211C 0002F05C B0 03 00 1E */ sth r0, 0x1e(r3) -/* 80032120 0002F060 A8 03 00 28 */ lha r0, 0x28(r3) -/* 80032124 0002F064 B0 03 00 2A */ sth r0, 0x2a(r3) -/* 80032128 0002F068 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_checkDownTrigger.s b/include/d/d_lib/asm/STControl_NS_checkDownTrigger.s deleted file mode 100644 index 110f1ecc0b..0000000000 --- a/include/d/d_lib/asm/STControl_NS_checkDownTrigger.s +++ /dev/null @@ -1,34 +0,0 @@ -/* 800325A0 0002F4E0 A8 03 00 10 */ lha r0, 0x10(r3) -/* 800325A4 0002F4E4 2C 00 00 00 */ cmpwi r0, 0 -/* 800325A8 0002F4E8 40 82 00 6C */ bne lbl_80032614 -/* 800325AC 0002F4EC 88 03 00 0C */ lbz r0, 0xc(r3) -/* 800325B0 0002F4F0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 800325B4 0002F4F4 41 82 00 60 */ beq lbl_80032614 -/* 800325B8 0002F4F8 A8 83 00 1A */ lha r4, 0x1a(r3) -/* 800325BC 0002F4FC A8 03 00 2C */ lha r0, 0x2c(r3) -/* 800325C0 0002F500 7C 04 02 14 */ add r0, r4, r0 -/* 800325C4 0002F504 B0 03 00 10 */ sth r0, 0x10(r3) -/* 800325C8 0002F508 38 00 00 00 */ li r0, 0 -/* 800325CC 0002F50C B0 03 00 2C */ sth r0, 0x2c(r3) -/* 800325D0 0002F510 A8 83 00 20 */ lha r4, 0x20(r3) -/* 800325D4 0002F514 2C 04 00 00 */ cmpwi r4, 0 -/* 800325D8 0002F518 40 82 00 2C */ bne lbl_80032604 -/* 800325DC 0002F51C A8 83 00 16 */ lha r4, 0x16(r3) -/* 800325E0 0002F520 A8 03 00 1A */ lha r0, 0x1a(r3) -/* 800325E4 0002F524 7C 04 00 50 */ subf r0, r4, r0 -/* 800325E8 0002F528 B0 03 00 1A */ sth r0, 0x1a(r3) -/* 800325EC 0002F52C A8 03 00 1A */ lha r0, 0x1a(r3) -/* 800325F0 0002F530 A8 83 00 14 */ lha r4, 0x14(r3) -/* 800325F4 0002F534 7C 00 20 00 */ cmpw r0, r4 -/* 800325F8 0002F538 40 80 00 14 */ bge lbl_8003260C -/* 800325FC 0002F53C B0 83 00 1A */ sth r4, 0x1a(r3) -/* 80032600 0002F540 48 00 00 0C */ b lbl_8003260C -lbl_80032604: -/* 80032604 0002F544 38 04 FF FF */ addi r0, r4, -1 -/* 80032608 0002F548 B0 03 00 20 */ sth r0, 0x20(r3) -lbl_8003260C: -/* 8003260C 0002F54C 38 60 00 01 */ li r3, 1 -/* 80032610 0002F550 4E 80 00 20 */ blr -lbl_80032614: -/* 80032614 0002F554 38 60 00 00 */ li r3, 0 -/* 80032618 0002F558 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_checkLeftTrigger.s b/include/d/d_lib/asm/STControl_NS_checkLeftTrigger.s deleted file mode 100644 index 01d2b61a62..0000000000 --- a/include/d/d_lib/asm/STControl_NS_checkLeftTrigger.s +++ /dev/null @@ -1,34 +0,0 @@ -/* 8003242C 0002F36C A8 03 00 0E */ lha r0, 0xe(r3) -/* 80032430 0002F370 2C 00 00 00 */ cmpwi r0, 0 -/* 80032434 0002F374 40 82 00 6C */ bne lbl_800324A0 -/* 80032438 0002F378 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8003243C 0002F37C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80032440 0002F380 41 82 00 60 */ beq lbl_800324A0 -/* 80032444 0002F384 A8 83 00 18 */ lha r4, 0x18(r3) -/* 80032448 0002F388 A8 03 00 2A */ lha r0, 0x2a(r3) -/* 8003244C 0002F38C 7C 04 02 14 */ add r0, r4, r0 -/* 80032450 0002F390 B0 03 00 0E */ sth r0, 0xe(r3) -/* 80032454 0002F394 38 00 00 00 */ li r0, 0 -/* 80032458 0002F398 B0 03 00 2A */ sth r0, 0x2a(r3) -/* 8003245C 0002F39C A8 83 00 1E */ lha r4, 0x1e(r3) -/* 80032460 0002F3A0 2C 04 00 00 */ cmpwi r4, 0 -/* 80032464 0002F3A4 40 82 00 2C */ bne lbl_80032490 -/* 80032468 0002F3A8 A8 83 00 16 */ lha r4, 0x16(r3) -/* 8003246C 0002F3AC A8 03 00 18 */ lha r0, 0x18(r3) -/* 80032470 0002F3B0 7C 04 00 50 */ subf r0, r4, r0 -/* 80032474 0002F3B4 B0 03 00 18 */ sth r0, 0x18(r3) -/* 80032478 0002F3B8 A8 03 00 18 */ lha r0, 0x18(r3) -/* 8003247C 0002F3BC A8 83 00 14 */ lha r4, 0x14(r3) -/* 80032480 0002F3C0 7C 00 20 00 */ cmpw r0, r4 -/* 80032484 0002F3C4 40 80 00 14 */ bge lbl_80032498 -/* 80032488 0002F3C8 B0 83 00 18 */ sth r4, 0x18(r3) -/* 8003248C 0002F3CC 48 00 00 0C */ b lbl_80032498 -lbl_80032490: -/* 80032490 0002F3D0 38 04 FF FF */ addi r0, r4, -1 -/* 80032494 0002F3D4 B0 03 00 1E */ sth r0, 0x1e(r3) -lbl_80032498: -/* 80032498 0002F3D8 38 60 00 01 */ li r3, 1 -/* 8003249C 0002F3DC 4E 80 00 20 */ blr -lbl_800324A0: -/* 800324A0 0002F3E0 38 60 00 00 */ li r3, 0 -/* 800324A4 0002F3E4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_checkRightTrigger.s b/include/d/d_lib/asm/STControl_NS_checkRightTrigger.s deleted file mode 100644 index 6858638e72..0000000000 --- a/include/d/d_lib/asm/STControl_NS_checkRightTrigger.s +++ /dev/null @@ -1,34 +0,0 @@ -/* 800324A8 0002F3E8 A8 03 00 0E */ lha r0, 0xe(r3) -/* 800324AC 0002F3EC 2C 00 00 00 */ cmpwi r0, 0 -/* 800324B0 0002F3F0 40 82 00 6C */ bne lbl_8003251C -/* 800324B4 0002F3F4 88 03 00 0C */ lbz r0, 0xc(r3) -/* 800324B8 0002F3F8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800324BC 0002F3FC 41 82 00 60 */ beq lbl_8003251C -/* 800324C0 0002F400 A8 83 00 18 */ lha r4, 0x18(r3) -/* 800324C4 0002F404 A8 03 00 2A */ lha r0, 0x2a(r3) -/* 800324C8 0002F408 7C 04 02 14 */ add r0, r4, r0 -/* 800324CC 0002F40C B0 03 00 0E */ sth r0, 0xe(r3) -/* 800324D0 0002F410 38 00 00 00 */ li r0, 0 -/* 800324D4 0002F414 B0 03 00 2A */ sth r0, 0x2a(r3) -/* 800324D8 0002F418 A8 83 00 1E */ lha r4, 0x1e(r3) -/* 800324DC 0002F41C 2C 04 00 00 */ cmpwi r4, 0 -/* 800324E0 0002F420 40 82 00 2C */ bne lbl_8003250C -/* 800324E4 0002F424 A8 83 00 16 */ lha r4, 0x16(r3) -/* 800324E8 0002F428 A8 03 00 18 */ lha r0, 0x18(r3) -/* 800324EC 0002F42C 7C 04 00 50 */ subf r0, r4, r0 -/* 800324F0 0002F430 B0 03 00 18 */ sth r0, 0x18(r3) -/* 800324F4 0002F434 A8 03 00 18 */ lha r0, 0x18(r3) -/* 800324F8 0002F438 A8 83 00 14 */ lha r4, 0x14(r3) -/* 800324FC 0002F43C 7C 00 20 00 */ cmpw r0, r4 -/* 80032500 0002F440 40 80 00 14 */ bge lbl_80032514 -/* 80032504 0002F444 B0 83 00 18 */ sth r4, 0x18(r3) -/* 80032508 0002F448 48 00 00 0C */ b lbl_80032514 -lbl_8003250C: -/* 8003250C 0002F44C 38 04 FF FF */ addi r0, r4, -1 -/* 80032510 0002F450 B0 03 00 1E */ sth r0, 0x1e(r3) -lbl_80032514: -/* 80032514 0002F454 38 60 00 01 */ li r3, 1 -/* 80032518 0002F458 4E 80 00 20 */ blr -lbl_8003251C: -/* 8003251C 0002F45C 38 60 00 00 */ li r3, 0 -/* 80032520 0002F460 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_checkUpTrigger.s b/include/d/d_lib/asm/STControl_NS_checkUpTrigger.s deleted file mode 100644 index a2e54e44b6..0000000000 --- a/include/d/d_lib/asm/STControl_NS_checkUpTrigger.s +++ /dev/null @@ -1,34 +0,0 @@ -/* 80032524 0002F464 A8 03 00 10 */ lha r0, 0x10(r3) -/* 80032528 0002F468 2C 00 00 00 */ cmpwi r0, 0 -/* 8003252C 0002F46C 40 82 00 6C */ bne lbl_80032598 -/* 80032530 0002F470 88 03 00 0C */ lbz r0, 0xc(r3) -/* 80032534 0002F474 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 80032538 0002F478 41 82 00 60 */ beq lbl_80032598 -/* 8003253C 0002F47C A8 83 00 1A */ lha r4, 0x1a(r3) -/* 80032540 0002F480 A8 03 00 2C */ lha r0, 0x2c(r3) -/* 80032544 0002F484 7C 04 02 14 */ add r0, r4, r0 -/* 80032548 0002F488 B0 03 00 10 */ sth r0, 0x10(r3) -/* 8003254C 0002F48C 38 00 00 00 */ li r0, 0 -/* 80032550 0002F490 B0 03 00 2C */ sth r0, 0x2c(r3) -/* 80032554 0002F494 A8 83 00 20 */ lha r4, 0x20(r3) -/* 80032558 0002F498 2C 04 00 00 */ cmpwi r4, 0 -/* 8003255C 0002F49C 40 82 00 2C */ bne lbl_80032588 -/* 80032560 0002F4A0 A8 83 00 16 */ lha r4, 0x16(r3) -/* 80032564 0002F4A4 A8 03 00 1A */ lha r0, 0x1a(r3) -/* 80032568 0002F4A8 7C 04 00 50 */ subf r0, r4, r0 -/* 8003256C 0002F4AC B0 03 00 1A */ sth r0, 0x1a(r3) -/* 80032570 0002F4B0 A8 03 00 1A */ lha r0, 0x1a(r3) -/* 80032574 0002F4B4 A8 83 00 14 */ lha r4, 0x14(r3) -/* 80032578 0002F4B8 7C 00 20 00 */ cmpw r0, r4 -/* 8003257C 0002F4BC 40 80 00 14 */ bge lbl_80032590 -/* 80032580 0002F4C0 B0 83 00 1A */ sth r4, 0x1a(r3) -/* 80032584 0002F4C4 48 00 00 0C */ b lbl_80032590 -lbl_80032588: -/* 80032588 0002F4C8 38 04 FF FF */ addi r0, r4, -1 -/* 8003258C 0002F4CC B0 03 00 20 */ sth r0, 0x20(r3) -lbl_80032590: -/* 80032590 0002F4D0 38 60 00 01 */ li r3, 1 -/* 80032594 0002F4D4 4E 80 00 20 */ blr -lbl_80032598: -/* 80032598 0002F4D8 38 60 00 00 */ li r3, 0 -/* 8003259C 0002F4DC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_init.s b/include/d/d_lib/asm/STControl_NS_init.s deleted file mode 100644 index 641a7e2008..0000000000 --- a/include/d/d_lib/asm/STControl_NS_init.s +++ /dev/null @@ -1,20 +0,0 @@ -/* 800320AC 0002EFEC 38 80 00 00 */ li r4, 0 -/* 800320B0 0002EFF0 B0 83 00 0E */ sth r4, 0xe(r3) -/* 800320B4 0002EFF4 B0 83 00 10 */ sth r4, 0x10(r3) -/* 800320B8 0002EFF8 98 83 00 0D */ stb r4, 0xd(r3) -/* 800320BC 0002EFFC 98 83 00 0C */ stb r4, 0xc(r3) -/* 800320C0 0002F000 B0 83 00 22 */ sth r4, 0x22(r3) -/* 800320C4 0002F004 A8 03 00 12 */ lha r0, 0x12(r3) -/* 800320C8 0002F008 B0 03 00 18 */ sth r0, 0x18(r3) -/* 800320CC 0002F00C A8 03 00 12 */ lha r0, 0x12(r3) -/* 800320D0 0002F010 B0 03 00 1A */ sth r0, 0x1a(r3) -/* 800320D4 0002F014 A8 03 00 1C */ lha r0, 0x1c(r3) -/* 800320D8 0002F018 B0 03 00 1E */ sth r0, 0x1e(r3) -/* 800320DC 0002F01C A8 03 00 1C */ lha r0, 0x1c(r3) -/* 800320E0 0002F020 B0 03 00 20 */ sth r0, 0x20(r3) -/* 800320E4 0002F024 B0 83 00 28 */ sth r4, 0x28(r3) -/* 800320E8 0002F028 A8 03 00 28 */ lha r0, 0x28(r3) -/* 800320EC 0002F02C B0 03 00 2A */ sth r0, 0x2a(r3) -/* 800320F0 0002F030 A8 03 00 28 */ lha r0, 0x28(r3) -/* 800320F4 0002F034 B0 03 00 2C */ sth r0, 0x2c(r3) -/* 800320F8 0002F038 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_setWaitParm.s b/include/d/d_lib/asm/STControl_NS_setWaitParm.s deleted file mode 100644 index c006236ce0..0000000000 --- a/include/d/d_lib/asm/STControl_NS_setWaitParm.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 80032088 0002EFC8 B0 83 00 12 */ sth r4, 0x12(r3) -/* 8003208C 0002EFCC B0 A3 00 14 */ sth r5, 0x14(r3) -/* 80032090 0002EFD0 B0 C3 00 16 */ sth r6, 0x16(r3) -/* 80032094 0002EFD4 B0 E3 00 1C */ sth r7, 0x1c(r3) -/* 80032098 0002EFD8 D0 23 00 04 */ stfs f1, 4(r3) -/* 8003209C 0002EFDC D0 43 00 08 */ stfs f2, 8(r3) -/* 800320A0 0002EFE0 B1 03 00 24 */ sth r8, 0x24(r3) -/* 800320A4 0002EFE4 B1 23 00 26 */ sth r9, 0x26(r3) -/* 800320A8 0002EFE8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/getAngleStick.s b/include/d/d_lib/asm/getAngleStick.s deleted file mode 100644 index 0d172af985..0000000000 --- a/include/d/d_lib/asm/getAngleStick.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 8003216C 0002F0AC 3C 60 80 3E */ lis r3, m_gamePad@ha -/* 80032170 0002F0B0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l -/* 80032174 0002F0B4 A8 63 00 0C */ lha r3, 0xc(r3) -/* 80032178 0002F0B8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/getValueStick.s b/include/d/d_lib/asm/getValueStick.s deleted file mode 100644 index 9e3a2744f4..0000000000 --- a/include/d/d_lib/asm/getValueStick.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 8003215C 0002F09C 3C 60 80 3E */ lis r3, m_gamePad@ha -/* 80032160 0002F0A0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l -/* 80032164 0002F0A4 C0 23 00 08 */ lfs f1, 8(r3) -/* 80032168 0002F0A8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_8000585C.s b/include/d/d_save/d_save/asm/func_8000585C.s deleted file mode 100644 index 2e0399c686..0000000000 --- a/include/d/d_save/d_save/asm/func_8000585C.s +++ /dev/null @@ -1,24 +0,0 @@ -/* 80005848 00002788 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8000584C 0000278C 7C 08 02 A6 */ mflr r0 -/* 80005850 00002790 90 01 00 14 */ stw r0, 0x14(r1) -/* 80005854 00002794 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80005858 00002798 93 C1 00 08 */ stw r30, 8(r1) -/* 8000585C 0000279C 7C 7E 1B 78 */ mr r30, r3 -/* 80005860 000027A0 48 33 B4 65 */ bl OSDisableScheduler -/* 80005864 000027A4 3B E0 00 00 */ li r31, 0 -/* 80005868 000027A8 80 7E 00 80 */ lwz r3, 0x80(r30) -/* 8000586C 000027AC 48 00 00 0C */ b lbl_80005878 -lbl_80005870: -/* 80005870 000027B0 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80005874 000027B4 3B FF 00 01 */ addi r31, r31, 1 -lbl_80005878: -/* 80005878 000027B8 28 03 00 00 */ cmplwi r3, 0 -/* 8000587C 000027BC 40 82 FF F4 */ bne lbl_80005870 -/* 80005880 000027C0 48 33 B4 85 */ bl OSEnableScheduler -/* 80005884 000027C4 7F E3 FB 78 */ mr r3, r31 -/* 80005888 000027C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8000588C 000027CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80005890 000027D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80005894 000027D4 7C 08 03 A6 */ mtlr r0 -/* 80005898 000027D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000589C 000027DC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80032AF8.s b/include/d/d_save/d_save/asm/func_80032AF8.s deleted file mode 100644 index 936bac4d23..0000000000 --- a/include/d/d_save/d_save/asm/func_80032AF8.s +++ /dev/null @@ -1,24 +0,0 @@ -/* 80032AF8 0002FA38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032AFC 0002FA3C 7C 08 02 A6 */ mflr r0 -/* 80032B00 0002FA40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032B04 0002FA44 54 84 06 3F */ clrlwi. r4, r4, 0x18 -/* 80032B08 0002FA48 40 82 00 1C */ bne lbl_80032B24 -/* 80032B0C 0002FA4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80032B10 0002FA50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80032B14 0002FA54 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80032B18 0002FA58 38 80 23 04 */ li r4, 0x2304 -/* 80032B1C 0002FA5C 48 00 1E A1 */ bl isEventBit__11dSv_event_cCFUs -/* 80032B20 0002FA60 48 00 00 20 */ b lbl_80032B40 -lbl_80032B24: -/* 80032B24 0002FA64 88 63 00 1C */ lbz r3, 0x1c(r3) -/* 80032B28 0002FA68 38 00 00 01 */ li r0, 1 -/* 80032B2C 0002FA6C 7C 00 20 30 */ slw r0, r0, r4 -/* 80032B30 0002FA70 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032B34 0002FA74 7C 63 00 38 */ and r3, r3, r0 -/* 80032B38 0002FA78 30 03 FF FF */ addic r0, r3, -1 -/* 80032B3C 0002FA7C 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80032B40: -/* 80032B40 0002FA80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032B44 0002FA84 7C 08 03 A6 */ mtlr r0 -/* 80032B48 0002FA88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032B4C 0002FA8C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80032BB0.s b/include/d/d_save/d_save/asm/func_80032BB0.s deleted file mode 100644 index b81907fd09..0000000000 --- a/include/d/d_save/d_save/asm/func_80032BB0.s +++ /dev/null @@ -1,8 +0,0 @@ -/* 80032BB0 0002FAF0 88 63 00 09 */ lbz r3, 9(r3) -/* 80032BB4 0002FAF4 38 00 00 01 */ li r0, 1 -/* 80032BB8 0002FAF8 7C 00 20 30 */ slw r0, r0, r4 -/* 80032BBC 0002FAFC 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032BC0 0002FB00 7C 63 00 38 */ and r3, r3, r0 -/* 80032BC4 0002FB04 30 03 FF FF */ addic r0, r3, -1 -/* 80032BC8 0002FB08 7C 60 19 10 */ subfe r3, r0, r3 -/* 80032BCC 0002FB0C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80032BEC.s b/include/d/d_save/d_save/asm/func_80032BEC.s deleted file mode 100644 index f2d8144ee9..0000000000 --- a/include/d/d_save/d_save/asm/func_80032BEC.s +++ /dev/null @@ -1,8 +0,0 @@ -/* 80032BEC 0002FB2C 88 63 00 08 */ lbz r3, 8(r3) -/* 80032BF0 0002FB30 38 00 00 01 */ li r0, 1 -/* 80032BF4 0002FB34 7C 00 20 30 */ slw r0, r0, r4 -/* 80032BF8 0002FB38 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032BFC 0002FB3C 7C 63 00 38 */ and r3, r3, r0 -/* 80032C00 0002FB40 30 03 FF FF */ addic r0, r3, -1 -/* 80032C04 0002FB44 7C 60 19 10 */ subfe r3, r0, r3 -/* 80032C08 0002FB48 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80032CC8.s b/include/d/d_save/d_save/asm/func_80032CC8.s deleted file mode 100644 index 036f906215..0000000000 --- a/include/d/d_save/d_save/asm/func_80032CC8.s +++ /dev/null @@ -1,21 +0,0 @@ -/* 80032CC8 0002FC08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032CCC 0002FC0C 7C 08 02 A6 */ mflr r0 -/* 80032CD0 0002FC10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032CD4 0002FC14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80032CD8 0002FC18 7C 7F 1B 78 */ mr r31, r3 -/* 80032CDC 0002FC1C 3C 80 80 38 */ lis r4, lbl_80379234@ha -/* 80032CE0 0002FC20 38 84 92 34 */ addi r4, r4, lbl_80379234@l -/* 80032CE4 0002FC24 38 84 00 01 */ addi r4, r4, 1 -/* 80032CE8 0002FC28 48 33 5E 45 */ bl strcpy -/* 80032CEC 0002FC2C 38 00 00 01 */ li r0, 1 -/* 80032CF0 0002FC30 98 1F 00 09 */ stb r0, 9(r31) -/* 80032CF4 0002FC34 38 60 00 00 */ li r3, 0 -/* 80032CF8 0002FC38 98 7F 00 08 */ stb r3, 8(r31) -/* 80032CFC 0002FC3C 38 00 00 15 */ li r0, 0x15 -/* 80032D00 0002FC40 98 1F 00 0A */ stb r0, 0xa(r31) -/* 80032D04 0002FC44 98 7F 00 0B */ stb r3, 0xb(r31) -/* 80032D08 0002FC48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80032D0C 0002FC4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032D10 0002FC50 7C 08 03 A6 */ mtlr r0 -/* 80032D14 0002FC54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032D18 0002FC58 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80032D1C.s b/include/d/d_save/d_save/asm/func_80032D1C.s deleted file mode 100644 index 66193e9037..0000000000 --- a/include/d/d_save/d_save/asm/func_80032D1C.s +++ /dev/null @@ -1,17 +0,0 @@ -/* 80032D1C 0002FC5C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80032D20 0002FC60 7C 08 02 A6 */ mflr r0 -/* 80032D24 0002FC64 90 01 00 24 */ stw r0, 0x24(r1) -/* 80032D28 0002FC68 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032D2C 0002FC6C 48 32 F4 B1 */ bl _savegpr_29 -/* 80032D30 0002FC70 7C 7D 1B 78 */ mr r29, r3 -/* 80032D34 0002FC74 7C BE 2B 78 */ mr r30, r5 -/* 80032D38 0002FC78 7C DF 33 78 */ mr r31, r6 -/* 80032D3C 0002FC7C 48 33 5D F1 */ bl strcpy -/* 80032D40 0002FC80 9B DD 00 09 */ stb r30, 9(r29) -/* 80032D44 0002FC84 9B FD 00 08 */ stb r31, 8(r29) -/* 80032D48 0002FC88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032D4C 0002FC8C 48 32 F4 DD */ bl _restgpr_29 -/* 80032D50 0002FC90 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80032D54 0002FC94 7C 08 03 A6 */ mtlr r0 -/* 80032D58 0002FC98 38 21 00 20 */ addi r1, r1, 0x20 -/* 80032D5C 0002FC9C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80032E78.s b/include/d/d_save/d_save/asm/func_80032E78.s deleted file mode 100644 index 5c9d4e0bfb..0000000000 --- a/include/d/d_save/d_save/asm/func_80032E78.s +++ /dev/null @@ -1,15 +0,0 @@ -/* 80032E78 0002FDB8 2C 04 00 00 */ cmpwi r4, 0 -/* 80032E7C 0002FDBC 41 80 00 2C */ blt lbl_80032EA8 -/* 80032E80 0002FDC0 2C 04 00 08 */ cmpwi r4, 8 -/* 80032E84 0002FDC4 40 80 00 24 */ bge lbl_80032EA8 -/* 80032E88 0002FDC8 88 63 00 19 */ lbz r3, 0x19(r3) -/* 80032E8C 0002FDCC 38 00 00 01 */ li r0, 1 -/* 80032E90 0002FDD0 7C 00 20 30 */ slw r0, r0, r4 -/* 80032E94 0002FDD4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032E98 0002FDD8 7C 63 00 38 */ and r3, r3, r0 -/* 80032E9C 0002FDDC 30 03 FF FF */ addic r0, r3, -1 -/* 80032EA0 0002FDE0 7C 60 19 10 */ subfe r3, r0, r3 -/* 80032EA4 0002FDE4 4E 80 00 20 */ blr -lbl_80032EA8: -/* 80032EA8 0002FDE8 38 60 00 00 */ li r3, 0 -/* 80032EAC 0002FDEC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80032FB8 .s b/include/d/d_save/d_save/asm/func_80032FB8 .s deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/include/d/d_save/d_save/asm/func_80032FB8.s b/include/d/d_save/d_save/asm/func_80032FB8.s deleted file mode 100644 index e02c5f750e..0000000000 --- a/include/d/d_save/d_save/asm/func_80032FB8.s +++ /dev/null @@ -1,33 +0,0 @@ -/* 80032FB8 0002FEF8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80032FBC 0002FEFC 7C 08 02 A6 */ mflr r0 -/* 80032FC0 0002FF00 90 01 00 24 */ stw r0, 0x24(r1) -/* 80032FC4 0002FF04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032FC8 0002FF08 48 32 F2 15 */ bl _savegpr_29 -/* 80032FCC 0002FF0C 7C 9D 23 78 */ mr r29, r4 -/* 80032FD0 0002FF10 2C 1D 00 18 */ cmpwi r29, 0x18 -/* 80032FD4 0002FF14 40 80 00 0C */ bge lbl_80032FE0 -/* 80032FD8 0002FF18 7C A3 E9 AE */ stbx r5, r3, r29 -/* 80032FDC 0002FF1C 48 00 03 1D */ bl setLineUpItem__17dSv_player_item_cFv -lbl_80032FE0: -/* 80032FE0 0002FF20 3B C0 00 00 */ li r30, 0 -/* 80032FE4 0002FF24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80032FE8 0002FF28 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l -lbl_80032FEC: -/* 80032FEC 0002FF2C 7F E3 FB 78 */ mr r3, r31 -/* 80032FF0 0002FF30 7F C4 F3 78 */ mr r4, r30 -/* 80032FF4 0002FF34 4B FF FA 69 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 80032FF8 0002FF38 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80032FFC 0002FF3C 7C 1D 00 00 */ cmpw r29, r0 -/* 80033000 0002FF40 40 82 00 0C */ bne lbl_8003300C -/* 80033004 0002FF44 7F C3 F3 78 */ mr r3, r30 -/* 80033008 0002FF48 4B FF AD ED */ bl dComIfGp_setSelectItem -lbl_8003300C: -/* 8003300C 0002FF4C 3B DE 00 01 */ addi r30, r30, 1 -/* 80033010 0002FF50 2C 1E 00 03 */ cmpwi r30, 3 -/* 80033014 0002FF54 41 80 FF D8 */ blt lbl_80032FEC -/* 80033018 0002FF58 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003301C 0002FF5C 48 32 F2 0D */ bl _restgpr_29 -/* 80033020 0002FF60 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033024 0002FF64 7C 08 03 A6 */ mtlr r0 -/* 80033028 0002FF68 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003302C 0002FF6C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800336BC.s b/include/d/d_save/d_save/asm/func_800336BC.s deleted file mode 100644 index 1ad198b26b..0000000000 --- a/include/d/d_save/d_save/asm/func_800336BC.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 800336BC 000305FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800336C0 00030600 7C 08 02 A6 */ mflr r0 -/* 800336C4 00030604 90 01 00 14 */ stw r0, 0x14(r1) -/* 800336C8 00030608 38 A0 00 60 */ li r5, 0x60 -/* 800336CC 0003060C 4B FF FE CD */ bl setEquipBottleItemIn__17dSv_player_item_cFUcUc -/* 800336D0 00030610 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800336D4 00030614 7C 08 03 A6 */ mtlr r0 -/* 800336D8 00030618 38 21 00 10 */ addi r1, r1, 0x10 -/* 800336DC 0003061C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80033754.s b/include/d/d_save/d_save/asm/func_80033754.s deleted file mode 100644 index 96816339ca..0000000000 --- a/include/d/d_save/d_save/asm/func_80033754.s +++ /dev/null @@ -1,41 +0,0 @@ -/* 80033754 00030694 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033758 00030698 7C 08 02 A6 */ mflr r0 -/* 8003375C 0003069C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80033760 000306A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033764 000306A4 48 32 EA 71 */ bl _savegpr_27 -/* 80033768 000306A8 3B 60 00 00 */ li r27, 0 -/* 8003376C 000306AC 3B E0 00 00 */ li r31, 0 -/* 80033770 000306B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80033774 000306B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80033778 000306B8 3B A3 00 CC */ addi r29, r3, 0xcc -/* 8003377C 000306BC 3B 83 07 F0 */ addi r28, r3, 0x7f0 -/* 80033780 000306C0 3C 60 80 3A */ lis r3, lbl_803A7288@ha -/* 80033784 000306C4 3B C3 72 88 */ addi r30, r3, lbl_803A7288@l -lbl_80033788: -/* 80033788 000306C8 7F A3 EB 78 */ mr r3, r29 -/* 8003378C 000306CC 38 1B 00 C0 */ addi r0, r27, 0xc0 -/* 80033790 000306D0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80033794 000306D4 48 00 07 35 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80033798 000306D8 2C 03 00 00 */ cmpwi r3, 0 -/* 8003379C 000306DC 41 82 00 24 */ beq lbl_800337C0 -/* 800337A0 000306E0 7F 83 E3 78 */ mr r3, r28 -/* 800337A4 000306E4 7C 9E FA 14 */ add r4, r30, r31 -/* 800337A8 000306E8 A0 84 03 22 */ lhz r4, 0x322(r4) -/* 800337AC 000306EC 48 00 12 11 */ bl isEventBit__11dSv_event_cCFUs -/* 800337B0 000306F0 2C 03 00 00 */ cmpwi r3, 0 -/* 800337B4 000306F4 40 82 00 0C */ bne lbl_800337C0 -/* 800337B8 000306F8 38 60 00 01 */ li r3, 1 -/* 800337BC 000306FC 48 00 00 18 */ b lbl_800337D4 -lbl_800337C0: -/* 800337C0 00030700 3B 7B 00 01 */ addi r27, r27, 1 -/* 800337C4 00030704 2C 1B 00 18 */ cmpwi r27, 0x18 -/* 800337C8 00030708 3B FF 00 02 */ addi r31, r31, 2 -/* 800337CC 0003070C 41 80 FF BC */ blt lbl_80033788 -/* 800337D0 00030710 38 60 00 00 */ li r3, 0 -lbl_800337D4: -/* 800337D4 00030714 39 61 00 20 */ addi r11, r1, 0x20 -/* 800337D8 00030718 48 32 EA 49 */ bl _restgpr_27 -/* 800337DC 0003071C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800337E0 00030720 7C 08 03 A6 */ mtlr r0 -/* 800337E4 00030724 38 21 00 20 */ addi r1, r1, 0x20 -/* 800337E8 00030728 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80033BEC.s b/include/d/d_save/d_save/asm/func_80033BEC.s deleted file mode 100644 index f106e7b0a7..0000000000 --- a/include/d/d_save/d_save/asm/func_80033BEC.s +++ /dev/null @@ -1,18 +0,0 @@ -/* 80033BEC 00030B2C 38 C0 00 00 */ li r6, 0 -/* 80033BF0 00030B30 38 E0 00 00 */ li r7, 0 -/* 80033BF4 00030B34 54 85 06 3E */ clrlwi r5, r4, 0x18 -/* 80033BF8 00030B38 38 00 00 03 */ li r0, 3 -/* 80033BFC 00030B3C 7C 09 03 A6 */ mtctr r0 -lbl_80033C00: -/* 80033C00 00030B40 38 07 00 0F */ addi r0, r7, 0xf -/* 80033C04 00030B44 7C 03 00 AE */ lbzx r0, r3, r0 -/* 80033C08 00030B48 7C 05 00 40 */ cmplw r5, r0 -/* 80033C0C 00030B4C 40 82 00 10 */ bne lbl_80033C1C -/* 80033C10 00030B50 54 C4 06 3E */ clrlwi r4, r6, 0x18 -/* 80033C14 00030B54 38 04 00 01 */ addi r0, r4, 1 -/* 80033C18 00030B58 54 06 06 3E */ clrlwi r6, r0, 0x18 -lbl_80033C1C: -/* 80033C1C 00030B5C 38 E7 00 01 */ addi r7, r7, 1 -/* 80033C20 00030B60 42 00 FF E0 */ bdnz lbl_80033C00 -/* 80033C24 00030B64 7C C3 33 78 */ mr r3, r6 -/* 80033C28 00030B68 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80033CBC.s b/include/d/d_save/d_save/asm/func_80033CBC.s deleted file mode 100644 index 6ccfa7a6b9..0000000000 --- a/include/d/d_save/d_save/asm/func_80033CBC.s +++ /dev/null @@ -1,39 +0,0 @@ -/* 80033CBC 00030BFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80033CC0 00030C00 7C 08 02 A6 */ mflr r0 -/* 80033CC4 00030C04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80033CC8 00030C08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80033CCC 00030C0C 88 03 00 14 */ lbz r0, 0x14(r3) -/* 80033CD0 00030C10 2C 00 00 5B */ cmpwi r0, 0x5b -/* 80033CD4 00030C14 41 82 00 20 */ beq lbl_80033CF4 -/* 80033CD8 00030C18 40 80 00 10 */ bge lbl_80033CE8 -/* 80033CDC 00030C1C 2C 00 00 4A */ cmpwi r0, 0x4a -/* 80033CE0 00030C20 41 82 00 2C */ beq lbl_80033D0C -/* 80033CE4 00030C24 48 00 00 30 */ b lbl_80033D14 -lbl_80033CE8: -/* 80033CE8 00030C28 2C 00 00 5D */ cmpwi r0, 0x5d -/* 80033CEC 00030C2C 41 82 00 14 */ beq lbl_80033D00 -/* 80033CF0 00030C30 48 00 00 24 */ b lbl_80033D14 -lbl_80033CF4: -/* 80033CF4 00030C34 38 00 00 5E */ li r0, 0x5e -/* 80033CF8 00030C38 98 03 00 14 */ stb r0, 0x14(r3) -/* 80033CFC 00030C3C 48 00 00 18 */ b lbl_80033D14 -lbl_80033D00: -/* 80033D00 00030C40 38 00 00 5F */ li r0, 0x5f -/* 80033D04 00030C44 98 03 00 14 */ stb r0, 0x14(r3) -/* 80033D08 00030C48 48 00 00 0C */ b lbl_80033D14 -lbl_80033D0C: -/* 80033D0C 00030C4C 38 00 00 5C */ li r0, 0x5c -/* 80033D10 00030C50 98 03 00 14 */ stb r0, 0x14(r3) -lbl_80033D14: -/* 80033D14 00030C54 3B E0 00 00 */ li r31, 0 -lbl_80033D18: -/* 80033D18 00030C58 7F E3 FB 78 */ mr r3, r31 -/* 80033D1C 00030C5C 4B FF A0 D9 */ bl dComIfGp_setSelectItem -/* 80033D20 00030C60 3B FF 00 01 */ addi r31, r31, 1 -/* 80033D24 00030C64 2C 1F 00 04 */ cmpwi r31, 4 -/* 80033D28 00030C68 41 80 FF F0 */ blt lbl_80033D18 -/* 80033D2C 00030C6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80033D30 00030C70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80033D34 00030C74 7C 08 03 A6 */ mtlr r0 -/* 80033D38 00030C78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80033D3C 00030C7C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80033D40.s b/include/d/d_save/d_save/asm/func_80033D40.s deleted file mode 100644 index 5313b2253a..0000000000 --- a/include/d/d_save/d_save/asm/func_80033D40.s +++ /dev/null @@ -1,73 +0,0 @@ -/* 80033D40 00030C80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80033D44 00030C84 7C 08 02 A6 */ mflr r0 -/* 80033D48 00030C88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80033D4C 00030C8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80033D50 00030C90 7C 7F 1B 78 */ mr r31, r3 -/* 80033D54 00030C94 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80033D58 00030C98 2C 00 00 76 */ cmpwi r0, 0x76 -/* 80033D5C 00030C9C 41 82 00 20 */ beq lbl_80033D7C -/* 80033D60 00030CA0 40 80 00 10 */ bge lbl_80033D70 -/* 80033D64 00030CA4 2C 00 00 74 */ cmpwi r0, 0x74 -/* 80033D68 00030CA8 41 82 00 48 */ beq lbl_80033DB0 -/* 80033D6C 00030CAC 48 00 00 A8 */ b lbl_80033E14 -lbl_80033D70: -/* 80033D70 00030CB0 2C 00 00 FF */ cmpwi r0, 0xff -/* 80033D74 00030CB4 41 82 00 70 */ beq lbl_80033DE4 -/* 80033D78 00030CB8 48 00 00 9C */ b lbl_80033E14 -lbl_80033D7C: -/* 80033D7C 00030CBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80033D80 00030CC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80033D84 00030CC4 38 63 00 CC */ addi r3, r3, 0xcc -/* 80033D88 00030CC8 38 80 00 3D */ li r4, 0x3d -/* 80033D8C 00030CCC 48 00 01 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80033D90 00030CD0 2C 03 00 00 */ cmpwi r3, 0 -/* 80033D94 00030CD4 41 82 00 10 */ beq lbl_80033DA4 -/* 80033D98 00030CD8 38 00 00 5E */ li r0, 0x5e -/* 80033D9C 00030CDC 98 1F 00 14 */ stb r0, 0x14(r31) -/* 80033DA0 00030CE0 48 00 00 74 */ b lbl_80033E14 -lbl_80033DA4: -/* 80033DA4 00030CE4 38 00 00 5B */ li r0, 0x5b -/* 80033DA8 00030CE8 98 1F 00 14 */ stb r0, 0x14(r31) -/* 80033DAC 00030CEC 48 00 00 68 */ b lbl_80033E14 -lbl_80033DB0: -/* 80033DB0 00030CF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80033DB4 00030CF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80033DB8 00030CF8 38 63 00 CC */ addi r3, r3, 0xcc -/* 80033DBC 00030CFC 38 80 00 3D */ li r4, 0x3d -/* 80033DC0 00030D00 48 00 01 09 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80033DC4 00030D04 2C 03 00 00 */ cmpwi r3, 0 -/* 80033DC8 00030D08 41 82 00 10 */ beq lbl_80033DD8 -/* 80033DCC 00030D0C 38 00 00 5F */ li r0, 0x5f -/* 80033DD0 00030D10 98 1F 00 14 */ stb r0, 0x14(r31) -/* 80033DD4 00030D14 48 00 00 40 */ b lbl_80033E14 -lbl_80033DD8: -/* 80033DD8 00030D18 38 00 00 5D */ li r0, 0x5d -/* 80033DDC 00030D1C 98 1F 00 14 */ stb r0, 0x14(r31) -/* 80033DE0 00030D20 48 00 00 34 */ b lbl_80033E14 -lbl_80033DE4: -/* 80033DE4 00030D24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80033DE8 00030D28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80033DEC 00030D2C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80033DF0 00030D30 38 80 00 3D */ li r4, 0x3d -/* 80033DF4 00030D34 48 00 00 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80033DF8 00030D38 2C 03 00 00 */ cmpwi r3, 0 -/* 80033DFC 00030D3C 41 82 00 10 */ beq lbl_80033E0C -/* 80033E00 00030D40 38 00 00 5C */ li r0, 0x5c -/* 80033E04 00030D44 98 1F 00 14 */ stb r0, 0x14(r31) -/* 80033E08 00030D48 48 00 00 0C */ b lbl_80033E14 -lbl_80033E0C: -/* 80033E0C 00030D4C 38 00 00 4A */ li r0, 0x4a -/* 80033E10 00030D50 98 1F 00 14 */ stb r0, 0x14(r31) -lbl_80033E14: -/* 80033E14 00030D54 3B E0 00 00 */ li r31, 0 -lbl_80033E18: -/* 80033E18 00030D58 7F E3 FB 78 */ mr r3, r31 -/* 80033E1C 00030D5C 4B FF 9F D9 */ bl dComIfGp_setSelectItem -/* 80033E20 00030D60 3B FF 00 01 */ addi r31, r31, 1 -/* 80033E24 00030D64 2C 1F 00 04 */ cmpwi r31, 4 -/* 80033E28 00030D68 41 80 FF F0 */ blt lbl_80033E18 -/* 80033E2C 00030D6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80033E30 00030D70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80033E34 00030D74 7C 08 03 A6 */ mtlr r0 -/* 80033E38 00030D78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80033E3C 00030D7C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80033F9C.s b/include/d/d_save/d_save/asm/func_80033F9C.s deleted file mode 100644 index 2e8c8e3557..0000000000 --- a/include/d/d_save/d_save/asm/func_80033F9C.s +++ /dev/null @@ -1,40 +0,0 @@ -/* 80033F9C 00030EDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80033FA0 00030EE0 7C 08 02 A6 */ mflr r0 -/* 80033FA4 00030EE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80033FA8 00030EE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80033FAC 00030EEC 93 C1 00 08 */ stw r30, 8(r1) -/* 80033FB0 00030EF0 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80033FB4 00030EF4 7F E3 02 14 */ add r31, r3, r0 -/* 80033FB8 00030EF8 88 7F 00 04 */ lbz r3, 4(r31) -/* 80033FBC 00030EFC 7C A0 07 34 */ extsh r0, r5 -/* 80033FC0 00030F00 7F C3 02 14 */ add r30, r3, r0 -/* 80033FC4 00030F04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80033FC8 00030F08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80033FCC 00030F0C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80033FD0 00030F10 38 04 00 0B */ addi r0, r4, 0xb -/* 80033FD4 00030F14 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80033FD8 00030F18 38 A0 00 01 */ li r5, 1 -/* 80033FDC 00030F1C 4B FF F0 55 */ bl getItem__17dSv_player_item_cCFib -/* 80033FE0 00030F20 2C 1E 00 00 */ cmpwi r30, 0 -/* 80033FE4 00030F24 40 80 00 10 */ bge lbl_80033FF4 -/* 80033FE8 00030F28 38 00 00 00 */ li r0, 0 -/* 80033FEC 00030F2C 98 1F 00 04 */ stb r0, 4(r31) -/* 80033FF0 00030F30 48 00 00 24 */ b lbl_80034014 -lbl_80033FF4: -/* 80033FF4 00030F34 4B FF A5 C5 */ bl dComIfGs_getBottleMax -/* 80033FF8 00030F38 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033FFC 00030F3C 7C 1E 00 00 */ cmpw r30, r0 -/* 80034000 00030F40 40 81 00 10 */ ble lbl_80034010 -/* 80034004 00030F44 4B FF A5 B5 */ bl dComIfGs_getBottleMax -/* 80034008 00030F48 98 7F 00 04 */ stb r3, 4(r31) -/* 8003400C 00030F4C 48 00 00 08 */ b lbl_80034014 -lbl_80034010: -/* 80034010 00030F50 9B DF 00 04 */ stb r30, 4(r31) -lbl_80034014: -/* 80034014 00030F54 88 7F 00 04 */ lbz r3, 4(r31) -/* 80034018 00030F58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003401C 00030F5C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80034020 00030F60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80034024 00030F64 7C 08 03 A6 */ mtlr r0 -/* 80034028 00030F68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003402C 00030F6C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034040.s b/include/d/d_save/d_save/asm/func_80034040.s deleted file mode 100644 index 7d16a201c7..0000000000 --- a/include/d/d_save/d_save/asm/func_80034040.s +++ /dev/null @@ -1,31 +0,0 @@ -/* 80034040 00030F80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80034044 00030F84 7C 08 02 A6 */ mflr r0 -/* 80034048 00030F88 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003404C 00030F8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80034050 00030F90 7C 7F 1B 78 */ mr r31, r3 -/* 80034054 00030F94 38 80 00 1E */ li r4, 0x1e -/* 80034058 00030F98 38 00 00 07 */ li r0, 7 -/* 8003405C 00030F9C 7C 09 03 A6 */ mtctr r0 -lbl_80034060: -/* 80034060 00030FA0 98 83 00 00 */ stb r4, 0(r3) -/* 80034064 00030FA4 38 63 00 01 */ addi r3, r3, 1 -/* 80034068 00030FA8 42 00 FF F8 */ bdnz lbl_80034060 -/* 8003406C 00030FAC 7F E3 FB 78 */ mr r3, r31 -/* 80034070 00030FB0 38 80 00 70 */ li r4, 0x70 -/* 80034074 00030FB4 38 A0 00 1E */ li r5, 0x1e -/* 80034078 00030FB8 48 00 00 41 */ bl setBombNum__21dSv_player_item_max_cFUcUc -/* 8003407C 00030FBC 7F E3 FB 78 */ mr r3, r31 -/* 80034080 00030FC0 38 80 00 71 */ li r4, 0x71 -/* 80034084 00030FC4 38 A0 00 0F */ li r5, 0xf -/* 80034088 00030FC8 48 00 00 31 */ bl setBombNum__21dSv_player_item_max_cFUcUc -/* 8003408C 00030FCC 7F E3 FB 78 */ mr r3, r31 -/* 80034090 00030FD0 38 80 00 72 */ li r4, 0x72 -/* 80034094 00030FD4 38 A0 00 0A */ li r5, 0xa -/* 80034098 00030FD8 48 00 00 21 */ bl setBombNum__21dSv_player_item_max_cFUcUc -/* 8003409C 00030FDC 38 00 00 00 */ li r0, 0 -/* 800340A0 00030FE0 98 1F 00 07 */ stb r0, 7(r31) -/* 800340A4 00030FE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800340A8 00030FE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800340AC 00030FEC 7C 08 03 A6 */ mtlr r0 -/* 800340B0 00030FF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800340B4 00030FF4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800340B8.s b/include/d/d_save/d_save/asm/func_800340B8.s deleted file mode 100644 index f59d122e75..0000000000 --- a/include/d/d_save/d_save/asm/func_800340B8.s +++ /dev/null @@ -1,20 +0,0 @@ -/* 800340B8 00030FF8 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 800340BC 00030FFC 2C 00 00 71 */ cmpwi r0, 0x71 -/* 800340C0 00031000 41 82 00 28 */ beq lbl_800340E8 -/* 800340C4 00031004 40 80 00 10 */ bge lbl_800340D4 -/* 800340C8 00031008 2C 00 00 70 */ cmpwi r0, 0x70 -/* 800340CC 0003100C 40 80 00 14 */ bge lbl_800340E0 -/* 800340D0 00031010 4E 80 00 20 */ blr -lbl_800340D4: -/* 800340D4 00031014 2C 00 00 73 */ cmpwi r0, 0x73 -/* 800340D8 00031018 4C 80 00 20 */ bgelr -/* 800340DC 0003101C 48 00 00 14 */ b lbl_800340F0 -lbl_800340E0: -/* 800340E0 00031020 98 A3 00 01 */ stb r5, 1(r3) -/* 800340E4 00031024 4E 80 00 20 */ blr -lbl_800340E8: -/* 800340E8 00031028 98 A3 00 02 */ stb r5, 2(r3) -/* 800340EC 0003102C 4E 80 00 20 */ blr -lbl_800340F0: -/* 800340F0 00031030 98 A3 00 06 */ stb r5, 6(r3) -/* 800340F4 00031034 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800340F8.s b/include/d/d_save/d_save/asm/func_800340F8.s deleted file mode 100644 index dc604e9b8f..0000000000 --- a/include/d/d_save/d_save/asm/func_800340F8.s +++ /dev/null @@ -1,52 +0,0 @@ -/* 800340F8 00031038 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800340FC 0003103C 7C 08 02 A6 */ mflr r0 -/* 80034100 00031040 90 01 00 24 */ stw r0, 0x24(r1) -/* 80034104 00031044 39 61 00 20 */ addi r11, r1, 0x20 -/* 80034108 00031048 48 32 E0 D5 */ bl _savegpr_29 -/* 8003410C 0003104C 7C 7D 1B 78 */ mr r29, r3 -/* 80034110 00031050 7C 9E 23 78 */ mr r30, r4 -/* 80034114 00031054 3B E0 00 01 */ li r31, 1 -/* 80034118 00031058 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 8003411C 0003105C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80034120 00031060 38 63 00 CC */ addi r3, r3, 0xcc -/* 80034124 00031064 38 80 00 4F */ li r4, 0x4f -/* 80034128 00031068 4B FF FD A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8003412C 0003106C 2C 03 00 00 */ cmpwi r3, 0 -/* 80034130 00031070 41 82 00 08 */ beq lbl_80034138 -/* 80034134 00031074 3B E0 00 02 */ li r31, 2 -lbl_80034138: -/* 80034138 00031078 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8003413C 0003107C 2C 00 00 71 */ cmpwi r0, 0x71 -/* 80034140 00031080 41 82 00 30 */ beq lbl_80034170 -/* 80034144 00031084 40 80 00 10 */ bge lbl_80034154 -/* 80034148 00031088 2C 00 00 70 */ cmpwi r0, 0x70 -/* 8003414C 0003108C 40 80 00 14 */ bge lbl_80034160 -/* 80034150 00031090 48 00 00 40 */ b lbl_80034190 -lbl_80034154: -/* 80034154 00031094 2C 00 00 73 */ cmpwi r0, 0x73 -/* 80034158 00031098 40 80 00 38 */ bge lbl_80034190 -/* 8003415C 0003109C 48 00 00 24 */ b lbl_80034180 -lbl_80034160: -/* 80034160 000310A0 88 1D 00 01 */ lbz r0, 1(r29) -/* 80034164 000310A4 7C 00 F9 D6 */ mullw r0, r0, r31 -/* 80034168 000310A8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8003416C 000310AC 48 00 00 28 */ b lbl_80034194 -lbl_80034170: -/* 80034170 000310B0 88 1D 00 02 */ lbz r0, 2(r29) -/* 80034174 000310B4 7C 00 F9 D6 */ mullw r0, r0, r31 -/* 80034178 000310B8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8003417C 000310BC 48 00 00 18 */ b lbl_80034194 -lbl_80034180: -/* 80034180 000310C0 88 1D 00 06 */ lbz r0, 6(r29) -/* 80034184 000310C4 7C 00 F9 D6 */ mullw r0, r0, r31 -/* 80034188 000310C8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8003418C 000310CC 48 00 00 08 */ b lbl_80034194 -lbl_80034190: -/* 80034190 000310D0 38 60 00 00 */ li r3, 0 -lbl_80034194: -/* 80034194 000310D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80034198 000310D8 48 32 E0 91 */ bl _restgpr_29 -/* 8003419C 000310DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800341A0 000310E0 7C 08 03 A6 */ mtlr r0 -/* 800341A4 000310E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800341A8 000310E8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800341AC.s b/include/d/d_save/d_save/asm/func_800341AC.s deleted file mode 100644 index 96458cfde3..0000000000 --- a/include/d/d_save/d_save/asm/func_800341AC.s +++ /dev/null @@ -1,16 +0,0 @@ -/* 800341AC 000310EC 38 A0 00 00 */ li r5, 0 -/* 800341B0 000310F0 7C 64 1B 78 */ mr r4, r3 -/* 800341B4 000310F4 38 00 00 08 */ li r0, 8 -/* 800341B8 000310F8 7C 09 03 A6 */ mtctr r0 -lbl_800341BC: -/* 800341BC 000310FC 98 A4 00 00 */ stb r5, 0(r4) -/* 800341C0 00031100 38 84 00 01 */ addi r4, r4, 1 -/* 800341C4 00031104 42 00 FF F8 */ bdnz lbl_800341BC -/* 800341C8 00031108 38 80 00 00 */ li r4, 0 -/* 800341CC 0003110C 98 83 00 08 */ stb r4, 8(r3) -/* 800341D0 00031110 98 83 00 09 */ stb r4, 9(r3) -/* 800341D4 00031114 98 83 00 0A */ stb r4, 0xa(r3) -/* 800341D8 00031118 38 00 00 FF */ li r0, 0xff -/* 800341DC 0003111C 98 03 00 0B */ stb r0, 0xb(r3) -/* 800341E0 00031120 98 83 00 0C */ stb r4, 0xc(r3) -/* 800341E4 00031124 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800341E8.s b/include/d/d_save/d_save/asm/func_800341E8.s deleted file mode 100644 index 51b52e629d..0000000000 --- a/include/d/d_save/d_save/asm/func_800341E8.s +++ /dev/null @@ -1,8 +0,0 @@ -/* 800341E8 00031128 7C E3 20 AE */ lbzx r7, r3, r4 -/* 800341EC 0003112C 38 C0 00 01 */ li r6, 1 -/* 800341F0 00031130 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 800341F4 00031134 7C C0 00 30 */ slw r0, r6, r0 -/* 800341F8 00031138 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 800341FC 0003113C 7C E0 03 78 */ or r0, r7, r0 -/* 80034200 00031140 7C 03 21 AE */ stbx r0, r3, r4 -/* 80034204 00031144 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034428.s b/include/d/d_save/d_save/asm/func_80034428.s deleted file mode 100644 index 3ac6464d12..0000000000 --- a/include/d/d_save/d_save/asm/func_80034428.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 80034428 00031368 7C 80 2E 70 */ srawi r0, r4, 5 -/* 8003442C 0003136C 54 07 10 3A */ slwi r7, r0, 2 -/* 80034430 00031370 7C C3 38 2E */ lwzx r6, r3, r7 -/* 80034434 00031374 38 A0 00 01 */ li r5, 1 -/* 80034438 00031378 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 8003443C 0003137C 7C A0 00 30 */ slw r0, r5, r0 -/* 80034440 00031380 7C C0 03 78 */ or r0, r6, r0 -/* 80034444 00031384 7C 03 39 2E */ stwx r0, r3, r7 -/* 80034448 00031388 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_8003444C.s b/include/d/d_save/d_save/asm/func_8003444C.s deleted file mode 100644 index c5e4a8bffc..0000000000 --- a/include/d/d_save/d_save/asm/func_8003444C.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 8003444C 0003138C 38 A0 00 01 */ li r5, 1 -/* 80034450 00031390 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034454 00031394 7C A5 00 30 */ slw r5, r5, r0 -/* 80034458 00031398 7C 80 2E 70 */ srawi r0, r4, 5 -/* 8003445C 0003139C 54 00 10 3A */ slwi r0, r0, 2 -/* 80034460 000313A0 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80034464 000313A4 7C A3 00 38 */ and r3, r5, r0 -/* 80034468 000313A8 30 03 FF FF */ addic r0, r3, -1 -/* 8003446C 000313AC 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034470 000313B0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034474.s b/include/d/d_save/d_save/asm/func_80034474.s deleted file mode 100644 index 69e60135bc..0000000000 --- a/include/d/d_save/d_save/asm/func_80034474.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80034474 000313B4 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034478 000313B8 54 00 10 3A */ slwi r0, r0, 2 -/* 8003447C 000313BC 7C C3 02 14 */ add r6, r3, r0 -/* 80034480 000313C0 80 A6 00 08 */ lwz r5, 8(r6) -/* 80034484 000313C4 38 60 00 01 */ li r3, 1 -/* 80034488 000313C8 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 8003448C 000313CC 7C 60 00 30 */ slw r0, r3, r0 -/* 80034490 000313D0 7C A0 03 78 */ or r0, r5, r0 -/* 80034494 000313D4 90 06 00 08 */ stw r0, 8(r6) -/* 80034498 000313D8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_8003449C.s b/include/d/d_save/d_save/asm/func_8003449C.s deleted file mode 100644 index 37e8d3bc72..0000000000 --- a/include/d/d_save/d_save/asm/func_8003449C.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 8003449C 000313DC 7C 80 2E 70 */ srawi r0, r4, 5 -/* 800344A0 000313E0 54 00 10 3A */ slwi r0, r0, 2 -/* 800344A4 000313E4 7C 63 02 14 */ add r3, r3, r0 -/* 800344A8 000313E8 80 A3 00 08 */ lwz r5, 8(r3) -/* 800344AC 000313EC 38 60 00 01 */ li r3, 1 -/* 800344B0 000313F0 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 800344B4 000313F4 7C 60 00 30 */ slw r0, r3, r0 -/* 800344B8 000313F8 7C A3 00 38 */ and r3, r5, r0 -/* 800344BC 000313FC 30 03 FF FF */ addic r0, r3, -1 -/* 800344C0 00031400 7C 60 19 10 */ subfe r3, r0, r3 -/* 800344C4 00031404 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800344FC.s b/include/d/d_save/d_save/asm/func_800344FC.s deleted file mode 100644 index ee14c3a72d..0000000000 --- a/include/d/d_save/d_save/asm/func_800344FC.s +++ /dev/null @@ -1,7 +0,0 @@ -/* 800344FC 0003143C 54 85 0D FC */ rlwinm r5, r4, 1, 0x17, 0x1e -/* 80034500 00031440 7C 83 2A 2E */ lhzx r4, r3, r5 -/* 80034504 00031444 28 04 03 E7 */ cmplwi r4, 0x3e7 -/* 80034508 00031448 4C 80 00 20 */ bgelr -/* 8003450C 0003144C 38 04 00 01 */ addi r0, r4, 1 -/* 80034510 00031450 7C 03 2B 2E */ sthx r0, r3, r5 -/* 80034514 00031454 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034644.s b/include/d/d_save/d_save/asm/func_80034644.s deleted file mode 100644 index 5551a6e269..0000000000 --- a/include/d/d_save/d_save/asm/func_80034644.s +++ /dev/null @@ -1,18 +0,0 @@ -/* 80034644 00031584 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80034648 00031588 7C 08 02 A6 */ mflr r0 -/* 8003464C 0003158C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80034650 00031590 80 0D 8F 60 */ lwz r0, _sRumbleSupported-_SDA_BASE_(r13) -/* 80034654 00031594 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 -/* 80034658 00031598 41 82 00 18 */ beq lbl_80034670 -/* 8003465C 0003159C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80034660 000315A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80034664 000315A4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80034668 000315A8 4B FF 6D 49 */ bl getNowVibration__14dComIfG_play_cFv -/* 8003466C 000315AC 48 00 00 08 */ b lbl_80034674 -lbl_80034670: -/* 80034670 000315B0 38 60 00 00 */ li r3, 0 -lbl_80034674: -/* 80034674 000315B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80034678 000315B8 7C 08 03 A6 */ mtlr r0 -/* 8003467C 000315BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034680 000315C0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800347A0.s b/include/d/d_save/d_save/asm/func_800347A0.s deleted file mode 100644 index c44ec6966e..0000000000 --- a/include/d/d_save/d_save/asm/func_800347A0.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 800347A0 000316E0 7C 80 2E 70 */ srawi r0, r4, 5 -/* 800347A4 000316E4 54 07 10 3A */ slwi r7, r0, 2 -/* 800347A8 000316E8 7C C3 38 2E */ lwzx r6, r3, r7 -/* 800347AC 000316EC 38 A0 00 01 */ li r5, 1 -/* 800347B0 000316F0 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 800347B4 000316F4 7C A0 00 30 */ slw r0, r5, r0 -/* 800347B8 000316F8 7C C0 03 78 */ or r0, r6, r0 -/* 800347BC 000316FC 7C 03 39 2E */ stwx r0, r3, r7 -/* 800347C0 00031700 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800347C4.s b/include/d/d_save/d_save/asm/func_800347C4.s deleted file mode 100644 index 91e15bb995..0000000000 --- a/include/d/d_save/d_save/asm/func_800347C4.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 800347C4 00031704 7C 80 2E 70 */ srawi r0, r4, 5 -/* 800347C8 00031708 54 07 10 3A */ slwi r7, r0, 2 -/* 800347CC 0003170C 7C C3 38 2E */ lwzx r6, r3, r7 -/* 800347D0 00031710 38 A0 00 01 */ li r5, 1 -/* 800347D4 00031714 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 800347D8 00031718 7C A0 00 30 */ slw r0, r5, r0 -/* 800347DC 0003171C 7C C0 00 78 */ andc r0, r6, r0 -/* 800347E0 00031720 7C 03 39 2E */ stwx r0, r3, r7 -/* 800347E4 00031724 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800347E8.s b/include/d/d_save/d_save/asm/func_800347E8.s deleted file mode 100644 index adb6fc2588..0000000000 --- a/include/d/d_save/d_save/asm/func_800347E8.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 800347E8 00031728 38 A0 00 01 */ li r5, 1 -/* 800347EC 0003172C 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 800347F0 00031730 7C A5 00 30 */ slw r5, r5, r0 -/* 800347F4 00031734 7C 80 2E 70 */ srawi r0, r4, 5 -/* 800347F8 00031738 54 00 10 3A */ slwi r0, r0, 2 -/* 800347FC 0003173C 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80034800 00031740 7C A3 00 38 */ and r3, r5, r0 -/* 80034804 00031744 30 03 FF FF */ addic r0, r3, -1 -/* 80034808 00031748 7C 60 19 10 */ subfe r3, r0, r3 -/* 8003480C 0003174C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034810.s b/include/d/d_save/d_save/asm/func_80034810.s deleted file mode 100644 index 5ff87156ea..0000000000 --- a/include/d/d_save/d_save/asm/func_80034810.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80034810 00031750 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034814 00031754 54 00 10 3A */ slwi r0, r0, 2 -/* 80034818 00031758 7C C3 02 14 */ add r6, r3, r0 -/* 8003481C 0003175C 80 A6 00 08 */ lwz r5, 8(r6) -/* 80034820 00031760 38 60 00 01 */ li r3, 1 -/* 80034824 00031764 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034828 00031768 7C 60 00 30 */ slw r0, r3, r0 -/* 8003482C 0003176C 7C A0 03 78 */ or r0, r5, r0 -/* 80034830 00031770 90 06 00 08 */ stw r0, 8(r6) -/* 80034834 00031774 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034838.s b/include/d/d_save/d_save/asm/func_80034838.s deleted file mode 100644 index 03c54daf1e..0000000000 --- a/include/d/d_save/d_save/asm/func_80034838.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80034838 00031778 7C 80 2E 70 */ srawi r0, r4, 5 -/* 8003483C 0003177C 54 00 10 3A */ slwi r0, r0, 2 -/* 80034840 00031780 7C C3 02 14 */ add r6, r3, r0 -/* 80034844 00031784 80 A6 00 08 */ lwz r5, 8(r6) -/* 80034848 00031788 38 60 00 01 */ li r3, 1 -/* 8003484C 0003178C 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034850 00031790 7C 60 00 30 */ slw r0, r3, r0 -/* 80034854 00031794 7C A0 00 78 */ andc r0, r5, r0 -/* 80034858 00031798 90 06 00 08 */ stw r0, 8(r6) -/* 8003485C 0003179C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034860.s b/include/d/d_save/d_save/asm/func_80034860.s deleted file mode 100644 index 5dd9b98427..0000000000 --- a/include/d/d_save/d_save/asm/func_80034860.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 80034860 000317A0 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034864 000317A4 54 00 10 3A */ slwi r0, r0, 2 -/* 80034868 000317A8 7C 63 02 14 */ add r3, r3, r0 -/* 8003486C 000317AC 80 A3 00 08 */ lwz r5, 8(r3) -/* 80034870 000317B0 38 60 00 01 */ li r3, 1 -/* 80034874 000317B4 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034878 000317B8 7C 60 00 30 */ slw r0, r3, r0 -/* 8003487C 000317BC 7C A3 00 38 */ and r3, r5, r0 -/* 80034880 000317C0 30 03 FF FF */ addic r0, r3, -1 -/* 80034884 000317C4 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034888 000317C8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800348C4.s b/include/d/d_save/d_save/asm/func_800348C4.s deleted file mode 100644 index d00fd65516..0000000000 --- a/include/d/d_save/d_save/asm/func_800348C4.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 800348C4 00031804 7C 80 2E 70 */ srawi r0, r4, 5 -/* 800348C8 00031808 54 00 10 3A */ slwi r0, r0, 2 -/* 800348CC 0003180C 7C C3 02 14 */ add r6, r3, r0 -/* 800348D0 00031810 80 A6 00 18 */ lwz r5, 0x18(r6) -/* 800348D4 00031814 38 60 00 01 */ li r3, 1 -/* 800348D8 00031818 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 800348DC 0003181C 7C 60 00 30 */ slw r0, r3, r0 -/* 800348E0 00031820 7C A0 03 78 */ or r0, r5, r0 -/* 800348E4 00031824 90 06 00 18 */ stw r0, 0x18(r6) -/* 800348E8 00031828 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800348EC.s b/include/d/d_save/d_save/asm/func_800348EC.s deleted file mode 100644 index d91a800b26..0000000000 --- a/include/d/d_save/d_save/asm/func_800348EC.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 800348EC 0003182C 7C 80 2E 70 */ srawi r0, r4, 5 -/* 800348F0 00031830 54 00 10 3A */ slwi r0, r0, 2 -/* 800348F4 00031834 7C 63 02 14 */ add r3, r3, r0 -/* 800348F8 00031838 80 A3 00 18 */ lwz r5, 0x18(r3) -/* 800348FC 0003183C 38 60 00 01 */ li r3, 1 -/* 80034900 00031840 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034904 00031844 7C 60 00 30 */ slw r0, r3, r0 -/* 80034908 00031848 7C A3 00 38 */ and r3, r5, r0 -/* 8003490C 0003184C 30 03 FF FF */ addic r0, r3, -1 -/* 80034910 00031850 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034914 00031854 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_8003498C.s b/include/d/d_save/d_save/asm/func_8003498C.s deleted file mode 100644 index 63a40c2b1d..0000000000 --- a/include/d/d_save/d_save/asm/func_8003498C.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 8003498C 000318CC 54 86 C6 3E */ rlwinm r6, r4, 0x18, 0x18, 0x1f -/* 80034990 000318D0 7C A3 30 AE */ lbzx r5, r3, r6 -/* 80034994 000318D4 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80034998 000318D8 7C A0 03 78 */ or r0, r5, r0 -/* 8003499C 000318DC 7C 03 31 AE */ stbx r0, r3, r6 -/* 800349A0 000318E0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800349A4.s b/include/d/d_save/d_save/asm/func_800349A4.s deleted file mode 100644 index 33ee871353..0000000000 --- a/include/d/d_save/d_save/asm/func_800349A4.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 800349A4 000318E4 54 86 C6 3E */ rlwinm r6, r4, 0x18, 0x18, 0x1f -/* 800349A8 000318E8 7C A3 30 AE */ lbzx r5, r3, r6 -/* 800349AC 000318EC 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 800349B0 000318F0 7C A0 00 78 */ andc r0, r5, r0 -/* 800349B4 000318F4 7C 03 31 AE */ stbx r0, r3, r6 -/* 800349B8 000318F8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800349BC.s b/include/d/d_save/d_save/asm/func_800349BC.s deleted file mode 100644 index fae43a2c82..0000000000 --- a/include/d/d_save/d_save/asm/func_800349BC.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 800349BC 000318FC 54 85 06 3E */ clrlwi r5, r4, 0x18 -/* 800349C0 00031900 54 80 C6 3E */ rlwinm r0, r4, 0x18, 0x18, 0x1f -/* 800349C4 00031904 7C 03 00 AE */ lbzx r0, r3, r0 -/* 800349C8 00031908 7C A0 00 39 */ and. r0, r5, r0 -/* 800349CC 0003190C 41 82 00 0C */ beq lbl_800349D8 -/* 800349D0 00031910 38 60 00 01 */ li r3, 1 -/* 800349D4 00031914 4E 80 00 20 */ blr -lbl_800349D8: -/* 800349D8 00031918 38 60 00 00 */ li r3, 0 -/* 800349DC 0003191C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034AA4.s b/include/d/d_save/d_save/asm/func_80034AA4.s deleted file mode 100644 index aa3c2c7947..0000000000 --- a/include/d/d_save/d_save/asm/func_80034AA4.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 80034AA4 000319E4 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034AA8 000319E8 54 07 10 3A */ slwi r7, r0, 2 -/* 80034AAC 000319EC 7C C3 38 2E */ lwzx r6, r3, r7 -/* 80034AB0 000319F0 38 A0 00 01 */ li r5, 1 -/* 80034AB4 000319F4 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034AB8 000319F8 7C A0 00 30 */ slw r0, r5, r0 -/* 80034ABC 000319FC 7C C0 03 78 */ or r0, r6, r0 -/* 80034AC0 00031A00 7C 03 39 2E */ stwx r0, r3, r7 -/* 80034AC4 00031A04 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034AC8.s b/include/d/d_save/d_save/asm/func_80034AC8.s deleted file mode 100644 index b1aee300af..0000000000 --- a/include/d/d_save/d_save/asm/func_80034AC8.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 80034AC8 00031A08 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034ACC 00031A0C 54 07 10 3A */ slwi r7, r0, 2 -/* 80034AD0 00031A10 7C C3 38 2E */ lwzx r6, r3, r7 -/* 80034AD4 00031A14 38 A0 00 01 */ li r5, 1 -/* 80034AD8 00031A18 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034ADC 00031A1C 7C A0 00 30 */ slw r0, r5, r0 -/* 80034AE0 00031A20 7C C0 00 78 */ andc r0, r6, r0 -/* 80034AE4 00031A24 7C 03 39 2E */ stwx r0, r3, r7 -/* 80034AE8 00031A28 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034AEC.s b/include/d/d_save/d_save/asm/func_80034AEC.s deleted file mode 100644 index c25232fe95..0000000000 --- a/include/d/d_save/d_save/asm/func_80034AEC.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80034AEC 00031A2C 38 A0 00 01 */ li r5, 1 -/* 80034AF0 00031A30 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034AF4 00031A34 7C A5 00 30 */ slw r5, r5, r0 -/* 80034AF8 00031A38 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034AFC 00031A3C 54 00 10 3A */ slwi r0, r0, 2 -/* 80034B00 00031A40 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80034B04 00031A44 7C A3 00 38 */ and r3, r5, r0 -/* 80034B08 00031A48 30 03 FF FF */ addic r0, r3, -1 -/* 80034B0C 00031A4C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034B10 00031A50 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034B98.s b/include/d/d_save/d_save/asm/func_80034B98.s deleted file mode 100644 index 6f2bbd3f61..0000000000 --- a/include/d/d_save/d_save/asm/func_80034B98.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80034B98 00031AD8 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034B9C 00031ADC 54 00 10 3A */ slwi r0, r0, 2 -/* 80034BA0 00031AE0 7C C3 02 14 */ add r6, r3, r0 -/* 80034BA4 00031AE4 80 A6 00 04 */ lwz r5, 4(r6) -/* 80034BA8 00031AE8 38 60 00 01 */ li r3, 1 -/* 80034BAC 00031AEC 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034BB0 00031AF0 7C 60 00 30 */ slw r0, r3, r0 -/* 80034BB4 00031AF4 7C A0 03 78 */ or r0, r5, r0 -/* 80034BB8 00031AF8 90 06 00 04 */ stw r0, 4(r6) -/* 80034BBC 00031AFC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034BC0.s b/include/d/d_save/d_save/asm/func_80034BC0.s deleted file mode 100644 index c5e7a2a0d9..0000000000 --- a/include/d/d_save/d_save/asm/func_80034BC0.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80034BC0 00031B00 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034BC4 00031B04 54 00 10 3A */ slwi r0, r0, 2 -/* 80034BC8 00031B08 7C C3 02 14 */ add r6, r3, r0 -/* 80034BCC 00031B0C 80 A6 00 04 */ lwz r5, 4(r6) -/* 80034BD0 00031B10 38 60 00 01 */ li r3, 1 -/* 80034BD4 00031B14 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034BD8 00031B18 7C 60 00 30 */ slw r0, r3, r0 -/* 80034BDC 00031B1C 7C A0 00 78 */ andc r0, r5, r0 -/* 80034BE0 00031B20 90 06 00 04 */ stw r0, 4(r6) -/* 80034BE4 00031B24 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034BE8.s b/include/d/d_save/d_save/asm/func_80034BE8.s deleted file mode 100644 index 1c58ba6705..0000000000 --- a/include/d/d_save/d_save/asm/func_80034BE8.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 80034BE8 00031B28 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034BEC 00031B2C 54 00 10 3A */ slwi r0, r0, 2 -/* 80034BF0 00031B30 7C 63 02 14 */ add r3, r3, r0 -/* 80034BF4 00031B34 80 A3 00 04 */ lwz r5, 4(r3) -/* 80034BF8 00031B38 38 60 00 01 */ li r3, 1 -/* 80034BFC 00031B3C 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034C00 00031B40 7C 60 00 30 */ slw r0, r3, r0 -/* 80034C04 00031B44 7C A3 00 38 */ and r3, r5, r0 -/* 80034C08 00031B48 30 03 FF FF */ addic r0, r3, -1 -/* 80034C0C 00031B4C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034C10 00031B50 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034C14.s b/include/d/d_save/d_save/asm/func_80034C14.s deleted file mode 100644 index 7c908da531..0000000000 --- a/include/d/d_save/d_save/asm/func_80034C14.s +++ /dev/null @@ -1,14 +0,0 @@ -/* 80034C14 00031B54 38 A0 00 01 */ li r5, 1 -/* 80034C18 00031B58 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034C1C 00031B5C 7C A5 00 30 */ slw r5, r5, r0 -/* 80034C20 00031B60 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034C24 00031B64 54 00 10 3A */ slwi r0, r0, 2 -/* 80034C28 00031B68 7C 63 02 14 */ add r3, r3, r0 -/* 80034C2C 00031B6C 80 03 00 04 */ lwz r0, 4(r3) -/* 80034C30 00031B70 7C 00 2A 78 */ xor r0, r0, r5 -/* 80034C34 00031B74 90 03 00 04 */ stw r0, 4(r3) -/* 80034C38 00031B78 80 03 00 04 */ lwz r0, 4(r3) -/* 80034C3C 00031B7C 7C 03 28 38 */ and r3, r0, r5 -/* 80034C40 00031B80 30 03 FF FF */ addic r0, r3, -1 -/* 80034C44 00031B84 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034C48 00031B88 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034C4C.s b/include/d/d_save/d_save/asm/func_80034C4C.s deleted file mode 100644 index 155559aaee..0000000000 --- a/include/d/d_save/d_save/asm/func_80034C4C.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80034C4C 00031B8C 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034C50 00031B90 54 00 10 3A */ slwi r0, r0, 2 -/* 80034C54 00031B94 7C C3 02 14 */ add r6, r3, r0 -/* 80034C58 00031B98 80 A6 00 0C */ lwz r5, 0xc(r6) -/* 80034C5C 00031B9C 38 60 00 01 */ li r3, 1 -/* 80034C60 00031BA0 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034C64 00031BA4 7C 60 00 30 */ slw r0, r3, r0 -/* 80034C68 00031BA8 7C A0 03 78 */ or r0, r5, r0 -/* 80034C6C 00031BAC 90 06 00 0C */ stw r0, 0xc(r6) -/* 80034C70 00031BB0 4E 80 00 20 */ blr diff --git a/include/d/d_save/d_save/asm/func_80034C74.s b/include/d/d_save/d_save/asm/func_80034C74.s deleted file mode 100644 index 4ffa1f4939..0000000000 --- a/include/d/d_save/d_save/asm/func_80034C74.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 80034C74 00031BB4 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034C78 00031BB8 54 00 10 3A */ slwi r0, r0, 2 -/* 80034C7C 00031BBC 7C 63 02 14 */ add r3, r3, r0 -/* 80034C80 00031BC0 80 A3 00 0C */ lwz r5, 0xc(r3) -/* 80034C84 00031BC4 38 60 00 01 */ li r3, 1 -/* 80034C88 00031BC8 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034C8C 00031BCC 7C 60 00 30 */ slw r0, r3, r0 -/* 80034C90 00031BD0 7C A3 00 38 */ and r3, r5, r0 -/* 80034C94 00031BD4 30 03 FF FF */ addic r0, r3, -1 -/* 80034C98 00031BD8 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034C9C 00031BDC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034D04.s b/include/d/d_save/d_save/asm/func_80034D04.s deleted file mode 100644 index be6b2fa5a7..0000000000 --- a/include/d/d_save/d_save/asm/func_80034D04.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80034D04 00031C44 7C 80 26 70 */ srawi r0, r4, 4 -/* 80034D08 00031C48 54 07 08 3C */ slwi r7, r0, 1 -/* 80034D0C 00031C4C 7C C3 3A 2E */ lhzx r6, r3, r7 -/* 80034D10 00031C50 38 A0 00 01 */ li r5, 1 -/* 80034D14 00031C54 54 80 07 3E */ clrlwi r0, r4, 0x1c -/* 80034D18 00031C58 7C A0 00 30 */ slw r0, r5, r0 -/* 80034D1C 00031C5C 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 80034D20 00031C60 7C C0 03 78 */ or r0, r6, r0 -/* 80034D24 00031C64 7C 03 3B 2E */ sthx r0, r3, r7 -/* 80034D28 00031C68 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034D2C.s b/include/d/d_save/d_save/asm/func_80034D2C.s deleted file mode 100644 index 407390879c..0000000000 --- a/include/d/d_save/d_save/asm/func_80034D2C.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 80034D2C 00031C6C 7C 80 26 70 */ srawi r0, r4, 4 -/* 80034D30 00031C70 54 07 08 3C */ slwi r7, r0, 1 -/* 80034D34 00031C74 7C C3 3A 2E */ lhzx r6, r3, r7 -/* 80034D38 00031C78 38 A0 00 01 */ li r5, 1 -/* 80034D3C 00031C7C 54 80 07 3E */ clrlwi r0, r4, 0x1c -/* 80034D40 00031C80 7C A0 00 30 */ slw r0, r5, r0 -/* 80034D44 00031C84 7C C0 00 78 */ andc r0, r6, r0 -/* 80034D48 00031C88 7C 03 3B 2E */ sthx r0, r3, r7 -/* 80034D4C 00031C8C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80034D50.s b/include/d/d_save/d_save/asm/func_80034D50.s deleted file mode 100644 index 182fda7d9e..0000000000 --- a/include/d/d_save/d_save/asm/func_80034D50.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80034D50 00031C90 38 A0 00 01 */ li r5, 1 -/* 80034D54 00031C94 54 80 07 3E */ clrlwi r0, r4, 0x1c -/* 80034D58 00031C98 7C A5 00 30 */ slw r5, r5, r0 -/* 80034D5C 00031C9C 7C 80 26 70 */ srawi r0, r4, 4 -/* 80034D60 00031CA0 54 00 08 3C */ slwi r0, r0, 1 -/* 80034D64 00031CA4 7C 03 02 2E */ lhzx r0, r3, r0 -/* 80034D68 00031CA8 7C A3 00 38 */ and r3, r5, r0 -/* 80034D6C 00031CAC 30 03 FF FF */ addic r0, r3, -1 -/* 80034D70 00031CB0 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034D74 00031CB4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_8003501C.s b/include/d/d_save/d_save/asm/func_8003501C.s deleted file mode 100644 index 2c5934a10e..0000000000 --- a/include/d/d_save/d_save/asm/func_8003501C.s +++ /dev/null @@ -1,37 +0,0 @@ -/* 8003501C 00031F5C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80035020 00031F60 7C 08 02 A6 */ mflr r0 -/* 80035024 00031F64 90 01 00 24 */ stw r0, 0x24(r1) -/* 80035028 00031F68 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003502C 00031F6C 48 32 D1 B1 */ bl _savegpr_29 -/* 80035030 00031F70 7C 7D 1B 78 */ mr r29, r3 -/* 80035034 00031F74 4B FF F6 71 */ bl init__12dSv_player_cFv -/* 80035038 00031F78 3B C0 00 00 */ li r30, 0 -/* 8003503C 00031F7C 3B E0 00 00 */ li r31, 0 -lbl_80035040: -/* 80035040 00031F80 38 7F 01 F0 */ addi r3, r31, 0x1f0 -/* 80035044 00031F84 7C 7D 1A 14 */ add r3, r29, r3 -/* 80035048 00031F88 4B FF FA 1D */ bl init__12dSv_memory_cFv -/* 8003504C 00031F8C 3B DE 00 01 */ addi r30, r30, 1 -/* 80035050 00031F90 2C 1E 00 20 */ cmpwi r30, 0x20 -/* 80035054 00031F94 3B FF 00 20 */ addi r31, r31, 0x20 -/* 80035058 00031F98 41 80 FF E8 */ blt lbl_80035040 -/* 8003505C 00031F9C 3B C0 00 00 */ li r30, 0 -/* 80035060 00031FA0 3B E0 00 00 */ li r31, 0 -lbl_80035064: -/* 80035064 00031FA4 38 7F 05 F0 */ addi r3, r31, 0x5f0 -/* 80035068 00031FA8 7C 7D 1A 14 */ add r3, r29, r3 -/* 8003506C 00031FAC 4B FF FA 19 */ bl init__13dSv_memory2_cFv -/* 80035070 00031FB0 3B DE 00 01 */ addi r30, r30, 1 -/* 80035074 00031FB4 2C 1E 00 40 */ cmpwi r30, 0x40 -/* 80035078 00031FB8 3B FF 00 08 */ addi r31, r31, 8 -/* 8003507C 00031FBC 41 80 FF E8 */ blt lbl_80035064 -/* 80035080 00031FC0 38 7D 07 F0 */ addi r3, r29, 0x7f0 -/* 80035084 00031FC4 4B FF F8 D1 */ bl init__11dSv_event_cFv -/* 80035088 00031FC8 38 7D 09 40 */ addi r3, r29, 0x940 -/* 8003508C 00031FCC 4B FF F9 91 */ bl init__14dSv_MiniGame_cFv -/* 80035090 00031FD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80035094 00031FD4 48 32 D1 95 */ bl _restgpr_29 -/* 80035098 00031FD8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003509C 00031FDC 7C 08 03 A6 */ mtlr r0 -/* 800350A0 00031FE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800350A4 00031FE4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800350A8.s b/include/d/d_save/d_save/asm/func_800350A8.s deleted file mode 100644 index df9b53d4b6..0000000000 --- a/include/d/d_save/d_save/asm/func_800350A8.s +++ /dev/null @@ -1,5 +0,0 @@ -/* 800350A8 00031FE8 7C 60 1B 78 */ mr r0, r3 -/* 800350AC 00031FEC 54 83 18 38 */ slwi r3, r4, 3 -/* 800350B0 00031FF0 38 63 05 F0 */ addi r3, r3, 0x5f0 -/* 800350B4 00031FF4 7C 60 1A 14 */ add r3, r0, r3 -/* 800350B8 00031FF8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_8003514C.s b/include/d/d_save/d_save/asm/func_8003514C.s deleted file mode 100644 index 9f99a1386a..0000000000 --- a/include/d/d_save/d_save/asm/func_8003514C.s +++ /dev/null @@ -1,23 +0,0 @@ -/* 8003514C 0003208C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80035150 00032090 7C 08 02 A6 */ mflr r0 -/* 80035154 00032094 90 01 00 24 */ stw r0, 0x24(r1) -/* 80035158 00032098 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003515C 0003209C 48 32 D0 81 */ bl _savegpr_29 -/* 80035160 000320A0 7C 7D 1B 78 */ mr r29, r3 -/* 80035164 000320A4 3B C0 00 00 */ li r30, 0 -/* 80035168 000320A8 3B E0 00 00 */ li r31, 0 -lbl_8003516C: -/* 8003516C 000320AC 38 7F 09 B4 */ addi r3, r31, 0x9b4 -/* 80035170 000320B0 7C 7D 1A 14 */ add r3, r29, r3 -/* 80035174 000320B4 38 80 FF FF */ li r4, -1 -/* 80035178 000320B8 4B FF FD CD */ bl init__10dSv_zone_cFi -/* 8003517C 000320BC 3B DE 00 01 */ addi r30, r30, 1 -/* 80035180 000320C0 2C 1E 00 20 */ cmpwi r30, 0x20 -/* 80035184 000320C4 3B FF 00 20 */ addi r31, r31, 0x20 -/* 80035188 000320C8 41 80 FF E4 */ blt lbl_8003516C -/* 8003518C 000320CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80035190 000320D0 48 32 D0 99 */ bl _restgpr_29 -/* 80035194 000320D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80035198 000320D8 7C 08 03 A6 */ mtlr r0 -/* 8003519C 000320DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800351A0 000320E0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800351A4.s b/include/d/d_save/d_save/asm/func_800351A4.s deleted file mode 100644 index 9579ee90d6..0000000000 --- a/include/d/d_save/d_save/asm/func_800351A4.s +++ /dev/null @@ -1,26 +0,0 @@ -/* 800351A4 000320E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800351A8 000320E8 7C 08 02 A6 */ mflr r0 -/* 800351AC 000320EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800351B0 000320F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800351B4 000320F4 38 63 09 B4 */ addi r3, r3, 0x9b4 -/* 800351B8 000320F8 3B E0 00 00 */ li r31, 0 -/* 800351BC 000320FC 38 00 00 20 */ li r0, 0x20 -/* 800351C0 00032100 7C 09 03 A6 */ mtctr r0 -lbl_800351C4: -/* 800351C4 00032104 88 03 00 00 */ lbz r0, 0(r3) -/* 800351C8 00032108 7C 00 07 75 */ extsb. r0, r0 -/* 800351CC 0003210C 40 80 00 10 */ bge lbl_800351DC -/* 800351D0 00032110 4B FF FD 75 */ bl init__10dSv_zone_cFi -/* 800351D4 00032114 7F E3 FB 78 */ mr r3, r31 -/* 800351D8 00032118 48 00 00 14 */ b lbl_800351EC -lbl_800351DC: -/* 800351DC 0003211C 38 63 00 20 */ addi r3, r3, 0x20 -/* 800351E0 00032120 3B FF 00 01 */ addi r31, r31, 1 -/* 800351E4 00032124 42 00 FF E0 */ bdnz lbl_800351C4 -/* 800351E8 00032128 38 60 FF FF */ li r3, -1 -lbl_800351EC: -/* 800351EC 0003212C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800351F0 00032130 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800351F4 00032134 7C 08 03 A6 */ mtlr r0 -/* 800351F8 00032138 38 21 00 10 */ addi r1, r1, 0x10 -/* 800351FC 0003213C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80035200.s b/include/d/d_save/d_save/asm/func_80035200.s deleted file mode 100644 index d178bfa50c..0000000000 --- a/include/d/d_save/d_save/asm/func_80035200.s +++ /dev/null @@ -1,49 +0,0 @@ -/* 80035200 00032140 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80035204 00032144 7C 08 02 A6 */ mflr r0 -/* 80035208 00032148 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003520C 0003214C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80035210 00032150 93 C1 00 08 */ stw r30, 8(r1) -/* 80035214 00032154 7C 7E 1B 78 */ mr r30, r3 -/* 80035218 00032158 7C 9F 23 78 */ mr r31, r4 -/* 8003521C 0003215C 2C 1F FF FF */ cmpwi r31, -1 -/* 80035220 00032160 41 82 00 78 */ beq lbl_80035298 -/* 80035224 00032164 2C 1F 00 FF */ cmpwi r31, 0xff -/* 80035228 00032168 40 82 00 08 */ bne lbl_80035230 -/* 8003522C 0003216C 48 00 00 6C */ b lbl_80035298 -lbl_80035230: -/* 80035230 00032170 2C 1F 00 80 */ cmpwi r31, 0x80 -/* 80035234 00032174 40 80 00 10 */ bge lbl_80035244 -/* 80035238 00032178 38 7E 09 58 */ addi r3, r30, 0x958 -/* 8003523C 0003217C 4B FF F5 D5 */ bl onSwitch__12dSv_memBit_cFi -/* 80035240 00032180 48 00 00 58 */ b lbl_80035298 -lbl_80035244: -/* 80035244 00032184 2C 1F 00 C0 */ cmpwi r31, 0xc0 -/* 80035248 00032188 40 80 00 14 */ bge lbl_8003525C -/* 8003524C 0003218C 38 7E 09 78 */ addi r3, r30, 0x978 -/* 80035250 00032190 38 9F FF 80 */ addi r4, r31, -128 -/* 80035254 00032194 4B FF F9 45 */ bl onSwitch__12dSv_danBit_cFi -/* 80035258 00032198 48 00 00 40 */ b lbl_80035298 -lbl_8003525C: -/* 8003525C 0003219C 7C A3 2B 78 */ mr r3, r5 -/* 80035260 000321A0 4B FF 87 51 */ bl dStage_roomControl_c_NS_getZoneNo -/* 80035264 000321A4 2C 1F 00 E0 */ cmpwi r31, 0xe0 -/* 80035268 000321A8 40 80 00 1C */ bge lbl_80035284 -/* 8003526C 000321AC 54 63 28 34 */ slwi r3, r3, 5 -/* 80035270 000321B0 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 80035274 000321B4 7C 7E 1A 14 */ add r3, r30, r3 -/* 80035278 000321B8 38 9F FF 40 */ addi r4, r31, -192 -/* 8003527C 000321BC 4B FF FA 89 */ bl onSwitch__13dSv_zoneBit_cFi -/* 80035280 000321C0 48 00 00 18 */ b lbl_80035298 -lbl_80035284: -/* 80035284 000321C4 54 63 28 34 */ slwi r3, r3, 5 -/* 80035288 000321C8 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 8003528C 000321CC 7C 7E 1A 14 */ add r3, r30, r3 -/* 80035290 000321D0 38 9F FF 20 */ addi r4, r31, -224 -/* 80035294 000321D4 4B FF FB 19 */ bl onOneSwitch__13dSv_zoneBit_cFi -lbl_80035298: -/* 80035298 000321D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003529C 000321DC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800352A0 000321E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800352A4 000321E4 7C 08 03 A6 */ mtlr r0 -/* 800352A8 000321E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800352AC 000321EC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80035360.s b/include/d/d_save/d_save/asm/func_80035360.s deleted file mode 100644 index 02fc67854d..0000000000 --- a/include/d/d_save/d_save/asm/func_80035360.s +++ /dev/null @@ -1,59 +0,0 @@ -/* 80035360 000322A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80035364 000322A4 7C 08 02 A6 */ mflr r0 -/* 80035368 000322A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003536C 000322AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80035370 000322B0 93 C1 00 08 */ stw r30, 8(r1) -/* 80035374 000322B4 7C 7E 1B 78 */ mr r30, r3 -/* 80035378 000322B8 7C 9F 23 78 */ mr r31, r4 -/* 8003537C 000322BC 2C 1F FF FF */ cmpwi r31, -1 -/* 80035380 000322C0 41 82 00 0C */ beq lbl_8003538C -/* 80035384 000322C4 2C 1F 00 FF */ cmpwi r31, 0xff -/* 80035388 000322C8 40 82 00 0C */ bne lbl_80035394 -lbl_8003538C: -/* 8003538C 000322CC 38 60 00 00 */ li r3, 0 -/* 80035390 000322D0 48 00 00 84 */ b lbl_80035414 -lbl_80035394: -/* 80035394 000322D4 2C 1F 00 80 */ cmpwi r31, 0x80 -/* 80035398 000322D8 40 80 00 10 */ bge lbl_800353A8 -/* 8003539C 000322DC 38 7E 09 58 */ addi r3, r30, 0x958 -/* 800353A0 000322E0 4B FF F4 C1 */ bl isSwitch__12dSv_memBit_cCFi -/* 800353A4 000322E4 48 00 00 70 */ b lbl_80035414 -lbl_800353A8: -/* 800353A8 000322E8 2C 1F 00 C0 */ cmpwi r31, 0xc0 -/* 800353AC 000322EC 40 80 00 14 */ bge lbl_800353C0 -/* 800353B0 000322F0 38 7E 09 78 */ addi r3, r30, 0x978 -/* 800353B4 000322F4 38 9F FF 80 */ addi r4, r31, -128 -/* 800353B8 000322F8 4B FF F8 31 */ bl isSwitch__12dSv_danBit_cCFi -/* 800353BC 000322FC 48 00 00 58 */ b lbl_80035414 -lbl_800353C0: -/* 800353C0 00032300 7C A3 2B 78 */ mr r3, r5 -/* 800353C4 00032304 4B FF 85 ED */ bl dStage_roomControl_c_NS_getZoneNo -/* 800353C8 00032308 2C 03 00 00 */ cmpwi r3, 0 -/* 800353CC 0003230C 41 80 00 0C */ blt lbl_800353D8 -/* 800353D0 00032310 2C 03 00 20 */ cmpwi r3, 0x20 -/* 800353D4 00032314 41 80 00 0C */ blt lbl_800353E0 -lbl_800353D8: -/* 800353D8 00032318 38 60 00 00 */ li r3, 0 -/* 800353DC 0003231C 48 00 00 38 */ b lbl_80035414 -lbl_800353E0: -/* 800353E0 00032320 2C 1F 00 E0 */ cmpwi r31, 0xe0 -/* 800353E4 00032324 40 80 00 1C */ bge lbl_80035400 -/* 800353E8 00032328 54 63 28 34 */ slwi r3, r3, 5 -/* 800353EC 0003232C 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 800353F0 00032330 7C 7E 1A 14 */ add r3, r30, r3 -/* 800353F4 00032334 38 9F FF 40 */ addi r4, r31, -192 -/* 800353F8 00032338 4B FF F9 59 */ bl isSwitch__13dSv_zoneBit_cCFi -/* 800353FC 0003233C 48 00 00 18 */ b lbl_80035414 -lbl_80035400: -/* 80035400 00032340 54 63 28 34 */ slwi r3, r3, 5 -/* 80035404 00032344 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 80035408 00032348 7C 7E 1A 14 */ add r3, r30, r3 -/* 8003540C 0003234C 38 9F FF 20 */ addi r4, r31, -224 -/* 80035410 00032350 4B FF F9 D1 */ bl isOneSwitch__13dSv_zoneBit_cCFi -lbl_80035414: -/* 80035414 00032354 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80035418 00032358 83 C1 00 08 */ lwz r30, 8(r1) -/* 8003541C 0003235C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80035420 00032360 7C 08 03 A6 */ mtlr r0 -/* 80035424 00032364 38 21 00 10 */ addi r1, r1, 0x10 -/* 80035428 00032368 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_8003542C.s b/include/d/d_save/d_save/asm/func_8003542C.s deleted file mode 100644 index c6a5fda5ec..0000000000 --- a/include/d/d_save/d_save/asm/func_8003542C.s +++ /dev/null @@ -1,51 +0,0 @@ -/* 8003542C 0003236C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80035430 00032370 7C 08 02 A6 */ mflr r0 -/* 80035434 00032374 90 01 00 14 */ stw r0, 0x14(r1) -/* 80035438 00032378 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003543C 0003237C 93 C1 00 08 */ stw r30, 8(r1) -/* 80035440 00032380 7C 7E 1B 78 */ mr r30, r3 -/* 80035444 00032384 7C 9F 23 78 */ mr r31, r4 -/* 80035448 00032388 2C 1F FF FF */ cmpwi r31, -1 -/* 8003544C 0003238C 41 82 00 0C */ beq lbl_80035458 -/* 80035450 00032390 2C 1F 00 FF */ cmpwi r31, 0xff -/* 80035454 00032394 40 82 00 0C */ bne lbl_80035460 -lbl_80035458: -/* 80035458 00032398 38 60 00 00 */ li r3, 0 -/* 8003545C 0003239C 48 00 00 6C */ b lbl_800354C8 -lbl_80035460: -/* 80035460 000323A0 2C 1F 00 80 */ cmpwi r31, 0x80 -/* 80035464 000323A4 40 80 00 10 */ bge lbl_80035474 -/* 80035468 000323A8 38 7E 09 58 */ addi r3, r30, 0x958 -/* 8003546C 000323AC 4B FF F4 21 */ bl revSwitch__12dSv_memBit_cFi -/* 80035470 000323B0 48 00 00 58 */ b lbl_800354C8 -lbl_80035474: -/* 80035474 000323B4 2C 1F 00 C0 */ cmpwi r31, 0xc0 -/* 80035478 000323B8 40 80 00 14 */ bge lbl_8003548C -/* 8003547C 000323BC 38 7E 09 78 */ addi r3, r30, 0x978 -/* 80035480 000323C0 38 9F FF 80 */ addi r4, r31, -128 -/* 80035484 000323C4 4B FF F7 91 */ bl revSwitch__12dSv_danBit_cFi -/* 80035488 000323C8 48 00 00 40 */ b lbl_800354C8 -lbl_8003548C: -/* 8003548C 000323CC 7C A3 2B 78 */ mr r3, r5 -/* 80035490 000323D0 4B FF 85 21 */ bl dStage_roomControl_c_NS_getZoneNo -/* 80035494 000323D4 2C 1F 00 E0 */ cmpwi r31, 0xe0 -/* 80035498 000323D8 40 80 00 1C */ bge lbl_800354B4 -/* 8003549C 000323DC 54 63 28 34 */ slwi r3, r3, 5 -/* 800354A0 000323E0 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 800354A4 000323E4 7C 7E 1A 14 */ add r3, r30, r3 -/* 800354A8 000323E8 38 9F FF 40 */ addi r4, r31, -192 -/* 800354AC 000323EC 4B FF F8 CD */ bl revSwitch__13dSv_zoneBit_cFi -/* 800354B0 000323F0 48 00 00 18 */ b lbl_800354C8 -lbl_800354B4: -/* 800354B4 000323F4 54 63 28 34 */ slwi r3, r3, 5 -/* 800354B8 000323F8 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 800354BC 000323FC 7C 7E 1A 14 */ add r3, r30, r3 -/* 800354C0 00032400 38 9F FF 20 */ addi r4, r31, -224 -/* 800354C4 00032404 4B FF F9 39 */ bl revOneSwitch__13dSv_zoneBit_cFi -lbl_800354C8: -/* 800354C8 00032408 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800354CC 0003240C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800354D0 00032410 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800354D4 00032414 7C 08 03 A6 */ mtlr r0 -/* 800354D8 00032418 38 21 00 10 */ addi r1, r1, 0x10 -/* 800354DC 0003241C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80035590.s b/include/d/d_save/d_save/asm/func_80035590.s deleted file mode 100644 index ce0990e41a..0000000000 --- a/include/d/d_save/d_save/asm/func_80035590.s +++ /dev/null @@ -1,51 +0,0 @@ -/* 80035590 000324D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80035594 000324D4 7C 08 02 A6 */ mflr r0 -/* 80035598 000324D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003559C 000324DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800355A0 000324E0 93 C1 00 08 */ stw r30, 8(r1) -/* 800355A4 000324E4 7C 7E 1B 78 */ mr r30, r3 -/* 800355A8 000324E8 7C 9F 23 78 */ mr r31, r4 -/* 800355AC 000324EC 2C 1F FF FF */ cmpwi r31, -1 -/* 800355B0 000324F0 41 82 00 0C */ beq lbl_800355BC -/* 800355B4 000324F4 2C 1F 00 FF */ cmpwi r31, 0xff -/* 800355B8 000324F8 40 82 00 0C */ bne lbl_800355C4 -lbl_800355BC: -/* 800355BC 000324FC 38 60 00 00 */ li r3, 0 -/* 800355C0 00032500 48 00 00 6C */ b lbl_8003562C -lbl_800355C4: -/* 800355C4 00032504 2C 1F 00 80 */ cmpwi r31, 0x80 -/* 800355C8 00032508 40 80 00 10 */ bge lbl_800355D8 -/* 800355CC 0003250C 38 7E 09 78 */ addi r3, r30, 0x978 -/* 800355D0 00032510 4B FF F6 A5 */ bl isItem__12dSv_danBit_cCFi -/* 800355D4 00032514 48 00 00 58 */ b lbl_8003562C -lbl_800355D8: -/* 800355D8 00032518 2C 1F 00 A0 */ cmpwi r31, 0xa0 -/* 800355DC 0003251C 40 80 00 14 */ bge lbl_800355F0 -/* 800355E0 00032520 38 7E 09 58 */ addi r3, r30, 0x958 -/* 800355E4 00032524 38 9F FF 80 */ addi r4, r31, -128 -/* 800355E8 00032528 4B FF F3 05 */ bl isItem__12dSv_memBit_cCFi -/* 800355EC 0003252C 48 00 00 40 */ b lbl_8003562C -lbl_800355F0: -/* 800355F0 00032530 7C A3 2B 78 */ mr r3, r5 -/* 800355F4 00032534 4B FF 83 BD */ bl dStage_roomControl_c_NS_getZoneNo -/* 800355F8 00032538 2C 1F 00 C0 */ cmpwi r31, 0xc0 -/* 800355FC 0003253C 40 80 00 1C */ bge lbl_80035618 -/* 80035600 00032540 54 63 28 34 */ slwi r3, r3, 5 -/* 80035604 00032544 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 80035608 00032548 7C 7E 1A 14 */ add r3, r30, r3 -/* 8003560C 0003254C 38 9F FF 60 */ addi r4, r31, -160 -/* 80035610 00032550 4B FF F8 41 */ bl isItem__13dSv_zoneBit_cCFi -/* 80035614 00032554 48 00 00 18 */ b lbl_8003562C -lbl_80035618: -/* 80035618 00032558 54 63 28 34 */ slwi r3, r3, 5 -/* 8003561C 0003255C 38 63 09 B6 */ addi r3, r3, 0x9b6 -/* 80035620 00032560 7C 7E 1A 14 */ add r3, r30, r3 -/* 80035624 00032564 38 9F FF 40 */ addi r4, r31, -192 -/* 80035628 00032568 4B FF F8 71 */ bl isOneItem__13dSv_zoneBit_cCFi -lbl_8003562C: -/* 8003562C 0003256C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80035630 00032570 83 C1 00 08 */ lwz r30, 8(r1) -/* 80035634 00032574 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80035638 00032578 7C 08 03 A6 */ mtlr r0 -/* 8003563C 0003257C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80035640 00032580 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800356B4.s b/include/d/d_save/d_save/asm/func_800356B4.s deleted file mode 100644 index 0ccd29c26f..0000000000 --- a/include/d/d_save/d_save/asm/func_800356B4.s +++ /dev/null @@ -1,30 +0,0 @@ -/* 800356B4 000325F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800356B8 000325F8 7C 08 02 A6 */ mflr r0 -/* 800356BC 000325FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800356C0 00032600 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800356C4 00032604 93 C1 00 08 */ stw r30, 8(r1) -/* 800356C8 00032608 7C 7E 1B 78 */ mr r30, r3 -/* 800356CC 0003260C 7C 9F 23 78 */ mr r31, r4 -/* 800356D0 00032610 2C 1F FF FF */ cmpwi r31, -1 -/* 800356D4 00032614 41 82 00 38 */ beq lbl_8003570C -/* 800356D8 00032618 3C 1F 00 00 */ addis r0, r31, 0 -/* 800356DC 0003261C 28 00 FF FF */ cmplwi r0, 0xffff -/* 800356E0 00032620 41 82 00 2C */ beq lbl_8003570C -/* 800356E4 00032624 2C 05 FF FF */ cmpwi r5, -1 -/* 800356E8 00032628 40 82 00 08 */ bne lbl_800356F0 -/* 800356EC 0003262C 48 00 00 20 */ b lbl_8003570C -lbl_800356F0: -/* 800356F0 00032630 7C A3 2B 78 */ mr r3, r5 -/* 800356F4 00032634 4B FF 82 BD */ bl dStage_roomControl_c_NS_getZoneNo -/* 800356F8 00032638 54 63 28 34 */ slwi r3, r3, 5 -/* 800356FC 0003263C 38 63 09 C4 */ addi r3, r3, 0x9c4 -/* 80035700 00032640 7C 7E 1A 14 */ add r3, r30, r3 -/* 80035704 00032644 7F E4 FB 78 */ mr r4, r31 -/* 80035708 00032648 4B FF F7 F1 */ bl off__15dSv_zoneActor_cFi -lbl_8003570C: -/* 8003570C 0003264C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80035710 00032650 83 C1 00 08 */ lwz r30, 8(r1) -/* 80035714 00032654 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80035718 00032658 7C 08 03 A6 */ mtlr r0 -/* 8003571C 0003265C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80035720 00032660 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80035724.s b/include/d/d_save/d_save/asm/func_80035724.s deleted file mode 100644 index 0c3c2fc4f5..0000000000 --- a/include/d/d_save/d_save/asm/func_80035724.s +++ /dev/null @@ -1,32 +0,0 @@ -/* 80035724 00032664 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80035728 00032668 7C 08 02 A6 */ mflr r0 -/* 8003572C 0003266C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80035730 00032670 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80035734 00032674 93 C1 00 08 */ stw r30, 8(r1) -/* 80035738 00032678 7C 7E 1B 78 */ mr r30, r3 -/* 8003573C 0003267C 7C 9F 23 78 */ mr r31, r4 -/* 80035740 00032680 2C 1F FF FF */ cmpwi r31, -1 -/* 80035744 00032684 41 82 00 18 */ beq lbl_8003575C -/* 80035748 00032688 3C 1F 00 00 */ addis r0, r31, 0 -/* 8003574C 0003268C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80035750 00032690 41 82 00 0C */ beq lbl_8003575C -/* 80035754 00032694 2C 05 FF FF */ cmpwi r5, -1 -/* 80035758 00032698 40 82 00 0C */ bne lbl_80035764 -lbl_8003575C: -/* 8003575C 0003269C 38 60 00 00 */ li r3, 0 -/* 80035760 000326A0 48 00 00 20 */ b lbl_80035780 -lbl_80035764: -/* 80035764 000326A4 7C A3 2B 78 */ mr r3, r5 -/* 80035768 000326A8 4B FF 82 49 */ bl dStage_roomControl_c_NS_getZoneNo -/* 8003576C 000326AC 54 63 28 34 */ slwi r3, r3, 5 -/* 80035770 000326B0 38 63 09 C4 */ addi r3, r3, 0x9c4 -/* 80035774 000326B4 7C 7E 1A 14 */ add r3, r30, r3 -/* 80035778 000326B8 7F E4 FB 78 */ mr r4, r31 -/* 8003577C 000326BC 4B FF F7 A1 */ bl is__15dSv_zoneActor_cCFi -lbl_80035780: -/* 80035780 000326C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80035784 000326C4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80035788 000326C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003578C 000326CC 7C 08 03 A6 */ mtlr r0 -/* 80035790 000326D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80035794 000326D4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80023E94.s b/include/d/d_stage/asm/func_80023E94.s deleted file mode 100644 index cf6c3c02ad..0000000000 --- a/include/d/d_stage/asm/func_80023E94.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 80023E94 00020DD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80023E98 00020DD8 7C 08 02 A6 */ mflr r0 -/* 80023E9C 00020DDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80023EA0 00020DE0 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80023EA4 00020DE4 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80023EA8 00020DE8 38 63 00 08 */ addi r3, r3, 8 -/* 80023EAC 00020DEC 4C C6 31 82 */ crclr 6 -/* 80023EB0 00020DF0 4B FE 2D 5D */ bl OSReport_Error -/* 80023EB4 00020DF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80023EB8 00020DF8 7C 08 03 A6 */ mtlr r0 -/* 80023EBC 00020DFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80023EC0 00020E00 4E 80 00 20 */ blr diff --git a/include/d/d_stage/asm/func_80023EC4.s b/include/d/d_stage/asm/func_80023EC4.s deleted file mode 100644 index f6d0ef213e..0000000000 --- a/include/d/d_stage/asm/func_80023EC4.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 80023EC4 00020E04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80023EC8 00020E08 7C 08 02 A6 */ mflr r0 -/* 80023ECC 00020E0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80023ED0 00020E10 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80023ED4 00020E14 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80023ED8 00020E18 38 63 00 49 */ addi r3, r3, 0x49 -/* 80023EDC 00020E1C 4C C6 31 82 */ crclr 6 -/* 80023EE0 00020E20 4B FE 2D 2D */ bl OSReport_Error -/* 80023EE4 00020E24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80023EE8 00020E28 7C 08 03 A6 */ mtlr r0 -/* 80023EEC 00020E2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80023EF0 00020E30 4E 80 00 20 */ blr diff --git a/include/d/d_stage/asm/func_8002419C.s b/include/d/d_stage/asm/func_8002419C.s deleted file mode 100644 index da3be74a7c..0000000000 --- a/include/d/d_stage/asm/func_8002419C.s +++ /dev/null @@ -1,19 +0,0 @@ -/* 8002419C 000210DC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800241A0 000210E0 7C 08 02 A6 */ mflr r0 -/* 800241A4 000210E4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800241A8 000210E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800241AC 000210EC 48 33 E0 2D */ bl _savegpr_28 -/* 800241B0 000210F0 7C 7C 1B 78 */ mr r28, r3 -/* 800241B4 000210F4 7C BD 2B 78 */ mr r29, r5 -/* 800241B8 000210F8 7C DE 33 78 */ mr r30, r6 -/* 800241BC 000210FC 7C FF 3B 78 */ mr r31, r7 -/* 800241C0 00021100 48 34 49 6D */ bl strcpy -/* 800241C4 00021104 9B BC 00 0A */ stb r29, 0xa(r28) -/* 800241C8 00021108 B3 DC 00 08 */ sth r30, 8(r28) -/* 800241CC 0002110C 9B FC 00 0B */ stb r31, 0xb(r28) -/* 800241D0 00021110 39 61 00 20 */ addi r11, r1, 0x20 -/* 800241D4 00021114 48 33 E0 51 */ bl _restgpr_28 -/* 800241D8 00021118 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800241DC 0002111C 7C 08 03 A6 */ mtlr r0 -/* 800241E0 00021120 38 21 00 20 */ addi r1, r1, 0x20 -/* 800241E4 00021124 4E 80 00 20 */ blr diff --git a/include/d/d_stage/asm/func_80027524.s b/include/d/d_stage/asm/func_80027524.s deleted file mode 100644 index e267b5bd6c..0000000000 --- a/include/d/d_stage/asm/func_80027524.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027524 00024464 90 83 00 34 */ stw r4, 0x34(r3) -/* 80027528 00024468 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002752C.s b/include/d/d_stage/asm/func_8002752C.s deleted file mode 100644 index 5031c93764..0000000000 --- a/include/d/d_stage/asm/func_8002752C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 8002752C 0002446C 80 63 00 34 */ lwz r3, 0x34(r3) -/* 80027530 00024470 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027534.s b/include/d/d_stage/asm/func_80027534.s deleted file mode 100644 index 28a82611c9..0000000000 --- a/include/d/d_stage/asm/func_80027534.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027534 00024474 90 83 00 38 */ stw r4, 0x38(r3) -/* 80027538 00024478 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002753C.s b/include/d/d_stage/asm/func_8002753C.s deleted file mode 100644 index bc6de28f1d..0000000000 --- a/include/d/d_stage/asm/func_8002753C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 8002753C 0002447C 80 63 00 38 */ lwz r3, 0x38(r3) -/* 80027540 00024480 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027544.s b/include/d/d_stage/asm/func_80027544.s deleted file mode 100644 index fb5655ed55..0000000000 --- a/include/d/d_stage/asm/func_80027544.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027544 00024484 90 83 00 28 */ stw r4, 0x28(r3) -/* 80027548 00024488 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002754C.s b/include/d/d_stage/asm/func_8002754C.s deleted file mode 100644 index df8a61ae77..0000000000 --- a/include/d/d_stage/asm/func_8002754C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 8002754C 0002448C B0 83 00 60 */ sth r4, 0x60(r3) -/* 80027550 00024490 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027554.s b/include/d/d_stage/asm/func_80027554.s deleted file mode 100644 index 8479a7f4ba..0000000000 --- a/include/d/d_stage/asm/func_80027554.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027554 00024494 A0 63 00 60 */ lhz r3, 0x60(r3) -/* 80027558 00024498 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002755C.s b/include/d/d_stage/asm/func_8002755C.s deleted file mode 100644 index 7c019c135c..0000000000 --- a/include/d/d_stage/asm/func_8002755C.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 8002755C 0002449C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027560 000244A0 7C 08 02 A6 */ mflr r0 -/* 80027564 000244A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027568 000244A8 4B FF C9 2D */ bl dStage_SetErrorRoom -/* 8002756C 000244AC 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027570 000244B0 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027574 000244B4 38 63 01 6F */ addi r3, r3, 0x16f -/* 80027578 000244B8 4C C6 31 82 */ crclr 6 -/* 8002757C 000244BC 4B FD F5 41 */ bl OSReport -/* 80027580 000244C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027584 000244C4 7C 08 03 A6 */ mtlr r0 -/* 80027588 000244C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002758C 000244CC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027590.s b/include/d/d_stage/asm/func_80027590.s deleted file mode 100644 index 1a0aacd063..0000000000 --- a/include/d/d_stage/asm/func_80027590.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027590 000244D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027594 000244D4 7C 08 02 A6 */ mflr r0 -/* 80027598 000244D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002759C 000244DC 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800275A0 000244E0 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800275A4 000244E4 38 63 01 6F */ addi r3, r3, 0x16f -/* 800275A8 000244E8 4C C6 31 82 */ crclr 6 -/* 800275AC 000244EC 4B FD F5 11 */ bl OSReport -/* 800275B0 000244F0 38 60 00 00 */ li r3, 0 -/* 800275B4 000244F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800275B8 000244F8 7C 08 03 A6 */ mtlr r0 -/* 800275BC 000244FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800275C0 00024500 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800275C4.s b/include/d/d_stage/asm/func_800275C4.s deleted file mode 100644 index 5b1d7c254b..0000000000 --- a/include/d/d_stage/asm/func_800275C4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 800275C4 00024504 90 83 00 10 */ stw r4, 0x10(r3) -/* 800275C8 00024508 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800275CC.s b/include/d/d_stage/asm/func_800275CC.s deleted file mode 100644 index 2226a1700e..0000000000 --- a/include/d/d_stage/asm/func_800275CC.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 800275CC 0002450C 80 63 00 10 */ lwz r3, 0x10(r3) -/* 800275D0 00024510 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800275D4.s b/include/d/d_stage/asm/func_800275D4.s deleted file mode 100644 index c2286b084a..0000000000 --- a/include/d/d_stage/asm/func_800275D4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 800275D4 00024514 90 83 00 14 */ stw r4, 0x14(r3) -/* 800275D8 00024518 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800275DC.s b/include/d/d_stage/asm/func_800275DC.s deleted file mode 100644 index 939ed7b827..0000000000 --- a/include/d/d_stage/asm/func_800275DC.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800275DC 0002451C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800275E0 00024520 7C 08 02 A6 */ mflr r0 -/* 800275E4 00024524 90 01 00 14 */ stw r0, 0x14(r1) -/* 800275E8 00024528 4B FF C8 AD */ bl dStage_SetErrorRoom -/* 800275EC 0002452C 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800275F0 00024530 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800275F4 00024534 38 63 01 86 */ addi r3, r3, 0x186 -/* 800275F8 00024538 4C C6 31 82 */ crclr 6 -/* 800275FC 0002453C 4B FD F4 C1 */ bl OSReport -/* 80027600 00024540 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027604 00024544 7C 08 03 A6 */ mtlr r0 -/* 80027608 00024548 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002760C 0002454C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027610.s b/include/d/d_stage/asm/func_80027610.s deleted file mode 100644 index 2d22f09a6a..0000000000 --- a/include/d/d_stage/asm/func_80027610.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027610 00024550 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027614 00024554 7C 08 02 A6 */ mflr r0 -/* 80027618 00024558 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002761C 0002455C 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027620 00024560 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027624 00024564 38 63 01 86 */ addi r3, r3, 0x186 -/* 80027628 00024568 4C C6 31 82 */ crclr 6 -/* 8002762C 0002456C 4B FD F4 91 */ bl OSReport -/* 80027630 00024570 38 60 00 00 */ li r3, 0 -/* 80027634 00024574 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027638 00024578 7C 08 03 A6 */ mtlr r0 -/* 8002763C 0002457C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027640 00024580 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027644.s b/include/d/d_stage/asm/func_80027644.s deleted file mode 100644 index e7f9954195..0000000000 --- a/include/d/d_stage/asm/func_80027644.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027644 00024584 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027648 00024588 7C 08 02 A6 */ mflr r0 -/* 8002764C 0002458C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027650 00024590 4B FF C8 45 */ bl dStage_SetErrorRoom -/* 80027654 00024594 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027658 00024598 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 8002765C 0002459C 38 63 01 9E */ addi r3, r3, 0x19e -/* 80027660 000245A0 4C C6 31 82 */ crclr 6 -/* 80027664 000245A4 4B FD F4 59 */ bl OSReport -/* 80027668 000245A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002766C 000245AC 7C 08 03 A6 */ mtlr r0 -/* 80027670 000245B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027674 000245B4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027678.s b/include/d/d_stage/asm/func_80027678.s deleted file mode 100644 index 952612edd5..0000000000 --- a/include/d/d_stage/asm/func_80027678.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027678 000245B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002767C 000245BC 7C 08 02 A6 */ mflr r0 -/* 80027680 000245C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027684 000245C4 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027688 000245C8 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 8002768C 000245CC 38 63 01 9E */ addi r3, r3, 0x19e -/* 80027690 000245D0 4C C6 31 82 */ crclr 6 -/* 80027694 000245D4 4B FD F4 29 */ bl OSReport -/* 80027698 000245D8 38 60 00 00 */ li r3, 0 -/* 8002769C 000245DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800276A0 000245E0 7C 08 03 A6 */ mtlr r0 -/* 800276A4 000245E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800276A8 000245E8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800276AC.s b/include/d/d_stage/asm/func_800276AC.s deleted file mode 100644 index 4cf85e3506..0000000000 --- a/include/d/d_stage/asm/func_800276AC.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800276AC 000245EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800276B0 000245F0 7C 08 02 A6 */ mflr r0 -/* 800276B4 000245F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800276B8 000245F8 4B FF C7 DD */ bl dStage_SetErrorRoom -/* 800276BC 000245FC 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800276C0 00024600 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800276C4 00024604 38 63 01 B8 */ addi r3, r3, 0x1b8 -/* 800276C8 00024608 4C C6 31 82 */ crclr 6 -/* 800276CC 0002460C 4B FD F3 F1 */ bl OSReport -/* 800276D0 00024610 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800276D4 00024614 7C 08 03 A6 */ mtlr r0 -/* 800276D8 00024618 38 21 00 10 */ addi r1, r1, 0x10 -/* 800276DC 0002461C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800276E0.s b/include/d/d_stage/asm/func_800276E0.s deleted file mode 100644 index 69208b1991..0000000000 --- a/include/d/d_stage/asm/func_800276E0.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800276E0 00024620 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800276E4 00024624 7C 08 02 A6 */ mflr r0 -/* 800276E8 00024628 90 01 00 14 */ stw r0, 0x14(r1) -/* 800276EC 0002462C 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800276F0 00024630 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800276F4 00024634 38 63 01 B8 */ addi r3, r3, 0x1b8 -/* 800276F8 00024638 4C C6 31 82 */ crclr 6 -/* 800276FC 0002463C 4B FD F3 C1 */ bl OSReport -/* 80027700 00024640 38 60 00 00 */ li r3, 0 -/* 80027704 00024644 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027708 00024648 7C 08 03 A6 */ mtlr r0 -/* 8002770C 0002464C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027710 00024650 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027714.s b/include/d/d_stage/asm/func_80027714.s deleted file mode 100644 index 8f4289c80c..0000000000 --- a/include/d/d_stage/asm/func_80027714.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027714 00024654 90 83 00 18 */ stw r4, 0x18(r3) -/* 80027718 00024658 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002771C.s b/include/d/d_stage/asm/func_8002771C.s deleted file mode 100644 index 77d71c335d..0000000000 --- a/include/d/d_stage/asm/func_8002771C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 8002771C 0002465C 80 63 00 18 */ lwz r3, 0x18(r3) -/* 80027720 00024660 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027724.s b/include/d/d_stage/asm/func_80027724.s deleted file mode 100644 index eabe88b406..0000000000 --- a/include/d/d_stage/asm/func_80027724.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027724 00024664 90 83 00 1C */ stw r4, 0x1c(r3) -/* 80027728 00024668 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002772C.s b/include/d/d_stage/asm/func_8002772C.s deleted file mode 100644 index 7560a49a47..0000000000 --- a/include/d/d_stage/asm/func_8002772C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 8002772C 0002466C 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80027730 00024670 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027734.s b/include/d/d_stage/asm/func_80027734.s deleted file mode 100644 index 38d2c3ac12..0000000000 --- a/include/d/d_stage/asm/func_80027734.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027734 00024674 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027738 00024678 7C 08 02 A6 */ mflr r0 -/* 8002773C 0002467C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027740 00024680 4B FF C7 55 */ bl dStage_SetErrorRoom -/* 80027744 00024684 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027748 00024688 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 8002774C 0002468C 38 63 01 CF */ addi r3, r3, 0x1cf -/* 80027750 00024690 4C C6 31 82 */ crclr 6 -/* 80027754 00024694 4B FD F3 69 */ bl OSReport -/* 80027758 00024698 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002775C 0002469C 7C 08 03 A6 */ mtlr r0 -/* 80027760 000246A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027764 000246A4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027768.s b/include/d/d_stage/asm/func_80027768.s deleted file mode 100644 index 4f569f7982..0000000000 --- a/include/d/d_stage/asm/func_80027768.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027768 000246A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002776C 000246AC 7C 08 02 A6 */ mflr r0 -/* 80027770 000246B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027774 000246B4 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027778 000246B8 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 8002777C 000246BC 38 63 01 CF */ addi r3, r3, 0x1cf -/* 80027780 000246C0 4C C6 31 82 */ crclr 6 -/* 80027784 000246C4 4B FD F3 39 */ bl OSReport -/* 80027788 000246C8 38 60 00 00 */ li r3, 0 -/* 8002778C 000246CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027790 000246D0 7C 08 03 A6 */ mtlr r0 -/* 80027794 000246D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027798 000246D8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002779C.s b/include/d/d_stage/asm/func_8002779C.s deleted file mode 100644 index f27869e7d5..0000000000 --- a/include/d/d_stage/asm/func_8002779C.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 8002779C 000246DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800277A0 000246E0 7C 08 02 A6 */ mflr r0 -/* 800277A4 000246E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800277A8 000246E8 4B FF C6 ED */ bl dStage_SetErrorRoom -/* 800277AC 000246EC 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800277B0 000246F0 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800277B4 000246F4 38 63 01 E8 */ addi r3, r3, 0x1e8 -/* 800277B8 000246F8 4C C6 31 82 */ crclr 6 -/* 800277BC 000246FC 4B FD F3 01 */ bl OSReport -/* 800277C0 00024700 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800277C4 00024704 7C 08 03 A6 */ mtlr r0 -/* 800277C8 00024708 38 21 00 10 */ addi r1, r1, 0x10 -/* 800277CC 0002470C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800277D0.s b/include/d/d_stage/asm/func_800277D0.s deleted file mode 100644 index 9c3401c88c..0000000000 --- a/include/d/d_stage/asm/func_800277D0.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800277D0 00024710 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800277D4 00024714 7C 08 02 A6 */ mflr r0 -/* 800277D8 00024718 90 01 00 14 */ stw r0, 0x14(r1) -/* 800277DC 0002471C 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800277E0 00024720 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800277E4 00024724 38 63 01 E8 */ addi r3, r3, 0x1e8 -/* 800277E8 00024728 4C C6 31 82 */ crclr 6 -/* 800277EC 0002472C 4B FD F2 D1 */ bl OSReport -/* 800277F0 00024730 38 60 00 00 */ li r3, 0 -/* 800277F4 00024734 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800277F8 00024738 7C 08 03 A6 */ mtlr r0 -/* 800277FC 0002473C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027800 00024740 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027804.s b/include/d/d_stage/asm/func_80027804.s deleted file mode 100644 index 6f4aac605f..0000000000 --- a/include/d/d_stage/asm/func_80027804.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027804 00024744 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027808 00024748 7C 08 02 A6 */ mflr r0 -/* 8002780C 0002474C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027810 00024750 4B FF C6 85 */ bl dStage_SetErrorRoom -/* 80027814 00024754 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027818 00024758 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 8002781C 0002475C 38 63 02 06 */ addi r3, r3, 0x206 -/* 80027820 00024760 4C C6 31 82 */ crclr 6 -/* 80027824 00024764 4B FD F2 99 */ bl OSReport -/* 80027828 00024768 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002782C 0002476C 7C 08 03 A6 */ mtlr r0 -/* 80027830 00024770 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027834 00024774 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027838.s b/include/d/d_stage/asm/func_80027838.s deleted file mode 100644 index 1ad0409032..0000000000 --- a/include/d/d_stage/asm/func_80027838.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027838 00024778 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002783C 0002477C 7C 08 02 A6 */ mflr r0 -/* 80027840 00024780 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027844 00024784 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027848 00024788 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 8002784C 0002478C 38 63 02 06 */ addi r3, r3, 0x206 -/* 80027850 00024790 4C C6 31 82 */ crclr 6 -/* 80027854 00024794 4B FD F2 69 */ bl OSReport -/* 80027858 00024798 38 60 00 00 */ li r3, 0 -/* 8002785C 0002479C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027860 000247A0 7C 08 03 A6 */ mtlr r0 -/* 80027864 000247A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027868 000247A8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002786C.s b/include/d/d_stage/asm/func_8002786C.s deleted file mode 100644 index 3a6768d2e3..0000000000 --- a/include/d/d_stage/asm/func_8002786C.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 8002786C 000247AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027870 000247B0 7C 08 02 A6 */ mflr r0 -/* 80027874 000247B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027878 000247B8 4B FF C6 1D */ bl dStage_SetErrorRoom -/* 8002787C 000247BC 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027880 000247C0 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027884 000247C4 38 63 02 24 */ addi r3, r3, 0x224 -/* 80027888 000247C8 4C C6 31 82 */ crclr 6 -/* 8002788C 000247CC 4B FD F2 31 */ bl OSReport -/* 80027890 000247D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027894 000247D4 7C 08 03 A6 */ mtlr r0 -/* 80027898 000247D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002789C 000247DC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800278A0.s b/include/d/d_stage/asm/func_800278A0.s deleted file mode 100644 index a0e8290c0c..0000000000 --- a/include/d/d_stage/asm/func_800278A0.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800278A0 000247E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800278A4 000247E4 7C 08 02 A6 */ mflr r0 -/* 800278A8 000247E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800278AC 000247EC 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800278B0 000247F0 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800278B4 000247F4 38 63 02 24 */ addi r3, r3, 0x224 -/* 800278B8 000247F8 4C C6 31 82 */ crclr 6 -/* 800278BC 000247FC 4B FD F2 01 */ bl OSReport -/* 800278C0 00024800 38 60 00 00 */ li r3, 0 -/* 800278C4 00024804 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800278C8 00024808 7C 08 03 A6 */ mtlr r0 -/* 800278CC 0002480C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800278D0 00024810 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800278D4.s b/include/d/d_stage/asm/func_800278D4.s deleted file mode 100644 index 81f6a279c2..0000000000 --- a/include/d/d_stage/asm/func_800278D4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 800278D4 00024814 90 83 00 64 */ stw r4, 0x64(r3) -/* 800278D8 00024818 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800278DC.s b/include/d/d_stage/asm/func_800278DC.s deleted file mode 100644 index cf4be9a10e..0000000000 --- a/include/d/d_stage/asm/func_800278DC.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 800278DC 0002481C 80 63 00 64 */ lwz r3, 0x64(r3) -/* 800278E0 00024820 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800278E4.s b/include/d/d_stage/asm/func_800278E4.s deleted file mode 100644 index bb3f5a7f54..0000000000 --- a/include/d/d_stage/asm/func_800278E4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 800278E4 00024824 90 83 00 68 */ stw r4, 0x68(r3) -/* 800278E8 00024828 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800278EC.s b/include/d/d_stage/asm/func_800278EC.s deleted file mode 100644 index a9e2bf4c7f..0000000000 --- a/include/d/d_stage/asm/func_800278EC.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 800278EC 0002482C 80 63 00 68 */ lwz r3, 0x68(r3) -/* 800278F0 00024830 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800278F4.s b/include/d/d_stage/asm/func_800278F4.s deleted file mode 100644 index 1b72aa15ff..0000000000 --- a/include/d/d_stage/asm/func_800278F4.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800278F4 00024834 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800278F8 00024838 7C 08 02 A6 */ mflr r0 -/* 800278FC 0002483C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027900 00024840 4B FF C5 95 */ bl dStage_SetErrorRoom -/* 80027904 00024844 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027908 00024848 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 8002790C 0002484C 38 63 02 3F */ addi r3, r3, 0x23f -/* 80027910 00024850 4C C6 31 82 */ crclr 6 -/* 80027914 00024854 4B FD F1 A9 */ bl OSReport -/* 80027918 00024858 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002791C 0002485C 7C 08 03 A6 */ mtlr r0 -/* 80027920 00024860 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027924 00024864 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027928.s b/include/d/d_stage/asm/func_80027928.s deleted file mode 100644 index 06fe181952..0000000000 --- a/include/d/d_stage/asm/func_80027928.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027928 00024868 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002792C 0002486C 7C 08 02 A6 */ mflr r0 -/* 80027930 00024870 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027934 00024874 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027938 00024878 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 8002793C 0002487C 38 63 02 3F */ addi r3, r3, 0x23f -/* 80027940 00024880 4C C6 31 82 */ crclr 6 -/* 80027944 00024884 4B FD F1 79 */ bl OSReport -/* 80027948 00024888 38 60 00 00 */ li r3, 0 -/* 8002794C 0002488C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027950 00024890 7C 08 03 A6 */ mtlr r0 -/* 80027954 00024894 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027958 00024898 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002795C.s b/include/d/d_stage/asm/func_8002795C.s deleted file mode 100644 index f6c6cd2ea5..0000000000 --- a/include/d/d_stage/asm/func_8002795C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 8002795C 0002489C 90 83 00 08 */ stw r4, 8(r3) -/* 80027960 000248A0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027964.s b/include/d/d_stage/asm/func_80027964.s deleted file mode 100644 index 1a866a01fd..0000000000 --- a/include/d/d_stage/asm/func_80027964.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027964 000248A4 80 63 00 08 */ lwz r3, 8(r3) -/* 80027968 000248A8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002796C.s b/include/d/d_stage/asm/func_8002796C.s deleted file mode 100644 index 0ef4fd93a5..0000000000 --- a/include/d/d_stage/asm/func_8002796C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 8002796C 000248AC 90 83 00 0C */ stw r4, 0xc(r3) -/* 80027970 000248B0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027974.s b/include/d/d_stage/asm/func_80027974.s deleted file mode 100644 index 7acda02646..0000000000 --- a/include/d/d_stage/asm/func_80027974.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027974 000248B4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80027978 000248B8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002797C.s b/include/d/d_stage/asm/func_8002797C.s deleted file mode 100644 index 862783a152..0000000000 --- a/include/d/d_stage/asm/func_8002797C.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 8002797C 000248BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027980 000248C0 7C 08 02 A6 */ mflr r0 -/* 80027984 000248C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027988 000248C8 4B FF C5 0D */ bl dStage_SetErrorRoom -/* 8002798C 000248CC 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027990 000248D0 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027994 000248D4 38 63 02 5C */ addi r3, r3, 0x25c -/* 80027998 000248D8 4C C6 31 82 */ crclr 6 -/* 8002799C 000248DC 4B FD F1 21 */ bl OSReport -/* 800279A0 000248E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800279A4 000248E4 7C 08 03 A6 */ mtlr r0 -/* 800279A8 000248E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800279AC 000248EC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800279B0.s b/include/d/d_stage/asm/func_800279B0.s deleted file mode 100644 index b01c967f2e..0000000000 --- a/include/d/d_stage/asm/func_800279B0.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800279B0 000248F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800279B4 000248F4 7C 08 02 A6 */ mflr r0 -/* 800279B8 000248F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800279BC 000248FC 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800279C0 00024900 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800279C4 00024904 38 63 02 5C */ addi r3, r3, 0x25c -/* 800279C8 00024908 4C C6 31 82 */ crclr 6 -/* 800279CC 0002490C 4B FD F0 F1 */ bl OSReport -/* 800279D0 00024910 38 60 00 00 */ li r3, 0 -/* 800279D4 00024914 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800279D8 00024918 7C 08 03 A6 */ mtlr r0 -/* 800279DC 0002491C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800279E0 00024920 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800279E4.s b/include/d/d_stage/asm/func_800279E4.s deleted file mode 100644 index f967f17f4d..0000000000 --- a/include/d/d_stage/asm/func_800279E4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 800279E4 00024924 90 83 00 48 */ stw r4, 0x48(r3) -/* 800279E8 00024928 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800279EC.s b/include/d/d_stage/asm/func_800279EC.s deleted file mode 100644 index c67ac11e87..0000000000 --- a/include/d/d_stage/asm/func_800279EC.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800279EC 0002492C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800279F0 00024930 7C 08 02 A6 */ mflr r0 -/* 800279F4 00024934 90 01 00 14 */ stw r0, 0x14(r1) -/* 800279F8 00024938 4B FF C4 9D */ bl dStage_SetErrorRoom -/* 800279FC 0002493C 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027A00 00024940 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027A04 00024944 38 63 02 73 */ addi r3, r3, 0x273 -/* 80027A08 00024948 4C C6 31 82 */ crclr 6 -/* 80027A0C 0002494C 4B FD F0 B1 */ bl OSReport -/* 80027A10 00024950 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027A14 00024954 7C 08 03 A6 */ mtlr r0 -/* 80027A18 00024958 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027A1C 0002495C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027A20.s b/include/d/d_stage/asm/func_80027A20.s deleted file mode 100644 index 565848010c..0000000000 --- a/include/d/d_stage/asm/func_80027A20.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027A20 00024960 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027A24 00024964 7C 08 02 A6 */ mflr r0 -/* 80027A28 00024968 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027A2C 0002496C 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027A30 00024970 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027A34 00024974 38 63 02 88 */ addi r3, r3, 0x288 -/* 80027A38 00024978 4C C6 31 82 */ crclr 6 -/* 80027A3C 0002497C 4B FD F0 81 */ bl OSReport -/* 80027A40 00024980 38 60 00 00 */ li r3, 0 -/* 80027A44 00024984 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027A48 00024988 7C 08 03 A6 */ mtlr r0 -/* 80027A4C 0002498C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027A50 00024990 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027A54.s b/include/d/d_stage/asm/func_80027A54.s deleted file mode 100644 index 28a4233b49..0000000000 --- a/include/d/d_stage/asm/func_80027A54.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027A54 00024994 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027A58 00024998 7C 08 02 A6 */ mflr r0 -/* 80027A5C 0002499C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027A60 000249A0 4B FF C4 35 */ bl dStage_SetErrorRoom -/* 80027A64 000249A4 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027A68 000249A8 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027A6C 000249AC 38 63 02 9E */ addi r3, r3, 0x29e -/* 80027A70 000249B0 4C C6 31 82 */ crclr 6 -/* 80027A74 000249B4 4B FD F0 49 */ bl OSReport -/* 80027A78 000249B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027A7C 000249BC 7C 08 03 A6 */ mtlr r0 -/* 80027A80 000249C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027A84 000249C4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027A88.s b/include/d/d_stage/asm/func_80027A88.s deleted file mode 100644 index cf3b47f98a..0000000000 --- a/include/d/d_stage/asm/func_80027A88.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027A88 000249C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027A8C 000249CC 7C 08 02 A6 */ mflr r0 -/* 80027A90 000249D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027A94 000249D4 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027A98 000249D8 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027A9C 000249DC 38 63 02 9E */ addi r3, r3, 0x29e -/* 80027AA0 000249E0 4C C6 31 82 */ crclr 6 -/* 80027AA4 000249E4 4B FD F0 19 */ bl OSReport -/* 80027AA8 000249E8 38 60 00 00 */ li r3, 0 -/* 80027AAC 000249EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027AB0 000249F0 7C 08 03 A6 */ mtlr r0 -/* 80027AB4 000249F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027AB8 000249F8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027ABC.s b/include/d/d_stage/asm/func_80027ABC.s deleted file mode 100644 index 666b363367..0000000000 --- a/include/d/d_stage/asm/func_80027ABC.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027ABC 000249FC 90 83 00 2C */ stw r4, 0x2c(r3) -/* 80027AC0 00024A00 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027AC4.s b/include/d/d_stage/asm/func_80027AC4.s deleted file mode 100644 index 78dde15eac..0000000000 --- a/include/d/d_stage/asm/func_80027AC4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027AC4 00024A04 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 80027AC8 00024A08 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027ACC.s b/include/d/d_stage/asm/func_80027ACC.s deleted file mode 100644 index 70452d8484..0000000000 --- a/include/d/d_stage/asm/func_80027ACC.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027ACC 00024A0C 90 83 00 30 */ stw r4, 0x30(r3) -/* 80027AD0 00024A10 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027AD4.s b/include/d/d_stage/asm/func_80027AD4.s deleted file mode 100644 index 9f5c2b2b71..0000000000 --- a/include/d/d_stage/asm/func_80027AD4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027AD4 00024A14 80 63 00 30 */ lwz r3, 0x30(r3) -/* 80027AD8 00024A18 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027ADC.s b/include/d/d_stage/asm/func_80027ADC.s deleted file mode 100644 index ecd17914b0..0000000000 --- a/include/d/d_stage/asm/func_80027ADC.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027ADC 00024A1C 90 83 00 40 */ stw r4, 0x40(r3) -/* 80027AE0 00024A20 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027AE4.s b/include/d/d_stage/asm/func_80027AE4.s deleted file mode 100644 index 937759f8ec..0000000000 --- a/include/d/d_stage/asm/func_80027AE4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027AE4 00024A24 80 63 00 40 */ lwz r3, 0x40(r3) -/* 80027AE8 00024A28 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027AEC.s b/include/d/d_stage/asm/func_80027AEC.s deleted file mode 100644 index dee277f87d..0000000000 --- a/include/d/d_stage/asm/func_80027AEC.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027AEC 00024A2C 90 83 00 44 */ stw r4, 0x44(r3) -/* 80027AF0 00024A30 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027AF4.s b/include/d/d_stage/asm/func_80027AF4.s deleted file mode 100644 index 788e3e8fff..0000000000 --- a/include/d/d_stage/asm/func_80027AF4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027AF4 00024A34 80 63 00 44 */ lwz r3, 0x44(r3) -/* 80027AF8 00024A38 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027AFC.s b/include/d/d_stage/asm/func_80027AFC.s deleted file mode 100644 index c96f0b2277..0000000000 --- a/include/d/d_stage/asm/func_80027AFC.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027AFC 00024A3C 90 83 00 3C */ stw r4, 0x3c(r3) -/* 80027B00 00024A40 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027B04.s b/include/d/d_stage/asm/func_80027B04.s deleted file mode 100644 index 5ebd0ce60a..0000000000 --- a/include/d/d_stage/asm/func_80027B04.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027B04 00024A44 80 63 00 3C */ lwz r3, 0x3c(r3) -/* 80027B08 00024A48 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027B0C.s b/include/d/d_stage/asm/func_80027B0C.s deleted file mode 100644 index e402169b0d..0000000000 --- a/include/d/d_stage/asm/func_80027B0C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027B0C 00024A4C 90 83 00 20 */ stw r4, 0x20(r3) -/* 80027B10 00024A50 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027B14.s b/include/d/d_stage/asm/func_80027B14.s deleted file mode 100644 index 605eefc575..0000000000 --- a/include/d/d_stage/asm/func_80027B14.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027B14 00024A54 80 63 00 20 */ lwz r3, 0x20(r3) -/* 80027B18 00024A58 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027B1C.s b/include/d/d_stage/asm/func_80027B1C.s deleted file mode 100644 index 6d6259fa6b..0000000000 --- a/include/d/d_stage/asm/func_80027B1C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027B1C 00024A5C 90 83 00 24 */ stw r4, 0x24(r3) -/* 80027B20 00024A60 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027B24.s b/include/d/d_stage/asm/func_80027B24.s deleted file mode 100644 index e113ba3eb1..0000000000 --- a/include/d/d_stage/asm/func_80027B24.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027B24 00024A64 90 83 00 5C */ stw r4, 0x5c(r3) -/* 80027B28 00024A68 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027B2C.s b/include/d/d_stage/asm/func_80027B2C.s deleted file mode 100644 index 044ab263f0..0000000000 --- a/include/d/d_stage/asm/func_80027B2C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027B2C 00024A6C 80 63 00 5C */ lwz r3, 0x5c(r3) -/* 80027B30 00024A70 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027B34.s b/include/d/d_stage/asm/func_80027B34.s deleted file mode 100644 index 7770969213..0000000000 --- a/include/d/d_stage/asm/func_80027B34.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 80027B34 00024A74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027B38 00024A78 7C 08 02 A6 */ mflr r0 -/* 80027B3C 00024A7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027B40 00024A80 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027B44 00024A84 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027B48 00024A88 38 63 02 B4 */ addi r3, r3, 0x2b4 -/* 80027B4C 00024A8C 4C C6 31 82 */ crclr 6 -/* 80027B50 00024A90 4B FD EF 6D */ bl OSReport -/* 80027B54 00024A94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027B58 00024A98 7C 08 03 A6 */ mtlr r0 -/* 80027B5C 00024A9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027B60 00024AA0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027B64.s b/include/d/d_stage/asm/func_80027B64.s deleted file mode 100644 index 9230e29c82..0000000000 --- a/include/d/d_stage/asm/func_80027B64.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027B64 00024AA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027B68 00024AA8 7C 08 02 A6 */ mflr r0 -/* 80027B6C 00024AAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027B70 00024AB0 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027B74 00024AB4 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027B78 00024AB8 38 63 02 B4 */ addi r3, r3, 0x2b4 -/* 80027B7C 00024ABC 4C C6 31 82 */ crclr 6 -/* 80027B80 00024AC0 4B FD EF 3D */ bl OSReport -/* 80027B84 00024AC4 38 60 00 00 */ li r3, 0 -/* 80027B88 00024AC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027B8C 00024ACC 7C 08 03 A6 */ mtlr r0 -/* 80027B90 00024AD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027B94 00024AD4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027B98.s b/include/d/d_stage/asm/func_80027B98.s deleted file mode 100644 index 011552eb59..0000000000 --- a/include/d/d_stage/asm/func_80027B98.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 80027B98 00024AD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027B9C 00024ADC 7C 08 02 A6 */ mflr r0 -/* 80027BA0 00024AE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027BA4 00024AE4 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027BA8 00024AE8 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027BAC 00024AEC 38 63 02 D2 */ addi r3, r3, 0x2d2 -/* 80027BB0 00024AF0 4C C6 31 82 */ crclr 6 -/* 80027BB4 00024AF4 4B FD EF 09 */ bl OSReport -/* 80027BB8 00024AF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027BBC 00024AFC 7C 08 03 A6 */ mtlr r0 -/* 80027BC0 00024B00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027BC4 00024B04 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027BC8.s b/include/d/d_stage/asm/func_80027BC8.s deleted file mode 100644 index 8f91a7a272..0000000000 --- a/include/d/d_stage/asm/func_80027BC8.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027BC8 00024B08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027BCC 00024B0C 7C 08 02 A6 */ mflr r0 -/* 80027BD0 00024B10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027BD4 00024B14 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027BD8 00024B18 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027BDC 00024B1C 38 63 02 D2 */ addi r3, r3, 0x2d2 -/* 80027BE0 00024B20 4C C6 31 82 */ crclr 6 -/* 80027BE4 00024B24 4B FD EE D9 */ bl OSReport -/* 80027BE8 00024B28 38 60 00 00 */ li r3, 0 -/* 80027BEC 00024B2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027BF0 00024B30 7C 08 03 A6 */ mtlr r0 -/* 80027BF4 00024B34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027BF8 00024B38 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027BFC.s b/include/d/d_stage/asm/func_80027BFC.s deleted file mode 100644 index 5c9e30c95b..0000000000 --- a/include/d/d_stage/asm/func_80027BFC.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 80027BFC 00024B3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027C00 00024B40 7C 08 02 A6 */ mflr r0 -/* 80027C04 00024B44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027C08 00024B48 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027C0C 00024B4C 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027C10 00024B50 38 63 02 ED */ addi r3, r3, 0x2ed -/* 80027C14 00024B54 4C C6 31 82 */ crclr 6 -/* 80027C18 00024B58 4B FD EE A5 */ bl OSReport -/* 80027C1C 00024B5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027C20 00024B60 7C 08 03 A6 */ mtlr r0 -/* 80027C24 00024B64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027C28 00024B68 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027C2C.s b/include/d/d_stage/asm/func_80027C2C.s deleted file mode 100644 index 591af37e62..0000000000 --- a/include/d/d_stage/asm/func_80027C2C.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027C2C 00024B6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027C30 00024B70 7C 08 02 A6 */ mflr r0 -/* 80027C34 00024B74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027C38 00024B78 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027C3C 00024B7C 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027C40 00024B80 38 63 02 ED */ addi r3, r3, 0x2ed -/* 80027C44 00024B84 4C C6 31 82 */ crclr 6 -/* 80027C48 00024B88 4B FD EE 75 */ bl OSReport -/* 80027C4C 00024B8C 38 60 00 00 */ li r3, 0 -/* 80027C50 00024B90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027C54 00024B94 7C 08 03 A6 */ mtlr r0 -/* 80027C58 00024B98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027C5C 00024B9C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027C60.s b/include/d/d_stage/asm/func_80027C60.s deleted file mode 100644 index e033d329d7..0000000000 --- a/include/d/d_stage/asm/func_80027C60.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 80027C60 00024BA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027C64 00024BA4 7C 08 02 A6 */ mflr r0 -/* 80027C68 00024BA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027C6C 00024BAC 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027C70 00024BB0 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027C74 00024BB4 38 63 03 03 */ addi r3, r3, 0x303 -/* 80027C78 00024BB8 4C C6 31 82 */ crclr 6 -/* 80027C7C 00024BBC 4B FD EE 41 */ bl OSReport -/* 80027C80 00024BC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027C84 00024BC4 7C 08 03 A6 */ mtlr r0 -/* 80027C88 00024BC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027C8C 00024BCC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027C90.s b/include/d/d_stage/asm/func_80027C90.s deleted file mode 100644 index 3111b357b4..0000000000 --- a/include/d/d_stage/asm/func_80027C90.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 80027C90 00024BD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027C94 00024BD4 7C 08 02 A6 */ mflr r0 -/* 80027C98 00024BD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027C9C 00024BDC 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027CA0 00024BE0 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027CA4 00024BE4 38 63 03 03 */ addi r3, r3, 0x303 -/* 80027CA8 00024BE8 4C C6 31 82 */ crclr 6 -/* 80027CAC 00024BEC 4B FD EE 11 */ bl OSReport -/* 80027CB0 00024BF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027CB4 00024BF4 7C 08 03 A6 */ mtlr r0 -/* 80027CB8 00024BF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027CBC 00024BFC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027CC0.s b/include/d/d_stage/asm/func_80027CC0.s deleted file mode 100644 index b0a54d81d5..0000000000 --- a/include/d/d_stage/asm/func_80027CC0.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027CC0 00024C00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027CC4 00024C04 7C 08 02 A6 */ mflr r0 -/* 80027CC8 00024C08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027CCC 00024C0C 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027CD0 00024C10 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027CD4 00024C14 38 63 03 03 */ addi r3, r3, 0x303 -/* 80027CD8 00024C18 4C C6 31 82 */ crclr 6 -/* 80027CDC 00024C1C 4B FD ED E1 */ bl OSReport -/* 80027CE0 00024C20 38 60 00 00 */ li r3, 0 -/* 80027CE4 00024C24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027CE8 00024C28 7C 08 03 A6 */ mtlr r0 -/* 80027CEC 00024C2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027CF0 00024C30 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027CF4.s b/include/d/d_stage/asm/func_80027CF4.s deleted file mode 100644 index 98fc22f401..0000000000 --- a/include/d/d_stage/asm/func_80027CF4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027CF4 00024C34 90 83 00 4C */ stw r4, 0x4c(r3) -/* 80027CF8 00024C38 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027CFC.s b/include/d/d_stage/asm/func_80027CFC.s deleted file mode 100644 index a00b8e88de..0000000000 --- a/include/d/d_stage/asm/func_80027CFC.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027CFC 00024C3C 80 63 00 4C */ lwz r3, 0x4c(r3) -/* 80027D00 00024C40 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027D04.s b/include/d/d_stage/asm/func_80027D04.s deleted file mode 100644 index 26acac0f67..0000000000 --- a/include/d/d_stage/asm/func_80027D04.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027D04 00024C44 90 83 00 50 */ stw r4, 0x50(r3) -/* 80027D08 00024C48 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027D0C.s b/include/d/d_stage/asm/func_80027D0C.s deleted file mode 100644 index 2b35324beb..0000000000 --- a/include/d/d_stage/asm/func_80027D0C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027D0C 00024C4C 80 63 00 50 */ lwz r3, 0x50(r3) -/* 80027D10 00024C50 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027D14.s b/include/d/d_stage/asm/func_80027D14.s deleted file mode 100644 index 49ca37d23a..0000000000 --- a/include/d/d_stage/asm/func_80027D14.s +++ /dev/null @@ -1 +0,0 @@ -/* 80027D14 00024C54 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027D18.s b/include/d/d_stage/asm/func_80027D18.s deleted file mode 100644 index 62880487e1..0000000000 --- a/include/d/d_stage/asm/func_80027D18.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027D18 00024C58 38 60 00 00 */ li r3, 0 -/* 80027D1C 00024C5C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027D20.s b/include/d/d_stage/asm/func_80027D20.s deleted file mode 100644 index b5d3ade3b1..0000000000 --- a/include/d/d_stage/asm/func_80027D20.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027D20 00024C60 90 83 00 54 */ stw r4, 0x54(r3) -/* 80027D24 00024C64 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027D28.s b/include/d/d_stage/asm/func_80027D28.s deleted file mode 100644 index 8bb8a882c9..0000000000 --- a/include/d/d_stage/asm/func_80027D28.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027D28 00024C68 80 63 00 54 */ lwz r3, 0x54(r3) -/* 80027D2C 00024C6C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027D30.s b/include/d/d_stage/asm/func_80027D30.s deleted file mode 100644 index df9f64cd4a..0000000000 --- a/include/d/d_stage/asm/func_80027D30.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027D30 00024C70 90 83 00 58 */ stw r4, 0x58(r3) -/* 80027D34 00024C74 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027D38.s b/include/d/d_stage/asm/func_80027D38.s deleted file mode 100644 index ff1d3fca93..0000000000 --- a/include/d/d_stage/asm/func_80027D38.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027D38 00024C78 80 63 00 58 */ lwz r3, 0x58(r3) -/* 80027D3C 00024C7C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027D40.s b/include/d/d_stage/asm/func_80027D40.s deleted file mode 100644 index 62287d9b49..0000000000 --- a/include/d/d_stage/asm/func_80027D40.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 80027D40 00024C80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027D44 00024C84 7C 08 02 A6 */ mflr r0 -/* 80027D48 00024C88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027D4C 00024C8C 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027D50 00024C90 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027D54 00024C94 38 63 03 1D */ addi r3, r3, 0x31d -/* 80027D58 00024C98 4C C6 31 82 */ crclr 6 -/* 80027D5C 00024C9C 4B FD ED 61 */ bl OSReport -/* 80027D60 00024CA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027D64 00024CA4 7C 08 03 A6 */ mtlr r0 -/* 80027D68 00024CA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027D6C 00024CAC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027D70.s b/include/d/d_stage/asm/func_80027D70.s deleted file mode 100644 index e4ed111a47..0000000000 --- a/include/d/d_stage/asm/func_80027D70.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027D70 00024CB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027D74 00024CB4 7C 08 02 A6 */ mflr r0 -/* 80027D78 00024CB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027D7C 00024CBC 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027D80 00024CC0 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027D84 00024CC4 38 63 03 1D */ addi r3, r3, 0x31d -/* 80027D88 00024CC8 4C C6 31 82 */ crclr 6 -/* 80027D8C 00024CCC 4B FD ED 31 */ bl OSReport -/* 80027D90 00024CD0 38 60 00 00 */ li r3, 0 -/* 80027D94 00024CD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027D98 00024CD8 7C 08 03 A6 */ mtlr r0 -/* 80027D9C 00024CDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027DA0 00024CE0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027DA4.s b/include/d/d_stage/asm/func_80027DA4.s deleted file mode 100644 index f2d5a814ba..0000000000 --- a/include/d/d_stage/asm/func_80027DA4.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027DA4 00024CE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027DA8 00024CE8 7C 08 02 A6 */ mflr r0 -/* 80027DAC 00024CEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027DB0 00024CF0 4B FF C0 E5 */ bl dStage_SetErrorRoom -/* 80027DB4 00024CF4 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027DB8 00024CF8 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027DBC 00024CFC 38 63 03 3C */ addi r3, r3, 0x33c -/* 80027DC0 00024D00 4C C6 31 82 */ crclr 6 -/* 80027DC4 00024D04 4B FD EC F9 */ bl OSReport -/* 80027DC8 00024D08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027DCC 00024D0C 7C 08 03 A6 */ mtlr r0 -/* 80027DD0 00024D10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027DD4 00024D14 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027DD8.s b/include/d/d_stage/asm/func_80027DD8.s deleted file mode 100644 index 0513e17ac7..0000000000 --- a/include/d/d_stage/asm/func_80027DD8.s +++ /dev/null @@ -1,14 +0,0 @@ -/* 80027DD8 00024D18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027DDC 00024D1C 7C 08 02 A6 */ mflr r0 -/* 80027DE0 00024D20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027DE4 00024D24 4B FF C0 B1 */ bl dStage_SetErrorRoom -/* 80027DE8 00024D28 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027DEC 00024D2C 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027DF0 00024D30 38 63 03 58 */ addi r3, r3, 0x358 -/* 80027DF4 00024D34 4C C6 31 82 */ crclr 6 -/* 80027DF8 00024D38 4B FD EC C5 */ bl OSReport -/* 80027DFC 00024D3C 38 60 00 00 */ li r3, 0 -/* 80027E00 00024D40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027E04 00024D44 7C 08 03 A6 */ mtlr r0 -/* 80027E08 00024D48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027E0C 00024D4C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E10.s b/include/d/d_stage/asm/func_80027E10.s deleted file mode 100644 index e814e76f05..0000000000 --- a/include/d/d_stage/asm/func_80027E10.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E10 00024D50 90 83 00 08 */ stw r4, 8(r3) -/* 80027E14 00024D54 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E18.s b/include/d/d_stage/asm/func_80027E18.s deleted file mode 100644 index 62fb93dbb8..0000000000 --- a/include/d/d_stage/asm/func_80027E18.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E18 00024D58 80 63 00 08 */ lwz r3, 8(r3) -/* 80027E1C 00024D5C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E20.s b/include/d/d_stage/asm/func_80027E20.s deleted file mode 100644 index d8ae3597fe..0000000000 --- a/include/d/d_stage/asm/func_80027E20.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E20 00024D60 90 83 00 0C */ stw r4, 0xc(r3) -/* 80027E24 00024D64 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E28.s b/include/d/d_stage/asm/func_80027E28.s deleted file mode 100644 index fbaedc2914..0000000000 --- a/include/d/d_stage/asm/func_80027E28.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E28 00024D68 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80027E2C 00024D6C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E30.s b/include/d/d_stage/asm/func_80027E30.s deleted file mode 100644 index d293edb45c..0000000000 --- a/include/d/d_stage/asm/func_80027E30.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E30 00024D70 90 83 00 10 */ stw r4, 0x10(r3) -/* 80027E34 00024D74 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E38.s b/include/d/d_stage/asm/func_80027E38.s deleted file mode 100644 index 31df877751..0000000000 --- a/include/d/d_stage/asm/func_80027E38.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E38 00024D78 B0 83 00 54 */ sth r4, 0x54(r3) -/* 80027E3C 00024D7C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E40.s b/include/d/d_stage/asm/func_80027E40.s deleted file mode 100644 index 54f585eae7..0000000000 --- a/include/d/d_stage/asm/func_80027E40.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E40 00024D80 A0 63 00 54 */ lhz r3, 0x54(r3) -/* 80027E44 00024D84 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E48.s b/include/d/d_stage/asm/func_80027E48.s deleted file mode 100644 index 8bc8c70aea..0000000000 --- a/include/d/d_stage/asm/func_80027E48.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E48 00024D88 90 83 00 14 */ stw r4, 0x14(r3) -/* 80027E4C 00024D8C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E50.s b/include/d/d_stage/asm/func_80027E50.s deleted file mode 100644 index 778050ea53..0000000000 --- a/include/d/d_stage/asm/func_80027E50.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E50 00024D90 90 83 00 18 */ stw r4, 0x18(r3) -/* 80027E54 00024D94 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E58.s b/include/d/d_stage/asm/func_80027E58.s deleted file mode 100644 index e1bcdc9187..0000000000 --- a/include/d/d_stage/asm/func_80027E58.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E58 00024D98 80 63 00 18 */ lwz r3, 0x18(r3) -/* 80027E5C 00024D9C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E60.s b/include/d/d_stage/asm/func_80027E60.s deleted file mode 100644 index c04f2e926f..0000000000 --- a/include/d/d_stage/asm/func_80027E60.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E60 00024DA0 90 83 00 1C */ stw r4, 0x1c(r3) -/* 80027E64 00024DA4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E68.s b/include/d/d_stage/asm/func_80027E68.s deleted file mode 100644 index 9f9677fb7e..0000000000 --- a/include/d/d_stage/asm/func_80027E68.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E68 00024DA8 90 83 00 20 */ stw r4, 0x20(r3) -/* 80027E6C 00024DAC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E70.s b/include/d/d_stage/asm/func_80027E70.s deleted file mode 100644 index 829d115c0f..0000000000 --- a/include/d/d_stage/asm/func_80027E70.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E70 00024DB0 80 63 00 20 */ lwz r3, 0x20(r3) -/* 80027E74 00024DB4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E78.s b/include/d/d_stage/asm/func_80027E78.s deleted file mode 100644 index ffee54f256..0000000000 --- a/include/d/d_stage/asm/func_80027E78.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E78 00024DB8 90 83 00 24 */ stw r4, 0x24(r3) -/* 80027E7C 00024DBC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E80.s b/include/d/d_stage/asm/func_80027E80.s deleted file mode 100644 index e5639a6ea4..0000000000 --- a/include/d/d_stage/asm/func_80027E80.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E80 00024DC0 80 63 00 24 */ lwz r3, 0x24(r3) -/* 80027E84 00024DC4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E88.s b/include/d/d_stage/asm/func_80027E88.s deleted file mode 100644 index 6d3e717fa7..0000000000 --- a/include/d/d_stage/asm/func_80027E88.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E88 00024DC8 90 83 00 28 */ stw r4, 0x28(r3) -/* 80027E8C 00024DCC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E90.s b/include/d/d_stage/asm/func_80027E90.s deleted file mode 100644 index 191325779f..0000000000 --- a/include/d/d_stage/asm/func_80027E90.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E90 00024DD0 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80027E94 00024DD4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027E98.s b/include/d/d_stage/asm/func_80027E98.s deleted file mode 100644 index 3de67d72c5..0000000000 --- a/include/d/d_stage/asm/func_80027E98.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027E98 00024DD8 90 83 00 2C */ stw r4, 0x2c(r3) -/* 80027E9C 00024DDC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027EA0.s b/include/d/d_stage/asm/func_80027EA0.s deleted file mode 100644 index 26d64e1cb9..0000000000 --- a/include/d/d_stage/asm/func_80027EA0.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027EA0 00024DE0 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 80027EA4 00024DE4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027EA8.s b/include/d/d_stage/asm/func_80027EA8.s deleted file mode 100644 index 3c3716ebcd..0000000000 --- a/include/d/d_stage/asm/func_80027EA8.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027EA8 00024DE8 90 83 00 30 */ stw r4, 0x30(r3) -/* 80027EAC 00024DEC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027EB0.s b/include/d/d_stage/asm/func_80027EB0.s deleted file mode 100644 index b4cf743ca1..0000000000 --- a/include/d/d_stage/asm/func_80027EB0.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027EB0 00024DF0 80 63 00 30 */ lwz r3, 0x30(r3) -/* 80027EB4 00024DF4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027EB8.s b/include/d/d_stage/asm/func_80027EB8.s deleted file mode 100644 index ff639b9283..0000000000 --- a/include/d/d_stage/asm/func_80027EB8.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027EB8 00024DF8 90 83 00 34 */ stw r4, 0x34(r3) -/* 80027EBC 00024DFC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027EC0.s b/include/d/d_stage/asm/func_80027EC0.s deleted file mode 100644 index e776b8d62f..0000000000 --- a/include/d/d_stage/asm/func_80027EC0.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027EC0 00024E00 80 63 00 34 */ lwz r3, 0x34(r3) -/* 80027EC4 00024E04 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027EC8.s b/include/d/d_stage/asm/func_80027EC8.s deleted file mode 100644 index 94b6039953..0000000000 --- a/include/d/d_stage/asm/func_80027EC8.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027EC8 00024E08 90 83 00 3C */ stw r4, 0x3c(r3) -/* 80027ECC 00024E0C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027ED0.s b/include/d/d_stage/asm/func_80027ED0.s deleted file mode 100644 index d2ca0f61f1..0000000000 --- a/include/d/d_stage/asm/func_80027ED0.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027ED0 00024E10 80 63 00 3C */ lwz r3, 0x3c(r3) -/* 80027ED4 00024E14 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027ED8.s b/include/d/d_stage/asm/func_80027ED8.s deleted file mode 100644 index 87c2569f9f..0000000000 --- a/include/d/d_stage/asm/func_80027ED8.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027ED8 00024E18 90 83 00 40 */ stw r4, 0x40(r3) -/* 80027EDC 00024E1C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027EE0.s b/include/d/d_stage/asm/func_80027EE0.s deleted file mode 100644 index 78870fa755..0000000000 --- a/include/d/d_stage/asm/func_80027EE0.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027EE0 00024E20 80 63 00 40 */ lwz r3, 0x40(r3) -/* 80027EE4 00024E24 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027EE8.s b/include/d/d_stage/asm/func_80027EE8.s deleted file mode 100644 index 5ab755e331..0000000000 --- a/include/d/d_stage/asm/func_80027EE8.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027EE8 00024E28 90 83 00 44 */ stw r4, 0x44(r3) -/* 80027EEC 00024E2C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027EF0.s b/include/d/d_stage/asm/func_80027EF0.s deleted file mode 100644 index 120a7991b3..0000000000 --- a/include/d/d_stage/asm/func_80027EF0.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027EF0 00024E30 80 63 00 44 */ lwz r3, 0x44(r3) -/* 80027EF4 00024E34 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027EF8.s b/include/d/d_stage/asm/func_80027EF8.s deleted file mode 100644 index 4adea91c61..0000000000 --- a/include/d/d_stage/asm/func_80027EF8.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027EF8 00024E38 90 83 00 48 */ stw r4, 0x48(r3) -/* 80027EFC 00024E3C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027F00.s b/include/d/d_stage/asm/func_80027F00.s deleted file mode 100644 index 34258a1243..0000000000 --- a/include/d/d_stage/asm/func_80027F00.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027F00 00024E40 80 63 00 48 */ lwz r3, 0x48(r3) -/* 80027F04 00024E44 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027F08.s b/include/d/d_stage/asm/func_80027F08.s deleted file mode 100644 index 7864189feb..0000000000 --- a/include/d/d_stage/asm/func_80027F08.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027F08 00024E48 90 83 00 4C */ stw r4, 0x4c(r3) -/* 80027F0C 00024E4C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027F10.s b/include/d/d_stage/asm/func_80027F10.s deleted file mode 100644 index 345fcac677..0000000000 --- a/include/d/d_stage/asm/func_80027F10.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027F10 00024E50 80 63 00 4C */ lwz r3, 0x4c(r3) -/* 80027F14 00024E54 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027F18.s b/include/d/d_stage/asm/func_80027F18.s deleted file mode 100644 index 17341cf76d..0000000000 --- a/include/d/d_stage/asm/func_80027F18.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027F18 00024E58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027F1C 00024E5C 7C 08 02 A6 */ mflr r0 -/* 80027F20 00024E60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027F24 00024E64 4B FF BF A1 */ bl dStage_SetErrorStage -/* 80027F28 00024E68 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027F2C 00024E6C 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027F30 00024E70 38 63 03 6D */ addi r3, r3, 0x36d -/* 80027F34 00024E74 4C C6 31 82 */ crclr 6 -/* 80027F38 00024E78 4B FD EB 85 */ bl OSReport -/* 80027F3C 00024E7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027F40 00024E80 7C 08 03 A6 */ mtlr r0 -/* 80027F44 00024E84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027F48 00024E88 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027F4C.s b/include/d/d_stage/asm/func_80027F4C.s deleted file mode 100644 index a7784e5b0e..0000000000 --- a/include/d/d_stage/asm/func_80027F4C.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027F4C 00024E8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027F50 00024E90 7C 08 02 A6 */ mflr r0 -/* 80027F54 00024E94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027F58 00024E98 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027F5C 00024E9C 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027F60 00024EA0 38 63 03 6D */ addi r3, r3, 0x36d -/* 80027F64 00024EA4 4C C6 31 82 */ crclr 6 -/* 80027F68 00024EA8 4B FD EB 55 */ bl OSReport -/* 80027F6C 00024EAC 38 60 00 00 */ li r3, 0 -/* 80027F70 00024EB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027F74 00024EB4 7C 08 03 A6 */ mtlr r0 -/* 80027F78 00024EB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027F7C 00024EBC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027F80.s b/include/d/d_stage/asm/func_80027F80.s deleted file mode 100644 index 8a5eeabbc2..0000000000 --- a/include/d/d_stage/asm/func_80027F80.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027F80 00024EC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027F84 00024EC4 7C 08 02 A6 */ mflr r0 -/* 80027F88 00024EC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027F8C 00024ECC 4B FF BF 39 */ bl dStage_SetErrorStage -/* 80027F90 00024ED0 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027F94 00024ED4 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027F98 00024ED8 38 63 03 89 */ addi r3, r3, 0x389 -/* 80027F9C 00024EDC 4C C6 31 82 */ crclr 6 -/* 80027FA0 00024EE0 4B FD EB 1D */ bl OSReport -/* 80027FA4 00024EE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027FA8 00024EE8 7C 08 03 A6 */ mtlr r0 -/* 80027FAC 00024EEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027FB0 00024EF0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027FB4.s b/include/d/d_stage/asm/func_80027FB4.s deleted file mode 100644 index 7bc27c6f45..0000000000 --- a/include/d/d_stage/asm/func_80027FB4.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80027FB4 00024EF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80027FB8 00024EF8 7C 08 02 A6 */ mflr r0 -/* 80027FBC 00024EFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80027FC0 00024F00 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80027FC4 00024F04 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80027FC8 00024F08 38 63 03 89 */ addi r3, r3, 0x389 -/* 80027FCC 00024F0C 4C C6 31 82 */ crclr 6 -/* 80027FD0 00024F10 4B FD EA ED */ bl OSReport -/* 80027FD4 00024F14 38 60 00 00 */ li r3, 0 -/* 80027FD8 00024F18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80027FDC 00024F1C 7C 08 03 A6 */ mtlr r0 -/* 80027FE0 00024F20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027FE4 00024F24 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027FE8.s b/include/d/d_stage/asm/func_80027FE8.s deleted file mode 100644 index ed802c7d88..0000000000 --- a/include/d/d_stage/asm/func_80027FE8.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027FE8 00024F28 90 83 00 50 */ stw r4, 0x50(r3) -/* 80027FEC 00024F2C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027FF0.s b/include/d/d_stage/asm/func_80027FF0.s deleted file mode 100644 index 219ab8eef2..0000000000 --- a/include/d/d_stage/asm/func_80027FF0.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027FF0 00024F30 80 63 00 50 */ lwz r3, 0x50(r3) -/* 80027FF4 00024F34 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80027FF8.s b/include/d/d_stage/asm/func_80027FF8.s deleted file mode 100644 index 39e40dcfe0..0000000000 --- a/include/d/d_stage/asm/func_80027FF8.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80027FF8 00024F38 90 83 00 5C */ stw r4, 0x5c(r3) -/* 80027FFC 00024F3C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028000.s b/include/d/d_stage/asm/func_80028000.s deleted file mode 100644 index 3e75fdaa70..0000000000 --- a/include/d/d_stage/asm/func_80028000.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028000 00024F40 90 83 00 60 */ stw r4, 0x60(r3) -/* 80028004 00024F44 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028008.s b/include/d/d_stage/asm/func_80028008.s deleted file mode 100644 index 176786a7a4..0000000000 --- a/include/d/d_stage/asm/func_80028008.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028008 00024F48 90 83 00 64 */ stw r4, 0x64(r3) -/* 8002800C 00024F4C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028010.s b/include/d/d_stage/asm/func_80028010.s deleted file mode 100644 index e768fcd998..0000000000 --- a/include/d/d_stage/asm/func_80028010.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028010 00024F50 80 63 00 64 */ lwz r3, 0x64(r3) -/* 80028014 00024F54 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028018.s b/include/d/d_stage/asm/func_80028018.s deleted file mode 100644 index 6541c7a65d..0000000000 --- a/include/d/d_stage/asm/func_80028018.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028018 00024F58 90 83 00 68 */ stw r4, 0x68(r3) -/* 8002801C 00024F5C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028020.s b/include/d/d_stage/asm/func_80028020.s deleted file mode 100644 index e2c5aa9bd3..0000000000 --- a/include/d/d_stage/asm/func_80028020.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028020 00024F60 80 63 00 68 */ lwz r3, 0x68(r3) -/* 80028024 00024F64 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028028.s b/include/d/d_stage/asm/func_80028028.s deleted file mode 100644 index 696422de9b..0000000000 --- a/include/d/d_stage/asm/func_80028028.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028028 00024F68 90 83 00 6C */ stw r4, 0x6c(r3) -/* 8002802C 00024F6C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028030.s b/include/d/d_stage/asm/func_80028030.s deleted file mode 100644 index fac69e5365..0000000000 --- a/include/d/d_stage/asm/func_80028030.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028030 00024F70 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 80028034 00024F74 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028038.s b/include/d/d_stage/asm/func_80028038.s deleted file mode 100644 index 00930130e7..0000000000 --- a/include/d/d_stage/asm/func_80028038.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028038 00024F78 90 83 00 70 */ stw r4, 0x70(r3) -/* 8002803C 00024F7C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028040.s b/include/d/d_stage/asm/func_80028040.s deleted file mode 100644 index 7561bbfd10..0000000000 --- a/include/d/d_stage/asm/func_80028040.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028040 00024F80 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80028044 00024F84 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028048.s b/include/d/d_stage/asm/func_80028048.s deleted file mode 100644 index 9a8504b532..0000000000 --- a/include/d/d_stage/asm/func_80028048.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028048 00024F88 90 83 00 74 */ stw r4, 0x74(r3) -/* 8002804C 00024F8C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028050.s b/include/d/d_stage/asm/func_80028050.s deleted file mode 100644 index 6b68f98828..0000000000 --- a/include/d/d_stage/asm/func_80028050.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028050 00024F90 80 63 00 74 */ lwz r3, 0x74(r3) -/* 80028054 00024F94 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028058.s b/include/d/d_stage/asm/func_80028058.s deleted file mode 100644 index 86a3f12801..0000000000 --- a/include/d/d_stage/asm/func_80028058.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028058 00024F98 90 83 00 78 */ stw r4, 0x78(r3) -/* 8002805C 00024F9C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028060.s b/include/d/d_stage/asm/func_80028060.s deleted file mode 100644 index 97ce279200..0000000000 --- a/include/d/d_stage/asm/func_80028060.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028060 00024FA0 80 63 00 78 */ lwz r3, 0x78(r3) -/* 80028064 00024FA4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028068.s b/include/d/d_stage/asm/func_80028068.s deleted file mode 100644 index 8515b2fc18..0000000000 --- a/include/d/d_stage/asm/func_80028068.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028068 00024FA8 90 83 00 38 */ stw r4, 0x38(r3) -/* 8002806C 00024FAC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028070.s b/include/d/d_stage/asm/func_80028070.s deleted file mode 100644 index ad673f82c8..0000000000 --- a/include/d/d_stage/asm/func_80028070.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028070 00024FB0 80 63 00 38 */ lwz r3, 0x38(r3) -/* 80028074 00024FB4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028078.s b/include/d/d_stage/asm/func_80028078.s deleted file mode 100644 index 48dcf8ea24..0000000000 --- a/include/d/d_stage/asm/func_80028078.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80028078 00024FB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002807C 00024FBC 7C 08 02 A6 */ mflr r0 -/* 80028080 00024FC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028084 00024FC4 4B FF BE 41 */ bl dStage_SetErrorStage -/* 80028088 00024FC8 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 8002808C 00024FCC 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80028090 00024FD0 38 63 03 A8 */ addi r3, r3, 0x3a8 -/* 80028094 00024FD4 4C C6 31 82 */ crclr 6 -/* 80028098 00024FD8 4B FD EA 25 */ bl OSReport -/* 8002809C 00024FDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800280A0 00024FE0 7C 08 03 A6 */ mtlr r0 -/* 800280A4 00024FE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800280A8 00024FE8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800280AC.s b/include/d/d_stage/asm/func_800280AC.s deleted file mode 100644 index 27c0d5fd44..0000000000 --- a/include/d/d_stage/asm/func_800280AC.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800280AC 00024FEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800280B0 00024FF0 7C 08 02 A6 */ mflr r0 -/* 800280B4 00024FF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800280B8 00024FF8 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800280BC 00024FFC 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800280C0 00025000 38 63 03 A8 */ addi r3, r3, 0x3a8 -/* 800280C4 00025004 4C C6 31 82 */ crclr 6 -/* 800280C8 00025008 4B FD E9 F5 */ bl OSReport -/* 800280CC 0002500C 38 60 00 00 */ li r3, 0 -/* 800280D0 00025010 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800280D4 00025014 7C 08 03 A6 */ mtlr r0 -/* 800280D8 00025018 38 21 00 10 */ addi r1, r1, 0x10 -/* 800280DC 0002501C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800280E0.s b/include/d/d_stage/asm/func_800280E0.s deleted file mode 100644 index d6ffa731a8..0000000000 --- a/include/d/d_stage/asm/func_800280E0.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800280E0 00025020 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800280E4 00025024 7C 08 02 A6 */ mflr r0 -/* 800280E8 00025028 90 01 00 14 */ stw r0, 0x14(r1) -/* 800280EC 0002502C 4B FF BD D9 */ bl dStage_SetErrorStage -/* 800280F0 00025030 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800280F4 00025034 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800280F8 00025038 38 63 03 C3 */ addi r3, r3, 0x3c3 -/* 800280FC 0002503C 4C C6 31 82 */ crclr 6 -/* 80028100 00025040 4B FD E9 BD */ bl OSReport -/* 80028104 00025044 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028108 00025048 7C 08 03 A6 */ mtlr r0 -/* 8002810C 0002504C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028110 00025050 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028114.s b/include/d/d_stage/asm/func_80028114.s deleted file mode 100644 index f539bc7986..0000000000 --- a/include/d/d_stage/asm/func_80028114.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80028114 00025054 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028118 00025058 7C 08 02 A6 */ mflr r0 -/* 8002811C 0002505C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028120 00025060 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 80028124 00025064 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 80028128 00025068 38 63 03 C3 */ addi r3, r3, 0x3c3 -/* 8002812C 0002506C 4C C6 31 82 */ crclr 6 -/* 80028130 00025070 4B FD E9 8D */ bl OSReport -/* 80028134 00025074 38 60 00 00 */ li r3, 0 -/* 80028138 00025078 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002813C 0002507C 7C 08 03 A6 */ mtlr r0 -/* 80028140 00025080 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028144 00025084 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028148.s b/include/d/d_stage/asm/func_80028148.s deleted file mode 100644 index ba6d1f4fe9..0000000000 --- a/include/d/d_stage/asm/func_80028148.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028148 00025088 90 83 00 7C */ stw r4, 0x7c(r3) -/* 8002814C 0002508C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028150.s b/include/d/d_stage/asm/func_80028150.s deleted file mode 100644 index ba6da2aa46..0000000000 --- a/include/d/d_stage/asm/func_80028150.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028150 00025090 80 63 00 7C */ lwz r3, 0x7c(r3) -/* 80028154 00025094 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028158.s b/include/d/d_stage/asm/func_80028158.s deleted file mode 100644 index 81fb49cafc..0000000000 --- a/include/d/d_stage/asm/func_80028158.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028158 00025098 90 83 00 80 */ stw r4, 0x80(r3) -/* 8002815C 0002509C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028160.s b/include/d/d_stage/asm/func_80028160.s deleted file mode 100644 index 1b7ab9f793..0000000000 --- a/include/d/d_stage/asm/func_80028160.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028160 000250A0 80 63 00 80 */ lwz r3, 0x80(r3) -/* 80028164 000250A4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028168.s b/include/d/d_stage/asm/func_80028168.s deleted file mode 100644 index 42b81c1240..0000000000 --- a/include/d/d_stage/asm/func_80028168.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028168 000250A8 90 83 00 84 */ stw r4, 0x84(r3) -/* 8002816C 000250AC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028170.s b/include/d/d_stage/asm/func_80028170.s deleted file mode 100644 index 3cfb2ecdcc..0000000000 --- a/include/d/d_stage/asm/func_80028170.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028170 000250B0 80 63 00 84 */ lwz r3, 0x84(r3) -/* 80028174 000250B4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028178.s b/include/d/d_stage/asm/func_80028178.s deleted file mode 100644 index 93dbb25497..0000000000 --- a/include/d/d_stage/asm/func_80028178.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028178 000250B8 90 83 00 88 */ stw r4, 0x88(r3) -/* 8002817C 000250BC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028180.s b/include/d/d_stage/asm/func_80028180.s deleted file mode 100644 index 9acb2b6544..0000000000 --- a/include/d/d_stage/asm/func_80028180.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028180 000250C0 80 63 00 88 */ lwz r3, 0x88(r3) -/* 80028184 000250C4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028188.s b/include/d/d_stage/asm/func_80028188.s deleted file mode 100644 index 05baad62d2..0000000000 --- a/include/d/d_stage/asm/func_80028188.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028188 000250C8 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 8002818C 000250CC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028190.s b/include/d/d_stage/asm/func_80028190.s deleted file mode 100644 index 341771010d..0000000000 --- a/include/d/d_stage/asm/func_80028190.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 80028190 000250D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028194 000250D4 7C 08 02 A6 */ mflr r0 -/* 80028198 000250D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002819C 000250DC 4B FF BD 29 */ bl dStage_SetErrorStage -/* 800281A0 000250E0 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800281A4 000250E4 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800281A8 000250E8 38 63 03 DD */ addi r3, r3, 0x3dd -/* 800281AC 000250EC 4C C6 31 82 */ crclr 6 -/* 800281B0 000250F0 4B FD E9 0D */ bl OSReport -/* 800281B4 000250F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800281B8 000250F8 7C 08 03 A6 */ mtlr r0 -/* 800281BC 000250FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800281C0 00025100 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800281C4.s b/include/d/d_stage/asm/func_800281C4.s deleted file mode 100644 index f63e974f90..0000000000 --- a/include/d/d_stage/asm/func_800281C4.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800281C4 00025104 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800281C8 00025108 7C 08 02 A6 */ mflr r0 -/* 800281CC 0002510C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800281D0 00025110 3C 60 80 38 */ lis r3, lbl_80378A50@ha -/* 800281D4 00025114 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l -/* 800281D8 00025118 38 63 03 DD */ addi r3, r3, 0x3dd -/* 800281DC 0002511C 4C C6 31 82 */ crclr 6 -/* 800281E0 00025120 4B FD E8 DD */ bl OSReport -/* 800281E4 00025124 38 60 00 00 */ li r3, 0 -/* 800281E8 00025128 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800281EC 0002512C 7C 08 03 A6 */ mtlr r0 -/* 800281F0 00025130 38 21 00 10 */ addi r1, r1, 0x10 -/* 800281F4 00025134 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_800281F8.s b/include/d/d_stage/asm/func_800281F8.s deleted file mode 100644 index 7c0254c10f..0000000000 --- a/include/d/d_stage/asm/func_800281F8.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 800281F8 00025138 90 83 00 90 */ stw r4, 0x90(r3) -/* 800281FC 0002513C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028200.s b/include/d/d_stage/asm/func_80028200.s deleted file mode 100644 index 6a8d14c247..0000000000 --- a/include/d/d_stage/asm/func_80028200.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028200 00025140 80 63 00 90 */ lwz r3, 0x90(r3) -/* 80028204 00025144 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028208.s b/include/d/d_stage/asm/func_80028208.s deleted file mode 100644 index 5f6c442f30..0000000000 --- a/include/d/d_stage/asm/func_80028208.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028208 00025148 90 83 00 94 */ stw r4, 0x94(r3) -/* 8002820C 0002514C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028210.s b/include/d/d_stage/asm/func_80028210.s deleted file mode 100644 index af8211b208..0000000000 --- a/include/d/d_stage/asm/func_80028210.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028210 00025150 80 63 00 94 */ lwz r3, 0x94(r3) -/* 80028214 00025154 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028218.s b/include/d/d_stage/asm/func_80028218.s deleted file mode 100644 index 9d4fe1a9fe..0000000000 --- a/include/d/d_stage/asm/func_80028218.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028218 00025158 90 83 00 98 */ stw r4, 0x98(r3) -/* 8002821C 0002515C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028220.s b/include/d/d_stage/asm/func_80028220.s deleted file mode 100644 index 84492a1aad..0000000000 --- a/include/d/d_stage/asm/func_80028220.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028220 00025160 80 63 00 98 */ lwz r3, 0x98(r3) -/* 80028224 00025164 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028228.s b/include/d/d_stage/asm/func_80028228.s deleted file mode 100644 index 7aaa35d937..0000000000 --- a/include/d/d_stage/asm/func_80028228.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028228 00025168 90 83 00 9C */ stw r4, 0x9c(r3) -/* 8002822C 0002516C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028230.s b/include/d/d_stage/asm/func_80028230.s deleted file mode 100644 index 22d09bac24..0000000000 --- a/include/d/d_stage/asm/func_80028230.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028230 00025170 80 63 00 9C */ lwz r3, 0x9c(r3) -/* 80028234 00025174 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028238.s b/include/d/d_stage/asm/func_80028238.s deleted file mode 100644 index 4be82d40d4..0000000000 --- a/include/d/d_stage/asm/func_80028238.s +++ /dev/null @@ -1 +0,0 @@ -/* 80028238 00025178 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_8002823C.s b/include/d/d_stage/asm/func_8002823C.s deleted file mode 100644 index a9fc137ea8..0000000000 --- a/include/d/d_stage/asm/func_8002823C.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 8002823C 0002517C 38 60 00 00 */ li r3, 0 -/* 80028240 00025180 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80028244.s b/include/d/d_stage/asm/func_80028244.s deleted file mode 100644 index aeab64cc03..0000000000 --- a/include/d/d_stage/asm/func_80028244.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80028244 00025184 90 83 00 A0 */ stw r4, 0xa0(r3) -/* 80028248 00025188 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_pc/f_pc_create_req/asm/func_80020BA0.s b/include/f/f_pc/f_pc_create_req/asm/func_80020BA0.s deleted file mode 100644 index 2eef38ee87..0000000000 --- a/include/f/f_pc/f_pc_create_req/asm/func_80020BA0.s +++ /dev/null @@ -1,32 +0,0 @@ -/* 80020BA0 0001DAE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80020BA4 0001DAE4 7C 08 02 A6 */ mflr r0 -/* 80020BA8 0001DAE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80020BAC 0001DAEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80020BB0 0001DAF0 7C 7F 1B 78 */ mr r31,r3 -/* 80020BB4 0001DAF4 4B FF FF 6D */ bl fpcCtRq_CreateQTo -/* 80020BB8 0001DAF8 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 80020BBC 0001DAFC 28 03 00 00 */ cmplwi r3, 0 -/* 80020BC0 0001DB00 41 82 00 20 */ beq lbl_80020BE0 -/* 80020BC4 0001DB04 80 63 00 08 */ lwz r3,8(r3) -/* 80020BC8 0001DB08 7F E4 FB 78 */ mr r4,r31 -/* 80020BCC 0001DB0C 48 00 18 5D */ bl fpcMtd_Method -/* 80020BD0 0001DB10 2C 03 00 00 */ cmpwi r3, 0 -/* 80020BD4 0001DB14 40 82 00 0C */ bne lbl_80020BE0 -/* 80020BD8 0001DB18 38 60 00 00 */ li r3,0 -/* 80020BDC 0001DB1C 48 00 00 24 */ b lbl_80020C00 -lbl_80020BE0 : -/* 80020BE0 0001DB20 80 7F 00 40 */ lwz r3,0x40(r31) -/* 80020BE4 0001DB24 28 03 00 00 */ cmplwi r3,0 -/* 80020BE8 0001DB28 41 82 00 0C */ beq lbl_80020BF4 -/* 80020BEC 0001DB2C 38 00 00 00 */ li r0,0 -/* 80020BF0 0001DB30 90 03 00 14 */ stw r0,0x14(r3) -lbl_80020BF4 : -/* 80020BF4 0001DB34 7F E3 FB 78 */ mr r3,r31 -/* 80020BF8 0001DB38 48 24 26 69 */ bl free__3cMlFPv -/* 80020BFC 0001DB3C 38 60 00 01 */ li r3,1 -lbl_80020C00 : -/* 80020C00 0001DB40 83 E1 00 0C */ lwz r31,0xc(r1) -/* 80020C04 0001DB44 80 01 00 14 */ lwz r0,0x14(r1) -/* 80020C08 0001DB48 7C 08 03 A6 */ mtlr r0 -/* 80020C0C 0001DB4C 38 21 00 10 */ addi r1,r1,0x10 -/* 80020C10 0001DB50 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/functions.h b/include/functions.h index 54b2092cf6..3a3d17ccb6 100644 --- a/include/functions.h +++ b/include/functions.h @@ -510,7 +510,6 @@ void Z2EnvSeMgr_NS_initSceneEnvSe(void); void setFieldBgmPlay__8Z2SeqMgrFb(void); void Z2SeqMgr_NS_setTimeProcVolMod(void); void Z2SeqMgr_NS_setHeightVolMod(void); -void JAISound_NS_stop(void); void JAUSoundTable_NS_getTypeID(void); void JAIStreamMgr_NS_isActive(void); void JAISound_NS_getID(void); @@ -518,13 +517,13 @@ void JSUList_X1_(void); void dComIfGs_isStageSwitch(void); void dComIfGs_getStartPoint(void); void isSwitch__10dSv_info_cCFii(void); -void Z2SoundObjMgr_NS_setForceBattleArea(void); +void setForceBattleArea__13Z2SoundObjMgrFbUsUsUs(void); void Z2SeqMgr_NS_unMuteSceneBgm(void); void Z2SeqMgr_NS_muteSceneBgm(void); void dComIfGs_isEventBit(void); void JAISoundID_NS___as(void); void dComIfGs_isSaveSwitch(void); -void Z2SoundObjMgr_NS_setGhostEnemyState(void); +void setGhostEnemyState__13Z2SoundObjMgrFUc(void); void Z2SeMgr_NS_resetCrowdSize(void); void Z2SeqMgr_NS_setTwilightGateVol(void); void Z2SeqMgr_NS_setWindStoneVol(void); @@ -535,30 +534,29 @@ void moveVolume__18JAISoundParamsMoveFfUl(void); } // Z2LinkMgr extern "C" { +void __ct__10Z2CreatureFv(void); void Z2CreatureLink_NS_startLinkSound(void); void Z2SoundObjSimple(void); -void Z2Creature(void); void JAISoundStarter_NS_dtor(void); void Z2Creature_NS_dtor(void); -void Z2SoundObjBase_NS_dtor(void); +void __dt__14Z2SoundObjBaseFv(void); void Z2Creature_NS_deleteObject(void); void deleteKantera__14Z2CreatureLinkFv(void); void Z2Creature_NS_init_X1_(void); -void Z2SoundObjBase_NS_deleteObject(void); +void deleteObject__14Z2SoundObjBaseFv(void); void moveVolume__18JAISoundParamsMoveFfUl(void); void Z2CreatureLink_NS_startLinkSoundLevel(void); void Z2Creature_NS_framework(void); void Z2Audience_NS_setTargetVolume(void); -void Z2SoundObjMgr_NS_setGhostEnemyState(void); +void setGhostEnemyState__13Z2SoundObjMgrFUc(void); void Z2FxLineMgr_NS_setFxForceOff(void); void JAISoundParamsMove_NS_movePitch(void); void Z2Calc_NS_linearTransform(void); -void JAISound_NS_stop(void); -void Z2SoundHandles_NS_getHandleSoundID(void); +void getHandleSoundID__14Z2SoundHandlesF10JAISoundID(void); void Z2SeqMgr_NS_setBattleSeqState(void); void startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc(void); void startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc(void); -void Z2SoundStarter_NS_setPortData(void); +void setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc(void); void Z2SoundObjBase_NS_startCollisionSE(void); void Z2SeqMgr_NS_setBattleLastHit(void); } @@ -1602,7 +1600,7 @@ void daAlink_c_NS_procBoomerangMoveInit(void); void daAlink_c_NS_checkHorseLieAnime(void); void func_800C6FE4(void); void daAlink_c_NS_setBowModel(void); -void Z2WolfHowlMgr(void); +void __ct__13Z2WolfHowlMgrFv(void); void daAlink_c_NS_getBaseHorseAnime(void); void daAlink_c_NS_checkHorseDashAccept(void); void func_8010755C(void); @@ -1703,7 +1701,7 @@ void func_800D087C(void); void dAttHint_c_NS_convPId(void); void dMsgFlow_c_NS_dtor(void); void dBgS_PolyPassChk_NS_SetLink(void); -void Z2WolfHowlMgr_NS_startWolfHowlSound(void); +void startWolfHowlSound__13Z2WolfHowlMgrFffbf(void); void daAlink_c_NS_setGrabItemActor(void); void fopKyM_createWpillar(void); void daAlink_c_NS_checkAcceptUseItemInWater(void); @@ -1724,7 +1722,7 @@ void daAlink_c_NS_procWolfSlipTurnLandInit(void); void daAlink_c_NS_procRollJumpInit(void); void mDoMtx_MtxToRot(void); void func_800D0998(void); -void Z2WolfHowlMgr_NS_skipCorrectDemo(void); +void skipCorrectDemo__13Z2WolfHowlMgrFv(void); void dKy_shadow_mode_reset(void); void dPaPo_c_NS_setEffectCenter(void); void daAlink_c_NS_procWaitTurnInit(void); @@ -2315,7 +2313,7 @@ void func_80110648(void); void daAlink_c_NS_getSceneExitMoveAngle(void); void func_800E3454(void); void daAlink_c_NS_setArmMatrix(void); -void JAISoundHandle_NS_releaseSound(void); +void releaseSound__14JAISoundHandleFv(void); void func_8010F698(void); void func_80141684(void); void daAlink_c_NS_procCoDeadInit(void); @@ -2382,7 +2380,7 @@ void func_800F3754(void); void daPy_py_c_NS_checkFishingRodItem(void); void daAlink_c_NS_procHorseComebackInit(void); void dKyw_get_AllWind_vec(void); -void Z2WolfHowlMgr_NS_setCorrectData(void); +void setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData(void); void func_800D6D94(void); void func_800D09C8(void); void daAlink_c_NS_checkWolfLockData(void); @@ -5588,9 +5586,9 @@ void setCameraGroupInfo__11Z2StatusMgrFUc(u8); extern "C" { void Z2EnvSeMgr_NS_getFogDensity(void); void Z2SpeechMgr2_NS_isNonVerbal(void); -void Z2SpeechMgr2_NS_ctor(void); +void __ct__12Z2SpeechMgr2Fv(void); void _savegpr_29(void); -void Z2SpeechStarter(void); +void __ct__15Z2SpeechStarterFv(void); void Z2SpeechMgr2_NS_setString(void); void Z2SpeechMgr2_NS_speakOneWord(void); void JAISoundParamsMove_NS_moveDolby(void); @@ -5599,7 +5597,6 @@ void Z2SpeechMgr2_NS_setTextCount(void); void func_802CCFF8(void); void _savegpr_28(void); void _restgpr_28(void); -void JAISound_NS_stop_X1_(void); void JAISoundParamsMove_NS_movePan(void); void Z2SpeechMgr2_NS_framework(void); // void subBgmStart__8Z2SeqMgrFUl(void); @@ -5611,7 +5608,7 @@ void Z2SpeechMgr2_NS_selectTail(void); void _savegpr_26(void); void _restgpr_26(void); void Z2SpeechMgr2_NS_selectUnit(void); -void Z2SoundStarter_NS_ctor(void); +void __ct__14Z2SoundStarterFb(void); } // additional symbols needed for Z2Audience.cpp @@ -5784,7 +5781,7 @@ void JAISeMgr_NS_stop(void); void JAISeMgr_NS_initParams(void); void JASTrack_NS_setFIR(void); void Z2SoundMgr_NS_isPlayingSoundID(void); -void Z2SoundInfo_NS_getSwBit(void); +void getSwBit__11Z2SoundInfoCF10JAISoundID(void); void JAISeMgr_NS_calc(void); void JAISeqMgr_NS_stopSoundID(void); void Z2SoundMgr_NS_multiVolumeSoundID(void); @@ -5810,7 +5807,7 @@ void JAU_JASInitializer(void); void __ct__7Z2SeMgrFv(void); void JASHeap_NS_free(void); void Z2AudioMgr_NS_init(void); -void Z2AudioArcLoader(void); +void __ct__16Z2AudioArcLoaderFP10JAUSection(void); void JAUAudioArcLoader_NS_load(void); void __ct__10Z2SceneMgrFv(void); void func_8036679C(void); @@ -5854,7 +5851,7 @@ void JASDriver_NS_getSubFrames(void); // ctors void Z2FxLineMgr(void); void Z2Audience(void); -void Z2SoundObjMgr_NS_ctor(void); +void __ct__13Z2SoundObjMgrFv(void); void JASHeap_NS___defctor(); void JASHeap_NS_dtor(); void JASMemPool_NS_dtor_X4_(); @@ -5900,7 +5897,7 @@ void func_802C06F4(void); void func_802C1A14(void); void Z2CreatureCitizen_NS_setMdlType(void); void func_802C1D10(void); -void Z2SoundObjBase_NS_init(void); +void init__14Z2SoundObjBaseFP3VecUc(void); void Z2CreatureCitizen_NS_init(void); void func_802C0AF8(void); void func_802C10D4(void); @@ -5909,7 +5906,6 @@ void func_802C0ED8(void); void Z2_E_sw_modPitch(void); void func_802C1B90(void); void Z2_B_zan_modPitch(void); -void Z2CreatureEnemy(void); void func_802C136C(void); void Z2SoundObjAnime(void); void Z2CreatureEnemy_NS_deleteObject(void); @@ -5933,7 +5929,7 @@ void func_802C19D8(void); void Z2_E_ms_modVol(void); // manual -void Z2SoundObjBase_NS_ctor(void); +void __ct__14Z2SoundObjBaseFv(void); void Z2SoundObjSimple_NS_dtor(void); } @@ -5942,29 +5938,29 @@ void Z2SoundObjSimple_NS_dtor(void); extern "C" { void JASTrack_NS_readPort(void); void JASTrack_NS_openChild(void); -void Z2SoundStarter_NS_getPortData(void); -void func_802AABF4(void); -void Z2SoundStarter_NS_startSound_X1_(void); -void func_802AAFF0(void); +void getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc(void); +void startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl( + void); +void __dt__14Z2SoundStarterFv(void); void JAISoundStarter_NS_ctor(void); } // additional symbols needed for Z2WolfHowlMgr.cpp // autogenerated by split.py v0.3 at 2021-01-04 23:43:51.357906 extern "C" { -void Z2WolfHowlMgr_NS_getCorrectLineNum(void); -void Z2WolfHowlMgr_NS_getNowPitch(void); -void Z2WolfHowlMgr_NS_getCorrectLine(void); -void Z2WolfHowlMgr_NS_calcPitchMod(void); +void getCorrectLineNum__13Z2WolfHowlMgrFv(void); +void getNowPitch__13Z2WolfHowlMgrFv(void); +void getCorrectLine__13Z2WolfHowlMgrFUc(void); +void calcPitchMod__13Z2WolfHowlMgrFff(void); void func_802CBB7C(void); -void Z2WolfHowlMgr_NS_calcVolumeMod(void); -void Z2WolfHowlMgr_NS_startGuideMelody(void); +void calcVolumeMod__13Z2WolfHowlMgrFf(void); +void startGuideMelody__13Z2WolfHowlMgrFb(void); void func_802CB6EC(void); void Z2SeqMgr_NS_stopWolfHowlSong(void); -void Z2WolfHowlMgr_NS_getNowInputValue(void); -void Z2WolfHowlMgr_NS_resetState(void); -void Z2WolfHowlMgr_NS_getOnLineNum(void); -void Z2WolfHowlMgr_NS_checkLine(void); +void getNowInputValue__13Z2WolfHowlMgrFv(void); +void resetState__13Z2WolfHowlMgrFv(void); +void getOnLineNum__13Z2WolfHowlMgrFv(void); +void checkLine__13Z2WolfHowlMgrFv(void); } // additional symbols needed for Z2SoundObject.cpp @@ -5983,14 +5979,13 @@ void func_802BE7AC(void); void Z2SoundHandles_NS_dtor(void); void Z2SoundObjAnime_NS_ageSounds_(void); void Z2SoundObjBase_NS_startSound(void); -void Z2SoundObjBase_NS_framework(void); +void framework__14Z2SoundObjBaseFUlSc(void); void JAISound_NS_newAudible(void); void Z2SoundObjAnime_NS_playsSound(void); void func_802BE880(void); void func_802BEB38(void); -void func_802BE070(void); void func_802BE8A0(void); -void Z2SoundHandles_NS_deleteHandlesPool(void); +void deleteHandlesPool__14Z2SoundHandlesFv(void); // void isSoundCulling__7Z2SeMgrF10JAISoundID(void); void Z2SoundHandles_NS_getLowPrioSound(void); void Z2SoundHandles_NS_setPos(void); @@ -5999,14 +5994,15 @@ void func_802BE9B0(void); void func_802BE65C(void); void Z2SoundHandles_NS_getFreeHandle(void); void func_802BEBDC(void); -void Z2SoundHandles_NS_initHandlesPool(void); -void Z2SoundHandles_NS_getHandleUserData(void); +void initHandlesPool__14Z2SoundHandlesFUc(void); +void getHandleUserData__14Z2SoundHandlesFUl(void); void func_802BE5FC(void); void Z2SoundObjBase_NS_startLevelSound(void); -void func_802BE104(void); +void stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool(void); // manual -void Z2SoundHandles(void); +void __ct__14Z2SoundHandlesFv(void); +void __dt__14Z2SoundHandlesFv(void); } // additional symbols needed for Z2SoundObjMgr.cpp @@ -6014,13 +6010,13 @@ void Z2SoundHandles(void); extern "C" { void Z2SeqMgr_NS_setBattleDistState(void); void Z2SeqMgr_NS_stopBattleBgm(void); -void Z2SoundObjMgr_NS_isTwilightBattle(void); +void isTwilightBattle__13Z2SoundObjMgrFv(void); void Z2SoundObjMgr_NS_checkBattleFinish(void); void Z2SoundObjMgr_NS_searchEnemy(void); -void Z2SeqMgr_NS_setBattleGhostMute(void); +void setBattleGhostMute__8Z2SeqMgrFb(void); void func_802C01EC(void); -void Z2SoundObjMgr_NS_deleteEnemyAll(void); -void Z2SoundObjMgr_NS_setBattleInit(void); +void deleteEnemyAll__13Z2SoundObjMgrFv(void); +void setBattleInit__13Z2SoundObjMgrFv(void); void Z2SeqMgr_NS_setBattleSearched(void); } @@ -6031,7 +6027,7 @@ void Z2SoundInfo_NS_getStreamFilePath(void); void func_802BB6DC(void); void func_802BBCBC(void); void func_802BB0E0(void); -void Z2SoundInfo_NS_getBgmSeqResourceID(void); +void getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID(void); void Z2SoundInfo_NS_getSoundInfo_(void); void func_802BBCD4(void); void func_802BBCCC(void); @@ -6052,9 +6048,9 @@ void func_802BB0D8(void); extern "C" { void JAUSectionHeap_NS_getOpenSection(void); void func_802A9B54(void); -void func_802A9A70(void); +void readCommandMore__16Z2AudioArcLoaderFUl(void); void Z2FxLineMgr_NS_initDataArc(void); -void Z2AudioArcLoader_NS_readBFCA(void); +void readBFCA__16Z2AudioArcLoaderFPCv(void); void func_802A9B58(void); // manual @@ -6077,11 +6073,11 @@ void JASDsp_NS_setFXLine(void); // additional symbols needed for Z2SoundHandles.cpp // autogenerated by split.py v0.3 at 2021-01-05 01:21:30.657314 extern "C" { -void Z2SoundHandles_NS_isActive(void); -void Z2SoundHandles_NS_stopAllSounds(void); +void isActive__14Z2SoundHandlesCFv(void); +void stopAllSounds__14Z2SoundHandlesFUl(void); } -// additional symbols needed for .cpp +// additional symbols needed for _Z2LinkMgr.cpp // autogenerated by split.py v0.3 at 2021-01-05 01:30:23.453804 extern "C" { void func_802C5078(void); diff --git a/include/m_Do/m_Do_controller_pad/asm/mDoCPd_c_NS_recalibrate.s b/include/m_Do/m_Do_controller_pad/asm/mDoCPd_c_NS_recalibrate.s deleted file mode 100644 index 92f6063c20..0000000000 --- a/include/m_Do/m_Do_controller_pad/asm/mDoCPd_c_NS_recalibrate.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80007D74 00004CB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80007D78 00004CB8 7C 08 02 A6 */ mflr r0 -/* 80007D7C 00004CBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80007D80 00004CC0 48 2D 92 A5 */ bl clearForReset__10JUTGamePadFv -/* 80007D84 00004CC4 3C 60 F0 00 */ lis r3, 0xf000 -/* 80007D88 00004CC8 48 2D 9C 51 */ bl setEnabled__Q210JUTGamePad7CRumbleFUl -/* 80007D8C 00004CCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80007D90 00004CD0 7C 08 03 A6 */ mtlr r0 -/* 80007D94 00004CD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80007D98 00004CD8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/m_Do/m_Do_main/asm/func_80005848.s b/include/m_Do/m_Do_main/asm/func_80005848.s deleted file mode 100644 index 2e0399c686..0000000000 --- a/include/m_Do/m_Do_main/asm/func_80005848.s +++ /dev/null @@ -1,24 +0,0 @@ -/* 80005848 00002788 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8000584C 0000278C 7C 08 02 A6 */ mflr r0 -/* 80005850 00002790 90 01 00 14 */ stw r0, 0x14(r1) -/* 80005854 00002794 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80005858 00002798 93 C1 00 08 */ stw r30, 8(r1) -/* 8000585C 0000279C 7C 7E 1B 78 */ mr r30, r3 -/* 80005860 000027A0 48 33 B4 65 */ bl OSDisableScheduler -/* 80005864 000027A4 3B E0 00 00 */ li r31, 0 -/* 80005868 000027A8 80 7E 00 80 */ lwz r3, 0x80(r30) -/* 8000586C 000027AC 48 00 00 0C */ b lbl_80005878 -lbl_80005870: -/* 80005870 000027B0 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80005874 000027B4 3B FF 00 01 */ addi r31, r31, 1 -lbl_80005878: -/* 80005878 000027B8 28 03 00 00 */ cmplwi r3, 0 -/* 8000587C 000027BC 40 82 FF F4 */ bne lbl_80005870 -/* 80005880 000027C0 48 33 B4 85 */ bl OSEnableScheduler -/* 80005884 000027C4 7F E3 FB 78 */ mr r3, r31 -/* 80005888 000027C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8000588C 000027CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80005890 000027D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80005894 000027D4 7C 08 03 A6 */ mtlr r0 -/* 80005898 000027D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000589C 000027DC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/m_Do/m_Do_main/asm/func_800058C4.s b/include/m_Do/m_Do_main/asm/func_800058C4.s deleted file mode 100644 index 4ab6c52b8c..0000000000 --- a/include/m_Do/m_Do_main/asm/func_800058C4.s +++ /dev/null @@ -1,133 +0,0 @@ -/* 800058C4 00002804 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800058C8 00002808 7C 08 02 A6 */ mflr r0 -/* 800058CC 0000280C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800058D0 00002810 39 61 00 20 */ addi r11, r1, 0x20 -/* 800058D4 00002814 48 35 C8 FD */ bl _savegpr_26 -/* 800058D8 00002818 7C 7D 1B 78 */ mr r29, r3 -/* 800058DC 0000281C 80 63 00 08 */ lwz r3, 8(r3) -/* 800058E0 00002820 80 83 00 38 */ lwz r4, 0x38(r3) -/* 800058E4 00002824 7C 9A 23 78 */ mr r26, r4 -/* 800058E8 00002828 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 800058EC 0000282C 7F E0 20 50 */ subf r31, r0, r4 -/* 800058F0 00002830 48 2C A4 75 */ bl getTotalUsedSize__10JKRExpHeapCFv -/* 800058F4 00002834 7C 7E 1B 78 */ mr r30, r3 -/* 800058F8 00002838 80 7D 00 08 */ lwz r3, 8(r29) -/* 800058FC 0000283C 48 2C 8E 89 */ bl getTotalFreeSize__7JKRHeapCFv -/* 80005900 00002840 7C 7B 1B 78 */ mr r27, r3 -/* 80005904 00002844 80 7D 00 08 */ lwz r3, 8(r29) -/* 80005908 00002848 48 2C 8E 25 */ bl getFreeSize__7JKRHeapCFv -/* 8000590C 0000284C 7C 7C 1B 78 */ mr r28, r3 -/* 80005910 00002850 38 60 00 64 */ li r3, 0x64 -/* 80005914 00002854 38 80 00 D4 */ li r4, 0xd4 -/* 80005918 00002858 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 8000591C 0000285C 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 80005920 00002860 38 A5 00 3C */ addi r5, r5, 0x3c -/* 80005924 00002864 80 DD 00 00 */ lwz r6, 0(r29) -/* 80005928 00002868 4C C6 31 82 */ crclr 6 -/* 8000592C 0000286C 48 2D AC 05 */ bl JUTReport__FiiPCce -/* 80005930 00002870 38 60 00 64 */ li r3, 0x64 -/* 80005934 00002874 38 80 00 E3 */ li r4, 0xe3 -/* 80005938 00002878 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 8000593C 0000287C 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 80005940 00002880 38 A5 00 45 */ addi r5, r5, 0x45 -/* 80005944 00002884 7F 46 D3 78 */ mr r6, r26 -/* 80005948 00002888 4C C6 31 82 */ crclr 6 -/* 8000594C 0000288C 48 2D AB E5 */ bl JUTReport__FiiPCce -/* 80005950 00002890 38 60 00 64 */ li r3, 0x64 -/* 80005954 00002894 38 80 00 F0 */ li r4, 0xf0 -/* 80005958 00002898 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 8000595C 0000289C 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 80005960 000028A0 38 A5 00 5B */ addi r5, r5, 0x5b -/* 80005964 000028A4 80 DD 00 1C */ lwz r6, 0x1c(r29) -/* 80005968 000028A8 4C C6 31 82 */ crclr 6 -/* 8000596C 000028AC 48 2D AB C5 */ bl JUTReport__FiiPCce -/* 80005970 000028B0 38 60 00 64 */ li r3, 0x64 -/* 80005974 000028B4 38 80 00 FD */ li r4, 0xfd -/* 80005978 000028B8 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 8000597C 000028BC 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 80005980 000028C0 38 A5 00 71 */ addi r5, r5, 0x71 -/* 80005984 000028C4 7C DF D8 50 */ subf r6, r31, r27 -/* 80005988 000028C8 4C C6 31 82 */ crclr 6 -/* 8000598C 000028CC 48 2D AB A5 */ bl JUTReport__FiiPCce -/* 80005990 000028D0 38 60 00 64 */ li r3, 0x64 -/* 80005994 000028D4 38 80 01 0A */ li r4, 0x10a -/* 80005998 000028D8 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 8000599C 000028DC 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 800059A0 000028E0 38 A5 00 87 */ addi r5, r5, 0x87 -/* 800059A4 000028E4 7C DF E0 50 */ subf r6, r31, r28 -/* 800059A8 000028E8 4C C6 31 82 */ crclr 6 -/* 800059AC 000028EC 48 2D AB 85 */ bl JUTReport__FiiPCce -/* 800059B0 000028F0 38 60 00 64 */ li r3, 0x64 -/* 800059B4 000028F4 38 80 01 17 */ li r4, 0x117 -/* 800059B8 000028F8 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 800059BC 000028FC 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 800059C0 00002900 38 A5 00 9D */ addi r5, r5, 0x9d -/* 800059C4 00002904 7F C6 F3 78 */ mr r6, r30 -/* 800059C8 00002908 4C C6 31 82 */ crclr 6 -/* 800059CC 0000290C 48 2D AB 65 */ bl JUTReport__FiiPCce -/* 800059D0 00002910 38 60 00 64 */ li r3, 0x64 -/* 800059D4 00002914 38 80 01 24 */ li r4, 0x124 -/* 800059D8 00002918 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 800059DC 0000291C 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 800059E0 00002920 38 A5 00 B3 */ addi r5, r5, 0xb3 -/* 800059E4 00002924 1C DE 00 64 */ mulli r6, r30, 0x64 -/* 800059E8 00002928 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 800059EC 0000292C 7C C6 03 D6 */ divw r6, r6, r0 -/* 800059F0 00002930 4C C6 31 82 */ crclr 6 -/* 800059F4 00002934 48 2D AB 3D */ bl JUTReport__FiiPCce -/* 800059F8 00002938 38 60 00 64 */ li r3, 0x64 -/* 800059FC 0000293C 38 80 01 31 */ li r4, 0x131 -/* 80005A00 00002940 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 80005A04 00002944 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 80005A08 00002948 38 A5 00 CF */ addi r5, r5, 0xcf -/* 80005A0C 0000294C 80 DD 00 0C */ lwz r6, 0xc(r29) -/* 80005A10 00002950 4C C6 31 82 */ crclr 6 -/* 80005A14 00002954 48 2D AB 1D */ bl JUTReport__FiiPCce -/* 80005A18 00002958 38 60 00 64 */ li r3, 0x64 -/* 80005A1C 0000295C 38 80 01 3E */ li r4, 0x13e -/* 80005A20 00002960 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 80005A24 00002964 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 80005A28 00002968 38 A5 00 E5 */ addi r5, r5, 0xe5 -/* 80005A2C 0000296C 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 80005A30 00002970 1C C0 00 64 */ mulli r6, r0, 0x64 -/* 80005A34 00002974 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 80005A38 00002978 7C C6 03 D6 */ divw r6, r6, r0 -/* 80005A3C 0000297C 4C C6 31 82 */ crclr 6 -/* 80005A40 00002980 48 2D AA F1 */ bl JUTReport__FiiPCce -/* 80005A44 00002984 38 60 00 64 */ li r3, 0x64 -/* 80005A48 00002988 38 80 01 4B */ li r4, 0x14b -/* 80005A4C 0000298C 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 80005A50 00002990 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 80005A54 00002994 38 A5 01 01 */ addi r5, r5, 0x101 -/* 80005A58 00002998 80 1D 00 10 */ lwz r0, 0x10(r29) -/* 80005A5C 0000299C 7C DF 00 50 */ subf r6, r31, r0 -/* 80005A60 000029A0 4C C6 31 82 */ crclr 6 -/* 80005A64 000029A4 48 2D AA CD */ bl JUTReport__FiiPCce -/* 80005A68 000029A8 38 60 00 64 */ li r3, 0x64 -/* 80005A6C 000029AC 38 80 01 58 */ li r4, 0x158 -/* 80005A70 000029B0 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 80005A74 000029B4 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 80005A78 000029B8 38 A5 01 17 */ addi r5, r5, 0x117 -/* 80005A7C 000029BC 80 1D 00 10 */ lwz r0, 0x10(r29) -/* 80005A80 000029C0 7C 1F 00 50 */ subf r0, r31, r0 -/* 80005A84 000029C4 1C C0 00 64 */ mulli r6, r0, 0x64 -/* 80005A88 000029C8 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 80005A8C 000029CC 7C C6 03 D6 */ divw r6, r6, r0 -/* 80005A90 000029D0 4C C6 31 82 */ crclr 6 -/* 80005A94 000029D4 48 2D AA 9D */ bl JUTReport__FiiPCce -/* 80005A98 000029D8 80 7D 00 08 */ lwz r3, 8(r29) -/* 80005A9C 000029DC 4B FF FD AD */ bl countUsed__FP10JKRExpHeap -/* 80005AA0 000029E0 7C 66 1B 78 */ mr r6, r3 -/* 80005AA4 000029E4 38 60 00 64 */ li r3, 0x64 -/* 80005AA8 000029E8 38 80 01 65 */ li r4, 0x165 -/* 80005AAC 000029EC 3C A0 80 37 */ lis r5, lbl_803739A0@ha -/* 80005AB0 000029F0 38 A5 39 A0 */ addi r5, r5, lbl_803739A0@l -/* 80005AB4 000029F4 38 A5 01 33 */ addi r5, r5, 0x133 -/* 80005AB8 000029F8 4C C6 31 82 */ crclr 6 -/* 80005ABC 000029FC 48 2D AA 75 */ bl JUTReport__FiiPCce -/* 80005AC0 00002A00 39 61 00 20 */ addi r11, r1, 0x20 -/* 80005AC4 00002A04 48 35 C7 59 */ bl _restgpr_26 -/* 80005AC8 00002A08 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80005ACC 00002A0C 7C 08 03 A6 */ mtlr r0 -/* 80005AD0 00002A10 38 21 00 20 */ addi r1, r1, 0x20 -/* 80005AD4 00002A14 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/m_Do/m_Do_main/asm/func_800061C8.s b/include/m_Do/m_Do_main/asm/func_800061C8.s deleted file mode 100644 index c1ec4f5a07..0000000000 --- a/include/m_Do/m_Do_main/asm/func_800061C8.s +++ /dev/null @@ -1,55 +0,0 @@ -/* 800061C8 00003108 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800061CC 0000310C 7C 08 02 A6 */ mflr r0 -/* 800061D0 00003110 90 01 00 14 */ stw r0, 0x14(r1) -/* 800061D4 00003114 88 0D 80 00 */ lbz r0, lbl_80450580-_SDA_BASE_(r13) -/* 800061D8 00003118 7C 00 07 75 */ extsb. r0, r0 -/* 800061DC 0000311C 41 82 00 A0 */ beq lbl_8000627C -/* 800061E0 00003120 88 0D 85 9A */ lbz r0, lbl_80450B1A-_SDA_BASE_(r13) -/* 800061E4 00003124 28 00 00 00 */ cmplwi r0, 0 -/* 800061E8 00003128 41 82 00 0C */ beq lbl_800061F4 -/* 800061EC 0000312C 38 60 00 02 */ li r3, 2 -/* 800061F0 00003130 4B FF F5 9D */ bl CheckHeap__FUl -lbl_800061F4: -/* 800061F4 00003134 3C 60 80 3E */ lis r3, m_gamePad@ha -/* 800061F8 00003138 38 63 D2 D8 */ addi r3, r3, m_gamePad@l -/* 800061FC 0000313C 80 63 00 08 */ lwz r3, 8(r3) -/* 80006200 00003140 80 03 00 18 */ lwz r0, 0x18(r3) -/* 80006204 00003144 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 80006208 00003148 28 00 00 20 */ cmplwi r0, 0x20 -/* 8000620C 0000314C 40 82 00 1C */ bne lbl_80006228 -/* 80006210 00003150 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80006214 00003154 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80006218 00003158 41 82 00 10 */ beq lbl_80006228 -/* 8000621C 0000315C 88 0D 85 98 */ lbz r0, lbl_80450B18-_SDA_BASE_(r13) -/* 80006220 00003160 68 00 00 01 */ xori r0, r0, 1 -/* 80006224 00003164 98 0D 85 98 */ stb r0, lbl_80450B18-_SDA_BASE_(r13) -lbl_80006228: -/* 80006228 00003168 88 0D 85 98 */ lbz r0, lbl_80450B18-_SDA_BASE_(r13) -/* 8000622C 0000316C 28 00 00 00 */ cmplwi r0, 0 -/* 80006230 00003170 41 82 00 44 */ beq lbl_80006274 -/* 80006234 00003174 80 03 00 18 */ lwz r0, 0x18(r3) -/* 80006238 00003178 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 8000623C 0000317C 28 00 00 40 */ cmplwi r0, 0x40 -/* 80006240 00003180 40 82 00 30 */ bne lbl_80006270 -/* 80006244 00003184 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80006248 00003188 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 8000624C 0000318C 41 82 00 24 */ beq lbl_80006270 -/* 80006250 00003190 88 6D 80 08 */ lbz r3, lbl_80450588-_SDA_BASE_(r13) -/* 80006254 00003194 28 03 00 05 */ cmplwi r3, 5 -/* 80006258 00003198 40 80 00 10 */ bge lbl_80006268 -/* 8000625C 0000319C 38 03 00 01 */ addi r0, r3, 1 -/* 80006260 000031A0 98 0D 80 08 */ stb r0, lbl_80450588-_SDA_BASE_(r13) -/* 80006264 000031A4 48 00 00 0C */ b lbl_80006270 -lbl_80006268: -/* 80006268 000031A8 38 00 00 01 */ li r0, 1 -/* 8000626C 000031AC 98 0D 80 08 */ stb r0, lbl_80450588-_SDA_BASE_(r13) -lbl_80006270: -/* 80006270 000031B0 4B FF F8 69 */ bl debugDisplay__Fv -lbl_80006274: -/* 80006274 000031B4 38 60 00 02 */ li r3, 2 -/* 80006278 000031B8 4B FF FA D5 */ bl Debug_console__FUl -lbl_8000627C: -/* 8000627C 000031BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80006280 000031C0 7C 08 03 A6 */ mtlr r0 -/* 80006284 000031C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80006288 000031C8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/variables.h b/include/variables.h index d18e1c6815..215c626cf7 100644 --- a/include/variables.h +++ b/include/variables.h @@ -115,7 +115,6 @@ extern u8 lbl_80451360[8]; // func_802C3464 extern u8 lbl_803CB96C[0x14]; extern u8 lbl_803C9D80[0x18]; -extern u32 lbl_80450B74; // func_802C3500 extern u8 lbl_803CAD10[0x20]; @@ -180,11 +179,8 @@ struct Z2SceneMgr; extern Z2SceneMgr* lbl_80450B80; // Z2SceneMgr sInstance struct Z2SoundMgr; extern Z2SoundMgr* lbl_80450B60; // Z2SoundMgr sInstance -struct Z2SoundObjMgr; -extern Z2SoundObjMgr* lbl_80450B48; // Z2SoundObjMgr sInstance struct Z2SpeechMgr2; -extern Z2SpeechMgr2* lbl_80450B70; // Z2SpeechMgr2 sInstance -extern void* lbl_803CC114; // JKRThread::__vt +extern void* lbl_803CC114; // JKRThread::__vt class JKRThreadSwitch; extern void* lbl_803CC100[5]; // JKRThreadSwitch::__vt @@ -2501,7 +2497,6 @@ extern u8 lbl_80455B2C; extern u8 lbl_804507E0; extern u8 lbl_804507DC; extern u8 lbl_80455AD8; -extern u8 lbl_80450B4C; extern u8 lbl_8039C220; extern u8 lbl_80455AE0; extern u8 lbl_803CAC98; diff --git a/ldscript.lcf b/ldscript.lcf index 6d332ddbdd..7ea0b4d4f6 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -2826,22 +2826,22 @@ func_802C087C func_802C0720 func_802C06F4 func_802C0618 -func_802AAFF0 -func_802AABF4 +__dt__14Z2SoundStarterFv +startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 func_802CBB7C -func_802CB6EC +startWindStoneSound__13Z2WolfHowlMgrFScP3Vec func_802BEBDC func_802BEB74 func_802BEB38 func_802BE9B0 func_802BE8A0 -func_802BE880 +init__16Z2SoundObjSimpleFP3VecUc func_802BE7AC func_802BE714 func_802BE6B8 -func_802BE65C +init__21Z2DopplerSoundObjBaseFP3VecUc func_802BE5FC -func_802BE104 +stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool func_802BE070 func_802C01EC func_802BBCD4 @@ -2854,9 +2854,9 @@ func_802BB6DC func_802BB0E0 func_802BB0D8 func_802BB090 -func_802A9B58 -func_802A9B54 -func_802A9A70 +__dt__16Z2AudioArcLoaderFv +readBSTN__16Z2AudioArcLoaderFPCvUl +readCommandMore__16Z2AudioArcLoaderFUl func_802C5894 func_802C588C func_802C57C0 @@ -3136,6 +3136,8 @@ func_8002CDB8 func_8002CB68 func_8002CB30 func_8002CAF0 +__ct__14JAISoundHandleFv +dispose__14Z2SoundObjBaseFv } /* .init 80003100 - 80005600 diff --git a/libs/JSystem/JAudio2/JAUClusterSound.cpp b/libs/JSystem/JAudio2/JAUClusterSound.cpp index 0d86824351..85c63c5f6b 100644 --- a/libs/JSystem/JAudio2/JAUClusterSound.cpp +++ b/libs/JSystem/JAudio2/JAUClusterSound.cpp @@ -1,5 +1,9 @@ #include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h" +#include "JSystem/JAudio2/JAISound/JAISound.h" +//! @meme: mwcc normally inlines this, but drops it this TU because it's the +//! first place we need a ref to this ctor. +//! @todo: eventually move this into JAISound.h once this file is decomped. JAISoundHandle::JAISoundHandle() { - this->unk = NULL; -} \ No newline at end of file + mSound = NULL; +} diff --git a/libs/Z2AudioLib/Z2Audience.cpp b/libs/Z2AudioLib/Z2Audience.cpp index 6766c45b89..8133055b01 100644 --- a/libs/Z2AudioLib/Z2Audience.cpp +++ b/libs/Z2AudioLib/Z2Audience.cpp @@ -1,5 +1,6 @@ /* Z2Audience.cpp autogenerated by split.py v0.3 at 2021-01-04 22:46:19.894499 */ +#include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h" #include "global.h" extern "C" { diff --git a/libs/Z2AudioLib/Z2AudioArcLoader.cpp b/libs/Z2AudioLib/Z2AudioArcLoader.cpp index d0365b297f..eb2b48fd05 100644 --- a/libs/Z2AudioLib/Z2AudioArcLoader.cpp +++ b/libs/Z2AudioLib/Z2AudioArcLoader.cpp @@ -1,39 +1,39 @@ /* Z2AudioArcLoader.cpp autogenerated by split.py v0.3 at 2021-01-05 01:13:20.339487 */ -#include "global.h" +#include "Z2AudioLib/Z2AudioArcLoader/Z2AudioArcLoader.h" extern "C" { // __ct__16Z2AudioArcLoaderFP10JAUSection // Z2AudioArcLoader::Z2AudioArcLoader(JAUSection*) -asm void Z2AudioArcLoader(void) { +asm Z2AudioArcLoader::Z2AudioArcLoader(JAUSection*) { nofralloc #include "Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A34.s" } // readCommandMore__16Z2AudioArcLoaderFUl // Z2AudioArcLoader::readCommandMore(unsigned long) -asm void func_802A9A70(void) { +asm void Z2AudioArcLoader::readCommandMore(u32) { nofralloc #include "Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A70.s" } // readBFCA__16Z2AudioArcLoaderFPCv // Z2AudioArcLoader::readBFCA(const void*) -asm void Z2AudioArcLoader_NS_readBFCA(void) { +asm void Z2AudioArcLoader::readBFCA(const void*) { nofralloc #include "Z2AudioLib/Z2AudioArcLoader/asm/func_802A9AC8.s" } // readBSTN__16Z2AudioArcLoaderFPCvUl // Z2AudioArcLoader::readBSTN(const void*, unsigned long) -asm void func_802A9B54(void) { +asm void Z2AudioArcLoader::readBSTN(const void*, u32) { nofralloc #include "Z2AudioLib/Z2AudioArcLoader/asm/func_802A9B54.s" } // __dt__16Z2AudioArcLoaderFv // Z2AudioArcLoader::~Z2AudioArcLoader(void) -asm void func_802A9B58(void) { +asm Z2AudioArcLoader::~Z2AudioArcLoader() { nofralloc #include "Z2AudioLib/Z2AudioArcLoader/asm/func_802A9B58.s" } diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index 976f5e19fa..050389c71a 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -1,6 +1,7 @@ /* Z2AudioMgr.cpp autogenerated by split.py v0.3 at 2021-01-04 23:11:48.333955 */ #include "Z2AudioLib/Z2Param/Z2Param.h" +#include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h" #include "global.h" extern "C" { diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp index 2da944db5e..bf8c379bc6 100644 --- a/libs/Z2AudioLib/Z2Creature.cpp +++ b/libs/Z2AudioLib/Z2Creature.cpp @@ -1,14 +1,17 @@ /* Z2Creature.cpp autogenerated by split.py v0.3 at 2021-01-04 23:26:27.773541 */ +#include "Z2AudioLib/Z2Creature/Z2Creature.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" +#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" +#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "global.h" extern "C" { // __ct__10Z2CreatureFv // Z2Creature::Z2Creature(void) -asm void Z2Creature(void) { +asm Z2Creature::Z2Creature(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C03C8.s" } diff --git a/libs/Z2AudioLib/Z2EnvSeMgr.cpp b/libs/Z2AudioLib/Z2EnvSeMgr.cpp index d1d9044952..f52eb5ee10 100644 --- a/libs/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/libs/Z2AudioLib/Z2EnvSeMgr.cpp @@ -2,6 +2,7 @@ #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" +#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "global.h" diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp index 26abee92e0..11bff4cc9c 100644 --- a/libs/Z2AudioLib/Z2LinkMgr.cpp +++ b/libs/Z2AudioLib/Z2LinkMgr.cpp @@ -1,5 +1,7 @@ #include "Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" +#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" +#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 19aa8eba9c..ad09f56d0e 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -1,6 +1,7 @@ #include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h" #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" +#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" @@ -117,8 +118,9 @@ asm void Z2SceneMgr::setSceneName(char* stageName, long roomNum, long layerNum){ #include "Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s" } +//! @meme this looks to be non-inlined here because @ref setSceneName is too large JAISoundID::JAISoundID(JAISoundID const& soundIdToSet) { - this->soundId = soundIdToSet.soundId; + mId = soundIdToSet.mId; return; } diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp index 9018ec675e..070ab66f5c 100644 --- a/libs/Z2AudioLib/Z2SeMgr.cpp +++ b/libs/Z2AudioLib/Z2SeMgr.cpp @@ -1,4 +1,7 @@ #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" +#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" +#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" +#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" extern "C" { @@ -32,14 +35,20 @@ asm void Z2SeMgr::modHeightAtCamera(Vec const** param1) { #include "Z2AudioLib/Z2SeMgr/asm/func_802AB830.s" } -asm void Z2SeMgr::incrCrowdSize(void) { - nofralloc -#include "Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s" +void Z2SeMgr::incrCrowdSize(void) { + mCrowdSize++; + + if (mCrowdSize > 100) + mCrowdSize = 100; } -asm void Z2SeMgr::decrCrowdSize(void) { - nofralloc -#include "Z2AudioLib/Z2SeMgr/asm/func_802AB960.s" +void Z2SeMgr::decrCrowdSize(void) { + mCrowdSize--; + + //! @bug probably copypasta from incrCrowdSize(), but semantically it's still correct: + //! mCrowdSize is a u8, so an underflow would result in mCrowdSize > 100, triggering the clamp. + if (mCrowdSize > 100) + mCrowdSize = 0; } asm void Z2SeMgr::seStart(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8) { @@ -127,9 +136,15 @@ asm u32 Z2MultiSeMgr::registMultiSePos(Vec*) { #include "Z2AudioLib/Z2SeMgr/asm/func_802AEB70.s" } -asm void Z2MultiSeMgr::resetMultiSePos(void) { - nofralloc -#include "Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s" +void Z2MultiSeMgr::resetMultiSePos(void) { + field_0x18 = -1; + // @todo fix when we have proper const placement + f32 zero = /* 0.0f */ lbl_80455878; + field_0x8 = zero; + this->field_0xc = zero; + this->field_0x10 = zero; + this->field_0x14 = zero; + this->field_0x4 = zero; } asm float Z2MultiSeMgr::getPanPower(void) { @@ -140,4 +155,4 @@ asm float Z2MultiSeMgr::getPanPower(void) { asm float Z2MultiSeMgr::getDolbyPower(void) { nofralloc #include "Z2AudioLib/Z2SeMgr/asm/func_802AEDC0.s" -} \ No newline at end of file +} diff --git a/libs/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp index 9227ef5ebd..135a6e4113 100644 --- a/libs/Z2AudioLib/Z2SeqMgr.cpp +++ b/libs/Z2AudioLib/Z2SeqMgr.cpp @@ -1,4 +1,6 @@ #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" +#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" +#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" asm Z2SeqMgr::Z2SeqMgr(void) { @@ -178,7 +180,7 @@ asm void Z2SeqMgr_NS_setBattleDistIgnore(void) { // setBattleGhostMute__8Z2SeqMgrFb // Z2SeqMgr::setBattleGhostMute(bool) -asm void Z2SeqMgr_NS_setBattleGhostMute(void) { +asm void Z2SeqMgr::setBattleGhostMute(bool) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B43E0.s" } diff --git a/libs/Z2AudioLib/Z2SoundHandles.cpp b/libs/Z2AudioLib/Z2SoundHandles.cpp index bff8227601..0a1378bfbf 100644 --- a/libs/Z2AudioLib/Z2SoundHandles.cpp +++ b/libs/Z2AudioLib/Z2SoundHandles.cpp @@ -1,57 +1,63 @@ /* Z2SoundHandles.cpp autogenerated by split.py v0.3 at 2021-01-05 01:21:30.657620 */ +#include "Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h" #include "global.h" -extern "C" { -// __ct__14Z2SoundHandlesFv -// Z2SoundHandles::Z2SoundHandles(void) -asm void Z2SoundHandles(void) { - nofralloc -#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB07C.s" +Z2SoundHandles::Z2SoundHandles() { + mNumHandles = 0; } -// __dt__14Z2SoundHandlesFv -// Z2SoundHandles::~Z2SoundHandles(void) -asm void Z2SoundHandles_NS_dtor(void) { - nofralloc -#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB0B4.s" +Z2SoundHandles::~Z2SoundHandles() { + deleteHandlesPool(); } -// initHandlesPool__14Z2SoundHandlesFUc -// Z2SoundHandles::initHandlesPool(unsigned char) -asm void Z2SoundHandles_NS_initHandlesPool(void) { - nofralloc -#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB118.s" +void Z2SoundHandles::initHandlesPool(u8 pNumHandles) { + mNumHandles = pNumHandles; } -// deleteHandlesPool__14Z2SoundHandlesFv -// Z2SoundHandles::deleteHandlesPool(void) -asm void Z2SoundHandles_NS_deleteHandlesPool(void) { +asm void Z2SoundHandles::deleteHandlesPool() { nofralloc #include "Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s" } +extern "C" { // __dt__31JASMemPool<17Z2SoundHandlePool>Fv // JASMemPool<17Z2SoundHandlePool>::~JASMemPool<17Z2SoundHandlePool>(void) asm void JASMemPool_NS_dtor_X4_(void) { nofralloc #include "Z2AudioLib/Z2SoundHandles/asm/func_802AB200.s" } +}; -// getHandleSoundID__14Z2SoundHandlesF10JAISoundID -// Z2SoundHandles::getHandleSoundID(JAISoundID) -asm void Z2SoundHandles_NS_getHandleSoundID(void) { - nofralloc -#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB254.s" +JAISoundHandle* Z2SoundHandles::getHandleSoundID(JAISoundID pSoundId) { + JSULink* link; + for (link = this->getFirst(); link != NULL; link = link->getNext()) { + JAISoundHandle* handle = link->getObject(); + if (handle->isSoundAttached()) { + if ((*handle)->getID() == pSoundId) { + return handle; + } + } + } + + return NULL; } -// getHandleUserData__14Z2SoundHandlesFUl -// Z2SoundHandles::getHandleUserData(unsigned long) -asm void Z2SoundHandles_NS_getHandleUserData(void) { - nofralloc -#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB2A0.s" +JAISoundHandle* Z2SoundHandles::getHandleUserData(u32 pUserData) { + JSULink* link; + for (link = this->getFirst(); link != NULL; link = link->getNext()) { + JAISoundHandle* handle = link->getObject(); + if (handle->isSoundAttached()) { + if ((*handle)->getUserData() == pUserData) { + return handle; + } + } + } + + return NULL; } +extern "C" { // getFreeHandle__14Z2SoundHandlesFv // Z2SoundHandles::getFreeHandle(void) asm void Z2SoundHandles_NS_getFreeHandle(void) { @@ -65,25 +71,37 @@ asm void Z2SoundHandles_NS_getLowPrioSound(void) { nofralloc #include "Z2AudioLib/Z2SoundHandles/asm/func_802AB3D0.s" } +}; // stopAllSounds__14Z2SoundHandlesFUl // Z2SoundHandles::stopAllSounds(unsigned long) -asm void Z2SoundHandles_NS_stopAllSounds(void) { - nofralloc -#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB4A0.s" +void Z2SoundHandles::stopAllSounds(u32 fadeout) { + JSULink* link; + for (link = this->getFirst(); link != NULL; link = link->getNext()) { + JAISoundHandle* handle = link->getObject(); + //! @meme: explicit operator bool call required to match and be similar + //! to CHN_debug; could more concisely write handle->isSoundAttached + //! (for some reason cast-to-bool doesn't work?) + if (handle && handle->operator bool()) { + (*handle)->stop(fadeout); + } + } } -// isActive__14Z2SoundHandlesCFv -// Z2SoundHandles::isActive(void) const -asm void Z2SoundHandles_NS_isActive(void) { - nofralloc -#include "Z2AudioLib/Z2SoundHandles/asm/func_802AB504.s" +bool Z2SoundHandles::isActive() const { + JSULink* link; + for (link = this->getFirst(); link != NULL; link = link->getNext()) { + if (link->getObject()->isSoundAttached()) { + return true; + } + } + + return false; } // setPos__14Z2SoundHandlesFRCQ29JGeometry8TVec3 // Z2SoundHandles::setPos(JGeometry::TVec3) -asm void Z2SoundHandles_NS_setPos(void) { +asm void Z2SoundHandles::setPos(const JGeometry::TVec3& pos) { nofralloc #include "Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s" } -}; diff --git a/libs/Z2AudioLib/Z2SoundInfo.cpp b/libs/Z2AudioLib/Z2SoundInfo.cpp index 4a6dcd678a..e1a8b7005e 100644 --- a/libs/Z2AudioLib/Z2SoundInfo.cpp +++ b/libs/Z2AudioLib/Z2SoundInfo.cpp @@ -1,16 +1,18 @@ /* Z2SoundInfo.cpp autogenerated by split.py v0.3 at 2021-01-05 00:36:00.060978 */ +#include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h" #include "dvd/dvd.h" #include "global.h" extern "C" { // getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID // Z2SoundInfo::getBgmSeqResourceID(JAISoundID) const -asm void Z2SoundInfo_NS_getBgmSeqResourceID(void) { +asm u32 Z2SoundInfo::getBgmSeqResourceID(JAISoundID) const { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BB00C.s" } +// @todo thunk // getSoundType__11Z2SoundInfoCF10JAISoundID // Z2SoundInfo::getSoundType(JAISoundID) const asm void func_802BB090(void) { @@ -80,14 +82,16 @@ asm void Z2SoundInfo_NS_getStreamFileEntry(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BBA88.s" } +}; // getSwBit__11Z2SoundInfoCF10JAISoundID // Z2SoundInfo::getSwBit(JAISoundID) const -asm void Z2SoundInfo_NS_getSwBit(void) { +asm u32 Z2SoundInfo::getSwBit(JAISoundID) const { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BBAC8.s" } +extern "C" { // getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound // Z2SoundInfo::getSoundInfo_(JAISoundID, JAISound*) const asm void Z2SoundInfo_NS_getSoundInfo_(void) { diff --git a/libs/Z2AudioLib/Z2SoundMgr.cpp b/libs/Z2AudioLib/Z2SoundMgr.cpp index 6f1a41cdd4..0b4d6fad10 100644 --- a/libs/Z2AudioLib/Z2SoundMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundMgr.cpp @@ -3,6 +3,8 @@ #include "Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" +#include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h" +#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h" #include "global.h" extern "C" { diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp index 500fb356ab..b060dec019 100644 --- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp @@ -1,19 +1,28 @@ /* Z2SoundObjMgr.cpp autogenerated by split.py v0.3 at 2021-01-05 00:01:40.089663 */ +#include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" -#include "global.h" -extern "C" { -// __ct__13Z2SoundObjMgrFv -// Z2SoundObjMgr::Z2SoundObjMgr(void) -asm void Z2SoundObjMgr_NS_ctor(void) { +#ifdef NONMATCHING +// order wrong because this needs to inherit from JASGlobalInstance +Z2SoundObjMgr::Z2SoundObjMgr() { + lbl_80450B48 = this; + field_0x19 = 0; + this->mIsTwilightBattle = false; + this->setBattleInit(); + this->setForceBattleArea(false, 700, 1100, 1500); +} +#else +asm Z2SoundObjMgr::Z2SoundObjMgr() { nofralloc #include "Z2AudioLib/Z2SoundObjMgr/asm/func_802BF920.s" } +#endif +extern "C" { // setForceBattleArea__13Z2SoundObjMgrFbUsUsUs // Z2SoundObjMgr::setForceBattleArea(bool, unsigned short, unsigned short, unsigned short) -asm void Z2SoundObjMgr_NS_setForceBattleArea(void) { +asm void Z2SoundObjMgr::setForceBattleArea(bool, u16, u16, u16) { nofralloc #include "Z2AudioLib/Z2SoundObjMgr/asm/func_802BF980.s" } @@ -25,11 +34,19 @@ asm void Z2SoundObjMgr_NS_searchEnemy(void) { #include "Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s" } -// setGhostEnemyState__13Z2SoundObjMgrFUc -// Z2SoundObjMgr::setGhostEnemyState(unsigned char) -asm void Z2SoundObjMgr_NS_setGhostEnemyState(void) { - nofralloc -#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802BFFEC.s" +void Z2SoundObjMgr::setGhostEnemyState(u8 p1) { + if (p1 == 0x20) { + if (field_0x1a >= field_0x16) { + lbl_80450B84->setBattleGhostMute(true); + } + } else { + if (this->field_0x1a == false) { + this->field_0x19 = 0; + return; + } + } + + this->field_0x19 = p1 + (this->field_0x19 & 1); } // getEnemyID__13Z2SoundObjMgrFPCcP26JSULink<15Z2CreatureEnemy> @@ -41,7 +58,7 @@ asm void Z2SoundObjMgr_NS_getEnemyID(void) { // setBattleInit__13Z2SoundObjMgrFv // Z2SoundObjMgr::setBattleInit(void) -asm void Z2SoundObjMgr_NS_setBattleInit(void) { +asm void Z2SoundObjMgr::setBattleInit() { nofralloc #include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C0100.s" } @@ -53,11 +70,21 @@ asm void Z2SoundObjMgr_NS_checkBattleFinish(void) { #include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C0120.s" } -// deleteEnemyAll__13Z2SoundObjMgrFv -// Z2SoundObjMgr::deleteEnemyAll(void) -asm void Z2SoundObjMgr_NS_deleteEnemyAll(void) { - nofralloc -#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C013C.s" +void Z2SoundObjMgr::deleteEnemyAll() { + JSULink* link; + + // not moving the link pointer forward looks like a bug, but deleteObject() actually unlinks the + // enemy from its owning list + while (link = this->getFirst(), link != NULL) { + Z2CreatureEnemy* enemy = link->getObject(); + if (enemy == NULL) { + // setWarningMessage_f((JUTAssertion *)0x1,(ulong)"Z2SoundObjMgr.cpp",(char + // *)0x16f,(int)&*fill*, + // "[Z2SoundObjMgr::searchEnemy] remain remove enemy\n",in_r8); + } else { + enemy->deleteObject(); + } + } } // removeEnemy__13Z2SoundObjMgrFP26JSULink<15Z2CreatureEnemy> @@ -66,14 +93,13 @@ asm void Z2SoundObjMgr_NS_removeEnemy(void) { nofralloc #include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C0190.s" } +}; -// isTwilightBattle__13Z2SoundObjMgrFv -// Z2SoundObjMgr::isTwilightBattle(void) -asm void Z2SoundObjMgr_NS_isTwilightBattle(void) { - nofralloc -#include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C01E4.s" +bool Z2SoundObjMgr::isTwilightBattle() { + return mTwilightBattle; } +extern "C" { // __sinit_Z2SoundObjMgr_cpp // asm void func_802C01EC(void) { diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index 531f6f3ac0..3eeb3f0b01 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -1,58 +1,65 @@ /* Z2SoundObject.cpp autogenerated by split.py v0.3 at 2021-01-04 23:48:52.467160 */ +#include "Z2AudioLib/Z2SoundObject/Z2SoundObject.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" -#include "global.h" +#include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h" + +Z2SoundObjBase::Z2SoundObjBase() { + //! @note initializer list doesn't work since fields were initialized out of + //! structure layout order, indicating original code didn't use initializer list. + mSoundPos = NULL; + mIsInitialized = false; + mSoundStarter = lbl_80450B74; + field_0x1c = 0; + field_0x1e = 0; +} + +Z2SoundObjBase::~Z2SoundObjBase() { + deleteObject(); +} + +void Z2SoundObjBase::init(Vec* pSoundPos, u8 pNumHandles) { + initHandlesPool(pNumHandles); + mSoundPos = pSoundPos; + mIsInitialized = true; +} + +void Z2SoundObjBase::deleteObject() { + this->dispose(); + this->deleteHandlesPool(); +} + +void Z2SoundObjBase::framework(u32 p1, s8 p2) { + if (mIsInitialized) { + this->field_0x1c = p1; + this->field_0x1e = p2; + this->setPos(*(JGeometry::TVec3*)this->mSoundPos); + } +} + +void Z2SoundObjBase::dispose() { + JAISoundHandle* handle; + JSULink* link; + for (link = this->getFirst(); link != NULL; link = link->getNext()) { + handle = link->getObject(); + if (handle != NULL && (bool)*handle) { + u32 swBit = lbl_80450B4C->getSwBit((*handle)->getID()); + if ((swBit & 0x8000) != 0) { + handle->releaseSound(); + } else { + (*handle)->stop(); + } + } + } + + this->mIsInitialized = false; +} + +bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& pSoundHandlePool) { + return !(lbl_80450B4C->getSwBit(pSoundHandlePool->getID()) & 0x8000); +} extern "C" { -// __ct__14Z2SoundObjBaseFv -// Z2SoundObjBase::Z2SoundObjBase(void) -asm void Z2SoundObjBase_NS_ctor(void) { - nofralloc -#include "Z2AudioLib/Z2SoundObject/asm/func_802BDEF0.s" -} - -// __dt__14Z2SoundObjBaseFv -// Z2SoundObjBase::~Z2SoundObjBase(void) -asm void Z2SoundObjBase_NS_dtor(void) { - nofralloc -#include "Z2AudioLib/Z2SoundObject/asm/func_802BDF48.s" -} - -// init__14Z2SoundObjBaseFP3VecUc -// Z2SoundObjBase::init(Vec*, unsigned char) -asm void Z2SoundObjBase_NS_init(void) { - nofralloc -#include "Z2AudioLib/Z2SoundObject/asm/func_802BDFB0.s" -} - -// deleteObject__14Z2SoundObjBaseFv -// Z2SoundObjBase::deleteObject(void) -asm void Z2SoundObjBase_NS_deleteObject(void) { - nofralloc -#include "Z2AudioLib/Z2SoundObject/asm/func_802BDFF8.s" -} - -// framework__14Z2SoundObjBaseFUlSc -// Z2SoundObjBase::framework(unsigned long, char) -asm void Z2SoundObjBase_NS_framework(void) { - nofralloc -#include "Z2AudioLib/Z2SoundObject/asm/func_802BE038.s" -} - -// dispose__14Z2SoundObjBaseFv -// Z2SoundObjBase::dispose(void) -asm void func_802BE070(void) { - nofralloc -#include "Z2AudioLib/Z2SoundObject/asm/func_802BE070.s" -} - -// stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool -// Z2SoundObjBase::stopOK(Z2SoundHandlePool&) -asm void func_802BE104(void) { - nofralloc -#include "Z2AudioLib/Z2SoundObject/asm/func_802BE104.s" -} - // startSound__14Z2SoundObjBaseF10JAISoundIDUlSc // Z2SoundObjBase::startSound(JAISoundID, unsigned long, char) asm void Z2SoundObjBase_NS_startSound(void) { @@ -90,7 +97,7 @@ asm void func_802BE5FC(void) { // init__21Z2DopplerSoundObjBaseFP3VecUc // Z2DopplerSoundObjBase::init(Vec*, unsigned char) -asm void func_802BE65C(void) { +asm void init__21Z2DopplerSoundObjBaseFP3VecUc(Vec* pSoundPos, u8 pNumHandles) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE65C.s" } @@ -123,12 +130,24 @@ asm void Z2SoundObjSimple(void) { #include "Z2AudioLib/Z2SoundObject/asm/func_802BE844.s" } +#ifdef NONMATCHING // init__16Z2SoundObjSimpleFP3VecUc // Z2SoundObjSimple::init(Vec*, unsigned char) -asm void func_802BE880(void) { +void Z2SoundObjSimple::init(Vec* pSoundPos, u8 pNumHandles) { + // i would write + // Z2SoundObjBase::init(pSoundPos, pNumHandles); + // but MWCC says "illegal use of non-static member" + // was calling like this not in C++98? + + // and this doesn't match + ((Z2SoundObjBase*)this)->init(pSoundPos, pNumHandles); +} +#else +asm void Z2SoundObjSimple::init(Vec* pSoundPos, u8 pNumHandles) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE880.s" } +#endif // startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc // Z2SoundObjSimple::startSound(JAISoundID, unsigned long, char) diff --git a/libs/Z2AudioLib/Z2SoundStarter.cpp b/libs/Z2AudioLib/Z2SoundStarter.cpp index 8b0969859f..78eb5088c0 100644 --- a/libs/Z2AudioLib/Z2SoundStarter.cpp +++ b/libs/Z2AudioLib/Z2SoundStarter.cpp @@ -1,5 +1,6 @@ /* Z2SoundStarter.cpp autogenerated by split.py v0.3 at 2021-01-04 23:38:28.244752 */ +#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "global.h" @@ -7,14 +8,14 @@ extern "C" { // __ct__14Z2SoundStarterFb // Z2SoundStarter::Z2SoundStarter(bool) -asm void Z2SoundStarter_NS_ctor(void) { +asm Z2SoundStarter::Z2SoundStarter(bool) { nofralloc #include "Z2AudioLib/Z2SoundStarter/asm/func_802AAB94.s" } // startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 // Z2SoundStarter::startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3) -asm void func_802AABF4(void) { +asm void Z2SoundStarter::startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*) { nofralloc #include "Z2AudioLib/Z2SoundStarter/asm/func_802AABF4.s" } @@ -22,28 +23,29 @@ asm void func_802AABF4(void) { // startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3UlfffffUl // Z2SoundStarter::startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3, unsigned long, // float, float, float, float, float, unsigned long) -asm void Z2SoundStarter_NS_startSound_X1_(void) { +asm void Z2SoundStarter::startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*, u32, + float, float, float, float, float, u32) { nofralloc #include "Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s" } // setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc // Z2SoundStarter::setPortData(JAISoundHandle*, unsigned long, unsigned short, char) -asm void Z2SoundStarter_NS_setPortData(void) { +asm void Z2SoundStarter::setPortData(JAISoundHandle*, u32, u16, s8) { nofralloc #include "Z2AudioLib/Z2SoundStarter/asm/func_802AAEDC.s" } // getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc // Z2SoundStarter::getPortData(JAISoundHandle*, unsigned long, char) -asm void Z2SoundStarter_NS_getPortData(void) { +asm void Z2SoundStarter::getPortData(JAISoundHandle*, u32, s8) { nofralloc #include "Z2AudioLib/Z2SoundStarter/asm/func_802AAF74.s" } // __dt__14Z2SoundStarterFv // Z2SoundStarter::~Z2SoundStarter(void) -asm void func_802AAFF0(void) { +asm Z2SoundStarter::~Z2SoundStarter(void) { nofralloc #include "Z2AudioLib/Z2SoundStarter/asm/func_802AAFF0.s" } diff --git a/libs/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp index 0c94677a3f..502766b104 100644 --- a/libs/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/libs/Z2AudioLib/Z2SpeechMgr2.cpp @@ -1,19 +1,31 @@ /* Z2SpeechMgr2.cpp autogenerated by split.py v0.3 at 2021-01-04 22:38:34.026034 */ -#include "JSystem/JMath/random.h" +#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h" #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" +#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h" #include "global.h" -extern "C" { -// __ct__12Z2SpeechMgr2Fv -// Z2SpeechMgr2::Z2SpeechMgr2(void) -asm void Z2SpeechMgr2_NS_ctor(void) { +#ifdef NONMATCHING +Z2SpeechMgr2::Z2SpeechMgr2() + : mSound(NULL), field_0x4(0), mRandom(0), mSpeechStarter(), field_0x3f8(0), mTextCount(-1), + field_0x3fc(0), field_0x3fe(0), field_0x3ff(0), field_0x401(0) { + // lbl_80450B70 = this; + // this->sound = NULL; + // this->field_0x4 = 0; + // this->random + for (int i = 0; i < 0x40; i++) + this->field_0x402[i] = -1; +} +#else +asm Z2SpeechMgr2::Z2SpeechMgr2() { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CBC60.s" } +#endif +extern "C" { // __dt__15Z2SpeechStarterFv // Z2SpeechStarter::~Z2SpeechStarter(void) asm void func_802CBCEC(void) { @@ -86,7 +98,7 @@ asm void Z2SpeechMgr2_NS_isMidnaSpeak(void) { // __ct__15Z2SpeechStarterFv // Z2SpeechStarter::Z2SpeechStarter(void) -asm void Z2SpeechStarter(void) { +asm Z2SpeechStarter::Z2SpeechStarter(void) { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFB8.s" } diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp index ea62eb4541..5ebb5b0acf 100644 --- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -1,119 +1,120 @@ /* Z2WolfHowlMgr.cpp autogenerated by split.py v0.3 at 2021-01-04 23:43:51.358132 */ +#include "global.h" + #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h" -#include "global.h" +#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h" +#include "Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h" -extern "C" { // __ct__13Z2WolfHowlMgrFv // Z2WolfHowlMgr::Z2WolfHowlMgr(void) -asm void Z2WolfHowlMgr(void) { +asm Z2WolfHowlMgr::Z2WolfHowlMgr() { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAAC0.s" } // resetState__13Z2WolfHowlMgrFv // Z2WolfHowlMgr::resetState(void) -asm void Z2WolfHowlMgr_NS_resetState(void) { +asm void Z2WolfHowlMgr::resetState() { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAB8C.s" } // calcVolumeMod__13Z2WolfHowlMgrFf // Z2WolfHowlMgr::calcVolumeMod(float) -asm void Z2WolfHowlMgr_NS_calcVolumeMod(void) { +asm void Z2WolfHowlMgr::calcVolumeMod(float) { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CABEC.s" } // getNowPitch__13Z2WolfHowlMgrFv // Z2WolfHowlMgr::getNowPitch(void) -asm void Z2WolfHowlMgr_NS_getNowPitch(void) { +asm void Z2WolfHowlMgr::getNowPitch() { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACB0.s" } // getNowInputValue__13Z2WolfHowlMgrFv // Z2WolfHowlMgr::getNowInputValue(void) -asm void Z2WolfHowlMgr_NS_getNowInputValue(void) { +asm void Z2WolfHowlMgr::getNowInputValue() { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACCC.s" } // calcPitchMod__13Z2WolfHowlMgrFff // Z2WolfHowlMgr::calcPitchMod(float, float) -asm void Z2WolfHowlMgr_NS_calcPitchMod(void) { +asm void Z2WolfHowlMgr::calcPitchMod(float, float) { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s" } // startWolfHowlSound__13Z2WolfHowlMgrFffbf // Z2WolfHowlMgr::startWolfHowlSound(float, float, bool, float) -asm void Z2WolfHowlMgr_NS_startWolfHowlSound(void) { +asm void Z2WolfHowlMgr::startWolfHowlSound(float, float, bool, float) { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CAED4.s" } // setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData // Z2WolfHowlMgr::setCorrectData(char, Z2WolfHowlData*) -asm void Z2WolfHowlMgr_NS_setCorrectData(void) { +asm void Z2WolfHowlMgr::setCorrectData(s8, Z2WolfHowlData*) { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB100.s" } // getCorrectLine__13Z2WolfHowlMgrFUc // Z2WolfHowlMgr::getCorrectLine(unsigned char) -asm void Z2WolfHowlMgr_NS_getCorrectLine(void) { +asm void Z2WolfHowlMgr::getCorrectLine(u8) { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB320.s" } // getCorrectLineNum__13Z2WolfHowlMgrFv // Z2WolfHowlMgr::getCorrectLineNum(void) -asm void Z2WolfHowlMgr_NS_getCorrectLineNum(void) { +asm void Z2WolfHowlMgr::getCorrectLineNum() { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB370.s" } // checkLine__13Z2WolfHowlMgrFv // Z2WolfHowlMgr::checkLine(void) -asm void Z2WolfHowlMgr_NS_checkLine(void) { +asm void Z2WolfHowlMgr::checkLine() { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB38C.s" } // getOnLineNum__13Z2WolfHowlMgrFv // Z2WolfHowlMgr::getOnLineNum(void) -asm void Z2WolfHowlMgr_NS_getOnLineNum(void) { +asm void Z2WolfHowlMgr::getOnLineNum() { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB650.s" } // startWindStoneSound__13Z2WolfHowlMgrFScP3Vec // Z2WolfHowlMgr::startWindStoneSound(char, Vec*) -asm void func_802CB6EC(void) { +asm void Z2WolfHowlMgr::startWindStoneSound(s8, Vec*) { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CB6EC.s" } // startGuideMelody__13Z2WolfHowlMgrFb // Z2WolfHowlMgr::startGuideMelody(bool) -asm void Z2WolfHowlMgr_NS_startGuideMelody(void) { +asm void Z2WolfHowlMgr::startGuideMelody(bool) { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBA88.s" } // skipCorrectDemo__13Z2WolfHowlMgrFv // Z2WolfHowlMgr::skipCorrectDemo(void) -asm void Z2WolfHowlMgr_NS_skipCorrectDemo(void) { +asm void Z2WolfHowlMgr::skipCorrectDemo() { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBB58.s" } // __sinit_Z2WolfHowlMgr_cpp // -asm void func_802CBB7C(void) { +asm void func_802CBB7C() { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBB7C.s" } -}; diff --git a/tools/find_unused_asm.py b/tools/find_unused_asm.py new file mode 100644 index 0000000000..92fde245c1 --- /dev/null +++ b/tools/find_unused_asm.py @@ -0,0 +1,32 @@ +""" +Use as `python tools/find_unused_asm.py | xargs rm` +""" + +import inotify.adapters +from inotify.constants import IN_OPEN +from pathlib import Path +import subprocess +from sys import stderr + +asm_files = set(Path('include/').glob('**/*.s')) + +stderr.write('==> clean\n') +subprocess.run(['make', 'clean'], stdout=subprocess.DEVNULL) + +stderr.write('==> set up watches\n') +ino = inotify.adapters.Inotify() +for p in asm_files: + ino.add_watch(str(p), mask=IN_OPEN) + +stderr.write('==> run make\n') +subprocess.run(['make', '-j'], stdout=subprocess.DEVNULL) + +opened_paths = set() +for evt in ino.event_gen(timeout_s=1): + if evt: + (header, type_names, path, filename) = evt + opened_paths.add(Path(path)) + +unused_asm = asm_files - opened_paths +for p in unused_asm: + print(str(p)) \ No newline at end of file diff --git a/tools/postprocess.py b/tools/postprocess.py index fb46f27e8b..b486ab218d 100644 --- a/tools/postprocess.py +++ b/tools/postprocess.py @@ -34,12 +34,12 @@ import struct # Substitutions substitutions = ( - ('<', '?0'), - ('>', '?1'), - ('@', '?2'), - ('\\', '?3'), - (',', '?4'), - ('-', '?5') + ('<', '_SUB_0'), + ('>', '_SUB_1'), + ('@', '_SUB_2'), + ('\\', '_SUB_3'), + (',', '_SUB_4'), + ('-', '_SUB_5') ) def format(symbol): @@ -117,7 +117,7 @@ def impl_postprocess_elf(f, do_ctor_realign, do_old_stack, do_symbol_fixup): f.seek(0x30) nSecHeader = read_u16(f) idxSegNameSeg = read_u16(f) - secF = False # First instance the section names + secF = True # First instance the section names # Header: 0x32: patch_align_ofs = [] @@ -132,8 +132,9 @@ def impl_postprocess_elf(f, do_ctor_realign, do_old_stack, do_symbol_fixup): if sh_type == SHT_STRTAB and do_symbol_fixup: if not secF: - secF = True continue + secF = False + f.seek(ofsSecHeader + i * 0x28 + 0x10) ofs = read_u32(f) size = read_u32(f)