level overlay .bss sections defined

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

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

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

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];

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);

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;