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

three more matches in BgJyaCobra (#758)

Browse source 
* two matches

* cleanup and formatting

* Update assets/xml/overlays/ovl_Bg_Jya_Cobra.xml

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* no more extract

* format

* owl exterminators

* new match

* new match

* small thing

* whoops

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
This commit is contained in:
petrie911 2021-04-09 18:02:16 -05:00 • committed by GitHub
parent 99fbbd8390
commit ab05eb9776
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 320 additions and 894 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
View file

@ -1799,7 +1799,8 @@ void BossSst_HandGrab(BossSst* this, GlobalContext* globalCtx) {
this->timer--;
}
this->actor.world.rot.y = ((1.0f - sinf(this->timer * (M_PI / 60.0f))) * (this->vParity * 0x2000)) + this->targetYaw;
this->actor.world.rot.y =
((1.0f - sinf(this->timer * (M_PI / 60.0f))) * (this->vParity * 0x2000)) + this->targetYaw;
this->actor.shape.rot.y = this->actor.world.rot.y - (this->vParity * 0x4000);
if (this->timer < 5) {
Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.5f, 25.0f, 5.0f);

64
src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.c
View file

@ -317,36 +317,36 @@ static ColliderCylinderInit sCylinderInitHand = {
static CollisionCheckInfoInit sColChkInfoInit = { 36, 100, 100, 200 };
static DamageTable sDamageTable = {
/* Deku nut */ DMG_ENTRY(0 , 0x0),
/* Deku stick */ DMG_ENTRY(2 , 0x0),
/* Slingshot */ DMG_ENTRY(1 , 0x0),
/* Explosive */ DMG_ENTRY(2 , 0x0),
/* Boomerang */ DMG_ENTRY(0 , 0x0),
/* Normal arrow */ DMG_ENTRY(2 , 0x0),
/* Hammer swing */ DMG_ENTRY(2 , 0x0),
/* Hookshot */ DMG_ENTRY(2 , 0x0),
/* Kokiri sword */ DMG_ENTRY(1 , 0x0),
/* Master sword */ DMG_ENTRY(2 , 0x0),
/* Giant's Knife */ DMG_ENTRY(4 , 0x0),
/* Fire arrow */ DMG_ENTRY(2 , 0x0),
/* Ice arrow */ DMG_ENTRY(4 , 0x3),
/* Light arrow */ DMG_ENTRY(2 , 0x0),
/* Unk arrow 1 */ DMG_ENTRY(4 , 0x0),
/* Unk arrow 2 */ DMG_ENTRY(2 , 0x0),
/* Unk arrow 3 */ DMG_ENTRY(2 , 0x0),
/* Fire magic */ DMG_ENTRY(0 , 0x0),
/* Ice magic */ DMG_ENTRY(4 , 0x3),
/* Light magic */ DMG_ENTRY(4 , 0x4),
/* Shield */ DMG_ENTRY(0 , 0x0),
/* Mirror Ray */ DMG_ENTRY(0 , 0x0),
/* Kokiri spin */ DMG_ENTRY(1 , 0x0),
/* Giant spin */ DMG_ENTRY(4 , 0x0),
/* Master spin */ DMG_ENTRY(2 , 0x0),
/* Kokiri jump */ DMG_ENTRY(2 , 0x0),
/* Giant jump */ DMG_ENTRY(8 , 0x0),
/* Master jump */ DMG_ENTRY(4 , 0x0),
/* Unknown 1 */ DMG_ENTRY(0 , 0x0),
/* Unblockable */ DMG_ENTRY(0 , 0x0),
/* Hammer jump */ DMG_ENTRY(4 , 0x0),
/* Unknown 2 */ DMG_ENTRY(0 , 0x0),
/* Deku nut */ DMG_ENTRY(0, 0x0),
/* Deku stick */ DMG_ENTRY(2, 0x0),
/* Slingshot */ DMG_ENTRY(1, 0x0),
/* Explosive */ DMG_ENTRY(2, 0x0),
/* Boomerang */ DMG_ENTRY(0, 0x0),
/* Normal arrow */ DMG_ENTRY(2, 0x0),
/* Hammer swing */ DMG_ENTRY(2, 0x0),
/* Hookshot */ DMG_ENTRY(2, 0x0),
/* Kokiri sword */ DMG_ENTRY(1, 0x0),
/* Master sword */ DMG_ENTRY(2, 0x0),
/* Giant's Knife */ DMG_ENTRY(4, 0x0),
/* Fire arrow */ DMG_ENTRY(2, 0x0),
/* Ice arrow */ DMG_ENTRY(4, 0x3),
/* Light arrow */ DMG_ENTRY(2, 0x0),
/* Unk arrow 1 */ DMG_ENTRY(4, 0x0),
/* Unk arrow 2 */ DMG_ENTRY(2, 0x0),
/* Unk arrow 3 */ DMG_ENTRY(2, 0x0),
/* Fire magic */ DMG_ENTRY(0, 0x0),
/* Ice magic */ DMG_ENTRY(4, 0x3),
/* Light magic */ DMG_ENTRY(4, 0x4),
/* Shield */ DMG_ENTRY(0, 0x0),
/* Mirror Ray */ DMG_ENTRY(0, 0x0),
/* Kokiri spin */ DMG_ENTRY(1, 0x0),
/* Giant spin */ DMG_ENTRY(4, 0x0),
/* Master spin */ DMG_ENTRY(2, 0x0),
/* Kokiri jump */ DMG_ENTRY(2, 0x0),
/* Giant jump */ DMG_ENTRY(8, 0x0),
/* Master jump */ DMG_ENTRY(4, 0x0),
/* Unknown 1 */ DMG_ENTRY(0, 0x0),
/* Unblockable */ DMG_ENTRY(0, 0x0),
/* Hammer jump */ DMG_ENTRY(4, 0x0),
/* Unknown 2 */ DMG_ENTRY(0, 0x0),
};