mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-09 12:37:18 -04: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-13 01:47:46 +01:00
committed by GitHub
parent fe60f6ffdc
commit 4bd5ca735f
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
include/d/d_a/d_a_alink/asm/func_800BEAF8.s
+1 -1
View File
@@ -116,7 +116,7 @@ lbl_800BEC88:
/* 800BEC94 000BBBD4 7F A3 EB 78 */ mr r3, r29
/* 800BEC98 000BBBD8 38 9C 04 D0 */ addi r4, r28, 0x4d0
/* 800BEC9C 000BBBDC 38 A1 00 08 */ addi r5, r1, 8
/* 800BECA0 000BBBE0 4B F5 EC 61 */ bl fpoAcM_relativePos
/* 800BECA0 000BBBE0 4B F5 EC 61 */ bl fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz
/* 800BECA4 000BBBE4 C0 41 00 0C */ lfs f2, 0xc(r1)
/* 800BECA8 000BBBE8 C0 02 97 40 */ lfs f0, lbl_80453140-_SDA2_BASE_(r2)
/* 800BECAC 000BBBEC FC 02 00 40 */ fcmpo cr0, f2, f0
include/d/d_a/d_a_alink/asm/func_800BF9F0.s
+6 -6
View File
@@ -17,7 +17,7 @@
/* 800BFA30 000BC970 39 00 00 00 */ li r8, 0
/* 800BFA34 000BC974 39 20 FF FF */ li r9, -1
/* 800BFA38 000BC978 39 40 00 00 */ li r10, 0
/* 800BFA3C 000BC97C 4B F5 A3 C9 */ bl fopAcM_fastCreate
/* 800BFA3C 000BC97C 4B F5 A3 C9 */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv
/* 800BFA40 000BC980 7C 64 1B 79 */ or. r4, r3, r3
/* 800BFA44 000BC984 40 82 00 1C */ bne lbl_800BFA60
/* 800BFA48 000BC988 7F E3 FB 78 */ mr r3, r31
@@ -46,7 +46,7 @@ lbl_800BFA78:
/* 800BFA9C 000BC9DC 39 00 00 00 */ li r8, 0
/* 800BFAA0 000BC9E0 39 20 FF FF */ li r9, -1
/* 800BFAA4 000BC9E4 39 40 00 00 */ li r10, 0
/* 800BFAA8 000BC9E8 4B F5 A3 5D */ bl fopAcM_fastCreate
/* 800BFAA8 000BC9E8 4B F5 A3 5D */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv
/* 800BFAAC 000BC9EC 7C 64 1B 79 */ or. r4, r3, r3
/* 800BFAB0 000BC9F0 40 82 00 1C */ bne lbl_800BFACC
/* 800BFAB4 000BC9F4 7F E3 FB 78 */ mr r3, r31
@@ -76,7 +76,7 @@ lbl_800BFAE4:
/* 800BFB0C 000BCA4C 39 00 00 00 */ li r8, 0
/* 800BFB10 000BCA50 39 20 FF FF */ li r9, -1
/* 800BFB14 000BCA54 39 40 00 00 */ li r10, 0
/* 800BFB18 000BCA58 4B F5 A2 ED */ bl fopAcM_fastCreate
/* 800BFB18 000BCA58 4B F5 A2 ED */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv
/* 800BFB1C 000BCA5C 7C 7E 1B 79 */ or. r30, r3, r3
/* 800BFB20 000BCA60 40 82 00 38 */ bne lbl_800BFB58
/* 800BFB24 000BCA64 A0 1F 1F BC */ lhz r0, 0x1fbc(r31)
@@ -110,7 +110,7 @@ lbl_800BFB70:
/* 800BFB88 000BCAC8 38 E0 00 00 */ li r7, 0
/* 800BFB8C 000BCACC 39 00 00 00 */ li r8, 0
/* 800BFB90 000BCAD0 39 20 FF FF */ li r9, -1
/* 800BFB94 000BCAD4 4B F5 A2 05 */ bl fopAcM_create_X1_
/* 800BFB94 000BCAD4 4B F5 A2 05 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc
/* 800BFB98 000BCAD8 90 7F 28 24 */ stw r3, 0x2824(r31)
/* 800BFB9C 000BCADC 7F E3 FB 78 */ mr r3, r31
/* 800BFBA0 000BCAE0 48 03 42 01 */ bl daAlink_c_NS_initFishingRodHand
@@ -193,7 +193,7 @@ lbl_800BFC4C:
/* 800BFCBC 000BCBFC 39 00 00 00 */ li r8, 0
/* 800BFCC0 000BCC00 39 20 FF FF */ li r9, -1
/* 800BFCC4 000BCC04 39 40 00 00 */ li r10, 0
/* 800BFCC8 000BCC08 4B F5 A1 3D */ bl fopAcM_fastCreate
/* 800BFCC8 000BCC08 4B F5 A1 3D */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv
/* 800BFCCC 000BCC0C 7C 64 1B 78 */ mr r4, r3
/* 800BFCD0 000BCC10 48 00 00 34 */ b lbl_800BFD04
lbl_800BFCD4:
@@ -207,7 +207,7 @@ lbl_800BFCD4:
/* 800BFCF0 000BCC30 39 00 00 00 */ li r8, 0
/* 800BFCF4 000BCC34 39 20 FF FF */ li r9, -1
/* 800BFCF8 000BCC38 39 40 00 00 */ li r10, 0
/* 800BFCFC 000BCC3C 4B F5 A1 09 */ bl fopAcM_fastCreate
/* 800BFCFC 000BCC3C 4B F5 A1 09 */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv
/* 800BFD00 000BCC40 7C 64 1B 78 */ mr r4, r3
lbl_800BFD04:
/* 800BFD04 000BCC44 28 04 00 00 */ cmplwi r4, 0
include/d/d_a/d_a_alink/asm/func_800C12DC.s
+3 -3
View File
@@ -85,11 +85,11 @@ lbl_800C1404:
/* 800C140C 000BE34C 28 1E 00 00 */ cmplwi r30, 0
/* 800C1410 000BE350 41 82 00 B0 */ beq lbl_800C14C0
/* 800C1414 000BE354 7F C3 F3 78 */ mr r3, r30
/* 800C1418 000BE358 4B F5 B7 89 */ bl fopAcM_cancelCarryNow
/* 800C1418 000BE358 4B F5 B7 89 */ bl fopAcM_cancelCarryNow__FP10fopAc_ac_c
/* 800C141C 000BE35C 38 7F 34 E0 */ addi r3, r31, 0x34e0
/* 800C1420 000BE360 38 9E 04 D0 */ addi r4, r30, 0x4d0
/* 800C1424 000BE364 7F E5 FB 78 */ mr r5, r31
/* 800C1428 000BE368 4B F5 C8 41 */ bl fopAcM_lc_c_NS_lineCheck
/* 800C1428 000BE368 4B F5 C8 41 */ bl lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c
/* 800C142C 000BE36C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800C1430 000BE370 41 82 00 90 */ beq lbl_800C14C0
/* 800C1434 000BE374 3C 60 80 3A */ lis r3, lbl_803A37C0@ha
@@ -127,7 +127,7 @@ lbl_800C14B0:
/* 800C14B0 000BE3F0 28 1E 00 00 */ cmplwi r30, 0
/* 800C14B4 000BE3F4 41 82 00 0C */ beq lbl_800C14C0
/* 800C14B8 000BE3F8 7F C3 F3 78 */ mr r3, r30
/* 800C14BC 000BE3FC 4B F5 87 C1 */ bl fopAcM_delete
/* 800C14BC 000BE3FC 4B F5 87 C1 */ bl fopAcM_delete__FP10fopAc_ac_c
lbl_800C14C0:
/* 800C14C0 000BE400 A0 7F 2F DC */ lhz r3, 0x2fdc(r31)
/* 800C14C4 000BE404 28 03 00 42 */ cmplwi r3, 0x42
include/d/d_a/d_a_alink/asm/func_800C38CC.s
+1 -1
View File
@@ -14,7 +14,7 @@ lbl_800C38F8:
/* 800C38FC 000C083C 28 04 00 00 */ cmplwi r4, 0
/* 800C3900 000C0840 41 82 00 0C */ beq lbl_800C390C
/* 800C3904 000C0844 7F E3 FB 78 */ mr r3, r31
/* 800C3908 000C0848 4B F5 6E 09 */ bl fopAcM_searchActorAngleY
/* 800C3908 000C0848 4B F5 6E 09 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
lbl_800C390C:
/* 800C390C 000C084C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2)
/* 800C3910 000C0850 D0 1F 33 98 */ stfs f0, 0x3398(r31)
include/d/d_a/d_a_alink/asm/func_800C3F60.s
+1 -1
View File
@@ -9,7 +9,7 @@
/* 800C3F80 000C0EC0 A8 1F 30 0A */ lha r0, 0x300a(r31)
/* 800C3F84 000C0EC4 2C 00 00 00 */ cmpwi r0, 0
/* 800C3F88 000C0EC8 41 82 00 48 */ beq lbl_800C3FD0
/* 800C3F8C 000C0ECC 4B F5 67 85 */ bl fopAcM_searchActorAngleY
/* 800C3F8C 000C0ECC 4B F5 67 85 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800C3F90 000C0ED0 7C 64 1B 78 */ mr r4, r3
/* 800C3F94 000C0ED4 38 7F 04 E6 */ addi r3, r31, 0x4e6
/* 800C3F98 000C0ED8 38 A0 00 05 */ li r5, 5
include/d/d_a/d_a_alink/asm/func_800C5484.s
+1 -1
View File
@@ -10,7 +10,7 @@
/* 800C54A8 000C23E8 80 83 27 EC */ lwz r4, 0x27ec(r3)
/* 800C54AC 000C23EC 28 04 00 00 */ cmplwi r4, 0
/* 800C54B0 000C23F0 41 82 00 48 */ beq lbl_800C54F8
/* 800C54B4 000C23F4 4B F5 52 5D */ bl fopAcM_searchActorAngleY
/* 800C54B4 000C23F4 4B F5 52 5D */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800C54B8 000C23F8 7C 64 1B 78 */ mr r4, r3
/* 800C54BC 000C23FC 38 7F 04 E6 */ addi r3, r31, 0x4e6
/* 800C54C0 000C2400 38 A0 00 05 */ li r5, 5
include/d/d_a/d_a_alink/asm/func_800C8700.s
+2 -2
View File
@@ -468,7 +468,7 @@ lbl_800C8D9C:
/*.global fpcSch_JudgeByID*/
/* 800C8DDC 000C5D1C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800C8DE0 000C5D20 38 81 00 08 */ addi r4, r1, 8
/* 800C8DE4 000C5D24 4B F5 0A 15 */ bl fopAcIt_Judge
/* 800C8DE4 000C5D24 4B F5 0A 15 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800C8DE8 000C5D28 7C 64 1B 79 */ or. r4, r3, r3
/* 800C8DEC 000C5D2C 41 82 00 18 */ beq lbl_800C8E04
/* 800C8DF0 000C5D30 38 7F 28 24 */ addi r3, r31, 0x2824
@@ -619,7 +619,7 @@ lbl_800C8FDC:
/* 800C8FE0 000C5F20 2C 00 00 00 */ cmpwi r0, 0
/* 800C8FE4 000C5F24 41 82 02 CC */ beq lbl_800C92B0
/* 800C8FE8 000C5F28 7F E3 FB 78 */ mr r3, r31
/* 800C8FEC 000C5F2C 4B F5 2B 29 */ bl fopAcM_getTalkEventPartner
/* 800C8FEC 000C5F2C 4B F5 2B 29 */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 800C8FF0 000C5F30 7C 7D 1B 78 */ mr r29, r3
/* 800C8FF4 000C5F34 7F E3 FB 78 */ mr r3, r31
/* 800C8FF8 000C5F38 48 04 CC 29 */ bl daAlink_c_NS_checkEventRun
include/d/d_a/d_a_alink/asm/func_800CB694.s
+2 -2
View File
@@ -26,7 +26,7 @@
/* 800CB6F8 000C8638 48 19 BA 31 */ bl atan2sX_Z__4cXyzCFv
/* 800CB6FC 000C863C B0 7E 2F F6 */ sth r3, 0x2ff6(r30)
/* 800CB700 000C8640 7F C3 F3 78 */ mr r3, r30
/* 800CB704 000C8644 4B F5 04 11 */ bl fopAcM_getTalkEventPartner
/* 800CB704 000C8644 4B F5 04 11 */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 800CB708 000C8648 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 800CB70C 000C864C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 800CB710 000C8650 80 04 5F 18 */ lwz r0, 0x5f18(r4)
@@ -97,7 +97,7 @@ lbl_800CB79C:
/* 800CB7F8 000C8738 38 61 00 24 */ addi r3, r1, 0x24
/* 800CB7FC 000C873C 38 81 00 18 */ addi r4, r1, 0x18
/* 800CB800 000C8740 7F C5 F3 78 */ mr r5, r30
/* 800CB804 000C8744 4B F5 24 65 */ bl fopAcM_lc_c_NS_lineCheck
/* 800CB804 000C8744 4B F5 24 65 */ bl lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c
/* 800CB808 000C8748 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800CB80C 000C874C 41 82 00 0C */ beq lbl_800CB818
/* 800CB810 000C8750 3B E0 00 01 */ li r31, 1
include/d/d_a/d_a_alink/asm/func_800CBC18.s
+4 -4
View File
@@ -266,7 +266,7 @@ lbl_800CBFC8:
/* 800CBFD8 000C8F18 48 00 01 20 */ b lbl_800CC0F8
lbl_800CBFDC:
/* 800CBFDC 000C8F1C 38 7D 38 04 */ addi r3, r29, 0x3804
/* 800CBFE0 000C8F20 4B F5 1C DD */ bl fopAcM_gc_c_NS_gndCheck
/* 800CBFE0 000C8F20 4B F5 1C DD */ bl gndCheck__11fopAcM_gc_cFPC4cXyz
/* 800CBFE4 000C8F24 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800CBFE8 000C8F28 41 82 01 10 */ beq lbl_800CC0F8
/* 800CBFEC 000C8F2C 80 7D 32 D4 */ lwz r3, 0x32d4(r29)
@@ -378,7 +378,7 @@ lbl_800CC14C:
/*.global fpcSch_JudgeByID*/
/* 800CC174 000C90B4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800CC178 000C90B8 38 81 00 10 */ addi r4, r1, 0x10
/* 800CC17C 000C90BC 4B F4 D6 7D */ bl fopAcIt_Judge
/* 800CC17C 000C90BC 4B F4 D6 7D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800CC180 000C90C0 7C 65 1B 79 */ or. r5, r3, r3
/* 800CC184 000C90C4 41 82 00 14 */ beq lbl_800CC198
/* 800CC188 000C90C8 7F E3 FB 78 */ mr r3, r31
@@ -396,7 +396,7 @@ lbl_800CC198:
/*.global fpcSch_JudgeByID*/
/* 800CC1B0 000C90F0 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800CC1B4 000C90F4 38 81 00 0C */ addi r4, r1, 0xc
/* 800CC1B8 000C90F8 4B F4 D6 41 */ bl fopAcIt_Judge
/* 800CC1B8 000C90F8 4B F4 D6 41 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800CC1BC 000C90FC 28 03 00 00 */ cmplwi r3, 0
/* 800CC1C0 000C9100 41 82 00 24 */ beq lbl_800CC1E4
/* 800CC1C4 000C9104 80 A3 05 24 */ lwz r5, 0x524(r3)
@@ -423,7 +423,7 @@ lbl_800CC1E4:
/*.global fpcSch_JudgeByID*/
/* 800CC210 000C9150 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800CC214 000C9154 38 81 00 08 */ addi r4, r1, 8
/* 800CC218 000C9158 4B F4 D5 E1 */ bl fopAcIt_Judge
/* 800CC218 000C9158 4B F4 D5 E1 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800CC21C 000C915C 28 03 00 00 */ cmplwi r3, 0
/* 800CC220 000C9160 41 82 00 24 */ beq lbl_800CC244
/* 800CC224 000C9164 80 A3 05 24 */ lwz r5, 0x524(r3)
include/d/d_a/d_a_alink/asm/func_800CF1B8.s
+1 -1
View File
@@ -18,7 +18,7 @@ lbl_800CF1E8:
/*.global daAlink_searchPeepObj*/
/* 800CF1F4 000CC134 38 63 ED 48 */ addi r3, r3, daAlink_searchPeepObj@l
/* 800CF1F8 000CC138 38 81 00 08 */ addi r4, r1, 8
/* 800CF1FC 000CC13C 4B F4 A5 C1 */ bl fopAcIt_Executor
/* 800CF1FC 000CC13C 4B F4 A5 C1 */ bl fopAcIt_Executor__FPFPvPv_iPv
/* 800CF200 000CC140 80 61 00 08 */ lwz r3, 8(r1)
/* 800CF204 000CC144 28 03 00 00 */ cmplwi r3, 0
/* 800CF208 000CC148 41 82 00 0C */ beq lbl_800CF214
include/d/d_a/d_a_alink/asm/func_800D0E08.s
+1 -1
View File
@@ -21,7 +21,7 @@
/*.global daAlink_searchNightStalker*/
/* 800D0E54 000CDD94 38 63 0D 38 */ addi r3, r3, daAlink_searchNightStalker@l
/* 800D0E58 000CDD98 38 80 00 00 */ li r4, 0
/* 800D0E5C 000CDD9C 4B F4 89 9D */ bl fopAcIt_Judge
/* 800D0E5C 000CDD9C 4B F4 89 9D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800D0E60 000CDDA0 28 03 00 00 */ cmplwi r3, 0
/* 800D0E64 000CDDA4 41 82 00 14 */ beq lbl_800D0E78
lbl_800D0E68:
include/d/d_a/d_a_alink/asm/func_800D26EC.s
+1 -1
View File
@@ -13,7 +13,7 @@ lbl_800D2718:
/* 800D2718 000CF658 80 9F 27 EC */ lwz r4, 0x27ec(r31)
/* 800D271C 000CF65C 28 04 00 00 */ cmplwi r4, 0
/* 800D2720 000CF660 41 82 00 18 */ beq lbl_800D2738
/* 800D2724 000CF664 4B F4 7F ED */ bl fopAcM_searchActorAngleY
/* 800D2724 000CF664 4B F4 7F ED */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800D2728 000CF668 A8 1F 2F E2 */ lha r0, 0x2fe2(r31)
/* 800D272C 000CF66C 7C 03 00 50 */ subf r0, r3, r0
/* 800D2730 000CF670 7C 03 07 34 */ extsh r3, r0
include/d/d_a/d_a_alink/asm/func_800D2C78.s
+1 -1
View File
@@ -63,7 +63,7 @@ lbl_800D2CF8:
/* 800D2D68 000CFCA8 D0 61 00 28 */ stfs f3, 0x28(r1)
/* 800D2D6C 000CFCAC D0 81 00 2C */ stfs f4, 0x2c(r1)
/* 800D2D70 000CFCB0 38 61 00 24 */ addi r3, r1, 0x24
/* 800D2D74 000CFCB4 4B F4 AF 49 */ bl fopAcM_gc_c_NS_gndCheck
/* 800D2D74 000CFCB4 4B F4 AF 49 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz
/* 800D2D78 000CFCB8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800D2D7C 000CFCBC 41 82 00 10 */ beq lbl_800D2D8C
/* 800D2D80 000CFCC0 C0 0D 87 50 */ lfs f0, lbl_80450CD0-_SDA_BASE_(r13)
include/d/d_a/d_a_alink/asm/func_800D53C8.s
+1 -1
View File
@@ -86,7 +86,7 @@ lbl_800D54EC:
/* 800D5508 000D2448 EC 01 00 2A */ fadds f0, f1, f0
/* 800D550C 000D244C D0 01 00 28 */ stfs f0, 0x28(r1)
/* 800D5510 000D2450 38 61 00 24 */ addi r3, r1, 0x24
/* 800D5514 000D2454 4B F4 87 A9 */ bl fopAcM_gc_c_NS_gndCheck
/* 800D5514 000D2454 4B F4 87 A9 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz
/* 800D5518 000D2458 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800D551C 000D245C 41 82 00 10 */ beq lbl_800D552C
/* 800D5520 000D2460 C0 0D 87 50 */ lfs f0, lbl_80450CD0-_SDA_BASE_(r13)
include/d/d_a/d_a_alink/asm/func_800DB6A4.s
+1 -1
View File
@@ -40,7 +40,7 @@ lbl_800DB6F4:
/*.global fpcSch_JudgeByID*/
/* 800DB734 000D8674 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800DB738 000D8678 38 81 00 0C */ addi r4, r1, 0xc
/* 800DB73C 000D867C 4B F3 E0 BD */ bl fopAcIt_Judge
/* 800DB73C 000D867C 4B F3 E0 BD */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800DB740 000D8680 28 03 00 00 */ cmplwi r3, 0
/* 800DB744 000D8684 41 82 00 F8 */ beq lbl_800DB83C
/* 800DB748 000D8688 38 63 04 A8 */ addi r3, r3, 0x4a8
include/d/d_a/d_a_alink/asm/func_800DB860.s
+1 -1
View File
@@ -13,7 +13,7 @@
/*.global fpcSch_JudgeByID*/
/* 800DB88C 000D87CC 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800DB890 000D87D0 38 81 00 0C */ addi r4, r1, 0xc
/* 800DB894 000D87D4 4B F3 DF 65 */ bl fopAcIt_Judge
/* 800DB894 000D87D4 4B F3 DF 65 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800DB898 000D87D8 7C 7E 1B 79 */ or. r30, r3, r3
/* 800DB89C 000D87DC 41 82 00 10 */ beq lbl_800DB8AC
/* 800DB8A0 000D87E0 80 1F 05 74 */ lwz r0, 0x574(r31)
include/d/d_a/d_a_alink/asm/func_800DC79C.s
+1 -1
View File
@@ -67,7 +67,7 @@ lbl_800DC870:
/* 800DC890 000D97D0 38 E0 00 00 */ li r7, 0
/* 800DC894 000D97D4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2)
/* 800DC898 000D97D8 FC 40 08 90 */ fmr f2, f1
/* 800DC89C 000D97DC 4B F3 F9 61 */ bl fopAcM_createItemForSimpleDemo
/* 800DC89C 000D97DC 4B F3 F9 61 */ bl fopAcM_createItemForSimpleDemo__FPC4cXyziiPC5csXyzPC4cXyzff
lbl_800DC8A0:
/* 800DC8A0 000D97E0 80 1E 05 80 */ lwz r0, 0x580(r30)
/* 800DC8A4 000D97E4 60 00 00 01 */ ori r0, r0, 1
include/d/d_a/d_a_alink/asm/func_800DC8C4.s
+3 -3
View File
@@ -42,10 +42,10 @@ lbl_800DC93C:
/*.global fpcSch_JudgeByID*/
/* 800DC950 000D9890 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800DC954 000D9894 38 81 00 08 */ addi r4, r1, 8
/* 800DC958 000D9898 4B F3 CE A1 */ bl fopAcIt_Judge
/* 800DC958 000D9898 4B F3 CE A1 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800DC95C 000D989C 28 03 00 00 */ cmplwi r3, 0
/* 800DC960 000D98A0 41 82 00 08 */ beq lbl_800DC968
/* 800DC964 000D98A4 4B F3 D3 19 */ bl fopAcM_delete
/* 800DC964 000D98A4 4B F3 D3 19 */ bl fopAcM_delete__FP10fopAc_ac_c
lbl_800DC968:
/* 800DC968 000D98A8 38 A0 00 00 */ li r5, 0
/* 800DC96C 000D98AC 38 60 00 00 */ li r3, 0
@@ -79,7 +79,7 @@ lbl_800DC978:
/* 800DC9D8 000D9918 38 E0 00 00 */ li r7, 0
/* 800DC9DC 000D991C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2)
/* 800DC9E0 000D9920 FC 40 08 90 */ fmr f2, f1
/* 800DC9E4 000D9924 4B F3 F8 19 */ bl fopAcM_createItemForSimpleDemo
/* 800DC9E4 000D9924 4B F3 F8 19 */ bl fopAcM_createItemForSimpleDemo__FPC4cXyziiPC5csXyzPC4cXyzff
lbl_800DC9E8:
/* 800DC9E8 000D9928 2C 1E 00 00 */ cmpwi r30, 0
/* 800DC9EC 000D992C 41 82 00 28 */ beq lbl_800DCA14
include/d/d_a/d_a_alink/asm/func_800DE008.s
+1 -1
View File
@@ -100,7 +100,7 @@ lbl_800DE148:
/* 800DE174 000DB0B4 D0 01 00 2C */ stfs f0, 0x2c(r1)
/* 800DE178 000DB0B8 7F 83 E3 78 */ mr r3, r28
/* 800DE17C 000DB0BC 7F C4 F3 78 */ mr r4, r30
/* 800DE180 000DB0C0 4B F3 C5 91 */ bl fopAcM_searchActorAngleY
/* 800DE180 000DB0C0 4B F3 C5 91 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800DE184 000DB0C4 B0 7C 04 E6 */ sth r3, 0x4e6(r28)
/* 800DE188 000DB0C8 C0 01 00 24 */ lfs f0, 0x24(r1)
/* 800DE18C 000DB0CC D0 01 00 0C */ stfs f0, 0xc(r1)
include/d/d_a/d_a_alink/asm/func_800DEA3C.s
+1 -1
View File
@@ -30,7 +30,7 @@ lbl_800DEA88:
/* 800DEAAC 000DB9EC 39 00 00 00 */ li r8, 0
/* 800DEAB0 000DB9F0 39 20 FF FF */ li r9, -1
/* 800DEAB4 000DB9F4 39 40 00 00 */ li r10, 0
/* 800DEAB8 000DB9F8 4B F3 B3 4D */ bl fopAcM_fastCreate
/* 800DEAB8 000DB9F8 4B F3 B3 4D */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv
/* 800DEABC 000DB9FC 7C 64 1B 78 */ mr r4, r3
/* 800DEAC0 000DBA00 38 7F 28 24 */ addi r3, r31, 0x2824
/* 800DEAC4 000DBA04 48 08 01 F5 */ bl daPy_actorKeep_c_NS_setData
include/d/d_a/d_a_alink/asm/func_800DEAE4.s
+1 -1
View File
@@ -34,7 +34,7 @@ lbl_800DEB40:
/* 800DEB64 000DBAA4 B0 04 5D F4 */ sth r0, 0x5df4(r4)
/* 800DEB68 000DBAA8 48 00 00 08 */ b lbl_800DEB70
lbl_800DEB6C:
/* 800DEB6C 000DBAAC 4B F3 B1 11 */ bl fopAcM_delete
/* 800DEB6C 000DBAAC 4B F3 B1 11 */ bl fopAcM_delete__FP10fopAc_ac_c
lbl_800DEB70:
/* 800DEB70 000DBAB0 38 7F 28 24 */ addi r3, r31, 0x2824
/* 800DEB74 000DBAB4 48 08 01 89 */ bl daPy_actorKeep_c_NS_clearData
include/d/d_a/d_a_alink/asm/func_800DF0BC.s
+1 -1
View File
@@ -91,7 +91,7 @@ lbl_800DF184:
/* 800DF218 000DC158 39 00 00 00 */ li r8, 0
/* 800DF21C 000DC15C 39 20 FF FF */ li r9, -1
/* 800DF220 000DC160 39 40 00 00 */ li r10, 0
/* 800DF224 000DC164 4B F3 AB E1 */ bl fopAcM_fastCreate
/* 800DF224 000DC164 4B F3 AB E1 */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv
/* 800DF228 000DC168 28 03 00 00 */ cmplwi r3, 0
/* 800DF22C 000DC16C 41 82 00 34 */ beq lbl_800DF260
/* 800DF230 000DC170 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
include/d/d_a/d_a_alink/asm/func_800E06B8.s
+1 -1
View File
@@ -60,7 +60,7 @@ lbl_800E0784:
/* 800E079C 000DD6DC A8 1D 04 E6 */ lha r0, 0x4e6(r29)
/* 800E07A0 000DD6E0 B0 1F 04 DE */ sth r0, 0x4de(r31)
/* 800E07A4 000DD6E4 7F E3 FB 78 */ mr r3, r31
/* 800E07A8 000DD6E8 4B F3 C3 F9 */ bl fopAcM_cancelCarryNow
/* 800E07A8 000DD6E8 4B F3 C3 F9 */ bl fopAcM_cancelCarryNow__FP10fopAc_ac_c
/* 800E07AC 000DD6EC 3B E0 00 00 */ li r31, 0
/* 800E07B0 000DD6F0 38 00 00 FF */ li r0, 0xff
/* 800E07B4 000DD6F4 B0 1D 2F DC */ sth r0, 0x2fdc(r29)
include/d/d_a/d_a_alink/asm/func_800E38EC.s
+1 -1
View File
@@ -12,7 +12,7 @@
/* 800E3918 000E0858 D0 41 00 10 */ stfs f2, 0x10(r1)
/* 800E391C 000E085C 38 81 00 08 */ addi r4, r1, 8
/* 800E3920 000E0860 38 63 05 50 */ addi r3, r3, 0x550
/* 800E3924 000E0864 4B F3 A3 45 */ bl fopAcM_lc_c_NS_lineCheck
/* 800E3924 000E0864 4B F3 A3 45 */ bl lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c
/* 800E3928 000E0868 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800E392C 000E086C 41 82 00 54 */ beq lbl_800E3980
/* 800E3930 000E0870 3C 60 80 3A */ lis r3, lbl_803A37C0@ha
include/d/d_a/d_a_alink/asm/func_800E3A14.s
+1 -1
View File
@@ -12,7 +12,7 @@
/* 800E3A40 000E0980 48 00 00 44 */ b lbl_800E3A84
lbl_800E3A44:
/* 800E3A44 000E0984 7F E3 FB 78 */ mr r3, r31
/* 800E3A48 000E0988 4B F3 91 59 */ bl fopAcM_cancelCarryNow
/* 800E3A48 000E0988 4B F3 91 59 */ bl fopAcM_cancelCarryNow__FP10fopAc_ac_c
/* 800E3A4C 000E098C 38 00 00 00 */ li r0, 0
/* 800E3A50 000E0990 B0 1F 04 E8 */ sth r0, 0x4e8(r31)
/* 800E3A54 000E0994 B0 1F 04 E4 */ sth r0, 0x4e4(r31)
include/d/d_a/d_a_alink/asm/func_800E4BD4.s
+1 -1
View File
@@ -22,7 +22,7 @@ lbl_800E4C1C:
/* 800E4C24 000E1B64 90 1E 04 9C */ stw r0, 0x49c(r30)
lbl_800E4C28:
/* 800E4C28 000E1B68 7F C3 F3 78 */ mr r3, r30
/* 800E4C2C 000E1B6C 4B F3 7F 75 */ bl fopAcM_cancelCarryNow
/* 800E4C2C 000E1B6C 4B F3 7F 75 */ bl fopAcM_cancelCarryNow__FP10fopAc_ac_c
/* 800E4C30 000E1B70 38 00 00 00 */ li r0, 0
/* 800E4C34 000E1B74 B0 1E 04 E8 */ sth r0, 0x4e8(r30)
/* 800E4C38 000E1B78 B0 1E 04 E4 */ sth r0, 0x4e4(r30)
include/d/d_a/d_a_alink/asm/func_800E5170.s
+1 -1
View File
@@ -88,7 +88,7 @@ lbl_800E5288:
/* 800E52AC 000E21EC 80 9E 27 F4 */ lwz r4, 0x27f4(r30)
/* 800E52B0 000E21F0 38 A0 00 00 */ li r5, 0
/* 800E52B4 000E21F4 38 C0 00 00 */ li r6, 0
/* 800E52B8 000E21F8 4B F3 5F 8D */ bl fopAcM_orderDoorEvent
/* 800E52B8 000E21F8 4B F3 5F 8D */ bl fopAcM_orderDoorEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs
/* 800E52BC 000E21FC 38 60 00 01 */ li r3, 1
/* 800E52C0 000E2200 48 00 00 D4 */ b lbl_800E5394
lbl_800E52C4:
include/d/d_a/d_a_alink/asm/func_800E5BB4.s
+1 -1
View File
@@ -7,7 +7,7 @@
/* 800E5BCC 000E2B0C 7C 9F 23 78 */ mr r31, r4
/* 800E5BD0 000E2B10 7F E3 FB 78 */ mr r3, r31
/* 800E5BD4 000E2B14 38 80 00 01 */ li r4, 1
/* 800E5BD8 000E2B18 4B F3 6F 71 */ bl fopAcM_setCarryNow
/* 800E5BD8 000E2B18 4B F3 6F 71 */ bl fopAcM_setCarryNow__FP10fopAc_ac_ci
/* 800E5BDC 000E2B1C 38 7E 28 2C */ addi r3, r30, 0x282c
/* 800E5BE0 000E2B20 7F E4 FB 78 */ mr r4, r31
/* 800E5BE4 000E2B24 48 07 90 D5 */ bl daPy_actorKeep_c_NS_setData
include/d/d_a/d_a_alink/asm/func_800E5CBC.s
+2 -2
View File
@@ -25,13 +25,13 @@ lbl_800E5D04:
/* 800E5D14 000E2C54 4B FF FE A1 */ bl daAlink_c_NS_setGrabItemActor
/* 800E5D18 000E2C58 7F E3 FB 78 */ mr r3, r31
/* 800E5D1C 000E2C5C 80 9F 27 F4 */ lwz r4, 0x27f4(r31)
/* 800E5D20 000E2C60 4B F3 4D 75 */ bl fopAcM_searchActorDistanceXZ2
/* 800E5D20 000E2C60 4B F3 4D 75 */ bl fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800E5D24 000E2C64 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2)
/* 800E5D28 000E2C68 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 800E5D2C 000E2C6C 40 81 00 14 */ ble lbl_800E5D40
/* 800E5D30 000E2C70 7F E3 FB 78 */ mr r3, r31
/* 800E5D34 000E2C74 80 9F 27 F4 */ lwz r4, 0x27f4(r31)
/* 800E5D38 000E2C78 4B F3 49 D9 */ bl fopAcM_searchActorAngleY
/* 800E5D38 000E2C78 4B F3 49 D9 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800E5D3C 000E2C7C B0 7F 04 E6 */ sth r3, 0x4e6(r31)
lbl_800E5D40:
/* 800E5D40 000E2C80 A8 1F 04 E6 */ lha r0, 0x4e6(r31)
include/d/d_a/d_a_alink/asm/func_800E5FD0.s
+1 -1
View File
@@ -150,7 +150,7 @@ lbl_800E61DC:
/* 800E61F4 000E3134 4E 80 04 21 */ bctrl
lbl_800E61F8:
/* 800E61F8 000E3138 7F E3 FB 78 */ mr r3, r31
/* 800E61FC 000E313C 4B F3 36 C9 */ bl fopAcM_setStageLayer
/* 800E61FC 000E313C 4B F3 36 C9 */ bl fopAcM_setStageLayer__FPv
/* 800E6200 000E3140 80 1E 05 80 */ lwz r0, 0x580(r30)
/* 800E6204 000E3144 60 00 80 00 */ ori r0, r0, 0x8000
/* 800E6208 000E3148 90 1E 05 80 */ stw r0, 0x580(r30)
include/d/d_a/d_a_alink/asm/func_800E71D4.s
+1 -1
View File
@@ -23,7 +23,7 @@ lbl_800E7210:
/* 800E7228 000E4168 28 03 00 00 */ cmplwi r3, 0
/* 800E722C 000E416C 41 82 00 0C */ beq lbl_800E7238
/* 800E7230 000E4170 38 80 00 00 */ li r4, 0
/* 800E7234 000E4174 4B F3 59 15 */ bl fopAcM_setCarryNow
/* 800E7234 000E4174 4B F3 59 15 */ bl fopAcM_setCarryNow__FP10fopAc_ac_ci
lbl_800E7238:
/* 800E7238 000E4178 38 60 00 01 */ li r3, 1
/* 800E723C 000E417C 83 E1 00 0C */ lwz r31, 0xc(r1)
include/d/d_a/d_a_alink/asm/func_800E7254.s
+3 -3
View File
@@ -43,13 +43,13 @@ lbl_800E72DC:
/* 800E72F0 000E4230 48 07 79 C9 */ bl daPy_actorKeep_c_NS_setData
/* 800E72F4 000E4234 7F E3 FB 78 */ mr r3, r31
/* 800E72F8 000E4238 80 9F 27 F4 */ lwz r4, 0x27f4(r31)
/* 800E72FC 000E423C 4B F3 37 99 */ bl fopAcM_searchActorDistanceXZ2
/* 800E72FC 000E423C 4B F3 37 99 */ bl fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800E7300 000E4240 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2)
/* 800E7304 000E4244 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 800E7308 000E4248 40 81 00 14 */ ble lbl_800E731C
/* 800E730C 000E424C 7F E3 FB 78 */ mr r3, r31
/* 800E7310 000E4250 80 9F 27 F4 */ lwz r4, 0x27f4(r31)
/* 800E7314 000E4254 4B F3 33 FD */ bl fopAcM_searchActorAngleY
/* 800E7314 000E4254 4B F3 33 FD */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800E7318 000E4258 B0 7F 04 E6 */ sth r3, 0x4e6(r31)
lbl_800E731C:
/* 800E731C 000E425C A8 1F 04 E6 */ lha r0, 0x4e6(r31)
@@ -129,7 +129,7 @@ lbl_800E7418:
/* 800E7438 000E4378 38 80 00 01 */ li r4, 1
lbl_800E743C:
/* 800E743C 000E437C 80 7F 27 F4 */ lwz r3, 0x27f4(r31)
/* 800E7440 000E4380 4B F3 57 09 */ bl fopAcM_setCarryNow
/* 800E7440 000E4380 4B F3 57 09 */ bl fopAcM_setCarryNow__FP10fopAc_ac_ci
/* 800E7444 000E4384 38 60 00 01 */ li r3, 1
lbl_800E7448:
/* 800E7448 000E4388 83 E1 00 1C */ lwz r31, 0x1c(r1)
include/d/d_a/d_a_alink/asm/func_800E76E0.s
+1 -1
View File
@@ -84,7 +84,7 @@ lbl_800E77D0:
/* 800E781C 000E475C 39 00 00 00 */ li r8, 0
/* 800E7820 000E4760 39 20 FF FF */ li r9, -1
/* 800E7824 000E4764 39 40 00 00 */ li r10, 0
/* 800E7828 000E4768 4B F3 25 DD */ bl fopAcM_fastCreate
/* 800E7828 000E4768 4B F3 25 DD */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv
/* 800E782C 000E476C 28 03 00 00 */ cmplwi r3, 0
/* 800E7830 000E4770 41 82 00 1C */ beq lbl_800E784C
/* 800E7834 000E4774 88 7F 2F 9C */ lbz r3, 0x2f9c(r31)
include/d/d_a/d_a_alink/asm/func_800E875C.s
+1 -1
View File
@@ -82,7 +82,7 @@ lbl_800E885C:
/* 800E8884 000E57C4 4B F8 BD 95 */ bl cBgS_NS_GetActorPointer
/* 800E8888 000E57C8 7C 7E 1B 78 */ mr r30, r3
/* 800E888C 000E57CC 7F E4 FB 78 */ mr r4, r31
/* 800E8890 000E57D0 4B F3 1E 81 */ bl fopAcM_searchActorAngleY
/* 800E8890 000E57D0 4B F3 1E 81 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800E8894 000E57D4 B0 7F 30 0E */ sth r3, 0x300e(r31)
/* 800E8898 000E57D8 C0 5E 04 D8 */ lfs f2, 0x4d8(r30)
/* 800E889C 000E57DC C0 1E 04 D0 */ lfs f0, 0x4d0(r30)
include/d/d_a/d_a_alink/asm/func_800E8D1C.s
+1 -1
View File
@@ -51,7 +51,7 @@ lbl_800E8DBC:
/* 800E8DD8 000E5D18 4B F8 B8 41 */ bl cBgS_NS_GetActorPointer
/* 800E8DDC 000E5D1C 7C 7E 1B 78 */ mr r30, r3
/* 800E8DE0 000E5D20 7F E4 FB 78 */ mr r4, r31
/* 800E8DE4 000E5D24 4B F3 19 2D */ bl fopAcM_searchActorAngleY
/* 800E8DE4 000E5D24 4B F3 19 2D */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800E8DE8 000E5D28 B0 7F 30 0E */ sth r3, 0x300e(r31)
/* 800E8DEC 000E5D2C C0 5E 04 D8 */ lfs f2, 0x4d8(r30)
/* 800E8DF0 000E5D30 C0 1E 04 D0 */ lfs f0, 0x4d0(r30)
include/d/d_a/d_a_alink/asm/func_800E9344.s
+1 -1
View File
@@ -45,7 +45,7 @@ lbl_800E938C:
/*.global daAlink_searchGoat*/
/* 800E93E8 000E6328 38 63 91 B0 */ addi r3, r3, daAlink_searchGoat@l
/* 800E93EC 000E632C 38 80 00 00 */ li r4, 0
/* 800E93F0 000E6330 4B F3 04 09 */ bl fopAcIt_Judge
/* 800E93F0 000E6330 4B F3 04 09 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800E93F4 000E6334 7C 64 1B 79 */ or. r4, r3, r3
/* 800E93F8 000E6338 41 82 00 0C */ beq lbl_800E9404
/* 800E93FC 000E633C 38 7F 28 0C */ addi r3, r31, 0x280c
include/d/d_a/d_a_alink/asm/func_800E9894.s
+1 -1
View File
@@ -49,7 +49,7 @@ lbl_800E9910:
/* 800E9950 000E6890 38 61 00 14 */ addi r3, r1, 0x14
/* 800E9954 000E6894 38 81 00 08 */ addi r4, r1, 8
/* 800E9958 000E6898 7F E5 FB 78 */ mr r5, r31
/* 800E995C 000E689C 4B F3 43 0D */ bl fopAcM_lc_c_NS_lineCheck
/* 800E995C 000E689C 4B F3 43 0D */ bl lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c
/* 800E9960 000E68A0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800E9964 000E68A4 41 82 00 18 */ beq lbl_800E997C
/* 800E9968 000E68A8 7F C3 F3 78 */ mr r3, r30
include/d/d_a/d_a_alink/asm/func_800EA2A8.s
+1 -1
View File
@@ -27,7 +27,7 @@ lbl_800EA2D8:
/* 800EA30C 000E724C D0 1F 33 98 */ stfs f0, 0x3398(r31)
/* 800EA310 000E7250 80 7F 27 F4 */ lwz r3, 0x27f4(r31)
/* 800EA314 000E7254 7F E4 FB 78 */ mr r4, r31
/* 800EA318 000E7258 4B F3 03 F9 */ bl fopAcM_searchActorAngleY
/* 800EA318 000E7258 4B F3 03 F9 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800EA31C 000E725C 80 9F 27 F4 */ lwz r4, 0x27f4(r31)
/* 800EA320 000E7260 A8 84 04 E6 */ lha r4, 0x4e6(r4)
/* 800EA324 000E7264 7C 04 18 50 */ subf r0, r4, r3
include/d/d_a/d_a_alink/asm/func_800EC87C.s
+1 -1
View File
@@ -5,7 +5,7 @@
/* 800EC88C 000E97CC 7C 7F 1B 78 */ mr r31, r3
/* 800EC890 000E97D0 80 63 27 F4 */ lwz r3, 0x27f4(r3)
/* 800EC894 000E97D4 7F E4 FB 78 */ mr r4, r31
/* 800EC898 000E97D8 4B F2 DE 79 */ bl fopAcM_searchActorAngleY
/* 800EC898 000E97D8 4B F2 DE 79 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800EC89C 000E97DC 80 9F 27 F4 */ lwz r4, 0x27f4(r31)
/* 800EC8A0 000E97E0 A8 04 04 E6 */ lha r0, 0x4e6(r4)
/* 800EC8A4 000E97E4 7C 00 18 50 */ subf r0, r0, r3
include/d/d_a/d_a_alink/asm/func_800ECAAC.s
+1 -1
View File
@@ -9,7 +9,7 @@
/*.global daAlink_searchBoar*/
/* 800ECAC8 000E9A08 38 63 C7 24 */ addi r3, r3, daAlink_searchBoar@l
/* 800ECACC 000E9A0C 38 80 00 00 */ li r4, 0
/* 800ECAD0 000E9A10 4B F2 CD 29 */ bl fopAcIt_Judge
/* 800ECAD0 000E9A10 4B F2 CD 29 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800ECAD4 000E9A14 7C 7F 1B 79 */ or. r31, r3, r3
/* 800ECAD8 000E9A18 40 82 00 0C */ bne lbl_800ECAE4
/* 800ECADC 000E9A1C 38 60 00 00 */ li r3, 0
include/d/d_a/d_a_alink/asm/func_800EEC98.s
+1 -1
View File
@@ -10,7 +10,7 @@
/* 800EECBC 000EBBFC 41 82 00 20 */ beq lbl_800EECDC
/* 800EECC0 000EBC00 83 ED 8A 98 */ lwz r31, lbl_80451018-_SDA_BASE_(r13)
/* 800EECC4 000EBC04 7F A3 EB 78 */ mr r3, r29
/* 800EECC8 000EBC08 4B F2 CE 4D */ bl fopAcM_getTalkEventPartner
/* 800EECC8 000EBC08 4B F2 CE 4D */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 800EECCC 000EBC0C 7C 03 F8 40 */ cmplw r3, r31
/* 800EECD0 000EBC10 40 82 00 0C */ bne lbl_800EECDC
/* 800EECD4 000EBC14 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2)
include/d/d_a/d_a_alink/asm/func_800F0AA4.s
+1 -1
View File
@@ -61,7 +61,7 @@ lbl_800F0B70:
/*.global daAlink_searchBoar*/
/* 800F0B80 000EDAC0 38 63 C7 24 */ addi r3, r3, daAlink_searchBoar@l
/* 800F0B84 000EDAC4 38 80 00 00 */ li r4, 0
/* 800F0B88 000EDAC8 4B F2 8C 71 */ bl fopAcIt_Judge
/* 800F0B88 000EDAC8 4B F2 8C 71 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800F0B8C 000EDACC 7C 7D 1B 79 */ or. r29, r3, r3
/* 800F0B90 000EDAD0 41 82 00 C0 */ beq lbl_800F0C50
/* 800F0B94 000EDAD4 38 7D 04 D0 */ addi r3, r29, 0x4d0
include/d/d_a/d_a_alink/asm/func_800F4A50.s
+1 -1
View File
@@ -39,7 +39,7 @@
/* 800F4AE8 000F1A28 4B FF FA 7D */ bl daAlink_c_NS_setRideCanoeBasePos
/* 800F4AEC 000F1A2C 7F E3 FB 78 */ mr r3, r31
/* 800F4AF0 000F1A30 7F C4 F3 78 */ mr r4, r30
/* 800F4AF4 000F1A34 4B F2 5C 1D */ bl fopAcM_searchActorAngleY
/* 800F4AF4 000F1A34 4B F2 5C 1D */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 800F4AF8 000F1A38 A8 9F 04 E6 */ lha r4, 0x4e6(r31)
/* 800F4AFC 000F1A3C 7C 04 18 50 */ subf r0, r4, r3
/* 800F4B00 000F1A40 7C 00 07 35 */ extsh. r0, r0
include/d/d_a/d_a_alink/asm/func_800F4C78.s
+1 -1
View File
@@ -14,7 +14,7 @@
/*.global daAlink_searchCanoe*/
/* 800F4CA8 000F1BE8 38 63 3C D8 */ addi r3, r3, daAlink_searchCanoe@l
/* 800F4CAC 000F1BEC 38 80 00 00 */ li r4, 0
/* 800F4CB0 000F1BF0 4B F2 4B 49 */ bl fopAcIt_Judge
/* 800F4CB0 000F1BF0 4B F2 4B 49 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800F4CB4 000F1BF4 7C 7E 1B 78 */ mr r30, r3
/* 800F4CB8 000F1BF8 3B E0 00 01 */ li r31, 1
/* 800F4CBC 000F1BFC 48 00 00 08 */ b lbl_800F4CC4
include/d/d_a/d_a_alink/asm/func_800F7708.s
+1 -1
View File
@@ -11,7 +11,7 @@
/* 800F7730 000F4670 38 E0 00 00 */ li r7, 0
/* 800F7734 000F4674 39 00 00 00 */ li r8, 0
/* 800F7738 000F4678 39 20 FF FF */ li r9, -1
/* 800F773C 000F467C 4B F2 26 5D */ bl fopAcM_create_X1_
/* 800F773C 000F467C 4B F2 26 5D */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc
/* 800F7740 000F4680 90 7F 28 24 */ stw r3, 0x2824(r31)
/* 800F7744 000F4684 7F E3 FB 78 */ mr r3, r31
/* 800F7748 000F4688 4B FF C6 59 */ bl daAlink_c_NS_initFishingRodHand
include/d/d_a/d_a_alink/asm/func_8010DC64.s
+1 -1
View File
@@ -15,7 +15,7 @@
/* 8010DC9C 0010ABDC 39 00 00 00 */ li r8, 0
/* 8010DCA0 0010ABE0 39 20 FF FF */ li r9, -1
/* 8010DCA4 0010ABE4 39 40 00 00 */ li r10, 0
/* 8010DCA8 0010ABE8 4B F0 C1 5D */ bl fopAcM_fastCreate
/* 8010DCA8 0010ABE8 4B F0 C1 5D */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv
/* 8010DCAC 0010ABEC 7C 7F 1B 79 */ or. r31, r3, r3
/* 8010DCB0 0010ABF0 40 82 00 0C */ bne lbl_8010DCBC
/* 8010DCB4 0010ABF4 38 60 00 00 */ li r3, 0
include/d/d_a/d_a_alink/asm/func_8010F45C.s
+1 -1
View File
@@ -38,7 +38,7 @@ lbl_8010F4C4:
/* 8010F4E4 0010C424 39 00 00 00 */ li r8, 0
/* 8010F4E8 0010C428 39 20 FF FF */ li r9, -1
/* 8010F4EC 0010C42C 39 40 00 00 */ li r10, 0
/* 8010F4F0 0010C430 4B F0 A9 15 */ bl fopAcM_fastCreate
/* 8010F4F0 0010C430 4B F0 A9 15 */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv
/* 8010F4F4 0010C434 7C 64 1B 78 */ mr r4, r3
/* 8010F4F8 0010C438 38 7F 28 5C */ addi r3, r31, 0x285c
/* 8010F4FC 0010C43C 48 04 F7 BD */ bl daPy_actorKeep_c_NS_setData
include/d/d_a/d_a_alink/asm/func_8010F6F4.s
+1 -1
View File
@@ -71,7 +71,7 @@ lbl_8010F7DC:
/* 8010F804 0010C744 38 E0 00 00 */ li r7, 0
/* 8010F808 0010C748 39 00 00 00 */ li r8, 0
/* 8010F80C 0010C74C 39 20 FF FF */ li r9, -1
/* 8010F810 0010C750 4B F0 A5 89 */ bl fopAcM_create_X1_
/* 8010F810 0010C750 4B F0 A5 89 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc
/* 8010F814 0010C754 90 7E 32 CC */ stw r3, 0x32cc(r30)
/* 8010F818 0010C758 38 00 00 00 */ li r0, 0
/* 8010F81C 0010C75C B0 1E 30 08 */ sth r0, 0x3008(r30)
include/d/d_a/d_a_alink/asm/func_8010F8E4.s
+1 -1
View File
@@ -194,7 +194,7 @@ lbl_8010FB88:
/*.global fpcSch_JudgeByID*/
/* 8010FBB4 0010CAF4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 8010FBB8 0010CAF8 38 81 00 08 */ addi r4, r1, 8
/* 8010FBBC 0010CAFC 4B F0 9C 3D */ bl fopAcIt_Judge
/* 8010FBBC 0010CAFC 4B F0 9C 3D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8010FBC0 0010CB00 7C 7F 1B 79 */ or. r31, r3, r3
/* 8010FBC4 0010CB04 41 82 00 58 */ beq lbl_8010FC1C
/* 8010FBC8 0010CB08 38 00 00 00 */ li r0, 0
include/d/d_a/d_a_alink/asm/func_8010FF58.s
+2 -2
View File
@@ -185,7 +185,7 @@ lbl_801101F8:
/* 80110208 0010D148 7F C3 F3 78 */ mr r3, r30
/* 8011020C 0010D14C 38 A0 00 00 */ li r5, 0
/* 80110210 0010D150 38 C0 00 00 */ li r6, 0
/* 80110214 0010D154 4B F0 B1 21 */ bl fopAcM_orderCatchEvent
/* 80110214 0010D154 4B F0 B1 21 */ bl fopAcM_orderCatchEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs
/* 80110218 0010D158 48 00 00 2C */ b lbl_80110244
lbl_8011021C:
/* 8011021C 0010D15C A0 1E 2F DC */ lhz r0, 0x2fdc(r30)
@@ -197,7 +197,7 @@ lbl_8011021C:
/* 80110234 0010D174 7F C3 F3 78 */ mr r3, r30
/* 80110238 0010D178 38 A0 00 00 */ li r5, 0
/* 8011023C 0010D17C 38 C0 00 00 */ li r6, 0
/* 80110240 0010D180 4B F0 B0 F5 */ bl fopAcM_orderCatchEvent
/* 80110240 0010D180 4B F0 B0 F5 */ bl fopAcM_orderCatchEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs
lbl_80110244:
/* 80110244 0010D184 7F E3 FB 78 */ mr r3, r31
/* 80110248 0010D188 48 04 E2 85 */ bl daPy_frameCtrl_c_NS_checkAnmEnd
include/d/d_a/d_a_alink/asm/func_80110668.s
+1 -1
View File
@@ -18,7 +18,7 @@
/* 801106AC 0010D5EC 40 80 00 20 */ bge lbl_801106CC
/* 801106B0 0010D5F0 7F E3 FB 78 */ mr r3, r31
/* 801106B4 0010D5F4 7F C4 F3 78 */ mr r4, r30
/* 801106B8 0010D5F8 4B F0 A0 E5 */ bl fopAcM_seenActorAngleY
/* 801106B8 0010D5F8 4B F0 A0 E5 */ bl fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 801106BC 0010D5FC 2C 03 30 00 */ cmpwi r3, 0x3000
/* 801106C0 0010D600 40 80 00 0C */ bge lbl_801106CC
/* 801106C4 0010D604 7F C3 F3 78 */ mr r3, r30
include/d/d_a/d_a_alink/asm/func_80111440.s
+1 -1
View File
@@ -65,7 +65,7 @@ lbl_8011150C:
/*.global daAlink_searchTagKtOnFire*/
/* 80111528 0010E468 38 63 06 68 */ addi r3, r3, daAlink_searchTagKtOnFire@l
/* 8011152C 0010E46C 38 80 00 00 */ li r4, 0
/* 80111530 0010E470 4B F0 82 C9 */ bl fopAcIt_Judge
/* 80111530 0010E470 4B F0 82 C9 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 80111534 0010E474 28 03 00 00 */ cmplwi r3, 0
/* 80111538 0010E478 41 82 00 40 */ beq lbl_80111578
lbl_8011153C:
include/d/d_a/d_a_alink/asm/func_801119D8.s
+1 -1
View File
@@ -33,7 +33,7 @@ lbl_80111A24:
/* 80111A54 0010E994 28 03 00 00 */ cmplwi r3, 0
/* 80111A58 0010E998 41 82 00 28 */ beq lbl_80111A80
/* 80111A5C 0010E99C 38 80 00 00 */ li r4, 0
/* 80111A60 0010E9A0 4B F0 B0 E9 */ bl fopAcM_setCarryNow
/* 80111A60 0010E9A0 4B F0 B0 E9 */ bl fopAcM_setCarryNow__FP10fopAc_ac_ci
/* 80111A64 0010E9A4 7F C3 F3 78 */ mr r3, r30
/* 80111A68 0010E9A8 3C 80 00 02 */ lis r4, 0x00020056@ha
/* 80111A6C 0010E9AC 38 84 00 56 */ addi r4, r4, 0x00020056@l
include/d/d_a/d_a_alink/asm/func_80111CA4.s
+1 -1
View File
@@ -46,7 +46,7 @@ lbl_80111D1C:
/*.global daAlink_searchWhistle*/
/* 80111D48 0010EC88 38 63 17 4C */ addi r3, r3, daAlink_searchWhistle@l
/* 80111D4C 0010EC8C 38 80 00 00 */ li r4, 0
/* 80111D50 0010EC90 4B F0 7A A9 */ bl fopAcIt_Judge
/* 80111D50 0010EC90 4B F0 7A A9 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 80111D54 0010EC94 7C 7E 1B 79 */ or. r30, r3, r3
/* 80111D58 0010EC98 41 82 00 60 */ beq lbl_80111DB8
/* 80111D5C 0010EC9C 80 1E 04 9C */ lwz r0, 0x49c(r30)
include/d/d_a/d_a_alink/asm/func_801120C8.s
+1 -1
View File
@@ -17,7 +17,7 @@
/* 80112108 0010F048 28 04 00 00 */ cmplwi r4, 0
/* 8011210C 0010F04C 41 82 00 2C */ beq lbl_80112138
/* 80112110 0010F050 7F E3 FB 78 */ mr r3, r31
/* 80112114 0010F054 4B F0 85 FD */ bl fopAcM_searchActorAngleY
/* 80112114 0010F054 4B F0 85 FD */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 80112118 0010F058 7C 64 1B 78 */ mr r4, r3
/* 8011211C 0010F05C 38 7F 04 E6 */ addi r3, r31, 0x4e6
/* 80112120 0010F060 38 A0 00 02 */ li r5, 2
include/d/d_a/d_a_alink/asm/func_80112278.s
+1 -1
View File
@@ -18,7 +18,7 @@ lbl_801122A4:
/*.global daAlink_searchHawk*/
/* 801122B4 0010F1F4 38 63 17 70 */ addi r3, r3, daAlink_searchHawk@l
/* 801122B8 0010F1F8 38 80 00 00 */ li r4, 0
/* 801122BC 0010F1FC 4B F0 75 3D */ bl fopAcIt_Judge
/* 801122BC 0010F1FC 4B F0 75 3D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 801122C0 0010F200 7C 64 1B 79 */ or. r4, r3, r3
/* 801122C4 0010F204 41 82 00 0C */ beq lbl_801122D0
/* 801122C8 0010F208 38 7F 28 0C */ addi r3, r31, 0x280c
include/d/d_a/d_a_alink/asm/func_80112C84.s
+1 -1
View File
@@ -16,7 +16,7 @@
/* 80112CC0 0010FC00 D0 21 00 28 */ stfs f1, 0x28(r1)
/* 80112CC4 0010FC04 D0 41 00 2C */ stfs f2, 0x2c(r1)
/* 80112CC8 0010FC08 38 61 00 24 */ addi r3, r1, 0x24
/* 80112CCC 0010FC0C 4B F0 AF F1 */ bl fopAcM_gc_c_NS_gndCheck
/* 80112CCC 0010FC0C 4B F0 AF F1 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz
/* 80112CD0 0010FC10 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80112CD4 0010FC14 41 82 01 84 */ beq lbl_80112E58
/* 80112CD8 0010FC18 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2)
include/d/d_a/d_a_alink/asm/func_80113D58.s
+2 -2
View File
@@ -260,7 +260,7 @@ lbl_80114108:
/* 8011413C 0011107C C3 E3 00 64 */ lfs f31, 0x64(r3)
/* 80114140 00111080 80 7F 38 40 */ lwz r3, 0x3840(r31)
/* 80114144 00111084 38 81 00 28 */ addi r4, r1, 0x28
/* 80114148 00111088 4B F0 97 49 */ bl fopAcM_getWaterY
/* 80114148 00111088 4B F0 97 49 */ bl fopAcM_getWaterY__FPC4cXyzPf
/* 8011414C 0011108C 2C 03 00 00 */ cmpwi r3, 0
/* 80114150 00111090 41 82 00 50 */ beq lbl_801141A0
/* 80114154 00111094 C0 21 00 28 */ lfs f1, 0x28(r1)
@@ -966,7 +966,7 @@ lbl_80114B64:
/* 80114B68 00111AA8 40 82 00 80 */ bne lbl_80114BE8
/* 80114B6C 00111AAC 80 7F 38 40 */ lwz r3, 0x3840(r31)
/* 80114B70 00111AB0 38 81 00 24 */ addi r4, r1, 0x24
/* 80114B74 00111AB4 4B F0 8D 1D */ bl fopAcM_getWaterY
/* 80114B74 00111AB4 4B F0 8D 1D */ bl fopAcM_getWaterY__FPC4cXyzPf
/* 80114B78 00111AB8 2C 03 00 00 */ cmpwi r3, 0
/* 80114B7C 00111ABC 41 82 00 28 */ beq lbl_80114BA4
/* 80114B80 00111AC0 C0 21 00 24 */ lfs f1, 0x24(r1)
include/d/d_a/d_a_alink/asm/func_80115C50.s
+1 -1
View File
@@ -37,7 +37,7 @@
/* 80115CE0 00112C20 38 E1 00 08 */ addi r7, r1, 8
/* 80115CE4 00112C24 39 00 00 00 */ li r8, 0
/* 80115CE8 00112C28 39 20 FF FF */ li r9, -1
/* 80115CEC 00112C2C 4B F0 40 AD */ bl fopAcM_create_X1_
/* 80115CEC 00112C2C 4B F0 40 AD */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc
/* 80115CF0 00112C30 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 80115CF4 00112C34 83 C1 00 28 */ lwz r30, 0x28(r1)
/* 80115CF8 00112C38 80 01 00 34 */ lwz r0, 0x34(r1)
include/d/d_a/d_a_alink/asm/func_80115EC0.s
+6 -6
View File
@@ -270,7 +270,7 @@ lbl_80116288:
/* 801162A0 001131E0 41 82 00 4C */ beq lbl_801162EC
/* 801162A4 001131E4 83 CD 8A 98 */ lwz r30, lbl_80451018-_SDA_BASE_(r13)
/* 801162A8 001131E8 7F A3 EB 78 */ mr r3, r29
/* 801162AC 001131EC 4B F0 58 69 */ bl fopAcM_getTalkEventPartner
/* 801162AC 001131EC 4B F0 58 69 */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 801162B0 001131F0 7C 03 F0 40 */ cmplw r3, r30
/* 801162B4 001131F4 40 82 00 38 */ bne lbl_801162EC
/* 801162B8 001131F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
@@ -299,11 +299,11 @@ lbl_801162FC:
/* 8011630C 0011324C 28 00 00 00 */ cmplwi r0, 0
/* 80116310 00113250 41 82 00 48 */ beq lbl_80116358
/* 80116314 00113254 7F A3 EB 78 */ mr r3, r29
/* 80116318 00113258 4B F0 57 FD */ bl fopAcM_getTalkEventPartner
/* 80116318 00113258 4B F0 57 FD */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 8011631C 0011325C 28 03 00 00 */ cmplwi r3, 0
/* 80116320 00113260 41 82 00 2C */ beq lbl_8011634C
/* 80116324 00113264 7F A3 EB 78 */ mr r3, r29
/* 80116328 00113268 4B F0 57 ED */ bl fopAcM_getTalkEventPartner
/* 80116328 00113268 4B F0 57 ED */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 8011632C 0011326C 7C 64 1B 78 */ mr r4, r3
/* 80116330 00113270 7F A3 EB 78 */ mr r3, r29
/* 80116334 00113274 48 00 1F A1 */ bl daAlink_c_NS_checkGrabTalkActor
@@ -402,7 +402,7 @@ lbl_8011645C:
/*.global daAlink_searchCanoe*/
/* 80116484 001133C4 38 63 3C D8 */ addi r3, r3, daAlink_searchCanoe@l
/* 80116488 001133C8 38 80 00 00 */ li r4, 0
/* 8011648C 001133CC 4B F0 33 6D */ bl fopAcIt_Judge
/* 8011648C 001133CC 4B F0 33 6D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 80116490 001133D0 7C 7E 1B 78 */ mr r30, r3
/* 80116494 001133D4 38 60 02 E4 */ li r3, 0x2e4
/* 80116498 001133D8 38 80 00 0D */ li r4, 0xd
@@ -411,7 +411,7 @@ lbl_8011645C:
/* 801164A4 001133E4 38 E0 00 00 */ li r7, 0
/* 801164A8 001133E8 39 00 00 00 */ li r8, 0
/* 801164AC 001133EC 39 20 FF FF */ li r9, -1
/* 801164B0 001133F0 4B F0 38 E9 */ bl fopAcM_create_X1_
/* 801164B0 001133F0 4B F0 38 E9 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc
/* 801164B4 001133F4 90 7E 14 64 */ stw r3, 0x1464(r30)
/* 801164B8 001133F8 7F A3 EB 78 */ mr r3, r29
/* 801164BC 001133FC 38 80 00 00 */ li r4, 0
@@ -435,7 +435,7 @@ lbl_801164D0:
/*.global daAlink_searchIceLeaf*/
/* 801164F8 00113438 38 63 5A 84 */ addi r3, r3, daAlink_searchIceLeaf@l
/* 801164FC 0011343C 38 80 00 00 */ li r4, 0
/* 80116500 00113440 4B F0 32 F9 */ bl fopAcIt_Judge
/* 80116500 00113440 4B F0 32 F9 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 80116504 00113444 7C 64 1B 79 */ or. r4, r3, r3
/* 80116508 00113448 41 82 00 54 */ beq lbl_8011655C
/* 8011650C 0011344C 38 00 00 05 */ li r0, 5
include/d/d_a/d_a_alink/asm/func_801180EC.s
+1 -1
View File
@@ -22,7 +22,7 @@ lbl_8011811C:
lbl_8011813C:
/* 8011813C 0011507C 2C 00 00 03 */ cmpwi r0, 3
/* 80118140 00115080 40 82 00 0C */ bne lbl_8011814C
/* 80118144 00115084 4B F0 39 D1 */ bl fopAcM_getTalkEventPartner
/* 80118144 00115084 4B F0 39 D1 */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 80118148 00115088 48 00 00 18 */ b lbl_80118160
lbl_8011814C:
/* 8011814C 0011508C 2C 00 00 04 */ cmpwi r0, 4
include/d/d_a/d_a_alink/asm/func_80118308.s
+1 -1
View File
@@ -5,7 +5,7 @@
/* 80118318 00115258 48 24 9E C5 */ bl _savegpr_29
/* 8011831C 0011525C 7C 7D 1B 78 */ mr r29, r3
/* 80118320 00115260 7C 9E 23 78 */ mr r30, r4
/* 80118324 00115264 4B F0 37 F1 */ bl fopAcM_getTalkEventPartner
/* 80118324 00115264 4B F0 37 F1 */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 80118328 00115268 7C 7F 1B 79 */ or. r31, r3, r3
/* 8011832C 0011526C 41 82 02 24 */ beq lbl_80118550
/* 80118330 00115270 A8 1F 00 08 */ lha r0, 8(r31)
include/d/d_a/d_a_alink/asm/func_8011856C.s
+2 -2
View File
@@ -4,7 +4,7 @@
/* 80118578 001154B8 39 61 00 20 */ addi r11, r1, 0x20
/* 8011857C 001154BC 48 24 9C 61 */ bl _savegpr_29
/* 80118580 001154C0 7C 7D 1B 78 */ mr r29, r3
/* 80118584 001154C4 4B F0 35 91 */ bl fopAcM_getTalkEventPartner
/* 80118584 001154C4 4B F0 35 91 */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 80118588 001154C8 7C 7E 1B 79 */ or. r30, r3, r3
/* 8011858C 001154CC 41 82 00 B0 */ beq lbl_8011863C
/* 80118590 001154D0 AB FE 00 08 */ lha r31, 8(r30)
@@ -48,7 +48,7 @@ lbl_80118604:
lbl_80118618:
/* 80118618 00115558 7F A3 EB 78 */ mr r3, r29
/* 8011861C 0011555C 7F C4 F3 78 */ mr r4, r30
/* 80118620 00115560 4B F0 20 F1 */ bl fopAcM_searchActorAngleY
/* 80118620 00115560 4B F0 20 F1 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 80118624 00115564 7C 64 1B 78 */ mr r4, r3
lbl_80118628:
/* 80118628 00115568 38 7D 04 E6 */ addi r3, r29, 0x4e6
include/d/d_a/d_a_alink/asm/func_801186D4.s
+1 -1
View File
@@ -27,7 +27,7 @@ lbl_80118728:
/* 80118734 00115674 7C 07 07 74 */ extsb r7, r0
/* 80118738 00115678 39 1F 04 E4 */ addi r8, r31, 0x4e4
/* 8011873C 0011567C 39 3F 04 EC */ addi r9, r31, 0x4ec
/* 80118740 00115680 4B F0 34 A9 */ bl fopAcM_createItemForPresentDemo
/* 80118740 00115680 4B F0 34 A9 */ bl fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz
/* 80118744 00115684 7C 64 1B 78 */ mr r4, r3
/* 80118748 00115688 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8011874C 0011568C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
include/d/d_a/d_a_alink/asm/func_8011A214.s
+1 -1
View File
@@ -69,7 +69,7 @@ lbl_8011A308:
/* 8011A308 00117248 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2)
/* 8011A30C 0011724C D0 1F 33 98 */ stfs f0, 0x3398(r31)
/* 8011A310 00117250 7F E3 FB 78 */ mr r3, r31
/* 8011A314 00117254 4B F0 18 61 */ bl fopAcM_getEventPartner
/* 8011A314 00117254 4B F0 18 61 */ bl fopAcM_getEventPartner__FPC10fopAc_ac_c
/* 8011A318 00117258 28 03 00 00 */ cmplwi r3, 0
/* 8011A31C 0011725C 41 82 00 68 */ beq lbl_8011A384
/* 8011A320 00117260 A8 83 04 E6 */ lha r4, 0x4e6(r3)
include/d/d_a/d_a_alink/asm/func_8011A798.s
+2 -2
View File
@@ -103,7 +103,7 @@ lbl_8011A8F4:
/* 8011A908 00117848 7C 07 07 74 */ extsb r7, r0
/* 8011A90C 0011784C 39 00 00 00 */ li r8, 0
/* 8011A910 00117850 39 20 00 00 */ li r9, 0
/* 8011A914 00117854 4B F0 12 D5 */ bl fopAcM_createItemForPresentDemo
/* 8011A914 00117854 4B F0 12 D5 */ bl fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz
/* 8011A918 00117858 7C 64 1B 78 */ mr r4, r3
/* 8011A91C 0011785C 3C 04 00 01 */ addis r0, r4, 1
/* 8011A920 00117860 28 00 FF FF */ cmplwi r0, 0xffff
@@ -117,7 +117,7 @@ lbl_8011A938:
/* 8011A93C 0011787C 48 00 00 2C */ b lbl_8011A968
lbl_8011A940:
/* 8011A940 00117880 7F A3 EB 78 */ mr r3, r29
/* 8011A944 00117884 4B F0 12 01 */ bl fopAcM_getItemEventPartner
/* 8011A944 00117884 4B F0 12 01 */ bl fopAcM_getItemEventPartner__FPC10fopAc_ac_c
/* 8011A948 00117888 28 03 00 00 */ cmplwi r3, 0
/* 8011A94C 0011788C 41 82 00 14 */ beq lbl_8011A960
/* 8011A950 00117890 4B F1 D1 0D */ bl daItemBase_c_NS_getItemNo
include/d/d_a/d_a_alink/asm/func_8011AC28.s
+1 -1
View File
@@ -131,7 +131,7 @@ lbl_8011ADFC:
/* 8011AE08 00117D48 B0 1C 04 E6 */ sth r0, 0x4e6(r28)
lbl_8011AE0C:
/* 8011AE0C 00117D4C 7F 83 E3 78 */ mr r3, r28
/* 8011AE10 00117D50 4B F0 0D 35 */ bl fopAcM_getItemEventPartner
/* 8011AE10 00117D50 4B F0 0D 35 */ bl fopAcM_getItemEventPartner__FPC10fopAc_ac_c
/* 8011AE14 00117D54 7C 7D 1B 78 */ mr r29, r3
/* 8011AE18 00117D58 A8 1C 30 0C */ lha r0, 0x300c(r28)
/* 8011AE1C 00117D5C 2C 00 FF FF */ cmpwi r0, -1
include/d/d_a/d_a_alink/asm/func_8011E060.s
+1 -1
View File
@@ -171,7 +171,7 @@ lbl_8011E294:
/* 8011E2C8 0011B208 48 00 00 F4 */ b lbl_8011E3BC
lbl_8011E2CC:
/* 8011E2CC 0011B20C 7F E3 FB 78 */ mr r3, r31
/* 8011E2D0 0011B210 4B EF D8 75 */ bl fopAcM_getItemEventPartner
/* 8011E2D0 0011B210 4B EF D8 75 */ bl fopAcM_getItemEventPartner__FPC10fopAc_ac_c
/* 8011E2D4 0011B214 7C 7E 1B 79 */ or. r30, r3, r3
/* 8011E2D8 0011B218 41 82 00 E4 */ beq lbl_8011E3BC
/* 8011E2DC 0011B21C 41 82 00 0C */ beq lbl_8011E2E8
include/d/d_a/d_a_alink/asm/func_8011E57C.s
+2 -2
View File
@@ -15,7 +15,7 @@
/* 8011E5B4 0011B4F4 7C 07 07 74 */ extsb r7, r0
/* 8011E5B8 0011B4F8 39 1F 04 E4 */ addi r8, r31, 0x4e4
/* 8011E5BC 0011B4FC 39 3F 04 EC */ addi r9, r31, 0x4ec
/* 8011E5C0 0011B500 4B EF D6 29 */ bl fopAcM_createItemForPresentDemo
/* 8011E5C0 0011B500 4B EF D6 29 */ bl fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz
/* 8011E5C4 0011B504 7C 64 1B 78 */ mr r4, r3
/* 8011E5C8 0011B508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8011E5CC 0011B50C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
@@ -28,7 +28,7 @@ lbl_8011E5E0:
/* 8011E5E4 0011B524 2C 00 00 00 */ cmpwi r0, 0
/* 8011E5E8 0011B528 41 82 00 A0 */ beq lbl_8011E688
/* 8011E5EC 0011B52C 7F E3 FB 78 */ mr r3, r31
/* 8011E5F0 0011B530 4B EF D5 55 */ bl fopAcM_getItemEventPartner
/* 8011E5F0 0011B530 4B EF D5 55 */ bl fopAcM_getItemEventPartner__FPC10fopAc_ac_c
/* 8011E5F4 0011B534 7C 7E 1B 79 */ or. r30, r3, r3
/* 8011E5F8 0011B538 41 82 00 CC */ beq lbl_8011E6C4
/* 8011E5FC 0011B53C 41 82 00 0C */ beq lbl_8011E608
include/d/d_a/d_a_alink/asm/func_8011EE94.s
+2 -2
View File
@@ -30,7 +30,7 @@ lbl_8011EEDC:
/* 8011EF04 0011BE44 38 FE 04 E4 */ addi r7, r30, 0x4e4
/* 8011EF08 0011BE48 39 00 00 00 */ li r8, 0
/* 8011EF0C 0011BE4C 39 20 FF FF */ li r9, -1
/* 8011EF10 0011BE50 4B EF AE 89 */ bl fopAcM_create_X1_
/* 8011EF10 0011BE50 4B EF AE 89 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc
/* 8011EF14 0011BE54 7C 7F 1B 78 */ mr r31, r3
/* 8011EF18 0011BE58 48 00 00 2C */ b lbl_8011EF44
lbl_8011EF1C:
@@ -42,7 +42,7 @@ lbl_8011EF1C:
/* 8011EF30 0011BE70 38 FE 04 E4 */ addi r7, r30, 0x4e4
/* 8011EF34 0011BE74 39 00 00 00 */ li r8, 0
/* 8011EF38 0011BE78 39 20 FF FF */ li r9, -1
/* 8011EF3C 0011BE7C 4B EF AE 5D */ bl fopAcM_create_X1_
/* 8011EF3C 0011BE7C 4B EF AE 5D */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc
/* 8011EF40 0011BE80 7C 7F 1B 78 */ mr r31, r3
lbl_8011EF44:
/* 8011EF44 0011BE84 3C 1F 00 01 */ addis r0, r31, 1
include/d/d_a/d_a_alink/asm/func_8011EFB8.s
+1 -1
View File
@@ -14,7 +14,7 @@
/*.global fpcSch_JudgeByID*/
/* 8011EFE8 0011BF28 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 8011EFEC 0011BF2C 38 81 00 08 */ addi r4, r1, 8
/* 8011EFF0 0011BF30 4B EF A8 09 */ bl fopAcIt_Judge
/* 8011EFF0 0011BF30 4B EF A8 09 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8011EFF4 0011BF34 7C 7F 1B 79 */ or. r31, r3, r3
/* 8011EFF8 0011BF38 41 82 00 70 */ beq lbl_8011F068
/* 8011EFFC 0011BF3C 38 7E 28 0C */ addi r3, r30, 0x280c
include/d/d_a/d_a_alink/asm/func_8011F9EC.s
+1 -1
View File
@@ -89,7 +89,7 @@ lbl_8011FB28:
/* 8011FB30 0011CA70 38 A5 FF FF */ addi r5, r5, 0x0000FFFF@l
/* 8011FB34 0011CA74 38 C0 00 01 */ li r6, 1
/* 8011FB38 0011CA78 38 E0 00 01 */ li r7, 1
/* 8011FB3C 0011CA7C 4B EF B8 91 */ bl fopAcM_orderOtherEvent
/* 8011FB3C 0011CA7C 4B EF B8 91 */ bl fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs
/* 8011FB40 0011CA80 48 00 00 5C */ b lbl_8011FB9C
lbl_8011FB44:
/* 8011FB44 0011CA84 38 00 00 05 */ li r0, 5
include/d/d_a/d_a_alink/asm/func_8011FD4C.s
+1 -1
View File
@@ -241,7 +241,7 @@ lbl_801200B4:
/*.global daAlink_searchPortal*/
/* 801200B8 0011CFF8 38 63 F5 D4 */ addi r3, r3, daAlink_searchPortal@l
/* 801200BC 0011CFFC 38 9C 04 D0 */ addi r4, r28, 0x4d0
/* 801200C0 0011D000 4B EF 97 39 */ bl fopAcIt_Judge
/* 801200C0 0011D000 4B EF 97 39 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 801200C4 0011D004 28 03 00 00 */ cmplwi r3, 0
/* 801200C8 0011D008 41 82 00 0C */ beq lbl_801200D4
/* 801200CC 0011D00C 88 03 05 C6 */ lbz r0, 0x5c6(r3)
include/d/d_a/d_a_alink/asm/func_80124A2C.s
+2 -2
View File
@@ -25,7 +25,7 @@ lbl_80124A6C:
/* 80124A88 001219C8 3B E0 00 00 */ li r31, 0
/* 80124A8C 001219CC 3B C0 00 00 */ li r30, 0
/* 80124A90 001219D0 38 61 00 08 */ addi r3, r1, 8
/* 80124A94 001219D4 4B EF 92 29 */ bl fopAcM_gc_c_NS_gndCheck
/* 80124A94 001219D4 4B EF 92 29 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz
/* 80124A98 001219D8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80124A9C 001219DC 41 82 00 38 */ beq lbl_80124AD4
/* 80124AA0 001219E0 C0 0D 87 50 */ lfs f0, lbl_80450CD0-_SDA_BASE_(r13)
@@ -43,7 +43,7 @@ lbl_80124A6C:
/* 80124AD0 00121A10 3B C0 00 01 */ li r30, 1
lbl_80124AD4:
/* 80124AD4 00121A14 38 61 00 08 */ addi r3, r1, 8
/* 80124AD8 00121A18 4B EF 92 AD */ bl fopAcM_wt_c_NS_waterCheck
/* 80124AD8 00121A18 4B EF 92 AD */ bl waterCheck__11fopAcM_wt_cFPC4cXyz
/* 80124ADC 00121A1C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80124AE0 00121A20 41 82 00 48 */ beq lbl_80124B28
/* 80124AE4 00121A24 C0 2D 87 58 */ lfs f1, lbl_80450CD8-_SDA_BASE_(r13)
include/d/d_a/d_a_alink/asm/func_8012C30C.s
+1 -1
View File
@@ -437,7 +437,7 @@ lbl_8012C8B0:
/* 8012C958 00129898 A8 9F 00 02 */ lha r4, 2(r31)
/* 8012C95C 0012989C 38 04 40 00 */ addi r0, r4, 0x4000
/* 8012C960 001298A0 7C 04 07 34 */ extsh r4, r0
/* 8012C964 001298A4 4B EF 12 75 */ bl fopAcM_getPolygonAngle_X1_
/* 8012C964 001298A4 4B EF 12 75 */ bl fopAcM_getPolygonAngle__FPC8cM3dGPlas
/* 8012C968 001298A8 B0 7F 00 04 */ sth r3, 4(r31)
/* 8012C96C 001298AC A8 7F 00 04 */ lha r3, 4(r31)
/* 8012C970 001298B0 A8 1F FF FE */ lha r0, -2(r31)
include/d/d_a/d_a_alink/asm/func_8012E0AC.s
+1 -1
View File
@@ -23,7 +23,7 @@ lbl_8012E100:
/* 8012E100 0012B040 80 9F 27 EC */ lwz r4, 0x27ec(r31)
/* 8012E104 0012B044 28 04 00 00 */ cmplwi r4, 0
/* 8012E108 0012B048 41 82 00 48 */ beq lbl_8012E150
/* 8012E10C 0012B04C 4B EE C6 05 */ bl fopAcM_searchActorAngleY
/* 8012E10C 0012B04C 4B EE C6 05 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 8012E110 0012B050 7C 64 1B 78 */ mr r4, r3
/* 8012E114 0012B054 38 7F 04 E6 */ addi r3, r31, 0x4e6
/* 8012E118 0012B058 38 A0 00 05 */ li r5, 5
include/d/d_a/d_a_alink/asm/func_80130700.s
+1 -1
View File
@@ -303,7 +303,7 @@ lbl_80130B00:
/*.global daAlink_searchGoldWolf*/
/* 80130B60 0012DAA0 38 63 05 6C */ addi r3, r3, daAlink_searchGoldWolf@l
/* 80130B64 0012DAA4 38 80 00 00 */ li r4, 0
/* 80130B68 0012DAA8 4B EE 8C 91 */ bl fopAcIt_Judge
/* 80130B68 0012DAA8 4B EE 8C 91 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 80130B6C 0012DAAC 7C 64 1B 78 */ mr r4, r3
/* 80130B70 0012DAB0 38 7E 28 0C */ addi r3, r30, 0x280c
/* 80130B74 0012DAB4 48 02 E1 45 */ bl daPy_actorKeep_c_NS_setData
include/d/d_a/d_a_alink/asm/func_80130BC4.s
+1 -1
View File
@@ -306,7 +306,7 @@ lbl_80130FF8:
/*.global daAlink_searchWolfHowl*/
/* 8013100C 0012DF4C 38 63 05 80 */ addi r3, r3, daAlink_searchWolfHowl@l
/* 80131010 0012DF50 38 81 00 08 */ addi r4, r1, 8
/* 80131014 0012DF54 4B EE 87 A9 */ bl fopAcIt_Executor
/* 80131014 0012DF54 4B EE 87 A9 */ bl fopAcIt_Executor__FPFPvPv_iPv
/* 80131018 0012DF58 48 00 00 08 */ b lbl_80131020
lbl_8013101C:
/* 8013101C 0012DF5C 93 81 00 08 */ stw r28, 8(r1)
include/d/d_a/d_a_alink/asm/func_80133EF0.s
+1 -1
View File
@@ -25,7 +25,7 @@ lbl_80133F44:
/* 80133F44 00130E84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80133F48 00130E88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80133F4C 00130E8C 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 80133F50 00130E90 4B EE 7B C5 */ bl fopAcM_getTalkEventPartner
/* 80133F50 00130E90 4B EE 7B C5 */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 80133F54 00130E94 38 A0 00 00 */ li r5, 0
/* 80133F58 00130E98 80 1F 05 80 */ lwz r0, 0x580(r31)
/* 80133F5C 00130E9C 54 00 03 9D */ rlwinm. r0, r0, 0, 0xe, 0xe
include/d/d_a/d_a_alink/asm/func_801351F8.s
+3 -3
View File
@@ -33,13 +33,13 @@ lbl_80135224:
/*.global daAlink_searchGiantTalk*/
/* 80135270 001321B0 38 63 50 A4 */ addi r3, r3, daAlink_searchGiantTalk@l
/* 80135274 001321B4 38 80 00 00 */ li r4, 0
/* 80135278 001321B8 4B EE 45 81 */ bl fopAcIt_Judge
/* 80135278 001321B8 4B EE 45 81 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8013527C 001321BC 7C 64 1B 79 */ or. r4, r3, r3
/* 80135280 001321C0 41 82 01 44 */ beq lbl_801353C4
/* 80135284 001321C4 7F E3 FB 78 */ mr r3, r31
/* 80135288 001321C8 38 A0 00 00 */ li r5, 0
/* 8013528C 001321CC 38 C0 00 00 */ li r6, 0
/* 80135290 001321D0 4B EE 5D D9 */ bl fopAcM_orderTalkEvent
/* 80135290 001321D0 4B EE 5D D9 */ bl fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs
/* 80135294 001321D4 48 00 01 30 */ b lbl_801353C4
lbl_80135298:
/* 80135298 001321D8 C0 3F 33 AC */ lfs f1, 0x33ac(r31)
@@ -93,7 +93,7 @@ lbl_80135298:
/*.global daAlink_searchGiant*/
/* 80135354 00132294 38 63 50 50 */ addi r3, r3, daAlink_searchGiant@l
/* 80135358 00132298 38 81 00 08 */ addi r4, r1, 8
/* 8013535C 0013229C 4B EE 44 9D */ bl fopAcIt_Judge
/* 8013535C 0013229C 4B EE 44 9D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 80135360 001322A0 28 03 00 00 */ cmplwi r3, 0
/* 80135364 001322A4 40 82 00 60 */ bne lbl_801353C4
/* 80135368 001322A8 3C 60 80 39 */ lis r3, lbl_8038EF28@ha

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