Renaming LMonkey

src/core2/code_509D0.c

@@ -6,7 +6,7 @@ extern void func_8028F7D4(f32, f32);
 void chLevelCollectible_update(Actor *this);
 extern void func_80329904(ActorMarker *, s32, f32*);
 extern ActorMarker *func_8028E86C(void);
-extern void func_803252D0(f32, s32);
+extern void timed_mapSpecificFlags_setTrue(f32, s32);
 extern void func_8035646C(s32);
 
 ActorAnimationInfo D_80367B50[] = {
@@ -107,8 +107,10 @@ void __chLevelCollectible_collide(ActorMarker *marker, ActorMarker *other_marker
         sp18[2] = this->position[2];
         switch (marker->id) {
             case MARKER_36_ORANGE_COLLECTIBLE:
-                if (mapSpecificFlags_get(1))
+                if (mapSpecificFlags_get(MM_SPECIFIC_FLAG_1_ORANGE_HAS_BEEN_COLLECTED)) {
                     return;
+                }
+
                 func_8035646C(FILEPROG_8_ORANGE_TEXT);
                 func_8030E6D4(SFX_B3_ORANGE_TALKING);
                 dialog_id = 0;
@@ -234,7 +236,7 @@ void __chLevelCollectible_returnObj(Actor *this) {
             case MARKER_37_GOLD_BULLION:
                 break;
             case MARKER_36_ORANGE_COLLECTIBLE:
-                func_803252D0(1.7f, 2);
+                timed_mapSpecificFlags_setTrue(1.7f, MM_SPECIFIC_FLAG_2_ORANGE_HAS_BEEN_RETURNED);
                 func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
                 break;
             case MARKER_1FD_BLUE_PRESENT_COLLECTIBLE:
@@ -363,7 +365,7 @@ void chLevelCollectible_update(Actor *this){
             func_802D83EC(this);
             break;
         case MARKER_36_ORANGE_COLLECTIBLE: //L802D86DC
-            if(mapSpecificFlags_get(3) && map_get() == MAP_2_MM_MUMBOS_MOUNTAIN){
+            if (mapSpecificFlags_get(MM_SPECIFIC_FLAG_3_CHIMPY_HAS_LEAVED) && map_get() == MAP_2_MM_MUMBOS_MOUNTAIN) {
                 marker_despawn(this->marker);
             }
             break;

src/core2/code_6B30.c

@@ -89,7 +89,7 @@ enum hitbox_e hitbox_getHitboxForActor(ActorMarker *arg0){
 }
 
 // break ?? //
-bool func_8028DD60(enum actor_e actor_id, Actor **arg1){
+bool player_setCarryObjectPose(enum actor_e actor_id, Actor **arg1){
     ActorMarker *m1;
     ActorMarker *m2;
     Actor *actor;

src/core2/code_7060.c

@@ -660,9 +660,9 @@ bool func_8028F2FC(void){
 }
 
 //sets carry actor if player is within a horizantal radius around a point
-bool func_8028F31C(f32 position[3], f32 radius, enum actor_e actor_id, Actor **arg3){
-    if(player_isInHorizontalRadius(position, radius)){
-        return func_8028DD60(actor_id, arg3);
+bool player_setCarryObjectPoseInHorizontalRadius(f32 position[3], f32 radius, enum actor_e actor_id, Actor **arg3){
+    if (player_isInHorizontalRadius(position, radius)) {
+        return player_setCarryObjectPose(actor_id, arg3);
     }
     return FALSE;
 }
@@ -670,7 +670,7 @@ bool func_8028F31C(f32 position[3], f32 radius, enum actor_e actor_id, Actor **a
 //sets carry actor if player is within a cylinder around a point
 bool func_8028F364(f32 position[3], f32 radius, f32 vert_range, enum actor_e actor_id, Actor **arg4) {
     if (player_isInVerticalRange(position, vert_range)) {
-        return func_8028F31C(position, radius, actor_id, arg4);
+        return player_setCarryObjectPoseInHorizontalRadius(position, radius, actor_id, arg4);
     }
     return FALSE;
 }
@@ -933,9 +933,11 @@ bool func_8028FBD4(f32 arg0[3]) {
     return bs_checkInterrupt(BS_INTR_8) == 2;
 }
 
-bool func_8028FC34(void){
-    if (func_8028E86C() && bscarry_inSet(bs_getState()))
+bool player_throwCarriedObject(void){
+    if (func_8028E86C() && bscarry_inSet(bs_getState())) {
         return bs_checkInterrupt(BS_INTR_16_THROW_CARRIED_OBJ) == 2;
+    }
+
     return FALSE;
 }
 

src/core2/code_9E370.c

@@ -1318,15 +1318,15 @@ void subaddie_set_state_with_direction(Actor * this, s32 myAnimId, f32 arg2, s32
         func_803289EC(this, arg2, direction);
 }
 
-int subaddie_maybe_set_state_position_direction(Actor * this, s32 myAnimId, f32 start_position, s32 direction, f32 probability){
-    if(randf() < probability){
-        if(__subaddie_set_state(this, myAnimId) && this->animctrl){
+bool subaddie_maybe_set_state_position_direction(Actor *this, s32 myAnimId, f32 start_position, s32 direction, f32 probability) {
+    if (randf() < probability) {
+        if (__subaddie_set_state(this, myAnimId) && this->animctrl) {
             func_803285E8(this, start_position, direction);
             animctrl_start(this->animctrl, "subaddie.c", 0x705);
         }
-        return 1;
+        return TRUE;
     }
-    return 0;
+    return FALSE;
 }
 
 void subaddie_set_ideal_yaw(Actor * this, int arg1){

src/core2/timedfuncqueue.c

@@ -135,17 +135,20 @@ void func_80324AEC(DelayedTextCallback *arg0) {
 }
 
 void func_80324BA0(s32 arg0){
-    if(arg0 == 1)
+    if (arg0 == 1) {
         func_8028F918(1);
-    else if(arg0 == 2)
+    }
+    else if (arg0 == 2) {
         func_8028F918(3);
-    else if(arg0 == 3)
+    }
+    else if (arg0 == 3) {
         func_8028F918(2);
-    else{ 
-        if(arg0 == 0)
-            func_8028F918(0);
-        else if (arg0 == 4)
-            func_802D6114();
+    }
+    else if (arg0 == 0) {
+        func_8028F918(0);
+    }
+    else if (arg0 == 4) {
+        func_802D6114();
     }
 }
 
@@ -319,10 +322,10 @@ void timedFuncQueue_defrag(void){
     D_80383380.ptr = vector_defrag(D_80383380.ptr);
 }
 
-void func_803252B0(s32 arg0){
-    mapSpecificFlags_set(arg0, 1);
+void mapSpecificFlags_setTrue(s32 flag){
+    mapSpecificFlags_set(flag, TRUE);
 }
 
-void func_803252D0(f32 time, s32 arg0){
-    timedFunc_set_1(time, func_803252B0, arg0);
+void timed_mapSpecificFlags_setTrue(f32 time, s32 flag){
+    timedFunc_set_1(time, mapSpecificFlags_setTrue, flag);
 }