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

z_en_weather_tag decomp (#329)

Browse source 
* Initial commit of weather_tag actor decomp

* Formatted source files and updated spec.

* Fixed references to the environment context variable that I changed.

* Deleted the last of the asm (forgot the stuff in the data folder)

* Made all requested changes to z_en_weather_tag

* Forgot to change basereg

* Removed unnecessary field in weather tag struct

* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* That field in the header was totally necessary, not sure what I was thinking, sorry for all the commits

* Renamed what I thought was struct padding to more accurately represent the fact that that field is an unused variable.

* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
fullgrowngaming 2020-08-20 18:28:41 -07:00 • committed by GitHub
parent 4bd417aeba
commit b406e041b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 335 additions and 1163 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/overlays/actors/ovl_En_Bom/z_en_bom.c
View file

@ -155,28 +155,28 @@ void EnBom_Explode(EnBom* this, GlobalContext* globalCtx) {
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->explosionCollider.base);
}
if (globalCtx->envCtx.unk_8C[3] != 0) {
globalCtx->envCtx.unk_8C[3] -= 0x19;
if (globalCtx->envCtx.unk_8C[1][0] != 0) {
globalCtx->envCtx.unk_8C[1][0] -= 0x19;
}
if (globalCtx->envCtx.unk_8C[4] != 0) {
globalCtx->envCtx.unk_8C[4] -= 0x19;
if (globalCtx->envCtx.unk_8C[1][1] != 0) {
globalCtx->envCtx.unk_8C[1][1] -= 0x19;
}
if (globalCtx->envCtx.unk_8C[5] != 0) {
globalCtx->envCtx.unk_8C[5] -= 0x19;
if (globalCtx->envCtx.unk_8C[1][2] != 0) {
globalCtx->envCtx.unk_8C[1][2] -= 0x19;
}
if (globalCtx->envCtx.unk_8C[0] != 0) {
globalCtx->envCtx.unk_8C[0] -= 0x19;
if (globalCtx->envCtx.unk_8C[0][0] != 0) {
globalCtx->envCtx.unk_8C[0][0] -= 0x19;
}
if (globalCtx->envCtx.unk_8C[1] != 0) {
globalCtx->envCtx.unk_8C[1] -= 0x19;
if (globalCtx->envCtx.unk_8C[0][1] != 0) {
globalCtx->envCtx.unk_8C[0][1] -= 0x19;
}
if (globalCtx->envCtx.unk_8C[2] != 0) {
globalCtx->envCtx.unk_8C[2] -= 0x19;
if (globalCtx->envCtx.unk_8C[0][2] != 0) {
globalCtx->envCtx.unk_8C[0][2] -= 0x19;
}
if (this->timer == 0) {
@ -289,8 +289,8 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) {
Audio_PlayActorSound2(thisx, NA_SE_IT_BOMB_EXPLOSION);
if (globalCtx) {};
globalCtx->envCtx.unk_8C[3] = globalCtx->envCtx.unk_8C[4] = globalCtx->envCtx.unk_8C[5] = 0xFA;
globalCtx->envCtx.unk_8C[0] = globalCtx->envCtx.unk_8C[1] = globalCtx->envCtx.unk_8C[2] = 0xFA;
globalCtx->envCtx.unk_8C[1][0] = globalCtx->envCtx.unk_8C[1][1] = globalCtx->envCtx.unk_8C[1][2] = 0xFA;
globalCtx->envCtx.unk_8C[0][0] = globalCtx->envCtx.unk_8C[0][1] = globalCtx->envCtx.unk_8C[0][2] = 0xFA;
func_8005AA1C(&globalCtx->cameras[0], 2, 0xB, 8);
thisx->params = BOMB_EXPLOSION;
this->timer = 10;