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

Oshihiki (#441)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* matching

* format

* document and format

* .s files

* cleanup and macros in block-related actors

* fixed a few more things, also an error I cso an error I caught in another file.
This commit is contained in:
petrie911 2020-10-26 08:33:58 -05:00 • committed by GitHub
parent 695552f0b8
commit 93fc51e9b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 715 additions and 1956 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c
View file

@ -5,6 +5,7 @@
*/
#include "z_obj_blockstop.h"
#include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h"
#define FLAGS 0x00000000
@ -50,8 +51,9 @@ void ObjBlockstop_Update(Actor* thisx, GlobalContext* globalCtx) {
&this->actor.floorPoly, 0, 0, 1, 1, &sp48, &this->actor)) {
dynaActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, sp48);
if ((dynaActor != NULL) && (dynaActor->actor.id == 0xFF)) {
if (((dynaActor->actor.params & 0x000F) == 3) || ((dynaActor->actor.params & 0x000F) == 7)) {
if ((dynaActor != NULL) && (dynaActor->actor.id == ACTOR_OBJ_OSHIHIKI)) {
if (((dynaActor->actor.params & 0xF) == PUSHBLOCK_HUGE_START_ON) ||
((dynaActor->actor.params & 0xF) == PUSHBLOCK_HUGE_START_OFF)) {
func_80078884(NA_SE_SY_CORRECT_CHIME);
} else {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR);