mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 04:31:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some nonmatching functions (#2141)

Browse Source
This commit is contained in:
Caroline Madsen
2024-04-28 22:33:32 -04:00
committed by GitHub
parent 669c7d920b
commit 7339a87bd9
75 changed files with 673 additions and 6374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/kankyo/d_kankyo_wether.cpp
+63 -622
View File
@@ -1,7 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: d/kankyo/d_kankyo_wether
//
/**
* d_kankyo_wether.cpp
* Weather Effects
*/
#include "d/kankyo/d_kankyo_wether.h"
#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
@@ -9,221 +9,11 @@
#include "d/com/d_com_inf_game.h"
#include "d/kankyo/d_kankyo.h"
#include "d/kankyo/d_kankyo_rain.h"
#include "dol2asm.h"
#include "string.h"
#include "m_Do/m_Do_audio.h"
//
// Forward References:
//
extern "C" static void dKyw_setDrawPacketList__FP9J3DPacketi();
extern "C" static void dKyw_setDrawPacketListIndScreen__FP9J3DPacketi();
extern "C" static void dKyw_setDrawPacketListSky__FP9J3DPacketi();
extern "C" static void dKyw_setDrawPacketListXluBg__FP9J3DPacketi();
extern "C" void draw__18dKankyo_sun_PacketFv();
extern "C" void draw__22dKankyo_sunlenz_PacketFv();
extern "C" void __dt__8RAIN_EFFFv();
extern "C" void __ct__8RAIN_EFFFv();
extern "C" void draw__19dKankyo_rain_PacketFv();
extern "C" void __dt__8SNOW_EFFFv();
extern "C" void __ct__8SNOW_EFFFv();
extern "C" void draw__19dKankyo_snow_PacketFv();
extern "C" void __dt__8STAR_EFFFv();
extern "C" void __ct__8STAR_EFFFv();
extern "C" void draw__19dKankyo_star_PacketFv();
extern "C" void __dt__9CLOUD_EFFFv();
extern "C" void __ct__9CLOUD_EFFFv();
extern "C" void draw__20dKankyo_cloud_PacketFv();
extern "C" void __dt__9HOUSI_EFFFv();
extern "C" void __ct__9HOUSI_EFFFv();
extern "C" void draw__20dKankyo_housi_PacketFv();
extern "C" void __dt__10VRKUMO_EFFFv();
extern "C" void __ct__10VRKUMO_EFFFv();
extern "C" void draw__21dKankyo_vrkumo_PacketFv();
extern "C" void __dt__12EF_ODOUR_EFFFv();
extern "C" void __ct__12EF_ODOUR_EFFFv();
extern "C" void draw__20dKankyo_odour_PacketFv();
extern "C" void __dt__10EF_MUD_EFFFv();
extern "C" void __ct__10EF_MUD_EFFFv();
extern "C" void draw__18dKankyo_mud_PacketFv();
extern "C" void __dt__11EF_EVIL_EFFFv();
extern "C" void __ct__11EF_EVIL_EFFFv();
extern "C" void draw__19dKankyo_evil_PacketFv();
extern "C" static void dKyw_drawSun__Fi();
extern "C" static void dKyw_Sun_Draw__Fv();
extern "C" static void dKyw_drawSunlenz__Fi();
extern "C" static void dKyw_Sunlenz_Draw__Fv();
extern "C" static void dKyw_drawRain__Fi();
extern "C" static void dKyw_Rain_Draw__Fv();
extern "C" static void dKyw_drawSnow__Fi();
extern "C" static void dKyw_Snow_Draw__Fv();
extern "C" static void dKyw_drawStar__Fi();
extern "C" static void dKyw_Star_Draw__Fv();
extern "C" static void dKyw_drawHousi__Fi();
extern "C" static void dKyw_Housi_Draw__Fv();
extern "C" static void dKyw_drawCloud__Fi();
extern "C" static void dKyw_Cloud_Draw__Fv();
extern "C" static void dKyw_drawVrkumo__Fi();
extern "C" static void dKyw_Vrkumo_Draw__Fv();
extern "C" static void dKyw_shstar_packet__Fi();
extern "C" static void dKyw_shstar_Draw__Fv();
extern "C" static void dKyw_odour_packet__Fi();
extern "C" static void dKyw_Odour_Draw__Fv();
extern "C" static void dKyw_mud_packet__Fi();
extern "C" static void dKyw_mud_Draw__Fv();
extern "C" static void dKyw_evil_packet__Fi();
extern "C" static void dKyw_evil_Draw__Fv();
extern "C" void dKyw_wether_init__Fv();
extern "C" void dKyw_wether_init2__Fv();
extern "C" void dKyw_wether_delete__Fv();
extern "C" void __dt__19dKankyo_evil_PacketFv();
extern "C" void __dt__18dKankyo_mud_PacketFv();
extern "C" void __dt__20dKankyo_odour_PacketFv();
extern "C" void __dt__20dKankyo_cloud_PacketFv();
extern "C" void __dt__20dKankyo_housi_PacketFv();
extern "C" void __dt__19dKankyo_star_PacketFv();
extern "C" void __dt__19dKankyo_snow_PacketFv();
extern "C" void __dt__19dKankyo_rain_PacketFv();
extern "C" void __dt__22dKankyo_sunlenz_PacketFv();
extern "C" void __dt__18dKankyo_sun_PacketFv();
extern "C" void dKyw_wether_delete2__Fv();
extern "C" void __dt__21dKankyo_vrkumo_PacketFv();
extern "C" static void wether_move_thunder__Fv();
extern "C" void dKyw_wether_move__Fv();
extern "C" static void wether_move_sun__Fv();
extern "C" static void wether_move_rain__Fv();
extern "C" static void wether_move_snow__Fv();
extern "C" static void wether_move_star__Fv();
extern "C" static void wether_move_housi__Fv();
extern "C" static void wether_move_odour__Fv();
extern "C" static void wether_move_moya__Fv();
extern "C" static void wether_move_vrkumo__Fv();
extern "C" static void wether_move_mud__Fv();
extern "C" static void wether_move_evil__Fv();
extern "C" void dKyw_wether_move_draw__Fv();
extern "C" void dKyw_wether_move_draw2__Fv();
extern "C" void dKyw_wether_draw__Fv();
extern "C" void dKyw_wether_draw2__Fv();
extern "C" void dKyw_wether_proc__Fv();
extern "C" static void dKyw_wind_init__Fv();
extern "C" void dKyw_wind_set__Fv();
extern "C" void dKyw_get_wind_vec__Fv();
extern "C" void dKyw_get_wind_pow__Fv();
extern "C" void dKyw_get_wind_vecpow__Fv();
extern "C" void dKyw_plight_collision_set__FP4cXyzssfffff();
extern "C" static void squal_proc__Fv();
extern "C" static void dKyw_pntwind_init__Fv();
extern "C" static void pntwind_set__FP14WIND_INFLUENCE();
extern "C" void dKyw_pntwind_set__FP14WIND_INFLUENCE();
extern "C" static void dKyw_pntlight_set__FP14WIND_INFLUENCE();
extern "C" void dKyw_pntwind_cut__FP14WIND_INFLUENCE();
extern "C" static void pntwind_get_info__FP4cXyzP4cXyzPfUc();
extern "C" static void dKyw_pntwind_get_info__FP4cXyzP4cXyzPf();
extern "C" void dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf();
extern "C" void dKyw_pntwind_get_vecpow__FP4cXyz();
extern "C" void dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf();
extern "C" void dKyw_get_AllWind_vecpow__FP4cXyz();
extern "C" void dKyw_custom_windpower__Ff();
extern "C" void dKyw_evt_wind_set__Fss();
extern "C" void dKyw_evt_wind_set_go__Fv();
extern "C" void dKyw_rain_set__Fi();
extern "C" extern char const* const d_kankyo_d_kankyo_wether__stringBase0;
//
// External References:
//
extern "C" void __dt__4cXyzFv();
extern "C" void __ct__4cXyzFv();
extern "C" void getStatusRoomDt__20dStage_roomControl_cFi();
extern "C" void getLayerNo__14dComIfG_play_cFi();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void dComIfG_getStageRes__FPCc();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz();
extern "C" void dKyr_lenzflare_move__Fv();
extern "C" void dKyr_sun_move__Fv();
extern "C" void dKyr_rain_init__Fv();
extern "C" void dKyr_rain_move__Fv();
extern "C" void dKyr_housi_move__Fv();
extern "C" void dKyr_snow_init__Fv();
extern "C" void dKyr_snow_move__Fv();
extern "C" void dKyr_star_init__Fv();
extern "C" void dKyr_star_move__Fv();
extern "C" void cloud_shadow_move__Fv();
extern "C" void vrkumo_move__Fv();
extern "C" void dKyr_drawSun__FPA4_fP4cXyzR8_GXColorPPUc(f32 (*param_0)[4], cXyz* param_1,
_GXColor& param_2, u8** param_3);
extern "C" void dKyr_drawLenzflare__FPA4_fP4cXyzR8_GXColorPPUc();
extern "C" void dKyr_drawRain__FPA4_fPPUc();
extern "C" void dKyr_drawSibuki__FPA4_fPPUc();
extern "C" void dKyr_drawHousi__FPA4_fPPUc();
extern "C" void dKyr_drawSnow__FPA4_fPPUc();
extern "C" void dKyr_drawStar__FPA4_fPPUc();
extern "C" void drawCloudShadow__FPA4_fPPUc();
extern "C" void drawVrkumo__FPA4_fR8_GXColorPPUc();
extern "C" void dKyr_thunder_init__Fv();
extern "C" void dKyr_thunder_move__Fv();
extern "C" void dKyr_shstar_init__Fv();
extern "C" void dKyr_shstar_move__Fv();
extern "C" void dKyr_odour_init__Fv();
extern "C" void dKyr_odour_move__Fv();
extern "C" void dKyr_odour_draw__FPA4_fPPUc();
extern "C" void dKyr_mud_init__Fv();
extern "C" void dKyr_mud_move__Fv();
extern "C" void dKyr_mud_draw__FPA4_fPPUc();
extern "C" void dKyr_evil_init__Fv();
extern "C" void dKyr_evil_move__Fv();
extern "C" void dKyr_evil_draw__FPA4_fPPUc();
extern "C" void getDaytime__18dScnKy_env_light_cFv();
extern "C" void dKy_undwater_filter_draw__Fv();
extern "C" void dKy_get_dayofweek__Fv();
extern "C" void dKy_darkworld_check__Fv();
extern "C" void __pl__4cXyzCFRC3Vec();
extern "C" void __ml__4cXyzCFf();
extern "C" void normZP__4cXyzCFv();
extern "C" bool __ne__4cXyzCFRC3Vec();
extern "C" void cM_atan2s__Fff();
extern "C" void cLib_addCalc__FPfffff();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void startRainSe__10Z2EnvSeMgrFlSc();
extern "C" void initStrongWindSe__10Z2EnvSeMgrFv();
extern "C" void setWindDirection__10Z2EnvSeMgrFP3Vec();
extern "C" void startStrongWindSe__10Z2EnvSeMgrFSc();
extern "C" void* __nw__FUli();
extern "C" void __dl__FPv();
extern "C" bool entry__9J3DPacketFP13J3DDrawBuffer();
extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs();
extern "C" void __register_global_object();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void _savegpr_24();
extern "C" void _savegpr_25();
extern "C" void _savegpr_26();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_24();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__9J3DPacket[5];
extern "C" extern dScnKy_env_light_c g_env_light;
extern "C" extern Z2EnvSeMgr g_mEnvSeMgr;
extern "C" f32 Zero__4cXyz[3];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u8 data_80450EE0;
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
static void dKyw_pntlight_set(WIND_INFLUENCE* pntwind);
//
// Declarations:
//
/* 80056AA8-80056AF8 0513E8 0050+00 3/3 0/0 0/0 .text dKyw_setDrawPacketList__FP9J3DPacketi */
static J3DPacket* dKyw_setDrawPacketList(J3DPacket* i_packet, int i_type) {
if (i_packet == NULL) {
@@ -504,35 +294,6 @@ static void dKyw_evil_Draw() {
dKyw_evil_packet(J3DSys_XLU_BUFFER_e);
}
/* 804520E0-804520E4 0006E0 0004+00 12/12 0/0 0/0 .sdata2 @4378 */
SECTION_SDATA2 static u8 lit_4378[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 804520E4-804520E8 0006E4 0004+00 11/11 0/0 0/0 .sdata2 @4379 */
SECTION_SDATA2 static f32 lit_4379 = 1.0f;
// remove these once float data is fixed
inline JPABaseEmitter* tmp_dComIfGp_particle_set(u16 param_1, const cXyz* param_2,
const dKy_tevstr_c* param_3, const csXyz* param_4,
const cXyz* param_5, u8 param_6,
dPa_levelEcallBack* param_7, s8 param_8,
const GXColor* param_9, const GXColor* param_10,
const cXyz* param_11) {
return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_1, param_2, param_3, param_4,
param_5, param_6, param_7, param_8,
param_9, param_10, param_11, lit_4379);
}
inline JPABaseEmitter* tmp_dComIfGp_particle_set(u16 param_0, const cXyz* param_1,
const csXyz* param_2, const cXyz* param_3) {
return tmp_dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL,
NULL, NULL);
}
/* 800574E0-800579EC 051E20 050C+00 0/0 1/1 0/0 .text dKyw_wether_init__Fv */
void dKyw_wether_init() {
g_env_light.mSunInitialized = false;
@@ -547,11 +308,10 @@ void dKyw_wether_init() {
g_env_light.field_0xe91 = 0;
g_env_light.mStarInitialized = false;
g_env_light.mStarCount = 0;
f32 tmp0 = FLOAT_LABEL(lit_4378);
g_env_light.mStarDensity = tmp0;
g_env_light.mStarDensity = 0.0f;
g_env_light.mCloudInitialized = 0;
g_env_light.mMoyaCount = 0;
g_env_light.field_0xebc = tmp0;
g_env_light.field_0xebc = 0.0f;
g_env_light.mMoyaMode = 0;
g_env_light.mHousiInitialized = false;
g_env_light.mHousiCount = 0;
@@ -566,7 +326,7 @@ void dKyw_wether_init() {
g_env_light.mEvilInitialized = 0;
g_env_light.field_0x1054 = 0;
g_env_light.field_0x1051 = 0;
g_env_light.field_0xe60 = tmp0;
g_env_light.field_0xe60 = 0.0f;
dKyw_wind_init();
dKyw_pntwind_init();
@@ -576,24 +336,23 @@ void dKyw_wether_init() {
dComIfG_play_c::getLayerNo(0) < 8)
{
cXyz tmp;
f32 tmp0_2 = FLOAT_LABEL(lit_4378);
tmp.z = tmp0_2;
tmp.y = tmp0_2;
tmp.x = tmp0_2;
tmp.z = 0.0f;
tmp.y = 0.0f;
tmp.x = 0.0f;
tmp_dComIfGp_particle_set(0x878F, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x8790, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x8791, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x8792, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x8793, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x8794, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x8795, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x8796, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x8797, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x8798, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x8799, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x879A, &tmp, NULL, NULL);
tmp_dComIfGp_particle_set(0x879B, &tmp, NULL, NULL);
dComIfGp_particle_set(0x878F, &tmp, NULL, NULL);
dComIfGp_particle_set(0x8790, &tmp, NULL, NULL);
dComIfGp_particle_set(0x8791, &tmp, NULL, NULL);
dComIfGp_particle_set(0x8792, &tmp, NULL, NULL);
dComIfGp_particle_set(0x8793, &tmp, NULL, NULL);
dComIfGp_particle_set(0x8794, &tmp, NULL, NULL);
dComIfGp_particle_set(0x8795, &tmp, NULL, NULL);
dComIfGp_particle_set(0x8796, &tmp, NULL, NULL);
dComIfGp_particle_set(0x8797, &tmp, NULL, NULL);
dComIfGp_particle_set(0x8798, &tmp, NULL, NULL);
dComIfGp_particle_set(0x8799, &tmp, NULL, NULL);
dComIfGp_particle_set(0x879A, &tmp, NULL, NULL);
dComIfGp_particle_set(0x879B, &tmp, NULL, NULL);
}
// Stage is City in the Sky
@@ -673,48 +432,18 @@ dKankyo_mud_Packet::~dKankyo_mud_Packet() {}
/* 80057D8C-80057E10 0526CC 0084+00 1/0 0/0 0/0 .text __dt__20dKankyo_odour_PacketFv */
dKankyo_odour_Packet::~dKankyo_odour_Packet() {}
/* ############################################################################################## */
/* 803A9AFC-803A9B10 006C1C 0014+00 2/2 0/0 0/0 .data __vt__21dKankyo_vrkumo_Packet */
SECTION_DATA extern void* __vt__21dKankyo_vrkumo_Packet[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)entry__9J3DPacketFP13J3DDrawBuffer,
(void*)draw__21dKankyo_vrkumo_PacketFv,
(void*)__dt__21dKankyo_vrkumo_PacketFv,
};
/* 80057E10-80057E94 052750 0084+00 1/0 0/0 0/0 .text __dt__20dKankyo_cloud_PacketFv */
dKankyo_cloud_Packet::~dKankyo_cloud_Packet() {}
/* 80057E94-80057F18 0527D4 0084+00 1/0 0/0 0/0 .text __dt__20dKankyo_housi_PacketFv */
dKankyo_housi_Packet::~dKankyo_housi_Packet() {}
/* ############################################################################################## */
/* 803A9B38-803A9B4C 006C58 0014+00 1/1 1/1 0/0 .data __vt__19dKankyo_star_Packet */
SECTION_DATA extern void* __vt__19dKankyo_star_Packet[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)entry__9J3DPacketFP13J3DDrawBuffer,
(void*)draw__19dKankyo_star_PacketFv,
(void*)__dt__19dKankyo_star_PacketFv,
};
/* 80057F18-80057F9C 052858 0084+00 1/0 0/0 0/0 .text __dt__19dKankyo_star_PacketFv */
dKankyo_star_Packet::~dKankyo_star_Packet() {}
/* 80057F9C-80058020 0528DC 0084+00 1/0 0/0 0/0 .text __dt__19dKankyo_snow_PacketFv */
dKankyo_snow_Packet::~dKankyo_snow_Packet() {}
/* ############################################################################################## */
/* 803A9B60-803A9B74 006C80 0014+00 2/2 0/0 0/0 .data __vt__19dKankyo_rain_Packet */
SECTION_DATA extern void* __vt__19dKankyo_rain_Packet[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)entry__9J3DPacketFP13J3DDrawBuffer,
(void*)draw__19dKankyo_rain_PacketFv,
(void*)__dt__19dKankyo_rain_PacketFv,
};
/* 80058020-800580A4 052960 0084+00 1/0 0/0 0/0 .text __dt__19dKankyo_rain_PacketFv */
dKankyo_rain_Packet::~dKankyo_rain_Packet() {}
@@ -755,12 +484,6 @@ void dKyw_wether_move() {
wether_move_thunder();
}
/* 804520E8-804520EC 0006E8 0004+00 1/1 0/0 0/0 .sdata2 @4610 */
SECTION_SDATA2 static f32 lit_4610 = 255.0f;
/* 804520EC-804520F0 0006EC 0004+00 1/1 0/0 0/0 .sdata2 @4611 */
SECTION_SDATA2 static f32 lit_4611 = 1000000000.0f;
/* 80058318-80058894 052C58 057C+00 1/1 0/0 0/0 .text wether_move_sun__Fv */
static void wether_move_sun() {
s32 sunVisible = false;
@@ -814,16 +537,15 @@ static void wether_move_sun() {
}
g_env_light.mpSunPacket->field_0x28 = 0;
g_env_light.mpSunPacket->field_0x29 = 0;
f32 tmp0 = FLOAT_LABEL(lit_4378);
g_env_light.mpSunPacket->mVisibility = tmp0;
g_env_light.mpSunPacket->mSunAlpha = tmp0;
g_env_light.mpSunPacket->field_0x64 = tmp0;
g_env_light.mpSunPacket->field_0x68 = tmp0;
g_env_light.mpSunPacket->mVisibility = 0.0f;
g_env_light.mpSunPacket->mSunAlpha = 0.0f;
g_env_light.mpSunPacket->field_0x64 = 0.0f;
g_env_light.mpSunPacket->field_0x68 = 0.0f;
if (g_env_light.mDaytime < lit_4610) {
g_env_light.mpSunPacket->field_0x6c = lit_4379;
if (g_env_light.mDaytime < 255.0f) {
g_env_light.mpSunPacket->field_0x6c = 1.0f;
} else {
g_env_light.mpSunPacket->field_0x6c = tmp0;
g_env_light.mpSunPacket->field_0x6c = 0.0f;
}
g_env_light.mpSunPacket->field_0x44[0] = 0;
g_env_light.mpSunPacket->field_0x44[1] = 0;
@@ -838,10 +560,9 @@ static void wether_move_sun() {
(u8*)dComIfG_getObjectRes("Always", 0x57);
g_env_light.mpSunLenzPacket->mpResLenz =
(u8*)dComIfG_getObjectRes("Always", 0x5C);
g_env_light.mpSunLenzPacket->field_0x8c = lit_4611;
f32 tmp0_2 = FLOAT_LABEL(lit_4378);
g_env_light.mpSunLenzPacket->field_0x90 = tmp0_2;
g_env_light.mpSunLenzPacket->mDistFalloff = tmp0_2;
g_env_light.mpSunLenzPacket->field_0x8c = 1e9f;
g_env_light.mpSunLenzPacket->field_0x90 = 0.0f;
g_env_light.mpSunLenzPacket->mDistFalloff = 0.0f;
g_env_light.mpSunLenzPacket->mDrawLenzInSky = false;
dKyr_sun_move();
dKyr_lenzflare_move();
@@ -865,25 +586,7 @@ static void wether_move_sun() {
}
}
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A3F1 = "R_SP127";
#pragma pop
/* 804520F0-804520F4 0006F0 0004+00 2/2 0/0 0/0 .sdata2 @4668 */
SECTION_SDATA2 static f32 lit_4668 = -1.0f;
/* 804520F4-804520F8 0006F4 0004+00 1/1 0/0 0/0 .sdata2 @4669 */
SECTION_SDATA2 static f32 lit_4669 = 125.0f;
/* 804520F8-80452100 0006F8 0008+00 2/2 0/0 0/0 .sdata2 @4671 */
SECTION_SDATA2 static f64 lit_4671 = 4503601774854144.0 /* cast s32 to float */;
/* 80058894-80058B00 0531D4 026C+00 1/1 0/0 0/0 .text wether_move_rain__Fv */
// matches with literals
#ifdef NONMATCHING
static void wether_move_rain() {
switch (g_env_light.mRainInitialized) {
case FALSE:
@@ -925,16 +628,6 @@ static void wether_move_rain() {
break;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void wether_move_rain() {
nofralloc
#include "asm/d/kankyo/d_kankyo_wether/wether_move_rain__Fv.s"
}
#pragma pop
#endif
/* 80058B00-80058B8C 053440 008C+00 1/1 0/0 0/0 .text wether_move_snow__Fv */
static void wether_move_snow() {
@@ -954,51 +647,6 @@ static void wether_move_snow() {
}
}
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A3F9 = "F_SP121";
SECTION_DEAD static char const* const stringBase_8037A401 = "F_SP122";
SECTION_DEAD static char const* const stringBase_8037A409 = "F_SP128";
#pragma pop
/* 80452100-80452104 000700 0004+00 1/1 0/0 0/0 .sdata2 @4761 */
SECTION_SDATA2 static f32 lit_4761 = 330.0f;
/* 80452104-80452108 000704 0004+00 1/1 0/0 0/0 .sdata2 @4762 */
SECTION_SDATA2 static f32 lit_4762 = 45.0f;
/* 80452108-8045210C 000708 0004+00 1/1 0/0 0/0 .sdata2 @4763 */
SECTION_SDATA2 static f32 lit_4763 = 285.0f;
/* 8045210C-80452110 00070C 0004+00 1/1 0/0 0/0 .sdata2 @4764 */
SECTION_SDATA2 static f32 lit_4764 = 1.0f / 45.0f;
/* 80452110-80452114 000710 0004+00 2/2 0/0 0/0 .sdata2 @4765 */
SECTION_SDATA2 static f32 lit_4765 = 75.0f;
/* 80452114-80452118 000714 0004+00 1/1 0/0 0/0 .sdata2 @4766 */
SECTION_SDATA2 static f32 lit_4766 = 1.0f / 30.0f;
/* 80452118-8045211C 000718 0004+00 2/2 0/0 0/0 .sdata2 @4767 */
SECTION_SDATA2 static f32 lit_4767 = 0.5f;
/* 8045211C-80452120 00071C 0004+00 2/2 0/0 0/0 .sdata2 @4768 */
SECTION_SDATA2 static f32 lit_4768 = 1.0f / 10.0f;
/* 80452120-80452124 000720 0004+00 3/3 0/0 0/0 .sdata2 @4769 */
SECTION_SDATA2 static f32 lit_4769 = 1.0f / 100.0f;
/* 80452124-80452128 000724 0004+00 2/2 0/0 0/0 .sdata2 @4770 */
SECTION_SDATA2 static f32 lit_4770 = 9.999999974752427e-07f;
/* 80452128-8045212C 000728 0004+00 1/1 0/0 0/0 .sdata2 @4771 */
SECTION_SDATA2 static f32 lit_4771 = 1200.0f;
/* 8045212C-80452130 00072C 0004+00 1/1 0/0 0/0 .sdata2 @4772 */
SECTION_SDATA2 static f32 lit_4772 = 500.0f;
/* 80058B8C-80058F18 0534CC 038C+00 1/1 0/0 0/0 .text wether_move_star__Fv */
static void wether_move_star() {
s32 starsVisible = false;
@@ -1026,40 +674,40 @@ static void wether_move_star() {
if (starsVisible && dKy_darkworld_check() != true) {
f32 density;
f32 time = g_env_light.getDaytime();
if (time >= lit_4761 || time < lit_4762) {
density = lit_4379;
} else if (time > lit_4763) {
density = lit_4379 - lit_4764 * (lit_4761 - time);
if (time >= 330.0f || time < 45.0f) {
density = 1.0f;
} else if (time > 285.0f) {
density = 1.0f - (1.0f / 45.0f) * (330.0f - time);
} else {
if (time < lit_4765) {
density = lit_4766 * (lit_4765 - time);
if (time < 75.0f) {
density = (1.0f / 30.0f) * (75.0f - time);
} else {
density = FLOAT_LABEL(lit_4378);
density = 0.0f;
}
}
if (g_env_light.mColpatWeather != 0) {
density = FLOAT_LABEL(lit_4378);
density = 0.0f;
}
if (g_env_light.mColPatCurr != 0 && g_env_light.mColPatBlend > lit_4767) {
density = FLOAT_LABEL(lit_4378);
if (g_env_light.mColPatCurr != 0 && g_env_light.mColPatBlend > 0.5f) {
density = 0.0f;
}
// Stage is Hero Shade arena
if (!strcmp(dComIfGp_getStartStageName(), "F_SP200")) {
density = lit_4379;
density = 1.0f;
}
cLib_addCalc(&g_env_light.mStarDensity, density, lit_4768, lit_4769, lit_4770);
g_env_light.mStarCount = (s16)(lit_4771 * g_env_light.mStarDensity);
cLib_addCalc(&g_env_light.mStarDensity, density, 0.1f, 0.01f, 0.000001f);
g_env_light.mStarCount = (s16)(1200.0f * g_env_light.mStarDensity);
// Stage is Hyrule Field or Outside Castle Town or Hidden Village
if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") ||
!strcmp(dComIfGp_getStartStageName(), "F_SP122") ||
!strcmp(dComIfGp_getStartStageName(), "F_SP128"))
{
g_env_light.mStarCount = (s16)(lit_4772 * g_env_light.mStarDensity);
g_env_light.mStarCount = (s16)(500.0f * g_env_light.mStarDensity);
}
switch (g_env_light.mStarInitialized) {
@@ -1163,9 +811,8 @@ static void wether_move_housi() {
}
}
f32 tmp0 = FLOAT_LABEL(lit_4378);
g_env_light.mpHousiPacket->field_0x5de8 = tmp0;
g_env_light.mpHousiPacket->field_0x10.set(tmp0, tmp0, tmp0);
g_env_light.mpHousiPacket->field_0x5de8 = 0.0f;
g_env_light.mpHousiPacket->field_0x10.set(0.0f, 0.0f, 0.0f);
for (int i = 0; i < 300; i++) {
g_env_light.mpHousiPacket->mHousiEff[i].mStatus = 0;
}
@@ -1176,7 +823,7 @@ static void wether_move_housi() {
break;
case TRUE:
if (g_env_light.mHousiCount == 0 &&
g_env_light.mpHousiPacket->field_0x5de8 <= FLOAT_LABEL(lit_4378))
g_env_light.mpHousiPacket->field_0x5de8 <= 0.0f)
{
g_env_light.mHousiInitialized = false;
delete g_env_light.mpHousiPacket;
@@ -1262,68 +909,7 @@ static void wether_move_moya() {
}
}
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A469 = "F_SP114";
SECTION_DEAD static char const* const stringBase_8037A471 = "D_MN09B";
SECTION_DEAD static char const* const stringBase_8037A479 = "F_SP104";
SECTION_DEAD static char const* const stringBase_8037A481 = "cloudtx_01.bti";
SECTION_DEAD static char const* const stringBase_8037A490 = "cloudtx_02.bti";
SECTION_DEAD static char const* const stringBase_8037A49F = "cloudtx_03.bti";
#pragma pop
/* 80424938-80424944 051658 000C+00 1/1 0/0 0/0 .bss @4965 */
static u8 lit_4965[12];
/* 80424944-80424950 051664 000C+00 1/1 0/0 0/0 .bss r09o$4964 */
static f32 r09o[3];
/* 80452130-80452134 000730 0004+00 1/1 0/0 0/0 .sdata2 @5181 */
SECTION_SDATA2 static f32 lit_5181 = -180000.0f;
/* 80452134-80452138 000734 0004+00 1/1 0/0 0/0 .sdata2 @5182 */
SECTION_SDATA2 static f32 lit_5182 = 750.0f;
/* 80452138-8045213C 000738 0004+00 1/1 0/0 0/0 .sdata2 @5183 */
SECTION_SDATA2 static f32 lit_5183 = -200000.0f;
/* 8045213C-80452140 00073C 0004+00 1/1 0/0 0/0 .sdata2 @5184 */
SECTION_SDATA2 static f32 lit_5184 = 0.003000000026077032f;
/* 80452140-80452144 000740 0004+00 1/1 0/0 0/0 .sdata2 @5185 */
SECTION_SDATA2 static f32 lit_5185 = 1.0000000116860974e-07f;
/* 80452144-80452148 000744 0004+00 1/1 0/0 0/0 .sdata2 @5186 */
SECTION_SDATA2 static f32 lit_5186 = 2.0f / 25.0f;
/* 80452148-8045214C 000748 0004+00 1/1 0/0 0/0 .sdata2 @5187 */
SECTION_SDATA2 static f32 lit_5187 = 0.0020000000949949026f;
/* 8045214C-80452150 00074C 0004+00 1/1 0/0 0/0 .sdata2 @5188 */
SECTION_SDATA2 static f32 lit_5188 = 9.99999993922529e-09f;
/* 80452150-80452154 000750 0004+00 1/1 0/0 0/0 .sdata2 @5189 */
SECTION_SDATA2 static f32 lit_5189 = 6.0f;
/* 80452154-80452158 000754 0004+00 1/1 0/0 0/0 .sdata2 @5190 */
SECTION_SDATA2 static f32 lit_5190 = 56.0f;
/* 80452158-8045215C 000758 0004+00 2/2 0/0 0/0 .sdata2 @5191 */
SECTION_SDATA2 static f32 lit_5191 = 3.0f / 10.0f;
/* 8045215C-80452160 00075C 0004+00 1/1 0/0 0/0 .sdata2 @5192 */
SECTION_SDATA2 static f32 lit_5192 = 24575.0f;
/* 80452160-80452164 000760 0004+00 1/1 0/0 0/0 .sdata2 @5193 */
SECTION_SDATA2 static f32 lit_5193 = 0.00139999995008111f;
u8 data_80450EE0;
/* 80059728-80059E38 054068 0710+00 1/1 0/0 0/0 .text wether_move_vrkumo__Fv */
// Matches with literals
#ifdef NONMATCHING
static void wether_move_vrkumo() {
BOOL var_r31 = false;
static cXyz r09o(-180000.0f, 750.0f, -200000.0f);
@@ -1454,16 +1040,6 @@ static void wether_move_vrkumo() {
break;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void wether_move_vrkumo() {
nofralloc
#include "asm/d/kankyo/d_kankyo_wether/wether_move_vrkumo__Fv.s"
}
#pragma pop
#endif
/* 80059E38-80059F74 054778 013C+00 1/1 0/0 0/0 .text wether_move_mud__Fv */
static void wether_move_mud() {
@@ -1600,40 +1176,13 @@ void dKyw_wether_draw2() {
}
}
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A4B3 = "F_SP127";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A4BB = "\0\0\0\0";
#pragma pop
/* 80452164-80452168 000764 0004+00 1/1 0/0 0/0 .sdata2 @5361 */
SECTION_SDATA2 static f32 lit_5361 = 120.0f;
/* 80452168-8045216C 000768 0004+00 3/3 0/0 0/0 .sdata2 @5362 */
SECTION_SDATA2 static f32 lit_5362 = 1.0f / 20.0f;
/* 8045216C-80452170 00076C 0004+00 1/1 0/0 0/0 .sdata2 @5363 */
SECTION_SDATA2 static f32 lit_5363 = 0.0024999999441206455f;
/* 80452170-80452178 000770 0004+04 1/1 0/0 0/0 .sdata2 @5364 */
SECTION_SDATA2 static f32 lit_5364[1 + 1 /* padding */] = {
9.999999747378752e-06f,
/* padding */
0.0f,
};
/* 8005A340-8005A57C 054C80 023C+00 0/0 1/1 0/0 .text dKyw_wether_proc__Fv */
// small branch issue
#ifdef NONMATCHING
void dKyw_wether_proc() {
// Stage is Faron Woods or Fishing Pond or Hyrule Field
if (!strcmp(dComIfGp_getStartStageName(), "F_SP108") ||
!strcmp(dComIfGp_getStartStageName(), "F_SP127") ||
(!strcmp(dComIfGp_getStartStageName(), "F_SP121") &&
FLOAT_LABEL(lit_4378) != g_env_light.mDiceWeatherTime))
g_env_light.mDiceWeatherTime != 0.0f))
{
if (!dKy_darkworld_check()) {
// Stage is Hyrule Field
@@ -1645,16 +1194,18 @@ void dKyw_wether_proc() {
g_env_light.mDiceWeatherMode >= 1 && g_env_light.mDiceWeatherMode < 6)
{
dKy_get_dayofweek();
cLib_addCalc(&g_env_light.field_0xebc, lit_4379, lit_5362, lit_5363, lit_4770);
lbl1:
cLib_addCalc(&g_env_light.field_0xebc, 1.0f, 0.05f, 0.0025f, 0.000001f);
g_env_light.mMoyaMode = 7;
g_env_light.mMoyaCount = 49;
} else {
cLib_addCalc(&g_env_light.field_0xebc, FLOAT_LABEL(lit_4378), lit_5362,
lit_5363, lit_5364[0]);
if (g_env_light.field_0xebc <= lit_4769 && g_env_light.mMoyaCount == 49) {
cLib_addCalc(&g_env_light.field_0xebc, 0.0f, 0.05f, 0.0025f, 0.00001f);
if (g_env_light.field_0xebc <= 0.01f && g_env_light.mMoyaCount == 49) {
g_env_light.mMoyaCount = 0;
}
}
} else {
goto lbl1; // maybe fake match
}
}
}
@@ -1672,63 +1223,23 @@ void dKyw_wether_proc() {
}
squal_proc();
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dKyw_wether_proc() {
nofralloc
#include "asm/d/kankyo/d_kankyo_wether/dKyw_wether_proc__Fv.s"
}
#pragma pop
#endif
/* 8005A57C-8005A5C0 054EBC 0044+00 1/1 0/0 0/0 .text dKyw_wind_init__Fv */
static void dKyw_wind_init() {
g_env_light.mWind.vec.x = lit_4668;
f32 tmp_0 = FLOAT_LABEL(lit_4378);
g_env_light.mWind.vec.y = tmp_0;
g_env_light.mWind.vec.z = tmp_0;
g_env_light.mWind.pow = tmp_0;
g_env_light.mWind.vec.x = -1.0f;
g_env_light.mWind.vec.y = 0.0f;
g_env_light.mWind.vec.z = 0.0f;
g_env_light.mWind.pow = 0.0f;
g_env_light.field_0xe6c = 0;
g_env_light.field_0xe64 = 0;
g_env_light.field_0xe66 = 0;
g_env_light.mWind.vec_override = 0;
g_env_light.custom_windpower = tmp_0;
g_env_light.custom_windpower = 0.0f;
g_env_light.mEvtWindSet = 0;
g_env_light.mTeachWindExist = 0;
}
/* ############################################################################################## */
/* 80452178-80452180 000778 0008+00 3/3 0/0 0/0 .sdata2 @5524 */
SECTION_SDATA2 static f64 lit_5524 = 0.5;
/* 80452180-80452188 000780 0008+00 3/3 0/0 0/0 .sdata2 @5525 */
SECTION_SDATA2 static f64 lit_5525 = 3.0;
/* 80452188-80452190 000788 0008+00 3/3 0/0 0/0 .sdata2 @5526 */
SECTION_SDATA2 static u8 lit_5526[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80452190-80452194 000790 0004+00 1/1 0/0 0/0 .sdata2 @5527 */
SECTION_SDATA2 static f32 lit_5527 = 3.0f / 5.0f;
/* 80452194-80452198 000794 0004+00 1/1 0/0 0/0 .sdata2 @5528 */
SECTION_SDATA2 static f32 lit_5528 = 9.0f / 10.0f;
/* 80452198-8045219C 000798 0004+00 1/1 0/0 0/0 .sdata2 @5529 */
SECTION_SDATA2 static f32 lit_5529 = 2.0f;
/* 8045219C-804521A0 00079C 0004+00 2/2 0/0 0/0 .sdata2 @5530 */
SECTION_SDATA2 static f32 lit_5530 = 0.0010000000474974513f;
/* 804521A0-804521A4 0007A0 0004+00 1/1 0/0 0/0 .sdata2 @5531 */
SECTION_SDATA2 static f32 lit_5531 = 0.004999999888241291f;
/* 8005A5C0-8005AAE0 054F00 0520+00 0/0 2/2 0/0 .text dKyw_wind_set__Fv */
// matches with literals
#ifdef NONMATCHING
void dKyw_wind_set() {
s16 var_r30;
s16 var_r29;
@@ -1870,16 +1381,6 @@ void dKyw_wind_set() {
cLib_addCalc(&g_env_light.mWind.pow, strength, 0.05f, 1.0f, 0.005f);
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dKyw_wind_set() {
nofralloc
#include "asm/d/kankyo/d_kankyo_wether/dKyw_wind_set__Fv.s"
}
#pragma pop
#endif
/* 8005AAE0-8005AAF0 055420 0010+00 1/1 6/6 7/7 .text dKyw_get_wind_vec__Fv */
cXyz* dKyw_get_wind_vec() {
@@ -1924,13 +1425,7 @@ void dKyw_plight_collision_set(cXyz* param_0, s16 param_1, s16 param_2, f32 para
}
}
/* ############################################################################################## */
/* 804521A4-804521A8 0007A4 0004+00 1/1 0/0 0/0 .sdata2 @5630 */
SECTION_SDATA2 static f32 lit_5630 = 1.0f / 5.0f;
/* 8005AC30-8005AD44 055570 0114+00 1/1 0/0 0/0 .text squal_proc__Fv */
// matches with literals
#ifdef NONMATCHING
static void squal_proc() {
dScnKy_env_light_c* env_light = dKy_getEnvlight();
WIND_INFLUENCE* influence;
@@ -1963,16 +1458,6 @@ static void squal_proc() {
}
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void squal_proc() {
nofralloc
#include "asm/d/kankyo/d_kankyo_wether/squal_proc__Fv.s"
}
#pragma pop
#endif
/* 8005AD44-8005AD98 055684 0054+00 1/1 0/0 0/0 .text dKyw_pntwind_init__Fv */
static void dKyw_pntwind_init() {
@@ -2024,8 +1509,6 @@ void dKyw_pntwind_cut(WIND_INFLUENCE* i_pntwind) {
/* 8005AE90-8005B23C 0557D0 03AC+00 2/2 0/0 0/0 .text pntwind_get_info__FP4cXyzP4cXyzPfUc
*/
// matches with literals
#ifdef NONMATCHING
static void pntwind_get_info(cXyz* param_0, cXyz* i_dir, f32* i_power, u8 param_3) {
i_dir->x = 0.0f;
i_dir->y = 0.0f;
@@ -2086,16 +1569,6 @@ static void pntwind_get_info(cXyz* param_0, cXyz* i_dir, f32* i_power, u8 param_
}
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void pntwind_get_info(cXyz* param_0, cXyz* param_1, f32* param_2, u8 param_3) {
nofralloc
#include "asm/d/kankyo/d_kankyo_wether/pntwind_get_info__FP4cXyzP4cXyzPfUc.s"
}
#pragma pop
#endif
/* 8005B23C-8005B260 055B7C 0024+00 3/3 0/0 0/0 .text dKyw_pntwind_get_info__FP4cXyzP4cXyzPf */
static void dKyw_pntwind_get_info(cXyz* param_0, cXyz* param_1, f32* param_2) {
@@ -2118,20 +1591,10 @@ cXyz dKyw_pntwind_get_vecpow(cXyz* param_0) {
return direction;
}
/* ############################################################################################## */
/* 804521A8-804521B0 0007A8 0004+04 2/2 0/0 0/0 .sdata2 @5855 */
SECTION_SDATA2 static f32 lit_5855[1 + 1 /* padding */] = {
5.0f,
/* padding */
0.0f,
};
/* 8005B2F8-8005B530 055C38 0238+00 0/0 3/3 13/13 .text dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf */
// matches with literals
#ifdef NONMATCHING
void dKyw_get_AllWind_vec(cXyz* i_position, cXyz* i_direction, f32* i_power) {
dScnKy_env_light_c* env_light = dKy_getEnvlight();
dKyw_pntwind_get_info(param_0, i_direction, i_power);
dKyw_pntwind_get_info(i_position, i_direction, i_power);
cXyz sp54;
cXyz sp30;
@@ -2153,20 +1616,8 @@ void dKyw_get_AllWind_vec(cXyz* i_position, cXyz* i_direction, f32* i_power) {
i_direction->z = env_light->mWind.vec.z;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dKyw_get_AllWind_vec(cXyz* param_0, cXyz* param_1, f32* param_2) {
nofralloc
#include "asm/d/kankyo/d_kankyo_wether/dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf.s"
}
#pragma pop
#endif
/* 8005B530-8005B60C 055E70 00DC+00 0/0 0/0 5/5 .text dKyw_get_AllWind_vecpow__FP4cXyz */
// matches with literals
#ifdef NONMATCHING
cXyz dKyw_get_AllWind_vecpow(cXyz* param_0) {
f32 sp8;
cXyz spC;
@@ -2181,16 +1632,6 @@ cXyz dKyw_get_AllWind_vecpow(cXyz* param_0) {
return spC;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dKyw_get_AllWind_vecpow(cXyz* param_0) {
nofralloc
#include "asm/d/kankyo/d_kankyo_wether/dKyw_get_AllWind_vecpow__FP4cXyz.s"
}
#pragma pop
#endif
/* 8005B60C-8005B61C 055F4C 0010+00 0/0 0/0 5/5 .text dKyw_custom_windpower__Ff */
void dKyw_custom_windpower(f32 pow) {