place surface type const and unassemble flag in vtx and document effects (#553)

* place surface type const and unassemble flag in vtx

1 files changed, 11 insertions, 11 deletions

diff --git a/src/code_80086E70.c b/src/code_80086E70.c
index 5cfb55fc4..38a583b84 100644
--- a/src/code_80086E70.c
+++ b/src/code_80086E70.c
@@ -1081,7 +1081,7 @@ void func_800896D4(s32 objectIndex, f32 arg1, f32 arg2) {
     player = gPlayerOne;
     if (is_obj_index_flag_unk_054_active(objectIndex, 0x00000200) != 0) {
         for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) {
-            if ((gObjectList[objectIndex].state != 0) && !(player->effects & 0x80000200) && (has_collided_horizontally_with_player(objectIndex, player) != 0)) {
+            if ((gObjectList[objectIndex].state != 0) && !(player->effects & (STAR_EFFECT | BOO_EFFECT)) && (has_collided_horizontally_with_player(objectIndex, player) != 0)) {
                 func_8008933C(player, objectIndex, arg1, arg2 * 1.1);
                 if (is_obj_index_flag_unk_054_active(objectIndex, 0x04000000) != 0) {
                     func_80072180();
@@ -1099,9 +1099,9 @@ void func_80089820(s32 objectIndex, f32 arg1, f32 arg2, u32 arg3) {
     set_object_flag_unk_054_false(objectIndex, 0x02000000);
     if (is_obj_index_flag_unk_054_active(objectIndex, 0x00000200) != 0) {
         for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) {
-            if ((gObjectList[objectIndex].state != 0) && !(player->effects & 0x80000000)) {
+            if ((gObjectList[objectIndex].state != 0) && !(player->effects & BOO_EFFECT)) {
                 if ((player->type & PLAYER_EXISTS) && !(player->type & PLAYER_INVISIBLE_OR_BOMB) && (has_collided_horizontally_with_player(objectIndex, player) != 0)) {
-                    if (player->effects & 0x200) {
+                    if (player->effects & STAR_EFFECT) {
                         set_object_flag_unk_054_true(objectIndex, 0x02000000);
                     } else {
                         if (is_obj_index_flag_unk_054_active(objectIndex, 0x04000000) != 0) {
@@ -1124,7 +1124,7 @@ void func_80089A04(s32 objectIndex, f32 arg1, f32 arg2) {
     player = gPlayerOne;
     if (is_obj_index_flag_unk_054_active(objectIndex, 0x00000200) != 0) {
         for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) {
-            if ((gObjectList[objectIndex].state != 0) && !(player->effects & 0x80000200) && (has_collided_with_player(objectIndex, player) != 0)) {
+            if ((gObjectList[objectIndex].state != 0) && !(player->effects & (BOO_EFFECT | STAR_EFFECT)) && (has_collided_with_player(objectIndex, player) != 0)) {
                 func_8008933C(player, objectIndex, arg1, arg2 * 1.1);
                 if (is_obj_index_flag_unk_054_active(objectIndex, 0x04000000) != 0) {
                     func_80072180();
@@ -1146,8 +1146,8 @@ s32 func_80089B50(s32 objectIndex) {
     if (is_obj_index_flag_unk_054_active(objectIndex, 0x00000200) != 0) {
         for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++, test++) {
             if ((gObjectList[objectIndex].state != 0) && !(player->effects & 0x81000000) && (player->type & PLAYER_EXISTS) && !(player->type & PLAYER_INVISIBLE_OR_BOMB) && (has_collided_horizontally_with_player(objectIndex, player) != 0)) {
-                if (!(player->effects & 0x200)) {
-                    player->statusEffects |= REVERSE_EFFECT;
+                if (!(player->effects & STAR_EFFECT)) {
+                    player->soundEffects |= REVERSE_SOUND_EFFECT;
                     if (is_obj_index_flag_unk_054_active(objectIndex, 0x04000000) != 0) {
                         func_80072180();
                     }
@@ -1172,8 +1172,8 @@ s32 func_80089CBC(s32 objectIndex, f32 arg1) {
         for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) {
             if ((gObjectList[objectIndex].state != 0) && !(player->effects & 0x81000000)) {
                 if ((player->type & PLAYER_EXISTS) && !(player->type & PLAYER_INVISIBLE_OR_BOMB) && (has_collided_with_player_and_within_height(objectIndex, player, arg1) != 0)) {
-                    if (!(player->effects & 0x200)) {
-                        player->statusEffects |= REVERSE_EFFECT;
+                    if (!(player->effects & STAR_EFFECT)) {
+                        player->soundEffects |= REVERSE_SOUND_EFFECT;
                         if (is_obj_index_flag_unk_054_active(objectIndex, 0x04000000) != 0) {
                             func_80072180();
                         }
@@ -1196,10 +1196,10 @@ s32 func_80089E18(s32 objectIndex) {
     if (is_obj_index_flag_unk_054_active(objectIndex, 0x00000200) != 0) {
         for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) {
             if ((gObjectList[objectIndex].state != 0) && !(player->effects & 0x800000C0) && (has_collided_horizontally_with_player(objectIndex, player) != 0)) {
-                if (player->effects & 0x200) {
+                if (player->effects & STAR_EFFECT) {
                     var_s6 = 1;
                 } else {
-                    player->statusEffects |= 1;
+                    player->soundEffects |= 1;
                 }
             }
         }
@@ -1222,7 +1222,7 @@ s32 func_80089F24(s32 objectIndex) {
                     if (is_obj_index_flag_unk_054_active(objectIndex, 0x04000000) != 0) {
                         func_80072180();
                     }
-                    player->statusEffects |= 0x200000;
+                    player->soundEffects |= 0x200000;
                 }
             }
         }