kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Created inital yaml for decompressed rom, edited makefile to build it and fixed all undefined symbol/multiple definition errors

Browse Source
This commit is contained in:
Mr-Wiseguy
2022-10-28 02:46:26 -04:00
parent cc8a6ffc78
commit e1bf4549e3
174 changed files with 3648 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/GV/code_0.c
View File

@@ -5,7 +5,7 @@
void chtoots_update(Actor *this);
/* .data */
ActorAnimationInfo D_80390BD0[] = {
ActorAnimationInfo GV_D_80390BD0[] = {
{0x000, 0.0f},
{ASSET_162_ANIM_TOOTS_IDLE, 5.0f},
{ASSET_162_ANIM_TOOTS_IDLE, 2.5f},
@@ -13,7 +13,7 @@ ActorAnimationInfo D_80390BD0[] = {
};
ActorInfo D_80390BF0 = { MARKER_1F4_TOOTS, ACTOR_1E4_TOOTS, ASSET_434_MODEL_TOOTS,
0x1, D_80390BD0,
0x1, GV_D_80390BD0,
chtoots_update, func_80326224, func_80325888,
2000, 0, 0.5f, 0
};
@@ -23,12 +23,12 @@ s32 D_80391A30;
s32 D_80391A34;
/* .code */
void func_803863F0(Actor *this){
void GV_func_803863F0(Actor *this){
func_80328B8C(this, 1, 0.0001f, 1);
D_80391A30 = FALSE;
}
void func_80386420(Actor *this){
void GV_func_80386420(Actor *this){
func_80328B8C(this, 2, 0.0001f, 1);
this->unk38_31 = 0x23;
}
@@ -50,7 +50,7 @@ void chtoots_update(Actor *this){
func_80386464(this);
}
else if(D_80391A30 == TRUE){
func_80386420(this);
GV_func_80386420(this);
}
break;
case 2://L80386540
@@ -64,12 +64,12 @@ void chtoots_update(Actor *this){
}
}
else{
func_803863F0(this);
GV_func_803863F0(this);
}
break;
case 3://L803865C8
if(!D_80391A34)
func_803863F0(this);
GV_func_803863F0(this);
break;
}//L803865DC
}

10
src/GV/code_1570.c
View File

@@ -13,7 +13,7 @@ void chgobi2_update(Actor *this);
Actor *chgobi2_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorInfo D_80390CB0 = { MARKER_BF_GOBI_2, ACTOR_131_GOBI_2, ASSET_3E0_MODEL_GOBI,
ActorInfo GV_D_80390CB0 = { MARKER_BF_GOBI_2, ACTOR_131_GOBI_2, ASSET_3E0_MODEL_GOBI,
0x0, NULL,
NULL, chgobi2_update, chgobi2_draw,
0, 0x533, 0.0f, 0
@@ -26,7 +26,7 @@ f32 D_80390CEC[3] = {1145.0f, 443.0f, 9197.0f};
extern u8 D_80391A50;
/* .code */
void func_80387960(void){
void GV_func_80387960(void){
func_8028F490(D_80390CD4);
}
@@ -43,7 +43,7 @@ void func_803879D4(ActorMarker *this_marker){
chgobi2_setState(this, 4);
}
void func_80387A00(ActorMarker *this_marker){
void GV_func_80387A00(ActorMarker *this_marker){
Actor *this = marker_getActor(reinterpret_cast(ActorMarker *, this_marker));
chgobi2_setState(this, 7);
}
@@ -57,7 +57,7 @@ void func_80387A2C(ActorMarker *caller, enum asset_e text_id, s32 arg2){
timed_setCameraToNode(3.0f, 0xd);
timedFunc_set_0(3.5f, __chgobi2_spawnJIggy);
func_80324E88(6.0f);
timedFunc_set_1(6.0f, (GenMethod_1) func_80387A00, reinterpret_cast(s32, caller));
timedFunc_set_1(6.0f, (GenMethod_1) GV_func_80387A00, reinterpret_cast(s32, caller));
func_80324E38(6.0f, 0);
}
@@ -76,7 +76,7 @@ void chgobi2_setState(Actor *this, s32 next_state){
}
if(next_state == 3){
timedFunc_set_0(0.05f, func_80387960);
timedFunc_set_0(0.05f, GV_func_80387960);
timed_playSfx(0.05f, SFX_84_GOBI_CRYING, 1.1f, 32000);
func_80324E38(0.051f, 1);
timedFunc_set_1(0.06f, (GenMethod_1)func_803879D4, reinterpret_cast(s32, this->marker));

24
src/GV/code_230.c
View File

@@ -17,9 +17,9 @@ void chancientone_update(Actor *this);
Actor *chancientone_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
s16 D_80390C20[4] = {5, 6, 7, 8};
s16 GV_D_80390C20[4] = {5, 6, 7, 8};
ActorMarker *D_80390C28[5] = {NULL};
ActorAnimationInfo D_80390C3C[] = {
ActorAnimationInfo GV_D_80390C3C[] = {
{0, 0.0f},
{0, 0.0f},
{ASSET_ED_ANIM_ANCIENT_ONE, 2.0f},
@@ -27,7 +27,7 @@ ActorAnimationInfo D_80390C3C[] = {
};
ActorInfo D_80390C5C = { MARKER_F4_ANCIENT_ONE, ACTOR_147_ANCIENT_ONE, ASSET_3E8_MODEL_ANCIENT_ONE,
0x1, D_80390C3C,
0x1, GV_D_80390C3C,
chancientone_update, func_80326224, chancientone_draw,
0, 0x100, 0.0f, 0
};
@@ -48,19 +48,19 @@ void func_80386620(Actor *this){
return;
}
D_80390C20[0] = 5;
D_80390C20[1] = 6;
D_80390C20[2] = 7;
D_80390C20[3] = 8;
GV_D_80390C20[0] = 5;
GV_D_80390C20[1] = 6;
GV_D_80390C20[2] = 7;
GV_D_80390C20[3] = 8;
phi_s3 = (randf() * 1.0737418e9f);
phi_s2 = 1;
phi_s1 = 0;
while(phi_s2 != 0x40000000){
if ((phi_s3 & phi_s2) != 0) {
temp_a1 = D_80390C20[phi_s1];
D_80390C20[phi_s1] = D_80390C20[phi_s1 + 1];
D_80390C20[phi_s1 + 1] = temp_a1;
temp_a1 = GV_D_80390C20[phi_s1];
GV_D_80390C20[phi_s1] = GV_D_80390C20[phi_s1 + 1];
GV_D_80390C20[phi_s1 + 1] = temp_a1;
temp_a0 = D_80390C28[phi_s1 + 1];
D_80390C28[phi_s1 + 1] = D_80390C28[phi_s1 + 2];
D_80390C28[phi_s1 + 2] = temp_a0;
@@ -166,7 +166,7 @@ void chancientone_update(Actor *this){
actor_playAnimationOnce(this);
if(this->unkF4_8 < 5){
D_80390C28[this->unkF4_8]->propPtr->unk8_4 = TRUE;
func_802BAFE4(D_80390C20[this->unkF4_8 - 1]);
func_802BAFE4(GV_D_80390C20[this->unkF4_8 - 1]);
func_80244BB0(2, 0x86, 0x7ff8, 0.3f);
timedFunc_set_0(0.45f, func_8038678C);
@@ -259,7 +259,7 @@ Actor *chancientone_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **v
}
void func_80387118(void){
void GV_func_80387118(void){
int i;
for(i = 0; i < 5; i++){
D_80390C28[i] = NULL;

11
src/GV/code_2730.c
View File

@@ -24,7 +24,8 @@ ActorInfo D_80390D60 = { 0xBE, 0x130, 0x3E4,
f32 D_80390D84[3] = {5644.0f, 2930.0f, -3258.0f};
/*.bss */
u8 D_80391A60;
u8 GV_pad1[0x10];
u8 GV_D_80391A60;
/* .code */
void func_80388B20(Actor *this, s32 next_state){
@@ -32,11 +33,11 @@ void func_80388B20(Actor *this, s32 next_state){
this->state = next_state;
local->unk14 = 0.0f;
D_80391A60 = FALSE;
GV_D_80391A60 = FALSE;
if(this->state == 2){
this->marker->propPtr->unk8_3 = FALSE;
local->unk14 = 2.6f;
D_80391A60 = TRUE;
GV_D_80391A60 = TRUE;
func_8028F428(2, this->marker);
FUNC_8030E624(SFX_9B_BOULDER_BREAKING_1, 0.3f, 9000);
FUNC_8030E624(SFX_9B_BOULDER_BREAKING_1, 0.5f, 9000);
@@ -79,7 +80,7 @@ Actor *func_80388C64(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
s32 func_80388D78(void){
return D_80391A60;
return GV_D_80391A60;
}
void func_80388D84(Actor *this){
@@ -103,7 +104,7 @@ void func_80388DC8(Actor *this){
marker_setCollisionScripts(this->marker, NULL, NULL, func_80388C24);
local->unkC = particleEmitter_new(20);
local->unk10 = particleEmitter_new(30);
D_80391A60 = FALSE;
GV_D_80391A60 = FALSE;
sp28 = func_80326D68(this->position, ACTOR_12E_GOBI_1, -1, &sp2C);
if(sp28){
this->position_x = sp28->position_x;

8
src/GV/code_2B80.c
View File

@@ -15,7 +15,7 @@ ActorInfo D_80390D90 = {
};
/* .code */
void func_80388F70(Actor *this, s32 next_state){
void GV_func_80388F70(Actor *this, s32 next_state){
this->state = next_state;
if(this->state == 1){
func_80335924(this->unk148, ASSET_FE_ANIM_TRUCKER_SHORT, 0.1f, 2.5f);
@@ -62,10 +62,10 @@ void func_80389144(Actor *this){
actor_collisionOff(this);
mapSpecificFlags_set(0xC, FALSE);
if(jiggyscore_isSpawned(JIGGY_45_GV_GOBI_2) && !func_803203FC(1)){
func_80388F70(this, 3);
GV_func_80388F70(this, 3);
}
else{//L803891CC
func_80388F70(this, 1);
GV_func_80388F70(this, 1);
}
}//L803891D8
if( this->state == 1
@@ -87,5 +87,5 @@ void func_80389144(Actor *this){
}
if(sp28)
func_80388F70(this, sp28);
GV_func_80388F70(this, sp28);
}

2
src/GV/code_2EE0.c
View File

@@ -11,7 +11,7 @@ extern ActorAnimationInfo D_80390DC0[]={
{ASSET_F1_ANIM_MAGIC_CARPET, 2.0f}
};
extern ActorInfo D_80390DD0 = { MARKER_AF_MAGIC_CARPET_SHADOW, ACTOR_122_MAGIC_CARPET_SHADOW, ASSET_3E7_MODEL_MAGIC_CARPET_SHADOW,
extern ActorInfo GV_D_80390DD0 = { MARKER_AF_MAGIC_CARPET_SHADOW, ACTOR_122_MAGIC_CARPET_SHADOW, ASSET_3E7_MODEL_MAGIC_CARPET_SHADOW,
0x1, D_80390DC0,
func_8038938C, func_80326224, func_803892D0,
2500, 0, 0.0f, 0

14
src/GV/code_30C0.c
View File

@@ -9,7 +9,7 @@ void func_80389634(Actor *this);
void func_803898B8(Actor *this);
/* .data */
ActorAnimationInfo D_80390E00[] = {
ActorAnimationInfo GV_D_80390E00[] = {
{0x00, 0.0f},
{0xCD, 8000000.0f},
{0xCD, 2.5f},
@@ -18,14 +18,14 @@ ActorAnimationInfo D_80390E00[] = {
{0xCD, 4.5f},
};
ActorInfo D_80390E30 = { 0xA8, 0x11A, 0x33D,
0x1, D_80390E00,
ActorInfo GV_D_80390E30 = { 0xA8, 0x11A, 0x33D,
0x1, GV_D_80390E00,
func_80389634, func_80326224, func_80325888,
2500, 0, 0.0f, 0
};
ActorInfo D_80390E54 = { 0x23B, 0x244, 0x33D,
0x1, D_80390E00,
0x1, GV_D_80390E00,
func_803898B8, func_80326224, func_80325888,
0, 0, 0.0f, 0
};
@@ -33,7 +33,7 @@ s32 D_80390E78[4] = {0xff, 0xd0, 0x5d, 0xb4};
s32 D_80390E88[4] = {0, 0, 0, 0};
/* .code */
void func_803894B0(Actor *this){
void GV_func_803894B0(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
func_80328B8C(this, 1, 0.01f, 1);
@@ -68,7 +68,7 @@ void func_80389634(Actor *this){
switch(this->state){
case 1: //L80389680
if(!this->initialized){
func_803894B0(this);
GV_func_803894B0(this);
}
if(func_80329530(this, 500) && func_8038957C(this)){
func_80328B8C(this, 2, 0.01f, 1);
@@ -120,7 +120,7 @@ void func_80389634(Actor *this){
void func_803898B8(Actor *this){
if(!this->initialized){
func_803894B0(this);
GV_func_803894B0(this);
if(func_8031FF1C(BKPROG_A4_UNKOWN))
func_80328B8C(this, 3, 0.5f, 1);
this->unk1C[0] = 0.0f;

10
src/GV/code_3AA0.c
View File

@@ -2,22 +2,22 @@
#include "functions.h"
#include "variables.h"
void func_80389E90(Actor *this);
void func_80389EA8(Actor *this);
void GV_func_80389E90(Actor *this);
void GV_func_80389EA8(Actor *this);
/* .data */
ActorInfo D_80390F00 = { MARKER_AB_RUBEES_EGG_POT, ACTOR_11D_RUBEES_EGG_POT, ASSET_3E1_MODEL_RUBEES_EGG_POT,
0x1, NULL,
func_80389E90, func_80389EA8, func_80325888,
GV_func_80389E90, GV_func_80389EA8, func_80325888,
2500, 0, 0.9f, 0
};
/* .code */
void func_80389E90(Actor *this){
void GV_func_80389E90(Actor *this){
this->marker->propPtr->unk8_3 = FALSE;
}
void func_80389EA8(Actor *this){
void GV_func_80389EA8(Actor *this){
this->marker->propPtr->unk8_3 = FALSE;
this->unk4C = 100 + 40*func_8038E178();
func_80343DEC(this);

6
src/GV/code_3BB0.c
View File

@@ -4,12 +4,12 @@
extern int func_8024DB50(f32[3], f32);
void func_8038A084(Actor *this);
void GV_func_8038A084(Actor *this);
/* .data */
ActorInfo D_80390F40 = { 0x24F, 0x37C, 0x0,
0, NULL,
func_8038A084, func_80326224, func_80325340,
GV_func_8038A084, func_80326224, func_80325340,
2000, 0, 0.0f, 0
};
@@ -45,7 +45,7 @@ void func_80389FA0(f32 position[3]){
func_802EFC28(pCtrl, &D_80390F64);
}
void func_8038A084(Actor *this){
void GV_func_8038A084(Actor *this){
if(this->unkF4_8 == 6 && !this->unk16C_4){
this->unk16C_4 = TRUE;
if( jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID) && this->yaw == 1.0f){

6
src/GV/code_43B0.c
View File

@@ -7,7 +7,7 @@ void func_80329904(ActorMarker *, s32, void *);
void func_8038A948(Actor *this);
void func_8038A9C0(Actor *this);
void GV_func_8038A9C0(Actor *this);
Actor *func_8038A7A0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
@@ -18,7 +18,7 @@ ActorAnimationInfo D_80391000[] = {
ActorInfo D_80391010 = { MARKER_A7_MAGIC_CARPET_1, ACTOR_119_MAGIC_CARPET_1, ASSET_3DC_MODEL_MAGIC_CARPET,
0x1, D_80391000,
func_8038A948, func_8038A9C0, func_8038A7A0,
func_8038A948, GV_func_8038A9C0, func_8038A7A0,
2500, 0, 0.0f, 0
};
@@ -73,7 +73,7 @@ void func_8038A948(Actor *this){
}
}
void func_8038A9C0(Actor *this){
void GV_func_8038A9C0(Actor *this){
Actor * sp24;
if(!this->initialized){
this->initialized = TRUE;

38
src/GV/code_4740.c
View File

@@ -34,7 +34,7 @@ struct43s D_803910D4 = {
};
/* .bss */
f32 D_80391A70[3];
f32 GV_D_80391A70[3];
/* .code */
void func_8038AB30(ParticleEmitter *pCtrl, f32 position[3], s32 cnt){
@@ -233,15 +233,15 @@ void func_8038B124(Actor *this){
func_8038ABD8(this->position, 8);
}
else{
D_80391A70[0] = 2*this->unk28;
D_80391A70[1] = 0.0f;
D_80391A70[2] = 0.0f;
ml_vec3f_yaw_rotate_copy(D_80391A70, D_80391A70, this->yaw - 90.0);
GV_D_80391A70[0] = 2*this->unk28;
GV_D_80391A70[1] = 0.0f;
GV_D_80391A70[2] = 0.0f;
ml_vec3f_yaw_rotate_copy(GV_D_80391A70, GV_D_80391A70, this->yaw - 90.0);
D_80391A70[0] = D_80391A70[0] + this->position[0];
D_80391A70[1] = D_80391A70[1] + this->position[1];
D_80391A70[2] = D_80391A70[2] + this->position[2];
func_8038ABD8(D_80391A70, 1);
GV_D_80391A70[0] = GV_D_80391A70[0] + this->position[0];
GV_D_80391A70[1] = GV_D_80391A70[1] + this->position[1];
GV_D_80391A70[2] = GV_D_80391A70[2] + this->position[2];
func_8038ABD8(GV_D_80391A70, 1);
}
break;
@@ -261,10 +261,10 @@ void func_8038B124(Actor *this){
case 5: //L8038B67C
if(this->marker->unk14_21 && actor_animationIsAt(this, 0.79f)){
func_8034A174(this->marker->unk44, 5, D_80391A70);
func_8038ACEC(D_80391A70, 2);
func_8034A174(this->marker->unk44, 6, D_80391A70);
func_8038ACEC(D_80391A70, 3);
func_8034A174(this->marker->unk44, 5, GV_D_80391A70);
func_8038ACEC(GV_D_80391A70, 2);
func_8034A174(this->marker->unk44, 6, GV_D_80391A70);
func_8038ACEC(GV_D_80391A70, 3);
func_802BB3DC(0, 18.0f, 0.92f);
func_8030E878(SFX_3_DULL_CANNON_SHOT, 1.0f, 32000, this->position, 2250.0f, 4500.0f);
}//L8038B734
@@ -304,12 +304,12 @@ void func_8038B124(Actor *this){
case 9: //L8038B870
func_80328A84(this, 0xA);
func_8038ACEC(this->position, 2);
func_8034A174(this->marker->unk44, 5, D_80391A70);
func_8038ACEC(D_80391A70, 2);
func_8038ADFC(D_80391A70, 3);
func_8034A174(this->marker->unk44, 6, D_80391A70);
func_8038ACEC(D_80391A70, 3);
func_8038ADFC(D_80391A70, 2);
func_8034A174(this->marker->unk44, 5, GV_D_80391A70);
func_8038ACEC(GV_D_80391A70, 2);
func_8038ADFC(GV_D_80391A70, 3);
func_8034A174(this->marker->unk44, 6, GV_D_80391A70);
func_8038ACEC(GV_D_80391A70, 3);
func_8038ADFC(GV_D_80391A70, 2);
break;
case 10: //L8038B900

8
src/GV/code_5570.c
View File

@@ -9,7 +9,7 @@ typedef struct {
s32 unk0;
}ActorLocal_Grabba;
void func_8038BEA0(Actor *this);
void GV_func_8038BEA0(Actor *this);
/* .data */
ActorAnimationInfo D_80391120[] ={
@@ -24,7 +24,7 @@ ActorAnimationInfo D_80391120[] ={
ActorInfo D_80391158 = { MARKER_A6_GRABBA, ACTOR_118_GRABBA, ASSET_371_MODEL_GRABBA,
0x1, D_80391120,
func_8038BEA0, func_80326224, func_80325888,
GV_func_8038BEA0, func_80326224, func_80325888,
0, 0, 0.0f, 0
};
@@ -153,7 +153,7 @@ void func_8038BD8C(f32 position[3], s32 cnt){
particleEmitter_emitN(pCtrl, cnt);
}
void func_8038BEA0(Actor *this){
void GV_func_8038BEA0(Actor *this){
ActorLocal_Grabba *local = (ActorLocal_Grabba *)&this->local;
f32 sp38[3];
@@ -318,6 +318,6 @@ void func_8038BEA0(Actor *this){
}//L8038C5AC
}
s32 func_8038C5BC(void){
s32 GV_func_8038C5BC(void){
return D_80391A80;
}

23
src/GV/code_61E0.c
View File

@@ -2,8 +2,8 @@
#include "functions.h"
#include "variables.h"
void func_8038C658(Actor *this);
Actor *func_8038C5D0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void GV_func_8038C658(Actor *this);
Actor *GV_func_8038C5D0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
ActorAnimationInfo D_80391190[] = {
@@ -17,32 +17,33 @@ ActorAnimationInfo D_80391190[] = {
ActorInfo D_803911C0 = { 0xAC, 0x11E, 0x3E5,
0, D_80391190,
func_8038C658, func_80326224, func_8038C5D0,
GV_func_8038C658, func_80326224, GV_func_8038C5D0,
0, 0, 0.0f, 0
};
/* .bss */
s32 D_80391A90;
u8 GV_pad2[0x10];
s32 GV_D_80391A90;
/* .code */
Actor *func_8038C5D0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *GV_func_8038C5D0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(this_marker);
if( this->state == 2
|| this->state == 3
|| this->state == 4
|| this->state == 5
){
if(!D_80391A90)
if(!GV_D_80391A90)
return func_80325888(this_marker, gfx, mtx, vtx);
}
return this;
}
void func_8038C658(Actor *this){
void GV_func_8038C658(Actor *this){
s32 sp24;
if(!this->initialized){
actor_collisionOff(this);
D_80391A90 = FALSE;
GV_D_80391A90 = FALSE;
this->initialized = TRUE;
this->position_y += 4.0f;
}
@@ -51,13 +52,13 @@ void func_8038C658(Actor *this){
this->unk16C_4 = TRUE;
func_80328B8C(this, this->state, 0.01f, 1);
}
sp24 = func_8038C5BC();
if(D_80391A90)
sp24 = GV_func_8038C5BC();
if(GV_D_80391A90)
marker_despawn(this->marker);
if(this->state != sp24)
func_80328A84(this, sp24);
}
void func_8038C748(void){
D_80391A90 = TRUE;
GV_D_80391A90 = TRUE;
}

16
src/GV/code_7530.c
View File

@@ -29,7 +29,7 @@ ActorInfo D_80391318 = { 0xAA, 0x11C, 0x3DE,
extern struct {
s32 unk0;
s32 unk4;
}D_80391AB0;
}GV_D_80391AB0;
extern s32 D_80391AB8;
/* .code */
@@ -69,25 +69,25 @@ Actor *func_8038DA18(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_8038DB0C(Actor *this){
void GV_func_8038DB0C(Actor *this){
func_80328B8C(this, 1, 0.99f, 0);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
}
void func_8038DB4C(s32 arg0){
D_80391AB0.unk0 = arg0;
GV_D_80391AB0.unk0 = arg0;
}
void func_8038DB58(s32 arg0){
D_80391AB0.unk4 = arg0;
GV_D_80391AB0.unk4 = arg0;
}
s32 func_8038DB64(void){
return D_80391AB0.unk4;
return GV_D_80391AB0.unk4;
}
void func_8038DB70(void){
D_80391AB0.unk4++;
GV_D_80391AB0.unk4++;
}
@@ -141,7 +141,7 @@ void func_8038DBDC(Actor *this){
}
}
else if(actor_animationIsAt(this, 0.99f)){//L8038DD94
func_8038DB0C(this);
GV_func_8038DB0C(this);
func_8038DB88(this);
}
else{ //L8038DDC0
@@ -211,7 +211,7 @@ void func_8038DBDC(Actor *this){
break;
case 6: //8038E080
if(actor_animationIsAt(this, 0.89f)){
func_8038DB0C(this);
GV_func_8038DB0C(this);
func_8038DB88(this);
}
else{

8
src/GV/code_7D50.c
View File

@@ -6,16 +6,16 @@ struct {
s32 unk0;
u8 pad4[4];
s32 unk8;
}D_80391AB0;
}GV_D_80391AB0;
/* .code */
void func_8038E140(void){
D_80391AB0.unk0++;
GV_D_80391AB0.unk0++;
func_8025A6EC(COMUSIC_2B_DING_B, 26000);
}
s32 func_8038E178(void){
return D_80391AB0.unk0;
return GV_D_80391AB0.unk0;
}
s32 func_8038E184(void){
@@ -23,5 +23,5 @@ s32 func_8038E184(void){
}
void func_8038E18C(void){
D_80391AB0.unk8 = TRUE;
GV_D_80391AB0.unk8 = TRUE;
}

8
src/GV/code_7FC0.c
View File

@@ -5,18 +5,18 @@
void func_8038E3B0(Actor *this);
/* .data */
ActorAnimationInfo D_80391380[] = {
ActorAnimationInfo GV_D_80391380[] = {
{0, 0.0f},
{0, 0.0f}
};
ActorInfo D_80391390 = { 0xFA, 0x1F8, 0x423,
0x1, D_80391380,
ActorInfo GV_D_80391390 = { 0xFA, 0x1F8, 0x423,
0x1, GV_D_80391380,
func_8038E3B0, func_80326224, func_80325888,
0, 0x100, 0.0f, 0
};
ActorInfo D_803913B4 = { 0xFB, 0x1F9, 0x424,
0x1, D_80391380,
0x1, GV_D_80391380,
func_8038E3B0, func_80326224, func_80325888,
0, 0x100, 0.0f, 0
};

30
src/GV/code_7FF0.c
View File

@@ -16,11 +16,11 @@ extern ActorInfo D_80390C5C;
extern ActorInfo D_80390C80;
extern ActorInfo D_80390D30;
extern ActorInfo D_80390D60;
extern ActorInfo D_80390CB0;
extern ActorInfo GV_D_80390CB0;
extern ActorInfo D_80390D00;
extern ActorInfo D_80390D90;
extern ActorInfo D_80390DD0;
extern ActorInfo D_80390E30;
extern ActorInfo GV_D_80390DD0;
extern ActorInfo GV_D_80390E30;
extern ActorInfo D_80390E54;
extern ActorInfo D_80390ED0;
extern ActorInfo D_80390F00;
@@ -36,7 +36,7 @@ extern ActorInfo D_80391260;
extern ActorInfo D_80391318;
extern ActorInfo D_80391358;
extern ActorInfo D_803912B8;
extern ActorInfo D_80391390;
extern ActorInfo GV_D_80391390;
extern ActorInfo D_803913B4;
extern ActorInfo D_80390F40;
extern ActorInfo D_80391494;
@@ -44,8 +44,8 @@ extern ActorInfo D_803915C0;
extern ActorInfo D_80391620;
extern ActorInfo D_803914B8;
extern ActorInfo D_803914DC;
extern ActorInfo D_80391500;
extern ActorInfo D_80391524;
extern ActorInfo GV_D_80391500;
extern ActorInfo GV_D_80391524;
extern ActorInfo D_8039156C;
extern ActorInfo D_80391428;
extern ActorInfo D_8039144C;
@@ -116,13 +116,13 @@ ActorInfo D_803914DC = { MARKER_ED_GV_SUN_DOOR, ACTOR_140_GV_SUN_DOOR, ASSET_3FF
0, 0, 0.0f, 0
};
ActorInfo D_80391500 = { MARKER_F0_GV_KAZOOIE_DOOR, ACTOR_143_GV_KAZOOIE_DOOR, ASSET_3D9_MODEL_GV_KAZOOIE_DOOR,
ActorInfo GV_D_80391500 = { MARKER_F0_GV_KAZOOIE_DOOR, ACTOR_143_GV_KAZOOIE_DOOR, ASSET_3D9_MODEL_GV_KAZOOIE_DOOR,
0x1, 0x0,
chKazooieDoor_update, func_80326224, func_80325F2C,
0, 0, 0.0f, 0
};
ActorInfo D_80391524 = { MARKER_EF_GV_STAR_HATCH, ACTOR_142_GV_STAR_HATCH, ASSET_3DB_MODEL_GV_STAR_HATCH,
ActorInfo GV_D_80391524 = { MARKER_EF_GV_STAR_HATCH, ACTOR_142_GV_STAR_HATCH, ASSET_3DB_MODEL_GV_STAR_HATCH,
0x1, 0x0,
func_8038E648, func_80326224, func_80325F2C,
0, 0, 0.0f, 0
@@ -465,18 +465,18 @@ void func_8038F130(UNK_TYPE(s32) arg0, ActorMarker *arg1){
func_8038F028(arg0, arg1, 1, 0); //JINXY egg flags?
}
void func_8038F154(void)
void GV_func_8038F154(void)
{
spawnableActorList_add(&D_80390BF0, actor_new, 0X180);
spawnableActorList_add(&D_80390C5C, actor_new, 0X58A);
spawnableActorList_add(&D_80390C80, actor_new, 0X9A8);
spawnableActorList_add(&D_80390D30, actor_new, 0X880);
spawnableActorList_add(&D_80390D60, actor_new, 0X80);
spawnableActorList_add(&D_80390CB0, actor_new, 0XDA8);
spawnableActorList_add(&GV_D_80390CB0, actor_new, 0XDA8);
spawnableActorList_add(&D_80390D00, actor_new, 0X9A8);
spawnableActorList_add(&D_80390D90, actor_new, 0XD80);
spawnableActorList_add(&D_80390DD0, actor_new, 0X4004);
spawnableActorList_add(&D_80390E30, actor_new, 0X448);
spawnableActorList_add(&GV_D_80390DD0, actor_new, 0X4004);
spawnableActorList_add(&GV_D_80390E30, actor_new, 0X448);
spawnableActorList_add(&D_80390E54, actor_new, 0X48);
spawnableActorList_add(&D_80390ED0, actor_new, 0X180);
spawnableActorList_add(&D_80390F00, actor_new, 0X80);
@@ -492,7 +492,7 @@ void func_8038F154(void)
spawnableActorList_add(&D_80391318, actor_new, 0X78A);
spawnableActorList_add(&D_80391358, actor_new, 0X518);
spawnableActorList_add(&D_803912B8, actor_new, 0X500);
spawnableActorList_add(&D_80391390, actor_new, 0X500);
spawnableActorList_add(&GV_D_80391390, actor_new, 0X500);
spawnableActorList_add(&D_803913B4, actor_new, 0X500);
spawnableActorList_add(&D_80390F40, actor_new, 0);
spawnableActorList_add(&D_80391494, actor_new, 0X408);
@@ -500,8 +500,8 @@ void func_8038F154(void)
spawnableActorList_add(&D_80391620, actor_new, 0X400);
spawnableActorList_add(&D_803914B8, actor_new, 0X400);
spawnableActorList_add(&D_803914DC, actor_new, 0X400);
spawnableActorList_add(&D_80391500, actor_new, 0X400);
spawnableActorList_add(&D_80391524, actor_new, 0X400);
spawnableActorList_add(&GV_D_80391500, actor_new, 0X400);
spawnableActorList_add(&GV_D_80391524, actor_new, 0X400);
spawnableActorList_add(&D_8039156C, actor_new, 0X400);
spawnableActorList_add(&D_80391428, actor_new, 8);
spawnableActorList_add(&D_8039144C, actor_new, 8);

4
src/GV/code_9DB0.c
View File

@@ -30,7 +30,7 @@ Struct_GV_9DB0_1 D_80391650[] = {
{0x19F, 7, 0 },
{0x000, 0, 0 },
};
f32 D_803916D8[3] = {0.0f, 100.0f, 0.0f};
f32 GV_D_803916D8[3] = {0.0f, 100.0f, 0.0f};
/*.bss */
extern struct {
@@ -63,7 +63,7 @@ void func_80390218(void *arg0){
}
void func_80390248(void){
jiggySpawn(JIGGY_40_GV_MATCHING_GAME, D_803916D8);
jiggySpawn(JIGGY_40_GV_MATCHING_GAME, GV_D_803916D8);
}
//matchingGame_setState

27
src/GV/code_A490.c
View File

@@ -3,10 +3,11 @@
#include "variables.h"
/* .bss */
u8 GV_pad3[0x40];
struct {
u8 unk0;
f32 unk4;
}D_80391B00;
}GV_D_80391B00;
/* .code */
void func_80390880(void){
@@ -20,8 +21,8 @@ void func_80390880(void){
void func_803908C4(s32 arg0){
void *tmp_v0;
D_80391B00.unk0 = arg0;
if(D_80391B00.unk0 == 2){
GV_D_80391B00.unk0 = arg0;
if(GV_D_80391B00.unk0 == 2){
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0);
timedFunc_set_0(3.0f, func_80390880);
@@ -36,7 +37,7 @@ void func_803908C4(s32 arg0){
}
}
if(D_80391B00.unk0 == 3){
if(GV_D_80391B00.unk0 == 3){
levelSpecificFlags_set(6, TRUE);
func_803228D8();
func_803204E4(0xe, 1);
@@ -51,7 +52,7 @@ void func_803909F4(void){
void *tmp_v0_2;
D_80391B00.unk0 = 0;
GV_D_80391B00.unk0 = 0;
if(map_get() != MAP_15_GV_WATER_PYRAMID) return;
if(jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID)){
@@ -64,7 +65,7 @@ void func_803909F4(void){
func_8034E71C(tmp_v0_2, -1460, 0.0f);
}
else{
D_80391B00.unk4 = 0.0f;
GV_D_80391B00.unk4 = 0.0f;
func_803908C4(1);
}
}
@@ -75,23 +76,23 @@ void func_80390A94(void){
time_delta = time_getDelta();
if(!D_80391B00.unk0) return;
if(!GV_D_80391B00.unk0) return;
if(D_80391B00.unk0 == 1){
if(0.0f < D_80391B00.unk4){
D_80391B00.unk4 -= time_delta;
if(D_80391B00.unk4 <= 0.0f){
if(GV_D_80391B00.unk0 == 1){
if(0.0f < GV_D_80391B00.unk4){
GV_D_80391B00.unk4 -= time_delta;
if(GV_D_80391B00.unk4 <= 0.0f){
func_803908C4(2);
}
}
else{
if(jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID)){
D_80391B00.unk4 = 0.01f;
GV_D_80391B00.unk4 = 0.01f;
}
}
}//L80390B34
if(D_80391B00.unk0 == 2){
if(GV_D_80391B00.unk0 == 2){
tmp_v0 = func_8034C528(0x190);
if(tmp_v0 && func_8034DC78(tmp_v0) == 1){
func_8030E760(SFX_7F_HEAVYDOOR_SLAM, 0.8f, 0x7fd0);

28
src/GV/code_D60.c
View File

@@ -24,20 +24,22 @@ ActorInfo D_80390C80 = { MARKER_BC_GOBI_1, ACTOR_12E_GOBI_1, ASSET_3E0_MODEL_GOB
0, 0x533, 0.0f, 0
};
/* .bss */
u8 GV_pad0[0x10];
struct {
u8 unk0;
u8 unk1;
}D_80391A40;
}GV_D_80391A40;
/* .code */
void func_80387150(Actor *this, s32 next_state){
void GV_func_80387150(Actor *this, s32 next_state){
ActorLocal_GV_D60 *local = (ActorLocal_GV_D60 *)&this->local;
this->state = next_state;
D_80391A40.unk0 = FALSE;
D_80391A40.unk1 = FALSE;
GV_D_80391A40.unk0 = FALSE;
GV_D_80391A40.unk1 = FALSE;
if(this->state == 1){
func_80335924(this->unk148, 0xd9, 0.5f, 4.0f);
@@ -47,14 +49,14 @@ void func_80387150(Actor *this, s32 next_state){
if(this->state == 2){
func_80335924(this->unk148, 0xda, 1.0f, 5.0f);
local->unkC = 0.9f;
D_80391A40.unk0 = TRUE;
GV_D_80391A40.unk0 = TRUE;
}
if(this->state == 3){
func_8028F918(2);
func_80335924(this->unk148, 0xf7, 1.0f, 5.33f);
local->unk14 = 0.01f;
D_80391A40.unk1 = TRUE;
GV_D_80391A40.unk1 = TRUE;
}
if(this->state == 4){
@@ -78,16 +80,16 @@ Actor *chgobi1_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
s32 func_80387354(void){
return D_80391A40.unk0;
return GV_D_80391A40.unk0;
}
s32 func_80387360(void){
return D_80391A40.unk1;
return GV_D_80391A40.unk1;
}
void func_8038736C(Actor *this){
ActorLocal_GV_D60 *local = (ActorLocal_GV_D60 *)&this->local;
func_80387150(this, 0);
GV_func_80387150(this, 0);
func_8030DA44(local->unk0[0]);
func_8030DA44(local->unk0[1]);
}
@@ -118,8 +120,8 @@ void func_80387408(Actor *this){
marker->unk30 = func_8038736C;
marker->propPtr->unk8_3 = TRUE;
marker->collidable = TRUE;
D_80391A40.unk0 = 0;
D_80391A40.unk1 = 0;
GV_D_80391A40.unk0 = 0;
GV_D_80391A40.unk1 = 0;
local->unk0[0] = func_8030D90C();
local->unk0[1] = func_8030D90C();
local->unk8 = 0.0f;
@@ -128,7 +130,7 @@ void func_80387408(Actor *this){
local->unk14 = 0.0f;
this->unk1C[0] = 0.0f;
this->unk1C[1] = 0.0f;
func_80387150(this, 1);
GV_func_80387150(this, 1);
if(jiggyscore_isSpawned(JIGGY_44_GV_GOBI_1) && ! func_803203FC(1)){
marker_despawn(this->marker);
}
@@ -228,5 +230,5 @@ void func_80387408(Actor *this){
this->unk1C[0] = 0.0f;
if(sp6C)
func_80387150(this, sp6C);
GV_func_80387150(this, sp6C);
}