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,397 Commits 1 Branch 0 Tags
2278bcb2c3383553d136216a7fc1600cd86485f3
Commit Graph

211 Commits

Author SHA1 Message Date
fig02 2278bcb2c3 Remove Variables.h; Decouple z64.h from global.h (#2507) 
* progress

* z64.h issues sorted

* remove variables.h

* format

* n64 fix

* another fix

* did the wrong fix

* fix libleo

* fix bss

* review

* remove instead of comment
 2025-04-19 22:04:08 -04:00
fig02 655ec77138 variables.h: migrate all remaining varaibles, remove other dependencies except z64.h (#2505) 
* move remaining variables from variables.h

* fix other dependencies

* extra newline

* fix and adjust comment

* is this the problem

* fix bss
 2025-04-16 08:22:42 -04:00
fig02 80564bf40b variables.h cleaning: migrate libultra variables (#2503) 
* variables.h cleaning: migrate libultra variables

* another increment_block_number

* fix bss
 2025-04-06 22:32:40 -04:00
fig02 5133db15a3 Remove functions.h (#2501) 
* split most of functions.h

* osdriverominit

* forgot include

* fix

* remove functions.h

* temporary fix for fix_bss

* fix bss

* revert fix_bss.py change
 2025-04-05 19:16:52 -04:00
fig02 ecf65e797e Some functions.h and variables.h work (#2491) 
* sort fuctions and variables

* bss
 2025-03-26 16:08:10 -04:00
mzxrules cf1a39c26f Reduce dependencies on global.h (10) (#2490) 
* reduce z64.h size

* fix z_cheap_proc.inc.c

* ,bss

* remove temp delcaration
 2025-02-26 17:18:30 -05:00
mzxrules 2e4c42719b Reduce dependencies on global.h (9) (#2488) 
* split game states

* split all GameState headers

* match fig names

* deduplicate headers from bad merge

* split z64actor.h into z64actor_profile.h, z_actor_dlftbls.h

* fix compile error

* .bss
 2025-02-24 20:55:55 -05:00
fig02 5ddb3e68b6 Clean out z64.h (#2484) 
* Clean out z64.h

* fix version include

* overlay.h

* pr suggestion

* try fixing main.c

* add back forward declare

* fix bss

* header guard

* prefix
 2025-02-22 14:01:09 -05:00
fig02 2e4d7a1101 Create headers for Game States (#2482) 
* make headers for gamestates

* fixes

* fixes 2

* bss
 2025-02-20 07:50:13 -05:00
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
fig02 96e13149ea Name Actor_DrawAll (#2464) 2025-02-11 17:33:09 -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
cadmic 284ecb114e [iQue] Match z_actor (#2431) 
* [iQue] Match z_actor

* Reword comment
 2025-01-19 22:29:35 -05:00
cadmic e4ad4e5eee [iQue] Match remaining src/boot files (#2417) 
* [iQue] Match remaining src/boot files

* Fix debug ROM

* Use -funsigned-char

* Sort ique before gc in LNx macros
 2025-01-10 18:47:55 +01: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
fig02 ff78b1263b Add macros for line number differences (#2365) 
* initial work, think I got all of them

* cleanup line_numbers.h

* fix gc-eu-mq-dbg

* fix matching problems

* remove old lines

* format

* missed some stuff

* comment fixes

* other

* review changes
 2024-12-15 11:07:21 -05:00
fig02 bda5e94ded Document Player Params (#2307) 
* document player params

* better bgcamindex comment

* cant use -1 for condition

* fix match

* define for default bgcam

* doesnt work

* matches

* better comment
 2024-12-08 14:56:01 -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 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 cf4dc98cc9 Use debug macros even in N64-only code (#2298) 
* Use debug macros even in N64-only code

* Use UNK_FILE/UNK_LINE instead
 2024-11-15 13:18:05 -05:00
cadmic 2048a65dd8 [ntsc-1.0/1.1] Match line numbers in debug strings (#2255) 2024-10-09 13:41:16 +02: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
cadmic 52a1c2f969 [PAL N64] Miscellaneous changes (#2211) 
* [PAL N64] Miscellaneous changes

* Reword comment

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

* glitch -> Glitch

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-09-23 20:13:09 -04:00
mzxrules acb5c7f20c Update Room Documentation (#2015) 
* Update Room Documentation

* Write more complete documentation, implement suggestions.

* Function name changes; minor comment tweaks

* nit

* Resolve Dragorn fixes

* Resolve Fig suggestions, fix comment wording

* fix bss, fig suggestion

* bss
 2024-09-05 21:08:21 +09:00
Dragorn421 dc469461a9 Pause docs: WorldMapArea enum and related data (#2130) 
* Pause docs: WorldMapArea enum and related data

* `WORLD_MAP_AREA_20` -> `_QUESTION_MARK`

* bss
 2024-09-04 17:51:08 -04:00
cadmic 8153c952f6 [ntsc-1.2] Organize n64dd declarations and convert to 1.0 addresses (#2127) 
* Reorganize n64dd declarations

* Fix bss

* Really fix bss
 2024-09-05 03:56:24 +09:00
cadmic e7cf2fceac [ntsc-1.2] Match game.c, z_play.c, z_room.c (#2117) 
* Match z_room.c

* Match game.c and z_play.c

* Add undefined syms

* Rewrite condition based on other file matches
 2024-09-04 01:46:41 -04:00
Dragorn421 68818044db [ntsc-1.2] Decompile fault.c (#2046) 
* wip decomp ntsc-1.2 fault.c

* more ntsc-1.2 fault.c

* decompiled fault_v1.c

* name fault_v1 functions, wip

* try to clean up build system (two versions of the fault system coexisting)

* cleanup

* cleanup2

* fix build gc-eu-mq-dbg

* match 2 more, ty anon

* matched

* review

* more review

* fixup spec

* `(uintptr_t)ptr op int` instead of `ptr op (type*)int`

* move fault.h out of global headers, properly include fault.h and versions.h

* compile all fault_*.c files regardless of version by overriding FAULT_VERSION

* n64 FaultMgr.framebuffer s32 -> u16*

* FaultMgr.framebuffer -> FaultMgr.fb

* make gc FaultMgr.fb u16* (yes, thats everything)

* bss

* fix Fault_Printf return type

* noop FaultDrawer_SetFontColor, FaultDrawer_SetCharPad in fault_n64

* fault_color_ stuff is only for fault_gc

* rm empty line in makefile

* I guess `D_80105A90_unknown` is `[sg]TotalAllocFailures`

* bss

* `Fault_WaitInput` -> `Fault_WaitForInput`

* use named fault funcs in pointers array

* FAULT_OOT{N64,GC} -> FAULT_{N64,GC}

* Apply suggestions from code review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* review, sync fault_{gc,n64}

* Apply `FPCSR_CE` suggestions from code review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2024-08-28 09:38:42 +02:00
Tharo aa97586659 [Audio 6/?] Build Soundfonts and the Soundfont Table (#2056) 
* [Audio 6/?] Build Soundfonts and the Soundfont Table

* Improve lots of error messages

* First suggested changes

* Make audio build debugging more friendly

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

* Some fixes from MM review

* Make soundfont_table.h generation depend on the samplebank xmls since they are read, report from which soundfont the invalid pointer indirect warning originates from

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2024-08-27 21:09:59 -04:00
Dragorn421 6b58a15fc0 T() macro 6 (#2090) 
* T() in z_skelanime.c

* T() in z_eff_blure.c

* T() in z_play.c

* T() in z_jpeg.c

* T() in z_horse.c

* T() in z_eff_spark.c

* T() in z_malloc.c

* T() in z_effect_soft_sprite.c

* add todo on translating "確保" (litterally ~"secure", but may be better as "allocate"-ish)

* review

* format
 2024-08-27 17:10:07 +02:00
cadmic 3795574878 Add all N64 version defines (#2095) 
* Add all N64 ROMs to versions.h

* Remove OOT_ prefix from version defines

* Make it pretty
 2024-08-26 11:43:59 -04:00
Dragorn421 ac2224f095 Add versions.h (#2060) 2024-08-20 17:19:16 -04:00
cadmic d191e8714e Allow building the Debug ROM without debug features (#2052) 
* Allow building the Debug ROM without debug features

* Fix bss

* Add comment

* Reword again

* Fix bss
 2024-08-19 23:58:31 +02:00
cadmic 46a5fa919b Match ntsc-1.2 z_scene_table.c (#2050) 
* Match z_scene_table.c

* Attempt to fix bss ordering

* Forward declare PlayState instead

* Untangle circular includes in z64scene.h
 2024-08-19 10:24:02 +02:00
Tharo ba5574be6d [Audio 5/?] Build the Samplebank Table (#2044) 2024-08-17 17:42:15 -04:00
Tharo eaf955ad22 Generic actor params getters (#1359) 
* Initial PARAMS_GET macros

* NOSHIFT macro

* Use number of bits rather than raw mask values

* Add descriptions for each generic macro

* Reformat

* Adjust comment

* format

* edit en_door macro names

* edit redead macro name

* edit bdan switch macro name, and remove unneeded comments in go2

* mizushutter macro names

* remove PARAMS_GET_S, rework ishi switch flag handling

* actually remove PARAMS_GET_S

* remove PARAMS_GET2_S

* PARAMS_GET_U and PARAMS_GET_S

* format

* fix merge

* format

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2024-08-14 21:29:43 +02: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
cadmic 067d06bb56 Match NTSC loose ends (#2004) 
* Match NTSC loose ends

* Add comment about giObjectSegment size
 2024-07-28 00:09:05 -04:00
cadmic bf3339a16d Set up build system and disassembly for gc-us (#1982) 
* Build gc-us

* Set up gc-us disassembly

* Don't disasm unchanged overlays

* Fix gc-eu-mq BSS

* romalign link_animetion for NTSC

* Explicitly set CPP defines to 0/1

* Add #ifs to segment_symbols.h

* Add sButtonTextures now

* Fix message _SHIFTL usage

* Don't ifdef LANGUAGE_MAX
 2024-07-06 21:38:31 +02:00
Anghelo Carvajal d8f2e9abc6 Move PlayState to a new z64play.h (#1966) 
* ActorContext

* frameadvance

* SfxSource

* GameOverContext

* RoomContext

* TransitionActorContext

* fix bss

* Move PlayState

* Move play functions to new header

* SAC_ENABLE

* no longer needed

* SAC_ENABLE again

* z_demo being silly

* comment

* format headers

* fix retail bss

* actually fix bss

* Cutscene_ProcessScript comment

* bss again

* Update src/code/z_demo.c

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

* rename to frame_advance and remove it from z64.h

* move macros too

* review

* Rename SequenceContext to SceneSequences

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
 2024-06-25 15:13:31 -04:00
fig02 06bbdf88f1 Revamp "AnimationContext" Docs, now called "AnimTaskQueue" (#1941) 
* start using task terminology

* more docs

* format

* cleanups

* MoveActor -> ActorMove

* missed a couple

* hopefully the last changes

* comment explaining the group change

* some review

* dragorn review

* remove accidental file

* fix matching issue, now use while loop
 2024-06-18 23:46:36 -04:00
cadmic f643499462 Match retail BSS ordering (#1927) 
* Match retail BSS ordering

* Revert moving some global variables to headers

* Adjust block numbers after header changes

* Fix debug build

* Overlay bss ordering

* Fix BSS ordering after header changes

* gc-eu-mq OK

* Implement preprocessor for #pragma increment_block_number

* Transfer usage comment from reencode.sh

* Use temporary directory instead of temporary file

* Move ColChkMassType back
 2024-04-14 23:51:32 +02:00
cadmic 4e1b0f6694 Fix various data issues in gc-eu-mq (#1921) 
* Fix various data issues

* D_80153D78 -> sMessageDebuggerTextboxCount
 2024-03-29 11:19:55 -04:00
cadmic c6e3ef4570 Match retail code data sizes (#1741) 
* Match retail audio data

* Fix various small code data problems

* Disable terminal colors in debug builds

* Match z_actor_dlftbls.c .rodata

* Use _3 for unused nameString macro parameter

* Move sDebugCutsceneScriptBuf to be in-function static

* Comment on actor name being NULL

* Split out padding the fault_drawer.bss.s
 2024-02-27 02:23:19 -05:00
engineer124 1e21f69b37 z_play retail OK (#1688) 
* z_play OK

* cleanup spacing

* PR
 2024-02-01 17:00:27 -05:00
Derek Hensley 06379c3109 Gamealloc, Graph, and Graphalloc retail OK (#1675) 
* Gamealloc OK

* Graph + Graphalloc OK

* PR review

* gfxalloc

* new lines

* Remove imposter
 2024-01-31 19:07:12 -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
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 aef0335681 Struct Returns (#1574) 
* change args

* PR Review

* format
 2023-11-19 11:17:31 -05:00