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

Actor Cleanups (#177)

Browse source 
* rename init chains, colchkinfo, colider inits, damage tables

* actor cleanups

* fix collider init script names

* small fixes

* ichain arg name

* change dynapoly types and names

* revert enru1 data name

* and the type

* pr suggestions
This commit is contained in:
fig02 2020-05-31 05:55:48 -04:00 • committed by GitHub
parent 13a94482e5
commit 78d0883f04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
108 changed files with 786 additions and 869 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
View file

@ -27,10 +27,10 @@ const ActorInit Bg_Umajump_InitVars = {
(ActorFunc)BgUmaJump_Draw,
};
extern D_06001438; // segmented address: 0x06001438
extern D_06001220; // segmented address: 0x06001220
extern UNK_TYPE D_06001438;
extern Gfx D_06001220[];
static InitChainEntry initChain[] = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
@ -39,7 +39,7 @@ void BgUmaJump_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
u32 sp24 = 0;
Actor_ProcessInitChain(&this->actor, initChain);
Actor_ProcessInitChain(&this->actor, sInitChain);
DynaPolyInfo_SetActorMove(&this->actor, DPM_UNK);
DynaPolyInfo_Alloc(&D_06001438, &sp24);
this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, sp24);
@ -63,5 +63,5 @@ void BgUmaJump_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgUmaJump_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, &D_06001220);
Gfx_DrawDListOpa(globalCtx, D_06001220);
}