From dd2eb476dc3194ea532e3c1a1d79492188b3c882 Mon Sep 17 00:00:00 2001 From: Alex Bates <16batesa@gmail.com> Date: Mon, 2 Nov 2020 17:16:26 +0000 Subject: [PATCH] remove sinful ld_addrs usage --- src/world/world.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/world/world.c b/src/world/world.c index caa2f6e98e..378d91329e 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -81,17 +81,17 @@ INCLUDE_ASM(s32, "code_341d0_len_20d0", get_asset_offset); #define MAP(map) \ .id = #map, \ .config = &map##_config, \ - .dmaStart = (void*)LD_code_##map##_ROM_START, \ - .dmaEnd = (void*)LD_code_##map##_ROM_END, \ - .dmaDest = (void*)LD_code_##map##_VRAM \ + .dmaStart = &code_##map##_ROM_START, \ + .dmaEnd = &code_##map##_ROM_END, \ + .dmaDest = &code_##map##_VRAM \ // Should be removed once the data section containing .init and .config of all maps have been disassembled #define MAP_UNSPLIT(map, configVRAM) \ .id = #map, \ .config = (MapConfig*)(configVRAM), \ - .dmaStart = (void*)LD_code_##map##_ROM_START, \ - .dmaEnd = (void*)LD_code_##map##_ROM_END, \ - .dmaDest = (void*)LD_code_##map##_VRAM \ + .dmaStart = &code_##map##_ROM_START, \ + .dmaEnd = &code_##map##_ROM_END, \ + .dmaDest = &code_##map##_VRAM \ /// Toad Town static Map mac_maps[] = {