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

Decompiled ovl_En_Zl1 (#169)

Browse source 
* Some progress

* progs

* More

* 1 more

* Init

* Slightly better score on one function

* 1 down!

* some progress

* Prep for PR

* PR suggestions

* OK!

* Formatting

* formatting again

* PR comments

* updating ZAP2
This commit is contained in:
Ethan Roseman 2020-05-30 09:33:29 -04:00 • committed by GitHub
parent 6d4558542a
commit 13a94482e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 909 additions and 2059 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/code/z_en_item00.c
View file

@ -478,8 +478,9 @@ void func_8001E5C8(EnItem00* this, GlobalContext* globalCtx) {
this->actor.posRot.pos.y += 40.0f + Math_Sins(this->unk_15A * 15000) * (this->unk_15A * 0.3f);
if LINK_IS_ADULT
if (LINK_IS_ADULT) {
this->actor.posRot.pos.y += 20.0f;
}
}
extern s32 D_80157D90;

6
src/code/z_play.c
View file

@ -1690,13 +1690,13 @@ void func_800C078C(GlobalContext* globalCtx, s16 camId1, s16 camId2) {
func_8005AE64(globalCtx->cameraPtrs[camIdx1], globalCtx->cameraPtrs[camIdx2]);
}
void func_800C0808(GlobalContext* globalCtx, s16 camId, s32 arg2, s16 arg3) {
s32 func_800C0808(GlobalContext* globalCtx, s16 camId, Player* player, s16 arg3) {
Camera* camera;
s16 camIdx = (camId == -1) ? globalCtx->activeCamera : camId;
camera = globalCtx->cameraPtrs[camIdx];
func_80058148(camera, arg2);
func_8005A77C(camera, arg3);
func_80058148(camera, player);
return func_8005A77C(camera, arg3);
}
void func_800C0874(GlobalContext* globalCtx, s16 camId, s16 arg2) {