From 54236cacb58125f54af87734d0c72355d86a0c5c Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 10 Jan 2022 06:24:41 +0200
Subject: [PATCH] Review fixes

---
 assets/assets.json            |  5 -----
 data/const/enemy/bombarossa.s | 11 -----------
 linker.ld                     |  2 +-
 src/enemy/bombarossa.c        | 37 +++++++++++++++++++++++------------
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/assets/assets.json b/assets/assets.json
index b670564e..a9d77ce1 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -25924,11 +25924,6 @@
     "size": 12,
     "type": "animation"
   },
-  {
-    "path": "bombarossa/gUnk_080CEB50.bin",
-    "start": 846672,
-    "size": 16
-  },
   {
     "path": "animations/gSpriteAnimations_Wisp_0.bin",
     "start": 846764,
diff --git a/data/const/enemy/bombarossa.s b/data/const/enemy/bombarossa.s
index 89a0c511..d721bc55 100644
--- a/data/const/enemy/bombarossa.s
+++ b/data/const/enemy/bombarossa.s
@@ -3,14 +3,3 @@
 
 	.section .rodata
     .align 2
-
-gUnk_080CEB38:: @ 080CEB38
-	.4byte sub_080333D4
-	.4byte sub_08033448
-	.4byte sub_08001324
-	.4byte sub_0804A7D4
-	.4byte sub_08001242
-	.4byte nullsub_158
-
-gUnk_080CEB50:: @ 080CEB50
-	.incbin "bombarossa/gUnk_080CEB50.bin"
diff --git a/linker.ld b/linker.ld
index 384db74f..66cf3f32 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1031,7 +1031,7 @@ SECTIONS {
         data/animations/enemy/crow.o(.rodata);
         data/const/enemy/mulldozer.o(.rodata);
         data/animations/enemy/mulldozer.o(.rodata);
-        data/const/enemy/bombarossa.o(.rodata);
+        src/enemy/bombarossa.o(.rodata);
         data/animations/enemy/bombarossa.o(.rodata);
         data/const/enemy/wisp.o(.rodata);
         data/animations/enemy/wisp.o(.rodata);
diff --git a/src/enemy/bombarossa.c b/src/enemy/bombarossa.c
index 948ea5a4..cfcbe832 100644
--- a/src/enemy/bombarossa.c
+++ b/src/enemy/bombarossa.c
@@ -9,20 +9,20 @@ typedef struct {
     Entity base;
     u8 filler[0xe];
     u16 unk_0x76;
-} BombarossEntity;
+} BombarossaEntity;
 
-extern void (*const gUnk_080CEB38[])(Entity*);
-extern s8 gUnk_080CEB50[];
+void (*const gUnk_080CEB38[])(Entity*);
+const s8 gUnk_080CEB50[];
 
 extern void sub_080A2CC0(Entity*, void*, void*);
 
-void sub_0803350C(BombarossEntity* this);
+void sub_0803350C(BombarossaEntity* this);
 
 void Bombarossa(Entity* this) {
     gUnk_080CEB38[GetNextFunction(this)](this);
 }
 
-void sub_080333D4(BombarossEntity* this) {
+void sub_080333D4(BombarossaEntity* this) {
     if (super->action == 0) {
         super->action = 1;
         super->actionDelay = Random() & 0xf;
@@ -41,31 +41,30 @@ void sub_080333D4(BombarossEntity* this) {
     }
 }
 
-void sub_08033448(BombarossEntity* this) {
+void sub_08033448(BombarossaEntity* this) {
+    Entity* ent;
     switch (super->bitfield & 0x7f) {
-        default: {
-            Entity* ent = CreateObject(OBJECT_20, 0, 0);
+        default:
+            ent = CreateObject(OBJECT_20, 0, 0);
             if (ent) {
                 CopyPosition(super, ent);
             }
             DeleteThisEntity();
-        }
         case 1:
         case 15:
         case 19:
         case 27:
         case 29:
-        case 30: {
+        case 30:
             sub_0804AA30(super, gUnk_080CEB38);
             break;
-        }
     }
 }
 
 void nullsub_158() {
 }
 
-void sub_0803350C(BombarossEntity* this) {
+void sub_0803350C(BombarossaEntity* this) {
     if ((super->direction & 0x80) == 0) {
         LinearMoveUpdate(super);
     }
@@ -74,3 +73,17 @@ void sub_0803350C(BombarossEntity* this) {
         sub_080A2CC0(super, &super->child, &this->unk_0x76);
     }
 }
+
+void (*const gUnk_080CEB38[])(Entity*) = {
+	(EntityActionPtr) sub_080333D4,
+	(EntityActionPtr) sub_08033448,
+	sub_08001324,
+	sub_0804A7D4,
+	sub_08001242,
+	nullsub_158,
+};
+
+const s8 gUnk_080CEB50[] = {
+    0, -1, -2, -3, -4, -3, -2, -1,
+    -18, -19, -20, -21, -22, -21, -20, -19,
+};
\ No newline at end of file