mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-10 19:17:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

fopScnM_SearchByID attempt

Browse Source
This commit is contained in:
Pheenoh
2021-02-20 10:25:13 -05:00
parent bbf1d1c34c
commit b0499177ef
16 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_stage/asm/func_80025014.s
+1 -1
View File
@@ -157,7 +157,7 @@ lbl_80025208:
/* 80025254 00022194 7F A4 EB 78 */ mr r4, r29
/* 80025258 00022198 4B FF FC A5 */ bl dStage_actorCreate
/* 8002525C 0002219C 80 6D 87 E0 */ lwz r3, lbl_80450D60-_SDA_BASE_(r13)
/* 80025260 000221A0 4B FF 9A 51 */ bl fopScnM_SearchByID
/* 80025260 000221A0 4B FF 9A 51 */ bl fopScnM_SearchByID__FUi
/* 80025264 000221A4 A8 03 00 08 */ lha r0, 8(r3)
/* 80025268 000221A8 2C 00 00 0B */ cmpwi r0, 0xb
/* 8002526C 000221AC 40 82 00 30 */ bne lbl_8002529C
include/f/f_op/f_op_actor_mng/asm/func_800198C4.s
+1 -1
View File
@@ -5,7 +5,7 @@
/* 800198D4 00016814 93 C1 00 08 */ stw r30, 8(r1)
/* 800198D8 00016818 7C 7E 1B 78 */ mr r30, r3
/* 800198DC 0001681C 80 6D 87 E0 */ lwz r3, lbl_80450D60-_SDA_BASE_(r13)
/* 800198E0 00016820 48 00 53 D1 */ bl fopScnM_SearchByID
/* 800198E0 00016820 48 00 53 D1 */ bl fopScnM_SearchByID__FUi
/* 800198E4 00016824 7C 7F 1B 78 */ mr r31, r3
/* 800198E8 00016828 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13)
/* 800198EC 0001682C 80 9F 00 B4 */ lwz r4, 0xb4(r31)
include/f/f_op/f_op_actor_mng/asm/func_80019934.s
+1 -1
View File
@@ -11,7 +11,7 @@
/* 8001995C 0001689C 1C 04 04 04 */ mulli r0, r4, 0x404
/* 80019960 000168A0 7C 63 02 14 */ add r3, r3, r0
/* 80019964 000168A4 80 63 03 FC */ lwz r3, 0x3fc(r3)
/* 80019968 000168A8 48 00 53 49 */ bl fopScnM_SearchByID
/* 80019968 000168A8 48 00 53 49 */ bl fopScnM_SearchByID__FUi
/* 8001996C 000168AC 7C 7F 1B 78 */ mr r31, r3
/* 80019970 000168B0 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13)
/* 80019974 000168B4 80 9F 00 B4 */ lwz r4, 0xb4(r31)
include/f/f_op/f_op_actor_mng/asm/func_8001CA1C.s
+1 -1
View File
@@ -8,7 +8,7 @@
/* 8001CA38 00019978 1C 00 04 04 */ mulli r0, r0, 0x404
/* 8001CA3C 0001997C 7C 64 02 14 */ add r3, r4, r0
/* 8001CA40 00019980 80 63 03 FC */ lwz r3, 0x3fc(r3)
/* 8001CA44 00019984 48 00 22 6D */ bl fopScnM_SearchByID
/* 8001CA44 00019984 48 00 22 6D */ bl fopScnM_SearchByID__FUi
/* 8001CA48 00019988 7C 7F 1B 78 */ mr r31, r3
/* 8001CA4C 0001998C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8001CA50 00019990 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
include/f/f_op/f_op_actor_mng/asm/func_8001CBA0.s
+1 -1
View File
@@ -19,7 +19,7 @@
/* 8001CBE8 00019B28 1C 00 04 04 */ mulli r0, r0, 0x404
/* 8001CBEC 00019B2C 7C 63 02 14 */ add r3, r3, r0
/* 8001CBF0 00019B30 80 63 03 FC */ lwz r3, 0x3fc(r3)
/* 8001CBF4 00019B34 48 00 20 BD */ bl fopScnM_SearchByID
/* 8001CBF4 00019B34 48 00 20 BD */ bl fopScnM_SearchByID__FUi
/* 8001CBF8 00019B38 28 03 00 00 */ cmplwi r3, 0
/* 8001CBFC 00019B3C 41 82 00 14 */ beq lbl_8001CC10
/* 8001CC00 00019B40 7F E3 FB 78 */ mr r3, r31
include/f/f_op/f_op_msg_mng/asm/func_8001F9B4.s
+1 -1
View File
@@ -5,7 +5,7 @@
/* 8001F9C4 0001C904 93 C1 00 08 */ stw r30, 8(r1)
/* 8001F9C8 0001C908 7C 7E 1B 78 */ mr r30, r3
/* 8001F9CC 0001C90C 80 6D 87 E0 */ lwz r3, lbl_80450D60-_SDA_BASE_(r13)
/* 8001F9D0 0001C910 4B FF F2 E1 */ bl fopScnM_SearchByID
/* 8001F9D0 0001C910 4B FF F2 E1 */ bl fopScnM_SearchByID__FUi
/* 8001F9D4 0001C914 7C 7F 1B 78 */ mr r31, r3
/* 8001F9D8 0001C918 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13)
/* 8001F9DC 0001C91C 80 9F 00 B4 */ lwz r4, 0xb4(r31)
include/f/f_op/f_op_scene_iter.h
+10
View File
@@ -0,0 +1,10 @@
#ifndef F_F_OP_SCENE_ITER_H_
#define F_F_OP_SCENE_ITER_H_
#include "dolphin/types.h"
typedef void* (*fop_ScnItFunc)(void*,void*);
void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pFunc2);
#endif
include/f/f_op_scene_mng/asm/func_8001ECB0.s
+1 -1
View File
@@ -7,7 +7,7 @@
/*.global fpcSch_JudgeByID*/
/* 8001ECC4 0001BC04 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 8001ECC8 0001BC08 38 81 00 08 */ addi r4, r1, 8
/* 8001ECCC 0001BC0C 4B FF FF A9 */ bl fopScnIt_Judge
/* 8001ECCC 0001BC0C 4B FF FF A9 */ bl fopScnIt_Judge__FPFPvPv_PvPv
/* 8001ECD0 0001BC10 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001ECD4 0001BC14 7C 08 03 A6 */ mtlr r0
/* 8001ECD8 0001BC18 38 21 00 10 */ addi r1, r1, 0x10