summaryrefslogtreecommitdiff
path: root/src/code/z_collision_check.c
AgeCommit message (Collapse)Author
2025-06-22Name `HIT_BACKLASH_` and `HIT_SPECIAL_EFFECT_` values (#2639)Dragorn421
* Name HIT_BACKLASH_ and HIT_SPECIAL_EFFECT_ values * SHOCK -> ELECTRIC
2025-06-20Rename AT `effect` to `hitSpecialEffect` (#2637)Dragorn421
* Rename AT `effect` to `hitSpecialEffect` * bss
2025-06-17fixup rename hitBacklash (#2638)Dragorn421
2025-06-17Rename `acDmgInfo.effect` -> `hitBacklash` (#2555)Dragorn421
* CollisionCheckInfo.atHitEffect -> atHitBacklash * ColliderElementDamageInfoAC.effect -> hitBacklash * add HIT_BACKLASH_ enum * bss * bss * bss * bss * bss * Update comments
2025-06-15Macroify PlaySfxGeneral calls: introduce `SFX_PLAY_CENTERED` and ↵Dragorn421
`SFX_PLAY_AT_POS` (#2633) * Add `SFX_PLAY_CENTERED` * Add `SFX_PLAY_AT_POS`
2025-06-10Introduce `CAM_DATA_SET_`, `CAM_ITEM_TYPE_` and name ↵Dragorn421
`Player_SetTurnAroundCamera`, `Player_RequestCameraSetting` (#2608) * Introduce `CAM_SET_CAMERA_DATA_`, `CAM_ITEM_TYPE_` and name `Player_CameraChangeSettingTurnAround` * bss and formatting * func_80835E44 -> Player_RequestCameraSetting * -> Player_SetTurnAroundCamera * -> CAM_DATA_SET_
2025-06-04Remove "z64" prefix from all headers (#2518)fig02
* z64 - a * z64 - b * z64 - c * z64 - d * z64 - e * z64 - f * z64 - g * z64 - h * z64 - i * z64 - l * z64 - m * z64 - o * z64 - p * z64 - q * z64 - r * z64 - s * z64 - t * z64 - v * restore file * fix merge * fix merge --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2025-06-03Rename `damageEffect` -> `damageReaction` (#2554)Dragorn421
* CollisionCheckInfo.damageEffect -> damageReaction * damageEffect -> damageReaction in other structs/temps * DMGEFF -> DMGREAC * EnSkb.lastDamageEffect -> lastDamageReaction * EnTest.lastDamageEffect -> lastDamageReaction * enums: DamageEffect -> DamageReaction * cleanup: EnGeldBDamageReactions -> EnGeldBDamageReaction * DMG_ENTRY effect -> reaction * cleanup: GELDB_DMG_ -> GELDB_DMGREAC_ * PEAHAT_DMG_EFF -> PEAHAT_DMGREAC * cleanup: RR_DMG_ -> RR_DMGREAC_ * cleanup: EnWallmas DAMAGE_EFFECT_ -> WALLMAS_DMGREAC_ * cleanup: EnPeehat's DamageReaction -> EnPeehatDamageReaction * format * review * _DMGREAC_ -> _DMG_REAC_ * _DMG_REAC_ -> _DMG_REACT_ * format
2025-04-27Delete macros.h; Delete global.h (#2516)fig02
2025-04-23macros.h 1/?: `PRINTF` and `T` (#2509)fig02
* create printf and translation headers * non-overlays complete * printf finished * move T macro * edit comment * fix error * fix bss * remove is_64 * fix bss
2025-04-16variables.h: migrate all remaining varaibles, remove other dependencies ↵fig02
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-11variables.h cleaning: migrate audio variables (#2504)fig02
* migrate audio variables, fix libultra thing * remove extra newlines * fix * add required pragmas * fix bss * audio table fixes * fix bss
2025-04-06variables.h cleaning: migrate libultra variables (#2503)fig02
* variables.h cleaning: migrate libultra variables * another increment_block_number * fix bss
2025-04-05Remove functions.h (#2501)fig02
* 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-02-26Reduce dependencies on global.h (10) (#2490)mzxrules
* reduce z64.h size * fix z_cheap_proc.inc.c * ,bss * remove temp delcaration
2025-02-20Create headers for Game States (#2482)fig02
* make headers for gamestates * fixes * fixes 2 * bss
2025-02-19Reduce overlay dependencies on global.h (8) (#2478)mzxrules
* 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-16Reduce overlay dependencies on global.h (7) (#2472)mzxrules
* z64env_flags, z64quest_hint_commands * z64cutscene_spline, z64save.h moved from z64.h * bss * pr suggestion * bss * suggestions
2025-02-08Reduce overlay dependencies on global.h (4) (#2456)mzxrules
* remove more global.h references * .bss
2025-02-08Rename gMtx(F)Clear to gIdentityMtx(F) (#2458)mzxrules
2025-02-04Finish matching ique-cn (#2451)Tharo
* 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-01-27Split z64debug_display.h, z64draw.h, z_en_item00.h (#2443)mzxrules
* z64debug_display.h * z64draw.h * z_en_item00.h * bss
2025-01-21[iQue] Import libultra audio library files (#2433)Tharo
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-08[iQue] Create/update macros for printing debug strings (#2398)cadmic
2024-12-13[Audio 10/10] Loose ends (#2337)Tharo
* 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-11-17Decouple Debug Features From gc-eu-mq-dbg (#2296)fig02
* 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-12Completely match ntsc-1.0/1.1 bss and add to CI (#2294)cadmic
2024-10-07[includes] z_collision_check.c (#2252)Dragorn421
* [includes] z_collision_check.c * bss
2024-10-01[headers] Create zelda_arena.h, move protos to z64effect.h, and misc fixups ↵Dragorn421
(#2248) * [headers] Create z64malloc.h, move protos to z64effect.h, and misc fixups * zelda_arena.h * bss * bss2 * bss3 * bss
2024-09-30[ntsc-1.0/1.1] Match "game engine" files (#2244)cadmic
* [ntsc-1.0/1.1] Match "game engine" files * Use R_START_BTN_X/R_START_BTN_Y * Comment obvious bugs * Move Magic_Fill comments * Move EVENTINF_HORSES_INDEX printf inside #if * Replace "this function"
2024-09-28[PAL N64] Completely match pal-1.0 and pal-1.1 and add to CI (#2246)cadmic
* [PAL N64] Match pal-1.0 and pal-1.1 and add to CI * bss fixes from Jenkins
2024-09-27[headers] Create `gfxalloc.h`, `map.h`, move protos to `gfx.h`, ↵Dragorn421
`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[headers] z64bgcheck.h functions (#2239)Dragorn421
* [headers] z64bgcheck.h functions * format * bss
2024-09-25[headers] audio functions to z64audio.h and z64ocarina.h (#2223)Dragorn421
* [headers] audio functions to z64audio.h and z64ocarina.h * bss
2024-09-24create ucode_disas.h (#2222)mzxrules
* ucode_disas.h * create UcodeType * bss
2024-09-23Document Player Knockback related functions (#1601)mzxrules
* 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-16Colliders: elemType -> elemMaterial (#2189)Dragorn421
* elemType -> elemMaterial * format
2024-09-12[ntsc-1.2] Match ntsc-1.2 BSS and add to CI (#2187)cadmic
* 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-11Colliders: colType -> colMaterial (#2186)Dragorn421
* colType -> colMaterial * fixups
2024-09-07Move `Graph_Alloc` and open/close Disps to `gfx.h` (#1976)Dragorn421
* move graph_alloc and open/close Disps to gfx.h * zcolchk bss reeeeeee * fix matching gc-eu-mq (bss) * remove __gfxCtx extern * revert makefile -Werror=implicit-function-declaration * bss
2024-09-07[headers 6] collision_check functions and structs (#2148)Dragorn421
* [headers 6] collision_check functions and structs * bss
2024-09-05[ntsc-1.2] Organize n64dd declarations and convert to 1.0 addresses (#2127)cadmic
* Reorganize n64dd declarations * Fix bss * Really fix bss
2024-08-28[ntsc-1.2] Decompile fault.c (#2046)Dragorn421
* 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-27[Audio 6/?] Build Soundfonts and the Soundfont Table (#2056)Tharo
* [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-27T() macro 5 (#2089)Dragorn421
* T() in __osMalloc.c * T() in code_80097A00.c * T() in debug_malloc.c * T() in code/load.c * T() in sys_math3d.c * T() in z_collision_btltbls.c, z_fbdemo_fade.c, z_fcurve_data_skelanime.c, z_view.c * T() in z_collision_check.c * remaining T() in __osMalloc.c * __osMalloc consistency * format
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-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-08gc-us OK (#2018)cadmic
Match BSS order and delete disassembly data
2024-08-02Automate fixing BSS ordering (#2009)cadmic
* Automate fixing BSS ordering * Typo * Some cleanups * Move pragma check after printing BSS info * Some proofreading * multiprocessing, require version, some colors * Tweak output * Black + mypy * Move logging and sys.exit out of helper functions * Use stdout instead of stderr in fix_bss.py * Add suggestion to conflicting offsets error Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Remove var = list[T]() * Improve error handling Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Add error if no pointers to BSS * Add comment about process_file_worker * Only print updates if stdout is a tty * Use new binary-search-esque candidate generation algorithm Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Add Wikipedia link * More comment tweaks --------- 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>
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-04 05:04:20 +0000