falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix change to dKyw_get_AllWind_vecpow__FP4cXyz return value

This commit is contained in:
Tal Hayon 2023-02-01 18:09:23 +02:00
parent 687e04ffbe
commit 9431eea44c
12 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/d/kankyo/d_kankyo_wether/dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz.s → asm/d/kankyo/d_kankyo_wether/dKyw_get_AllWind_vecpow__FP4cXyz.s
View File

@ -9,7 +9,7 @@ lbl_8005B530:
/* 8005B54C 38 A1 00 08 */ addi r5, r1, 8
/* 8005B550 4B FF FC ED */ bl dKyw_pntwind_get_info__FP4cXyzP4cXyzPf
/* 8005B554 38 61 00 24 */ addi r3, r1, 0x24
/* 8005B558 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
/* 8005B558 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CEA54@ha */
/* 8005B55C 38 A4 CA 54 */ addi r5, r4, g_env_light@l /* 0x8042CA54@l */
/* 8005B560 38 85 0E 48 */ addi r4, r5, 0xe48
/* 8005B564 C0 45 0E 58 */ lfs f2, 0xe58(r5)

2
asm/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry/setNormalClothPos__10daObjLdy_cFv.s
View File

@ -15,7 +15,7 @@ lbl_80C51194:
/* 80C511C8 3B E3 20 00 */ addi r31, r3, M_attr__10daObjLdy_c@l /* 0x80C52000@l */
/* 80C511CC 38 61 00 9C */ addi r3, r1, 0x9c
/* 80C511D0 38 9D 04 D0 */ addi r4, r29, 0x4d0
/* 80C511D4 4B 40 A3 5D */ bl dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz
/* 80C511D4 4B 40 A3 5D */ bl dKyw_get_AllWind_vecpow__FP4cXyz
/* 80C511D8 C0 01 00 9C */ lfs f0, 0x9c(r1)
/* 80C511DC D0 01 00 C0 */ stfs f0, 0xc0(r1)
/* 80C511E0 C0 01 00 A0 */ lfs f0, 0xa0(r1)

2
asm/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope/setNormalRopePos__14daObjLndRope_cFv.s
View File

@ -18,7 +18,7 @@ lbl_80C528E0:
/* 80C52920 3B 7F 16 8C */ addi r27, r31, 0x168c
/* 80C52924 38 61 00 8C */ addi r3, r1, 0x8c
/* 80C52928 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 80C5292C 4B 40 8C 05 */ bl dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz
/* 80C5292C 4B 40 8C 05 */ bl dKyw_get_AllWind_vecpow__FP4cXyz
/* 80C52930 C0 01 00 8C */ lfs f0, 0x8c(r1)
/* 80C52934 D0 01 00 A4 */ stfs f0, 0xa4(r1)
/* 80C52938 C0 01 00 90 */ lfs f0, 0x90(r1)

2
asm/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth/setNormalClothPos__14daObjOnCloth_cFv.s
View File

@ -13,7 +13,7 @@ lbl_805951DC:
/* 80595208 3B C3 5C B4 */ addi r30, r3, M_attr__14daObjOnCloth_c@l /* 0x80595CB4@l */
/* 8059520C 38 61 00 6C */ addi r3, r1, 0x6c
/* 80595210 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 80595214 4B AC 63 1D */ bl dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz
/* 80595214 4B AC 63 1D */ bl dKyw_get_AllWind_vecpow__FP4cXyz
/* 80595218 C0 01 00 6C */ lfs f0, 0x6c(r1)
/* 8059521C D0 01 00 84 */ stfs f0, 0x84(r1)
/* 80595220 C0 01 00 70 */ lfs f0, 0x70(r1)

2
asm/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope/daObjItaRope_Execute__FP14daObjItaRope_c.s
View File

@ -11,7 +11,7 @@ lbl_80CC652C:
/* 80CC6550 4B FF F9 7D */ bl setNormalRopePos__14daObjItaRope_cFv
/* 80CC6554 38 61 00 20 */ addi r3, r1, 0x20
/* 80CC6558 38 9C 04 D0 */ addi r4, r28, 0x4d0
/* 80CC655C 4B 39 4F D5 */ bl dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz
/* 80CC655C 4B 39 4F D5 */ bl dKyw_get_AllWind_vecpow__FP4cXyz
/* 80CC6560 C0 01 00 20 */ lfs f0, 0x20(r1)
/* 80CC6564 D0 01 00 08 */ stfs f0, 8(r1)
/* 80CC6568 C0 01 00 24 */ lfs f0, 0x24(r1)

2
asm/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope/setNormalRopePos__14daObjItaRope_cFv.s
View File

@ -17,7 +17,7 @@ lbl_80CC5ECC:
/* 80CC5F08 83 7F 06 18 */ lwz r27, 0x618(r31)
/* 80CC5F0C 38 61 00 80 */ addi r3, r1, 0x80
/* 80CC5F10 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 80CC5F14 4B 39 56 1D */ bl dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz
/* 80CC5F14 4B 39 56 1D */ bl dKyw_get_AllWind_vecpow__FP4cXyz
/* 80CC5F18 C0 01 00 80 */ lfs f0, 0x80(r1)
/* 80CC5F1C D0 01 00 8C */ stfs f0, 0x8c(r1)
/* 80CC5F20 C0 01 00 84 */ lfs f0, 0x84(r1)

4
defs/module0.py
View File

