Map SkeletalFishBossHead and decompile SkeletalFishBossScarFlash

csv/Boss.csv

@@ -3072,10 +3072,10 @@ receiveMsgPlayerAttack__20SkeletalFishBossHeadFUlP9HitSensorP9HitSensor,Skeletal
 attackSensor__20SkeletalFishBossHeadFP9HitSensorP9HitSensor,SkeletalFishBoss.o,Boss.a,false
 updateCollisionMtx__20SkeletalFishBossHeadFv,SkeletalFishBoss.o,Boss.a,false
 createSubModel__20SkeletalFishBossHeadFv,SkeletalFishBoss.o,Boss.a,false
-__ct__25SkeletalFishBossScarFlashFP9LiveActor,SkeletalFishBoss.o,Boss.a,false
-init__25SkeletalFishBossScarFlashFRC12JMapInfoIter,SkeletalFishBoss.o,Boss.a,false
-appear__25SkeletalFishBossScarFlashFv,SkeletalFishBoss.o,Boss.a,false
-control__25SkeletalFishBossScarFlashFv,SkeletalFishBoss.o,Boss.a,false
+__ct__25SkeletalFishBossScarFlashFP9LiveActor,SkeletalFishBoss.o,Boss.a,true
+init__25SkeletalFishBossScarFlashFRC12JMapInfoIter,SkeletalFishBoss.o,Boss.a,true
+appear__25SkeletalFishBossScarFlashFv,SkeletalFishBoss.o,Boss.a,true
+control__25SkeletalFishBossScarFlashFv,SkeletalFishBoss.o,Boss.a,true
 __sinit_\SkeletalFishBoss_cpp,SkeletalFishBoss.o,Boss.a,true
 __ct__Q230@unnamed@SkeletalFishBoss_cpp@23SkeletalFishBossNrvSwimFv,SkeletalFishBoss.o,Boss.a,true
 __ct__Q230@unnamed@SkeletalFishBoss_cpp@23SkeletalFishBossNrvOpenFv,SkeletalFishBoss.o,Boss.a,true

data/Game.json

@@ -1,6 +1,6 @@
 {
 	"schemaVersion": 1,
 	"label": "Game",
-	"message": "12.784%",
+	"message": "12.791%",
 	"color": "blue"
 }

data/json/Boss.json

@@ -1,6 +1,6 @@
 {
 	"schemaVersion": 1,
 	"label": "Boss",
-	"message": "2.109%",
+	"message": "2.194%",
 	"color": "orange"
 }

docs/PROGRESS.md

