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

New tool: sfxconvert (#514)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* new tool

* python function conventions

* new name

* new error handling

* whoops comments
This commit is contained in:
petrie911 2020-12-09 18:39:32 -06:00 • committed by GitHub
parent 96512ee3ab
commit 0c2b92125f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 185 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -585,7 +585,7 @@ void func_80AEBAFC(EnRu1* this) {
void func_80AEBB3C(EnRu1* this) {
if (func_800A56C8(&this->skelAnime, 5.0f)) {
func_80078914(&this->actor.projectedPos, 0x863);
func_80078914(&this->actor.projectedPos, NA_SE_PL_FACE_UP);
}
}
@ -595,13 +595,13 @@ void func_80AEBB78(EnRu1* this) {
if ((((func_800A56C8(skelAnime, 4.0f)) || (func_800A56C8(skelAnime, 13.0f))) ||
(func_800A56C8(skelAnime, 22.0f))) ||
(func_800A56C8(skelAnime, 31.0f))) {
func_80078914(&this->actor.projectedPos, 0x839);
func_80078914(&this->actor.projectedPos, NA_SE_PL_SWIM);
}
}
void func_80AEBBF4(EnRu1* this) {
if (func_800A56C8(&this->skelAnime, 8.0f)) {
func_80078914(&this->actor.projectedPos, 0x873);
func_80078914(&this->actor.projectedPos, NA_SE_PL_SUBMERGE);
}
}
@ -856,7 +856,7 @@ void func_80AEC650(EnRu1* this) {
s32 pad[2];
if (this->unk_280 == 0) {
if ((func_800A56C8(&this->skelAnime, 2.0f)) || (func_800A56C8(&this->skelAnime, 7.0f))) {
func_80078914(&this->actor.projectedPos, 0x803);
func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_DIRT);
}
}
}
@ -1926,7 +1926,7 @@ void func_80AEF40C(EnRu1* this) {
if ((func_800A56C8(skelAnime, 2.0f)) || (func_800A56C8(skelAnime, 7.0f)) || (func_800A56C8(skelAnime, 12.0f)) ||
(func_800A56C8(skelAnime, 18.0f)) || (func_800A56C8(skelAnime, 25.0f)) || (func_800A56C8(skelAnime, 33.0f))) {
func_80078914(&this->actor.projectedPos, 0x803);
func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_DIRT);
}
}