mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
moved strings + decompile simple store functions
This commit is contained in:
@@ -163,10 +163,10 @@ struct Z2SoundObjBase {
|
||||
/* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*);
|
||||
};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct JAISoundID {};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct Z2SeMgr {
|
||||
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
|
||||
};
|
||||
@@ -221,8 +221,8 @@ extern "C" bool eventStart__17dEvLib_callback_cFv();
|
||||
extern "C" bool eventRun__17dEvLib_callback_cFv();
|
||||
extern "C" bool eventEnd__17dEvLib_callback_cFv();
|
||||
extern "C" void __dt__14daObjSwLight_cFv();
|
||||
extern "C" void func_80CF8358(u16*);
|
||||
extern "C" void func_80CF8374(u8*);
|
||||
extern "C" void func_80CF8358(void* _this, u16*);
|
||||
extern "C" void func_80CF8374(void* _this, u8*);
|
||||
extern "C" static void func_80CF8390();
|
||||
extern "C" extern char const* const d_a_obj_swLight__stringBase0;
|
||||
|
||||
@@ -338,7 +338,7 @@ SECTION_RODATA static u8 const l_sph_src_at[64] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(80CF83A0, &l_sph_src_at);
|
||||
COMPILER_STRIP_GATE(0x80CF83A0, &l_sph_src_at);
|
||||
|
||||
/* 80CF83E0-80CF8420 000040 0040+00 0/1 0/0 0/0 .rodata l_sph_src_tg */
|
||||
#pragma push
|
||||
@@ -349,12 +349,12 @@ SECTION_RODATA static u8 const l_sph_src_tg[64] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(80CF83E0, &l_sph_src_tg);
|
||||
COMPILER_STRIP_GATE(0x80CF83E0, &l_sph_src_tg);
|
||||
#pragma pop
|
||||
|
||||
/* 80CF8420-80CF8424 000080 0004+00 2/6 0/0 0/0 .rodata @3701 */
|
||||
SECTION_RODATA static f32 const lit_3701 = 500.0f;
|
||||
COMPILER_STRIP_GATE(80CF8420, &lit_3701);
|
||||
COMPILER_STRIP_GATE(0x80CF8420, &lit_3701);
|
||||
|
||||
/* 80CF8424-80CF8428 000084 0004+00 0/4 0/0 0/0 .rodata @3702 */
|
||||
#pragma push
|
||||
@@ -365,7 +365,14 @@ SECTION_RODATA static u8 const lit_3702[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(80CF8424, &lit_3702);
|
||||
COMPILER_STRIP_GATE(0x80CF8424, &lit_3702);
|
||||
#pragma pop
|
||||
|
||||
/* 80CF8454-80CF8454 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80CF8454 = "Obj_l8sw0";
|
||||
SECTION_DEAD static char const* const stringBase_80CF845E = "cc_LB_v";
|
||||
#pragma pop
|
||||
|
||||
/* 80CF8468-80CF8474 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
|
||||
@@ -450,25 +457,25 @@ asm void daObjSwLight_c::Execute(f32 (**param_0)[3][4]) {
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3780 = 90.0f;
|
||||
COMPILER_STRIP_GATE(80CF8428, &lit_3780);
|
||||
COMPILER_STRIP_GATE(0x80CF8428, &lit_3780);
|
||||
#pragma pop
|
||||
|
||||
/* 80CF842C-80CF8430 00008C 0004+00 1/2 0/0 0/0 .rodata @3781 */
|
||||
SECTION_RODATA static f32 const lit_3781 = 255.0f;
|
||||
COMPILER_STRIP_GATE(80CF842C, &lit_3781);
|
||||
COMPILER_STRIP_GATE(0x80CF842C, &lit_3781);
|
||||
|
||||
/* 80CF8430-80CF8434 000090 0004+00 0/1 0/0 0/0 .rodata @3782 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3782 = 1.0f;
|
||||
COMPILER_STRIP_GATE(80CF8430, &lit_3782);
|
||||
COMPILER_STRIP_GATE(0x80CF8430, &lit_3782);
|
||||
#pragma pop
|
||||
|
||||
/* 80CF8434-80CF8438 000094 0004+00 0/1 0/0 0/0 .rodata @3783 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3783 = -1.0f;
|
||||
COMPILER_STRIP_GATE(80CF8434, &lit_3783);
|
||||
COMPILER_STRIP_GATE(0x80CF8434, &lit_3783);
|
||||
#pragma pop
|
||||
|
||||
/* 80CF84E8-80CF84F4 -00001 000C+00 0/1 0/0 0/0 .data @3738 */
|
||||
@@ -546,14 +553,14 @@ asm void daObjSwLight_c::init_modeSwOnWait() {
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3829 = 125.0f;
|
||||
COMPILER_STRIP_GATE(80CF8438, &lit_3829);
|
||||
COMPILER_STRIP_GATE(0x80CF8438, &lit_3829);
|
||||
#pragma pop
|
||||
|
||||
/* 80CF843C-80CF8440 00009C 0004+00 0/1 0/0 0/0 .rodata @3830 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3830 = 0.25f;
|
||||
COMPILER_STRIP_GATE(80CF843C, &lit_3830);
|
||||
COMPILER_STRIP_GATE(0x80CF843C, &lit_3830);
|
||||
#pragma pop
|
||||
|
||||
/* 80CF8440-80CF8448 0000A0 0004+04 0/1 0/0 0/0 .rodata @3831 */
|
||||
@@ -564,7 +571,7 @@ SECTION_RODATA static f32 const lit_3831[1 + 1 /* padding */] = {
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(80CF8440, &lit_3831);
|
||||
COMPILER_STRIP_GATE(0x80CF8440, &lit_3831);
|
||||
#pragma pop
|
||||
|
||||
/* 80CF8448-80CF8450 0000A8 0008+00 0/1 0/0 0/0 .rodata @3833 */
|
||||
@@ -573,7 +580,7 @@ COMPILER_STRIP_GATE(80CF8440, &lit_3831);
|
||||
SECTION_RODATA static u8 const lit_3833[8] = {
|
||||
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(80CF8448, &lit_3833);
|
||||
COMPILER_STRIP_GATE(0x80CF8448, &lit_3833);
|
||||
#pragma pop
|
||||
|
||||
/* 80CF766C-80CF777C 00074C 0110+00 1/0 0/0 0/0 .text modeSwOnWait__14daObjSwLight_cFv */
|
||||
@@ -599,7 +606,7 @@ asm void daObjSwLight_c::init_modeOnLight() {
|
||||
/* ############################################################################################## */
|
||||
/* 80CF8450-80CF8454 0000B0 0004+00 1/2 0/0 0/0 .rodata @3844 */
|
||||
SECTION_RODATA static f32 const lit_3844 = 25.0f;
|
||||
COMPILER_STRIP_GATE(80CF8450, &lit_3844);
|
||||
COMPILER_STRIP_GATE(0x80CF8450, &lit_3844);
|
||||
|
||||
/* 80CF7788-80CF77D8 000868 0050+00 1/0 0/0 0/0 .text modeOnLight__14daObjSwLight_cFv */
|
||||
#pragma push
|
||||
@@ -920,7 +927,7 @@ asm daObjSwLight_c::~daObjSwLight_c() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
extern "C" asm void func_80CF8358(u16* param_0) {
|
||||
extern "C" asm void func_80CF8358(void* _this, u16* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight/func_80CF8358.s"
|
||||
}
|
||||
@@ -930,7 +937,7 @@ extern "C" asm void func_80CF8358(u16* param_0) {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
extern "C" asm void func_80CF8374(u8* param_0) {
|
||||
extern "C" asm void func_80CF8374(void* _this, u8* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight/func_80CF8374.s"
|
||||
}
|
||||
@@ -946,10 +953,4 @@ static asm void func_80CF8390() {
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80CF8454-80CF8466 0000B4 0012+00 2/1 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
#pragma section ".dead"
|
||||
SECTION_DEAD static char const* const stringBase_80CF8454 = "Obj_l8sw0";
|
||||
SECTION_DEAD static char const* const stringBase_80CF845E = "cc_LB_v";
|
||||
#pragma pop
|
||||
/* 80CF8454-80CF8454 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
Reference in New Issue
Block a user