2 All Trees Permanently Get Cut
voloved edited this page 2023-02-07 19:58:15 -05:00

Goal: Make it so cutting a tree once will keep it cut for the rest of the game.


-------------------------- include/constants/flags.h --------------------------
index 55106baae..63b491195 100644
@@ -1287,30 +1287,30 @@
 #define FLAG_UNUSED_0x4D6                                           0x4D6 // Unused Flag
 #define FLAG_UNUSED_0x4D7                                           0x4D7 // Unused Flag
 #define FLAG_UNUSED_0x4D8                                           0x4D8 // Unused Flag
 #define FLAG_UNUSED_0x4D9                                           0x4D9 // Unused Flag
-#define FLAG_UNUSED_0x4DA                                           0x4DA // Unused Flag
-#define FLAG_UNUSED_0x4DB                                           0x4DB // Unused Flag
-#define FLAG_UNUSED_0x4DC                                           0x4DC // Unused Flag
-#define FLAG_UNUSED_0x4DD                                           0x4DD // Unused Flag
-#define FLAG_UNUSED_0x4DE                                           0x4DE // Unused Flag
-#define FLAG_UNUSED_0x4DF                                           0x4DF // Unused Flag
-#define FLAG_UNUSED_0x4E0                                           0x4E0 // Unused Flag
-#define FLAG_UNUSED_0x4E1                                           0x4E1 // Unused Flag
-#define FLAG_UNUSED_0x4E2                                           0x4E2 // Unused Flag
-#define FLAG_UNUSED_0x4E3                                           0x4E3 // Unused Flag
-#define FLAG_UNUSED_0x4E4                                           0x4E4 // Unused Flag
-#define FLAG_UNUSED_0x4E5                                           0x4E5 // Unused Flag
-#define FLAG_UNUSED_0x4E6                                           0x4E6 // Unused Flag
-#define FLAG_UNUSED_0x4E7                                           0x4E7 // Unused Flag
-#define FLAG_UNUSED_0x4E8                                           0x4E8 // Unused Flag
-#define FLAG_UNUSED_0x4E9                                           0x4E9 // Unused Flag
-#define FLAG_UNUSED_0x4EA                                           0x4EA // Unused Flag
-#define FLAG_UNUSED_0x4EB                                           0x4EB // Unused Flag
-#define FLAG_UNUSED_0x4EC                                           0x4EC // Unused Flag
-#define FLAG_UNUSED_0x4ED                                           0x4ED // Unused Flag
-#define FLAG_UNUSED_0x4EE                                           0x4EE // Unused Flag
-#define FLAG_UNUSED_0x4EF                                           0x4EF // Unused Flag
+#define FLAG_TREE_PETALBURGWOODS_1                                  0x4DA
+#define FLAG_TREE_PETALBURGWOODS_2                                  0x4DB
+#define FLAG_TREE_ROUTE103_1                                        0x4DC
+#define FLAG_TREE_ROUTE103_2                                        0x4DD
+#define FLAG_TREE_ROUTE104_1                                        0x4DE
+#define FLAG_TREE_ROUTE111_1                                        0x4DF
+#define FLAG_TREE_ROUTE116_1                                        0x4E0
+#define FLAG_TREE_ROUTE116_2                                        0x4E1
+#define FLAG_TREE_ROUTE116_3                                        0x4E2
+#define FLAG_TREE_ROUTE116_4                                        0x4E3
+#define FLAG_TREE_ROUTE116_5                                        0x4E4
+#define FLAG_TREE_ROUTE117_1                                        0x4E5
+#define FLAG_TREE_ROUTE118_1                                        0x4E6
+#define FLAG_TREE_ROUTE120_1                                        0x4E7
+#define FLAG_TREE_ROUTE120_2                                        0x4E8
+#define FLAG_TREE_ROUTE120_3                                        0x4E9
+#define FLAG_TREE_ROUTE121_1                                        0x4EA
+#define FLAG_TREE_ROUTE121_2                                        0x4EB
+#define FLAG_TREE_ROUTE121_3                                        0x4EC
+#define FLAG_TREE_ROUTE123_1                                        0x4ED
+#define FLAG_TREE_ROUTE123_2                                        0x4EE
+#define FLAG_TREE_ROUTE123_3                                        0x4EF
 
 #define FLAG_DEFEATED_RUSTBORO_GYM                                  0x4F0
 #define FLAG_DEFEATED_DEWFORD_GYM                                   0x4F1
 #define FLAG_DEFEATED_MAUVILLE_GYM                                  0x4F2
