encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

f_op_actor_mng split & started decomp (#112)

Browse Source 
* fop-actor-mng

* rodata

* more actor mng progress

* actor mng progress

* format

* cleanup

* fix Mtx function signatures

* PR suggestion

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
lepelog
2021-02-12 19:47:46 -05:00
committed by GitHub
co-authored by Pheenoh
parent 103e9a3865
commit aff4c171fc
295 changed files with 6350 additions and 5712 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DUClipper.h
+32
View File
@@ -0,0 +1,32 @@
#ifndef JSYSTEM_J3DUCLIPPER_H_
#define JSYSTEM_J3DUCLIPPER_H_
#include "dolphin/types.h"
#include "mtx_vec.h"
class J3DUClipper {
private:
void* vtable;
Vec _4;
Vec _10;
Vec _1C;
Vec _28;
u8 _34[0x4C - 0x34];
f32 mFovY;
f32 mAspect;
f32 mNear;
f32 mFar;
public:
u32 clip(const Mtx, Vec*, f32) const;
u32 clip(const Mtx, Vec*, Vec*) const;
};
extern J3DUClipper lbl_803DD8E4;
extern "C" {
u32 J3DUClipper_NS_clip(const J3DUClipper*, const Mtx, Vec*, f32);
u32 J3DUClipper_NS_clip_X1_(const J3DUClipper*, const Mtx, Vec*, Vec*);
}
#endif
include/JSystem/JMath/JMath.h
+21
View File
@@ -0,0 +1,21 @@
#ifndef JSYSTEM_JMATH_H_
#define JSYSTEM_JMATH_H_
#include "dolphin/types.h"
struct sinCosTableEntry {
f32 sin;
f32 cos;
};
extern sinCosTableEntry lbl_80439A20[0x2000]; // JMath::JMath::sincosTable_
inline f32 cM_scos(s16 s) {
return lbl_80439A20[static_cast<u16>(s) >> 3].cos;
}
inline f32 cM_ssin(s16 s) {
return lbl_80439A20[static_cast<u16>(s) >> 3].sin;
}
#endif
include/SComponent/c_sxyz.h
+9 -2
View File
@@ -3,12 +3,19 @@
#include "global.h"
class csXyz {
private:
struct SVec {
s16 mX, mY, mZ;
};
class csXyz : public SVec {
public:
csXyz() {}
csXyz(const csXyz& other) : SVec(other){};
csXyz(s16, s16, s16);
~csXyz() {}
s16 GetX() const { return mX; }
s16 GetY() const { return mY; }
s16 GetZ() const { return mZ; }
csXyz operator+(csXyz&);
void operator+=(csXyz&);
csXyz operator-(csXyz&);
include/SComponent/c_xyz.h
+17
View File
@@ -55,6 +55,11 @@ public:
y -= f;
z -= f;
}
void operator+=(const Vec& vec) {
x += vec.x;
y += vec.y;
z += vec.z;
}
cXyz getCrossProduct(const Vec&) const;
cXyz outprod(const Vec&) const;
cXyz norm(void) const;
@@ -75,6 +80,12 @@ public:
x = f;
}
void set(f32 pX, f32 pY, f32 pZ) {
x = pX;
y = pY;
z = pZ;
}
void setMin(const cXyz& other) {
if (x > other.x) {
x = other.x;
@@ -100,6 +111,12 @@ public:
}
bool checkEpsilon() const { return !(PSVECSquareMag(this) < lbl_80455074); }
f32 getSquareMag() const { return PSVECSquareMag(this); }
f32 abs2() const { return this->getSquareMag(); }
f32 abs2XZ() const {
cXyz tmp(this->x, 0, this->z);
return tmp.abs2();
}
};
extern cXyz lbl_80430CF4; // SComponent::cXyz::Zero
include/d/d_a/d_a_alink/asm/func_800A093C.s
+2 -2
View File
@@ -39,7 +39,7 @@ lbl_800A09AC:
/* 800A09CC 0009D90C 41 82 02 40 */ beq lbl_800A0C0C
/* 800A09D0 0009D910 28 05 01 5D */ cmplwi r5, 0x15d
/* 800A09D4 0009D914 41 82 02 38 */ beq lbl_800A0C0C
/* 800A09D8 0009D918 4B F7 B1 3D */ bl fopAcM_getTalkEventPartner
/* 800A09D8 0009D918 4B F7 B1 3D */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 800A09DC 0009D91C 7C 7A 1B 79 */ or. r26, r3, r3
/* 800A09E0 0009D920 41 82 02 2C */ beq lbl_800A0C0C
/* 800A09E4 0009D924 83 0D 8A 98 */ lwz r24, lbl_80451018-_SDA_BASE_(r13)
@@ -139,7 +139,7 @@ lbl_800A0B1C:
/* 800A0B30 0009DA70 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha
/* 800A0B34 0009DA74 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800A0B38 0009DA78 38 81 00 0C */ addi r4, r1, 0xc
/* 800A0B3C 0009DA7C 4B F7 8C BD */ bl fopAcIt_Judge
/* 800A0B3C 0009DA7C 4B F7 8C BD */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800A0B40 0009DA80 A8 9F 30 F8 */ lha r4, 0x30f8(r31)
/* 800A0B44 0009DA84 38 04 FF FF */ addi r0, r4, -1
/* 800A0B48 0009DA88 B0 1F 30 F8 */ sth r0, 0x30f8(r31)
include/d/d_a/d_a_alink/asm/func_800A551C.s
+1 -1
View File
@@ -146,7 +146,7 @@ lbl_800A5718:
/*.global fpcSch_JudgeByID*/
/* 800A5738 000A2678 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800A573C 000A267C 38 81 00 08 */ addi r4, r1, 8
/* 800A5740 000A2680 4B F7 40 B9 */ bl fopAcIt_Judge
/* 800A5740 000A2680 4B F7 40 B9 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800A5744 000A2684 7C 64 1B 78 */ mr r4, r3
/* 800A5748 000A2688 7F 03 C3 78 */ mr r3, r24
/* 800A574C 000A268C 48 06 12 ED */ bl daAlink_c_NS_procBoardWaitInit
include/d/d_a/d_a_alink/asm/func_800A5CC8.s
+12 -12
View File
@@ -88,7 +88,7 @@ lbl_800A5E04:
/* 800A5E0C 000A2D4C 93 E3 5D AC */ stw r31, 0x5dac(r3)
/* 800A5E10 000A2D50 93 E3 5D B4 */ stw r31, 0x5db4(r3)
/* 800A5E14 000A2D54 7F E3 FB 78 */ mr r3, r31
/* 800A5E18 000A2D58 4B F7 3A AD */ bl fopAcM_setStageLayer
/* 800A5E18 000A2D58 4B F7 3A AD */ bl fopAcM_setStageLayer__FPv
/* 800A5E1C 000A2D5C 28 1B 00 07 */ cmplwi r27, 7
/* 800A5E20 000A2D60 40 82 00 34 */ bne lbl_800A5E54
/* 800A5E24 000A2D64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
@@ -206,7 +206,7 @@ lbl_800A5FB0:
/* 800A5FB8 000A2EF8 38 84 48 F0 */ addi r4, r4, daAlink_createHeap@l
/* 800A5FBC 000A2EFC 3C A0 C0 04 */ lis r5, 0xC003E930@ha
/* 800A5FC0 000A2F00 38 A5 E9 30 */ addi r5, r5, 0xC003E930@l
/* 800A5FC4 000A2F04 4B F7 44 ED */ bl fopAcM_entrySolidHeap
/* 800A5FC4 000A2F04 4B F7 44 ED */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl
/* 800A5FC8 000A2F08 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800A5FCC 000A2F0C 40 82 00 0C */ bne lbl_800A5FD8
/* 800A5FD0 000A2F10 38 60 00 05 */ li r3, 5
@@ -235,7 +235,7 @@ lbl_800A5FD8:
/* 800A6028 000A2F68 38 FF 04 E4 */ addi r7, r31, 0x4e4
/* 800A602C 000A2F6C 39 00 00 00 */ li r8, 0
/* 800A6030 000A2F70 39 20 FF FF */ li r9, -1
/* 800A6034 000A2F74 4B F7 3D 65 */ bl fopAcM_create_X1_
/* 800A6034 000A2F74 4B F7 3D 65 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc
/* 800A6038 000A2F78 90 7F 29 00 */ stw r3, 0x2900(r31)
/* 800A603C 000A2F7C 48 00 00 44 */ b lbl_800A6080
lbl_800A6040:
@@ -250,7 +250,7 @@ lbl_800A6040:
/* 800A6060 000A2FA0 38 FF 04 E4 */ addi r7, r31, 0x4e4
/* 800A6064 000A2FA4 39 00 00 00 */ li r8, 0
/* 800A6068 000A2FA8 39 20 FF FF */ li r9, -1
/* 800A606C 000A2FAC 4B F7 3D 2D */ bl fopAcM_create_X1_
/* 800A606C 000A2FAC 4B F7 3D 2D */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc
/* 800A6070 000A2FB0 90 7F 29 00 */ stw r3, 0x2900(r31)
/* 800A6074 000A2FB4 48 00 00 0C */ b lbl_800A6080
lbl_800A6078:
@@ -284,7 +284,7 @@ lbl_800A60C8:
/*.global daAlink_searchPortal*/
/* 800A60D8 000A3018 38 63 F5 D4 */ addi r3, r3, daAlink_searchPortal@l
/* 800A60DC 000A301C 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 800A60E0 000A3020 4B F7 37 19 */ bl fopAcIt_Judge
/* 800A60E0 000A3020 4B F7 37 19 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800A60E4 000A3024 7C 78 1B 79 */ or. r24, r3, r3
/* 800A60E8 000A3028 41 82 00 F0 */ beq lbl_800A61D8
lbl_800A60EC:
@@ -298,7 +298,7 @@ lbl_800A60EC:
/*.global fpcSch_JudgeByID*/
/* 800A6104 000A3044 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800A6108 000A3048 38 81 00 10 */ addi r4, r1, 0x10
/* 800A610C 000A304C 4B F7 36 ED */ bl fopAcIt_Judge
/* 800A610C 000A304C 4B F7 36 ED */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800A6110 000A3050 28 03 00 00 */ cmplwi r3, 0
/* 800A6114 000A3054 41 82 00 C4 */ beq lbl_800A61D8
lbl_800A6118:
@@ -311,7 +311,7 @@ lbl_800A6118:
/*.global daAlink_searchCanoe*/
/* 800A612C 000A306C 38 63 3C D8 */ addi r3, r3, daAlink_searchCanoe@l
/* 800A6130 000A3070 38 80 00 00 */ li r4, 0
/* 800A6134 000A3074 4B F7 36 C5 */ bl fopAcIt_Judge
/* 800A6134 000A3074 4B F7 36 C5 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800A6138 000A3078 28 03 00 00 */ cmplwi r3, 0
/* 800A613C 000A307C 41 82 00 9C */ beq lbl_800A61D8
lbl_800A6140:
@@ -324,7 +324,7 @@ lbl_800A6140:
/*.global daAlink_searchBoar*/
/* 800A6154 000A3094 38 63 C7 24 */ addi r3, r3, daAlink_searchBoar@l
/* 800A6158 000A3098 38 80 00 00 */ li r4, 0
/* 800A615C 000A309C 4B F7 36 9D */ bl fopAcIt_Judge
/* 800A615C 000A309C 4B F7 36 9D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800A6160 000A30A0 28 03 00 00 */ cmplwi r3, 0
/* 800A6164 000A30A4 41 82 00 74 */ beq lbl_800A61D8
lbl_800A6168:
@@ -350,7 +350,7 @@ lbl_800A61A4:
/*.global daAlink_searchLightBall*/
/* 800A61A8 000A30E8 38 63 38 80 */ addi r3, r3, daAlink_searchLightBall@l
/* 800A61AC 000A30EC 38 80 00 00 */ li r4, 0
/* 800A61B0 000A30F0 4B F7 36 49 */ bl fopAcIt_Judge
/* 800A61B0 000A30F0 4B F7 36 49 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800A61B4 000A30F4 28 03 00 00 */ cmplwi r3, 0
/* 800A61B8 000A30F8 41 82 00 20 */ beq lbl_800A61D8
lbl_800A61BC:
@@ -534,7 +534,7 @@ lbl_800A6448:
/*.global daAlink_searchLightBall*/
/* 800A644C 000A338C 38 63 38 80 */ addi r3, r3, daAlink_searchLightBall@l
/* 800A6450 000A3390 38 80 00 00 */ li r4, 0
/* 800A6454 000A3394 4B F7 33 A5 */ bl fopAcIt_Judge
/* 800A6454 000A3394 4B F7 33 A5 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800A6458 000A3398 7C 64 1B 78 */ mr r4, r3
/* 800A645C 000A339C 7F E3 FB 78 */ mr r3, r31
/* 800A6460 000A33A0 38 A0 00 01 */ li r5, 1
@@ -552,7 +552,7 @@ lbl_800A6478:
/* 800A648C 000A33CC 38 FF 04 E4 */ addi r7, r31, 0x4e4
/* 800A6490 000A33D0 39 00 00 00 */ li r8, 0
/* 800A6494 000A33D4 39 20 FF FF */ li r9, -1
/* 800A6498 000A33D8 4B F7 39 01 */ bl fopAcM_create_X1_
/* 800A6498 000A33D8 4B F7 39 01 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc
/* 800A649C 000A33DC 7F E3 FB 78 */ mr r3, r31
/* 800A64A0 000A33E0 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 800A64A4 000A33E4 88 1F 04 E2 */ lbz r0, 0x4e2(r31)
@@ -599,7 +599,7 @@ lbl_800A64FC:
/* 800A6540 000A3480 39 01 00 1C */ addi r8, r1, 0x1c
/* 800A6544 000A3484 39 20 00 00 */ li r9, 0
/* 800A6548 000A3488 39 40 FF FF */ li r10, -1
/* 800A654C 000A348C 4B F7 39 A5 */ bl fopAcM_createChild
/* 800A654C 000A348C 4B F7 39 A5 */ bl fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i
lbl_800A6550:
/* 800A6550 000A3490 38 7B 3E E8 */ addi r3, r27, 0x3ee8
/* 800A6554 000A3494 81 9B 3E E8 */ lwz r12, 0x3ee8(r27)
include/d/d_a/d_a_alink/asm/func_800A7358.s
+1 -1
View File
@@ -73,7 +73,7 @@ lbl_800A7460:
/* 800A7468 000A43A8 38 A1 00 28 */ addi r5, r1, 0x28
/* 800A746C 000A43AC 38 C1 00 0C */ addi r6, r1, 0xc
/* 800A7470 000A43B0 38 E0 00 00 */ li r7, 0
/* 800A7474 000A43B4 4B F7 65 35 */ bl fopAcM_getWaterStream
/* 800A7474 000A43B4 4B F7 65 35 */ bl fopAcM_getWaterStream__FPC4cXyzRC13cBgS_PolyInfoP4cXyzPii
/* 800A7478 000A43B8 2C 03 00 00 */ cmpwi r3, 0
/* 800A747C 000A43BC 41 82 00 10 */ beq lbl_800A748C
/* 800A7480 000A43C0 80 1E 05 7C */ lwz r0, 0x57c(r30)
include/d/d_a/d_a_alink/asm/func_800AA5E8.s
+2 -2
View File
@@ -29,12 +29,12 @@
/* 800AA658 000A7598 2C 03 00 00 */ cmpwi r3, 0
/* 800AA65C 000A759C 41 82 00 34 */ beq lbl_800AA690
/* 800AA660 000A75A0 7F C3 F3 78 */ mr r3, r30
/* 800AA664 000A75A4 4B F7 14 B1 */ bl fopAcM_getTalkEventPartner
/* 800AA664 000A75A4 4B F7 14 B1 */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 800AA668 000A75A8 28 03 00 00 */ cmplwi r3, 0
/* 800AA66C 000A75AC 41 82 00 18 */ beq lbl_800AA684
/* 800AA670 000A75B0 83 ED 8A 98 */ lwz r31, lbl_80451018-_SDA_BASE_(r13)
/* 800AA674 000A75B4 7F C3 F3 78 */ mr r3, r30
/* 800AA678 000A75B8 4B F7 14 9D */ bl fopAcM_getTalkEventPartner
/* 800AA678 000A75B8 4B F7 14 9D */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 800AA67C 000A75BC 7C 03 F8 40 */ cmplw r3, r31
/* 800AA680 000A75C0 41 82 00 10 */ beq lbl_800AA690
lbl_800AA684:
include/d/d_a/d_a_alink/asm/func_800B0098.s
+1 -1
View File
@@ -37,7 +37,7 @@ lbl_800B010C:
lbl_800B0120:
/* 800B0120 000AD060 38 61 00 08 */ addi r3, r1, 8
/* 800B0124 000AD064 7F C4 F3 78 */ mr r4, r30
/* 800B0128 000AD068 4B F6 DA B1 */ bl fopAcM_getPolygonAngle_X1_
/* 800B0128 000AD068 4B F6 DA B1 */ bl fopAcM_getPolygonAngle__FPC8cM3dGPlas
/* 800B012C 000AD06C 3C 80 80 3A */ lis r4, lbl_803A37C0@ha
/* 800B0130 000AD070 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l
/* 800B0134 000AD074 90 01 00 18 */ stw r0, 0x18(r1)
include/d/d_a/d_a_alink/asm/func_800B0150.s
+1 -1
View File
@@ -30,7 +30,7 @@ lbl_800B01AC:
lbl_800B01C0:
/* 800B01C0 000AD100 38 61 00 08 */ addi r3, r1, 8
/* 800B01C4 000AD104 7F C4 F3 78 */ mr r4, r30
/* 800B01C8 000AD108 4B F6 DA 11 */ bl fopAcM_getPolygonAngle_X1_
/* 800B01C8 000AD108 4B F6 DA 11 */ bl fopAcM_getPolygonAngle__FPC8cM3dGPlas
/* 800B01CC 000AD10C 3C 63 00 01 */ addis r3, r3, 1
/* 800B01D0 000AD110 38 03 80 00 */ addi r0, r3, -32768
/* 800B01D4 000AD114 7C 03 07 34 */ extsh r3, r0
include/d/d_a/d_a_alink/asm/func_800B154C.s
+1 -1
View File
@@ -35,7 +35,7 @@ lbl_800B15BC:
/* 800B15C8 000AE508 3B A3 00 1C */ addi r29, r3, 0x1c
lbl_800B15CC:
/* 800B15CC 000AE50C 38 61 00 14 */ addi r3, r1, 0x14
/* 800B15D0 000AE510 4B F6 C7 B5 */ bl fopAcM_wt_c_NS_waterCheck
/* 800B15D0 000AE510 4B F6 C7 B5 */ bl waterCheck__11fopAcM_wt_cFPC4cXyz
/* 800B15D4 000AE514 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800B15D8 000AE518 41 82 01 1C */ beq lbl_800B16F4
/* 800B15DC 000AE51C C0 0D 87 58 */ lfs f0, lbl_80450CD8-_SDA_BASE_(r13)
include/d/d_a/d_a_alink/asm/func_800B6A30.s
+2 -2
View File
@@ -200,7 +200,7 @@ lbl_800B6CE4:
/*.global daAlink_searchTagKandelaar*/
/* 800B6D18 000B3C58 38 63 06 54 */ addi r3, r3, daAlink_searchTagKandelaar@l
/* 800B6D1C 000B3C5C 38 80 00 00 */ li r4, 0
/* 800B6D20 000B3C60 4B F6 2A D9 */ bl fopAcIt_Judge
/* 800B6D20 000B3C60 4B F6 2A D9 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800B6D24 000B3C64 7C 7D 1B 78 */ mr r29, r3
lbl_800B6D28:
/* 800B6D28 000B3C68 28 1D 00 00 */ cmplwi r29, 0
@@ -212,7 +212,7 @@ lbl_800B6D28:
/* 800B6D40 000B3C80 C0 1D 04 D4 */ lfs f0, 0x4d4(r29)
/* 800B6D44 000B3C84 EF E1 00 28 */ fsubs f31, f1, f0
/* 800B6D48 000B3C88 7F A3 EB 78 */ mr r3, r29
/* 800B6D4C 000B3C8C 4B F6 3C 19 */ bl fopAcM_searchActorDistanceXZ
/* 800B6D4C 000B3C8C 4B F6 3C 19 */ bl fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800B6D50 000B3C90 C0 1D 04 EC */ lfs f0, 0x4ec(r29)
/* 800B6D54 000B3C94 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 800B6D58 000B3C98 40 80 00 68 */ bge lbl_800B6DC0
include/d/d_a/d_a_alink/asm/func_800B7B7C.s
+1 -1
View File
@@ -15,7 +15,7 @@
/* 800B7BB4 000B4AF4 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 800B7BB8 000B4AF8 38 E0 00 01 */ li r7, 1
/* 800B7BBC 000B4AFC 39 00 00 00 */ li r8, 0
/* 800B7BC0 000B4B00 4B F6 39 21 */ bl fopAcM_orderOtherEvent_X1_
/* 800B7BC0 000B4B00 4B F6 39 21 */ bl fopAcM_orderOtherEvent__FP10fopAc_ac_cP10fopAc_ac_cPCcUsUsUs
/* 800B7BC4 000B4B04 80 1F 05 74 */ lwz r0, 0x574(r31)
/* 800B7BC8 000B4B08 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
/* 800B7BCC 000B4B0C 41 82 00 10 */ beq lbl_800B7BDC
include/d/d_a/d_a_alink/asm/func_800B7BF8.s
+2 -2
View File
@@ -34,7 +34,7 @@ lbl_800B7C64:
/* 800B7C74 000B4BB4 80 9C 27 F4 */ lwz r4, 0x27f4(r28)
/* 800B7C78 000B4BB8 38 A0 00 00 */ li r5, 0
/* 800B7C7C 000B4BBC 38 C0 00 00 */ li r6, 0
/* 800B7C80 000B4BC0 4B F6 33 E9 */ bl fopAcM_orderTalkEvent
/* 800B7C80 000B4BC0 4B F6 33 E9 */ bl fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs
/* 800B7C84 000B4BC4 38 60 00 01 */ li r3, 1
/* 800B7C88 000B4BC8 48 00 00 AC */ b lbl_800B7D34
lbl_800B7C8C:
@@ -69,7 +69,7 @@ lbl_800B7CB8:
/* 800B7CF8 000B4C38 80 BC 27 F8 */ lwz r5, 0x27f8(r28)
/* 800B7CFC 000B4C3C 38 C0 00 00 */ li r6, 0
/* 800B7D00 000B4C40 38 E0 00 00 */ li r7, 0
/* 800B7D04 000B4C44 4B F6 33 F9 */ bl fopAcM_orderTalkItemBtnEvent
/* 800B7D04 000B4C44 4B F6 33 F9 */ bl fopAcM_orderTalkItemBtnEvent__FUsP10fopAc_ac_cP10fopAc_ac_cUsUs
/* 800B7D08 000B4C48 38 60 00 01 */ li r3, 1
/* 800B7D0C 000B4C4C 48 00 00 28 */ b lbl_800B7D34
lbl_800B7D10:
include/d/d_a/d_a_alink/asm/func_800B7D4C.s
+1 -1
View File
@@ -136,7 +136,7 @@ lbl_800B7F0C:
/* 800B7F40 000B4E80 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 800B7F44 000B4E84 38 E0 00 04 */ li r7, 4
/* 800B7F48 000B4E88 39 00 00 01 */ li r8, 1
/* 800B7F4C 000B4E8C 4B F6 37 31 */ bl fopAcM_orderOtherEventId
/* 800B7F4C 000B4E8C 4B F6 37 31 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
/* 800B7F50 000B4E90 38 00 00 01 */ li r0, 1
/* 800B7F54 000B4E94 48 00 00 08 */ b lbl_800B7F5C
lbl_800B7F58:
include/d/d_a/d_a_alink/asm/func_800B7F84.s
+2 -2
View File
@@ -13,7 +13,7 @@
/* 800B7FB4 000B4EF4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 800B7FB8 000B4EF8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 800B7FBC 000B4EFC 80 84 5D AC */ lwz r4, 0x5dac(r4)
/* 800B7FC0 000B4F00 4B F6 27 51 */ bl fopAcM_searchActorAngleY
/* 800B7FC0 000B4F00 4B F6 27 51 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800B7FC4 000B4F04 38 80 00 03 */ li r4, 3
/* 800B7FC8 000B4F08 A8 1E 04 B6 */ lha r0, 0x4b6(r30)
/* 800B7FCC 000B4F0C 7C 00 18 50 */ subf r0, r0, r3
@@ -65,7 +65,7 @@ lbl_800B8048:
/* 800B807C 000B4FBC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 800B8080 000B4FC0 38 E0 00 04 */ li r7, 4
/* 800B8084 000B4FC4 39 00 00 01 */ li r8, 1
/* 800B8088 000B4FC8 4B F6 35 F5 */ bl fopAcM_orderOtherEventId
/* 800B8088 000B4FC8 4B F6 35 F5 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
/* 800B808C 000B4FCC 38 00 00 01 */ li r0, 1
/* 800B8090 000B4FD0 48 00 00 08 */ b lbl_800B8098
lbl_800B8094:
include/d/d_a/d_a_alink/asm/func_800B80C4.s
+3 -3
View File
@@ -135,14 +135,14 @@ lbl_800B8268:
/* 800B82B8 000B51F8 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 800B82BC 000B51FC 38 E0 00 00 */ li r7, 0
/* 800B82C0 000B5200 39 00 00 01 */ li r8, 1
/* 800B82C4 000B5204 4B F6 33 B9 */ bl fopAcM_orderOtherEventId
/* 800B82C4 000B5204 4B F6 33 B9 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
/* 800B82C8 000B5208 48 00 00 70 */ b lbl_800B8338
lbl_800B82CC:
/* 800B82CC 000B520C 7F E3 FB 78 */ mr r3, r31
/* 800B82D0 000B5210 7F C4 F3 78 */ mr r4, r30
/* 800B82D4 000B5214 38 A0 00 00 */ li r5, 0
/* 800B82D8 000B5218 38 C0 00 00 */ li r6, 0
/* 800B82DC 000B521C 4B F6 2D 8D */ bl fopAcM_orderTalkEvent
/* 800B82DC 000B521C 4B F6 2D 8D */ bl fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs
/* 800B82E0 000B5220 48 00 00 58 */ b lbl_800B8338
lbl_800B82E4:
/* 800B82E4 000B5224 80 1F 28 00 */ lwz r0, 0x2800(r31)
@@ -166,7 +166,7 @@ lbl_800B8324:
/* 800B8328 000B5268 80 8D 8A 98 */ lwz r4, lbl_80451018-_SDA_BASE_(r13)
/* 800B832C 000B526C 38 A0 00 00 */ li r5, 0
/* 800B8330 000B5270 38 C0 00 00 */ li r6, 0
/* 800B8334 000B5274 4B F6 2D 35 */ bl fopAcM_orderTalkEvent
/* 800B8334 000B5274 4B F6 2D 35 */ bl fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs
lbl_800B8338:
/* 800B8338 000B5278 C0 1F 35 94 */ lfs f0, 0x3594(r31)
/* 800B833C 000B527C D0 1F 35 A0 */ stfs f0, 0x35a0(r31)
include/d/d_a/d_a_alink/asm/func_800B8374.s
+4 -4
View File
@@ -124,7 +124,7 @@ lbl_800B850C:
/*.global daAlink_searchKolin*/
/* 800B8528 000B5468 38 63 7F 84 */ addi r3, r3, daAlink_searchKolin@l
/* 800B852C 000B546C 38 80 00 00 */ li r4, 0
/* 800B8530 000B5470 4B F6 12 C9 */ bl fopAcIt_Judge
/* 800B8530 000B5470 4B F6 12 C9 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800B8534 000B5474 28 03 00 00 */ cmplwi r3, 0
/* 800B8538 000B5478 41 82 00 10 */ beq lbl_800B8548
/* 800B853C 000B547C 7F E3 FB 78 */ mr r3, r31
@@ -172,7 +172,7 @@ lbl_800B8598:
/*.global daAlink_searchBouDoor*/
/* 800B85CC 000B550C 38 63 7D 4C */ addi r3, r3, daAlink_searchBouDoor@l
/* 800B85D0 000B5510 38 80 00 00 */ li r4, 0
/* 800B85D4 000B5514 4B F6 12 25 */ bl fopAcIt_Judge
/* 800B85D4 000B5514 4B F6 12 25 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800B85D8 000B5518 28 03 00 00 */ cmplwi r3, 0
/* 800B85DC 000B551C 40 82 00 18 */ bne lbl_800B85F4
lbl_800B85E0:
@@ -180,7 +180,7 @@ lbl_800B85E0:
/* 800B85E4 000B5524 80 9F 27 F4 */ lwz r4, 0x27f4(r31)
/* 800B85E8 000B5528 38 A0 00 00 */ li r5, 0
/* 800B85EC 000B552C 38 C0 00 00 */ li r6, 0
/* 800B85F0 000B5530 4B F6 2C 55 */ bl fopAcM_orderDoorEvent
/* 800B85F0 000B5530 4B F6 2C 55 */ bl fopAcM_orderDoorEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs
lbl_800B85F4:
/* 800B85F4 000B5534 7F E3 FB 78 */ mr r3, r31
/* 800B85F8 000B5538 4B FF D2 F5 */ bl daAlink_c_NS_checkWaitAction
@@ -190,7 +190,7 @@ lbl_800B8600:
/* 800B8604 000B5544 80 9F 27 F4 */ lwz r4, 0x27f4(r31)
/* 800B8608 000B5548 38 A0 00 00 */ li r5, 0
/* 800B860C 000B554C 38 C0 00 00 */ li r6, 0
/* 800B8610 000B5550 4B F6 34 6D */ bl fopAcM_orderTreasureEvent
/* 800B8610 000B5550 4B F6 34 6D */ bl fopAcM_orderTreasureEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs
lbl_800B8614:
/* 800B8614 000B5554 38 60 00 01 */ li r3, 1
/* 800B8618 000B5558 48 00 02 F8 */ b lbl_800B8910
include/d/d_a/d_a_alink/asm/func_800BE26C.s
+1 -1
View File
@@ -11,7 +11,7 @@
/*.global daAlink_searchCoach*/
/* 800BE290 000BB1D0 38 63 C7 58 */ addi r3, r3, daAlink_searchCoach@l
/* 800BE294 000BB1D4 38 80 00 00 */ li r4, 0
/* 800BE298 000BB1D8 4B F5 B5 61 */ bl fopAcIt_Judge
/* 800BE298 000BB1D8 4B F5 B5 61 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800BE29C 000BB1DC 28 03 00 00 */ cmplwi r3, 0
/* 800BE2A0 000BB1E0 41 82 00 08 */ beq lbl_800BE2A8
/* 800BE2A4 000BB1E4 3B E0 00 01 */ li r31, 1

Some files were not shown because too many files have changed in this diff Show More