1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00

Merge branch 'master' into ovl_En_Ru2_new

This commit is contained in:
Ethan Roseman 2020-03-25 18:56:09 -04:00
commit a4be535164
731 changed files with 32380 additions and 35358 deletions

View file

@ -54,7 +54,7 @@ extern u32 D_0403F070;
extern u32 D_04042440;
//extern ? D_04048160;
extern u32 D_04048180;
extern u32 D_04049210;
extern Gfx D_04049210[];
extern u32 D_04049AD0;
//extern ? D_0404D1C0;
extern u32 D_0404D450;
@ -545,8 +545,6 @@ extern u32 gObjectTableSize;
extern RomFile gObjectTable[402];
extern EntranceInfo gEntranceTable[1556];
extern Scene gSceneTable[110];
//extern ? D_8012A480;
//extern ? D_8012A484;
//extern ? D_8012A4A0;
//extern ? D_8012A4E0;
//extern ? D_8012A4EC;
@ -3507,7 +3505,6 @@ extern u8 D_8015FD70;
//extern ? D_80160014;
//extern ? D_80160018;
//extern ? D_80160020;
//extern ? D_801600B0;
//extern ? D_801600C0;
extern u8 D_80161010;
extern u8 D_801610D4;