mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-26 15:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
175 Commits 21 Branches 27 Tags
aeefcd55e2feab71f473f2cf1cc61d481bb92ad1
Commit Graph

138 Commits

Author SHA1 Message Date
jdflyer da5628562f Various Fixes 2021-01-21 22:20:43 -07:00
jdflyer 56352bd0c2 clang-format 2021-01-21 22:06:54 -07:00
jdflyer fb9a6d9a15 Fix Merge and set maxerrors to 5 2021-01-21 21:59:24 -07:00
jdflyer 2ba44f831b Merge remote-tracking branch 'upstream/master' into m_Do_audio2 2021-01-21 21:58:53 -07:00
jdflyer 806630e336 m_Do_audio 2021-01-21 21:47:28 -07:00
Erin Moon 972960b6eb 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
LC f0699b05a8 c_lib: Decomp a few functions (#89) 
* c_lib: Decomp cLib_memSet and cLib_memCpy

Gets rid of some low-hanging fruit.

* c_lib: Decomp cLib_distanceAngleS

Another super trivial function to make match.

* c_lib: Decomp cLib_targetAngleY overload set

Fairly trivial in terms of matching.

* c_lib: Sate clang-format

I didn't touch this code, but the clang-format pass wants this done, and
so it is.
 2021-01-21 20:29:22 -05:00
notyourav c48c35f4db fvb, functionvalue, vector (#77) 
Co-authored-by: Pheenoh <pheenoh@gmail.com>
 2021-01-18 14:27:25 -05:00
Erin Moon ebd329b188 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
TakaRikka 9250602752 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
TakaRikka 07156cecda 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
Pheenoh bf155ed773 convert dStage_roomControl_c::init method 2021-01-10 03:04:59 -05:00
Pheenoh 41c8b6034b dStage_SetErrorRoom OK 2021-01-10 02:33:36 -05:00
Pheenoh 273c455555 dStage_startStage_c::set OK 2021-01-10 02:25:21 -05:00
Pheenoh 6b22c667ea clang-format 2021-01-10 01:27:16 -05:00
Pheenoh ff27d95afb Merge branch 'master' of https://github.com/zeldaret/tp 2021-01-10 01:24:52 -05:00
Pheenoh 20d7d4eb27 dStage_roomDt_c methods decomp'd 2021-01-09 23:04:11 -05:00
Jonathan Wase 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
TakaRikka 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
Pheenoh 9546cf18ad convert dStage_roomDt_c methods 2021-01-09 19:20:36 -05:00
Pheenoh c078294afc convert dStage_stageDt_c methods 2021-01-09 17:00:47 -05:00
Pheenoh 15cbad3824 split d_stage 2021-01-08 13:01:37 -05:00
Pheenoh c979f72b3d dStage_roomDt_c initial class mapping 2021-01-08 03:46:59 -05:00
Pheenoh 60b8591e3f dStage_stageDt_c initial mapping 2021-01-08 03:05:50 -05:00
Pheenoh 7f30607337 clang-format 2021-01-07 22:58:47 -05:00
Pheenoh a6bd9830b0 main01 attempt, fix dcomifg_play_c members 2021-01-07 22:56:08 -05:00
Pheenoh ccad5253e2 Merge branch 'master' of https://github.com/zeldaret/tp 2021-01-06 21:03:19 -05:00
Erin Moon 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
lepelog 11e2bab926 match some Z2Calc functions (#72) 
* Z2Calc OK

* inline definitions in random.h and format

* set -enum int compiler flag and fix enum hacks

* note for get_ufloat_1 inline

* PR suggestions and UB note

Co-authored-by: Pheenoh <pheenoh@gmail.com>
 2021-01-06 20:39:56 -05:00
notyourav a787699d14 Refactor JUTFont symbols (#71) 
* fix JUTFont args

* fix

Co-authored-by: Pheenoh <pheenoh@gmail.com>
 2021-01-06 20:36:27 -05:00
Jonathan Wase 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
lepelog 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
Jonathan Wase 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
notyourav 6a81911ba6 TObject and JStudio internals (#57) 
* TObject

* fix

Co-authored-by: Pheenoh <pheenoh@gmail.com>
 2021-01-05 12:47:26 -05:00
lepelog 9d17d56ece 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
TakaRikka 65651dc37e 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
Jonathan Wase 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
Pheenoh e5c3cd446c Merge branch 'master' of https://github.com/zeldaret/tp 2021-01-04 22:10:07 -05:00
Jonathan Wase 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
Pheenoh fd4dcfe559 Merge branch 'master' of https://github.com/zeldaret/tp 2021-01-04 10:43:15 -05:00
TakaRikka cda110d0ee 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
Pheenoh f90b7b8eca Merge branch 'master' of https://github.com/zeldaret/tp 2021-01-04 10:37:18 -05:00
Erin Moon bc9677e928 close-to-matching mDoCPd_c::convert() (#61) 2021-01-04 10:37:08 -05:00
Pheenoh 343f688286 begin decomping main01 2021-01-04 00:16:06 -05:00
Jonathan Wase 252d874e14 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
Pheenoh cb1737ea06 debug OK 2021-01-03 22:41:17 -05:00
Jonathan Wase fa9b428351 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
Pheenoh 9d766bf0e3 clang-format 2021-01-03 21:11:43 -05:00
Pheenoh 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
Pheenoh 02f5383111 countUsed OK 2021-01-03 16:58:49 -05:00