mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-29 08:43:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,747 Commits 1 Branch 0 Tags
9da9e76309d3893c44b8fa06dd23b94b2dedebf0
Commit Graph

1429 Commits

Author SHA1 Message Date
Dragorn421 9da9e76309 rename z_play.c -> z_play_.c 2024-01-31 19:46:40 +01:00
Dragorn421 f016a1583d format 2024-01-31 19:45:09 +01:00
Dragorn421 2fa42a7a04 cheeky z_play edit 2024-01-31 19:42:23 +01:00
cadmic 87a886df5b Match sys_math3d.c (#1674) 2024-01-30 21:42:15 -05:00
engineer124 8ae003b0d7 z_actor retail OK (#1670) 
* actor ok

* cleanup

* cleanup

* cleanup

* player

* ACTOR_PRINTF

* PR Suggestion

* gcc

* c file

* ACTOR_DEBUG_PRINTF

* bool

* more review

* newline
 2024-01-30 21:07:34 -05:00
cadmic 8ea4cb87e5 Match retail z_std_dma.c (#1665) 
* Match z_std_dma.c

* Fix DmaMgr_Error doc comment

* Unindent
 2024-01-30 19:53:16 -05:00
cadmic 17da5e7bf9 z_collision_check.c OK (#1642) 
* Match z_collision_check.c

* Disable function declarations

* Remove /* OOT_DEBUG */

* Remove newlines around ifdef

* Newlines

* Tweak z_actor.c #if to avoid merge conflicts
 2024-01-30 19:43:10 -05:00
Derek Hensley 77c9c97ff9 Overlay_Relocate and Overlay_Load retail OK (#1662) 
* Overlay_Relocate OK

* Overlay_Load

* format

* PR + better match for Overlay_Load
 2024-01-30 19:30:27 -05:00
fig02 8be8848f85 z_demo retail code matched (#1655) 
* match all functions

* format

* clarify between 'dest' and 'skip' debug features

* format

* better match for CutsceneHandler_RunScript

* review

* format

* remove macro
 2024-01-30 18:52:04 -05:00
engineer124 af6b821193 Audio retail OK (#1650) 
* general OK

* wait for data

* sfx and sequence

* PR Suggestions

* debug file

* data

* PR
 2024-01-30 18:24:13 -05:00
cadmic 18b7030534 Revert bad uses of if (OOT_DEBUG) (#1666) 2024-01-30 15:19:00 -05:00
Derek Hensley 7b770dc1e0 vr_box OK (#1663) 2024-01-30 14:22:55 -05:00
Yanis42 24df1480a3 Match `z_select.c` (#1659) 
* match ``z_select.c``

* add missing newline

* missed newlines

* ifdef -> if
 2024-01-30 14:17:49 -05:00
cadmic 9816f62129 Define OOT_DEBUG=0 in retail builds (#1658) 
* Define OOT_DEBUG=0 in retail builds

* Fix ifndef

* Replace VI_MODE_EDITOR_INACTIVE

* Revert "Replace VI_MODE_EDITOR_INACTIVE"

This reverts commit f7c4cae7c3.

* Replace VI_MODE_EDITOR_INACTIVE, take 2

* Revert EnBom_Draw
 2024-01-30 13:54:38 -05:00
engineer124 6d09437c21 Retail z_quake.c and z_room.c OK (#1661) 
* quake OK

* z_room OK
 2024-01-29 21:08:35 -05:00
cadmic 5ba625b171 Match yaz0.c (#1660) 2024-01-29 18:14:30 -05:00
Yanis42 9f169a67cd Match `game.c` - OK (#1644) 2024-01-29 15:27:29 -05:00
cadmic 64d384b4c1 is_debug.c and boot_main.c OK (#1641) 
* Match is_debug.c and boot_main.c

* Disable function declarations

* Remove /* OOT_DEBUG */

* Remove newlines around ifdef
 2024-01-29 12:10:28 -05:00
cadmic be731f8a35 Move __osPfsInodeCache and __osPfsPifRam (#1654) 
* Move __osPfsInodeCache to pfsgetstatus.c

* Move __osPfsInodeCache to contfps.c and __osPfsPifRam to pfsisplug.c
 2024-01-29 07:30:29 -05:00
cadmic 6e0d67f9ec Check formatting in CI (#1652) 
* Check formatting in CI

* Move deleteDir() to cleanup section

* Revert "Move deleteDir() to cleanup section"

This reverts commit 4b0dd80cac.

* Give up on check_format.txt

* Fix formatting
 2024-01-29 07:25:58 -05:00
cadmic 8af0919e7d Match idle.c (#1643) 2024-01-29 12:48:06 +01:00
engineer124 795f7e5251 z_parameter retail OK (#1649) 
* z_parameter okay

* no u32
 2024-01-28 16:20:21 -05:00
Yanis42 8a8b6cf90b Match `main.c` - OK (#1645) 
* main.c OK

* removed comment

* better match

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-01-28 15:46:08 -05:00
cadmic 0e6dc594e9 Match z_en_dodongo.c (#1640) 2024-01-28 13:17:57 -05:00
cadmic 88aa6de9ff Match z_en_bom.c (#1639) 2024-01-28 13:03:33 -05:00
Anghelo Carvajal 3d9db8d34d Setup rom decompression and compression (#1614) 
* decompress baserom

* cleanup

* specific hash check

* rename baserom

* git subrepo clone (merge) --branch=5da3132606e4fd427a8d72b8428e4f921cd6e56f git@github.com:z64tools/z64compress.git tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "5da313260"
upstream:
  origin:   "git@github.com:z64tools/z64compress.git"
  branch:   "5da3132606e4fd427a8d72b8428e4f921cd6e56f"
  commit:   "5da313260"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* setup compression

* Add all compressed segments to the spec

* Update md5 files

* readme instructions

* cleanup

* Setup python dependencies on Jenkinsfile

* Update Makefile

Co-authored-by: cadmic <cadmic24@gmail.com>

* review

* . .venv/bin/activate

* update readme

* whoops

* Yeet other versions from decompress_baserom.py

* my bad

* Move everything to baseroms/VERSION/

* Active venv on each command

* jenkinsfile: use multiline syntax

* Put the correct path on the jenkinsfile

* Forgot to call per_version_fixes

* CC0

* Update readme

* Change where baserom segments are put into

* Update Makefile

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update crunch64

* Label compressed instead of uncompressed

* Update README.md

Co-authored-by: fig02 <fig02srl@gmail.com>

* Fix

* `make rom`

* baserom-uncompressed

* Update README.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update README.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update README.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update README.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update README.md

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* review

* baserom-decompressed.z64

* ignore baseroms

* rm -rf tools/z64compress

* wip crunch64-based compress.py

* OK compress

* use ipl3checksum sum directly for cic update on compressed rom

* multithreading

* "docs"

* fix MT: move set_sigint_ignored to global level for pickling

* license compress.py

* rm junk

* Fix (or at least sort out) compress_ranges.txt dependencies

* Update tools/overlayhelpers/damage_table.py

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-01-24 13:00:10 -05:00
Dragorn421 5e406f754e Small Math_Vec3f_Yaw doc (#1433) 
* Small `Math_Vec3f_Yaw` doc

* remove actor from arg names

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-01-18 17:56:54 -05:00
cadmic 6b5533ccd9 Create debug macros for LogUtils functions (#1610) 2024-01-16 09:59:02 -05:00
cadmic a5fbfdba01 Move Scene_SetTransitionForNextEntrance to z_scene.c (#1609) 2024-01-16 09:50:28 -05:00
Phil 616d6d4e46 Named a couple things in z_boss_ganon2.c (#1606) 
* Fixed minor style inconsistencies for CollisionCheckInfoInit

* Minor renaming in z_boss_ganon2.c

* Update z_boss_ganon2.c

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-01-12 11:56:16 -05:00
mzxrules f4306900ee en_honotrap MM sync (#1564) 
* MM pr suggestions

* more changes to match MM

* linebreak in switch

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-01-12 11:38:14 -05:00
Dragorn421 4982f32384 Name actor flags 1: ACTOR_FLAG_REACT_TO_LENS, ACTOR_FLAG_IGNORE_POINT_LIGHTS (#1583) 
* 7 -> `ACTOR_FLAG_REACT_TO_LENS`

* move comment above actor flag

* 22 -> `ACTOR_FLAG_IGNORE_POINT_LIGHTS`

* newlines between flags

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-01-12 10:48:54 -05:00
cadmic 324db1d578 Replace most osSyncPrintf calls with PRINTF macro (#1598) 
* Replace most osSyncPrintf calls with PRINTF macro

* DEBUG -> OOT_DEBUG
 2024-01-12 10:38:13 -05:00
Dragorn421 1a8772e540 Cleanup z_collision_check 1 (#1427) 
* Cleanup `z_collision_check.c` and structs

* Revert `other*` names to master, split to other pr

* WIP/experimental: `ColliderCylinderElement`

* Revert "WIP/experimental: `ColliderCylinderElement`"

This reverts commit cfc8c32ace.

* ac/atHitInfo -> HitElem

* rename some collider elements to "elem" (instead of item, info, hurtbox...)

* cut down on more "hitbox" usage

* name all `ColliderElement*` temps properly

* rearrange colcheck structs

* add collider shape name descriptions

* reword collider shape descriptions

* jntsph first again

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-01-11 10:30:47 -05:00
cadmic cd917b0cb8 Create debug macros for common functions (#1597) 
* Create debug macros for common functions

* Revert NDEBUG change

* MALLOCR -> MALLOC_R

* DEBUG -> OOT_DEBUG

* Use the same name for debug and non-debug matrix functions

* Fix file/line argument order

* Revert g[s]DPNoOp[Tag]

* Use SystemArena_MallocDebug directly in GameAlloc_MallocDebug

* MTXF_TO_MTX -> MATRIX_TO_MTX
 2024-01-09 07:59:03 -05:00
engineer124 e146d7bc26 Introduce Face Reaction Enum (#1586) 
* face reactions

* cleanup

* cleanup fake match

* PR Review

* while I'm here

* mask reaction

* small fix

* Small cleanup

* oops
 2024-01-08 17:17:22 -05:00
Phil dcab429bf2 Fixed minor style inconsistencies for CollisionCheckInfoInit (#1603) 2024-01-05 18:57:05 -05:00
Yanis42 21cb04db2c Document `z_bg_mizu_movebg.c` (#1565) 
* document z_bg_mizu_movebg.c + assets

* remove temp comment

* renamed "temp" variable

* review 1

* format + type names comments at dLists/colHeaders

* review 2

* review 3

* named dragon statue 1

* float -> floating + review

* format

* review 5
 2023-12-15 15:33:50 -05:00
fig02 2b5b0fac06 name shock and burn functions (#1594) 2023-12-15 08:53:51 -05:00
krm01 e3316c9fb1 [Doc] Actor Bg_Bdan_Objects (Jabu Jabu misc dungeon actors) (#1577) 
* bdan_objects type 2

* other bdan object types

* finish off bigocto platform

* run formatter

* remove stray comment

* add namespacing prefix to enums

* abbreviate camera to cam

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* fix typo on enum

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* enum name fixes

* remove unnecessary enum assignment

* Waterbox -> WaterBox

* named union, sfx to use SFX_FLAG

* friendly names for enums

* fix over-eager sed rename

* indent union fields

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2023-12-11 10:55:35 -05:00
fig02 0ed57f61b7 Cleanup: Remove uneeded casts on collider members (#1595) 
* rm casts

* format
 2023-12-10 14:53:51 -05:00
hiisuya cc96184a96 Doc Actor: En_Ma1 (Child Malon) (#1584) 
* started malon documentation

* docd all event and inf table checks

* doc cleanup

* ran formatter

* fixed misnamed eventcheck

* revert isNotSinging oops

* removed unnecessary comments

* changed from handle to update

* revert vec3f name change

* moved texture information

* isNotSinging to singingDisabled

* rename of inftable and eventchk

* small cleanup

* anim enum change

* enum names for child malon limbs
 2023-12-10 14:36:12 -05:00
cadmic 2ab90bc517 Document a bug in Actor_ChangeCategory where actors may not be updated correctly (#1587) 
* Document Actor_ChangeCategory bug

* Reword

* actor update function -> actor update
 2023-11-30 20:18:00 -05:00
Tharo 5ce4670fd1 Documentation for audio_thread_manager.c (#1562) 
* Documentation for audio_thread_manager.c

* Fixes

* Move AudioTask back to z64audio.h and include in audiomgr.h, adjust bug comment

* Adjust AudioMgrDebugLevel enum
 2023-11-30 16:22:30 -05:00
engineer124 f2c06ce441 Misc Cleanup (#1585) 
* misc cleanup

* more fake matches

* revert for sym
 2023-11-22 04:19:31 -05:00
krm01 2aaa286cf8 [Doc] Actor Bg_Hidan_Fslift (Fire Temple hookshot elevator) (#1579) 
* doc bg_hidan_fslift

* improve name for hookshot block pos function

* comment explaining cameraSetting

* improve comment

* Update src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* rename to Idle

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2023-11-19 13:34:25 -05:00
engineer124 aef0335681 Struct Returns (#1574) 
* change args

* PR Review

* format
 2023-11-19 11:17:31 -05:00
engineer124 3d1ee33d7b Document Actor "OfferTalk" (#1567) 
* OfferTalk

* rm comment

* exch to offer in comment

* reword again

* Partial PR Review

* Actor_AcknowledgeTalking

* Actor_TalkOfferAccepted

* PR Review

* rm part of comment

* rm comment
 2023-11-19 11:11:59 -05:00
fig02 c11ce9c994 Player Docs: Some Item Action function names (#1575) 
* progress

* unname shield upper action

* add more to sword comment
 2023-11-19 09:38:49 -05:00
hiisuya 68bdbf7759 Doc Actor: En_Brob (Jabu Jabu Wobble Flesh Block) (#1581) 
* brob function naming

* modified brob header file

* renamed skel, collision, and anims

* named limbs and dls

* renamed shock function

* ran formatter

* doc modifications

* Update assets/xml/objects/object_brob.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2023-11-19 05:11:52 -05:00