summaryrefslogtreecommitdiff
path: root/src/code
AgeCommit message (Collapse)Author
2021-12-27z_kaleido_manager and z_kaleido_scope_call OK (#489)Lucas Shaw
* migrated data and bss for z_kaleido_manager, renamed ovl_Player_Actor to ovl_player_actor to make it work with the data * z_kaleido_manager OK * add to functions.h variables.h and variables.txt * init * rename parameters in func_80163700 * rename func_80163700 to KaleidoManager_FaultAddrConvFunc * change u32 casts to uintptr_t casts in z_kaleido_manager. (u8 *) casts must stay, they are the only casts that match * ran format, uintptr_t * made suggested changes
2021-12-27code_80194710 OK (Audio libultra_code_O2) (#474)engineer124
* code_80194710.c OK * Add new line after variable declaration * format * Function declarations * Name changes to match OoT * Rename file * s32 -> size_t
2021-12-27Match 8 BgCheck functions (7 remaining) (#496)engineer124
* Match CollisionPoly_CheckYIntersect * Match CollisionPoly_SphVsPoly * Match StaticLookup_AddPolyToSSList * Match BgCheck_CheckStaticCeiling * Match BgCheck_SphVsFirstStaticPolyList * Match BgCheck_Allocate * Match BgCheck_CheckLineImpl * Match BgCheck_SphVsDynaWallInBgActor * Update src/code/z_bgcheck.c Co-authored-by: mzxrules <mzxrules@gmail.com> * Add comment about in-function static bss Co-authored-by: mzxrules <mzxrules@gmail.com>
2021-12-27[Object] Bigpo object documentation (+ some gameplay_keep) (#525)Isghj
* Bigpo: object documentation starts and already issues * Bigpo: almost all named * Bigpo: done with object except ubused blobs * Bigpo: added flame docs to gameplay_keep and minor cleaning, format pass * Bigpo: forgot to remove sym and replace everywhere, with formater pass * Bigpo: forgot about actorfixer * Bigpo: disasm cant find asset xml values, have to put this undefined sym back for now * Bigpo: warnings * Bigpo: remove extern for gameplay_keep display list reference from aqua * EnBigpo: suggested fixes to header calls and function name Co-authored-by: Isghj8 <isghj8@gmail.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-12-27Decompile and clean up some effect files (#342)Roman971
* Decompile various effect files and cleanup z_effect.c * Decompile z_eff_tire_mark.c and cleanup structs * Small cleanups * Apply most review suggestions * Apply more review suggestions * Change eff_shield_particle vertices to be extracted as an asset * Add relevant effect functions to actorfixer.py
2021-12-27En_Elf (#371)Maide
* En_Elf * En_Elf * PR * PR * Format
2021-12-19Name coordinate transformation matrix similar to OoT (#499)engineer124
* name coordiante transformation names similar to OoT * update actorfixer
2021-12-19Code_800f07c0 OK with some documentation (#373)Derek Hensley
* Matched func_800F07C0 * Matched func_800F0888 * Matched func_800F0944 * Matched func_800F09B4 * Matched func_800F0A94 * Matched func_800F0E94 * Matched func_800F0EEC * Matched func_800F0F28 * Matched func_800F0FF0 * Matched func_800F10AC * Matched func_800F112C * Matched func_800F0DD4 * Matched func_800F0CE4 * Matched func_800F0A20 * Matched func_800F0BB4 * Fix functions.h * Migrated data and add some doc comments, having BSS issues * BSS fix * Fix merge conflict * Document * Run Formatter * Actually save functions.h * Rename UnusedNPC to EnHy * Change some rets and run format * PR review * Fix merge conflict * Minor touchups * Fix renamed func * Change char to UNK_TYPE1 * Add header * Rename two functions * Fix capital X's in undefined_syms * Convert char to UNK_TYPE1 in EnDoor * Change huge ternary into if else for readability * Fix up EnIn * Better whitespace * Format * Revert UNK_TYPE1s in EnDoor * Rename file * Missed rename in undefined_syms
2021-12-19sys_ucode OK (#432)EllipticEllipsis
* sys_ucode OK * Update file split of data * Format * Name symbols, sizes -> u32 * Correct undefined_syms * Format
2021-12-19Importing Audio Init Params (#471)engineer124
* Import audio init params * Add comments describing what these sizes represents * Fix variables.txt * Remove leading zero's from gTatumsPerBeat * Name variables
2021-12-19pause (Frame Advance) OK (#455)Derek Hensley
* Matched * Rename and format * typo * Missed renames * Revert "Missed renames" This reverts commit 64d9f7046407eac71b849420457968e3b38fc4d8. * Revert "typo" This reverts commit 81696364d3db71b6085fda1aa99855def390628e. * Revert "Rename and format" This reverts commit aec7d245e896777d70eb7024c336f76ed2a32c7f. * Rename functions * Add header explaining frame advance * Header * Format
2021-12-16Tutorial (#362)EllipticEllipsis
* ObjTree OK, data imported * EnMs OK, data imported * And the spec * OK * Some minor edits * A lot of preliminary stuff * Mostly complete beginning * First draft of other functions doc * Whoops, forgot the GlobalContext pad * Draw functions (minus colour), create Data * Data * gitignore, some progress on documenting * Review comments, continue documenting * spec * Finish off documentation * undefined_syms * Add a couple of todos * One more * At least add tools for object decomp * Start conversion table stuff * Document ObjTree * Document EnMs * Add more tables to conversions * Maide's review * Review * Review * Typos and incomplete thoughts * Update vscode.md * Correct function/variable names * Review suggestions * Format * Missed one * Rename functions and format * Fix ObjTree * Update actorfixer.py, fix some variable names * Some review * Review suggestions * More review * Hopefully fix all the thisx references * Missed one
2021-12-15ZAPD fixes in `sys_initial_check`, update subrepos (#507)EllipticEllipsis
* git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "a3363333d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "a3363333d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/asm-differ --force subrepo: subdir: "tools/asm-differ" merged: "70c33cc12" upstream: origin: "https://github.com/simonlindholm/asm-differ.git" branch: "main" commit: "70c33cc12" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull (merge) tools/z64compress --force subrepo: subdir: "tools/z64compress" merged: "ac5b1a0d0" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "ac5b1a0d0" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * Use defines for texture sizes in sys_initial_check * Update extract_assets.py * Add null check * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "50242eca9" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "50242eca9" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596"
2021-12-07z_vr_box_draw OK (#481)Lucas Shaw
* z_vr_box_draw OK * ok * Removed z_vr_box_draw.data.s, its actually z_sram_NES.data.s * Added enum SkyboxId
2021-12-07Macro Clean up (#454)engineer124
* Add OS macros * MTXMODE cleanup * format * More matrix mode macros missed
2021-12-07Importing Audio Sfx Params (#472)engineer124
* Import audio sfx params * Add TODO: description for this file
2021-12-06Elf_Message OK (#457)Derek Hensley
* Matched * Rename function
2021-11-23z_bgcheck.c (#357)mzxrules
* first few functions * two more almost matching functions * Rebase to NBS, get it to compile * BgCheck_RaycastFloorStaticList OK, fix-up some functions * BgCheck_SphVsStaticWall OK! and a few others * more z_bgcheck NON_MATCHINGS * OK more functions, reorganize external reference #defines * More functions OK, more struct fixes * More OKs * Decomp all the way to the end of bgcheck * All functions attempted * Rename functions * formatting, data migration * Give names to unk structs, rename some structs, fix some non-equivalent functions * WaterBox_GetSurfaceImpl OK * BgCheck_ResetPolyCheckTbl OK, improve WaterBox_GetSurface2 codegen, eliminate warnings and clean up source. * BcCheck3_BgActorInit ->BgCheck3_BgActorInit, fix warnings * pr change requests * fix crc maybe * implement more changes * implement alf's changes
2021-11-20En_Tk (#338)Maide
* En_Tk * PR * Warnings Co-authored-by: root <root@Careface.localdomain>
2021-11-20Audio BGM Macros (#460)engineer124
* Introduce bgms * Fill in bgm enums * Rename bgm to clearer names * Fix spacing * Fix "No_Music" define * remove comment * Improve bgm names, found another seqId function * Another seqId function * Another name change * Woods of Mystery -> Sarias Song * add saria's song bgm to pierre * Another bgm function found! * Add bgm's to `gSaveContext.seqIndex`
2021-11-19`z_jpeg`, `jpegutils` and `jpegdecoder` OK (#322)Anghelo Carvajal
* this is a disaster * two more * func_800F470C * split and rename jpegutils and jpegdecoder * match jpegutils * match jpegdecoder.c * audio_rodata * data split * Split rsp * Steal documentation from OoT * cleanup * Format * remove removed members in JpegContext * Update include/z64.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/jpegdecoder.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/jpegutils.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review renames * true * Some type fixes * Update include/z64.h Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * add comment * Update src/code/z_jpeg.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * format * bss fix * decr * format * z64jpeg.h * Add stdbool * Rename audio_init_params * whoops * whoops++ * whoops# * remove extra dumb variables in variables.txt * fix Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-11-19Sub_S Prototypes and approriate header stuff (#408)Derek Hensley
* Add sub_s prototypes * Rename limbDrawTable to jointTable * Rename UnkActorDraws * Fix warnings * Fix warnings
2021-11-19Audio Files & Data: Fix File/Data Splits and Compiler Flags (#456)engineer124
* Properly split audio voice * Split off jpeg code from audio * Fix compiler flags * Properly split libultra audio file * Split audio data for many files correctly * Fix remaining data splits * Fix up troublesome data * Fix variables.txt * Missed two files that need to go in audio/ * Add missing `/` * `D_801E1100` -> audio_init_params * Properly split code_801D9090.data.s * Fix code_801A5BD0 bss * Move audio_dramStack to a blob
2021-11-15sys_initial_check OK, documented, error message files debinarised (#437)EllipticEllipsis
* OK * Symbols and other documentation * Remove externs * spec * More documentation, decompile the texture files, some uintptr_t and size_t * Top-of-file comment * Move symbols back into right order * Use some defines * Missed an osTvType and a size_t * Add missing header to os.h * Use segment symbol macros * Remove duplicate header * Address review suggestions
2021-11-14Moves func_800CB000 to z_bg_item, decompiles func_800CB000, and documents ↵Kenix3
z_bg_item and a few DynaPolyActor struct members. (#407) * Moves func_800CB000 to z_bg_item, decompiles func_800CB000, and documents z_bg_item and a few DynaPolyActor struct members. * Adding usage of dynapoly state flag defines. * Formats z_bg_item * Update z_bg_item.c * Update z_bg_collect.c * Update z_bg_item.c * Update z_bg_item.c * Renames z_bg_item system to DynaPolyActor * Format
2021-11-14sched.h (#341)Anghelo Carvajal
* sched.h * format * screen.h * sched.h and scheduler.h * empty commit * remove screen.h * format * Fix * fix bss * remove line * Whoops * remove dupllicated structs * ... * c'mon * Add TASK_FRAMEBUFFER macro * format
2021-11-11Improve/Add Enums for Player, Items, and Quest (#275)engineer124
* Create enums (non-matching monkaBSS) * Add effect enum * Almost fix bss reordering (1 different word) * Fix capacity * Fully fix bss * Add PlayerBoots * PR Feedback & add missing playerForm enums * Clean-Up * Script to check global bss ordering * Bit of cleanup * Format * Remove global_bss_check PR * Fix bss * Add enums to new PRs & previously missed ones * Remove Effect Enums * Missed one * Format * Remove old prevent_bss_reordering.h comments * Use a better macro * A few more uses of enums found * Add enums to recent PRs * Improve GI enums * Add enums from new PRs * PR Suggestions * format * Fix bss * Fix mistake in GI * No actually, part of it was correct before Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2021-11-06`motor.c` OK (#397)Anghelo Carvajal
* use motor in the spec * import bss * Delete viextendvstart.c * rename functions * move stuff and format * remove globals.h and ultra64.h * Update src/libultra/io/motor.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * add motor.h to padmgr * fix Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-11-05EnvFlags OK (#404)Derek Hensley
* Matched * Remove magic number * Rename system to EnvFlags
2021-11-03osFlash (#158)petrie911
* some matches * Decompile code_0x80186A70 Add defines for KSEG0/1 and (Un)Cached RDRAM * format * cleanup * moved osFlash and imported data * implement fixes * format again * Update include/functions.h Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * Update include/variables.h Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * Update src/libultra/flash/osFlash.c Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * Update src/libultra/flash/osFlash.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * returns are needed * format * Update src/libultra/flash/osFlash.c Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * Update src/libultra/flash/osFlash.c Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * Update src/libultra/flash/osFlash.c Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * Update src/libultra/flash/osFlash.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/libultra/flash/osFlash.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/libultra/flash/osFlash.c Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * should be fixed Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: MMDecomp <mmdecomp@gmail.com> Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-11-03Fireobj Kinda OK (#400)louist103
* done * format * PR fixes * revert formatting z64.h * Update warnings_build_current.txt
2021-11-03Match EnItem00_Update (#381)Tom Overton
2021-11-03Match `SkelAnime_GetFrameDataLegacy` (#392)Anghelo Carvajal
* Properly rename SkelAnime_GetFrameDataLegacy * Match
2021-11-03Debug display mostly OK (#399)louist103
* WIP * done? * remove something from variables.h * missed a warning * PR fixes (AngheloAlf) * fix lights * restore ZAPD makefile * format * format again * fix a graph alloc * Missed one in skin
2021-11-03Common data OK (#398)Derek Hensley
* Matched common data * Change one hex to dec
2021-11-03z_path.c OK (#379)Lucas Shaw
* z_path.c OK * Ran format
2021-11-02Rename yDistTo variables (#286)rylieb
* Change yDistTo to yDirDistTo. * Run format.sh. * Apply suggestions from code review Fix comments in header file. * Added "Surface" to yDirDistToWater. * Update names in sellnuts and skb. * Actually fix skb * Rename yDirDistToWaterSurface to depthInWater. * Rename yDirDistToPlayer to playerHeightRel. * Apply suggestions from code review Fix capitalization in header file comments. Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Fix Jenkins (Obj_Aqua). * Fix Jenkins (Obj_Etcetera). * Fix Jenkins (En_Thiefbird). * Fix misformatted files in current master. * Fix Jenkins and run format.sh. * Fix misformatted file in current master (z_debug). * Update PR to include new actors. * Update PR to include elforg, po_sisters, wf. * update actorfixer.py with variable name changes. Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-10-29Decompile graph.c (#274)Tharo
* Decompiled, 1 non-matching, add some bss reordering helpers * Document stuff * Review suggestions * graphutil.c -> graphalloc.c * Try to fix fault callback warnings * Remove extra comments in GfxMasterList * char pad -> u32 pad Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Fix gameState Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Other suggestions Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-10-24z_game_over.c (#263)Tharo
* game over * Fixes * Revert save field rename * Fix comment indent Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Add bss reordering stuff, fix bss reordering in z_scene_proc * Enum uggestions, fix item id * link -> player in enum comments Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-10-24Animation system updated, some more boot files decompiled (+6%), ↵Lucas Shaw
z_fcurve_data_skelanime decompiled (1 non-matching), some asm files split, etc (#89) * Progress on various files * gfxprint stuff * split some rodata, add iconv for rodata string parsing * z_std_dma rodata * 2 nonmatchings in gfxprint * mtxuty-cvt ok * more * match a function in idle.c * progress * Cleanup * Rename BgPolygon to CollisionPoly * progress * some effect stuff * more effect progress * updates * made suggested changes * z_effect_soft_sprite_old_init mostly ok * remove old effects enum * gamealloc.c OK * added more files * motor.c almost done * motor.c OK * updates * migration of two files * listalloc.c oK * z_fcurve_data_skelanime split * z_fcurve_data_skelanime.c decompiled * more files split * z_malloc.c OK * contpfs.c OK * fault.c rodata migrated * migrated fault_drawer rodata * update * update preprocess.py * renamed functions in z_skelanime * started z_skelanime cleanup * like halfway through fixing z_skelanime * animation system updated to meet oot standards * remove unused animation structs * rename matrix structs to fit oot * Add -woff 712 * fix diff_settings.py because i accidentally broke it before * fixed merge conflict, doesn't match though * It matches now * Updates * Fixed warnings...added gcc code syntax checking * Remove gcc check, added in Tharo's PR * warnings fixed (i think) * fixed all warnings i think * ok * not sure what to do * Fix all warnings i think (z_en_a_keep needs some file cleanup thouguh) * it matches if i do this * remove comment * accidentally put osPfsFreeBlocks in epilinkhandle.c * memcmp -> bcmp * change u32 size to size_t size, delete string.h because it caused unnecessary confusion with defining size_t twice * format.sh * MTXMODE_NEW and MTXMODE_APPLY to matrix functions * Made suggested changes * pragma sFaultDrawerFont instead of including in repo * add some functions to functions.h * Bss reordering fixed in z_collision_check...added hack to disasm.py * Updated z_en_a_keep.c * Missed suggestion in EnAObj_Destroy * . * update z_fcurve_Data_skelanime and z_skelanime with suggestions * devmgr.c ok * minor changes * Addressed comments * remove redundant file * gfxp -> dlist in game.c * updated actorfixer.py * fixed warnings in z_malloc * Change void* back to Actor* * format * Add the soft_sprit comments back * Rename SV->Flex * remove .common * run format * Update src/code/z_skelanime.c * u32 channel Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-10-23Format the misformatted files in master (#354)Tom Overton
* Format the misformatted files in master * Correct arms_hook double-semicolon, since it was almost certainly just an accident
2021-10-14`z_debug` OK (#330)EllipticEllipsis
* z_debug OK * Rename function * Remove duplicate struct * Update z64.h
2021-10-12Macros: `PLAYER` -> `GET_PLAYER(globalCtx)` and `ACTIVE_CAM` -> ↵engineer124
`GET_ACTIVE_CAM(globalCtx)` (#283) * PLAYER -> GET_PLAYER(globalCtx), ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx) * formatter * PR Suggestions * `FIRST_ENEMY` -> `GET_FIRST_ENEMY(globalCtx)` * Fix merge conflicts
2021-10-12Decompile the GameStateOverlay table (#337)EllipticEllipsis
* Decomp GameStateOverlayTable * spec * Review * gSchedContext * Format * Fix bss
2021-10-11`flg_set.c` OK and documented (#335)EllipticEllipsis
* Draw OK, Update very much not * Flag table imported * Update OK * Actually OK this time * Begin documenting * Rename some stuff * Rename functions * spec * Review * Format * Anghelo's review * Fix lifemeter bss * Format * Missed one * idle.c bss
2021-10-04Run ./format.sh on master again (#348)Tom Overton
2021-09-30Match last function in z_prenmi, add DISPS macros to ArmsHook (#305)EllipticEllipsis
* preNMI OK, added DISP macros to ArmsHook * Decimal colours in preNMI * SCREEN_WIDTH * engineer's review
2021-09-29`z_nmi_buff` OK, `code_8010C1B0` split and OK (#334)EllipticEllipsis
* nmi_buff OK, code_8010C1B0 split and OK * COLD_RESET * spec * Fix lifemeter bss * Rename variable
2021-09-29ShrinkWindow OK (#303)EllipticEllipsis
* OK, small amount of documentation, import bss * Remove comments * Actually commit functions.txt * Add renames to actorfixer.py, review
2021-09-29Fix some dummy label matches (#331)Tom Overton
* Fix some dummy label matches * Remove dummy label in z_en_railgibud * Remove dummy label from z_door_ana.c * Remove dummy label from z_obj_raillift.c * Remove dummy label from z_en_minislime.c * A few more dummy label fixes * Run format, whoops * Add single line between pad and code * Add OPEN/CLOSE_DISPS to GameState_Draw * Add the padding in game.c too (how did I forget this???) * Run format.sh * pad -> requiredScopeTemp