diff --git a/bss.txt b/bss.txt index b88d4b4b..096cf296 100644 --- a/bss.txt +++ b/bss.txt @@ -33,47 +33,10 @@ unknown_071730 unknown_072E50 unknown_0777A0 -D_80124200; -D_80124218; -D_80124220; -D_80124238; -D_80124278; -D_80124290; - unknown_078050 -D_801242A0; -D_801246A0; -D_80125EA0; -D_80125EB8; -D_80125EC0; -D_80125ED8; -D_80125EF0; -D_80125F10; -D_80125F30; -D_80125F31; -D_80125F32; -D_80125F33; -D_80125F34; -D_80125F35; -D_80125F36; -D_80125F37; -D_80125F38; -D_80125F3C; -D_80125F40; -D_80126020; -D_80126100; - unknown_079F50 -D_80126110; -D_80126114; -D_80126118; -D_8012611C; -D_80126120; -D_80126124; -D_80126170; -D_80126174; unknown_07AF10 diff --git a/src/unknown_0777A0.c b/src/unknown_0777A0.c index 7b4301a8..1f4eb7ce 100644 --- a/src/unknown_0777A0.c +++ b/src/unknown_0777A0.c @@ -3,23 +3,23 @@ #include "types.h" #include "macros.h" +#include "ultra64.h" /************ .bss ************/ -extern s32 *D_80124200; -extern s32 D_80124218; -extern s32 D_80124220; -extern s32 D_80124238; -extern s32 D_80124278; -extern s32 *D_80124290; +OSIoMesg D_80124200; +OSMesg D_80124218; +OSMesgQueue D_80124220; +OSMesg D_80124238; +s32 D_80124240[14]; +OSMesgQueue D_80124278; +s32 *D_80124290; /*******************************/ // These are both defined in the generated dkr.ld file. extern u8 __ASSETS_LUT_START, __ASSETS_LUT_END; // __ASSETS_LUT_START = 0xECB60, _END = 0xECC30 -void osCreateMesgQueue(s32*, s32*, s32); -void osCreatePiManager(s32, s32*, s32*, s32); void *func_80070C9C(s32, s32); s32 func_80071478(s32*); void dmacopy(u32 romOffset, u8 *ramAddress, s32 numBytes); diff --git a/src/unknown_078050.c b/src/unknown_078050.c index 7223f02f..5950b15e 100644 --- a/src/unknown_078050.c +++ b/src/unknown_078050.c @@ -136,14 +136,29 @@ u32 D_800DE6E8[] = { /************ .bss ************/ -extern OSMesgQueue D_80125EA0; -extern OSMesg D_80125EB8; -extern OSMesgQueue D_80125EC0; -extern OSMesgQueue D_80125ED8; -extern OSMesg D_80125EF0; -extern OSMesg D_80125F10; - -extern u32 D_80126100; +s32 D_801242A0[256]; +s32 D_801246A0[1536]; +OSMesgQueue D_80125EA0; +OSMesg D_80125EB8; +OSMesgQueue D_80125EC0; +OSMesgQueue D_80125ED8; +OSMesg D_80125EF0; +s32 D_80125EF8[6]; +OSMesg D_80125F10; +s32 D_80125F18[6]; +s8 D_80125F30; +s8 D_80125F31; +s8 D_80125F32; +s8 D_80125F33; +s8 D_80125F34; +s8 D_80125F35; +s8 D_80125F36; +s8 D_80125F37; +s32 D_80125F38; +s32 D_80125F3C; +s32 D_80125F40[56]; +s32 D_80126020[56]; +u32 D_80126100; /*******************************/ diff --git a/src/unknown_079F50.c b/src/unknown_079F50.c index 4558e128..0646d982 100644 --- a/src/unknown_079F50.c +++ b/src/unknown_079F50.c @@ -109,7 +109,17 @@ const char D_800E7958[] = "\tdata_size\t\t= %u\n"; extern OSViMode D_800E3900[];//osViModeTable; -extern s32 D_80126120; +/************ .bss ************/ + +s32 D_80126110; +s32 D_80126114; +s32 D_80126118; +s32 D_8012611C; +s32 D_80126120; +s32 D_80126124; +s32 D_80126128[18]; + +/*******************************/ void __scMain(void); void __scExec(OSSched *sc, OSScTask *sp, OSScTask *dp); diff --git a/src/unknown_07AF10.c b/src/unknown_07AF10.c index 0e7ba2df..46a6ae1d 100644 --- a/src/unknown_07AF10.c +++ b/src/unknown_07AF10.c @@ -47,12 +47,28 @@ const char D_800E7AC8[] = "640 by 480 Anti-aliased, Interlaced, De-flickered.\n" /************ .bss ************/ -extern s32 D_801262B0[2]; -extern s32 D_801262B8[2]; -extern s32 D_801262C8; -extern s32 D_801262CC; -extern s8 D_80126308; -extern s8 D_80126309; +s32 D_80126170; +s32 D_80126174; +s32 D_80126178[2]; +s32 D_80126180[8]; +s32 D_801261A0[48]; +s32 D_80126260[20]; +s32 D_801262B0[2]; +s32 D_801262B8[2]; +s32 D_801262C0[2]; +s32 D_801262C8; +s32 D_801262CC; +s32 D_801262D0; +s32 D_801262D4; +s32 D_801262D8; +s32 D_801262DC; +s32 D_801262E0; +s32 D_801262E4; +s32 D_801262E8[8]; +s8 D_80126308; +s8 D_80126309; +s32 D_8012630C; +s32 D_80126310; /******************************/ diff --git a/undefined_syms.txt b/undefined_syms.txt index 70093605..e8afc62c 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,60 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_80124200 = 0x80124200; -D_80124218 = 0x80124218; -D_80124220 = 0x80124220; -D_80124238 = 0x80124238; -D_80124278 = 0x80124278; -D_80124290 = 0x80124290; - -D_801242A0 = 0x801242A0; -D_801246A0 = 0x801246A0; -D_80125EA0 = 0x80125EA0; -D_80125EB8 = 0x80125EB8; -D_80125EC0 = 0x80125EC0; -D_80125ED8 = 0x80125ED8; -D_80125EF0 = 0x80125EF0; -D_80125F10 = 0x80125F10; -D_80125F30 = 0x80125F30; -D_80125F31 = 0x80125F31; -D_80125F32 = 0x80125F32; -D_80125F33 = 0x80125F33; -D_80125F34 = 0x80125F34; -D_80125F35 = 0x80125F35; -D_80125F36 = 0x80125F36; -D_80125F37 = 0x80125F37; -D_80125F38 = 0x80125F38; -D_80125F3C = 0x80125F3C; -D_80125F40 = 0x80125F40; -D_80126020 = 0x80126020; -D_80126100 = 0x80126100; -D_80126110 = 0x80126110; -D_80126114 = 0x80126114; -D_80126118 = 0x80126118; -D_8012611C = 0x8012611C; -D_80126120 = 0x80126120; -D_80126124 = 0x80126124; -D_80126170 = 0x80126170; -D_80126174 = 0x80126174; -D_80126178 = 0x80126178; -D_80126180 = 0x80126180; -D_801261A0 = 0x801261A0; -D_80126260 = 0x80126260; -D_801262B0 = 0x801262B0; -D_801262B8 = 0x801262B8; -D_801262C0 = 0x801262C0; -D_801262C8 = 0x801262C8; -D_801262CC = 0x801262CC; -D_801262D0 = 0x801262D0; -D_801262D4 = 0x801262D4; -D_801262D8 = 0x801262D8; -D_801262DC = 0x801262DC; -D_801262E0 = 0x801262E0; -D_801262E4 = 0x801262E4; -D_80126308 = 0x80126308; -D_80126309 = 0x80126309; -D_80126310 = 0x80126310; D_80126320 = 0x80126320; D_80126328 = 0x80126328; D_8012632C = 0x8012632C;