[XCX] Fix crashes when using mods (see issue #271 for more details).

This commit is contained in:
lasyan3 2018-12-11 20:31:19 +01:00
parent 7e7636ab2a
commit 98643550ef
11 changed files with 29 additions and 29 deletions

View File

@ -22,7 +22,7 @@ _checkMir = 0x00000004
0x02A7A784 = bla _checkMir
_checkRes = 0x00000010
0x00000010 = lis r3, _resource@h
0x00000010 = lis r3, _resource@ha
0x00000014 = lbz r3, _resource@l(r3)
0x00000018 = blr
0x02A7A954 = bla _checkRes
@ -56,7 +56,7 @@ _checkMir = 0x00000004
0x02A7A774 = bla _checkMir
_checkRes = 0x00000010
0x00000010 = lis r3, _resource@h
0x00000010 = lis r3, _resource@ha
0x00000014 = lbz r3, _resource@l(r3)
0x00000018 = blr
0x02A7A944 = bla _checkRes

View File

@ -9,12 +9,12 @@ _selectItem = 0x00000000
_strengthen = 0x00000001
_checkSelectItem = 0x00000004
0x00000004 = lis r4, _selectItem@h
0x00000004 = lis r4, _selectItem@ha
0x00000008 = lbz r3, _selectItem@l(r4)
0x0000000C = blr
_checkStrengthen = 0x00000010
0x00000010 = lis r3, _strengthen@h
0x00000010 = lis r3, _strengthen@ha
0x00000014 = lbz r3, _strengthen@l(r3)
0x00000018 = blr
@ -44,12 +44,12 @@ _selectItem = 0x00000000
_strengthen = 0x00000001
_checkSelectItem = 0x00000004
0x00000004 = lis r4, _selectItem@h
0x00000004 = lis r4, _selectItem@ha
0x00000008 = lbz r3, _selectItem@l(r4)
0x0000000C = blr
_checkStrengthen = 0x00000010
0x00000010 = lis r3, _strengthen@h
0x00000010 = lis r3, _strengthen@ha
0x00000014 = lbz r3, _strengthen@l(r3)
0x00000018 = blr

View File

@ -9,12 +9,12 @@ _ignore = 0x00000000
_end = 0x00000001
_checkIgnore = 0x00000004
0x00000004 = lis r4, _ignore@h
0x00000004 = lis r4, _ignore@ha
0x00000008 = lbz r3, _ignore@l(r4)
0x0000000C = blr
_checkIgnoreEnd = 0x00000010
0x00000010 = lis r3, _end@h
0x00000010 = lis r3, _end@ha
0x00000014 = lbz r3, _end@l(r3)
0x00000018 = blr
@ -38,12 +38,12 @@ _ignore = 0x00000000
_end = 0x00000001
_checkIgnore = 0x00000004
0x00000004 = lis r4, _ignore@h
0x00000004 = lis r4, _ignore@ha
0x00000008 = lbz r3, _ignore@l(r4)
0x0000000C = blr
_checkIgnoreEnd = 0x00000010
0x00000010 = lis r3, _end@h
0x00000010 = lis r3, _end@ha
0x00000014 = lbz r3, _end@l(r3)
0x00000018 = blr

View File

@ -1,7 +1,7 @@
[XCX_BLADEX]
moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
codeCaveSize = 0x20
codeCaveSize = 0x10
0x00000000 = .byte $mod
_mod = 0x00000000

View File

@ -1,7 +1,7 @@
[XCX_FRIENDPOINTSX]
moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
codeCaveSize = 0x20
codeCaveSize = 0x10
0x00000000 = .short $mod
_mod = 0x00000000

View File

@ -1,7 +1,7 @@
[XCX_EXPX]
moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
codeCaveSize = 0x20
codeCaveSize = 0x14
0x00000000 = .byte $mod
_mod = 0x00000000

View File

@ -7,6 +7,6 @@ codeCaveSize = 0x4
_zoom = 0x00000000
# CamData::CCamDataManager::getParamsZoomDefault((CamData::eTargetTypes, unsigned char))
0x0222A19C = lis r12, _zoom@h
0x0222A19C = lis r12, _zoom@ha
0x0222A1B0 = lfs f1, _zoom@l(r12)
0x0222A1CC = nop

View File

@ -11,17 +11,17 @@ _cnt2 = 0x00000004
_cnt1 = 0x00000008
_forceLot_3 = 0x0000000C
0x0000000C = lis r3, _cnt3@h
0x0000000C = lis r3, _cnt3@ha
0x00000010 = lbz r3, _cnt3@l(r3)
0x00000014 = blr
_forceLot_2 = 0x00000018
0x00000018 = lis r3, _cnt2@h
0x00000018 = lis r3, _cnt2@ha
0x0000001C = lbz r3, _cnt2@l(r3)
0x00000020 = blr
_forceLot_1 = 0x00000024
0x00000024 = lis r3, _cnt1@h
0x00000024 = lis r3, _cnt1@ha
0x00000028 = lbz r3, _cnt1@l(r3)
0x0000002C = blr

View File

@ -10,14 +10,14 @@ _velocity = 0x00000020
_hvelocity = 0x00000024
_setVelocity = 0x00000000
0x00000000 = lis r3, _velocity@h
0x00000000 = lis r3, _velocity@ha
0x00000004 = lfs f30, _velocity@l(r3)
0x00000008 = fdivs f30, f1, f30
0x0000000C = blr
0x0264A700 = bla _setVelocity
_setHorizVelocity = 0x00000010
0x00000010 = lis r12, _hvelocity@h
0x00000010 = lis r12, _hvelocity@ha
0x00000014 = lfs f31, _hvelocity@l(r12)
0x00000018 = fdivs f31, f1, f31
0x0000001C = blr

View File

@ -1,17 +1,17 @@
[XCX_MOVESPEED]
moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
codeCaveSize = 0x1C
codeCaveSize = 0x18
0x00000018 = .float $mod ; dash speed (smallest means fastest, default is 1.0)
_speed = 0x00000018
0x00000000 = .float $mod ; dash speed (smallest means fastest, default is 1.0)
_speed = 0x00000000
_setSpeed = 0x00000000
0x00000000 = lis r3, _speed@h
0x00000004 = lfs f13, _speed@l(r3)
0x00000008 = fdivs f1, f1, f13
0x0000000C = lwz r3, 0(r31)
0x00000010 = blr
_setSpeed = 0x00000004
0x00000004 = lis r3, _speed@ha
0x00000008 = lfs f13, _speed@l(r3)
0x0000000C = fdivs f1, f1, f13
0x00000010 = lwz r3, 0(r31)
0x00000014 = blr
# chr::CInnerLabelState::applyFieldMoveWeight((float))
0x02643330 = bla _setSpeed ; SetVariableFloat(0xBD,float)

View File

@ -11,7 +11,7 @@ _weather = 0x00000000
0x0229F0FC = bla _forceWeather
_forceWeather = 0x00000004
0x00000004 = lis r28, _weather@h
0x00000004 = lis r28, _weather@ha
0x00000008 = lbz r28, _weather@l(r28)
0x0000000C = blr