Added kysc to remove macros and removed no_segmented_memory

include/level_commands.h

@@ -34,7 +34,6 @@
 #define REGULAR_FACE 0x0002
 #define DIZZY_FACE 0x0003
 
-#ifdef NO_SEGMENTED_MEMORY
 #define EXECUTE(seg, script, scriptEnd, entry) \
     CMD_BBH(0x00, 0x10, 0x0000), \
     CMD_PTR(NULL), \
@@ -46,19 +45,6 @@
     CMD_PTR(NULL), \
     CMD_PTR(NULL), \
     CMD_PTR(entry)
-#else
-#define EXECUTE(seg, script, scriptEnd, entry) \
-    CMD_BBH(0x00, 0x10, seg), \
-    CMD_PTR(script), \
-    CMD_PTR(scriptEnd), \
-    CMD_PTR(entry)
-
-#define EXIT_AND_EXECUTE(seg, script, scriptEnd, entry) \
-    CMD_BBH(0x01, 0x10, seg), \
-    CMD_PTR(script), \
-    CMD_PTR(scriptEnd), \
-    CMD_PTR(entry)
-#endif
 
 #define EXIT() \
     CMD_BBH(0x02, 0x04, 0x0000)
@@ -132,7 +118,6 @@
 #define POP_POOL() \
     CMD_BBH(0x15, 0x04, 0x0000)
 
-#ifdef NO_SEGMENTED_MEMORY
 #define FIXED_LOAD(loadAddr, romStart, romEnd) \
     CMD_BBH(0x16, 0x10, 0x0000), \
     CMD_PTR(NULL), \
@@ -148,38 +133,14 @@
     CMD_BBH(0x18, 0x0C, 0x0000), \
     CMD_PTR(NULL), \
     CMD_PTR(NULL)
-#else
-#define FIXED_LOAD(loadAddr, romStart, romEnd) \
-    CMD_BBH(0x16, 0x10, 0x0000), \
-    CMD_PTR(loadAddr), \
-    CMD_PTR(romStart), \
-    CMD_PTR(romEnd)
-
-#define LOAD_RAW(seg, romStart, romEnd) \
-    CMD_BBH(0x17, 0x0C, seg), \
-    CMD_PTR(romStart), \
-    CMD_PTR(romEnd)
-
-#define LOAD_MIO0(seg, romStart, romEnd) \
-    CMD_BBH(0x18, 0x0C, seg), \
-    CMD_PTR(romStart), \
-    CMD_PTR(romEnd)
-#endif
 
 #define LOAD_MARIO_HEAD(sethead) \
     CMD_BBH(0x19, 0x04, sethead)
 
-#ifdef NO_SEGMENTED_MEMORY
 #define LOAD_MIO0_TEXTURE(seg, romStart, romEnd) \
     CMD_BBH(0x1A, 0x0C, 0x0000), \
     CMD_PTR(NULL), \
     CMD_PTR(NULL)
-#else
-#define LOAD_MIO0_TEXTURE(seg, romStart, romEnd) \
-    CMD_BBH(0x1A, 0x0C, seg), \
-    CMD_PTR(romStart), \
-    CMD_PTR(romEnd)
-#endif
 
 #define INIT_LEVEL() \
     CMD_BBH(0x1B, 0x04, 0x0000)

include/macros.h

@@ -47,20 +47,9 @@
 #define ALIGNED16
 #endif
 
-#ifndef NO_SEGMENTED_MEMORY
-// convert a virtual address to physical.
-#define VIRTUAL_TO_PHYSICAL(addr)   ((uintptr_t)(addr) & 0x1FFFFFFF)
-
-// convert a physical address to virtual.
-#define PHYSICAL_TO_VIRTUAL(addr)   ((uintptr_t)(addr) | 0x80000000)
-
-// another way of converting virtual to physical
-#define VIRTUAL_TO_PHYSICAL2(addr)  ((u8 *)(addr) - 0x80000000U)
-#else
 // no conversion needed other than cast
 #define VIRTUAL_TO_PHYSICAL(addr)   ((uintptr_t)(addr))
 #define PHYSICAL_TO_VIRTUAL(addr)   ((uintptr_t)(addr))
 #define VIRTUAL_TO_PHYSICAL2(addr)  ((void *)(addr))
-#endif
 
 #endif // MACROS_H

include/segment_symbols.h

@@ -1,95 +1,5 @@
 #ifndef SEGMENT_SYMBOLS_H
 #define SEGMENT_SYMBOLS_H
 