@@ -3,7 +3,7 @@
 | [Animation](https://github.com/shibbo/Petari/blob/master/docs/lib/Animation.md) | 4.860149543062863% |
 | [AreaObj](https://github.com/shibbo/Petari/blob/master/docs/lib/AreaObj.md) | 57.68352365415987% |
 | [AudioLib](https://github.com/shibbo/Petari/blob/master/docs/lib/AudioLib.md) | 0.0% |
-| [Boss](https://github.com/shibbo/Petari/blob/master/docs/lib/Boss.md) | 2.109555412237086% |
+| [Boss](https://github.com/shibbo/Petari/blob/master/docs/lib/Boss.md) | 2.1948530176628456% |
 | [Camera](https://github.com/shibbo/Petari/blob/master/docs/lib/Camera.md) | 34.12644987572494% |
 | [Demo](https://github.com/shibbo/Petari/blob/master/docs/lib/Demo.md) | 3.7442572741194486% |
 | [Effect](https://github.com/shibbo/Petari/blob/master/docs/lib/Effect.md) | 1.855215360664245% |

docs/lib/Boss.md

@@ -131,7 +131,7 @@
 | [SkeletalFishBaby.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Boss/SkeletalFishBaby.md) | 0.0% | 0 / 38 | 0.0% | :x: 
 | [SkeletalFishBabyRail.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Boss/SkeletalFishBabyRail.md) | 100.0% | 3 / 3 | 100.0% | :white_check_mark: 
 | [SkeletalFishBabyRailHolder.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Boss/SkeletalFishBabyRailHolder.md) | 100.0% | 12 / 12 | 100.0% | :white_check_mark: 
-| [SkeletalFishBoss.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Boss/SkeletalFishBoss.md) | 5.522345573583831% | 34 / 114 | 29.82456140350877% | :eight_pointed_black_star: 
+| [SkeletalFishBoss.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Boss/SkeletalFishBoss.md) | 7.856532877882152% | 38 / 114 | 33.33333333333333% | :eight_pointed_black_star: 
 | [SkeletalFishBossBattleDirector.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Boss/SkeletalFishBossBattleDirector.md) | 100.0% | 14 / 14 | 100.0% | :white_check_mark: 
 | [SkeletalFishBossFunc.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Boss/SkeletalFishBossFunc.md) | 100.0% | 2 / 2 | 100.0% | :white_check_mark: 
 | [SkeletalFishBossInfo.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Boss/SkeletalFishBossInfo.md) | 100.0% | 8 / 8 | 100.0% | :white_check_mark: 

docs/lib/Boss/SkeletalFishBoss.md

@@ -5,7 +5,7 @@
 | :white_check_mark: | Function is completed. 
 
 
-# 34 / 114 Completed -- (29.82456140350877%)
+# 38 / 114 Completed -- (33.33333333333333%)
 # SkeletalFishBoss.o
 | Symbol | Decompiled? |
 | ------------- | ------------- |
@@ -80,10 +80,10 @@
 | `attackSensor__20SkeletalFishBossHeadFP9HitSensorP9HitSensor` | :x: |
 | `updateCollisionMtx__20SkeletalFishBossHeadFv` | :x: |
 | `createSubModel__20SkeletalFishBossHeadFv` | :x: |
-| `__ct__25SkeletalFishBossScarFlashFP9LiveActor` | :x: |
-| `init__25SkeletalFishBossScarFlashFRC12JMapInfoIter` | :x: |
-| `appear__25SkeletalFishBossScarFlashFv` | :x: |
-| `control__25SkeletalFishBossScarFlashFv` | :x: |
+| `__ct__25SkeletalFishBossScarFlashFP9LiveActor` | :white_check_mark: |
+| `init__25SkeletalFishBossScarFlashFRC12JMapInfoIter` | :white_check_mark: |
+| `appear__25SkeletalFishBossScarFlashFv` | :white_check_mark: |
+| `control__25SkeletalFishBossScarFlashFv` | :white_check_mark: |
 | `__sinit_\SkeletalFishBoss_cpp` | :white_check_mark: |
 | `__ct__Q230@unnamed@SkeletalFishBoss_cpp@23SkeletalFishBossNrvSwimFv` | :white_check_mark: |
 | `__ct__Q230@unnamed@SkeletalFishBoss_cpp@23SkeletalFishBossNrvOpenFv` | :white_check_mark: |

include/Game/Boss/SkeletalFishBoss.hpp

@@ -133,6 +133,15 @@ public:
     
     void updateCollisionMtx();
     void createSubModel();
+
+    TMtx34f _9C;
+    CollisionParts* _CC;
+    TMtx34f _D0;
+    CollisionParts* _100;
+    ModelObj** _104;
+    u32 _108;
+    ModelObj** _10C;
+    u8 _114;
 };
 
 namespace {

source/Game/Boss/SkeletalFishBoss.cpp

@@ -1,5 +1,26 @@
 #include "Game/Boss/SkeletalFishBoss.hpp"
 
+SkeletalFishBossScarFlash::SkeletalFishBossScarFlash(LiveActor *pActor) : PartsModel(pActor, "スカルシャーク傷跡エフェクトモデル", "SkeletalFishBossScarFlash", nullptr, 0x12, false) {
+    initFixedPosition("Head");
+}
+
+void SkeletalFishBossScarFlash::init(const JMapInfoIter &rIter) {
+    PartsModel::init(rIter);
+    makeActorDead();
+}
+
+void SkeletalFishBossScarFlash::appear() {
+    LiveActor::appear();
+    MR::startBck(this, "Damage", nullptr);
+    MR::startBrk(this, "Damage");
+}
+
+void SkeletalFishBossScarFlash::control() {
+    if (MR::isBckStopped(this)) {
+        kill();
+    }
+}
+
 namespace {
     INIT_NERVE(SkeletalFishBossNrvSwim);
     INIT_NERVE(SkeletalFishBossNrvOpen);