From b03a51e034df8513456043dabf23596c8daba2c1 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 16 Jul 2017 10:35:31 -0500 Subject: labeling --- src/field_region_map.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/field_region_map.c') diff --git a/src/field_region_map.c b/src/field_region_map.c index 58b0e37bc..2b324ca1e 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -19,11 +19,13 @@ struct UnkStruct { MainCallback callback; u8 filler[4]; + // This should be RegionMap, but I can't do that because it overlaps unk888. struct RegionMapStruct unk8; u16 unk888; }; -extern struct UnkStruct unk_2000000; +extern u8 ewram[]; +#define unk_2000000 (*(struct UnkStruct *)(ewram)) void FieldInitRegionMap(MainCallback callback) { @@ -46,9 +48,10 @@ void CB2_FieldInitRegionMap(void) REG_BG3VOFS = 0; ResetSpriteData(); FreeAllSpritePalettes(); - sub_80FA8EC((u32)&unk_2000000.unk8, 0); - sub_80FBCF0(0, 0); - sub_80FBB3C(1, 1); + // TODO: remove this cast + InitRegionMap((void *)&unk_2000000.unk8, 0); + CreateRegionMapPlayerIcon(0, 0); + CreateRegionMapCursorIcon(1, 1); SetUpWindowConfig(&gWindowConfig_81E709C); InitMenuWindow(&gWindowConfig_81E709C); MenuZeroFillScreen(); @@ -107,7 +110,7 @@ void sub_813EFDC(void) case 4: if (!gPaletteFade.active) { - sub_80FAB10(); + FreeRegionMapIconResources(); SetMainCallback2(unk_2000000.callback); } break; -- cgit v1.2.3 From d4bd4c393e59bb66a8d4f69f23dce694982723e1 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 16 Jul 2017 12:41:13 -0500 Subject: more labeling and use static --- src/field_region_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/field_region_map.c') diff --git a/src/field_region_map.c b/src/field_region_map.c index 2b324ca1e..7cb22e5df 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -51,7 +51,7 @@ void CB2_FieldInitRegionMap(void) // TODO: remove this cast InitRegionMap((void *)&unk_2000000.unk8, 0); CreateRegionMapPlayerIcon(0, 0); - CreateRegionMapCursorIcon(1, 1); + CreateRegionMapCursor(1, 1); SetUpWindowConfig(&gWindowConfig_81E709C); InitMenuWindow(&gWindowConfig_81E709C); MenuZeroFillScreen(); -- cgit v1.2.3