diff --git a/Progress.md b/Progress.md index d300721dbd..f940da1f3f 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 36.010236% | 1295124 | 3596544 +.text | 36.033815% | 1295972 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 42.755539% | 1719060 | 4020672 +Total | 42.776630% | 1719908 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 42.755539% | 1719060 | 4020672 -RELs | 35.067151% | 4032836 | 11500324 -Total | 37.058807% | 5751896 | 15520996 +main.dol | 42.776630% | 1719908 | 4020672 +RELs | 35.091046% | 4035584 | 11500324 +Total | 37.081976% | 5755492 | 15520996 ## RELs @@ -216,7 +216,7 @@ d_a_mg_rod | 24.484345% | 23836 | 97352 d_a_midna | 22.953368% | 12404 | 54040 d_a_mirror | 48.001631% | 4708 | 9808 d_a_movie_player | 23.696790% | 8328 | 35144 -d_a_myna | 36.077635% | 11376 | 31532 +d_a_myna | 44.792592% | 14124 | 31532 d_a_nbomb | 28.739233% | 8808 | 30648 d_a_ni | 27.299309% | 8216 | 30096 d_a_npc_aru | 34.812103% | 12932 | 37148 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 35.067151% | 4032836 | 11500324 +Total | 35.091046% | 4035584 | 11500324 diff --git a/asm/d/a/d_a_alink/commonKandelaarPourInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/commonKandelaarPourInit__9daAlink_cFv.s deleted file mode 100644 index 718fd4e789..0000000000 --- a/asm/d/a/d_a_alink/commonKandelaarPourInit__9daAlink_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80110FE0: -/* 80110FE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80110FE4 7C 08 02 A6 */ mflr r0 -/* 80110FE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80110FEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80110FF0 93 C1 00 08 */ stw r30, 8(r1) -/* 80110FF4 7C 7E 1B 78 */ mr r30, r3 -/* 80110FF8 80 03 05 78 */ lwz r0, 0x578(r3) -/* 80110FFC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80111000 41 82 00 10 */ beq lbl_80111010 -/* 80111004 38 00 00 01 */ li r0, 1 -/* 80111008 B0 1E 30 0E */ sth r0, 0x300e(r30) -/* 8011100C 48 00 00 0C */ b lbl_80111018 -lbl_80111010: -/* 80111010 38 00 00 00 */ li r0, 0 -/* 80111014 B0 1E 30 0E */ sth r0, 0x300e(r30) -lbl_80111018: -/* 80111018 7F C3 F3 78 */ mr r3, r30 -/* 8011101C 4B FA E8 39 */ bl keepItemData__9daAlink_cFv -/* 80111020 7F C3 F3 78 */ mr r3, r30 -/* 80111024 4B FF FE 61 */ bl setKandelaarModel__9daAlink_cFv -/* 80111028 88 7E 2F 9C */ lbz r3, 0x2f9c(r30) -/* 8011102C 4B F1 CE F1 */ bl dComIfGp_getSelectItem__Fi -/* 80111030 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 80111034 7F C3 F3 78 */ mr r3, r30 -/* 80111038 4B FF D5 A1 */ bl setBottleModel__9daAlink_cFUs -/* 8011103C 38 00 00 00 */ li r0, 0 -/* 80111040 B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 80111044 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80111048 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011104C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 80111050 60 00 20 00 */ ori r0, r0, 0x2000 -/* 80111054 90 03 5F 1C */ stw r0, 0x5f1c(r3) -/* 80111058 38 00 00 0A */ li r0, 0xa -/* 8011105C 90 1E 31 94 */ stw r0, 0x3194(r30) -/* 80111060 28 1E 00 00 */ cmplwi r30, 0 -/* 80111064 41 82 00 0C */ beq lbl_80111070 -/* 80111068 83 FE 00 04 */ lwz r31, 4(r30) -/* 8011106C 48 00 00 08 */ b lbl_80111074 -lbl_80111070: -/* 80111070 3B E0 FF FF */ li r31, -1 -lbl_80111074: -/* 80111074 48 07 05 CD */ bl dCam_getBody__Fv -/* 80111078 38 80 00 12 */ li r4, 0x12 -/* 8011107C 7F E5 FB 78 */ mr r5, r31 -/* 80111080 3C C0 80 39 */ lis r6, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 80111084 38 C6 20 94 */ addi r6, r6, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 80111088 38 C6 00 43 */ addi r6, r6, 0x43 -/* 8011108C 38 E0 00 01 */ li r7, 1 -/* 80111090 39 1E 31 94 */ addi r8, r30, 0x3194 -/* 80111094 39 20 00 00 */ li r9, 0 -/* 80111098 4C C6 31 82 */ crclr 6 -/* 8011109C 4B F7 79 E1 */ bl StartEventCamera__9dCamera_cFiie -/* 801110A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801110A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 801110A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801110AC 7C 08 03 A6 */ mtlr r0 -/* 801110B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801110B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initKandelaarSwing__9daAlink_cFv.s b/asm/d/a/d_a_alink/initKandelaarSwing__9daAlink_cFv.s deleted file mode 100644 index 3c43288b0b..0000000000 --- a/asm/d/a/d_a_alink/initKandelaarSwing__9daAlink_cFv.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_8011130C: -/* 8011130C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80111310 7C 08 02 A6 */ mflr r0 -/* 80111314 90 01 00 24 */ stw r0, 0x24(r1) -/* 80111318 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8011131C 7C 7F 1B 78 */ mr r31, r3 -/* 80111320 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 80111324 28 00 00 48 */ cmplwi r0, 0x48 -/* 80111328 40 82 00 74 */ bne lbl_8011139C -/* 8011132C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80111330 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80111334 A0 03 00 08 */ lhz r0, 8(r3) -/* 80111338 28 00 00 00 */ cmplwi r0, 0 -/* 8011133C 41 82 00 34 */ beq lbl_80111370 -/* 80111340 3C 60 00 02 */ lis r3, 0x0002 /* 0x00020059@ha */ -/* 80111344 38 03 00 59 */ addi r0, r3, 0x0059 /* 0x00020059@l */ -/* 80111348 90 01 00 0C */ stw r0, 0xc(r1) -/* 8011134C 38 7F 2D 3C */ addi r3, r31, 0x2d3c -/* 80111350 38 81 00 0C */ addi r4, r1, 0xc -/* 80111354 38 A0 00 00 */ li r5, 0 -/* 80111358 88 DF 2F 9A */ lbz r6, 0x2f9a(r31) -/* 8011135C 81 9F 2D 4C */ lwz r12, 0x2d4c(r31) -/* 80111360 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80111364 7D 89 03 A6 */ mtctr r12 -/* 80111368 4E 80 04 21 */ bctrl -/* 8011136C 48 00 00 30 */ b lbl_8011139C -lbl_80111370: -/* 80111370 3C 60 00 02 */ lis r3, 0x0002 /* 0x0002005D@ha */ -/* 80111374 38 03 00 5D */ addi r0, r3, 0x005D /* 0x0002005D@l */ -/* 80111378 90 01 00 08 */ stw r0, 8(r1) -/* 8011137C 38 7F 2D 3C */ addi r3, r31, 0x2d3c -/* 80111380 38 81 00 08 */ addi r4, r1, 8 -/* 80111384 38 A0 00 00 */ li r5, 0 -/* 80111388 88 DF 2F 9A */ lbz r6, 0x2f9a(r31) -/* 8011138C 81 9F 2D 4C */ lwz r12, 0x2d4c(r31) -/* 80111390 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80111394 7D 89 03 A6 */ mtctr r12 -/* 80111398 4E 80 04 21 */ bctrl -lbl_8011139C: -/* 8011139C 7F E3 FB 78 */ mr r3, r31 -/* 801113A0 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001001D@ha */ -/* 801113A4 38 84 00 1D */ addi r4, r4, 0x001D /* 0x0001001D@l */ -/* 801113A8 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 801113AC 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 801113B0 7D 89 03 A6 */ mtctr r12 -/* 801113B4 4E 80 04 21 */ bctrl -/* 801113B8 38 7F 0F B8 */ addi r3, r31, 0xfb8 -/* 801113BC 4B F7 2F 5D */ bl ResetAtHit__12dCcD_GObjInfFv -/* 801113C0 7F E3 FB 78 */ mr r3, r31 -/* 801113C4 48 00 48 5D */ bl checkEventRun__9daAlink_cCFv -/* 801113C8 2C 03 00 00 */ cmpwi r3, 0 -/* 801113CC 40 82 00 28 */ bne lbl_801113F4 -/* 801113D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801113D4 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801113D8 80 85 5D D4 */ lwz r4, 0x5dd4(r5) -/* 801113DC 3C 60 80 39 */ lis r3, m__23daAlinkHIO_kandelaar_c0@ha /* 0x8038E77C@ha */ -/* 801113E0 38 63 E7 7C */ addi r3, r3, m__23daAlinkHIO_kandelaar_c0@l /* 0x8038E77C@l */ -/* 801113E4 A8 03 00 4A */ lha r0, 0x4a(r3) -/* 801113E8 7C 00 00 D0 */ neg r0, r0 -/* 801113EC 7C 04 02 14 */ add r0, r4, r0 -/* 801113F0 90 05 5D D4 */ stw r0, 0x5dd4(r5) -lbl_801113F4: -/* 801113F4 80 1F 0F B8 */ lwz r0, 0xfb8(r31) -/* 801113F8 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 801113FC 90 1F 0F B8 */ stw r0, 0xfb8(r31) -/* 80111400 38 7F 10 DC */ addi r3, r31, 0x10dc -/* 80111404 C0 22 93 00 */ lfs f1, lit_6895(r2) -/* 80111408 48 15 E3 01 */ bl SetR__8cM3dGSphFf -/* 8011140C 38 00 02 00 */ li r0, 0x200 -/* 80111410 90 1F 0F C8 */ stw r0, 0xfc8(r31) -/* 80111414 38 00 00 00 */ li r0, 0 -/* 80111418 98 1F 10 2E */ stb r0, 0x102e(r31) -/* 8011141C 98 1F 10 2C */ stb r0, 0x102c(r31) -/* 80111420 98 1F 0F CC */ stb r0, 0xfcc(r31) -/* 80111424 38 00 00 01 */ li r0, 1 -/* 80111428 98 1F 10 2D */ stb r0, 0x102d(r31) -/* 8011142C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80111430 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80111434 7C 08 03 A6 */ mtlr r0 -/* 80111438 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011143C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setFootEffectProcType__9daAlink_cFi.s b/asm/d/a/d_a_alink/setFootEffectProcType__9daAlink_cFi.s deleted file mode 100644 index cf86f08ae2..0000000000 --- a/asm/d/a/d_a_alink/setFootEffectProcType__9daAlink_cFi.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801211C0: -/* 801211C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801211C4 7C 08 02 A6 */ mflr r0 -/* 801211C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801211CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801211D0 93 C1 00 08 */ stw r30, 8(r1) -/* 801211D4 7C 7E 1B 78 */ mr r30, r3 -/* 801211D8 7C 9F 23 78 */ mr r31, r4 -/* 801211DC 88 03 2F 9F */ lbz r0, 0x2f9f(r3) -/* 801211E0 7C 1F 00 00 */ cmpw r31, r0 -/* 801211E4 41 82 00 0C */ beq lbl_801211F0 -/* 801211E8 38 7E 2E 54 */ addi r3, r30, 0x2e54 -/* 801211EC 4B F3 02 39 */ bl clearFourAllID__8dPaPoF_cFv -lbl_801211F0: -/* 801211F0 9B FE 2F 9E */ stb r31, 0x2f9e(r30) -/* 801211F4 88 1E 2F 9E */ lbz r0, 0x2f9e(r30) -/* 801211F8 98 1E 2F 9F */ stb r0, 0x2f9f(r30) -/* 801211FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80121200 83 C1 00 08 */ lwz r30, 8(r1) -/* 80121204 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80121208 7C 08 03 A6 */ mtlr r0 -/* 8012120C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80121210 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setFootMark__9daAlink_cFP4cXyzUsi.s b/asm/d/a/d_a_alink/setFootMark__9daAlink_cFP4cXyzUsi.s deleted file mode 100644 index 24268450b9..0000000000 --- a/asm/d/a/d_a_alink/setFootMark__9daAlink_cFP4cXyzUsi.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80121304: -/* 80121304 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80121308 7C 08 02 A6 */ mflr r0 -/* 8012130C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80121310 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80121314 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80121318 7C 9E 23 78 */ mr r30, r4 -/* 8012131C 7C DF 33 78 */ mr r31, r6 -/* 80121320 80 63 06 50 */ lwz r3, 0x650(r3) -/* 80121324 80 63 00 84 */ lwz r3, 0x84(r3) -/* 80121328 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8012132C 54 A0 04 3E */ clrlwi r0, r5, 0x10 -/* 80121330 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 80121334 7C 63 02 14 */ add r3, r3, r0 -/* 80121338 3C 80 80 43 */ lis r4, BaseX__4cXyz@ha /* 0x80430D0C@ha */ -/* 8012133C 38 84 0D 0C */ addi r4, r4, BaseX__4cXyz@l /* 0x80430D0C@l */ -/* 80121340 38 A1 00 08 */ addi r5, r1, 8 -/* 80121344 48 22 5B 09 */ bl PSMTXMultVecSR -/* 80121348 38 61 00 08 */ addi r3, r1, 8 -/* 8012134C 48 14 5D DD */ bl atan2sX_Z__4cXyzCFv -/* 80121350 7C 60 1B 78 */ mr r0, r3 -/* 80121354 38 60 03 03 */ li r3, 0x303 -/* 80121358 54 00 80 1E */ slwi r0, r0, 0x10 -/* 8012135C 7F E4 03 78 */ or r4, r31, r0 -/* 80121360 7F C5 F3 78 */ mr r5, r30 -/* 80121364 38 C0 00 00 */ li r6, 0 -/* 80121368 38 E0 00 00 */ li r7, 0 -/* 8012136C 4B EF E4 4D */ bl fopKyM_create__FsiP4cXyzP4cXyzPFPv_i -/* 80121370 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80121374 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80121378 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8012137C 7C 08 03 A6 */ mtlr r0 -/* 80121380 38 21 00 20 */ addi r1, r1, 0x20 -/* 80121384 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWaterfallEffect__9daAlink_cFPC4cXyzPUl.s b/asm/d/a/d_a_alink/setWaterfallEffect__9daAlink_cFPC4cXyzPUl.s deleted file mode 100644 index 93049b88a2..0000000000 --- a/asm/d/a/d_a_alink/setWaterfallEffect__9daAlink_cFPC4cXyzPUl.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_801225E8: -/* 801225E8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801225EC 7C 08 02 A6 */ mflr r0 -/* 801225F0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801225F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801225F8 48 23 FB E5 */ bl _savegpr_29 -/* 801225FC 7C 7D 1B 78 */ mr r29, r3 -/* 80122600 7C 9E 23 78 */ mr r30, r4 -/* 80122604 7C BF 2B 78 */ mr r31, r5 -/* 80122608 7F E4 FB 78 */ mr r4, r31 -/* 8012260C 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008614@ha */ -/* 80122610 38 A5 86 14 */ addi r5, r5, 0x8614 /* 0x00008614@l */ -/* 80122614 7F C6 F3 78 */ mr r6, r30 -/* 80122618 38 E0 00 00 */ li r7, 0 -/* 8012261C 4B FF DF 65 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz -/* 80122620 7F A3 EB 78 */ mr r3, r29 -/* 80122624 38 9F 00 04 */ addi r4, r31, 4 -/* 80122628 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008615@ha */ -/* 8012262C 38 A5 86 15 */ addi r5, r5, 0x8615 /* 0x00008615@l */ -/* 80122630 7F C6 F3 78 */ mr r6, r30 -/* 80122634 38 E0 00 00 */ li r7, 0 -/* 80122638 4B FF DF 49 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz -/* 8012263C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80122640 48 23 FB E9 */ bl _restgpr_29 -/* 80122644 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80122648 7C 08 03 A6 */ mtlr r0 -/* 8012264C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80122650 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/attack2_talk_init__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/attack2_talk_init__8daMyna_cFv.s deleted file mode 100644 index 064ba43bcf..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/attack2_talk_init__8daMyna_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_809486F8: -/* 809486F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 809486FC 7C 08 02 A6 */ mflr r0 -/* 80948700 90 01 00 14 */ stw r0, 0x14(r1) -/* 80948704 7C 64 1B 78 */ mr r4, r3 -/* 80948708 38 00 00 D6 */ li r0, 0xd6 -/* 8094870C B0 03 09 1C */ sth r0, 0x91c(r3) -/* 80948710 38 64 06 20 */ addi r3, r4, 0x620 -/* 80948714 A0 A4 09 1C */ lhz r5, 0x91c(r4) -/* 80948718 38 C0 00 00 */ li r6, 0 -/* 8094871C 38 E0 00 00 */ li r7, 0 -/* 80948720 4B 90 18 71 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 80948724 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80948728 7C 08 03 A6 */ mtlr r0 -/* 8094872C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80948730 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/attack2_talk_move__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/attack2_talk_move__8daMyna_cFv.s deleted file mode 100644 index c78b506353..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/attack2_talk_move__8daMyna_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80948734: -/* 80948734 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80948738 7C 08 02 A6 */ mflr r0 -/* 8094873C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80948740 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80948744 7C 7F 1B 78 */ mr r31, r3 -/* 80948748 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 8094874C 28 00 00 01 */ cmplwi r0, 1 -/* 80948750 40 82 00 88 */ bne lbl_809487D8 -/* 80948754 38 7F 06 20 */ addi r3, r31, 0x620 -/* 80948758 7F E4 FB 78 */ mr r4, r31 -/* 8094875C 38 A0 00 00 */ li r5, 0 -/* 80948760 38 C0 00 00 */ li r6, 0 -/* 80948764 4B 90 1B 75 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80948768 2C 03 00 00 */ cmpwi r3, 0 -/* 8094876C 41 82 00 6C */ beq lbl_809487D8 -/* 80948770 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80948774 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80948778 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 8094877C 4B 6F 9C ED */ bl reset__14dEvt_control_cFv -/* 80948780 38 00 00 00 */ li r0, 0 -/* 80948784 90 1F 08 28 */ stw r0, 0x828(r31) -/* 80948788 38 00 00 07 */ li r0, 7 -/* 8094878C 98 1F 09 2C */ stb r0, 0x92c(r31) -/* 80948790 38 60 00 00 */ li r3, 0 -/* 80948794 4B 8F 00 99 */ bl dMsgObject_setTotalPayment__FUs -/* 80948798 38 60 00 00 */ li r3, 0 -/* 8094879C 4B 8E FF 2D */ bl dMsgObject_setTotalPrice__FUs -/* 809487A0 4B 8F 00 25 */ bl dMsgObject_getTotalPayment__Fv -/* 809487A4 B0 7F 09 22 */ sth r3, 0x922(r31) -/* 809487A8 4B 8E FE B9 */ bl dMsgObject_getTotalPrice__Fv -/* 809487AC B0 7F 09 20 */ sth r3, 0x920(r31) -/* 809487B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 809487B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 809487B8 80 83 5D BC */ lwz r4, 0x5dbc(r3) -/* 809487BC 38 00 00 00 */ li r0, 0 -/* 809487C0 B0 04 01 7A */ sth r0, 0x17a(r4) -/* 809487C4 80 83 5D BC */ lwz r4, 0x5dbc(r3) -/* 809487C8 B0 04 01 7C */ sth r0, 0x17c(r4) -/* 809487CC 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 809487D0 98 03 04 D0 */ stb r0, 0x4d0(r3) -/* 809487D4 98 1F 09 39 */ stb r0, 0x939(r31) -lbl_809487D8: -/* 809487D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 809487DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 809487E0 7C 08 03 A6 */ mtlr r0 -/* 809487E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 809487E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/attack_after_talk_init__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/attack_after_talk_init__8daMyna_cFv.s deleted file mode 100644 index d1851ad187..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/attack_after_talk_init__8daMyna_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80946DD4: -/* 80946DD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80946DD8 7C 08 02 A6 */ mflr r0 -/* 80946DDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80946DE0 7C 64 1B 78 */ mr r4, r3 -/* 80946DE4 38 64 06 20 */ addi r3, r4, 0x620 -/* 80946DE8 A0 A4 09 1C */ lhz r5, 0x91c(r4) -/* 80946DEC 38 C0 00 00 */ li r6, 0 -/* 80946DF0 38 E0 00 00 */ li r7, 0 -/* 80946DF4 4B 90 31 9D */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 80946DF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80946DFC 7C 08 03 A6 */ mtlr r0 -/* 80946E00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80946E04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/attack_after_talk_move__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/attack_after_talk_move__8daMyna_cFv.s deleted file mode 100644 index ce29892ccd..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/attack_after_talk_move__8daMyna_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80946E08: -/* 80946E08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80946E0C 7C 08 02 A6 */ mflr r0 -/* 80946E10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80946E14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80946E18 7C 7F 1B 78 */ mr r31, r3 -/* 80946E1C A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80946E20 28 00 00 01 */ cmplwi r0, 1 -/* 80946E24 40 82 00 4C */ bne lbl_80946E70 -/* 80946E28 38 7F 06 20 */ addi r3, r31, 0x620 -/* 80946E2C 7F E4 FB 78 */ mr r4, r31 -/* 80946E30 38 A0 00 00 */ li r5, 0 -/* 80946E34 38 C0 00 00 */ li r6, 0 -/* 80946E38 4B 90 34 A1 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80946E3C 2C 03 00 00 */ cmpwi r3, 0 -/* 80946E40 41 82 00 30 */ beq lbl_80946E70 -/* 80946E44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80946E48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80946E4C 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80946E50 4B 6F B6 19 */ bl reset__14dEvt_control_cFv -/* 80946E54 88 1F 09 2F */ lbz r0, 0x92f(r31) -/* 80946E58 60 00 00 04 */ ori r0, r0, 4 -/* 80946E5C 98 1F 09 2F */ stb r0, 0x92f(r31) -/* 80946E60 38 00 01 39 */ li r0, 0x139 -/* 80946E64 B0 1F 09 1C */ sth r0, 0x91c(r31) -/* 80946E68 38 00 00 05 */ li r0, 5 -/* 80946E6C 98 1F 09 2C */ stb r0, 0x92c(r31) -lbl_80946E70: -/* 80946E70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80946E74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80946E78 7C 08 03 A6 */ mtlr r0 -/* 80946E7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80946E80 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/attack_before_talk2_move__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/attack_before_talk2_move__8daMyna_cFv.s deleted file mode 100644 index 87a3c8fe8c..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/attack_before_talk2_move__8daMyna_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_809483DC: -/* 809483DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 809483E0 7C 08 02 A6 */ mflr r0 -/* 809483E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 809483E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 809483EC 7C 7F 1B 78 */ mr r31, r3 -/* 809483F0 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 809483F4 28 00 00 01 */ cmplwi r0, 1 -/* 809483F8 40 82 00 38 */ bne lbl_80948430 -/* 809483FC 38 7F 06 20 */ addi r3, r31, 0x620 -/* 80948400 7F E4 FB 78 */ mr r4, r31 -/* 80948404 38 A0 00 00 */ li r5, 0 -/* 80948408 38 C0 00 00 */ li r6, 0 -/* 8094840C 4B 90 1E CD */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80948410 2C 03 00 00 */ cmpwi r3, 0 -/* 80948414 41 82 00 1C */ beq lbl_80948430 -/* 80948418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8094841C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80948420 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80948424 4B 6F A0 45 */ bl reset__14dEvt_control_cFv -/* 80948428 38 00 00 13 */ li r0, 0x13 -/* 8094842C 98 1F 09 2C */ stb r0, 0x92c(r31) -lbl_80948430: -/* 80948430 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80948434 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80948438 7C 08 03 A6 */ mtlr r0 -/* 8094843C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80948440 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/attack_before_talk_move__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/attack_before_talk_move__8daMyna_cFv.s deleted file mode 100644 index ac7a18496a..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/attack_before_talk_move__8daMyna_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80946B40: -/* 80946B40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80946B44 7C 08 02 A6 */ mflr r0 -/* 80946B48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80946B4C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80946B50 7C 7F 1B 78 */ mr r31, r3 -/* 80946B54 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80946B58 28 00 00 01 */ cmplwi r0, 1 -/* 80946B5C 40 82 00 44 */ bne lbl_80946BA0 -/* 80946B60 38 7F 06 20 */ addi r3, r31, 0x620 -/* 80946B64 7F E4 FB 78 */ mr r4, r31 -/* 80946B68 38 A0 00 00 */ li r5, 0 -/* 80946B6C 38 C0 00 00 */ li r6, 0 -/* 80946B70 4B 90 37 69 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80946B74 2C 03 00 00 */ cmpwi r3, 0 -/* 80946B78 41 82 00 28 */ beq lbl_80946BA0 -/* 80946B7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80946B80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80946B84 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80946B88 4B 6F B8 E1 */ bl reset__14dEvt_control_cFv -/* 80946B8C 88 1F 09 2F */ lbz r0, 0x92f(r31) -/* 80946B90 60 00 00 02 */ ori r0, r0, 2 -/* 80946B94 98 1F 09 2F */ stb r0, 0x92f(r31) -/* 80946B98 38 00 00 02 */ li r0, 2 -/* 80946B9C 98 1F 09 2C */ stb r0, 0x92c(r31) -lbl_80946BA0: -/* 80946BA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80946BA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80946BA8 7C 08 03 A6 */ mtlr r0 -/* 80946BAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80946BB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/byebye_talk_init__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/byebye_talk_init__8daMyna_cFv.s deleted file mode 100644 index 4a500543fb..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/byebye_talk_init__8daMyna_cFv.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_80947794: -/* 80947794 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80947798 7C 08 02 A6 */ mflr r0 -/* 8094779C 90 01 00 14 */ stw r0, 0x14(r1) -/* 809477A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 809477A4 93 C1 00 08 */ stw r30, 8(r1) -/* 809477A8 7C 7F 1B 78 */ mr r31, r3 -/* 809477AC 4B 8F 10 19 */ bl dMsgObject_getTotalPayment__Fv -/* 809477B0 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 809477B4 A8 1F 09 22 */ lha r0, 0x922(r31) -/* 809477B8 7F C0 18 50 */ subf r30, r0, r3 -/* 809477BC 4B 8F 0E A5 */ bl dMsgObject_getTotalPrice__Fv -/* 809477C0 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 809477C4 A8 1F 09 20 */ lha r0, 0x920(r31) -/* 809477C8 7C 00 18 50 */ subf r0, r0, r3 -/* 809477CC 7C 1E 00 00 */ cmpw r30, r0 -/* 809477D0 41 80 00 10 */ blt lbl_809477E0 -/* 809477D4 38 00 00 00 */ li r0, 0 -/* 809477D8 98 1F 09 32 */ stb r0, 0x932(r31) -/* 809477DC 48 00 00 20 */ b lbl_809477FC -lbl_809477E0: -/* 809477E0 2C 1E 00 00 */ cmpwi r30, 0 -/* 809477E4 40 81 00 10 */ ble lbl_809477F4 -/* 809477E8 38 00 00 01 */ li r0, 1 -/* 809477EC 98 1F 09 32 */ stb r0, 0x932(r31) -/* 809477F0 48 00 00 0C */ b lbl_809477FC -lbl_809477F4: -/* 809477F4 38 00 00 02 */ li r0, 2 -/* 809477F8 98 1F 09 32 */ stb r0, 0x932(r31) -lbl_809477FC: -/* 809477FC 88 1F 09 32 */ lbz r0, 0x932(r31) -/* 80947800 2C 00 00 01 */ cmpwi r0, 1 -/* 80947804 41 82 00 34 */ beq lbl_80947838 -/* 80947808 40 80 00 10 */ bge lbl_80947818 -/* 8094780C 2C 00 00 00 */ cmpwi r0, 0 -/* 80947810 40 80 00 14 */ bge lbl_80947824 -/* 80947814 48 00 00 48 */ b lbl_8094785C -lbl_80947818: -/* 80947818 2C 00 00 03 */ cmpwi r0, 3 -/* 8094781C 40 80 00 40 */ bge lbl_8094785C -/* 80947820 48 00 00 2C */ b lbl_8094784C -lbl_80947824: -/* 80947824 7F E3 FB 78 */ mr r3, r31 -/* 80947828 48 00 23 E5 */ bl getFlowNodeNum__8daMyna_cFv -/* 8094782C 38 03 00 03 */ addi r0, r3, 3 -/* 80947830 B0 1F 09 1C */ sth r0, 0x91c(r31) -/* 80947834 48 00 00 28 */ b lbl_8094785C -lbl_80947838: -/* 80947838 7F E3 FB 78 */ mr r3, r31 -/* 8094783C 48 00 23 D1 */ bl getFlowNodeNum__8daMyna_cFv -/* 80947840 38 03 00 04 */ addi r0, r3, 4 -/* 80947844 B0 1F 09 1C */ sth r0, 0x91c(r31) -/* 80947848 48 00 00 14 */ b lbl_8094785C -lbl_8094784C: -/* 8094784C 7F E3 FB 78 */ mr r3, r31 -/* 80947850 48 00 23 BD */ bl getFlowNodeNum__8daMyna_cFv -/* 80947854 38 03 00 05 */ addi r0, r3, 5 -/* 80947858 B0 1F 09 1C */ sth r0, 0x91c(r31) -lbl_8094785C: -/* 8094785C 88 1F 09 33 */ lbz r0, 0x933(r31) -/* 80947860 28 00 00 00 */ cmplwi r0, 0 -/* 80947864 40 82 00 3C */ bne lbl_809478A0 -/* 80947868 4B 8F 0F 5D */ bl dMsgObject_getTotalPayment__Fv -/* 8094786C B0 7F 09 22 */ sth r3, 0x922(r31) -/* 80947870 4B 8F 0D F1 */ bl dMsgObject_getTotalPrice__Fv -/* 80947874 B0 7F 09 20 */ sth r3, 0x920(r31) -/* 80947878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8094787C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80947880 80 83 5D BC */ lwz r4, 0x5dbc(r3) -/* 80947884 38 00 00 00 */ li r0, 0 -/* 80947888 B0 04 01 7A */ sth r0, 0x17a(r4) -/* 8094788C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80947890 B0 03 01 7C */ sth r0, 0x17c(r3) -/* 80947894 88 1F 09 2F */ lbz r0, 0x92f(r31) -/* 80947898 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e -/* 8094789C 98 1F 09 2F */ stb r0, 0x92f(r31) -lbl_809478A0: -/* 809478A0 38 7F 06 20 */ addi r3, r31, 0x620 -/* 809478A4 7F E4 FB 78 */ mr r4, r31 -/* 809478A8 A0 BF 09 1C */ lhz r5, 0x91c(r31) -/* 809478AC 38 C0 00 00 */ li r6, 0 -/* 809478B0 38 E0 00 00 */ li r7, 0 -/* 809478B4 4B 90 26 DD */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 809478B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 809478BC 83 C1 00 08 */ lwz r30, 8(r1) -/* 809478C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 809478C4 7C 08 03 A6 */ mtlr r0 -/* 809478C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 809478CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/byebye_talk_move__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/byebye_talk_move__8daMyna_cFv.s deleted file mode 100644 index fb899c8136..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/byebye_talk_move__8daMyna_cFv.s +++ /dev/null @@ -1,85 +0,0 @@ -lbl_809478D0: -/* 809478D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 809478D4 7C 08 02 A6 */ mflr r0 -/* 809478D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 809478DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 809478E0 93 C1 00 08 */ stw r30, 8(r1) -/* 809478E4 7C 7E 1B 78 */ mr r30, r3 -/* 809478E8 3B E0 00 01 */ li r31, 1 -/* 809478EC A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 809478F0 28 00 00 01 */ cmplwi r0, 1 -/* 809478F4 40 82 00 F4 */ bne lbl_809479E8 -/* 809478F8 38 7E 06 20 */ addi r3, r30, 0x620 -/* 809478FC 7F C4 F3 78 */ mr r4, r30 -/* 80947900 38 A0 00 00 */ li r5, 0 -/* 80947904 38 C0 00 00 */ li r6, 0 -/* 80947908 4B 90 29 D1 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 8094790C 2C 03 00 00 */ cmpwi r3, 0 -/* 80947910 41 82 00 D8 */ beq lbl_809479E8 -/* 80947914 88 1E 09 33 */ lbz r0, 0x933(r30) -/* 80947918 28 00 00 00 */ cmplwi r0, 0 -/* 8094791C 40 82 00 5C */ bne lbl_80947978 -/* 80947920 88 1E 09 31 */ lbz r0, 0x931(r30) -/* 80947924 28 00 00 FF */ cmplwi r0, 0xff -/* 80947928 41 82 00 1C */ beq lbl_80947944 -/* 8094792C 38 80 00 03 */ li r4, 3 -/* 80947930 54 00 25 36 */ rlwinm r0, r0, 4, 0x14, 0x1b -/* 80947934 7C 7E 02 14 */ add r3, r30, r0 -/* 80947938 98 83 08 75 */ stb r4, 0x875(r3) -/* 8094793C 38 00 00 FF */ li r0, 0xff -/* 80947940 98 1E 09 31 */ stb r0, 0x931(r30) -lbl_80947944: -/* 80947944 38 60 00 00 */ li r3, 0 -/* 80947948 88 1E 09 30 */ lbz r0, 0x930(r30) -/* 8094794C 7C 09 03 A6 */ mtctr r0 -/* 80947950 2C 00 00 00 */ cmpwi r0, 0 -/* 80947954 40 81 00 30 */ ble lbl_80947984 -lbl_80947958: -/* 80947958 38 03 08 75 */ addi r0, r3, 0x875 -/* 8094795C 7C 1E 00 AE */ lbzx r0, r30, r0 -/* 80947960 28 00 00 02 */ cmplwi r0, 2 -/* 80947964 40 82 00 08 */ bne lbl_8094796C -/* 80947968 3B E0 00 00 */ li r31, 0 -lbl_8094796C: -/* 8094796C 38 63 00 10 */ addi r3, r3, 0x10 -/* 80947970 42 00 FF E8 */ bdnz lbl_80947958 -/* 80947974 48 00 00 10 */ b lbl_80947984 -lbl_80947978: -/* 80947978 38 00 00 00 */ li r0, 0 -/* 8094797C 98 1E 09 33 */ stb r0, 0x933(r30) -/* 80947980 3B E0 00 00 */ li r31, 0 -lbl_80947984: -/* 80947984 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80947988 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8094798C 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80947990 4B 6F AA D9 */ bl reset__14dEvt_control_cFv -/* 80947994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80947998 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8094799C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 809479A0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 809479A4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 809479A8 A0 84 06 44 */ lhz r4, 0x644(r4) -/* 809479AC 4B 6E D0 11 */ bl isEventBit__11dSv_event_cCFUs -/* 809479B0 2C 03 00 00 */ cmpwi r3, 0 -/* 809479B4 41 82 00 18 */ beq lbl_809479CC -/* 809479B8 38 00 00 11 */ li r0, 0x11 -/* 809479BC 98 1E 09 2C */ stb r0, 0x92c(r30) -/* 809479C0 38 00 00 14 */ li r0, 0x14 -/* 809479C4 98 1E 09 37 */ stb r0, 0x937(r30) -/* 809479C8 48 00 00 20 */ b lbl_809479E8 -lbl_809479CC: -/* 809479CC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 809479D0 41 82 00 10 */ beq lbl_809479E0 -/* 809479D4 38 00 00 07 */ li r0, 7 -/* 809479D8 98 1E 09 2C */ stb r0, 0x92c(r30) -/* 809479DC 48 00 00 0C */ b lbl_809479E8 -lbl_809479E0: -/* 809479E0 38 00 00 07 */ li r0, 7 -/* 809479E4 98 1E 09 2C */ stb r0, 0x92c(r30) -lbl_809479E8: -/* 809479E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 809479EC 83 C1 00 08 */ lwz r30, 8(r1) -/* 809479F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 809479F4 7C 08 03 A6 */ mtlr r0 -/* 809479F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 809479FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/daMyna_searchEvtTag__FPvPv.s b/asm/rel/d/a/d_a_myna/d_a_myna/daMyna_searchEvtTag__FPvPv.s deleted file mode 100644 index c0cb87213f..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/daMyna_searchEvtTag__FPvPv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80945E0C: -/* 80945E0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80945E10 7C 08 02 A6 */ mflr r0 -/* 80945E14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80945E18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80945E1C 7C 7F 1B 78 */ mr r31, r3 -/* 80945E20 4B 6D 2E C1 */ bl fopAc_IsActor__FPv -/* 80945E24 2C 03 00 00 */ cmpwi r3, 0 -/* 80945E28 41 82 00 40 */ beq lbl_80945E68 -/* 80945E2C A8 1F 00 08 */ lha r0, 8(r31) -/* 80945E30 2C 00 02 D2 */ cmpwi r0, 0x2d2 -/* 80945E34 40 82 00 34 */ bne lbl_80945E68 -/* 80945E38 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80945E3C 54 00 47 3F */ rlwinm. r0, r0, 8, 0x1c, 0x1f -/* 80945E40 40 82 00 10 */ bne lbl_80945E50 -/* 80945E44 3C 60 80 95 */ lis r3, daMyna_evtTagActor0@ha /* 0x8094BAC8@ha */ -/* 80945E48 93 E3 BA C8 */ stw r31, daMyna_evtTagActor0@l(r3) /* 0x8094BAC8@l */ -/* 80945E4C 48 00 00 14 */ b lbl_80945E60 -lbl_80945E50: -/* 80945E50 28 00 00 01 */ cmplwi r0, 1 -/* 80945E54 40 82 00 0C */ bne lbl_80945E60 -/* 80945E58 3C 60 80 95 */ lis r3, daMyna_evtTagActor1@ha /* 0x8094BACC@ha */ -/* 80945E5C 93 E3 BA CC */ stw r31, daMyna_evtTagActor1@l(r3) /* 0x8094BACC@l */ -lbl_80945E60: -/* 80945E60 38 60 00 00 */ li r3, 0 -/* 80945E64 48 00 00 08 */ b lbl_80945E6C -lbl_80945E68: -/* 80945E68 38 60 00 00 */ li r3, 0 -lbl_80945E6C: -/* 80945E6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80945E70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80945E74 7C 08 03 A6 */ mtlr r0 -/* 80945E78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80945E7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/daMyna_searchSSItem__FPvPv.s b/asm/rel/d/a/d_a_myna/d_a_myna/daMyna_searchSSItem__FPvPv.s deleted file mode 100644 index 98f17b2c9b..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/daMyna_searchSSItem__FPvPv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80945CD8: -/* 80945CD8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80945CDC 7C 08 02 A6 */ mflr r0 -/* 80945CE0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80945CE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80945CE8 4B A1 C4 F5 */ bl _savegpr_29 -/* 80945CEC 7C 7D 1B 78 */ mr r29, r3 -/* 80945CF0 7C 9E 23 78 */ mr r30, r4 -/* 80945CF4 3C 80 80 95 */ lis r4, lit_1109@ha /* 0x8094B9F0@ha */ -/* 80945CF8 3B E4 B9 F0 */ addi r31, r4, lit_1109@l /* 0x8094B9F0@l */ -/* 80945CFC 4B 6D 2F E5 */ bl fopAc_IsActor__FPv -/* 80945D00 2C 03 00 00 */ cmpwi r3, 0 -/* 80945D04 41 82 00 7C */ beq lbl_80945D80 -/* 80945D08 A8 9D 00 08 */ lha r4, 8(r29) -/* 80945D0C 2C 04 01 21 */ cmpwi r4, 0x121 -/* 80945D10 41 82 00 14 */ beq lbl_80945D24 -/* 80945D14 2C 04 01 20 */ cmpwi r4, 0x120 -/* 80945D18 41 82 00 0C */ beq lbl_80945D24 -/* 80945D1C 2C 04 01 22 */ cmpwi r4, 0x122 -/* 80945D20 40 82 00 60 */ bne lbl_80945D80 -lbl_80945D24: -/* 80945D24 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80945D28 54 03 00 06 */ rlwinm r3, r0, 0, 0, 3 -/* 80945D2C 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80945D30 54 00 00 06 */ rlwinm r0, r0, 0, 0, 3 -/* 80945D34 7C 03 00 40 */ cmplw r3, r0 -/* 80945D38 40 82 00 48 */ bne lbl_80945D80 -/* 80945D3C 80 1F 00 D4 */ lwz r0, 0xd4(r31) -/* 80945D40 2C 00 00 0A */ cmpwi r0, 0xa -/* 80945D44 40 80 00 3C */ bge lbl_80945D80 -/* 80945D48 7F A3 EB 78 */ mr r3, r29 -/* 80945D4C 2C 04 01 21 */ cmpwi r4, 0x121 -/* 80945D50 40 82 00 08 */ bne lbl_80945D58 -/* 80945D54 48 3A 1A A5 */ bl getExchangeItemPtr__14daObj_SSItem_cFv -lbl_80945D58: -/* 80945D58 28 03 00 00 */ cmplwi r3, 0 -/* 80945D5C 41 82 00 24 */ beq lbl_80945D80 -/* 80945D60 80 BF 00 D4 */ lwz r5, 0xd4(r31) -/* 80945D64 54 A0 10 3A */ slwi r0, r5, 2 -/* 80945D68 38 9F 00 80 */ addi r4, r31, 0x80 -/* 80945D6C 7C 64 01 2E */ stwx r3, r4, r0 -/* 80945D70 38 7F 00 A8 */ addi r3, r31, 0xa8 -/* 80945D74 7F A3 01 2E */ stwx r29, r3, r0 -/* 80945D78 38 05 00 01 */ addi r0, r5, 1 -/* 80945D7C 90 1F 00 D4 */ stw r0, 0xd4(r31) -lbl_80945D80: -/* 80945D80 38 60 00 00 */ li r3, 0 -/* 80945D84 39 61 00 20 */ addi r11, r1, 0x20 -/* 80945D88 4B A1 C4 A1 */ bl _restgpr_29 -/* 80945D8C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80945D90 7C 08 03 A6 */ mtlr r0 -/* 80945D94 38 21 00 20 */ addi r1, r1, 0x20 -/* 80945D98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/greet_talk_move__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/greet_talk_move__8daMyna_cFv.s deleted file mode 100644 index 59f96a5342..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/greet_talk_move__8daMyna_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8094711C: -/* 8094711C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80947120 7C 08 02 A6 */ mflr r0 -/* 80947124 90 01 00 14 */ stw r0, 0x14(r1) -/* 80947128 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8094712C 7C 7F 1B 78 */ mr r31, r3 -/* 80947130 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80947134 28 00 00 01 */ cmplwi r0, 1 -/* 80947138 40 82 00 70 */ bne lbl_809471A8 -/* 8094713C 38 7F 06 20 */ addi r3, r31, 0x620 -/* 80947140 7F E4 FB 78 */ mr r4, r31 -/* 80947144 38 A0 00 00 */ li r5, 0 -/* 80947148 38 C0 00 00 */ li r6, 0 -/* 8094714C 4B 90 31 8D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80947150 2C 03 00 00 */ cmpwi r3, 0 -/* 80947154 41 82 00 54 */ beq lbl_809471A8 -/* 80947158 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8094715C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80947160 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80947164 4B 6F B3 05 */ bl reset__14dEvt_control_cFv -/* 80947168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8094716C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80947170 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80947174 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80947178 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8094717C A0 84 06 44 */ lhz r4, 0x644(r4) -/* 80947180 4B 6E D8 3D */ bl isEventBit__11dSv_event_cCFUs -/* 80947184 2C 03 00 00 */ cmpwi r3, 0 -/* 80947188 41 82 00 18 */ beq lbl_809471A0 -/* 8094718C 38 00 00 14 */ li r0, 0x14 -/* 80947190 98 1F 09 37 */ stb r0, 0x937(r31) -/* 80947194 38 00 00 13 */ li r0, 0x13 -/* 80947198 98 1F 09 2C */ stb r0, 0x92c(r31) -/* 8094719C 48 00 00 0C */ b lbl_809471A8 -lbl_809471A0: -/* 809471A0 38 00 00 07 */ li r0, 7 -/* 809471A4 98 1F 09 2C */ stb r0, 0x92c(r31) -lbl_809471A8: -/* 809471A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 809471AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 809471B0 7C 08 03 A6 */ mtlr r0 -/* 809471B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 809471B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/setItemInfo__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/setItemInfo__8daMyna_cFv.s deleted file mode 100644 index 47033a5691..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/setItemInfo__8daMyna_cFv.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_80949408: -/* 80949408 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8094940C 7C 08 02 A6 */ mflr r0 -/* 80949410 90 01 00 34 */ stw r0, 0x34(r1) -/* 80949414 39 61 00 30 */ addi r11, r1, 0x30 -/* 80949418 4B A1 8D B1 */ bl _savegpr_24 -/* 8094941C 7C 7E 1B 78 */ mr r30, r3 -/* 80949420 3C 60 80 95 */ lis r3, lit_1109@ha /* 0x8094B9F0@ha */ -/* 80949424 3B E3 B9 F0 */ addi r31, r3, lit_1109@l /* 0x8094B9F0@l */ -/* 80949428 80 7F 00 D4 */ lwz r3, 0xd4(r31) -/* 8094942C 2C 03 FF FF */ cmpwi r3, -1 -/* 80949430 41 82 00 28 */ beq lbl_80949458 -/* 80949434 88 1E 09 30 */ lbz r0, 0x930(r30) -/* 80949438 7C 00 18 00 */ cmpw r0, r3 -/* 8094943C 40 81 00 1C */ ble lbl_80949458 -/* 80949440 38 00 00 00 */ li r0, 0 -/* 80949444 90 1F 00 D4 */ stw r0, 0xd4(r31) -/* 80949448 3C 60 80 94 */ lis r3, daMyna_searchSSItem__FPvPv@ha /* 0x80945CD8@ha */ -/* 8094944C 38 63 5C D8 */ addi r3, r3, daMyna_searchSSItem__FPvPv@l /* 0x80945CD8@l */ -/* 80949450 7F C4 F3 78 */ mr r4, r30 -/* 80949454 4B 6D 7E E5 */ bl fpcEx_Search__FPFPvPv_PvPv -lbl_80949458: -/* 80949458 80 1F 00 D8 */ lwz r0, 0xd8(r31) -/* 8094945C 28 00 00 00 */ cmplwi r0, 0 -/* 80949460 40 82 00 14 */ bne lbl_80949474 -/* 80949464 3C 60 80 94 */ lis r3, daMyna_searchEvtTag__FPvPv@ha /* 0x80945E0C@ha */ -/* 80949468 38 63 5E 0C */ addi r3, r3, daMyna_searchEvtTag__FPvPv@l /* 0x80945E0C@l */ -/* 8094946C 7F C4 F3 78 */ mr r4, r30 -/* 80949470 4B 6D 7E C9 */ bl fpcEx_Search__FPFPvPv_PvPv -lbl_80949474: -/* 80949474 80 7F 00 D4 */ lwz r3, 0xd4(r31) -/* 80949478 2C 03 FF FF */ cmpwi r3, -1 -/* 8094947C 41 82 00 B0 */ beq lbl_8094952C -/* 80949480 88 1E 09 30 */ lbz r0, 0x930(r30) -/* 80949484 7C 00 18 00 */ cmpw r0, r3 -/* 80949488 41 81 00 A4 */ bgt lbl_8094952C -/* 8094948C 3B 00 00 00 */ li r24, 0 -/* 80949490 3B A0 00 00 */ li r29, 0 -/* 80949494 3B 80 00 00 */ li r28, 0 -/* 80949498 3B 5F 00 A8 */ addi r26, r31, 0xa8 -/* 8094949C 3B 7F 00 80 */ addi r27, r31, 0x80 -/* 809494A0 48 00 00 78 */ b lbl_80949518 -lbl_809494A4: -/* 809494A4 7C 9A E0 2E */ lwzx r4, r26, r28 -/* 809494A8 93 C4 05 6C */ stw r30, 0x56c(r4) -/* 809494AC 7C 7B E0 2E */ lwzx r3, r27, r28 -/* 809494B0 28 03 00 00 */ cmplwi r3, 0 -/* 809494B4 41 82 00 0C */ beq lbl_809494C0 -/* 809494B8 80 03 00 04 */ lwz r0, 4(r3) -/* 809494BC 48 00 00 08 */ b lbl_809494C4 -lbl_809494C0: -/* 809494C0 38 00 FF FF */ li r0, -1 -lbl_809494C4: -/* 809494C4 7F 3E EA 14 */ add r25, r30, r29 -/* 809494C8 90 19 08 68 */ stw r0, 0x868(r25) -/* 809494CC 7C 7A E0 2E */ lwzx r3, r26, r28 -/* 809494D0 28 03 00 00 */ cmplwi r3, 0 -/* 809494D4 41 82 00 0C */ beq lbl_809494E0 -/* 809494D8 80 03 00 04 */ lwz r0, 4(r3) -/* 809494DC 48 00 00 08 */ b lbl_809494E4 -lbl_809494E0: -/* 809494E0 38 00 FF FF */ li r0, -1 -lbl_809494E4: -/* 809494E4 90 19 08 6C */ stw r0, 0x86c(r25) -/* 809494E8 A0 04 05 72 */ lhz r0, 0x572(r4) -/* 809494EC B0 19 08 70 */ sth r0, 0x870(r25) -/* 809494F0 A0 04 05 74 */ lhz r0, 0x574(r4) -/* 809494F4 B0 19 08 72 */ sth r0, 0x872(r25) -/* 809494F8 7F C3 F3 78 */ mr r3, r30 -/* 809494FC 48 00 05 E5 */ bl getItemType__8daMyna_cFPv -/* 80949500 98 79 08 74 */ stb r3, 0x874(r25) -/* 80949504 38 00 00 02 */ li r0, 2 -/* 80949508 98 19 08 75 */ stb r0, 0x875(r25) -/* 8094950C 3B 18 00 01 */ addi r24, r24, 1 -/* 80949510 3B BD 00 10 */ addi r29, r29, 0x10 -/* 80949514 3B 9C 00 04 */ addi r28, r28, 4 -lbl_80949518: -/* 80949518 88 1E 09 30 */ lbz r0, 0x930(r30) -/* 8094951C 7C 18 00 00 */ cmpw r24, r0 -/* 80949520 41 80 FF 84 */ blt lbl_809494A4 -/* 80949524 38 00 FF FF */ li r0, -1 -/* 80949528 90 1F 00 D4 */ stw r0, 0xd4(r31) -lbl_8094952C: -/* 8094952C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80949530 4B A1 8C E5 */ bl _restgpr_24 -/* 80949534 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80949538 7C 08 03 A6 */ mtlr r0 -/* 8094953C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80949540 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/shopping_talk_init__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/shopping_talk_init__8daMyna_cFv.s deleted file mode 100644 index 9971c40398..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/shopping_talk_init__8daMyna_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_809475B4: -/* 809475B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 809475B8 7C 08 02 A6 */ mflr r0 -/* 809475BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 809475C0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 809475C4 7C 7F 1B 78 */ mr r31, r3 -/* 809475C8 88 03 09 31 */ lbz r0, 0x931(r3) -/* 809475CC 54 00 20 36 */ slwi r0, r0, 4 -/* 809475D0 7C 7F 02 14 */ add r3, r31, r0 -/* 809475D4 80 03 08 68 */ lwz r0, 0x868(r3) -/* 809475D8 90 01 00 08 */ stw r0, 8(r1) -/* 809475DC 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 809475E0 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 809475E4 38 81 00 08 */ addi r4, r1, 8 -/* 809475E8 4B 6D 22 11 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 809475EC 90 7F 08 28 */ stw r3, 0x828(r31) -/* 809475F0 88 1F 09 31 */ lbz r0, 0x931(r31) -/* 809475F4 54 00 20 36 */ slwi r0, r0, 4 -/* 809475F8 7C 7F 02 14 */ add r3, r31, r0 -/* 809475FC A0 03 08 70 */ lhz r0, 0x870(r3) -/* 80947600 B0 1F 09 1C */ sth r0, 0x91c(r31) -/* 80947604 38 7F 06 20 */ addi r3, r31, 0x620 -/* 80947608 7F E4 FB 78 */ mr r4, r31 -/* 8094760C A0 BF 09 1C */ lhz r5, 0x91c(r31) -/* 80947610 38 C0 00 00 */ li r6, 0 -/* 80947614 38 E0 00 00 */ li r7, 0 -/* 80947618 4B 90 29 79 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 8094761C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80947620 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80947624 7C 08 03 A6 */ mtlr r0 -/* 80947628 38 21 00 20 */ addi r1, r1, 0x20 -/* 8094762C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/shopping_talk_move__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/shopping_talk_move__8daMyna_cFv.s deleted file mode 100644 index adde716890..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/shopping_talk_move__8daMyna_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80947630: -/* 80947630 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80947634 7C 08 02 A6 */ mflr r0 -/* 80947638 90 01 00 14 */ stw r0, 0x14(r1) -/* 8094763C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80947640 7C 7F 1B 78 */ mr r31, r3 -/* 80947644 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80947648 28 00 00 01 */ cmplwi r0, 1 -/* 8094764C 40 82 00 40 */ bne lbl_8094768C -/* 80947650 38 7F 06 20 */ addi r3, r31, 0x620 -/* 80947654 7F E4 FB 78 */ mr r4, r31 -/* 80947658 38 A0 00 00 */ li r5, 0 -/* 8094765C 38 C0 00 00 */ li r6, 0 -/* 80947660 4B 90 2C 79 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80947664 2C 03 00 00 */ cmpwi r3, 0 -/* 80947668 41 82 00 24 */ beq lbl_8094768C -/* 8094766C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80947670 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80947674 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80947678 4B 6F AD F1 */ bl reset__14dEvt_control_cFv -/* 8094767C 38 00 00 00 */ li r0, 0 -/* 80947680 90 1F 08 28 */ stw r0, 0x828(r31) -/* 80947684 38 00 00 07 */ li r0, 7 -/* 80947688 98 1F 09 2C */ stb r0, 0x92c(r31) -lbl_8094768C: -/* 8094768C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80947690 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80947694 7C 08 03 A6 */ mtlr r0 -/* 80947698 38 21 00 10 */ addi r1, r1, 0x10 -/* 8094769C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/thanks_talk_init__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/thanks_talk_init__8daMyna_cFv.s deleted file mode 100644 index 9dcf3ad463..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/thanks_talk_init__8daMyna_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_809476A0: -/* 809476A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 809476A4 7C 08 02 A6 */ mflr r0 -/* 809476A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 809476AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 809476B0 7C 7F 1B 78 */ mr r31, r3 -/* 809476B4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 809476B8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 809476BC 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 809476C0 A8 04 01 7C */ lha r0, 0x17c(r4) -/* 809476C4 A8 84 01 7A */ lha r4, 0x17a(r4) -/* 809476C8 7C 00 20 00 */ cmpw r0, r4 -/* 809476CC 40 82 00 14 */ bne lbl_809476E0 -/* 809476D0 48 00 25 3D */ bl getFlowNodeNum__8daMyna_cFv -/* 809476D4 38 03 00 06 */ addi r0, r3, 6 -/* 809476D8 B0 1F 09 1C */ sth r0, 0x91c(r31) -/* 809476DC 48 00 00 24 */ b lbl_80947700 -lbl_809476E0: -/* 809476E0 40 81 00 14 */ ble lbl_809476F4 -/* 809476E4 48 00 25 29 */ bl getFlowNodeNum__8daMyna_cFv -/* 809476E8 38 03 00 07 */ addi r0, r3, 7 -/* 809476EC B0 1F 09 1C */ sth r0, 0x91c(r31) -/* 809476F0 48 00 00 10 */ b lbl_80947700 -lbl_809476F4: -/* 809476F4 48 00 25 19 */ bl getFlowNodeNum__8daMyna_cFv -/* 809476F8 38 03 00 08 */ addi r0, r3, 8 -/* 809476FC B0 1F 09 1C */ sth r0, 0x91c(r31) -lbl_80947700: -/* 80947700 38 7F 06 20 */ addi r3, r31, 0x620 -/* 80947704 7F E4 FB 78 */ mr r4, r31 -/* 80947708 A0 BF 09 1C */ lhz r5, 0x91c(r31) -/* 8094770C 38 C0 00 00 */ li r6, 0 -/* 80947710 38 E0 00 00 */ li r7, 0 -/* 80947714 4B 90 28 7D */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 80947718 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8094771C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80947720 7C 08 03 A6 */ mtlr r0 -/* 80947724 38 21 00 10 */ addi r1, r1, 0x10 -/* 80947728 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/thanks_talk_move__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/thanks_talk_move__8daMyna_cFv.s deleted file mode 100644 index 800a5be661..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/thanks_talk_move__8daMyna_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8094772C: -/* 8094772C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80947730 7C 08 02 A6 */ mflr r0 -/* 80947734 90 01 00 14 */ stw r0, 0x14(r1) -/* 80947738 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8094773C 7C 7F 1B 78 */ mr r31, r3 -/* 80947740 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80947744 28 00 00 01 */ cmplwi r0, 1 -/* 80947748 40 82 00 38 */ bne lbl_80947780 -/* 8094774C 38 7F 06 20 */ addi r3, r31, 0x620 -/* 80947750 7F E4 FB 78 */ mr r4, r31 -/* 80947754 38 A0 00 00 */ li r5, 0 -/* 80947758 38 C0 00 00 */ li r6, 0 -/* 8094775C 4B 90 2B 7D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80947760 2C 03 00 00 */ cmpwi r3, 0 -/* 80947764 41 82 00 1C */ beq lbl_80947780 -/* 80947768 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8094776C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80947770 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80947774 4B 6F AC F5 */ bl reset__14dEvt_control_cFv -/* 80947778 38 00 00 07 */ li r0, 7 -/* 8094777C 98 1F 09 2C */ stb r0, 0x92c(r31) -lbl_80947780: -/* 80947780 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80947784 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80947788 7C 08 03 A6 */ mtlr r0 -/* 8094778C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80947790 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/turn_on_move__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/turn_on_move__8daMyna_cFv.s deleted file mode 100644 index 4a5e80c363..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/turn_on_move__8daMyna_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80947CFC: -/* 80947CFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80947D00 7C 08 02 A6 */ mflr r0 -/* 80947D04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80947D08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80947D0C 7C 7F 1B 78 */ mr r31, r3 -/* 80947D10 A0 03 09 1E */ lhz r0, 0x91e(r3) -/* 80947D14 28 00 00 00 */ cmplwi r0, 0 -/* 80947D18 41 82 00 1C */ beq lbl_80947D34 -/* 80947D1C 3C 60 80 95 */ lis r3, daMyna_LightActor@ha /* 0x8094BAC0@ha */ -/* 80947D20 38 63 BA C0 */ addi r3, r3, daMyna_LightActor@l /* 0x8094BAC0@l */ -/* 80947D24 80 63 00 00 */ lwz r3, 0(r3) -/* 80947D28 48 41 51 19 */ bl setTurnOnOffChange__17daTag_MynaLight_cFv -/* 80947D2C 38 00 00 0D */ li r0, 0xd -/* 80947D30 98 1F 09 2C */ stb r0, 0x92c(r31) -lbl_80947D34: -/* 80947D34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80947D38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80947D3C 7C 08 03 A6 */ mtlr r0 -/* 80947D40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80947D44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/wolf_talk_init__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/wolf_talk_init__8daMyna_cFv.s deleted file mode 100644 index 0967ba5307..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/wolf_talk_init__8daMyna_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_809480E4: -/* 809480E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 809480E8 7C 08 02 A6 */ mflr r0 -/* 809480EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 809480F0 7C 64 1B 78 */ mr r4, r3 -/* 809480F4 38 64 06 20 */ addi r3, r4, 0x620 -/* 809480F8 38 A0 00 C9 */ li r5, 0xc9 -/* 809480FC 38 C0 00 00 */ li r6, 0 -/* 80948100 38 E0 00 00 */ li r7, 0 -/* 80948104 4B 90 1E 8D */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 80948108 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8094810C 7C 08 03 A6 */ mtlr r0 -/* 80948110 38 21 00 10 */ addi r1, r1, 0x10 -/* 80948114 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_myna/d_a_myna/wolf_talk_move__8daMyna_cFv.s b/asm/rel/d/a/d_a_myna/d_a_myna/wolf_talk_move__8daMyna_cFv.s deleted file mode 100644 index 506c79f2fb..0000000000 --- a/asm/rel/d/a/d_a_myna/d_a_myna/wolf_talk_move__8daMyna_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80948118: -/* 80948118 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8094811C 7C 08 02 A6 */ mflr r0 -/* 80948120 90 01 00 14 */ stw r0, 0x14(r1) -/* 80948124 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80948128 7C 7F 1B 78 */ mr r31, r3 -/* 8094812C 38 7F 06 20 */ addi r3, r31, 0x620 -/* 80948130 7F E4 FB 78 */ mr r4, r31 -/* 80948134 38 A0 00 00 */ li r5, 0 -/* 80948138 38 C0 00 00 */ li r6, 0 -/* 8094813C 4B 90 21 9D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80948140 2C 03 00 00 */ cmpwi r3, 0 -/* 80948144 41 82 00 1C */ beq lbl_80948160 -/* 80948148 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8094814C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80948150 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80948154 4B 6F A3 15 */ bl reset__14dEvt_control_cFv -/* 80948158 88 1F 09 2E */ lbz r0, 0x92e(r31) -/* 8094815C 98 1F 09 2C */ stb r0, 0x92c(r31) -lbl_80948160: -/* 80948160 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80948164 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80948168 7C 08 03 A6 */ mtlr r0 -/* 8094816C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80948170 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_obj_ss_base.h b/include/d/a/d_a_obj_ss_base.h index e1002470b4..a9b64dfe36 100644 --- a/include/d/a/d_a_obj_ss_base.h +++ b/include/d/a/d_a_obj_ss_base.h @@ -11,21 +11,12 @@ public: /* 8015E4C8 */ virtual void setSoldOut(); /* 8015E4B0 */ virtual u32 getProcessID(); - void* getParentPtr() { - return mpParentPtr; - } - - void setFlowNodeNumber(u16 flowNodeNum) { - mFlowNodeNum = flowNodeNum; - } - - u16 getValueNumber() { - return mValueNum; - } - - void setValueNumber(u16 valueNum) { - mValueNum = valueNum; - } + void* getParentPtr() { return mpParentPtr; } + void setParentPtr(void* parentPtr) { mpParentPtr = parentPtr; } + u16 getFlowNodeNumber() { return mFlowNodeNum; } + void setFlowNodeNumber(u16 flowNodeNum) { mFlowNodeNum = flowNodeNum; } + u16 getValueNumber() { return mValueNum; } + void setValueNumber(u16 valueNum) { mValueNum = valueNum; } private: /* 0x56C */ void* mpParentPtr; diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 7f4d5042a3..8ac65e113b 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -94,9 +94,7 @@ private: class daPy_actorKeep_c { public: - daPy_actorKeep_c() { - clearData(); - } + daPy_actorKeep_c() { clearData(); } void setActor(); void setData(fopAc_ac_c*); @@ -161,10 +159,10 @@ public: s16 getMoveAngle() const { return mDemoMoveAngle; } f32 getStick() { return mStick; } int getParam0() const { return mParam0; } - void setParam0(int value) { mParam0 = value;} - void setParam1(int value) { mParam1 = value;} - void setParam2(int value) { mParam2 = value;} - void setPos0(const cXyz* pos) { mDemoPos0 = *pos;} + void setParam0(int value) { mParam0 = value; } + void setParam1(int value) { mParam1 = value; } + void setParam2(int value) { mParam2 = value; } + void setPos0(const cXyz* pos) { mDemoPos0 = *pos; } void setToolDemoType() { setDemoType(1); } s16 getTimer() const { return mTimer; } void decTimer() { mTimer--; } @@ -410,6 +408,7 @@ public: RFLG0_UNK_100 = 0x100, RFLG0_UNK_80 = 0x80, RFLG0_UNK_40 = 0x40, + RFLG0_GRAB_UP_END = 0x20, RFLG0_UNK_10 = 0x10, RFLG0_UNK_8 = 0x8, RFLG0_UNK_2 = 0x2, @@ -539,11 +538,12 @@ public: void changeDemoParam2(s16); void cancelOriginalDemo(); void changeOriginalDemo(); + cXyz getHeadTopPos() const; /* 801829E0 */ void checkThrowDamage() const; /* 80182A10 */ void checkGoronSideMove() const; /* 80182AAC */ void getRightFootPosP(); /* 80182AB4 */ void getLeftFootPosP(); - /* 80182ABC */ //u32 getMidnaActor(); + /* 80182ABC */ // u32 getMidnaActor(); /* 80182AC4 */ void checkCopyRodThrowAfter() const; /* 80182AD8 */ void checkRide() const; /* 80182B9C */ void getRightHandPos() const; @@ -727,7 +727,6 @@ public: virtual BOOL checkCopyRodTopUse(); virtual bool checkCopyRodEquip() const; virtual BOOL checkCutJumpMode() const; - virtual cXyz getHeadTopPos() const; bool getSumouCameraMode() const { bool sumouCameraMode = false; @@ -758,13 +757,14 @@ public: bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); } bool checkFreezeDamage() const { return i_checkNoResetFlg1(FLG1_UNK_40000000); } bool checkWolfTagLockJumpReady() const { return i_checkResetFlg0(RFLG0_UNK_20000); } - + bool getGrabUpEnd() const { return i_checkResetFlg0(RFLG0_GRAB_UP_END); } + void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); } void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); } void onNotHang() { i_onEndResetFlg0(ERFLG0_NOT_HANG); } void onShieldBackBone() { i_onEndResetFlg1(ERFLG1_GANON_FINISH); } void onFogFade() { i_onNoResetFlg2(FLG2_UNK_4000); } - + void offCargoCarry() { if (checkCargoCarry()) { mSpecialMode = 0; @@ -788,35 +788,35 @@ public: u32 i_checkNoResetFlg1(daPy_FLG1 i_flag) const { return mNoResetFlg1 & i_flag; } u32 i_checkNoResetFlg2(daPy_FLG2 i_flag) const { return mNoResetFlg2 & i_flag; } u32 i_checkNoResetFlg3(daPy_FLG3 i_flag) const { return mNoResetFlg3 & i_flag; } - + void i_onNoResetFlg0(int i_flag) { mNoResetFlg0 |= i_flag; } void i_onNoResetFlg1(int i_flag) { mNoResetFlg1 |= i_flag; } void i_onNoResetFlg2(int i_flag) { mNoResetFlg2 |= i_flag; } void i_onNoResetFlg3(int i_flag) { mNoResetFlg3 |= i_flag; } - + void i_offNoResetFlg0(int i_flag) { mNoResetFlg0 &= ~i_flag; } void i_offNoResetFlg1(int i_flag) { mNoResetFlg1 &= ~i_flag; } void i_offNoResetFlg2(int i_flag) { mNoResetFlg2 &= ~i_flag; } void i_offNoResetFlg3(int i_flag) { mNoResetFlg3 &= ~i_flag; } - + void i_offResetFlg0(int flag) { mResetFlg0 &= ~flag; } void i_offResetFlg1(int flag) { mResetFlg1 &= ~flag; } void i_onResetFlg0(int flag) { mResetFlg0 |= flag; } void i_onResetFlg1(int flag) { mResetFlg1 |= flag; } - + void i_onEndResetFlg0(int i_flag) { mEndResetFlg0 |= i_flag; } void i_onEndResetFlg2(int i_flag) { mEndResetFlg2 |= i_flag; } void i_offEndResetFlg2(daPy_ERFLG2 i_flag) { mEndResetFlg2 &= ~i_flag; } - + u32 i_checkResetFlg0(daPy_py_c::daPy_RFLG0 i_flag) const { return mResetFlg0 & i_flag; } u32 checkResetFlg1(daPy_py_c::daPy_RFLG1 i_flag) const { return mResetFlg1 & i_flag; } - + u32 i_checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 i_flag) const { return mEndResetFlg0 & i_flag; } u32 i_checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 i_flag) const { return mEndResetFlg1 & i_flag; } u32 i_checkEndResetFlg2(daPy_py_c::daPy_ERFLG2 i_flag) const { return mEndResetFlg2 & i_flag; } - + void i_onEndResetFlg1(daPy_ERFLG1 i_flag) { mEndResetFlg1 |= i_flag; } - + u32 i_checkWolf() const { return i_checkNoResetFlg1(FLG1_IS_WOLF); } BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); } BOOL i_checkMagneBootsOn() const { return i_checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); } @@ -826,7 +826,6 @@ public: void i_onPushPullKeep() { i_onNoResetFlg0(FLG0_PUSH_PULL_KEEP); } void i_offPushPullKeep() { i_offNoResetFlg0(FLG0_PUSH_PULL_KEEP); } - u32 i_checkBoarSingleBattle() const { return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } void i_changeOriginalDemo() { @@ -834,7 +833,7 @@ public: mDemo.setParam0(0); } - void i_changeDemoMode(u32 i_demoMode,int i_param0,int i_param1,s16 i_param2) { + void i_changeDemoMode(u32 i_demoMode, int i_param0, int i_param1, s16 i_param2) { mDemo.setDemoMode(i_demoMode); mDemo.setParam0(i_param0); mDemo.setParam1(i_param1); diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index 134128c029..fded21ac11 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -117,8 +117,8 @@ public: /* 802380C4 */ static void changeGroup(s16); /* 8023806C */ static void demoMessageGroup(); /* 80238098 */ void endFlowGroup(); - /* 802380F4 */ static bool getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*, - char*, char*, s16*); + /* 802380F4 */ static bool getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, + char*, char*, char*, s16*); /* 80238174 */ static u8* getMsgDtPtr(); /* 80238188 */ static void setProcessID(unsigned int); /* 8023819C */ static fopAc_ac_c* getActor(); @@ -164,26 +164,34 @@ public: s16 getInputValueLocal() { return mInputValue; } void setInputValueLocal(s16 i_inputValue) { mInputValue = i_inputValue; } s16 getNowTotalPriceLocal() { return mNowTotalPrice; } + void setNowTotalPriceLocal(s16 i_nowTotalPrice) { mNowTotalPrice = i_nowTotalPrice; } s16 getNowTotalPaymentLocal() { return mNowTotalPayment; } + void setNowTotalPaymentLocal(s16 i_nowTotalPayment) { mNowTotalPayment = i_nowTotalPayment; } void onInputFlagLocal() { mInputFlag = 1; } + void offPaymentFlagLocal() { mPaymentFlag = 0; } void offAutoMessageFlagLocal() { mAutoMessageFlag = 0; } void onAutoMessageFlagLocal() { mAutoMessageFlag = 1; } void setFundRaisingValueLocal(s16 i_value) { mFundRaisingValue = i_value; } u16 getPortalMessageIDLocal() { return mPortalMessageID; } bool isAutoMessageFlagLocal() { return mAutoMessageFlag; } + bool isPaymentFlagLocal() { return mPaymentFlag; } u8 getSelectPushFlag() { return mSelectPushFlag; } u8 getSelectCancelPos() { return mSelectCancelPos; } s16 getInputValue() { return getInputValueLocal(); } void setInputValue(s16 i_inputValue) { setInputValueLocal(i_inputValue); } s16 getNowTotalPrice() { return getNowTotalPriceLocal(); } + void setNowTotalPrice(s16 i_nowTotalPrice) { setNowTotalPriceLocal(i_nowTotalPrice); } s16 getNowTotalPayment() { return getNowTotalPaymentLocal(); } + void setNowTotalPayment(s16 i_nowTotalPayment) { setNowTotalPaymentLocal(i_nowTotalPayment); } void onInputFlag() { onInputFlagLocal(); } + void offPaymentFlag() { offPaymentFlagLocal(); } void offAutoMessageFlag() { offAutoMessageFlagLocal(); } void onAutoMessageFlag() { onAutoMessageFlagLocal(); } void setFundRaisingValue(s16 i_value) { setFundRaisingValueLocal(i_value); } u16 getPortalMessageID() { return getPortalMessageIDLocal(); } bool isAutoMessageFlag() { return isAutoMessageFlagLocal(); } + bool isPaymentFlag() { return isPaymentFlagLocal(); } jmessage_tSequenceProcessor* getSequenceProcessor() { return mpSeqProc; } @@ -276,6 +284,10 @@ u16 dMsgObject_getFundRaising(); void dMsgObject_addOffering(s16 param_0); u16 dMsgObject_getOffering(); void dMsgObject_addTotalPrice(s16 param_0); +u16 dMsgObject_getTotalPrice(); +void dMsgObject_setTotalPrice(u16 param_0); +u16 dMsgObject_getTotalPayment(); +void dMsgObject_setTotalPayment(u16 param_0); inline dMsgObject_c* dMsgObject_getMsgObjectClass() { return dComIfGp_getMsgObjectClass(); @@ -325,11 +337,8 @@ inline void dMsgObject_setTalkActor(fopAc_ac_c* actor) { inline bool dMsgObject_getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2, JUTFont* param_3, COutFont_c* param_4, char* param_5, char* param_6, char* param_7, s16* param_8) { - return dMsgObject_c::getString( - param_0, param_1, param_2, param_3, - param_4, param_5, param_6, param_7, - param_8 - ); + return dMsgObject_c::getString(param_0, param_1, param_2, param_3, param_4, param_5, param_6, + param_7, param_8); } inline void dMsgObject_onKillMessageFlag() { @@ -348,7 +357,7 @@ inline void dMsgObject_setSmellType(u8 type) { dMsgObject_c::setSmellType(type); } -inline void dMsgObject_setTalkPartner(fopAc_ac_c *actor) { +inline void dMsgObject_setTalkPartner(fopAc_ac_c* actor) { dMsgObject_getMsgObjectClass()->setTalkPartner(actor); } @@ -486,7 +495,8 @@ public: /* 0x0DC */ f32 mBoxItemTextSizeY; /* 0x0E0 */ f32 mBoxItemTextPosX; /* 0x0E4 */ f32 mBoxItemTextPosY; - /* 0x0E8 */ JUtility::TColor mBoxStartBlack[10]; // talk, navi, midna, item, stone, wood, book, wolf, + /* 0x0E8 */ JUtility::TColor + mBoxStartBlack[10]; // talk, navi, midna, item, stone, wood, book, wolf, /* 0x110 */ JUtility::TColor mBoxEndBlack[10]; /* 0x138 */ JUtility::TColor mBoxStartWhite[10]; /* 0x160 */ JUtility::TColor mBoxEndWhite[10]; @@ -510,7 +520,8 @@ public: /* 0x1CC */ f32 mStageTitleBaseAlpha; /* 0x1D0 */ f32 mBossNameBaseAlpha; /* 0x1D4 */ f32 mChoicePos[3][10]; // down, mid, top - /* 0x24C */ f32 mBoxPos[3][10]; // down, mid, top // talk, navi, midna, item, stone, wood, book, wolf, + /* 0x24C */ f32 + mBoxPos[3][10]; // down, mid, top // talk, navi, midna, item, stone, wood, book, wolf, /* 0x2C4 */ f32 mPortalIconScale; /* 0x2C8 */ f32 mTextPosX; /* 0x2CC */ f32 mTextPosY; @@ -548,10 +559,12 @@ public: /* 0x31E */ bool mSaveSeqMsgDebug; /* 0x31F */ bool mMsgDebug; /* 0x320 */ bool mTextColorDebug; - /* 0x321 */ u8 mTextColorUpperR[9]; // Default, Red, Green, Blue, Yellow, L.Blue, Purple, Grey, Orange, + /* 0x321 */ u8 + mTextColorUpperR[9]; // Default, Red, Green, Blue, Yellow, L.Blue, Purple, Grey, Orange, /* 0x32A */ u8 mTextColorUpperG[9]; /* 0x333 */ u8 mTextColorUpperB[9]; - /* 0x33C */ u8 mTextColorLowerR[9]; // Default, Red, Green, Blue, Yellow, L.Blue, Purple, Grey, Orange, + /* 0x33C */ u8 + mTextColorLowerR[9]; // Default, Red, Green, Blue, Yellow, L.Blue, Purple, Grey, Orange, /* 0x345 */ u8 mTextColorLowerG[9]; /* 0x34E */ u8 mTextColorLowerB[9]; /* 0x357 */ u8 mDisplaySpeed; diff --git a/include/rel/d/a/d_a_myna/d_a_myna.h b/include/rel/d/a/d_a_myna/d_a_myna.h index 333aa1cbc2..9fd473f905 100644 --- a/include/rel/d/a/d_a_myna/d_a_myna.h +++ b/include/rel/d/a/d_a_myna/d_a_myna.h @@ -81,8 +81,8 @@ public: /* 809486F8 */ void attack2_talk_init(); /* 80948734 */ void attack2_talk_move(); /* 809487EC */ void soldoutItem(unsigned int); - /* 80948828 */ void fly_attack_move(); - /* 80948ADC */ void fly_return_move(); + /* 80948828 */ bool fly_attack_move(); + /* 80948ADC */ bool fly_return_move(); /* 80948DFC */ void fly_body_wave(); /* 80948E84 */ void talkAnime(msg_class*); /* 80948FAC */ int chkEvent(); @@ -115,6 +115,8 @@ public: daMyna_c(){}; void onEventFlag(u8 flag) { field_0x92F |= (1 << flag); } + void offEventFlag(u8 flag) { field_0x92F &= ~(1 << flag); } + bool isEventFlag(u8 flag) { return field_0x92F & (1 << flag); } typedef void (daMyna_c::*ProcFunc)(); typedef int (daMyna_c::*BaseMotionFunc)(int); @@ -135,8 +137,8 @@ public: /* 0x66C */ cBgS_GndChk mGndChk; /* 0x6A8 */ dCcD_Stts mStatus; /* 0x6E4 */ dCcD_Sph mSph; - /* 0x81C */ u32 field_0x81C; - /* 0x820 */ u32 field_0x820; + /* 0x81C */ s32 field_0x81C; + /* 0x820 */ s32 field_0x820; /* 0x824 */ u32 field_0x824; /* 0x828 */ fopAc_ac_c* field_0x828; /* 0x82C */ cXyz field_0x82C; diff --git a/include/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.h b/include/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.h index 0069110c40..6b8fb9aa8f 100644 --- a/include/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.h +++ b/include/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.h @@ -22,6 +22,8 @@ public: return var1 & 0xFF; } + bool getTurnOnFlag() { return mTurnOnFlag; } + /* 0x568 */ // vtable /* 0x56C */ f32 field_0x56c; /* 0x570 */ JPABaseEmitter* field_0x570[2]; diff --git a/rel/d/a/d_a_myna/d_a_myna.cpp b/rel/d/a/d_a_myna/d_a_myna.cpp index fad8ea19d0..17470bf272 100644 --- a/rel/d/a/d_a_myna/d_a_myna.cpp +++ b/rel/d/a/d_a_myna/d_a_myna.cpp @@ -4,6 +4,7 @@ // #include "rel/d/a/d_a_myna/d_a_myna.h" +#include "JSystem/JAudio2/JAISound.h" #include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_math.h" #include "d/a/d_a_player.h" @@ -12,16 +13,9 @@ #include "d/kankyo/d_kankyo.h" #include "d/msg/d_msg_object.h" #include "dol2asm.h" +#include "rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h" #include "rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.h" -// -// Types: -// - -struct daObj_SSItem_c { - /* 80CE77F8 */ void getExchangeItemPtr(); -}; - // // Forward References: // @@ -380,44 +374,48 @@ static u8 l_HOSTIO[52]; #endif /* 8094BA70-8094BA98 000088 0028+00 0/2 0/0 0/0 .bss daMyna_targetActor */ -#pragma push -#pragma force_active on -static u8 daMyna_targetActor[40]; -#pragma pop +static fopAc_ac_c* daMyna_targetActor[10]; /* 8094BA98-8094BAC0 0000B0 0028+00 0/2 0/0 0/0 .bss daMyna_subActor */ -#pragma push -#pragma force_active on -static u8 daMyna_subActor[40]; -#pragma pop +static fopAc_ac_c* daMyna_subActor[10]; /* 8094BAC0-8094BAC4 0000D8 0004+00 7/7 0/0 0/0 .bss daMyna_LightActor */ static daTag_MynaLight_c* daMyna_LightActor; /* 8094BAC4-8094BAC8 0000DC 0004+00 0/2 0/0 0/0 .bss daMyna_actor_count */ -#pragma push -#pragma force_active on -static u8 daMyna_actor_count[4]; -#pragma pop +static s32 daMyna_actor_count; /* 80945CD8-80945D9C 000158 00C4+00 1/1 0/0 0/0 .text daMyna_searchSSItem__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daMyna_searchSSItem(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/daMyna_searchSSItem__FPvPv.s" +static void* daMyna_searchSSItem(void* param_0, void* param_1) { + if (fopAcM_IsActor(param_0) && (fopAcM_GetName(param_0) == PROC_OBJ_SSITEM || + fopAcM_GetName(param_0) == PROC_OBJ_SSDRINK || + fopAcM_GetName(param_0) == PROC_TAG_SSDRINK)) + { + if ((fopAcM_GetParam(param_1) & 0xF0000000) == (fopAcM_GetParam(param_0) & 0xF0000000) && + daMyna_actor_count < 10) + { + fopAc_ac_c* pfVar4 = static_cast(param_0); + if (fopAcM_GetName(param_0) == PROC_OBJ_SSITEM) { + pfVar4 = static_cast(param_0)->getExchangeItemPtr(); + } + if (pfVar4 != NULL) { + daMyna_targetActor[daMyna_actor_count] = pfVar4; + daMyna_subActor[daMyna_actor_count] = static_cast(param_0); + daMyna_actor_count++; + } + } + } + return 0; } -#pragma pop /* 80945D9C-80945E0C 00021C 0070+00 1/1 0/0 0/0 .text daMyna_searchLight__FPvPv */ static void* daMyna_searchLight(void* i_mynaLightTagActor, void* param_1) { if (fopAcM_IsActor(i_mynaLightTagActor) && fopAcM_GetName(i_mynaLightTagActor) == PROC_TAG_MNLIGHT) { - u32 uVar1 = fopAcM_GetParam(param_1) & 0xF0000000; - u32 uVar2 = fopAcM_GetParam(i_mynaLightTagActor) & 0xF0000000; - if (uVar1 == uVar2) { + if ((fopAcM_GetParam(param_1) & 0xF0000000) == + (fopAcM_GetParam(i_mynaLightTagActor) & 0xF0000000)) + { daMyna_LightActor = static_cast(i_mynaLightTagActor); } } @@ -426,20 +424,23 @@ static void* daMyna_searchLight(void* i_mynaLightTagActor, void* param_1) { /* ############################################################################################## */ /* 8094BAC8-8094BACC 0000E0 0004+00 8/9 0/0 0/0 .bss daMyna_evtTagActor0 */ -static u8 daMyna_evtTagActor0[4]; +static fopAc_ac_c* daMyna_evtTagActor0; /* 8094BACC-8094BAD0 0000E4 0004+00 2/2 0/0 0/0 .bss daMyna_evtTagActor1 */ -static u8 daMyna_evtTagActor1[4]; +static fopAc_ac_c* daMyna_evtTagActor1; /* 80945E0C-80945E80 00028C 0074+00 1/1 0/0 0/0 .text daMyna_searchEvtTag__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daMyna_searchEvtTag(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/daMyna_searchEvtTag__FPvPv.s" +static void* daMyna_searchEvtTag(void* i_evtTagActor, void* param_1) { + if (fopAcM_IsActor(i_evtTagActor) && fopAcM_GetName(i_evtTagActor) == PROC_TAG_EVT) { + if (((fopAcM_GetParam(i_evtTagActor) >> 24) & 0xF) == 0) { + daMyna_evtTagActor0 = static_cast(i_evtTagActor); + } else if (((fopAcM_GetParam(i_evtTagActor) >> 24) & 0xF) == 1) { + daMyna_evtTagActor1 = static_cast(i_evtTagActor); + } + return 0; + } + return 0; } -#pragma pop /* ############################################################################################## */ /* 8094B1B0-8094B1F0 000000 0040+00 7/7 0/0 0/0 .rodata mCcDSph__8daMyna_c */ @@ -1569,6 +1570,13 @@ int daMyna_c::jntNodeCB(J3DJoint* i_jnt, J3DModel* i_model) { } /* 809468EC-8094692C 000D6C 0040+00 1/0 0/0 0/0 .text attack_wait_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::attack_wait_init() { + setAnimeType(1, 0.0f); + field_0x92A = 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1577,8 +1585,45 @@ asm void daMyna_c::attack_wait_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_wait_init__8daMyna_cFv.s" } #pragma pop +#endif /* 8094692C-80946AEC 000DAC 01C0+00 1/0 0/0 0/0 .text attack_wait_move__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::attack_wait_move() { + if (current.angle.y != orig.angle.y) { + cLib_addCalcAngleS(¤t.angle.y, orig.angle.y, 4, 32767, 1500); + cLib_addCalcAngleS(¤t.angle.x, orig.angle.x, 4, 32767, 1500); + if (abs(s16(current.angle.y - orig.angle.y)) < 128) { + current.angle = orig.angle; + } + } + if (!daPy_py_c::i_checkNowWolf() && daMyna_evtTagActor0 != NULL) { + cXyz var1(1.0f, 1.0f, 1.0f); + if (!dComIfGs_isSaveSwitch(0x3C)) { + if (chkPlayerInEvtArea(daMyna_evtTagActor0, var1)) { + if (!isEventFlag(1)) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + if (mEvtInfo.checkCommandTalk()) { + field_0x92C = 1; + } + } else { + field_0x92C = 2; + } + } + } else if (field_0x92A < l_HOSTIO.field_0x24) { + field_0x92A++; + } else { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + if (mEvtInfo.checkCommandTalk()) { + field_0x92C = 4; + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1587,8 +1632,16 @@ asm void daMyna_c::attack_wait_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_wait_move__8daMyna_cFv.s" } #pragma pop +#endif /* 80946AEC-80946B40 000F6C 0054+00 1/0 0/0 0/0 .text attack_before_talk_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::attack_before_talk_init() { + mMsgFlow.init(this, field_0x91C, 0, NULL); + setAnimeType(10, 0.0f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1597,18 +1650,25 @@ asm void daMyna_c::attack_before_talk_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_before_talk_init__8daMyna_cFv.s" } #pragma pop +#endif /* 80946B40-80946BB4 000FC0 0074+00 1/0 0/0 0/0 .text attack_before_talk_move__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::attack_before_talk_move() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/attack_before_talk_move__8daMyna_cFv.s" +void daMyna_c::attack_before_talk_move() { + if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + i_dComIfGp_event_reset(); + onEventFlag(1); + field_0x92C = 2; + } } -#pragma pop /* 80946BB4-80946BF4 001034 0040+00 1/0 0/0 0/0 .text attack_fly_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::attack_fly_init() { + setAnimeType(0, 0.0f); + field_0x91A = 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1617,8 +1677,31 @@ asm void daMyna_c::attack_fly_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_fly_init__8daMyna_cFv.s" } #pragma pop +#endif /* 80946BF4-80946D20 001074 012C+00 1/0 0/0 0/0 .text attack_fly_move__8daMyna_cFv */ +// regswap +#ifdef NONMATCHING +void daMyna_c::attack_fly_move() { + if (daMyna_evtTagActor0 != NULL) { + cXyz var1(1.0f, 1.0f, 1.0f); + fly_body_wave(); + if (field_0x926 > 0 && dComIfGs_isSaveSwitch(0x3C)) { + field_0x926 = 0; + } + if (chkPlayerInEvtArea(daMyna_evtTagActor0, var1) && !daPy_py_c::i_checkNowWolf() && + !dComIfGs_isSaveSwitch(0x3C) && field_0x926 == 0) + { + mStatus.Move(); + if (fly_attack_move()) { + field_0x92C = 3; + } + } else if (fly_return_move()) { + field_0x92C = 0; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1627,8 +1710,16 @@ asm void daMyna_c::attack_fly_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_fly_move__8daMyna_cFv.s" } #pragma pop +#endif /* 80946D20-80946D64 0011A0 0044+00 1/0 0/0 0/0 .text attack_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::attack_init() { + setAnimeType(8, 0.0f); + mSph.OnAtVsPlayerBit(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1637,8 +1728,22 @@ asm void daMyna_c::attack_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_init__8daMyna_cFv.s" } #pragma pop +#endif /* 80946D64-80946DD4 0011E4 0070+00 1/0 0/0 0/0 .text attack_move__8daMyna_cFv */ +// Matches when l_HOSTIO is the correct type +#ifdef NONMATCHING +void daMyna_c::attack_move() { + mStatus.Move(); + if (field_0x91E != 0) { + field_0x92C = 2; + } + if (mSph.ChkAtHit()) { + field_0x926 = l_HOSTIO.field_0x30; + mSph.OffAtVsPlayerBit(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1647,30 +1752,32 @@ asm void daMyna_c::attack_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_move__8daMyna_cFv.s" } #pragma pop +#endif /* 80946DD4-80946E08 001254 0034+00 1/0 0/0 0/0 .text attack_after_talk_init__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::attack_after_talk_init() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/attack_after_talk_init__8daMyna_cFv.s" +void daMyna_c::attack_after_talk_init() { + mMsgFlow.init(this, field_0x91C, 0, NULL); } -#pragma pop /* 80946E08-80946E84 001288 007C+00 1/0 0/0 0/0 .text attack_after_talk_move__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::attack_after_talk_move() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/attack_after_talk_move__8daMyna_cFv.s" +void daMyna_c::attack_after_talk_move() { + if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + i_dComIfGp_event_reset(); + onEventFlag(2); + field_0x91C = 0x139; + field_0x92C = 5; + } } -#pragma pop /* 80946E84-80946EB0 001304 002C+00 1/0 0/0 0/0 .text greet_wait_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::greet_wait_init() { + setAnimeType(1, 0.0f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1679,6 +1786,7 @@ asm void daMyna_c::greet_wait_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/greet_wait_init__8daMyna_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8094B200-8094B204 000050 0004+00 1/1 0/0 0/0 .rodata @4481 */ @@ -1686,6 +1794,46 @@ SECTION_RODATA static f32 const lit_4481 = 350.0f; COMPILER_STRIP_GATE(0x8094B200, &lit_4481); /* 80946EB0-80947030 001330 0180+00 1/0 0/0 0/0 .text greet_wait_move__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::greet_wait_move() { + if (!daPy_py_c::i_checkNowWolf()) { + if (daMyna_evtTagActor0 != NULL) { + if (chkPlayerInEvtArea(daMyna_evtTagActor0, cXyz(cXyz(1.0f, 1.0f, 1.0f)))) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + if (mEvtInfo.checkCommandTalk()) { + field_0x92C = 6; + } + } else { + if (isEventFlag(0)) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + if (mEvtInfo.checkCommandTalk()) { + field_0x92C = 10; + } + } + } + } else { + if (fopAcM_searchPlayerDistanceXZ(this) < 350.0f) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + if (mEvtInfo.checkCommandTalk()) { + field_0x92C = 6; + } + } else { + if (isEventFlag(0)) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + if (mEvtInfo.checkCommandTalk()) { + field_0x92C = 10; + } + } + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1694,8 +1842,35 @@ asm void daMyna_c::greet_wait_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/greet_wait_move__8daMyna_cFv.s" } #pragma pop +#endif /* 80947030-8094711C 0014B0 00EC+00 1/0 0/0 0/0 .text greet_talk_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::greet_talk_init() { + dMsgObject_setTotalPayment(0); + dMsgObject_setTotalPrice(0); + field_0x922 = dMsgObject_getTotalPayment(); + field_0x920 = dMsgObject_getTotalPrice(); + dMsgObject_getMsgObjectClass()->setNowTotalPrice(0); + dMsgObject_getMsgObjectClass()->setNowTotalPayment(0); + + switch (field_0x932) { + case 0: + field_0x91C = getFlowNodeNum(); + break; + case 1: + field_0x91C = getFlowNodeNum() + 1; + break; + case 2: + field_0x91C = getFlowNodeNum() + 2; + break; + } + + setAnimeType(9, 0.0f); + mMsgFlow.init(this, field_0x91C, 0, NULL); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1704,18 +1879,28 @@ asm void daMyna_c::greet_talk_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/greet_talk_init__8daMyna_cFv.s" } #pragma pop +#endif /* 8094711C-809471BC 00159C 00A0+00 1/0 0/0 0/0 .text greet_talk_move__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::greet_talk_move() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/greet_talk_move__8daMyna_cFv.s" +void daMyna_c::greet_talk_move() { + if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + i_dComIfGp_event_reset(); + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { + field_0x937 = 20; + field_0x92C = 19; + } else { + field_0x92C = 7; + } + } } -#pragma pop /* 809471BC-809471E8 00163C 002C+00 1/0 0/0 0/0 .text shopping_wait_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::shopping_wait_init() { + setAnimeType(1, 0.0f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1724,6 +1909,7 @@ asm void daMyna_c::shopping_wait_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/shopping_wait_init__8daMyna_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8094B204-8094B208 000054 0004+00 1/1 0/0 0/0 .rodata @4655 */ @@ -1731,6 +1917,100 @@ SECTION_RODATA static f32 const lit_4655 = 450.0f; COMPILER_STRIP_GATE(0x8094B204, &lit_4655); /* 809471E8-809475B4 001668 03CC+00 1/0 0/0 0/0 .text shopping_wait_move__8daMyna_cFv */ +// regswap +#ifdef NONMATCHING +void daMyna_c::shopping_wait_move() { + if (!daPy_py_c::i_checkNowWolf()) { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { + field_0x92C = 17; + field_0x937 = 20; + } else { + daPy_py_c* player = daPy_getPlayerActorClass(); + bool bVar1 = false; + s16 nowTotalPrice = dMsgObject_getMsgObjectClass()->getNowTotalPrice(); + if (dMsgObject_getMsgObjectClass()->isPaymentFlag()) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + if (mEvtInfo.checkCommandTalk()) { + field_0x92C = 9; + dMsgObject_getMsgObjectClass()->offPaymentFlag(); + } + } else { + if (player->getGrabUpEnd()) { + for (int i = 0; i < 10; i++) { + if (mShopItems[i].mTargetActorID == player->getGrabActorID() && + mShopItems[i].mItemStatus == 2) + { + dMsgObject_addTotalPrice(mShopItems[i].mValueNum); + field_0x931 = i; + if (mShopItems[i].mFlowNodeNum != 0xFFFF) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + } + } + } + } + + if (field_0x931 != 0xFF) { + if (mShopItems[field_0x931].mTargetActorID != player->getGrabActorID() && + mShopItems[field_0x931].mItemStatus == 2) + { + dMsgObject_addTotalPrice(-mShopItems[field_0x931].mValueNum); + field_0x931 = -1; + } + } + + if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203]) && + daMyna_evtTagActor1 != NULL) + { + cXyz stack_2c(1.0f, 1.0f, 1.0f); + if (chkPlayerInEvtArea(daMyna_evtTagActor1, stack_2c)) { + if (isEventFlag(0)) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + bVar1 = true; + field_0x933 = 1; + } else if (field_0x931 != 0xFF && mShopItems[field_0x931].mItemStatus == 2) + { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + bVar1 = true; + field_0x933 = 1; + } + } + } + + if (daMyna_evtTagActor0 != NULL) { + cXyz stack_38(1.0f, 1.0f, 1.0f); + if (!chkPlayerInEvtArea(daMyna_evtTagActor0, stack_38) && nowTotalPrice > 0) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + bVar1 = true; + } + } else if (fopAcM_searchPlayerDistanceXZ(this) > 450.0f) { + if (isEventFlag(0)) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + bVar1 = true; + } else if (field_0x931 != 0xFF && mShopItems[field_0x931].mItemStatus == 2) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + bVar1 = true; + } + } + + if (mEvtInfo.checkCommandTalk()) { + if (!bVar1) { + field_0x92C = 8; + } else { + field_0x92C = 10; + } + } + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1739,68 +2019,123 @@ asm void daMyna_c::shopping_wait_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/shopping_wait_move__8daMyna_cFv.s" } #pragma pop +#endif /* 809475B4-80947630 001A34 007C+00 1/0 0/0 0/0 .text shopping_talk_init__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::shopping_talk_init() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/shopping_talk_init__8daMyna_cFv.s" +void daMyna_c::shopping_talk_init() { + field_0x828 = fopAcM_SearchByID(mShopItems[field_0x931].mTargetActorID); + field_0x91C = mShopItems[field_0x931].mFlowNodeNum; + mMsgFlow.init(this, field_0x91C, 0, NULL); } -#pragma pop /* 80947630-809476A0 001AB0 0070+00 1/0 0/0 0/0 .text shopping_talk_move__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::shopping_talk_move() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/shopping_talk_move__8daMyna_cFv.s" +void daMyna_c::shopping_talk_move() { + if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + i_dComIfGp_event_reset(); + field_0x828 = NULL; + field_0x92C = 7; + } } -#pragma pop /* 809476A0-8094772C 001B20 008C+00 1/0 0/0 0/0 .text thanks_talk_init__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::thanks_talk_init() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/thanks_talk_init__8daMyna_cFv.s" +void daMyna_c::thanks_talk_init() { + s16 nowTotalPayment = dMsgObject_getMsgObjectClass()->getNowTotalPayment(); + s16 nowTotalPrice = dMsgObject_getMsgObjectClass()->getNowTotalPrice(); + if (nowTotalPayment == nowTotalPrice) { + field_0x91C = getFlowNodeNum() + 6; + } else if (nowTotalPayment > nowTotalPrice) { + field_0x91C = getFlowNodeNum() + 7; + } else { + field_0x91C = getFlowNodeNum() + 8; + } + mMsgFlow.init(this, field_0x91C, 0, NULL); } -#pragma pop /* 8094772C-80947794 001BAC 0068+00 1/0 0/0 0/0 .text thanks_talk_move__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::thanks_talk_move() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/thanks_talk_move__8daMyna_cFv.s" +void daMyna_c::thanks_talk_move() { + if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + i_dComIfGp_event_reset(); + field_0x92C = 7; + } } -#pragma pop /* 80947794-809478D0 001C14 013C+00 1/0 0/0 0/0 .text byebye_talk_init__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::byebye_talk_init() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/byebye_talk_init__8daMyna_cFv.s" +void daMyna_c::byebye_talk_init() { + int var1 = dMsgObject_getTotalPayment() - field_0x922; + if (var1 >= dMsgObject_getTotalPrice() - field_0x920) { + field_0x932 = 0; + } else if (var1 > 0) { + field_0x932 = 1; + } else { + field_0x932 = 2; + } + + switch (field_0x932) { + case 0: + field_0x91C = getFlowNodeNum() + 3; + break; + case 1: + field_0x91C = getFlowNodeNum() + 4; + break; + case 2: + field_0x91C = getFlowNodeNum() + 5; + break; + } + + if (field_0x933 == 0) { + field_0x922 = dMsgObject_getTotalPayment(); + field_0x920 = dMsgObject_getTotalPrice(); + dMsgObject_getMsgObjectClass()->setNowTotalPrice(0); + dMsgObject_getMsgObjectClass()->setNowTotalPayment(0); + offEventFlag(0); + } + + mMsgFlow.init(this, field_0x91C, 0, NULL); } -#pragma pop /* 809478D0-80947A00 001D50 0130+00 1/0 0/0 0/0 .text byebye_talk_move__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::byebye_talk_move() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/byebye_talk_move__8daMyna_cFv.s" +void daMyna_c::byebye_talk_move() { + bool bVar1 = true; + if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + if (field_0x933 == 0) { + if (field_0x931 != 0xFF) { + mShopItems[field_0x931].mItemStatus = 3; + field_0x931 = -1; + } + for (int i = 0; i < mNumShopItems; i++) { + if (mShopItems[i].mItemStatus == 2) { + bVar1 = false; + } + } + } else { + field_0x933 = 0; + bVar1 = false; + } + + i_dComIfGp_event_reset(); + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { + field_0x92C = 0x11; + field_0x937 = 0x14; + } else if (bVar1) { + field_0x92C = 7; + } else { + field_0x92C = 7; + } + } } -#pragma pop /* 80947A00-80947AA4 001E80 00A4+00 1/0 0/0 0/0 .text turn_on_start_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::turn_on_start_init() { + setAnimeType(4, 0.0f); + if (daMyna_LightActor->getTurnOnFlag()) { + mCreature.startCreatureVoice(JAISoundID(Z2SE_MYNA_V_LIGHT_ON), -1); + } else { + mCreature.startCreatureVoice(JAISoundID(Z2SE_MYNA_V_LIGHT_OFF), -1); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1809,6 +2144,7 @@ asm void daMyna_c::turn_on_start_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/turn_on_start_init__8daMyna_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8094B208-8094B210 000058 0004+04 0/5 0/0 0/0 .rodata @4828 */ @@ -1850,6 +2186,36 @@ COMPILER_STRIP_GATE(0x8094B220, &lit_4831); #pragma pop /* 80947AA4-80947CD0 001F24 022C+00 1/0 0/0 0/0 .text turn_on_start_move__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::turn_on_start_move() { + cXyz stack_28; + cXyz local_34; + cXyz local_40; + + local_40.x = daMyna_LightActor->current.pos.x; + local_40.y = current.pos.y; + local_40.z = daMyna_LightActor->current.pos.z; + + cXyz local_4c = local_40 - current.pos; + + s16 sVar2 = cM_atan2s(local_4c.x, local_4c.z); + f32 fVar1 = 0.5f * ((field_0x82C.y - field_0x844.y) + (field_0x838.y - field_0x850.y)); + + local_34.x = 0.0f; + local_34.y = 0.0f; + local_34.z = l_HOSTIO.field_0x0C * (fVar1 * fVar1); + + cLib_offsetPos(&stack_28, ¤t.pos, sVar2, &local_34); + current.pos = stack_28; + + cXyz stack_58 = local_40 - current.pos; + + if (stack_58.abs() < l_HOSTIO.field_0x1C) { + field_0x92C = 12; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1858,8 +2224,15 @@ asm void daMyna_c::turn_on_start_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/turn_on_start_move__8daMyna_cFv.s" } #pragma pop +#endif /* 80947CD0-80947CFC 002150 002C+00 1/0 0/0 0/0 .text turn_on_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::turn_on_init() { + setAnimeType(7, 0.0f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1868,18 +2241,23 @@ asm void daMyna_c::turn_on_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/turn_on_init__8daMyna_cFv.s" } #pragma pop +#endif /* 80947CFC-80947D48 00217C 004C+00 1/0 0/0 0/0 .text turn_on_move__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::turn_on_move() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/turn_on_move__8daMyna_cFv.s" +void daMyna_c::turn_on_move() { + if (field_0x91E != 0) { + daMyna_LightActor->setTurnOnOffChange(); + field_0x92C = 13; + } } -#pragma pop /* 80947D48-80947D74 0021C8 002C+00 1/0 0/0 0/0 .text turn_on_end1_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::turn_on_end1_init() { + setAnimeType(4, 0.0f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1888,8 +2266,23 @@ asm void daMyna_c::turn_on_end1_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/turn_on_end1_init__8daMyna_cFv.s" } #pragma pop +#endif /* 80947D74-80947E18 0021F4 00A4+00 1/0 0/0 0/0 .text turn_on_end1_move__8daMyna_cFv */ +// Matches when l_HOSTIO is the correct type +#ifdef NONMATCHING +void daMyna_c::turn_on_end1_move() { + cXyz local_18 = orig.pos - current.pos; + s16 sVar2 = cM_atan2s(local_18.x, local_18.z); + cLib_addCalcAngleS(¤t.angle.y, sVar2, l_HOSTIO.field_0x26, l_HOSTIO.field_0x28, + l_HOSTIO.field_0x2A); + + if (abs(current.angle.y - sVar2) <= 16) { + current.angle.y = sVar2; + field_0x92C = 14; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1898,8 +2291,17 @@ asm void daMyna_c::turn_on_end1_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/turn_on_end1_move__8daMyna_cFv.s" } #pragma pop +#endif /* 80947E18-80947E50 002298 0038+00 1/0 0/0 0/0 .text turn_on_end2_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::turn_on_end2_init() { + if (field_0x935 != 4) { + setAnimeType(4, 0.0f); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1908,8 +2310,34 @@ asm void daMyna_c::turn_on_end2_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/turn_on_end2_init__8daMyna_cFv.s" } #pragma pop +#endif /* 80947E50-80948070 0022D0 0220+00 1/0 0/0 0/0 .text turn_on_end2_move__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::turn_on_end2_move() { + cXyz stack_24; + cXyz local_30; + cXyz local_3c = orig.pos - current.pos; + + s16 sVar2 = cM_atan2s(local_3c.x, local_3c.z); + f32 fVar1 = ((field_0x82C.y - field_0x844.y) + (field_0x838.y - field_0x850.y)) * 0.5f; + + local_30.x = 0.0f; + local_30.y = 0.0f; + local_30.z = l_HOSTIO.field_0x0C * (fVar1 * fVar1); + + cLib_offsetPos(&stack_24, ¤t.pos, sVar2, &local_30); + current.pos = stack_24; + + cXyz stack_48 = orig.pos - current.pos; + + if (stack_48.abs() < l_HOSTIO.field_0x20) { + current.pos.set(orig.pos); + field_0x92C = 15; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1918,6 +2346,7 @@ asm void daMyna_c::turn_on_end2_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/turn_on_end2_move__8daMyna_cFv.s" } #pragma pop +#endif /* 80948070-80948074 0024F0 0004+00 1/0 0/0 0/0 .text turn_on_end3_init__8daMyna_cFv */ void daMyna_c::turn_on_end3_init() { @@ -1925,6 +2354,18 @@ void daMyna_c::turn_on_end3_init() { } /* 80948074-809480E4 0024F4 0070+00 1/0 0/0 0/0 .text turn_on_end3_move__8daMyna_cFv */ +// Matches when l_HOSTIO is the correct type +#ifdef NONMATCHING +void daMyna_c::turn_on_end3_move() { + cLib_addCalcAngleS(¤t.angle.y, orig.angle.y, l_HOSTIO.field_0x26, l_HOSTIO.field_0x28, + l_HOSTIO.field_0x2A); + + if (abs(current.angle.y - orig.angle.y) <= 16) { + current.angle.y = orig.angle.y; + field_0x92C = field_0x92D; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1933,28 +2374,29 @@ asm void daMyna_c::turn_on_end3_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/turn_on_end3_move__8daMyna_cFv.s" } #pragma pop +#endif /* 809480E4-80948118 002564 0034+00 1/0 0/0 0/0 .text wolf_talk_init__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::wolf_talk_init() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/wolf_talk_init__8daMyna_cFv.s" +void daMyna_c::wolf_talk_init() { + mMsgFlow.init(this, 0xC9, 0, NULL); } -#pragma pop /* 80948118-80948174 002598 005C+00 1/0 0/0 0/0 .text wolf_talk_move__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::wolf_talk_move() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/wolf_talk_move__8daMyna_cFv.s" +void daMyna_c::wolf_talk_move() { + if (mMsgFlow.doFlow(this, NULL, 0) != 0) { + i_dComIfGp_event_reset(); + field_0x92C = field_0x92E; + } } -#pragma pop /* 80948174-809481B4 0025F4 0040+00 1/0 0/0 0/0 .text attack_wait2_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::attack_wait2_init() { + setAnimeType(1, 0.0f); + field_0x92A = 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1963,8 +2405,48 @@ asm void daMyna_c::attack_wait2_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_wait2_init__8daMyna_cFv.s" } #pragma pop +#endif /* 809481B4-80948388 002634 01D4+00 1/0 0/0 0/0 .text attack_wait2_move__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::attack_wait2_move() { + if (daPy_py_c::i_checkNowWolf()) { + field_0x92C = 7; + } else { + if (current.angle.y != orig.angle.y) { + cLib_addCalcAngleS(¤t.angle.y, orig.angle.y, 4, 0x7FFF, 0x5DC); + cLib_addCalcAngleS(¤t.angle.x, orig.angle.x, 4, 0x7FFF, 0x5DC); + if (abs(s16(current.angle.y - orig.angle.y)) < 128) { + current.angle = orig.angle; + } + } + + if (daMyna_evtTagActor0 != NULL) { + cXyz stack_1c(1.0f, 1.0f, 1.0f); + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { + if (chkPlayerInEvtArea(daMyna_evtTagActor0, stack_1c)) { + field_0x937 = 20; + field_0x92C = 19; + } + } else { + if (field_0x939 == 1) { + current.angle = orig.angle; + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); + if (mEvtInfo.checkCommandTalk()) { + field_0x92C = 21; + } + } else if (field_0x92A < l_HOSTIO.field_0x24) { + field_0x92A++; + } else { + field_0x92C = 7; + } + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1973,8 +2455,16 @@ asm void daMyna_c::attack_wait2_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_wait2_move__8daMyna_cFv.s" } #pragma pop +#endif /* 80948388-809483DC 002808 0054+00 1/0 0/0 0/0 .text attack_before_talk2_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::attack_before_talk2_init() { + mMsgFlow.init(this, field_0x91C, 0, NULL); + setAnimeType(10, 0.0f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1983,18 +2473,24 @@ asm void daMyna_c::attack_before_talk2_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_before_talk2_init__8daMyna_cFv.s" } #pragma pop +#endif /* 809483DC-80948444 00285C 0068+00 1/0 0/0 0/0 .text attack_before_talk2_move__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::attack_before_talk2_move() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/attack_before_talk2_move__8daMyna_cFv.s" +void daMyna_c::attack_before_talk2_move() { + if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + i_dComIfGp_event_reset(); + field_0x92C = 19; + } } -#pragma pop /* 80948444-80948484 0028C4 0040+00 1/0 0/0 0/0 .text attack_fly2_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::attack_fly2_init() { + setAnimeType(0, 0.0f); + field_0x91A = 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2003,8 +2499,42 @@ asm void daMyna_c::attack_fly2_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_fly2_init__8daMyna_cFv.s" } #pragma pop +#endif /* 80948484-80948600 002904 017C+00 1/0 0/0 0/0 .text attack_fly2_move__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::attack_fly2_move() { + if (daMyna_evtTagActor0 != NULL) { + cXyz stack_2c(1.0f, 1.0f, 1.0f); + fly_body_wave(); + + if (field_0x926 > 0 && field_0x937 == 0) { + field_0x926 = 0; + } + + if (dMsgObject_getTotalPayment() > field_0x922) { + field_0x937 = 0; + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[802]); + field_0x939 = 1; + } + + if (chkPlayerInEvtArea(daMyna_evtTagActor0, stack_2c) && !daPy_py_c::i_checkNowWolf() && + field_0x937 != 0 && field_0x926 == 0) + { + mStatus.Move(); + if (fly_attack_move()) { + field_0x92C = 20; + } + } else if (fly_return_move()) { + if (field_0x937 == 0) { + dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[802]); + } + field_0x92C = 17; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2013,8 +2543,16 @@ asm void daMyna_c::attack_fly2_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack_fly2_move__8daMyna_cFv.s" } #pragma pop +#endif /* 80948600-80948644 002A80 0044+00 1/0 0/0 0/0 .text attack2_init__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::attack2_init() { + setAnimeType(8, 0.0f); + mSph.OnAtVsPlayerBit(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2023,8 +2561,30 @@ asm void daMyna_c::attack2_init() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack2_init__8daMyna_cFv.s" } #pragma pop +#endif /* 80948644-809486F8 002AC4 00B4+00 1/0 0/0 0/0 .text attack2_move__8daMyna_cFv */ +// Matches when l_HOSTIO is the correct type +#ifdef NONMATCHING +void daMyna_c::attack2_move() { + mStatus.Move(); + if (field_0x91E != 0) { + field_0x92C = 19; + } + + if (mSph.ChkAtHit()) { + field_0x926 = l_HOSTIO.field_0x30; + mSph.OffAtVsPlayerBit(); + if (field_0x937 != 0) { + field_0x937--; + if (i_dComIfGs_getLife() <= 1) { + dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[802]); + field_0x937 = 0; + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2033,26 +2593,30 @@ asm void daMyna_c::attack2_move() { #include "asm/rel/d/a/d_a_myna/d_a_myna/attack2_move__8daMyna_cFv.s" } #pragma pop +#endif /* 809486F8-80948734 002B78 003C+00 1/0 0/0 0/0 .text attack2_talk_init__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::attack2_talk_init() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/attack2_talk_init__8daMyna_cFv.s" +void daMyna_c::attack2_talk_init() { + field_0x91C = 214; + mMsgFlow.init(this, field_0x91C, 0, NULL); } -#pragma pop /* 80948734-809487EC 002BB4 00B8+00 1/0 0/0 0/0 .text attack2_talk_move__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::attack2_talk_move() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/attack2_talk_move__8daMyna_cFv.s" +void daMyna_c::attack2_talk_move() { + if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + i_dComIfGp_event_reset(); + field_0x828 = NULL; + field_0x92C = 7; + dMsgObject_setTotalPayment(0); + dMsgObject_setTotalPrice(0); + field_0x922 = dMsgObject_getTotalPayment(); + field_0x920 = dMsgObject_getTotalPrice(); + dMsgObject_getMsgObjectClass()->setNowTotalPrice(0); + dMsgObject_getMsgObjectClass()->setNowTotalPayment(0); + dMsgObject_getMsgObjectClass()->offPaymentFlag(); + field_0x939 = 0; + } } -#pragma pop /* 809487EC-80948828 002C6C 003C+00 0/0 0/0 2/2 .text soldoutItem__8daMyna_cFUi */ void daMyna_c::soldoutItem(unsigned int i_itemId) { @@ -2069,14 +2633,42 @@ SECTION_RODATA static f32 const lit_5221 = 15.0f; COMPILER_STRIP_GATE(0x8094B228, &lit_5221); /* 80948828-80948ADC 002CA8 02B4+00 2/2 0/0 0/0 .text fly_attack_move__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +bool daMyna_c::fly_attack_move() { + daPy_py_c* playerActorClass = daPy_getPlayerActorClass(); + cXyz local_28; + cXyz stack_34; + cXyz stack_40; + cXyz stack_4c; + cXyz stack_58; + + stack_34.set(playerActorClass->getHeadTopPos()); + stack_34.y += l_HOSTIO.field_0x14; + stack_40.set(field_0x85C); + stack_4c = current.pos - stack_40; + local_28 = stack_34 - stack_40; + + f32 fVar4 = JMAFastSqrt(local_28.x * local_28.x + local_28.z * local_28.z); + s16 sVar1 = -cM_atan2s(local_28.y, fVar4); + s16 sVar2 = cM_atan2s(local_28.x, local_28.z); + cLib_addCalcAngleS(¤t.angle.y, sVar2, 4, 0x7FFF, 0x5DC); + cLib_addCalcAngleS(¤t.angle.x, sVar1, 4, 0x7FFF, 0x5DC); + cLib_addCalcPos2(&stack_40, stack_34, 0.5f, 15.0f); + stack_58 = stack_34 - stack_40; + current.pos = stack_40 + stack_4c; + return stack_58.abs() < l_HOSTIO.field_0x18; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMyna_c::fly_attack_move() { +asm bool daMyna_c::fly_attack_move() { nofralloc #include "asm/rel/d/a/d_a_myna/d_a_myna/fly_attack_move__8daMyna_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8094B22C-8094B230 00007C 0004+00 0/1 0/0 0/0 .rodata @5317 */ @@ -2101,14 +2693,52 @@ COMPILER_STRIP_GATE(0x8094B234, &lit_5319); #pragma pop /* 80948ADC-80948DFC 002F5C 0320+00 2/2 0/0 0/0 .text fly_return_move__8daMyna_cFv */ +// Possibly matches with literals? Will need to double check +#ifdef NONMATCHING +bool daMyna_c::fly_return_move() { + if (field_0x926 > 0) { + daPy_py_c* playerActorClass = daPy_getPlayerActorClass(); + cXyz stack_3c; + stack_3c.set(playerActorClass->getHeadTopPos()); + + cXyz local_30 = stack_3c - current.pos; + f32 fVar4 = JMAFastSqrt(local_30.x * local_30.x + local_30.z * local_30.z); + s16 sVar1 = -cM_atan2s(local_30.y, fVar4); + s16 sVar2 = cM_atan2s(local_30.x, local_30.z); + + cLib_addCalcAngleS(¤t.angle.y, sVar2, 4, 0x7FFF, 0x5DC); + cLib_addCalcAngleS(¤t.angle.x, sVar1, 4, 0x7FFF, 0x5DC); + cLib_addCalcPos2(¤t.pos, orig.pos, 0.001f, 100.0f); + + } else { + cXyz stack_48 = orig.pos; + cXyz local_30 = stack_48 - current.pos; + f32 fVar4 = JMAFastSqrt(local_30.x * local_30.x + local_30.z * local_30.z); + s16 sVar1 = -cM_atan2s(local_30.y, fVar4); + s16 sVar2 = cM_atan2s(local_30.x, local_30.z); + + cLib_addCalcAngleS(¤t.angle.y, sVar2, 4, 0x7FFF, 0x5DC); + cLib_addCalcAngleS(¤t.angle.x, sVar1, 4, 0x7FFF, 0x5DC); + cLib_addCalcPos2(¤t.pos, stack_48, 0.5f, 25.0f); + + cXyz local_44 = stack_48 - current.pos; + if (local_44.abs() < 3.0f) { + current.pos.set(orig.pos); + return true; + } + } + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMyna_c::fly_return_move() { +asm bool daMyna_c::fly_return_move() { nofralloc #include "asm/rel/d/a/d_a_myna/d_a_myna/fly_return_move__8daMyna_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8094B238-8094B240 000088 0008+00 3/3 0/0 0/0 .rodata @5332 */ @@ -2140,6 +2770,36 @@ asm void daMyna_c::fly_body_wave() { #endif /* 80948E84-80948FAC 003304 0128+00 1/1 0/0 0/0 .text talkAnime__8daMyna_cFP9msg_class */ +// Matches when mBaseMotionTBL is the correct type +#ifdef NONMATCHING +void daMyna_c::talkAnime(msg_class* param_0) { + u32 uVar4 = 0; + if (param_0 != NULL && this == dComIfGp_event_getTalkPartner()) { + switch (param_0->mMode) { + case 2: + field_0x81C = 1; + break; + default: + if (param_0->mMsgID != field_0x824) { + field_0x81C = 1; + } + } + + if (param_0->mMode == 6 && field_0x81C != 0) { + field_0x81C = 0; + field_0x820 = dComIfGp_getMesgAnimeAttrInfo(); + field_0x824 = param_0->mMsgID; + uVar4 = 1; + } + } + + if (field_0x824 != 0 && field_0x820 >= 0 && field_0x820 < 7 && + mBaseMotionTBL[field_0x820] != NULL) + { + (this->*mBaseMotionTBL[field_0x820])(uVar4); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2148,6 +2808,7 @@ asm void daMyna_c::talkAnime(msg_class* param_0) { #include "asm/rel/d/a/d_a_myna/d_a_myna/talkAnime__8daMyna_cFP9msg_class.s" } #pragma pop +#endif /* 80948FAC-809490B8 00342C 010C+00 1/1 0/0 0/0 .text chkEvent__8daMyna_cFv */ // Matches with literals @@ -2338,14 +2999,28 @@ asm void daMyna_c::initiate() { #endif /* 80949408-80949544 003888 013C+00 1/1 0/0 0/0 .text setItemInfo__8daMyna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMyna_c::setItemInfo() { - nofralloc -#include "asm/rel/d/a/d_a_myna/d_a_myna/setItemInfo__8daMyna_cFv.s" +void daMyna_c::setItemInfo() { + if (daMyna_actor_count != -1 && mNumShopItems > daMyna_actor_count) { + daMyna_actor_count = 0; + i_fpcM_Search(daMyna_searchSSItem, this); + } + if (daMyna_evtTagActor0 == NULL) { + i_fpcM_Search(daMyna_searchEvtTag, this); + } + if (daMyna_actor_count != -1 && mNumShopItems <= daMyna_actor_count) { + for (int i = 0; i < mNumShopItems; i++) { + daObj_SSBase_c* subActor = static_cast(daMyna_subActor[i]); + subActor->setParentPtr(this); + mShopItems[i].mTargetActorID = fopAcM_GetID(daMyna_targetActor[i]); + mShopItems[i].mSubActorID = fopAcM_GetID(daMyna_subActor[i]); + mShopItems[i].mFlowNodeNum = subActor->getFlowNodeNumber(); + mShopItems[i].mValueNum = subActor->getValueNumber(); + mShopItems[i].mItemType = getItemType(subActor); + mShopItems[i].mItemStatus = 2; + } + daMyna_actor_count = -1; + } } -#pragma pop /* 80949544-80949588 0039C4 0044+00 2/2 0/0 0/0 .text setRoomNo__8daMyna_cFv */ void daMyna_c::setRoomNo() { @@ -2495,6 +3170,32 @@ J3DAnmTexPattern* daMyna_c::getTexPtrnAnm(char* i_resName) { } /* 80949998-80949A70 003E18 00D8+00 1/1 0/0 0/0 .text checkEndAnm__8daMyna_cFf */ +// regswap +#ifdef NONMATCHING +int daMyna_c::checkEndAnm(f32 param_0) { + bool retVal; + switch (mpMorf->getPlayMode()) { + case 2: + return mpMorf->isLoop(); + case 0: + case 1: + retVal = false; + if (mpMorf->isStop() && mpMorf->getPlaySpeed() != param_0) { + retVal = true; + } + return retVal; + case 3: + case 4: + retVal = false; + if (mpMorf->isStop() && mpMorf->getPlaySpeed() != param_0) { + retVal = true; + } + return retVal; + default: + return false; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2503,6 +3204,7 @@ asm int daMyna_c::checkEndAnm(f32 param_0) { #include "asm/rel/d/a/d_a_myna/d_a_myna/checkEndAnm__8daMyna_cFf.s" } #pragma pop +#endif /* 80949A70-80949AD4 003EF0 0064+00 1/1 0/0 0/0 .text checkEndAnm__8daMyna_cFP12J3DFrameCtrl */ // Matches with literals @@ -2622,6 +3324,27 @@ u16 daMyna_c::getFlowNodeNum() { } /* 80949C44-80949D54 0040C4 0110+00 1/1 0/0 0/0 .text checkDead__8daMyna_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::checkDead() { + for (int i = 0; i < 10; i++) { + if (mShopItems[i].mItemStatus == 2 && !fopAcM_IsExecuting(mShopItems[i].mTargetActorID)) { + deleteItem(i); + onEventFlag(0); + dMsgObject_addTotalPrice(mShopItems[i].mValueNum); + fopAcM_delete(mShopItems[i].mSubActorID); + cXyz var1(1.0f, 1.0f, 1.0f); + if (daMyna_evtTagActor0 == NULL || + (daMyna_evtTagActor0 != NULL && !chkPlayerInEvtArea(daMyna_evtTagActor0, var1))) + { + if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203])) { + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[203]); + } + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2630,6 +3353,7 @@ asm void daMyna_c::checkDead() { #include "asm/rel/d/a/d_a_myna/d_a_myna/checkDead__8daMyna_cFv.s" } #pragma pop +#endif /* 80949D54-80949EE8 0041D4 0194+00 7/7 0/0 0/0 .text * chkPlayerInEvtArea__8daMyna_cFP10fopAc_ac_c4cXyz */ @@ -2677,6 +3401,49 @@ SECTION_RODATA static f32 const lit_5889 = 6.0f; COMPILER_STRIP_GATE(0x8094B244, &lit_5889); /* 80949EE8-8094A054 004368 016C+00 2/1 0/0 0/0 .text animeControl__8daMyna_cFv */ +// regswap +#ifdef NONMATCHING +void daMyna_c::animeControl() { + f32 fVar1 = 1.0f; + int iVar5 = 2; + f32 fVar2 = field_0x90C; + switch (field_0x935) { + case 1: + if (field_0x934 == 4) { + fVar2 = 6.0f; + } + break; + case 2: + iVar5 = 0; + break; + case 3: + iVar5 = 0; + break; + case 4: + fVar1 = l_HOSTIO.field_0x08; + break; + case 7: + iVar5 = 0; + fVar2 = 6.0f; + break; + case 8: + iVar5 = 0; + break; + case 14: + iVar5 = 0; + break; + } + + setMcaMorfAnm(getTrnsfrmKeyAnm(l_bckFileNameTBL[field_0x935]), fVar1, fVar2, iVar5, 0, -1); + if (cLib_checkBit(field_0x914, 0x40) == 0) { + J3DAnmTexPattern* btk = getTexPtrnAnm(l_btpFileNameTBL[field_0x936]); + if (btk != NULL) { + setBtpAnm(btk, mpMorf->getModel()->getModelData(), 1.0f, 2); + cLib_onBit(field_0x914, 0x44); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2685,8 +3452,20 @@ asm void daMyna_c::animeControl() { #include "asm/rel/d/a/d_a_myna/d_a_myna/animeControl__8daMyna_cFv.s" } #pragma pop +#endif /* 8094A054-8094A098 0044D4 0044+00 24/24 0/0 0/0 .text setAnimeType__8daMyna_cFUcf */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::setAnimeType(u8 param_0, f32 param_1) { + if (param_0 == 13 || param_0 == 1 || (param_0 == 14 && field_0x935 != 13)) { + param_1 = 6.0f; + } + field_0x934 = field_0x935; + field_0x935 = param_0; + field_0x90C = param_1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2695,9 +3474,72 @@ asm void daMyna_c::setAnimeType(u8 param_0, f32 param_1) { #include "asm/rel/d/a/d_a_myna/d_a_myna/setAnimeType__8daMyna_cFUcf.s" } #pragma pop +#endif /* 8094A098-8094A608 004518 0570+00 1/1 0/0 0/0 .text playDefaultWaitAnime__8daMyna_cFv */ +// Mostly matching, still has a few issues that need to be fixed +#ifdef NONMATCHING +void daMyna_c::playDefaultWaitAnime() { + switch (field_0x935) { + case 2: + case 3: + if (field_0x91E != 0) { + setAnimeType(1, 0.0f); + } + break; + case 6: + cXyz local_58; + cXyz local_64; + cXyz stack_70; + + local_58.x = daMyna_LightActor->current.pos.x; + local_58.y = orig.pos.y; + local_58.z = daMyna_LightActor->current.pos.z; + + cXyz stack_7c = local_58 - orig.pos; + + s16 sVar42 = cM_atan2s(stack_7c.x, stack_7c.z); + f32 fVar7 = stack_7c.abs(); + f32 fVar3 = ((field_0x82C.y - field_0x844.y) + (field_0x838.y - field_0x850.y)) * 0.5f; + + local_64.x = 0.0f; + local_64.y = 0.0f; + local_64.z = l_HOSTIO.field_0x10 * (fVar3 * fVar3); + + cLib_offsetPos(&stack_70, ¤t.pos, sVar42, &local_64); + current.pos = stack_70; + + cXyz stack_88 = current.pos - orig.pos; + if (fVar7 > field_0x910 * stack_88.abs()) { + setAnimeType(1, 6.0f); + } + break; + case 5: + cXyz local_94; + cXyz stack_a0; + cXyz local_ac = orig.pos - current.pos; + + s16 sVar4 = cM_atan2s(local_ac.x, local_ac.z); + f32 fVar2 = ((field_0x82C.y - field_0x844.y) + (field_0x838.y - field_0x850.y)) * 0.5f; + + local_94.x = 0.0f; + local_94.y = 0.0f; + local_94.z = l_HOSTIO.field_0x10 * (fVar2 * fVar2); + + cLib_offsetPos(&stack_a0, ¤t.pos, sVar4, &local_94); + current.pos = stack_a0; + + cXyz stack_b8 = orig.pos - current.pos; + + if (stack_b8.abs() < l_HOSTIO.field_0x20) { + current.pos.set(orig.pos); + setAnimeType(1, 6.0f); + } + break; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2706,6 +3548,7 @@ asm void daMyna_c::playDefaultWaitAnime() { #include "asm/rel/d/a/d_a_myna/d_a_myna/playDefaultWaitAnime__8daMyna_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8094B248-8094B24C 000098 0004+00 0/1 0/0 0/0 .rodata @6108 */ @@ -2717,6 +3560,43 @@ COMPILER_STRIP_GATE(0x8094B248, &lit_6108); /* 8094A608-8094A890 004A88 0288+00 1/1 0/0 0/0 .text setDefaultWaitAnime__8daMyna_cFUc */ +// Matches with literals +#ifdef NONMATCHING +void daMyna_c::setDefaultWaitAnime(u8 param_0) { + if (daMyna_LightActor != NULL && field_0x935 == 1 && + (field_0x92C == 0 || field_0x92C == 5 || field_0x92C == 7) && + daMyna_LightActor->field_0x578 != daMyna_LightActor->mTurnOnFlag) + { + field_0x92D = field_0x92C; + field_0x92C = 11; + } else { + if (field_0x935 == param_0) { + switch (field_0x935) { + case 1: + field_0x924--; + if (field_0x924 <= 0) { + switch (int(cM_rndF(100.0f)) % 3) { + case 0: + setAnimeType(2, 0.0f); + break; + case 1: + setAnimeType(3, 0.0f); + break; + default: + cXyz stack_24 = orig.pos - current.pos; + if (stack_24.abs() < l_HOSTIO.field_0x20) { + field_0x910 = cM_rnd() * 0.25f + 0.25f; + setAnimeType(6, 0.0f); + } else { + setAnimeType(5, 0.0f); + } + } + } + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2725,6 +3605,7 @@ asm void daMyna_c::setDefaultWaitAnime(u8 param_0) { #include "asm/rel/d/a/d_a_myna/d_a_myna/setDefaultWaitAnime__8daMyna_cFUc.s" } #pragma pop +#endif /* 8094A890-8094A8B0 004D10 0020+00 1/0 0/0 0/0 .text daMyna_Create__FPv */ static int daMyna_Create(void* i_this) { diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index 987bf5129c..8a939a68cb 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -10,8 +10,8 @@ #include "d/a/d_a_alink.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_lib.h" -#include "rel/d/a/d_a_midna/d_a_midna.h" #include "rel/d/a/d_a_boomerang/d_a_boomerang.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" #include "rel/d/a/d_a_spinner/d_a_spinner.h" bool daPy_frameCtrl_c::checkAnmEnd() { diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index 0cfe874905..d1c47fbc25 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -2033,7 +2033,7 @@ void dMsgObject_c::setSelectCancelPos(u8 pos) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_getTotalPrice() { +asm u16 dMsgObject_getTotalPrice() { nofralloc #include "asm/d/msg/d_msg_object/dMsgObject_getTotalPrice__Fv.s" } @@ -2063,7 +2063,7 @@ asm void dMsgObject_addTotalPrice(s16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_getTotalPayment() { +asm u16 dMsgObject_getTotalPayment() { nofralloc #include "asm/d/msg/d_msg_object/dMsgObject_getTotalPayment__Fv.s" } @@ -2143,8 +2143,7 @@ asm void dMsgObject_addOffering(s16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_d_msg_object_cpp() { - nofralloc +asm void __sinit_d_msg_object_cpp(){nofralloc #include "asm/d/msg/d_msg_object/__sinit_d_msg_object_cpp.s" } #pragma pop