diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-02-29 05:15:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-29 14:15:04 +0100 |
| commit | 1b60dcf6dd198fe8b29e33053ecefc62c5233c42 (patch) | |
| tree | 38e51f128933e363a22feff1ecc83d904f8134c1 /src/code/z_map_mark.c | |
| parent | 7a2c46d4eb4f3f0d12cae4f41df0e55342a42fd3 (diff) | |
Use Romfile in place of vromStart and vromEnd in structs (#1742)
* KaleidoMgrOverlay
* GameStateOverlay
* ActorOverlay
* EffectSsOverlay
* MapMarkDataOverlay
* Missed DEFINE_ACTOR_UNSET
* ROM_FILE_UNSET
* DEFINE_OBJECT_EMPTY
* DmaEntry
* ACTOR_UNSET
* romfile.h
* newline
* Format
Diffstat (limited to 'src/code/z_map_mark.c')
| -rw-r--r-- | src/code/z_map_mark.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 31d9f93ad..f6cc28833 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -16,8 +16,7 @@ typedef struct { typedef struct { /* 0x00 */ void* loadedRamAddr; // original name: "allocp" - /* 0x04 */ uintptr_t vromStart; - /* 0x08 */ uintptr_t vromEnd; + /* 0x04 */ RomFile file; /* 0x0C */ void* vramStart; /* 0x10 */ void* vramEnd; /* 0x14 */ void* vramTable; @@ -43,12 +42,7 @@ static MapMarkInfo sMapMarkInfoTable[] = { }; static MapMarkDataOverlay sMapMarkDataOvl = { - NULL, - (uintptr_t)_ovl_map_mark_dataSegmentRomStart, - (uintptr_t)_ovl_map_mark_dataSegmentRomEnd, - _ovl_map_mark_dataSegmentStart, - _ovl_map_mark_dataSegmentEnd, - gMapMarkDataTable, + NULL, ROM_FILE(ovl_map_mark_data), _ovl_map_mark_dataSegmentStart, _ovl_map_mark_dataSegmentEnd, gMapMarkDataTable, }; static MapMarkData** sLoadedMarkDataTable; @@ -60,7 +54,8 @@ void MapMark_Init(PlayState* play) { overlay->loadedRamAddr = GAME_STATE_ALLOC(&play->state, overlaySize, "../z_map_mark.c", 235); LOG_UTILS_CHECK_NULL_POINTER("dlftbl->allocp", overlay->loadedRamAddr, "../z_map_mark.c", 236); - Overlay_Load(overlay->vromStart, overlay->vromEnd, overlay->vramStart, overlay->vramEnd, overlay->loadedRamAddr); + Overlay_Load(overlay->file.vromStart, overlay->file.vromEnd, overlay->vramStart, overlay->vramEnd, + overlay->loadedRamAddr); sLoadedMarkDataTable = gMapMarkDataTable; sLoadedMarkDataTable = |