diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-10-16 02:02:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-15 20:02:54 -0400 |
| commit | 17073af8a3d3be324cabf867960b1a9a53073ee0 (patch) | |
| tree | fa0ed97934a3e359e9e2ba43999d9fa3eab7b37b /src/code/z_sram.c | |
| parent | 0283493db8e968be67d9e591ec4719fe9d0477f0 (diff) | |
Enum comments on some arrays (#1404)
* Comment enums on some big arrays
* z_camera_data too
* comment in get item table on own lines
* `sDebugSaveInventory.ammo`
* More in z_sram
* `0xFF` -> `ITEM_NONE` in `sNewSaveInventory.items`
Diffstat (limited to 'src/code/z_sram.c')
| -rw-r--r-- | src/code/z_sram.c | 119 |
1 files changed, 107 insertions, 12 deletions
diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 4e79b2214..24c7e0d48 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -136,9 +136,52 @@ static ItemEquips sNewSaveEquips = { }; static Inventory sNewSaveInventory = { - { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, // items - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // ammo + // items + { + ITEM_NONE, // SLOT_STICK + ITEM_NONE, // SLOT_NUT + ITEM_NONE, // SLOT_BOMB + ITEM_NONE, // SLOT_BOW + ITEM_NONE, // SLOT_ARROW_FIRE + ITEM_NONE, // SLOT_DINS_FIRE + ITEM_NONE, // SLOT_SLINGSHOT + ITEM_NONE, // SLOT_OCARINA + ITEM_NONE, // SLOT_BOMBCHU + ITEM_NONE, // SLOT_HOOKSHOT + ITEM_NONE, // SLOT_ARROW_ICE + ITEM_NONE, // SLOT_FARORES_WIND + ITEM_NONE, // SLOT_BOOMERANG + ITEM_NONE, // SLOT_LENS + ITEM_NONE, // SLOT_BEAN + ITEM_NONE, // SLOT_HAMMER + ITEM_NONE, // SLOT_ARROW_LIGHT + ITEM_NONE, // SLOT_NAYRUS_LOVE + ITEM_NONE, // SLOT_BOTTLE_1 + ITEM_NONE, // SLOT_BOTTLE_2 + ITEM_NONE, // SLOT_BOTTLE_3 + ITEM_NONE, // SLOT_BOTTLE_4 + ITEM_NONE, // SLOT_TRADE_ADULT + ITEM_NONE, // SLOT_TRADE_CHILD + }, + // ammo + { + 0, // SLOT_STICK + 0, // SLOT_NUT + 0, // SLOT_BOMB + 0, // SLOT_BOW + 0, // SLOT_ARROW_FIRE + 0, // SLOT_DINS_FIRE + 0, // SLOT_SLINGSHOT + 0, // SLOT_OCARINA + 0, // SLOT_BOMBCHU + 0, // SLOT_HOOKSHOT + 0, // SLOT_ARROW_ICE + 0, // SLOT_FARORES_WIND + 0, // SLOT_BOOMERANG + 0, // SLOT_LENS + 0, // SLOT_BEAN + 0, // SLOT_HAMMER + }, // equipment (((1 << EQUIP_INV_TUNIC_KOKIRI) << (EQUIP_TYPE_TUNIC * 4)) | ((1 << EQUIP_INV_BOOTS_KOKIRI) << (EQUIP_TYPE_BOOTS * 4))), @@ -223,13 +266,52 @@ static ItemEquips sDebugSaveEquips = { }; static Inventory sDebugSaveInventory = { + // items + { + ITEM_STICK, // SLOT_STICK + ITEM_NUT, // SLOT_NUT + ITEM_BOMB, // SLOT_BOMB + ITEM_BOW, // SLOT_BOW + ITEM_ARROW_FIRE, // SLOT_ARROW_FIRE + ITEM_DINS_FIRE, // SLOT_DINS_FIRE + ITEM_SLINGSHOT, // SLOT_SLINGSHOT + ITEM_OCARINA_FAIRY, // SLOT_OCARINA + ITEM_BOMBCHU, // SLOT_BOMBCHU + ITEM_HOOKSHOT, // SLOT_HOOKSHOT + ITEM_ARROW_ICE, // SLOT_ARROW_ICE + ITEM_FARORES_WIND, // SLOT_FARORES_WIND + ITEM_BOOMERANG, // SLOT_BOOMERANG + ITEM_LENS, // SLOT_LENS + ITEM_BEAN, // SLOT_BEAN + ITEM_HAMMER, // SLOT_HAMMER + ITEM_ARROW_LIGHT, // SLOT_ARROW_LIGHT + ITEM_NAYRUS_LOVE, // SLOT_NAYRUS_LOVE + ITEM_BOTTLE, // SLOT_BOTTLE_1 + ITEM_POTION_RED, // SLOT_BOTTLE_2 + ITEM_POTION_GREEN, // SLOT_BOTTLE_3 + ITEM_POTION_BLUE, // SLOT_BOTTLE_4 + ITEM_POCKET_EGG, // SLOT_TRADE_ADULT + ITEM_WEIRD_EGG, // SLOT_TRADE_CHILD + }, + // ammo { - ITEM_STICK, ITEM_NUT, ITEM_BOMB, ITEM_BOW, ITEM_ARROW_FIRE, ITEM_DINS_FIRE, - ITEM_SLINGSHOT, ITEM_OCARINA_FAIRY, ITEM_BOMBCHU, ITEM_HOOKSHOT, ITEM_ARROW_ICE, ITEM_FARORES_WIND, - ITEM_BOOMERANG, ITEM_LENS, ITEM_BEAN, ITEM_HAMMER, ITEM_ARROW_LIGHT, ITEM_NAYRUS_LOVE, - ITEM_BOTTLE, ITEM_POTION_RED, ITEM_POTION_GREEN, ITEM_POTION_BLUE, ITEM_POCKET_EGG, ITEM_WEIRD_EGG, - }, // items - { 50, 50, 10, 30, 1, 1, 30, 1, 50, 1, 1, 1, 1, 1, 1, 1 }, // ammo + 50, // SLOT_STICK + 50, // SLOT_NUT + 10, // SLOT_BOMB + 30, // SLOT_BOW + 1, // SLOT_ARROW_FIRE + 1, // SLOT_DINS_FIRE + 30, // SLOT_SLINGSHOT + 1, // SLOT_OCARINA + 50, // SLOT_BOMBCHU + 1, // SLOT_HOOKSHOT + 1, // SLOT_ARROW_ICE + 1, // SLOT_FARORES_WIND + 1, // SLOT_BOOMERANG + 1, // SLOT_LENS + 1, // SLOT_BEAN + 1 // SLOT_HAMMER + }, // equipment ((((1 << EQUIP_INV_SWORD_KOKIRI) << (EQUIP_TYPE_SWORD * 4)) | ((1 << EQUIP_INV_SWORD_MASTER) << (EQUIP_TYPE_SWORD * 4)) | @@ -300,9 +382,22 @@ void Sram_InitDebugSave(void) { } static s16 sDungeonEntrances[] = { - ENTR_YDAN_0, ENTR_DDAN_0, ENTR_BDAN_0, ENTR_BMORI1_0, ENTR_HIDAN_0, ENTR_MIZUSIN_0, - ENTR_JYASINZOU_0, ENTR_HAKADAN_0, ENTR_HAKADANCH_0, ENTR_ICE_DOUKUTO_0, ENTR_GANON_0, ENTR_MEN_0, - ENTR_GERUDOWAY_0, ENTR_GANONTIKA_0, ENTR_GANON_SONOGO_0, ENTR_GANONTIKA_SONOGO_0, + ENTR_YDAN_0, // SCENE_YDAN + ENTR_DDAN_0, // SCENE_DDAN + ENTR_BDAN_0, // SCENE_BDAN + ENTR_BMORI1_0, // SCENE_BMORI1 + ENTR_HIDAN_0, // SCENE_HIDAN + ENTR_MIZUSIN_0, // SCENE_MIZUSIN + ENTR_JYASINZOU_0, // SCENE_JYASINZOU + ENTR_HAKADAN_0, // SCENE_HAKADAN + ENTR_HAKADANCH_0, // SCENE_HAKADANCH + ENTR_ICE_DOUKUTO_0, // SCENE_ICE_DOUKUTO + ENTR_GANON_0, // SCENE_GANON + ENTR_MEN_0, // SCENE_MEN + ENTR_GERUDOWAY_0, // SCENE_GERUDOWAY + ENTR_GANONTIKA_0, // SCENE_GANONTIKA + ENTR_GANON_SONOGO_0, // SCENE_GANON_SONOGO + ENTR_GANONTIKA_SONOGO_0, // SCENE_GANONTIKA_SONOGO }; /** |
