summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
authoroctorock <79596758+octorock@users.noreply.github.com>2024-01-06 16:14:12 +0100
committeroctorock <79596758+octorock@users.noreply.github.com>2024-01-06 16:15:34 +0100
commit06dc15859867c7f2db22ea6e289e28ff12b0b6c9 (patch)
treeae4991dfff60d689953033fb75345cc65628684a /src/data
parentaced0bef691dbc41bdd39b6e62662d2436877a4b (diff)
Rename vvv to actTile
Diffstat (limited to 'src/data')
-rw-r--r--src/data/mapActTileToSurfaceType.c75
-rw-r--r--src/data/mapVvvToSurfaceType.c75
2 files changed, 75 insertions, 75 deletions
diff --git a/src/data/mapActTileToSurfaceType.c b/src/data/mapActTileToSurfaceType.c
new file mode 100644
index 00000000..e821a766
--- /dev/null
+++ b/src/data/mapActTileToSurfaceType.c
@@ -0,0 +1,75 @@
+#include "asm.h"
+#include "player.h"
+#include "tiles.h"
+
+const KeyValuePair gMapActTileToSurfaceType[] = {
+ { ACT_TILE_13, SURFACE_PIT },
+ { ACT_TILE_38, SURFACE_SLOPE_GNDGND_V },
+ { ACT_TILE_39, SURFACE_SLOPE_GNDGND_H },
+ { ACT_TILE_82, SURFACE_26 },
+ { ACT_TILE_99, SURFACE_24 },
+ { ACT_TILE_116, SURFACE_EDGE },
+ { ACT_TILE_8, SURFACE_7 },
+ { ACT_TILE_31, SURFACE_MINISH_DOOR_FRONT },
+ { ACT_TILE_32, SURFACE_MINISH_DOOR_BACK },
+ { ACT_TILE_33, SURFACE_A },
+ { ACT_TILE_34, SURFACE_B },
+ { ACT_TILE_24, SURFACE_16 },
+ { ACT_TILE_18, SURFACE_ICE },
+ { ACT_TILE_15, SURFACE_SHALLOW_WATER },
+ { ACT_TILE_14, SURFACE_SLOPE_GNDWATER },
+ { ACT_TILE_16, SURFACE_WATER },
+ { ACT_TILE_27, SURFACE_BUTTON },
+ { ACT_TILE_29, SURFACE_BUTTON },
+ { ACT_TILE_97, SURFACE_1B },
+ { ACT_TILE_90, SURFACE_1C },
+ { ACT_TILE_17, SURFACE_14 },
+ { ACT_TILE_98, SURFACE_21 },
+ { ACT_TILE_101, SURFACE_6 },
+ { ACT_TILE_102, SURFACE_6 },
+ { ACT_TILE_103, SURFACE_6 },
+ { ACT_TILE_104, SURFACE_6 },
+ { ACT_TILE_105, SURFACE_6 },
+ { ACT_TILE_106, SURFACE_6 },
+ { ACT_TILE_108, SURFACE_6 },
+ { ACT_TILE_109, SURFACE_6 },
+ { ACT_TILE_110, SURFACE_6 },
+ { ACT_TILE_111, SURFACE_6 },
+ { ACT_TILE_107, SURFACE_6 },
+ { ACT_TILE_48, SURFACE_22 },
+ { ACT_TILE_49, SURFACE_22 },
+ { ACT_TILE_50, SURFACE_22 },
+ { ACT_TILE_51, SURFACE_22 },
+ { ACT_TILE_22, SURFACE_DUST },
+ { ACT_TILE_25, SURFACE_HOLE },
+ { ACT_TILE_240, SURFACE_HOLE },
+ { ACT_TILE_87, SURFACE_CLONE_TILE },
+ { ACT_TILE_83, SURFACE_LADDER },
+ { ACT_TILE_241, SURFACE_LADDER },
+ { ACT_TILE_63, SURFACE_AUTO_LADDER },
+ { ACT_TILE_80, SURFACE_CLIMB_WALL },
+ { ACT_TILE_81, SURFACE_2C },
+ { ACT_TILE_52, SURFACE_LIGHT_GRADE },
+ { ACT_TILE_53, SURFACE_29 },
+ { ACT_TILE_42, SURFACE_E },
+ { ACT_TILE_43, SURFACE_D },
+ { ACT_TILE_44, SURFACE_10 },
+ { ACT_TILE_45, SURFACE_F },
+ { ACT_TILE_64, SURFACE_E },
+ { ACT_TILE_65, SURFACE_D },
+ { ACT_TILE_66, SURFACE_10 },
+ { ACT_TILE_67, SURFACE_F },
+ { ACT_TILE_72, SURFACE_10 },
+ { ACT_TILE_74, SURFACE_E },
+ { ACT_TILE_69, SURFACE_E },
+ { ACT_TILE_71, SURFACE_E },
+ { ACT_TILE_70, SURFACE_D },
+ { ACT_TILE_73, SURFACE_D },
+ { ACT_TILE_68, SURFACE_D },
+ { ACT_TILE_75, SURFACE_D },
+ { ACT_TILE_19, SURFACE_SWAMP },
+ { ACT_TILE_41, SURFACE_DOOR },
+ { ACT_TILE_23, SURFACE_2D },
+ { ACT_TILE_40, SURFACE_DOOR_13 },
+};
+// const u16 gMapActTileToSurfaceTypeEnd = 0;
diff --git a/src/data/mapVvvToSurfaceType.c b/src/data/mapVvvToSurfaceType.c
deleted file mode 100644
index b3a9a99e..00000000
--- a/src/data/mapVvvToSurfaceType.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "asm.h"
-#include "player.h"
-#include "tiles.h"
-
-const KeyValuePair gMapVvvToSurfaceType[] = {
- { VVV_13, SURFACE_PIT },
- { VVV_38, SURFACE_SLOPE_GNDGND_V },
- { VVV_39, SURFACE_SLOPE_GNDGND_H },
- { VVV_82, SURFACE_26 },
- { VVV_99, SURFACE_24 },
- { VVV_116, SURFACE_EDGE },
- { VVV_8, SURFACE_7 },
- { VVV_31, SURFACE_MINISH_DOOR_FRONT },
- { VVV_32, SURFACE_MINISH_DOOR_BACK },
- { VVV_33, SURFACE_A },
- { VVV_34, SURFACE_B },
- { VVV_24, SURFACE_16 },
- { VVV_18, SURFACE_ICE },
- { VVV_15, SURFACE_SHALLOW_WATER },
- { VVV_14, SURFACE_SLOPE_GNDWATER },
- { VVV_16, SURFACE_WATER },
- { VVV_27, SURFACE_BUTTON },
- { VVV_29, SURFACE_BUTTON },
- { VVV_97, SURFACE_1B },
- { VVV_90, SURFACE_1C },
- { VVV_17, SURFACE_14 },
- { VVV_98, SURFACE_21 },
- { VVV_101, SURFACE_6 },
- { VVV_102, SURFACE_6 },
- { VVV_103, SURFACE_6 },
- { VVV_104, SURFACE_6 },
- { VVV_105, SURFACE_6 },
- { VVV_106, SURFACE_6 },
- { VVV_108, SURFACE_6 },
- { VVV_109, SURFACE_6 },
- { VVV_110, SURFACE_6 },
- { VVV_111, SURFACE_6 },
- { VVV_107, SURFACE_6 },
- { VVV_48, SURFACE_22 },
- { VVV_49, SURFACE_22 },
- { VVV_50, SURFACE_22 },
- { VVV_51, SURFACE_22 },
- { VVV_22, SURFACE_DUST },
- { VVV_25, SURFACE_HOLE },
- { VVV_240, SURFACE_HOLE },
- { VVV_87, SURFACE_CLONE_TILE },
- { VVV_83, SURFACE_LADDER },
- { VVV_241, SURFACE_LADDER },
- { VVV_63, SURFACE_AUTO_LADDER },
- { VVV_80, SURFACE_CLIMB_WALL },
- { VVV_81, SURFACE_2C },
- { VVV_52, SURFACE_LIGHT_GRADE },
- { VVV_53, SURFACE_29 },
- { VVV_42, SURFACE_E },
- { VVV_43, SURFACE_D },
- { VVV_44, SURFACE_10 },
- { VVV_45, SURFACE_F },
- { VVV_64, SURFACE_E },
- { VVV_65, SURFACE_D },
- { VVV_66, SURFACE_10 },
- { VVV_67, SURFACE_F },
- { VVV_72, SURFACE_10 },
- { VVV_74, SURFACE_E },
- { VVV_69, SURFACE_E },
- { VVV_71, SURFACE_E },
- { VVV_70, SURFACE_D },
- { VVV_73, SURFACE_D },
- { VVV_68, SURFACE_D },
- { VVV_75, SURFACE_D },
- { VVV_19, SURFACE_SWAMP },
- { VVV_41, SURFACE_DOOR },
- { VVV_23, SURFACE_2D },
- { VVV_40, SURFACE_DOOR_13 },
-};
-// const u16 gMapVvvToSurfaceTypeEnd = 0;