mirror of https://github.com/zeldaret/tp.git
Match a few funcs, optimize some things (#1960)
* match a few nonmatchings * remove unused asm * remove stale docs * add LICENSE.md to project overview in readme
This commit is contained in:
Trueffel
GitHub
parent
6229bba991
commit
69e9173e0f
|
|
@ -34,6 +34,7 @@ tp/
|
|||
├── .clang-format # Clang format file.
|
||||
├── .gitignore # Files/folders to ignore changes to when making commits.
|
||||
├── Doxyfile # Doxygen configuration file.
|
||||
├── LICENSE.md # License file containing information about CC0-1.0
|
||||
├── Makefile # Makefile for the project containing various targets.
|
||||
├── Progress.md # Markdown file that displays the current progress of the project.
|
||||
├── README.md # The file you're currently reading.
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
lbl_802EA1AC:
|
||||
/* 802EA1AC 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 802EA1B0 7C 08 02 A6 */ mflr r0
|
||||
/* 802EA1B4 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 802EA1B8 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 802EA1BC 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 802EA1C0 3C 60 80 3D */ lis r3, __vt__11J2DMaterial@ha /* 0x803CCA78@ha */
|
||||
/* 802EA1C4 38 03 CA 78 */ addi r0, r3, __vt__11J2DMaterial@l /* 0x803CCA78@l */
|
||||
/* 802EA1C8 90 1F 00 00 */ stw r0, 0(r31)
|
||||
/* 802EA1CC 3C 60 80 3D */ lis r3, __vt__13J2DColorBlock@ha /* 0x803CCA84@ha */
|
||||
/* 802EA1D0 38 03 CA 84 */ addi r0, r3, __vt__13J2DColorBlock@l /* 0x803CCA84@l */
|
||||
/* 802EA1D4 90 1F 00 24 */ stw r0, 0x24(r31)
|
||||
/* 802EA1D8 38 7F 00 10 */ addi r3, r31, 0x10
|
||||
/* 802EA1DC 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */
|
||||
/* 802EA1E0 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */
|
||||
/* 802EA1E4 38 A0 00 00 */ li r5, 0
|
||||
/* 802EA1E8 38 C0 00 04 */ li r6, 4
|
||||
/* 802EA1EC 38 E0 00 02 */ li r7, 2
|
||||
/* 802EA1F0 48 07 7B 71 */ bl __construct_array
|
||||
/* 802EA1F4 38 7F 00 1A */ addi r3, r31, 0x1a
|
||||
/* 802EA1F8 3C 80 80 2F */ lis r4, __ct__12J2DColorChanFv@ha /* 0x802EB280@ha */
|
||||
/* 802EA1FC 38 84 B2 80 */ addi r4, r4, __ct__12J2DColorChanFv@l /* 0x802EB280@l */
|
||||
/* 802EA200 38 A0 00 00 */ li r5, 0
|
||||
/* 802EA204 38 C0 00 02 */ li r6, 2
|
||||
/* 802EA208 38 E0 00 04 */ li r7, 4
|
||||
/* 802EA20C 48 07 7B 55 */ bl __construct_array
|
||||
/* 802EA210 38 7F 00 10 */ addi r3, r31, 0x10
|
||||
/* 802EA214 48 00 11 81 */ bl initialize__13J2DColorBlockFv
|
||||
/* 802EA218 3C 60 80 3D */ lis r3, __vt__14J2DTexGenBlock@ha /* 0x803CCF30@ha */
|
||||
/* 802EA21C 38 03 CF 30 */ addi r0, r3, __vt__14J2DTexGenBlock@l /* 0x803CCF30@l */
|
||||
/* 802EA220 90 1F 00 6C */ stw r0, 0x6c(r31)
|
||||
/* 802EA224 38 7F 00 2C */ addi r3, r31, 0x2c
|
||||
/* 802EA228 3C 80 80 2F */ lis r4, __ct__11J2DTexCoordFv@ha /* 0x802EB260@ha */
|
||||
/* 802EA22C 38 84 B2 60 */ addi r4, r4, __ct__11J2DTexCoordFv@l /* 0x802EB260@l */
|
||||
/* 802EA230 38 A0 00 00 */ li r5, 0
|
||||
/* 802EA234 38 C0 00 04 */ li r6, 4
|
||||
/* 802EA238 38 E0 00 08 */ li r7, 8
|
||||
/* 802EA23C 48 07 7B 25 */ bl __construct_array
|
||||
/* 802EA240 38 7F 00 28 */ addi r3, r31, 0x28
|
||||
/* 802EA244 48 00 12 CD */ bl initialize__14J2DTexGenBlockFv
|
||||
/* 802EA248 A0 02 C7 AE */ lhz r0, j2dDefaultAlphaCmp(r2)
|
||||
/* 802EA24C B0 1F 00 78 */ sth r0, 0x78(r31)
|
||||
/* 802EA250 38 00 00 00 */ li r0, 0
|
||||
/* 802EA254 98 1F 00 7A */ stb r0, 0x7a(r31)
|
||||
/* 802EA258 98 1F 00 7B */ stb r0, 0x7b(r31)
|
||||
/* 802EA25C 88 02 C7 A0 */ lbz r0, j2dDefaultBlendInfo(r2)
|
||||
/* 802EA260 98 1F 00 7C */ stb r0, 0x7c(r31)
|
||||
/* 802EA264 38 62 C7 A0 */ la r3, j2dDefaultBlendInfo(r2) /* 804561A0-_SDA2_BASE_ */
|
||||
/* 802EA268 88 03 00 01 */ lbz r0, 1(r3)
|
||||
/* 802EA26C 98 1F 00 7D */ stb r0, 0x7d(r31)
|
||||
/* 802EA270 88 03 00 02 */ lbz r0, 2(r3)
|
||||
/* 802EA274 98 1F 00 7E */ stb r0, 0x7e(r31)
|
||||
/* 802EA278 88 03 00 03 */ lbz r0, 3(r3)
|
||||
/* 802EA27C 98 1F 00 7F */ stb r0, 0x7f(r31)
|
||||
/* 802EA280 38 7F 00 78 */ addi r3, r31, 0x78
|
||||
/* 802EA284 48 00 75 79 */ bl initialize__10J2DPEBlockFv
|
||||
/* 802EA288 38 80 00 00 */ li r4, 0
|
||||
/* 802EA28C 90 9F 00 04 */ stw r4, 4(r31)
|
||||
/* 802EA290 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */
|
||||
/* 802EA294 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */
|
||||
/* 802EA298 B0 1F 00 0C */ sth r0, 0xc(r31)
|
||||
/* 802EA29C 90 9F 00 70 */ stw r4, 0x70(r31)
|
||||
/* 802EA2A0 90 9F 00 74 */ stw r4, 0x74(r31)
|
||||
/* 802EA2A4 90 9F 00 84 */ stw r4, 0x84(r31)
|
||||
/* 802EA2A8 38 00 00 01 */ li r0, 1
|
||||
/* 802EA2AC 90 1F 00 08 */ stw r0, 8(r31)
|
||||
/* 802EA2B0 98 1F 00 0E */ stb r0, 0xe(r31)
|
||||
/* 802EA2B4 7F E3 FB 78 */ mr r3, r31
|
||||
/* 802EA2B8 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 802EA2BC 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 802EA2C0 7C 08 03 A6 */ mtlr r0
|
||||
/* 802EA2C4 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 802EA2C8 4E 80 00 20 */ blr
|
||||
|
|
@ -1,130 +0,0 @@
|
|||
lbl_802EA410:
|
||||
/* 802EA410 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 802EA414 7C 08 02 A6 */ mflr r0
|
||||
/* 802EA418 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 802EA41C 54 80 06 3F */ clrlwi. r0, r4, 0x18
|
||||
/* 802EA420 41 82 00 C4 */ beq lbl_802EA4E4
|
||||
/* 802EA424 2C 03 00 01 */ cmpwi r3, 1
|
||||
/* 802EA428 41 81 00 24 */ bgt lbl_802EA44C
|
||||
/* 802EA42C 38 60 00 60 */ li r3, 0x60
|
||||
/* 802EA430 4B FE 48 1D */ bl __nw__FUl
|
||||
/* 802EA434 7C 60 1B 79 */ or. r0, r3, r3
|
||||
/* 802EA438 41 82 00 0C */ beq lbl_802EA444
|
||||
/* 802EA43C 48 00 14 51 */ bl __ct__12J2DTevBlock1Fv
|
||||
/* 802EA440 7C 60 1B 78 */ mr r0, r3
|
||||
lbl_802EA444:
|
||||
/* 802EA444 7C 03 03 78 */ mr r3, r0
|
||||
/* 802EA448 48 00 01 6C */ b lbl_802EA5B4
|
||||
lbl_802EA44C:
|
||||
/* 802EA44C 2C 03 00 02 */ cmpwi r3, 2
|
||||
/* 802EA450 40 82 00 24 */ bne lbl_802EA474
|
||||
/* 802EA454 38 60 00 7C */ li r3, 0x7c
|
||||
/* 802EA458 4B FE 47 F5 */ bl __nw__FUl
|
||||
/* 802EA45C 7C 60 1B 79 */ or. r0, r3, r3
|
||||
/* 802EA460 41 82 00 0C */ beq lbl_802EA46C
|
||||
/* 802EA464 48 00 21 55 */ bl __ct__12J2DTevBlock2Fv
|
||||
/* 802EA468 7C 60 1B 78 */ mr r0, r3
|
||||
lbl_802EA46C:
|
||||
/* 802EA46C 7C 03 03 78 */ mr r3, r0
|
||||
/* 802EA470 48 00 01 44 */ b lbl_802EA5B4
|
||||
lbl_802EA474:
|
||||
/* 802EA474 2C 03 00 04 */ cmpwi r3, 4
|
||||
/* 802EA478 41 81 00 24 */ bgt lbl_802EA49C
|
||||
/* 802EA47C 38 60 00 B4 */ li r3, 0xb4
|
||||
/* 802EA480 4B FE 47 CD */ bl __nw__FUl
|
||||
/* 802EA484 7C 60 1B 79 */ or. r0, r3, r3
|
||||
/* 802EA488 41 82 00 0C */ beq lbl_802EA494
|
||||
/* 802EA48C 48 00 34 31 */ bl __ct__12J2DTevBlock4Fv
|
||||
/* 802EA490 7C 60 1B 78 */ mr r0, r3
|
||||
lbl_802EA494:
|
||||
/* 802EA494 7C 03 03 78 */ mr r3, r0
|
||||
/* 802EA498 48 00 01 1C */ b lbl_802EA5B4
|
||||
lbl_802EA49C:
|
||||
/* 802EA49C 2C 03 00 08 */ cmpwi r3, 8
|
||||
/* 802EA4A0 41 81 00 24 */ bgt lbl_802EA4C4
|
||||
/* 802EA4A4 38 60 01 24 */ li r3, 0x124
|
||||
/* 802EA4A8 4B FE 47 A5 */ bl __nw__FUl
|
||||
/* 802EA4AC 7C 60 1B 79 */ or. r0, r3, r3
|
||||
/* 802EA4B0 41 82 00 0C */ beq lbl_802EA4BC
|
||||
/* 802EA4B4 48 00 48 B1 */ bl __ct__12J2DTevBlock8Fv
|
||||
/* 802EA4B8 7C 60 1B 78 */ mr r0, r3
|
||||
lbl_802EA4BC:
|
||||
/* 802EA4BC 7C 03 03 78 */ mr r3, r0
|
||||
/* 802EA4C0 48 00 00 F4 */ b lbl_802EA5B4
|
||||
lbl_802EA4C4:
|
||||
/* 802EA4C4 38 60 01 B4 */ li r3, 0x1b4
|
||||
/* 802EA4C8 4B FE 47 85 */ bl __nw__FUl
|
||||
/* 802EA4CC 7C 60 1B 79 */ or. r0, r3, r3
|
||||
/* 802EA4D0 41 82 00 0C */ beq lbl_802EA4DC
|
||||
/* 802EA4D4 48 00 5D 11 */ bl __ct__13J2DTevBlock16Fv
|
||||
/* 802EA4D8 7C 60 1B 78 */ mr r0, r3
|
||||
lbl_802EA4DC:
|
||||
/* 802EA4DC 7C 03 03 78 */ mr r3, r0
|
||||
/* 802EA4E0 48 00 00 D4 */ b lbl_802EA5B4
|
||||
lbl_802EA4E4:
|
||||
/* 802EA4E4 2C 03 00 01 */ cmpwi r3, 1
|
||||
/* 802EA4E8 41 81 00 28 */ bgt lbl_802EA510
|
||||
/* 802EA4EC 38 60 00 60 */ li r3, 0x60
|
||||
/* 802EA4F0 38 80 FF FC */ li r4, -4
|
||||
/* 802EA4F4 4B FE 47 81 */ bl __nw__FUli
|
||||
/* 802EA4F8 7C 60 1B 79 */ or. r0, r3, r3
|
||||
/* 802EA4FC 41 82 00 0C */ beq lbl_802EA508
|
||||
/* 802EA500 48 00 13 8D */ bl __ct__12J2DTevBlock1Fv
|
||||
/* 802EA504 7C 60 1B 78 */ mr r0, r3
|
||||
lbl_802EA508:
|
||||
/* 802EA508 7C 03 03 78 */ mr r3, r0
|
||||
/* 802EA50C 48 00 00 A8 */ b lbl_802EA5B4
|
||||
lbl_802EA510:
|
||||
/* 802EA510 2C 03 00 02 */ cmpwi r3, 2
|
||||
/* 802EA514 40 82 00 28 */ bne lbl_802EA53C
|
||||
/* 802EA518 38 60 00 7C */ li r3, 0x7c
|
||||
/* 802EA51C 38 80 FF FC */ li r4, -4
|
||||
/* 802EA520 4B FE 47 55 */ bl __nw__FUli
|
||||
/* 802EA524 7C 60 1B 79 */ or. r0, r3, r3
|
||||
/* 802EA528 41 82 00 0C */ beq lbl_802EA534
|
||||
/* 802EA52C 48 00 20 8D */ bl __ct__12J2DTevBlock2Fv
|
||||
/* 802EA530 7C 60 1B 78 */ mr r0, r3
|
||||
lbl_802EA534:
|
||||
/* 802EA534 7C 03 03 78 */ mr r3, r0
|
||||
/* 802EA538 48 00 00 7C */ b lbl_802EA5B4
|
||||
lbl_802EA53C:
|
||||
/* 802EA53C 2C 03 00 04 */ cmpwi r3, 4
|
||||
/* 802EA540 41 81 00 28 */ bgt lbl_802EA568
|
||||
/* 802EA544 38 60 00 B4 */ li r3, 0xb4
|
||||
/* 802EA548 38 80 FF FC */ li r4, -4
|
||||
/* 802EA54C 4B FE 47 29 */ bl __nw__FUli
|
||||
/* 802EA550 7C 60 1B 79 */ or. r0, r3, r3
|
||||
/* 802EA554 41 82 00 0C */ beq lbl_802EA560
|
||||
/* 802EA558 48 00 33 65 */ bl __ct__12J2DTevBlock4Fv
|
||||
/* 802EA55C 7C 60 1B 78 */ mr r0, r3
|
||||
lbl_802EA560:
|
||||
/* 802EA560 7C 03 03 78 */ mr r3, r0
|
||||
/* 802EA564 48 00 00 50 */ b lbl_802EA5B4
|
||||
lbl_802EA568:
|
||||
/* 802EA568 2C 03 00 08 */ cmpwi r3, 8
|
||||
/* 802EA56C 41 81 00 28 */ bgt lbl_802EA594
|
||||
/* 802EA570 38 60 01 24 */ li r3, 0x124
|
||||
/* 802EA574 38 80 FF FC */ li r4, -4
|
||||
/* 802EA578 4B FE 46 FD */ bl __nw__FUli
|
||||
/* 802EA57C 7C 60 1B 79 */ or. r0, r3, r3
|
||||
/* 802EA580 41 82 00 0C */ beq lbl_802EA58C
|
||||
/* 802EA584 48 00 47 E1 */ bl __ct__12J2DTevBlock8Fv
|
||||
/* 802EA588 7C 60 1B 78 */ mr r0, r3
|
||||
lbl_802EA58C:
|
||||
/* 802EA58C 7C 03 03 78 */ mr r3, r0
|
||||
/* 802EA590 48 00 00 24 */ b lbl_802EA5B4
|
||||
lbl_802EA594:
|
||||
/* 802EA594 38 60 01 B4 */ li r3, 0x1b4
|
||||
/* 802EA598 38 80 FF FC */ li r4, -4
|
||||
/* 802EA59C 4B FE 46 D9 */ bl __nw__FUli
|
||||
/* 802EA5A0 7C 60 1B 79 */ or. r0, r3, r3
|
||||
/* 802EA5A4 41 82 00 0C */ beq lbl_802EA5B0
|
||||
/* 802EA5A8 48 00 5C 3D */ bl __ct__13J2DTevBlock16Fv
|
||||
/* 802EA5AC 7C 60 1B 78 */ mr r0, r3
|
||||
lbl_802EA5B0:
|
||||
/* 802EA5B0 7C 03 03 78 */ mr r3, r0
|
||||
lbl_802EA5B4:
|
||||
/* 802EA5B4 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 802EA5B8 7C 08 03 A6 */ mtlr r0
|
||||
/* 802EA5BC 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 802EA5C0 4E 80 00 20 */ blr
|
||||
|
|
@ -1,213 +0,0 @@
|
|||
lbl_802594AC:
|
||||
/* 802594AC 94 21 FF C0 */ stwu r1, -0x40(r1)
|
||||
/* 802594B0 7C 08 02 A6 */ mflr r0
|
||||
/* 802594B4 90 01 00 44 */ stw r0, 0x44(r1)
|
||||
/* 802594B8 39 61 00 40 */ addi r11, r1, 0x40
|
||||
/* 802594BC 48 10 8D 1D */ bl _savegpr_28
|
||||
/* 802594C0 7C 7C 1B 78 */ mr r28, r3
|
||||
/* 802594C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 802594C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 802594CC 3B A3 23 3C */ addi r29, r3, 0x233c
|
||||
/* 802594D0 7F A3 EB 78 */ mr r3, r29
|
||||
/* 802594D4 4B E2 DD DD */ bl Move__4dCcSFv
|
||||
/* 802594D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 802594DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 802594E0 3B C3 0F 38 */ addi r30, r3, 0xf38
|
||||
/* 802594E4 7F C3 F3 78 */ mr r3, r30
|
||||
/* 802594E8 4B E1 B4 55 */ bl ClrMoveFlag__4dBgSFv
|
||||
/* 802594EC 4B DC 50 6D */ bl fopOvlpM_IsPeek__Fv
|
||||
/* 802594F0 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 802594F4 40 82 01 B8 */ bne lbl_802596AC
|
||||
/* 802594F8 7F 83 E3 78 */ mr r3, r28
|
||||
/* 802594FC 4B DD 38 49 */ bl dComIfG_resetToOpening__FP11scene_class
|
||||
/* 80259500 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80259504 40 82 01 A8 */ bne lbl_802596AC
|
||||
/* 80259508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8025950C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80259510 88 03 4E 1C */ lbz r0, 0x4e1c(r3)
|
||||
/* 80259514 7C 00 07 75 */ extsb. r0, r0
|
||||
/* 80259518 41 82 01 94 */ beq lbl_802596AC
|
||||
/* 8025951C 88 03 4E 1D */ lbz r0, 0x4e1d(r3)
|
||||
/* 80259520 7C 00 07 74 */ extsb r0, r0
|
||||
/* 80259524 54 1F 06 3E */ clrlwi r31, r0, 0x18
|
||||
/* 80259528 7F 83 E3 78 */ mr r3, r28
|
||||
/* 8025952C 38 80 00 0B */ li r4, 0xb
|
||||
/* 80259530 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e
|
||||
/* 80259534 3C A0 80 3C */ lis r5, l_wipeType@ha /* 0x803C3158@ha */
|
||||
/* 80259538 38 A5 31 58 */ addi r5, r5, l_wipeType@l /* 0x803C3158@l */
|
||||
/* 8025953C 7C A5 02 AE */ lhax r5, r5, r0
|
||||
/* 80259540 38 C0 00 05 */ li r6, 5
|
||||
/* 80259544 4B DC 57 9D */ bl fopScnM_ChangeReq__FP11scene_classssUs
|
||||
/* 80259548 4B F4 64 C9 */ bl dKy_getdaytime_hour__Fv
|
||||
/* 8025954C 38 00 00 00 */ li r0, 0
|
||||
/* 80259550 2C 03 00 06 */ cmpwi r3, 6
|
||||
/* 80259554 41 80 00 10 */ blt lbl_80259564
|
||||
/* 80259558 2C 03 00 12 */ cmpwi r3, 0x12
|
||||
/* 8025955C 40 80 00 08 */ bge lbl_80259564
|
||||
/* 80259560 38 00 00 01 */ li r0, 1
|
||||
lbl_80259564:
|
||||
/* 80259564 54 00 06 3E */ clrlwi r0, r0, 0x18
|
||||
/* 80259568 7C 00 00 34 */ cntlzw r0, r0
|
||||
/* 8025956C 54 03 D9 7E */ srwi r3, r0, 5
|
||||
/* 80259570 38 1F FF FF */ addi r0, r31, -1
|
||||
/* 80259574 54 00 06 3E */ clrlwi r0, r0, 0x18
|
||||
/* 80259578 28 00 00 01 */ cmplwi r0, 1
|
||||
/* 8025957C 40 81 00 5C */ ble lbl_802595D8
|
||||
/* 80259580 28 1F 00 07 */ cmplwi r31, 7
|
||||
/* 80259584 41 82 00 54 */ beq lbl_802595D8
|
||||
/* 80259588 28 1F 00 11 */ cmplwi r31, 0x11
|
||||
/* 8025958C 41 82 00 4C */ beq lbl_802595D8
|
||||
/* 80259590 28 1F 00 15 */ cmplwi r31, 0x15
|
||||
/* 80259594 41 82 00 44 */ beq lbl_802595D8
|
||||
/* 80259598 28 1F 00 08 */ cmplwi r31, 8
|
||||
/* 8025959C 41 82 00 14 */ beq lbl_802595B0
|
||||
/* 802595A0 28 1F 00 0A */ cmplwi r31, 0xa
|
||||
/* 802595A4 41 82 00 0C */ beq lbl_802595B0
|
||||
/* 802595A8 28 1F 00 12 */ cmplwi r31, 0x12
|
||||
/* 802595AC 40 82 00 0C */ bne lbl_802595B8
|
||||
lbl_802595B0:
|
||||
/* 802595B0 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 802595B4 40 82 00 24 */ bne lbl_802595D8
|
||||
lbl_802595B8:
|
||||
/* 802595B8 28 1F 00 09 */ cmplwi r31, 9
|
||||
/* 802595BC 41 82 00 14 */ beq lbl_802595D0
|
||||
/* 802595C0 28 1F 00 0B */ cmplwi r31, 0xb
|
||||
/* 802595C4 41 82 00 0C */ beq lbl_802595D0
|
||||
/* 802595C8 28 1F 00 13 */ cmplwi r31, 0x13
|
||||
/* 802595CC 40 82 00 40 */ bne lbl_8025960C
|
||||
lbl_802595D0:
|
||||
/* 802595D0 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 802595D4 40 82 00 38 */ bne lbl_8025960C
|
||||
lbl_802595D8:
|
||||
/* 802595D8 80 0D 80 8C */ lwz r0, g_saftyWhiteColor(r13)
|
||||
/* 802595DC 90 01 00 1C */ stw r0, 0x1c(r1)
|
||||
/* 802595E0 90 01 00 10 */ stw r0, 0x10(r1)
|
||||
/* 802595E4 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13)
|
||||
/* 802595E8 88 01 00 10 */ lbz r0, 0x10(r1)
|
||||
/* 802595EC 98 03 00 0C */ stb r0, 0xc(r3)
|
||||
/* 802595F0 88 01 00 11 */ lbz r0, 0x11(r1)
|
||||
/* 802595F4 98 03 00 0D */ stb r0, 0xd(r3)
|
||||
/* 802595F8 88 01 00 12 */ lbz r0, 0x12(r1)
|
||||
/* 802595FC 98 03 00 0E */ stb r0, 0xe(r3)
|
||||
/* 80259600 88 01 00 13 */ lbz r0, 0x13(r1)
|
||||
/* 80259604 98 03 00 0F */ stb r0, 0xf(r3)
|
||||
/* 80259608 48 00 00 A4 */ b lbl_802596AC
|
||||
lbl_8025960C:
|
||||
/* 8025960C 28 1F 00 0E */ cmplwi r31, 0xe
|
||||
/* 80259610 41 82 00 0C */ beq lbl_8025961C
|
||||
/* 80259614 28 1F 00 14 */ cmplwi r31, 0x14
|
||||
/* 80259618 40 82 00 64 */ bne lbl_8025967C
|
||||
lbl_8025961C:
|
||||
/* 8025961C 80 02 B5 2C */ lwz r0, lit_4100(r2)
|
||||
/* 80259620 90 01 00 20 */ stw r0, 0x20(r1)
|
||||
/* 80259624 4B F5 2F 59 */ bl dKy_darkworld_check__Fv
|
||||
/* 80259628 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 8025962C 41 82 00 1C */ beq lbl_80259648
|
||||
/* 80259630 38 00 00 FF */ li r0, 0xff
|
||||
/* 80259634 98 01 00 20 */ stb r0, 0x20(r1)
|
||||
/* 80259638 38 00 00 CF */ li r0, 0xcf
|
||||
/* 8025963C 98 01 00 21 */ stb r0, 0x21(r1)
|
||||
/* 80259640 38 00 00 B4 */ li r0, 0xb4
|
||||
/* 80259644 98 01 00 22 */ stb r0, 0x22(r1)
|
||||
lbl_80259648:
|
||||
/* 80259648 80 01 00 20 */ lwz r0, 0x20(r1)
|
||||
/* 8025964C 90 01 00 18 */ stw r0, 0x18(r1)
|
||||
/* 80259650 90 01 00 0C */ stw r0, 0xc(r1)
|
||||
/* 80259654 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13)
|
||||
/* 80259658 88 01 00 0C */ lbz r0, 0xc(r1)
|
||||
/* 8025965C 98 03 00 0C */ stb r0, 0xc(r3)
|
||||
/* 80259660 88 01 00 0D */ lbz r0, 0xd(r1)
|
||||
/* 80259664 98 03 00 0D */ stb r0, 0xd(r3)
|
||||
/* 80259668 88 01 00 0E */ lbz r0, 0xe(r1)
|
||||
/* 8025966C 98 03 00 0E */ stb r0, 0xe(r3)
|
||||
/* 80259670 88 01 00 0F */ lbz r0, 0xf(r1)
|
||||
/* 80259674 98 03 00 0F */ stb r0, 0xf(r3)
|
||||
/* 80259678 48 00 00 34 */ b lbl_802596AC
|
||||
lbl_8025967C:
|
||||
/* 8025967C 80 0D 80 84 */ lwz r0, g_blackColor(r13)
|
||||
/* 80259680 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80259684 90 01 00 08 */ stw r0, 8(r1)
|
||||
/* 80259688 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13)
|
||||
/* 8025968C 88 01 00 08 */ lbz r0, 8(r1)
|
||||
/* 80259690 98 03 00 0C */ stb r0, 0xc(r3)
|
||||
/* 80259694 88 01 00 09 */ lbz r0, 9(r1)
|
||||
/* 80259698 98 03 00 0D */ stb r0, 0xd(r3)
|
||||
/* 8025969C 88 01 00 0A */ lbz r0, 0xa(r1)
|
||||
/* 802596A0 98 03 00 0E */ stb r0, 0xe(r3)
|
||||
/* 802596A4 88 01 00 0B */ lbz r0, 0xb(r1)
|
||||
/* 802596A8 98 03 00 0F */ stb r0, 0xf(r3)
|
||||
lbl_802596AC:
|
||||
/* 802596AC 4B E4 32 15 */ bl reset__10dMdl_mng_cFv
|
||||
/* 802596B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 802596B4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 802596B8 88 1F 5E B5 */ lbz r0, 0x5eb5(r31)
|
||||
/* 802596BC 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 802596C0 40 82 00 60 */ bne lbl_80259720
|
||||
/* 802596C4 88 0D 8B A4 */ lbz r0, pauseTimer__9dScnPly_c+0x0(r13)
|
||||
/* 802596C8 7C 00 07 75 */ extsb. r0, r0
|
||||
/* 802596CC 40 82 00 54 */ bne lbl_80259720
|
||||
/* 802596D0 A8 1C 00 08 */ lha r0, 8(r28)
|
||||
/* 802596D4 2C 00 00 0B */ cmpwi r0, 0xb
|
||||
/* 802596D8 40 82 00 0C */ bne lbl_802596E4
|
||||
/* 802596DC 38 7E 4C 9C */ addi r3, r30, 0x4c9c
|
||||
/* 802596E0 4B E1 5B 89 */ bl Run__12dVibration_cFv
|
||||
lbl_802596E4:
|
||||
/* 802596E4 4B DD 7E C1 */ bl execute__7daSus_cFv
|
||||
/* 802596E8 7F C3 F3 78 */ mr r3, r30
|
||||
/* 802596EC 4B E1 B2 BD */ bl Move__4dBgSFv
|
||||
/* 802596F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 802596F4 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 802596F8 80 7C 5D 3C */ lwz r3, 0x5d3c(r28)
|
||||
/* 802596FC 4B DF 29 7D */ bl calc3D__13dPa_control_cFv
|
||||
/* 80259700 80 7C 5D 3C */ lwz r3, 0x5d3c(r28)
|
||||
/* 80259704 4B DF 29 E9 */ bl calc2D__13dPa_control_cFv
|
||||
/* 80259708 3C 60 80 43 */ lis r3, g_Counter@ha /* 0x80430CD8@ha */
|
||||
/* 8025970C 38 83 0C D8 */ addi r4, r3, g_Counter@l /* 0x80430CD8@l */
|
||||
/* 80259710 80 64 00 08 */ lwz r3, 8(r4)
|
||||
/* 80259714 38 03 00 01 */ addi r0, r3, 1
|
||||
/* 80259718 90 04 00 08 */ stw r0, 8(r4)
|
||||
/* 8025971C 48 00 00 38 */ b lbl_80259754
|
||||
lbl_80259720:
|
||||
/* 80259720 88 0D 89 44 */ lbz r0, mStatus__13dPa_control_c(r13)
|
||||
/* 80259724 60 03 00 01 */ ori r3, r0, 1
|
||||
/* 80259728 98 6D 89 44 */ stb r3, mStatus__13dPa_control_c(r13)
|
||||
/* 8025972C 88 8D 8B A4 */ lbz r4, pauseTimer__9dScnPly_c+0x0(r13)
|
||||
/* 80259730 7C 80 07 75 */ extsb. r0, r4
|
||||
/* 80259734 40 82 00 10 */ bne lbl_80259744
|
||||
/* 80259738 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 8025973C 60 00 00 02 */ ori r0, r0, 2
|
||||
/* 80259740 98 0D 89 44 */ stb r0, mStatus__13dPa_control_c(r13)
|
||||
lbl_80259744:
|
||||
/* 80259744 7C 80 07 75 */ extsb. r0, r4
|
||||
/* 80259748 40 82 00 0C */ bne lbl_80259754
|
||||
/* 8025974C 38 7E 4C 9C */ addi r3, r30, 0x4c9c
|
||||
/* 80259750 4B E1 67 E9 */ bl Pause__12dVibration_cFv
|
||||
lbl_80259754:
|
||||
/* 80259754 4B DC 6C F1 */ bl fopDwIt_Begin__Fv
|
||||
/* 80259758 7C 7C 1B 78 */ mr r28, r3
|
||||
/* 8025975C 48 00 00 18 */ b lbl_80259774
|
||||
lbl_80259760:
|
||||
/* 80259760 80 7C 00 0C */ lwz r3, 0xc(r28)
|
||||
/* 80259764 4B DC 89 3D */ bl fpcM_Draw__FPv
|
||||
/* 80259768 7F 83 E3 78 */ mr r3, r28
|
||||
/* 8025976C 4B DC 6D 15 */ bl fopDwIt_Next__FP16create_tag_class
|
||||
/* 80259770 7C 7C 1B 78 */ mr r28, r3
|
||||
lbl_80259774:
|
||||
/* 80259774 28 1C 00 00 */ cmplwi r28, 0
|
||||
/* 80259778 40 82 FF E8 */ bne lbl_80259760
|
||||
/* 8025977C 88 1F 5E B5 */ lbz r0, 0x5eb5(r31)
|
||||
/* 80259780 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 80259784 40 82 00 18 */ bne lbl_8025979C
|
||||
/* 80259788 4B E4 32 C1 */ bl update__12dEyeHL_mng_cFv
|
||||
/* 8025978C 7F A3 EB 78 */ mr r3, r29
|
||||
/* 80259790 4B E2 DB 41 */ bl Draw__4dCcSFv
|
||||
/* 80259794 38 7E 47 80 */ addi r3, r30, 0x4780
|
||||
/* 80259798 4B E1 94 3D */ bl Draw__12dAttention_cFv
|
||||
lbl_8025979C:
|
||||
/* 8025979C 38 60 00 01 */ li r3, 1
|
||||
/* 802597A0 39 61 00 40 */ addi r11, r1, 0x40
|
||||
/* 802597A4 48 10 8A 81 */ bl _restgpr_28
|
||||
/* 802597A8 80 01 00 44 */ lwz r0, 0x44(r1)
|
||||
/* 802597AC 7C 08 03 A6 */ mtlr r0
|
||||
/* 802597B0 38 21 00 40 */ addi r1, r1, 0x40
|
||||
/* 802597B4 4E 80 00 20 */ blr
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
Contributing
|
||||
=================
|
||||
Ghidra Setup
|
||||
-----
|
||||
1. Install [Java 11 64-bit Runtime and Development Kit](https://www.oracle.com/java/technologies/javase/jdk11-archive-downloads.html).
|
||||
2. Download Ghidra from [here](https://github.com/NationalSecurityAgency/ghidra/releases).
|
||||
3. Download the Ghidra-GameCube-Loader from [here](https://github.com/Cuyler36/Ghidra-GameCube-Loader/releases). Follow the Installation Instructions for installing.
|
||||
4. Open a pull request against [this repo](https://github.com/zsrtp/tp-ghidra-server), adding your desired username and permissions level into users.yaml
|
||||
5. Login using the following server info:
|
||||
|
||||
```
|
||||
Server: ghidra.tpgz.io
|
||||
Port: 13100
|
||||
Username: <your_username>
|
||||
Password: changeme
|
||||
```
|
||||
|
||||
You will be prompted to change your password at login. After logging in, you will see a list of all the Twilight Princess DOLs for each version.
|
||||
|
||||
|
||||
|
||||
Getting Started
|
||||
-----
|
||||
To begin, select a file to begin work on. You can check what files are available on [Trello](https://trello.com/b/Y04SAxbw/twilight-princess-decompilation).
|
||||
|
||||
This project has been automatically generated using `dol2asm`. This process generates blank headers for every source file, default includes, necessary types to be used within the file, forward references, and external references of data / functions used within the file's functions. Additionally, all data and functions have been split and generated with default types.
|
||||
|
||||
When decompiling a file, you will need to manually fix structs/classes, function return types, data types, and data definitions. Parameters are already setup for any function with a mangled name. Some functions / data may need to be changed to be auto-generated by the compiler, such as by inlining functions or making data in-function static.
|
||||
|
||||
The TP Nvidia Shield Debug Rom contains extra useful info, as it was compiled with less aggressive function inlining, and also contains debug tools / debug strings. While the primary focus currently is on the NTSC-U GameCube version, it is highly recommended to reference the Debug rom for help / documentation.
|
||||
|
||||
### diff.py
|
||||
`diff.py` is the tool we use to fix matching errors. You can invoke `diff.py` from command line like:
|
||||
`python diff.py -mwo mangled_symbol_name`
|
||||
- `-m` will run make before opening diff.
|
||||
- `-w` will automatically update the diff when you save your changes.
|
||||
- `-o` will diff only the necessary `.o` file, which is recommended for this project.
|
||||
- `-f` can be used to specify a specific object file to use when diffing with `-o` (Used to diff rels)
|
||||
- You can find the mangled symbol name in the function info comment. (Ex. `onEventBit__11dSv_event_cFUs`)
|
||||
|
||||
NOTE: You must run `./tp expected` with an OK build before diffing to have a correct binary to compare to.
|
||||
|
||||
You can install the requirements for `diff.py` by running `pip install -r tools/requirements.txt`.
|
||||
|
||||
### tp.py
|
||||
`tp.py` is a multi-purpose tool that can be used for things such as checking SHA1 checksums, current decompilation progress, and removing unused assembly files.
|
||||
You can invoke `tp.py` from command line either directly in the `tools/` folder, or by running the `tp` bash script.
|
||||
Useful commands:
|
||||
- `check` - Compares the SHA1 checksums of your current build to the ones of the expected build. Add `--rels` to check rel checksums.
|
||||
- `expected` - Copies your current build folder to the expected build folder.
|
||||
- `progress` - Calculates and displays the decompilation progress of the main dol. Add `--rels` to calculate rel progress.
|
||||
- `remove-unused-asm` - Finds and removes all assembly files that are no longer being used.
|
||||
- `pull-request` - Verifies that everything is OK before you set up a pull request.
|
||||
|
||||
### decomp.me
|
||||
[decomp.me](https://decomp.me/) is a very useful website for sharing individual functions with other contributers.
|
||||
To use decomp.me with TP, select the `GameCube / Wii` platform and `Twilight Princess` compiler preset. Enter your function's mangled name under `Function name`, and copy / paste the function assembly from the project into the `Target assembly` box. Provide any necessary context within the provided box, then create your scratch.
|
||||
|
||||
From here you can use the built-in editor to write your function code. Make sure to save the scratch when you are done, then you can copy and share the URL to receive help matching the function.
|
||||
BIN
docs/ghidra.png
BIN
docs/ghidra.png
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
|
|
@ -145,7 +145,6 @@ SECTION_DATA extern void* __vt__13J2DColorBlock[3] = {
|
|||
};
|
||||
|
||||
/* 802EA1AC-802EA2CC 2E4AEC 0120+00 0/0 1/1 0/0 .text __ct__11J2DMaterialFv */
|
||||
#ifdef NONMATCHING
|
||||
J2DMaterial::J2DMaterial() {
|
||||
field_0x4 = 0;
|
||||
mIndex = -1;
|
||||
|
|
@ -155,16 +154,6 @@ J2DMaterial::J2DMaterial() {
|
|||
field_0x8 = 1;
|
||||
mVisible = true;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm J2DMaterial::J2DMaterial() {
|
||||
nofralloc
|
||||
#include "asm/JSystem/J2DGraph/J2DMaterial/__ct__11J2DMaterialFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 802EA2CC-802EA38C 2E4C0C 00C0+00 1/0 2/2 0/0 .text __dt__11J2DMaterialFv */
|
||||
#pragma push
|
||||
|
|
@ -196,7 +185,6 @@ void J2DMaterial::setGX() {
|
|||
}
|
||||
|
||||
/* 802EA410-802EA5C4 2E4D50 01B4+00 0/0 1/1 0/0 .text createTevBlock__11J2DMaterialFib */
|
||||
#ifdef NONMATCHING
|
||||
J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) {
|
||||
J2DTevBlock* block;
|
||||
|
||||
|
|
@ -228,16 +216,6 @@ J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) {
|
|||
|
||||
return block;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm J2DTevBlock* J2DMaterial::createTevBlock(int param_0, bool param_1) {
|
||||
nofralloc
|
||||
#include "asm/JSystem/J2DGraph/J2DMaterial/createTevBlock__11J2DMaterialFib.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 802EA5C4-802EA79C 2E4F04 01D8+00 0/0 1/1 0/0 .text createIndBlock__11J2DMaterialFib */
|
||||
J2DIndBlock* J2DMaterial::createIndBlock(int block_type, bool noAlign) {
|
||||
|
|
|
|||
|
|
@ -662,8 +662,7 @@ void dMenu_Fishing_c::setHIO(bool param_0) {
|
|||
|
||||
/* 801C659C-801C65BC 1C0EDC 0020+00 1/0 0/0 0/0 .text draw__15dMenu_Fishing_cFv */
|
||||
#ifdef NONMATCHING
|
||||
// Matches but TU has to be finished and
|
||||
// cleaned up with every other function
|
||||
// vtable padding
|
||||
void dMenu_Fishing_c::draw() {
|
||||
_draw();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,9 @@
|
|||
#include "d/meter/d_meter_HIO.h"
|
||||
#include "d/save/d_save.h"
|
||||
#include "dol2asm.h"
|
||||
#include "JSystem/JKernel/JKRArchive.h"
|
||||
#include "m_Do/m_Do_ext.h"
|
||||
#include "JSystem/JKernel/JKRExpHeap.h"
|
||||
#include "global.h"
|
||||
|
||||
//
|
||||
|
|
@ -1685,6 +1688,7 @@ dMeter_fmapHIO_c::dMeter_fmapHIO_c() {
|
|||
}
|
||||
|
||||
/* 80200BCC-80200CD4 1FB50C 0108+00 2/1 0/0 0/0 .text __dt__16dMeter_fmapHIO_cFv */
|
||||
// Matches with dMeter_mapIconHIO_c dtor defined instead of declared in the header
|
||||
#ifdef NONMATCHING
|
||||
dMeter_fmapHIO_c::~dMeter_fmapHIO_c() {
|
||||
if (field_0xc != NULL) {
|
||||
|
|
@ -1702,8 +1706,6 @@ dMeter_fmapHIO_c::~dMeter_fmapHIO_c() {
|
|||
delete field_0x8;
|
||||
field_0x8 = NULL;
|
||||
}
|
||||
|
||||
delete mMapIconHIO;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
|
|
|
|||
|
|
@ -7,37 +7,27 @@
|
|||
#include "JSystem/JUtility/JUTConsole.h"
|
||||
#include "JSystem/JUtility/JUTGamePad.h"
|
||||
#include "SSystem/SComponent/c_counter.h"
|
||||
#include "c/c_dylink.h"
|
||||
#include "d/a/d_a_player.h"
|
||||
#include "d/d_demo.h"
|
||||
#include "d/d_eye_hl.h"
|
||||
#include "d/d_item.h"
|
||||
#include "d/d_model.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/map/d_map_path_dmap.h"
|
||||
#include "d/meter/d_meter2_info.h"
|
||||
#include "d/msg/d_msg_object.h"
|
||||
#include "d/save/d_save_HIO.h"
|
||||
#include "dol2asm.h"
|
||||
#include "f_op/f_op_draw_iter.h"
|
||||
#include "f_op/f_op_msg_mng.h"
|
||||
#include "f_op/f_op_overlap_mng.h"
|
||||
#include "f_op/f_op_scene_mng.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include "m_Do/m_Do_Reset.h"
|
||||
#include "m_Do/m_Do_audio.h"
|
||||
#include "m_Do/m_Do_graphic.h"
|
||||
#include "d/d_eye_hl.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct daSus_c {
|
||||
/* 800313BC */ void reset();
|
||||
/* 800315A4 */ static void execute();
|
||||
};
|
||||
|
||||
struct cDylPhs {
|
||||
/* 8001884C */ void Link(request_of_phase_process_class*, s16);
|
||||
/* 80018890 */ void Unlink(request_of_phase_process_class*, s16);
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
#include "rel/d/a/d_a_suspend/d_a_suspend.h"
|
||||
|
||||
extern "C" void calcPauseTimer__9dScnPly_cFv();
|
||||
extern "C" void __ct__22dScnPly_env_otherHIO_cFv();
|
||||
|
|
@ -378,13 +368,7 @@ asm dScnPly_env_debugHIO_c::dScnPly_env_debugHIO_c() {
|
|||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80454F2C-80454F30 00352C 0004+00 1/1 0/0 0/0 .sdata2 @4100 */
|
||||
SECTION_SDATA2 static u32 lit_4100 = 0x2A1E46FF;
|
||||
|
||||
/* 802594AC-802597B8 253DEC 030C+00 1/0 0/0 0/0 .text dScnPly_Draw__FP9dScnPly_c */
|
||||
// bool comparison issues
|
||||
#ifdef NONMATCHING
|
||||
static int dScnPly_Draw(dScnPly_c* scn) {
|
||||
dComIfG_Ccsp()->Move();
|
||||
dComIfG_Bgsp().ClrMoveFlag();
|
||||
|
|
@ -396,11 +380,8 @@ static int dScnPly_Draw(dScnPly_c* scn) {
|
|||
fopScnM_ChangeReq(scn, 11, l_wipeType[wipe], 5);
|
||||
|
||||
int hour = dKy_getdaytime_hour();
|
||||
useWhiteColor = false;
|
||||
if (hour >= 6 && hour < 18) {
|
||||
useWhiteColor = true;
|
||||
}
|
||||
bool tmp = useWhiteColor == 0;
|
||||
useWhiteColor = hour >= 6 && hour < 18 ? true : false;
|
||||
BOOL tmp = useWhiteColor == 0 ? 1 : 0;
|
||||
|
||||
if (wipe == 1 || wipe == 2 || wipe == 7 || wipe == 17 || wipe == 21 ||
|
||||
((wipe == 8 || wipe == 10 || wipe == 18) && tmp) ||
|
||||
|
|
@ -434,9 +415,9 @@ static int dScnPly_Draw(dScnPly_c* scn) {
|
|||
dPa_control_c::onStatus(1);
|
||||
if (dScnPly_c::pauseTimer == 0) {
|
||||
dPa_control_c::onStatus(2);
|
||||
if (dScnPly_c::pauseTimer == 0) {
|
||||
dComIfGp_getVibration().Pause();
|
||||
}
|
||||
}
|
||||
if (dScnPly_c::pauseTimer == 0) {
|
||||
dComIfGp_getVibration().Pause();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -452,16 +433,6 @@ static int dScnPly_Draw(dScnPly_c* scn) {
|
|||
|
||||
return 1;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void dScnPly_Draw(dScnPly_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/d/s/d_s_play/dScnPly_Draw__FP9dScnPly_c.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 802597B8-8025987C 2540F8 00C4+00 1/0 0/0 0/0 .text dScnPly_Execute__FP9dScnPly_c */
|
||||
static int dScnPly_Execute(dScnPly_c* scnPly) {
|
||||
|
|
@ -808,11 +779,11 @@ static asm int phase_2(dScnPly_c* param_0) {
|
|||
static int phase_3(dScnPly_c* scn) {
|
||||
if ((scn->sceneCommand != NULL && !scn->sceneCommand->sync()) || mDoAud_check1stDynamicWave()) {
|
||||
return cPhs_INIT_e;
|
||||
} else if (!scn->field_0x1d0 == NULL && !scn->field_0x1d0->sync()) {
|
||||
}
|
||||
if (!scn->field_0x1d0 == NULL && !scn->field_0x1d0->sync()) {
|
||||
return cPhs_INIT_e;
|
||||
} else {
|
||||
return cPhs_NEXT_e;
|
||||
}
|
||||
}
|
||||
return cPhs_NEXT_e;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
|
|
|
|||
Loading…
Reference in New Issue