mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-16 21:18:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

fopOvlpM_Done OK, fopOvlpM_ToldAboutID OK, fopOvlpM_IsPeek OK, fopOvlpM_IsDone OK

Browse Source
This commit is contained in:
Pheenoh
2021-02-14 13:36:25 -05:00
parent 7f95de6c60
commit c29034f4bd
22 changed files with 264 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/d/ovlp/d_ovlp_fade.s
+3 -3
View File
@@ -84,7 +84,7 @@ lbl_80252284:
/* 80252290 0024F1D0 90 1E 00 CC */ stw r0, 0xcc(r30)
/* 80252294 0024F1D4 40 82 00 18 */ bne lbl_802522AC
/* 80252298 0024F1D8 7F C3 F3 78 */ mr r3, r30
/* 8025229C 0024F1DC 4B DC C2 81 */ bl fopOvlpM_Done
/* 8025229C 0024F1DC 4B DC C2 81 */ bl fopOvlpM_Done__FP18overlap_task_class
/* 802522A0 0024F1E0 80 7E 00 CC */ lwz r3, 0xcc(r30)
/* 802522A4 0024F1E4 38 03 00 01 */ addi r0, r3, 1
/* 802522A8 0024F1E8 90 1E 00 CC */ stw r0, 0xcc(r30)
@@ -101,7 +101,7 @@ dOvlpFd_Wait:
/* 802522C8 0024F208 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802522CC 0024F20C 7C 08 02 A6 */ mflr r0
/* 802522D0 0024F210 90 01 00 14 */ stw r0, 0x14(r1)
/* 802522D4 0024F214 4B DC C2 31 */ bl fopOvlpM_IsOutReq
/* 802522D4 0024F214 4B DC C2 31 */ bl fopOvlpM_IsOutReq__FP18overlap_task_class
/* 802522D8 0024F218 2C 03 00 00 */ cmpwi r3, 0
/* 802522DC 0024F21C 41 82 00 10 */ beq lbl_802522EC
.global dOvlpFd_FadeOut
@@ -197,7 +197,7 @@ lbl_802523C8:
/* 80252404 0024F344 4E 80 04 21 */ bctrl
lbl_80252408:
/* 80252408 0024F348 7F E3 FB 78 */ mr r3, r31
/* 8025240C 0024F34C 4B DC C1 11 */ bl fopOvlpM_Done
/* 8025240C 0024F34C 4B DC C1 11 */ bl fopOvlpM_Done__FP18overlap_task_class
lbl_80252410:
/* 80252410 0024F350 38 60 00 01 */ li r3, 1
lbl_80252414:
asm/d/ovlp/d_ovlp_fade2.s
+3 -3
View File
@@ -377,7 +377,7 @@ dOvlpFd2_c:
/* 80252A3C 0024F97C 80 04 00 08 */ lwz r0, 8(r4)
/* 80252A40 0024F980 90 1F 00 D4 */ stw r0, 0xd4(r31)
/* 80252A44 0024F984 7F E3 FB 78 */ mr r3, r31
/* 80252A48 0024F988 4B DC BA D5 */ bl fopOvlpM_Done
/* 80252A48 0024F988 4B DC BA D5 */ bl fopOvlpM_Done__FP18overlap_task_class
/* 80252A4C 0024F98C 38 00 FF F4 */ li r0, -12
/* 80252A50 0024F990 98 1F 01 1D */ stb r0, 0x11d(r31)
lbl_80252A54:
@@ -423,7 +423,7 @@ lbl_80252A64:
/* 80252AEC 0024FA2C 7C 00 07 75 */ extsb. r0, r0
/* 80252AF0 0024FA30 40 82 00 48 */ bne lbl_80252B38
/* 80252AF4 0024FA34 7F E3 FB 78 */ mr r3, r31
/* 80252AF8 0024FA38 4B DC BA 0D */ bl fopOvlpM_IsOutReq
/* 80252AF8 0024FA38 4B DC BA 0D */ bl fopOvlpM_IsOutReq__FP18overlap_task_class
/* 80252AFC 0024FA3C 2C 03 00 00 */ cmpwi r3, 0
/* 80252B00 0024FA40 41 82 00 38 */ beq lbl_80252B38
/* 80252B04 0024FA44 4B DC B9 C1 */ bl fopOvlpM_SceneIsStart
@@ -545,7 +545,7 @@ lbl_80252C54:
/* 80252CC0 0024FC00 48 00 00 38 */ b lbl_80252CF8
lbl_80252CC4:
/* 80252CC4 0024FC04 7F E3 FB 78 */ mr r3, r31
/* 80252CC8 0024FC08 4B DC B8 55 */ bl fopOvlpM_Done
/* 80252CC8 0024FC08 4B DC B8 55 */ bl fopOvlpM_Done__FP18overlap_task_class
/* 80252CCC 0024FC0C 38 00 00 01 */ li r0, 1
/* 80252CD0 0024FC10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80252CD4 0024FC14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
asm/d/ovlp/d_ovlp_fade3.s
+3 -3
View File
@@ -434,7 +434,7 @@ lbl_80253500:
/* 80253570 002504B0 80 04 00 08 */ lwz r0, 8(r4)
/* 80253574 002504B4 90 1F 00 D4 */ stw r0, 0xd4(r31)
/* 80253578 002504B8 7F E3 FB 78 */ mr r3, r31
/* 8025357C 002504BC 4B DC AF A1 */ bl fopOvlpM_Done
/* 8025357C 002504BC 4B DC AF A1 */ bl fopOvlpM_Done__FP18overlap_task_class
/* 80253580 002504C0 38 00 FF FF */ li r0, -1
/* 80253584 002504C4 98 1F 01 1D */ stb r0, 0x11d(r31)
lbl_80253588:
@@ -460,7 +460,7 @@ lbl_80253598:
/* 802535D0 00250510 88 03 01 1D */ lbz r0, 0x11d(r3)
/* 802535D4 00250514 7C 00 07 75 */ extsb. r0, r0
/* 802535D8 00250518 40 82 00 44 */ bne lbl_8025361C
/* 802535DC 0025051C 4B DC AF 29 */ bl fopOvlpM_IsOutReq
/* 802535DC 0025051C 4B DC AF 29 */ bl fopOvlpM_IsOutReq__FP18overlap_task_class
/* 802535E0 00250520 2C 03 00 00 */ cmpwi r3, 0
/* 802535E4 00250524 41 82 00 38 */ beq lbl_8025361C
/* 802535E8 00250528 4B DC AE DD */ bl fopOvlpM_SceneIsStart
@@ -571,7 +571,7 @@ lbl_8025371C:
/* 80253778 002506B8 48 00 00 20 */ b lbl_80253798
lbl_8025377C:
/* 8025377C 002506BC 7F E3 FB 78 */ mr r3, r31
/* 80253780 002506C0 4B DC AD 9D */ bl fopOvlpM_Done
/* 80253780 002506C0 4B DC AD 9D */ bl fopOvlpM_Done__FP18overlap_task_class
/* 80253784 002506C4 38 00 00 01 */ li r0, 1
/* 80253788 002506C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8025378C 002506CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
asm/d/s/d_s_name.s
+2 -2
View File
@@ -300,7 +300,7 @@ dScnName_c_NS_execute:
/* 80258BD0 00255B10 90 01 00 14 */ stw r0, 0x14(r1)
/* 80258BD4 00255B14 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80258BD8 00255B18 7C 7F 1B 78 */ mr r31, r3
/* 80258BDC 00255B1C 4B DC 59 7D */ bl fopOvlpM_IsPeek
/* 80258BDC 00255B1C 4B DC 59 7D */ bl fopOvlpM_IsPeek__Fv
/* 80258BE0 00255B20 2C 03 00 00 */ cmpwi r3, 0
/* 80258BE4 00255B24 40 82 00 0C */ bne lbl_80258BF0
/* 80258BE8 00255B28 7F E3 FB 78 */ mr r3, r31
@@ -665,7 +665,7 @@ lbl_802590E4:
/* 80259110 00256050 80 03 00 00 */ lwz r0, 0(r3)
/* 80259114 00256054 2C 00 00 00 */ cmpwi r0, 0
/* 80259118 00256058 40 82 00 94 */ bne lbl_802591AC
/* 8025911C 0025605C 4B DC 54 3D */ bl fopOvlpM_IsPeek
/* 8025911C 0025605C 4B DC 54 3D */ bl fopOvlpM_IsPeek__Fv
/* 80259120 00256060 2C 03 00 00 */ cmpwi r3, 0
/* 80259124 00256064 40 82 00 88 */ bne lbl_802591AC
/* 80259128 00256068 4B DD 58 4D */ bl dComIfGs_gameStart
asm/d/s/d_s_play.s
+3 -3
View File
@@ -72,7 +72,7 @@ dScnPly_env_debugHIO_c:
/* 802594E0 00256420 3B C3 0F 38 */ addi r30, r3, 0xf38
/* 802594E4 00256424 7F C3 F3 78 */ mr r3, r30
/* 802594E8 00256428 4B E1 B4 55 */ bl dBgS_NS_ClrMoveFlag
/* 802594EC 0025642C 4B DC 50 6D */ bl fopOvlpM_IsPeek
/* 802594EC 0025642C 4B DC 50 6D */ bl fopOvlpM_IsPeek__Fv
/* 802594F0 00256430 2C 03 00 00 */ cmpwi r3, 0
/* 802594F4 00256434 40 82 01 B8 */ bne lbl_802596AC
/* 802594F8 00256438 7F 83 E3 78 */ mr r3, r28
@@ -278,7 +278,7 @@ lbl_8025979C:
/* 802597D4 00256714 98 0D 87 E8 */ stb r0, lbl_80450D68-_SDA_BASE_(r13)
/* 802597D8 00256718 38 00 FF FF */ li r0, -1
/* 802597DC 0025671C 98 0D 80 70 */ stb r0, lbl_804505F0-_SDA_BASE_(r13)
/* 802597E0 00256720 4B DC 4D 79 */ bl fopOvlpM_IsPeek
/* 802597E0 00256720 4B DC 4D 79 */ bl fopOvlpM_IsPeek__Fv
/* 802597E4 00256724 2C 03 00 00 */ cmpwi r3, 0
/* 802597E8 00256728 40 82 00 48 */ bne lbl_80259830
/* 802597EC 0025672C 88 0D 86 3A */ lbz r0, lbl_80450BBA-_SDA_BASE_(r13)
@@ -571,7 +571,7 @@ dScnPly_c_NS_offReset:
/* 80259C10 00256B50 88 03 01 D4 */ lbz r0, 0x1d4(r3)
/* 80259C14 00256B54 28 00 00 00 */ cmplwi r0, 0
/* 80259C18 00256B58 41 82 00 44 */ beq lbl_80259C5C
/* 80259C1C 00256B5C 4B DC 49 3D */ bl fopOvlpM_IsPeek
/* 80259C1C 00256B5C 4B DC 49 3D */ bl fopOvlpM_IsPeek__Fv
/* 80259C20 00256B60 2C 03 00 00 */ cmpwi r3, 0
/* 80259C24 00256B64 40 82 00 38 */ bne lbl_80259C5C
/* 80259C28 00256B68 38 80 00 00 */ li r4, 0
asm/f/op/scene/f_op_scene_req.s
+2 -2
View File
@@ -40,7 +40,7 @@ lbl_8001EEA4:
/* 8001EEB4 0001BDF4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8001EEB8 0001BDF8 7C 08 02 A6 */ mflr r0
/* 8001EEBC 0001BDFC 90 01 00 14 */ stw r0, 0x14(r1)
/* 8001EEC0 0001BE00 4B FF F6 B5 */ bl fopOvlpM_IsDone
/* 8001EEC0 0001BE00 4B FF F6 B5 */ bl fopOvlpM_IsDone__Fv
/* 8001EEC4 0001BE04 2C 03 00 01 */ cmpwi r3, 1
/* 8001EEC8 0001BE08 38 60 00 00 */ li r3, 0
/* 8001EECC 0001BE0C 40 82 00 08 */ bne lbl_8001EED4
@@ -100,7 +100,7 @@ lbl_8001EF58:
/* 8001EF88 0001BEC8 41 82 00 10 */ beq lbl_8001EF98
/* 8001EF8C 0001BECC 48 00 15 BD */ bl fopScnPause_Enable
/* 8001EF90 0001BED0 80 7F 00 04 */ lwz r3, 4(r31)
/* 8001EF94 0001BED4 4B FF F5 AD */ bl fopOvlpM_ToldAboutID
/* 8001EF94 0001BED4 4B FF F5 AD */ bl fopOvlpM_ToldAboutID__FUi
lbl_8001EF98:
/* 8001EF98 0001BED8 38 60 00 01 */ li r3, 1
/* 8001EF9C 0001BEDC 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/sdata.s
+2 -2
View File
@@ -29,8 +29,8 @@ lbl_804505A8:
.global lbl_804505AC
lbl_804505AC:
.incbin "baserom.dol", 0x3D030C, 0x4
.global lbl_804505B0
lbl_804505B0:
.global l_fopOvlpM_overlap
l_fopOvlpM_overlap:
.incbin "baserom.dol", 0x3D0310, 0x8
.global lbl_804505B8
lbl_804505B8: