2022-03-21 21:51:23 -04:00
|
|
|
#include "global.h"
|
|
|
|
#include "objects/object_gi_key/object_gi_key.h"
|
|
|
|
#include "objects/object_gi_jewel/object_gi_jewel.h"
|
|
|
|
#include "objects/object_gi_melody/object_gi_melody.h"
|
|
|
|
#include "objects/object_gi_heart/object_gi_heart.h"
|
|
|
|
#include "objects/object_gi_compass/object_gi_compass.h"
|
|
|
|
#include "objects/object_gi_bosskey/object_gi_bosskey.h"
|
|
|
|
#include "objects/object_gi_medal/object_gi_medal.h"
|
|
|
|
#include "objects/object_gi_nuts/object_gi_nuts.h"
|
|
|
|
#include "objects/object_gi_hearts/object_gi_hearts.h"
|
|
|
|
#include "objects/object_gi_arrowcase/object_gi_arrowcase.h"
|
|
|
|
#include "objects/object_gi_bombpouch/object_gi_bombpouch.h"
|
|
|
|
#include "objects/object_gi_bottle/object_gi_bottle.h"
|
|
|
|
#include "objects/object_gi_stick/object_gi_stick.h"
|
|
|
|
#include "objects/object_gi_map/object_gi_map.h"
|
|
|
|
#include "objects/object_gi_shield_1/object_gi_shield_1.h"
|
|
|
|
#include "objects/object_gi_magicpot/object_gi_magicpot.h"
|
|
|
|
#include "objects/object_gi_bomb_1/object_gi_bomb_1.h"
|
|
|
|
#include "objects/object_gi_purse/object_gi_purse.h"
|
|
|
|
#include "objects/object_gi_gerudo/object_gi_gerudo.h"
|
|
|
|
#include "objects/object_gi_arrow/object_gi_arrow.h"
|
|
|
|
#include "objects/object_gi_bomb_2/object_gi_bomb_2.h"
|
|
|
|
#include "objects/object_gi_egg/object_gi_egg.h"
|
|
|
|
#include "objects/object_gi_scale/object_gi_scale.h"
|
|
|
|
#include "objects/object_gi_shield_2/object_gi_shield_2.h"
|
|
|
|
#include "objects/object_gi_hookshot/object_gi_hookshot.h"
|
|
|
|
#include "objects/object_gi_ocarina/object_gi_ocarina.h"
|
|
|
|
#include "objects/object_gi_milk/object_gi_milk.h"
|
|
|
|
#include "objects/object_gi_pachinko/object_gi_pachinko.h"
|
|
|
|
#include "objects/object_gi_boomerang/object_gi_boomerang.h"
|
|
|
|
#include "objects/object_gi_bow/object_gi_bow.h"
|
|
|
|
#include "objects/object_gi_glasses/object_gi_glasses.h"
|
|
|
|
#include "objects/object_gi_liquid/object_gi_liquid.h"
|
|
|
|
#include "objects/object_gi_shield_3/object_gi_shield_3.h"
|
|
|
|
#include "objects/object_gi_letter/object_gi_letter.h"
|
|
|
|
#include "objects/object_gi_clothes/object_gi_clothes.h"
|
|
|
|
#include "objects/object_gi_bean/object_gi_bean.h"
|
|
|
|
#include "objects/object_gi_fish/object_gi_fish.h"
|
|
|
|
#include "objects/object_gi_saw/object_gi_saw.h"
|
|
|
|
#include "objects/object_gi_hammer/object_gi_hammer.h"
|
|
|
|
#include "objects/object_gi_grass/object_gi_grass.h"
|
|
|
|
#include "objects/object_gi_longsword/object_gi_longsword.h"
|
|
|
|
#include "objects/object_gi_niwatori/object_gi_niwatori.h"
|
|
|
|
#include "objects/object_gi_bottle_letter/object_gi_bottle_letter.h"
|
|
|
|
#include "objects/object_gi_ocarina_0/object_gi_ocarina_0.h"
|
|
|
|
#include "objects/object_gi_boots_2/object_gi_boots_2.h"
|
|
|
|
#include "objects/object_gi_seed/object_gi_seed.h"
|
|
|
|
#include "objects/object_gi_gloves/object_gi_gloves.h"
|
|
|
|
#include "objects/object_gi_coin/object_gi_coin.h"
|
|
|
|
#include "objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h"
|
|
|
|
#include "objects/object_gi_redead_mask/object_gi_redead_mask.h"
|
|
|
|
#include "objects/object_gi_skj_mask/object_gi_skj_mask.h"
|
|
|
|
#include "objects/object_gi_rabit_mask/object_gi_rabit_mask.h"
|
|
|
|
#include "objects/object_gi_truth_mask/object_gi_truth_mask.h"
|
|
|
|
#include "objects/object_gi_eye_lotion/object_gi_eye_lotion.h"
|
|
|
|
#include "objects/object_gi_powder/object_gi_powder.h"
|
|
|
|
#include "objects/object_gi_mushroom/object_gi_mushroom.h"
|
|
|
|
#include "objects/object_gi_ticketstone/object_gi_ticketstone.h"
|
|
|
|
#include "objects/object_gi_brokensword/object_gi_brokensword.h"
|
|
|
|
#include "objects/object_gi_prescription/object_gi_prescription.h"
|
|
|
|
#include "objects/object_gi_bracelet/object_gi_bracelet.h"
|
|
|
|
#include "objects/object_gi_soldout/object_gi_soldout.h"
|
|
|
|
#include "objects/object_gi_frog/object_gi_frog.h"
|
|
|
|
#include "objects/object_gi_golonmask/object_gi_golonmask.h"
|
|
|
|
#include "objects/object_gi_zoramask/object_gi_zoramask.h"
|
|
|
|
#include "objects/object_gi_gerudomask/object_gi_gerudomask.h"
|
|
|
|
#include "objects/object_gi_hoverboots/object_gi_hoverboots.h"
|
|
|
|
#include "objects/object_gi_m_arrow/object_gi_m_arrow.h"
|
|
|
|
#include "objects/object_gi_sutaru/object_gi_sutaru.h"
|
|
|
|
#include "objects/object_gi_goddess/object_gi_goddess.h"
|
|
|
|
#include "objects/object_gi_fire/object_gi_fire.h"
|
|
|
|
#include "objects/object_gi_insect/object_gi_insect.h"
|
|
|
|
#include "objects/object_gi_butterfly/object_gi_butterfly.h"
|
|
|
|
#include "objects/object_gi_ghost/object_gi_ghost.h"
|
|
|
|
#include "objects/object_gi_soul/object_gi_soul.h"
|
|
|
|
#include "objects/object_gi_dekupouch/object_gi_dekupouch.h"
|
|
|
|
#include "objects/object_gi_rupy/object_gi_rupy.h"
|
|
|
|
#include "objects/object_gi_sword_1/object_gi_sword_1.h"
|
|
|
|
#include "objects/object_st/object_st.h"
|
|
|
|
|
|
|
|
// "Get Item" Model Draw Functions
|
|
|
|
void GetItem_DrawMaskOrBombchu(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawSoldOut(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawBlueFire(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawPoes(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawFairy(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawMirrorShield(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawSkullToken(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawEggOrMedallion(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawCompass(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawPotion(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawGoronSword(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawDekuNuts(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawRecoveryHeart(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawFish(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawOpa0(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawOpa0Xlu1(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawXlu01(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawOpa10Xlu2(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawMagicArrow(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawMagicSpell(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawOpa1023(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawOpa10Xlu32(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawSmallRupee(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawScale(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawBulletBag(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawWallet(GlobalContext* globalCtx, s16 drawId);
|
testing out item replacement (#416)
* skip learning song of storms
* don't set flag when getting goron tunic as child
* Initiates prelude check when master sword unloads.
Not quite how N64 rando does it but so far it's the only way I've found to make it trigger without also triggering the time travel again.
* Stops Shadow Temple lore prompts from appearing in rando.
* Skips cutscene of royal tomb explosion in rando.
Explosion sound doesn't play correctly and I think the debris appears in the wrong place, but the functionality is here.
* Improves visual of exploding gravestone.
* Adds some comments explaining the rando differences
* Skip ruto text box in jabu blue warp
For rando
* skip intro cutscene in dodongo's cavern
* load spoiler files on boot, fix spoilerfile existing check when making new saves
* name entry dropped spoiler logic
* make sure to actually init the cvar
* no chime on load
* uncomment
* Skip ganondrof cutscene
Skip to scream part of the death animation, skipping the text boxes etc. For rando
* Update z_boss_ganondrof.c
* skip owl flight cutscenes in rando
* Fixes skipped text so it only applies to shadow temple.
Earlier fix inadvertently applied to some other text as well, changed logic so that only specified sceneNums and textIds can have this enabled, and text skipped by sceneNum can have the skip overriden by textId if needed. Currently there are no overrides so the textId section of the logic is commented out to avoid compilation errors.
* Adds a default to the switch case statements that leaves the randoSkipText variable unchanged, just in case.
* TEST: Text for item
* Adding ganon flavor text
* ADD: AMMO Count
* format ganon text/hint text
* Autoskip the tower cutscene if settings call for tower collapse.
* ganon hint text logic
* Improved prelude after time travel fix
* swapped the sizes between ganon hint text and ganon text, as they were set to the wrong things.
* this is all i did
* not the cleanest code ever but it's working
* ADD: GS Count
* ADD: Wallter (crash for now)
* TWEAK: Wallet check
* FIX: Use DrawItem instread of DrawUpgrade... b-baka!
* Fixes some vanilla bugs introduced by rando code.
* Added cutscene skip for zelda escaping
Using the debug cutscene skipping function. Also added a conditional so the bridge doesn't spawn closed when cutscene is ready to trigger
* ADD: X Spacing + Placeholders for song
* ADD: default case for items
* TWEAK: Spacing
* FIX: Light Arrow
* ADD: Ammo Option
* use groups instead
* ADD: More spacing logic
* songs and names
* TWEAK: Color on wallet
* colors
* Added flags cutscene before nabooru fight
* ADD: ChromaKey text
* First attempt skip cs after nabooru defeat
* Better implementation for specific rando cutscene skips
* use pulseaudio defaults
* spaces/tabs
* move color push/pop to stop crash
* make the colors work again
* the real bottle fix
* pulseaudio values tuned for n64 audio at 44.1khz
* update tlength
* remove one hardcoded samplerate
* Cleaned up and fixed zelda escape skip
The if statement is a freaking monster, but unless we want to skip more cutscenes in the same way later, this is the most compact way of doing it that I know of.
* Revert one line to match original
nothing functional
* another hint line that breaks autonewline logic
* don't autospawn epona if we don't have the song/ocarina
* Trying to use iron knuckle death effects
not working yet
* Streamlined OoT cutscene skip for future additions
Also cleaned up if statement in general
* Made if statement more readable
Also added clarity for what cutscene was skipped
* Fixed typo in comment
* Janky nabooru defeat cs skip
* altar text formatting (gonna need help shortening some of the french ones)
* more altar text formatting
* english altar text formatting complete
* make gtg blocking guard check for card not bridge
* FIX: Typo!
* FIX: Uppercases
* FIX: Typo
* TWEAK: Alter + some names
* TWEAK: More caps!
* ADD: Missing string
TWEAK more uppercases and namefixe
s
* Hide nabooru death by covering her in flames
* bandaid fix for death crash issue
* Twinrova defeat cs skip
Skips the animation and manually calls the function to show the "beam" around the sisters
* fix crash
* fix caps to match
* fix great fairy reward mashing/shielding issue
* TWEAK : Typo clé to Clé
* TWEAK: Some Altar hints
TWEAK: Some capitals
* TWEAK: Unmatching text + some cap again
* TWEAK: More tweaks
* fix build
* remove extra json.hpp, add hint
* Update randomizer_item_tracker.cpp
* TWEAK: Double Defense with RedParticles instead of white
* make sure we don't optimize out the check to ensure a spoilerfile exists
* vanilla ganon boss key hint formatting
* TWEAK: FR- better way of the hero text
* fix
* and again
* Initializes dungeonsDone items in gSaveContext to 0.
* Replaces sizeof calculation with a NUM_DUNGEONS constant.
* Fixes Saria's Gift on the LW Bridge from getting killed when holding shield.
* More airtight fix for Saria's Gift on the Bridge.
* Lifts one of the conditions in the if statement a little higher to prevent unnecessary lookups of getItemId.
* Invalidate text box icon before drawing
* Fixes the case where Saria's gift is an Ice Trap.
We still get the Ice Trap once, but never again. This does mean you can now hold R while walking in to avoid the ice trap, but everything else seems to work fine.
* Initial commit
Might need changing when we change the settings in the future
* Fixes Door of Time opening cutscene after warping with prelude.
* Initial waterfall skip
Very rudimentary way of doing things but it seems to work so :shrug:
* inital rework
* fixed default rotation for 2D sprites
* fix tab/space issues
* 3d drops rando merge fix again
* Allows Impa to appear in the Lullaby check post drawbridge escape.
* Changes Ganon's Trials Count setting to a checkbox
The checkbox is whether or not to skip all of them. Leaving the box unchecked will mean doing all of them. Eventually this will be switched back to a slider once we implement the logic for which trials start out completed.
* Sets all Ganon's Trials to incomplete in new saves.
Fixes https://github.com/briaguya-ai/rando-issue-tracker/issues/131
* fix castle guards when oot throw cutscene has already played in rando
* Properly removes the beams when trials are cleared.
* Removes Question Mark from Skip Ganon's Trials UI.
* Adds a todo comment about when to change back to slider.
* make deku seeds check for bullet bag
* Various tweaks
TWEAK: Altar Text
TWEAK: Hint names
TWEAK: Replace more problematic œ to oe
* upgrade ocarina on both child and adult equips
* FIX: Jabu Item
* update equipped hookshot/longshot when obtained as other age
* add hint
* don't give the bgs check without the claim check
* Skips Darunia Cutscene in Fire Temple
* Added a TODO note about not skipping the cutscene.
There is a setting we will want to have eventually that will require this cutscene to not be skipped since it is used during a glitch.
* remove todo
* restore fast ocarina option in imgui that was lost in merge
* Fixes grey screen issue + tooltip for 2 handed shield
* update to use dg instead of g for textures in item tracker
* TWEAK: Default color for cosmetic RAND button was not the corect one
* fix texture crash, remove unused item tracker code
* don't open mask shop until we get zelda's letter
* Update README.md
* Prevents "correct" chime under incorrect conditions.
* Fixes typo in conditional and adds "bonk" sound effect.
"Bonk" sound is NA_SE_SY_OCARINA_ERROR and it plays when conditions for the Door of Time have not been met after playing Song of Time. This is only possible in rando's "Intended" Door of Time option, in which the Ocarina of Time and all 3 spritual stones are required to open the door, instead of the vanilla requirements of just having the song of time.
* remove modify dpad equips toggle, replace with checks for dpad menu
* remove extra check
* add ability to hold c-up to assign to dpad when dpad menuing is enabled
* disable d-pad navigation on item menu when holding c-up to equip
* dpad+c-up stuff for equipment menu
* ADD: Checbox for songs colors
* TWEAK: RandoColors for normal songs
* kind of quick and dirty but it works
* TWEAK: Clarity of the tooltip
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Dog <5172592+Dog@users.noreply.github.com>
Co-authored-by: Vague Rant <vaguerant@users.noreply.github.com>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
2022-07-11 20:11:07 -04:00
|
|
|
void GetItem_DrawJewel(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawJewelKokiri(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawJewelGoron(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawJewelZora(GlobalContext* globalCtx, s16 drawId);
|
|
|
|
void GetItem_DrawGenericMusicNote(GlobalContext* globalCtx, s16 drawId);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
/* 0x00 */ void (*drawFunc)(GlobalContext*, s16);
|
|
|
|
/* 0x04 */ Gfx* dlists[8];
|
|
|
|
} DrawItemTableEntry; // size = 0x24
|
|
|
|
|
|
|
|
DrawItemTableEntry sDrawItemTable[] = {
|
|
|
|
// bottle, OBJECT_GI_BOTTLE
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiBottleStopperDL, gGiBottleDL } },
|
|
|
|
// small key, OBJECT_GI_KEY
|
|
|
|
{ GetItem_DrawOpa0, { gGiSmallKeyDL } },
|
|
|
|
// minuet of forest, OBJECT_GI_MELODY
|
|
|
|
{ GetItem_DrawXlu01, { gGiMinuetColorDL, gGiSongNoteDL } },
|
|
|
|
// bolero of fire, OBJECT_GI_MELODY
|
|
|
|
{ GetItem_DrawXlu01, { gGiBoleroColorDL, gGiSongNoteDL } },
|
|
|
|
// serenade of water, OBJECT_GI_MELODY
|
|
|
|
{ GetItem_DrawXlu01, { gGiSerenadeColorDL, gGiSongNoteDL } },
|
|
|
|
// requiem of spirit, OBJECT_GI_MELODY
|
|
|
|
{ GetItem_DrawXlu01, { gGiRequiemColorDL, gGiSongNoteDL } },
|
|
|
|
// nocturne of shadow, OBJECT_GI_MELODY
|
|
|
|
{ GetItem_DrawXlu01, { gGiNocturneColorDL, gGiSongNoteDL } },
|
|
|
|
// prelude of light, OBJECT_GI_MELODY
|
|
|
|
{ GetItem_DrawXlu01, { gGiPreludeColorDL, gGiSongNoteDL } },
|
|
|
|
// recovery heart, OBJECT_GI_HEART
|
|
|
|
{ GetItem_DrawRecoveryHeart, { gGiRecoveryHeartDL } },
|
|
|
|
// boss key, OBJECT_GI_BOSSKEY
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiBossKeyDL, gGiBossKeyGemDL } },
|
|
|
|
// compass, OBJECT_GI_COMPASS
|
|
|
|
{ GetItem_DrawCompass, { gGiCompassDL, gGiCompassGlassDL } },
|
|
|
|
// forest medallion, OBJECT_GI_MEDAL
|
|
|
|
{ GetItem_DrawEggOrMedallion, { gGiForestMedallionFaceDL, gGiMedallionDL } },
|
|
|
|
// fire medallion, OBJECT_GI_MEDAL
|
|
|
|
{ GetItem_DrawEggOrMedallion, { gGiFireMedallionFaceDL, gGiMedallionDL } },
|
|
|
|
// water medallion, OBJECT_GI_MEDAL
|
|
|
|
{ GetItem_DrawEggOrMedallion, { gGiWaterMedallionFaceDL, gGiMedallionDL } },
|
|
|
|
// spirit medallion, OBJECT_GI_MEDAL
|
|
|
|
{ GetItem_DrawEggOrMedallion, { gGiSpiritMedallionFaceDL, gGiMedallionDL } },
|
|
|
|
// shadow medallion, OBJECT_GI_MEDAL
|
|
|
|
{ GetItem_DrawEggOrMedallion, { gGiShadowMedallionFaceDL, gGiMedallionDL } },
|
|
|
|
// light medallion, OBJECT_GI_MEDAL
|
|
|
|
{ GetItem_DrawEggOrMedallion, { gGiLightMedallionFaceDL, gGiMedallionDL } },
|
|
|
|
// deku nuts, OBJECT_GI_NUTS
|
|
|
|
{ GetItem_DrawDekuNuts, { gGiNutDL } },
|
|
|
|
// heart container, OBJECT_GI_HEARTS
|
|
|
|
{ GetItem_DrawXlu01, { gGiHeartBorderDL, gGiHeartContainerDL } },
|
|
|
|
// heart piece, OBJECT_GI_HEARTS
|
|
|
|
{ GetItem_DrawXlu01, { gGiHeartBorderDL, gGiHeartPieceDL } },
|
|
|
|
// quiver 30, OBJECT_GI_ARROWCASE
|
|
|
|
{ GetItem_DrawOpa1023, { gGiQuiverInnerDL, gGiQuiver30InnerColorDL, gGiQuiver30OuterColorDL, gGiQuiverOuterDL } },
|
|
|
|
// quiver 40, OBJECT_GI_ARROWCASE
|
|
|
|
{ GetItem_DrawOpa1023, { gGiQuiverInnerDL, gGiQuiver40InnerColorDL, gGiQuiver40OuterColorDL, gGiQuiverOuterDL } },
|
|
|
|
// quiver 50, OBJECT_GI_ARROWCASE
|
|
|
|
{ GetItem_DrawOpa1023, { gGiQuiverInnerDL, gGiQuiver50InnerColorDL, gGiQuiver50OuterColorDL, gGiQuiverOuterDL } },
|
|
|
|
// bomb bag 20, OBJECT_GI_BOMBPOUCH
|
|
|
|
{ GetItem_DrawOpa1023, { gGiBombBagDL, gGiBombBag20BagColorDL, gGiBombBag20RingColorDL, gGiBombBagRingDL } },
|
|
|
|
// bomb bag 30, OBJECT_GI_BOMBPOUCH
|
|
|
|
{ GetItem_DrawOpa1023, { gGiBombBagDL, gGiBombBag30BagColorDL, gGiBombBag30RingColorDL, gGiBombBagRingDL } },
|
|
|
|
// bomb bag 40, OBJECT_GI_BOMBPOUCH
|
|
|
|
{ GetItem_DrawOpa1023, { gGiBombBagDL, gGiBombBag40BagColorDL, gGiBombBag40RingColorDL, gGiBombBagRingDL } },
|
|
|
|
// stick, OBJECT_GI_STICK
|
|
|
|
{ GetItem_DrawOpa0, { gGiStickDL } },
|
|
|
|
// dungeon map, OBJECT_GI_MAP
|
|
|
|
{ GetItem_DrawOpa0, { gGiDungeonMapDL } },
|
|
|
|
// deku shield, OBJECT_GI_SHIELD_1
|
|
|
|
{ GetItem_DrawOpa0, { gGiDekuShieldDL } },
|
|
|
|
// small magic jar, OBJECT_GI_MAGICPOT
|
|
|
|
{ GetItem_DrawOpa0, { gGiMagicJarSmallDL } },
|
|
|
|
// large magic jar, OBJECT_GI_MAGICPOT
|
|
|
|
{ GetItem_DrawOpa0, { gGiMagicJarLargeDL } },
|
|
|
|
// bombs, OBJECT_GI_BOMB_1
|
|
|
|
{ GetItem_DrawOpa0, { gGiBombDL } },
|
|
|
|
// stone of agony, OBJECT_GI_MAP
|
|
|
|
{ GetItem_DrawOpa0, { gGiStoneOfAgonyDL } },
|
|
|
|
// adult's wallet, OBJECT_GI_PURSE
|
|
|
|
{ GetItem_DrawWallet,
|
|
|
|
{ gGiWalletDL, gGiAdultWalletColorDL, gGiAdultWalletRupeeOuterColorDL, gGiWalletRupeeOuterDL,
|
|
|
|
gGiAdultWalletStringColorDL, gGiWalletStringDL, gGiAdultWalletRupeeInnerColorDL, gGiWalletRupeeInnerDL } },
|
|
|
|
// giant's wallet, OBJECT_GI_PURSE
|
|
|
|
{ GetItem_DrawWallet,
|
|
|
|
{ gGiWalletDL, gGiGiantsWalletColorDL, gGiGiantsWalletRupeeOuterColorDL, gGiWalletRupeeOuterDL,
|
|
|
|
gGiGiantsWalletStringColorDL, gGiWalletStringDL, gGiGiantsWalletRupeeInnerColorDL, gGiWalletRupeeInnerDL } },
|
|
|
|
// gerudo card, OBJECT_GI_GERUDO
|
|
|
|
{ GetItem_DrawOpa0, { gGiGerudoCardDL } },
|
|
|
|
// arrows (small), OBJECT_GI_ARROW
|
|
|
|
{ GetItem_DrawOpa0, { gGiArrowSmallDL } },
|
|
|
|
// arrows (medium), OBJECT_GI_ARROW
|
|
|
|
{ GetItem_DrawOpa0, { gGiArrowMediumDL } },
|
|
|
|
// arrows (large), OBJECT_GI_ARROW
|
|
|
|
{ GetItem_DrawOpa0, { gGiArrowLargeDL } },
|
|
|
|
// bombchus, OBJECT_GI_BOMB_2
|
|
|
|
{ GetItem_DrawMaskOrBombchu, { gGiBombchuDL } },
|
|
|
|
// egg, OBJECT_GI_EGG
|
|
|
|
{ GetItem_DrawEggOrMedallion, { gGiEggMaterialDL, gGiEggDL } },
|
|
|
|
// silver scale, OBJECT_GI_SCALE
|
|
|
|
{ GetItem_DrawScale, { gGiScaleWaterDL, gGiSilverScaleWaterColorDL, gGiSilverScaleColorDL, gGiScaleDL } },
|
|
|
|
// gold scale, OBJECT_GI_SCALE
|
|
|
|
{ GetItem_DrawScale, { gGiScaleWaterDL, gGiGoldenScaleWaterColorDL, gGiGoldenScaleColorDL, gGiScaleDL } },
|
|
|
|
// hylian shield, OBJECT_GI_SHIELD_2
|
|
|
|
{ GetItem_DrawOpa0, { gGiHylianShieldDL } },
|
|
|
|
// hookshot, OBJECT_GI_HOOKSHOT
|
|
|
|
{ GetItem_DrawOpa0, { gGiHookshotDL } },
|
|
|
|
// longshot, OBJECT_GI_HOOKSHOT
|
|
|
|
{ GetItem_DrawOpa0, { gGiLongshotDL } },
|
|
|
|
// ocarina of time, OBJECT_GI_OCARINA
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiOcarinaTimeDL, gGiOcarinaTimeHolesDL } },
|
|
|
|
// milk, OBJECT_GI_MILK
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiMilkBottleContentsDL, gGiMilkBottleDL } },
|
|
|
|
// keaton mask, OBJECT_GI_KI_TAN_MASK
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiKeatonMaskDL, gGiKeatonMaskEyesDL } },
|
|
|
|
// spooky mask, OBJECT_GI_REDEAD_MASK
|
|
|
|
{ GetItem_DrawOpa0, { gGiSpookyMaskDL } },
|
|
|
|
// slingshot, OBJECT_GI_PACHINKO
|
|
|
|
{ GetItem_DrawOpa0, { gGiSlingshotDL } },
|
|
|
|
// boomerang, OBJECT_GI_BOOMERANG
|
|
|
|
{ GetItem_DrawOpa0, { gGiBoomerangDL } },
|
|
|
|
// bow, OBJECT_GI_BOW
|
|
|
|
{ GetItem_DrawOpa0, { gGiBowDL } },
|
|
|
|
// lens, OBJECT_GI_GLASSES
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiLensDL, gGiLensGlassDL } },
|
|
|
|
// green potion, OBJECT_GI_LIQUID
|
|
|
|
{ GetItem_DrawPotion,
|
|
|
|
{ gGiPotionPotDL, gGiGreenPotColorDL, gGiGreenLiquidColorDL, gGiPotionLiquidDL, gGiGreenPatternColorDL,
|
|
|
|
gGiPotionPatternDL } },
|
|
|
|
// red potion, OBJECT_GI_LIQUID
|
|
|
|
{ GetItem_DrawPotion,
|
|
|
|
{ gGiPotionPotDL, gGiRedPotColorDL, gGiRedLiquidColorDL, gGiPotionLiquidDL, gGiRedPatternColorDL,
|
|
|
|
gGiPotionPatternDL } },
|
|
|
|
// blue potion, OBJECT_GI_LIQUID
|
|
|
|
{ GetItem_DrawPotion,
|
|
|
|
{ gGiPotionPotDL, gGiBluePotColorDL, gGiBlueLiquidColorDL, gGiPotionLiquidDL, gGiBluePatternColorDL,
|
|
|
|
gGiPotionPatternDL } },
|
|
|
|
// mirror shield, OBJECT_GI_SHIELD_3
|
|
|
|
{ GetItem_DrawMirrorShield, { gGiMirrorShieldDL, gGiMirrorShieldSymbolDL } },
|
|
|
|
// zelda's letter, OBJECT_GI_LETTER
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiLetterDL, gGiLetterWritingDL } },
|
|
|
|
// goron tunic, OBJECT_GI_CLOTHES
|
|
|
|
{ GetItem_DrawOpa1023, { gGiTunicCollarDL, gGiGoronCollarColorDL, gGiGoronTunicColorDL, gGiTunicDL } },
|
|
|
|
// zora tunic, OBJECT_GI_CLOTHES
|
|
|
|
{ GetItem_DrawOpa1023, { gGiTunicCollarDL, gGiZoraCollarColorDL, gGiZoraTunicColorDL, gGiTunicDL } },
|
|
|
|
// beans, OBJECT_GI_BEAN
|
|
|
|
{ GetItem_DrawOpa0, { gGiBeanDL } },
|
|
|
|
// fish, OBJECT_GI_FISH
|
|
|
|
{ GetItem_DrawFish, { gGiFishDL } },
|
|
|
|
// saw, OBJECT_GI_SAW
|
|
|
|
{ GetItem_DrawOpa0, { gGiSawDL } },
|
|
|
|
// hammer, OBJECT_GI_HAMMER
|
|
|
|
{ GetItem_DrawOpa0, { gGiHammerDL } },
|
|
|
|
// grass, OBJECT_GI_GRASS
|
|
|
|
{ GetItem_DrawOpa0, { gGiGrassDL } },
|
|
|
|
// biggorons sword, OBJECT_GI_LONGSWORD
|
|
|
|
{ GetItem_DrawGoronSword, { gGiBiggoronSwordDL } },
|
|
|
|
// chicken, OBJECT_GI_NIWATORI
|
|
|
|
{ GetItem_DrawOpa10Xlu2, { gGiChickenDL, gGiChickenColorDL, gGiChickenEyesDL } },
|
|
|
|
// ruto's letter, OBJECT_GI_BOTTLE_LETTER
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiLetterBottleContentsDL, gGiLetterBottleDL } },
|
|
|
|
// fairy ocarina, OBJECT_GI_OCARINA_0
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiOcarinaFairyDL, gGiOcarinaFairyHolesDL } },
|
|
|
|
// iron boots, OBJECT_GI_BOOTS_2
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiIronBootsDL, gGiIronBootsRivetsDL } },
|
|
|
|
// seeds, OBJECT_GI_SEED
|
|
|
|
{ GetItem_DrawOpa0, { gGiSeedDL } },
|
|
|
|
// silver gauntlets, OBJECT_GI_GLOVES
|
|
|
|
{ GetItem_DrawOpa10Xlu32,
|
|
|
|
{ gGiGauntletsDL, gGiSilverGauntletsColorDL, gGiGauntletsPlateDL, gGiSilverGauntletsPlateColorDL } },
|
|
|
|
// golden gauntlets, OBJECT_GI_GLOVES
|
|
|
|
{ GetItem_DrawOpa10Xlu32,
|
|
|
|
{ gGiGauntletsDL, gGiGoldenGauntletsColorDL, gGiGauntletsPlateDL, gGiGoldenGauntletsPlateColorDL } },
|
|
|
|
// yellow n coin, OBJECT_GI_COIN
|
|
|
|
{ GetItem_DrawOpa10Xlu2, { gGiCoinDL, gGiYellowCoinColorDL, gGiNDL } },
|
|
|
|
// red n coin, OBJECT_GI_COIN
|
|
|
|
{ GetItem_DrawOpa10Xlu2, { gGiCoinDL, gGiRedCoinColorDL, gGiNDL } },
|
|
|
|
// green n coin, OBJECT_GI_COIN
|
|
|
|
{ GetItem_DrawOpa10Xlu2, { gGiCoinDL, gGiGreenCoinColorDL, gGiNDL } },
|
|
|
|
// blue n coin, OBJECT_GI_COIN
|
|
|
|
{ GetItem_DrawOpa10Xlu2, { gGiCoinDL, gGiBlueCoinColorDL, gGiNDL } },
|
|
|
|
// skull mask, OBJECT_GI_SKJ_MASK
|
|
|
|
{ GetItem_DrawOpa0, { gGiSkullMaskDL } },
|
|
|
|
// bunny hood OBJECT_GI_RABIT_MASK
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiBunnyHoodDL, gGiBunnyHoodEyesDL } },
|
|
|
|
// mask of truth, OBJECT_GI_TRUTH_MASK
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiMaskOfTruthDL, gGiMaskOfTruthAccentsDL } },
|
|
|
|
// eyedrops, OBJECT_GI_EYE_LOTION
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiEyeDropsCapDL, gGiEyeDropsBottleDL } },
|
|
|
|
// odd potion, OBJECT_GI_POWDER
|
|
|
|
{ GetItem_DrawOpa0, { gGiOddPotionDL } },
|
|
|
|
// odd mushroom, OBJECT_GI_MUSHROOM
|
|
|
|
{ GetItem_DrawOpa0, { gGiOddMushroomDL } },
|
|
|
|
// claim check, OBJECT_GI_TICKETSTONE
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiClaimCheckDL, gGiClaimCheckWritingDL } },
|
|
|
|
// broken goron's sword, OBJECT_GI_BROKENSWORD
|
|
|
|
{ GetItem_DrawGoronSword, { gGiBrokenGoronSwordDL } },
|
|
|
|
// prescription, OBJECT_GI_PRESCRIPTION
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiPrescriptionDL, gGiPrescriptionWritingDL } },
|
|
|
|
// goron bracelet, OBJECT_GI_BRACELET
|
|
|
|
{ GetItem_DrawOpa0, { gGiGoronBraceletDL } },
|
|
|
|
// sold out, OBJECT_GI_SOLDOUT
|
|
|
|
{ GetItem_DrawSoldOut, { gGiSoldOutDL } },
|
|
|
|
// frog, OBJECT_GI_FROG
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiFrogDL, gGiFrogEyesDL } },
|
|
|
|
// goron mask, OBJECT_GI_GOLONMASK
|
|
|
|
{ GetItem_DrawMaskOrBombchu, { gGiGoronMaskDL } },
|
|
|
|
// zora mask, OBJECT_GI_ZORAMASK
|
|
|
|
{ GetItem_DrawMaskOrBombchu, { gGiZoraMaskDL } },
|
|
|
|
// gerudo mask, OBJECT_GI_GERUDOMASK
|
|
|
|
{ GetItem_DrawMaskOrBombchu, { gGiGerudoMaskDL } },
|
|
|
|
// cojiro, OBJECT_GI_NIWATORI
|
|
|
|
{ GetItem_DrawOpa10Xlu2, { gGiChickenDL, gGiCojiroColorDL, gGiChickenEyesDL } },
|
|
|
|
// hover boots, OBJECT_GI_HOVERBOOTS
|
|
|
|
{ GetItem_DrawOpa0, { gGiHoverBootsDL } },
|
|
|
|
// fire arrows, OBJECT_GI_M_ARROW
|
|
|
|
{ GetItem_DrawMagicArrow, { gGiMagicArrowDL, gGiFireArrowColorDL, gGiArrowMagicDL } },
|
|
|
|
// ice arrows, OBJECT_GI_M_ARROW
|
|
|
|
{ GetItem_DrawMagicArrow, { gGiMagicArrowDL, gGiIceArrowColorDL, gGiArrowMagicDL } },
|
|
|
|
// light arrows, OBJECT_GI_M_ARROW
|
|
|
|
{ GetItem_DrawMagicArrow, { gGiMagicArrowDL, gGiLightArrowColorDL, gGiArrowMagicDL } },
|
|
|
|
// skulltula token, OBJECT_GI_SUTARU
|
|
|
|
{ GetItem_DrawSkullToken, { gGiSkulltulaTokenDL, gGiSkulltulaTokenFlameDL } },
|
|
|
|
// din's fire, OBJECT_GI_GODDESS
|
|
|
|
{ GetItem_DrawMagicSpell, { gGiMagicSpellDiamondDL, gGiDinsFireColorDL, gGiMagicSpellOrbDL } },
|
|
|
|
// farore's wind, OBJECT_GI_GODDESS
|
|
|
|
{ GetItem_DrawMagicSpell, { gGiMagicSpellDiamondDL, gGiFaroresWindColorDL, gGiMagicSpellOrbDL } },
|
|
|
|
// nayru's Love, OBJECT_GI_GODDESS
|
|
|
|
{ GetItem_DrawMagicSpell, { gGiMagicSpellDiamondDL, gGiNayrusLoveColorDL, gGiMagicSpellOrbDL } },
|
|
|
|
// blue fire, OBJECT_GI_FIRE
|
|
|
|
{ GetItem_DrawBlueFire, { gGiBlueFireChamberstickDL, gGiBlueFireFlameDL } },
|
|
|
|
// bugs, OBJECT_GI_INSECT
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiBugsContainerDL, gGiBugsGlassDL } },
|
|
|
|
// butterfly, OBJECT_GI_BUTTERFLY
|
|
|
|
{ GetItem_DrawOpa0Xlu1, { gGiButterflyContainerDL, gGiButterflyGlassDL } },
|
|
|
|
// poe, OBJECT_GI_GHOST
|
|
|
|
{ GetItem_DrawPoes,
|
|
|
|
{ gGiGhostContainerLidDL, gGiGhostContainerGlassDL, gGiGhostContainerContentsDL, gGiPoeColorDL } },
|
|
|
|
// fairy, OBJECT_GI_SOUL
|
|
|
|
{ GetItem_DrawFairy, { gGiFairyContainerBaseCapDL, gGiFairyContainerGlassDL, gGiFairyContainerContentsDL } },
|
|
|
|
// bullet bag 40, OBJECT_GI_DEKUPOUCH
|
|
|
|
{ GetItem_DrawBulletBag,
|
|
|
|
{ gGiBulletBagDL, gGiBulletBagColorDL, gGiBulletBagStringDL, gGiBulletBagStringColorDL, gGiBulletBagWritingDL } },
|
|
|
|
// green rupee, OBJECT_GI_RUPY
|
|
|
|
{ GetItem_DrawSmallRupee,
|
|
|
|
{ gGiRupeeInnerDL, gGiGreenRupeeInnerColorDL, gGiRupeeOuterDL, gGiGreenRupeeOuterColorDL } },
|
|
|
|
// blue rupee, OBJECT_GI_RUPY
|
|
|
|
{ GetItem_DrawSmallRupee,
|
|
|
|
{ gGiRupeeInnerDL, gGiBlueRupeeInnerColorDL, gGiRupeeOuterDL, gGiBlueRupeeOuterColorDL } },
|
|
|
|
// red rupee, OBJECT_GI_RUPY
|
|
|
|
{ GetItem_DrawSmallRupee, { gGiRupeeInnerDL, gGiRedRupeeInnerColorDL, gGiRupeeOuterDL, gGiRedRupeeOuterColorDL } },
|
|
|
|
// big poe, OBJECT_GI_GHOST
|
|
|
|
{ GetItem_DrawPoes,
|
|
|
|
{ gGiGhostContainerLidDL, gGiGhostContainerGlassDL, gGiGhostContainerContentsDL, gGiBigPoeColorDL } },
|
|
|
|
// purple rupee, OBJECT_GI_RUPY
|
|
|
|
{ GetItem_DrawOpa10Xlu32,
|
|
|
|
{ gGiRupeeInnerDL, gGiPurpleRupeeInnerColorDL, gGiRupeeOuterDL, gGiPurpleRupeeOuterColorDL } },
|
|
|
|
// gold rupee, OBJECT_GI_RUPY
|
|
|
|
{ GetItem_DrawOpa10Xlu32,
|
|
|
|
{ gGiRupeeInnerDL, gGiGoldRupeeInnerColorDL, gGiRupeeOuterDL, gGiGoldRupeeOuterColorDL } },
|
|
|
|
// bullet bag 50, OBJECT_GI_DEKUPOUCH
|
|
|
|
{ GetItem_DrawBulletBag,
|
|
|
|
{ gGiBulletBagDL, gGiBulletBag50ColorDL, gGiBulletBagStringDL, gGiBulletBag50StringColorDL,
|
|
|
|
gGiBulletBagWritingDL } },
|
|
|
|
// kokiri sword, OBJECT_GI_SWORD_1
|
|
|
|
{ GetItem_DrawOpa0, { gGiKokiriSwordDL } },
|
|
|
|
// gold skulltula token, OBJECT_ST
|
|
|
|
{ GetItem_DrawSkullToken, { object_st_DL_004DB0, object_st_DL_004EB8 } },
|
testing out item replacement (#416)
* skip learning song of storms
* don't set flag when getting goron tunic as child
* Initiates prelude check when master sword unloads.
Not quite how N64 rando does it but so far it's the only way I've found to make it trigger without also triggering the time travel again.
* Stops Shadow Temple lore prompts from appearing in rando.
* Skips cutscene of royal tomb explosion in rando.
Explosion sound doesn't play correctly and I think the debris appears in the wrong place, but the functionality is here.
* Improves visual of exploding gravestone.
* Adds some comments explaining the rando differences
* Skip ruto text box in jabu blue warp
For rando
* skip intro cutscene in dodongo's cavern
* load spoiler files on boot, fix spoilerfile existing check when making new saves
* name entry dropped spoiler logic
* make sure to actually init the cvar
* no chime on load
* uncomment
* Skip ganondrof cutscene
Skip to scream part of the death animation, skipping the text boxes etc. For rando
* Update z_boss_ganondrof.c
* skip owl flight cutscenes in rando
* Fixes skipped text so it only applies to shadow temple.
Earlier fix inadvertently applied to some other text as well, changed logic so that only specified sceneNums and textIds can have this enabled, and text skipped by sceneNum can have the skip overriden by textId if needed. Currently there are no overrides so the textId section of the logic is commented out to avoid compilation errors.
* Adds a default to the switch case statements that leaves the randoSkipText variable unchanged, just in case.
* TEST: Text for item
* Adding ganon flavor text
* ADD: AMMO Count
* format ganon text/hint text
* Autoskip the tower cutscene if settings call for tower collapse.
* ganon hint text logic
* Improved prelude after time travel fix
* swapped the sizes between ganon hint text and ganon text, as they were set to the wrong things.
* this is all i did
* not the cleanest code ever but it's working
* ADD: GS Count
* ADD: Wallter (crash for now)
* TWEAK: Wallet check
* FIX: Use DrawItem instread of DrawUpgrade... b-baka!
* Fixes some vanilla bugs introduced by rando code.
* Added cutscene skip for zelda escaping
Using the debug cutscene skipping function. Also added a conditional so the bridge doesn't spawn closed when cutscene is ready to trigger
* ADD: X Spacing + Placeholders for song
* ADD: default case for items
* TWEAK: Spacing
* FIX: Light Arrow
* ADD: Ammo Option
* use groups instead
* ADD: More spacing logic
* songs and names
* TWEAK: Color on wallet
* colors
* Added flags cutscene before nabooru fight
* ADD: ChromaKey text
* First attempt skip cs after nabooru defeat
* Better implementation for specific rando cutscene skips
* use pulseaudio defaults
* spaces/tabs
* move color push/pop to stop crash
* make the colors work again
* the real bottle fix
* pulseaudio values tuned for n64 audio at 44.1khz
* update tlength
* remove one hardcoded samplerate
* Cleaned up and fixed zelda escape skip
The if statement is a freaking monster, but unless we want to skip more cutscenes in the same way later, this is the most compact way of doing it that I know of.
* Revert one line to match original
nothing functional
* another hint line that breaks autonewline logic
* don't autospawn epona if we don't have the song/ocarina
* Trying to use iron knuckle death effects
not working yet
* Streamlined OoT cutscene skip for future additions
Also cleaned up if statement in general
* Made if statement more readable
Also added clarity for what cutscene was skipped
* Fixed typo in comment
* Janky nabooru defeat cs skip
* altar text formatting (gonna need help shortening some of the french ones)
* more altar text formatting
* english altar text formatting complete
* make gtg blocking guard check for card not bridge
* FIX: Typo!
* FIX: Uppercases
* FIX: Typo
* TWEAK: Alter + some names
* TWEAK: More caps!
* ADD: Missing string
TWEAK more uppercases and namefixe
s
* Hide nabooru death by covering her in flames
* bandaid fix for death crash issue
* Twinrova defeat cs skip
Skips the animation and manually calls the function to show the "beam" around the sisters
* fix crash
* fix caps to match
* fix great fairy reward mashing/shielding issue
* TWEAK : Typo clé to Clé
* TWEAK: Some Altar hints
TWEAK: Some capitals
* TWEAK: Unmatching text + some cap again
* TWEAK: More tweaks
* fix build
* remove extra json.hpp, add hint
* Update randomizer_item_tracker.cpp
* TWEAK: Double Defense with RedParticles instead of white
* make sure we don't optimize out the check to ensure a spoilerfile exists
* vanilla ganon boss key hint formatting
* TWEAK: FR- better way of the hero text
* fix
* and again
* Initializes dungeonsDone items in gSaveContext to 0.
* Replaces sizeof calculation with a NUM_DUNGEONS constant.
* Fixes Saria's Gift on the LW Bridge from getting killed when holding shield.
* More airtight fix for Saria's Gift on the Bridge.
* Lifts one of the conditions in the if statement a little higher to prevent unnecessary lookups of getItemId.
* Invalidate text box icon before drawing
* Fixes the case where Saria's gift is an Ice Trap.
We still get the Ice Trap once, but never again. This does mean you can now hold R while walking in to avoid the ice trap, but everything else seems to work fine.
* Initial commit
Might need changing when we change the settings in the future
* Fixes Door of Time opening cutscene after warping with prelude.
* Initial waterfall skip
Very rudimentary way of doing things but it seems to work so :shrug:
* inital rework
* fixed default rotation for 2D sprites
* fix tab/space issues
* 3d drops rando merge fix again
* Allows Impa to appear in the Lullaby check post drawbridge escape.
* Changes Ganon's Trials Count setting to a checkbox
The checkbox is whether or not to skip all of them. Leaving the box unchecked will mean doing all of them. Eventually this will be switched back to a slider once we implement the logic for which trials start out completed.
* Sets all Ganon's Trials to incomplete in new saves.
Fixes https://github.com/briaguya-ai/rando-issue-tracker/issues/131
* fix castle guards when oot throw cutscene has already played in rando
* Properly removes the beams when trials are cleared.
* Removes Question Mark from Skip Ganon's Trials UI.
* Adds a todo comment about when to change back to slider.
* make deku seeds check for bullet bag
* Various tweaks
TWEAK: Altar Text
TWEAK: Hint names
TWEAK: Replace more problematic œ to oe
* upgrade ocarina on both child and adult equips
* FIX: Jabu Item
* update equipped hookshot/longshot when obtained as other age
* add hint
* don't give the bgs check without the claim check
* Skips Darunia Cutscene in Fire Temple
* Added a TODO note about not skipping the cutscene.
There is a setting we will want to have eventually that will require this cutscene to not be skipped since it is used during a glitch.
* remove todo
* restore fast ocarina option in imgui that was lost in merge
* Fixes grey screen issue + tooltip for 2 handed shield
* update to use dg instead of g for textures in item tracker
* TWEAK: Default color for cosmetic RAND button was not the corect one
* fix texture crash, remove unused item tracker code
* don't open mask shop until we get zelda's letter
* Update README.md
* Prevents "correct" chime under incorrect conditions.
* Fixes typo in conditional and adds "bonk" sound effect.
"Bonk" sound is NA_SE_SY_OCARINA_ERROR and it plays when conditions for the Door of Time have not been met after playing Song of Time. This is only possible in rando's "Intended" Door of Time option, in which the Ocarina of Time and all 3 spritual stones are required to open the door, instead of the vanilla requirements of just having the song of time.
* remove modify dpad equips toggle, replace with checks for dpad menu
* remove extra check
* add ability to hold c-up to assign to dpad when dpad menuing is enabled
* disable d-pad navigation on item menu when holding c-up to equip
* dpad+c-up stuff for equipment menu
* ADD: Checbox for songs colors
* TWEAK: RandoColors for normal songs
* kind of quick and dirty but it works
* TWEAK: Clarity of the tooltip
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Dog <5172592+Dog@users.noreply.github.com>
Co-authored-by: Vague Rant <vaguerant@users.noreply.github.com>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
2022-07-11 20:11:07 -04:00
|
|
|
|
|
|
|
{ GetItem_DrawJewelKokiri, { gGiKokiriEmeraldGemDL, gGiKokiriEmeraldSettingDL } },
|
|
|
|
{ GetItem_DrawJewelGoron, { gGiGoronRubyGemDL, gGiGoronRubySettingDL } },
|
|
|
|
{ GetItem_DrawJewelZora, { gGiZoraSapphireGemDL, gGiZoraSapphireSettingDL } },
|
|
|
|
|
|
|
|
{ GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Generic
|
|
|
|
|
|
|
|
{ GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Zelda's Lullaby
|
|
|
|
{ GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Epona's song
|
|
|
|
{ GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Saria's song
|
|
|
|
{ GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Sun's song
|
|
|
|
{ GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, //Song of time
|
|
|
|
{ GetItem_DrawGenericMusicNote, { gGiSongNoteDL } } //Song of storms
|
2022-03-21 21:51:23 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Draw "Get Item" Model
|
|
|
|
* Calls the corresponding draw function for the given draw ID
|
|
|
|
*/
|
|
|
|
void GetItem_Draw(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
sDrawItemTable[drawId].drawFunc(globalCtx, drawId);
|
|
|
|
}
|
|
|
|
|
|
|
|
// All remaining functions in this file are draw functions referenced in the table and called by the function above
|
|
|
|
|
testing out item replacement (#416)
* skip learning song of storms
* don't set flag when getting goron tunic as child
* Initiates prelude check when master sword unloads.
Not quite how N64 rando does it but so far it's the only way I've found to make it trigger without also triggering the time travel again.
* Stops Shadow Temple lore prompts from appearing in rando.
* Skips cutscene of royal tomb explosion in rando.
Explosion sound doesn't play correctly and I think the debris appears in the wrong place, but the functionality is here.
* Improves visual of exploding gravestone.
* Adds some comments explaining the rando differences
* Skip ruto text box in jabu blue warp
For rando
* skip intro cutscene in dodongo's cavern
* load spoiler files on boot, fix spoilerfile existing check when making new saves
* name entry dropped spoiler logic
* make sure to actually init the cvar
* no chime on load
* uncomment
* Skip ganondrof cutscene
Skip to scream part of the death animation, skipping the text boxes etc. For rando
* Update z_boss_ganondrof.c
* skip owl flight cutscenes in rando
* Fixes skipped text so it only applies to shadow temple.
Earlier fix inadvertently applied to some other text as well, changed logic so that only specified sceneNums and textIds can have this enabled, and text skipped by sceneNum can have the skip overriden by textId if needed. Currently there are no overrides so the textId section of the logic is commented out to avoid compilation errors.
* Adds a default to the switch case statements that leaves the randoSkipText variable unchanged, just in case.
* TEST: Text for item
* Adding ganon flavor text
* ADD: AMMO Count
* format ganon text/hint text
* Autoskip the tower cutscene if settings call for tower collapse.
* ganon hint text logic
* Improved prelude after time travel fix
* swapped the sizes between ganon hint text and ganon text, as they were set to the wrong things.
* this is all i did
* not the cleanest code ever but it's working
* ADD: GS Count
* ADD: Wallter (crash for now)
* TWEAK: Wallet check
* FIX: Use DrawItem instread of DrawUpgrade... b-baka!
* Fixes some vanilla bugs introduced by rando code.
* Added cutscene skip for zelda escaping
Using the debug cutscene skipping function. Also added a conditional so the bridge doesn't spawn closed when cutscene is ready to trigger
* ADD: X Spacing + Placeholders for song
* ADD: default case for items
* TWEAK: Spacing
* FIX: Light Arrow
* ADD: Ammo Option
* use groups instead
* ADD: More spacing logic
* songs and names
* TWEAK: Color on wallet
* colors
* Added flags cutscene before nabooru fight
* ADD: ChromaKey text
* First attempt skip cs after nabooru defeat
* Better implementation for specific rando cutscene skips
* use pulseaudio defaults
* spaces/tabs
* move color push/pop to stop crash
* make the colors work again
* the real bottle fix
* pulseaudio values tuned for n64 audio at 44.1khz
* update tlength
* remove one hardcoded samplerate
* Cleaned up and fixed zelda escape skip
The if statement is a freaking monster, but unless we want to skip more cutscenes in the same way later, this is the most compact way of doing it that I know of.
* Revert one line to match original
nothing functional
* another hint line that breaks autonewline logic
* don't autospawn epona if we don't have the song/ocarina
* Trying to use iron knuckle death effects
not working yet
* Streamlined OoT cutscene skip for future additions
Also cleaned up if statement in general
* Made if statement more readable
Also added clarity for what cutscene was skipped
* Fixed typo in comment
* Janky nabooru defeat cs skip
* altar text formatting (gonna need help shortening some of the french ones)
* more altar text formatting
* english altar text formatting complete
* make gtg blocking guard check for card not bridge
* FIX: Typo!
* FIX: Uppercases
* FIX: Typo
* TWEAK: Alter + some names
* TWEAK: More caps!
* ADD: Missing string
TWEAK more uppercases and namefixe
s
* Hide nabooru death by covering her in flames
* bandaid fix for death crash issue
* Twinrova defeat cs skip
Skips the animation and manually calls the function to show the "beam" around the sisters
* fix crash
* fix caps to match
* fix great fairy reward mashing/shielding issue
* TWEAK : Typo clé to Clé
* TWEAK: Some Altar hints
TWEAK: Some capitals
* TWEAK: Unmatching text + some cap again
* TWEAK: More tweaks
* fix build
* remove extra json.hpp, add hint
* Update randomizer_item_tracker.cpp
* TWEAK: Double Defense with RedParticles instead of white
* make sure we don't optimize out the check to ensure a spoilerfile exists
* vanilla ganon boss key hint formatting
* TWEAK: FR- better way of the hero text
* fix
* and again
* Initializes dungeonsDone items in gSaveContext to 0.
* Replaces sizeof calculation with a NUM_DUNGEONS constant.
* Fixes Saria's Gift on the LW Bridge from getting killed when holding shield.
* More airtight fix for Saria's Gift on the Bridge.
* Lifts one of the conditions in the if statement a little higher to prevent unnecessary lookups of getItemId.
* Invalidate text box icon before drawing
* Fixes the case where Saria's gift is an Ice Trap.
We still get the Ice Trap once, but never again. This does mean you can now hold R while walking in to avoid the ice trap, but everything else seems to work fine.
* Initial commit
Might need changing when we change the settings in the future
* Fixes Door of Time opening cutscene after warping with prelude.
* Initial waterfall skip
Very rudimentary way of doing things but it seems to work so :shrug:
* inital rework
* fixed default rotation for 2D sprites
* fix tab/space issues
* 3d drops rando merge fix again
* Allows Impa to appear in the Lullaby check post drawbridge escape.
* Changes Ganon's Trials Count setting to a checkbox
The checkbox is whether or not to skip all of them. Leaving the box unchecked will mean doing all of them. Eventually this will be switched back to a slider once we implement the logic for which trials start out completed.
* Sets all Ganon's Trials to incomplete in new saves.
Fixes https://github.com/briaguya-ai/rando-issue-tracker/issues/131
* fix castle guards when oot throw cutscene has already played in rando
* Properly removes the beams when trials are cleared.
* Removes Question Mark from Skip Ganon's Trials UI.
* Adds a todo comment about when to change back to slider.
* make deku seeds check for bullet bag
* Various tweaks
TWEAK: Altar Text
TWEAK: Hint names
TWEAK: Replace more problematic œ to oe
* upgrade ocarina on both child and adult equips
* FIX: Jabu Item
* update equipped hookshot/longshot when obtained as other age
* add hint
* don't give the bgs check without the claim check
* Skips Darunia Cutscene in Fire Temple
* Added a TODO note about not skipping the cutscene.
There is a setting we will want to have eventually that will require this cutscene to not be skipped since it is used during a glitch.
* remove todo
* restore fast ocarina option in imgui that was lost in merge
* Fixes grey screen issue + tooltip for 2 handed shield
* update to use dg instead of g for textures in item tracker
* TWEAK: Default color for cosmetic RAND button was not the corect one
* fix texture crash, remove unused item tracker code
* don't open mask shop until we get zelda's letter
* Update README.md
* Prevents "correct" chime under incorrect conditions.
* Fixes typo in conditional and adds "bonk" sound effect.
"Bonk" sound is NA_SE_SY_OCARINA_ERROR and it plays when conditions for the Door of Time have not been met after playing Song of Time. This is only possible in rando's "Intended" Door of Time option, in which the Ocarina of Time and all 3 spritual stones are required to open the door, instead of the vanilla requirements of just having the song of time.
* remove modify dpad equips toggle, replace with checks for dpad menu
* remove extra check
* add ability to hold c-up to assign to dpad when dpad menuing is enabled
* disable d-pad navigation on item menu when holding c-up to equip
* dpad+c-up stuff for equipment menu
* ADD: Checbox for songs colors
* TWEAK: RandoColors for normal songs
* kind of quick and dirty but it works
* TWEAK: Clarity of the tooltip
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Dog <5172592+Dog@users.noreply.github.com>
Co-authored-by: Vague Rant <vaguerant@users.noreply.github.com>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
2022-07-11 20:11:07 -04:00
|
|
|
/* 0x0178 */ u8 primXluColor[3];
|
|
|
|
/* 0x017B */ u8 envXluColor[3];
|
|
|
|
/* 0x017E */ u8 primOpaColor[3];
|
|
|
|
/* 0x0181 */ u8 envOpaColor[3];
|
|
|
|
|
|
|
|
void GetItem_DrawJewelKokiri(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
primXluColor[2] = 160;
|
|
|
|
primXluColor[0] = 255;
|
|
|
|
primXluColor[1] = 255;
|
|
|
|
envXluColor[0] = 0;
|
|
|
|
envXluColor[1] = 255;
|
|
|
|
envXluColor[2] = 0;
|
|
|
|
primOpaColor[2] = 170;
|
|
|
|
primOpaColor[0] = 255;
|
|
|
|
primOpaColor[1] = 255;
|
|
|
|
envOpaColor[1] = 120;
|
|
|
|
envOpaColor[0] = 150;
|
|
|
|
envOpaColor[2] = 0;
|
|
|
|
|
|
|
|
GetItem_DrawJewel(globalCtx, drawId);
|
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawJewelGoron(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
primXluColor[1] = 170;
|
|
|
|
primXluColor[0] = 255;
|
|
|
|
primXluColor[2] = 255;
|
|
|
|
envXluColor[2] = 100;
|
|
|
|
envXluColor[0] = 255;
|
|
|
|
envXluColor[1] = 0;
|
|
|
|
primOpaColor[2] = 170;
|
|
|
|
primOpaColor[0] = 255;
|
|
|
|
primOpaColor[1] = 255;
|
|
|
|
envOpaColor[1] = 120;
|
|
|
|
envOpaColor[0] = 150;
|
|
|
|
envOpaColor[2] = 0;
|
|
|
|
|
|
|
|
GetItem_DrawJewel(globalCtx, drawId);
|
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawJewelZora(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
primXluColor[0] = 50;
|
|
|
|
primXluColor[1] = 255;
|
|
|
|
primXluColor[2] = 255;
|
|
|
|
envXluColor[2] = 150;
|
|
|
|
envXluColor[0] = 50;
|
|
|
|
envXluColor[1] = 0;
|
|
|
|
primOpaColor[2] = 170;
|
|
|
|
primOpaColor[0] = 255;
|
|
|
|
primOpaColor[1] = 255;
|
|
|
|
envOpaColor[1] = 120;
|
|
|
|
envOpaColor[0] = 150;
|
|
|
|
envOpaColor[2] = 0;
|
|
|
|
|
|
|
|
GetItem_DrawJewel(globalCtx, drawId);
|
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawJewel(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
|
|
|
|
|
|
|
gSPSegment(POLY_XLU_DISP++, 9,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 % 256, (256 - (0 % 256)) - 1, 64, 64, 1, 0 % 256,
|
|
|
|
(256 - (0 % 256)) - 1, 16, 16));
|
|
|
|
|
|
|
|
gSPSegment(POLY_OPA_DISP++, 8, Gfx_TexScroll(globalCtx->state.gfxCtx, (u8)0, (u8)0, 16, 16));
|
|
|
|
|
|
|
|
Matrix_Push();
|
|
|
|
Matrix_RotateZYX(0, -0x4000, 0x4000, MTXMODE_APPLY);
|
|
|
|
|
|
|
|
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2597),
|
|
|
|
G_MTX_NOPUSH | G_MTX_LOAD);
|
|
|
|
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2599),
|
|
|
|
G_MTX_NOPUSH | G_MTX_LOAD);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
|
|
|
|
|
|
|
// func_8002ED80(&this->actor, globalCtx, 0);
|
|
|
|
gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, primXluColor[0], primXluColor[1], primXluColor[2], 255);
|
|
|
|
gDPSetEnvColor(POLY_XLU_DISP++, envXluColor[0], envXluColor[1], envXluColor[2], 255);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
|
|
|
// func_8002EBCC(&this->actor, globalCtx, 0);
|
|
|
|
gDPSetPrimColor(POLY_OPA_DISP++, 0, 128, primOpaColor[0], primOpaColor[1], primOpaColor[2], 255);
|
|
|
|
gDPSetEnvColor(POLY_OPA_DISP++, envOpaColor[0], envOpaColor[1], envOpaColor[2], 255);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
|
|
|
|
Matrix_Pop();
|
|
|
|
|
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
|
|
|
}
|
|
|
|
|
2022-03-21 21:51:23 -04:00
|
|
|
void GetItem_DrawMaskOrBombchu(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093BA8(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawSoldOut(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 5);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawBlueFire(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
|
|
|
gSPSegment(POLY_XLU_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
|
|
|
0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1),
|
|
|
|
1 * -(globalCtx->state.frames * 8), 16, 32));
|
|
|
|
Matrix_Push();
|
|
|
|
Matrix_Translate(-8.0f, -2.0f, 0.0f, MTXMODE_APPLY);
|
|
|
|
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
Matrix_Pop();
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawPoes(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPSegment(POLY_XLU_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
|
|
|
0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1),
|
|
|
|
1 * -(globalCtx->state.frames * 6), 16, 32));
|
|
|
|
Matrix_Push();
|
|
|
|
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
Matrix_Pop();
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawFairy(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPSegment(POLY_XLU_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
|
|
|
0 * (globalCtx->state.frames * 0), 32, 32, 1, 1 * (globalCtx->state.frames * 1),
|
|
|
|
1 * -(globalCtx->state.frames * 6), 32, 32));
|
|
|
|
Matrix_Push();
|
|
|
|
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
Matrix_Pop();
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawMirrorShield(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
|
|
|
gSPSegment(POLY_OPA_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0) % 256,
|
|
|
|
1 * (globalCtx->state.frames * 2) % 256, 64, 64, 1,
|
|
|
|
0 * (globalCtx->state.frames * 0) % 128, 1 * (globalCtx->state.frames * 1) % 128, 32,
|
|
|
|
32));
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawSkullToken(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
|
|
|
gSPSegment(POLY_XLU_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
|
|
|
1 * -(globalCtx->state.frames * 5), 32, 32, 1, 0 * (globalCtx->state.frames * 0),
|
|
|
|
0 * (globalCtx->state.frames * 0), 32, 64));
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawEggOrMedallion(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093BA8(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawCompass(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 5);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawPotion(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
|
|
|
gSPSegment(POLY_OPA_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -1 * (globalCtx->state.frames * 1),
|
|
|
|
1 * (globalCtx->state.frames * 1), 32, 32, 1, -1 * (globalCtx->state.frames * 1),
|
|
|
|
1 * (globalCtx->state.frames * 1), 32, 32));
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[5]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawGoronSword(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
|
|
|
gSPSegment(POLY_OPA_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 1),
|
|
|
|
0 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 1),
|
|
|
|
0 * (globalCtx->state.frames * 1), 32, 32));
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawDekuNuts(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
|
|
|
gSPSegment(POLY_OPA_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 6),
|
|
|
|
1 * (globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 6),
|
|
|
|
1 * (globalCtx->state.frames * 6), 32, 32));
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawRecoveryHeart(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
|
|
|
gSPSegment(POLY_XLU_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 1),
|
|
|
|
1 * -(globalCtx->state.frames * 3), 32, 32, 1, 0 * (globalCtx->state.frames * 1),
|
|
|
|
1 * -(globalCtx->state.frames * 2), 32, 32));
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawFish(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
|
|
|
gSPSegment(POLY_XLU_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
|
|
|
1 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 0),
|
|
|
|
1 * (globalCtx->state.frames * 1), 32, 32));
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawOpa0(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawOpa0Xlu1(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
testing out item replacement (#416)
* skip learning song of storms
* don't set flag when getting goron tunic as child
* Initiates prelude check when master sword unloads.
Not quite how N64 rando does it but so far it's the only way I've found to make it trigger without also triggering the time travel again.
* Stops Shadow Temple lore prompts from appearing in rando.
* Skips cutscene of royal tomb explosion in rando.
Explosion sound doesn't play correctly and I think the debris appears in the wrong place, but the functionality is here.
* Improves visual of exploding gravestone.
* Adds some comments explaining the rando differences
* Skip ruto text box in jabu blue warp
For rando
* skip intro cutscene in dodongo's cavern
* load spoiler files on boot, fix spoilerfile existing check when making new saves
* name entry dropped spoiler logic
* make sure to actually init the cvar
* no chime on load
* uncomment
* Skip ganondrof cutscene
Skip to scream part of the death animation, skipping the text boxes etc. For rando
* Update z_boss_ganondrof.c
* skip owl flight cutscenes in rando
* Fixes skipped text so it only applies to shadow temple.
Earlier fix inadvertently applied to some other text as well, changed logic so that only specified sceneNums and textIds can have this enabled, and text skipped by sceneNum can have the skip overriden by textId if needed. Currently there are no overrides so the textId section of the logic is commented out to avoid compilation errors.
* Adds a default to the switch case statements that leaves the randoSkipText variable unchanged, just in case.
* TEST: Text for item
* Adding ganon flavor text
* ADD: AMMO Count
* format ganon text/hint text
* Autoskip the tower cutscene if settings call for tower collapse.
* ganon hint text logic
* Improved prelude after time travel fix
* swapped the sizes between ganon hint text and ganon text, as they were set to the wrong things.
* this is all i did
* not the cleanest code ever but it's working
* ADD: GS Count
* ADD: Wallter (crash for now)
* TWEAK: Wallet check
* FIX: Use DrawItem instread of DrawUpgrade... b-baka!
* Fixes some vanilla bugs introduced by rando code.
* Added cutscene skip for zelda escaping
Using the debug cutscene skipping function. Also added a conditional so the bridge doesn't spawn closed when cutscene is ready to trigger
* ADD: X Spacing + Placeholders for song
* ADD: default case for items
* TWEAK: Spacing
* FIX: Light Arrow
* ADD: Ammo Option
* use groups instead
* ADD: More spacing logic
* songs and names
* TWEAK: Color on wallet
* colors
* Added flags cutscene before nabooru fight
* ADD: ChromaKey text
* First attempt skip cs after nabooru defeat
* Better implementation for specific rando cutscene skips
* use pulseaudio defaults
* spaces/tabs
* move color push/pop to stop crash
* make the colors work again
* the real bottle fix
* pulseaudio values tuned for n64 audio at 44.1khz
* update tlength
* remove one hardcoded samplerate
* Cleaned up and fixed zelda escape skip
The if statement is a freaking monster, but unless we want to skip more cutscenes in the same way later, this is the most compact way of doing it that I know of.
* Revert one line to match original
nothing functional
* another hint line that breaks autonewline logic
* don't autospawn epona if we don't have the song/ocarina
* Trying to use iron knuckle death effects
not working yet
* Streamlined OoT cutscene skip for future additions
Also cleaned up if statement in general
* Made if statement more readable
Also added clarity for what cutscene was skipped
* Fixed typo in comment
* Janky nabooru defeat cs skip
* altar text formatting (gonna need help shortening some of the french ones)
* more altar text formatting
* english altar text formatting complete
* make gtg blocking guard check for card not bridge
* FIX: Typo!
* FIX: Uppercases
* FIX: Typo
* TWEAK: Alter + some names
* TWEAK: More caps!
* ADD: Missing string
TWEAK more uppercases and namefixe
s
* Hide nabooru death by covering her in flames
* bandaid fix for death crash issue
* Twinrova defeat cs skip
Skips the animation and manually calls the function to show the "beam" around the sisters
* fix crash
* fix caps to match
* fix great fairy reward mashing/shielding issue
* TWEAK : Typo clé to Clé
* TWEAK: Some Altar hints
TWEAK: Some capitals
* TWEAK: Unmatching text + some cap again
* TWEAK: More tweaks
* fix build
* remove extra json.hpp, add hint
* Update randomizer_item_tracker.cpp
* TWEAK: Double Defense with RedParticles instead of white
* make sure we don't optimize out the check to ensure a spoilerfile exists
* vanilla ganon boss key hint formatting
* TWEAK: FR- better way of the hero text
* fix
* and again
* Initializes dungeonsDone items in gSaveContext to 0.
* Replaces sizeof calculation with a NUM_DUNGEONS constant.
* Fixes Saria's Gift on the LW Bridge from getting killed when holding shield.
* More airtight fix for Saria's Gift on the Bridge.
* Lifts one of the conditions in the if statement a little higher to prevent unnecessary lookups of getItemId.
* Invalidate text box icon before drawing
* Fixes the case where Saria's gift is an Ice Trap.
We still get the Ice Trap once, but never again. This does mean you can now hold R while walking in to avoid the ice trap, but everything else seems to work fine.
* Initial commit
Might need changing when we change the settings in the future
* Fixes Door of Time opening cutscene after warping with prelude.
* Initial waterfall skip
Very rudimentary way of doing things but it seems to work so :shrug:
* inital rework
* fixed default rotation for 2D sprites
* fix tab/space issues
* 3d drops rando merge fix again
* Allows Impa to appear in the Lullaby check post drawbridge escape.
* Changes Ganon's Trials Count setting to a checkbox
The checkbox is whether or not to skip all of them. Leaving the box unchecked will mean doing all of them. Eventually this will be switched back to a slider once we implement the logic for which trials start out completed.
* Sets all Ganon's Trials to incomplete in new saves.
Fixes https://github.com/briaguya-ai/rando-issue-tracker/issues/131
* fix castle guards when oot throw cutscene has already played in rando
* Properly removes the beams when trials are cleared.
* Removes Question Mark from Skip Ganon's Trials UI.
* Adds a todo comment about when to change back to slider.
* make deku seeds check for bullet bag
* Various tweaks
TWEAK: Altar Text
TWEAK: Hint names
TWEAK: Replace more problematic œ to oe
* upgrade ocarina on both child and adult equips
* FIX: Jabu Item
* update equipped hookshot/longshot when obtained as other age
* add hint
* don't give the bgs check without the claim check
* Skips Darunia Cutscene in Fire Temple
* Added a TODO note about not skipping the cutscene.
There is a setting we will want to have eventually that will require this cutscene to not be skipped since it is used during a glitch.
* remove todo
* restore fast ocarina option in imgui that was lost in merge
* Fixes grey screen issue + tooltip for 2 handed shield
* update to use dg instead of g for textures in item tracker
* TWEAK: Default color for cosmetic RAND button was not the corect one
* fix texture crash, remove unused item tracker code
* don't open mask shop until we get zelda's letter
* Update README.md
* Prevents "correct" chime under incorrect conditions.
* Fixes typo in conditional and adds "bonk" sound effect.
"Bonk" sound is NA_SE_SY_OCARINA_ERROR and it plays when conditions for the Door of Time have not been met after playing Song of Time. This is only possible in rando's "Intended" Door of Time option, in which the Ocarina of Time and all 3 spritual stones are required to open the door, instead of the vanilla requirements of just having the song of time.
* remove modify dpad equips toggle, replace with checks for dpad menu
* remove extra check
* add ability to hold c-up to assign to dpad when dpad menuing is enabled
* disable d-pad navigation on item menu when holding c-up to equip
* dpad+c-up stuff for equipment menu
* ADD: Checbox for songs colors
* TWEAK: RandoColors for normal songs
* kind of quick and dirty but it works
* TWEAK: Clarity of the tooltip
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Dog <5172592+Dog@users.noreply.github.com>
Co-authored-by: Vague Rant <vaguerant@users.noreply.github.com>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
2022-07-11 20:11:07 -04:00
|
|
|
void GetItem_DrawGenericMusicNote(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
s16 color_slot = drawId-120; //0 = generic
|
|
|
|
s16* colors[7][3] = {
|
|
|
|
{255,255,255}, //Generic Song (full white)
|
|
|
|
{109, 73,143}, //Lullaby
|
|
|
|
{217,110, 48}, //Epona
|
|
|
|
{ 62,109, 23}, //Saria
|
|
|
|
{237,231, 62}, //Sun
|
|
|
|
{ 98,177,211}, //Time
|
|
|
|
{146,146,146} //Storms
|
|
|
|
};
|
|
|
|
|
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
|
|
|
|
|
|
|
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gsDPSetGrayscaleColor(POLY_OPA_DISP++, colors[color_slot][0], colors[color_slot][1], colors[color_slot][2], 255);
|
|
|
|
gsSPGrayscale(POLY_OPA_DISP++, true);
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
gsSPGrayscale(POLY_OPA_DISP++, false);
|
|
|
|
|
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
|
|
|
}
|
|
|
|
|
2022-03-21 21:51:23 -04:00
|
|
|
void GetItem_DrawXlu01(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawOpa10Xlu2(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawMagicArrow(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawMagicSpell(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
|
|
|
gSPSegment(POLY_XLU_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2),
|
|
|
|
1 * -(globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 1),
|
|
|
|
-1 * (globalCtx->state.frames * 2), 32, 32));
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawOpa1023(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawOpa10Xlu32(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawSmallRupee(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
Matrix_Scale(0.7f, 0.7f, 0.7f, MTXMODE_APPLY);
|
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawScale(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
|
|
|
gSPSegment(POLY_XLU_DISP++, 0x08,
|
|
|
|
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2),
|
|
|
|
-1 * (globalCtx->state.frames * 2), 64, 64, 1, 1 * (globalCtx->state.frames * 4),
|
|
|
|
1 * -(globalCtx->state.frames * 4), 32, 32));
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawBulletBag(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
|
|
|
|
func_80093D84(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
|
|
|
|
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void GetItem_DrawWallet(GlobalContext* globalCtx, s16 drawId) {
|
|
|
|
s32 pad;
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
OPEN_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
|
|
|
|
func_80093D18(globalCtx->state.gfxCtx);
|
2022-07-05 19:29:34 -04:00
|
|
|
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx),
|
2022-03-21 21:51:23 -04:00
|
|
|
G_MTX_MODELVIEW | G_MTX_LOAD);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[4]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[5]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[6]);
|
|
|
|
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[7]);
|
|
|
|
|
2022-07-05 19:29:34 -04:00
|
|
|
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
2022-03-21 21:51:23 -04:00
|
|
|
}
|