Commit Graph

430 Commits

Author SHA1 Message Date
Pheenoh f6318d671c Merge branch 'd_a_player' into d_timer 2022-12-22 08:31:49 -07:00
Pheenoh d3ef35d560 dTimer_Create 2022-12-22 08:10:03 -07:00
Pheenoh 2764ca7bec dTimer_Draw 2022-12-22 08:06:17 -07:00
Pheenoh 8518811226 dTimer_c::isStart 2022-12-22 01:25:35 -07:00
Pheenoh 09cf836d6e dTimer_c::getTimeMs 2022-12-22 00:57:43 -07:00
Pheenoh 995d81d7ea dTimer_c::getLimitTimeMs 2022-12-22 00:46:31 -07:00
Pheenoh 538c1d2214 dTimer_c::deleteRequest 2022-12-22 00:37:31 -07:00
Pheenoh 282b2a33f4 dTimer_c::stop 2022-12-22 00:36:10 -07:00
Pheenoh 42d6d8c0bf dTimer_c::stock_start (no param) attempt 2022-12-22 00:30:04 -07:00
Pheenoh c4ed589f23 dTimer_c::stock_start 2022-12-22 00:03:31 -07:00
Pheenoh 5e997de2c1 dTimer_c::deleteCheck 2022-12-21 23:57:09 -07:00
Pheenoh a1f695fdc4 Merge remote-tracking branch 'upstream/master' into d_a_player 2022-12-21 23:22:19 -07:00
Pheenoh b87b7d1f45 wolfGrabSubjectNoDraw 2022-12-21 15:55:44 -07:00
Pheenoh 693afdbb71 daPy_sightPacket_c::draw() 2022-12-21 13:46:28 -07:00
Pheenoh c1bddb4a3b fixes for taka 2022-12-21 09:56:34 -07:00
TakaRikka 1775ce443c big d_a_alink pass (#214)
* d_a_alink pass1 wip

* more d_a_alink work

* remove asm

* more daalink work

* 20% dol code decompiled

* fixed some nonmatchings for building

* a few daalink functions and labeling some HIO data
2022-12-20 16:30:00 -07:00
Pheenoh 85ad8b190d d_a_npc work
daBaseNpc_c::setBckAnm and J3DAnmTransform* daBaseNpc_c

daBaseNpc_c::setBtpAnm

daBaseNpc_c::attnSttsOn

daBaseNpc_c::orderEvent

daBaseNpc_c::setEnvTevColor

daBaseNpc_c::setRoomNo

daBaseNpc_c::checkEndAnm attempt

CheckCreateHeap

daNpcF_addIdx

daNpcF_subIdx

daNpcF_incIdx

daNpcF_decIdx

daNpcF_ActorMngr_c::initialize()

daNpcF_ActorMngr_c::entry

cleanup daNpcF_ActorMngr_c::entry

daNpcF_ActorMngr_c::remove

daNpcF_ActorMngr_c::getActorP

daNpcF_MatAnm_c::calc attempt

daNpcF_SPCurve_c::initialize

minor fixes

daNpcF_Path_c::initialize

daNpcF_Path_c::setPathInfo

daNpcF_Path_c::chkPassed

daNpcF_Path_c::reverse

daNpcF_Path_c::setNextIdx

daNpcF_Path_c::getNextIdx

daNpcF_Path_c::getBeforeIdx

daNpcF_Path_c::getBeforePos

daNpcF_Path_c::getNextPos

daNpcT_MatAnm_c::initialize

daNpcT_MatAnm_c::calc

daNpcT_addIdx

daNpcT_subIdx

daNpcT_decIdx

daNpcT_Path_c::hermite

daNpcT_Path_c::initialize

daNpcT_Path_c::setPathInfo attempt

daNpcT_Path_c::setNextPathInfo

daNpcT_Path_c::reverse

daNpcT_Path_c::setNextIdx

daNpcT_Path_c::getDstPos attempt

daNpcT_DmgStagger_c::setParam

Add FLOAT_LABEL where possible

fopEn_enemy / fix e_wb

move jasper's jsystem work over

d_attention / d_demo / d_lib work

remove asm

clean up dolphin files / work on some rels (#212)

* d_a_alldie / d_a_tboxSw / d_a_tag_gstart / d_a_tag_hstop

* dolphin OS work / cleanup

* dolphin GX work / cleanup

* finish changing dolphin files to C

* more files into C

* match rest of MSL_C math functions

* more dolphin files converted to C

* remove asm

* d_bg_w work

* remove asm

* d_a_alink work / kytag14

initial changes to d_a_e_yc

checkpoint until virtual destructor issue is solved

daNpcF_Lookat_c::adjustMoveDisAngle

daBaseNpc_c::setMtx

daBaseNpc_moveBgActor_c::daBaseNpc_moveBgActor_c()

daNpcT_c::ctrlFaceMotion

daNpcT_c::ctrlMsgAnm attempt

daNpcT_c::initTalk

daNpcF_clearMessageTmpBit

daNpcF_getDistTableIdx

daNpcF_offTmpBit

daNpcF_onTmpBit

daNpcF_chkTmpBit

daNpcF_onEvtBit

daNpcF_chkEvtBit

daNpcF_c::getDistTableIdx

daNpcF_chkPointInArea

daNpcF_chkDoBtnEqSpeak

daNpcF_getPlayerInfoFromPlayerList attempt

daNpcF_pntVsLineSegmentLengthSquare2D

daNpcF_c::chkPointInArea

daNpcF_c::chkPointInArea

daNpcF_c::getAttentionPos

daNpcT_chkTmpBit

daNpcT_offTmpBit

daNpcT_onTmpBit

daNpcT_chkEvtBit

daNpcT_offEvtBit

daNpcT_onEvtBit

daNpcT_chkDoBtnIsSpeak

daNpcT_getDistTableIdx

daBaseNpc_acMngr_c::entry

daNpcF_c::initTalk

undo override
2022-12-20 16:28:41 -07:00
TakaRikka 84950e08b4 d_camera / m_Do_ext / d_particle + minor various wip (#210) 2022-12-20 16:27:00 -07:00
TakaRikka ca71275bbe
big d_a_alink pass (#214)
* d_a_alink pass1 wip

* more d_a_alink work

* remove asm

* more daalink work

* 20% dol code decompiled

* fixed some nonmatchings for building

* a few daalink functions and labeling some HIO data
2022-12-19 12:06:32 -07:00
TakaRikka 1114b13da8
clean up dolphin files / work on some rels (#212)
* d_a_alldie / d_a_tboxSw / d_a_tag_gstart / d_a_tag_hstop

* dolphin OS work / cleanup

* dolphin GX work / cleanup

* finish changing dolphin files to C

* more files into C

* match rest of MSL_C math functions

* more dolphin files converted to C

* remove asm

* d_bg_w work

* remove asm

* d_a_alink work / kytag14
2022-11-11 11:09:48 -07:00
TakaRikka 6d006074a7 d_attention / d_demo / d_lib work 2022-10-18 05:15:45 -07:00
TakaRikka a3578d0c7c fopEn_enemy / fix e_wb 2022-10-04 17:29:53 -07:00
TakaRikka 4913395dbd
d_camera / m_Do_ext / d_particle + minor various wip (#210) 2022-10-03 18:26:26 -04:00
Tom Overton fb504a1bff Fix some include capitalization 2022-09-03 02:58:36 -07:00
TakaRikka f8979749e3
j2d / map_path work, d_drawlist / d_attention cleanup (#208)
* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress

* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data

* rename more data

* remove asm / progress

* match all of d_pane_class

* fixes / some dKankyo doc

* bunch of j2d work. d_drawlist / d_attention cleanup

* progress / asm

* cleanup wip

* decompile JStage

* setup some more JStudio structs

* set up d_demo classes

* some d_demo work

* cleanup dolphin os stuff

* some initial dEvent documentation

* some At collision documentation

* match JUTConsole::doDraw

* dbgs work / split up some of d_a_alink into .inc files

* d_a_alink_spinner work
2022-08-30 15:22:17 -06:00
TakaRikka 929c5cfa5a
d_menu_save / pane_class / rename some data (#205)
* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress

* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data

* rename more data

* remove asm / progress

* match all of d_pane_class

* fixes / some dKankyo doc
2022-07-04 21:21:57 +02:00
lepelog b99af1efc3 use procname 2022-07-02 14:30:42 +02:00
lepelog b649193f04 misc and d_event 2022-07-02 03:08:21 +02:00
lepelog a2e21275cb fix 2022-07-01 01:02:48 +02:00
lepelog e71aa4578d move inlines 2022-07-01 00:12:01 +02:00
TakaRikka 046d178003
work on daalink, fop actor, mDo machine, msg_scrn, + various (#201)
* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress
2022-06-29 22:19:09 +02:00
lepelog 0b060164da event lib 2022-06-27 01:37:35 +02:00
lepelog d0e349630e small fixes 2022-06-26 23:44:57 +02:00
lepelog afd940edbc fixes, remove asm 2022-06-26 23:25:59 +02:00
lepelog f215e2d649 more nonmatching 2022-06-26 22:33:09 +02:00
lepelog faea874741 match dEvDt_Next_Stage 2022-06-15 22:37:02 +02:00
lepelog 8945d46f09 progress 2022-06-08 21:50:29 +02:00
Jcw87 fb9dd3cdee
JKRDvdRipper, JKRSolidHeap (#199) 2022-06-07 16:03:27 -04:00
TakaRikka 69108b8731 Merge branch 'master' of https://github.com/zeldaret/tp into ext 2022-06-01 05:00:55 -07:00
TakaRikka eac84e07bc revert some format changes 2022-06-01 04:31:11 -07:00
TakaRikka 32cea78625 format 2022-06-01 04:23:39 -07:00
TakaRikka 3f22fa4483 m_Do / d_a_npc work 2022-06-01 03:49:32 -07:00
TakaRikka 36e62e0b80 npcT / JUTGamePad work 2022-05-28 03:49:55 -07:00
lepelog 132f0cbfb7 some cleanup 2022-05-21 21:25:05 +02:00
lepelog ac5a31ff42 event manager 2022-05-21 16:11:46 +02:00
TakaRikka d91b1294bb
d_name / d_s_name (#194)
* d_name

* scnname
2022-04-28 16:58:43 -04:00
TakaRikka 07c5152e5a
Merge pull request #193 from magcius/j3dsys
more J3D work
2022-04-26 23:28:35 -07:00
TakaRikka 589cc12296
some MSL_C work (#192)
* wip

* bunch of MSL_C files

thanks to pikmin2 decomp for their work

* format / asm

* progress

* fix

* fix remove-asm to work with C files

* init / start
2022-04-24 13:02:50 +02:00
Jasper St. Pierre e5df49a7f3 J3DShape: Some funcs 2022-04-23 14:34:11 -07:00
jdflyer 545da8536d
Add Progress.md (#187)
* Match DynamicLink

* finish merge

* Add Progress.md and update readme
2022-04-10 18:29:58 -04:00
TakaRikka dd8899033b
d_s_logo (#188)
* d_s_logo

* match fpcM_Management

* asm
2022-04-10 18:29:28 -04:00
TakaRikka 02c7a47f13
move remaining old progress (#186)
* move remaining old progress

* remove asm
2022-03-26 13:17:17 -04:00
TakaRikka 3af0f51186
m_Do_MemCard / m_Do_MemCardRWmng (#184)
* memcard wip

* format / asm

* fix includes

Co-authored-by: TakaRikka <taka@DESKTOP-T4B7CTF.localdomain>
2022-03-22 23:42:16 -04:00
Zen64 4eb820bb83 Renamed instances of msl_c -> MSL_C because 2022-03-20 00:01:24 -04:00
Zen64 727b2768e2 Fixed capitalization and msl library names 2022-03-19 22:31:05 -04:00
TakaRikka 9b81bd3fc3 format / asm 2022-03-15 02:35:30 -07:00
TakaRikka 985d47a5c8 msg_flow wip 2022-03-15 02:25:25 -07:00
TakaRikka fdaeb3437d shop_system stuff 2022-02-24 14:04:56 -08:00
TakaRikka 9ba9d7c06c
d_model / d_simple_model / d_stage + cleanup (#181)
* d_model / d_simple_model / cleanup

* d_stage work

* set up saveHIO / remove asm

* d_a_itembase
2022-02-19 14:22:47 +01:00
TakaRikka 2e1be6224f jdflyer's work
Co-Authored-By: jdflyer <jdflyer10@gmail.com>
2022-02-07 17:47:45 -08:00
TakaRikka 92a4cd174e c_dylink 2022-02-07 15:27:50 -08:00
TakaRikka 3a79e96e8b
d_meter2 wip / d_s_play / d_file_sel_info (#179)
* d_meter2 wip

* d_s_play

* d_file_sel_info

* format

* tag_lv5soup / tag_setBall / fix dKyeff

* d_cc_uty
2022-02-06 09:23:54 -05:00
TakaRikka 612f26c132
d_kankyo_wether / d_eye_hl (#178)
* d_eye_hl / d_kankyo_wether wip

* more d_kankyo_wether + format

* remove asm

* some d_kankyo wip

* fix dccs vtable

* some m_Do_graphic / d_meter2_draw work
2022-01-25 21:24:14 +01:00
jdflyer 252c5daba7 Formatting fixes 2022-01-17 20:19:43 -07:00
jdflyer ecc987f34c Hyrule field speedhack and shiftability fixes 2022-01-17 20:00:12 -07:00
jdflyer 824a9eabc9 Merge remote-tracking branch 'Upstream/master' 2022-01-16 15:20:32 -07:00
jdflyer db9079ede2 Shift Fixes 2022-01-16 15:16:08 -07:00
jdflyer e1246d9b0a Shiftable 2022-01-15 17:59:59 -07:00
jdflyer c72012c5d8 Add basic dol shiftability
Fixed an incorrect function name
2022-01-11 21:12:44 -07:00
jdflyer 50471c025b Merge remote-tracking branch 'Upstream/master' 2022-01-11 20:24:58 -07:00
jdflyer d0a7d3cd34 fix intentional diff I made for testing 2022-01-11 19:46:30 -07:00
jdflyer 7e97dfab7b Match destructor and msl_c header include fixes 2022-01-11 19:36:28 -07:00
TakaRikka 32fc4e2944 JUTAssert 2022-01-10 04:07:06 -08:00
TakaRikka d6f68167c6 Merge branch 'master' of https://github.com/zeldaret/tp into menu 2022-01-09 17:41:12 -08:00
TakaRikka 37146dfed1 JFramework mostly ok 2022-01-09 17:33:14 -08:00
lepelog da3d98b67a
J2DAnimation (#173)
* ok

* naming stuff
2022-01-04 18:18:23 +01:00
TakaRikka 035a24092e format 2022-01-04 05:37:27 -08:00
TakaRikka f8ce912342 d_menu_window 2022-01-04 04:53:20 -08:00
TakaRikka 15808a2011
Merge pull request #171 from TakaRikka/wip1
d_a_player / d_meter_map + misc
2022-01-04 03:46:52 -08:00
jdflyer 346215bd49 Match most of DynamicLink 2022-01-03 21:05:34 -07:00
TakaRikka 4b60389c21 d_menu_window_HIO ok 2021-12-28 03:02:45 -08:00
TakaRikka 3c26cf452e cleanup 2021-12-27 06:17:37 -08:00
TakaRikka 38037ea1a0 d_meter_map / some d_a_alink 2021-12-27 05:15:35 -08:00
Jasper St. Pierre 045fefcab7 minor cleanups 2021-12-23 17:10:39 -08:00
Jasper St. Pierre 2ec3e1f189 Add an enum for the different procnames (actor types)
and switch over the stage data table to use it.
2021-12-23 16:46:48 -08:00
TakaRikka 2074bd72d9 wip 2021-12-21 06:06:57 -08:00
lepelog 202e3c51c0
J2DPane (#168)
* most of J2DPane

* finish j2dpane

* cleanup

* use J2DBlendInfo
2021-12-11 23:39:53 +01:00
Jasper St. Pierre c15d8fcb3e
more simple J2D/J3D funcs (#166)
* more simple J2D/J3D funcs

* JPABaseShape constructor

* fmt

Co-authored-by: lepelog <25211966+lepelog@users.noreply.github.com>
2021-12-06 12:51:53 +01:00
TakaRikka 751a4112a0 fixes 2021-12-04 16:27:19 -08:00
TakaRikka 942c375fe5 format / asm 2021-12-04 05:57:01 -08:00
TakaRikka b88340aca7 merge 2021-12-04 05:29:00 -08:00
TakaRikka fd9c4cafc4 wip 2021-12-04 05:10:59 -08:00
icogn f6f7e7ce38
d_kankyo_data and d_kankyo work (#158)
* Copy over progress

* Comment other d_kankyo_data dat section stuff

* Compiling

* Progress

* Progress

* Close

* Match

* Clean

* Change loop

* Clean

* Clean

* Before attempt clean

* Work on dKy_F_SP121Check, not compiling

* Adjust comparisons

* Adjust headers

* Close

* Matching

* Remove

* Comments

* Fix u8 pointer

* Comment

* Adjust

* Comment stage names

* Rename member

* Decomp dKy_darkworld_spot_check

* Decomp dKy_darkworld_Area_set

* Adjust

* Comments, small adjust

* Add phase1 base txt

* Working through d_s_play phase_1

* Finish function outline

* Comments

* Add darkLv enum

* Rename enum

* Refactor

* Comment

* Documentation

* Move out notes

* Comments

* Adjust

* Rename structs

* Comments

* Minor adjust

* Comment

* Adjust and Comments

* Adjust

* Adjust

* Comment

* Clean

* Add back addresses

* Adjust comment

* Adjust comments

* Comments

* Comment

* Adjust for clang-format-10

* Edit getName

* Fix fog table

* Make l_field_data use placeholder struct

* Make l_envr_default use placeholder struct

* Make l_vr_box_data use placeholder struct

* Make l_pselect_default use placeholder struct
2021-12-02 23:43:22 +01:00
TakaRikka 5f187a0776
Merge pull request #161 from lepelog/c-lib
c_lib OK
2021-12-02 06:38:58 -08:00
notyourav c4ef30bc95
Port JStudio work to new branch (#160)
* build fix

* stb

* functionvalue

* fvb

* jstudio cleanup

* d
2021-11-26 15:50:22 +01:00
lepelog 475d94201c rebase 2021-11-13 13:24:38 +01:00
TakaRikka 70eabb12bd wip 2021-11-10 23:54:31 -08:00
TakaRikka 74ed2da8bc
d_bg_s (#159)
* wip

* d_bg_s

* most of d_bg_s

* small cleanup

* clang

* fixes
2021-11-10 19:56:51 +01:00
Jonathan Wase 901b222eb8
JUTException (#154)
* JUTException inherit JKRThread

* OK __ct__12JUTExceptionFP14JUTDirectPrint

* OK create__12JUTExceptionFP14JUTDirectPrint

* OK setFPException__12JUTExceptionFUl

* OK showFloatSub__12JUTExceptionFif

* OK showFloat__12JUTExceptionFP9OSContext

* OK searchPartialModule__12JUTExceptionFUlPUlPUlPUlPUl

* OK search_name_part__FPUcPUci

* OK showStack__12JUTExceptionFP9OSContext

* OK showMainInfo__12JUTExceptionFUsP9OSContextUlUl

* OK showGPR__12JUTExceptionFP9OSContext

* OK __sinit_JUTException_cpp

* OK showMapInfo_subroutine__12JUTExceptionFUlb

* OK showGPRMap__12JUTExceptionFP9OSContext

* OK showSRR0Map__12JUTExceptionFP9OSContext

* OK printDebugInfo__12JUTExceptionFQ212JUTException9EInfoPageUsP9OSContextUlUl

* OK isEnablePad__12JUTExceptionCFv

* OK readPad__12JUTExceptionFPUlPUl

* NONMATCHING printContext__12JUTExceptionFUsP9OSContextUlUl

* OK printContext__12JUTExceptionFUsP9OSContextUlUl

* OK __dt__12JUTExceptionFv

* OK waitTime__12JUTExceptionFl

* OK createFB__12JUTExceptionFv

* OK setPreUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v

* OK __ct__13JUTExternalFBFP16_GXRenderModeObj8_GXGammaPvUl

* OK createConsole__12JUTExceptionFPvUl

* NONMATCHING queryMapAddress_single__12JUTExceptionFPcUllPUlPUlPcUlbb

* OK queryMapAddress__12JUTExceptionFPcUllPUlPUlPcUlbb

* OK appendMapFile__12JUTExceptionFPCc

* clean up

* OK panic_f__12JUTExceptionFPCciPCce

* OK panic_f_va__12JUTExceptionFPCciPCcP16__va_list_struct

* OK errorHandler__12JUTExceptionFUsP9OSContextUlUl

* format

* format

* fixed requested changes

* merged with master and removed *.s files

Co-authored-by: Julgodis <>
2021-11-09 23:09:38 +01:00
TakaRikka 5020395dfd
J2D structs + print / fix GX + MSL string headers (#157)
* J2D structs + print / fix GX + MSL string headers

* remove msl_c/string.h
2021-10-24 23:35:00 +02:00