mirror of https://github.com/zeldaret/tp.git
Merge pull request #264 from Trueffeloot/work3
Most of d_a_tag_ajnot decompiled
This commit is contained in:
TakaRikka
GitHub
commit
df55eee7a7
1430
Progress.md
1430
Progress.md
File diff suppressed because it is too large
Load Diff
|
|
@ -1,23 +0,0 @@
|
|||
lbl_805A26C8:
|
||||
/* 805A26C8 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 805A26CC 7C 08 02 A6 */ mflr r0
|
||||
/* 805A26D0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 805A26D4 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 805A26D8 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 805A26DC 7C 7E 1B 79 */ or. r30, r3, r3
|
||||
/* 805A26E0 7C 9F 23 78 */ mr r31, r4
|
||||
/* 805A26E4 41 82 00 1C */ beq lbl_805A2700
|
||||
/* 805A26E8 38 80 00 00 */ li r4, 0
|
||||
/* 805A26EC 4B A7 65 A1 */ bl __dt__10fopAc_ac_cFv
|
||||
/* 805A26F0 7F E0 07 35 */ extsh. r0, r31
|
||||
/* 805A26F4 40 81 00 0C */ ble lbl_805A2700
|
||||
/* 805A26F8 7F C3 F3 78 */ mr r3, r30
|
||||
/* 805A26FC 4B D2 C6 41 */ bl __dl__FPv
|
||||
lbl_805A2700:
|
||||
/* 805A2700 7F C3 F3 78 */ mr r3, r30
|
||||
/* 805A2704 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 805A2708 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 805A270C 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 805A2710 7C 08 03 A6 */ mtlr r0
|
||||
/* 805A2714 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 805A2718 4E 80 00 20 */ blr
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
lbl_805A2658:
|
||||
/* 805A2658 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 805A265C 7C 08 02 A6 */ mflr r0
|
||||
/* 805A2660 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 805A2664 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 805A2668 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 805A266C 80 03 04 A0 */ lwz r0, 0x4a0(r3)
|
||||
/* 805A2670 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
|
||||
/* 805A2674 40 82 00 1C */ bne lbl_805A2690
|
||||
/* 805A2678 28 1F 00 00 */ cmplwi r31, 0
|
||||
/* 805A267C 41 82 00 08 */ beq lbl_805A2684
|
||||
/* 805A2680 4B A7 64 E5 */ bl __ct__10fopAc_ac_cFv
|
||||
lbl_805A2684:
|
||||
/* 805A2684 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
|
||||
/* 805A2688 60 00 00 08 */ ori r0, r0, 8
|
||||
/* 805A268C 90 1F 04 A0 */ stw r0, 0x4a0(r31)
|
||||
lbl_805A2690:
|
||||
/* 805A2690 38 60 00 04 */ li r3, 4
|
||||
/* 805A2694 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 805A2698 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 805A269C 7C 08 03 A6 */ mtlr r0
|
||||
/* 805A26A0 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 805A26A4 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_805A26A8:
|
||||
/* 805A26A8 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 805A26AC 7C 08 02 A6 */ mflr r0
|
||||
/* 805A26B0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 805A26B4 4B FF FF A5 */ bl create__12daTagAJnot_cFv
|
||||
/* 805A26B8 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 805A26BC 7C 08 03 A6 */ mtlr r0
|
||||
/* 805A26C0 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 805A26C4 4E 80 00 20 */ blr
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
lbl_805A271C:
|
||||
/* 805A271C 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 805A2720 7C 08 02 A6 */ mflr r0
|
||||
/* 805A2724 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 805A2728 38 80 FF FF */ li r4, -1
|
||||
/* 805A272C 4B FF FF 9D */ bl __dt__12daTagAJnot_cFv
|
||||
/* 805A2730 38 60 00 01 */ li r3, 1
|
||||
/* 805A2734 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 805A2738 7C 08 03 A6 */ mtlr r0
|
||||
/* 805A273C 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 805A2740 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_805A2850:
|
||||
/* 805A2850 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 805A2854 7C 08 02 A6 */ mflr r0
|
||||
/* 805A2858 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 805A285C 4B FF FE E9 */ bl execute__12daTagAJnot_cFv
|
||||
/* 805A2860 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 805A2864 7C 08 03 A6 */ mtlr r0
|
||||
/* 805A2868 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 805A286C 4E 80 00 20 */ blr
|
||||
|
|
@ -1,6 +1,15 @@
|
|||
#ifndef D_A_TAG_AJNOT_H
|
||||
#define D_A_TAG_AJNOT_H
|
||||
|
||||
#include "d/com/d_com_inf_game.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
class daTagAJnot_c : public fopAc_ac_c {
|
||||
public:
|
||||
/* 805A2658 */ int create();
|
||||
/* 805A26C8 */ ~daTagAJnot_c();
|
||||
/* 805A2744 */ int execute();
|
||||
};
|
||||
|
||||
#endif /* D_A_TAG_AJNOT_H */
|
||||
|
|
|
|||
|
|
@ -7,21 +7,6 @@
|
|||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct fopAc_ac_c {
|
||||
/* 80018B64 */ fopAc_ac_c();
|
||||
/* 80018C8C */ ~fopAc_ac_c();
|
||||
};
|
||||
|
||||
struct daTagAJnot_c {
|
||||
/* 805A2658 */ void create();
|
||||
/* 805A26C8 */ ~daTagAJnot_c();
|
||||
/* 805A2744 */ void execute();
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
|
@ -42,58 +27,39 @@ extern "C" extern void* g_profile_Tag_AJnot[12];
|
|||
extern "C" void __ct__10fopAc_ac_cFv();
|
||||
extern "C" void __dt__10fopAc_ac_cFv();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void PSVECSquareDistance();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" extern void* g_fopAc_Method[8];
|
||||
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* 805A2658-805A26A8 000078 0050+00 1/1 0/0 0/0 .text create__12daTagAJnot_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTagAJnot_c::create() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot/create__12daTagAJnot_cFv.s"
|
||||
int daTagAJnot_c::create() {
|
||||
if (!fopAcM_CheckCondition(this, 8)) {
|
||||
new (this) daTagAJnot_c();
|
||||
fopAcM_OnCondition(this, 8);
|
||||
}
|
||||
return 4;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 805A26A8-805A26C8 0000C8 0020+00 1/0 0/0 0/0 .text daTagAJnot_Create__FP10fopAc_ac_c
|
||||
*/
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daTagAJnot_Create(fopAc_ac_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot/daTagAJnot_Create__FP10fopAc_ac_c.s"
|
||||
|
||||
static int daTagAJnot_Create(fopAc_ac_c* ajnot) {
|
||||
return static_cast<daTagAJnot_c*>(ajnot)->create();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 805A26C8-805A271C 0000E8 0054+00 1/1 0/0 0/0 .text __dt__12daTagAJnot_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm daTagAJnot_c::~daTagAJnot_c() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot/__dt__12daTagAJnot_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
daTagAJnot_c::~daTagAJnot_c() {}
|
||||
|
||||
/* 805A271C-805A2744 00013C 0028+00 1/0 0/0 0/0 .text daTagAJnot_Delete__FP12daTagAJnot_c
|
||||
*/
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daTagAJnot_Delete(daTagAJnot_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot/daTagAJnot_Delete__FP12daTagAJnot_c.s"
|
||||
static int daTagAJnot_Delete(daTagAJnot_c* ajnot) {
|
||||
ajnot->~daTagAJnot_c();
|
||||
return 1;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 805A2880-805A2884 000000 0004+00 1/1 0/0 0/0 .rodata @3713 */
|
||||
|
|
@ -123,25 +89,19 @@ COMPILER_STRIP_GATE(0x805A2888, &lit_3715);
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTagAJnot_c::execute() {
|
||||
asm int daTagAJnot_c::execute() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot/execute__12daTagAJnot_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 805A2850-805A2870 000270 0020+00 1/0 0/0 0/0 .text daTagAJnot_Execute__FP12daTagAJnot_c */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daTagAJnot_Execute(daTagAJnot_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot/daTagAJnot_Execute__FP12daTagAJnot_c.s"
|
||||
static int daTagAJnot_Execute(daTagAJnot_c* ajnot) {
|
||||
return ajnot->execute();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 805A2870-805A2878 000290 0008+00 1/0 0/0 0/0 .text daTagAJnot_Draw__FP12daTagAJnot_c
|
||||
*/
|
||||
static bool daTagAJnot_Draw(daTagAJnot_c* param_0) {
|
||||
static bool daTagAJnot_Draw(daTagAJnot_c* ajnot) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue