mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-17 07:07:57 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,370 Commits 1 Branch 0 Tags
981af4b6af34cdd9e4f55f8f9f4fce803600fa62
Commit Graph

177 Commits

Author SHA1 Message Date
mzxrules 981af4b6af Reduce overlay dependencies on global.h (8) (#2478) 
* move variables into z64environment.h

* z_room.h

* z64sram.h, z64ss_sram.h, z64font.h, kanread.h

* z64lifemeter.h, z64debug.h, debug_arena.h

* buffers.h

* remove z_bgcheck global

* gamealloc.h

* suggestions

* .bdd
 2025-02-19 05:54:39 -05:00
mzxrules 652478c338 Reduce overlay dependencies on global.h (7) (#2472) 
* z64env_flags, z64quest_hint_commands

* z64cutscene_spline, z64save.h moved from z64.h

* bss

* pr suggestion

* bss

* suggestions
 2025-02-16 15:33:55 -05:00
cadmic aba3720d62 Use enums for settings in SRAM header (#2429) 
* Use enums for settings in SRAM header

* Fix bss

* Uglify z_en_mag to match ique
 2025-02-15 19:36:19 -05:00
fig02 c859678d5f Document sSceneInitLetterboxTimer (#2469) 
* document scene init letterbox timer

* reword
 2025-02-14 13:55:11 -05:00
mzxrules 4639914583 Reduce overlay dependencies on global.h (6) (#2468) 
* add some headers, split some of z64.h

* MtxClear -> IdentityMtx

* more misc cleanups

* move D_80116280 to header, fix build issue

* remove z64.h

* Revert "MtxClear -> IdentityMtx"

This reverts commit 8fc74c0672.

* split z64path.h and z64skin.h functions

* z64face_reaction.h

* cleanup overlay global references

* trim padding

* bss
 2025-02-13 18:15:14 -05:00
mzxrules 494aecc9fc Reduce overlay dependencies on global.h (5) (#2466) 
* remove global.h dependency from all actors

* fix compiler error

* fix another build issue

* fix bss
 2025-02-12 21:50:46 +01:00
mzxrules 54939bac3a Reduce overlay dependencies on global.h (3) (#2449) 
* kill more global.h references

* .format.py

* bss

* ique
 2025-02-05 21:07:19 +01:00
Tharo c028db03b4 Finish matching ique-cn (#2451) 
* git subrepo clone git@github.com:Thar0/com-plugin.git tools/com-plugin

subrepo:
  subdir:   "tools/com-plugin"
  merged:   "e8543312d"
upstream:
  origin:   "git@github.com:Thar0/com-plugin.git"
  branch:   "main"
  commit:   "e8543312d"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* ique-cn OK

* Review suggestions

* Most suggestions

* git subrepo pull tools/com-plugin

subrepo:
  subdir:   "tools/com-plugin"
  merged:   "81595ed1c"
upstream:
  origin:   "git@github.com:Thar0/com-plugin.git"
  branch:   "main"
  commit:   "81595ed1c"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Fix other versions
 2025-02-04 06:55:04 -05:00
mzxrules d855f2bfd8 Split z64debug_display.h, z64draw.h, z_en_item00.h (#2443) 
* z64debug_display.h

* z64draw.h

* z_en_item00.h

* bss
 2025-01-27 13:01:54 -05:00
mzxrules f448a48cd6 Create headers for some libu64 files (#2440) 
* Create headers for some libu64 files

* apply bss patch
 2025-01-24 13:25:05 -05:00
Tharo afa0842de4 [iQue] Import libultra audio library files (#2433) 
Note about comments in these files:
The libultra audio library was originally available to developers in
source code form, unlike most of libultra. These files are based on
these source code forms, adapted to meet the style of this project.
The comments in the files as of this commit are, apart from the style,
comments from the original SGI authors.
 2025-01-21 15:21:48 -05:00
cadmic d066586872 [iQue] Match z_sram (#2426) 
* [iQue] z_sram: Use iQue-specific read/write macros

* [iQue] z_sram: Make checksum a struct

* [iQue] z_sram: Finish matching

* Call the trigraph usage a bug

* Fix bss

* Sram_iQueReadWrite -> Sram_ReadWriteIQue

* Use SRAM_HEADER_MAGIC for loop bound

* Rename sZeldaMagic -> sSramDefaultHeader and use less char literals
 2025-01-17 06:56:22 -05:00
Tharo b19b06a531 [iQue] Match remaining libultra/os files (#2414) 
* Match remaining libultra/os files

* Align box id macros

* Fix bss, format

* Fix BSS

* Clarify some comments

* More bug comment

* Comment

* Fix BSS
 2025-01-10 18:54:02 -05:00
Tharo a57d449196 [iQue] Match remaining libultra/io files (#2411) 
* [iQue] Match remaining libultra/io files

* Match osSpTaskYielded

* Fix bss, remove double space in controller.h

* Fix BSS
 2025-01-09 19:31:11 -05:00
Tharo aaf9c939a4 [iQue] Match osViSetMode (#2404) 2025-01-07 00:21:25 -05:00
cadmic 9dafc2f2e4 [iQue] Build some C files with EGCS (#2396) 2025-01-02 03:35:22 -05:00
mzxrules 1adf696588 Document z_horse.c and related actors (#2278) 
* document z_horse.h

* .bss

* suggestions and more comments

* bss

* INGORACE -> INGO_RACE

* format header macros

* FIx incorrect type comparision

* EnInMode -> EnInStartMode

* R_EXITED_SCENE_RIDING_HORSE
 2024-12-17 10:51:56 -05:00
Tharo df5d4cb467 [Audio 10/10] Loose ends (#2337) 
* Introduce afile_sizes, generate headers of sizes for soundfonts and sequences

* Initial tools/audio README

* Versioning for samplebank extraction

* Clean up the disassemble_sequence.py runnable interface

* Add static assertions for maximum bank sizes

* Boost optimization for audio tools

* Samplebank XML doc

* Soundfont XML doc

* More docs in sampleconv for vadpcm

* Various tools fixes/cleanup

* VADPCM doc

* Try to fix md formatting

* VADPCM doc can come later

* Fix merge with PR 9

* Fix blobs from MM

* Try to fix bss

* Try fix bss round 2

* Fix sampleconv memset bug

* Suggested documentation tweaks
 2024-12-13 19:26:36 -05:00
Tharo 3f703a39d9 Fix some more GCC warnings, mark some bugs based on GCC warnings (#2309) 
* Fix some more GCC warnings, mark some bugs based on GCC warnings

* Weird formatting

* Suggested changes

* More weird indentation I guess

* UNREACHABLE() macro, add missing NORETURNs to fault_n64.c

* AVOID_UB for PAL path in z_file_nameset.c

* Remove comments about return types

* Remove temp no longer needed
 2024-12-02 04:40:49 -05:00
fig02 ae1a1adcf1 Player Docs: Begin "Start Mode" Documentation (#2301) 
* set up start mode

* note unused modes

* fix bss
 2024-11-18 18:47:41 -05:00
fig02 17edb82c0d Decouple Debug Features From gc-eu-mq-dbg (#2296) 
* rename OOT_DEBUG to DEBUG_FEATURES

* makefile changes

* add DEBUG_ASSETS

* fix DEBUG_FEATURES usages

* format

* fix errors

* review

* fix problem and review2

* review

* add DEBUG_FEATURES to DEBUG_ASSETS check

* review

* whoops

* format
 2024-11-17 17:02:07 -05:00
cadmic 8ce69c3ac9 Completely match ntsc-1.0/1.1 bss and add to CI (#2294) 2024-11-12 17:39:08 -05:00
mzxrules 2f54db142e Rename RoomBehaviorType1 to RoomType (#2271) 
* Rename RoomBehaviorType1 to RoomType

* suggestions

* Update include/z64scene.h

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-10-14 15:23:50 -04:00
mzxrules eee7ba9bd5 Rename RoomBehaviorType2 (#2270) 
* Rename RoomBehavior2

* fig proposal

* fig comment
 2024-10-12 22:28:55 -04:00
fig02 7dd8f2b6ad Document Player_ChooseNextIdleAnim (#2262) 
* document most of Player_ChooseNextIdleAnim

* finish documenting Player_ChooseNextIdleAnim

* capital letter

* dummy block numbers for the script

* fix bss

* bug comment

* SpeicalIdle -> Fidget, clean up related things

* fix rng chance comment

* normal -> default

* rework Player_CheckForIdleAnim

* swap idle anim defines

* remove COMMON_FIDGET

* add ARRAY_COUNT_2D

* change macro def
 2024-10-08 00:19:10 -04:00
cadmic e9cbcb7ad9 Document bug in Camera_BGCheckInfo (#2258) 2024-10-04 04:04:53 -04:00
Dragorn421 ed77e143b6 [headers] Create one_point_cutscene.h, z64olib.h and move stuff to z64{object,player,scene}.h (#2250) 
* [headers] Create `one_point_cutscene.h`, `z64olib.h` and move stuff to `z64{object,player,scene}.h`

* bss

* sSceneCmdHandlers

* bss

* bss
 2024-10-01 13:14:54 -04:00
Dragorn421 47c6c36dc3 [headers] Create zelda_arena.h, move protos to z64effect.h, and misc fixups (#2248) 
* [headers] Create z64malloc.h, move protos to z64effect.h, and misc fixups

* zelda_arena.h

* bss

* bss2

* bss3

* bss
 2024-10-01 08:46:56 +02:00
cadmic f7f38ff874 [PAL N64] Completely match pal-1.0 and pal-1.1 and add to CI (#2246) 
* [PAL N64] Match pal-1.0 and pal-1.1 and add to CI

* bss fixes from Jenkins
 2024-09-28 20:52:45 -04:00
Dragorn421 fbf797f1e2 [headers] Create gfxalloc.h, map.h, move protos to gfx.h, z64{player,view}.h (#2233) 
* [headers] Create gfxalloc.h, map.h, move protos to z64{actor,player,view}.h

* oops

* bss

* comment on player_lib protos & format

* format map.h

* Move SCREEN_{WIDTH,HEIGHT} and SET_FULLSCREEN_VIEWPORT to z64view.h

* bss

* revert move screen_width/height

* bss
 2024-09-27 14:51:00 -04:00
Dragorn421 bc8945eb3a [headers] Move libultra protos to ultra64.h (as a temporary measure) (#2234) 
* [headers] Move libultra protos to ultra64.h (as a temporary measure)

* format ultra64.h

* bss

* bss

* bss
 2024-09-26 23:58:43 -04:00
cadmic bccb219ea3 Fix typos found by codespell (#2229) 2024-09-26 00:21:00 -04:00
Dragorn421 7ccb0a641e [headers] Create letterbox.h, move more protos from functions.h (#2225) 
* [headers] Create z64shrink_window.h, move more protos from functions.h

* format

* include

* bss

* letterbox.h
 2024-09-25 13:45:06 -04:00
Dragorn421 5ed5f196d9 [headers] audio functions to z64audio.h and z64ocarina.h (#2223) 
* [headers] audio functions to z64audio.h and z64ocarina.h

* bss
 2024-09-25 10:25:49 +02:00
Dragorn421 a09ea76025 [headers] gfx_setupdl.h and z64skin_matrix.h (#2221) 
* [headers] gfx_setupdl.h and z64skin_matrix.h

* include z64skin_matrix.h

* bss

* bss
 2024-09-24 18:18:01 -04:00
mzxrules dc1501e7a0 create ucode_disas.h (#2222) 
* ucode_disas.h

* create UcodeType

* bss
 2024-09-24 13:45:53 -04:00
mzxrules 56981d5297 Document Player Knockback related functions (#1601) 
* document knockback related functions

* rotation -> yRot

* implement some changes

* Renames and comments

* mq bss

* format

* Intangibility and Invulnerability

* bss

* .bss

* add #pragma increment_block_number to z_en_item00.c

* .bss
 2024-09-23 18:31:00 -04:00
Dragorn421 0f725405d1 [headers] Move z_actor functions to z64actor.h (#2216) 
* move

* format

* bss
 2024-09-23 11:06:43 -04:00
fig02 fcd5745d40 PLAYER_STATE1_ACTOR_CARRY -> PLAYER_STATE1_CARRYING_ACTOR (#2213) 2024-09-21 18:25:19 -04:00
Dragorn421 a1a192b1a2 [headers] z64inventory.h, move savectx/inventory macros to z64save.h (#2209) 
* [headers] z64inventory.h

* move savectx/inventory macros to z64save.h

* commit the file

* bss
 2024-09-18 15:40:59 -04:00
fig02 8f0e2fc29c Name PLAYER_STATE1_CHARGING_SPIN_ATTACK (#2203) 
* name charge state flag

* format
 2024-09-16 17:14:29 -04:00
cadmic f089adf20c [ntsc-1.2] Match ntsc-1.2 BSS and add to CI (#2187) 
* Match ntsc-1.2

* Add ntsc-1.2 to CI

* Apply fixes from Jenkins

* Promote ntsc-1.2 to "supported" in Makefile

* Declare D_80858AD8 as a u64 array

* Tweak wording

* Hopefully make ntsc-1.2 bss more stable

* Restore segmented_address.h include
 2024-09-12 14:10:43 -04:00
fig02 900c2f0f68 Name PLAYER_STATE1_ACTOR_CARRY (#2173) 
* actor carry flag

* format and add comments

* comment changes
 2024-09-08 17:43:27 -04:00
Dragorn421 3a9ebfbbad Pause doc: World map points (#2141) 
* Pause doc: World map points

* bss

* `WORLD_MAP_POINT_HYLIA_LAKESIDE` -> `_LAKE_HYLIA`
 2024-09-07 17:14:08 +09:00
cadmic 2ce648a7c6 Miscellaneous libultra header fixes (#2139) 
* Miscellaneous libultra header fixes

* Fix bss?

* Reword RCP timeout
 2024-09-06 14:46:44 +02:00
cadmic 7a9209c885 [ntsc-1.2] Match z_camera.c (#2112) 
* Add CAMERA_CHECK_BTN

* Match Camera_Demo3
 2024-09-03 23:00:37 -04:00
Dragorn421 b1b8b8c426 T() macro 3 (#2083) 
* T() in z_camera.c

* T() in z_parameter.c

* T() in z_room.c

* T() in z_kaleido_scope_call.c

* T() in z_map_exp.c
 2024-08-24 17:47:45 +02:00
cadmic ec70295357 Move non-libultra libc functions to src/libc/ (#2055) 
* Move non-libultra libc functions to src/libc/

* Add explicit nops in delay slots

* Don't rely on CPP expanding undefined macros to 0

* Delete old Makefile rules

* Fix type of memset()
 2024-08-20 01:15:24 -04:00
cadmic e6bc4bd8cb Add names to all typedef'd structs, unions, and enums (#2028) 
* Add names to all typedef'd structs, unions, and enums

* wtf vs code

* Use a better regex
 2024-08-12 03:07:48 -04:00
cadmic d495436190 Match remaining GC retail versions (#2019) 
* Match the remaining GC retail versions

* Fix BSS ordering for existing versions

* Disable clang-format for #pragma increment_block_number

* sramResetCode -> sSramResetCode

* Replace 0xFF3F with or-ing all buttons together

* Revert "Disable clang-format for #pragma increment_block_number"

This reverts commit 406b6d26c9.

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2024-08-09 20:58:46 -04:00