Commit Graph

105 Commits

Author SHA1 Message Date
TakaRikka 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
TakaRikka 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
Pheenoh 2d1d72e1c9 convert dStage_roomControl_c::init method 2021-01-10 03:04:59 -05:00
Pheenoh 2d0a9fb22c dStage_SetErrorStage OK 2021-01-10 02:34:49 -05:00
Pheenoh fb341652cc dStage_SetErrorRoom OK 2021-01-10 02:33:36 -05:00
Pheenoh adf65faa28 dStage_startStage_c::set OK 2021-01-10 02:25:21 -05:00
Pheenoh b51b5abd14 Merge branch 'master' of https://github.com/zeldaret/tp 2021-01-10 01:24:52 -05:00
Pheenoh df361497c2 dStage_stageDt_c methods decomped 2021-01-10 01:23:43 -05:00
Pheenoh 3c0fe08bdc dStage_roomDt_c methods decomp'd 2021-01-09 23:04:11 -05:00
Jonathan Wase 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
TakaRikka 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
Pheenoh 872cd076aa convert dStage_roomDt_c methods 2021-01-09 19:20:36 -05:00
Pheenoh 9349690253 convert dStage_stageDt_c methods 2021-01-09 17:00:47 -05:00
Pheenoh f1ff8a45ee split d_stage 2021-01-08 13:01:37 -05:00
Pheenoh 52a53ba135 clang-format 2021-01-07 22:58:47 -05:00
Pheenoh c1d05bc46c main01 attempt, fix dcomifg_play_c members 2021-01-07 22:56:08 -05:00
Pheenoh 74fac079fa Merge branch 'master' of https://github.com/zeldaret/tp 2021-01-06 21:03:19 -05:00
Erin Moon 6f3f8cc38e 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 6d946e8330 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
lepelog 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
TakaRikka 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
Pheenoh efb2a3896f Merge branch 'master' of https://github.com/zeldaret/tp 2021-01-04 10:43:15 -05:00
TakaRikka 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
Pheenoh 90eb3341bc Merge branch 'master' of https://github.com/zeldaret/tp 2021-01-04 10:37:18 -05:00
Erin Moon 5c23199fe2 close-to-matching mDoCPd_c::convert() (#61) 2021-01-04 10:37:08 -05:00
Pheenoh 2a6fc42571 begin decomping main01 2021-01-04 00:16:06 -05:00
Pheenoh 922a0df5ea debug OK 2021-01-03 22:41:17 -05:00
Pheenoh 409257b111 clang-format 2021-01-03 21:11:43 -05:00
Pheenoh 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
Pheenoh da3a142828 clang-format 2021-01-03 17:03:11 -05:00
Pheenoh d8fdc85090 countUsed OK 2021-01-03 16:58:49 -05:00
Pheenoh f12c5050f3 HeapCheck::heapDisplay OK 2021-01-03 16:34:11 -05:00
Pheenoh 4e085c9c84 make gameinfo members private 2021-01-03 16:13:28 -05:00
TakaRikka 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
Pheenoh ee0bb8f5c6 clang-format 2021-01-03 05:07:35 -05:00
Pheenoh a846de469c dSv_player_item_c::checkInsectBottle OK 2021-01-03 05:03:42 -05:00
Pheenoh d7ece32bbb dSv_info_c::revSwitch OK 2021-01-03 04:22:09 -05:00
Pheenoh 777bf2d3eb dSv_info_c::isSwitch OK 2021-01-03 03:51:44 -05:00
Pheenoh 47c40cce41 dSv_info_c::isItem OK 2021-01-03 03:35:54 -05:00
Pheenoh 5abaebc40d dSv_info_c::isActor OK 2021-01-03 03:22:30 -05:00
Erin Moon 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
Jonathan Wase 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
Pheenoh 609891bc25 adjust gameinfo sizing, rename inline register funcs 2021-01-02 19:09:04 -05:00
Pheenoh e375712d23 Merge branch 'master' of https://github.com/zeldaret/tp 2021-01-02 17:49:20 -05:00
Pheenoh 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
Erin Moon 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
Erin Moon 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
Erin Moon 8821a84a70 d_camera: split (#51)
Co-authored-by: Pheenoh <pheenoh@gmail.com>
2021-01-02 10:37:11 -05:00
jdflyer 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
Erin Moon 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