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

level overlay .bss sections defined

Browse Source
This commit is contained in:
Banjo Kazooie
2022-12-05 19:04:09 -06:00
parent 1e8dc04fb8
commit 0258e21af5
37 changed files with 170 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/BGS/bss_pad.c Normal file
View File

@@ -0,0 +1 @@
char pad_BGS_D_80391230[0x10];

1
src/CC/bss_pad.c Normal file
View File

@@ -0,0 +1 @@
char pad_CC_D_80389F70[0x10];

3
src/CC/code_1B90.c
View File

@@ -7,10 +7,9 @@
f32 D_80389BF0[3] = {0.0f, 1300.0f, -2800.0f};
/* .bss */
extern struct {
struct {
u8 unk0;
u8 unk1;
//u8 pad2[2];
f32 unk4;
f32 unk8;
} D_80389F90;

1
src/CCW/bss_pad.c Normal file
View File

@@ -0,0 +1 @@
char pad_CCW_8038FDD0[0x10];

1
src/CCW/code_3310.c
View File

@@ -99,7 +99,6 @@ Struct_CCW_3310_0 D_8038F080[] = {
ActorInfo D_8038F130 = { MARKER_1B4_EEYRIE_BABY, ACTOR_2A1_EEYRIE_BABY, ASSET_484_MODEL_EAGLE_BABY, 0x0, NULL, CCW_func_80389BFC, NULL, func_80389B24, 0, 0, 0.0f, 0};
/* .bss */
u8 pad_8038FDD0[0x10];
f32 D_8038FDE0[3];
/* .code */

1
src/FP/bss_end_pad.c Normal file
View File

@@ -0,0 +1 @@
char pad_FP_803935A8[0x20];

1
src/FP/bss_pad.c Normal file
View File

@@ -0,0 +1 @@
char pad_FP_80392F10[0x10];

3
src/FP/code_2350.c
View File

@@ -80,8 +80,7 @@ Struct_FP_2350 D_80391DB8[7]={
{0x364, 0x35E}
};
f64 D_80392CB8;
/* .bss */
s32 D_80392F20[3];
/* .code */

2
src/FP/code_4400.c
View File

@@ -5,7 +5,7 @@
f32 D_80391EB0[3] = {-625.0f, 8840.0f, -111.0f};
/* .bss */
extern struct {
struct {
u8 unk0;
s32 unk4;
s32 unk8;

3
src/FP/code_45D0.c
View File

@@ -13,7 +13,8 @@ typedef struct {
f32 D_80391EC0[3] ={-625.0f, 466.0f, -111.0f};
extern Struct_FP_45D0_0 D_80392F50;
/* .bss */
Struct_FP_45D0_0 D_80392F50;
/* .code */
void FP_func_8038A9C0(void){

144
src/FP/code_4770.c
View File

@@ -31,8 +31,10 @@ f32 D_80391F2C[3] = {-4454.0f, 1920.0f, -6898.0f};
f32 D_80391F38[3] = {-4451.0f, 1920.0f, -6685.0f};
/* .bss */
extern ActorMarker *D_80393590[5];
extern struct {
Struct_FP_4770 D_80392F70[0x27];
Struct_FP_4770 D_80393280[0x27];
ActorMarker *D_80393590[5];
struct {
u8 unk0;
// u8 pad1[0x3];
s32 unk4;
@@ -43,9 +45,7 @@ extern struct {
u8 unk18;
u8 unk19;
u8 unk1A;
}D_803935A8;
extern Struct_FP_4770 D_80392F70[0x27];
extern Struct_FP_4770 D_80393280[0x27];
}FP_D_803935A8;
/* .code */
@@ -209,7 +209,7 @@ void func_8038B190(void){
}
void func_8038B1C4(void){
D_803935A8.unk0 = 0;
FP_D_803935A8.unk0 = 0;
}
void func_8038B1D0(enum jiggy_e jiggy_id){
@@ -233,8 +233,8 @@ void func_8038B268(void){
void func_8038B2C8(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *actor;
if(D_803935A8.unk14){
actor = marker_getActor(D_803935A8.unk14);
if(FP_D_803935A8.unk14){
actor = marker_getActor(FP_D_803935A8.unk14);
}
switch(text_id){
@@ -278,8 +278,8 @@ void func_8038B410(void){
Actor *sp2C;
func_8028F918(2);
if(D_803935A8.unk14)
sp2C = marker_getActor(D_803935A8.unk14);
if(FP_D_803935A8.unk14)
sp2C = marker_getActor(FP_D_803935A8.unk14);
sp2C->unk38_31 = 1;
func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 28000);
@@ -304,9 +304,9 @@ void func_8038B544(void){
f32 f2;
f32 f0;
switch(D_803935A8.unk0){
switch(FP_D_803935A8.unk0){
case 1: //L8038B57C
if(D_803935A8.unk4 < 0x4e) break;
if(FP_D_803935A8.unk4 < 0x4e) break;
for(i = 0; i < 0x27; i++){
if(i < 0x26){
@@ -318,7 +318,7 @@ void func_8038B544(void){
D_80392F70[0x26].unk10 = D_80392F70[i].unk10;
}
func_8038AEA0();
D_803935A8.unk0 = NULL;
FP_D_803935A8.unk0 = NULL;
break;
case 2: //L8038B61C
@@ -330,19 +330,19 @@ void func_8038B544(void){
if(3.0f == marker_getActor(D_80392F70[0x26].marker)->velocity[0]){
func_8038B39C();
D_803935A8.unk0 = 3;
FP_D_803935A8.unk0 = 3;
break;
}
if(D_803935A8.unk10){
if(FP_D_803935A8.unk10){
func_8038B410();
D_803935A8.unk0 = 4;
FP_D_803935A8.unk0 = 4;
}
break;
case 3: //L8038B6C4
if(D_803935A8.unk14){
sp2C = marker_getActor(D_803935A8.unk14);
if(FP_D_803935A8.unk14){
sp2C = marker_getActor(FP_D_803935A8.unk14);
}
sp2C->unk38_31 = 2;
timed_playSfx(1.0f, SFX_8D_BOGGY_OHWW, 1.0f, 32000);
@@ -352,7 +352,7 @@ void func_8038B544(void){
else{
func_80324DBC(2.0f, 0xc07, 0x22, sp2C->position, NULL, func_8038B2C8, NULL);
}
D_803935A8.unk0 = 4;
FP_D_803935A8.unk0 = 4;
break;
}//L8038B794
}
@@ -363,19 +363,19 @@ void func_8038B7A4(void){
FP_func_8038AB60(0);
if(map_get() != MAP_27_FP_FREEZEEZY_PEAK || jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3)){
D_803935A8.unk0 = 0;
FP_D_803935A8.unk0 = 0;
return;
}
D_803935A8.unk0 = 1;
D_803935A8.unk14 = NULL;
D_803935A8.unk4 = 0;
D_803935A8.unk8 = -1;
D_803935A8.unkC = -1;
D_803935A8.unk10 = 0;
D_803935A8.unk18 = 0;
D_803935A8.unk19 = 0;
D_803935A8.unk1A = 0;
FP_D_803935A8.unk0 = 1;
FP_D_803935A8.unk14 = NULL;
FP_D_803935A8.unk4 = 0;
FP_D_803935A8.unk8 = -1;
FP_D_803935A8.unkC = -1;
FP_D_803935A8.unk10 = 0;
FP_D_803935A8.unk18 = 0;
FP_D_803935A8.unk19 = 0;
FP_D_803935A8.unk1A = 0;
for(i = 0; i < 0x27; i++){
D_80392F70[i].marker = NULL;
@@ -402,7 +402,7 @@ void func_8038B8B0(ActorMarker *marker){
D_80392F70[tmp_a0].position[0] = actor->position[0];
D_80392F70[tmp_a0].position[1] = actor->position[1];
D_80392F70[tmp_a0].position[2] = actor->position[2];
D_803935A8.unk4++;
FP_D_803935A8.unk4++;
}//L8038B920
}
@@ -416,16 +416,16 @@ void func_8038B930(ActorMarker *marker){
D_80393280[tmp_a0].position[0] = actor->position[0];
D_80393280[tmp_a0].position[1] = actor->position[1];
D_80393280[tmp_a0].position[2] = actor->position[2];
D_803935A8.unk4++;
FP_D_803935A8.unk4++;
}//L8038B9A0
}
void func_8038B9B0(ActorMarker *marker){
D_803935A8.unk14 = marker;
FP_D_803935A8.unk14 = marker;
}
void func_8038B9BC(void){
D_803935A8.unk14 = NULL;
FP_D_803935A8.unk14 = NULL;
}
void func_8038B9C8(void){
@@ -441,19 +441,19 @@ void func_8038B9C8(void){
__spawnQueue_add_0(func_8038B0F8);
}
D_803935A8.unk8 = -1;
D_803935A8.unkC = -1;
D_803935A8.unk10 = 0;
D_803935A8.unk18 = 0;
D_803935A8.unk19 = 0;
D_803935A8.unk1A = 0;
FP_D_803935A8.unk8 = -1;
FP_D_803935A8.unkC = -1;
FP_D_803935A8.unk10 = 0;
FP_D_803935A8.unk18 = 0;
FP_D_803935A8.unk19 = 0;
FP_D_803935A8.unk1A = 0;
FP_func_8038AB60(1);
D_803935A8.unk0 = 2;
FP_D_803935A8.unk0 = 2;
}
void FP_func_8038BA88(s32 arg0){
D_803935A8.unk8 = --arg0;
FP_D_803935A8.unk8 = --arg0;
func_8038AC20(arg0, 3);
if(arg0 + 1 < 39){
func_8038AC20(arg0 + 1, 1);
@@ -481,7 +481,7 @@ void FP_func_8038BA88(s32 arg0){
func_8028F8F8(30, 1);
}
switch(D_803935A8.unkC - D_803935A8.unk8){
switch(FP_D_803935A8.unkC - FP_D_803935A8.unk8){
case 3:
func_8025AEA0(0x3a, 0x411aa);
break;
@@ -500,47 +500,47 @@ void FP_func_8038BA88(s32 arg0){
void func_8038BC0C(s32 arg0){
if(D_803935A8.unkC - D_803935A8.unk8 < 4 || 0x23 < D_803935A8.unkC){
if(D_803935A8.unk14)
marker_getActor(D_803935A8.unk14);
if(FP_D_803935A8.unkC - FP_D_803935A8.unk8 < 4 || 0x23 < FP_D_803935A8.unkC){
if(FP_D_803935A8.unk14)
marker_getActor(FP_D_803935A8.unk14);
if(func_8038A1A0(D_803935A8.unk14))
if(func_8038A1A0(FP_D_803935A8.unk14))
return;
D_803935A8.unkC = arg0-1;
if(D_803935A8.unkC >= 0x26){
D_803935A8.unk10 = 1;
FP_D_803935A8.unkC = arg0-1;
if(FP_D_803935A8.unkC >= 0x26){
FP_D_803935A8.unk10 = 1;
return;
}
if(D_803935A8.unk0 == 3) return;
if(D_803935A8.unk0 == 4) return;
if(D_803935A8.unkC >= 0x25) return;
if(FP_D_803935A8.unk0 == 3) return;
if(FP_D_803935A8.unk0 == 4) return;
if(FP_D_803935A8.unkC >= 0x25) return;
switch(D_803935A8.unkC - D_803935A8.unk8){
switch(FP_D_803935A8.unkC - FP_D_803935A8.unk8){
case 4:
if(D_803935A8.unk1A)
if(FP_D_803935A8.unk1A)
break;
D_803935A8.unk1A = TRUE;
FP_D_803935A8.unk1A = TRUE;
FP_func_8038AB60(0);
if(!func_8028F22C()){
func_8028F918(2);
func_80311480(0xc10, 0x20, NULL, NULL, func_8038B2C8, NULL);
}//L8038BD40
D_803935A8.unk0 = 4;
FP_D_803935A8.unk0 = 4;
break;
case 3:
if(!D_803935A8.unk19 && !func_8028F22C()){
D_803935A8.unk19 = 1;
if(!FP_D_803935A8.unk19 && !func_8028F22C()){
FP_D_803935A8.unk19 = 1;
func_80311480(0xc0f, 0x20, NULL, NULL, NULL, NULL);
}//L8038BD94
func_8025AEA0(0x3a, 0x411aa);
break;
case 2:
if(!D_803935A8.unk18 && !func_8028F22C()){
D_803935A8.unk18 = 1;
if(!FP_D_803935A8.unk18 && !func_8028F22C()){
FP_D_803935A8.unk18 = 1;
func_80311480(0xc0e, 0x20, NULL, NULL, NULL, NULL);
}//L8038BDF0
func_8025AEA0(0x3a, 0x493e0);
@@ -560,19 +560,19 @@ f32 func_8038BE20(f32 arg0[3]){
f32 sp2C;
f32 tmp_f12;
tmp_f12 = (f32)(D_803935A8.unkC - D_803935A8.unk8);
if(D_803935A8.unk0 != 2 || D_803935A8.unkC < 0 || D_803935A8.unk8 < 0)
tmp_f12 = (f32)(FP_D_803935A8.unkC - FP_D_803935A8.unk8);
if(FP_D_803935A8.unk0 != 2 || FP_D_803935A8.unkC < 0 || FP_D_803935A8.unk8 < 0)
return 0.0f;
if(tmp_f12 == 0.0f){
player_getPosition(sp38);
f18 = D_80392F70[D_803935A8.unkC].unk10;
f18 = D_80392F70[FP_D_803935A8.unkC].unk10;
if( 0.0 == f18 )
return 0.5f;
sp30 = ((arg0[0] - D_80392F70[D_803935A8.unkC].position[0])*(D_80392F70[D_803935A8.unkC+1].position[0] - D_80392F70[D_803935A8.unkC].position[0]) + (arg0[2] - D_80392F70[D_803935A8.unkC].position[2])*(D_80392F70[D_803935A8.unkC+1].position[2] - D_80392F70[D_803935A8.unkC].position[2]))/f18;
sp2C = ((sp38[0] - D_80392F70[D_803935A8.unkC].position[0])*(D_80392F70[D_803935A8.unkC+1].position[0] - D_80392F70[D_803935A8.unkC].position[0]) + (sp38[2] - D_80392F70[D_803935A8.unkC].position[2])*(D_80392F70[D_803935A8.unkC+1].position[2] - D_80392F70[D_803935A8.unkC].position[2]))/f18;
sp30 = ((arg0[0] - D_80392F70[FP_D_803935A8.unkC].position[0])*(D_80392F70[FP_D_803935A8.unkC+1].position[0] - D_80392F70[FP_D_803935A8.unkC].position[0]) + (arg0[2] - D_80392F70[FP_D_803935A8.unkC].position[2])*(D_80392F70[FP_D_803935A8.unkC+1].position[2] - D_80392F70[FP_D_803935A8.unkC].position[2]))/f18;
sp2C = ((sp38[0] - D_80392F70[FP_D_803935A8.unkC].position[0])*(D_80392F70[FP_D_803935A8.unkC+1].position[0] - D_80392F70[FP_D_803935A8.unkC].position[0]) + (sp38[2] - D_80392F70[FP_D_803935A8.unkC].position[2])*(D_80392F70[FP_D_803935A8.unkC+1].position[2] - D_80392F70[FP_D_803935A8.unkC].position[2]))/f18;
return -(sp30 - sp2C);
}//L8038BF58
@@ -581,10 +581,10 @@ f32 func_8038BE20(f32 arg0[3]){
}
bool func_8038BFA0(void){
if ( D_803935A8.unk0 == 2
|| D_803935A8.unk0 == 3
|| D_803935A8.unk0 == 4
|| D_803935A8.unk1A
if ( FP_D_803935A8.unk0 == 2
|| FP_D_803935A8.unk0 == 3
|| FP_D_803935A8.unk0 == 4
|| FP_D_803935A8.unk1A
){
return TRUE;
}
@@ -594,8 +594,8 @@ bool func_8038BFA0(void){
bool func_8038BFE8(f32 arg0[3], s32 arg1){
Actor *actor;
if(D_803935A8.unk14){
actor = marker_getActor(D_803935A8.unk14);
if(FP_D_803935A8.unk14){
actor = marker_getActor(FP_D_803935A8.unk14);
}
else{
return FALSE;
@@ -612,5 +612,5 @@ bool func_8038BFE8(f32 arg0[3], s32 arg1){
}
s32 func_8038C098(void){
return D_803935A8.unk10;
return FP_D_803935A8.unk10;
}

1
src/GV/bss_pad.c Normal file
View File

@@ -0,0 +1 @@
char pad_GV_D_80391A20[0x10];

2
src/GV/code_1570.c
View File

@@ -23,7 +23,7 @@ f32 chgobi2_jiggy_position[3] = {1150.0f, 1150.0f, 9200.0f}; //jiggy spawn posit
f32 D_80390CEC[3] = {1145.0f, 443.0f, 9197.0f};
/* .bss */
extern u8 D_80391A50;
u8 D_80391A50;
/* .code */
void GV_func_80387960(void){

1
src/GV/code_2730.c
View File

@@ -24,7 +24,6 @@ ActorInfo D_80390D60 = { 0xBE, 0x130, 0x3E4,
f32 D_80390D84[3] = {5644.0f, 2930.0f, -3258.0f};
/*.bss */
u8 GV_pad1[0x10];
u8 GV_D_80391A60;
/* .code */

2
src/GV/code_5570.c
View File

@@ -32,7 +32,7 @@ s32 D_8039117C[3] = {160, 100, 0};
/* .bss */
extern s32 D_80391A80;
s32 D_80391A80;
/* .code */
void func_8038B960(void){

1
src/GV/code_61E0.c
View File

@@ -22,7 +22,6 @@ ActorInfo D_803911C0 = { 0xAC, 0x11E, 0x3E5,
};
/* .bss */
u8 GV_pad2[0x10];
s32 GV_D_80391A90;
/* .code */

6
src/GV/code_7FF0.c
View File

@@ -147,9 +147,9 @@ ActorInfo D_80391590 = { MARKER_23A_GV_SNS_CHAMBER_DOOR, ACTOR_243_GV_SNS_CHAMBE
};
/* .bss */
extern f32 D_80391AC0;
extern f32 D_80391AC4;
extern f32 D_80391AC8;
f32 D_80391AC0;
f32 D_80391AC4;
f32 D_80391AC8;
/* .code */
void func_8038E3E0(Actor *this){

14
src/GV/code_9C10.c
View File

@@ -3,15 +3,15 @@
#include "variables.h"
/* .bss */
extern u8 D_80391AD0;
u8 GV_D_80391AD0;
/* .code */
void func_80390000(s32 arg0){
Struct73s *tmp_v0;
Struct6Ds *tmp_v0_2;
D_80391AD0 = arg0;
if(D_80391AD0 == 1){
GV_D_80391AD0 = arg0;
if(GV_D_80391AD0 == 1){
set_camera_to_node(0x14);
func_80324E38(0.0f, 3);
timed_setCameraToNode(4.0f, 0x15);
@@ -29,7 +29,7 @@ void func_80390000(s32 arg0){
}
}//L803900AC
if(D_80391AD0 == 2){
if(GV_D_80391AD0 == 2){
levelSpecificFlags_set(6, FALSE);
func_803228D8();
func_802E4078(MAP_15_GV_WATER_PYRAMID, 1, 0);
@@ -39,15 +39,15 @@ void func_80390000(s32 arg0){
void func_803900F8(void){}
void func_80390100(void){
D_80391AD0 = 0;
GV_D_80391AD0 = 0;
if(levelSpecificFlags_get(6)){
func_80390000(1);
}
}
void func_80390138(void){
if(D_80391AD0 && func_80334904() == 2){
if(D_80391AD0 == 1 && timedFuncQueue_is_empty()){
if(GV_D_80391AD0 && func_80334904() == 2){
if(GV_D_80391AD0 == 1 && timedFuncQueue_is_empty()){
func_80390000(2);
}
}

2
src/GV/code_9DB0.c
View File

@@ -33,7 +33,7 @@ Struct_GV_9DB0_1 D_80391650[] = {
f32 GV_D_803916D8[3] = {0.0f, 100.0f, 0.0f};
/*.bss */
extern struct {
struct {
Struct_GV_9DB0_1 *tile1_0;
Struct_GV_9DB0_1 *tile2_4;
u8 matchCnt_8;//match_count

1
src/GV/code_A490.c
View File

@@ -3,7 +3,6 @@
#include "variables.h"
/* .bss */
u8 GV_pad3[0x40];
struct {
u8 unk0;
f32 unk4;

1
src/GV/code_D60.c
View File

@@ -26,7 +26,6 @@ ActorInfo D_80390C80 = { MARKER_BC_GOBI_1, ACTOR_12E_GOBI_1, ASSET_3E0_MODEL_GOB
/* .bss */
u8 GV_pad0[0x10];
struct {
u8 unk0;
u8 unk1;

1
src/MM/bss_pad.c Normal file
View File

@@ -0,0 +1 @@
char pad_MM_D_80389C80[0x10];

9
src/MM/ch/juju.c
View File

@@ -18,7 +18,8 @@ typedef struct{
void func_80389598(Actor *this);
Actor* func_80389014(ActorMarker *, Gfx **, Mtx**, Vtx** );
extern s32 D_80389C90;
/* .bss */
s32 MM_D_80389C90;
/* .data */
ActorInfo chjujuInfo = { MARKER_67_JUJU, ACTOR_59_JUJU, ASSET_2E6_MODEL_JUJU,
@@ -161,10 +162,10 @@ int func_8038948C(ActorMarker **ptr){
void func_80389514(ActorMarker **ptr){
s32 i;
D_80389C90 = 0;
MM_D_80389C90 = 0;
for(i = 0; i < 4; i++){
if(((ActorLocal_Juju_2 *)&marker_getActor(ptr[i])->local)->unk0 != 2){
D_80389C90++;
MM_D_80389C90++;
};
}
}
@@ -180,7 +181,7 @@ void func_80389598(Actor *this){
switch(jujuPtr->unk0){
case 1: //L80389624
sp34 = this->yaw;
this->yaw += ((0xb - D_80389C90*2)*time_getDelta()*60.0f)/2;
this->yaw += ((0xb - MM_D_80389C90*2)*time_getDelta()*60.0f)/2;
if(360.0f < this->yaw){
sp38 = 1;
this->yaw -= 360.0f;

1
src/MMM/bss_pad.c Normal file
View File

@@ -0,0 +1 @@
char pad_D_8038C4C0[0x10];

2
src/MMM/code_2040.c
View File

@@ -245,7 +245,7 @@ void func_803888B8(Actor *this){
}
Actor *func_80388994(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
static u8 pad[0x10];
static s32 i;
Actor *this;
f32 sp90[3];

38
src/MMM/code_3120.c
View File

@@ -5,23 +5,23 @@
Struct5Es * func_80309B48(f32[3], f32[3], f32[3], u32);
/* .bss */
extern struct{
struct{
u8 unk0;
u8 unk1;
u8 unk2;
} D_8038C4E0;
} MMM_D_8038C4E0;
/* .code */
s32 func_80389510() {
return D_8038C4E0.unk1 == 1;
return MMM_D_8038C4E0.unk1 == 1;
}
u8 func_80389524() {
return D_8038C4E0.unk0;
return MMM_D_8038C4E0.unk0;
}
u8 MMM_func_80389530() {
return D_8038C4E0.unk2;
return MMM_D_8038C4E0.unk2;
}
void func_8038953C() {
@@ -29,28 +29,28 @@ void func_8038953C() {
}
void func_80389544(void){
D_8038C4E0.unk0 = 0;
D_8038C4E0.unk2 = 0;
MMM_D_8038C4E0.unk0 = 0;
MMM_D_8038C4E0.unk2 = 0;
if(map_get() == MAP_26_MMM_NAPPERS_ROOM){
if(jiggyscore_isCollected(JIGGY_5D_MMM_NAPPER)){
D_8038C4E0.unk1 = 2;
MMM_D_8038C4E0.unk1 = 2;
}
else{
D_8038C4E0.unk1 = 1;
MMM_D_8038C4E0.unk1 = 1;
}
}
else{
D_8038C4E0.unk1 = 0;
MMM_D_8038C4E0.unk1 = 0;
}
}
void func_803895B0(s32 arg0) {
if (arg0 != 0) {
D_8038C4E0.unk1 = 1;
MMM_D_8038C4E0.unk1 = 1;
return;
}
D_8038C4E0.unk1 = 2;
MMM_D_8038C4E0.unk1 = 2;
}
void func_803895D8(ActorMarker *caller, enum asset_e text_id, s32 arg2) {
@@ -60,7 +60,7 @@ void func_803895D8(ActorMarker *caller, enum asset_e text_id, s32 arg2) {
func_80324E38(1.5f, 0);
return;
}
D_8038C4E0.unk0 = 1;
MMM_D_8038C4E0.unk0 = 1;
func_80324E88(1.5f);
func_80324E38(1.5f, 0);
}
@@ -72,19 +72,19 @@ void func_8038966C(void){
f32 sp30[3];
BKCollisionTri *tmp_v0;
if(D_8038C4E0.unk1 == 0) return;
if(MMM_D_8038C4E0.unk1 == 0) return;
if( !D_8038C4E0.unk2
&& D_8038C4E0.unk1 == 1
if( !MMM_D_8038C4E0.unk2
&& MMM_D_8038C4E0.unk1 == 1
&& jiggyscore_isCollected(JIGGY_5D_MMM_NAPPER)
){
D_8038C4E0.unk2 = TRUE;
MMM_D_8038C4E0.unk2 = TRUE;
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.2f, 1);
func_80324DBC(0.2f, 0xad9, 6, NULL, NULL, func_803895D8, NULL);
}//L80389700
if(D_8038C4E0.unk1 != 1)
if(MMM_D_8038C4E0.unk1 != 1)
return;
player_getPosition(sp54);
@@ -103,7 +103,7 @@ void func_8038966C(void){
if(tmp_v0 != NULL){
if((s32)(tmp_v0->flags << 4) < 0){
FUNC_8030E624(SFX_6B_LOCKUP_OPENING, 1.4f, 32750);
D_8038C4E0.unk1 = 2;
MMM_D_8038C4E0.unk1 = 2;
if(!levelSpecificFlags_get(0x1b)){
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0);

2
src/MMM/code_3420.c
View File

@@ -134,7 +134,7 @@ u8 D_8038C1D4[] = {0xA, 0x12, 0xF, 0x9, 0xE, 0xD, 0x9, 0x11, 0xB, 0xF, 0, 0};
f32 D_8038C1E0[3] = {0.0f, 3250.0f, -3200.0f}; //jiggy spawn position
/* .bss */
extern struct {
struct {
s32 unk0;
ActorMarker *motzhand_marker;
Struct_MMM_3420_0 *unk8;

1
src/RBB/bss_pad.c Normal file
View File

@@ -0,0 +1 @@
char pad_RBB_80391270[0x10];

1
src/RBB/code_5F80.c
View File

@@ -87,7 +87,6 @@ struct43s D_80390CA8 = {
};
/* .bss */
s32 pad_80391270[4];
u8 D_80391280;
s32 pad_80391284;
f32 D_80391288[3];

5
src/core1/code_136D0.c
View File

@@ -13,6 +13,9 @@ extern u8 core2_RODATA_END[];
extern u8 core2_BSS_START[];
extern u8 core2_BSS_END[];
extern u8 CC_VRAM[];
extern u8 CC_VRAM_END[];
typedef struct struct_2a_s{
char *name;
u32 ram_start;
@@ -34,7 +37,7 @@ extern u8 D_803A5D00;
struct2As D_802762D0[] = {
{"gs", 0x80286F90, 0x803863F0, 0x00F55960, 0x01048560, 0x80286F90, 0x80363590, 0x80363590, 0x80379B90, 0x80379B90, 0x803863F0},
{"coshow", 0x803863F0, 0x80386430, 0x010BCD00, 0x010BCD20, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
{"whale", 0x803863F0, 0x8038A000, 0x01048560, 0x0104C0E0, 0x803863F0, 0x80389AA0, 0x80389AA0, 0x80389F70, 0x80389F70, 0x8038A000},
{"whale", (u32)CC_VRAM, (u32)CC_VRAM_END, 0x01048560, 0x0104C0E0, 0x803863F0, 0x80389AA0, 0x80389AA0, 0x80389F70, 0x80389F70, 0x8038A000},
{"haunted", 0x803863F0, 0x8038C530, 0x01057710, 0x0105D7E0, 0x803863F0, 0x8038B9E0, 0x8038B9E0, 0x8038C4C0, 0x8038C4C0, 0x8038C530},
{"desert", 0x803863F0, 0x80391B10, 0x0104C0E0, 0x01057710, 0x803863F0, 0x80390BD0, 0x80390BD0, 0x80391A20, 0x80391A20, 0x80391B10},
{"beach", 0x803863F0, 0x8038D740, 0x0105D7E0, 0x01064AE0, 0x803863F0, 0x8038C3B0, 0x8038C3B0, 0x8038D6F0, 0x8038D6F0, 0x8038D740},

1
src/cutscenes/bss_pad.c Normal file
View File

@@ -0,0 +1 @@
char pad_cutscenes_8038E9E0[0x10];

2
src/fight/chjinjonator.c
View File

@@ -65,8 +65,6 @@ s32 D_80392060[] = {
};
/* .bss */
f32 D_80392720;
f32 D_80392724;
f32 D_80392920[3];
/* .code */

2
src/fight/code_0.c
View File

@@ -21,7 +21,7 @@ extern ActorInfo D_80392018;
extern ActorInfo D_80392090;
/* .bss */
u8 pad_80392750[0x10];
u8 pad_fight_80392740[0x10];
void fight_func_803863F0(void)
{

1
src/lair/bss_pad.c Normal file
View File

@@ -0,0 +1 @@
static char pad_lair_80395350[0x10]; //padding

1
src/lair/code_0.c
View File

@@ -1776,7 +1776,6 @@ Actor *func_80389E10(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
f32 sp84[3];
f32 sp78[3];
f32 sp6C[3];
static u8 D_80395350[0x10]; //padding
static s32 D_80395360;

4
src/lair/code_A810.c
View File

@@ -15,8 +15,8 @@ void func_80390E28(Actor *this);
ActorInfo D_80394A80 = { 0x1EC, 0x377, 0x0, 0x0, NULL, func_80390E28, func_80326224, func_80325340, 3000, 0, 0.0f, 0};
/* .bss */
extern f32 D_80395370[14][3];
extern s32 D_80395460;
f32 D_80395370[0x14][3];
s32 D_80395460;
/* .code */
void func_80390C00(ActorMarker *marker)