From 932174b6eef97a8d6439cae836ce561ecc888968 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Tue, 1 Dec 2020 20:48:54 -0500 Subject: Decompiled ovl_En_Zl3 (2 non-matchings) (#491) * Progress * deleting more function files * more * more * More * more * more * more * more * 2 more * more * more * more * more * more * more * more * more * more * master update * 4 more * Merged * 3 more * One more done! * ug * Ido Recomp test * try 2 * Recomp by default * Fix Jenkinsfile * Fix 2 * Fixing struct * CFE errors * CFE fix -O2 * Cleanup * More progress, almost done... * Almost.. * Update and some progress * formatting * Cleanup * Major cleanup * done for now * PR comments * PR comments * merge master and format * a few things Co-authored-by: fig --- src/code/z_sram.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'src/code') diff --git a/src/code/z_sram.c b/src/code/z_sram.c index f0a61bb5d..1145bd9b3 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -221,23 +221,20 @@ ItemEquips sDebugSaveEquips = { 0x1122, // equipment }; -Inventory - sDebugSaveInventory = - { - { 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 - 0x7777, // equipment - 0x125249, // upgrades - 0x1E3FFFF, // questItems - { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // dungeonItems - { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 }, // dungeonKeys - 0, // defenseHearts - 0, // gsTokens - }; +Inventory sDebugSaveInventory = { + { 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 + 0x7777, // equipment + 0x125249, // upgrades + 0x1E3FFFF, // questItems + { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // dungeonItems + { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 }, // dungeonKeys + 0, // defenseHearts + 0, // gsTokens +}; u16 sDebugSaveChecksum = 0; -- cgit v1.2.3