04354aadb9
JKRAram and JKRAramStream ( #80 )
...
* before __register_global_object
* JKRThread::sThreadList, JKRHeap::sSystemHeap, etc.
* cleanup and started on JKRDvdArchive
* before changing JKRCompression
* more JKRDvdArchive, abs, and memset
* fixed JKRArchive::setExpandSize split
* JKRArchive::sCurrentDirID, JKRDvdFile::sDvdList, and matching JKRDvdFile constructors
* problems
* merge fixes and formatting
* updated clang version in clang-format-all to version 10
* Added OSPhysicalToCached and struct for global memory
* remove useless __attribute__
* changed from defines and macros to const variable and function
* changed FLAG_HAS to FLAG_ON
* JKRAram, linking problems
* fix JKRAram
* remove nonmatching stuff
* renamed static data
* more static class members
* JKRAramStream OK
* formatting
Co-authored-by: Julgodis <>
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2021-01-09 20:15:52 -05:00
3e498a531d
more daalink / d_item improvements ( #79 )
...
* some daalink funcs
* more d_item inlines / setShieldChange
* more daalink stuff
getlife, getrstatus, setitemlifecount, getrupee, setitemrupeecount
* format
* format
2021-01-09 19:59:35 -05:00
15cbad3824
split d_stage
2021-01-08 13:01:37 -05:00
e71b327988
Z2AudioLib: split ( #64 )
...
* Z2AudioLib: split
- Z2SpeechMgr2
- Z2Audience
- Z2EnvSeMgr
- Z2SoundMgr
- Z2AudioMgr
- Z2Creature
- Z2SoundStarter
- Z2WolfHowlMgr
- Z2SoundObject
- Z2SoundObjMgr
- Z2SoundInfo
- Z2AudioArcLoader
- Z2AudioLib
- Z2SoundHandles
- Z2LinkMgr: finish splitting
- Z2SceneMgr: finish splitting
- Z2SeqMgr: finish splitting
* merge fix
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2021-01-06 21:00:42 -05:00
a787699d14
Refactor JUTFont symbols ( #71 )
...
* fix JUTFont args
* fix
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2021-01-06 20:36:27 -05:00
4fa0ecdd97
JKRSolidHeap ( #69 )
...
* JKRSolidHeap progress
* JKRSolidHeap, added const to virtual functions, and JKRHeap::TState
* fixed braces
* fix function overload
* clang-format
Co-authored-by: Julgodis <>
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2021-01-06 20:33:03 -05:00
0eec99db4d
Split SComponent ( #45 )
...
* split c_math
* split c_angle
* split c_API_controller_pad
* split c_API_graphic
* split c_bg_s_chk
* c_bg_s_gnd_chk split
* more c_bg split
* split c_cc_d
* delete asm
* split c_cc_s
* split c_lib
* split c_m2d and c_m3d_g_aab
* split c_m3d_g_cir
* split c_m3d_g_cps
* split rest of c_m3d_g
* split c_m3d
* split c_malloc
* split c_request
* split c_sxyz
* split and partly decompile c_xyz
* format
* c_angle.h
* begin c_angle decomp
* c_angle
* progress adding stub classes for SComponent
* more c_m3d
* remove some asm and format
* more m3d headers
* more c_angle decomp
* c_lib headers
* add public to classes
* fix csXyz member names
* c_sxyz partly OK
* move Zero csXyz to c_sxyz header
* c_API_graphic
* delete some unused asm
* move math extern data, decompile some functions
* delete unused asm
* fix duplicated c_angle.h
* fix an inlined function name, add more inlined functions for c_angle.h (currently unused)
* format
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2021-01-06 20:04:53 -05:00
9ff0143cd7
JKRFileCache matched 22/24 ( #73 )
...
* progress
* strlen, strcat, and strcchr
* more functions from JKRFileCache
* JKRFileCache 22/24 matched
Co-authored-by: Julgodis <>
2021-01-06 19:47:07 -05:00
6a81911ba6
TObject and JStudio internals ( #57 )
...
* TObject
* fix
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2021-01-05 12:47:26 -05:00
42a5e45a98
JKRMemArchive ( #66 )
...
* JKRArchivePri OK
* JKRArchivePub OK
* formatting
* removed unused asm files and tried to fixed setExpandSize and getExpandSize
* JKRMemArchive and created JKRCompression
Co-authored-by: Julgodis <>
2021-01-05 11:34:58 -05:00
594d2c384d
JKRArchive ( #63 )
...
* JKRArchivePri OK
* JKRArchivePub OK
* formatting
* removed unused asm files and tried to fixed setExpandSize and getExpandSize
Co-authored-by: Julgodis <>
2021-01-04 18:20:45 -05:00
1f6f337212
swap in memcpy for func_80003540, correct some minor issues in dvd.h and JKRDVDFile.h
2021-01-03 21:08:33 -05:00
112e86f0e8
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
66626304fa
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
fe87a0f926
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
cd601606ee
adjust gameinfo sizing, rename inline register funcs
2021-01-02 19:09:04 -05:00
4b9c7e0376
Merge branch 'master' of https://github.com/zeldaret/tp
2021-01-02 17:49:20 -05:00
eb4f3431f2
more d_save funcs OK, initial map out of dcomifg_play_c and it's classes
2021-01-02 17:47:43 -05:00
e40f61ddef
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
d369a7e7e6
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
2ab5f6c297
d_camera: split ( #51 )
...
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2021-01-02 10:37:11 -05:00
cb436a727b
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
59a9fda7cb
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
5ffa0945b0
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
bf652784d1
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
7241bb2666
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
8e1eeaddce
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
73c4048b27
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
33b1429f1b
d_a_alink.cpp: split ( #41 )
2020-12-29 17:08:25 -05:00
bf0bb4b851
move asm in TUs to files, add diff.py
2020-12-26 13:03:37 -05:00
b02529acb8
begin splitting d_a_alink ( #34 )
...
* begin splitting d_a_alink
* fix
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2020-12-25 21:03:10 -05:00
50f8971ec3
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
b0cfabc8cc
d_bomb OK ( #28 )
...
* Start Z2SceneMgr
* Various Fixes After Merge
* d_bomb OK
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2020-12-13 15:49:40 -05:00
19375e117b
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
1d91307157
f_pc_pause / f_pc_priority ( #23 )
...
* f_pc_pause
* f_pc_priority
2020-12-13 15:38:17 -05:00
ff2faa9804
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
ccab99f398
f_pc_layer ( #16 )
...
* f_op_actor_tag OK
* f_pc_layer_tag OK
* f_pc_layer_iter
* forgot a return
* identation and extern var name comments
* fix struct member name
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2020-12-05 23:58:12 -05:00
74faaee32a
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
09a19f1576
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
18f4c3a05f
initial class structure for dComIfG_inf_c
2020-12-04 00:04:41 -05:00
dd306405fe
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
0ef9f1ddf9
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
7643baec7d
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
3b18e45c56
d_a_item_static ok ( #10 )
...
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2020-12-02 20:33:22 -05:00
154a6ed4c0
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
52bc3ed5b9
Improved handling of virtual inheritance. ( #7 )
...
* new system for handling vtables
* commented out non-matching JKRDisposer::~JKDisposer()
* removed artificial vtables and matched simple virtual-call functions
* better text on nonmatching functions
* reverted asmdiff.sh
* attempt 2
* Spelling
* banner and .gitignore for vtable artifacts
* move virtual function to the correct class
* remove unnecessary casts
2020-12-01 15:18:01 -05:00
eff77cbe26
SComponent c_list / c_node ( #5 )
...
* SComponent c_list / c_node
* SComponent: c_tree
* SComponent: start c_phase
* SComponent: c_tag
* SComponent: c_counter
* f_pc_line / f_pc_line_tag
the beginnings of the framework process system
* f_pc_method_tag
* SComponent: c_node_iter / c_list_iter / c_tag_iter / c_tree_iter
* f_pc_draw_priority
* f_pc_method_iter
* f_pc_profile
Also add (untested) base header classes for f_pc_base
* f_pc_searcher
* f_pc_create_tag
* f_pc_creator
* f_pc_layer skeleton
* f_pc_method
* f_pc_line_iter
* f_pc_leaf somewhat
* f_pc_delete_tag
* f_pc_create_req
* Fix a few non-matchings
* c_phase: slight additional notes
* c_node: more matching
* fix build
* c_node: One more matching
* f_pc_line_iter: Matching
* f_pc_create_req: a bit more
* f_pc_load, f_pc_deletor partial
* f_pc_executor partial
* f: minor cleanups
* f_pc_executor
Co-authored-by: Pheenoh <pheenoh@gmail.com >
2020-11-30 17:26:55 -05:00
89f4055593
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
8a1439e50c
migrate all d_file_sel_info asm functions to inline
2020-11-29 23:26:19 -05:00
2993cfd15a
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
Jonathan Wase