mirror of
https://github.com/zeldaret/tp
synced 2026-07-08 14:36:36 -04:00
setFadeColor fix, some d_msg_flow functions (#339)
This commit is contained in:
hatal175
@@ -1,9 +0,0 @@
|
||||
lbl_8024DAB0:
|
||||
/* 8024DAB0 80 83 00 00 */ lwz r4, 0(r3)
|
||||
/* 8024DAB4 2C 04 00 00 */ cmpwi r4, 0
|
||||
/* 8024DAB8 41 82 00 0C */ beq lbl_8024DAC4
|
||||
/* 8024DABC 38 04 FF FF */ addi r0, r4, -1
|
||||
/* 8024DAC0 90 03 00 00 */ stw r0, 0(r3)
|
||||
lbl_8024DAC4:
|
||||
/* 8024DAC4 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 8024DAC8 4E 80 00 20 */ blr
|
||||
@@ -1,40 +0,0 @@
|
||||
lbl_8024BDB0:
|
||||
/* 8024BDB0 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 8024BDB4 7C 08 02 A6 */ mflr r0
|
||||
/* 8024BDB8 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8024BDBC 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 8024BDC0 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 8024BDC4 A3 C4 00 04 */ lhz r30, 4(r4)
|
||||
/* 8024BDC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8024BDCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8024BDD0 38 63 0D D8 */ addi r3, r3, 0xdd8
|
||||
/* 8024BDD4 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */
|
||||
/* 8024BDD8 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */
|
||||
/* 8024BDDC 4B DE 8C 29 */ bl getEventReg__11dSv_event_cCFUs
|
||||
/* 8024BDE0 7C 64 1B 78 */ mr r4, r3
|
||||
/* 8024BDE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8024BDE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8024BDEC 38 63 00 EC */ addi r3, r3, 0xec
|
||||
/* 8024BDF0 38 04 FF FF */ addi r0, r4, -1
|
||||
/* 8024BDF4 54 04 06 3E */ clrlwi r4, r0, 0x18
|
||||
/* 8024BDF8 4B DE 81 85 */ bl getBombNum__24dSv_player_item_record_cCFUc
|
||||
/* 8024BDFC 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 8024BE00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8024BE04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8024BE08 38 63 00 F8 */ addi r3, r3, 0xf8
|
||||
/* 8024BE0C 38 80 00 70 */ li r4, 0x70
|
||||
/* 8024BE10 4B DE 82 E9 */ bl getBombNum__21dSv_player_item_max_cCFUc
|
||||
/* 8024BE14 54 65 06 3E */ clrlwi r5, r3, 0x18
|
||||
/* 8024BE18 57 E0 06 3E */ clrlwi r0, r31, 0x18
|
||||
/* 8024BE1C 7C 00 F2 14 */ add r0, r0, r30
|
||||
/* 8024BE20 7C A4 FE 70 */ srawi r4, r5, 0x1f
|
||||
/* 8024BE24 54 03 0F FE */ srwi r3, r0, 0x1f
|
||||
/* 8024BE28 7C 00 28 10 */ subfc r0, r0, r5
|
||||
/* 8024BE2C 7C 04 19 14 */ adde r0, r4, r3
|
||||
/* 8024BE30 54 03 06 3E */ clrlwi r3, r0, 0x18
|
||||
/* 8024BE34 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 8024BE38 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 8024BE3C 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 8024BE40 7C 08 03 A6 */ mtlr r0
|
||||
/* 8024BE44 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 8024BE48 4E 80 00 20 */ blr
|
||||
@@ -1,72 +0,0 @@
|
||||
lbl_8024BE4C:
|
||||
/* 8024BE4C 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 8024BE50 7C 08 02 A6 */ mflr r0
|
||||
/* 8024BE54 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8024BE58 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 8024BE5C 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 8024BE60 A0 64 00 04 */ lhz r3, 4(r4)
|
||||
/* 8024BE64 2C 03 00 01 */ cmpwi r3, 1
|
||||
/* 8024BE68 41 80 00 18 */ blt lbl_8024BE80
|
||||
/* 8024BE6C 2C 03 00 04 */ cmpwi r3, 4
|
||||
/* 8024BE70 40 80 00 10 */ bge lbl_8024BE80
|
||||
/* 8024BE74 38 03 FF FF */ addi r0, r3, -1
|
||||
/* 8024BE78 54 1E 06 3E */ clrlwi r30, r0, 0x18
|
||||
/* 8024BE7C 48 00 00 48 */ b lbl_8024BEC4
|
||||
lbl_8024BE80:
|
||||
/* 8024BE80 2C 03 00 04 */ cmpwi r3, 4
|
||||
/* 8024BE84 40 82 00 20 */ bne lbl_8024BEA4
|
||||
/* 8024BE88 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
|
||||
/* 8024BE8C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
|
||||
/* 8024BE90 88 03 00 DC */ lbz r0, 0xdc(r3)
|
||||
/* 8024BE94 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 8024BE98 41 82 00 2C */ beq lbl_8024BEC4
|
||||
/* 8024BE9C 7C 1E 03 78 */ mr r30, r0
|
||||
/* 8024BEA0 48 00 00 24 */ b lbl_8024BEC4
|
||||
lbl_8024BEA4:
|
||||
/* 8024BEA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8024BEA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8024BEAC 38 63 0D D8 */ addi r3, r3, 0xdd8
|
||||
/* 8024BEB0 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */
|
||||
/* 8024BEB4 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */
|
||||
/* 8024BEB8 4B DE 8B 4D */ bl getEventReg__11dSv_event_cCFUs
|
||||
/* 8024BEBC 38 03 FF FF */ addi r0, r3, -1
|
||||
/* 8024BEC0 54 1E 06 3E */ clrlwi r30, r0, 0x18
|
||||
lbl_8024BEC4:
|
||||
/* 8024BEC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8024BEC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8024BECC 38 63 00 EC */ addi r3, r3, 0xec
|
||||
/* 8024BED0 7F C4 F3 78 */ mr r4, r30
|
||||
/* 8024BED4 4B DE 80 A9 */ bl getBombNum__24dSv_player_item_record_cCFUc
|
||||
/* 8024BED8 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 8024BEDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8024BEE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8024BEE4 38 63 00 9C */ addi r3, r3, 0x9c
|
||||
/* 8024BEE8 38 1E 00 0F */ addi r0, r30, 0xf
|
||||
/* 8024BEEC 54 04 06 3E */ clrlwi r4, r0, 0x18
|
||||
/* 8024BEF0 38 A0 00 00 */ li r5, 0
|
||||
/* 8024BEF4 4B DE 71 3D */ bl getItem__17dSv_player_item_cCFib
|
||||
/* 8024BEF8 7C 64 1B 78 */ mr r4, r3
|
||||
/* 8024BEFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8024BF00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8024BF04 38 63 00 F8 */ addi r3, r3, 0xf8
|
||||
/* 8024BF08 4B DE 81 F1 */ bl getBombNum__21dSv_player_item_max_cCFUc
|
||||
/* 8024BF0C 57 E4 06 3F */ clrlwi. r4, r31, 0x18
|
||||
/* 8024BF10 40 82 00 0C */ bne lbl_8024BF1C
|
||||
/* 8024BF14 38 00 00 00 */ li r0, 0
|
||||
/* 8024BF18 48 00 00 1C */ b lbl_8024BF34
|
||||
lbl_8024BF1C:
|
||||
/* 8024BF1C 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 8024BF20 7C 04 00 40 */ cmplw r4, r0
|
||||
/* 8024BF24 41 80 00 0C */ blt lbl_8024BF30
|
||||
/* 8024BF28 38 00 00 02 */ li r0, 2
|
||||
/* 8024BF2C 48 00 00 08 */ b lbl_8024BF34
|
||||
lbl_8024BF30:
|
||||
/* 8024BF30 38 00 00 01 */ li r0, 1
|
||||
lbl_8024BF34:
|
||||
/* 8024BF34 54 03 06 3E */ clrlwi r3, r0, 0x18
|
||||
/* 8024BF38 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 8024BF3C 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 8024BF40 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 8024BF44 7C 08 03 A6 */ mtlr r0
|
||||
/* 8024BF48 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 8024BF4C 4E 80 00 20 */ blr
|
||||
@@ -1,40 +0,0 @@
|
||||
lbl_8024BF50:
|
||||
/* 8024BF50 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 8024BF54 7C 08 02 A6 */ mflr r0
|
||||
/* 8024BF58 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8024BF5C 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 8024BF60 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 8024BF64 A3 C4 00 04 */ lhz r30, 4(r4)
|
||||
/* 8024BF68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8024BF6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8024BF70 38 63 0D D8 */ addi r3, r3, 0xdd8
|
||||
/* 8024BF74 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */
|
||||
/* 8024BF78 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */
|
||||
/* 8024BF7C 4B DE 8A 89 */ bl getEventReg__11dSv_event_cCFUs
|
||||
/* 8024BF80 7C 64 1B 78 */ mr r4, r3
|
||||
/* 8024BF84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8024BF88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8024BF8C 38 63 00 EC */ addi r3, r3, 0xec
|
||||
/* 8024BF90 38 04 FF FF */ addi r0, r4, -1
|
||||
/* 8024BF94 54 04 06 3E */ clrlwi r4, r0, 0x18
|
||||
/* 8024BF98 4B DE 7F E5 */ bl getBombNum__24dSv_player_item_record_cCFUc
|
||||
/* 8024BF9C 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 8024BFA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8024BFA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8024BFA8 38 63 00 F8 */ addi r3, r3, 0xf8
|
||||
/* 8024BFAC 38 80 00 71 */ li r4, 0x71
|
||||
/* 8024BFB0 4B DE 81 49 */ bl getBombNum__21dSv_player_item_max_cCFUc
|
||||
/* 8024BFB4 54 65 06 3E */ clrlwi r5, r3, 0x18
|
||||
/* 8024BFB8 57 E0 06 3E */ clrlwi r0, r31, 0x18
|
||||
/* 8024BFBC 7C 00 F2 14 */ add r0, r0, r30
|
||||
/* 8024BFC0 7C A4 FE 70 */ srawi r4, r5, 0x1f
|
||||
/* 8024BFC4 54 03 0F FE */ srwi r3, r0, 0x1f
|
||||
/* 8024BFC8 7C 00 28 10 */ subfc r0, r0, r5
|
||||
/* 8024BFCC 7C 04 19 14 */ adde r0, r4, r3
|
||||
/* 8024BFD0 54 03 06 3E */ clrlwi r3, r0, 0x18
|
||||
/* 8024BFD4 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 8024BFD8 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 8024BFDC 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 8024BFE0 7C 08 03 A6 */ mtlr r0
|
||||
/* 8024BFE4 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 8024BFE8 4E 80 00 20 */ blr
|
||||
@@ -1,41 +0,0 @@
|
||||
lbl_8024C18C:
|
||||
/* 8024C18C 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 8024C190 7C 08 02 A6 */ mflr r0
|
||||
/* 8024C194 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8024C198 4B DE 22 91 */ bl dComIfGs_checkGetInsectNum__Fv
|
||||
/* 8024C19C 38 80 00 00 */ li r4, 0
|
||||
/* 8024C1A0 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 8024C1A4 40 82 00 0C */ bne lbl_8024C1B0
|
||||
/* 8024C1A8 38 80 00 00 */ li r4, 0
|
||||
/* 8024C1AC 48 00 00 58 */ b lbl_8024C204
|
||||
lbl_8024C1B0:
|
||||
/* 8024C1B0 28 00 00 01 */ cmplwi r0, 1
|
||||
/* 8024C1B4 41 80 00 14 */ blt lbl_8024C1C8
|
||||
/* 8024C1B8 28 00 00 0B */ cmplwi r0, 0xb
|
||||
/* 8024C1BC 41 81 00 0C */ bgt lbl_8024C1C8
|
||||
/* 8024C1C0 38 80 00 01 */ li r4, 1
|
||||
/* 8024C1C4 48 00 00 40 */ b lbl_8024C204
|
||||
lbl_8024C1C8:
|
||||
/* 8024C1C8 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 8024C1CC 28 00 00 0C */ cmplwi r0, 0xc
|
||||
/* 8024C1D0 41 80 00 14 */ blt lbl_8024C1E4
|
||||
/* 8024C1D4 28 00 00 16 */ cmplwi r0, 0x16
|
||||
/* 8024C1D8 41 81 00 0C */ bgt lbl_8024C1E4
|
||||
/* 8024C1DC 38 80 00 02 */ li r4, 2
|
||||
/* 8024C1E0 48 00 00 24 */ b lbl_8024C204
|
||||
lbl_8024C1E4:
|
||||
/* 8024C1E4 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 8024C1E8 28 00 00 17 */ cmplwi r0, 0x17
|
||||
/* 8024C1EC 40 82 00 0C */ bne lbl_8024C1F8
|
||||
/* 8024C1F0 38 80 00 03 */ li r4, 3
|
||||
/* 8024C1F4 48 00 00 10 */ b lbl_8024C204
|
||||
lbl_8024C1F8:
|
||||
/* 8024C1F8 28 00 00 18 */ cmplwi r0, 0x18
|
||||
/* 8024C1FC 40 82 00 08 */ bne lbl_8024C204
|
||||
/* 8024C200 38 80 00 04 */ li r4, 4
|
||||
lbl_8024C204:
|
||||
/* 8024C204 54 83 06 3E */ clrlwi r3, r4, 0x18
|
||||
/* 8024C208 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 8024C20C 7C 08 03 A6 */ mtlr r0
|
||||
/* 8024C210 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 8024C214 4E 80 00 20 */ blr
|
||||
Reference in New Issue
Block a user