-#ifndef NO_SEGMENTED_MEMORY
-#define DECLARE_SEGMENT(name) \
-    extern u8 _##name##SegmentRomStart[]; \
-    extern u8 _##name##SegmentRomEnd[];
-
-#define DECLARE_ACTOR_SEGMENT(name) \
-    DECLARE_SEGMENT(name##_mio0) \
-    DECLARE_SEGMENT(name##_geo)
-
-#define DECLARE_LEVEL_SEGMENT(name) \
-    DECLARE_SEGMENT(name) \
-    DECLARE_SEGMENT(name##_segment_7)
-
-DECLARE_ACTOR_SEGMENT(common0)
-DECLARE_ACTOR_SEGMENT(common1)
-DECLARE_ACTOR_SEGMENT(group0)
-DECLARE_ACTOR_SEGMENT(group1)
-DECLARE_ACTOR_SEGMENT(group2)
-DECLARE_ACTOR_SEGMENT(group3)
-DECLARE_ACTOR_SEGMENT(group4)
-DECLARE_ACTOR_SEGMENT(group5)
-DECLARE_ACTOR_SEGMENT(group6)
-DECLARE_ACTOR_SEGMENT(group7)
-DECLARE_ACTOR_SEGMENT(group8)
-DECLARE_ACTOR_SEGMENT(group9)
-DECLARE_ACTOR_SEGMENT(group10)
-DECLARE_ACTOR_SEGMENT(group11)
-DECLARE_ACTOR_SEGMENT(group12)
-DECLARE_ACTOR_SEGMENT(group13)
-DECLARE_ACTOR_SEGMENT(group14)
-DECLARE_ACTOR_SEGMENT(group15)
-DECLARE_ACTOR_SEGMENT(group16)
-DECLARE_ACTOR_SEGMENT(group17)
-
-DECLARE_SEGMENT(entry)
-DECLARE_SEGMENT(engine)
-DECLARE_SEGMENT(behavior)
-DECLARE_SEGMENT(scripts)
-DECLARE_SEGMENT(goddard)
-extern u8 _goddardSegmentStart[];
-
-DECLARE_LEVEL_SEGMENT(menu)
-DECLARE_LEVEL_SEGMENT(intro)
-DECLARE_LEVEL_SEGMENT(ending)
-
-#define STUB_LEVEL(_0, _1, _2, _3, _4, _5, _6, _7, _8)
-#define DEFINE_LEVEL(_0, _1, _2, folder, _4, _5, _6, _7, _8, _9, _10) DECLARE_LEVEL_SEGMENT(folder)
-
-#include "levels/level_defines.h"
-
-#undef STUB_LEVEL
-#undef DEFINE_LEVEL
-
-DECLARE_SEGMENT(segment2_mio0)
-
-DECLARE_SEGMENT(water_skybox_mio0)
-DECLARE_SEGMENT(ccm_skybox_mio0)
-DECLARE_SEGMENT(clouds_skybox_mio0)
-DECLARE_SEGMENT(bitfs_skybox_mio0)
-DECLARE_SEGMENT(wdw_skybox_mio0)
-DECLARE_SEGMENT(cloud_floor_skybox_mio0)
-DECLARE_SEGMENT(ssl_skybox_mio0)
-DECLARE_SEGMENT(bbh_skybox_mio0)
-DECLARE_SEGMENT(bidw_skybox_mio0)
-DECLARE_SEGMENT(bits_skybox_mio0)
-
-DECLARE_SEGMENT(fire_mio0)
-DECLARE_SEGMENT(spooky_mio0)
-DECLARE_SEGMENT(generic_mio0)
-DECLARE_SEGMENT(water_mio0)
-DECLARE_SEGMENT(sky_mio0)
-DECLARE_SEGMENT(snow_mio0)
-DECLARE_SEGMENT(cave_mio0)
-DECLARE_SEGMENT(machine_mio0)
-DECLARE_SEGMENT(mountain_mio0)
-DECLARE_SEGMENT(grass_mio0)
-DECLARE_SEGMENT(outside_mio0)
-DECLARE_SEGMENT(inside_mio0)
-DECLARE_SEGMENT(effect_mio0)
-DECLARE_SEGMENT(title_screen_bg_mio0)
-
-DECLARE_SEGMENT(debug_level_select_mio0)
-
-#ifdef VERSION_EU
-DECLARE_SEGMENT(translation_de_mio0)
-DECLARE_SEGMENT(translation_en_mio0)
-DECLARE_SEGMENT(translation_fr_mio0)
-#endif
-
-#endif
 
 #endif // SEGMENT_SYMBOLS_H