mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

Document Collision_Check (#468)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* some decomp

* still playing around with this

* rename functions

* ZAP again

* ZAP again

* the renaming begins

* more renaming. hopefully didn't break anything

* change all the things

* this and then merge

* and done

* one little thing

* small docs, small rename

* changed mind on cylinder and quad elements

* something

* more stuff

* more docs

* more adjustments

* Fixed some types

* more fixes

* all sorts of cleanup

* now with flags

* match!

* names and such

* update tools

* damage tables

* ColChkInfo

* one more thing

* formatting

* more formatting

* anime merge

* some stuff

* damage table

* again

* changes

* .s

* changes

* oc2 type

* a couple things

* format

* un-name magic arrows, not enough proof yet

* fix damage table script and remove old one

* EnAObj

* changes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
petrie911 2021-01-17 20:13:36 -06:00 • committed by GitHub
parent f786f958bb
commit 02994f5339
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
487 changed files with 14371 additions and 4713 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
View file

@ -44,7 +44,7 @@ u32 EffectSsHitMark_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, vo
this->pos = initParams->pos;
this->gfx = SEGMENTED_TO_VIRTUAL(D_04021770);
if (initParams->type == 1) {
if (initParams->type == EFFECT_HITMARK_DUST) {
this->life = 16;
} else {
this->life = 8;
@ -101,7 +101,7 @@ void EffectSsHitMark_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
void EffectSsHitMark_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {
s32 colorIdx;
if (this->rType == 1) {
if (this->rType == EFFECT_HITMARK_DUST) {
this->rTexIdx = (15 - this->life) / 2;
} else {
this->rTexIdx = 7 - this->life;

7
src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
View file

@ -10,4 +10,11 @@ typedef struct {
/* 0x08 */ Vec3f pos;
} EffectSsHitMarkInitParams; // size = 0x14
typedef enum {
EFFECT_HITMARK_WHITE,
EFFECT_HITMARK_DUST,
EFFECT_HITMARK_RED,
EFFECT_HITMARK_METAL
} EffectSsHitmarkType;
#endif