1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 03:14:38 +00:00

code_800F7260 (#433)

* Split code_800F7260

* More function splits, migrate rodata

* Initial progress

* Small progress

* More substantial progress, finally figured out structs

* 2 functions left

* Move prototypes to functions.h

* Remove unused asm, move most externs to variables.h

* Fix merge

* Ran formatter

* Brackets to avoid && &

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>

* More variables to variables.h

* Braces around early return

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* ARRAY_COUNT in sBankSizes and remove unnecessary temp vars

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
Tharo 2020-10-26 11:58:56 +00:00 committed by GitHub
parent b4096eee34
commit 695552f0b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 751 additions and 1555 deletions

View file

@ -612,8 +612,9 @@ extern s16 D_80130328[];
//extern ? D_80130500;
extern f32 D_80130510;
extern s32 D_80130514;
//extern ? D_80130570;
//extern ? D_80130578;
extern u8 D_80130570[8];
extern u8 D_80130578[4][7];
extern u8 D_80130594[4][7];
//extern ? D_801305B0;
//extern ? D_801305B4;
//extern ? D_801305B8;
@ -752,22 +753,23 @@ extern u8* gScarecrowSpawnSongPtr;
//extern ? D_80131F68;
//extern ? D_80131F6C;
//extern ? D_8013331C;
//extern ? D_80133340;
extern u8 D_80133340[4];
//extern ? D_80133344;
//extern ? D_80133390;
//extern ? D_80133398;
//extern ? D_801333A0;
//extern ? D_801333A4;
//extern ? D_801333A8;
//extern ? D_801333C4;
//extern ? D_801333CC;
//extern ? D_801333D0;
extern s32 D_8013338C;
extern UNK_TYPE D_80133390[];
extern UNK_TYPE D_80133398[];
extern u8 D_801333A0;
extern u8 D_801333A4;
extern SoundBankEntry* gSoundBanks[7];
extern u8 sBankSizes[7];
extern u8 D_801333CC;
extern u16 D_801333D0;
extern Vec3f D_801333D4;
extern u32 D_801333E0;
extern u32 D_801333E8;
//extern ? D_801333F0;
//extern ? D_801333F4;
//extern ? D_801333F8;
extern f32 D_801333E0;
extern f32 D_801333E8;
extern u8 D_801333F0;
extern u8 D_801333F4;
extern u8 D_801333F8;
//extern ? D_80133400;
//extern ? D_80133404;
//extern ? D_80133408;
@ -3529,17 +3531,24 @@ extern FaultThreadStruct gFaultStruct;
//extern ? D_8016BAB8;
//extern ? D_8016BABC;
//extern ? D_8016BAC0;
extern SoundBankEntry D_8016BAD0[9];
extern SoundBankEntry D_8016BC80[12];
extern SoundBankEntry D_8016BEC0[22];
extern SoundBankEntry D_8016C2E0[20];
extern SoundBankEntry D_8016C6A0[8];
extern SoundBankEntry D_8016C820[3];
extern SoundBankEntry D_8016C8B0[5];
//extern ? D_8016C9A0;
//extern ? D_8016E1A0;
//extern ? D_8016E1A8;
//extern ? D_8016E1B0;
extern u8 D_8016E1A0[7];
extern u8 D_8016E1A8[7];
extern u8 D_8016E1B0[7];
//extern ? D_8016E1B8;
//extern ? D_8016E260;
//extern ? D_8016E264;
extern u8 D_8016E260;
extern u8 D_8016E264[];
//extern ? D_8016E270;
//extern ? D_8016E2E0;
//extern ? D_8016E2F8;
//extern ? D_8016E310;
extern u16 D_8016E2E0[];
extern u16 D_8016E2F8[];
extern u8 D_8016E310[];
//extern ? D_8016E320;
//extern ? D_8016E348;
//extern ? D_8016E350;