mirror of
https://github.com/SMGCommunity/Petari.git
synced 2024-11-27 23:40:39 +00:00
some RotateMoveObj / SandCapsuleInsidePlanet progress
This commit is contained in:
shibbo
parent
c8d02b6370
commit
aa1a3f6fb2
@ -4260,38 +4260,38 @@ execute__Q221NrvRosettaPictureBook18HostTypeNrvReadingCFP5Spine,RosettaPictureBo
|
||||
execute__Q221NrvRosettaPictureBook18HostTypeNrvFadeOutCFP5Spine,RosettaPictureBook.o,MapObj.a,false
|
||||
execute__Q221NrvRosettaPictureBook19HostTypeNrvDemoWaitCFP5Spine,RosettaPictureBook.o,MapObj.a,false
|
||||
execute__Q221NrvRosettaPictureBook15HostTypeNrvWaitCFP5Spine,RosettaPictureBook.o,MapObj.a,false
|
||||
init__13RotateMoveObjFRC12JMapInfoIter,RotateMoveObj.o,MapObj.a,false
|
||||
init__13RotateMoveObjFRC12JMapInfoIter,RotateMoveObj.o,MapObj.a,true
|
||||
initCaseUseSwitchB__13RotateMoveObjFRC19MapObjActorInitInfo,RotateMoveObj.o,MapObj.a,false
|
||||
initCaseNoUseSwitchB__13RotateMoveObjFRC19MapObjActorInitInfo,RotateMoveObj.o,MapObj.a,false
|
||||
setStateMove__13RotateMoveObjFv,RotateMoveObj.o,MapObj.a,false
|
||||
exeMove__13RotateMoveObjFv,RotateMoveObj.o,MapObj.a,false
|
||||
exeStop__13RotateMoveObjFv,RotateMoveObj.o,MapObj.a,false
|
||||
__sinit_\RotateMoveObj_cpp,RotateMoveObj.o,MapObj.a,false
|
||||
__ct__Q216NrvRotateMoveObj23HostTypeWaitForPlayerOnFv,RotateMoveObj.o,MapObj.a,false
|
||||
__ct__Q216NrvRotateMoveObj12HostTypeWaitFv,RotateMoveObj.o,MapObj.a,false
|
||||
__ct__Q216NrvRotateMoveObj12HostTypeMoveFv,RotateMoveObj.o,MapObj.a,false
|
||||
__ct__Q216NrvRotateMoveObj12HostTypeStopFv,RotateMoveObj.o,MapObj.a,false
|
||||
execute__Q216NrvRotateMoveObj12HostTypeStopCFP5Spine,RotateMoveObj.o,MapObj.a,false
|
||||
execute__Q216NrvRotateMoveObj12HostTypeMoveCFP5Spine,RotateMoveObj.o,MapObj.a,false
|
||||
execute__Q216NrvRotateMoveObj12HostTypeWaitCFP5Spine,RotateMoveObj.o,MapObj.a,false
|
||||
execute__Q216NrvRotateMoveObj23HostTypeWaitForPlayerOnCFP5Spine,RotateMoveObj.o,MapObj.a,false
|
||||
Functor<13RotateMoveObj>__2MRFP13RotateMoveObjM13RotateMoveObjFPCvPv_v_Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v>,RotateMoveObj.o,MapObj.a,false
|
||||
__cl__Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v>CFv,RotateMoveObj.o,MapObj.a,false
|
||||
clone__Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v>CFP7JKRHeap,RotateMoveObj.o,MapObj.a,false
|
||||
__dt__13RotateMoveObjFv,RotateMoveObj.o,MapObj.a,false
|
||||
setStateMove__13RotateMoveObjFv,RotateMoveObj.o,MapObj.a,true
|
||||
exeMove__13RotateMoveObjFv,RotateMoveObj.o,MapObj.a,true
|
||||
exeStop__13RotateMoveObjFv,RotateMoveObj.o,MapObj.a,true
|
||||
__sinit_\RotateMoveObj_cpp,RotateMoveObj.o,MapObj.a,true
|
||||
__ct__Q216NrvRotateMoveObj23HostTypeWaitForPlayerOnFv,RotateMoveObj.o,MapObj.a,true
|
||||
__ct__Q216NrvRotateMoveObj12HostTypeWaitFv,RotateMoveObj.o,MapObj.a,true
|
||||
__ct__Q216NrvRotateMoveObj12HostTypeMoveFv,RotateMoveObj.o,MapObj.a,true
|
||||
__ct__Q216NrvRotateMoveObj12HostTypeStopFv,RotateMoveObj.o,MapObj.a,true
|
||||
execute__Q216NrvRotateMoveObj12HostTypeStopCFP5Spine,RotateMoveObj.o,MapObj.a,true
|
||||
execute__Q216NrvRotateMoveObj12HostTypeMoveCFP5Spine,RotateMoveObj.o,MapObj.a,true
|
||||
execute__Q216NrvRotateMoveObj12HostTypeWaitCFP5Spine,RotateMoveObj.o,MapObj.a,true
|
||||
execute__Q216NrvRotateMoveObj23HostTypeWaitForPlayerOnCFP5Spine,RotateMoveObj.o,MapObj.a,true
|
||||
Functor<13RotateMoveObj>__2MRFP13RotateMoveObjM13RotateMoveObjFPCvPv_v_Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v>,RotateMoveObj.o,MapObj.a,true
|
||||
__cl__Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v>CFv,RotateMoveObj.o,MapObj.a,true
|
||||
clone__Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v>CFP7JKRHeap,RotateMoveObj.o,MapObj.a,true
|
||||
__dt__13RotateMoveObjFv,RotateMoveObj.o,MapObj.a,true
|
||||
getRotateSpeed__19MapPartsRotatorBaseCFv,RotateMoveObj.o,MapObj.a,false
|
||||
__ct__23SandCapsuleInsidePlanetFPCc,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
init__23SandCapsuleInsidePlanetFRC12JMapInfoIter,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
initCaseUseSwitchA__23SandCapsuleInsidePlanetFRC19MapObjActorInitInfo,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
startOn__23SandCapsuleInsidePlanetFv,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
startOff__23SandCapsuleInsidePlanetFv,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
__sinit_\SandCapsuleInsidePlanet_cpp,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
__ct__Q226NrvSandCapsuleInsidePlanet30SandCapsuleInsidePlanetNrvWaitFv,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
execute__Q226NrvSandCapsuleInsidePlanet30SandCapsuleInsidePlanetNrvWaitCFP5Spine,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
Functor<23SandCapsuleInsidePlanet>__2MRFP23SandCapsuleInsidePlanetM23SandCapsuleInsidePlanetFPCvPv_v_Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v>,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
__cl__Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v>CFv,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
clone__Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v>CFP7JKRHeap,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
__dt__23SandCapsuleInsidePlanetFv,SandCapsuleInsidePlanet.o,MapObj.a,false
|
||||
__ct__23SandCapsuleInsidePlanetFPCc,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
init__23SandCapsuleInsidePlanetFRC12JMapInfoIter,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
initCaseUseSwitchA__23SandCapsuleInsidePlanetFRC19MapObjActorInitInfo,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
startOn__23SandCapsuleInsidePlanetFv,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
startOff__23SandCapsuleInsidePlanetFv,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
__sinit_\SandCapsuleInsidePlanet_cpp,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
__ct__Q226NrvSandCapsuleInsidePlanet30SandCapsuleInsidePlanetNrvWaitFv,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
execute__Q226NrvSandCapsuleInsidePlanet30SandCapsuleInsidePlanetNrvWaitCFP5Spine,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
Functor<23SandCapsuleInsidePlanet>__2MRFP23SandCapsuleInsidePlanetM23SandCapsuleInsidePlanetFPCvPv_v_Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v>,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
__cl__Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v>CFv,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
clone__Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v>CFP7JKRHeap,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
__dt__23SandCapsuleInsidePlanetFv,SandCapsuleInsidePlanet.o,MapObj.a,true
|
||||
__ct__22SandCapsulePressGroundFPCc,SandCapsulePressGround.o,MapObj.a,false
|
||||
init__22SandCapsulePressGroundFRC12JMapInfoIter,SandCapsulePressGround.o,MapObj.a,false
|
||||
exeWait__22SandCapsulePressGroundFv,SandCapsulePressGround.o,MapObj.a,false
|
||||
|
||||
|
@ -439,7 +439,7 @@ createNameObj<16OceanWaveFloater>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj,
|
||||
createNameObj<16OceanSmallTurtle>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj,NameObjFactory.o,NameObj.a,false
|
||||
createNameObj<22SpringWaterFloaterSpot>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj,NameObjFactory.o,NameObj.a,false
|
||||
createNameObj<24SeaBottomTriplePropeller>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj,NameObjFactory.o,NameObj.a,false
|
||||
createNameObj<13RotateMoveObj>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj,NameObjFactory.o,NameObj.a,false
|
||||
createNameObj<13RotateMoveObj>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj,NameObjFactory.o,NameObj.a,true
|
||||
createNameObj<10LargeChain>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj,NameObjFactory.o,NameObj.a,false
|
||||
createNameObj<15ItemAppearStone>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj,NameObjFactory.o,NameObj.a,false
|
||||
createNameObj<9SnowFloor>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj,NameObjFactory.o,NameObj.a,false
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"label": "Game",
|
||||
"message": "9.837741494853503%",
|
||||
"message": "9.886751202030073%",
|
||||
"color": "blue"
|
||||
}
|
||||
@ -12,8 +12,8 @@
|
||||
| [Gravity](https://github.com/shibbo/Petari/blob/master/docs/lib/Gravity.md) | 56.816792337477075% |
|
||||
| [LiveActor](https://github.com/shibbo/Petari/blob/master/docs/lib/LiveActor.md) | 39.26233287229138% |
|
||||
| [Map](https://github.com/shibbo/Petari/blob/master/docs/lib/Map.md) | 15.921118600635062% |
|
||||
| [MapObj](https://github.com/shibbo/Petari/blob/master/docs/lib/MapObj.md) | 22.41000946447701% |
|
||||
| [NameObj](https://github.com/shibbo/Petari/blob/master/docs/lib/NameObj.md) | 28.65853658536585% |
|
||||
| [MapObj](https://github.com/shibbo/Petari/blob/master/docs/lib/MapObj.md) | 22.664302280834956% |
|
||||
| [NameObj](https://github.com/shibbo/Petari/blob/master/docs/lib/NameObj.md) | 28.856063208519412% |
|
||||
| [NPC](https://github.com/shibbo/Petari/blob/master/docs/lib/NPC.md) | 0.7591369440774989% |
|
||||
| [NWC24](https://github.com/shibbo/Petari/blob/master/docs/lib/NWC24.md) | 0.0% |
|
||||
| [Player](https://github.com/shibbo/Petari/blob/master/docs/lib/Player.md) | 0.14184156212575486% |
|
||||
|
||||
@ -217,8 +217,8 @@
|
||||
| RockCreator.o | 0.0% | 0 / 17 | 0.0% | :x:
|
||||
| RosettaChair.o | 0.0% | 0 / 8 | 0.0% | :x:
|
||||
| RosettaPictureBook.o | 0.0% | 0 / 23 | 0.0% | :x:
|
||||
| RotateMoveObj.o | 0.0% | 0 / 20 | 0.0% | :x:
|
||||
| SandCapsuleInsidePlanet.o | 0.0% | 0 / 12 | 0.0% | :x:
|
||||
| RotateMoveObj.o | 89.16666666666667% | 17 / 20 | 85.0% | :eight_pointed_black_star:
|
||||
| SandCapsuleInsidePlanet.o | 100.0% | 12 / 12 | 100.0% | :white_check_mark:
|
||||
| SandCapsulePressGround.o | 0.0% | 0 / 36 | 0.0% | :x:
|
||||
| Sandstorm.o | 0.0% | 0 / 46 | 0.0% | :x:
|
||||
| SandUpDownEffectObj.o | 0.0% | 0 / 28 | 0.0% | :x:
|
||||
@ -5636,43 +5636,43 @@
|
||||
# RotateMoveObj.o
|
||||
| Symbol | Decompiled? |
|
||||
| ------------- | ------------- |
|
||||
| init__13RotateMoveObjFRC12JMapInfoIter | :x: |
|
||||
| init__13RotateMoveObjFRC12JMapInfoIter | :white_check_mark: |
|
||||
| initCaseUseSwitchB__13RotateMoveObjFRC19MapObjActorInitInfo | :x: |
|
||||
| initCaseNoUseSwitchB__13RotateMoveObjFRC19MapObjActorInitInfo | :x: |
|
||||
| setStateMove__13RotateMoveObjFv | :x: |
|
||||
| exeMove__13RotateMoveObjFv | :x: |
|
||||
| exeStop__13RotateMoveObjFv | :x: |
|
||||
| __sinit_\RotateMoveObj_cpp | :x: |
|
||||
| __ct__Q216NrvRotateMoveObj23HostTypeWaitForPlayerOnFv | :x: |
|
||||
| __ct__Q216NrvRotateMoveObj12HostTypeWaitFv | :x: |
|
||||
| __ct__Q216NrvRotateMoveObj12HostTypeMoveFv | :x: |
|
||||
| __ct__Q216NrvRotateMoveObj12HostTypeStopFv | :x: |
|
||||
| execute__Q216NrvRotateMoveObj12HostTypeStopCFP5Spine | :x: |
|
||||
| execute__Q216NrvRotateMoveObj12HostTypeMoveCFP5Spine | :x: |
|
||||
| execute__Q216NrvRotateMoveObj12HostTypeWaitCFP5Spine | :x: |
|
||||
| execute__Q216NrvRotateMoveObj23HostTypeWaitForPlayerOnCFP5Spine | :x: |
|
||||
| Functor<13RotateMoveObj>__2MRFP13RotateMoveObjM13RotateMoveObjFPCvPv_v_Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v> | :x: |
|
||||
| __cl__Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v>CFv | :x: |
|
||||
| clone__Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v>CFP7JKRHeap | :x: |
|
||||
| __dt__13RotateMoveObjFv | :x: |
|
||||
| setStateMove__13RotateMoveObjFv | :white_check_mark: |
|
||||
| exeMove__13RotateMoveObjFv | :white_check_mark: |
|
||||
| exeStop__13RotateMoveObjFv | :white_check_mark: |
|
||||
| __sinit_\RotateMoveObj_cpp | :white_check_mark: |
|
||||
| __ct__Q216NrvRotateMoveObj23HostTypeWaitForPlayerOnFv | :white_check_mark: |
|
||||
| __ct__Q216NrvRotateMoveObj12HostTypeWaitFv | :white_check_mark: |
|
||||
| __ct__Q216NrvRotateMoveObj12HostTypeMoveFv | :white_check_mark: |
|
||||
| __ct__Q216NrvRotateMoveObj12HostTypeStopFv | :white_check_mark: |
|
||||
| execute__Q216NrvRotateMoveObj12HostTypeStopCFP5Spine | :white_check_mark: |
|
||||
| execute__Q216NrvRotateMoveObj12HostTypeMoveCFP5Spine | :white_check_mark: |
|
||||
| execute__Q216NrvRotateMoveObj12HostTypeWaitCFP5Spine | :white_check_mark: |
|
||||
| execute__Q216NrvRotateMoveObj23HostTypeWaitForPlayerOnCFP5Spine | :white_check_mark: |
|
||||
| Functor<13RotateMoveObj>__2MRFP13RotateMoveObjM13RotateMoveObjFPCvPv_v_Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v> | :white_check_mark: |
|
||||
| __cl__Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v>CFv | :white_check_mark: |
|
||||
| clone__Q22MR53FunctorV0M<P13RotateMoveObj,M13RotateMoveObjFPCvPv_v>CFP7JKRHeap | :white_check_mark: |
|
||||
| __dt__13RotateMoveObjFv | :white_check_mark: |
|
||||
| getRotateSpeed__19MapPartsRotatorBaseCFv | :x: |
|
||||
|
||||
|
||||
# SandCapsuleInsidePlanet.o
|
||||
| Symbol | Decompiled? |
|
||||
| ------------- | ------------- |
|
||||
| __ct__23SandCapsuleInsidePlanetFPCc | :x: |
|
||||
| init__23SandCapsuleInsidePlanetFRC12JMapInfoIter | :x: |
|
||||
| initCaseUseSwitchA__23SandCapsuleInsidePlanetFRC19MapObjActorInitInfo | :x: |
|
||||
| startOn__23SandCapsuleInsidePlanetFv | :x: |
|
||||
| startOff__23SandCapsuleInsidePlanetFv | :x: |
|
||||
| __sinit_\SandCapsuleInsidePlanet_cpp | :x: |
|
||||
| __ct__Q226NrvSandCapsuleInsidePlanet30SandCapsuleInsidePlanetNrvWaitFv | :x: |
|
||||
| execute__Q226NrvSandCapsuleInsidePlanet30SandCapsuleInsidePlanetNrvWaitCFP5Spine | :x: |
|
||||
| Functor<23SandCapsuleInsidePlanet>__2MRFP23SandCapsuleInsidePlanetM23SandCapsuleInsidePlanetFPCvPv_v_Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v> | :x: |
|
||||
| __cl__Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v>CFv | :x: |
|
||||
| clone__Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v>CFP7JKRHeap | :x: |
|
||||
| __dt__23SandCapsuleInsidePlanetFv | :x: |
|
||||
| __ct__23SandCapsuleInsidePlanetFPCc | :white_check_mark: |
|
||||
| init__23SandCapsuleInsidePlanetFRC12JMapInfoIter | :white_check_mark: |
|
||||
| initCaseUseSwitchA__23SandCapsuleInsidePlanetFRC19MapObjActorInitInfo | :white_check_mark: |
|
||||
| startOn__23SandCapsuleInsidePlanetFv | :white_check_mark: |
|
||||
| startOff__23SandCapsuleInsidePlanetFv | :white_check_mark: |
|
||||
| __sinit_\SandCapsuleInsidePlanet_cpp | :white_check_mark: |
|
||||
| __ct__Q226NrvSandCapsuleInsidePlanet30SandCapsuleInsidePlanetNrvWaitFv | :white_check_mark: |
|
||||
| execute__Q226NrvSandCapsuleInsidePlanet30SandCapsuleInsidePlanetNrvWaitCFP5Spine | :white_check_mark: |
|
||||
| Functor<23SandCapsuleInsidePlanet>__2MRFP23SandCapsuleInsidePlanetM23SandCapsuleInsidePlanetFPCvPv_v_Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v> | :white_check_mark: |
|
||||
| __cl__Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v>CFv | :white_check_mark: |
|
||||
| clone__Q22MR73FunctorV0M<P23SandCapsuleInsidePlanet,M23SandCapsuleInsidePlanetFPCvPv_v>CFP7JKRHeap | :white_check_mark: |
|
||||
| __dt__23SandCapsuleInsidePlanetFv | :white_check_mark: |
|
||||
|
||||
|
||||
# SandCapsulePressGround.o
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
| NameObjArchiveListCollector.o | 100.0% | 3 / 3 | 100.0% | :white_check_mark:
|
||||
| NameObjCategoryList.o | 87.30964467005076% | 13 / 15 | 86.66666666666667% | :eight_pointed_black_star:
|
||||
| NameObjExecuteHolder.o | 100.0% | 49 / 49 | 100.0% | :white_check_mark:
|
||||
| NameObjFactory.o | 14.290443610681969% | 71 / 568 | 12.5% | :eight_pointed_black_star:
|
||||
| NameObjFactory.o | 14.544250717280955% | 72 / 568 | 12.676056338028168% | :eight_pointed_black_star:
|
||||
| NameObjFinder.o | 100.0% | 1 / 1 | 100.0% | :white_check_mark:
|
||||
| NameObjGroup.o | 100.0% | 5 / 5 | 100.0% | :white_check_mark:
|
||||
| NameObjHolder.o | 35.95505617977528% | 6 / 10 | 60.0% | :eight_pointed_black_star:
|
||||
@ -501,7 +501,7 @@
|
||||
| createNameObj<16OceanSmallTurtle>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj | :x: |
|
||||
| createNameObj<22SpringWaterFloaterSpot>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj | :x: |
|
||||
| createNameObj<24SeaBottomTriplePropeller>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj | :x: |
|
||||
| createNameObj<13RotateMoveObj>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj | :x: |
|
||||
| createNameObj<13RotateMoveObj>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj | :white_check_mark: |
|
||||
| createNameObj<10LargeChain>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj | :x: |
|
||||
| createNameObj<15ItemAppearStone>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj | :x: |
|
||||
| createNameObj<9SnowFloor>__28@unnamed@NameObjFactory_cpp@FPCc_P7NameObj | :x: |
|
||||
|
||||
@ -71,6 +71,7 @@
|
||||
#include "Game/MapObj/PurpleCoinStarter.h"
|
||||
#include "Game/MapObj/RailMoveObj.h"
|
||||
#include "Game/MapObj/ReverseGravityRoomPlanet.h"
|
||||
#include "Game/MapObj/RotateMoveObj.h"
|
||||
#include "Game/MapObj/ShootingStar.h"
|
||||
#include "Game/MapObj/SimpleMapObj.h"
|
||||
#include "Game/MapObj/SimpleTimerObj.h"
|
||||
|
||||
@ -35,7 +35,7 @@ public:
|
||||
MapObjActor(const char *);
|
||||
MapObjActor(const char *, const char *);
|
||||
|
||||
virtual ~MapObjActor() NO_INLINE {
|
||||
virtual ~MapObjActor() {
|
||||
|
||||
}
|
||||
|
||||
@ -114,6 +114,8 @@ public:
|
||||
|
||||
static void setupInitInfoSimpleMapObj(MapObjActorInitInfo *);
|
||||
|
||||
static void setupInitInfoPlanet(MapObjActorInitInfo *);
|
||||
|
||||
static void setupInitInfoSeesaw(MapObjActorInitInfo *, const JMapInfoIter &, const char *, f32);
|
||||
|
||||
static void setupInitInfoColorChangeArg0(MapObjActorInitInfo *, const JMapInfoIter &);
|
||||
|
||||
27
include/Game/MapObj/RotateMoveObj.h
Normal file
27
include/Game/MapObj/RotateMoveObj.h
Normal file
@ -0,0 +1,27 @@
|
||||
#pragma once
|
||||
|
||||
#include "Game/MapObj/MapObjActor.h"
|
||||
|
||||
class RotateMoveObj : public MapObjActor {
|
||||
public:
|
||||
inline RotateMoveObj(const char *pName) : MapObjActor(pName) {
|
||||
|
||||
}
|
||||
|
||||
virtual ~RotateMoveObj();
|
||||
virtual void init(const JMapInfoIter &);
|
||||
virtual void initCaseUseSwitchB(const MapObjActorInitInfo &);
|
||||
virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &);
|
||||
|
||||
void setStateMove();
|
||||
void exeMove();
|
||||
void exeStop();
|
||||
inline void exeWaitForPlayerOn();
|
||||
};
|
||||
|
||||
namespace NrvRotateMoveObj {
|
||||
NERVE_DECL(HostTypeWaitForPlayerOn, RotateMoveObj, RotateMoveObj::exeWaitForPlayerOn);
|
||||
NERVE_DECL_NULL(HostTypeWait);
|
||||
NERVE_DECL(HostTypeMove, RotateMoveObj, RotateMoveObj::exeMove);
|
||||
NERVE_DECL(HostTypeStop, RotateMoveObj, RotateMoveObj::exeStop);
|
||||
};
|
||||
19
include/Game/MapObj/SandCapsuleInsidePlanet.h
Normal file
19
include/Game/MapObj/SandCapsuleInsidePlanet.h
Normal file
@ -0,0 +1,19 @@
|
||||
#pragma once
|
||||
|
||||
#include "Game/MapObj/MapObjActor.h"
|
||||
|
||||
class SandCapsuleInsidePlanet : public MapObjActor {
|
||||
public:
|
||||
SandCapsuleInsidePlanet(const char *);
|
||||
|
||||
virtual ~SandCapsuleInsidePlanet();
|
||||
virtual void init(const JMapInfoIter &);
|
||||
virtual void initCaseUseSwitchA(const MapObjActorInitInfo &);
|
||||
|
||||
void startOn();
|
||||
void startOff();
|
||||
};
|
||||
|
||||
namespace NrvSandCapsuleInsidePlanet {
|
||||
NERVE_DECL_NULL(SandCapsuleInsidePlanetNrvWait);
|
||||
};
|
||||
@ -1,8 +1,192 @@
|
||||
#pragma once
|
||||
|
||||
#include <revolution.h>
|
||||
|
||||
class NameObj;
|
||||
class LiveActor;
|
||||
|
||||
struct StageEffectSoundData {
|
||||
const char* objectName; // _0
|
||||
const char* startSoundEffect; // _4
|
||||
const char* movingSoundEffect; // _8
|
||||
const char* stopSoundEffect; // _C
|
||||
u32 stopSoundEffectSteps; // _10
|
||||
s32 soundEffectType; // _14
|
||||
};
|
||||
|
||||
namespace {
|
||||
enum CameraShakeType {
|
||||
Strong = 1,
|
||||
Normal = 2,
|
||||
NormalWeak = 3,
|
||||
Weak = 4,
|
||||
VeryWeak = 5
|
||||
};
|
||||
|
||||
static StageEffectSoundData sStageEffectSeDataTable[0x9B] = {
|
||||
{ "LavaHomeVolcanoInnerFlow", 0, "SE_OJ_LV_LAVA_INCREASE_HOME", 0, 0xffffffff, 0 },
|
||||
{ "LavaRotatePlanetStartStep", "SE_OJ_LAVA_BR_ROCK_L_ON", "SE_OJ_LV_LAVA_BR_ROCK_L_MV", 0, 0xffffffff, 0 },
|
||||
{ "OceanRingRuinsMove", "SE_OJ_OCN_RUIN_MOVE_START", "SE_OJ_LV_OCN_RUIN_MOVE", "SE_OJ_OCN_RUIN_STOP", 0xffffffff, 0 },
|
||||
{ "OceanRingRuinsGearBig", "SE_OJ_OCN_RUIN_GEAR_L_ST", "SE_OJ_LV_OCN_RUIN_MOVE", "SE_OJ_OCN_RUIN_GEAR_L_END", 0xffffffff, 0 },
|
||||
{ "OceanRingRuinsGearSmall", 0, "SE_OJ_LV_OCN_RUIN_GEAR_S_MV", 0, 0xffffffff, 0 },
|
||||
{ "OceanRotateBridge", "SE_OJ_O_ROTATE_BRIDGE_ST", "SE_OJ_LV_O_ROTATE_BRIDGE_MV", "SE_OJ_O_ROTATE_BRIDGE_END", 0xffffffff, 2 },
|
||||
{ "ShutterDoorA", 0, "SE_OJ_LV_SHUTTER_DOOR_MOVE", "SE_OJ_SHUTTER_DOOR_STOP", 0xffffffff, 0 },
|
||||
{ "OceanSwingBoard", "SE_OJ_O_SWG_BOARD_MOVE_ST", "SE_OJ_LV_O_SWG_BOARD_MOVE", 0, 0xffffffff, 0 },
|
||||
{ "RotateNutStep", 0, "SE_OJ_LV_ROTATE_NUT_MOVE", 0, 0xffffffff, 0 },
|
||||
{ "OceanFloaterTowerRotateStepA", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 1 },
|
||||
{ "OceanFloaterTowerRotateStepB", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 1 },
|
||||
{ "OceanFloaterTowerRotateStepC", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 0 },
|
||||
{ "OceanFloaterTowerRotateStepD", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 0 },
|
||||
{ "OceanAppearBridge", "SE_OJ_O_APPEAR_BRDG_APPEAR", 0, 0, 0xffffffff, 0 },
|
||||
{ "OnimasuPlanetRotatePartsA", 0, "SE_OJ_LV_STONE_ROTATOR_MOVE", 0, 0xffffffff, 0 },
|
||||
{ "OnimasuPlanetRotatePartsB", 0, "SE_OJ_LV_STONE_ROTATOR_MOVE", 0, 0xffffffff, 0 },
|
||||
{ "OnimasuPlanetRailMovePartsA", "SE_OJ_STONE_FLOOR_START", "SE_OJ_LV_STONE_FLOOR_MOVE", "SE_OJ_STONE_FLOOR_END", 0xffffffff, 0 },
|
||||
{ "GhostShipCaveMoveGroundA", "SE_OJ_PTM_GROUND_START", "SE_OJ_LV_PTM_GROUND_MOVE", "SE_OJ_PTM_GROUND_STOP", 0xffffffff, 0 },
|
||||
{ "GhostShipCaveMoveGroundB", "SE_OJ_PTM_GROUND_START", "SE_OJ_LV_PTM_GROUND_MOVE", "SE_OJ_PTM_GROUND_STOP", 0xffffffff, 0 },
|
||||
{ "WaterRoadCaveStepA", "SE_OJ_W_RD_CAVE_STEP_ST", "SE_OJ_LV_W_RD_CAVE_STEP_MV", "SE_OJ_W_RD_CAVE_STEP_ED", 0xffffffff, 0 },
|
||||
{ "LavaBreakColumn", "SE_OJ_LAVA_COLUMN_FALL_ST", "SE_OJ_LV_LAVA_COLUMN_FALL", 0, 0x4b, 0 },
|
||||
{ "LavaBreakRockA", "SE_OJ_LAVA_BR_ROCK_H_ON", "SE_OJ_LV_LAVA_BR_ROCK_H_MV", 0, 0xffffffff, 0 },
|
||||
{ "LavaBreakRockB", "SE_OJ_LAVA_BR_ROCK_S_ON", "SE_OJ_LV_LAVA_BR_ROCK_S_MV", 0, 0xffffffff, 0 },
|
||||
{ "LavaBreakRockC", "SE_OJ_LAVA_BR_ROCK_L_ON", "SE_OJ_LV_LAVA_BR_ROCK_L_MV", 0, 0xffffffff, 0 },
|
||||
{ "LavaBreakRockD", "SE_OJ_LAVA_BR_ROCK_S_ON", "SE_OJ_LV_LAVA_BR_ROCK_S_MV", 0, 0xffffffff, 0 },
|
||||
{ "LavaFallDownColumnA", "SE_OJ_LAVA_COLUMN_FALL_1", 0, 0, 0xffffffff, 0 },
|
||||
{ "LavaFallDownColumnB", "SE_OJ_LAVA_COLUMN_FALL_2", 0, 0, 0xffffffff, 0 },
|
||||
{ "OceanHomeTopRock", 0, 0, 0, 0xffffffff, 0 },
|
||||
{ "WaterWheelGear", 0, "SE_OJ_LV_W_WHEEL_GEAR_MOVE", 0, 0xffffffff, 0 },
|
||||
{ "TeresaRoomDoor", "SE_OJ_TERESA_ROOM_DOOR_OPEN", 0, 0, 0xffffffff, 0 },
|
||||
{ "WaterPowerStream", "SE_OJ_W_POWER_STREAM_ST", "SE_OJ_LV_W_POWER_STREAM_MV", 0, 0xffffffff, 0 },
|
||||
{ "LavaObstacleRockShell", "SE_OJ_LAVA_OB_ROCK_S_ON", "SE_OJ_LV_LAVA_OB_ROCK_S_MV", "SE_OJ_LAVA_OB_ROCK_S_STOP", 0x122, 0 },
|
||||
{ "LavaObstacleRockHomeA", "SE_OJ_LAVA_OB_ROCK_A_ON", "SE_OJ_LV_LAVA_OB_ROCK_A_MV", "SE_OJ_LAVA_OB_ROCK_A_STOP", 0xd2, 0 },
|
||||
{ "LavaObstacleRockHomeB", 0, "SE_OJ_LV_LAVA_OB_ROCK_B_MV", "SE_OJ_LAVA_OB_ROCK_B_STOP", 0x118, 0 },
|
||||
{ "UFOKinoko", 0, "SE_OJ_LV_UFO_KINOKO_ROTATE", 0, 0xffffffff, 0 },
|
||||
{ "PhantomShipPropellerSmall", 0, "SE_OJ_LV_P_SHIP_PROPELLER_S", 0, 0xffffffff, 0 },
|
||||
{ "PhantomShipPropellerBig", 0, "SE_OJ_LV_P_SHIP_PROPELLER_L", 0, 0xffffffff, 0 },
|
||||
{ "ForestAppearStepA", "SE_OJ_FOREST_STEP_APPEAR", 0, 0, 0xffffffff, 0 },
|
||||
{ "ForestObstacleWoodA", "SE_OJ_FOREST_OBS_WOOD_ON", "SE_OJ_LV_FOREST_OBS_WOOD_MV", "SE_OJ_FOREST_OBS_WOOD_STOP", 0x78, 2 },
|
||||
{ "RGTowerPressGroundA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0 },
|
||||
{ "TeresaMansionEntranceDoor", 0, 0, "SE_OJ_P_ROOM_DOOR_L_CL_ST", 0xffffffff, 0 },
|
||||
{ "BattleShipMovePartsA", 0, "SE_OJ_LV_METAL_ROTATOR_MOVE", 0, 0xffffffff, 0 },
|
||||
{ "ReverseGravityRoomPressGroundA", "SE_OJ_METAL_FLOOR_S_START", "SE_OJ_LV_METAL_FLOOR_S_MOVE", "SE_OJ_METAL_FLOOR_S_STOP", 0xffffffff, 0 },
|
||||
{ "ReverseGravityRoomPressGroundB", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 0 },
|
||||
{ "ShutterDoorB", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 2 },
|
||||
{ "TeresaMansionHoleCover", 0, 0, "SE_OJ_STRANGEROCK_BREAK_S", 0xffffffff, 0 },
|
||||
{ "KoopaStatue", 0, 0, "SE_OJ_STRANGEROCK_BREAK_S", 0xffffffff, 2 },
|
||||
{ "TeresaRacePartsA", 0, "SE_OJ_LV_TR_RACE_ROTATER", 0, 0xffffffff, 0 },
|
||||
{ "TeresaRacePartsB", "SE_OJ_TR_RACE_PARTS_BOUND", 0, 0, 0xffffffff, 0 },
|
||||
{ "BeeWallClimbPartsA", 0, "SE_OJ_LV_BEE_WALL_MOVE", "SE_OJ_BEE_WALL_STOP", 0xffffffff, 0 },
|
||||
{ "ShutterDoorC", "SE_OJ_FENCE_SHUTTER_START", "SE_OJ_LV_FENCE_SHUTTER_MOVE", "SE_OJ_FENCE_SHUTTER_STOP", 0xae, 2 },
|
||||
{ "ShutterDoorD", "SE_OJ_FENCE_SHUTTER_S_ST", "SE_OJ_LV_FENCE_SHUTTER_S_MV", "SE_OJ_FENCE_SHUTTER_S_ED", 0xb4, 0 },
|
||||
{ "IcicleRock", 0, 0, "SE_OJ_STRANGEROCK_BREAK_S", 0xffffffff, 0 },
|
||||
{ "QuestionBoxMoveStepA", 0, "SE_OJ_LV_Q_BOX_ROTATE", 0, 0xffffffff, 0 },
|
||||
{ "QuestionBoxMoveStepB", 0, "SE_OJ_LV_Q_BOX_RAIL_MOVE", 0, 0xffffffff, 0 },
|
||||
{ "QuestionBoxMoveStepC", 0, "SE_OJ_LV_Q_BOX_RAIL_UD", "SE_OJ_Q_BOX_RAIL_UD_STOP", 0xffffffff, 0 },
|
||||
{ "KoopaVS1PartsMoveStepA", "SE_OJ_KOOPA_F_LIFT_ST", "SE_OJ_LV_KOOPA_F_LIFT_MV", "SE_OJ_KOOPA_F_LIFT_ED", 0xffffffff, 0 },
|
||||
{ "KoopaVS1PartsMoveStepB", "SE_OJ_KOOPA_F_LIFT_ST", "SE_OJ_LV_KOOPA_F_LIFT_MV", "SE_OJ_KOOPA_F_LIFT_ED", 0xffffffff, 0 },
|
||||
{ "KoopaVS1PartsRotateMoveStepA", "SE_OJ_KOOPA_F_R_LIFT_ST", "SE_OJ_LV_KOOPA_F_R_LIFT_MV", "SE_OJ_KOOPA_F_R_LIFT_ED", 0xffffffff, 0 },
|
||||
{ "KoopaVS1PartsRotateMoveStepB", "SE_OJ_KOOPA_F_R_LIFT_ST", "SE_OJ_LV_KOOPA_F_R_LIFT_MV", "SE_OJ_KOOPA_F_R_LIFT_ED", 0xffffffff, 0 },
|
||||
{ "SideSpikeMoveStepA", "SE_OJ_SIDE_SPIKE_STEP_ST", "SE_OJ_LV_SIDE_SPIKE_STEP_MV", "SE_OJ_SIDE_SPIKE_STEP_ED", 0xffffffff, 0 },
|
||||
{ "PhantomTowerMoveStepA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0 },
|
||||
{ "IceVolcanoAppearStepA", "SE_OJ_VOL_APPEAR_STEP_ST", "SE_OJ_LV_VOL_APPEAR_STEP_MV", "SE_OJ_VOL_APPEAR_STEP_ED", 0xda, 2 },
|
||||
{ "IceVolcanoClimbingWall", "SE_OJ_VOL_CLIMB_WALL_ST", "SE_OJ_LV_VOL_CLIMB_WALL_MV", "SE_OJ_VOL_CLIMB_WALL_ED", 0x1ca, 2 },
|
||||
{ "IceUpDownShutterDoorA", "SE_OJ_MTL_SHUTTER_S_ST", "SE_OJ_LV_MTL_SHUTTER_S_MV", "SE_OJ_MTL_SHUTTER_S_ED", 0x90, 2 },
|
||||
{ "IceVolcanoMoveStepA", 0, "SE_OJ_LV_VOL_MOVE_STEP_FLOW", 0, 0xffffffff, 0 },
|
||||
{ "HopperBeltConveyerRotatePartsA", 0, "SE_OJ_LV_HOPPER_CONVEYER_MV", 0, 0xffffffff, 0 },
|
||||
{ "HopperBeltConveyerMovePartsA", 0, "SE_OJ_LV_HOPPER_CONVEYER_MV", 0, 0xffffffff, 0 },
|
||||
{ "MechaKoopaPartsCaterpillar", 0, "SE_OJ_LV_M_KOOPA_CATER_L_MV", 0, 0xffffffff, 0 },
|
||||
{ "BroadBeanMoveStepA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0 },
|
||||
{ "BroadBeanMoveStepB", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0 },
|
||||
{ "RayGunPlanetPartsGear", 0, "SE_OJ_LV_RAYGUN_GEAR_ROT", 0, 0xffffffff, 0 },
|
||||
{ "RayGunPlanetPartsScrew", 0, "SE_OJ_LV_RAYGUN_SCREW_ROT", "SE_OJ_RAYGUN_SCREW_STOP", 0xffffffff, 2 },
|
||||
{ "SandStreamHighTowerMoveStepA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0 },
|
||||
{ "MechaKoopaPartsRollerA", 0, "SE_OJ_LV_M_KOOPA_CATER_S_MV", 0, 0xffffffff, 0 },
|
||||
{ "MiniMechaKoopaPartsGear", 0, "SE_OJ_LV_MM_KOOPA_GEAR_ROT", 0, 0xffffffff, 0 },
|
||||
{ "MiniMechaKoopaPartsCage", "SE_OJ_MM_KOOPA_CAGE_START", "SE_OJ_LV_MM_KOOPA_CAGE_ROT", "SE_OJ_MM_KOOPA_CAGE_STOP", 0xffffffff, 2 },
|
||||
{ "MiniMechaKoopaPartsMoveStepA", "SE_OJ_MM_KOOPA_STEP_START", "SE_OJ_LV_MM_KOOPA_STEP_MOVE", "SE_OJ_MM_KOOPA_STEP_STOP", 0xffffffff, 2 },
|
||||
{ "AsteroidBlockRotateStepA", 0, "SE_OJ_LV_AST_BLOCK_ROTATE", 0, 0xffffffff, 0 },
|
||||
{ "SandUpDownTowerBreakableWallA", 0, 0, "SE_OJ_WOOD_WALL_BREAK", 0xffffffff, 0 },
|
||||
{ "SandUpDownTowerBreakableWallB", 0, 0, "SE_OJ_WOOD_WALL_BREAK", 0xffffffff, 0 },
|
||||
{ "HoleDeathSandMoveStepA", "SE_OJ_SAND_MOVE_STEP_ST", "SE_OJ_LV_SAND_MOVE_STEP_MV", "SE_OJ_SAND_MOVE_STEP_ED", 0xffffffff, 0 },
|
||||
{ "CannonFortressMoveWall", "SE_OJ_CNFORT_MOVEWALL_ST", "SE_OJ_LV_CNFORT_MOVEWALL_MV", "SE_OJ_CNFORT_MOVEWALL_ED", 0xffffffff, 0 },
|
||||
{ "MechaKoopaPartsBreast", "SE_OJ_M_KOOPA_BREAST_START", "SE_OJ_LV_M_KOOPA_BREAST_MV", "SE_OJ_M_KOOPA_BREAST_BREAK", 0xffffffff, 1 },
|
||||
{ "ChoConveyorMoveChocoA", 0, "SE_OJ_LV_CHOCONVEYER_MOVE", 0, 0xffffffff, 0 },
|
||||
{ "MechaKoopaPartsCollar", 0, "SE_OJ_LV_M_KOOPA_COLLAR_ROT", 0, 0xffffffff, 0 },
|
||||
{ "MechaKoopaPartsMoveStepA", "SE_OJ_M_KOOPA_MV_STEP_ST", "SE_OJ_LV_M_KOOPA_MV_STEP_MV", "SE_OJ_M_KOOPA_MV_STEP_ED", 0xffffffff, 0 },
|
||||
{ "ChoConveyorPlanetD", 0, "SE_OJ_LV_CHO_CONVEYOR_PLN_D", 0, 0xffffffff, 0 },
|
||||
{ "SeaBottomBigDoorA", "SE_OJ_SEABTM_B_DOOR_START", "SE_OJ_LV_SEABTM_B_DOOR_MOVE", "SE_OJ_SEABTM_B_DOOR_STOP", 0xffffffff, 0 },
|
||||
{ "SeaBottomBigDoorB", "SE_OJ_SEABTM_B_DOOR_START", "SE_OJ_LV_SEABTM_B_DOOR_MOVE", "SE_OJ_SEABTM_B_DOOR_STOP", 0xffffffff, 0 },
|
||||
{ "SeaBottomBigDoorC", "SE_OJ_SEABTM_DOOR_C_START", "SE_OJ_LV_SEABTM_DOOR_C_MOVE", "SE_OJ_SEABTM_DOOR_C_STOP", 0xffffffff, 0 },
|
||||
{ "WaterBazookaTowerMoveStepA", 0, "SE_OJ_LV_W_BZK_TW_STEP_A_MV", "SE_OJ_W_BZK_TW_STEP_A_ED", 0xffffffff, 0 },
|
||||
{ "WaterBazookaTowerMoveStepB", "SE_OJ_W_BZK_TW_STEP_B_ST", "SE_OJ_LV_W_BZK_TW_STEP_B_MV", "SE_OJ_W_BZK_TW_STEP_B_ED", 0xffffffff, 0 },
|
||||
{ "WaterBazookaTowerMoveStepC", "SE_OJ_W_BZK_TW_STEP_C_ST", "SE_OJ_LV_W_BZK_TW_STEP_C_MV", "SE_OJ_W_BZK_TW_STEP_C_ED", 0xffffffff, 0 },
|
||||
{ "KoopaJrSmallShipA", "SE_OJ_KOOPA_JR_S_SHIP_ST", "SE_OJ_LV_KOOPA_JR_S_SHIP_MV", "SE_OJ_KOOPA_JR_S_SHIP_ED", 0xffffffff, 0 },
|
||||
{ "HeavensDoorInsideRotatePartsA", 0, "SE_OJ_LV_HD_INSIDE_ROTATOR", 0, 0xffffffff, 0 },
|
||||
{ "HeavensDoorInsideRotatePartsB", 0, "SE_OJ_LV_HD_INSIDE_ROTATOR", 0, 0xffffffff, 0 },
|
||||
{ "HeavensDoorInsideRotatePartsC", 0, "SE_OJ_LV_HD_INSIDE_ROTATOR", 0, 0xffffffff, 0 },
|
||||
{ "HeavensDoorMiddleRotatePartsA", 0, "SE_OJ_LV_HD_MID_ROTATOR_A", 0, 0xffffffff, 0 },
|
||||
{ "HeavensDoorMiddleRotatePartsB", 0, "SE_OJ_LV_HD_MID_ROTATOR_B", 0, 0xffffffff, 0 },
|
||||
{ "HeavensDoorInsideCage", "SE_OJ_HD_INSIDE_CAGE_BREAK", 0, 0, 0xffffffff, 0 },
|
||||
{ "HeavensDoorInsidePlanetPartsA", "SE_OJ_HD_INSIDE_SUN_OFF", 0, 0, 0xffffffff, 0 },
|
||||
{ "HeavensDoorAppearStepA", "SE_OJ_HD_STEP_APPEAR", 0, 0, 0xffffffff, 0 },
|
||||
{ "ReverseGravityRoomPressGroundC", "SE_OJ_METAL_FLOOR_S_START", "SE_OJ_LV_METAL_FLOOR_S_MOVE", "SE_OJ_METAL_FLOOR_S_STOP", 0xffffffff, 0 },
|
||||
{ "ReverseGravityRoomPressGroundD", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 0 },
|
||||
{ "BattleShipMovePartsB", "SE_OJ_BS_MOVE_PARTS_B_ST", "SE_OJ_LV_BS_MOVE_PARTS_B_MV", "SE_OJ_BS_MOVE_PARTS_B_ED", 0xffffffff, 0 },
|
||||
{ "IceWaterUpDownParts", 0, "SE_AT_LV_ICE_WATER_UP_DOWN", 0, 0xffffffff, 0 },
|
||||
{ "LavaUpDownParts", 0, "SE_AT_LV_LAVA_UP_DOWN", 0, 0xffffffff, 0 },
|
||||
{ "KoopaVS2PartsStartMoveStepA", "SE_OJ_KP2_START_STEP_ST", "SE_OJ_LV_KP2_START_STEP_MV", "SE_OJ_KP2_START_STEP_ED", 0xffffffff, 0 },
|
||||
{ "KoopaVS2PartsStartMoveStepB", "SE_OJ_KP2_START_STEP_ST", "SE_OJ_LV_KP2_START_STEP_MV", "SE_OJ_KP2_START_STEP_ED", 0xffffffff, 0 },
|
||||
{ "KoopaVS2PartsStartMoveStepC", "SE_OJ_KP2_START_STEP_ST", "SE_OJ_LV_KP2_START_STEP_MV", "SE_OJ_KP2_START_STEP_ED", 0xffffffff, 0 },
|
||||
{ "KoopaVS2PartsRollingStep", 0, "SE_OJ_LV_KP2_ROLL_STEP_MV", 0, 0xffffffff, 0 },
|
||||
{ "KoopaVS2PartsSSquareMoveStep", "SE_OJ_KP2_S_SQR_STEP_ST", "SE_OJ_LV_KP2_S_SQR_STEP_MV", "SE_OJ_KP2_S_SQR_STEP_ED", 0xffffffff, 0 },
|
||||
{ "KoopaVS2Parts2DMoveStepBarA", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 },
|
||||
{ "KoopaVS2Parts2DMoveStepBarB", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 },
|
||||
{ "KoopaVS2Parts2DMoveStepSBarB", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 },
|
||||
{ "KoopaVS2Parts2DMoveStepConvex", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 },
|
||||
{ "KoopaVS2Parts2DMoveStepLShape", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 },
|
||||
{ "KoopaVS2Parts2DMoveStepCross", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 },
|
||||
{ "KoopaVS2PartsSquareMoveStepA", 0, "SE_OJ_LV_KP2_START_STEP_MV", 0, 0xffffffff, 0 },
|
||||
{ "KoopaVS2PartsSquareMoveStepB", 0, "SE_OJ_LV_KP2_START_STEP_MV", 0, 0xffffffff, 0 },
|
||||
{ "KoopaVS2PartsJoinedMoveStep", "SE_OJ_KP2_JNT_STEP_ST", "SE_OJ_LV_KP2_JNT_STEP_MV", "SE_OJ_KP2_JNT_STEP_ED", 0xffffffff, 0 },
|
||||
{ "HeavenlyBeachTimerStepA", "SE_OJ_O_APPEAR_BRDG_APPEAR", 0, 0, 0xffffffff, 0 },
|
||||
{ "HeavenlyBeachTimerStepB", "SE_OJ_O_APPEAR_BRDG_APPEAR", 0, 0, 0xffffffff, 0 },
|
||||
{ "IceLavaIslandLavaMovableStepA", 0, "SE_AT_LV_ICE_LAVA_LAVA_STEP", 0, 0xffffffff, 0 },
|
||||
{ "ConcreteBlock", 0, 0, "SE_OJ_STRANGEROCK_BREAK_M", 0xffffffff, 0 },
|
||||
{ "WindMillPropeller", 0, "SE_OJ_LV_WINDMILL_PROPELLER", 0, 0xffffffff, 0 },
|
||||
{ "BiriBiriBegomanSpikePistonA", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 0 },
|
||||
{ "HeavenlyBeachUnderRock", "SE_OJ_HB_UNDERROCK_BREAK", "SE_OJ_LV_HB_UNDERROCK_WATER", 0, 0xffffffff, 0 },
|
||||
{ "HeavenlyBeachTopRock", "SE_OJ_STRANGEROCK_BREAK_M", 0, 0, 0xffffffff, 0 },
|
||||
{ "FlagDiscPlanetD", 0, "SE_OJ_LV_FLY_DISK_ROTATE", 0, 0xffffffff, 0 },
|
||||
{ "IceVolcanoAppearStepB", "SE_OJ_IV_STEP_B_START", "SE_OJ_LV_IV_STEP_B_MVOE", "SE_OJ_IV_STEP_B_END", 0xd2, 0 },
|
||||
{ "ShutterDoorE", "SE_OJ_MTL_SHUTTER_S_ST", "SE_OJ_LV_MTL_SHUTTER_S_MV", "SE_OJ_MTL_SHUTTER_S_ED", 0xad, 2 },
|
||||
{ "SnowBlockA", 0, 0, "SE_OJ_SNOW_MAN_MELT", 0xffffffff, 0 },
|
||||
{ "ChallengeBallRotateBridgeA", "SE_OJ_CHAL_RT_BRIDGE_ST", "SE_OJ_LV_CHAL_RT_BRIDGE_ROT", "SE_OJ_CHAL_RT_BRIDGE_ED", 0xffffffff, 0 },
|
||||
{ "ChallengeBallMoveGroundA", "SE_OJ_CHAL_MV_GND_L_ST", "SE_OJ_LV_CHAL_MV_GND_L_MV", "SE_OJ_CHAL_MV_GND_L_ED", 0xffffffff, 0 },
|
||||
{ "ChallengeBallMoveGroundB", 0, "SE_OJ_LV_CHAL_MV_GND_S_MV", 0, 0xffffffff, 0 },
|
||||
{ "ChallengeBallGearA", 0, "SE_OJ_LV_CHAL_GEAR_ROTATE", 0, 0xffffffff, 0 },
|
||||
{ "ChallengeBallAccelCylinderA", 0, "SE_OJ_LV_CHAL_ACC_CYLINDER", 0, 0xffffffff, 0 },
|
||||
{ "AstroDecoratePartsGearA", 0, "SE_OJ_LV_ASTRO_DECO_GEAR_MV", 0, 0xffffffff, 0 },
|
||||
{ "DarkHopperRotateStepA", "SE_OJ_MYST_CIRCLE_PENDULUM", 0, 0, 0xffffffff, 0 },
|
||||
{ "TrialBubbleRevolvingPartsA", 0, "SE_OJ_LV_TRIBBL_REVOLV_PRT", 0, 0xffffffff, 0 },
|
||||
{ "TrialBubbleRotateWallA", 0, "SE_OJ_LV_TRIBBL_ROT_WALL", 0, 0xffffffff, 0 },
|
||||
{ "TrialBubbleMoveWallA", "SE_OJ_TRIBBL_MOVEWALL_ST", "SE_OJ_LV_TRIBBL_MOVEWALL_MV", "SE_OJ_TRIBBL_MOVEWALL_ED", 0xffffffff, 0 },
|
||||
{ "CubeBubbleExRotateWallL", 0, "SE_OJ_LV_CUBEBBL_ROT_WALL_L", 0, 0xffffffff, 0 },
|
||||
{ "PowerStarKeeperA", 0, "SE_OJ_LV_POW_STAR_KEEPER_A", 0, 0xffffffff, 0 },
|
||||
{ "PowerStarKeeperB", 0, "SE_OJ_LV_POW_STAR_KEEPER_B", 0, 0xffffffff, 0 },
|
||||
{ "PowerStarKeeperC", 0, "SE_OJ_LV_POW_STAR_KEEPER_C", 0, 0xffffffff, 0 },
|
||||
{ "KoopaVS3RotateStepsA", 0, "SE_OJ_LV_KP_VS3_ROT_STEP_A", 0, 0xffffffff, 0 },
|
||||
{ "DeathPromenadeMovePartsSpuareA", "SE_OJ_DP_MOVE_STEP_START", "SE_OJ_LV_DP_MOVE_STEP_MOVE", "SE_OJ_DP_MOVE_STEP_START", 0xffffffff, 0 },
|
||||
{ "DeathPromenadeRotateCircleL", 0, "SE_OJ_LV_DP_ROT_CIRCLE_L", 0, 0xffffffff, 0 },
|
||||
{ "DeathPromenadeRotateCircleS", 0, "SE_OJ_LV_DP_ROT_CIRCLE_S", 0, 0xffffffff, 0 },
|
||||
{ "MiniMechaKoopaPartsFan", 0, "SE_OJ_LV_MM_KOOPA_FAN", 0, 0xffffffff, 0 },
|
||||
{ "ClockworkHandle", 0, "SE_OJ_LV_CLOCKWORK_HANDLE", 0, 0xffffffff, 0 },
|
||||
{ "SunkenShip", 0, 0, "SE_OJ_SUNKEN_SHIP_BREAK", 0xffffffff, 2 }
|
||||
};
|
||||
|
||||
StageEffectSoundData* getStageEffectSeParam(const char *);
|
||||
|
||||
void shakeCamera(CameraShakeType);
|
||||
bool isDistanceValidShake(LiveActor *, const char *);
|
||||
};
|
||||
|
||||
namespace MR {
|
||||
class StageEffect {
|
||||
public:
|
||||
|
||||
@ -598,10 +598,10 @@ namespace {
|
||||
{ "ShutterDoorE", NULL, "ShutterDoorE" },
|
||||
{ "SeaBottomTriplePropellerStand", NULL, "SeaBottomTriplePropellerStand" },
|
||||
{ "SeaBottomTriplePropeller", NULL, "SeaBottomTriplePropeller" },
|
||||
{ "OceanFloaterTowerRotateStepA", NULL, "OceanFloaterTowerRotateStepA" },
|
||||
{ "OceanFloaterTowerRotateStepB", NULL, "OceanFloaterTowerRotateStepB" },
|
||||
{ "OceanFloaterTowerRotateStepC", NULL, "OceanFloaterTowerRotateStepC" },
|
||||
{ "OceanFloaterTowerRotateStepD", NULL, "OceanFloaterTowerRotateStepD" },
|
||||
{ "OceanFloaterTowerRotateStepA", createNameObj<RotateMoveObj>, "OceanFloaterTowerRotateStepA" },
|
||||
{ "OceanFloaterTowerRotateStepB", createNameObj<RotateMoveObj>, "OceanFloaterTowerRotateStepB" },
|
||||
{ "OceanFloaterTowerRotateStepC", createNameObj<RotateMoveObj>, "OceanFloaterTowerRotateStepC" },
|
||||
{ "OceanFloaterTowerRotateStepD", createNameObj<RotateMoveObj>, "OceanFloaterTowerRotateStepD" },
|
||||
{ "LargeChain", createNameObj<LargeChain>, "LargeChain" },
|
||||
{ "IcicleRock", NULL, "IcicleRock" },
|
||||
{ "ItemAppearStoneSpinDriver", NULL, "ItemAppearStoneSpinDriver" },
|
||||
@ -622,7 +622,7 @@ namespace {
|
||||
{ "JumpStand", NULL, "JumpStand" },
|
||||
{ "CaretakerGarbage", NULL, "CaretakerGarbage" },
|
||||
{ "GlassBottleTall", NULL, "GlassBottleTall" },
|
||||
{ "HopperBeltConveyerRotatePartsA", NULL, "HopperBeltConveyerRotatePartsA" },
|
||||
{ "HopperBeltConveyerRotatePartsA", createNameObj<RotateMoveObj>, "HopperBeltConveyerRotatePartsA" },
|
||||
{ "HopperBeltConveyerMovePartsA", NULL, "HopperBeltConveyerMovePartsA" },
|
||||
{ "ChooChooTrain", createNameObj<ChooChooTrain>, "ChooChooTrain" },
|
||||
{ "SandRiverLightA", NULL, "SandRiverLightA" },
|
||||
@ -661,7 +661,7 @@ namespace {
|
||||
{ "StarDustStepB", NULL, "StarDustStepB" },
|
||||
{ "TreasureSpot", NULL, "TreasureSpot" },
|
||||
{ "CoinFlower", NULL, "CoinFlower" },
|
||||
{ "StarDustRollingStepA", NULL, "StarDustRollingStepA" },
|
||||
{ "StarDustRollingStepA", createNameObj<RotateMoveObj>, "StarDustRollingStepA" },
|
||||
{ "AsteroidMoveA", NULL, "AsteroidMoveA" },
|
||||
{ "StarPieceCluster", NULL, "StarPieceCluster" },
|
||||
{ "SpaceSeparatorA", NULL, "SpaceSeparatorA" },
|
||||
@ -671,9 +671,9 @@ namespace {
|
||||
{ "RGTowerPressGroundA", NULL, "RGTowerPressGroundA" },
|
||||
{ "WeatherVane", NULL, "WeatherVane" },
|
||||
{ "RainCloud", NULL, "RainCloud" },
|
||||
{ "PowerStarKeeperA", NULL, "PowerStarKeeperA" },
|
||||
{ "PowerStarKeeperB", NULL, "PowerStarKeeperB" },
|
||||
{ "PowerStarKeeperC", NULL, "PowerStarKeeperC" },
|
||||
{ "PowerStarKeeperA", createNameObj<RotateMoveObj>, "PowerStarKeeperA" },
|
||||
{ "PowerStarKeeperB", createNameObj<RotateMoveObj>, "PowerStarKeeperB" },
|
||||
{ "PowerStarKeeperC", createNameObj<RotateMoveObj>, "PowerStarKeeperC" },
|
||||
{ "ForestPoihanaFenceA", NULL, "ForestPoihanaFenceA" },
|
||||
{ "ForestPoihanaFenceB", NULL, "ForestPoihanaFenceB" },
|
||||
{ "TeresaMansionBridgeA", NULL, "TeresaMansionBridgeA" },
|
||||
@ -682,7 +682,7 @@ namespace {
|
||||
{ "TeresaMansionDoorA", NULL, "TeresaMansionDoorA" },
|
||||
{ "TeresaMansionDoorB", NULL, "TeresaMansionDoorB" },
|
||||
{ "TeresaMansionEntranceDoor", NULL, "TeresaMansionEntranceDoor" },
|
||||
{ "WaterBazookaTowerMoveStepA", NULL, "WaterBazookaTowerMoveStepA" },
|
||||
{ "WaterBazookaTowerMoveStepA", createNameObj<RotateMoveObj>, "WaterBazookaTowerMoveStepA" },
|
||||
{ "WaterBazookaTowerMoveStepB", NULL, "WaterBazookaTowerMoveStepB" },
|
||||
{ "WaterBazookaTowerMoveStepC", NULL, "WaterBazookaTowerMoveStepC" },
|
||||
{ "QuestionBoxMoveStepA", NULL, "QuestionBoxMoveStepA" },
|
||||
@ -695,7 +695,7 @@ namespace {
|
||||
{ "ReverseGravityRoomPressGroundC", NULL, "ReverseGravityRoomPressGroundC" },
|
||||
{ "ReverseGravityRoomPressGroundD", NULL, "ReverseGravityRoomPressGroundD" },
|
||||
{ "ReverseGravityRoomPressGroundE", NULL, "ReverseGravityRoomPressGroundE" },
|
||||
{ "RollingOvalPlanetParts", NULL, "RollingOvalPlanetParts" },
|
||||
{ "RollingOvalPlanetParts", createNameObj<RotateMoveObj>, "RollingOvalPlanetParts" },
|
||||
{ "TeresaMansionLightA", NULL, "TeresaMansionLightA" },
|
||||
{ "TeresaMansionLightB", NULL, "TeresaMansionLightB" },
|
||||
{ "TeresaMansionCandlestand", NULL, "TeresaMansionCandlestand" },
|
||||
@ -704,14 +704,14 @@ namespace {
|
||||
{ "TeresaPicture", NULL, "TeresaPicture" },
|
||||
{ "KinokoOneUpPicture", NULL, "KinokoOneUpPicture" },
|
||||
{ "FireBar", createNameObj<FireBar>, "FireBarCore" },
|
||||
{ "BattleShipMovePartsA", NULL, "BattleShipMovePartsA" },
|
||||
{ "BattleShipMovePartsB", NULL, "BattleShipMovePartsB" },
|
||||
{ "BattleShipMovePartsA", createNameObj<RotateMoveObj>, "BattleShipMovePartsA" },
|
||||
{ "BattleShipMovePartsB", createNameObj<RotateMoveObj>, "BattleShipMovePartsB" },
|
||||
{ "BattleShipElevator", NULL, "BattleShipElevator" },
|
||||
{ "BattleShipElevatorCover", NULL, "BattleShipElevatorCover" },
|
||||
{ "TeresaRaceSpaceStickA", NULL, "TeresaRaceSpaceStickA" },
|
||||
{ "TeresaRaceSpaceStickB", NULL, "TeresaRaceSpaceStickB" },
|
||||
{ "TeresaRaceSpaceStickC", NULL, "TeresaRaceSpaceStickC" },
|
||||
{ "TeresaRacePartsA", NULL, "TeresaRacePartsA" },
|
||||
{ "TeresaRacePartsA", createNameObj<RotateMoveObj>, "TeresaRacePartsA" },
|
||||
{ "TeresaRacePartsB", NULL, "TeresaRacePartsB" },
|
||||
{ "NeedlePlant", NULL, "NeedlePlant" },
|
||||
{ "NeedlePlantFly", NULL, "NeedlePlantFly" },
|
||||
@ -726,16 +726,16 @@ namespace {
|
||||
{ "CocoonStepB", NULL, "CocoonStepB" },
|
||||
{ "SpaceCannonLauncher", NULL, "SpaceCannonLauncher" },
|
||||
{ "TrapBaseA", NULL, "TrapBaseA" },
|
||||
{ "SweetsDecoratePartsSpoon", NULL, "SweetsDecoratePartsSpoon" },
|
||||
{ "SweetsDecoratePartsFork", NULL, "SweetsDecoratePartsFork" },
|
||||
{ "SweetsDecoratePartsSpoon", createNameObj<RotateMoveObj>, "SweetsDecoratePartsSpoon" },
|
||||
{ "SweetsDecoratePartsFork", createNameObj<RotateMoveObj>, "SweetsDecoratePartsFork" },
|
||||
{ "SeesawMoveNutA", NULL, "SeesawMoveNutA" },
|
||||
{ "SeesawMoveNutB", NULL, "SeesawMoveNutB" },
|
||||
{ "SeesawMoveNutC", NULL, "SeesawMoveNutC" },
|
||||
{ "TwisterSan", NULL, "TwisterSan" },
|
||||
{ "TwisterSanSlim", NULL, "TwisterSanSlim" },
|
||||
{ "SunakazeKun", NULL, "SunakazeKun" },
|
||||
{ "SandStreamMoveStepsA", NULL, "SandStreamMoveStepsA" },
|
||||
{ "SandStreamMoveStepsB", NULL, "SandStreamMoveStepsB" },
|
||||
{ "SandStreamMoveStepsA", createNameObj<RotateMoveObj>, "SandStreamMoveStepsA" },
|
||||
{ "SandStreamMoveStepsB", createNameObj<RotateMoveObj>, "SandStreamMoveStepsB" },
|
||||
{ "WaterLeakPipe", NULL, "WaterLeakPipe" },
|
||||
{ "BroadBeanMoveStepA", NULL, "BroadBeanMoveStepA" },
|
||||
{ "BroadBeanMoveStepB", NULL, "BroadBeanMoveStepB" },
|
||||
@ -743,15 +743,15 @@ namespace {
|
||||
{ "TeresaRacePartsBallA", NULL, "TeresaRacePartsBallA" },
|
||||
{ "SandCapsulePressGround", NULL, "SandCapsulePressGround" },
|
||||
{ "RayGunPlanetPartsScrew", NULL, "RayGunPlanetPartsScrew" },
|
||||
{ "RayGunPlanetPartsGear", NULL, "RayGunPlanetPartsGear" },
|
||||
{ "RayGunPlanetPartsGear", createNameObj<RotateMoveObj>, "RayGunPlanetPartsGear" },
|
||||
{ "BreakDownFixStepA", NULL, "BreakDownFixStepA" },
|
||||
{ "SandStreamHighTowerMoveStepA", NULL, "SandStreamHighTowerMoveStepA" },
|
||||
{ "DriftWood", NULL, "DriftWood" },
|
||||
{ "ToyFactoryDecoratePartsGearA", NULL, "ToyFactoryDecoratePartsGearA" },
|
||||
{ "ToyFactoryDecoratePartsGearA", createNameObj<RotateMoveObj>, "ToyFactoryDecoratePartsGearA" },
|
||||
{ "MiniMechaKoopaPartsMoveStepA", NULL, "MiniMechaKoopaPartsMoveStepA" },
|
||||
{ "MiniMechaKoopaPartsGear", NULL, "MiniMechaKoopaPartsGear" },
|
||||
{ "MiniMechaKoopaPartsCage", NULL, "MiniMechaKoopaPartsCage" },
|
||||
{ "AsteroidBlockRotateStepA", NULL, "AsteroidBlockRotateStepA" },
|
||||
{ "MiniMechaKoopaPartsGear", createNameObj<RotateMoveObj>, "MiniMechaKoopaPartsGear" },
|
||||
{ "MiniMechaKoopaPartsCage", createNameObj<RotateMoveObj>, "MiniMechaKoopaPartsCage" },
|
||||
{ "AsteroidBlockRotateStepA", createNameObj<RotateMoveObj>, "AsteroidBlockRotateStepA" },
|
||||
{ "SandUpDownTowerBreakableWallA", NULL, "SandUpDownTowerBreakableWallA" },
|
||||
{ "SandUpDownTowerBreakableWallB", NULL, "SandUpDownTowerBreakableWallB" },
|
||||
{ "HoleDeathSandMoveStepA", NULL, "HoleDeathSandMoveStepA" },
|
||||
@ -784,21 +784,21 @@ namespace {
|
||||
{ "HeavenlyBeachTimerStepB", NULL, "HeavenlyBeachTimerStepB" },
|
||||
{ "ReverseKingdomTreeA", NULL, "ReverseKingdomTreeA" },
|
||||
{ "FloaterOtakingFloaterA", NULL, "FloaterOtakingFloaterA" },
|
||||
{ "WindMillPropeller", NULL, "WindMillPropeller" },
|
||||
{ "WindMillPropellerMini", NULL, "WindMillPropellerMini" },
|
||||
{ "LavaRotateStepsRotatePartsA", NULL, "LavaRotateStepsRotatePartsA" },
|
||||
{ "LavaRotateStepsRotatePartsB", NULL, "LavaRotateStepsRotatePartsB" },
|
||||
{ "LavaRotateStepsRotatePartsC", NULL, "LavaRotateStepsRotatePartsC" },
|
||||
{ "LavaRotateStepsRotatePartsD", NULL, "LavaRotateStepsRotatePartsD" },
|
||||
{ "QuickSand2DMovePartsA", NULL, "QuickSand2DMovePartsA" },
|
||||
{ "WindMillPropeller", createNameObj<RotateMoveObj>, "WindMillPropeller" },
|
||||
{ "WindMillPropellerMini", createNameObj<RotateMoveObj>, "WindMillPropellerMini" },
|
||||
{ "LavaRotateStepsRotatePartsA", createNameObj<RotateMoveObj>, "LavaRotateStepsRotatePartsA" },
|
||||
{ "LavaRotateStepsRotatePartsB", createNameObj<RotateMoveObj>, "LavaRotateStepsRotatePartsB" },
|
||||
{ "LavaRotateStepsRotatePartsC", createNameObj<RotateMoveObj>, "LavaRotateStepsRotatePartsC" },
|
||||
{ "LavaRotateStepsRotatePartsD", createNameObj<RotateMoveObj>, "LavaRotateStepsRotatePartsD" },
|
||||
{ "QuickSand2DMovePartsA", createNameObj<RotateMoveObj>, "QuickSand2DMovePartsA" },
|
||||
{ "BiriBiriBegomanSpikePistonA", NULL, "BiriBiriBegomanSpikePistonA" },
|
||||
{ "HugeBattleShipPlanetEntrance", NULL, "HugeBattleShipPlanetEntrance" },
|
||||
{ "MysteryGravityRoomBridgeA", NULL, "MysteryGravityRoomBridgeA" },
|
||||
{ "DeadLeaves", NULL, "DeadLeaves" },
|
||||
{ "PrologueDirector", NULL, "DemoLetter" },
|
||||
{ "DeathPromenadeMovePartsSpuareA", NULL, "DeathPromenadeMovePartsSpuareA" },
|
||||
{ "DeathPromenadeRotateCircleL", NULL, "DeathPromenadeRotateCircleL" },
|
||||
{ "DeathPromenadeRotateCircleS", NULL, "DeathPromenadeRotateCircleS" },
|
||||
{ "DeathPromenadeRotateCircleL", createNameObj<RotateMoveObj>, "DeathPromenadeRotateCircleL" },
|
||||
{ "DeathPromenadeRotateCircleS", createNameObj<RotateMoveObj>, "DeathPromenadeRotateCircleS" },
|
||||
{ "FlexibleSandPlanetPartsA", NULL, "FlexibleSandPlanetPartsA" },
|
||||
{ "DarkHopperRotateStepA", NULL, "DarkHopperRotateStepA" },
|
||||
{ "DarkHopperPlanetPartsA", NULL, "DarkHopperPlanetPartsA" },
|
||||
@ -817,17 +817,17 @@ namespace {
|
||||
{ "AssemblyBlockPartsIceD", NULL, "AssemblyBlockPartsIceD" },
|
||||
{ "AssemblyBlockPartsIceE", NULL, "AssemblyBlockPartsIceE" },
|
||||
{ "AssemblyBlockPartsTimerA", NULL, "AssemblyBlockPartsTimerA" },
|
||||
{ "HellBallGuidePartsA", NULL, "HellBallGuidePartsA" },
|
||||
{ "HellBallRotatePartsA", NULL, "HellBallRotatePartsA" },
|
||||
{ "HellBallRotatePartsB", NULL, "HellBallRotatePartsB" },
|
||||
{ "HellBallRotatePartsC", NULL, "HellBallRotatePartsC" },
|
||||
{ "HellBallRotatePartsD", NULL, "HellBallRotatePartsD" },
|
||||
{ "HellBallRotatePartsE", NULL, "HellBallRotatePartsE" },
|
||||
{ "HellBallRotatePartsF", NULL, "HellBallRotatePartsF" },
|
||||
{ "HellBallRotatePartsG", NULL, "HellBallRotatePartsG" },
|
||||
{ "HellBallGuidePartsA", createNameObj<RotateMoveObj>, "HellBallGuidePartsA" },
|
||||
{ "HellBallRotatePartsA", createNameObj<RotateMoveObj>, "HellBallRotatePartsA" },
|
||||
{ "HellBallRotatePartsB", createNameObj<RotateMoveObj>, "HellBallRotatePartsB" },
|
||||
{ "HellBallRotatePartsC", createNameObj<RotateMoveObj>, "HellBallRotatePartsC" },
|
||||
{ "HellBallRotatePartsD", createNameObj<RotateMoveObj>, "HellBallRotatePartsD" },
|
||||
{ "HellBallRotatePartsE", createNameObj<RotateMoveObj>, "HellBallRotatePartsE" },
|
||||
{ "HellBallRotatePartsF", createNameObj<RotateMoveObj>, "HellBallRotatePartsF" },
|
||||
{ "HellBallRotatePartsG", createNameObj<RotateMoveObj>, "HellBallRotatePartsG" },
|
||||
{ "IceSlipRoad", NULL, "IceSlipRoad" },
|
||||
{ "CandyLiftA", NULL, "CandyLiftA" },
|
||||
{ "CandyLiftB", NULL, "CandyLiftB" },
|
||||
{ "CandyLiftA", createNameObj<RotateMoveObj>, "CandyLiftA" },
|
||||
{ "CandyLiftB", createNameObj<RotateMoveObj>, "CandyLiftB" },
|
||||
{ "SurfingRaceTutorialParts", NULL, "SurfingRaceTutorialParts" },
|
||||
{ "SurfingRaceMainGate", NULL, "SurfingRaceMainGate" },
|
||||
{ "SurfingRaceSubGate", NULL, "SurfingRaceSubGate" },
|
||||
@ -838,15 +838,15 @@ namespace {
|
||||
{ "HeavensDoorHouseDoor", NULL, "HeavensDoorHouseDoor" },
|
||||
{ "HeavensDoorAppearStepAAfter", NULL, "HeavensDoorAppearStepAAfter" },
|
||||
{ "HeavensDoorAppearStepA", NULL, "HeavensDoorAppearStepA" },
|
||||
{ "HeavensDoorMiddleRotatePartsA", NULL, "HeavensDoorMiddleRotatePartsA" },
|
||||
{ "HeavensDoorMiddleRotatePartsB", NULL, "HeavensDoorMiddleRotatePartsB" },
|
||||
{ "HeavensDoorMiddleRotatePartsA", createNameObj<RotateMoveObj>, "HeavensDoorMiddleRotatePartsA" },
|
||||
{ "HeavensDoorMiddleRotatePartsB", createNameObj<RotateMoveObj>, "HeavensDoorMiddleRotatePartsB" },
|
||||
{ "HeavensDoorInsideCage", NULL, "HeavensDoorInsideCage" },
|
||||
{ "HeavensDoorInsidePlanetPartsA", NULL, "HeavensDoorInsidePlanetPartsA" },
|
||||
{ "HeavensDoorInsideRotatePartsA", NULL, "HeavensDoorInsideRotatePartsA" },
|
||||
{ "HeavensDoorInsideRotatePartsB", NULL, "HeavensDoorInsideRotatePartsB" },
|
||||
{ "HeavensDoorInsideRotatePartsC", NULL, "HeavensDoorInsideRotatePartsC" },
|
||||
{ "HeavensDoorInsideRotatePartsA", createNameObj<RotateMoveObj>, "HeavensDoorInsideRotatePartsA" },
|
||||
{ "HeavensDoorInsideRotatePartsB", createNameObj<RotateMoveObj>, "HeavensDoorInsideRotatePartsB" },
|
||||
{ "HeavensDoorInsideRotatePartsC", createNameObj<RotateMoveObj>, "HeavensDoorInsideRotatePartsC" },
|
||||
{ "MechaKoopaPartsHead", createNameObj<MechaKoopaPartsHead>, "MechaKoopaPartsHead" },
|
||||
{ "MechaKoopaPartsCollar", NULL, "MechaKoopaPartsCollar" },
|
||||
{ "MechaKoopaPartsCollar", createNameObj<RotateMoveObj>, "MechaKoopaPartsCollar" },
|
||||
{ "MechaKoopaPartsBreast", NULL, "MechaKoopaPartsBreast" },
|
||||
{ "MechaKoopaPartsArmRight", createNameObj<MechaKoopaPartsArm>, "MechaKoopaPartsArmRight" },
|
||||
{ "MechaKoopaPartsArmLeft", createNameObj<MechaKoopaPartsArm>, "MechaKoopaPartsArmLeft" },
|
||||
@ -890,22 +890,22 @@ namespace {
|
||||
{ "HoleBeltConveyerPartsD", NULL, "HoleBeltConveyerPartsD" },
|
||||
{ "HoleBeltConveyerPartsE", NULL, "HoleBeltConveyerPartsE" },
|
||||
{ "HoleBeltConveyerPartsF", NULL, "HoleBeltConveyerPartsF" },
|
||||
{ "HoleBeltConveyerPartsG", NULL, "HoleBeltConveyerPartsG" },
|
||||
{ "HoleBeltConveyerPartsG", createNameObj<RotateMoveObj>, "HoleBeltConveyerPartsG" },
|
||||
{ "HoleBeltConveyerPartsH", NULL, "HoleBeltConveyerPartsH" },
|
||||
{ "ChallengeBallAccelCylinderA", NULL, "ChallengeBallAccelCylinderA" },
|
||||
{ "ChallengeBallGearA", NULL, "ChallengeBallGearA" },
|
||||
{ "ChallengeBallAccelCylinderA", createNameObj<RotateMoveObj>, "ChallengeBallAccelCylinderA" },
|
||||
{ "ChallengeBallGearA", createNameObj<RotateMoveObj>, "ChallengeBallGearA" },
|
||||
{ "ChallengeBallMoveGroundA", NULL, "ChallengeBallMoveGroundA" },
|
||||
{ "ChallengeBallMoveGroundB", NULL, "ChallengeBallMoveGroundB" },
|
||||
{ "ChallengeBallRotateBridgeA", NULL, "ChallengeBallRotateBridgeA" },
|
||||
{ "ChallengeBallRotateBridgeA", createNameObj<RotateMoveObj>, "ChallengeBallRotateBridgeA" },
|
||||
{ "ChallengeBallVanishingRoadA", NULL, "ChallengeBallVanishingRoadA" },
|
||||
{ "TrialBubbleTimerMoveWallA", NULL, "TrialBubbleTimerMoveWallA" },
|
||||
{ "TrialBubbleRotateWallA", NULL, "TrialBubbleRotateWallA" },
|
||||
{ "TrialBubbleRevolvingPartsA", NULL, "TrialBubbleRevolvingPartsA" },
|
||||
{ "TrialBubbleRotateWallA", createNameObj<RotateMoveObj>, "TrialBubbleRotateWallA" },
|
||||
{ "TrialBubbleRevolvingPartsA", createNameObj<RotateMoveObj>, "TrialBubbleRevolvingPartsA" },
|
||||
{ "TrialBubbleMoveWallA", NULL, "TrialBubbleMoveWallA" },
|
||||
{ "CubeBubbleExHomeStep", NULL, "CubeBubbleExHomeStep" },
|
||||
{ "CubeBubbleExStartStep", NULL, "CubeBubbleExStartStep" },
|
||||
{ "CubeBubbleExRotateWallS", NULL, "CubeBubbleExRotateWallS" },
|
||||
{ "CubeBubbleExRotateWallL", NULL, "CubeBubbleExRotateWallL" },
|
||||
{ "CubeBubbleExRotateWallS", createNameObj<RotateMoveObj>, "CubeBubbleExRotateWallS" },
|
||||
{ "CubeBubbleExRotateWallL", createNameObj<RotateMoveObj>, "CubeBubbleExRotateWallL" },
|
||||
{ "CubeBubbleExPartsA", NULL, "CubeBubbleExPartsA" },
|
||||
{ "UFONormalB", NULL, "UFONormalB" },
|
||||
{ "UFONormalD", NULL, "UFONormalD" },
|
||||
@ -928,15 +928,15 @@ namespace {
|
||||
{ "KoopaJrNormalShipA", NULL, "KoopaJrNormalShipA" },
|
||||
{ "WaterRoadCaveStepA", NULL, "WaterRoadCaveStepA" },
|
||||
{ "WaterRoadCaveStepB", NULL, "WaterRoadCaveStepB" },
|
||||
{ "WaterRoadCaveRotateGround", NULL, "WaterRoadCaveRotateGround" },
|
||||
{ "WaterRoadCaveRotateGround", createNameObj<RotateMoveObj>, "WaterRoadCaveRotateGround" },
|
||||
{ "SubmarineVolcanoInside", NULL, "SubmarineVolcanoInside" },
|
||||
{ "SubmarineVolcanoBigColumn", NULL, "SubmarineVolcanoBigColumn" },
|
||||
{ "SubmarineVolcanoSmallColumn", NULL, "SubmarineVolcanoSmallColumn" },
|
||||
{ "OnimasuPlanetPartsGoal", NULL, "OnimasuPlanetPartsGoal" },
|
||||
{ "OnimasuPlanetObstaclePartsA", NULL, "OnimasuPlanetObstaclePartsA" },
|
||||
{ "OnimasuPlanetRailMovePartsA", NULL, "OnimasuPlanetRailMovePartsA" },
|
||||
{ "OnimasuPlanetRotatePartsA", NULL, "OnimasuPlanetRotatePartsA" },
|
||||
{ "OnimasuPlanetRotatePartsB", NULL, "OnimasuPlanetRotatePartsB" },
|
||||
{ "OnimasuPlanetRotatePartsA", createNameObj<RotateMoveObj>, "OnimasuPlanetRotatePartsA" },
|
||||
{ "OnimasuPlanetRotatePartsB", createNameObj<RotateMoveObj>, "OnimasuPlanetRotatePartsB" },
|
||||
{ "PhantomShipPropellerSmall", NULL, "PhantomShipPropellerSmall" },
|
||||
{ "PhantomShipPropellerBig", NULL, "PhantomShipPropellerBig" },
|
||||
{ "PhantomShipHandle", NULL, "PhantomShipHandle" },
|
||||
@ -977,10 +977,10 @@ namespace {
|
||||
{ "KoopaVS2PartsDarkMatterC", NULL, "KoopaVS2PartsDarkMatterC" },
|
||||
{ "KoopaVS2PartsDarkMatterD", NULL, "KoopaVS2PartsDarkMatterD" },
|
||||
{ "KoopaVS2PartsDarkMatterE", NULL, "KoopaVS2PartsDarkMatterE" },
|
||||
{ "KoopaVS2PartsStartMoveStepA", NULL, "KoopaVS2PartsStartMoveStepA" },
|
||||
{ "KoopaVS2PartsStartMoveStepB", NULL, "KoopaVS2PartsStartMoveStepB" },
|
||||
{ "KoopaVS2PartsStartMoveStepA", createNameObj<RotateMoveObj>, "KoopaVS2PartsStartMoveStepA" },
|
||||
{ "KoopaVS2PartsStartMoveStepB", createNameObj<RotateMoveObj>, "KoopaVS2PartsStartMoveStepB" },
|
||||
{ "KoopaVS2PartsStartMoveStepC", NULL, "KoopaVS2PartsStartMoveStepC" },
|
||||
{ "KoopaVS2PartsRollingStep", NULL, "KoopaVS2PartsRollingStep" },
|
||||
{ "KoopaVS2PartsRollingStep", createNameObj<RotateMoveObj>, "KoopaVS2PartsRollingStep" },
|
||||
{ "KoopaVS2Parts2DMoveStepBarA", NULL, "KoopaVS2Parts2DMoveStepBarA" },
|
||||
{ "KoopaVS2Parts2DMoveStepBarB", NULL, "KoopaVS2Parts2DMoveStepBarB" },
|
||||
{ "KoopaVS2Parts2DMoveStepSBarB", NULL, "KoopaVS2Parts2DMoveStepSBarB" },
|
||||
@ -996,10 +996,10 @@ namespace {
|
||||
{ "KoopaVS2PartsClipAreaDisplayA", NULL, "KoopaVS2PartsClipAreaDisplayA" },
|
||||
{ "KoopaVS2PartsStairBig", NULL, "KoopaVS2PartsStairBig" },
|
||||
{ "KoopaVS2Parts2DRailGuideA", NULL, "KoopaVS2Parts2DRailGuideA" },
|
||||
{ "KoopaVS3RotateStepA", NULL, "KoopaVS3RotateStepA" },
|
||||
{ "KoopaVS3RotateStepB", NULL, "KoopaVS3RotateStepB" },
|
||||
{ "KoopaVS3RotateStepD", NULL, "KoopaVS3RotateStepD" },
|
||||
{ "KoopaVS3RotateStepsA", NULL, "KoopaVS3RotateStepsA" },
|
||||
{ "KoopaVS3RotateStepA", createNameObj<RotateMoveObj>, "KoopaVS3RotateStepA" },
|
||||
{ "KoopaVS3RotateStepB", createNameObj<RotateMoveObj>, "KoopaVS3RotateStepB" },
|
||||
{ "KoopaVS3RotateStepD", createNameObj<RotateMoveObj>, "KoopaVS3RotateStepD" },
|
||||
{ "KoopaVS3RotateStepsA", createNameObj<RotateMoveObj>, "KoopaVS3RotateStepsA" },
|
||||
{ "KoopaVS3Parts2DWallA", NULL, "KoopaVS3Parts2DWallA" },
|
||||
{ "TreasureBoxCrackedEmpty", createNameObj<TreasureBoxCracked>, "TreasureBoxCracked" },
|
||||
{ "TreasureBoxCrackedCoin", createNameObj<TreasureBoxCracked>, "TreasureBoxCracked" },
|
||||
@ -1017,8 +1017,8 @@ namespace {
|
||||
{ "TreasureBoxKinokoLifeUp", createNameObj<TreasureBoxCracked>, "TreasureBox" },
|
||||
{ "TreasureBoxGoldEmpty", createNameObj<TreasureBoxCracked>, "TreasureBoxGold" },
|
||||
{ "OceanRingRuinsMove", NULL, "OceanRingRuinsMove" },
|
||||
{ "OceanRingRuinsGearSmall", NULL, "OceanRingRuinsGearSmall" },
|
||||
{ "OceanRingRuinsGearBig", NULL, "OceanRingRuinsGearBig" },
|
||||
{ "OceanRingRuinsGearSmall", createNameObj<RotateMoveObj>, "OceanRingRuinsGearSmall" },
|
||||
{ "OceanRingRuinsGearBig", createNameObj<RotateMoveObj>, "OceanRingRuinsGearBig" },
|
||||
{ "OceanRingRuinsColumn", NULL, "OceanRingRuinsColumn" },
|
||||
{ "OceanRingRuinsBase", NULL, "OceanRingRuinsBase" },
|
||||
{ "KameckShip", NULL, "KameckShip" },
|
||||
@ -1137,7 +1137,7 @@ namespace {
|
||||
{ "WaterPlant", NULL, "WaterPlant" },
|
||||
{ "HitWallTimerSwitch", NULL, "HitWallTimerSwitch" },
|
||||
{ "PTimerSwitch", NULL, "PTimerSwitch" },
|
||||
{ "CrystalSwitch", NULL, "CrystalSwitch" },
|
||||
{ "CrystalSwitch", createNameObj<CrystalSwitch>, "CrystalSwitch" },
|
||||
{ "HipDropSwitch", NULL, "HipDropSwitch" },
|
||||
{ "HipDropTimerSwitch", NULL, "HipDropTimerSwitch" },
|
||||
{ "DesertLandUpSwitch", NULL, "DesertLandUpSwitch" },
|
||||
@ -1147,7 +1147,7 @@ namespace {
|
||||
{ "PicketSwitch", NULL, "PicketSwitch" },
|
||||
{ "PicketSwitchBig", NULL, "PicketSwitchBig" },
|
||||
{ "ValveSwitch", NULL, "ValveSwitch" },
|
||||
{ "KeySwitch", NULL, "KeySwitch" },
|
||||
{ "KeySwitch", createNameObj<KeySwitch>, "KeySwitch" },
|
||||
{ "SpinLeverSwitch", NULL, "SpinLeverSwitch" },
|
||||
{ "EffectObjSample", NULL, 0 },
|
||||
{ "ShootingStarArea", NULL, 0 },
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "Inline.h"
|
||||
|
||||
class JKRHeap;
|
||||
|
||||
namespace MR {
|
||||
@ -62,7 +64,7 @@ namespace MR {
|
||||
};
|
||||
|
||||
template<class T>
|
||||
static FunctorV0M<T *, void (T::*)()> Functor(T* a1, void (T::*a2)()) {
|
||||
static FunctorV0M<T *, void (T::*)()> Functor(T* a1, void (T::*a2)()) NO_INLINE {
|
||||
return FunctorV0M<T *, void (T::*)()>(a1, a2);
|
||||
}
|
||||
|
||||
|
||||
110
source/Game/MapObj/RotateMoveObj.cpp
Normal file
110
source/Game/MapObj/RotateMoveObj.cpp
Normal file
@ -0,0 +1,110 @@
|
||||
#include "Game/MapObj/RotateMoveObj.h"
|
||||
#include "Game/MapObj/StageEffectDataTable.h"
|
||||
#include "Game/MapObj/MapPartsRotator.h"
|
||||
|
||||
void RotateMoveObj::init(const JMapInfoIter &rIter) {
|
||||
MapObjActor::init(rIter);
|
||||
MapObjActorInitInfo info;
|
||||
MapObjActorUtil::setupInitInfoSimpleMapObj(&info);
|
||||
info.setupRotator();
|
||||
info.setupBaseMtxFollowTarget();
|
||||
info.setupNerve(&NrvMapObjActor::HostTypeWait::sInstance);
|
||||
MapObjActorUtil::setupInitInfoColorChangeArg0(&info, rIter);
|
||||
MapObjActorUtil::setupInitInfoTextureChangeArg1(&info, rIter);
|
||||
MapObjActorUtil::setupInitInfoTypical(&info, mObjectName);
|
||||
initialize(rIter, info);
|
||||
|
||||
bool v5 = true;
|
||||
s32 condType = 0;
|
||||
MR::getMapPartsArgMoveConditionType(&condType, rIter);
|
||||
|
||||
if (!MR::isMoveStartTypeUnconditional(condType)) {
|
||||
setNerve(&NrvRotateMoveObj::HostTypeWaitForPlayerOn::sInstance);
|
||||
v5 = false;
|
||||
}
|
||||
|
||||
if (MR::isDemoCast(this, NULL)) {
|
||||
MR::FunctorV0M<RotateMoveObj *, void (RotateMoveObj::*)()> setStateFunc = MR::Functor<RotateMoveObj>(this, &RotateMoveObj::setStateMove);
|
||||
|
||||
if (MR::tryRegisterDemoActionFunctor(this, setStateFunc, NULL)) {
|
||||
v5 = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (MR::isValidSwitchB(this)) {
|
||||
v5 = false;
|
||||
}
|
||||
|
||||
if (v5) {
|
||||
startMapPartsFunctions();
|
||||
setNerve(&NrvRotateMoveObj::HostTypeMove::sInstance);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
void RotateMoveObj::initCaseUseSwitchB(const MapObjActorInitInfo &rInfo) {
|
||||
MR::FunctorV0M<RotateMoveObj *, void (RotateMoveObj::*)()> setFunc = MR::Functor<RotateMoveObj>(this, &RotateMoveObj::setStateMove);
|
||||
MR::listenStageSwitchOnOffB(this, MR::FunctorV0M<RotateMoveObj *, void (RotateMoveObj::*)(void)>(this, &RotateMoveObj::pauseMapPartsFunctions), setFunc);
|
||||
}*/
|
||||
|
||||
void RotateMoveObj::initCaseNoUseSwitchB(const MapObjActorInitInfo &rInfo) {
|
||||
|
||||
}
|
||||
|
||||
void RotateMoveObj::setStateMove() {
|
||||
if (MR::isRegisteredEffect(this, "Appear")) {
|
||||
MR::emitEffect(this, "Appear");
|
||||
}
|
||||
|
||||
startMapPartsFunctions();
|
||||
setNerve(&NrvMapObjActor::HostTypeMove::sInstance);
|
||||
}
|
||||
|
||||
void RotateMoveObj::exeMove() {
|
||||
if (MR::isFirstStep(this)) {
|
||||
MR::StageEffect::tryStageEffectStart(this, mObjectName);
|
||||
}
|
||||
|
||||
if (!MapObjActorUtil::isRotatorMoving(this)) {
|
||||
setNerve(&NrvRotateMoveObj::HostTypeStop::sInstance);
|
||||
}
|
||||
else {
|
||||
if (mRotator->_14) {
|
||||
if (MR::isEqualString(mObjectName, "OceanRingRuinsGearBig") || MR::isEqualString(mObjectName, "OceanRingRuinsGearSmall")) {
|
||||
if (mRotator->getRotateSpeed() != 0.0f) {
|
||||
MR::StageEffect::tryStageEffectMoving(this, mObjectName);
|
||||
}
|
||||
}
|
||||
else {
|
||||
MR::StageEffect::tryStageEffectMoving(this, mObjectName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void RotateMoveObj::exeStop() {
|
||||
if (MapObjActorUtil::isRotatorMoving(this)) {
|
||||
setNerve(&NrvRotateMoveObj::HostTypeMove::sInstance);
|
||||
}
|
||||
else if (MR::isFirstStep(this)) {
|
||||
MR::StageEffect::tryStageEffectStop(this, mObjectName);
|
||||
}
|
||||
}
|
||||
|
||||
void RotateMoveObj::exeWaitForPlayerOn() {
|
||||
if (MR::isOnPlayer(this)) {
|
||||
setStateMove();
|
||||
}
|
||||
}
|
||||
|
||||
namespace NrvRotateMoveObj {
|
||||
INIT_NERVE(HostTypeWaitForPlayerOn);
|
||||
INIT_NERVE(HostTypeWait);
|
||||
INIT_NERVE(HostTypeMove);
|
||||
INIT_NERVE(HostTypeStop);
|
||||
};
|
||||
|
||||
RotateMoveObj::~RotateMoveObj() {
|
||||
|
||||
}
|
||||
|
||||
37
source/Game/MapObj/SandCapsuleInsidePlanet.cpp
Normal file
37
source/Game/MapObj/SandCapsuleInsidePlanet.cpp
Normal file
@ -0,0 +1,37 @@
|
||||
#include "Game/MapObj/SandCapsuleInsidePlanet.h"
|
||||
|
||||
SandCapsuleInsidePlanet::SandCapsuleInsidePlanet(const char *pName) : MapObjActor(pName) {
|
||||
|
||||
}
|
||||
|
||||
void SandCapsuleInsidePlanet::init(const JMapInfoIter &rIter) {
|
||||
MapObjActor::init(rIter);
|
||||
MapObjActorInitInfo info;
|
||||
MapObjActorUtil::setupInitInfoPlanet(&info);
|
||||
info.setupNerve(&NrvSandCapsuleInsidePlanet::SandCapsuleInsidePlanetNrvWait::sInstance);
|
||||
initialize(rIter, info);
|
||||
MR::startBrk(this, "Off");
|
||||
MR::setBrkFrameEndAndStop(this);
|
||||
}
|
||||
|
||||
void SandCapsuleInsidePlanet::initCaseUseSwitchA(const MapObjActorInitInfo &rInfo) {
|
||||
void (SandCapsuleInsidePlanet::*offFunc)(void) = &SandCapsuleInsidePlanet::startOff;
|
||||
void (SandCapsuleInsidePlanet::*onFunc)(void) = &SandCapsuleInsidePlanet::startOn;
|
||||
MR::listenStageSwitchOnOffA(this, MR::Functor(this, onFunc), MR::Functor(this, offFunc));
|
||||
}
|
||||
|
||||
void SandCapsuleInsidePlanet::startOn() {
|
||||
MR::startBrk(this, "On");
|
||||
}
|
||||
|
||||
void SandCapsuleInsidePlanet::startOff() {
|
||||
MR::startBrk(this, "Off");
|
||||
}
|
||||
|
||||
namespace NrvSandCapsuleInsidePlanet {
|
||||
INIT_NERVE(SandCapsuleInsidePlanetNrvWait);
|
||||
};
|
||||
|
||||
SandCapsuleInsidePlanet::~SandCapsuleInsidePlanet() {
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user