summaryrefslogtreecommitdiff
path: root/src/code
AgeCommit message (Collapse)Author
2023-04-18`z_player_lib`: Dawn of the final PR (#1142)Anghelo Carvajal
* Player_GetMask and Player_RemoveMask * some comments * Player_ActionToBottle and Player_GetBottleHeld * Player_DrawGetItemImpl and Player_DrawGetItem * func_80123420 OK * Decompile a few more functions * Decompile a few more functions * func_80122760 * func_80122868, func_801229A0 and func_801229EC * func_80122F28 * func_8012301C * func_801242B4 * func_801242DC * func_80124420 nonmatching * func_80126440 * func_801240C8 and func_801240DC * func_8012405C and func_80124088 * func_80124020 * Player_IsBurningStickInRange * func_8012754C * func_80125318 and func_80125CE0 * func_801229FC * func_80127B64 * func_80127488 * func_80122D44 * func_80122BA4 * func_80122C20 attempt * func_80122EEC * func_80122F9C * func_80122FCC and func_8012300C * func_80123448 * func_801234D4 * func_801235DC * func_80123960 * func_80123BD4 * func_80123AA4 * func_801239AC * func_801241B4 * func_80123C58 and func_80123C90 * func_80123D50 and func_80123DA4 * func_80123DC0, func_80123E90 and func_80123F14 * func_80124110 and func_80124148 * func_80124168 and func_80124190 * func_80124278 * func_80124F18 non_equivalent * func_80125340 and func_8012536C * func_801263FC * func_801265C8 * func_8012669C * func_80128B74 * func_80123140 * func_801246F4 * func_801253A4 NON_MATCHING * func_801262C8 * func_80126AB4 * func_80126B8C * func_80127438 * func_801278F8 NON_MATCHING * Fix data split * cleanup externs * func_80128BD0 compiles... * Rename Player_SetEquipmentData * fix merge issues * Fix types * Improvement? Worse? I don't know at this point * func_80128640 attempt * func_80127BE8 * func_80127A60 * func_80127594 attempt * func_801271B0 * func_8012364C NON_MATCHING * func_80124618 * func_80124CC4 non matching * func_801251C4 * func_80125580 non equivalent * func_80128388 * cleanup * remove some hardcoded pointers * object symbol cleanup * func_80124870 NON_EQUIVALENT * name overridlimbdraw arguments * func_80125D4C NON_EQUIVALENT * func_80126BD0 NON_MATCHING * Match func_80126BD0 thanks to anon58 * func_80127DA4 NON_EQUIVALENT * fix merge issues * some stealing from OoT * small rename pass and cleanup * Improve some * CLAMP and fix warnings * func_80125580 matched by mzx * cleanup func_80128BD0 a bit * import data * func_80124CC4 * Rename objectFileTable to gObjectTable * Improve func_80124FF0 thanks to maide * fix renames * Match func_80124FF0 thanks to Maide * cleanup * More cleaning up * import bss * Add PLAYER_STATE macros * a bit more of cleanup * run formatter * func_80128BD0 a bit more deecent * Add player limb enum * Use limb enum * cleanup and format * Use symbols for player dlists groups * A bunch more of pointers * more object pointers * Change the remaining object pointers * Add a few missing dlist in link_child * Small rename * whoops * Work on NON_MATCHINGs * Cleanup * Steal OoT renames from "sword" to "meleeWeapon" * Fix some symbols * Match func_80127594 and format * Match func_80127DA4 * Matched func_801284A0 * Annotate D_801F59AC * Matched func_80128640 * Some cleanup * format * stuffs * some cleanups * import stuff from pr * swords and shields * fixes * bss * cleanup Player_OverrideLimbDrawGameplayCommon * progress on func_80125D4C * PlayerMeleeWeapon enum * Player_BButtonSwordFromAP * GET_B_SWORD_FROM_AP * GET_MELEE_WEAPON_FROM_AP * PlayerBottle * PlayerExplosive and PlayerSword * misc fixes * Various changes fromplayer_actor * z64player.h stuff from player_actor * Fixes * skelanime stuff * placeholders on z64item.h, save macros and ther cleanups * <= PLAYER_AP_MINUS1 * Player_UpdateBunnyEarsKinematics Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * cleanup * bodyPartsPos * comment * sizeof(u16) * typo * merge fixes * fix * fixes * format * fix merge * fix merge * func_80125D4C Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * func_80128BD0 improvement * minor renames * format * whoops * small cleanup * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * format * _B_ * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * format * remove gap * whoops * clanups * remove stuff from permuter_settings * steal some OoT docs * some other docs vscode didn't add to the last commit * format * data as infunction-static data * OoT docs stealing * Improvements on Player_PostLimbDrawGameplay * More improvement * Match Player_PostLimbDrawGameplay Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * cleanups * Convert unk_AF0 into an union and some other cleanups * bss * headLimbRot and upperLimbRot * fix naming * cleanups * bss * bss * Update src/code/z_player_lib.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * pr review Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * bss * gesture * namefixer * gestureInfo * IA_MIN and BOTTLE_EMPTY * review Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * review * D_801F59B0_LEN * Remove LevelOfDetail enum * bss * review * review * gLinkDekuClosedFlowerDL gLinkDekuOpenFlowerDL * _B_ * Player_DrawStrayFairyParticles * fix build --------- Co-authored-by: kyleburnette <kyle@kyleburnette.com> Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-04-18Rename `LinkAnimation` to `DmaAnimation` and other `skelanime` misc cleanups ↵Anghelo Carvajal
(#1147) * Rename LinkAnimation to PlayerAnimation * remove the remaining link stuff * Move functions out of functions.h * cleanup returns * more cleanups * format * format again * format again again * Remove internal functions from header * legacy * bss * linkAnimSegment * Update src/overlays/actors/ovl_En_Yb/z_en_yb.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * bss * `DmaAnimation` rename * more DMA i missed * Revert "more DMA i missed" This reverts commit 6c0ca44f450c92d8c12374fa243c8b17d46527d3. * Revert "`DmaAnimation` rename" This reverts commit 1d2626514c94158001566fa664222b0dcf34a4f7. * Add LinkAnimationHeader rename to namefixer.py --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-04-18Add `SaveInfo` substruct to `SaveContext` (#1191)Anghelo Carvajal
* SaveInfo * fix accesses in sram_NES.c * some more fixing * more fixes * format * fix unk * namefixer * format * bss * review * weekeventregconvert * namefixer * bss
2023-04-18DynaPoly Docs Pass (#1194)engineer124
* dyna docs * init flags * more docs * cleanup * partial PR review * another bracket * hold to press * PR cleanup
2023-04-18Name some `SurfaceType_` functions (#1155)Anghelo Carvajal
* enums * renaming functions * fixes * SurfaceType_IsSoft * type fixing * format * Update src/code/z_bgcheck.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_bgcheck.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * SurfaceType_GetFloorEffect Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * format * bss * cleanups * extra material docs * cleanup * cleanups * Remove Bg prefix * minor fixes * Remove BG_ * SURFACE_MATERIAL_DIRT_SHALLOW * format * bss * bss * review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * format * format again * bug * format * namefixer * bss * bss * bss * review --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2023-04-18`stackcheck.h` (#1204)Anghelo Carvajal
* stackcheck.h * warning * Update src/boot_O2/stackcheck.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/boot_O2/stackcheck.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/boot_O2/stackcheck.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * stack * format * bss * review * review --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-04-18Angle Conversions (#1216)Derek Hensley
* Angle Conversions * Format * namefixer * Renames in ObjHsStump_Appear * Format * once more * Explicit cast in EnSsh * Update src/overlays/actors/ovl_En_Fishing/z_en_fishing.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-04-18Defines for flags passed to `Actor_UpdateBgCheckInfo` (#1197)engineer124
* add flags * add comment * small fix --------- Co-authored-by: angie <angheloalf95@gmail.com>
2023-04-18Match `DynaPoly_ExpandSRT` (#1203)engineer124
* match DynaPoly_ExpandSRT * name variables * oops
2023-04-18z_viszbuf (code_801420C0) OK (#1211)Derek Hensley
* first pass * Match * variables.txt * Update include/functions.h Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> --------- Co-authored-by: angie <angheloalf95@gmail.com>
2023-04-07Introduce `SaveContext.gameMode` enum (#1198)engineer124
* gamemode enum * owl save * trailing enum comma
2023-03-30Effect table (#1209)Anghelo Carvajal
* effect_ss_table.h * monkaBSS * format * Remove InitVars extern headers * Remove `const` from InitVars * cleanup * cleanup * format * bss * bss * bss
2023-03-30`z_parameter`: Buttons (part 9) (#1192)engineer124
* import button docs * cleanup * sync timer val * add flag comments * Update src/code/z_parameter.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_parameter.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_parameter.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * fix merge master --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-30Audio `sequence.c` OK and documented (#1201)engineer124
* import sequence docs * cleanup * do not need raw hex
2023-03-24`z64game_over.h` (#1183)Anghelo Carvajal
* z64game_over.h * format * Update include/z64game_over.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-24THA docs (#1177)Anghelo Carvajal
* THA docs Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * format * namefixer * yada * remove zero pad comment * Update include/z64.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/thga.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * namefixer * bss * namefixer --------- Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-23z_room (1 non-matching) (#1143)engineer124
* begin room docs and decomp * match Room_DrawImageSingle * match Room_DrawImageMulti * Room_AllocateAndLoad non-matching * big improvements on Room_DrawCullable * match Room_AllocateAndLoad * improvement? * cleanup * comments * cleanup * small pr suggestions * PR Suggestions * cleanup sceneCmds * some PR * PR Suggestions * more PR Suggestions * col to collision
2023-03-21Misc Cleanup 14 (#1214)Derek Hensley
* bgId * z64scene.h whitespace * SubS_ComputeTrackPointRot casts * Macros cleanup * ifs * Empty Loops * Lights_FindBufSlot void * SkelAnime_GetFrameData * }; * Struct inits * fs * @todo * Bug comments * EnPofusen and ObjUm * Trailing comma * Revert "bgId" This reverts commit eea073c5ac30fd41f50436eeade43a811d0f0981. * Revert "z64scene.h whitespace" This reverts commit 399fd57550b7536b357ab6283360042f2e3e1467. * Revert "SubS_ComputeTrackPointRot casts" This reverts commit dea896c8743475508a3c7391e9d19cdb6b63f6a7. * FAKE * Review * Format
2023-03-20Slowly Cleanup (#1213)Derek Hensley
* Add slowly.h * Init and destroy * File header
2023-03-18Merge remote-tracking branch 'upstream/master' into sys_math3dDerek Hensley
2023-03-16Document z_en_time_tag (#1140)engineer124
* time-tag docs * simplify enums * PR Reviews * PR Suggestions * small change * small fix * PR Suggestions * add extra func ref * rm raw text from first actor I decompiled * Stock Pot Inn * fix master merge
2023-03-11Fully matchingThar0
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-101 function leftThar0
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-09`z_actor` documentation pass (#1154)Anghelo Carvajal
* ActorContext_unk_1F4 * a * ACTOR_FLAG_IGNORE_QUAKE * ACTOR_FLAG_TALK_REQUESTED and ACTOR_FLAG_CANT_LOCK_ON * actorCtx->unkC => ctorCtx->halfDaysBit * HALFDAYBIT defines * actor.halfDaysBits * format * Actor_InitHalfDaysBit * Name actor-killing functions * cleanup variables.h a bit * DAWN * bss * Actor_RequestRumble and Actor_GetArrowDmgFlags * name vars of func_800BC620 * format * fix missing PLAYER_IA * Actor_OfferGetItem * Actor_SetClosestSecretDistance * freezeCategoryPlayerFlags1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * DROPFLAG_ * a * COLORFILTER * format * sCategoryFreezeMasks * Actor_OfferCarry * review Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * change hex to dec * COLORFILTER_INTENSITY_FLAG * format * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * shiftedHalfDaysBit Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * cleanup * Undo Actor_RequestRumble * Undo ACTOR_FLAG_IGNORE_QUAKE * format * Remove COLORFILTER_GET_BUFFLAG * Undo Actor_KillAllFromUnloadedRooms * format * Update Actor_OfferGetItem comment * Update Actor_OfferGetItem description * diving * bss * namefixer * format * speed * review --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-08Rename `GameInfo` to `RegEditor` (#1178)Anghelo Carvajal
* Rename RegEditor and move it to regs.h * bring over some minor doc from oot * add missing include * Update tools/disasm/variables.txt Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * update comment * bss --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-08Stack cleanups (#1193)Anghelo Carvajal
* Use STACK and STACK_TOP everywhere * format * remove fake variable * bss * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/boot_O2_g3/boot_main.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review * renames * more renames * and more * whoopsie, forgot those too * hopefully the last cleanup * forgot some stuff * a * bss --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-08Debug mode (#1185)Derek Hensley
* OK * Docs * PR * Format * Update include/z64debug_display.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64debug_display.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-07Misc cleanup 13 (#1189)Derek Hensley
* FaultAddrConv Functions * Invisible Ruppe macros * skybox * Z64 header defines * ActorId * remove i from KaleidoManager_FaultAddrConv * size_t and parens
2023-03-07z64frameadvance.h (#1182)Anghelo Carvajal
2023-03-08rename audio files (#1188)engineer124
2023-03-07NPC Tracking (#1184)engineer124
* npc tracking * fix func declaration * more cleanup * rm named var * more cleanup
2023-03-04Introduce BgCheckFlags Defines (#1195)engineer124
* flags * cleanup * adjust comment
2023-03-04`z_fireobj.h` header (#1179)Anghelo Carvajal
* fireobj.h * name states and cleanups * minor cleanups * format * bss * review * bss * review
2023-03-03speedXZ -> speed (#1186)engineer124
* speedXZ to speed * brackets
2023-03-03Name `Actor_PlaySfx` and `Player_PlaySfx` (#1190)engineer124
* name funcs * namefixer * function comments
2023-03-02actor math cleanup (#1187)engineer124
2023-03-01Merge branch 'master' into parameterengineer124
2023-02-27`z_eff_footmark` cleanup (#1180)Anghelo Carvajal
* z64eff_footmark.h * arraycount and other clenaups * flag * extract data * gEffFootprints * singular * minor cleanup * review * pos * mf * format
2023-02-24TransitionFade OK (#1160)Derek Hensley
* Match fade * Some adjustments from OoT PR * Missed 1 * iREG(50) * Fill * Sync * PR review
2023-02-21Debloating `z64.h` 1: Introducing `z64skybox.h` (#1150)Anghelo Carvajal
* z64skybox.h * Add a few placeholder values on the enum * Remove unused structs on z64.h * Update include/z64skybox.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * move skybox functions * format * Revert ARRAY_COUNT(msg) * bss * whoops * Update include/z64.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * SkyboxDraw -> Skybox_ * use enum in z_play * format --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-02-21Introduce `object_table.h` (#1136)Anghelo Carvajal
* object_table * segmentsymbols * format * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * bss * add more descriptions to the object_table * DEFINE_OBJECT_SIZE_ZERO * Update include/tables/object_table.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Rename `z_scene_dlftbls.c` to `object_table.c` * bss * bss * bss * bss --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2023-02-21Fbdemo (TransitionTile) OK (#1163)Derek Hensley
* Fbdemo OK * Cleanup * sync and format * Fix functions.h * format * SQ
2023-02-21Lens docs (#1123)engineer124
* match MirRay_ReflectedBeam * match Actor_DrawLensActors * match func_80B9E8D4 * lens docs * more lens docs * fix * cleanup * move define down * Actor_AddToLensActors * small comment adj * add one more comment * fix bss
2023-01-182 non-matchingThar0
2023-01-17cleanup desyncengineer124
2023-01-17merge masterengineer124
2023-01-14Play (2 NON_MATCHINGS) (#1109)Derek Hensley
* Bring over progress from another branch Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com> * cleanup, fake match Play_Init * small fixes * Some small cleanup * Match func_80165460 (from debug) * Match func_80165658 * Match func_80165DB8, func_80165DCC, func_80165DF0, func_80165E04 * Match func_80167DE4 (from debug) * Match func_80167F0C * Match func_80168DAC * Matched func_80169100 * Matched func_801691F0 * import D_801DFA18 * match Play_Main thanks to debug * cleanup * synray does it again * add docs from debug * fix func_801656A4 * more docs and cleanup * Match func_80166B30 and diff fake match in Init * import transition docs from OoT * Play Update, sort of * cleanup Play_Update * more cleanup * slightly more docs * small docs * Play_Draw WIP Thanks @petrie911 * progress? * two more matches * format * misc play docs * transitions cleanup * Motion Blur * Transitions * Fog * Bombers notebook + small cleanup * bss * Camera Functions * Picto functions * Init * MotionBlur Clean up * Floor Surface * Pictographs some more * regs * fix circular dependency problem * Cleanup PR commits outside play * namefixer * PR picto * PR audio * PR small clean ups * debug strings * Picto defines * bss * enums * remove void * typedefs * Hireso -> BombersNotebook * bss comments * bss and I8/I5 functions * Smaller PR comments * Transitions * Combine enums * Revert "Combine enums" This reverts commit 0da1ebcaed69a3ce0fbd5942460b67f80f0e15e7. * Fix Transition defines * RGBA16 macros * Unname * worldCoverAlpha * Rename Update and Draw * PR review, plus annotate bug * Clean up nonmatchings with a closer DrawGame * Format * New macros * UpdateMain and DrawMain * Fix merge * Small cleanups from PR * zFar * Intensity macros * Format * Remove bss comments * Compression/decompression * Small cleanup * Format * More PR cleanup * Cleanup picto stuff * format * Fix compression comments * Play processes state enums DONE -> READY * cutscene comment * fix bss Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: angie <angheloalf95@gmail.com>
2023-01-14sys_cmpdata OK (#1065)mzxrules
* sys_cmpdata decomp * implement suggestions * sys_cmpdata OK * format * implement suggestion * make bss data public * format bleh
2023-01-02func_801068FC OKmzxrules
2023-01-01Merge remote-tracking branch 'origin/master' into z_map_mzxrules
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-08 23:08:47 +0000