1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Commit graph

1701 commits

Author SHA1 Message Date
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
adaliaramon
6eb3bf401c
Removed unused imports and other minor improvements (#1602)
* Removed unused imports and other minor improvements

* revert tools/ZAPD/ZAPD/genbuildinfo.py

* revert diff.py

* Update sym_info.py

* revert asm_processor/

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-01-11 11:04:53 -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
Dragorn421
f02d012ce7
add OOT_DEBUG define to vscode.md (#1607) 2024-01-09 15:22:51 -05:00
Yanis42
8a09f33c8f
Makefile: Change EMULATOR := to N64_EMULATOR ?= (#1608)
* ``EMULATOR :=`` -> ``N64_EMULATOR ?=``

* change other instances of EMULATOR and removed EMU_FLAGS

* missing one EMULATOR
2024-01-09 12:49:12 -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
louist103
c1a499c3ae
ZAPD Update (#1605)
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "2b6f459b9"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "2b6f459b9"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"

* Update ZAPD

Co-authored-by: Yanis42 <35189056+Yanis42@users.noreply.github.com>

---------

Co-authored-by: Yanis42 <35189056+Yanis42@users.noreply.github.com>
2024-01-07 17:52:45 -05:00
Phil
dcab429bf2
Fixed minor style inconsistencies for CollisionCheckInfoInit (#1603) 2024-01-05 18:57:05 -05:00
cadmic
25ff0a27de
Create separate build directories based on version (#1591)
* Create separate build directories based on version

* Fix find_unused_asm.sh

* Remove find_unused_asm.sh from Jenkinsfile

* Revert diff.py

* Clarify that gc-eu-mq is not "supported" yet

* Revert xmlcreate.py (to be deleted)

* Remove gc-eu-mq for now

* Add version flags to diff_settings.py and sym_info.py

* --version -> --oot-version

* Fix --oot-version

* Revert adding version flags to tools

* Delete find_unused_asm.sh

* Revert changes to first_diff.py output in tutorial

* Factor out sed usages for spec
2024-01-05 23:27:19 +01:00
cadmic
1f9c28f370
Change ?= to := for Makefile variables (#1599)
* Change ?= to := for most Makefile variables

* Remove empty ?= assignments

* Revert "Remove empty ?= assignments"

This reverts commit 3db472faea.
2023-12-16 16:45:02 -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
cadmic
b2f596faca
Delete old bootstrap tools (#1590)
* Delete old bootstrap tools

* Restore find_unused_asm.sh
2023-12-10 19:05:37 -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
engineer124
81a3c3da32
More Camera Flags (#1453)
* Generic Camera Flags

* New flag names

* Add flags to functions

* Finish flag docs

* More docs

* More cleanup

* More clarity

* Better shrinkwindow flag docs

* Improve name

* CAM_INTERFACE_FLAGS

* Better approach to edge cases

* Change ordering for consistency

* Oops

* Add masks to macro

* PR/Discord discussions

* cleanup comment

* Oops

* PR Suggestions

* More PR Feedback

* More PR Suggestions

* More Camera Flags

* PR Suggestions

* More flag style change

* Small cleanup

* More flag docs

* Another flag

* Fix flags

* sync names with other PRs

* more fixes

* fix comments

* update with hud visibility mode docs

* missed one

* fix comments

* Roman PR Suggestions

* interfaceField

* small fix

* letterbox cleanup

* cleanup

* fix macro arg

* fix func declaration

* many more docs

* better docs?

* missed some

* oops, revert

* add flags to name

* cleanup

* flag

* double signal

* simplify cam func name

* more suggestions

* PR Suggestion
2023-11-19 02:17:32 +01:00
krm01
d1df4e4c7e
bombowlman typo (#1582) 2023-11-18 12:30:36 -05:00
Roman971
b4edc05c69
Fix and simplify progress.py to account for src/audio/ files in 'code' (#1578) 2023-11-14 15:20:46 -05:00
krm01
0a48348f8d
doc for menkuri_eye (#1580) 2023-11-14 14:20:23 -05:00
Dragorn421
4c75260097
Fix misc 21 (#1573)
* Make `sNew` in (unused) `code_800FC620.c` a string

It is passed as a filename to `__osMallocDebug` so should be a nul-terminated string, not a char[3] missing an explicit \0

* Fix gcc warning in `JpegDecoder_ParseNextSymbol` about SLL on negative value

-1U is an unsigned value, aka 0xFFFFFFFF
I keep -1 because it seems that's what a jpeg standard has too

References:
https://stackoverflow.com/questions/40508958/shifting-a-negative-signed-value-is-undefined
https://www.w3.org/Graphics/JPEG/itu-t81.pdf (page 105, figure F.12)

* Small cleanup

* Fix few mistakes (thanks gcc warnings)

* Add `@bug` in file select settings draw code, using the wrong array

* format

* format main

* rename arg for a happy formatter

* Move important function call out of a printf
2023-11-12 16:59:52 -05:00
Javarooster
dc323052c3
Changed gLinkChildSlinghotStringDL to gLinkChildSlingshotStringDL (#1576) 2023-11-12 00:01:55 +01:00
fig02
836adb83ea
Rename "ITEM_LAST_USED" (#1572)
* rename

* format

* remove formatter changes

* change model group comments
2023-11-07 14:11:59 -05:00
fig02
042a5c5530
rename to upper action (#1570) 2023-11-04 02:59:12 -04:00
Dragorn421
8718a5c8c0
Remove (ActorFunc) casts in initvars (#1571)
* Remove `(ActorFunc)` casts in initvars, use `/**/` trick for format

Achieved by using the following regex:

(ActorInit.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*\n\};)

replaced with

$1$2/**/ $3$4/**/ $5$6/**/ $7$8/**/ $9$10/**/ $11$12/**/ $13$14/**/ $15$16/**/ $17$18/**/ $19

plus a change from /**/ to #if 0 #endif in docs/

* Manual fixes
2023-10-30 10:19:16 -04:00
fig02
4908b8b37c
Player Docs: public facing csAction things (#1561)
* name public csAction functions

* format

* adjust function comment

* format
2023-10-28 07:46:24 -04:00
Tharo
3475651701
libc cleanup (#1568)
* libc cleanup

* Suggested changes, small alloca tweak

* Remove printf include
2023-10-27 16:06:44 +02:00
Dragorn421
4e55168eaa
Update ZAPD (#1569)
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "094e79734"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "094e79734"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Add EnumData.xml where some names are now externalized

* Remove legacy typedefs for zapd, no longer needed!
2023-10-24 21:36:10 -04:00
Tharo
503f6d86d5
Track most header dependencies for include/tables headers (#1566)
* Makefile automatically rebuild source files including headers from include/tables

* Fix typo, make z_actor.c also depend on actor_table.h

* Add message data dependencies for z_message_PAL, adjust comments
2023-10-20 19:14:52 +02:00
Tharo
a20163c6ab
Use long over int for s32/u32 types (#1546)
* long s32

* Suggested changes
2023-10-17 21:16:31 +02:00
cadmic
b3486b57ef
Rename Math3D_CylOutsideCyl and Math3D_CylOutsideCylDist (#1557)
* Rename Math3D_CylOutsideCyl and Math3D_CylOutsideCylDist

* radix -> radii

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Make Math3D sphere/cylinder collision check function names more consistent

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2023-10-07 19:42:28 -04:00
fig02
181b438393
Player Docs: Propose Named Unions For Shared Variables (#1560)
* make unions

* format

* adjust comment on halt thing
2023-10-07 19:25:45 -04:00
fig02
ebc6ebf232
Player Docs: Initial AnimSfx stuff (#1556)
* initial animsfx docs

* review

* extra space
2023-10-05 10:22:40 -04:00
engineer124
c39578f971
Introduce Player CueIds (#1559)
* cueId

* cleanup
2023-10-05 10:04:41 -04:00
fig02
c5e4357127
initial action-change-list docs (#1540) 2023-09-27 11:02:21 -04:00
fig02
2cb4ff4fd3
Player Docs: csMode -> csAction (#1547)
* csmode -> cs action

* format
2023-09-26 12:48:41 -04:00
Tharo
092f602638
Fix gamestate overlay table size declaration (#1555) 2023-09-26 08:40:55 -04:00