sms/supSMS-MiscCode
1
0
Fork 0
Code Wiki Activity

add InStageAttemptCounter, ManualAttemptCounter, NoShineGet, MarioStateSavestate

Browse source
This commit is contained in:
sup39 2023-02-14 06:05:03 +09:00
parent ef79386e74
commit f2bf2603d3
14 changed files with 415 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
__pycache__/

2
src/InStageAttemptCounter.ld Normal file
View file

@ -0,0 +1,2 @@
$$ = 0;
$C2$.direct = 0xA0 + TMarDirector.direct;

42
src/InStageAttemptCounter.s Normal file
View file

@ -0,0 +1,42 @@
.set r817F, 10
.set rPad, 11
.set crSave, 7
.set addrTimer, 0x817F0478
.set addrDuration, 0x817F0479
.set addrAttemptCount, 0x817F04A6
.direct:
.checkController:
lis rPad, mPadButton+2@ha
lhzu r0, mPadButton+2@l(rPad)
cmplwi crSave, r0, 0x1
beq- crSave, .checkController.done
cmplwi r0, 0x2
bne+ .done
.checkController.done:
.prepare:
lis r817F, 0x817F
## set display timer
lbz r0, addrDuration@l(r817F)
stb r0, addrTimer@l(r817F)
## done for Save
beq crSave, .done
.checkPress:
## prev = cur XOR pressed XOR released
### Case 1: newly pressed == DR
### Case 2: something released
## prev != 0x2 => pressed XOR released != 0
lhz r0, 4(rPad)
lhz r12, 8(rPad)
xor. r0, r0, r12
beq .done
.updateAttemptCount:
lhz r12, addrAttemptCount@l(r817F)
addi r12, r12, 1
sth r12, addrAttemptCount@l(r817F)
.done:
## orig
li r7, 0

2
src/ManualAttemptCounter.ld Normal file
View file

@ -0,0 +1,2 @@
$$ = 0;
$C2$.direct = 0x9C + TMarDirector.direct;

50
src/ManualAttemptCounter.s Normal file
View file

@ -0,0 +1,50 @@
.set rPad, 9
.set r817F, 10
.set addrTimer, 0x817F0478
.set addrDuration, 0x817F0479
.set addrCount, 0x817F04A4
.direct:
.checkController:
## R+X
lis rPad, mPadButton+2@ha
lhzu r0, mPadButton+2@l(rPad)
andi. r0, r0, 0xFFF0
cmplwi r0, 0x420
bne+ .done
## effective D-Pad
lbz rPad, -2+0x18+3(rPad)
### skip if no D-Pad pressed
rlwinm. r0, rPad, 0, 0xF
beq .done
.prepare:
lis r817F, 0x817F
## set display timer
lbz r0, addrDuration@l(r817F)
stb r0, addrTimer@l(r817F)
.update.success:
lhz r12, addrCount@l(r817F)
### DD(0x4)
rlwinm r0, rPad, 32-2, 0x1
sub r12, r12, r0
### DU(0x8)
rlwinm r0, rPad, 32-3, 0x1
add r12, r12, r0
## write back
sth r12, addrCount@l(r817F)
.update.attempt:
lhz r12, addrCount+2@l(r817F)
### DL(0x1)
rlwinm r0, rPad, 0, 0x1
sub r12, r12, r0
### DR(0x2)
rlwinm r0, rPad, 32-1, 0x1
add r12, r12, r0
## write back
sth r12, addrCount+2@l(r817F)
.done:
## orig
li r6, 0

8
src/NoShineGet-base.ld Normal file
View file

@ -0,0 +1,8 @@
$$ = 0;
$C2$.onWinDemo.fireGetStar = 0x88 + TMario.winDemo;
$C2$.onWinDemo.sendMessageToShine = 0xA4 + TMario.winDemo;
$C2$.onWinDemo.changeSubstate = 0xAC + TMario.winDemo;
$C2$.onShineTouchPlayer = TShine.touchPlayer;
$C2$.reset = 0x28 + TMarDirector.setupObjects;
/* $C2$.onSetShineGetStatus = 0x801629f4; */

73
src/NoShineGet-base.s Normal file
View file

