96flashbacks · somepersononthenet · May 17, 2026 · May 17, 2026 · May 25, 2026 · May 26, 2026
diff --git a/actors/common1.c b/actors/common1.c
@@ -31,6 +31,11 @@ UNUSED static const u64 binid_7 = 7;
 #include "blue_fish/anims/table.inc.c"
 UNUSED static const u64 binid_8 = 8;
 
+#include "bub/model.inc.c"
+#include "bub/anims/data.inc.c"
+#include "bub/anims/table.inc.c"
+UNUSED static const u64 binid_9 = 9;
+
 #include "leaves/model.inc.c"
 UNUSED static const u64 binid_10 = 10;
 

diff --git a/actors/common1.h b/actors/common1.h
@@ -4,6 +4,22 @@
 #include "types.h"
 #include "headers.h"
 
+// bub
+extern const GeoLayout bub_geo[];
+extern const Gfx bub_seg6_dl_06011848[];
+extern const Gfx bub_seg6_dl_060118C0[];
+extern const Gfx bub_seg6_dl_06011918[];
+extern const Gfx bub_seg6_dl_06011968[];
+extern const Gfx bub_seg6_dl_06011A50[];
+extern const Gfx bub_seg6_dl_06011B28[];
+extern const Gfx bub_seg6_dl_06011C58[];
+extern const Gfx bub_seg6_dl_06011CF0[];
+extern const Gfx bub_seg6_dl_06011DC0[];
+extern const Gfx bub_seg6_dl_06011E48[];
+extern const Gfx bub_seg6_dl_06011F18[];
+extern const Gfx bub_seg6_dl_06011FA0[];
+extern const struct Animation *const bub_seg6_anims_06012354[];
+
 // blue_fish
 extern const GeoLayout fish_shadow_geo[];
 extern const GeoLayout fish_geo[];

diff --git a/actors/common1_geo.c b/actors/common1_geo.c
@@ -13,6 +13,7 @@
 #include "warp_pipe/geo.inc.c"
 #include "door/door.hms"
 #include "flame/geo.inc.c"
+#include "bub/geo.inc.c"
 #include "blue_fish/geo.inc.c"
 #include "leaves/geo.inc.c"
 #include "number/geo.inc.c"

diff --git a/actors/group13.c b/actors/group13.c
@@ -15,11 +15,6 @@ UNUSED static const u64 binid_0 = 0;
 #include "cyan_fish/anims/table.inc.c"
 UNUSED static const u64 binid_1 = 1;
 
-#include "bub/model.inc.c"
-#include "bub/anims/data.inc.c"
-#include "bub/anims/table.inc.c"
-UNUSED static const u64 binid_2 = 2;
-
 #include "water_ring/model.inc.c"
 #include "water_ring/anims/data.inc.c"
 #include "water_ring/anims/table.inc.c"

diff --git a/actors/group13.h b/actors/group13.h
@@ -4,22 +4,6 @@
 #include "types.h"
 #include "headers.h"
 
-// bub
-extern const GeoLayout bub_geo[];
-extern const Gfx bub_seg6_dl_06011848[];
-extern const Gfx bub_seg6_dl_060118C0[];
-extern const Gfx bub_seg6_dl_06011918[];
-extern const Gfx bub_seg6_dl_06011968[];
-extern const Gfx bub_seg6_dl_06011A50[];
-extern const Gfx bub_seg6_dl_06011B28[];
-extern const Gfx bub_seg6_dl_06011C58[];
-extern const Gfx bub_seg6_dl_06011CF0[];
-extern const Gfx bub_seg6_dl_06011DC0[];
-extern const Gfx bub_seg6_dl_06011E48[];
-extern const Gfx bub_seg6_dl_06011F18[];
-extern const Gfx bub_seg6_dl_06011FA0[];
-extern const struct Animation *const bub_seg6_anims_06012354[];
-
 // cyan_fish
 extern const GeoLayout cyan_fish_geo[];
 extern const Gfx cyan_fish_seg6_dl_0600DD20[];

diff --git a/actors/group13_geo.c b/actors/group13_geo.c
@@ -10,6 +10,5 @@
 
 #include "water_mine/geo.inc.c"
 #include "cyan_fish/geo.inc.c"
-#include "bub/geo.inc.c"
 #include "water_ring/geo.inc.c"
 #include "treasure_chest/geo.inc.c"
diff --git a/actors/impact_smoke/geo.inc.c b/actors/impact_smoke/geo.inc.c
@@ -1,12 +1,14 @@
 // 0x0D000BB8 / 0BFC
 const GeoLayout bowser_impact_smoke_geo[] = {
-    GEO_SWITCH_CASE(5, geo_switch_anim_state),
+    GEO_NODE_START(),
     GEO_OPEN_NODE(),
+    GEO_SWITCH_CASE(5, geo_switch_anim_state)
             GEO_DISPLAY_LIST(LAYER_TRANSPARENT, impact_smoke_seg6_dl_06062B38),
             GEO_DISPLAY_LIST(LAYER_TRANSPARENT, impact_smoke_seg6_dl_06062BD8),
             GEO_DISPLAY_LIST(LAYER_TRANSPARENT, impact_smoke_seg6_dl_06062C78),
             GEO_DISPLAY_LIST(LAYER_TRANSPARENT, impact_smoke_seg6_dl_06062D18),
             GEO_DISPLAY_LIST(LAYER_TRANSPARENT, impact_smoke_seg6_dl_06062BD8),
+        GEO_CLOSE_NODE(),
     GEO_CLOSE_NODE(),
     GEO_END(),
 };
diff --git a/actors/walk_smoke/walk_smoke_1.ia16.png b/actors/walk_smoke/walk_smoke_1.ia16.png
diff --git a/actors/whomp/wallman.sou b/actors/whomp/wallman.sou
@@ -2,7 +2,7 @@
 /*	shape data wallman_base_data (skeleton & animation) */
 /**************************************************************/
 
-#define SCALE 0.25
+#define SCALE 0.24
 #define ShapeColor_wallman(R,G,B) {{R*SCALE ,G*SCALE ,B*SCALE ,0 ,R*SCALE ,G*SCALE ,B*SCALE ,0 },{ R, G, B, 0, R, G, B, 0, LIGHT_X, LIGHT_Y, LIGHT_Z, 0} }
 
 

diff --git a/assets/anims/anim_0D.inc.c b/assets/anims/anim_0D.inc.c
diff --git a/include/config.h b/include/config.h
@@ -20,7 +20,7 @@
 #define BORDER_HEIGHT 2
 
 // POW Build
-#define POWBUILD
+//#define POWBUILD
 
 // Debug Build
 #define DEBUG

diff --git a/include/model_ids.h b/include/model_ids.h
@@ -388,7 +388,6 @@
 #define MODEL_BOWSER_NO_SHADOW            0x69        // bowser_geo_no_shadow
 
 // group 13
-#define MODEL_BUB                         0x64        // cheep_cheep_geo
 #define MODEL_TREASURE_CHEST_BASE         0x65        // treasure_chest_base_geo
 #define MODEL_TREASURE_CHEST_LID          0x66        // treasure_chest_lid_geo
 #define MODEL_CYAN_FISH                   0x67        // cyan_fish_geo
@@ -400,6 +399,7 @@
 #define MODEL_WHOMP                       0x67        // whomp_geo
 #define MODEL_KOOPA_WITH_SHELL            0x68        // koopa_with_shell_geo
 #define MODEL_METALLIC_BALL               0x65        // metallic_ball_geo
+#define MODEL_BUB                         0x69        // cheep_cheep_geo
 #define MODEL_CHAIN_CHOMP                 0x66        // chain_chomp
 #define MODEL_KOOPA_FLAG                  0x6A        // koopa_flag_geo
 #define MODEL_WOODEN_POST                 0x6B        // wooden_post_geo

diff --git a/include/types.h b/include/types.h
@@ -312,7 +312,6 @@ struct MarioState {
     /*0xC4*/ f32 gettingBlownGravity;
              u8 pretipTimer;
              u8 sleepTimer;
-             u8 isPushing;
 };
 
 #endif // TYPES_H
diff --git a/levels/castle_grounds/1.rgba16.png b/levels/castle_grounds/1.rgba16.png
diff --git a/levels/castle_grounds/2.rgba16.png b/levels/castle_grounds/2.rgba16.png
diff --git a/levels/castle_grounds/5.rgba16.png b/levels/castle_grounds/5.rgba16.png
diff --git a/levels/castle_grounds/7.rgba16.png b/levels/castle_grounds/7.rgba16.png
diff --git a/levels/castle_grounds/8.rgba16.png b/levels/castle_grounds/8.rgba16.png
diff --git a/levels/castle_grounds/9.rgba16.png b/levels/castle_grounds/9.rgba16.png