summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>2024-03-21 15:41:46 -0300
committerGitHub <noreply@github.com>2024-03-21 15:41:46 -0300
commit6c27771ff4a968fe92dec9d9f12260edec4f9214 (patch)
tree909df4104b09be86fefdf84d4bde4454c477b502 /include
parent5531a140d87450fce5eb828941f061ce6f73f964 (diff)
export configuration for ast_map (#172)
* progress * progress * progress * progress * progress * progress * progress * finished? * remove unnecessary header * rename to map * remove header * rename to ast_map * problem with torch * Matchpoint * take out pads and update Torch
Diffstat (limited to 'include')
-rw-r--r--include/assets.h2
-rw-r--r--include/assets/ast_map.h8
-rw-r--r--include/assets/ast_menu.h8
-rw-r--r--include/sf64dma.h2
4 files changed, 2 insertions, 18 deletions
diff --git a/include/assets.h b/include/assets.h
index 0af6fbe4..c4acd789 100644
--- a/include/assets.h
+++ b/include/assets.h
@@ -19,7 +19,7 @@ extern Gfx D_4007AF0[];
/* ast_corneria, ast_meteo, ast_titania, ast_sector_x, ast_sector_z,
* ast_aquas, ast_area_6, ast_venom_1, ast_venom_2, ast_ve1_boss*,
* ast_bolse, ast_fortuna, ast_sector_y, ast_solar, ast_zoness,
- * ast_katina, ast_macbeth, ast_title, ast_menu, ast_training
+ * ast_katina, ast_macbeth, ast_title, ast_map, ast_training
*/
extern Gfx D_60005B0[]; // fox_bg
extern Gfx D_6000A80[]; // fox_bg, fox_effect
diff --git a/include/assets/ast_map.h b/include/assets/ast_map.h
deleted file mode 100644
index b8f915a4..00000000
--- a/include/assets/ast_map.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef AST_MAP_H
-#define AST_MAP_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif
diff --git a/include/assets/ast_menu.h b/include/assets/ast_menu.h
deleted file mode 100644
index ef4681e3..00000000
--- a/include/assets/ast_menu.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef AST_MENU_H
-#define AST_MENU_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif
diff --git a/include/sf64dma.h b/include/sf64dma.h
index 9b50a534..201c1ec4 100644
--- a/include/sf64dma.h
+++ b/include/sf64dma.h
@@ -163,7 +163,7 @@ DECLARE_SEGMENT(ast_katina);
DECLARE_SEGMENT(ast_macbeth);
DECLARE_SEGMENT(ast_warp_zone);
DECLARE_SEGMENT(ast_title);
-DECLARE_SEGMENT(ast_menu);
+DECLARE_SEGMENT(ast_map);
DECLARE_SEGMENT(ast_option);
DECLARE_SEGMENT(ast_versus);
DECLARE_SEGMENT(ast_font);