mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 17:00:19 +00:00
Code Issues Projects Releases Wiki Activity

Objects4 (#1057)

Browse source 
* remove fake match

* merge master

* animations

* dog limbs

* textures

* KZ limbs and DL

* a few KZ textures and make a file for link_boy

* the rest of KZ

* Far Limb DLs

* near DLs and limbs

* small fix to child

* boots and some sword and more child clean ups

* a bunch of DLs

* fix boy

* fix link child for real this time

* adult should be good now

* progress

* all undefined symbols done

* progress

* done (for now)

* restore makefile

* child -> adult

* child -> adult

* dog fixes

* KZ fixes

* more player fixes

* remove unneeded enum in dog

* rename hookshot stuff

* Update z_player_lib.c

* revert model group stuff

* move comment

* fix mirror shield upper

* remove useless 2

* OOT -> Oot

* gauntlet plate 2 fix

* fix

Co-authored-by: Louis <louist103@pop-os.localdomain>
This commit is contained in:
louist103 2021-12-27 08:08:26 -05:00 • committed by GitHub
parent 6213fe3bbd
commit a862411f00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 622 additions and 343 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c
View file

@ -5,6 +5,8 @@
*/
#include "z_eff_ss_stick.h"
#include "objects/object_link_boy/object_link_boy.h"
#include "objects/object_link_child/object_link_child.h"
#define rObjBankIdx regs[0]
#define rYaw regs[1]
@ -25,8 +27,8 @@ typedef struct {
u32 EffectSsStick_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
StickDrawInfo drawInfo[] = {
{ OBJECT_LINK_BOY, 0x0602BA38 }, // adult, broken sword
{ OBJECT_LINK_CHILD, 0x06006CC0 }, // child, broken stick
{ OBJECT_LINK_BOY, gLinkAdultBrokenGiantsKnifeBladeDL }, // adult, broken sword
{ OBJECT_LINK_CHILD, gLinkChildLinkDekuStickDL }, // child, broken stick
};
StickDrawInfo* ageInfoEntry = gSaveContext.linkAge + drawInfo;
EffectSsStickInitParams* initParams = (EffectSsStickInitParams*)initParamsx;