summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2024-08-14Generic actor params getters (#1359)Tharo
* 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-12Add names to all typedef'd structs, unions, and enums (#2028)cadmic
* Add names to all typedef'd structs, unions, and enums * wtf vs code * Use a better regex
2024-08-11[Doc] name function func_8002DBD0 to Actor_WorldToActorCoords (#2029)krm01
* name function Actor_WorldToActorCoords * clean up some misleading usages
2024-08-11Set up build system and disassembly for ntsc-1.2 (#2021)cadmic
* Set up build system for ntsc-1.2 * Set up disassembly for ntsc-1.2 * Add all unnamed functions to functions.txt * Update docs/retail_versions.md for ntsc-1.2 * Format * Update docs/retail_versions.md Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Remove mention of US * OOT_N64 -> PLATFORM_N64, OOT_GC -> PLATFORM_GC * Move mtxutil to libultra/gu * Fix libultra/io bss splits * Fix merge --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-10Add "do {} while (0);" to CLOSE_DISPS (#2025)cadmic
2024-08-09Match remaining GC retail versions (#2019)cadmic
* 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 406b6d26c92911c676a7ea9f07a1612211760e11. --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-08Match NTSC file select (#1998)cadmic
* Match NTSC file select Co-authored-by: inspectredc <inspectredc@gmail.com> * nes -> eng in macros * Duplicate more code but use less #ifs * Format --------- Co-authored-by: inspectredc <inspectredc@gmail.com>
2024-08-08Match NTSC z_kaleido_scope.c (#1988)cadmic
* Match NTSC z_kaleido_scope.c * Use new REGs everywhere * Add comments for YREG initialization * Use new REGs everywhere for real * Fix merge
2024-08-02`InitVars` -> `Profile` (#2011)fig02
* rename ActorInit * rename actorInit * rename initInfo * EffectSs Profile * _InitVars -> _Profile * format, loose ends * revert tutorial
2024-07-28Introduce OOT_VERSION and OOT_REGION defines for build info and ROM header ↵cadmic
(#2003) * Use version defines for build info and ROM header * Use existing REGION_ defines for OOT_REGION instead
2024-07-27Document `ANIM_FLAG_PLAYER_2` as `ANIM_FLAG_DISABLE_CHILD_ROOT_ADJUSTMENT` ↵fig02
(#2001) * name ANIM_FLAG_DISABLE_CHILD_ROOT_ADJUSTMENT * reword * typo
2024-07-21Match NTSC z_kanfont.c and z_message.c (#1997)cadmic
* Match NTSC z_kanfont.c and z_message.c Co-authored-by: inspectredc <inspectredc@gmail.com> * Apply suggestions from code review Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * Remove now-unnecessary padding * Remove msgBufDecoded comment * Use == NULL for fake match * Rename Message_DrawText{JPN,NES} -> Message_DrawText[Wide] * Font_LoadKanji -> Font_LoadCharWide * Restore FONT_MESSAGE_OFFSET/FONT_MESSAGE_LENGTH --------- Co-authored-by: inspectredc <inspectredc@gmail.com> Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2024-07-21Rename `ANIM_FLAG_NO_MOVE` to `ANIM_FLAG_ADJUST_STARTING_POS` (#1981)fig02
* rename flag and draft 1 of comment * draft 2 * tweak wording * format * format
2024-07-17make format.py clean up extra whitespace, also in .h files (#1991)Dragorn421
* make format.py clean up extra whitespace, also in .h files * fixup * cleanup whitespace msg * Update check_format.py to also check non-src files touched by format.py * format
2024-07-17Match NTSC z_parameter.c and z_construct.c (#1987)cadmic
* Match NTSC z_parameter.c and z_construct.c * Comment which REG collide * Use new REGs everywhere * Use new REGs everywhere for real
2024-07-17Create FILENAME_ macros for NTSC filename encoding (#1986)cadmic
* Create FILENAME_ macros for NTSC filename encoding * Add defines/comments for all filename characters * FILENAME_EXCLAMATION_POINT -> FILENAME_EXCLAMATION_MARK to match kanji file * hirigana -> hiragana
2024-07-06Set up build system and disassembly for gc-us (#1982)cadmic
* 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-02Reworked text extraction + add JP text extraction (#1980)Tharo
* Reworked text extraction + add JP text extraction * Format * Suggested changes * Correct address for gc-us sJpnMessageEntryTable Co-authored-by: cadmic <cadmic24@gmail.com> --------- Co-authored-by: cadmic <cadmic24@gmail.com>
2024-06-25Remove global.h from z_fishing (#1977)cadmic
2024-06-25Rename ANIM_FLAG_PLAYER_7 to ANIM_FLAG_OVERRIDE_MOVEMENT (#1969)fig02
* rename and add comments * format * override movement * format * rework comments * Remove whitespace at end of lines --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-06-25Move `PlayState` to a new `z64play.h` (#1966)Anghelo Carvajal
* 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-24Fix misc 22 (#1971)Dragorn421
* remove trailing whitespace * fix/docbug about dright for next page of fault menu * // size = ...; -> // size = ... * access `ColliderJntSph.elements` as an array * fixup doc in PreRender.c * empty line after decl * gdSPDefLights1 xyz arguments for direction are signed 8bit values * doc bug of bad use of free in EffDust actor * decimal for Actor.colorFilterTimer * shopItemEntries -> sShopItemEntries * HEISHI4_AT_KAKRIKO_ENTRANCE -> HEISHI4_AT_KAKARIKO_ENTRANCE * format
2024-06-22Sync gbi.h with MM, move ucode defines to makefile (#1968)Tharo
* Sync gbi.h with MM, move ucode defines to makefile, use GBI_DEBUG instead of OOT_DEBUG * UCODE_DEFS -> GBI_DEFINES, add GBI_DOWHILE toggle
2024-06-21Rename `ANIM_FLAG_0` to `ANIM_FLAG_UPDATE_XZ` (#1964)fig02
* rename anim flag 0 * review * missed a word
2024-06-20Add point lighting gbi features (#1962)Tharo
* Add point lighting gbi features * Maybe fix bss ordering
2024-06-19Experiment: remove global.h dependency from sys_math, sys_math3d, z_lib (#1956)mzxrules
* split sys_math, sys_math3d, z_lib from global.h * suggestions * forgot this * more math stuff * nit fix * re-add ichain.h * resolve tharo's comments
2024-06-18Revamp "AnimationContext" Docs, now called "AnimTaskQueue" (#1941)fig02
* 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-09Fix LensMode Enum Names (#1954)inspectredc
2024-05-23Document pause page switching (#1550)Dragorn421
* Document pause page switching * document initial scroll left setup, when opening the pause menu * `PAUSE_MAIN_STATE_1` -> `PAUSE_MAIN_STATE_SWITCHING_PAGE` * try a diagram of the pages layout in world space as a comment * expand `nextPageMode` comment * touch up pause camera header comments * expand comment on irrelevant init `mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE` * expand doc on `sKaleidoSetup*` data * expand docs on `gPageSwitchNextButtonStatus` * add some doc on `sPageSwitch*` arrays * SwitchPage -> PageSwitch * add `PAGE_SWITCH_NSTEPS` * `SWITCH_PAGE_*_PT` -> `PAGE_SWITCH_PT_*` * peepoArtist --------- Co-authored-by: fig02 <fig02srl@gmail.com>
2024-04-28Rename yDistToWater -> depthInWater (#1950)cadmic
* Rename yDistToWater -> yDistUnderWater * yDistUnderWater -> depthInWater
2024-04-22Player Docs: Control stick buffers (#1945)fig02
* name vars and add enum * name some spin attack stuff * fix right and left * forward/backward * format * fix retail bss * sControlStickWorldYaw
2024-04-17Player Docs: "sUpperBodyIsBusy" (#1944)fig02
* document upperbodybusy * change wording for comment and rename upperanimblendweight * format * review
2024-04-15Player: Document "WaitForPutAway" (#1936)fig02
* document put away delay * functions.txt * add a note on delaying indefinitely * format * typo * delay -> wait for put away * revert unintended formatting change * add comment to struct member * format * fix functions.txt
2024-04-14Match retail BSS ordering (#1927)cadmic
* 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-03-24targetActor -> talkActor (#1933)fig02
2024-03-23Extract unused scene headers (#1930)cadmic
* Extract unused scene headers * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "1300a4f36" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "1300a4f36" git-subrepo: version: "0.4.6" origin: "git@github.com:ingydotnet/git-subrepo.git" commit: "110b9eb" * Add more unused arguments to CS_LIGHT_SETTING
2024-03-23Document Player's Face and z_actor FaceChange functions (#1928)fig02
* create some enums * gonna try struct instead of array * struct works. add docs too * inline function comments * fix function comment * name faces, move enums * rename textures * outnames * remove comments * change comment slightly * fixup face comments * review * offset comments * add and use PLAYER_FACE_MAX * typo * more comment on blinkDuration * another change to the comment
2024-03-04Colliders: change "touch, bump" to AT and AC (elems) (#1637)Dragorn421
* toucherFlags, bumperFlags -> atElemFlags, acElemFlags * TOUCH_ -> ATELEM_ * BUMP_ -> ACELEM_ * ColliderElementTouch,Bump -> ColliderElementDamageInfoAT,AC * toucher,bumper -> atDmgInfo,acDmgInfo * Update docs and zcolchk funcs names * run formatter * remove the last mentions of "bump" for colliders * Update renamed functions in disasm
2024-03-01Introduce extracted/VERSION, with text extracted there (#1730)Dragorn421
* Introduce assets/_extracted/VERSION, with text extracted there * move to `extracted/text/` * Update gitignore s * rework args for msgenc.py * put mkdir with others, until theyre all moved at once * move 0xFFFC back to being extracted, making it use specific macro `DEFINE_MESSAGE_NES` to handle its special behavior * prettier gitignore * Move messages 0xFFFC, 0xFFFD to committed message_data.h
2024-03-01No longer use asm-processor (#1824)Dragorn421
* git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "b3bfa14cf" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "b3bfa14cf" git-subrepo: version: "0.4.6" origin: "https://github.com/ingydotnet/git-subrepo" commit: "110b9eb" * use CS_FLOAT * update csdis * update committed csdata * finish updating csdis.py * add script to reextract committed csdata * dont use asm-processor, use iconv for reencoding utf8 to eucjp * remove asm-processor csdata usage remnants * --cs-float hex * delete tempfile at end of reencode.sh (may want to rm even if compilation fails though?) * comment reencode.sh * comment CMD_F * do not break permuter guessing compile command, by not reencode.sh-wrapping compilation under PERMUTER (thanks anghelo) * fix the permuter fix * pad -> sBssDummyNeg1 * reencode.sh: rm tempfile on script exit (including on error) * renumber sBssDummy vars in zcolchk from 0 * Revert "--cs-float hex" This reverts commit 85267dc348741b67ac9c12eb60e1e764793d0bb6. * Revert BSS changes * Add linemarker to reencoded files for better error message * fix audio/general.c bss * make reencode.sh work on macOS * touch up csdis, csdis_re --------- Co-authored-by: cadmic <cadmic24@gmail.com>
2024-02-29Some GCC flags improvements (#1903)Tharo
* Some GCC flags improvements * Move -fno-reorder-blocks -fno-zero-initialized-in-bss to assets only * Add -fno-PIC since some gcc versions use -fPIC as default * Enable builtin functions on gcc, with appropriate changes to missing_gcc_functions.c and ultra64/libc.h * Move -fno-merge-constants -mno-explicit-relocs -mno-split-addresses to overlays only as they are only needed there for reloc reasons * Remove unneeded casts in missing_gcc_functions.c * Change gcc assets flags handling
2024-02-29Use Romfile in place of vromStart and vromEnd in structs (#1742)Derek Hensley
* KaleidoMgrOverlay * GameStateOverlay * ActorOverlay * EffectSsOverlay * MapMarkDataOverlay * Missed DEFINE_ACTOR_UNSET * ROM_FILE_UNSET * DEFINE_OBJECT_EMPTY * DmaEntry * ACTOR_UNSET * romfile.h * newline * Format
2024-02-27Remove gSystemHeap and use _buffersSegmentEnd instead, make buffer ↵Tharo
alignments explicit for gcc (#1901) * Remove gSystemHeap and use _buffersSegmentEnd instead, make buffer alignments explicit for gcc * ALIGNEDn -> ALIGNED(n), reposition alignment attribute for PreNmiBuff * Correct positioning of ALIGNED for filter data in audio/lib/data.c * Add ALIGNED to TypenameMacros * ALIGNED(4) on same line for PreNmiBuff * Revert audio load.c change, to be submitted separately
2024-02-27Restore terminal colors in retail, except in __osMalloc.c (#1899)cadmic
2024-02-27Filename & line number args cleanup (#1891)Tharo
* Filename & line number args cleanup * Use int for line number args over s32/u32 * Add missing const qualifiers from filename args * Fix gcc warning in game.c * Add comment to weird assignments in GameState_Init
2024-02-27Match retail code data sizes (#1741)cadmic
* 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-20Fixup permuter_settings (#1746)Dragorn421
* fix how permuter imports PRINTF macros wrt the ido-has-no-variadic-macros hack * more permuter_settings fixups
2024-02-12Rework disassembly: out of makefile, separate sections, relocs (#1728)Dragorn421
* Rework disassembly: out of makefile, separate sections, relocs * another nice print * fix type hints for python 3.8 dinosaurs * reencode from utf-8 to euc-jp (iconv) before assemble * Add "include guards" to macro.inc * For producing the expected file object files, assemble sections together instead of linking together the individually assembled sections * review * fixup * require spimdisasm >=1.21.0 * remove assembling sections individually (for now) * uppercase encoding names (standard)
2024-02-07Match retail z_sram.c (#1722)cadmic
2024-02-03Match compression for gc-eu-mq (#1704)cadmic
* Improve compression * Format * Typo * Use Python assignment expression in tools/dmadata.py Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Review decompress_baserom.py * Replace DEFINE_DEBUG_SCENE with CPP defines * Pass is_zlib_compressed instead of version * Reword NOLOAD comment in write_compress_ranges * Remove redundant comment --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>