diff options
Diffstat (limited to 'mm/2s2h/Rando/MiscBehavior')
| -rw-r--r-- | mm/2s2h/Rando/MiscBehavior/FileSelect.cpp | 21 | ||||
| -rw-r--r-- | mm/2s2h/Rando/MiscBehavior/MiscBehavior.h | 10 |
2 files changed, 16 insertions, 15 deletions
diff --git a/mm/2s2h/Rando/MiscBehavior/FileSelect.cpp b/mm/2s2h/Rando/MiscBehavior/FileSelect.cpp index 32084a872..d7cda75f1 100644 --- a/mm/2s2h/Rando/MiscBehavior/FileSelect.cpp +++ b/mm/2s2h/Rando/MiscBehavior/FileSelect.cpp @@ -13,22 +13,13 @@ extern s16 sWindowContentColors[3]; extern FileSelectState* gFileSelectState; } -typedef struct { - char tex[512]; - uint16_t width; - uint16_t height; - uint8_t im_fmt; - uint8_t im_siz; - uint8_t id; -} Sprite; - // Image Icons #include <array> #include "assets/archives/icon_item_static/icon_item_static_yar.h" #include "assets/archives/icon_item_24_static/icon_item_24_static_yar.h" -inline std::array<Sprite, 100> gSeedTextures = { { +inline std::array<Rando::MiscBehavior::Sprite, 100> gSeedTextures = { { { dgItemIconOcarinaOfTimeTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 0 }, { dgItemIconBowTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1 }, { dgItemIconFireArrowTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b, 2 }, @@ -131,7 +122,7 @@ inline std::array<Sprite, 100> gSeedTextures = { { { dgQuestIconSmallKeyTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 99 }, } }; -Sprite* GetSeedTexture(const uint8_t index) { +Rando::MiscBehavior::Sprite* Rando::MiscBehavior::GetSeedTexture(const uint8_t index) { return &gSeedTextures[index]; } @@ -248,7 +239,7 @@ void SetRandSaveTypeVtxData() { } } -void SpriteLoad(Sprite* sprite) { +void SpriteLoad(Rando::MiscBehavior::Sprite* sprite) { OPEN_DISPS(gFileSelectState->state.gfxCtx); /* @@ -274,7 +265,7 @@ void SpriteLoad(Sprite* sprite) { CLOSE_DISPS(gFileSelectState->state.gfxCtx); } -void SpriteDraw(Sprite* sprite, int left, int top, int width, int height) { +void SpriteDraw(Rando::MiscBehavior::Sprite* sprite, int left, int top, int width, int height) { int width_factor = (1 << 10) * sprite->width / width; int height_factor = (1 << 10) * sprite->height / height; @@ -305,8 +296,8 @@ void DrawSeedHashSprites() { for (int i = 0; i < 5; i++) { u8 hashPart = fileHash % 100; fileHash /= 100; - SpriteLoad(GetSeedTexture(hashPart)); - SpriteDraw(GetSeedTexture(hashPart), xStart + (40 * i), 10, 24, 24); + SpriteLoad(Rando::MiscBehavior::GetSeedTexture(hashPart)); + SpriteDraw(Rando::MiscBehavior::GetSeedTexture(hashPart), xStart + (40 * i), 10, 24, 24); } } } diff --git a/mm/2s2h/Rando/MiscBehavior/MiscBehavior.h b/mm/2s2h/Rando/MiscBehavior/MiscBehavior.h index 5d026bf9e..128674f3f 100644 --- a/mm/2s2h/Rando/MiscBehavior/MiscBehavior.h +++ b/mm/2s2h/Rando/MiscBehavior/MiscBehavior.h @@ -26,6 +26,16 @@ void SariasSongHint(); void BankSignHint(); void InitTycoonWallet(); +typedef struct { + char tex[512]; + uint16_t width; + uint16_t height; + uint8_t im_fmt; + uint8_t im_siz; + uint8_t id; +} Sprite; +Sprite* GetSeedTexture(const uint8_t index); + } // namespace MiscBehavior } // namespace Rando |