@ -0,0 +1,73 @@
.set slot, 0x817F003C
.set addrTimer, 0x817F0478
.set addrDuration, 0x817F0479
.set addrSuccessCount, 0x817F04A4
.onWinDemo.fireGetStar:
lis r12, 0x817F
## update grab game QF
lwz r11, 0x58(r3)
stw r11, slot@l(r12)
## QFT freeze
### set freezeTime = +4 rounded globalQF
lwz r11, 0x5C(r3)
addi r11, r11, 4
rlwinm r11, r11, 0, 0, 29
stw r11, 0xB8(r12)
### freeze duration = inf
li r0, -1
stw r0, 0xBC(r12)
## Attempt Counter
### display timer
lbz r0, addrDuration@l(r12)
stb r0, addrTimer@l(r12)
### success count
lhz r11, addrSuccessCount@l(r12)
addi r11, r11, 1
sth r11, addrSuccessCount@l(r12)
.onWinDemo.sendMessageToShine:
## make shine collision active again
### clear 0x1 bit
lwz r0, 0x64(r3)
rlwinm r0, r0, 0, 0, 30
stw r0, 0x64(r3)
.onWinDemo.changeSubstate:
## this->prevState = this->curState
#lwz r0, 0x7C(r31)
#stw r0, 0x80(r31)
## this->curState = idle
lis r0, 0x0C40
ori r0, r0, 0x0201
stw r0, 0x7C(r31)
li r0, 0
## 0x88
#stw r0, 0x88(r31)
## substate (0x84), substate timer (0x86)
stw r0, 0x84(r31)
.onShineTouchPlayer:
lis r12, 0x817F
### r0 = last grab game QF
### r11 = current grab game QF
lwz r0, slot@l(r12)
lwz r11, gpMarDirector$r13(r13)
lwz r11, 0x58(r11)
### r0 = elapsed time since last grab
sub r0, r11, r0
cmplwi r0, 4
### update last grab game QF
stw r11, slot@l(r12)
### return if contiguous grab
blelr
## orig
mflr r0
.reset:
## update last grab game QF to 0
lis r12, 0x817F
li r11, 0
stw r11, slot@l(r12)
## orig
mr r3, r0

114
src/NoShineGet-base.xml Normal file
View file

@ -0,0 +1,114 @@
<code>
<source version="GMSJ01">
C210C3D4 00000003
3D80817F 39600000
916C003C 7C030378
60000000 00000000
C2120540 00000008
3D80817F 81630058
916C003C 8163005C
396B0004 556B003A
916C00B8 3800FFFF
900C00BC 880C0479
980C0478 A16C04A4
396B0001 B16C04A4
60000000 00000000
C2195304 00000005
3D80817F 800C003C
816D97E8 816B0058
7C005850 28000004
916C003C 4C810020
7C0802A6 00000000
C212055C 00000002
80030064 5400003C
90030064 00000000
C2120564 00000003
3C000C40 60000201
901F007C 38000000
901F0084 00000000
</source>
<source version="GMSJ0A">
C2296F2C 00000003
3D80817F 39600000
916C003C 7C030378
60000000 00000000
C2221148 00000008
3D80817F 81630058
916C003C 8163005C
396B0004 556B003A
916C00B8 3800FFFF
900C00BC 880C0479
980C0478 A16C04A4
396B0001 B16C04A4
60000000 00000000
C219D0BC 00000005
3D80817F 800C003C
816D9E78 816B0058
7C005850 28000004
916C003C 4C810020
7C0802A6 00000000
C2221164 00000002
80030064 5400003C
90030064 00000000
C222116C 00000003
3C000C40 60000201
901F007C 38000000
901F0084 00000000
</source>
<source version="GMSP01">
C22AF6EC 00000003
3D80817F 39600000
916C003C 7C030378
60000000 00000000
C223918C 00000008
3D80817F 81630058
916C003C 8163005C
396B0004 556B003A
916C00B8 3800FFFF
900C00BC 880C0479
980C0478 A16C04A4
396B0001 B16C04A4
60000000 00000000
C21B51EC 00000005
3D80817F 800C003C
816D9EE0 816B0058
7C005850 28000004
916C003C 4C810020
7C0802A6 00000000
C22391A8 00000002
80030064 5400003C
90030064 00000000
C22391B0 00000003
3C000C40 60000201
901F007C 38000000
901F0084 00000000
</source>
<source version="GMSE01">
C22B771C 00000003
3D80817F 39600000
916C003C 7C030378
60000000 00000000
C2241400 00000008
3D80817F 81630058
916C003C 8163005C
396B0004 556B003A
916C00B8 3800FFFF
900C00BC 880C0479
980C0478 A16C04A4
396B0001 B16C04A4
60000000 00000000
C21BD334 00000005
3D80817F 800C003C
816D9FB8 816B0058
7C005850 28000004
916C003C 4C810020
7C0802A6 00000000
C224141C 00000002
80030064 5400003C
90030064 00000000
C2241424 00000003
3C000C40 60000201
901F007C 38000000
901F0084 00000000
</source>
</code>

21
src/NoShineGet.py Normal file
View file

