efb2a3896f
Merge branch 'master' of https://github.com/zeldaret/tp
2021-01-04 10:43:15 -05:00
7215cc6a51
some daAlink_c funcs ( #62 )
...
* checkMagicArmorHeavy / checkBootsOrArmorHeavy / setSpecialGravity ok
* onFroollCrashFlg / setMidnaTalkStatus ok
* add setZStatus inline
* format
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-04 10:43:09 -05:00
2a6fc42571
begin decomping main01
2021-01-04 00:16:06 -05:00
0be0a7ea94
JKRFileLoader, JKRFileFinder, and JKRThread ( #60 )
...
* JKRFileLoader OK
* JKRFileFinder progress
* JKRFileFinder OK
* JKRFileCache fix virtual function signatures
* added OSThread and OSContext types
* JKRThread fixed nonmatching functions
Co-authored-by: Julgodis <>
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-03 22:48:07 -05:00
5217a4189e
JKernel cleanup and DVD types ( #59 )
...
* JKRDecomp OK
* JKRFile and JKRDvdFile cleanup
* more DVD stuff and cleanup JKRDvdFile more
* formatting
* JKRHeap cleanup
* formatting
* JKRDisposer cleanup
* JKRAramBlock and JKRAramHeap cleanup
* fix merge error
* fixed comments
* forgot to save file...
* fix DVDCBcallback
Co-authored-by: Julgodis <>
2021-01-03 21:26:25 -05:00
409257b111
clang-format
2021-01-03 21:11:43 -05:00
6f22d27503
swap in memcpy for func_80003540, correct some minor issues in dvd.h and JKRDVDFile.h
2021-01-03 21:08:33 -05:00
4e085c9c84
make gameinfo members private
2021-01-03 16:13:28 -05:00
4309c3db5b
JKRAramHeap and JKRAramPiece ( #53 )
...
* renamed func_XXX to _savegpr_XX
* renamed func_XXX to _restgpr_XX
* renamed func_XXX to _savefpr_XX
* renamed func_XXX to _restfpr_XX
* cleanup functions.h and moved intrisics to mwcc.h
* formatting
* cleanup functions.h
* Added include/ar/ARQ.h
* renamed func_XXX to _savegpr_25
* removed JKRAramPiece asm files
* JKRAramHeap OK, JKRAramPiece OK
* formatting
* more formatting
* Added const and removed explicit this->
* fixed merge problems
* changed mMessages[1] to mMessage
* foramatting
Co-authored-by: Julgodis <>
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-03 05:29:50 -05:00
5c4ac052c3
decomp some small files, do some cleanup ( #42 )
...
* remove leftover asm: JSUList.s
* d_save_init: decomp
* JMath/random: decomp
* J3DUDL: fixup label
* JAUClusterSound: decomp
* c_API_controller_pad: decomp, elaborate globals/types
* clang-format
* don't add guards to functions.h
* semantic merge of m_cpadInfo stuff
* fix undef symbols
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-03 01:04:15 -05:00
d2e9db3748
Fixed _savegpr etc. ( #54 )
...
* renamed func_XXX to _savegpr_XX
* renamed func_XXX to _restgpr_XX
* renamed func_XXX to _savefpr_XX
* renamed func_XXX to _restfpr_XX
* cleanup functions.h and moved intrisics to mwcc.h
* formatting
* cleanup functions.h
* fix bad-formatting from master
Co-authored-by: Julgodis <>
2021-01-02 23:15:12 -05:00
609891bc25
adjust gameinfo sizing, rename inline register funcs
2021-01-02 19:09:04 -05:00
e375712d23
Merge branch 'master' of https://github.com/zeldaret/tp
2021-01-02 17:49:20 -05:00
458be4d8cb
more d_save funcs OK, initial map out of dcomifg_play_c and it's classes
2021-01-02 17:47:43 -05:00
ad62061cfc
Split d_meter, d_meter2 ( #49 )
...
* d_meter2*: split
- d_meter2
- d_meter2_info
- d_meter2_draw
* d_meter_*: split
- d_meter_button
- d_meter_haihai
- d_meter_hakusha
- d_meter_HIO
- d_meter_map
- d_meter_string
* d_kantera_icon_meter: split
* clang-format
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-02 10:47:18 -05:00
30a10e0352
m_Do_Reset: reset, callback not statics (ty @notyourav) ( #50 )
...
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-02 10:39:15 -05:00
8821a84a70
d_camera: split ( #51 )
...
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-02 10:37:11 -05:00
e42d44e6cb
M_do_controller_pad split and partially matched ( #36 )
...
* m_Do_controller_pad split
* Attempt to match and match mDoCPd_c::recalibrate
* Fix Merge Errors
* clang-format
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-02 02:02:19 -05:00
69faf591d4
d_kankyo, d_kankyo_*: autosplit ( #44 )
...
- d_kankyo
- d_kankyo_rain
- d_kankyo_wether
- d_kankyo_rain
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-02 01:54:59 -05:00
915991f431
most daMidna_c ( #43 )
...
* most daMidna_c done
* setLinkState ok
* format
* remove asm
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-02 01:46:34 -05:00
0555115de8
A few f_pc files ( #26 )
...
* f_pc_base, one non matching
* some of f_pc_manager
* f_pc_node OK
* f_pc_pause partly
* started node_req
* more progress
* most of node req
* delete unused asm
* node req header and param names
* param renaming
* header for manager
* review comment struct names
* fpcM_Management OK
* int -> s32
* merge master
* most of f_pc_create_iter
* f_pc_stdcreate_req OK
* f_pc_fstcreate OK
* f_pc_leaf OK
* f_pc_draw OK
* f_pc_deletor partly
* fix parameter type in f_pc_pause
* review
* review, use cPh enum and fix process_profile_definition struct
* convert f_pc files to C
* matched more functions
* fix global.h
* fix variable types
* format
* mpre Phs enum
* fix merge errors
* fix gamepad stopPatternedRumble
* format
* delete leftover files from merge
* move asm to correct folder
* revert f_pc from C to CPP
* remove C hacks and format
* format
* OK
2020-12-31 15:12:29 -05:00
992cf48c7f
Split and decompile parts of JUTGamePad ( #33 )
...
* JUTGamePad.o: elaborate classes, split
* JUTGamePad::CButton: decompile functions:
- clear()
- clear(JUTGamePad*)
- setRepeat()
* elaborate PAD* types in new header
* decompile getNumBit()
* elaborate JUTGamePad fields
* move retyped externs from variables.h to JUTGamePad.h
* elaborate JUTGamePadLongPress
* JUTGamePad: decompile functions
- initList()
- init()
- clear()
- assign()
- checkResetCallback()
- checkResetSwitch()
- clearForReset()
- recalibrate()
JUTGamePad: decompile
* JUTGamePad::CStick::clear(): decompile
* JUTGamePad::CRumble: decompile functions
- startMotor()
- stopMotor()
- triggerPatternedRumble()
- startPatternedRumble()
- stopPatternedRumbleAtThePeriod()
- setEnabled()
* JUTGamePadLongPress::checkCallback(): decompile
* nonmatching: JUTGamePad::CRumble::update() and JUTGamePad::getGamePad
* JSUList<T>: allow access to JSUPtrList functions
* functions.h: clear out some func decls that are no longer used
* add notes in JUTGamePad.cpp
* clang-format + add back extern funcs
* fix some more extern labels
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-29 20:22:18 -05:00
2dddd746a6
split d_attention ( #40 )
...
* d_attention.cpp: split
* clang-format + add back in dropped labels
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-29 18:19:10 -05:00
cba64289a4
JUTXfb: decompile ( #38 )
...
* m_Do_Reset: split and (some) decomp
decompiles:
- my_OSCancelAlarmAll()
- destroyVideo()
* mDoRst::reset(): decompile, plus some supporting code
* split DVD* functions to dvd.h
* mDoRst::resetCallBack(): decompile
* JUTXfb: split
* JUTXfb: decompile (except for almost-matching ctor)
Elaborates JUTVideo and some related stuff.
Decompiles the following functions:
- JUTXfb::initiate()
- JUTXfb::createManager()
- JUTXfb::common_init()
- JUTXfb::destroyManager()
- JUTXfb::~JUTXfb()
- JUTXfb::JUTXfb(): *almost* matching up to regalloc
* clang-format and extern label modifications
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-29 18:01:48 -05:00
6a16bef70e
d_lib split and partially matched ( #30 )
...
* d_lib split and partially matched
* clang-format
* modify some extern labels
* clang-format
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-29 17:39:36 -05:00
8630c588e9
d_a_alink.cpp: split ( #41 )
2020-12-29 17:08:25 -05:00
4c504d078d
run clang-format
2020-12-26 11:31:49 -05:00
58fc83c4f8
m_Do_Reset: OK ( #35 )
...
* m_Do_Reset: split and (some) decomp
decompiles:
- my_OSCancelAlarmAll()
- destroyVideo()
* mDoRst::reset(): decompile, plus some supporting code
* split DVD* functions to dvd.h
* mDoRst::resetCallBack(): decompile
2020-12-25 20:59:52 -05:00
c65c2dbb8f
Z2StatusMgr ( #24 )
...
* split Z2SeMgr / begin split of Z2SeqMgr
* Z2StatusMgr ok
most of Z2StatusMgr done, rest split
* name some class members
* name some Z2SceneMgr vars
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-13 15:43:16 -05:00
b8bd1bbab1
OS.h: more type elaboration ( #21 )
...
* move OS function decls to their own header, os.h
* os.h: OSReport (+related), OSMutex, OSThread; fixup uses
* os.h: OS{Mutex,Thread}{Link,Queue}, OSCond
* os.h: OSxx typedefs, OSMessageQueue
* os.h: fix time function decls
* os.h: retype misc sched fns, create u32 OSSoundMode enum (and fixup use)
* os.h: more retyping
* merge os.h into os/OS.h
@Julgodis did this in parallel to me and added some functions beyond
what was in functions.h, so I merged our versions together
* os.h: retype the rest of the (currently decl'd) thread functions
* d_save: move OS import
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-07 15:05:20 -05:00
cbd06e5668
add d_meter2_info methods, addBottleNum OK, getBombNum OK, isLetterReadFlag OK
2020-12-06 20:46:16 -05:00
86f892c3d3
JKernel ( #20 )
...
* JKRDvdArchive.s split
* JKRMemArchive.s split
* JKRAramArchive.s split
* JKRCompArchive.s split
* JKRDecomp.s split
* JKRDvdRipper.s split
* JKRAramBlock.s split
* JKRAramHeap.s split
* JKRAramPiece.s split
* JKRAramStream.s split
* removed unused .s files
* JKRDvdAramRipper.s split
* JKRAram.s split
* cleanup and making vtables easier to debug
* fixed merge errors
* fixed JKRFileLoader::fetchVolumeName
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-06 15:02:25 -05:00
59a3d00209
OS.h and JKRDvdFile ( #19 )
...
* OS header
* JKRFile and JKRDvdFile
2020-12-06 00:40:34 -05:00
2fbecbc1da
d_item ( #18 )
...
* item_funcs ok
* item_getcheck_func ok
* remove unnecessary asm file
* execItemGet / checkItemGet ok, add enums for readability
* fix return types
2020-12-05 23:30:55 -05:00
fb1217e3f9
Types and functions for JKRThread, JKRFile, JKRDvdFile, JKRFileCache... ( #17 )
...
* Added JSUListIterator and decompiled JKRHeap::dispose_subroutine
* JKRDisposer!
* only 4 functions not OK in JKRHeap
* JKRThread asm functions
* more JKRThread
* JKRThreadSwitch
* JKRThread::JKRThread
* More JKRTHread functions and vtable
* fixed bad merge
* update JKRThread and JKRThreadSwitch to use new virtual inheritance
* save before asmsplit.py script
* JKRFile
* JKRDvdFile
* JKRFileCache
* JKRFileFinder
* JKRFileLoader
* JKRAssertHeap
* JKRExpHeap
* JKRSolidHeap
* fixed type and functions definitions
* JKRArchive (Pub)
* missed file
* JKRArchive
* forgot obj_files.mk
* fixed merge error and class members
* class members
* removed unused asm files
* added names to global variables
* class members for JKRHeap, JKRExpHeap, JKRSolidHeap, and JKRFileCache.
2020-12-05 12:45:10 -05:00
3dc3739ebd
initial class structure for dComIfG_inf_c
2020-12-04 00:04:41 -05:00
4adfed901e
JSUList.h templates and JKRHeap matches ( #13 )
...
* JSULink, JSUList, JSUTree and more matching in JKRHeap
* Added JSUListIterator and decompiled JKRHeap::dispose_subroutine
* more templates and JKRHeap functions
* JKRDisposer!
* only 4 functions not OK in JKRHeap
* fixed: *this->getObject()
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-03 21:02:41 -05:00
294858f751
JSystem Font classes, SComponent cBgW ( #14 )
...
* c_bg_w.cpp OK
* JUTFont and JUTResFont partially implemented
Co-authored-by: notyouraveragehooman <65437533+notyouraveragehooman@users.noreply.github.com>
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-03 20:58:53 -05:00
8703f1315e
d_a_horse_static ( #12 )
...
* d_a_item_static ok
* d_a_horse_static ok
* typo
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-02 22:38:32 -05:00
539608859b
Start Z2SceneMgr and Various Fixes ( #11 )
...
* Start Z2SceneMgr
* Various Fixes After Merge
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-02 20:35:32 -05:00
84c6fa1a58
Z2CreatureLink / Z2Calc ( #8 )
...
* begin Z2LinkMgr
Z2CreatureLink::setLinkGroupInfo, Z2CreatureLink::setLinkHp ok
* split Z2CreatureLink
* split Z2Calc
* fix label data type / clean up
* fix getRandom_0_1 instruction
* fix
* clean up
2020-12-01 22:34:15 -05:00
51b0260c80
JKRHeap functions ( #6 )
...
* becomeSystemHeap OK! becomeCurrentHeap OK!
* initArena OK!
* static-alloc OK! static-free OK! static-resize OK!
* operator new OK! operator delete OK!
* removed asm/d/file/sel/d_file_sel_info.o from obj_files.mk
* fixed vtable names
2020-11-30 17:24:05 -05:00
635472d71f
migrate all d_file_sel_info asm functions to inline
2020-11-29 23:26:19 -05:00
44b14ec128
migrate remaining d_save and m_Do_main asm to inline, add intial class mapping for dFile_select_c
2020-11-29 20:16:52 -05:00
635fbc34ec
Adds JSUList, JKRDisposer, and JKRHeap. ( #4 )
...
* Added JSUList, JKRDisposer, and JKRHeap.
JSUList: Decompiled JSUPtrLink and JSUPtrList with their respected
functions. The templated class JSUList is left.
JKRDisposer: Constructor matched but the destructor is close but
not yet a match.
JKRHeap: No functions matches yet. JKRHeap.cpp now includes
"operator delete" which makes it possible to forward compile
destructors.
* moved files from src/ to libs/
2020-11-29 11:47:00 -05:00
68a46e15cb
begin d_save_HIO, some m_Do_main functions ok
2020-11-28 23:34:06 -05:00
f861af3f37
a few dSv_info_c methods ok
2020-11-28 19:18:27 -05:00
9982bcab28
dSv_zoneActor_c ok dSv_zone_c ok dSv_restart_c ok dSv_turnRestart_c ok dSv_info_c::init ok some dSv_save_c ok
2020-11-27 23:34:39 -05:00
d0e76b81b9
dSv_danBit_c ok + fixed many nonmatchings
2020-11-27 20:49:52 -05:00
c1f0b47a93
dSv_memory_c::init ok, dSv_memory2_c::init ok, some dSv_event_c::offEventBit ok
2020-11-26 23:55:28 -05:00
Pheenoh