Merge 536fec01d7 into 362f2012d0

include/actor_types.h

@@ -61,9 +61,9 @@ enum ActorType {
     ACTOR_MARIO_SIGN,
     ACTOR_UNKNOWN_0x18,
     ACTOR_PALM_TREE,
-    ACTOR_UNKNOWN_0x1A,
+    ACTOR_TREE_LUIGI_RACEWAY,
     ACTOR_UNKNOWN_0x1B,
-    ACTOR_TREE_BOWSERS_CASTLE,
+    ACTOR_TREE_PEACH_CASTLE,
     ACTOR_TREE_FRAPPE_SNOWLAND,
     ACTOR_CACTUS1_KALAMARI_DESERT,
     ACTOR_CACTUS2_KALAMARI_DESERT,

src/actors/trees/render.inc.c

@@ -144,8 +144,7 @@ void render_actor_tree_moo_moo_farm(Camera* camera, Mat4 arg1, struct Actor* arg
     }
 }
 
-// have all the properties of the tree
-void func_80299864(Camera* camera, Mat4 arg1, struct Actor* arg2) {
+void render_actor_tree_luigi_raceway(Camera* camera, Mat4 arg1, struct Actor* arg2) {
     f32 temp_f0;
     s16 temp_v0 = arg2->flags;
 
@@ -178,13 +177,13 @@ void func_80299864(Camera* camera, Mat4 arg1, struct Actor* arg2) {
 }
 
 /**
- * @brief Renders the tree actor in Bowser's Castle.
+ * @brief Renders Peach's Castle trees in Royal Raceway.
  *
  * @param camera
  * @param arg1
  * @param arg2
  */
-void render_actor_tree_bowser_castle(Camera* camera, Mat4 arg1, struct Actor* arg2) {
+void render_actor_tree_peach_castle(Camera* camera, Mat4 arg1, struct Actor* arg2) {
     f32 temp_f0;
     s16 temp_v0 = arg2->flags;
 

src/code_800029B0.c

@@ -210,7 +210,7 @@ void setup_race(void) {
     D_80152308 = 0;
     gDemoTimer = -1;
     D_802BA048 = 0;
-    func_802A74BC();
+    set_screen();
     set_perspective_and_aspect_ratio();
     func_80091FA4();
     init_actors_and_load_textures();

src/ending/code_80280000.c

@@ -131,7 +131,7 @@ void load_credits(void) {
     D_800DC5B4 = 1;
     creditsRenderMode = 1;
     set_perspective_and_aspect_ratio();
-    func_802A74BC();
+    set_screen();
     camera->unk_B4 = 60.0f;
     gCameraZoom[0] = 60.0f;
     D_800DC5EC->screenWidth = SCREEN_WIDTH;

src/ending/code_80281780.c

@@ -94,7 +94,7 @@ void load_ceremony_cutscene(void) {
     gGotoMenu = 0xFFFF;
     D_80287554 = 0;
     set_perspective_and_aspect_ratio();
-    func_802A74BC();
+    set_screen();
     camera->unk_B4 = 60.0f;
     gCameraZoom[0] = 60.0f;
     D_800DC5EC->screenWidth = SCREEN_WIDTH;

src/racing/actors.c

@@ -204,7 +204,7 @@ void actor_init(struct Actor* actor, Vec3f startingPos, Vec3s startingRot, Vec3f
             actor->boundingBoxSize = 3.0f;
             actor->unk_08 = 17.0f;
             break;
-        case 26:
+        case ACTOR_TREE_LUIGI_RACEWAY:
             actor->flags |= 0x4000;
             actor->state = 0x0043;
             actor->boundingBoxSize = 3.0f;
@@ -2185,8 +2185,8 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor
         case ACTOR_TREE_ROYAL_RACEWAY:
         case ACTOR_TREE_MOO_MOO_FARM:
         case ACTOR_PALM_TREE:
-        case 26:
-        case ACTOR_TREE_BOWSERS_CASTLE:
+        case ACTOR_TREE_LUIGI_RACEWAY:
+        case ACTOR_TREE_PEACH_CASTLE:
         case ACTOR_TREE_FRAPPE_SNOWLAND:
         case ACTOR_CACTUS1_KALAMARI_DESERT:
         case ACTOR_CACTUS2_KALAMARI_DESERT:
@@ -2501,11 +2501,11 @@ void render_course_actors(struct UnkStruct_800DC5EC* arg0) {
             case ACTOR_TREE_MOO_MOO_FARM:
                 render_actor_tree_moo_moo_farm(camera, D_801502C0, actor);
                 break;
-            case ACTOR_UNKNOWN_0x1A:
-                func_80299864(camera, D_801502C0, actor);
+            case ACTOR_TREE_LUIGI_RACEWAY:
+                render_actor_tree_luigi_raceway(camera, D_801502C0, actor);
                 break;
-            case ACTOR_TREE_BOWSERS_CASTLE:
-                render_actor_tree_bowser_castle(camera, D_801502C0, actor);
+            case ACTOR_TREE_PEACH_CASTLE:
+                render_actor_tree_peach_castle(camera, D_801502C0, actor);
                 break;
             case ACTOR_BUSH_BOWSERS_CASTLE:
                 render_actor_bush_bowser_castle(camera, D_801502C0, actor);
@@ -2676,9 +2676,9 @@ void update_course_actors(void) {
             case ACTOR_TREE_ROYAL_RACEWAY:
             case ACTOR_TREE_MOO_MOO_FARM:
             case ACTOR_PALM_TREE:
-            case ACTOR_UNKNOWN_0x1A: // A plant?
+            case ACTOR_TREE_LUIGI_RACEWAY: // A plant?
             case ACTOR_UNKNOWN_0x1B:
-            case ACTOR_TREE_BOWSERS_CASTLE:
+            case ACTOR_TREE_PEACH_CASTLE:
             case ACTOR_TREE_FRAPPE_SNOWLAND:
             case ACTOR_CACTUS1_KALAMARI_DESERT:
             case ACTOR_CACTUS2_KALAMARI_DESERT:

src/racing/actors.h

@@ -41,8 +41,8 @@ void render_actor_tree_mario_raceway(Camera*, Mat4, struct Actor*);
 void render_actor_tree_yoshi_valley(Camera*, Mat4, struct Actor*);
 void render_actor_tree_royal_raceway(Camera*, Mat4, struct Actor*);
 void render_actor_tree_moo_moo_farm(Camera*, Mat4, struct Actor*);
-void func_80299864(Camera*, Mat4, struct Actor*);
-void render_actor_tree_bowser_castle(Camera*, Mat4, struct Actor*);
+void render_actor_tree_luigi_raceway(Camera*, Mat4, struct Actor*);
+void render_actor_tree_peach_castle(Camera*, Mat4, struct Actor*);
 void render_actor_bush_bowser_castle(Camera*, Mat4, struct Actor*);
 void render_actor_tree_frappe_snowland(Camera*, Mat4, struct Actor*);
 void render_actor_tree_cactus1_kalimari_desert(Camera*, Mat4, struct Actor*);

src/racing/skybox_and_splitscreen.c

@@ -1372,7 +1372,7 @@ void render_player_four_3p_4p_screen(void) {
     D_8015F788 += 1;
 }
 
-void func_802A74BC(void) {
+void set_screen(void) {
     struct UnkStruct_800DC5EC* wrapper = &D_8015F480[0];
     Player* player = &gPlayers[0];
     Camera* camera = &cameras[0];

src/racing/skybox_and_splitscreen.h

@@ -50,7 +50,7 @@ void render_player_one_3p_4p_screen(void);
 void render_player_two_3p_4p_screen(void);
 void render_player_three_3p_4p_screen(void);
 void render_player_four_3p_4p_screen(void);
-void func_802A74BC(void);
+void set_screen(void);
 void copy_framebuffer(s32, s32, s32, s32, u16*, u16*);
 void func_802A7728(void);
 void func_802A7940(void);