From d3500f589e85f2070d93a4b321e79e93c8bf6e82 Mon Sep 17 00:00:00 2001 From: sup39 Date: Sun, 25 Feb 2024 16:00:41 +0900 Subject: [PATCH] fix (ILSEx v1.2.1): remove pipe transition --- InstantLevelSelectExtra/@code.xml | 78 ++++++++++++++++-------------- InstantLevelSelectExtra/info.xml | 2 +- InstantLevelSelectExtra/src/main.s | 5 +- 3 files changed, 46 insertions(+), 39 deletions(-) diff --git a/InstantLevelSelectExtra/@code.xml b/InstantLevelSelectExtra/@code.xml index 9456667..6ac531c 100644 --- a/InstantLevelSelectExtra/@code.xml +++ b/InstantLevelSelectExtra/@code.xml @@ -3,7 +3,7 @@ Instant Level Select Extra レベル選択EX sup39(サポミク) - 1.2 + 1.2.1 Feb 25, 2024 ::: warning @@ -69,7 +69,7 @@ 4. これで好きなだけハニスキを練習できます。他のエリアに入ろうとする時に自動的にやり直すので、手動でやり直す必要がありません。必要であれば`十字キー上`でやり直すこともできます。 - C20F9B74 00000065 + C20F9B74 00000066 3C80817F 816D97D0 3D808040 80AC0D80 20050022 540A043D @@ -78,20 +78,20 @@ 28830001 4C451102 40A2000C 38A00008 90AC0D80 7C7D1B79 - 418202D0 818D97E8 + 418202D8 818D97E8 2B0C0000 419A0018 898C0064 2E8C0009 38000021 5C00656B - 408202B0 70A00004 + 408202B8 70A00004 41A20040 881F0008 2C000008 41820034 881F000E 3D40803B 394A40E8 7CEA00AE - 2C070001 40810284 + 2C070001 4081028C 38070001 5400EFFE 7CE70214 54E7403E 60E700FF 4800011C - 70A00008 41A20264 + 70A00008 41A2026C 48000045 00141516 0017181D 34000090 2F2E3020 32293328 @@ -156,24 +156,25 @@ A00C00E2 540007FA B00C00E2 409A0010 54FDD7BE 3BBD0005 - 48000060 4196005C + 48000068 41960064 806D97E8 3D80800E 618CAB40 4BFFFE29 387F0034 38800000 3D808020 618C1150 - 4BFFFE15 806D97E8 + 4BFFFE15 3800000F + 806D97E8 900300E4 38800009 3D80800E - 618CC11C 4BFFFE01 + 618CC11C 4BFFFDF9 806D97E8 38800009 3D80800E 618CB80C - 4BFFFDED 806D97E8 + 4BFFFDE5 806D97E8 38000009 98030064 2C1D0001 4081000C 3D80817F 998C0007 60000000 00000000 - C22A6170 00000065 + C22A6170 00000066 3C80817F 816D9FA0 3D808040 80AC4484 20050022 540A043D @@ -182,20 +183,20 @@ 28830001 4C451102 40A2000C 38A00008 90AC4484 7C7D1B79 - 418202D0 818D9FB8 + 418202D8 818D9FB8 2B0C0000 419A0018 898C0064 2E8C0009 38000021 5C00656B - 408202B0 70A00004 + 408202B8 70A00004 41A20040 881F0008 2C000008 41820034 881F000E 3D40803E 394AF498 7CEA00AE - 2C070001 40810284 + 2C070001 4081028C 38070001 5400EFFE 7CE70214 54E7403E 60E700FF 4800011C - 70A00008 41A20264 + 70A00008 41A2026C 48000045 00141516 0017181D 34000090 2F2E3020 32293328 @@ -260,24 +261,25 @@ A00C00E2 540007FA B00C00E2 409A0010 54FDD7BE 3BBD0005 - 48000060 4196005C + 48000068 41960064 806D9FB8 3D808029 618C7584 4BFFFE29 387F0034 38800000 3D808013 618CF638 - 4BFFFE15 806D9FB8 + 4BFFFE15 3800000F + 806D9FB8 900300E4 38800009 3D808029 - 618C8BB0 4BFFFE01 + 618C8BB0 4BFFFDF9 806D9FB8 38800009 3D808029 618C8250 - 4BFFFDED 806D9FB8 + 4BFFFDE5 806D9FB8 38000009 98030064 2C1D0001 4081000C 3D80817F 998C0007 60000000 00000000 - C229E080 00000065 + C229E080 00000066 3C80817F 816D9EC8 3D808040 80ACBC24 20050022 540A043D @@ -286,20 +288,20 @@ 28830001 4C451102 40A2000C 38A00008 90ACBC24 7C7D1B79 - 418202D0 818D9EE0 + 418202D8 818D9EE0 2B0C0000 419A0018 898C0064 2E8C0009 38000021 5C00656B - 408202B0 70A00004 + 408202B8 70A00004 41A20040 881F0008 2C000008 41820034 881F000E 3D40803D 394A6DB0 7CEA00AE - 2C070001 40810284 + 2C070001 4081028C 38070001 5400EFFE 7CE70214 54E7403E 60E700FF 4800011C - 70A00008 41A20264 + 70A00008 41A2026C 48000045 00141516 0017181D 34000090 2F2E3020 32293328 @@ -364,24 +366,25 @@ A00C00E2 540007FA B00C00E2 409A0010 54FDD7BE 3BBD0005 - 48000060 4196005C + 48000068 41960064 806D9EE0 3D808028 618CF41C 4BFFFE29 387F0034 38800000 3D808013 618C41B4 - 4BFFFE15 806D9EE0 + 4BFFFE15 3800000F + 806D9EE0 900300E4 38800009 3D808029 - 618C0A48 4BFFFE01 + 618C0A48 4BFFFDF9 806D9EE0 38800009 3D808029 618C00E8 - 4BFFFDED 806D9EE0 + 4BFFFDE5 806D9EE0 38000009 98030064 2C1D0001 4081000C 3D80817F 998C0007 60000000 00000000 - C2285FCC 00000065 + C2285FCC 00000066 3C80817F 816D9E60 3D80803F 80AC5458 20050022 540A043D @@ -390,20 +393,20 @@ 28830001 4C451102 40A2000C 38A00008 90AC5458 7C7D1B79 - 418202D0 818D9E78 + 418202D8 818D9E78 2B0C0000 419A0018 898C0064 2E8C0009 38000021 5C00656B - 408202B0 70A00004 + 408202B8 70A00004 41A20040 881F0008 2C000008 41820034 881F000E 3D40803D 394AF9B8 7CEA00AE - 2C070001 40810284 + 2C070001 4081028C 38070001 5400EFFE 7CE70214 54E7403E 60E700FF 4800011C - 70A00008 41A20264 + 70A00008 41A2026C 48000045 00141516 0017181D 34000090 2F2E3020 32293328 @@ -468,17 +471,18 @@ A00C00E2 540007FA B00C00E2 409A0010 54FDD7BE 3BBD0005 - 48000060 4196005C + 48000068 41960064 806D9E78 3D808027 618C722C 4BFFFE29 387F0034 38800000 3D808012 618C0908 - 4BFFFE15 806D9E78 + 4BFFFE15 3800000F + 806D9E78 900300E4 38800009 3D808027 - 618C8858 4BFFFE01 + 618C8858 4BFFFDF9 806D9E78 38800009 3D808027 618C7EF8 - 4BFFFDED 806D9E78 + 4BFFFDE5 806D9E78 38000009 98030064 2C1D0001 4081000C 3D80817F 998C0007 diff --git a/InstantLevelSelectExtra/info.xml b/InstantLevelSelectExtra/info.xml index ff8ec05..31551ae 100644 --- a/InstantLevelSelectExtra/info.xml +++ b/InstantLevelSelectExtra/info.xml @@ -3,7 +3,7 @@ Instant Level Select Extra レベル選択EX sup39(サポミク) - 1.2 + 1.2.1 Feb 25, 2024 ::: warning diff --git a/InstantLevelSelectExtra/src/main.s b/InstantLevelSelectExtra/src/main.s index 90d3855..ff1cb57 100644 --- a/InstantLevelSelectExtra/src/main.s +++ b/InstantLevelSelectExtra/src/main.s @@ -370,8 +370,11 @@ handlePlaza: addi r3, rApp, 0x34 li r4, 0 call TSMSFader_setFadeStatus -## TMarDirector::currentStateFinalize(gpMarDirector, 9); +## gpMarDirector->faderType = 0xf + li r0, 0xf lwz r3, gpMarDirector$r13(r13) + stw r0, 0xe4(r3) +## TMarDirector::currentStateFinalize(gpMarDirector, 9); li r4, 9 call TMarDirector_currentStateFinalize ## TMarDirector::nextStateInitialize(gpMarDirectorthis, 9);