@ -0,0 +1,21 @@
import xml.etree.ElementTree as ET
from __gecko__ import *
tree = ET.parse('NoShineGet-base.xml')
root = tree.getroot()
for src in root:
version = src.attrib['version']
winDemo = symbols['winDemo'][version]
touchShine = symbols['TShine.touchPlayer'][version]
fireGetStar = symbols['TMarDirector.fireGetStar'][version]
mPadStatus = symbols['mPadStatus'][version]
print(f'''<source version="{version}">
{GECKO(0x28, mPadStatus, 0x441)}
{src.text.strip()}
{GECKO(0x28, mPadStatus+1, 0x442)}
{GECKO(0x04, 0x88+winDemo, BL(fireGetStar-winDemo-0x88))}
{GECKO(0x04, 0xA4+winDemo, 0x4E800021)}
{GECKO(0x04, 0xAC+winDemo, 0xB01F0084)}
{GECKO(0x04, touchShine, 0x7C0802A6)}
{GECKO(0xE0, 0, 0)}
</source>''')

43
src/__gecko__.py Normal file
View file

@ -0,0 +1,43 @@
GECKO = lambda ct, addr, payload: '%08X %08X'%(ct<<24 | addr&0x1ff_ffff, payload)
BL = lambda dis: 0x4800_0001 | dis&0x3ff_ffff
VERSIONS = ['GMSJ01', 'GMSJ0A', 'GMSP01', 'GMSE01']
symbols = {
'mPadStatus': {
'GMSJ01': 0x80400d50,
'GMSJ0A': 0x803f5428,
'GMSP01': 0x803fbbf4,
'GMSE01': 0x80404454,
},
'winDemo': {
'GMSJ01': 0x801204b8,
'GMSJ0A': 0x802210c0,
'GMSP01': 0x80239104,
'GMSE01': 0x80241378,
},
'TShine.touchPlayer': {
'GMSJ01': 0x80195304,
'GMSJ0A': 0x8019d0bc,
'GMSP01': 0x801b51ec,
'GMSE01': 0x801bd334,
},
'TMarDirector.fireGetStar': {
'GMSJ01': 0x800edae8,
'GMSJ0A': 0x8027a214,
'GMSP01': 0x802923fc,
'GMSE01': 0x8029a564,
},
'gpMarioOriginal': {
'GMSJ01': 0x8040a378,
'GMSJ0A': 0x803fef88,
'GMSP01': 0x804057b0,
'GMSE01': 0x8040e0e8,
},
'TMarDirector.__dtor': {
'GMSJ01': 0x800efa34,
'GMSJ0A': 0x8027c218,
'GMSP01': 0x80294400,
'GMSE01': 0x8029c524,
},
}

45
src/savestate/MarioState.py Normal file
View file

@ -0,0 +1,45 @@
from __gecko__ import *
# 0: curState+prevState+substate+88 [7C, 8C)
# 1: flag [118, 120)
# 2: HSpd {B0}
# 3: VSpd {A8}
# 4: grab target {384}
# 5: FLUDD {3E4}
# 6: water {r5->1C80}
for version in VERSIONS:
mario = symbols['gpMarioOriginal'][version]
mPadStatus = symbols['mPadStatus'][version]
onDestroy = symbols['TMarDirector.__dtor'][version]
print(f'''<source version="{version}">
{GECKO(0x48, 0, mario)}
DE000000 80008180
80000000 817F0040
80000001 817F0050
80000002 817F0058
80000003 817F005C
80000004 817F0060
92210005 000003E4
80000006 817F0064
{GECKO(0x28, mPadStatus, 0x1)}
9C0010F0 0000007C
9C0008F1 00000118
9C0004F2 000000B0
9C0004F3 000000A8
9C0004F4 00000384
9C000456 00001C80
{GECKO(0x28, mPadStatus+1, 0x2)}
237F0040 00000000
9A00100F 0000007C
9A00081F 00000118
9A00042F 000000B0
9A00043F 000000A8
9A00044F 00000384
9A000465 00001C80
E0000000 00000000
{GECKO(0xC2, onDestroy, 3)}
90010004 3D80817F
38000000 900C0040
60000000 00000000
</source>''')

1
src/savestate/__gecko__.py Symbolic link
View file

@ -0,0 +1 @@
../__gecko__.py

3
src/savestate/reset.ld Normal file
View file

@ -0,0 +1,3 @@
$$ = 0;
$C2$.reset = 0x4 + TMarDirector._dtor_TMarDirector$0;

10
src/savestate/reset.s Normal file
View file

@ -0,0 +1,10 @@
.set slot, 0x817F0040
.reset:
## orig
stw r0, 4(r1)
## main
lis r12, 0x817F
li r0, 0
stw r0, slot@l(r12)
#stw r0, slot+4@l(r12)