64bb8562fa
Merge remote-tracking branch 'upstream/master' into m_Do_audio2
2021-01-21 21:58:53 -07:00
ff7ac962f1
m_Do_audio
2021-01-21 21:47:28 -07:00
a072e71c33
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 <pheenoh@gmail.com>
Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com>
2021-01-21 23:16:51 -05:00
c70d485d35
normalize header guards to {tu_name}_H_ ( #87 )
...
i previously had a bad habit of using double underscores in include
guard macro names, which are implementation-reserved per
the C++98 standard (see 17.4.3.1.2 Global names).
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-18 14:02:51 -05:00
7b97550cee
d_com_inf_game / d_save improvements ( #82 )
...
* some dcominfg funcs
* add dcom inlines to d_save
* format
* format
2021-01-11 11:32:56 -05:00
8cf6641bd4
fully split / more work on d_com_inf_game ( #81 )
...
* split d_com_inf_game
* fix func name
* start some dcomifg funcs
* fix
* clang-format
* change dComIfGs_setWarpItemData back to inline asm for now
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-10 09:00:45 -05:00
2d1d72e1c9
convert dStage_roomControl_c::init method
2021-01-10 03:04:59 -05:00
adf65faa28
dStage_startStage_c::set OK
2021-01-10 02:25:21 -05:00
1eb2cc39a8
clang-format
2021-01-10 01:27:16 -05:00
b51b5abd14
Merge branch 'master' of https://github.com/zeldaret/tp
2021-01-10 01:24:52 -05:00
3c0fe08bdc
dStage_roomDt_c methods decomp'd
2021-01-09 23:04:11 -05:00
82d5e0f796
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
8bd3d07e23
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
872cd076aa
convert dStage_roomDt_c methods
2021-01-09 19:20:36 -05:00
9349690253
convert dStage_stageDt_c methods
2021-01-09 17:00:47 -05:00
f1ff8a45ee
split d_stage
2021-01-08 13:01:37 -05:00
92e9a5ce63
dStage_roomDt_c initial class mapping
2021-01-08 03:46:59 -05:00
cff2beec9c
dStage_stageDt_c initial mapping
2021-01-08 03:05:50 -05:00
52a53ba135
clang-format
2021-01-07 22:58:47 -05:00
c1d05bc46c
main01 attempt, fix dcomifg_play_c members
2021-01-07 22:56:08 -05:00
88fca194f8
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
0cf65151b3
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
792509e0a1
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
689d83dd23
Move and type PSVEC and PSMTX funcs and follow includes in functions.h ( #68 )
...
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-05 12:32:20 -05:00
e9607ae760
add a lot of dComIfGs inlines ( #65 )
...
* item_func inlines
* some getcheck func inlines
* remove asm
* format
* format
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-05 11:48:08 -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
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
ab8dee5c14
dSv_player_item_c setWarashibeItem ( #56 )
...
* dsv_player_item_c::setWarashibeItem
* add slot name
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-03 05:15:52 -05:00
d7ece32bbb
dSv_info_c::revSwitch OK
2021-01-03 04:22:09 -05:00
777bf2d3eb
dSv_info_c::isSwitch OK
2021-01-03 03:51:44 -05:00
47c40cce41
dSv_info_c::isItem OK
2021-01-03 03:35:54 -05:00
5abaebc40d
dSv_info_c::isActor OK
2021-01-03 03:22:30 -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
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
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
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
9e442d11ca
move asm in TUs to files, add diff.py
2020-12-26 13:03:37 -05:00
4c504d078d
run clang-format
2020-12-26 11:31:49 -05:00
64a6a97b7b
add missing class and clang-format
2020-12-25 21:16:13 -05:00
e066711553
add missing class in d_save and clang-format
2020-12-25 21:11:16 -05:00
e8315cdb81
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
22bda03652
more d_item / d_a_horse_static done ( #32 )
...
* more d_item funcs done / add dSv_info_c to gameinfo
* checkWait ok / remove asm
2020-12-14 14:07:29 -05:00
e4ad32409b
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
c0ba553a85
convert more class members to new naming convention
2020-12-08 01:37:35 -05:00
5684d3b149
use dolphin types, begin changing class member naming convention
2020-12-08 00:46:44 -05:00
cbd06e5668
add d_meter2_info methods, addBottleNum OK, getBombNum OK, isLetterReadFlag OK
2020-12-06 20:46:16 -05:00
819f178657
add dmeter2 header, isMagicFlag OK, setItem OK
2020-12-06 14:38:26 -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
3dc3739ebd
initial class structure for dComIfG_inf_c
2020-12-04 00:04:41 -05:00
7ec9d6ec28
Merge branch 'master' of https://github.com/zeldaret/tp
2020-12-03 21:04:06 -05:00
1c7bf89fff
begin adding d_com_inf_game, add include guards to headers
2020-12-03 21:03:25 -05:00
e27ed1c55d
add gameinfo class / rename unk vars in d_save ( #15 )
2020-12-03 20:56:56 -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
6e9b833ef7
d_a_item_static ok ( #10 )
...
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-02 20:33:22 -05:00
31817ac993
canonize d_save.h ( #9 )
...
Co-authored-by: notyouraveragehooman <65437533+notyouraveragehooman@users.noreply.github.com>
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2020-12-02 19:03:31 -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
92cfb378f3
Add better sorting for inline'd asm
2020-11-29 12:21:01 -05:00
jdflyer