Commit Graph

981 Commits

Author SHA1 Message Date
bomba1749 726f5bb347
Add files via upload 2023-07-02 22:16:37 -04:00
bomba1749 739d1e06a8
Add files via upload 2023-07-02 22:10:24 -04:00
bomba1749 adf4703d1d
Add files via upload 2023-07-02 22:08:20 -04:00
bomba1749 d5412a0b24
hopefully this will fix some errors 2023-07-02 15:14:55 -04:00
bomba1749 051f83f430
Add files via upload 2023-07-01 18:33:26 -04:00
bomba1749 a748269673
adding these so i can get the function on the latest commit 2023-07-01 18:28:45 -04:00
bomba1749 0943ffa6eb
Merge branch 'zeldaret:master' into master 2023-07-01 18:26:13 -04:00
Briggs Baltzell fd527f9216
Added VFR::getDeltaFrame (#122)
* Added getDeltaFrame and changed getDeltaTime

* Replaced getDeltaTime usages with getDeltaFrame

* Moved getDeltaTime above getDeltaFrame
2023-07-01 21:29:40 +01:00
bomba1749 c385453f76
Add files via upload 2023-06-30 16:18:40 -04:00
bomba1749 bc039919de
calc_ is almost done 2023-06-29 20:51:56 -04:00
bomba1749 1773dcab55
hopefully the table is correct now 2023-06-29 20:51:19 -04:00
bomba1749 b6971ccf3e
Add files via upload 2023-06-29 20:49:08 -04:00
bomba1749 20ff981a16
Add files via upload 2023-06-29 20:33:21 -04:00
bomba1749 ead424d6a5
moved ASList to its own file 2023-06-29 20:32:54 -04:00
bomba1749 e7cebb4977
making ASList have a file of its own;
doing this now so i dont forget
2023-06-29 20:32:17 -04:00
bomba1749 26db64bf54
Create ASList.cpp 2023-06-29 20:31:22 -04:00
bomba1749 d0f7a3072a
Delete .AS 2023-06-29 20:30:59 -04:00
bomba1749 8acc27911f
Create .AS 2023-06-29 20:30:38 -04:00
bomba1749 33d30205fc
Merge branch 'zeldaret:master' into master 2023-06-13 21:24:59 -04:00
bomba1749 ba5bbdb3dc
changed from float to void 2023-06-13 21:24:08 -04:00
bomba1749 d5f6f43eb5
AirOctaDataMgr temporarily moved to /Game 2023-06-13 19:49:36 -04:00
bomba1749 2b44d041c3
AirOctaDataMgr temporarily moved to /Game 2023-06-13 19:48:30 -04:00
bomba1749 bbb6c6a4f1
removed unnecessary return 2023-06-13 16:50:27 -04:00
bomba1749 e71e29de5f
AirOctaFlyUp::leave OK 2023-06-13 16:45:58 -04:00
Esras bdd6e57d63
resPlacement (#120) 2023-06-11 23:17:14 +01:00
bomba1749 95ee9b929c
removed excess includes 2023-06-10 23:30:03 -04:00
bomba1749 83b5065160
AirOctaFlyUp::enter ok
had to make a dummy variable in order to get a variable at 0x114 in AirOctaDataMgr, and also had to make function sub_71002FB17C so enter_ could still call it. loadParams_ still doesnt match with a difference of 0. Will look into sub_71002FB17C and the missing variables soon.
2023-06-10 23:22:00 -04:00
bomba1749 8d099f9009
Add files via upload 2023-06-10 13:49:40 -04:00
bomba1749 6c1892d5cf
AirOctaFlyUp::handleMessage ok, AirOctaFlyUp::leave_ not ok with a difference of 0 2023-06-09 23:30:04 -04:00
bomba1749 ee7f19e1d5
AirOctaFlyUp::handleMessage ok, AirOctaFlyUp::leave_ not ok with a difference of 0 2023-06-09 23:28:42 -04:00
bomba1749 efa72cb461
AirOctaFlyUp::handleMessage ok, AirOctaFlyUp::leave_ not ok with a difference of 0 2023-06-09 23:24:19 -04:00
notyourav dc4e48523b
mapRail.cpp ok (#118) 2023-05-27 00:39:40 +01:00
Martin Aguayo 78fd3c6e7a
Add uking::ai::ActorWaterDepthSelect functions (#117) 2023-05-14 15:01:16 +01:00
Briggs Baltzell 2340dc7bc0
Implement CookingMgr class (#113)
* Added CookingMgr fields and started on ctor

* Implemented CookItem::copy

* Implemented CookingMgr dtor

* Marked CookingMgr createInstance as matching

* Implemented CookingMgr::getCookItem

* Added CookingMgr::cook decl

* Added CookingMgr method decls

* Replaced part of CookingMgr with sead::FixedObjArray

* Added line separators in cookManager.h

* Defined structs Ingredient and BoostArg in CookingMgr

* Defined structs CookArg and CookIngredient

* Renamed some fields of CookingMgr

* Added struct CookingMgr::CookingEffectEntry

* Started implementing CookingMgr::init

* Set more entries in init

* Set field _548

* Set field default values in init

* Loaded string values from config

* Set mCookingEffectEntries in init

* Added conditional mConfig allocation

* Added FixedTreeMap class to sead

* Used FixedTreeMap in CookingMgr

* Set CookingMgr constructor to default and marked it as matching

* Removed field _31C from CookingMgr

* Updated sead

* Cleared _548 before filling

* Used name hash for _548 keys

* Fixed path setup

* Changed type of _548 to sead::FixedTreeMap<u32, u32, 13>

* Set mNMSSR to correct values

* Fixed field init order

* Rearranged variables

* Swapped entry_hash comparisons

* Changed CRC32 names and index values

* Cast i to u64

* Renamed static crc32 variables

* Renamed _548 to mCookingEffectNameIdMap

* Marked static vars as const and used decimal numbers

* Used sead::SafeArray for mNMMR and mNMSSR

* Rearranged mNMMR and mNMSSR conditions

* Removed size check from mNMMR and mNMSSR conditions

* Removed size check from CEI conditions

* Renamed mRes2 to mResHandle

* Renamed cook args

* Moved crc32 statics into Constants struct

* Marked CookingMgr::init as matching

* Renamed Constants to Crc32Constants

* Added cookFail and cookFailForMissingConfig

* Added NumIngredientsMax, NumEffects, and NumEffectSlots constants

* Renamed getCookItem to setCookItem

* Renamed x to getCookItem

* Implemented getCookItem

* Made setCookItem take a const ref

* Decompiled cookCalcItemPrice

* Marked cookCalcItemPrice as const

* Fixed both cookFail and cookFailForMissingConfig

* Added CookItem::reset

* Added CookingMgr::resetCookItem

* Moved ctor and dtor below static variables

* Changed cookFailForMissingConfig arg to sead::SafeString

* Started on cookCalcBoost

* Moved CookItem into cookManager.h

* Moved Cooking into Game

* Moved CookingMgr to uking namespace

* Inlined CookItem::reset

* Renamed CookItem members

* Fixed CookItem mangled names in uking_functions.csv

* Added enum class CookEffectId

* Moved CookingMgr ctor below disposer impl

* Updated sead

* Started on cookHandleBoostSuccessInner

* Made changes to cookCalcBoost and cookHandleBoostSuccessInner

* Extracted cookHandleBoostMonsterExtractInner

* Removed found_monster_extract in cookCalcBoost

* Marked cookCalcBoost as matching

* Got cookHandleBoostMonsterExtractInner matching

* Made changes to cookHandleBoostSuccessInner

* Renamed discriminator to bonus in cookHandleBoostSuccessInner

* Added CookingMgr::cookCalcSpiceBoost

* Made changes to CookingMgr::cookCalcSpiceBoost

* Added CookingMgr::cookCalcPotencyBoost

* Mostly matched CookingMgr::cookCalcPotencyBoost

* Added CookingMgr::getCookEffectId

* Used getCookEffectId in cookCalcPotencyBoost

* Set access modifiers in CookingMgr

* Made cookCalcPotencyBoost const-correct

* Marked global init as mismatching

* Renamed CookingMgr functions in uking_functions.csv

* Added CookingMgr::prepareCookArg

* Added IngredientArray type

* Added cookWithItems

* Added CookingMgr::prepareCookArg

* Fixed getCookEffectId

* Fixed cookCalcPotencyBoost

* Made changes to prepareCookArg

* Got cookWithItems matching

* Marked vars const

* Removed commented-out destructor and UnkItem

* Renamed CookIngredient._58 to count

* Started on CookingMgr::cook

* Extracted cookAdjustItem

* Fixed ingredient setup

* Extracted actor_info_data

* Fixed some control flow for single ingredients

* Fixed more control flow for single ingredients

* Handled no effect and empty actor name

* Renamed Ingredient::_10 to used_in_recipe

* Fixed recipe control flow

* Matched cookAdjustItem

* Fixed InfoData instance uses

* Removed BAD_RECIPE label

* Rearranged to remove goto

* Added cookCalcRecipeBoost

* Extracted getCookEffectId

* Extracted isCookFailure and isMedicine

* Extracted getCookEffectIdFromTreeMap

* Extracted findIngredientByName and findIngredientByTag

* Marked nonmatching functions

* Added resetArgCookData

* Matched resetArgCookData and prepareCookArg

* Added fields and handleMessage to CookPotRoot

* Started on CookPotRoot::init_

* Added hasMonsterExtract

* Added to CookPotRoot::handleMessage_

* Removed Ingredient::_4 field

* Renamed CookItem::_224 to is_crit

* Renamed CookingEffectEntry members

* Renamed CookingMgr fields

* Changed comparison in cook

* Renamed actor_tag_iter to hash_iter and added num checks

* Got cookCalcSpiceBoost closer to matching

* Removed int_val init from cookCalcSpiceBoost

* Inlined actor_data

* Added `using namespace ksys::act`

* Moved int_val outside loop

* Marked cookCalcSpiceBoost as matching

* Rearranged cookHandleBoostSuccessInner

* Renamed cookCalcPotencyBoost to cookCalcIngredientsBoost

* Renamed stamina_recover to vitality_boost

* Renamed CookItem args to cook_item

* Renamed cookFailForMissingConfig arg

* Used IngredientArray in findIngredient functions

* Renamed crit functions

* Renamed getCookEffectId arg

* Renamed getCookEffectId to getCookEffectIdByName

* Added SetCookItemInDemo::oneShot_

* Matched SetCookItemInDemo::oneShot_

* Added comment about CookArg constructor and formatted

* Removed TODO from CookingMgr

* Marked WIP functions as non-matching

* Fixed formatting

* Matched sead::SafeArray<uking::CookIngredient, 5>::SafeArray

* Added BoostArg default member initializers

* Used auto for cooking_mgr in CookPotRoot::handleMessage_

* Used designated initializers for boost_arg and added whitespace

* Used angle brackets for sead import

* Removed [[maybe_unused]] from declaration

* Used safeDelete

* Inverted condition in CookingMgr::cookCalcCritBoost

* Added getCookingEffectEntry getter and moved CookingEffectEntry up

* Cleaned up CookingMgr::cookCalcSpiceBoost

* Used loops to init ingredient num members

* Converted CookingMgr fields to s32

* Cleaned up CookingMgr::cookCalcItemPrice

* Renamed CookItem::item_price to sell_price

* Used min and max in CookingMgr::cookCalcItemPrice

* Inlined count vars in CookingMgr::cookCalcItemPrice

* Removed explicit casts in CookingMgr::cookCalcItemPrice

* Cleaned up and reformatted CookingMgr::cookCalcIngredientsBoost

* Added casts back into CookingMgr::cookCalcItemPrice to silence warnings
2023-01-27 18:30:24 +01:00
Briggs Baltzell 969b1c3f33
Match ShootingStarMgr::initSchedule (#114) 2023-01-25 12:48:06 +01:00
Tonycons-dev 50469a43fc
Add uking::PlayReport (#112) 2023-01-22 18:17:04 +01:00
oxixes a7c8d40275
Implement FadeProgress class (#110) 2023-01-08 00:49:25 +01:00
Léo Lam 6723cd5a5c
Improve rebuild times by removing unnecessary includes in AI headers 2022-12-22 14:35:08 +01:00
Léo Lam 2616802996
ksys/act: Clean up RootAiFlag/RootAiFlag2 definitions and usage 2022-12-22 14:35:08 +01:00
Léo Lam 25427f1b4c
ksys/phys: Add RagdollController (the real one, not RagdollInstance) 2022-12-21 12:25:49 +01:00
Léo Lam 27ef71eff7
ksys/phys: Rename RagdollController to RagdollInstance
RagdollController is a different thing!
2022-12-20 19:23:54 +01:00
Léo Lam 08ccaf9c3c
ksys/phys: Add RagdollController::getTransform and more
Credit to @Dragorn421 for helping me figure out the rotation matrix
thing in the getTransform function
2022-12-20 16:27:40 +01:00
Léo Lam faf29549c6
clang-tidy: Relax member name check (for AI parameter variables) 2022-12-20 15:13:34 +01:00
Léo Lam e9790f83eb
lib: Update sead 2022-12-20 01:58:44 +01:00
Léo Lam a217abe647
ksys/phys: Improve RagdollController::setUnk1 match
https://discord.com/channels/688807550715560050/745633101157498880/1054479382892249119

[20:24]TheGreatB3: The Wii U version sets the fields to zero if the value is less than zero, so I think it's really using clamp.
2022-12-19 20:39:15 +01:00
Léo Lam 8c9a316c5b
ksys/phys: Match RagdollController::setUnk1 2022-12-19 13:21:19 +01:00
ThePixelCoder 4275779f8a
Handle nn::gfx merge (#108)
* Fix build and document nn::gfx merge

* Update submodules and some extra labelling in csv

* Fix various issues

* Make versioning more flexible
2022-12-19 13:12:15 +01:00
Léo Lam b4e6a4dac9
ksys/phys: Implement the rest of the easy RagdollController functions 2022-12-19 02:09:22 +01:00
Léo Lam bdd2015a08
ksys/phys: Implement more RagdollController functions 2022-12-19 00:07:21 +01:00
Léo Lam 20be3a197a
ksys/phys: Clarify EntityCollisionMask structure and names 2022-12-18 18:58:23 +01:00