d_kankyo_wether / d_eye_hl (#178)

* d_eye_hl / d_kankyo_wether wip

* more d_kankyo_wether + format

* remove asm

* some d_kankyo wip

* fix dccs vtable

* some m_Do_graphic / d_meter2_draw work
This commit is contained in:
TakaRikka
2022-01-25 12:24:14 -08:00
committed by GitHub
parent 6f4d068f1d
commit 612f26c132
241 changed files with 3715 additions and 9755 deletions
@@ -1,20 +0,0 @@
lbl_80007F90:
/* 80007F90 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80007F94 7C 08 02 A6 */ mflr r0
/* 80007F98 90 01 00 14 */ stw r0, 0x14(r1)
/* 80007F9C 88 0D 86 68 */ lbz r0, data_80450BE8(r13)
/* 80007FA0 28 00 00 00 */ cmplwi r0, 0
/* 80007FA4 41 82 00 10 */ beq lbl_80007FB4
/* 80007FA8 38 00 FF FF */ li r0, -1
/* 80007FAC 80 6D 8F D0 */ lwz r3, sManager__6JUTXfb(r13)
/* 80007FB0 B0 03 00 14 */ sth r0, 0x14(r3)
lbl_80007FB4:
/* 80007FB4 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13)
/* 80007FB8 81 83 00 00 */ lwz r12, 0(r3)
/* 80007FBC 81 8C 00 08 */ lwz r12, 8(r12)
/* 80007FC0 7D 89 03 A6 */ mtctr r12
/* 80007FC4 4E 80 04 21 */ bctrl
/* 80007FC8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80007FCC 7C 08 03 A6 */ mtlr r0
/* 80007FD0 38 21 00 10 */ addi r1, r1, 0x10
/* 80007FD4 4E 80 00 20 */ blr
@@ -1,47 +0,0 @@
lbl_80009544:
/* 80009544 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80009548 7C 08 02 A6 */ mflr r0
/* 8000954C 90 01 00 24 */ stw r0, 0x24(r1)
/* 80009550 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80009554 93 C1 00 18 */ stw r30, 0x18(r1)
/* 80009558 7C 7E 1B 78 */ mr r30, r3
/* 8000955C 80 03 00 10 */ lwz r0, 0x10(r3)
/* 80009560 28 00 00 00 */ cmplwi r0, 0
/* 80009564 40 82 00 7C */ bne lbl_800095E0
/* 80009568 38 60 01 30 */ li r3, 0x130
/* 8000956C 38 80 00 E0 */ li r4, 0xe0
/* 80009570 38 A0 00 06 */ li r5, 6
/* 80009574 38 C0 00 00 */ li r6, 0
/* 80009578 38 E0 00 00 */ li r7, 0
/* 8000957C 48 35 46 A1 */ bl GXGetTexBufferSize
/* 80009580 7C 7F 1B 78 */ mr r31, r3
/* 80009584 48 00 58 69 */ bl mDoExt_getArchiveHeap__Fv
/* 80009588 7F E4 FB 78 */ mr r4, r31
/* 8000958C 38 A0 FF E0 */ li r5, -32
/* 80009590 48 2C 4F 45 */ bl alloc__7JKRHeapFUli
/* 80009594 90 7E 00 10 */ stw r3, 0x10(r30)
/* 80009598 38 00 00 00 */ li r0, 0
/* 8000959C 98 1E 00 08 */ stb r0, 8(r30)
/* 800095A0 98 1E 00 09 */ stb r0, 9(r30)
/* 800095A4 38 60 00 80 */ li r3, 0x80
/* 800095A8 98 7E 00 0A */ stb r3, 0xa(r30)
/* 800095AC 38 00 00 40 */ li r0, 0x40
/* 800095B0 98 1E 00 0B */ stb r0, 0xb(r30)
/* 800095B4 98 7E 00 0C */ stb r3, 0xc(r30)
/* 800095B8 80 02 80 B0 */ lwz r0, lit_4505(r2)
/* 800095BC 90 01 00 08 */ stw r0, 8(r1)
/* 800095C0 88 01 00 08 */ lbz r0, 8(r1)
/* 800095C4 98 1E 00 00 */ stb r0, 0(r30)
/* 800095C8 88 01 00 09 */ lbz r0, 9(r1)
/* 800095CC 98 1E 00 01 */ stb r0, 1(r30)
/* 800095D0 88 01 00 0A */ lbz r0, 0xa(r1)
/* 800095D4 98 1E 00 02 */ stb r0, 2(r30)
/* 800095D8 88 01 00 0B */ lbz r0, 0xb(r1)
/* 800095DC 98 1E 00 03 */ stb r0, 3(r30)
lbl_800095E0:
/* 800095E0 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 800095E4 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 800095E8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 800095EC 7C 08 03 A6 */ mtlr r0
/* 800095F0 38 21 00 20 */ addi r1, r1, 0x20
/* 800095F4 4E 80 00 20 */ blr
@@ -1,12 +0,0 @@
lbl_80008424:
/* 80008424 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80008428 7C 08 02 A6 */ mflr r0
/* 8000842C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80008430 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80008434 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80008438 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 8000843C 48 04 E0 FD */ bl reset__12dDlst_list_cFv
/* 80008440 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80008444 7C 08 03 A6 */ mtlr r0
/* 80008448 38 21 00 10 */ addi r1, r1, 0x10
/* 8000844C 4E 80 00 20 */ blr
-31
View File
@@ -1,31 +0,0 @@
lbl_8000A58C:
/* 8000A58C 94 21 FF C0 */ stwu r1, -0x40(r1)
/* 8000A590 7C 08 02 A6 */ mflr r0
/* 8000A594 90 01 00 44 */ stw r0, 0x44(r1)
/* 8000A598 93 E1 00 3C */ stw r31, 0x3c(r1)
/* 8000A59C 38 61 00 08 */ addi r3, r1, 8
/* 8000A5A0 48 1A D0 49 */ bl setupItem3D__17dMenu_Collect3D_cFPA4_f
/* 8000A5A4 4B FF FF 61 */ bl setLight__Fv
/* 8000A5A8 38 61 00 08 */ addi r3, r1, 8
/* 8000A5AC 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */
/* 8000A5B0 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */
/* 8000A5B4 48 33 BE FD */ bl PSMTXCopy
/* 8000A5B8 38 60 00 01 */ li r3, 1
/* 8000A5BC 48 35 60 15 */ bl GXSetClipMode
/* 8000A5C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8000A5C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8000A5C8 3B E3 5F 64 */ addi r31, r3, 0x5f64
/* 8000A5CC 7F E3 FB 78 */ mr r3, r31
/* 8000A5D0 48 04 C1 7D */ bl drawOpaListItem3d__12dDlst_list_cFv
/* 8000A5D4 7F E3 FB 78 */ mr r3, r31
/* 8000A5D8 48 04 C1 99 */ bl drawXluListItem3d__12dDlst_list_cFv
/* 8000A5DC 38 60 00 00 */ li r3, 0
/* 8000A5E0 48 35 5F F1 */ bl GXSetClipMode
/* 8000A5E4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
/* 8000A5E8 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
/* 8000A5EC 48 30 61 51 */ bl reinitGX__6J3DSysFv
/* 8000A5F0 83 E1 00 3C */ lwz r31, 0x3c(r1)
/* 8000A5F4 80 01 00 44 */ lwz r0, 0x44(r1)
/* 8000A5F8 7C 08 03 A6 */ mtlr r0
/* 8000A5FC 38 21 00 40 */ addi r1, r1, 0x40
/* 8000A600 4E 80 00 20 */ blr
@@ -1,10 +0,0 @@
lbl_800080D0:
/* 800080D0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800080D4 7C 08 02 A6 */ mflr r0
/* 800080D8 90 01 00 14 */ stw r0, 0x14(r1)
/* 800080DC 38 6D 80 80 */ la r3, g_clearColor(r13) /* 80450600-_SDA_BASE_ */
/* 800080E0 4B FF FE F9 */ bl fadeOut__13mDoGph_gInf_cFfR8_GXColor
/* 800080E4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800080E8 7C 08 03 A6 */ mtlr r0
/* 800080EC 38 21 00 10 */ addi r1, r1, 0x10
/* 800080F0 4E 80 00 20 */ blr
@@ -1,23 +0,0 @@
lbl_80007FD8:
/* 80007FD8 38 00 00 01 */ li r0, 1
/* 80007FDC 98 0D 86 66 */ stb r0, struct_80450BE4+0x2(r13)
/* 80007FE0 D0 2D 86 60 */ stfs f1, mFadeSpeed__13mDoGph_gInf_c(r13)
/* 80007FE4 88 03 00 00 */ lbz r0, 0(r3)
/* 80007FE8 98 0D 80 14 */ stb r0, mFadeColor__13mDoGph_gInf_c(r13)
/* 80007FEC 88 03 00 01 */ lbz r0, 1(r3)
/* 80007FF0 38 8D 80 14 */ la r4, mFadeColor__13mDoGph_gInf_c(r13) /* 80450594-_SDA_BASE_ */
/* 80007FF4 98 04 00 01 */ stb r0, 1(r4)
/* 80007FF8 88 03 00 02 */ lbz r0, 2(r3)
/* 80007FFC 98 04 00 02 */ stb r0, 2(r4)
/* 80008000 88 03 00 03 */ lbz r0, 3(r3)
/* 80008004 98 04 00 03 */ stb r0, 3(r4)
/* 80008008 C0 02 80 38 */ lfs f0, lit_4062(r2)
/* 8000800C FC 01 00 40 */ fcmpo cr0, f1, f0
/* 80008010 4C 41 13 82 */ cror 2, 1, 2
/* 80008014 40 82 00 08 */ bne lbl_8000801C
/* 80008018 48 00 00 08 */ b lbl_80008020
lbl_8000801C:
/* 8000801C C0 02 80 3C */ lfs f0, lit_4063(r2)
lbl_80008020:
/* 80008020 D0 0D 86 5C */ stfs f0, mFadeRate__13mDoGph_gInf_c(r13)
/* 80008024 4E 80 00 20 */ blr
@@ -1,23 +0,0 @@
lbl_80008028:
/* 80008028 38 00 00 81 */ li r0, 0x81
/* 8000802C 98 0D 86 66 */ stb r0, struct_80450BE4+0x2(r13)
/* 80008030 D0 2D 86 60 */ stfs f1, mFadeSpeed__13mDoGph_gInf_c(r13)
/* 80008034 88 03 00 00 */ lbz r0, 0(r3)
/* 80008038 98 0D 80 14 */ stb r0, mFadeColor__13mDoGph_gInf_c(r13)
/* 8000803C 88 03 00 01 */ lbz r0, 1(r3)
/* 80008040 38 8D 80 14 */ la r4, mFadeColor__13mDoGph_gInf_c(r13) /* 80450594-_SDA_BASE_ */
/* 80008044 98 04 00 01 */ stb r0, 1(r4)
/* 80008048 88 03 00 02 */ lbz r0, 2(r3)
/* 8000804C 98 04 00 02 */ stb r0, 2(r4)
/* 80008050 88 03 00 03 */ lbz r0, 3(r3)
/* 80008054 98 04 00 03 */ stb r0, 3(r4)
/* 80008058 C0 02 80 38 */ lfs f0, lit_4062(r2)
/* 8000805C FC 01 00 40 */ fcmpo cr0, f1, f0
/* 80008060 4C 41 13 82 */ cror 2, 1, 2
/* 80008064 40 82 00 08 */ bne lbl_8000806C
/* 80008068 48 00 00 08 */ b lbl_80008070
lbl_8000806C:
/* 8000806C C0 02 80 3C */ lfs f0, lit_4063(r2)
lbl_80008070:
/* 80008070 D0 0D 86 5C */ stfs f0, mFadeRate__13mDoGph_gInf_c(r13)
/* 80008074 4E 80 00 20 */ blr
@@ -1,10 +0,0 @@
lbl_80008450:
/* 80008450 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80008454 7C 08 02 A6 */ mflr r0
/* 80008458 90 01 00 14 */ stw r0, 0x14(r1)
/* 8000845C 4B FF FF C9 */ bl dScnPly_BeforeOfPaint__Fv
/* 80008460 38 60 00 01 */ li r3, 1
/* 80008464 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80008468 7C 08 03 A6 */ mtlr r0
/* 8000846C 38 21 00 10 */ addi r1, r1, 0x10
/* 80008470 4E 80 00 20 */ blr
-24
View File
@@ -1,24 +0,0 @@
lbl_8000B174:
/* 8000B174 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8000B178 7C 08 02 A6 */ mflr r0
/* 8000B17C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8000B180 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8000B184 38 60 00 00 */ li r3, 0
/* 8000B188 38 80 00 00 */ li r4, 0
/* 8000B18C 38 A0 00 00 */ li r5, 0
/* 8000B190 48 00 3E 2D */ bl mDoExt_createSolidHeapToCurrent__FUlP7JKRHeapUl
/* 8000B194 7C 7F 1B 78 */ mr r31, r3
/* 8000B198 4B FF CC AD */ bl create__13mDoGph_gInf_cFv
/* 8000B19C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8000B1A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8000B1A4 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 8000B1A8 48 04 B1 E9 */ bl init__12dDlst_list_cFv
/* 8000B1AC 7F E3 FB 78 */ mr r3, r31
/* 8000B1B0 48 00 3E DD */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap
/* 8000B1B4 48 00 40 41 */ bl mDoExt_restoreCurrentHeap__Fv
/* 8000B1B8 38 60 00 01 */ li r3, 1
/* 8000B1BC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8000B1C0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8000B1C4 7C 08 03 A6 */ mtlr r0
/* 8000B1C8 38 21 00 10 */ addi r1, r1, 0x10
/* 8000B1CC 4E 80 00 20 */ blr
@@ -1,37 +0,0 @@
lbl_800094B4:
/* 800094B4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800094B8 7C 08 02 A6 */ mflr r0
/* 800094BC 90 01 00 14 */ stw r0, 0x14(r1)
/* 800094C0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800094C4 93 C1 00 08 */ stw r30, 8(r1)
/* 800094C8 7C 7E 1B 78 */ mr r30, r3
/* 800094CC 7C 9F 23 78 */ mr r31, r4
/* 800094D0 38 60 00 80 */ li r3, 0x80
/* 800094D4 38 80 00 00 */ li r4, 0
/* 800094D8 38 A0 00 04 */ li r5, 4
/* 800094DC 48 35 32 89 */ bl GXBegin
/* 800094E0 38 80 00 00 */ li r4, 0
/* 800094E4 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */
/* 800094E8 98 83 80 00 */ stb r4, 0x8000(r3) /* 0xCC008000@l */
/* 800094EC 98 83 80 00 */ stb r4, -0x8000(r3)
/* 800094F0 98 83 80 00 */ stb r4, -0x8000(r3)
/* 800094F4 98 83 80 00 */ stb r4, -0x8000(r3)
/* 800094F8 9B C3 80 00 */ stb r30, -0x8000(r3)
/* 800094FC 98 83 80 00 */ stb r4, -0x8000(r3)
/* 80009500 38 00 00 01 */ li r0, 1
/* 80009504 98 03 80 00 */ stb r0, -0x8000(r3)
/* 80009508 98 83 80 00 */ stb r4, -0x8000(r3)
/* 8000950C 9B C3 80 00 */ stb r30, -0x8000(r3)
/* 80009510 9B E3 80 00 */ stb r31, -0x8000(r3)
/* 80009514 98 03 80 00 */ stb r0, -0x8000(r3)
/* 80009518 98 03 80 00 */ stb r0, -0x8000(r3)
/* 8000951C 98 83 80 00 */ stb r4, -0x8000(r3)
/* 80009520 9B E3 80 00 */ stb r31, -0x8000(r3)
/* 80009524 98 83 80 00 */ stb r4, -0x8000(r3)
/* 80009528 98 03 80 00 */ stb r0, -0x8000(r3)
/* 8000952C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80009530 83 C1 00 08 */ lwz r30, 8(r1)
/* 80009534 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80009538 7C 08 03 A6 */ mtlr r0
/* 8000953C 38 21 00 10 */ addi r1, r1, 0x10
/* 80009540 4E 80 00 20 */ blr
@@ -1,13 +0,0 @@
lbl_800080A0:
/* 800080A0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800080A4 7C 08 02 A6 */ mflr r0
/* 800080A8 90 01 00 14 */ stw r0, 0x14(r1)
/* 800080AC 38 00 00 01 */ li r0, 1
/* 800080B0 98 0D 86 64 */ stb r0, struct_80450BE4+0x0(r13)
/* 800080B4 3C 80 80 3E */ lis r4, mBlureMtx__13mDoGph_gInf_c@ha /* 0x803DD43C@ha */
/* 800080B8 38 84 D4 3C */ addi r4, r4, mBlureMtx__13mDoGph_gInf_c@l /* 0x803DD43C@l */
/* 800080BC 48 33 E3 F5 */ bl PSMTXCopy
/* 800080C0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800080C4 7C 08 03 A6 */ mtlr r0
/* 800080C8 38 21 00 10 */ addi r1, r1, 0x10
/* 800080CC 4E 80 00 20 */ blr
@@ -1,11 +0,0 @@
lbl_80008078:
/* 80008078 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8000807C 7C 08 02 A6 */ mflr r0
/* 80008080 90 01 00 14 */ stw r0, 0x14(r1)
/* 80008084 3C 60 80 3A */ lis r3, g_mDoMtx_identity@ha /* 0x803A2FD8@ha */
/* 80008088 38 63 2F D8 */ addi r3, r3, g_mDoMtx_identity@l /* 0x803A2FD8@l */
/* 8000808C 48 00 00 15 */ bl onBlure__13mDoGph_gInf_cFPA4_Cf
/* 80008090 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80008094 7C 08 03 A6 */ mtlr r0
/* 80008098 38 21 00 10 */ addi r1, r1, 0x10
/* 8000809C 4E 80 00 20 */ blr
@@ -1,24 +0,0 @@
lbl_800095F8:
/* 800095F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800095FC 7C 08 02 A6 */ mflr r0
/* 80009600 90 01 00 14 */ stw r0, 0x14(r1)
/* 80009604 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80009608 93 C1 00 08 */ stw r30, 8(r1)
/* 8000960C 7C 7E 1B 78 */ mr r30, r3
/* 80009610 83 E3 00 10 */ lwz r31, 0x10(r3)
/* 80009614 28 1F 00 00 */ cmplwi r31, 0
/* 80009618 41 82 00 18 */ beq lbl_80009630
/* 8000961C 48 00 57 D1 */ bl mDoExt_getArchiveHeap__Fv
/* 80009620 7F E4 FB 78 */ mr r4, r31
/* 80009624 48 2C 4F 25 */ bl free__7JKRHeapFPv
/* 80009628 38 00 00 00 */ li r0, 0
/* 8000962C 90 1E 00 10 */ stw r0, 0x10(r30)
lbl_80009630:
/* 80009630 38 00 00 00 */ li r0, 0
/* 80009634 98 1E 00 07 */ stb r0, 7(r30)
/* 80009638 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8000963C 83 C1 00 08 */ lwz r30, 8(r1)
/* 80009640 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80009644 7C 08 03 A6 */ mtlr r0
/* 80009648 38 21 00 10 */ addi r1, r1, 0x10
/* 8000964C 4E 80 00 20 */ blr