---------------------- data/maps/PetalburgWoods/map.json ----------------------
index 4179d8195..990463618 100644
@@ -24,9 +24,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_11"
+      "flag": "FLAG_TREE_PETALBURGWOODS_1"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
       "x": 19,
@@ -37,9 +37,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_12"
+      "flag": "FLAG_TREE_PETALBURGWOODS_2"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
       "x": 26,

------------------------- data/maps/Route103/map.json -------------------------
index 9bc6fed67..c561a249c 100644
@@ -204,9 +204,9 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_12"
+      "flag": "FLAG_TREE_ROUTE103_1"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
       "x": 72,
@@ -217,9 +217,9 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_13"
+      "flag": "FLAG_TREE_ROUTE103_2"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
       "x": 67,

------------------------- data/maps/Route104/map.json -------------------------
index 80af8aa6d..29941b7b0 100644
@@ -417,9 +417,9 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_11"
+      "flag": "FLAG_TREE_ROUTE104_1"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,

------------------------- data/maps/Route111/map.json -------------------------
index bc476ebaa..f17b5db3d 100644
@@ -378,9 +378,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_13"
+      "flag": "FLAG_TREE_ROUTE111_1"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
       "x": 10,

------------------------- data/maps/Route116/map.json -------------------------
index adf9a86d5..565188bf2 100644
@@ -74,9 +74,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_11"
+      "flag": "FLAG_TREE_ROUTE116_1"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
       "x": 32,
@@ -87,9 +87,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_12"
+      "flag": "FLAG_TREE_ROUTE116_2"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 13,
@@ -178,9 +178,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_13"
+      "flag": "FLAG_TREE_ROUTE116_3"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 36,
@@ -204,9 +204,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_14"
+      "flag": "FLAG_TREE_ROUTE116_4"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 80,
@@ -360,9 +360,9 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_15"
+      "flag": "FLAG_TREE_ROUTE116_5"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 36,

------------------------- data/maps/Route117/map.json -------------------------
index 80304ddf4..9365e4876 100644
@@ -217,9 +217,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_11"
+      "flag": "FLAG_TREE_ROUTE117_1"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 9,

------------------------- data/maps/Route118/map.json -------------------------
index 1068e4a1a..50451dd4e 100644
@@ -183,9 +183,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_11"
+      "flag": "FLAG_TREE_ROUTE118_1"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_FISHERMAN",
       "x": 28,

------------------------- data/maps/Route120/map.json -------------------------
index 6bb2c84c1..db2cc27ef 100644
@@ -295,9 +295,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_11"
+      "flag": "FLAG_TREE_ROUTE120_1"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 7,
@@ -438,9 +438,9 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_14"
+      "flag": "FLAG_TREE_ROUTE120_2"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
       "x": 15,
@@ -451,9 +451,9 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_12"
+      "flag": "FLAG_TREE_ROUTE120_3"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
       "x": 10,

------------------------- data/maps/Route121/map.json -------------------------
index 4a73f3fdd..4a7572062 100644
@@ -222,9 +222,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_11"
+      "flag": "FLAG_TREE_ROUTE121_1"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
       "x": 65,
@@ -235,9 +235,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_12"
+      "flag": "FLAG_TREE_ROUTE121_2"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
       "x": 63,
@@ -313,9 +313,9 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_13"
+      "flag": "FLAG_TREE_ROUTE121_3"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_MANIAC",
       "x": 11,

------------------------- data/maps/Route123/map.json -------------------------
index 11798b95d..a6f5daa81 100644
@@ -256,9 +256,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_11"
+      "flag": "FLAG_TREE_ROUTE123_1"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
       "x": 129,
@@ -269,9 +269,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_12"
+      "flag": "FLAG_TREE_ROUTE123_2"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
       "x": 92,
@@ -282,9 +282,9 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_CutTree",
-      "flag": "FLAG_TEMP_13"
+      "flag": "FLAG_TREE_ROUTE123_3"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 31,