diff options
| author | petrie911 <69443847+petrie911@users.noreply.github.com> | 2020-12-04 12:47:50 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 13:47:50 -0500 |
| commit | 4beeedd116626d31d1ebb7f27940498b0f4f7131 (patch) | |
| tree | 055a648b39596d5b6dede56813169714e34d90dc /src/code | |
| parent | e455a2487642326a063963f3cdc35f6f0e7606f0 (diff) | |
Matched EnMb and EnDoor (#510)
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* new matches
* format
* again
* Update src/overlays/actors/ovl_En_Door/z_en_door.c
* Update src/overlays/actors/ovl_En_Mb/z_en_mb.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_sram.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 1145bd9b3..615aefb73 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -222,10 +222,12 @@ ItemEquips sDebugSaveEquips = { }; 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 + { + 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 |