@ -3345,7 +3345,7 @@ SYMBOLS = [
{'addr':0x8005B260,'size':36,'pad':0,'label':"dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf",'name':"dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf",'lib':0,'tu':104,'section':2,'class_template':False,'static':False,'is_reachable':False,'r':[0,0,3],'sh':[0,0,0],'type':"ASMFunction"},
{'addr':0x8005B284,'size':116,'pad':0,'label':"dKyw_pntwind_get_vecpow__FP4cXyz",'name':"dKyw_pntwind_get_vecpow__FP4cXyz",'lib':0,'tu':104,'section':2,'class_template':False,'static':False,'is_reachable':False,'r':[0,1,0],'sh':[0,0,0],'type':"ASMFunction"},
{'addr':0x8005B2F8,'size':568,'pad':0,'label':"dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf",'name':"dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf",'lib':0,'tu':104,'section':2,'class_template':False,'static':False,'is_reachable':True,'r':[0,3,13],'sh':[0,0,0],'type':"ASMFunction"},
{'addr':0x8005B530,'size':220,'pad':0,'label':"dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz",'name':"dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz",'lib':0,'tu':104,'section':2,'class_template':False,'static':False,'is_reachable':False,'r':[0,0,5],'sh':[0,0,0],'type':"ASMFunction"},
{'addr':0x8005B530,'size':220,'pad':0,'label':"dKyw_get_AllWind_vecpow__FP4cXyz",'name':"dKyw_get_AllWind_vecpow__FP4cXyz",'lib':0,'tu':104,'section':2,'class_template':False,'static':False,'is_reachable':False,'r':[0,0,5],'sh':[0,0,0],'type':"ASMFunction"},
{'addr':0x8005B60C,'size':16,'pad':0,'label':"dKyw_custom_windpower__Ff",'name':"dKyw_custom_windpower__Ff",'lib':0,'tu':104,'section':2,'class_template':False,'static':False,'is_reachable':False,'r':[0,0,5],'sh':[0,0,0],'type':"ASMFunction"},
{'addr':0x8005B61C,'size':28,'pad':0,'label':"dKyw_evt_wind_set__Fss",'name':"dKyw_evt_wind_set__Fss",'lib':0,'tu':104,'section':2,'class_template':False,'static':False,'is_reachable':False,'r':[0,0,6],'sh':[0,0,0],'type':"ASMFunction"},
{'addr':0x8005B638,'size':20,'pad':0,'label':"dKyw_evt_wind_set_go__Fv",'name':"dKyw_evt_wind_set_go__Fv",'lib':0,'tu':104,'section':2,'class_template':False,'static':False,'is_reachable':False,'r':[0,0,3],'sh':[0,0,0],'type':"ASMFunction"},
@ -29837,7 +29837,7 @@ SYMBOL_NAMES = {
"dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf":2562,
"dKyw_pntwind_get_vecpow__FP4cXyz":2563,
"dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf":2564,
"dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz":2565,
"dKyw_get_AllWind_vecpow__FP4cXyz":2565,
"dKyw_custom_windpower__Ff":2566,
"dKyw_evt_wind_set__Fss":2567,
"dKyw_evt_wind_set_go__Fv":2568,

2
rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp
View File

@ -176,7 +176,7 @@ extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci();
extern "C" void dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz();
extern "C" void dKyw_get_AllWind_vecpow__FP4cXyz();
extern "C" void GetAc__22dCcD_GAtTgCoCommonBaseFv();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void __ct__12dCcD_GObjInfFv();

2
rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp
View File

@ -139,7 +139,7 @@ extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci();
extern "C" void dPath_GetRoomPath__Fii();
extern "C" void dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz();
extern "C" void dKyw_get_AllWind_vecpow__FP4cXyz();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void __dt__12dCcD_GObjInfFv();

2
rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp
View File

@ -138,7 +138,7 @@ extern "C" void fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci();
extern "C" void dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz();
extern "C" void dKyw_get_AllWind_vecpow__FP4cXyz();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void __pl__4cXyzCFRC3Vec();

2
rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp
View File

@ -162,7 +162,7 @@ extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci();
extern "C" void dPath_GetRoomPath__Fii();
extern "C" void dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz();
extern "C" void dKyw_get_AllWind_vecpow__FP4cXyz();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void __pl__4cXyzCFRC3Vec();

14
src/d/kankyo/d_kankyo_wether.cpp
View File

@ -122,7 +122,7 @@ 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__FP4cXyzP4cXyz();
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();
@ -1753,30 +1753,30 @@ asm void dKyw_get_AllWind_vec(cXyz* param_0, cXyz* param_1, f32* param_2) {
}
#pragma pop
/* 8005B530-8005B60C 055E70 00DC+00 0/0 0/0 5/5 .text dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz */
/* 8005B530-8005B60C 055E70 00DC+00 0/0 0/0 5/5 .text dKyw_get_AllWind_vecpow__FP4cXyz */
// matches with literals
#ifdef NONMATCHING
void dKyw_get_AllWind_vecpow(cXyz* param_0, cXyz* param_1) {
cXyz dKyw_get_AllWind_vecpow(cXyz* param_0) {
f32 sp8;
cXyz spC;
cXyz sp18;
cXyz sp24;
cXyz sp30;
dKyw_pntwind_get_info(param_1, &sp30, &sp8);
dKyw_pntwind_get_info(param_0, &sp30, &sp8);
sp18 = g_env_light.mWind.vec * (g_env_light.mWind.pow * (1.0f - sp8));
sp24 = sp30 * (5.0f * sp8);
spC = sp18 + sp24;
*param_0 = spC;
return spC;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dKyw_get_AllWind_vecpow(cXyz* param_0, cXyz* param_1) {
asm void dKyw_get_AllWind_vecpow(cXyz* param_0) {
nofralloc
#include "asm/d/kankyo/d_kankyo_wether/dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz.s"
#include "asm/d/kankyo/d_kankyo_wether/dKyw_get_AllWind_vecpow__FP4cXyz.s"
}
#pragma pop
#endif