d_menu_map_common OK (#2075)

This commit is contained in:
hatal175
2024-02-18 09:55:58 +02:00
committed by GitHub
parent fa3be5d11d
commit c471449d0e
18 changed files with 519 additions and 3038 deletions
+376 -287
View File
@@ -10,47 +10,6 @@
#include "dol2asm.h"
#include "global.h"
//
// Forward References:
//
extern "C" void __ct__16dMenuMapCommon_cFv();
extern "C" void __dt__16dMenuMapCommon_cFv();
extern "C" void initiate__16dMenuMapCommon_cFP10JKRArchive();
extern "C" void drawIcon__16dMenuMapCommon_cFffff();
extern "C" void iconScale__16dMenuMapCommon_cFifff();
extern "C" void setIconInfo__16dMenuMapCommon_cFUcfffffUc();
extern "C" void clearIconInfo__16dMenuMapCommon_cFv();
extern "C" void setBlendRatio__16dMenuMapCommon_cFUcff();
extern "C" void blinkMove__16dMenuMapCommon_cFs();
extern "C" void moveLightDropAnime__16dMenuMapCommon_cFv();
extern "C" void getIconSizeX__16dMenuMapCommon_cFUc();
extern "C" void getIconSizeY__16dMenuMapCommon_cFUc();
extern "C" void debugIcon__16dMenuMapCommon_cFv();
extern "C" extern char const* const d_menu_d_menu_map_common__stringBase0;
//
// External References:
//
extern "C" void __ct__16dSelect_cursor_cFUcfP10JKRArchive();
extern "C" void setScale__16dSelect_cursor_cFf();
extern "C" void setAlphaRate__16dSelect_cursor_cFf();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void rotate__7J2DPaneFff13J2DRotateAxisf();
extern "C" void setBasePosition__7J2DPaneF15J2DBasePosition();
extern "C" void setInfluencedAlpha__7J2DPaneFbb();
extern "C" void __ct__10J2DPictureFPC7ResTIMG();
extern "C" void _savegpr_26();
extern "C" void _savegpr_29();
extern "C" void _restgpr_26();
extern "C" void _restgpr_29();
//
// Declarations:
//
/* ############################################################################################## */
/* 803BCF18-803BD02C 01A038 0114+00 2/2 0/0 0/0 .data map_icon_size */
struct map_icon_size_t {
@@ -66,24 +25,8 @@ static map_icon_size_t map_icon_size[] = {
{40.0f, 40.0f, 0xb}, {40.0f, 40.0f, 0xc}, {40.0f, 40.0f, 0xf}, {40.0f, 40.0f, 0x10},
{40.0f, 40.0f, 0x8}, {67.5f, 40.0f, 0xd}, {40.0f, 40.0f, 0xe}, {40.0f, 40.0f, 0x13},
{40.0f, 40.0f, 0x14}, {40.0f, 40.0f, 0x15}, {40.0f, 40.0f, 0x16}};
/* 803BD02C-803BD038 01A14C 000C+00 2/2 0/0 0/0 .data __vt__16dMenuMapCommon_c */
SECTION_DATA extern void* __vt__16dMenuMapCommon_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__16dMenuMapCommon_cFv,
};
/* 804540D8-804540DC 0026D8 0004+00 6/6 0/0 0/0 .sdata2 @3703 */
SECTION_SDATA2 static u8 lit_3703[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 801C2718-801C27B4 1BD058 009C+00 0/0 2/2 0/0 .text __ct__16dMenuMapCommon_cFv */
// matches with literals
#ifdef NONMATCHING
dMenuMapCommon_c::dMenuMapCommon_c() {
for (int i = 0; i < 23; i++) {
mPictures[i] = NULL;
@@ -103,34 +46,31 @@ dMenuMapCommon_c::dMenuMapCommon_c() {
_c90 = 0;
clearIconInfo();
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dMenuMapCommon_c::dMenuMapCommon_c() {
nofralloc
#include "asm/d/menu/d_menu_map_common/__ct__16dMenuMapCommon_cFv.s"
}
#pragma pop
#endif
/* 801C27B4-801C28D8 1BD0F4 0124+00 1/0 2/2 0/0 .text __dt__16dMenuMapCommon_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dMenuMapCommon_c::~dMenuMapCommon_c() {
nofralloc
#include "asm/d/menu/d_menu_map_common/__dt__16dMenuMapCommon_cFv.s"
dMenuMapCommon_c::~dMenuMapCommon_c() {
for (int i = 0; i < 23; i++) {
if (mPictures[i] != NULL) {
delete mPictures[i];
mPictures[i] = NULL;
}
}
if (_60 != NULL) {
delete _60;
_60 = NULL;
}
if (mpDrawCursor != NULL) {
delete mpDrawCursor;
mpDrawCursor = NULL;
}
if (mpPortalIcon != NULL) {
delete mpPortalIcon;
mpPortalIcon = NULL;
}
}
#pragma pop
/* 804540DC-804540E0 0026DC 0004+00 7/7 0/0 0/0 .sdata2 @3882 */
SECTION_SDATA2 static f32 lit_3882 = 1.0f;
/* 801C28D8-801C38E4 1BD218 100C+00 0/0 2/2 0/0 .text initiate__16dMenuMapCommon_cFP10JKRArchive
*/
// matches with literals
#ifdef NONMATCHING
void dMenuMapCommon_c::initiate(JKRArchive* arc) {
ResTIMG* mp_image;
@@ -139,7 +79,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[4] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "tt_map_icon_boss_ci8_32_00.bti");
ASSERT(mp_image != 0);
mPictures[4]->append(mp_image, 1.0f);
mPictures[4]->append(mp_image, 0.0f);
mPictures[4]->setBasePosition(J2DBasePosition_4);
mPictures[4]->setInfluencedAlpha(false, false);
@@ -148,7 +88,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[3] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "tt_map_icon_boss_ci8_32_00.bti");
ASSERT(mp_image != 0);
mPictures[3]->append(mp_image, 1.0f);
mPictures[3]->append(mp_image, 0.0f);
mPictures[3]->setBasePosition(J2DBasePosition_4);
mPictures[3]->setInfluencedAlpha(false, false);
@@ -157,7 +97,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[20] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "im_map_icon_enter_ci8_02.bti");
ASSERT(mp_image != 0);
mPictures[20]->append(mp_image, 1.0f);
mPictures[20]->append(mp_image, 0.0f);
mPictures[20]->setBasePosition(J2DBasePosition_4);
mPictures[20]->setInfluencedAlpha(false, false);
@@ -166,7 +106,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[21] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "tt_map_icon_enter_ci8_32_00.bti");
ASSERT(mp_image != 0);
mPictures[21]->append(mp_image, 1.0f);
mPictures[21]->append(mp_image, 0.0f);
mPictures[21]->setBasePosition(J2DBasePosition_4);
mPictures[21]->setInfluencedAlpha(false, false);
@@ -175,7 +115,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[22] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "im_map_icon_warp_32_ci8_00.bti");
ASSERT(mp_image != 0);
mPictures[22]->append(mp_image, 1.0f);
mPictures[22]->append(mp_image, 0.0f);
mPictures[22]->setBasePosition(J2DBasePosition_4);
mPictures[22]->setInfluencedAlpha(false, false);
@@ -184,7 +124,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[19] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "tt_map_icon_box_ci8_32_00.bti");
ASSERT(mp_image != 0);
mPictures[19]->append(mp_image, 1.0f);
mPictures[19]->append(mp_image, 0.0f);
mPictures[19]->setBasePosition(J2DBasePosition_4);
mPictures[19]->setInfluencedAlpha(false, false);
@@ -193,7 +133,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[14] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "tt_map_icon_key_ci8_32_00.bti");
ASSERT(mp_image != 0);
mPictures[14]->append(mp_image, 1.0f);
mPictures[14]->append(mp_image, 0.0f);
mPictures[14]->setBasePosition(J2DBasePosition_4);
mPictures[14]->setInfluencedAlpha(false, false);
@@ -202,7 +142,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[9] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "st_yuki_M.bti");
ASSERT(mp_image != 0);
mPictures[9]->append(mp_image, 1.0f);
mPictures[9]->append(mp_image, 0.0f);
mPictures[9]->setBasePosition(J2DBasePosition_4);
mPictures[9]->setInfluencedAlpha(false, false);
@@ -211,7 +151,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[10] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "st_yuki_W.bti");
ASSERT(mp_image != 0);
mPictures[10]->append(mp_image, 1.0f);
mPictures[10]->append(mp_image, 0.0f);
mPictures[10]->setBasePosition(J2DBasePosition_4);
mPictures[10]->setInfluencedAlpha(false, false);
@@ -220,7 +160,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[11] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "st_gold_wolf.bti");
ASSERT(mp_image != 0);
mPictures[11]->append(mp_image, 1.0f);
mPictures[11]->append(mp_image, 0.0f);
mPictures[11]->setBasePosition(J2DBasePosition_4);
mPictures[11]->setInfluencedAlpha(false, false);
@@ -229,7 +169,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[12] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "tt_map_icon_monkey_ci8_32_00.bti");
ASSERT(mp_image != 0);
mPictures[12]->append(mp_image, 1.0f);
mPictures[12]->append(mp_image, 0.0f);
mPictures[12]->setBasePosition(J2DBasePosition_4);
mPictures[12]->setInfluencedAlpha(false, false);
@@ -238,7 +178,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[15] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "ni_obacyan.bti");
ASSERT(mp_image != 0);
mPictures[15]->append(mp_image, 1.0f);
mPictures[15]->append(mp_image, 0.0f);
mPictures[15]->setBasePosition(J2DBasePosition_4);
mPictures[15]->setInfluencedAlpha(false, false);
@@ -247,7 +187,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[16] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "ni_obacyan.bti");
ASSERT(mp_image != 0);
mPictures[16]->append(mp_image, 1.0f);
mPictures[16]->append(mp_image, 0.0f);
mPictures[16]->setBasePosition(J2DBasePosition_4);
mPictures[16]->setInfluencedAlpha(false, false);
@@ -257,7 +197,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mp_image = (ResTIMG*)arc->getResource('TIMG',
"im_zelda_map_icon_copy_stone_statue_snup_try_00_04.bti");
ASSERT(mp_image != 0);
mPictures[8]->append(mp_image, 1.0f);
mPictures[8]->append(mp_image, 0.0f);
mPictures[8]->setBasePosition(J2DBasePosition_4);
mPictures[8]->setInfluencedAlpha(false, false);
@@ -266,7 +206,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[17] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "tt_map_icon_link_ci8_32_00.bti");
ASSERT(mp_image != 0);
mPictures[17]->append(mp_image, 1.0f);
mPictures[17]->append(mp_image, 0.0f);
mPictures[17]->setBasePosition(J2DBasePosition_4);
mPictures[17]->setInfluencedAlpha(false, false);
@@ -275,7 +215,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[2] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "tt_map_icon_penant_ci8_32_00.bti");
ASSERT(mp_image != 0);
mPictures[2]->append(mp_image, 1.0f);
mPictures[2]->append(mp_image, 0.0f);
mPictures[2]->setBasePosition(J2DBasePosition_4);
mPictures[2]->setInfluencedAlpha(false, false);
@@ -284,7 +224,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[5] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "im_black_32.bti");
ASSERT(mp_image != 0);
mPictures[5]->append(mp_image, 1.0f);
mPictures[5]->append(mp_image, 0.0f);
mPictures[5]->setBasePosition(J2DBasePosition_4);
mPictures[5]->setInfluencedAlpha(false, false);
@@ -296,7 +236,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[23] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "im_hikari_no_shizuku_try_10_00_24x24.bti");
ASSERT(mp_image != 0);
mPictures[23]->append(mp_image, 1.0f);
mPictures[23]->append(mp_image, 0.0f);
mPictures[23]->setBasePosition(J2DBasePosition_4);
mPictures[23]->setInfluencedAlpha(false, false);
@@ -308,7 +248,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[6] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "im_zelda_map_icon_hikari_ball_03.bti");
ASSERT(mp_image != 0);
mPictures[6]->append(mp_image, 1.0f);
mPictures[6]->append(mp_image, 0.0f);
mPictures[6]->setBasePosition(J2DBasePosition_4);
mPictures[6]->setInfluencedAlpha(false, false);
@@ -317,7 +257,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[7] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "im_map_icon_iron_ball_ci8_32_00.bti");
ASSERT(mp_image != 0);
mPictures[7]->append(mp_image, 1.0f);
mPictures[7]->append(mp_image, 0.0f);
mPictures[7]->setBasePosition(J2DBasePosition_4);
mPictures[7]->setInfluencedAlpha(false, false);
@@ -326,7 +266,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[13] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "im_map_icon_basha_ci8.bti");
ASSERT(mp_image != 0);
mPictures[13]->append(mp_image, 1.0f);
mPictures[13]->append(mp_image, 0.0f);
mPictures[13]->setBasePosition(J2DBasePosition_4);
mPictures[13]->setInfluencedAlpha(false, false);
@@ -335,7 +275,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
mPictures[18] = new J2DPicture(mp_image);
mp_image = (ResTIMG*)arc->getResource('TIMG', "im_nijumaru_40x40_ind_01.bti");
ASSERT(mp_image != 0);
mPictures[18]->append(mp_image, 1.0f);
mPictures[18]->append(mp_image, 0.0f);
mPictures[18]->setBasePosition(J2DBasePosition_4);
mPictures[18]->setInfluencedAlpha(false, false);
@@ -347,81 +287,10 @@ void dMenuMapCommon_c::initiate(JKRArchive* arc) {
ASSERT(mpPortalIcon != 0);
}
}
#else
/* ############################################################################################## */
/* 803959C0-803959C0 022020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803959C0 = "tt_map_icon_boss_s_ci8_16_00.bti";
SECTION_DEAD static char const* const stringBase_803959E1 = "tt_map_icon_boss_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395A00 = "im_map_icon_enter_ci8_24_02.bti";
SECTION_DEAD static char const* const stringBase_80395A20 = "im_map_icon_enter_ci8_02.bti";
SECTION_DEAD static char const* const stringBase_80395A3D = "tt_map_icon_enter_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395A5F = "tt_map_icon_enter_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395A7F = "im_map_icon_warp_24_ci8_00.bti";
SECTION_DEAD static char const* const stringBase_80395A9E = "im_map_icon_warp_32_ci8_00.bti";
SECTION_DEAD static char const* const stringBase_80395ABD = "tt_map_icon_box_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395ADD = "tt_map_icon_box_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395AFB =
"tt_map_icon_s_size_circle_ci4_gray_00.bti";
SECTION_DEAD static char const* const stringBase_80395B25 = "tt_map_icon_key_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395B43 = "tt_map_icon_s_size_circle_ci4_00.bti";
SECTION_DEAD static char const* const stringBase_80395B68 = "st_yuki_M.bti";
SECTION_DEAD static char const* const stringBase_80395B76 = "st_yuki_W.bti";
SECTION_DEAD static char const* const stringBase_80395B84 =
"tt_map_icon_s_size_circle_ci4_yellow_00.bti";
SECTION_DEAD static char const* const stringBase_80395BB0 = "st_gold_wolf.bti";
SECTION_DEAD static char const* const stringBase_80395BC1 = "tt_map_icon_monkey_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395BE2 =
"tt_map_icon_s_size_circle_ci4_blue_00.bti";
SECTION_DEAD static char const* const stringBase_80395C0C = "ni_obacyan.bti";
SECTION_DEAD static char const* const stringBase_80395C1B =
"im_zelda_map_icon_copy_stone_statue_snup_try_00_"
"04.bti";
SECTION_DEAD static char const* const stringBase_80395C52 = "tt_map_icon_link_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395C73 = "tt_map_icon_link_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395C92 = "tt_map_icon_penant_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395CB5 = "tt_map_icon_penant_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395CD6 = "im_black_32.bti";
SECTION_DEAD static char const* const stringBase_80395CE6 =
"im_hikari_no_shizuku_try_10_00_24x24.bti";
SECTION_DEAD static char const* const stringBase_80395D0F = "im_zelda_map_icon_hikari_ball_03.bti";
SECTION_DEAD static char const* const stringBase_80395D34 = "im_map_icon_iron_ball_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395D58 = "im_map_icon_basha_ci8.bti";
SECTION_DEAD static char const* const stringBase_80395D72 = "im_nijumaru_40x40_ind_01.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80395D8F = "";
#pragma pop
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenuMapCommon_c::initiate(JKRArchive* param_0) {
nofralloc
#include "asm/d/menu/d_menu_map_common/initiate__16dMenuMapCommon_cFP10JKRArchive.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 804540E0-804540E4 0026E0 0004+00 1/1 0/0 0/0 .sdata2 @4010 */
SECTION_SDATA2 static f32 lit_4010 = 255.0f;
/* 804540E4-804540E8 0026E4 0004+00 1/1 0/0 0/0 .sdata2 @4011 */
SECTION_SDATA2 static f32 lit_4011 = 4.0f / 7.0f;
/* 804540E8-804540EC 0026E8 0004+00 3/3 0/0 0/0 .sdata2 @4012 */
SECTION_SDATA2 static f32 lit_4012 = 0.5f;
/* 804540EC-804540F0 0026EC 0004+00 1/1 0/0 0/0 .sdata2 @4013 */
SECTION_SDATA2 static f32 lit_4013 = 180.0f;
/* 801C38E4-801C3EC4 1BE224 05E0+00 0/0 2/2 0/0 .text drawIcon__16dMenuMapCommon_cFffff
*/
//unfinished
#ifdef NONMATCHING
void dMenuMapCommon_c::drawIcon(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
void dMenuMapCommon_c::drawIcon(f32 param_1, f32 param_2, f32 param_3, f32 param_4) {
s16 tmp[128];
if (g_fmapHIO.mMapIconHIO.mIconDebug) {
debugIcon();
@@ -437,8 +306,8 @@ void dMenuMapCommon_c::drawIcon(f32 param_0, f32 param_1, f32 param_2, f32 param
tmp[i] = -1;
}
for (int i = 0; i < 22; i++) {
for (int j = 0; j < 128; j++) {
for (int i = 22; i >= 0; i--) {
for (s16 j = 0; j < 128; j++) {
if (i == _70[j]._14 && _70[j]._15 != 0) {
tmp[counter] = j;
counter++;
@@ -447,163 +316,383 @@ void dMenuMapCommon_c::drawIcon(f32 param_0, f32 param_1, f32 param_2, f32 param
}
for (int i = 0; i < 128; i++) {
s16 val = tmp[i];
if (val != -1) {
if (_70[val]._14 == 0) {
float float1 = _70[val]._0;
float float2 = _70[val]._4;
if (mpPortalIcon) {
if (mpPortalIcon->getUpdateFlag()) {
if (_70[val]._15 == 2) {
mpPortalIcon->setAlphaRate(255.0f);
s16 sVar9 = tmp[i];
if (sVar9 != -1) {
if (_70[sVar9]._14 == 0) {
if (mpDrawCursor != NULL) {
f32 local_1b4 = _70[sVar9]._0;
f32 local_1b8 = _70[sVar9]._4;
if (mpDrawCursor->getUpdateFlag() == 1) {
if (_70[sVar9]._15 == 2) {
mpDrawCursor->setAlphaRate(1.0f);
} else if (_70[sVar9]._15 == 3) {
mpDrawCursor->setAlphaRate(_c78);
} else {
mpDrawCursor->setAlphaRate(param_4 * (param_3 * _70[sVar9]._10));
}
}
f32 local_1bc = (local_1b4 + param_1);
mpDrawCursor->setPos(local_1bc, (local_1b8 + param_2));
mpDrawCursor->setScale( _70[sVar9]._8 * g_fmapHIO.mMapIconHIO.mPortalCursorScale);
mpDrawCursor->draw();
mpDrawCursor->resetUpdateFlag();
}
} else if (_70[sVar9]._14 == 1) {
if (mpPortalIcon != NULL) {
f32 local_1c0 = _70[sVar9]._0;
f32 local_1c4 = _70[sVar9]._4;
if (mpPortalIcon->getUpdateFlag() == 1) {
if (_70[sVar9]._15 == 2) {
mpPortalIcon->setAlphaRate(1.0f);
} else if (_70[sVar9]._15 == 3) {
mpPortalIcon->setAlphaRate(_c78);
} else {
mpPortalIcon->setAlphaRate(param_3 * _70[sVar9]._10);
}
}
f32 local_1c8 = (local_1c0 + param_1);
mpPortalIcon->setPos(local_1c8, (local_1c4 + param_2));
mpPortalIcon->setScale(_70[sVar9]._8 * g_fmapHIO.mMapIconHIO.mPortalIconScale);
mpPortalIcon->draw();
mpPortalIcon->resetUpdateFlag();
}
} else if (mPictures[_70[sVar9]._14] != NULL) {
f32 fVar2 = _70[sVar9]._0;
f32 fVar3 = _70[sVar9]._4;
f32 dVar11 = getIconSizeX(_70[sVar9]._14);
f32 dVar12 = getIconSizeY(_70[sVar9]._14);
f32 dVar17 = ((4.0f / 7.0f) * getIconSizeX(_70[sVar9]._14));
f32 dVar13 = ((4.0f / 7.0f) * getIconSizeY(_70[sVar9]._14));
if (_70[sVar9]._14 == 5) {
dVar11 = (dVar11 * _c7c);
dVar12 = (dVar12 * _c7c);
}
mPictures[_70[sVar9]._14]->rotate(
dVar11 / 2,
dVar12 / 2, ROTATE_Z,
_70[sVar9]._C);
if (_70[sVar9]._14 == 5) {
mPictures[_70[sVar9]._14]->setAlpha(((180.0f * _c80) / 255.0f));
_60->rotate((dVar17 / 2), (dVar13 / 2), ROTATE_Z, _70[sVar9]._C);
_60->setAlpha(_c80);
} else if (_70[sVar9]._15 == 2) {
mPictures[_70[sVar9]._14]->setAlpha(0xff);
} else if (_70[sVar9]._15 == 3) {
mPictures[_70[sVar9]._14]->setAlpha(255.0f * _c78);
} else {
mPictures[_70[sVar9]._14]->setAlpha(param_4 *
(255.0f * param_3 * _70[sVar9]._10));
}
f32 temp = (fVar2 - (dVar11 / 2));
fVar2 = param_1 + temp;
mPictures[_70[sVar9]._14]->draw(fVar2, (param_2 + (fVar3 - dVar12 / 2)), dVar11, dVar12,
false, false, false);
if (_70[sVar9]._14 == 5) {
_60->draw((fVar2 + (dVar11 / 2)) - (dVar17 / 2),
((dVar12 / 2) + (param_2 + (fVar3 - dVar12 / 2))) - (dVar13 / 2),
dVar17, dVar13, false, false, false);
}
}
}
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenuMapCommon_c::drawIcon(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
nofralloc
#include "asm/d/menu/d_menu_map_common/drawIcon__16dMenuMapCommon_cFffff.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 804540F0-804540F4 0026F0 0004+00 1/1 0/0 0/0 .sdata2 @4072 */
SECTION_SDATA2 static f32 lit_4072 = 16.0f / 27.0f;
/* 804540F4-804540F8 0026F4 0004+00 1/1 0/0 0/0 .sdata2 @4073 */
SECTION_SDATA2 static f32 lit_4073 = 11.0f / 27.0f;
/* 801C3EC4-801C43A8 1BE804 04E4+00 0/0 4/4 0/0 .text iconScale__16dMenuMapCommon_cFifff
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenuMapCommon_c::iconScale(int param_0, f32 param_1, f32 param_2, f32 param_3) {
nofralloc
#include "asm/d/menu/d_menu_map_common/iconScale__16dMenuMapCommon_cFifff.s"
void dMenuMapCommon_c::iconScale(int param_1, f32 param_2, f32 param_3, f32 param_4) {
_c88 = 1.0f + param_4;
f32 local_74[23];
local_74[17] =
g_fmapHIO.mMapIconHIO.mLinkZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mLinkZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mLinkScale[param_1]);
local_74[20] =
g_fmapHIO.mMapIconHIO.mDungeonEntranceZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mDungeonEntranceZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mDungeonEntranceScale[param_1]);
local_74[21] =
g_fmapHIO.mMapIconHIO.mRoomEntranceZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mRoomEntranceZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mRoomEntranceScale[param_1]);
local_74[22] =
g_fmapHIO.mMapIconHIO.mLV8EntranceZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mLV8EntranceZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mLV8EntranceScale[param_1]);
local_74[4] =
g_fmapHIO.mMapIconHIO.mBossZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mBossZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mBossScale[param_1]);
local_74[3] =
g_fmapHIO.mMapIconHIO.mGanonZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mGanonZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mGanonScale[param_1]);
local_74[14] =
g_fmapHIO.mMapIconHIO.mSmallKeyZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mSmallKeyZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mSmallKeyScale[param_1]);
local_74[19] =
g_fmapHIO.mMapIconHIO.mChestZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mChestZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mChestScale[param_1]);
local_74[9] =
g_fmapHIO.mMapIconHIO.mYetoZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mYetoZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mYetoScale[param_1]);
local_74[10] =
g_fmapHIO.mMapIconHIO.mYetaZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mYetaZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mYetaScale[param_1]);
local_74[11] =
g_fmapHIO.mMapIconHIO.mGoldWolfZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mGoldWolfZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mGoldWolfScale[param_1]);
local_74[12] =
g_fmapHIO.mMapIconHIO.mMonkeyZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mMonkeyZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mMonkeyScale[param_1]);
local_74[15] =
g_fmapHIO.mMapIconHIO.mOoccooZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mOoccooZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mOoccooScale[param_1]);
local_74[16] =
g_fmapHIO.mMapIconHIO.mOoccooPotZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mOoccooPotZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mOoccooPotScale[param_1]);
local_74[8] =
g_fmapHIO.mMapIconHIO.mCopyRodStatueZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mCopyRodStatueZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mCopyRodStatueScale[param_1]);
local_74[2] =
g_fmapHIO.mMapIconHIO.mDungeonWarpZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mDungeonWarpZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mDungeonWarpScale[param_1]);
local_74[5] =
g_fmapHIO.mMapIconHIO.mLightDropZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mLightDropZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mLightDropScale[param_1]);
local_74[6] =
g_fmapHIO.mMapIconHIO.mLightOrbZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mLightOrbZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mLightOrbScale[param_1]);
local_74[7] =
g_fmapHIO.mMapIconHIO.mCannonBallZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mCannonBallZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mCannonBallScale[param_1]);
local_74[13] =
g_fmapHIO.mMapIconHIO.mWagonZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mWagonZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mWagonScale[param_1]);
local_74[18] =
g_fmapHIO.mMapIconHIO.mDestinationZoomScale[param_1] -
param_2 * (g_fmapHIO.mMapIconHIO.mDestinationZoomScale[param_1] - g_fmapHIO.mMapIconHIO.mDestinationScale[param_1]);
local_74[0] = 1.0f;
local_74[1] = 1.0f;
for (int i = 0; i < 23; i++) {
if (mPictures[i] != NULL) {
if (i == 13) {
mPictures[i]->scale(((16.0f / 27.0f) +
((11.0f / 27.0f) * param_4)) *
local_74[i],
local_74[i]);
} else {
mPictures[i]->scale(local_74[i], local_74[i]);
if (i == 5) {
_60->scale(local_74[i], local_74[i]);
}
}
}
}
setBlendRatio(17, param_3, param_4);
setBlendRatio(20, param_3, param_4);
setBlendRatio(21, param_3, param_4);
setBlendRatio(22, param_3, param_4);
setBlendRatio(4, param_3, param_4);
setBlendRatio(3, param_3, param_4);
setBlendRatio(14, param_3, param_4);
setBlendRatio(19, param_3, param_4);
setBlendRatio(9, param_3, param_4);
setBlendRatio(10, param_3, param_4);
setBlendRatio(11, param_3, param_4);
setBlendRatio(12, param_3, param_4);
setBlendRatio(15, param_3, param_4);
setBlendRatio(16, param_3, param_4);
setBlendRatio(8, param_3, param_4);
setBlendRatio(2, param_3, param_4);
setBlendRatio(5, param_3, param_4);
setBlendRatio(6, param_3, param_4);
setBlendRatio(7, param_3, param_4);
setBlendRatio(13, param_3, param_4);
setBlendRatio(18, param_3, param_4);
}
#pragma pop
/* 801C43A8-801C443C 1BECE8 0094+00 1/1 3/3 0/0 .text setIconInfo__16dMenuMapCommon_cFUcfffffUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenuMapCommon_c::setIconInfo(u8 param_0, f32 param_1, f32 param_2, f32 param_3,
f32 param_4, f32 param_5, u8 param_6) {
nofralloc
#include "asm/d/menu/d_menu_map_common/setIconInfo__16dMenuMapCommon_cFUcfffffUc.s"
bool dMenuMapCommon_c::setIconInfo(u8 param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5,
f32 param_6, u8 param_7) {
if (mIconNum >= 128) {
return false;
}
_70[mIconNum]._0 = param_2;
_70[mIconNum]._4 = param_3;
_70[mIconNum]._8 = param_6;
_70[mIconNum]._C = param_5;
_70[mIconNum]._14 = param_1;
_70[mIconNum]._15 = param_7;
_70[mIconNum]._10 = param_4;
mIconNum++;
return true;
}
#pragma pop
/* 801C443C-801C4494 1BED7C 0058+00 1/1 2/2 0/0 .text clearIconInfo__16dMenuMapCommon_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenuMapCommon_c::clearIconInfo() {
nofralloc
#include "asm/d/menu/d_menu_map_common/clearIconInfo__16dMenuMapCommon_cFv.s"
void dMenuMapCommon_c::clearIconInfo() {
mIconNum = 0;
for (int i = 0; i < 128; i++) {
_70[i]._0 = 0.0f;
_70[i]._4 = 0.0f;
_70[i]._8 = 1.0f;
_70[i]._C = 0.0f;
_70[i]._14 = 23;
_70[i]._15 = 0;
// !@bug _10 is only set to zero in the first icon.
// Shouldn't really matter though as setIconInfo sets it on init.
_70[mIconNum]._10 = 0.0f;
}
}
#pragma pop
/* 801C4494-801C452C 1BEDD4 0098+00 1/1 0/0 0/0 .text setBlendRatio__16dMenuMapCommon_cFUcff */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenuMapCommon_c::setBlendRatio(u8 param_0, f32 param_1, f32 param_2) {
nofralloc
#include "asm/d/menu/d_menu_map_common/setBlendRatio__16dMenuMapCommon_cFUcff.s"
void dMenuMapCommon_c::setBlendRatio(u8 param_1, f32 param_2, f32 param_3) {
if (mPictures[param_1] != NULL) {
mPictures[param_1]->setBlendRatio(param_2, param_3);
if (param_1 == 5) {
_60->setBlendRatio(param_2, param_3);
}
}
}
#pragma pop
/* ############################################################################################## */
/* 804540F8-80454100 0026F8 0008+00 2/2 0/0 0/0 .sdata2 @4119 */
SECTION_SDATA2 static f64 lit_4119 = 4503601774854144.0 /* cast s32 to float */;
/* 801C452C-801C4600 1BEE6C 00D4+00 0/0 1/1 0/0 .text blinkMove__16dMenuMapCommon_cFs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenuMapCommon_c::blinkMove(s16 param_0) {
nofralloc
#include "asm/d/menu/d_menu_map_common/blinkMove__16dMenuMapCommon_cFs.s"
void dMenuMapCommon_c::blinkMove(s16 param_1) {
_c72++;
if (_c72 >= param_1) {
_c72 -= (s16)(param_1 + 15);
}
if (_c72 < 0) {
_c78 = 1.0f;
} else if (_c72 <= param_1 / 2.0f) {
_c78 = (param_1 / 2.0f - _c72) / (param_1 / 2.0f);
} else {
_c78 = (_c72 - param_1 / 2.0f) / (param_1 / 2.0f);
}
}
#pragma pop
/* ############################################################################################## */
/* 80454100-80454108 002700 0008+00 1/1 0/0 0/0 .sdata2 @4140 */
SECTION_SDATA2 static f64 lit_4140 = 4503599627370496.0 /* cast u32 to float */;
/* 801C4600-801C4738 1BEF40 0138+00 0/0 1/1 0/0 .text moveLightDropAnime__16dMenuMapCommon_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenuMapCommon_c::moveLightDropAnime() {
nofralloc
#include "asm/d/menu/d_menu_map_common/moveLightDropAnime__16dMenuMapCommon_cFv.s"
void dMenuMapCommon_c::moveLightDropAnime() {
int bVar6 = 0;
if (_c88 > 1.0f) {
bVar6 = 1;
}
s16 r7 = g_fmapHIO.mMapIconHIO.mLightDropFlashFrameNum;
f32 fVar3 = g_fmapHIO.mMapIconHIO.mLightDropFlashStartScaleOut[bVar6];
f32 fVar4 = g_fmapHIO.mMapIconHIO.mLightDropFlashEndScaleOut[bVar6];
u8 bVar1 = g_fmapHIO.mMapIconHIO.mLightDropFlashStartAlphaOut[bVar6];
u8 bVar2 = g_fmapHIO.mMapIconHIO.mLightDropFlashEndAlphaOut[bVar6];
_c74++;
if (_c74 >= r7) {
_c74 -= r7;
}
f32 fVar7;
if (_c74 <= r7 / 2.0f) {
fVar7 = (r7 / 2.0f - _c74) / (r7 / 2.0f);
} else {
fVar7 = (_c74 - r7 / 2.0f) / (r7 / 2.0f);
}
_c80 = bVar1 + fVar7 * (bVar2 - bVar1);
_c7c = fVar3 + fVar7 * (fVar4 - fVar3);
}
#pragma pop
/* 801C4738-801C4778 1BF078 0040+00 1/1 0/0 0/0 .text getIconSizeX__16dMenuMapCommon_cFUc
*/
#ifdef NONMATCHING
float dMenuMapCommon_c::getIconSizeX(u8 index) {
for (int i = 0; i < ARRAY_SIZE(map_icon_size); i++) {
if (map_icon_size[index].mIndex == index) {
return map_icon_size[index].mXSize;
if (map_icon_size[i].mIndex == index) {
return map_icon_size[i].mXSize;
}
}
return 0.0f;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm float dMenuMapCommon_c::getIconSizeX(u8 param_0) {
nofralloc
#include "asm/d/menu/d_menu_map_common/getIconSizeX__16dMenuMapCommon_cFUc.s"
}
#pragma pop
#endif
/* 801C4778-801C47C4 1BF0B8 004C+00 1/1 0/0 0/0 .text getIconSizeY__16dMenuMapCommon_cFUc
*/
#ifdef NONMATCHING
float dMenuMapCommon_c::getIconSizeY(u8 index) {
for (int i = 0; i < ARRAY_SIZE(map_icon_size); i++) {
if (map_icon_size[index].mIndex == index) {
return map_icon_size[index].mYSize;
if (map_icon_size[i].mIndex == index) {
return map_icon_size[i].mYSize;
}
}
return 0.0f;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm float dMenuMapCommon_c::getIconSizeY(u8 param_0) {
nofralloc
#include "asm/d/menu/d_menu_map_common/getIconSizeY__16dMenuMapCommon_cFUc.s"
}
#pragma pop
#endif
/* 801C47C4-801C4D54 1BF104 0590+00 1/1 0/0 0/0 .text debugIcon__16dMenuMapCommon_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenuMapCommon_c::debugIcon() {
nofralloc
#include "asm/d/menu/d_menu_map_common/debugIcon__16dMenuMapCommon_cFv.s"
}
#pragma pop
void dMenuMapCommon_c::debugIcon() {
int iVar6 = -1;
for (int i = 0; i < 128; i++)
{
if (_70[i]._14 == 17) {
iVar6 = i;
break;
}
}
if (iVar6 < 0) {
return;
}
/* 803959C0-803959C0 022020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
f32 dVar10 = _70[iVar6]._0;
f32 dVar9 = _70[iVar6]._4;
f32 dVar7 = _70[iVar6]._8;
if (g_fmapHIO.mMapIconHIO.mIconDisplay[0]) {
setIconInfo(0, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
setIconInfo(1, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (!g_fmapHIO.mMapIconHIO.mIconDisplay[1]) {
_70[iVar6]._15 = 0;
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[2]) {
setIconInfo(2, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[3]) {
setIconInfo(18, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[4]) {
setIconInfo(4, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[5]) {
setIconInfo(3, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[6]) {
setIconInfo(5, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[7]) {
setIconInfo(6, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[8]) {
setIconInfo(7, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[9]) {
setIconInfo(9, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[10]) {
setIconInfo(10, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[11]) {
setIconInfo(11, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[12]) {
setIconInfo(12, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[13]) {
setIconInfo(15, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[14]) {
setIconInfo(16, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[15]) {
setIconInfo(8, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[16]) {
setIconInfo(13, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[17]) {
setIconInfo(14, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[18]) {
setIconInfo(19, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[19]) {
setIconInfo(20, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[20]) {
setIconInfo(21, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
if (g_fmapHIO.mMapIconHIO.mIconDisplay[21]) {
setIconInfo(22, dVar10, dVar9, 0.0f, dVar7, 1.0f, 1);
}
}
+92 -92
View File
@@ -1226,90 +1226,90 @@ dMeter_ringHIO_c::dMeter_ringHIO_c() {
dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() {
mPortalCursorScale = 0.5f;
mPortalIconScale = 0.65f;
mDestinationScale = 0.5f;
mDestinationZoomScale = 0.8f;
mLinkScale = 0.5f;
mLinkZoomScale = 0.6f;
mYetoScale = 0.3f;
mYetoZoomScale = 1.2f;
mYetaScale = 0.3f;
mYetaZoomScale = 1.2f;
mGoldWolfScale = 0.2f;
mGoldWolfZoomScale = 1.28f;
field_0xa0 = 0.2f;
field_0xa8 = 1.6f;
field_0xb0 = 0.2f;
field_0xb8 = 1.6f;
field_0xc0 = 0.2f;
field_0xc8 = 1.6f;
field_0xd0 = 0.2f;
field_0xd8 = 1.6f;
mWagonScale = 0.2f;
mWagonZoomScale = 1.0f;
field_0x60 = 0.2f;
field_0x68 = 1.6f;
field_0x50 = 0.2f;
field_0x58 = 1.4f;
mDungeonEntranceScale = 0.4f;
mDungeonEntranceZoomScale = 0.6f;
field_0x20 = 0.2f;
field_0x28 = 1.6f;
field_0x30 = 0.2f;
field_0x38 = 1.6f;
mRoomEntranceScale = 0.5f;
mRoomEntranceZoomScale = 0.6f;
mLV8EntranceScale = 0.5f;
mLV8EntranceZoomScale = 0.6f;
field_0x120 = 0.2f;
field_0x128 = 1.6f;
mLightDropScale = 0.25f;
mLightDropZoomScale = 0.55f;
field_0x140 = 0.2f;
field_0x148 = 1.6f;
field_0x150 = 0.2f;
field_0x158 = 1.6f;
mDungeonDestScale = 0.5f;
mDungeonDestZoomScale = 0.8f;
mDungeonLinkScale = 0.4f;
mDungeonLinkZoomScale = 0.5f;
field_0x74 = 0.2f;
field_0x7c = 0.8f;
field_0x84 = 0.2f;
field_0x8c = 0.8f;
field_0x94 = 0.2f;
field_0x9c = 0.8f;
mMonkeyScale = 0.2f;
mMonkeyZoomScale = 0.8f;
mOoccooScale = 0.2f;
mOoccooZoomScale = 0.8f;
mOoccooPotScale = 0.2f;
mOoccooPotZoomScale = 0.8f;
mCopyRodStatueScale = 0.2f;
mCopyRodStatueZoomScale = 0.8f;
field_0xe4 = 0.2f;
field_0xec = 0.5f;
mChestScale = 0.2f;
mChestZoomScale = 0.8f;
mSmallKeyScale = 0.2f;
mSmallKeyZoomScale = 0.7f;
mDungeonExitScale = 0.3f;
mDungeonExitZoomScale = 0.6f;
mBossScale = 0.2f;
mBossZoomScale = 0.8f;
mGanonScale = 0.2f;
mGanonZoomScale = 0.8f;
mDungeonSpawnScale = 0.4f;
mDungeonSpawnZoomScale = 0.5f;
field_0x114 = 0.4f;
field_0x11c = 0.5f;
mDungeonWarpScale = 0.2f;
mDungeonWarpZoomScale = 0.8f;
field_0x134 = 0.25f;
field_0x13c = 0.3f;
mLightOrbScale = 0.2f;
mLightOrbZoomScale = 0.8f;
mCannonBallScale = 0.2f;
mCannonBallZoomScale = 0.8f;
mDestinationScale[0] = 0.5f;
mDestinationZoomScale[0] = 0.8f;
mLinkScale[0] = 0.5f;
mLinkZoomScale[0] = 0.6f;
mYetoScale[0] = 0.3f;
mYetoZoomScale[0] = 1.2f;
mYetaScale[0] = 0.3f;
mYetaZoomScale[0] = 1.2f;
mGoldWolfScale[0] = 0.2f;
mGoldWolfZoomScale[0] = 1.28f;
mMonkeyScale[0] = 0.2f;
mMonkeyZoomScale[0] = 1.6f;
mOoccooScale[0] = 0.2f;
mOoccooZoomScale[0] = 1.6f;
mOoccooPotScale[0] = 0.2f;
mOoccooPotZoomScale[0] = 1.6f;
mCopyRodStatueScale[0] = 0.2f;
mCopyRodStatueZoomScale[0] = 1.6f;
mWagonScale[0] = 0.2f;
mWagonZoomScale[0] = 1.0f;
mChestScale[0] = 0.2f;
mChestZoomScale[0] = 1.6f;
mSmallKeyScale[0] = 0.2f;
mSmallKeyZoomScale[0] = 1.4f;
mDungeonEntranceScale[0] = 0.4f;
mDungeonEntranceZoomScale[0] = 0.6f;
mBossScale[0] = 0.2f;
mBossZoomScale[0] = 1.6f;
mGanonScale[0] = 0.2f;
mGanonZoomScale[0] = 1.6f;
mRoomEntranceScale[0] = 0.5f;
mRoomEntranceZoomScale[0] = 0.6f;
mLV8EntranceScale[0] = 0.5f;
mLV8EntranceZoomScale[0] = 0.6f;
mDungeonWarpScale[0] = 0.2f;
mDungeonWarpZoomScale[0] = 1.6f;
mLightDropScale[0] = 0.25f;
mLightDropZoomScale[0] = 0.55f;
mLightOrbScale[0] = 0.2f;
mLightOrbZoomScale[0] = 1.6f;
mCannonBallScale[0] = 0.2f;
mCannonBallZoomScale[0] = 1.6f;
mDestinationScale[1] = 0.5f;
mDestinationZoomScale[1] = 0.8f;
mLinkScale[1] = 0.4f;
mLinkZoomScale[1] = 0.5f;
mYetoScale[1] = 0.2f;
mYetoZoomScale[1] = 0.8f;
mYetaScale[1] = 0.2f;
mYetaZoomScale[1] = 0.8f;
mGoldWolfScale[1] = 0.2f;
mGoldWolfZoomScale[1] = 0.8f;
mMonkeyScale[1] = 0.2f;
mMonkeyZoomScale[1] = 0.8f;
mOoccooScale[1] = 0.2f;
mOoccooZoomScale[1] = 0.8f;
mOoccooPotScale[1] = 0.2f;
mOoccooPotZoomScale[1] = 0.8f;
mCopyRodStatueScale[1] = 0.2f;
mCopyRodStatueZoomScale[1] = 0.8f;
mWagonScale[1] = 0.2f;
mWagonZoomScale[1] = 0.5f;
mChestScale[1] = 0.2f;
mChestZoomScale[1] = 0.8f;
mSmallKeyScale[1] = 0.2f;
mSmallKeyZoomScale[1] = 0.7f;
mDungeonEntranceScale[1] = 0.3f;
mDungeonEntranceZoomScale[1] = 0.6f;
mBossScale[1] = 0.2f;
mBossZoomScale[1] = 0.8f;
mGanonScale[1] = 0.2f;
mGanonZoomScale[1] = 0.8f;
mRoomEntranceScale[1] = 0.4f;
mRoomEntranceZoomScale[1] = 0.5f;
mLV8EntranceScale[1] = 0.4f;
mLV8EntranceZoomScale[1] = 0.5f;
mDungeonWarpScale[1] = 0.2f;
mDungeonWarpZoomScale[1] = 0.8f;
mLightDropScale[1] = 0.25f;
mLightDropZoomScale[1] = 0.3f;
mLightOrbScale[1] = 0.2f;
mLightOrbZoomScale[1] = 0.8f;
mCannonBallScale[1] = 0.2f;
mCannonBallZoomScale[1] = 0.8f;
mLV5DungeonItemDebug = false;
mLV5DungeonItem = NO_ITEM;
@@ -1319,14 +1319,14 @@ dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() {
mIconDisplay[i] = true;
}
mLightDropFlashStartScaleOut = 1.2f;
mLightDropFlashEndScaleOut = 1.5f;
mLightDropFlashStartAlphaOut = 255;
mLightDropFlashEndAlphaOut = 255;
mLightDropFlashStartScaleIn = 1.0f;
mLightDropFlashEndScaleIn = 1.3f;
mLightDropFlashStartAlphaIn = 255;
mLightDropFlashEndAlphaIn = 255;
mLightDropFlashStartScaleOut[0] = 1.2f;
mLightDropFlashEndScaleOut[0] = 1.5f;
mLightDropFlashStartAlphaOut[0] = 255;
mLightDropFlashEndAlphaOut[0] = 255;
mLightDropFlashStartScaleOut[1] = 1.0f;
mLightDropFlashEndScaleOut[1] = 1.3f;
mLightDropFlashStartAlphaOut[1] = 255;
mLightDropFlashEndAlphaOut[1] = 255;
mLightDropFlashFrameNum = 10;
}