mirror of
https://github.com/zeldaret/oot
synced 2026-09-06 19:01:01 -04:00
Naming1 (#1113)
* typo * rename 800636C0 to gameinfo_init * fix incorrect casing in cup button * some constants * add item00_none enum value * rename 80009460 to gdmaverbose * fix typos * Revert "some constants" This reverts commit27a07204d7. * rename gdmaverbose to gdmamgrverbose * Revert "rename 800636C0 to gameinfo_init" This reverts commitc74e255929. * Revert "fix incorrect casing in cup button" This reverts commitac313b3965. * a couple of typos * minor changes based on clang-format
This commit is contained in:
+1
-1
@@ -15,7 +15,7 @@ extern u8 osAppNmiBuffer[0x40];
|
||||
extern u8 D_80009320[];
|
||||
extern u8 D_800093F0[];
|
||||
extern s8 D_80009430;
|
||||
extern u32 D_80009460;
|
||||
extern u32 gDmaMgrVerbose;
|
||||
extern u32 gDmaMgrDmaBuffSize;
|
||||
extern vu8 gViConfigUseDefault;
|
||||
extern u8 gViConfigAdditionalScanLines;
|
||||
|
||||
+2
-1
@@ -265,7 +265,8 @@ typedef enum {
|
||||
/* 0x16 */ ITEM00_SHIELD_HYLIAN,
|
||||
/* 0x17 */ ITEM00_TUNIC_ZORA,
|
||||
/* 0x18 */ ITEM00_TUNIC_GORON,
|
||||
/* 0x19 */ ITEM00_BOMBS_SPECIAL
|
||||
/* 0x19 */ ITEM00_BOMBS_SPECIAL,
|
||||
/* 0xFF */ ITEM00_NONE = 0xFF
|
||||
} Item00Type;
|
||||
|
||||
struct EnItem00;
|
||||
|
||||
+1
-1
@@ -87,7 +87,7 @@ typedef struct {
|
||||
/* 0x003F */ u8 ocarinaGameRoundNum;
|
||||
/* 0x0040 */ ItemEquips childEquips;
|
||||
/* 0x004A */ ItemEquips adultEquips;
|
||||
/* 0x0054 */ u32 unk_54; // this may be incorrect, currently used for alignement
|
||||
/* 0x0054 */ u32 unk_54; // this may be incorrect, currently used for alignment
|
||||
/* 0x0058 */ char unk_58[0x0E];
|
||||
/* 0x0066 */ s16 savedSceneNum;
|
||||
/* 0x0068 */ ItemEquips equips;
|
||||
|
||||
Reference in New Issue
Block a user