From 48407f4c37e39f2792e469ee18ab743b01f84316 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 14 Jul 2017 17:24:36 -0500 Subject: decompile sub_80FA8EC - sub_80FAB60 --- src/region_map.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 src/region_map.c (limited to 'src') diff --git a/src/region_map.c b/src/region_map.c new file mode 100644 index 000000000..301c3c082 --- /dev/null +++ b/src/region_map.c @@ -0,0 +1,155 @@ +#include "global.h" +#include "palette.h" +#include "sprite.h" + +struct UnknownStruct1 +{ + u8 filler0[0x14]; + u16 unk14; + u8 unk16; + u8 filler17[1]; + u8 (*unk18)(void); + struct Sprite *unk1C; + struct Sprite *unk20; + u8 filler24[0x30]; + u16 unk54; + u16 unk56; + u16 unk58; + u16 unk5A; + s16 unk5C; + s16 unk5E; + u8 filler60[4]; + u16 unk64; + u16 unk66; + u8 filler68[8]; + u16 unk70; + u16 unk72; + u16 unk74; + u16 unk76; + u8 unk78; + u8 unk79; + u8 unk7A; + u8 filler7B[3]; + u8 unk7E; + u8 filler7F[0x101]; + u8 unk180[0x100]; + u8 unk280[0x100]; +}; + +extern struct UnknownStruct1 *gUnknown_020388CC; + +const u16 gPokenavCursor_Pal[] = INCBIN_U16("graphics/pokenav/cursor.gbapal"); +const u8 gUnknown_083E5AF0[] = INCBIN_U8("graphics/pokenav/cursor_small.4bpp.lz"); +const u8 gUnknown_083E5B34[] = INCBIN_U8("graphics/pokenav/cursor_large.4bpp.lz"); +const u16 gRegionMapBrendanIconPalette[] = INCBIN_U16("graphics/pokenav/brendan_icon.gbapal"); +const u8 gRegionMapBrendanIconTiles[] = INCBIN_U8("graphics/pokenav/brendan_icon.4bpp"); +const u16 gRegionMapMayIconPalette[] = INCBIN_U16("graphics/pokenav/may_icon.gbapal"); +const u8 gRegionMapMayIconTiles[] = INCBIN_U8("graphics/pokenav/may_icon.4bpp"); +const u16 gUnknown_083E5D60[] = INCBIN_U16("graphics/pokenav/region_map.gbapal"); +const u8 gUnknown_083E5DA0[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz"); +const u8 gUnknown_083E6B04[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz"); + +void sub_80FA904(struct UnknownStruct1 *, u8); +bool8 sub_80FA940(void); +u8 sub_80FAB78(void); +u8 sub_80FAD04(void); +void sub_80FB170(); +void sub_80FB260(void); +void sub_80FB32C(void); +u16 sub_80FB758(); +u16 sub_80FB9C0(u16); +void sub_80FBA18(); +void sub_80FBFB4(); + +void sub_80FA8EC(struct UnknownStruct1 *a, u8 b) +{ + sub_80FA904(a, b); + while (sub_80FA940()) + ; +} + +void sub_80FA904(struct UnknownStruct1 *a, u8 b) +{ + gUnknown_020388CC = a; + gUnknown_020388CC->unk79 = 0; + gUnknown_020388CC->unk78 = b; + gUnknown_020388CC->unk18 = (b == 0) ? sub_80FAB78 : sub_80FAD04; +} + +bool8 sub_80FA940(void) +{ + switch (gUnknown_020388CC->unk79) + { + case 0: + LZ77UnCompVram(gUnknown_083E5DA0, (void *)(VRAM + 0x8000)); + break; + case 1: + LZ77UnCompVram(gUnknown_083E6B04, (void *)(VRAM + 0xE000)); + break; + case 2: + LoadPalette(gUnknown_083E5D60, 0x70, 0x60); // Why isn't this the right size? + break; + case 3: + LZ77UnCompWram(gUnknown_083E5AF0, gUnknown_020388CC->unk180); + break; + case 4: + LZ77UnCompWram(gUnknown_083E5B34, gUnknown_020388CC->unk280); + break; + case 5: + sub_80FB32C(); + gUnknown_020388CC->unk74 = gUnknown_020388CC->unk54; + gUnknown_020388CC->unk76 = gUnknown_020388CC->unk56; + gUnknown_020388CC->unk16 = sub_80FB758(gUnknown_020388CC->unk14); + gUnknown_020388CC->unk14 = sub_80FB9C0(gUnknown_020388CC->unk14); + sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16); + break; + case 6: + if (gUnknown_020388CC->unk78 == 0) + { + sub_80FB170(0, 0, 0, 0, 0x100, 0x100, 0); + } + else + { + gUnknown_020388CC->unk5C = gUnknown_020388CC->unk54 * 8 - 0x34; + gUnknown_020388CC->unk5E = gUnknown_020388CC->unk56 * 8 - 0x44; + gUnknown_020388CC->unk64 = gUnknown_020388CC->unk54; + gUnknown_020388CC->unk66 = gUnknown_020388CC->unk56; + sub_80FB170(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E, 0x38, 0x48, 0x80, 0x80, 0); + } + break; + case 7: + sub_80FBA18(); + sub_80FB260(); + gUnknown_020388CC->unk1C = NULL; + gUnknown_020388CC->unk20 = NULL; + gUnknown_020388CC->unk7A = 0; + gUnknown_020388CC->unk7E = 0; + REG_BG2CNT = 0xBC8A; + gUnknown_020388CC->unk79++; + default: + return FALSE; + } + gUnknown_020388CC->unk79++; + return TRUE; +} + +void sub_80FAB10(void) +{ + if (gUnknown_020388CC->unk1C != NULL) + { + DestroySprite(gUnknown_020388CC->unk1C); + FreeSpriteTilesByTag(gUnknown_020388CC->unk58); + FreeSpritePaletteByTag(gUnknown_020388CC->unk5A); + } + if (gUnknown_020388CC->unk20 != NULL) + { + DestroySprite(gUnknown_020388CC->unk20); + FreeSpriteTilesByTag(gUnknown_020388CC->unk70); + FreeSpritePaletteByTag(gUnknown_020388CC->unk72); + } +} + +u8 sub_80FAB60(void) +{ + return gUnknown_020388CC->unk18(); +} -- cgit v1.2.3 From 9013ffe84a12a8d81d32fb8125687988bd2ba8ca Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 14 Jul 2017 21:14:00 -0500 Subject: decompile sub_80FAB78 - sub_80FAFC0 --- src/region_map.c | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 264 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/region_map.c b/src/region_map.c index 301c3c082..0a50da51e 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1,4 +1,5 @@ #include "global.h" +#include "main.h" #include "palette.h" #include "sprite.h" @@ -11,25 +12,37 @@ struct UnknownStruct1 u8 (*unk18)(void); struct Sprite *unk1C; struct Sprite *unk20; - u8 filler24[0x30]; - u16 unk54; - u16 unk56; + u8 filler24[0x18]; + s32 unk3C; + s32 unk40; + s32 unk44; + s32 unk48; + s32 unk4C; + u32 unk50; + u16 unk54; // cursor x + u16 unk56; // cursor y u16 unk58; u16 unk5A; s16 unk5C; s16 unk5E; - u8 filler60[4]; + s16 unk60; + s16 unk62; u16 unk64; u16 unk66; - u8 filler68[8]; + u16 unk68; + u16 unk6A; + u16 unk6C; + u16 unk6E; u16 unk70; u16 unk72; u16 unk74; u16 unk76; u8 unk78; u8 unk79; - u8 unk7A; - u8 filler7B[3]; + s8 unk7A; + s8 unk7B; // movement delta horizontal + s8 unk7C; // movement delta vertical + u8 unk7D; u8 unk7E; u8 filler7F[0x101]; u8 unk180[0x100]; @@ -52,13 +65,21 @@ const u8 gUnknown_083E6B04[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz void sub_80FA904(struct UnknownStruct1 *, u8); bool8 sub_80FA940(void); u8 sub_80FAB78(void); +u8 _swiopen(void); u8 sub_80FAD04(void); -void sub_80FB170(); +u8 sub_80FADE4(void); +void sub_80FB170(int, int, int, int, u16, u16, int); +void sub_80FB238(); void sub_80FB260(void); +u16 GetRegionMapSectionAt(); void sub_80FB32C(void); u16 sub_80FB758(); u16 sub_80FB9C0(u16); void sub_80FBA18(); +void sub_80FBB3C(); +void sub_80FBCA0(void); +void sub_80FBDF8(void); +void sub_80FBE24(void); void sub_80FBFB4(); void sub_80FA8EC(struct UnknownStruct1 *a, u8 b) @@ -153,3 +174,238 @@ u8 sub_80FAB60(void) { return gUnknown_020388CC->unk18(); } + +u8 sub_80FAB78(void) +{ + u8 r4 = 0; + + gUnknown_020388CC->unk7B = 0; + gUnknown_020388CC->unk7C = 0; + if ((gMain.heldKeys & DPAD_UP) && gUnknown_020388CC->unk56 > 2) + { + gUnknown_020388CC->unk7C = -1; + r4 = 1; + } + if ((gMain.heldKeys & DPAD_DOWN) && gUnknown_020388CC->unk56 < 16) + { + gUnknown_020388CC->unk7C = 1; + r4 = 1; + } + if ((gMain.heldKeys & DPAD_LEFT) && gUnknown_020388CC->unk54 > 1) + { + gUnknown_020388CC->unk7B = -1; + r4 = 1; + } + if ((gMain.heldKeys & DPAD_RIGHT) && gUnknown_020388CC->unk54 < 0x1C) + { + gUnknown_020388CC->unk7B = 1; + r4 = 1; + } + if (gMain.newKeys & A_BUTTON) + r4 = 4; + else if (gMain.newKeys & B_BUTTON) + r4 = 5; + if (r4 == 1) + { + gUnknown_020388CC->unk7A = 4; + gUnknown_020388CC->unk18 = _swiopen; + } + return r4; +} + +u8 _swiopen(void) +{ + u16 r4; + + if (gUnknown_020388CC->unk7A != 0) + return 2; + + if (gUnknown_020388CC->unk7B > 0) + gUnknown_020388CC->unk54++; + + if (gUnknown_020388CC->unk7B < 0) + gUnknown_020388CC->unk54--; + + if (gUnknown_020388CC->unk7C > 0) + gUnknown_020388CC->unk56++; + + if (gUnknown_020388CC->unk7C < 0) + gUnknown_020388CC->unk56--; + + r4 = GetRegionMapSectionAt(gUnknown_020388CC->unk54, gUnknown_020388CC->unk56); + gUnknown_020388CC->unk16 = sub_80FB758(r4); + if (r4 != gUnknown_020388CC->unk14) + { + gUnknown_020388CC->unk14 = r4; + sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16); + } + sub_80FBA18(); + gUnknown_020388CC->unk18 = sub_80FAB78; + return 3; +} + +u8 sub_80FAD04(void) +{ + u8 r4 = 0; + gUnknown_020388CC->unk6A = 0; + gUnknown_020388CC->unk68 = 0; + if ((gMain.heldKeys & 0x40) && gUnknown_020388CC->unk5E > -0x34) + { + gUnknown_020388CC->unk68 = -1; + r4 = 1; + } + if ((gMain.heldKeys & 0x80) && gUnknown_020388CC->unk5E < 0x3C) + { + gUnknown_020388CC->unk68 = 1; + r4 = 1; + } + if ((gMain.heldKeys & 0x20) && gUnknown_020388CC->unk5C > -0x2C) + { + gUnknown_020388CC->unk6A = -1; + r4 = 1; + } + if ((gMain.heldKeys & 0x10) && gUnknown_020388CC->unk5C < 0xAC) + { + gUnknown_020388CC->unk6A = 1; + r4 = 1; + } + if (gMain.newKeys & A_BUTTON) + r4 = 4; + if (gMain.newKeys & B_BUTTON) + r4 = 5; + if (r4 == 1) + { + gUnknown_020388CC->unk18 = sub_80FADE4; + gUnknown_020388CC->unk6C = 0; + } + return r4; +} + +u8 sub_80FADE4(void) +{ + gUnknown_020388CC->unk5E += gUnknown_020388CC->unk68; + gUnknown_020388CC->unk5C += gUnknown_020388CC->unk6A; + sub_80FB238(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E); + gUnknown_020388CC->unk6C++; + if (gUnknown_020388CC->unk6C == 8) + { + u16 r3 = (gUnknown_020388CC->unk5C + 0x2C) / 8 + 1; + u16 r1 = (gUnknown_020388CC->unk5E + 0x34) / 8 + 2; + + if (r3 != gUnknown_020388CC->unk64 || r1 != gUnknown_020388CC->unk66) + { + u16 r4; + + gUnknown_020388CC->unk64 = r3; + gUnknown_020388CC->unk66 = r1; + r4 = GetRegionMapSectionAt(r3, r1); + gUnknown_020388CC->unk16 = sub_80FB758(r4); + if (r4 != gUnknown_020388CC->unk14) + { + gUnknown_020388CC->unk14 = r4; + sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16); + } + sub_80FBA18(); + } + gUnknown_020388CC->unk6C = 0; + gUnknown_020388CC->unk18 = sub_80FAD04; + return 3; + } + return 2; +} + +void sub_80FAEC4(void) +{ + if (gUnknown_020388CC->unk78 == 0) + { + gUnknown_020388CC->unk5E = 0; + gUnknown_020388CC->unk5C = 0; + gUnknown_020388CC->unk40 = 0; + gUnknown_020388CC->unk3C = 0; + gUnknown_020388CC->unk60 = gUnknown_020388CC->unk54 * 8 - 0x34; + gUnknown_020388CC->unk62 = gUnknown_020388CC->unk56 * 8 - 0x44; + gUnknown_020388CC->unk44 = (gUnknown_020388CC->unk60 << 8) / 16; + gUnknown_020388CC->unk48 = (gUnknown_020388CC->unk62 << 8) / 16; + gUnknown_020388CC->unk64 = gUnknown_020388CC->unk54; + gUnknown_020388CC->unk66 = gUnknown_020388CC->unk56; + gUnknown_020388CC->unk4C = 0x10000; + gUnknown_020388CC->unk50 = -0x800; + } + else + { + gUnknown_020388CC->unk3C = gUnknown_020388CC->unk5C * 256; + gUnknown_020388CC->unk40 = gUnknown_020388CC->unk5E * 256; + gUnknown_020388CC->unk60 = 0; + gUnknown_020388CC->unk62 = 0; + gUnknown_020388CC->unk44 = -(gUnknown_020388CC->unk3C / 16); + gUnknown_020388CC->unk48 = -(gUnknown_020388CC->unk40 / 16); + gUnknown_020388CC->unk54 = gUnknown_020388CC->unk64; + gUnknown_020388CC->unk56 = gUnknown_020388CC->unk66; + gUnknown_020388CC->unk4C = 0x8000; + gUnknown_020388CC->unk50 = 0x800; + } + gUnknown_020388CC->unk6E = 0; + sub_80FBCA0(); + sub_80FBDF8(); +} + +u8 sub_80FAFC0(void) +{ + u8 r4; + + if (gUnknown_020388CC->unk6E > 15) + return 0; + gUnknown_020388CC->unk6E++; + if (gUnknown_020388CC->unk6E == 16) + { + gUnknown_020388CC->unk44 = 0; + gUnknown_020388CC->unk48 = 0; + gUnknown_020388CC->unk5C = gUnknown_020388CC->unk60; + gUnknown_020388CC->unk5E = gUnknown_020388CC->unk62; + gUnknown_020388CC->unk4C = (gUnknown_020388CC->unk78 == 0) ? 0x8000 : 0x10000; + gUnknown_020388CC->unk78 = (gUnknown_020388CC->unk78 == 0) ? 1 : 0; + gUnknown_020388CC->unk18 = (gUnknown_020388CC->unk78 == 0) ? sub_80FAB78 : sub_80FAD04; + sub_80FBB3C(gUnknown_020388CC->unk58, gUnknown_020388CC->unk5A); + sub_80FBE24(); + r4 = 0; + } + else + { + gUnknown_020388CC->unk3C += gUnknown_020388CC->unk44; + gUnknown_020388CC->unk40 += gUnknown_020388CC->unk48; + gUnknown_020388CC->unk5C = gUnknown_020388CC->unk3C >> 8; + gUnknown_020388CC->unk5E = gUnknown_020388CC->unk40 >> 8; + gUnknown_020388CC->unk4C += gUnknown_020388CC->unk50; + if ((gUnknown_020388CC->unk44 < 0 && gUnknown_020388CC->unk5C < gUnknown_020388CC->unk60) + || (gUnknown_020388CC->unk44 > 0 && gUnknown_020388CC->unk5C > gUnknown_020388CC->unk60)) + { + gUnknown_020388CC->unk5C = gUnknown_020388CC->unk60; + gUnknown_020388CC->unk44 = 0; + } + if ((gUnknown_020388CC->unk48 < 0 && gUnknown_020388CC->unk5E < gUnknown_020388CC->unk62) + || (gUnknown_020388CC->unk48 > 0 && gUnknown_020388CC->unk5E > gUnknown_020388CC->unk62)) + { + gUnknown_020388CC->unk5E = gUnknown_020388CC->unk62; + gUnknown_020388CC->unk48 = 0; + } + if (gUnknown_020388CC->unk78 == 0) + { + if (gUnknown_020388CC->unk4C < 0x8000) + { + gUnknown_020388CC->unk4C = 0x8000; + gUnknown_020388CC->unk50 = 0; + } + } + else + { + if (gUnknown_020388CC->unk4C > 0x10000) + { + gUnknown_020388CC->unk4C = 0x10000; + gUnknown_020388CC->unk50 = 0; + } + } + r4 = 1; + } + sub_80FB170(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E, 0x38, 0x48, gUnknown_020388CC->unk4C >> 8, gUnknown_020388CC->unk4C >> 8, 0); + return r4; +} -- cgit v1.2.3 From 563d7591e46475e5429ef594b6058de7451f9ed4 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 15 Jul 2017 01:45:56 -0500 Subject: decompile sub_80FB170 - sub_80FB32C --- src/data/region_map_names_de.h | 79 ++++++++++ src/data/region_map_names_en.h | 79 ++++++++++ src/region_map.c | 330 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 483 insertions(+), 5 deletions(-) create mode 100644 src/data/region_map_names_de.h create mode 100644 src/data/region_map_names_en.h (limited to 'src') diff --git a/src/data/region_map_names_de.h b/src/data/region_map_names_de.h new file mode 100644 index 000000000..10f53c8ba --- /dev/null +++ b/src/data/region_map_names_de.h @@ -0,0 +1,79 @@ +const u8 gMapName_LittlerootTown[] = _("WURZELHEIM"); +const u8 gMapName_OldaleTown[] = _("ROSALTSTADT"); +const u8 gMapName_DewfordTown[] = _("FAUSTAUHAVEN"); +const u8 gMapName_LavaridgeTown[] = _("BAD LAVASTADT"); +const u8 gMapName_FallarborTown[] = _("LAUBWECHSEL{NAME_END}FELD"); +const u8 gMapName_VerdanturfTown[] = _("WIESENFLUR"); +const u8 gMapName_PacifidlogTown[] = _("FLOSSBRUNN"); +const u8 gMapName_PetalburgCity[] = _("BLÜTENBURG{NAME_END} CITY"); +const u8 gMapName_SlateportCity[] = _("GRAPHITPORT{NAME_END} CITY"); +const u8 gMapName_MauvilleCity[] = _("MALVENFROH{NAME_END} CITY"); +const u8 gMapName_RustboroCity[] = _("METAROST{NAME_END} CITY"); +const u8 gMapName_FortreeCity[] = _("BAUMHAUSEN{NAME_END} CITY"); +const u8 gMapName_LilycoveCity[] = _("SEEGRASULB{NAME_END} CITY"); +const u8 gMapName_MossdeepCity[] = _("MOOSBACH{NAME_END} CITY"); +const u8 gMapName_SootopolisCity[] = _("XENEROVILLE"); +const u8 gMapName_EverGrandeCity[] = _("PRACHTPOLIS{NAME_END} CITY"); +const u8 gMapName_Route101[] = _("ROUTE 101"); +const u8 gMapName_Route102[] = _("ROUTE 102"); +const u8 gMapName_Route103[] = _("ROUTE 103"); +const u8 gMapName_Route104[] = _("ROUTE 104"); +const u8 gMapName_Route105[] = _("ROUTE 105"); +const u8 gMapName_Route106[] = _("ROUTE 106"); +const u8 gMapName_Route107[] = _("ROUTE 107"); +const u8 gMapName_Route108[] = _("ROUTE 108"); +const u8 gMapName_Route109[] = _("ROUTE 109"); +const u8 gMapName_Route110[] = _("ROUTE 110"); +const u8 gMapName_Route111[] = _("ROUTE 111"); +const u8 gMapName_Route112[] = _("ROUTE 112"); +const u8 gMapName_Route113[] = _("ROUTE 113"); +const u8 gMapName_Route114[] = _("ROUTE 114"); +const u8 gMapName_Route115[] = _("ROUTE 115"); +const u8 gMapName_Route116[] = _("ROUTE 116"); +const u8 gMapName_Route117[] = _("ROUTE 117"); +const u8 gMapName_Route118[] = _("ROUTE 118"); +const u8 gMapName_Route119[] = _("ROUTE 119"); +const u8 gMapName_Route120[] = _("ROUTE 120"); +const u8 gMapName_Route121[] = _("ROUTE 121"); +const u8 gMapName_Route122[] = _("ROUTE 122"); +const u8 gMapName_Route123[] = _("ROUTE 123"); +const u8 gMapName_Route124[] = _("ROUTE 124"); +const u8 gMapName_Route125[] = _("ROUTE 125"); +const u8 gMapName_Route126[] = _("ROUTE 126"); +const u8 gMapName_Route127[] = _("ROUTE 127"); +const u8 gMapName_Route128[] = _("ROUTE 128"); +const u8 gMapName_Route129[] = _("ROUTE 129"); +const u8 gMapName_Route130[] = _("ROUTE 130"); +const u8 gMapName_Route131[] = _("ROUTE 131"); +const u8 gMapName_Route132[] = _("ROUTE 132"); +const u8 gMapName_Route133[] = _("ROUTE 133"); +const u8 gMapName_Route134[] = _("ROUTE 134"); +const u8 gMapName_Underwater[] = _("UNTERWASSER"); +const u8 gMapName_GraniteCave[] = _("GRANITHÖHLE"); +const u8 gMapName_MtChimney[] = _("SCHLOTBERG"); +const u8 gMapName_SafariZone[] = _("SAFARI-ZONE"); +const u8 gMapName_BattleTower[] = _("DUELLTURM"); +const u8 gMapName_PetalburgWoods[] = _("BLÜTENBURGWALD"); +const u8 gMapName_RusturfTunnel[] = _("METAFLURTUNNEL"); +const u8 gMapName_AbandonedShip[] = _("SCHIFFSWRACK"); +const u8 gMapName_NewMauville[] = _("NEU MALVENFROH"); +const u8 gMapName_MeteorFalls[] = _("METEORFÄLLE"); +const u8 gMapName_MtPyre[] = _("PYROBERG"); +const u8 gMapName_EvilTeamHideout[] = _("{EVIL_TEAM}s VERSTECK"); +const u8 gMapName_ShoalCave[] = _("KÜSTENHÖHLE"); +const u8 gMapName_SeafloorCavern[] = _("TIEFSEEHÖHLE"); +const u8 gMapName_VictoryRoad[] = _("SIEGESSTRASSE"); +const u8 gMapName_MirageIsland[] = _("WUNDEREILAND"); +const u8 gMapName_CaveOfOrigin[] = _("URZEITHÖHLE"); +const u8 gMapName_SouthernIsland[] = _("INSEL IM SÜDEN"); +const u8 gMapName_FieryPath[] = _("FEURIGER PFAD"); +const u8 gMapName_JaggedPass[] = _("STEILPASS"); +const u8 gMapName_SealedChamber[] = _("SIEGELKAMMER"); +const u8 gMapName_ScorchedSlab[] = _("SONNENGROTTE"); +const u8 gMapName_IslandCave[] = _("INSELHÖHLE"); +const u8 gMapName_DesertRuins[] = _("WÜSTENRUINE"); +const u8 gMapName_AncientTomb[] = _("GRABMAL"); +const u8 gMapName_InsideOfTruck[] = _("IM MÖBELWAGEN"); +const u8 gMapName_SkyPillar[] = _("HIMMELTURM"); +const u8 gMapName_SecretBase[] = _("GEHEIMBASIS"); +const u8 gMapName_None[] = _(""); diff --git a/src/data/region_map_names_en.h b/src/data/region_map_names_en.h new file mode 100644 index 000000000..9dde3d71a --- /dev/null +++ b/src/data/region_map_names_en.h @@ -0,0 +1,79 @@ +const u8 gMapName_LittlerootTown[] = _("LITTLEROOT{NAME_END} TOWN"); +const u8 gMapName_OldaleTown[] = _("OLDALE{NAME_END} TOWN"); +const u8 gMapName_DewfordTown[] = _("DEWFORD{NAME_END} TOWN"); +const u8 gMapName_LavaridgeTown[] = _("LAVARIDGE{NAME_END} TOWN"); +const u8 gMapName_FallarborTown[] = _("FALLARBOR{NAME_END} TOWN"); +const u8 gMapName_VerdanturfTown[] = _("VERDANTURF{NAME_END} TOWN"); +const u8 gMapName_PacifidlogTown[] = _("PACIFIDLOG{NAME_END} TOWN"); +const u8 gMapName_PetalburgCity[] = _("PETALBURG{NAME_END} CITY"); +const u8 gMapName_SlateportCity[] = _("SLATEPORT{NAME_END} CITY"); +const u8 gMapName_MauvilleCity[] = _("MAUVILLE{NAME_END} CITY"); +const u8 gMapName_RustboroCity[] = _("RUSTBORO{NAME_END} CITY"); +const u8 gMapName_FortreeCity[] = _("FORTREE{NAME_END} CITY"); +const u8 gMapName_LilycoveCity[] = _("LILYCOVE{NAME_END} CITY"); +const u8 gMapName_MossdeepCity[] = _("MOSSDEEP{NAME_END} CITY"); +const u8 gMapName_SootopolisCity[] = _("SOOTOPOLIS{NAME_END} CITY"); +const u8 gMapName_EverGrandeCity[] = _("EVER GRANDE{NAME_END} CITY"); +const u8 gMapName_Route101[] = _("ROUTE 101"); +const u8 gMapName_Route102[] = _("ROUTE 102"); +const u8 gMapName_Route103[] = _("ROUTE 103"); +const u8 gMapName_Route104[] = _("ROUTE 104"); +const u8 gMapName_Route105[] = _("ROUTE 105"); +const u8 gMapName_Route106[] = _("ROUTE 106"); +const u8 gMapName_Route107[] = _("ROUTE 107"); +const u8 gMapName_Route108[] = _("ROUTE 108"); +const u8 gMapName_Route109[] = _("ROUTE 109"); +const u8 gMapName_Route110[] = _("ROUTE 110"); +const u8 gMapName_Route111[] = _("ROUTE 111"); +const u8 gMapName_Route112[] = _("ROUTE 112"); +const u8 gMapName_Route113[] = _("ROUTE 113"); +const u8 gMapName_Route114[] = _("ROUTE 114"); +const u8 gMapName_Route115[] = _("ROUTE 115"); +const u8 gMapName_Route116[] = _("ROUTE 116"); +const u8 gMapName_Route117[] = _("ROUTE 117"); +const u8 gMapName_Route118[] = _("ROUTE 118"); +const u8 gMapName_Route119[] = _("ROUTE 119"); +const u8 gMapName_Route120[] = _("ROUTE 120"); +const u8 gMapName_Route121[] = _("ROUTE 121"); +const u8 gMapName_Route122[] = _("ROUTE 122"); +const u8 gMapName_Route123[] = _("ROUTE 123"); +const u8 gMapName_Route124[] = _("ROUTE 124"); +const u8 gMapName_Route125[] = _("ROUTE 125"); +const u8 gMapName_Route126[] = _("ROUTE 126"); +const u8 gMapName_Route127[] = _("ROUTE 127"); +const u8 gMapName_Route128[] = _("ROUTE 128"); +const u8 gMapName_Route129[] = _("ROUTE 129"); +const u8 gMapName_Route130[] = _("ROUTE 130"); +const u8 gMapName_Route131[] = _("ROUTE 131"); +const u8 gMapName_Route132[] = _("ROUTE 132"); +const u8 gMapName_Route133[] = _("ROUTE 133"); +const u8 gMapName_Route134[] = _("ROUTE 134"); +const u8 gMapName_Underwater[] = _("UNDERWATER"); +const u8 gMapName_GraniteCave[] = _("GRANITE CAVE"); +const u8 gMapName_MtChimney[] = _("MT. CHIMNEY"); +const u8 gMapName_SafariZone[] = _("SAFARI ZONE"); +const u8 gMapName_BattleTower[] = _("BATTLE TOWER"); +const u8 gMapName_PetalburgWoods[] = _("PETALBURG WOODS"); +const u8 gMapName_RusturfTunnel[] = _("RUSTURF TUNNEL"); +const u8 gMapName_AbandonedShip[] = _("ABANDONED SHIP"); +const u8 gMapName_NewMauville[] = _("NEW MAUVILLE"); +const u8 gMapName_MeteorFalls[] = _("METEOR FALLS"); +const u8 gMapName_MtPyre[] = _("MT. PYRE"); +const u8 gMapName_EvilTeamHideout[] = _("{EVIL_TEAM} HIDEOUT"); +const u8 gMapName_ShoalCave[] = _("SHOAL CAVE"); +const u8 gMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN"); +const u8 gMapName_VictoryRoad[] = _("VICTORY ROAD"); +const u8 gMapName_MirageIsland[] = _("MIRAGE ISLAND"); +const u8 gMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN"); +const u8 gMapName_SouthernIsland[] = _("SOUTHERN ISLAND"); +const u8 gMapName_FieryPath[] = _("FIERY PATH"); +const u8 gMapName_JaggedPass[] = _("JAGGED PASS"); +const u8 gMapName_SealedChamber[] = _("SEALED CHAMBER"); +const u8 gMapName_ScorchedSlab[] = _("SCORCHED SLAB"); +const u8 gMapName_IslandCave[] = _("ISLAND CAVE"); +const u8 gMapName_DesertRuins[] = _("DESERT RUINS"); +const u8 gMapName_AncientTomb[] = _("ANCIENT TOMB"); +const u8 gMapName_InsideOfTruck[] = _("INSIDE OF TRUCK"); +const u8 gMapName_SkyPillar[] = _("SKY PILLAR"); +const u8 gMapName_SecretBase[] = _("SECRET BASE"); +const u8 gMapName_None[] = _(""); diff --git a/src/region_map.c b/src/region_map.c index 0a50da51e..07c88ccd3 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1,7 +1,9 @@ #include "global.h" #include "main.h" #include "palette.h" +#include "rom4.h" #include "sprite.h" +#include "trig.h" struct UnknownStruct1 { @@ -12,7 +14,12 @@ struct UnknownStruct1 u8 (*unk18)(void); struct Sprite *unk1C; struct Sprite *unk20; - u8 filler24[0x18]; + s32 unk24; + s32 unk28; + u32 unk2C; + u32 unk30; + u32 unk34; + u32 unk38; s32 unk3C; s32 unk40; s32 unk44; @@ -44,7 +51,8 @@ struct UnknownStruct1 s8 unk7C; // movement delta vertical u8 unk7D; u8 unk7E; - u8 filler7F[0x101]; + u8 unk7F; + u8 filler80[0x100]; u8 unk180[0x100]; u8 unk280[0x100]; }; @@ -62,17 +70,142 @@ const u16 gUnknown_083E5D60[] = INCBIN_U16("graphics/pokenav/region_map.gbapal") const u8 gUnknown_083E5DA0[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz"); const u8 gUnknown_083E6B04[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz"); +const u8 gRegionMapSections[] = +{ + 0x58, 0x1D, 0x1D, 0x04, 0x1C, 0x1C, 0x1C, 0x1C, 0x1A, 0x58, 0x58, 0x22, 0x0B, 0x23, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, + 0x58, 0x1D, 0x58, 0x58, 0x58, 0x58, 0x38, 0x38, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, + 0x1E, 0x1D, 0x58, 0x58, 0x58, 0x58, 0x38, 0x38, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x58, 0x58, 0x39, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, + 0x1E, 0x58, 0x58, 0x58, 0x58, 0x03, 0x1B, 0x1B, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x24, 0x24, 0x24, 0x24, 0x0C, 0x0C, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0x58, 0x58, + 0x1E, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x58, 0x58, 0x58, 0x25, 0x58, 0x58, 0x58, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0x58, 0x58, + 0x0A, 0x1F, 0x1F, 0x1F, 0x1F, 0x58, 0x58, 0x58, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x58, 0x58, 0x58, 0x25, 0x58, 0x58, 0x58, 0x27, 0x27, 0x27, 0x27, 0x0D, 0x0D, 0x58, 0x58, + 0x0A, 0x58, 0x58, 0x58, 0x05, 0x20, 0x20, 0x20, 0x09, 0x09, 0x21, 0x21, 0x26, 0x26, 0x26, 0x26, 0x26, 0x58, 0x58, 0x58, 0x29, 0x29, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x58, + 0x13, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x29, 0x0E, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x58, + 0x13, 0x58, 0x58, 0x58, 0x12, 0x12, 0x12, 0x12, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x29, 0x29, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x0F, + 0x13, 0x07, 0x11, 0x11, 0x01, 0x58, 0x58, 0x58, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x2B, 0x2B, 0x2B, 0x2B, 0x0F, + 0x14, 0x58, 0x58, 0x58, 0x10, 0x58, 0x58, 0x58, 0x08, 0x31, 0x31, 0x31, 0x30, 0x30, 0x30, 0x2F, 0x2F, 0x06, 0x2E, 0x2E, 0x2E, 0x2D, 0x2D, 0x2D, 0x2C, 0x2C, 0x58, 0x58, + 0x14, 0x58, 0x58, 0x58, 0x00, 0x58, 0x58, 0x58, 0x08, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, + 0x14, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x18, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x3A, 0x58, 0x58, 0x58, 0x58, 0x58, + 0x15, 0x15, 0x15, 0x58, 0x58, 0x58, 0x58, 0x58, 0x18, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, + 0x58, 0x58, 0x02, 0x16, 0x16, 0x16, 0x17, 0x17, 0x18, 0x58, 0x58, 0x58, 0x49, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, +}; + +#if ENGLISH +#include "data/region_map_names_en.h" +#elif GERMAN +#include "data/region_map_names_de.h" +#endif + +struct RegionMapLocation +{ + u8 x, y; + u8 width, height; + const u8 *name; +}; + +const struct RegionMapLocation gRegionMapLocations[] = +{ + { 4, 11, 1, 1, gMapName_LittlerootTown}, + { 4, 9, 1, 1, gMapName_OldaleTown}, + { 2, 14, 1, 1, gMapName_DewfordTown}, + { 5, 3, 1, 1, gMapName_LavaridgeTown}, + { 3, 0, 1, 1, gMapName_FallarborTown}, + { 4, 6, 1, 1, gMapName_VerdanturfTown}, + {17, 10, 1, 1, gMapName_PacifidlogTown}, + { 1, 9, 1, 1, gMapName_PetalburgCity}, + { 8, 10, 1, 2, gMapName_SlateportCity}, + { 8, 6, 2, 1, gMapName_MauvilleCity}, + { 0, 5, 1, 2, gMapName_RustboroCity}, + {12, 0, 1, 1, gMapName_FortreeCity}, + {18, 3, 2, 1, gMapName_LilycoveCity}, + {24, 5, 2, 1, gMapName_MossdeepCity}, + {21, 7, 1, 1, gMapName_SootopolisCity}, + {27, 8, 1, 2, gMapName_EverGrandeCity}, + { 4, 10, 1, 1, gMapName_Route101}, + { 2, 9, 2, 1, gMapName_Route102}, + { 4, 8, 4, 1, gMapName_Route103}, + { 0, 7, 1, 3, gMapName_Route104}, + { 0, 10, 1, 3, gMapName_Route105}, + { 0, 13, 2, 1, gMapName_Route106}, + { 3, 14, 3, 1, gMapName_Route107}, + { 6, 14, 2, 1, gMapName_Route108}, + { 8, 12, 1, 3, gMapName_Route109}, + { 8, 7, 1, 3, gMapName_Route110}, + { 8, 0, 1, 6, gMapName_Route111}, + { 6, 3, 2, 1, gMapName_Route112}, + { 4, 0, 4, 1, gMapName_Route113}, + { 1, 0, 2, 3, gMapName_Route114}, + { 0, 2, 1, 3, gMapName_Route115}, + { 1, 5, 4, 1, gMapName_Route116}, + { 5, 6, 3, 1, gMapName_Route117}, + {10, 6, 2, 1, gMapName_Route118}, + {11, 0, 1, 6, gMapName_Route119}, + {13, 0, 1, 4, gMapName_Route120}, + {14, 3, 4, 1, gMapName_Route121}, + {16, 4, 1, 2, gMapName_Route122}, + {12, 6, 5, 1, gMapName_Route123}, + {20, 3, 4, 3, gMapName_Route124}, + {24, 3, 2, 2, gMapName_Route125}, + {20, 6, 3, 3, gMapName_Route126}, + {23, 6, 3, 3, gMapName_Route127}, + {23, 9, 4, 1, gMapName_Route128}, + {24, 10, 2, 1, gMapName_Route129}, + {21, 10, 3, 1, gMapName_Route130}, + {18, 10, 3, 1, gMapName_Route131}, + {15, 10, 2, 1, gMapName_Route132}, + {12, 10, 3, 1, gMapName_Route133}, + { 9, 10, 3, 1, gMapName_Route134}, + {20, 3, 4, 3, gMapName_Underwater}, + {20, 6, 3, 3, gMapName_Underwater}, + {23, 6, 3, 3, gMapName_Underwater}, + {23, 9, 4, 1, gMapName_Underwater}, + {21, 7, 1, 1, gMapName_Underwater}, + { 1, 13, 1, 1, gMapName_GraniteCave}, + { 6, 2, 1, 1, gMapName_MtChimney}, + {16, 2, 1, 1, gMapName_SafariZone}, + {22, 12, 1, 1, gMapName_BattleTower}, + { 0, 8, 1, 1, gMapName_PetalburgWoods}, + { 2, 5, 1, 1, gMapName_RusturfTunnel}, + { 6, 14, 1, 1, gMapName_AbandonedShip}, + { 8, 7, 1, 1, gMapName_NewMauville}, + { 0, 3, 1, 1, gMapName_MeteorFalls}, + { 1, 2, 1, 1, gMapName_MeteorFalls}, + {16, 4, 1, 1, gMapName_MtPyre}, + {19, 3, 1, 1, gMapName_EvilTeamHideout}, + {24, 4, 1, 1, gMapName_ShoalCave}, + {24, 9, 1, 1, gMapName_SeafloorCavern}, + {24, 9, 1, 1, gMapName_Underwater}, + {27, 9, 1, 1, gMapName_VictoryRoad}, + {17, 10, 1, 1, gMapName_MirageIsland}, + {21, 7, 1, 1, gMapName_CaveOfOrigin}, + {12, 14, 1, 1, gMapName_SouthernIsland}, + { 6, 3, 1, 1, gMapName_FieryPath}, + { 7, 3, 1, 1, gMapName_FieryPath}, + { 6, 3, 1, 1, gMapName_JaggedPass}, + { 7, 2, 1, 1, gMapName_JaggedPass}, + {11, 10, 1, 1, gMapName_SealedChamber}, + {11, 10, 1, 1, gMapName_Underwater}, + {13, 0, 1, 1, gMapName_ScorchedSlab}, + {0, 10, 1, 1, gMapName_IslandCave}, + { 8, 3, 1, 1, gMapName_DesertRuins}, + {13, 2, 1, 1, gMapName_AncientTomb}, + { 0, 0, 1, 1, gMapName_InsideOfTruck}, + {19, 10, 1, 1, gMapName_SkyPillar}, + { 0, 0, 1, 1, gMapName_SecretBase}, + { 0, 0, 1, 1, gMapName_None}, +}; + void sub_80FA904(struct UnknownStruct1 *, u8); bool8 sub_80FA940(void); u8 sub_80FAB78(void); u8 _swiopen(void); u8 sub_80FAD04(void); u8 sub_80FADE4(void); -void sub_80FB170(int, int, int, int, u16, u16, int); -void sub_80FB238(); +void sub_80FB170(s16, s16, s16, s16, u16, u16, u8); +void sub_80FB238(s16, s16); void sub_80FB260(void); -u16 GetRegionMapSectionAt(); +u16 GetRegionMapSectionAt(u16, u16); void sub_80FB32C(void); +void sub_80FB600(void); u16 sub_80FB758(); u16 sub_80FB9C0(u16); void sub_80FBA18(); @@ -409,3 +542,190 @@ u8 sub_80FAFC0(void) sub_80FB170(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E, 0x38, 0x48, gUnknown_020388CC->unk4C >> 8, gUnknown_020388CC->unk4C >> 8, 0); return r4; } + +void sub_80FB170(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 g) +{ + s32 var1; + s32 var2; + s32 var3; + s32 var4; + + gUnknown_020388CC->unk2C = e * gSineTable[g + 64] >> 8; + gUnknown_020388CC->unk30 = e * -gSineTable[g] >> 8; + gUnknown_020388CC->unk34 = f * gSineTable[g] >> 8; + gUnknown_020388CC->unk38 = f * gSineTable[g + 64] >> 8; + + var1 = (a << 8) + (c << 8); + var2 = d * gUnknown_020388CC->unk34 + gUnknown_020388CC->unk2C * c; + gUnknown_020388CC->unk24 = var1 - var2; + + var3 = (b << 8) + (d << 8); + var4 = gUnknown_020388CC->unk38 * d + gUnknown_020388CC->unk30 * c; + gUnknown_020388CC->unk28 = var3 - var4; + + gUnknown_020388CC->unk7D = 1; +} + +void sub_80FB238(s16 a, s16 b) +{ + gUnknown_020388CC->unk24 = 0x1C00 + (a << 8); + gUnknown_020388CC->unk28 = 0x2400 + (b << 8); + gUnknown_020388CC->unk7D = 1; +} + +void sub_80FB260(void) +{ + if (gUnknown_020388CC->unk7D != 0) + { + REG_BG2PA = gUnknown_020388CC->unk2C; + REG_BG2PB = gUnknown_020388CC->unk34; + REG_BG2PC = gUnknown_020388CC->unk30; + REG_BG2PD = gUnknown_020388CC->unk38; + REG_BG2X = gUnknown_020388CC->unk24; + REG_BG2Y = gUnknown_020388CC->unk28; + gUnknown_020388CC->unk7D = 0; + } +} + +void sub_80FB2A4(s16 a, s16 b) +{ + sub_80FB170(a, b, 0x38, 0x48, 0x100, 0x100, 0); + sub_80FB260(); + if (gUnknown_020388CC->unk20 != NULL) + { + gUnknown_020388CC->unk20->pos2.x = -a; + gUnknown_020388CC->unk20->pos2.y = -b; + } +} + +u16 GetRegionMapSectionAt(u16 x, u16 y) +{ + + if (y < 2 || y > 16 || x < 1 || x > 0x1C) + return 0x58; + y -= 2; + x -= 1; + return gRegionMapSections[x + y * 28]; +} + +void sub_80FB32C(void) +{ + struct MapHeader *mapHeader; + u16 mapWidth; + u16 mapHeight; + u16 x; + u16 y; + u16 r1; + u16 r9; + + if (gSaveBlock1.location.mapGroup == 0x19 && (gSaveBlock1.location.mapNum == 0x29 || gSaveBlock1.location.mapNum == 0x2A || gSaveBlock1.location.mapNum == 0x2B)) + { + sub_80FB600(); + return; + } + + switch (get_map_light_level_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum) - 1) + { + default: + case 0: + case 1: + case 2: + case 4: + case 5: + gUnknown_020388CC->unk14 = gMapHeader.name; + gUnknown_020388CC->unk7F = 0; + mapWidth = gMapHeader.mapData->width; + mapHeight = gMapHeader.mapData->height; + x = gSaveBlock1.pos.x; + y = gSaveBlock1.pos.y; + if (gUnknown_020388CC->unk14 == 0x45) + gUnknown_020388CC->unk7F = 1; + break; + case 3: + case 6: + mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp4.mapGroup, gSaveBlock1.warp4.mapNum); + gUnknown_020388CC->unk14 = mapHeader->name; + gUnknown_020388CC->unk7F = 1; + mapWidth = mapHeader->mapData->width; + mapHeight = mapHeader->mapData->height; + x = gSaveBlock1.warp4.x; + y = gSaveBlock1.warp4.y; + break; + case 8: + mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum); + gUnknown_020388CC->unk14 = mapHeader->name; + gUnknown_020388CC->unk7F = 1; + mapWidth = mapHeader->mapData->width; + mapHeight = mapHeader->mapData->height; + x = gSaveBlock1.warp2.x; + y = gSaveBlock1.warp2.y; + break; + case 7: + { + struct WarpData *r4; + + gUnknown_020388CC->unk14 = gMapHeader.name; + if (gUnknown_020388CC->unk14 != 0x57) + { + r4 = &gSaveBlock1.warp4; + mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum); + } + else + { + r4 = &gSaveBlock1.warp2; + mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum); + gUnknown_020388CC->unk14 = mapHeader->name; + } + gUnknown_020388CC->unk7F = 0; + mapWidth = mapHeader->mapData->width; + mapHeight = mapHeader->mapData->height; + x = r4->x; + y = r4->y; + } + break; + } + r9 = x; + r1 = mapWidth / gRegionMapLocations[gUnknown_020388CC->unk14].width; + if (r1 == 0) + r1 = 1; + x /= r1; + if (x >= gRegionMapLocations[gUnknown_020388CC->unk14].width) + x = gRegionMapLocations[gUnknown_020388CC->unk14].width - 1; + r1 = mapHeight / gRegionMapLocations[gUnknown_020388CC->unk14].height; + if (r1 == 0) + r1 = 1; + y /= r1; + if (y >= gRegionMapLocations[gUnknown_020388CC->unk14].height) + y = gRegionMapLocations[gUnknown_020388CC->unk14].height - 1; + switch (gUnknown_020388CC->unk14) + { + case 0x1D: + if (y != 0) + x = 0; + break; + case 0x29: + case 0x33: + x = 0; + if (gSaveBlock1.pos.x > 32) + x = 1; + if (gSaveBlock1.pos.x > 0x33) + x++; + y = 0; + if (gSaveBlock1.pos.y > 0x25) + y = 1; + if (gSaveBlock1.pos.y > 0x38) + y++; + break; + case 0x24: + x = 0; + if (r9 > 14) + x = 1; + if (r9 > 0x1C) + x++; + if (r9 > 0x36) + x++; + break; + } + gUnknown_020388CC->unk54 = gRegionMapLocations[gUnknown_020388CC->unk14].x + x + 1; + gUnknown_020388CC->unk56 = gRegionMapLocations[gUnknown_020388CC->unk14].y + y + 2; +} -- cgit v1.2.3 From 4d28489c65aba913e4169b3467dce49b54f38c87 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 15 Jul 2017 14:50:23 -0500 Subject: decompile sub_80FB600 - sub_80FBB3C --- src/region_map.c | 356 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 343 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/region_map.c b/src/region_map.c index 07c88ccd3..9e95c40d0 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1,4 +1,6 @@ #include "global.h" +#include "event_data.h" +#include "field_specials.h" #include "main.h" #include "palette.h" #include "rom4.h" @@ -10,7 +12,7 @@ struct UnknownStruct1 u8 filler0[0x14]; u16 unk14; u8 unk16; - u8 filler17[1]; + u8 unk17; u8 (*unk18)(void); struct Sprite *unk1C; struct Sprite *unk20; @@ -54,7 +56,7 @@ struct UnknownStruct1 u8 unk7F; u8 filler80[0x100]; u8 unk180[0x100]; - u8 unk280[0x100]; + u8 unk280[0x100]; // possibly 0x600 }; extern struct UnknownStruct1 *gUnknown_020388CC; @@ -194,6 +196,23 @@ const struct RegionMapLocation gRegionMapLocations[] = { 0, 0, 1, 1, gMapName_None}, }; +const u16 gUnknown_083E7684[][2] = +{ + {50, 39}, + {51, 41}, + {52, 42}, + {53, 43}, + {54, 14}, + {69, 43}, + {66, 12}, + {79, 49}, + {59, 19}, + {76, 27}, + {65, 37}, + {85, 46}, + {88, 88}, +}; + void sub_80FA904(struct UnknownStruct1 *, u8); bool8 sub_80FA940(void); u8 sub_80FAB78(void); @@ -206,10 +225,11 @@ void sub_80FB260(void); u16 GetRegionMapSectionAt(u16, u16); void sub_80FB32C(void); void sub_80FB600(void); -u16 sub_80FB758(); +u16 sub_80FB758(u16); u16 sub_80FB9C0(u16); -void sub_80FBA18(); -void sub_80FBB3C(); +void sub_80FBA18(void); +u8 sub_80FBAA0(u16); +void sub_80FBB3C(u16, u16); void sub_80FBCA0(void); void sub_80FBDF8(void); void sub_80FBE24(void); @@ -549,20 +569,20 @@ void sub_80FB170(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 g) s32 var2; s32 var3; s32 var4; - + gUnknown_020388CC->unk2C = e * gSineTable[g + 64] >> 8; gUnknown_020388CC->unk30 = e * -gSineTable[g] >> 8; gUnknown_020388CC->unk34 = f * gSineTable[g] >> 8; gUnknown_020388CC->unk38 = f * gSineTable[g + 64] >> 8; - + var1 = (a << 8) + (c << 8); var2 = d * gUnknown_020388CC->unk34 + gUnknown_020388CC->unk2C * c; gUnknown_020388CC->unk24 = var1 - var2; - + var3 = (b << 8) + (d << 8); var4 = gUnknown_020388CC->unk38 * d + gUnknown_020388CC->unk30 * c; gUnknown_020388CC->unk28 = var3 - var4; - + gUnknown_020388CC->unk7D = 1; } @@ -600,7 +620,7 @@ void sub_80FB2A4(s16 a, s16 b) u16 GetRegionMapSectionAt(u16 x, u16 y) { - + if (y < 2 || y > 16 || x < 1 || x > 0x1C) return 0x58; y -= 2; @@ -617,13 +637,13 @@ void sub_80FB32C(void) u16 y; u16 r1; u16 r9; - + if (gSaveBlock1.location.mapGroup == 0x19 && (gSaveBlock1.location.mapNum == 0x29 || gSaveBlock1.location.mapNum == 0x2A || gSaveBlock1.location.mapNum == 0x2B)) { sub_80FB600(); return; } - + switch (get_map_light_level_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum) - 1) { default: @@ -663,7 +683,7 @@ void sub_80FB32C(void) case 7: { struct WarpData *r4; - + gUnknown_020388CC->unk14 = gMapHeader.name; if (gUnknown_020388CC->unk14 != 0x57) { @@ -684,19 +704,23 @@ void sub_80FB32C(void) } break; } + r9 = x; + r1 = mapWidth / gRegionMapLocations[gUnknown_020388CC->unk14].width; if (r1 == 0) r1 = 1; x /= r1; if (x >= gRegionMapLocations[gUnknown_020388CC->unk14].width) x = gRegionMapLocations[gUnknown_020388CC->unk14].width - 1; + r1 = mapHeight / gRegionMapLocations[gUnknown_020388CC->unk14].height; if (r1 == 0) r1 = 1; y /= r1; if (y >= gRegionMapLocations[gUnknown_020388CC->unk14].height) y = gRegionMapLocations[gUnknown_020388CC->unk14].height - 1; + switch (gUnknown_020388CC->unk14) { case 0x1D: @@ -729,3 +753,309 @@ void sub_80FB32C(void) gUnknown_020388CC->unk54 = gRegionMapLocations[gUnknown_020388CC->unk14].x + x + 1; gUnknown_020388CC->unk56 = gRegionMapLocations[gUnknown_020388CC->unk14].y + y + 2; } + +void sub_80FB600(void) +{ + u16 y = 0; + u16 x = 0; + u8 mapGroup; + u8 mapNum; + s16 sp2; + s16 sp4; + + switch (GetSSTidalLocation(&mapGroup, &mapNum, &sp2, &sp4)) + { + case 1: + gUnknown_020388CC->unk14 = 8; + break; + case 2: + gUnknown_020388CC->unk14 = 12; + break; + case 3: + gUnknown_020388CC->unk14 = 0x27; + break; + case 4: + gUnknown_020388CC->unk14 = 0x2E; + break; + default: + case 0: + { + struct MapHeader *mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum); + u16 r1; + + gUnknown_020388CC->unk14 = mapHeader->name; + r1 = mapHeader->mapData->width / gRegionMapLocations[gUnknown_020388CC->unk14].width; + if (r1 == 0) + r1 = 1; + x = sp2 / r1; + if (x >= gRegionMapLocations[gUnknown_020388CC->unk14].width) + x = gRegionMapLocations[gUnknown_020388CC->unk14].width - 1; + + r1 = mapHeader->mapData->height / gRegionMapLocations[gUnknown_020388CC->unk14].height; + if (r1 == 0) + r1 = 1; + y = sp4 / r1; + if (y >= gRegionMapLocations[gUnknown_020388CC->unk14].height) + y = gRegionMapLocations[gUnknown_020388CC->unk14].height - 1; + } + break; + } + gUnknown_020388CC->unk7F = 0; + gUnknown_020388CC->unk54 = gRegionMapLocations[gUnknown_020388CC->unk14].x + x + 1; + gUnknown_020388CC->unk56 = gRegionMapLocations[gUnknown_020388CC->unk14].y + y + 2; +} + +u16 sub_80FB758(u16 a) +{ + switch (a) + { + case 88: + return 0; + case 0: + return FlagGet(0x80F) ? 2 : 3; + case 1: + return FlagGet(0x810) ? 2 : 3; + case 2: + return FlagGet(0x811) ? 2 : 3; + case 3: + return FlagGet(0x812) ? 2 : 3; + case 4: + return FlagGet(0x813) ? 2 : 3; + case 5: + return FlagGet(0x814) ? 2 : 3; + case 6: + return FlagGet(0x815) ? 2 : 3; + case 7: + return FlagGet(0x816) ? 2 : 3; + case 8: + return FlagGet(0x817) ? 2 : 3; + case 9: + return FlagGet(0x818) ? 2 : 3; + case 10: + return FlagGet(0x819) ? 2 : 3; + case 11: + return FlagGet(0x81A) ? 2 : 3; + case 12: + return FlagGet(0x81B) ? 2 : 3; + case 13: + return FlagGet(0x81C) ? 2 : 3; + case 14: + return FlagGet(0x81D) ? 2 : 3; + case 15: + return FlagGet(0x81E) ? 2 : 3; + case 58: + return FlagGet(0x848) ? 4 : 0; + case 73: + return FlagGet(0x849) ? 1 : 0; + default: + return 1; + } +} + +u16 GetRegionMapSectionAt_(u16 x, u16 y) +{ + return GetRegionMapSectionAt(x, y); +} + +u16 sub_80FB9C0(u16 a) +{ + u16 i = 0; + + while (gUnknown_083E7684[i][0] != 88) + { + if (gUnknown_083E7684[i][0] == a) + return gUnknown_083E7684[i][1]; + i++; + } + return a; +} + +u16 sub_80FBA04(u16 a) +{ + return sub_80FB9C0(a); +} + +void sub_80FBA18(void) +{ + u16 x; + u16 y; + u16 i; + + if (gUnknown_020388CC->unk14 == 88) + { + gUnknown_020388CC->unk17 = 0; + return; + } + + if (gUnknown_020388CC->unk78 == 0) + { + x = gUnknown_020388CC->unk54; + y = gUnknown_020388CC->unk56; + } + else + { + x = gUnknown_020388CC->unk64; + y = gUnknown_020388CC->unk66; + } + + i = 0; + while (1) + { + if (x <= 1) + { + if (sub_80FBAA0(y) != 0) + { + y--; + x = 0x1D; + } + else + { + break; + } + } + else + { + x--; + if (GetRegionMapSectionAt(x, y) == gUnknown_020388CC->unk14) + i++; + } + } + + gUnknown_020388CC->unk17 = i; +} + +u8 sub_80FBAA0(u16 a) +{ + u16 x; + u16 y; + + y = a - 1; + if (y == 0xFFFF) + return 0; + + x = 1; + while (x < 0x1D) + { + if (GetRegionMapSectionAt(x, y) == gUnknown_020388CC->unk14) + return 1; + x++; + } + return 0; +} + + + +const struct OamData gOamData_83E76B8 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_83E76C0[] = +{ + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(4, 20), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gSpriteAnim_83E76CC[] = +{ + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(16, 10), + ANIMCMD_FRAME(32, 10), + ANIMCMD_FRAME(16, 10), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gSpriteAnimTable_83E76E0[] = +{ + gSpriteAnim_83E76C0, + gSpriteAnim_83E76CC, +}; + +void sub_80FBAF0(struct Sprite *sprite) +{ + if (gUnknown_020388CC->unk7A != 0) + { + sprite->pos1.x += gUnknown_020388CC->unk7B * 2; + sprite->pos1.y += gUnknown_020388CC->unk7C * 2; + gUnknown_020388CC->unk7A--; + } +} + +void nullsub_66(struct Sprite *sprite) +{ +} + +void sub_80FBB3C(u16 tileTag, u16 paletteTag) +{ + u8 spriteId; + struct SpriteSheet spriteSheet; + struct SpritePalette spritePalette = + { + .data = gPokenavCursor_Pal, + }; + struct SpriteTemplate spriteTemplate = + { + .oam = &gOamData_83E76B8, + .anims = gSpriteAnimTable_83E76E0, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FBAF0, + }; + + spriteSheet.tag = tileTag; + spriteTemplate.tileTag = tileTag; + gUnknown_020388CC->unk58 = tileTag; + + spritePalette.tag = paletteTag; + spriteTemplate.paletteTag = paletteTag; + gUnknown_020388CC->unk5A = paletteTag; + + if (gUnknown_020388CC->unk78 == 0) + { + spriteSheet.data = gUnknown_020388CC->unk180; + spriteSheet.size = 0x100; + spriteTemplate.callback = sub_80FBAF0; + } + else + { + spriteSheet.data = gUnknown_020388CC->unk280; + spriteSheet.size = 0x600; + spriteTemplate.callback = nullsub_66; + } + LoadSpriteSheet(&spriteSheet); + LoadSpritePalette(&spritePalette); + spriteId = CreateSprite(&spriteTemplate, 0x38, 0x48, 0); + if (spriteId != 64) + { + gUnknown_020388CC->unk1C = &gSprites[spriteId]; + if (gUnknown_020388CC->unk78 == 1) + { + gUnknown_020388CC->unk1C->oam.size = 2; + gUnknown_020388CC->unk1C->pos1.x -= 8; + gUnknown_020388CC->unk1C->pos1.y -= 8; + StartSpriteAnim(gUnknown_020388CC->unk1C, 1); + } + else + { + gUnknown_020388CC->unk1C->oam.size = 1; + gUnknown_020388CC->unk1C->pos1.x = gUnknown_020388CC->unk54 * 8 + 4; + gUnknown_020388CC->unk1C->pos1.y = gUnknown_020388CC->unk56 * 8 + 4; + } + gUnknown_020388CC->unk1C->data1 = 2; + gUnknown_020388CC->unk1C->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101; + gUnknown_020388CC->unk1C->data3 = 1; + } +} -- cgit v1.2.3 From 32a9e2ae445e6f5674357edc4e8b9ee90c927c43 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 15 Jul 2017 20:52:54 -0500 Subject: finish decompiling region_map --- src/menu.c | 2 +- src/region_map.c | 746 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 741 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/menu.c b/src/menu.c index d532fc602..8d80c35aa 100644 --- a/src/menu.c +++ b/src/menu.c @@ -710,7 +710,7 @@ _08072B3E:\n\ } #endif -void MenuPrint_RightAligned(u8 *str, u8 left, u8 top) +void MenuPrint_RightAligned(const u8 *str, u8 left, u8 top) { sub_8004D38(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); } diff --git a/src/region_map.c b/src/region_map.c index 9e95c40d0..6318893ab 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1,10 +1,19 @@ #include "global.h" #include "event_data.h" +#include "field_effect.h" #include "field_specials.h" +#include "m4a.h" #include "main.h" +#include "menu.h" #include "palette.h" +#include "pokemon_menu.h" #include "rom4.h" +#include "secret_base.h" +#include "songs.h" #include "sprite.h" +#include "strings.h" +#include "string_util.h" +#include "text.h" #include "trig.h" struct UnknownStruct1 @@ -233,7 +242,21 @@ void sub_80FBB3C(u16, u16); void sub_80FBCA0(void); void sub_80FBDF8(void); void sub_80FBE24(void); -void sub_80FBFB4(); +void sub_80FBF34(struct Sprite *); +void sub_80FBF40(struct Sprite *); +void sub_80FBEA4(struct Sprite *); +const u8 *sub_80FBFB4(u8 *, u16, u16); +void sub_80FC214(void); +void sub_80FC228(void); +void sub_80FC244(void (*func)(void)); +void sub_80FC254(void); +void sub_80FC31C(void); +void sub_80FC374(void); +void sub_80FC484(void); +void sub_80FC55C(struct Sprite *); +void sub_80FC5B4(void); +void sub_80FC600(void); +void sub_80FC69C(void); void sub_80FA8EC(struct UnknownStruct1 *a, u8 b) { @@ -275,7 +298,7 @@ bool8 sub_80FA940(void) gUnknown_020388CC->unk76 = gUnknown_020388CC->unk56; gUnknown_020388CC->unk16 = sub_80FB758(gUnknown_020388CC->unk14); gUnknown_020388CC->unk14 = sub_80FB9C0(gUnknown_020388CC->unk14); - sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16); + sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16); break; case 6: if (gUnknown_020388CC->unk78 == 0) @@ -390,7 +413,7 @@ u8 _swiopen(void) if (r4 != gUnknown_020388CC->unk14) { gUnknown_020388CC->unk14 = r4; - sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16); + sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16); } sub_80FBA18(); gUnknown_020388CC->unk18 = sub_80FAB78; @@ -456,7 +479,7 @@ u8 sub_80FADE4(void) if (r4 != gUnknown_020388CC->unk14) { gUnknown_020388CC->unk14 = r4; - sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16); + sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16); } sub_80FBA18(); } @@ -1018,11 +1041,11 @@ void sub_80FBB3C(u16 tileTag, u16 paletteTag) spriteSheet.tag = tileTag; spriteTemplate.tileTag = tileTag; gUnknown_020388CC->unk58 = tileTag; - + spritePalette.tag = paletteTag; spriteTemplate.paletteTag = paletteTag; gUnknown_020388CC->unk5A = paletteTag; - + if (gUnknown_020388CC->unk78 == 0) { spriteSheet.data = gUnknown_020388CC->unk180; @@ -1059,3 +1082,714 @@ void sub_80FBB3C(u16 tileTag, u16 paletteTag) gUnknown_020388CC->unk1C->data3 = 1; } } + +void sub_80FBCA0(void) +{ + if (gUnknown_020388CC->unk1C != NULL) + { + DestroySprite(gUnknown_020388CC->unk1C); + FreeSpriteTilesByTag(gUnknown_020388CC->unk58); + FreeSpritePaletteByTag(gUnknown_020388CC->unk5A); + } +} + +void unref_sub_80FBCD0(void) +{ + gUnknown_020388CC->unk1C->data3 = 1; +} + +void unref_sub_80FBCE0(void) +{ + gUnknown_020388CC->unk1C->data3 = 0; +} + +const struct OamData gOamData_083E7708 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_83E7710[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_083E7718[] = +{ + gSpriteAnim_83E7710, +}; + +void sub_80FBCF0(u16 tileTag, u16 paletteTag) +{ + u8 spriteId; + struct SpriteSheet spriteSheet = + { + .data = gRegionMapBrendanIconTiles, + .size = 128, + .tag = tileTag, + }; + struct SpritePalette spritePalette = + { + .data = gRegionMapBrendanIconPalette, + .tag = paletteTag, + }; + struct SpriteTemplate spriteTemplate = + { + .tileTag = tileTag, + .paletteTag = paletteTag, + .oam = &gOamData_083E7708, + .anims = gSpriteAnimTable_083E7718, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }; + + if (gSaveBlock2.playerGender == FEMALE) + { + spriteSheet.data = gRegionMapMayIconTiles; + spritePalette.data = gRegionMapMayIconPalette; + } + LoadSpriteSheet(&spriteSheet); + LoadSpritePalette(&spritePalette); + spriteId = CreateSprite(&spriteTemplate, 0, 0, 1); + gUnknown_020388CC->unk20 = &gSprites[spriteId]; + if (gUnknown_020388CC->unk78 == 0) + { + gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 8 + 4; + gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 8 + 4; + gUnknown_020388CC->unk20->callback = sub_80FBF34; + } + else + { + gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 16 - 48; + gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 16 - 66; + gUnknown_020388CC->unk20->callback = sub_80FBEA4; + } +} + +void sub_80FBDF8(void) +{ + if (gUnknown_020388CC->unk20 != NULL) + { + gUnknown_020388CC->unk20->invisible = TRUE; + gUnknown_020388CC->unk20->callback = SpriteCallbackDummy; + } +} + +void sub_80FBE24(void) +{ + if (gUnknown_020388CC->unk20 != NULL) + { + if (gUnknown_020388CC->unk78 == 1) + { + gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 16 - 48; + gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 16 - 66; + gUnknown_020388CC->unk20->callback = sub_80FBEA4; + gUnknown_020388CC->unk20->invisible = FALSE; + } + else + { + gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 8 + 4; + gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 8 + 4; + gUnknown_020388CC->unk20->pos2.x = 0; + gUnknown_020388CC->unk20->pos2.y = 0; + gUnknown_020388CC->unk20->callback = sub_80FBF34; + gUnknown_020388CC->unk20->invisible = FALSE; + } + } +} + +void sub_80FBEA4(struct Sprite *sprite) +{ + sprite->pos2.x = -(gUnknown_020388CC->unk5C * 2); + sprite->pos2.y = -(gUnknown_020388CC->unk5E * 2); + sprite->data0 = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; + sprite->data1 = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; + + if (sprite->data0 < -8 || sprite->data0 > 0xA8 || sprite->data1 < -8 || sprite->data1 > 0xF8) + sprite->data2 = 0; + else + sprite->data2 = 1; + + if (sprite->data2 == 1) + sub_80FBF40(sprite); + else + sprite->invisible = TRUE; +} + +void sub_80FBF34(struct Sprite *sprite) +{ + sub_80FBF40(sprite); +} + +void sub_80FBF40(struct Sprite *sprite) +{ + if (gUnknown_020388CC->unk7E != 0) + { + sprite->data7++; + if (sprite->data7 > 16) + { + sprite->data7 = 0; + sprite->invisible = !sprite->invisible; + } + } + else + { + sprite->invisible = FALSE; + } +} + +void sub_80FBF94(void) +{ + if (gUnknown_020388CC->unk7F != 0) + gUnknown_020388CC->unk7E = 1; +} + +const u8 *sub_80FBFB4(u8 *dest, u16 b, u16 length) +{ + if (b == 86) + return GetSecretBaseMapName(dest); + if (b < 88) + return StringCopy(dest, gRegionMapLocations[b].name); + if (length == 0) + length = 18; + return StringFill(dest, CHAR_SPACE, length); +} + +const u8 *CopyMapName(u8 *dest, u16 b) +{ + switch (b) + { + case 87: + return StringCopy(dest, gOtherText_Ferry); + case 86: + return StringCopy(dest, gOtherText_SecretBase); + default: + return sub_80FBFB4(dest, b, 0); + } +} + +const u8 *CopyLocationName(u8 *dest, u16 b) +{ + if (b == 66) + return StringCopy(dest, gOtherText_Hideout); + else + return CopyMapName(dest, b); +} + +void sub_80FC04C(u16 a, u16 *x, u16 *y, u16 *width, u16 *height) +{ + *x = gRegionMapLocations[a].x; + *y = gRegionMapLocations[a].y; + *width = gRegionMapLocations[a].width; + *height = gRegionMapLocations[a].height; +} + +struct UnknownStruct3 +{ + void (*unk0)(void); + u16 unk4; + u16 unk6; + struct UnknownStruct1 unk8; +}; + +extern u8 ewram[]; +#define ewram0 (*(struct UnknownStruct3 *)(ewram + 0)) +#define ewram888 (ewram + 0x888) +#define ewramA6E (ewram[0xA6E]) +#define ewramA48 (ewram + 0xA48) + +const u16 gUnknown_083E771C[] = INCBIN_U16("graphics/pokenav/map_frame.gbapal"); +const u8 gUnknown_083E773C[] = INCBIN_U8("graphics/pokenav/map_frame.4bpp.lz"); +const u8 gUnknown_083E7774[] = INCBIN_U8("graphics/pokenav/map_frame.bin.lz"); +const u16 gPokenavMapMisc_Pal[] = INCBIN_U16("graphics/pokenav/map_misc.gbapal"); +const u8 gUnknown_083E784C[] = INCBIN_U8("graphics/pokenav/map_misc.4bpp.lz"); + +const u8 gUnknown_083E7920[][3] = +{ + {0, 9, 1}, + {0, 10, 14}, + {0, 11, 15}, + {0, 12, 16}, + {0, 13, 17}, + {0, 14, 18}, + {0, 15, 19}, + {0, 0, 3}, + {0, 1, 4}, + {0, 2, 5}, + {0, 3, 6}, + {0, 4, 7}, + {0, 5, 8}, + {0, 6, 9}, + {0, 7, 10}, + {0, 8, 11}, + {0, 16, 0}, + {0, 17, 0}, + {0, 18, 0}, + {0, 19, 0}, + {0, 20, 0}, + {0, 21, 0}, + {0, 22, 0}, + {0, 23, 0}, + {0, 24, 0}, + {0, 25, 0}, + {0, 26, 0}, + {0, 27, 0}, + {0, 28, 0}, + {0, 29, 0}, + {0, 30, 0}, + {0, 31, 0}, + {0, 32, 0}, + {0, 33, 0}, + {0, 34, 0}, + {0, 35, 0}, + {0, 36, 0}, + {0, 37, 0}, + {0, 38, 0}, + {0, 39, 0}, + {0, 40, 0}, + {0, 41, 0}, + {0, 42, 0}, + {0, 43, 0}, + {0, 44, 0}, + {0, 45, 0}, + {0, 46, 0}, + {0, 47, 0}, + {0, 48, 0}, + {0, 49, 0}, +}; + +struct UnknownStruct4 +{ + const u8 *const *unk0; + u16 unk4; + u16 unk6; +}; + +const u8 *const Unknown_3E79B8[] = {OtherText_PokeLeague, OtherText_PokeCenter}; + +const struct UnknownStruct4 gUnknown_083E79C0[1] = +{ + {Unknown_3E79B8, 15, 0x854}, +}; + +// XXX: what is this? +static u8 *const ewram_ = ewram; + +const struct SpritePalette gUnknown_083E79CC = {gPokenavMapMisc_Pal, 2}; + +const u16 gUnknown_083E79D4[][2] = +{ + {0x848, 58}, + {0xFFFF, 88}, +}; + +const struct OamData gOamData_83E79DC = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_83E79E4[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83E79EC[] = +{ + ANIMCMD_FRAME(1, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83E79F4[] = +{ + ANIMCMD_FRAME(3, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83E79FC[] = +{ + ANIMCMD_FRAME(5, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83E7A04[] = +{ + ANIMCMD_FRAME(6, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83E7A0C[] = +{ + ANIMCMD_FRAME(8, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83E7A14[] = +{ + ANIMCMD_FRAME(10, 5), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_83E7A1C[] = +{ + gSpriteAnim_83E79E4, + gSpriteAnim_83E79EC, + gSpriteAnim_83E79F4, + gSpriteAnim_83E79FC, + gSpriteAnim_83E7A04, + gSpriteAnim_83E7A0C, + gSpriteAnim_83E7A14, +}; + +const struct SpriteTemplate gSpriteTemplate_83E7A38 = +{ + .tileTag = 2, + .paletteTag = 2, + .oam = &gOamData_83E79DC, + .anims = gSpriteAnimTable_83E7A1C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +void sub_80FC074(void) +{ + switch (gMain.state) + { + case 0: + SetVBlankCallback(NULL); + REG_DISPCNT = 0; + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG2VOFS = 0; + REG_BG2HOFS = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; + ResetPaletteFade(); + ResetSpriteData(); + FreeSpriteTileRanges(); + FreeAllSpritePalettes(); + break; + case 1: + SetUpWindowConfig(&gWindowConfig_81E7224); + break; + case 2: + InitMenuWindow(&gWindowConfig_81E7224); + MenuZeroFillScreen(); + break; + case 3: + sub_80FA8EC(&ewram0.unk8, 0); + sub_80FBB3C(0, 0); + sub_80FBCF0(1, 1); + ewram0.unk6 = ewram0.unk8.unk14; + StringFill(ewramA48, CHAR_SPACE, 12); + sub_80FC254(); + break; + case 4: + LZ77UnCompVram(gUnknown_083E773C, (void *)(VRAM + 0xC000)); + break; + case 5: + LZ77UnCompVram(gUnknown_083E7774, (void *)(VRAM + 0xF000)); + break; + case 6: + LoadPalette(gUnknown_083E771C, 16, 32); + MenuPrint_PixelCoords(gOtherText_FlyToWhere, 1, 0x90, 1); + break; + case 7: + sub_80FC31C(); + break; + case 8: + BlendPalettes(0xFFFFFFFF, 16, 0); + SetVBlankCallback(sub_80FC214); + break; + case 9: + REG_BLDCNT = 0; + REG_BG1CNT = 0x1E0D; + REG_DISPCNT = 0x1741; + sub_80FC244(sub_80FC5B4); + SetMainCallback2(sub_80FC228); + break; + default: + return; + } + gMain.state++; +} + +void sub_80FC214(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +void sub_80FC228(void) +{ + ewram0.unk0(); + AnimateSprites(); + BuildOamBuffer(); +} + +void sub_80FC244(void (*func)(void)) +{ + ewram0.unk0 = func; + ewram0.unk4 = 0; +} + +void sub_80FC254(void) +{ + if (ewram0.unk8.unk16 == 2 || ewram0.unk8.unk16 == 4) + { + u16 i = 0; + int zero; + + for (i = 0; i < 1; i++) + { + const struct UnknownStruct4 *r4 = &gUnknown_083E79C0[i]; + + if (ewram0.unk8.unk14 == r4->unk4) + { + if (FlagGet(r4->unk6)) + { + MenuDrawTextWindow(16, 14, 29, 19); + MenuPrint(ewram0.unk8.filler0, 17, 15); + MenuPrint_RightAligned(r4->unk0[ewram0.unk8.unk17], 29, 17); + return; + } + break; + } + } + // This check is always true, but somehow the compiler still performed it. + asm("mov %0, #0\n":"=r"(zero)); // zero = 0 + if (zero == 0) + { + MenuDrawTextWindow(16, 16, 29, 19); + MenuPrint(ewram0.unk8.filler0, 17, 17); + MenuZeroFillWindowRect(16, 14, 29, 15); + } + } + else + { + MenuDrawTextWindow(16, 16, 29, 19); + MenuPrint(ewramA48, 17, 17); + MenuZeroFillWindowRect(16, 14, 29, 15); + } +} + +void sub_80FC31C(void) +{ + struct SpriteSheet spriteSheet; + + LZ77UnCompWram(gUnknown_083E784C, ewram888); + spriteSheet.data = ewram888; + spriteSheet.size = 0x1C0; + spriteSheet.tag = 2; + LoadSpriteSheet(&spriteSheet); + LoadSpritePalette(&gUnknown_083E79CC); + sub_80FC374(); + sub_80FC484(); +} + +void sub_80FC374(void) +{ + u16 flag = 0x80F; + u16 i; + + for (i = 0; i < 16; i++) + { + u16 x; + u16 y; + u16 width; + u16 height; + u16 r7; + u8 spriteId; + + sub_80FC04C(i, &x, &y, &width, &height); + x = (x + 1) * 8 + 4; + y = (y + 2) * 8 + 4; + if (width == 2) + r7 = 1; + else if (height == 2) + r7 = 2; + else + r7 = 0; + spriteId = CreateSprite(&gSpriteTemplate_83E7A38, x, y, 10); + if (spriteId != 64) + { + gSprites[spriteId].oam.shape = r7; + if (FlagGet(flag)) + gSprites[spriteId].callback = sub_80FC55C; + else + r7 += 3; + StartSpriteAnim(&gSprites[spriteId], r7); + gSprites[spriteId].data0 = i; + } + flag++; + } +} + +void sub_80FC484(void) +{ + u16 i; + + for (i = 0; gUnknown_083E79D4[i][1] != 88; i++) + { + u16 x; + u16 y; + u16 width; + u16 height; + + if (FlagGet(gUnknown_083E79D4[i][0])) + { + u16 r6 = gUnknown_083E79D4[i][1]; + u8 spriteId; + + sub_80FC04C(r6, &x, &y, &width, &height); + x = (x + 1) * 8; + y = (y + 2) * 8; + spriteId = CreateSprite(&gSpriteTemplate_83E7A38, x, y, 10); + if (spriteId != 64) + { + gSprites[spriteId].oam.size = 1; + gSprites[spriteId].callback = sub_80FC55C; + StartSpriteAnim(&gSprites[spriteId], 6); + gSprites[spriteId].data0 = r6; + } + } + } +} + +void sub_80FC55C(struct Sprite *sprite) +{ + if (ewram0.unk8.unk14 == sprite->data0) + { + sprite->data1++; + if (sprite->data1 > 16) + { + sprite->data1 = 0; + sprite->invisible = !sprite->invisible; + } + } + else + { + sprite->data1 = 16; + sprite->invisible = FALSE; + } +} + +void sub_80FC5B4(void) +{ + switch (ewram0.unk4) + { + case 0: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + ewram0.unk4++; + break; + case 1: + if (UpdatePaletteFade() != 0) + break; + sub_80FC244(sub_80FC600); + break; + } +} + +void sub_80FC600(void) +{ + if (ewram0.unk4 == 0) + { + switch (sub_80FAB60()) + { + case 0: + case 1: + case 2: + break; + case 3: + sub_80FC254(); + break; + case 4: + if (ewram0.unk8.unk16 == 2 || ewram0.unk8.unk16 == 4) + { + m4aSongNumStart(SE_SELECT); + ewramA6E = 1; + sub_80FC244(sub_80FC69C); + } + break; + case 5: + m4aSongNumStart(SE_SELECT); + ewramA6E = 0; + sub_80FC244(sub_80FC69C); + break; + } + } +} + +void sub_80FC69C(void) +{ + switch (ewram0.unk4) + { + case 0: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + ewram0.unk4++; + break; + case 1: + if (UpdatePaletteFade() != 0) + break; + sub_80FAB10(); + if (ewramA6E != 0) + { + switch (ewram0.unk8.unk14) + { + case 0x49: + sub_8053538(22); + break; + case 0x3A: + sub_8053538(21); + break; + case 0: + sub_8053538((gSaveBlock2.playerGender == MALE) ? 12 : 13); + break; + case 15: + sub_8053538((FlagGet(0x854) && ewram0.unk8.unk17 == 0) ? 20 : 11); + break; + default: + if (gUnknown_083E7920[ewram0.unk8.unk14][2] != 0) + sub_8053538(gUnknown_083E7920[ewram0.unk8.unk14][2]); + else + warp1_set_2(gUnknown_083E7920[ewram0.unk8.unk14][0], gUnknown_083E7920[ewram0.unk8.unk14][1], -1); + break; + } + sub_80865BC(); + } + else + { + SetMainCallback2(sub_808AD58); + } + break; + } +} -- cgit v1.2.3 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 +- src/field_specials.c | 2 +- src/map_name_popup.c | 2 +- src/region_map.c | 1207 +++++++++++++++++++++++++----------------------- src/rom4.c | 4 +- src/save_menu_util.c | 2 +- src/secret_base.c | 2 +- src/tv.c | 18 +- 8 files changed, 663 insertions(+), 587 deletions(-) (limited to 'src') 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; diff --git a/src/field_specials.c b/src/field_specials.c index 2b505bbfe..71de04f55 100755 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1761,7 +1761,7 @@ u8 GetPokeblockNameByMonNature(void) void GetSecretBaseNearbyMapName(void) { - sub_80FBFB4(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0); + GetMapSectionName(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0); } u16 sub_810F404(void) diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 303cc3d07..01105d0db 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -101,7 +101,7 @@ void DrawMapNamePopup(void) u8 name[20]; MenuLoadTextWindowGraphics_OverrideFrameType(0); - sub_80FBFB4(name, gMapHeader.name, 0); + GetMapSectionName(name, gMapHeader.regionMapSectionId, 0); MenuDrawTextWindow(0, 0, 13, 3); sub_8072BD8(name, 1, 1, 0x60); } diff --git a/src/region_map.c b/src/region_map.c index 6318893ab..a0739ecef 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -4,9 +4,11 @@ #include "field_specials.h" #include "m4a.h" #include "main.h" +#include "map_constants.h" #include "menu.h" #include "palette.h" #include "pokemon_menu.h" +#include "region_map.h" #include "rom4.h" #include "secret_base.h" #include "songs.h" @@ -16,59 +18,116 @@ #include "text.h" #include "trig.h" -struct UnknownStruct1 -{ - u8 filler0[0x14]; - u16 unk14; - u8 unk16; - u8 unk17; - u8 (*unk18)(void); - struct Sprite *unk1C; - struct Sprite *unk20; - s32 unk24; - s32 unk28; - u32 unk2C; - u32 unk30; - u32 unk34; - u32 unk38; - s32 unk3C; - s32 unk40; - s32 unk44; - s32 unk48; - s32 unk4C; - u32 unk50; - u16 unk54; // cursor x - u16 unk56; // cursor y - u16 unk58; - u16 unk5A; - s16 unk5C; - s16 unk5E; - s16 unk60; - s16 unk62; - u16 unk64; - u16 unk66; - u16 unk68; - u16 unk6A; - u16 unk6C; - u16 unk6E; - u16 unk70; - u16 unk72; - u16 unk74; - u16 unk76; - u8 unk78; - u8 unk79; - s8 unk7A; - s8 unk7B; // movement delta horizontal - s8 unk7C; // movement delta vertical - u8 unk7D; - u8 unk7E; - u8 unk7F; - u8 filler80[0x100]; - u8 unk180[0x100]; - u8 unk280[0x100]; // possibly 0x600 +#define MAPSEC_LITTLEROOT_TOWN 0 +#define MAPSEC_OLDALE_TOWN 1 +#define MAPSEC_DEWFORD_TOWN 2 +#define MAPSEC_LAVARIDGE_TOWN 3 +#define MAPSEC_FALLARBOR_TOWN 4 +#define MAPSEC_VERDANTURF_TOWN 5 +#define MAPSEC_PACIFIDLOG_TOWN 6 +#define MAPSEC_PETALBURG_CITY 7 +#define MAPSEC_SLATEPORT_CITY 8 +#define MAPSEC_MAUVILLE_CITY 9 +#define MAPSEC_RUSTBORO_CITY 10 +#define MAPSEC_FORTREE_CITY 11 +#define MAPSEC_LILYCOVE_CITY 12 +#define MAPSEC_MOSSDEEP_CITY 13 +#define MAPSEC_SOOTOPOLIS_CITY 14 +#define MAPSEC_EVER_GRANDE_CITY 15 +#define MAPSEC_ROUTE_101 0x10 +#define MAPSEC_ROUTE_102 0x11 +#define MAPSEC_ROUTE_103 0x12 +#define MAPSEC_ROUTE_104 0x13 +#define MAPSEC_ROUTE_105 0x14 +#define MAPSEC_ROUTE_106 0x15 +#define MAPSEC_ROUTE_107 0x16 +#define MAPSEC_ROUTE_108 0x17 +#define MAPSEC_ROUTE_109 0x18 +#define MAPSEC_ROUTE_110 0x19 +#define MAPSEC_ROUTE_111 0x1A +#define MAPSEC_ROUTE_112 0x1B +#define MAPSEC_ROUTE_113 0x1C +#define MAPSEC_ROUTE_114 0x1D +#define MAPSEC_ROUTE_115 0x1E +#define MAPSEC_ROUTE_116 0x1F +#define MAPSEC_ROUTE_117 0x20 +#define MAPSEC_ROUTE_118 0x21 +#define MAPSEC_ROUTE_119 0x22 +#define MAPSEC_ROUTE_120 0x23 +#define MAPSEC_ROUTE_121 0x24 +#define MAPSEC_ROUTE_122 0x25 +#define MAPSEC_ROUTE_123 0x26 +#define MAPSEC_ROUTE_124 0x27 +#define MAPSEC_ROUTE_125 0x28 +#define MAPSEC_ROUTE_126 0x29 +#define MAPSEC_ROUTE_127 0x2A +#define MAPSEC_ROUTE_128 0x2B +#define MAPSEC_ROUTE_129 0x2C +#define MAPSEC_ROUTE_130 0x2D +#define MAPSEC_ROUTE_131 0x2E +#define MAPSEC_ROUTE_132 0x2F +#define MAPSEC_ROUTE_133 0x30 +#define MAPSEC_ROUTE_134 0x31 +#define MAPSEC_UNDERWATER1 0x32 +#define MAPSEC_UNDERWATER2 0x33 +#define MAPSEC_UNDERWATER3 0x34 +#define MAPSEC_UNDERWATER4 0x35 +#define MAPSEC_UNDERWATER5 0x36 +#define MAPSEC_GRANITE_CAVE 0x37 +#define MAPSEC_MT_CHIMNEY 0x38 +#define MAPSEC_SAFARI_ZONE 0x39 +#define MAPSEC_BATTLE_TOWER 0x3A +#define MAPSEC_PETALBURG_WOODS 0x3B +#define MAPSEC_RUSTURF_TUNNEL 0x3C +#define MAPSEC_ABANDONED_SHIP 0x3D +#define MAPSEC_NEW_MAUVILLE 0x3E +#define MAPSEC_METEOR_FALLS_1 0x3F +#define MAPSEC_METEOR_FALLS_2 0x40 +#define MAPSEC_MT_PYRE 0x41 +#define MAPSEC_EVIL_TEAM_HIDEOUT 0x42 +#define MAPSEC_SHOAL_CAVE 0x43 +#define MAPSEC_SEAFLOOR_CAVERN 0x44 +#define MAPSEC_UNDERWATER6 0x45 +#define MAPSEC_VICTORY_ROAD 0x46 +#define MAPSEC_MIRAGE_ISLAND 0x47 +#define MAPSEC_CAVE_OF_ORIGIN 0x48 +#define MAPSEC_SOUTHERN_ISLAND 0x49 +#define MAPSEC_FIERY_PATH_1 0x4A +#define MAPSEC_FIERY_PATH_2 0x4B +#define MAPSEC_JAGGED_PASS_1 0x4C +#define MAPSEC_JAGGED_PASS_2 0x4D +#define MAPSEC_SEALED_CHAMBER 0x4E +#define MAPSEC_UNDERWATER7 0x4F +#define MAPSEC_SCORCHED_SLAB 0x50 +#define MAPSEC_ISLAND_CAVE 0x51 +#define MAPSEC_DESERT_RUINS 0x52 +#define MAPSEC_ANCIENT_TOMB 0x53 +#define MAPSEC_INSIDE_OF_TRUCK 0x54 +#define MAPSEC_SKY_PILLAR 0x55 +#define MAPSEC_SECRET_BASE 0x56 +#define MAPSEC_UNK_0x57 0x57 +#define MAPSEC_NONE 0x58 + +#define MAP_WIDTH 28 +#define MAP_HEIGHT 15 + +#define MAPCURSOR_X_MIN 1 +#define MAPCURSOR_Y_MIN 2 +#define MAPCURSOR_X_MAX 28 +#define MAPCURSOR_Y_MAX 16 + +// Input events +enum +{ + INPUT_EVENT_NONE, + INPUT_EVENT_DPAD, + INPUT_EVENT_2, + INPUT_EVENT_3, + INPUT_EVENT_A_BUTTON, + INPUT_EVENT_B_BUTTON, }; -extern struct UnknownStruct1 *gUnknown_020388CC; +extern struct RegionMap *gRegionMap; const u16 gPokenavCursor_Pal[] = INCBIN_U16("graphics/pokenav/cursor.gbapal"); const u8 gUnknown_083E5AF0[] = INCBIN_U8("graphics/pokenav/cursor_small.4bpp.lz"); @@ -110,7 +169,7 @@ struct RegionMapLocation { u8 x, y; u8 width, height; - const u8 *name; + const u8 *regionMapSectionId; }; const struct RegionMapLocation gRegionMapLocations[] = @@ -207,75 +266,75 @@ const struct RegionMapLocation gRegionMapLocations[] = const u16 gUnknown_083E7684[][2] = { - {50, 39}, - {51, 41}, - {52, 42}, - {53, 43}, - {54, 14}, - {69, 43}, - {66, 12}, - {79, 49}, - {59, 19}, - {76, 27}, - {65, 37}, - {85, 46}, - {88, 88}, + {MAPSEC_UNDERWATER1, MAPSEC_ROUTE_124}, + {MAPSEC_UNDERWATER2, MAPSEC_ROUTE_126}, + {MAPSEC_UNDERWATER3, MAPSEC_ROUTE_127}, + {MAPSEC_UNDERWATER4, MAPSEC_ROUTE_128}, + {MAPSEC_UNDERWATER5, MAPSEC_SOOTOPOLIS_CITY}, + {MAPSEC_UNDERWATER6, MAPSEC_ROUTE_128}, + {MAPSEC_EVIL_TEAM_HIDEOUT, MAPSEC_LILYCOVE_CITY}, + {MAPSEC_UNDERWATER7, MAPSEC_ROUTE_134}, + {MAPSEC_PETALBURG_WOODS, MAPSEC_ROUTE_104}, + {MAPSEC_JAGGED_PASS_1, MAPSEC_ROUTE_112}, + {MAPSEC_MT_PYRE, MAPSEC_ROUTE_122}, + {MAPSEC_SKY_PILLAR, MAPSEC_ROUTE_131}, + {MAPSEC_NONE, MAPSEC_NONE}, }; -void sub_80FA904(struct UnknownStruct1 *, u8); +void sub_80FA904(struct RegionMap *, u8); bool8 sub_80FA940(void); u8 sub_80FAB78(void); u8 _swiopen(void); u8 sub_80FAD04(void); u8 sub_80FADE4(void); -void sub_80FB170(s16, s16, s16, s16, u16, u16, u8); +void CalcZoomScrollParams(s16, s16, s16, s16, u16, u16, u8); void sub_80FB238(s16, s16); -void sub_80FB260(void); +void UpdateRegionMapVideoRegs(void); u16 GetRegionMapSectionAt(u16, u16); -void sub_80FB32C(void); +void InitializeCursorPosition(void); void sub_80FB600(void); u16 sub_80FB758(u16); u16 sub_80FB9C0(u16); void sub_80FBA18(void); -u8 sub_80FBAA0(u16); -void sub_80FBB3C(u16, u16); +bool8 sub_80FBAA0(u16); +void CreateRegionMapCursorIcon(u16, u16); void sub_80FBCA0(void); void sub_80FBDF8(void); void sub_80FBE24(void); -void sub_80FBF34(struct Sprite *); -void sub_80FBF40(struct Sprite *); -void sub_80FBEA4(struct Sprite *); -const u8 *sub_80FBFB4(u8 *, u16, u16); +void SpriteCB_PlayerIconZoomedOut(struct Sprite *); +void UpdateIconBlink(struct Sprite *); +void SpriteCB_PlayerIconZoomedIn(struct Sprite *); +const u8 *GetMapSectionName(u8 *, u16, u16); void sub_80FC214(void); void sub_80FC228(void); void sub_80FC244(void (*func)(void)); -void sub_80FC254(void); -void sub_80FC31C(void); -void sub_80FC374(void); -void sub_80FC484(void); -void sub_80FC55C(struct Sprite *); +void PrintFlyTargetName(void); +void CreateFlyTargetGraphics(void); +void CreateCityTownFlyTargetIcons(void); +void CreateSpecialAreaFlyTargetIcons(void); +void SpriteCB_FlyTargetIcons(struct Sprite *); void sub_80FC5B4(void); void sub_80FC600(void); void sub_80FC69C(void); -void sub_80FA8EC(struct UnknownStruct1 *a, u8 b) +void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed) { - sub_80FA904(a, b); + sub_80FA904(regionMap, zoomed); while (sub_80FA940()) ; } -void sub_80FA904(struct UnknownStruct1 *a, u8 b) +void sub_80FA904(struct RegionMap *regionMap, bool8 zoomed) { - gUnknown_020388CC = a; - gUnknown_020388CC->unk79 = 0; - gUnknown_020388CC->unk78 = b; - gUnknown_020388CC->unk18 = (b == 0) ? sub_80FAB78 : sub_80FAD04; + gRegionMap = regionMap; + gRegionMap->initStep = 0; + gRegionMap->zoomed = zoomed; + gRegionMap->inputCallback = (zoomed == 0) ? sub_80FAB78 : sub_80FAD04; } bool8 sub_80FA940(void) { - switch (gUnknown_020388CC->unk79) + switch (gRegionMap->initStep) { case 0: LZ77UnCompVram(gUnknown_083E5DA0, (void *)(VRAM + 0x8000)); @@ -287,240 +346,245 @@ bool8 sub_80FA940(void) LoadPalette(gUnknown_083E5D60, 0x70, 0x60); // Why isn't this the right size? break; case 3: - LZ77UnCompWram(gUnknown_083E5AF0, gUnknown_020388CC->unk180); + LZ77UnCompWram(gUnknown_083E5AF0, gRegionMap->unk180); break; case 4: - LZ77UnCompWram(gUnknown_083E5B34, gUnknown_020388CC->unk280); + LZ77UnCompWram(gUnknown_083E5B34, gRegionMap->unk280); break; case 5: - sub_80FB32C(); - gUnknown_020388CC->unk74 = gUnknown_020388CC->unk54; - gUnknown_020388CC->unk76 = gUnknown_020388CC->unk56; - gUnknown_020388CC->unk16 = sub_80FB758(gUnknown_020388CC->unk14); - gUnknown_020388CC->unk14 = sub_80FB9C0(gUnknown_020388CC->unk14); - sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16); + InitializeCursorPosition(); + gRegionMap->unk74 = gRegionMap->cursorPosX; + gRegionMap->unk76 = gRegionMap->cursorPosY; + gRegionMap->unk16 = sub_80FB758(gRegionMap->mapSecId); + gRegionMap->mapSecId = sub_80FB9C0(gRegionMap->mapSecId); + GetMapSectionName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16); break; case 6: - if (gUnknown_020388CC->unk78 == 0) + if (gRegionMap->zoomed == FALSE) { - sub_80FB170(0, 0, 0, 0, 0x100, 0x100, 0); + CalcZoomScrollParams(0, 0, 0, 0, 0x100, 0x100, 0); } else { - gUnknown_020388CC->unk5C = gUnknown_020388CC->unk54 * 8 - 0x34; - gUnknown_020388CC->unk5E = gUnknown_020388CC->unk56 * 8 - 0x44; - gUnknown_020388CC->unk64 = gUnknown_020388CC->unk54; - gUnknown_020388CC->unk66 = gUnknown_020388CC->unk56; - sub_80FB170(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E, 0x38, 0x48, 0x80, 0x80, 0); + gRegionMap->scrollX = gRegionMap->cursorPosX * 8 - 52; + gRegionMap->scrollY = gRegionMap->cursorPosY * 8 - 68; + gRegionMap->unk64 = gRegionMap->cursorPosX; + gRegionMap->unk66 = gRegionMap->cursorPosY; + CalcZoomScrollParams(gRegionMap->scrollX, gRegionMap->scrollY, 0x38, 0x48, 0x80, 0x80, 0); } break; case 7: sub_80FBA18(); - sub_80FB260(); - gUnknown_020388CC->unk1C = NULL; - gUnknown_020388CC->unk20 = NULL; - gUnknown_020388CC->unk7A = 0; - gUnknown_020388CC->unk7E = 0; + UpdateRegionMapVideoRegs(); + gRegionMap->cursorIconSprite = NULL; + gRegionMap->playerIconSprite = NULL; + gRegionMap->unk7A = 0; + gRegionMap->blinkPlayerIcon = FALSE; REG_BG2CNT = 0xBC8A; - gUnknown_020388CC->unk79++; + gRegionMap->initStep++; default: return FALSE; } - gUnknown_020388CC->unk79++; + gRegionMap->initStep++; return TRUE; } -void sub_80FAB10(void) +void FreeRegionMapIconResources(void) { - if (gUnknown_020388CC->unk1C != NULL) + if (gRegionMap->cursorIconSprite != NULL) { - DestroySprite(gUnknown_020388CC->unk1C); - FreeSpriteTilesByTag(gUnknown_020388CC->unk58); - FreeSpritePaletteByTag(gUnknown_020388CC->unk5A); + DestroySprite(gRegionMap->cursorIconSprite); + FreeSpriteTilesByTag(gRegionMap->cursorIconTileTag); + FreeSpritePaletteByTag(gRegionMap->cursorIconPaletteTag); } - if (gUnknown_020388CC->unk20 != NULL) + if (gRegionMap->playerIconSprite != NULL) { - DestroySprite(gUnknown_020388CC->unk20); - FreeSpriteTilesByTag(gUnknown_020388CC->unk70); - FreeSpritePaletteByTag(gUnknown_020388CC->unk72); + DestroySprite(gRegionMap->playerIconSprite); + FreeSpriteTilesByTag(gRegionMap->playerIconTileTag); + FreeSpritePaletteByTag(gRegionMap->playerIconPaletteTag); } } u8 sub_80FAB60(void) { - return gUnknown_020388CC->unk18(); + return gRegionMap->inputCallback(); } u8 sub_80FAB78(void) { - u8 r4 = 0; + u8 event = INPUT_EVENT_NONE; - gUnknown_020388CC->unk7B = 0; - gUnknown_020388CC->unk7C = 0; - if ((gMain.heldKeys & DPAD_UP) && gUnknown_020388CC->unk56 > 2) + gRegionMap->cursorDeltaX = 0; + gRegionMap->cursorDeltaY = 0; + if ((gMain.heldKeys & DPAD_UP) && gRegionMap->cursorPosY > MAPCURSOR_Y_MIN) { - gUnknown_020388CC->unk7C = -1; - r4 = 1; + gRegionMap->cursorDeltaY = -1; + event = INPUT_EVENT_DPAD; } - if ((gMain.heldKeys & DPAD_DOWN) && gUnknown_020388CC->unk56 < 16) + if ((gMain.heldKeys & DPAD_DOWN) && gRegionMap->cursorPosY < MAPCURSOR_Y_MAX) { - gUnknown_020388CC->unk7C = 1; - r4 = 1; + gRegionMap->cursorDeltaY = 1; + event = INPUT_EVENT_DPAD; } - if ((gMain.heldKeys & DPAD_LEFT) && gUnknown_020388CC->unk54 > 1) + if ((gMain.heldKeys & DPAD_LEFT) && gRegionMap->cursorPosX > MAPCURSOR_X_MIN) { - gUnknown_020388CC->unk7B = -1; - r4 = 1; + gRegionMap->cursorDeltaX = -1; + event = INPUT_EVENT_DPAD; } - if ((gMain.heldKeys & DPAD_RIGHT) && gUnknown_020388CC->unk54 < 0x1C) + if ((gMain.heldKeys & DPAD_RIGHT) && gRegionMap->cursorPosX < MAPCURSOR_X_MAX) { - gUnknown_020388CC->unk7B = 1; - r4 = 1; + gRegionMap->cursorDeltaX = 1; + event = INPUT_EVENT_DPAD; } + if (gMain.newKeys & A_BUTTON) - r4 = 4; + event = INPUT_EVENT_A_BUTTON; else if (gMain.newKeys & B_BUTTON) - r4 = 5; - if (r4 == 1) + event = INPUT_EVENT_B_BUTTON; + + if (event == INPUT_EVENT_DPAD) { - gUnknown_020388CC->unk7A = 4; - gUnknown_020388CC->unk18 = _swiopen; + gRegionMap->unk7A = 4; + gRegionMap->inputCallback = _swiopen; } - return r4; + return event; } u8 _swiopen(void) { - u16 r4; + u16 mapSecId; - if (gUnknown_020388CC->unk7A != 0) - return 2; + if (gRegionMap->unk7A != 0) + return INPUT_EVENT_2; - if (gUnknown_020388CC->unk7B > 0) - gUnknown_020388CC->unk54++; + if (gRegionMap->cursorDeltaX > 0) + gRegionMap->cursorPosX++; - if (gUnknown_020388CC->unk7B < 0) - gUnknown_020388CC->unk54--; + if (gRegionMap->cursorDeltaX < 0) + gRegionMap->cursorPosX--; - if (gUnknown_020388CC->unk7C > 0) - gUnknown_020388CC->unk56++; + if (gRegionMap->cursorDeltaY > 0) + gRegionMap->cursorPosY++; - if (gUnknown_020388CC->unk7C < 0) - gUnknown_020388CC->unk56--; + if (gRegionMap->cursorDeltaY < 0) + gRegionMap->cursorPosY--; - r4 = GetRegionMapSectionAt(gUnknown_020388CC->unk54, gUnknown_020388CC->unk56); - gUnknown_020388CC->unk16 = sub_80FB758(r4); - if (r4 != gUnknown_020388CC->unk14) + mapSecId = GetRegionMapSectionAt(gRegionMap->cursorPosX, gRegionMap->cursorPosY); + gRegionMap->unk16 = sub_80FB758(mapSecId); + if (mapSecId != gRegionMap->mapSecId) { - gUnknown_020388CC->unk14 = r4; - sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16); + gRegionMap->mapSecId = mapSecId; + GetMapSectionName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16); } sub_80FBA18(); - gUnknown_020388CC->unk18 = sub_80FAB78; - return 3; + gRegionMap->inputCallback = sub_80FAB78; + return INPUT_EVENT_3; } u8 sub_80FAD04(void) { - u8 r4 = 0; - gUnknown_020388CC->unk6A = 0; - gUnknown_020388CC->unk68 = 0; - if ((gMain.heldKeys & 0x40) && gUnknown_020388CC->unk5E > -0x34) + u8 event = INPUT_EVENT_NONE; + + gRegionMap->unk6A = 0; + gRegionMap->unk68 = 0; + if ((gMain.heldKeys & DPAD_UP) && gRegionMap->scrollY > -52) { - gUnknown_020388CC->unk68 = -1; - r4 = 1; + gRegionMap->unk68 = -1; + event = INPUT_EVENT_DPAD; } - if ((gMain.heldKeys & 0x80) && gUnknown_020388CC->unk5E < 0x3C) + if ((gMain.heldKeys & DPAD_DOWN) && gRegionMap->scrollY < 60) { - gUnknown_020388CC->unk68 = 1; - r4 = 1; + gRegionMap->unk68 = 1; + event = INPUT_EVENT_DPAD; } - if ((gMain.heldKeys & 0x20) && gUnknown_020388CC->unk5C > -0x2C) + if ((gMain.heldKeys & DPAD_LEFT) && gRegionMap->scrollX > -44) { - gUnknown_020388CC->unk6A = -1; - r4 = 1; + gRegionMap->unk6A = -1; + event = INPUT_EVENT_DPAD; } - if ((gMain.heldKeys & 0x10) && gUnknown_020388CC->unk5C < 0xAC) + if ((gMain.heldKeys & DPAD_RIGHT) && gRegionMap->scrollX < 172) { - gUnknown_020388CC->unk6A = 1; - r4 = 1; + gRegionMap->unk6A = 1; + event = INPUT_EVENT_DPAD; } + if (gMain.newKeys & A_BUTTON) - r4 = 4; + event = INPUT_EVENT_A_BUTTON; if (gMain.newKeys & B_BUTTON) - r4 = 5; - if (r4 == 1) + event = INPUT_EVENT_B_BUTTON; + + if (event == INPUT_EVENT_DPAD) { - gUnknown_020388CC->unk18 = sub_80FADE4; - gUnknown_020388CC->unk6C = 0; + gRegionMap->inputCallback = sub_80FADE4; + gRegionMap->unk6C = 0; } - return r4; + return event; } u8 sub_80FADE4(void) { - gUnknown_020388CC->unk5E += gUnknown_020388CC->unk68; - gUnknown_020388CC->unk5C += gUnknown_020388CC->unk6A; - sub_80FB238(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E); - gUnknown_020388CC->unk6C++; - if (gUnknown_020388CC->unk6C == 8) + gRegionMap->scrollY += gRegionMap->unk68; + gRegionMap->scrollX += gRegionMap->unk6A; + sub_80FB238(gRegionMap->scrollX, gRegionMap->scrollY); + gRegionMap->unk6C++; + if (gRegionMap->unk6C == 8) { - u16 r3 = (gUnknown_020388CC->unk5C + 0x2C) / 8 + 1; - u16 r1 = (gUnknown_020388CC->unk5E + 0x34) / 8 + 2; + u16 r3 = (gRegionMap->scrollX + 44) / 8 + 1; + u16 r1 = (gRegionMap->scrollY + 52) / 8 + 2; - if (r3 != gUnknown_020388CC->unk64 || r1 != gUnknown_020388CC->unk66) + if (r3 != gRegionMap->unk64 || r1 != gRegionMap->unk66) { - u16 r4; + u16 mapSecId; - gUnknown_020388CC->unk64 = r3; - gUnknown_020388CC->unk66 = r1; - r4 = GetRegionMapSectionAt(r3, r1); - gUnknown_020388CC->unk16 = sub_80FB758(r4); - if (r4 != gUnknown_020388CC->unk14) + gRegionMap->unk64 = r3; + gRegionMap->unk66 = r1; + mapSecId = GetRegionMapSectionAt(r3, r1); + gRegionMap->unk16 = sub_80FB758(mapSecId); + if (mapSecId != gRegionMap->mapSecId) { - gUnknown_020388CC->unk14 = r4; - sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16); + gRegionMap->mapSecId = mapSecId; + GetMapSectionName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16); } sub_80FBA18(); } - gUnknown_020388CC->unk6C = 0; - gUnknown_020388CC->unk18 = sub_80FAD04; - return 3; + gRegionMap->unk6C = 0; + gRegionMap->inputCallback = sub_80FAD04; + return INPUT_EVENT_3; } - return 2; + return INPUT_EVENT_2; } void sub_80FAEC4(void) { - if (gUnknown_020388CC->unk78 == 0) + if (gRegionMap->zoomed == FALSE) { - gUnknown_020388CC->unk5E = 0; - gUnknown_020388CC->unk5C = 0; - gUnknown_020388CC->unk40 = 0; - gUnknown_020388CC->unk3C = 0; - gUnknown_020388CC->unk60 = gUnknown_020388CC->unk54 * 8 - 0x34; - gUnknown_020388CC->unk62 = gUnknown_020388CC->unk56 * 8 - 0x44; - gUnknown_020388CC->unk44 = (gUnknown_020388CC->unk60 << 8) / 16; - gUnknown_020388CC->unk48 = (gUnknown_020388CC->unk62 << 8) / 16; - gUnknown_020388CC->unk64 = gUnknown_020388CC->unk54; - gUnknown_020388CC->unk66 = gUnknown_020388CC->unk56; - gUnknown_020388CC->unk4C = 0x10000; - gUnknown_020388CC->unk50 = -0x800; + gRegionMap->scrollY = 0; + gRegionMap->scrollX = 0; + gRegionMap->unk40 = 0; + gRegionMap->unk3C = 0; + gRegionMap->unk60 = gRegionMap->cursorPosX * 8 - 52; + gRegionMap->unk62 = gRegionMap->cursorPosY * 8 - 68; + gRegionMap->unk44 = (gRegionMap->unk60 << 8) / 16; + gRegionMap->unk48 = (gRegionMap->unk62 << 8) / 16; + gRegionMap->unk64 = gRegionMap->cursorPosX; + gRegionMap->unk66 = gRegionMap->cursorPosY; + gRegionMap->unk4C = (256 << 8); + gRegionMap->unk50 = -0x800; } else { - gUnknown_020388CC->unk3C = gUnknown_020388CC->unk5C * 256; - gUnknown_020388CC->unk40 = gUnknown_020388CC->unk5E * 256; - gUnknown_020388CC->unk60 = 0; - gUnknown_020388CC->unk62 = 0; - gUnknown_020388CC->unk44 = -(gUnknown_020388CC->unk3C / 16); - gUnknown_020388CC->unk48 = -(gUnknown_020388CC->unk40 / 16); - gUnknown_020388CC->unk54 = gUnknown_020388CC->unk64; - gUnknown_020388CC->unk56 = gUnknown_020388CC->unk66; - gUnknown_020388CC->unk4C = 0x8000; - gUnknown_020388CC->unk50 = 0x800; + gRegionMap->unk3C = gRegionMap->scrollX * 256; + gRegionMap->unk40 = gRegionMap->scrollY * 256; + gRegionMap->unk60 = 0; + gRegionMap->unk62 = 0; + gRegionMap->unk44 = -(gRegionMap->unk3C / 16); + gRegionMap->unk48 = -(gRegionMap->unk40 / 16); + gRegionMap->cursorPosX = gRegionMap->unk64; + gRegionMap->cursorPosY = gRegionMap->unk66; + gRegionMap->unk4C = (128 << 8); + gRegionMap->unk50 = 0x800; } - gUnknown_020388CC->unk6E = 0; + gRegionMap->unk6E = 0; sub_80FBCA0(); sub_80FBDF8(); } @@ -529,129 +593,128 @@ u8 sub_80FAFC0(void) { u8 r4; - if (gUnknown_020388CC->unk6E > 15) + if (gRegionMap->unk6E >= 16) return 0; - gUnknown_020388CC->unk6E++; - if (gUnknown_020388CC->unk6E == 16) + gRegionMap->unk6E++; + if (gRegionMap->unk6E == 16) { - gUnknown_020388CC->unk44 = 0; - gUnknown_020388CC->unk48 = 0; - gUnknown_020388CC->unk5C = gUnknown_020388CC->unk60; - gUnknown_020388CC->unk5E = gUnknown_020388CC->unk62; - gUnknown_020388CC->unk4C = (gUnknown_020388CC->unk78 == 0) ? 0x8000 : 0x10000; - gUnknown_020388CC->unk78 = (gUnknown_020388CC->unk78 == 0) ? 1 : 0; - gUnknown_020388CC->unk18 = (gUnknown_020388CC->unk78 == 0) ? sub_80FAB78 : sub_80FAD04; - sub_80FBB3C(gUnknown_020388CC->unk58, gUnknown_020388CC->unk5A); + gRegionMap->unk44 = 0; + gRegionMap->unk48 = 0; + gRegionMap->scrollX = gRegionMap->unk60; + gRegionMap->scrollY = gRegionMap->unk62; + gRegionMap->unk4C = (gRegionMap->zoomed == FALSE) ? (128 << 8) : (256 << 8); + gRegionMap->zoomed = !gRegionMap->zoomed; + gRegionMap->inputCallback = (gRegionMap->zoomed == FALSE) ? sub_80FAB78 : sub_80FAD04; + CreateRegionMapCursorIcon(gRegionMap->cursorIconTileTag, gRegionMap->cursorIconPaletteTag); sub_80FBE24(); r4 = 0; } else { - gUnknown_020388CC->unk3C += gUnknown_020388CC->unk44; - gUnknown_020388CC->unk40 += gUnknown_020388CC->unk48; - gUnknown_020388CC->unk5C = gUnknown_020388CC->unk3C >> 8; - gUnknown_020388CC->unk5E = gUnknown_020388CC->unk40 >> 8; - gUnknown_020388CC->unk4C += gUnknown_020388CC->unk50; - if ((gUnknown_020388CC->unk44 < 0 && gUnknown_020388CC->unk5C < gUnknown_020388CC->unk60) - || (gUnknown_020388CC->unk44 > 0 && gUnknown_020388CC->unk5C > gUnknown_020388CC->unk60)) + gRegionMap->unk3C += gRegionMap->unk44; + gRegionMap->unk40 += gRegionMap->unk48; + gRegionMap->scrollX = gRegionMap->unk3C >> 8; + gRegionMap->scrollY = gRegionMap->unk40 >> 8; + gRegionMap->unk4C += gRegionMap->unk50; + if ((gRegionMap->unk44 < 0 && gRegionMap->scrollX < gRegionMap->unk60) + || (gRegionMap->unk44 > 0 && gRegionMap->scrollX > gRegionMap->unk60)) { - gUnknown_020388CC->unk5C = gUnknown_020388CC->unk60; - gUnknown_020388CC->unk44 = 0; + gRegionMap->scrollX = gRegionMap->unk60; + gRegionMap->unk44 = 0; } - if ((gUnknown_020388CC->unk48 < 0 && gUnknown_020388CC->unk5E < gUnknown_020388CC->unk62) - || (gUnknown_020388CC->unk48 > 0 && gUnknown_020388CC->unk5E > gUnknown_020388CC->unk62)) + if ((gRegionMap->unk48 < 0 && gRegionMap->scrollY < gRegionMap->unk62) + || (gRegionMap->unk48 > 0 && gRegionMap->scrollY > gRegionMap->unk62)) { - gUnknown_020388CC->unk5E = gUnknown_020388CC->unk62; - gUnknown_020388CC->unk48 = 0; + gRegionMap->scrollY = gRegionMap->unk62; + gRegionMap->unk48 = 0; } - if (gUnknown_020388CC->unk78 == 0) + if (gRegionMap->zoomed == FALSE) { - if (gUnknown_020388CC->unk4C < 0x8000) + if (gRegionMap->unk4C < (128 << 8)) { - gUnknown_020388CC->unk4C = 0x8000; - gUnknown_020388CC->unk50 = 0; + gRegionMap->unk4C = (128 << 8); + gRegionMap->unk50 = 0; } } else { - if (gUnknown_020388CC->unk4C > 0x10000) + if (gRegionMap->unk4C > (256 << 8)) { - gUnknown_020388CC->unk4C = 0x10000; - gUnknown_020388CC->unk50 = 0; + gRegionMap->unk4C = (256 << 8); + gRegionMap->unk50 = 0; } } r4 = 1; } - sub_80FB170(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E, 0x38, 0x48, gUnknown_020388CC->unk4C >> 8, gUnknown_020388CC->unk4C >> 8, 0); + CalcZoomScrollParams(gRegionMap->scrollX, gRegionMap->scrollY, 0x38, 0x48, gRegionMap->unk4C >> 8, gRegionMap->unk4C >> 8, 0); return r4; } -void sub_80FB170(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 g) +void CalcZoomScrollParams(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 rotation) { s32 var1; s32 var2; s32 var3; s32 var4; - gUnknown_020388CC->unk2C = e * gSineTable[g + 64] >> 8; - gUnknown_020388CC->unk30 = e * -gSineTable[g] >> 8; - gUnknown_020388CC->unk34 = f * gSineTable[g] >> 8; - gUnknown_020388CC->unk38 = f * gSineTable[g + 64] >> 8; + gRegionMap->unk2C = e * gSineTable[rotation + 64] >> 8; + gRegionMap->unk30 = e * -gSineTable[rotation] >> 8; + gRegionMap->unk34 = f * gSineTable[rotation] >> 8; + gRegionMap->unk38 = f * gSineTable[rotation + 64] >> 8; var1 = (a << 8) + (c << 8); - var2 = d * gUnknown_020388CC->unk34 + gUnknown_020388CC->unk2C * c; - gUnknown_020388CC->unk24 = var1 - var2; + var2 = d * gRegionMap->unk34 + gRegionMap->unk2C * c; + gRegionMap->bg2x = var1 - var2; var3 = (b << 8) + (d << 8); - var4 = gUnknown_020388CC->unk38 * d + gUnknown_020388CC->unk30 * c; - gUnknown_020388CC->unk28 = var3 - var4; + var4 = gRegionMap->unk38 * d + gRegionMap->unk30 * c; + gRegionMap->bg2y = var3 - var4; - gUnknown_020388CC->unk7D = 1; + gRegionMap->needUpdateVideoRegs = TRUE; } -void sub_80FB238(s16 a, s16 b) +void sub_80FB238(s16 x, s16 y) { - gUnknown_020388CC->unk24 = 0x1C00 + (a << 8); - gUnknown_020388CC->unk28 = 0x2400 + (b << 8); - gUnknown_020388CC->unk7D = 1; + gRegionMap->bg2x = (0x1C << 8) + (x << 8); + gRegionMap->bg2y = (0x24 << 8) + (y << 8); + gRegionMap->needUpdateVideoRegs = TRUE; } -void sub_80FB260(void) +void UpdateRegionMapVideoRegs(void) { - if (gUnknown_020388CC->unk7D != 0) + if (gRegionMap->needUpdateVideoRegs) { - REG_BG2PA = gUnknown_020388CC->unk2C; - REG_BG2PB = gUnknown_020388CC->unk34; - REG_BG2PC = gUnknown_020388CC->unk30; - REG_BG2PD = gUnknown_020388CC->unk38; - REG_BG2X = gUnknown_020388CC->unk24; - REG_BG2Y = gUnknown_020388CC->unk28; - gUnknown_020388CC->unk7D = 0; + REG_BG2PA = gRegionMap->unk2C; + REG_BG2PB = gRegionMap->unk34; + REG_BG2PC = gRegionMap->unk30; + REG_BG2PD = gRegionMap->unk38; + REG_BG2X = gRegionMap->bg2x; + REG_BG2Y = gRegionMap->bg2y; + gRegionMap->needUpdateVideoRegs = FALSE; } } void sub_80FB2A4(s16 a, s16 b) { - sub_80FB170(a, b, 0x38, 0x48, 0x100, 0x100, 0); - sub_80FB260(); - if (gUnknown_020388CC->unk20 != NULL) + CalcZoomScrollParams(a, b, 0x38, 0x48, 0x100, 0x100, 0); + UpdateRegionMapVideoRegs(); + if (gRegionMap->playerIconSprite != NULL) { - gUnknown_020388CC->unk20->pos2.x = -a; - gUnknown_020388CC->unk20->pos2.y = -b; + gRegionMap->playerIconSprite->pos2.x = -a; + gRegionMap->playerIconSprite->pos2.y = -b; } } u16 GetRegionMapSectionAt(u16 x, u16 y) { - - if (y < 2 || y > 16 || x < 1 || x > 0x1C) - return 0x58; - y -= 2; - x -= 1; + if (y < MAPCURSOR_Y_MIN || y > MAPCURSOR_Y_MAX || x < MAPCURSOR_X_MIN || x > MAPCURSOR_X_MAX) + return MAPSEC_NONE; + y -= MAPCURSOR_Y_MIN; + x -= MAPCURSOR_X_MIN; return gRegionMapSections[x + y * 28]; } -void sub_80FB32C(void) +void InitializeCursorPosition(void) { struct MapHeader *mapHeader; u16 mapWidth; @@ -661,7 +724,10 @@ void sub_80FB32C(void) u16 r1; u16 r9; - if (gSaveBlock1.location.mapGroup == 0x19 && (gSaveBlock1.location.mapNum == 0x29 || gSaveBlock1.location.mapNum == 0x2A || gSaveBlock1.location.mapNum == 0x2B)) + if (gSaveBlock1.location.mapGroup == 25 + && (gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_CORRIDOR + || gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_LOWER_DECK + || gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_ROOMS)) { sub_80FB600(); return; @@ -675,20 +741,20 @@ void sub_80FB32C(void) case 2: case 4: case 5: - gUnknown_020388CC->unk14 = gMapHeader.name; - gUnknown_020388CC->unk7F = 0; + gRegionMap->mapSecId = gMapHeader.regionMapSectionId; + gRegionMap->playerIsInCave = FALSE; mapWidth = gMapHeader.mapData->width; mapHeight = gMapHeader.mapData->height; x = gSaveBlock1.pos.x; y = gSaveBlock1.pos.y; - if (gUnknown_020388CC->unk14 == 0x45) - gUnknown_020388CC->unk7F = 1; + if (gRegionMap->mapSecId == MAPSEC_UNDERWATER6) + gRegionMap->playerIsInCave = TRUE; break; case 3: case 6: mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp4.mapGroup, gSaveBlock1.warp4.mapNum); - gUnknown_020388CC->unk14 = mapHeader->name; - gUnknown_020388CC->unk7F = 1; + gRegionMap->mapSecId = mapHeader->regionMapSectionId; + gRegionMap->playerIsInCave = TRUE; mapWidth = mapHeader->mapData->width; mapHeight = mapHeader->mapData->height; x = gSaveBlock1.warp4.x; @@ -696,8 +762,8 @@ void sub_80FB32C(void) break; case 8: mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum); - gUnknown_020388CC->unk14 = mapHeader->name; - gUnknown_020388CC->unk7F = 1; + gRegionMap->mapSecId = mapHeader->regionMapSectionId; + gRegionMap->playerIsInCave = TRUE; mapWidth = mapHeader->mapData->width; mapHeight = mapHeader->mapData->height; x = gSaveBlock1.warp2.x; @@ -707,8 +773,8 @@ void sub_80FB32C(void) { struct WarpData *r4; - gUnknown_020388CC->unk14 = gMapHeader.name; - if (gUnknown_020388CC->unk14 != 0x57) + gRegionMap->mapSecId = gMapHeader.regionMapSectionId; + if (gRegionMap->mapSecId != MAPSEC_UNK_0x57) { r4 = &gSaveBlock1.warp4; mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum); @@ -717,9 +783,9 @@ void sub_80FB32C(void) { r4 = &gSaveBlock1.warp2; mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum); - gUnknown_020388CC->unk14 = mapHeader->name; + gRegionMap->mapSecId = mapHeader->regionMapSectionId; } - gUnknown_020388CC->unk7F = 0; + gRegionMap->playerIsInCave = FALSE; mapWidth = mapHeader->mapData->width; mapHeight = mapHeader->mapData->height; x = r4->x; @@ -730,28 +796,28 @@ void sub_80FB32C(void) r9 = x; - r1 = mapWidth / gRegionMapLocations[gUnknown_020388CC->unk14].width; + r1 = mapWidth / gRegionMapLocations[gRegionMap->mapSecId].width; if (r1 == 0) r1 = 1; x /= r1; - if (x >= gRegionMapLocations[gUnknown_020388CC->unk14].width) - x = gRegionMapLocations[gUnknown_020388CC->unk14].width - 1; + if (x >= gRegionMapLocations[gRegionMap->mapSecId].width) + x = gRegionMapLocations[gRegionMap->mapSecId].width - 1; - r1 = mapHeight / gRegionMapLocations[gUnknown_020388CC->unk14].height; + r1 = mapHeight / gRegionMapLocations[gRegionMap->mapSecId].height; if (r1 == 0) r1 = 1; y /= r1; - if (y >= gRegionMapLocations[gUnknown_020388CC->unk14].height) - y = gRegionMapLocations[gUnknown_020388CC->unk14].height - 1; + if (y >= gRegionMapLocations[gRegionMap->mapSecId].height) + y = gRegionMapLocations[gRegionMap->mapSecId].height - 1; - switch (gUnknown_020388CC->unk14) + switch (gRegionMap->mapSecId) { - case 0x1D: + case MAPSEC_ROUTE_114: if (y != 0) x = 0; break; - case 0x29: - case 0x33: + case MAPSEC_ROUTE_126: + case MAPSEC_UNDERWATER2: x = 0; if (gSaveBlock1.pos.x > 32) x = 1; @@ -763,7 +829,7 @@ void sub_80FB32C(void) if (gSaveBlock1.pos.y > 0x38) y++; break; - case 0x24: + case MAPSEC_ROUTE_121: x = 0; if (r9 > 14) x = 1; @@ -773,8 +839,8 @@ void sub_80FB32C(void) x++; break; } - gUnknown_020388CC->unk54 = gRegionMapLocations[gUnknown_020388CC->unk14].x + x + 1; - gUnknown_020388CC->unk56 = gRegionMapLocations[gUnknown_020388CC->unk14].y + y + 2; + gRegionMap->cursorPosX = gRegionMapLocations[gRegionMap->mapSecId].x + x + MAPCURSOR_X_MIN; + gRegionMap->cursorPosY = gRegionMapLocations[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN; } void sub_80FB600(void) @@ -789,16 +855,16 @@ void sub_80FB600(void) switch (GetSSTidalLocation(&mapGroup, &mapNum, &sp2, &sp4)) { case 1: - gUnknown_020388CC->unk14 = 8; + gRegionMap->mapSecId = MAPSEC_SLATEPORT_CITY; break; case 2: - gUnknown_020388CC->unk14 = 12; + gRegionMap->mapSecId = MAPSEC_LILYCOVE_CITY; break; case 3: - gUnknown_020388CC->unk14 = 0x27; + gRegionMap->mapSecId = MAPSEC_ROUTE_124; break; case 4: - gUnknown_020388CC->unk14 = 0x2E; + gRegionMap->mapSecId = MAPSEC_ROUTE_131; break; default: case 0: @@ -806,70 +872,71 @@ void sub_80FB600(void) struct MapHeader *mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum); u16 r1; - gUnknown_020388CC->unk14 = mapHeader->name; - r1 = mapHeader->mapData->width / gRegionMapLocations[gUnknown_020388CC->unk14].width; + gRegionMap->mapSecId = mapHeader->regionMapSectionId; + r1 = mapHeader->mapData->width / gRegionMapLocations[gRegionMap->mapSecId].width; if (r1 == 0) r1 = 1; x = sp2 / r1; - if (x >= gRegionMapLocations[gUnknown_020388CC->unk14].width) - x = gRegionMapLocations[gUnknown_020388CC->unk14].width - 1; + if (x >= gRegionMapLocations[gRegionMap->mapSecId].width) + x = gRegionMapLocations[gRegionMap->mapSecId].width - 1; - r1 = mapHeader->mapData->height / gRegionMapLocations[gUnknown_020388CC->unk14].height; + r1 = mapHeader->mapData->height / gRegionMapLocations[gRegionMap->mapSecId].height; if (r1 == 0) r1 = 1; y = sp4 / r1; - if (y >= gRegionMapLocations[gUnknown_020388CC->unk14].height) - y = gRegionMapLocations[gUnknown_020388CC->unk14].height - 1; + if (y >= gRegionMapLocations[gRegionMap->mapSecId].height) + y = gRegionMapLocations[gRegionMap->mapSecId].height - 1; } break; } - gUnknown_020388CC->unk7F = 0; - gUnknown_020388CC->unk54 = gRegionMapLocations[gUnknown_020388CC->unk14].x + x + 1; - gUnknown_020388CC->unk56 = gRegionMapLocations[gUnknown_020388CC->unk14].y + y + 2; + gRegionMap->playerIsInCave = FALSE; + gRegionMap->cursorPosX = gRegionMapLocations[gRegionMap->mapSecId].x + x + MAPCURSOR_X_MIN; + gRegionMap->cursorPosY = gRegionMapLocations[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN; } -u16 sub_80FB758(u16 a) +u16 sub_80FB758(u16 mapSecId) { - switch (a) + switch (mapSecId) { - case 88: + case MAPSEC_NONE: return 0; - case 0: - return FlagGet(0x80F) ? 2 : 3; - case 1: - return FlagGet(0x810) ? 2 : 3; - case 2: - return FlagGet(0x811) ? 2 : 3; - case 3: - return FlagGet(0x812) ? 2 : 3; - case 4: - return FlagGet(0x813) ? 2 : 3; - case 5: - return FlagGet(0x814) ? 2 : 3; - case 6: - return FlagGet(0x815) ? 2 : 3; - case 7: - return FlagGet(0x816) ? 2 : 3; - case 8: - return FlagGet(0x817) ? 2 : 3; - case 9: - return FlagGet(0x818) ? 2 : 3; - case 10: - return FlagGet(0x819) ? 2 : 3; - case 11: - return FlagGet(0x81A) ? 2 : 3; - case 12: - return FlagGet(0x81B) ? 2 : 3; - case 13: - return FlagGet(0x81C) ? 2 : 3; - case 14: - return FlagGet(0x81D) ? 2 : 3; - case 15: - return FlagGet(0x81E) ? 2 : 3; - case 58: - return FlagGet(0x848) ? 4 : 0; - case 73: - return FlagGet(0x849) ? 1 : 0; + case MAPSEC_LITTLEROOT_TOWN: + return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? 2 : 3; + case MAPSEC_OLDALE_TOWN: + return FlagGet(FLAG_VISITED_OLDALE_TOWN) ? 2 : 3; + case MAPSEC_DEWFORD_TOWN: + return FlagGet(FLAG_VISITED_DEWFORD_TOWN) ? 2 : 3; + case MAPSEC_LAVARIDGE_TOWN: + return FlagGet(FLAG_VISITED_LAVARIDGE_TOWN) ? 2 : 3; + case MAPSEC_FALLARBOR_TOWN: + return FlagGet(FLAG_VISITED_FALLARBOR_TOWN) ? 2 : 3; + case MAPSEC_VERDANTURF_TOWN: + return FlagGet(FLAG_VISITED_VERDANTURF_TOWN) ? 2 : 3; + case MAPSEC_PACIFIDLOG_TOWN: + return FlagGet(FLAG_VISITED_PACIFIDLOG_TOWN) ? 2 : 3; + case MAPSEC_PETALBURG_CITY: + return FlagGet(FLAG_VISITED_PETALBURG_CITY) ? 2 : 3; + case MAPSEC_SLATEPORT_CITY: + return FlagGet(FLAG_VISITED_SLATEPORT_CITY) ? 2 : 3; + case MAPSEC_MAUVILLE_CITY: + return FlagGet(FLAG_VISITED_MAUVILLE_CITY) ? 2 : 3; + case MAPSEC_RUSTBORO_CITY: + return FlagGet(FLAG_VISITED_RUSTBORO_CITY) ? 2 : 3; + case MAPSEC_FORTREE_CITY: + return FlagGet(FLAG_VISITED_FORTREE_CITY) ? 2 : 3; + case MAPSEC_LILYCOVE_CITY: + return FlagGet(FLAG_VISITED_LILYCOVE_CITY) ? 2 : 3; + case MAPSEC_MOSSDEEP_CITY: + return FlagGet(FLAG_VISITED_MOSSDEEP_CITY) ? 2 : 3; + case MAPSEC_SOOTOPOLIS_CITY: + return FlagGet(FLAG_VISITED_SOOTOPOLIS_CITY) ? 2 : 3; + case MAPSEC_EVER_GRANDE_CITY: + return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? 2 : 3; + + case MAPSEC_BATTLE_TOWER: + return FlagGet(FLAG_UNLOCK_BATTLE_TOWER) ? 4 : 0; + case MAPSEC_SOUTHERN_ISLAND: + return FlagGet(FLAG_UNLOCK_SOUTHERN_ISLAND) ? 1 : 0; default: return 1; } @@ -880,22 +947,21 @@ u16 GetRegionMapSectionAt_(u16 x, u16 y) return GetRegionMapSectionAt(x, y); } -u16 sub_80FB9C0(u16 a) +u16 sub_80FB9C0(u16 mapSecId) { - u16 i = 0; + u16 i; - while (gUnknown_083E7684[i][0] != 88) + for (i = 0; gUnknown_083E7684[i][0] != MAPSEC_NONE; i++) { - if (gUnknown_083E7684[i][0] == a) + if (gUnknown_083E7684[i][0] == mapSecId) return gUnknown_083E7684[i][1]; - i++; } - return a; + return mapSecId; } -u16 sub_80FBA04(u16 a) +u16 sub_80FBA04(u16 mapSecId) { - return sub_80FB9C0(a); + return sub_80FB9C0(mapSecId); } void sub_80FBA18(void) @@ -904,21 +970,21 @@ void sub_80FBA18(void) u16 y; u16 i; - if (gUnknown_020388CC->unk14 == 88) + if (gRegionMap->mapSecId == MAPSEC_NONE) { - gUnknown_020388CC->unk17 = 0; + gRegionMap->everGrandeCityArea = 0; return; } - if (gUnknown_020388CC->unk78 == 0) + if (gRegionMap->zoomed == FALSE) { - x = gUnknown_020388CC->unk54; - y = gUnknown_020388CC->unk56; + x = gRegionMap->cursorPosX; + y = gRegionMap->cursorPosY; } else { - x = gUnknown_020388CC->unk64; - y = gUnknown_020388CC->unk66; + x = gRegionMap->unk64; + y = gRegionMap->unk66; } i = 0; @@ -926,7 +992,7 @@ void sub_80FBA18(void) { if (x <= 1) { - if (sub_80FBAA0(y) != 0) + if (sub_80FBAA0(y)) { y--; x = 0x1D; @@ -939,36 +1005,34 @@ void sub_80FBA18(void) else { x--; - if (GetRegionMapSectionAt(x, y) == gUnknown_020388CC->unk14) + if (GetRegionMapSectionAt(x, y) == gRegionMap->mapSecId) i++; } } - gUnknown_020388CC->unk17 = i; + gRegionMap->everGrandeCityArea = i; } -u8 sub_80FBAA0(u16 a) +bool8 sub_80FBAA0(u16 a) { u16 x; u16 y; y = a - 1; if (y == 0xFFFF) - return 0; + return FALSE; - x = 1; - while (x < 0x1D) + for (x = MAPCURSOR_X_MIN; x <= MAPCURSOR_X_MAX; x++) { - if (GetRegionMapSectionAt(x, y) == gUnknown_020388CC->unk14) - return 1; - x++; + if (GetRegionMapSectionAt(x, y) == gRegionMap->mapSecId) + return TRUE; } - return 0; + return FALSE; } -const struct OamData gOamData_83E76B8 = +const struct OamData gCursorIconOamData = { .y = 0, .affineMode = 0, @@ -1001,19 +1065,19 @@ const union AnimCmd gSpriteAnim_83E76CC[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gSpriteAnimTable_83E76E0[] = +const union AnimCmd *const gCursorIconAnimTable[] = { gSpriteAnim_83E76C0, gSpriteAnim_83E76CC, }; -void sub_80FBAF0(struct Sprite *sprite) +void SpriteCB_CursorIcon(struct Sprite *sprite) { - if (gUnknown_020388CC->unk7A != 0) + if (gRegionMap->unk7A != 0) { - sprite->pos1.x += gUnknown_020388CC->unk7B * 2; - sprite->pos1.y += gUnknown_020388CC->unk7C * 2; - gUnknown_020388CC->unk7A--; + sprite->pos1.x += gRegionMap->cursorDeltaX * 2; + sprite->pos1.y += gRegionMap->cursorDeltaY * 2; + gRegionMap->unk7A--; } } @@ -1021,7 +1085,7 @@ void nullsub_66(struct Sprite *sprite) { } -void sub_80FBB3C(u16 tileTag, u16 paletteTag) +void CreateRegionMapCursorIcon(u16 tileTag, u16 paletteTag) { u8 spriteId; struct SpriteSheet spriteSheet; @@ -1031,30 +1095,30 @@ void sub_80FBB3C(u16 tileTag, u16 paletteTag) }; struct SpriteTemplate spriteTemplate = { - .oam = &gOamData_83E76B8, - .anims = gSpriteAnimTable_83E76E0, + .oam = &gCursorIconOamData, + .anims = gCursorIconAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FBAF0, + .callback = SpriteCB_CursorIcon, }; spriteSheet.tag = tileTag; spriteTemplate.tileTag = tileTag; - gUnknown_020388CC->unk58 = tileTag; + gRegionMap->cursorIconTileTag = tileTag; spritePalette.tag = paletteTag; spriteTemplate.paletteTag = paletteTag; - gUnknown_020388CC->unk5A = paletteTag; + gRegionMap->cursorIconPaletteTag = paletteTag; - if (gUnknown_020388CC->unk78 == 0) + if (gRegionMap->zoomed == FALSE) { - spriteSheet.data = gUnknown_020388CC->unk180; + spriteSheet.data = gRegionMap->unk180; spriteSheet.size = 0x100; - spriteTemplate.callback = sub_80FBAF0; + spriteTemplate.callback = SpriteCB_CursorIcon; } else { - spriteSheet.data = gUnknown_020388CC->unk280; + spriteSheet.data = gRegionMap->unk280; spriteSheet.size = 0x600; spriteTemplate.callback = nullsub_66; } @@ -1063,44 +1127,44 @@ void sub_80FBB3C(u16 tileTag, u16 paletteTag) spriteId = CreateSprite(&spriteTemplate, 0x38, 0x48, 0); if (spriteId != 64) { - gUnknown_020388CC->unk1C = &gSprites[spriteId]; - if (gUnknown_020388CC->unk78 == 1) + gRegionMap->cursorIconSprite = &gSprites[spriteId]; + if (gRegionMap->zoomed == TRUE) { - gUnknown_020388CC->unk1C->oam.size = 2; - gUnknown_020388CC->unk1C->pos1.x -= 8; - gUnknown_020388CC->unk1C->pos1.y -= 8; - StartSpriteAnim(gUnknown_020388CC->unk1C, 1); + gRegionMap->cursorIconSprite->oam.size = 2; + gRegionMap->cursorIconSprite->pos1.x -= 8; + gRegionMap->cursorIconSprite->pos1.y -= 8; + StartSpriteAnim(gRegionMap->cursorIconSprite, 1); } else { - gUnknown_020388CC->unk1C->oam.size = 1; - gUnknown_020388CC->unk1C->pos1.x = gUnknown_020388CC->unk54 * 8 + 4; - gUnknown_020388CC->unk1C->pos1.y = gUnknown_020388CC->unk56 * 8 + 4; + gRegionMap->cursorIconSprite->oam.size = 1; + gRegionMap->cursorIconSprite->pos1.x = gRegionMap->cursorPosX * 8 + 4; + gRegionMap->cursorIconSprite->pos1.y = gRegionMap->cursorPosY * 8 + 4; } - gUnknown_020388CC->unk1C->data1 = 2; - gUnknown_020388CC->unk1C->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101; - gUnknown_020388CC->unk1C->data3 = 1; + gRegionMap->cursorIconSprite->data1 = 2; + gRegionMap->cursorIconSprite->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101; + gRegionMap->cursorIconSprite->data3 = 1; } } void sub_80FBCA0(void) { - if (gUnknown_020388CC->unk1C != NULL) + if (gRegionMap->cursorIconSprite != NULL) { - DestroySprite(gUnknown_020388CC->unk1C); - FreeSpriteTilesByTag(gUnknown_020388CC->unk58); - FreeSpritePaletteByTag(gUnknown_020388CC->unk5A); + DestroySprite(gRegionMap->cursorIconSprite); + FreeSpriteTilesByTag(gRegionMap->cursorIconTileTag); + FreeSpritePaletteByTag(gRegionMap->cursorIconPaletteTag); } } void unref_sub_80FBCD0(void) { - gUnknown_020388CC->unk1C->data3 = 1; + gRegionMap->cursorIconSprite->data3 = 1; } void unref_sub_80FBCE0(void) { - gUnknown_020388CC->unk1C->data3 = 0; + gRegionMap->cursorIconSprite->data3 = 0; } const struct OamData gOamData_083E7708 = @@ -1131,7 +1195,7 @@ const union AnimCmd *const gSpriteAnimTable_083E7718[] = gSpriteAnim_83E7710, }; -void sub_80FBCF0(u16 tileTag, u16 paletteTag) +void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag) { u8 spriteId; struct SpriteSheet spriteSheet = @@ -1164,80 +1228,82 @@ void sub_80FBCF0(u16 tileTag, u16 paletteTag) LoadSpriteSheet(&spriteSheet); LoadSpritePalette(&spritePalette); spriteId = CreateSprite(&spriteTemplate, 0, 0, 1); - gUnknown_020388CC->unk20 = &gSprites[spriteId]; - if (gUnknown_020388CC->unk78 == 0) + gRegionMap->playerIconSprite = &gSprites[spriteId]; + if (gRegionMap->zoomed == FALSE) { - gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 8 + 4; - gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 8 + 4; - gUnknown_020388CC->unk20->callback = sub_80FBF34; + gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 8 + 4; + gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 8 + 4; + gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedOut; } else { - gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 16 - 48; - gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 16 - 66; - gUnknown_020388CC->unk20->callback = sub_80FBEA4; + gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 16 - 48; + gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 16 - 66; + gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedIn; } } void sub_80FBDF8(void) { - if (gUnknown_020388CC->unk20 != NULL) + if (gRegionMap->playerIconSprite != NULL) { - gUnknown_020388CC->unk20->invisible = TRUE; - gUnknown_020388CC->unk20->callback = SpriteCallbackDummy; + gRegionMap->playerIconSprite->invisible = TRUE; + gRegionMap->playerIconSprite->callback = SpriteCallbackDummy; } } void sub_80FBE24(void) { - if (gUnknown_020388CC->unk20 != NULL) + if (gRegionMap->playerIconSprite != NULL) { - if (gUnknown_020388CC->unk78 == 1) + if (gRegionMap->zoomed == TRUE) { - gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 16 - 48; - gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 16 - 66; - gUnknown_020388CC->unk20->callback = sub_80FBEA4; - gUnknown_020388CC->unk20->invisible = FALSE; + gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 16 - 48; + gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 16 - 66; + gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedIn; + gRegionMap->playerIconSprite->invisible = FALSE; } else { - gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 8 + 4; - gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 8 + 4; - gUnknown_020388CC->unk20->pos2.x = 0; - gUnknown_020388CC->unk20->pos2.y = 0; - gUnknown_020388CC->unk20->callback = sub_80FBF34; - gUnknown_020388CC->unk20->invisible = FALSE; + gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 8 + 4; + gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 8 + 4; + gRegionMap->playerIconSprite->pos2.x = 0; + gRegionMap->playerIconSprite->pos2.y = 0; + gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedOut; + gRegionMap->playerIconSprite->invisible = FALSE; } } } -void sub_80FBEA4(struct Sprite *sprite) +void SpriteCB_PlayerIconZoomedIn(struct Sprite *sprite) { - sprite->pos2.x = -(gUnknown_020388CC->unk5C * 2); - sprite->pos2.y = -(gUnknown_020388CC->unk5E * 2); + sprite->pos2.x = -(gRegionMap->scrollX * 2); + sprite->pos2.y = -(gRegionMap->scrollY * 2); sprite->data0 = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; sprite->data1 = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; + // Determine if sprite is on screen if (sprite->data0 < -8 || sprite->data0 > 0xA8 || sprite->data1 < -8 || sprite->data1 > 0xF8) - sprite->data2 = 0; + sprite->data2 = FALSE; else - sprite->data2 = 1; + sprite->data2 = TRUE; - if (sprite->data2 == 1) - sub_80FBF40(sprite); + if (sprite->data2 == TRUE) + UpdateIconBlink(sprite); else sprite->invisible = TRUE; } -void sub_80FBF34(struct Sprite *sprite) +void SpriteCB_PlayerIconZoomedOut(struct Sprite *sprite) { - sub_80FBF40(sprite); + UpdateIconBlink(sprite); } -void sub_80FBF40(struct Sprite *sprite) +void UpdateIconBlink(struct Sprite *sprite) { - if (gUnknown_020388CC->unk7E != 0) + if (gRegionMap->blinkPlayerIcon) { + // Toggle visibility every 16 frames sprite->data7++; if (sprite->data7 > 16) { @@ -1253,48 +1319,48 @@ void sub_80FBF40(struct Sprite *sprite) void sub_80FBF94(void) { - if (gUnknown_020388CC->unk7F != 0) - gUnknown_020388CC->unk7E = 1; + if (gRegionMap->playerIsInCave) + gRegionMap->blinkPlayerIcon = TRUE; } -const u8 *sub_80FBFB4(u8 *dest, u16 b, u16 length) +const u8 *GetMapSectionName(u8 *dest, u16 mapSecId, u16 length) { - if (b == 86) + if (mapSecId == MAPSEC_SECRET_BASE) return GetSecretBaseMapName(dest); - if (b < 88) - return StringCopy(dest, gRegionMapLocations[b].name); + if (mapSecId < MAPSEC_NONE) + return StringCopy(dest, gRegionMapLocations[mapSecId].regionMapSectionId); if (length == 0) length = 18; return StringFill(dest, CHAR_SPACE, length); } -const u8 *CopyMapName(u8 *dest, u16 b) +const u8 *CopyMapName(u8 *dest, u16 mapSecId) { - switch (b) + switch (mapSecId) { - case 87: + case MAPSEC_UNK_0x57: return StringCopy(dest, gOtherText_Ferry); - case 86: + case MAPSEC_SECRET_BASE: return StringCopy(dest, gOtherText_SecretBase); default: - return sub_80FBFB4(dest, b, 0); + return GetMapSectionName(dest, mapSecId, 0); } } -const u8 *CopyLocationName(u8 *dest, u16 b) +const u8 *CopyLocationName(u8 *dest, u16 mapSecId) { - if (b == 66) + if (mapSecId == MAPSEC_EVIL_TEAM_HIDEOUT) return StringCopy(dest, gOtherText_Hideout); else - return CopyMapName(dest, b); + return CopyMapName(dest, mapSecId); } -void sub_80FC04C(u16 a, u16 *x, u16 *y, u16 *width, u16 *height) +void GetRegionMapLocationPosition(u16 mapSecId, u16 *x, u16 *y, u16 *width, u16 *height) { - *x = gRegionMapLocations[a].x; - *y = gRegionMapLocations[a].y; - *width = gRegionMapLocations[a].width; - *height = gRegionMapLocations[a].height; + *x = gRegionMapLocations[mapSecId].x; + *y = gRegionMapLocations[mapSecId].y; + *width = gRegionMapLocations[mapSecId].width; + *height = gRegionMapLocations[mapSecId].height; } struct UnknownStruct3 @@ -1302,14 +1368,14 @@ struct UnknownStruct3 void (*unk0)(void); u16 unk4; u16 unk6; - struct UnknownStruct1 unk8; + struct RegionMap regionMap; }; extern u8 ewram[]; #define ewram0 (*(struct UnknownStruct3 *)(ewram + 0)) #define ewram888 (ewram + 0x888) #define ewramA6E (ewram[0xA6E]) -#define ewramA48 (ewram + 0xA48) +#define ewramBlankMapName (ewram + 0xA48) const u16 gUnknown_083E771C[] = INCBIN_U16("graphics/pokenav/map_frame.gbapal"); const u8 gUnknown_083E773C[] = INCBIN_U8("graphics/pokenav/map_frame.4bpp.lz"); @@ -1374,15 +1440,15 @@ const u8 gUnknown_083E7920[][3] = struct UnknownStruct4 { const u8 *const *unk0; - u16 unk4; - u16 unk6; + u16 mapSecId; + u16 flag; }; -const u8 *const Unknown_3E79B8[] = {OtherText_PokeLeague, OtherText_PokeCenter}; +const u8 *const sEverGrandeCityAreaNames[] = {OtherText_PokeLeague, OtherText_PokeCenter}; const struct UnknownStruct4 gUnknown_083E79C0[1] = { - {Unknown_3E79B8, 15, 0x854}, + {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, 0x854}, }; // XXX: what is this? @@ -1390,13 +1456,15 @@ static u8 *const ewram_ = ewram; const struct SpritePalette gUnknown_083E79CC = {gPokenavMapMisc_Pal, 2}; -const u16 gUnknown_083E79D4[][2] = +// Fly targets that are not cities or towns +const u16 gSpecialFlyAreas[][2] = { - {0x848, 58}, - {0xFFFF, 88}, + // flag, mapSecId + {0x848, MAPSEC_BATTLE_TOWER}, + {0xFFFF, MAPSEC_NONE}, }; -const struct OamData gOamData_83E79DC = +const struct OamData gFlyTargetOamData = { .y = 0, .affineMode = 0, @@ -1413,71 +1481,71 @@ const struct OamData gOamData_83E79DC = .affineParam = 0, }; -const union AnimCmd gSpriteAnim_83E79E4[] = +const union AnimCmd gFlyTargetAnimSeq0[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; -const union AnimCmd gSpriteAnim_83E79EC[] = +const union AnimCmd gFlyTargetAnimSeq1[] = { ANIMCMD_FRAME(1, 5), ANIMCMD_END, }; -const union AnimCmd gSpriteAnim_83E79F4[] = +const union AnimCmd gFlyTargetAnimSeq2[] = { ANIMCMD_FRAME(3, 5), ANIMCMD_END, }; -const union AnimCmd gSpriteAnim_83E79FC[] = +const union AnimCmd gFlyTargetAnimSeq3[] = { ANIMCMD_FRAME(5, 5), ANIMCMD_END, }; -const union AnimCmd gSpriteAnim_83E7A04[] = +const union AnimCmd gFlyTargetAnimSeq4[] = { ANIMCMD_FRAME(6, 5), ANIMCMD_END, }; -const union AnimCmd gSpriteAnim_83E7A0C[] = +const union AnimCmd gFlyTargetAnimSeq5[] = { ANIMCMD_FRAME(8, 5), ANIMCMD_END, }; -const union AnimCmd gSpriteAnim_83E7A14[] = +const union AnimCmd gFlyTargetAnimSeq6[] = { ANIMCMD_FRAME(10, 5), ANIMCMD_END, }; -const union AnimCmd *const gSpriteAnimTable_83E7A1C[] = +const union AnimCmd *const gFlyTargetAnimTable[] = { - gSpriteAnim_83E79E4, - gSpriteAnim_83E79EC, - gSpriteAnim_83E79F4, - gSpriteAnim_83E79FC, - gSpriteAnim_83E7A04, - gSpriteAnim_83E7A0C, - gSpriteAnim_83E7A14, + gFlyTargetAnimSeq0, + gFlyTargetAnimSeq1, + gFlyTargetAnimSeq2, + gFlyTargetAnimSeq3, + gFlyTargetAnimSeq4, + gFlyTargetAnimSeq5, + gFlyTargetAnimSeq6, }; -const struct SpriteTemplate gSpriteTemplate_83E7A38 = +const struct SpriteTemplate gFlyTargetSpriteTemplate = { .tileTag = 2, .paletteTag = 2, - .oam = &gOamData_83E79DC, - .anims = gSpriteAnimTable_83E7A1C, + .oam = &gFlyTargetOamData, + .anims = gFlyTargetAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -void sub_80FC074(void) +void CB2_InitFlyRegionMap(void) { switch (gMain.state) { @@ -1505,12 +1573,12 @@ void sub_80FC074(void) MenuZeroFillScreen(); break; case 3: - sub_80FA8EC(&ewram0.unk8, 0); - sub_80FBB3C(0, 0); - sub_80FBCF0(1, 1); - ewram0.unk6 = ewram0.unk8.unk14; - StringFill(ewramA48, CHAR_SPACE, 12); - sub_80FC254(); + InitRegionMap(&ewram0.regionMap, 0); + CreateRegionMapCursorIcon(0, 0); + CreateRegionMapPlayerIcon(1, 1); + ewram0.unk6 = ewram0.regionMap.mapSecId; + StringFill(ewramBlankMapName, CHAR_SPACE, 12); + PrintFlyTargetName(); break; case 4: LZ77UnCompVram(gUnknown_083E773C, (void *)(VRAM + 0xC000)); @@ -1523,7 +1591,7 @@ void sub_80FC074(void) MenuPrint_PixelCoords(gOtherText_FlyToWhere, 1, 0x90, 1); break; case 7: - sub_80FC31C(); + CreateFlyTargetGraphics(); break; case 8: BlendPalettes(0xFFFFFFFF, 16, 0); @@ -1562,24 +1630,24 @@ void sub_80FC244(void (*func)(void)) ewram0.unk4 = 0; } -void sub_80FC254(void) +void PrintFlyTargetName(void) { - if (ewram0.unk8.unk16 == 2 || ewram0.unk8.unk16 == 4) + if (ewram0.regionMap.unk16 == 2 || ewram0.regionMap.unk16 == 4) { u16 i = 0; int zero; - for (i = 0; i < 1; i++) + for (i = 0; i < ARRAY_COUNT(gUnknown_083E79C0); i++) { const struct UnknownStruct4 *r4 = &gUnknown_083E79C0[i]; - if (ewram0.unk8.unk14 == r4->unk4) + if (ewram0.regionMap.mapSecId == r4->mapSecId) { - if (FlagGet(r4->unk6)) + if (FlagGet(r4->flag)) { MenuDrawTextWindow(16, 14, 29, 19); - MenuPrint(ewram0.unk8.filler0, 17, 15); - MenuPrint_RightAligned(r4->unk0[ewram0.unk8.unk17], 29, 17); + MenuPrint(ewram0.regionMap.mapSecName, 17, 15); + MenuPrint_RightAligned(r4->unk0[ewram0.regionMap.everGrandeCityArea], 29, 17); return; } break; @@ -1590,19 +1658,19 @@ void sub_80FC254(void) if (zero == 0) { MenuDrawTextWindow(16, 16, 29, 19); - MenuPrint(ewram0.unk8.filler0, 17, 17); + MenuPrint(ewram0.regionMap.mapSecName, 17, 17); MenuZeroFillWindowRect(16, 14, 29, 15); } } else { MenuDrawTextWindow(16, 16, 29, 19); - MenuPrint(ewramA48, 17, 17); + MenuPrint(ewramBlankMapName, 17, 17); MenuZeroFillWindowRect(16, 14, 29, 15); } } -void sub_80FC31C(void) +void CreateFlyTargetGraphics(void) { struct SpriteSheet spriteSheet; @@ -1612,13 +1680,14 @@ void sub_80FC31C(void) spriteSheet.tag = 2; LoadSpriteSheet(&spriteSheet); LoadSpritePalette(&gUnknown_083E79CC); - sub_80FC374(); - sub_80FC484(); + CreateCityTownFlyTargetIcons(); + CreateSpecialAreaFlyTargetIcons(); } -void sub_80FC374(void) +// Draws a light overlay on cities and towns that the player can fly to +void CreateCityTownFlyTargetIcons(void) { - u16 flag = 0x80F; + u16 canFlyFlag = 0x80F; u16 i; for (i = 0; i < 16; i++) @@ -1630,7 +1699,7 @@ void sub_80FC374(void) u16 r7; u8 spriteId; - sub_80FC04C(i, &x, &y, &width, &height); + GetRegionMapLocationPosition(i, &x, &y, &width, &height); x = (x + 1) * 8 + 4; y = (y + 2) * 8 + 4; if (width == 2) @@ -1639,56 +1708,60 @@ void sub_80FC374(void) r7 = 2; else r7 = 0; - spriteId = CreateSprite(&gSpriteTemplate_83E7A38, x, y, 10); + spriteId = CreateSprite(&gFlyTargetSpriteTemplate, x, y, 10); if (spriteId != 64) { gSprites[spriteId].oam.shape = r7; - if (FlagGet(flag)) - gSprites[spriteId].callback = sub_80FC55C; + if (FlagGet(canFlyFlag)) + gSprites[spriteId].callback = SpriteCB_FlyTargetIcons; else r7 += 3; StartSpriteAnim(&gSprites[spriteId], r7); gSprites[spriteId].data0 = i; } - flag++; + canFlyFlag++; } } -void sub_80FC484(void) +// Draws a red box on other fly targets +// The Battle Tower is the only one of these +void CreateSpecialAreaFlyTargetIcons(void) { u16 i; - for (i = 0; gUnknown_083E79D4[i][1] != 88; i++) + for (i = 0; gSpecialFlyAreas[i][1] != MAPSEC_NONE; i++) { u16 x; u16 y; u16 width; u16 height; - if (FlagGet(gUnknown_083E79D4[i][0])) + if (FlagGet(gSpecialFlyAreas[i][0])) { - u16 r6 = gUnknown_083E79D4[i][1]; + u16 mapSecId = gSpecialFlyAreas[i][1]; u8 spriteId; - sub_80FC04C(r6, &x, &y, &width, &height); + GetRegionMapLocationPosition(mapSecId, &x, &y, &width, &height); x = (x + 1) * 8; y = (y + 2) * 8; - spriteId = CreateSprite(&gSpriteTemplate_83E7A38, x, y, 10); + spriteId = CreateSprite(&gFlyTargetSpriteTemplate, x, y, 10); if (spriteId != 64) { gSprites[spriteId].oam.size = 1; - gSprites[spriteId].callback = sub_80FC55C; + gSprites[spriteId].callback = SpriteCB_FlyTargetIcons; StartSpriteAnim(&gSprites[spriteId], 6); - gSprites[spriteId].data0 = r6; + gSprites[spriteId].data0 = mapSecId; } } } } -void sub_80FC55C(struct Sprite *sprite) +void SpriteCB_FlyTargetIcons(struct Sprite *sprite) { - if (ewram0.unk8.unk14 == sprite->data0) + // Blink if our mapSecId is the one selected on the map + if (ewram0.regionMap.mapSecId == sprite->data0) { + // Toggle visibility every 16 frames sprite->data1++; if (sprite->data1 > 16) { @@ -1725,22 +1798,22 @@ void sub_80FC600(void) { switch (sub_80FAB60()) { - case 0: - case 1: - case 2: + case INPUT_EVENT_NONE: + case INPUT_EVENT_DPAD: + case INPUT_EVENT_2: break; - case 3: - sub_80FC254(); + case INPUT_EVENT_3: + PrintFlyTargetName(); break; - case 4: - if (ewram0.unk8.unk16 == 2 || ewram0.unk8.unk16 == 4) + case INPUT_EVENT_A_BUTTON: + if (ewram0.regionMap.unk16 == 2 || ewram0.regionMap.unk16 == 4) { m4aSongNumStart(SE_SELECT); ewramA6E = 1; sub_80FC244(sub_80FC69C); } break; - case 5: + case INPUT_EVENT_B_BUTTON: m4aSongNumStart(SE_SELECT); ewramA6E = 0; sub_80FC244(sub_80FC69C); @@ -1760,28 +1833,28 @@ void sub_80FC69C(void) case 1: if (UpdatePaletteFade() != 0) break; - sub_80FAB10(); + FreeRegionMapIconResources(); if (ewramA6E != 0) { - switch (ewram0.unk8.unk14) + switch (ewram0.regionMap.mapSecId) { - case 0x49: + case MAPSEC_SOUTHERN_ISLAND: sub_8053538(22); break; - case 0x3A: + case MAPSEC_BATTLE_TOWER: sub_8053538(21); break; - case 0: + case MAPSEC_LITTLEROOT_TOWN: sub_8053538((gSaveBlock2.playerGender == MALE) ? 12 : 13); break; - case 15: - sub_8053538((FlagGet(0x854) && ewram0.unk8.unk17 == 0) ? 20 : 11); + case MAPSEC_EVER_GRANDE_CITY: + sub_8053538((FlagGet(0x854) && ewram0.regionMap.everGrandeCityArea == 0) ? 20 : 11); break; default: - if (gUnknown_083E7920[ewram0.unk8.unk14][2] != 0) - sub_8053538(gUnknown_083E7920[ewram0.unk8.unk14][2]); + if (gUnknown_083E7920[ewram0.regionMap.mapSecId][2] != 0) + sub_8053538(gUnknown_083E7920[ewram0.regionMap.mapSecId][2]); else - warp1_set_2(gUnknown_083E7920[ewram0.unk8.unk14][0], gUnknown_083E7920[ewram0.unk8.unk14][1], -1); + warp1_set_2(gUnknown_083E7920[ewram0.regionMap.mapSecId][0], gUnknown_083E7920[ewram0.regionMap.mapSecId][1], -1); break; } sub_80865BC(); diff --git a/src/rom4.c b/src/rom4.c index bfc8e0e44..b2e30e292 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -993,12 +993,12 @@ bool8 is_light_level_8_or_9(u8 a1) u8 unref_sub_8054260(void) { - return get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum)->name; + return get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum)->regionMapSectionId; } u8 sav1_map_get_name(void) { - return get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->name; + return get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->regionMapSectionId; } u8 sav1_map_get_battletype(void) diff --git a/src/save_menu_util.c b/src/save_menu_util.c index b2dd662d6..a2d17bd36 100644 --- a/src/save_menu_util.c +++ b/src/save_menu_util.c @@ -70,7 +70,7 @@ void PrintSaveMapName(s16 x, s16 y) { char name[32]; - CopyMapName(name, gMapHeader.name); + CopyMapName(name, gMapHeader.regionMapSectionId); MenuPrint(name, x, y); } diff --git a/src/secret_base.c b/src/secret_base.c index d88d2c66a..4e8331f5c 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -205,7 +205,7 @@ void sub_80BB8CC(void) memset(gSaveBlock1.secretBases[0].sbr_field_2, 0xFF, 7); StringCopyN(gSaveBlock1.secretBases[0].sbr_field_2, gSaveBlock2.playerName, nameLength); gSaveBlock1.secretBases[0].gender = gSaveBlock2.playerGender; - VarSet(VAR_SECRET_BASE_MAP, gMapHeader.name); + VarSet(VAR_SECRET_BASE_MAP, gMapHeader.regionMapSectionId); } void sub_80BB970(struct MapEvents *events) diff --git a/src/tv.c b/src/tv.c index 27fe9b84c..529537366 100644 --- a/src/tv.c +++ b/src/tv.c @@ -479,7 +479,7 @@ void sub_80BDC14(void) gSaveBlock1.gabbyAndTyData.valB_2 = gSaveBlock1.gabbyAndTyData.valA_2; gSaveBlock1.gabbyAndTyData.valB_3 = gSaveBlock1.gabbyAndTyData.valA_3; gSaveBlock1.gabbyAndTyData.valA_4 = 1; - gSaveBlock1.gabbyAndTyData.mapnum = gMapHeader.name; + gSaveBlock1.gabbyAndTyData.mapnum = gMapHeader.regionMapSectionId; IncrementGameStat(GAME_STAT_GOT_INTERVIEWED); } @@ -664,7 +664,7 @@ void sub_80BE028(void) { buffer->worldOfMasters.var02++; buffer->worldOfMasters.var04 = gBattleResults.CaughtPoke; buffer->worldOfMasters.var08 = gBattleResults.Poke1Species; - buffer->worldOfMasters.var0a = gMapHeader.name; + buffer->worldOfMasters.var0a = gMapHeader.regionMapSectionId; } #ifdef NONMATCHING @@ -692,7 +692,7 @@ void sub_80BE074(void) { show->pokemonTodayFailed.species2 = gBattleResults.unk20; show->pokemonTodayFailed.var10 = total; show->pokemonTodayFailed.var11 = gBattleOutcome; - show->pokemonTodayFailed.var12 = gMapHeader.name; + show->pokemonTodayFailed.var12 = gMapHeader.regionMapSectionId; StringCopy(show->pokemonTodayFailed.playerName, gSaveBlock2.playerName); sub_80BE138(show); show->pokemonTodayFailed.language = GAME_LANGUAGE; @@ -905,7 +905,7 @@ void sub_80BE3BC(void) { tvShow = &gSaveBlock1.tvShows[gUnknown_03005D38.var0]; tvShow->smartshopperShow.var00 = TVSHOW_SMART_SHOPPER; tvShow->smartshopperShow.var01 = rval; - tvShow->smartshopperShow.shopLocation = gMapHeader.name; + tvShow->smartshopperShow.shopLocation = gMapHeader.regionMapSectionId; for (i=0; i<3; i++) { tvShow->smartshopperShow.itemIds[i] = gUnknown_02038724[i].item_id; tvShow->smartshopperShow.itemAmounts[i] = gUnknown_02038724[i].item_amount; @@ -3216,7 +3216,7 @@ void DoTVShowTodaysSmartShopper(void) { case 0: TVShowConvertInternationalString(gStringVar1, tvShow->smartshopperShow.playerName, tvShow->smartshopperShow.language); - sub_80FBFB4(gStringVar2, tvShow->smartshopperShow.shopLocation, 0); + GetMapSectionName(gStringVar2, tvShow->smartshopperShow.shopLocation, 0); if (tvShow->smartshopperShow.itemAmounts[0] >= 0xff) { gUnknown_020387E8 = 11; @@ -3498,7 +3498,7 @@ void DoTVShowPokemonTodayFailedCapture(void) { break; case 1: TVShowConvertInternationalString(gStringVar1, tvShow->pokemonTodayFailed.playerName, tvShow->pokemonTodayFailed.language); - sub_80FBFB4(gStringVar2, tvShow->pokemonTodayFailed.var12, 0); + GetMapSectionName(gStringVar2, tvShow->pokemonTodayFailed.var12, 0); StringCopy(gStringVar3, gSpeciesNames[tvShow->pokemonTodayFailed.species2]); if (tvShow->pokemonTodayFailed.var11 == 1) { gUnknown_020387E8 = 3; @@ -3653,7 +3653,7 @@ void DoTVShowPokemonNewsMassOutbreak(void) tvShow = &gSaveBlock1.tvShows[gSpecialVar_0x8004]; - sub_80FBFB4(gStringVar1, tvShow->massOutbreak.locationMapNum, 0); + GetMapSectionName(gStringVar1, tvShow->massOutbreak.locationMapNum, 0); StringCopy(gStringVar2, gSpeciesNames[tvShow->massOutbreak.species]); @@ -3669,7 +3669,7 @@ void DoTVShowInSearchOfTrainers(void) { switchval = gUnknown_020387E8; switch (switchval) { case 0: - sub_80FBFB4(gStringVar1, gSaveBlock1.gabbyAndTyData.mapnum, 0); + GetMapSectionName(gStringVar1, gSaveBlock1.gabbyAndTyData.mapnum, 0); if (gSaveBlock1.gabbyAndTyData.battleNum > 1) { gUnknown_020387E8 = 1; } else { @@ -3765,7 +3765,7 @@ void DoTVShowTheWorldOfMasters(void) { case 2: TVShowConvertInternationalString(gStringVar1, tvShow->worldOfMasters.playerName, tvShow->worldOfMasters.language); - sub_80FBFB4(gStringVar2, tvShow->worldOfMasters.var0a, 0); + GetMapSectionName(gStringVar2, tvShow->worldOfMasters.var0a, 0); StringCopy(gStringVar3, gSpeciesNames[tvShow->worldOfMasters.var04]); TVShowDone(); break; -- cgit v1.2.3 From 9000ea3277d7c030e5830f5ca5206665b1c5be25 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 16 Jul 2017 11:30:26 -0500 Subject: visual region map layout --- src/data/region_map_layout.h | 42 ++++++++++++++++++++++++++++++++++++++++++ src/region_map.c | 21 ++------------------- 2 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 src/data/region_map_layout.h (limited to 'src') diff --git a/src/data/region_map_layout.h b/src/data/region_map_layout.h new file mode 100644 index 000000000..7b7c1df2a --- /dev/null +++ b/src/data/region_map_layout.h @@ -0,0 +1,42 @@ +// Abbreviated definitions to make the map layout more visual +#define R(routeNum) MAPSEC_ROUTE_##routeNum +#define LITT_T MAPSEC_LITTLEROOT_TOWN +#define OLDA_T MAPSEC_OLDALE_TOWN +#define DEWF_T MAPSEC_DEWFORD_TOWN +#define LAVA_T MAPSEC_LAVARIDGE_TOWN +#define FALL_T MAPSEC_FALLARBOR_TOWN +#define VERD_T MAPSEC_VERDANTURF_TOWN +#define PACI_T MAPSEC_PACIFIDLOG_TOWN +#define PETA_C MAPSEC_PETALBURG_CITY +#define SLAT_C MAPSEC_SLATEPORT_CITY +#define MAUV_C MAPSEC_MAUVILLE_CITY +#define RUST_T MAPSEC_RUSTBORO_CITY +#define FORT_C MAPSEC_FORTREE_CITY +#define LILY_C MAPSEC_LILYCOVE_CITY +#define MOSS_C MAPSEC_MOSSDEEP_CITY +#define SOOT_C MAPSEC_SOOTOPOLIS_CITY +#define EVER_C MAPSEC_EVER_GRANDE_CITY +#define MTCHIM MAPSEC_MT_CHIMNEY +#define SAFARI MAPSEC_SAFARI_ZONE +#define BTLTWR MAPSEC_BATTLE_TOWER +#define S_ISLD MAPSEC_SOUTHERN_ISLAND +#define ______ MAPSEC_NONE + +const u8 gRegionMapLayout[] = +{ + ______, R(114), R(114), FALL_T, R(113), R(113), R(113), R(113), R(111), ______, ______, R(119), FORT_C, R(120), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, + ______, R(114), ______, ______, ______, ______, MTCHIM, MTCHIM, R(111), ______, ______, R(119), ______, R(120), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, + R(115), R(114), ______, ______, ______, ______, MTCHIM, MTCHIM, R(111), ______, ______, R(119), ______, R(120), ______, ______, SAFARI, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, + R(115), ______, ______, ______, ______, LAVA_T, R(112), R(112), R(111), ______, ______, R(119), ______, R(120), R(121), R(121), R(121), R(121), LILY_C, LILY_C, R(124), R(124), R(124), R(124), R(125), R(125), ______, ______, + R(115), ______, ______, ______, ______, ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), R(125), R(125), ______, ______, + RUST_T, R(116), R(116), R(116), R(116), ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), MOSS_C, MOSS_C, ______, ______, + RUST_T, ______, ______, ______, VERD_T, R(117), R(117), R(117), MAUV_C, MAUV_C, R(118), R(118), R(123), R(123), R(123), R(123), R(123), ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, ______, + R(104), ______, ______, ______, ______, ______, ______, ______, R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(126), SOOT_C, R(126), R(127), R(127), R(127), ______, ______, + R(104), ______, ______, ______, R(103), R(103), R(103), R(103), R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, EVER_C, + R(104), PETA_C, R(102), R(102), OLDA_T, ______, ______, ______, R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(128), R(128), R(128), R(128), EVER_C, + R(105), ______, ______, ______, R(101), ______, ______, ______, SLAT_C, R(134), R(134), R(134), R(133), R(133), R(133), R(132), R(132), PACI_T, R(131), R(131), R(131), R(130), R(130), R(130), R(129), R(129), ______, ______, + R(105), ______, ______, ______, LITT_T, ______, ______, ______, SLAT_C, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, + R(105), ______, ______, ______, ______, ______, ______, ______, R(109), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, BTLTWR, ______, ______, ______, ______, ______, + R(106), R(106), R(106), ______, ______, ______, ______, ______, R(109), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, + ______, ______, DEWF_T, R(107), R(107), R(107), R(108), R(108), R(109), ______, ______, ______, S_ISLD, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, +}; diff --git a/src/region_map.c b/src/region_map.c index a0739ecef..418be8663 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -140,24 +140,7 @@ const u16 gUnknown_083E5D60[] = INCBIN_U16("graphics/pokenav/region_map.gbapal") const u8 gUnknown_083E5DA0[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz"); const u8 gUnknown_083E6B04[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz"); -const u8 gRegionMapSections[] = -{ - 0x58, 0x1D, 0x1D, 0x04, 0x1C, 0x1C, 0x1C, 0x1C, 0x1A, 0x58, 0x58, 0x22, 0x0B, 0x23, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, - 0x58, 0x1D, 0x58, 0x58, 0x58, 0x58, 0x38, 0x38, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, - 0x1E, 0x1D, 0x58, 0x58, 0x58, 0x58, 0x38, 0x38, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x58, 0x58, 0x39, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, - 0x1E, 0x58, 0x58, 0x58, 0x58, 0x03, 0x1B, 0x1B, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x24, 0x24, 0x24, 0x24, 0x0C, 0x0C, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0x58, 0x58, - 0x1E, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x58, 0x58, 0x58, 0x25, 0x58, 0x58, 0x58, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0x58, 0x58, - 0x0A, 0x1F, 0x1F, 0x1F, 0x1F, 0x58, 0x58, 0x58, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x58, 0x58, 0x58, 0x25, 0x58, 0x58, 0x58, 0x27, 0x27, 0x27, 0x27, 0x0D, 0x0D, 0x58, 0x58, - 0x0A, 0x58, 0x58, 0x58, 0x05, 0x20, 0x20, 0x20, 0x09, 0x09, 0x21, 0x21, 0x26, 0x26, 0x26, 0x26, 0x26, 0x58, 0x58, 0x58, 0x29, 0x29, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x58, - 0x13, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x29, 0x0E, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x58, - 0x13, 0x58, 0x58, 0x58, 0x12, 0x12, 0x12, 0x12, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x29, 0x29, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x0F, - 0x13, 0x07, 0x11, 0x11, 0x01, 0x58, 0x58, 0x58, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x2B, 0x2B, 0x2B, 0x2B, 0x0F, - 0x14, 0x58, 0x58, 0x58, 0x10, 0x58, 0x58, 0x58, 0x08, 0x31, 0x31, 0x31, 0x30, 0x30, 0x30, 0x2F, 0x2F, 0x06, 0x2E, 0x2E, 0x2E, 0x2D, 0x2D, 0x2D, 0x2C, 0x2C, 0x58, 0x58, - 0x14, 0x58, 0x58, 0x58, 0x00, 0x58, 0x58, 0x58, 0x08, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, - 0x14, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x18, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x3A, 0x58, 0x58, 0x58, 0x58, 0x58, - 0x15, 0x15, 0x15, 0x58, 0x58, 0x58, 0x58, 0x58, 0x18, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, - 0x58, 0x58, 0x02, 0x16, 0x16, 0x16, 0x17, 0x17, 0x18, 0x58, 0x58, 0x58, 0x49, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, -}; +#include "data/region_map_layout.h" #if ENGLISH #include "data/region_map_names_en.h" @@ -711,7 +694,7 @@ u16 GetRegionMapSectionAt(u16 x, u16 y) return MAPSEC_NONE; y -= MAPCURSOR_Y_MIN; x -= MAPCURSOR_X_MIN; - return gRegionMapSections[x + y * 28]; + return gRegionMapLayout[x + y * 28]; } void InitializeCursorPosition(void) -- 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/data/region_map_layout.h | 8 +- src/field_region_map.c | 2 +- src/region_map.c | 374 +++++++++++++++++++++---------------------- 3 files changed, 190 insertions(+), 194 deletions(-) (limited to 'src') diff --git a/src/data/region_map_layout.h b/src/data/region_map_layout.h index 7b7c1df2a..ca33ef37a 100644 --- a/src/data/region_map_layout.h +++ b/src/data/region_map_layout.h @@ -10,7 +10,7 @@ #define PETA_C MAPSEC_PETALBURG_CITY #define SLAT_C MAPSEC_SLATEPORT_CITY #define MAUV_C MAPSEC_MAUVILLE_CITY -#define RUST_T MAPSEC_RUSTBORO_CITY +#define RUST_C MAPSEC_RUSTBORO_CITY #define FORT_C MAPSEC_FORTREE_CITY #define LILY_C MAPSEC_LILYCOVE_CITY #define MOSS_C MAPSEC_MOSSDEEP_CITY @@ -22,15 +22,15 @@ #define S_ISLD MAPSEC_SOUTHERN_ISLAND #define ______ MAPSEC_NONE -const u8 gRegionMapLayout[] = +static const u8 sRegionMapLayout[] = { ______, R(114), R(114), FALL_T, R(113), R(113), R(113), R(113), R(111), ______, ______, R(119), FORT_C, R(120), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(114), ______, ______, ______, ______, MTCHIM, MTCHIM, R(111), ______, ______, R(119), ______, R(120), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(115), R(114), ______, ______, ______, ______, MTCHIM, MTCHIM, R(111), ______, ______, R(119), ______, R(120), ______, ______, SAFARI, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(115), ______, ______, ______, ______, LAVA_T, R(112), R(112), R(111), ______, ______, R(119), ______, R(120), R(121), R(121), R(121), R(121), LILY_C, LILY_C, R(124), R(124), R(124), R(124), R(125), R(125), ______, ______, R(115), ______, ______, ______, ______, ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), R(125), R(125), ______, ______, - RUST_T, R(116), R(116), R(116), R(116), ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), MOSS_C, MOSS_C, ______, ______, - RUST_T, ______, ______, ______, VERD_T, R(117), R(117), R(117), MAUV_C, MAUV_C, R(118), R(118), R(123), R(123), R(123), R(123), R(123), ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, ______, + RUST_C, R(116), R(116), R(116), R(116), ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), MOSS_C, MOSS_C, ______, ______, + RUST_C, ______, ______, ______, VERD_T, R(117), R(117), R(117), MAUV_C, MAUV_C, R(118), R(118), R(123), R(123), R(123), R(123), R(123), ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, ______, R(104), ______, ______, ______, ______, ______, ______, ______, R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(126), SOOT_C, R(126), R(127), R(127), R(127), ______, ______, R(104), ______, ______, ______, R(103), R(103), R(103), R(103), R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, EVER_C, R(104), PETA_C, R(102), R(102), OLDA_T, ______, ______, ______, R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(128), R(128), R(128), R(128), EVER_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(); diff --git a/src/region_map.c b/src/region_map.c index 418be8663..097417357 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -18,6 +18,7 @@ #include "text.h" #include "trig.h" +// Map Section IDs #define MAPSEC_LITTLEROOT_TOWN 0 #define MAPSEC_OLDALE_TOWN 1 #define MAPSEC_DEWFORD_TOWN 2 @@ -110,11 +111,10 @@ #define MAP_WIDTH 28 #define MAP_HEIGHT 15 - #define MAPCURSOR_X_MIN 1 #define MAPCURSOR_Y_MIN 2 -#define MAPCURSOR_X_MAX 28 -#define MAPCURSOR_Y_MAX 16 +#define MAPCURSOR_X_MAX (MAPCURSOR_X_MIN + MAP_WIDTH - 1) +#define MAPCURSOR_Y_MAX (MAPCURSOR_Y_MIN + MAP_HEIGHT - 1) // Input events enum @@ -129,16 +129,16 @@ enum extern struct RegionMap *gRegionMap; -const u16 gPokenavCursor_Pal[] = INCBIN_U16("graphics/pokenav/cursor.gbapal"); -const u8 gUnknown_083E5AF0[] = INCBIN_U8("graphics/pokenav/cursor_small.4bpp.lz"); -const u8 gUnknown_083E5B34[] = INCBIN_U8("graphics/pokenav/cursor_large.4bpp.lz"); -const u16 gRegionMapBrendanIconPalette[] = INCBIN_U16("graphics/pokenav/brendan_icon.gbapal"); -const u8 gRegionMapBrendanIconTiles[] = INCBIN_U8("graphics/pokenav/brendan_icon.4bpp"); -const u16 gRegionMapMayIconPalette[] = INCBIN_U16("graphics/pokenav/may_icon.gbapal"); -const u8 gRegionMapMayIconTiles[] = INCBIN_U8("graphics/pokenav/may_icon.4bpp"); -const u16 gUnknown_083E5D60[] = INCBIN_U16("graphics/pokenav/region_map.gbapal"); -const u8 gUnknown_083E5DA0[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz"); -const u8 gUnknown_083E6B04[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz"); +static const u16 sRegionMapCursor_Pal[] = INCBIN_U16("graphics/pokenav/cursor.gbapal"); +static const u8 sRegionMapCursorSmall_ImageLZ[] = INCBIN_U8("graphics/pokenav/cursor_small.4bpp.lz"); +static const u8 sRegionMapCursorLarge_ImageLZ[] = INCBIN_U8("graphics/pokenav/cursor_large.4bpp.lz"); +static const u16 sRegionMapBrendanIcon_Pal[] = INCBIN_U16("graphics/pokenav/brendan_icon.gbapal"); +static const u8 sRegionMapBrendanIcon_Image[] = INCBIN_U8("graphics/pokenav/brendan_icon.4bpp"); +static const u16 sRegionMapMayIcon_Pal[] = INCBIN_U16("graphics/pokenav/may_icon.gbapal"); +static const u8 sRegionMapMayIcon_Image[] = INCBIN_U8("graphics/pokenav/may_icon.4bpp"); +static const u16 sRegionMapBkgnd_Pal[] = INCBIN_U16("graphics/pokenav/region_map.gbapal"); +static const u8 sRegionMapBkgnd_ImageLZ[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz"); +static const u8 sRegionMapBkgnd_TilemapLZ[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz"); #include "data/region_map_layout.h" @@ -247,7 +247,7 @@ const struct RegionMapLocation gRegionMapLocations[] = { 0, 0, 1, 1, gMapName_None}, }; -const u16 gUnknown_083E7684[][2] = +static const u16 gUnknown_083E7684[][2] = { {MAPSEC_UNDERWATER1, MAPSEC_ROUTE_124}, {MAPSEC_UNDERWATER2, MAPSEC_ROUTE_126}, @@ -264,41 +264,39 @@ const u16 gUnknown_083E7684[][2] = {MAPSEC_NONE, MAPSEC_NONE}, }; -void sub_80FA904(struct RegionMap *, u8); -bool8 sub_80FA940(void); -u8 sub_80FAB78(void); -u8 _swiopen(void); -u8 sub_80FAD04(void); -u8 sub_80FADE4(void); -void CalcZoomScrollParams(s16, s16, s16, s16, u16, u16, u8); -void sub_80FB238(s16, s16); +static u8 sub_80FAB78(void); +static u8 _swiopen(void); +static u8 sub_80FAD04(void); +static u8 sub_80FADE4(void); +static void CalcZoomScrollParams(s16, s16, s16, s16, u16, u16, u8); +static void sub_80FB238(s16, s16); void UpdateRegionMapVideoRegs(void); -u16 GetRegionMapSectionAt(u16, u16); -void InitializeCursorPosition(void); -void sub_80FB600(void); -u16 sub_80FB758(u16); -u16 sub_80FB9C0(u16); -void sub_80FBA18(void); -bool8 sub_80FBAA0(u16); -void CreateRegionMapCursorIcon(u16, u16); -void sub_80FBCA0(void); -void sub_80FBDF8(void); -void sub_80FBE24(void); -void SpriteCB_PlayerIconZoomedOut(struct Sprite *); -void UpdateIconBlink(struct Sprite *); -void SpriteCB_PlayerIconZoomedIn(struct Sprite *); +static u16 GetRegionMapSectionAt(u16, u16); +static void InitializeCursorPosition(void); +static void sub_80FB600(void); +static u16 sub_80FB758(u16); +static u16 sub_80FB9C0(u16); +static void sub_80FBA18(void); +static bool8 sub_80FBAA0(u16); +void CreateRegionMapCursor(u16, u16); +static void sub_80FBCA0(void); +static void sub_80FBDF8(void); +static void sub_80FBE24(void); +static void SpriteCB_PlayerIconZoomedOut(struct Sprite *); +static void UpdateIconBlink(struct Sprite *); +static void SpriteCB_PlayerIconZoomedIn(struct Sprite *); const u8 *GetMapSectionName(u8 *, u16, u16); -void sub_80FC214(void); -void sub_80FC228(void); -void sub_80FC244(void (*func)(void)); -void PrintFlyTargetName(void); -void CreateFlyTargetGraphics(void); -void CreateCityTownFlyTargetIcons(void); -void CreateSpecialAreaFlyTargetIcons(void); -void SpriteCB_FlyTargetIcons(struct Sprite *); -void sub_80FC5B4(void); -void sub_80FC600(void); -void sub_80FC69C(void); +static void VBlankCB_FlyRegionMap(void); +static void CB2_FlyRegionMap(void); +static void sub_80FC244(void (*func)(void)); +static void PrintFlyTargetName(void); +static void CreateFlyTargetGraphics(void); +static void CreateCityTownFlyTargetIcons(void); +static void CreateSpecialAreaFlyTargetIcons(void); +static void SpriteCB_FlyTargetIcons(struct Sprite *); +static void sub_80FC5B4(void); +static void sub_80FC600(void); +static void sub_80FC69C(void); void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed) { @@ -320,19 +318,19 @@ bool8 sub_80FA940(void) switch (gRegionMap->initStep) { case 0: - LZ77UnCompVram(gUnknown_083E5DA0, (void *)(VRAM + 0x8000)); + LZ77UnCompVram(sRegionMapBkgnd_ImageLZ, (void *)(VRAM + 0x8000)); break; case 1: - LZ77UnCompVram(gUnknown_083E6B04, (void *)(VRAM + 0xE000)); + LZ77UnCompVram(sRegionMapBkgnd_TilemapLZ, (void *)(VRAM + 0xE000)); break; case 2: - LoadPalette(gUnknown_083E5D60, 0x70, 0x60); // Why isn't this the right size? + LoadPalette(sRegionMapBkgnd_Pal, 0x70, 0x60); // Why isn't this the right size? break; case 3: - LZ77UnCompWram(gUnknown_083E5AF0, gRegionMap->unk180); + LZ77UnCompWram(sRegionMapCursorSmall_ImageLZ, gRegionMap->cursorSmallImage); break; case 4: - LZ77UnCompWram(gUnknown_083E5B34, gRegionMap->unk280); + LZ77UnCompWram(sRegionMapCursorLarge_ImageLZ, gRegionMap->cursorLargeImage); break; case 5: InitializeCursorPosition(); @@ -359,7 +357,7 @@ bool8 sub_80FA940(void) case 7: sub_80FBA18(); UpdateRegionMapVideoRegs(); - gRegionMap->cursorIconSprite = NULL; + gRegionMap->cursorSprite = NULL; gRegionMap->playerIconSprite = NULL; gRegionMap->unk7A = 0; gRegionMap->blinkPlayerIcon = FALSE; @@ -374,11 +372,11 @@ bool8 sub_80FA940(void) void FreeRegionMapIconResources(void) { - if (gRegionMap->cursorIconSprite != NULL) + if (gRegionMap->cursorSprite != NULL) { - DestroySprite(gRegionMap->cursorIconSprite); - FreeSpriteTilesByTag(gRegionMap->cursorIconTileTag); - FreeSpritePaletteByTag(gRegionMap->cursorIconPaletteTag); + DestroySprite(gRegionMap->cursorSprite); + FreeSpriteTilesByTag(gRegionMap->cursorTileTag); + FreeSpritePaletteByTag(gRegionMap->cursorPaletteTag); } if (gRegionMap->playerIconSprite != NULL) { @@ -393,7 +391,7 @@ u8 sub_80FAB60(void) return gRegionMap->inputCallback(); } -u8 sub_80FAB78(void) +static u8 sub_80FAB78(void) { u8 event = INPUT_EVENT_NONE; @@ -433,7 +431,7 @@ u8 sub_80FAB78(void) return event; } -u8 _swiopen(void) +static u8 _swiopen(void) { u16 mapSecId; @@ -464,7 +462,7 @@ u8 _swiopen(void) return INPUT_EVENT_3; } -u8 sub_80FAD04(void) +static u8 sub_80FAD04(void) { u8 event = INPUT_EVENT_NONE; @@ -504,7 +502,7 @@ u8 sub_80FAD04(void) return event; } -u8 sub_80FADE4(void) +static u8 sub_80FADE4(void) { gRegionMap->scrollY += gRegionMap->unk68; gRegionMap->scrollX += gRegionMap->unk6A; @@ -588,7 +586,7 @@ u8 sub_80FAFC0(void) gRegionMap->unk4C = (gRegionMap->zoomed == FALSE) ? (128 << 8) : (256 << 8); gRegionMap->zoomed = !gRegionMap->zoomed; gRegionMap->inputCallback = (gRegionMap->zoomed == FALSE) ? sub_80FAB78 : sub_80FAD04; - CreateRegionMapCursorIcon(gRegionMap->cursorIconTileTag, gRegionMap->cursorIconPaletteTag); + CreateRegionMapCursor(gRegionMap->cursorTileTag, gRegionMap->cursorPaletteTag); sub_80FBE24(); r4 = 0; } @@ -633,7 +631,7 @@ u8 sub_80FAFC0(void) return r4; } -void CalcZoomScrollParams(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 rotation) +static void CalcZoomScrollParams(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 rotation) { s32 var1; s32 var2; @@ -656,7 +654,7 @@ void CalcZoomScrollParams(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 rotation) gRegionMap->needUpdateVideoRegs = TRUE; } -void sub_80FB238(s16 x, s16 y) +static void sub_80FB238(s16 x, s16 y) { gRegionMap->bg2x = (0x1C << 8) + (x << 8); gRegionMap->bg2y = (0x24 << 8) + (y << 8); @@ -688,16 +686,16 @@ void sub_80FB2A4(s16 a, s16 b) } } -u16 GetRegionMapSectionAt(u16 x, u16 y) +static u16 GetRegionMapSectionAt(u16 x, u16 y) { if (y < MAPCURSOR_Y_MIN || y > MAPCURSOR_Y_MAX || x < MAPCURSOR_X_MIN || x > MAPCURSOR_X_MAX) return MAPSEC_NONE; y -= MAPCURSOR_Y_MIN; x -= MAPCURSOR_X_MIN; - return gRegionMapLayout[x + y * 28]; + return sRegionMapLayout[x + y * 28]; } -void InitializeCursorPosition(void) +static void InitializeCursorPosition(void) { struct MapHeader *mapHeader; u16 mapWidth; @@ -826,7 +824,7 @@ void InitializeCursorPosition(void) gRegionMap->cursorPosY = gRegionMapLocations[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN; } -void sub_80FB600(void) +static void sub_80FB600(void) { u16 y = 0; u16 x = 0; @@ -877,7 +875,7 @@ void sub_80FB600(void) gRegionMap->cursorPosY = gRegionMapLocations[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN; } -u16 sub_80FB758(u16 mapSecId) +static u16 sub_80FB758(u16 mapSecId) { switch (mapSecId) { @@ -930,7 +928,7 @@ u16 GetRegionMapSectionAt_(u16 x, u16 y) return GetRegionMapSectionAt(x, y); } -u16 sub_80FB9C0(u16 mapSecId) +static u16 sub_80FB9C0(u16 mapSecId) { u16 i; @@ -947,7 +945,7 @@ u16 sub_80FBA04(u16 mapSecId) return sub_80FB9C0(mapSecId); } -void sub_80FBA18(void) +static void sub_80FBA18(void) { u16 x; u16 y; @@ -996,7 +994,7 @@ void sub_80FBA18(void) gRegionMap->everGrandeCityArea = i; } -bool8 sub_80FBAA0(u16 a) +static bool8 sub_80FBAA0(u16 a) { u16 x; u16 y; @@ -1013,9 +1011,7 @@ bool8 sub_80FBAA0(u16 a) return FALSE; } - - -const struct OamData gCursorIconOamData = +static const struct OamData sCursorOamData = { .y = 0, .affineMode = 0, @@ -1032,14 +1028,14 @@ const struct OamData gCursorIconOamData = .affineParam = 0, }; -const union AnimCmd gSpriteAnim_83E76C0[] = +static const union AnimCmd sCursorAnimSeq0[] = { ANIMCMD_FRAME(0, 20), ANIMCMD_FRAME(4, 20), ANIMCMD_JUMP(0), }; -const union AnimCmd gSpriteAnim_83E76CC[] = +static const union AnimCmd sCursorAnimSeq1[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(16, 10), @@ -1048,13 +1044,13 @@ const union AnimCmd gSpriteAnim_83E76CC[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gCursorIconAnimTable[] = +static const union AnimCmd *const sCursorAnimTable[] = { - gSpriteAnim_83E76C0, - gSpriteAnim_83E76CC, + sCursorAnimSeq0, + sCursorAnimSeq1, }; -void SpriteCB_CursorIcon(struct Sprite *sprite) +static void SpriteCB_Cursor(struct Sprite *sprite) { if (gRegionMap->unk7A != 0) { @@ -1064,44 +1060,44 @@ void SpriteCB_CursorIcon(struct Sprite *sprite) } } -void nullsub_66(struct Sprite *sprite) +static void nullsub_66(struct Sprite *sprite) { } -void CreateRegionMapCursorIcon(u16 tileTag, u16 paletteTag) +void CreateRegionMapCursor(u16 tileTag, u16 paletteTag) { u8 spriteId; struct SpriteSheet spriteSheet; struct SpritePalette spritePalette = { - .data = gPokenavCursor_Pal, + .data = sRegionMapCursor_Pal, }; struct SpriteTemplate spriteTemplate = { - .oam = &gCursorIconOamData, - .anims = gCursorIconAnimTable, + .oam = &sCursorOamData, + .anims = sCursorAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_CursorIcon, + .callback = SpriteCB_Cursor, }; spriteSheet.tag = tileTag; spriteTemplate.tileTag = tileTag; - gRegionMap->cursorIconTileTag = tileTag; + gRegionMap->cursorTileTag = tileTag; spritePalette.tag = paletteTag; spriteTemplate.paletteTag = paletteTag; - gRegionMap->cursorIconPaletteTag = paletteTag; + gRegionMap->cursorPaletteTag = paletteTag; if (gRegionMap->zoomed == FALSE) { - spriteSheet.data = gRegionMap->unk180; + spriteSheet.data = gRegionMap->cursorSmallImage; spriteSheet.size = 0x100; - spriteTemplate.callback = SpriteCB_CursorIcon; + spriteTemplate.callback = SpriteCB_Cursor; } else { - spriteSheet.data = gRegionMap->unk280; + spriteSheet.data = gRegionMap->cursorLargeImage; spriteSheet.size = 0x600; spriteTemplate.callback = nullsub_66; } @@ -1110,47 +1106,47 @@ void CreateRegionMapCursorIcon(u16 tileTag, u16 paletteTag) spriteId = CreateSprite(&spriteTemplate, 0x38, 0x48, 0); if (spriteId != 64) { - gRegionMap->cursorIconSprite = &gSprites[spriteId]; + gRegionMap->cursorSprite = &gSprites[spriteId]; if (gRegionMap->zoomed == TRUE) { - gRegionMap->cursorIconSprite->oam.size = 2; - gRegionMap->cursorIconSprite->pos1.x -= 8; - gRegionMap->cursorIconSprite->pos1.y -= 8; - StartSpriteAnim(gRegionMap->cursorIconSprite, 1); + gRegionMap->cursorSprite->oam.size = 2; + gRegionMap->cursorSprite->pos1.x -= 8; + gRegionMap->cursorSprite->pos1.y -= 8; + StartSpriteAnim(gRegionMap->cursorSprite, 1); } else { - gRegionMap->cursorIconSprite->oam.size = 1; - gRegionMap->cursorIconSprite->pos1.x = gRegionMap->cursorPosX * 8 + 4; - gRegionMap->cursorIconSprite->pos1.y = gRegionMap->cursorPosY * 8 + 4; + gRegionMap->cursorSprite->oam.size = 1; + gRegionMap->cursorSprite->pos1.x = gRegionMap->cursorPosX * 8 + 4; + gRegionMap->cursorSprite->pos1.y = gRegionMap->cursorPosY * 8 + 4; } - gRegionMap->cursorIconSprite->data1 = 2; - gRegionMap->cursorIconSprite->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101; - gRegionMap->cursorIconSprite->data3 = 1; + gRegionMap->cursorSprite->data1 = 2; + gRegionMap->cursorSprite->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101; + gRegionMap->cursorSprite->data3 = 1; } } -void sub_80FBCA0(void) +static void sub_80FBCA0(void) { - if (gRegionMap->cursorIconSprite != NULL) + if (gRegionMap->cursorSprite != NULL) { - DestroySprite(gRegionMap->cursorIconSprite); - FreeSpriteTilesByTag(gRegionMap->cursorIconTileTag); - FreeSpritePaletteByTag(gRegionMap->cursorIconPaletteTag); + DestroySprite(gRegionMap->cursorSprite); + FreeSpriteTilesByTag(gRegionMap->cursorTileTag); + FreeSpritePaletteByTag(gRegionMap->cursorPaletteTag); } } void unref_sub_80FBCD0(void) { - gRegionMap->cursorIconSprite->data3 = 1; + gRegionMap->cursorSprite->data3 = 1; } void unref_sub_80FBCE0(void) { - gRegionMap->cursorIconSprite->data3 = 0; + gRegionMap->cursorSprite->data3 = 0; } -const struct OamData gOamData_083E7708 = +static const struct OamData sPlayerIconOamData = { .y = 0, .affineMode = 0, @@ -1167,37 +1163,37 @@ const struct OamData gOamData_083E7708 = .affineParam = 0, }; -const union AnimCmd gSpriteAnim_83E7710[] = +static const union AnimCmd sPlayerIconAnimSeq0[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; -const union AnimCmd *const gSpriteAnimTable_083E7718[] = +static const union AnimCmd *const sPlayerIconAnimTable[] = { - gSpriteAnim_83E7710, + sPlayerIconAnimSeq0, }; void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag) { u8 spriteId; - struct SpriteSheet spriteSheet = + struct SpriteSheet playerIconSpriteSheet = { - .data = gRegionMapBrendanIconTiles, + .data = sRegionMapBrendanIcon_Image, .size = 128, .tag = tileTag, }; - struct SpritePalette spritePalette = + struct SpritePalette playerIconSpritePalette = { - .data = gRegionMapBrendanIconPalette, + .data = sRegionMapBrendanIcon_Pal, .tag = paletteTag, }; - struct SpriteTemplate spriteTemplate = + struct SpriteTemplate playerIconSpriteTemplate = { .tileTag = tileTag, .paletteTag = paletteTag, - .oam = &gOamData_083E7708, - .anims = gSpriteAnimTable_083E7718, + .oam = &sPlayerIconOamData, + .anims = sPlayerIconAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, @@ -1205,12 +1201,12 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag) if (gSaveBlock2.playerGender == FEMALE) { - spriteSheet.data = gRegionMapMayIconTiles; - spritePalette.data = gRegionMapMayIconPalette; + playerIconSpriteSheet.data = sRegionMapMayIcon_Image; + playerIconSpritePalette.data = sRegionMapMayIcon_Pal; } - LoadSpriteSheet(&spriteSheet); - LoadSpritePalette(&spritePalette); - spriteId = CreateSprite(&spriteTemplate, 0, 0, 1); + LoadSpriteSheet(&playerIconSpriteSheet); + LoadSpritePalette(&playerIconSpritePalette); + spriteId = CreateSprite(&playerIconSpriteTemplate, 0, 0, 1); gRegionMap->playerIconSprite = &gSprites[spriteId]; if (gRegionMap->zoomed == FALSE) { @@ -1226,7 +1222,7 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag) } } -void sub_80FBDF8(void) +static void sub_80FBDF8(void) { if (gRegionMap->playerIconSprite != NULL) { @@ -1235,7 +1231,7 @@ void sub_80FBDF8(void) } } -void sub_80FBE24(void) +static void sub_80FBE24(void) { if (gRegionMap->playerIconSprite != NULL) { @@ -1258,7 +1254,7 @@ void sub_80FBE24(void) } } -void SpriteCB_PlayerIconZoomedIn(struct Sprite *sprite) +static void SpriteCB_PlayerIconZoomedIn(struct Sprite *sprite) { sprite->pos2.x = -(gRegionMap->scrollX * 2); sprite->pos2.y = -(gRegionMap->scrollY * 2); @@ -1277,12 +1273,12 @@ void SpriteCB_PlayerIconZoomedIn(struct Sprite *sprite) sprite->invisible = TRUE; } -void SpriteCB_PlayerIconZoomedOut(struct Sprite *sprite) +static void SpriteCB_PlayerIconZoomedOut(struct Sprite *sprite) { UpdateIconBlink(sprite); } -void UpdateIconBlink(struct Sprite *sprite) +static void UpdateIconBlink(struct Sprite *sprite) { if (gRegionMap->blinkPlayerIcon) { @@ -1338,7 +1334,7 @@ const u8 *CopyLocationName(u8 *dest, u16 mapSecId) return CopyMapName(dest, mapSecId); } -void GetRegionMapLocationPosition(u16 mapSecId, u16 *x, u16 *y, u16 *width, u16 *height) +static void GetRegionMapLocationPosition(u16 mapSecId, u16 *x, u16 *y, u16 *width, u16 *height) { *x = gRegionMapLocations[mapSecId].x; *y = gRegionMapLocations[mapSecId].y; @@ -1360,13 +1356,13 @@ extern u8 ewram[]; #define ewramA6E (ewram[0xA6E]) #define ewramBlankMapName (ewram + 0xA48) -const u16 gUnknown_083E771C[] = INCBIN_U16("graphics/pokenav/map_frame.gbapal"); -const u8 gUnknown_083E773C[] = INCBIN_U8("graphics/pokenav/map_frame.4bpp.lz"); -const u8 gUnknown_083E7774[] = INCBIN_U8("graphics/pokenav/map_frame.bin.lz"); -const u16 gPokenavMapMisc_Pal[] = INCBIN_U16("graphics/pokenav/map_misc.gbapal"); -const u8 gUnknown_083E784C[] = INCBIN_U8("graphics/pokenav/map_misc.4bpp.lz"); +static const u16 sFlyRegionMapFrame_Pal[] = INCBIN_U16("graphics/pokenav/map_frame.gbapal"); +static const u8 sFlyRegionMapFrame_ImageLZ[] = INCBIN_U8("graphics/pokenav/map_frame.4bpp.lz"); +static const u8 sFlyRegionMapFrame_TilemapLZ[] = INCBIN_U8("graphics/pokenav/map_frame.bin.lz"); +static const u16 sFlyTargetIcons_Pal[] = INCBIN_U16("graphics/pokenav/fly_target_icons.gbapal"); +static const u8 sFlyTargetIcons_ImageLZ[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz"); -const u8 gUnknown_083E7920[][3] = +static const u8 sUnknown_083E7920[][3] = { {0, 9, 1}, {0, 10, 14}, @@ -1427,27 +1423,27 @@ struct UnknownStruct4 u16 flag; }; -const u8 *const sEverGrandeCityAreaNames[] = {OtherText_PokeLeague, OtherText_PokeCenter}; +static const u8 *const sEverGrandeCityAreaNames[] = {OtherText_PokeLeague, OtherText_PokeCenter}; -const struct UnknownStruct4 gUnknown_083E79C0[1] = +static const struct UnknownStruct4 sUnknown_083E79C0[1] = { - {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, 0x854}, + {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, SYS_POKEMON_LEAGUE_FLY}, }; // XXX: what is this? static u8 *const ewram_ = ewram; -const struct SpritePalette gUnknown_083E79CC = {gPokenavMapMisc_Pal, 2}; +static const struct SpritePalette sFlyTargetIconSpritePalette = {sFlyTargetIcons_Pal, 2}; // Fly targets that are not cities or towns -const u16 gSpecialFlyAreas[][2] = +static const u16 sSpecialFlyAreas[][2] = { // flag, mapSecId {0x848, MAPSEC_BATTLE_TOWER}, {0xFFFF, MAPSEC_NONE}, }; -const struct OamData gFlyTargetOamData = +static const struct OamData sFlyTargetOamData = { .y = 0, .affineMode = 0, @@ -1464,65 +1460,65 @@ const struct OamData gFlyTargetOamData = .affineParam = 0, }; -const union AnimCmd gFlyTargetAnimSeq0[] = +static const union AnimCmd sFlyTargetAnimSeq0[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; -const union AnimCmd gFlyTargetAnimSeq1[] = +static const union AnimCmd sFlyTargetAnimSeq1[] = { ANIMCMD_FRAME(1, 5), ANIMCMD_END, }; -const union AnimCmd gFlyTargetAnimSeq2[] = +static const union AnimCmd sFlyTargetAnimSeq2[] = { ANIMCMD_FRAME(3, 5), ANIMCMD_END, }; -const union AnimCmd gFlyTargetAnimSeq3[] = +static const union AnimCmd sFlyTargetAnimSeq3[] = { ANIMCMD_FRAME(5, 5), ANIMCMD_END, }; -const union AnimCmd gFlyTargetAnimSeq4[] = +static const union AnimCmd sFlyTargetAnimSeq4[] = { ANIMCMD_FRAME(6, 5), ANIMCMD_END, }; -const union AnimCmd gFlyTargetAnimSeq5[] = +static const union AnimCmd sFlyTargetAnimSeq5[] = { ANIMCMD_FRAME(8, 5), ANIMCMD_END, }; -const union AnimCmd gFlyTargetAnimSeq6[] = +static const union AnimCmd sFlyTargetAnimSeq6[] = { ANIMCMD_FRAME(10, 5), ANIMCMD_END, }; -const union AnimCmd *const gFlyTargetAnimTable[] = +static const union AnimCmd *const sFlyTargetAnimTable[] = { - gFlyTargetAnimSeq0, - gFlyTargetAnimSeq1, - gFlyTargetAnimSeq2, - gFlyTargetAnimSeq3, - gFlyTargetAnimSeq4, - gFlyTargetAnimSeq5, - gFlyTargetAnimSeq6, + sFlyTargetAnimSeq0, + sFlyTargetAnimSeq1, + sFlyTargetAnimSeq2, + sFlyTargetAnimSeq3, + sFlyTargetAnimSeq4, + sFlyTargetAnimSeq5, + sFlyTargetAnimSeq6, }; -const struct SpriteTemplate gFlyTargetSpriteTemplate = +static const struct SpriteTemplate gFlyTargetSpriteTemplate = { .tileTag = 2, .paletteTag = 2, - .oam = &gFlyTargetOamData, - .anims = gFlyTargetAnimTable, + .oam = &sFlyTargetOamData, + .anims = sFlyTargetAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, @@ -1557,20 +1553,20 @@ void CB2_InitFlyRegionMap(void) break; case 3: InitRegionMap(&ewram0.regionMap, 0); - CreateRegionMapCursorIcon(0, 0); + CreateRegionMapCursor(0, 0); CreateRegionMapPlayerIcon(1, 1); ewram0.unk6 = ewram0.regionMap.mapSecId; StringFill(ewramBlankMapName, CHAR_SPACE, 12); PrintFlyTargetName(); break; case 4: - LZ77UnCompVram(gUnknown_083E773C, (void *)(VRAM + 0xC000)); + LZ77UnCompVram(sFlyRegionMapFrame_ImageLZ, (void *)(VRAM + 0xC000)); break; case 5: - LZ77UnCompVram(gUnknown_083E7774, (void *)(VRAM + 0xF000)); + LZ77UnCompVram(sFlyRegionMapFrame_TilemapLZ, (void *)(VRAM + 0xF000)); break; case 6: - LoadPalette(gUnknown_083E771C, 16, 32); + LoadPalette(sFlyRegionMapFrame_Pal, 16, 32); MenuPrint_PixelCoords(gOtherText_FlyToWhere, 1, 0x90, 1); break; case 7: @@ -1578,14 +1574,14 @@ void CB2_InitFlyRegionMap(void) break; case 8: BlendPalettes(0xFFFFFFFF, 16, 0); - SetVBlankCallback(sub_80FC214); + SetVBlankCallback(VBlankCB_FlyRegionMap); break; case 9: REG_BLDCNT = 0; REG_BG1CNT = 0x1E0D; REG_DISPCNT = 0x1741; sub_80FC244(sub_80FC5B4); - SetMainCallback2(sub_80FC228); + SetMainCallback2(CB2_FlyRegionMap); break; default: return; @@ -1593,36 +1589,36 @@ void CB2_InitFlyRegionMap(void) gMain.state++; } -void sub_80FC214(void) +static void VBlankCB_FlyRegionMap(void) { LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); } -void sub_80FC228(void) +static void CB2_FlyRegionMap(void) { ewram0.unk0(); AnimateSprites(); BuildOamBuffer(); } -void sub_80FC244(void (*func)(void)) +static void sub_80FC244(void (*func)(void)) { ewram0.unk0 = func; ewram0.unk4 = 0; } -void PrintFlyTargetName(void) +static void PrintFlyTargetName(void) { if (ewram0.regionMap.unk16 == 2 || ewram0.regionMap.unk16 == 4) { u16 i = 0; int zero; - for (i = 0; i < ARRAY_COUNT(gUnknown_083E79C0); i++) + for (i = 0; i < ARRAY_COUNT(sUnknown_083E79C0); i++) { - const struct UnknownStruct4 *r4 = &gUnknown_083E79C0[i]; + const struct UnknownStruct4 *r4 = &sUnknown_083E79C0[i]; if (ewram0.regionMap.mapSecId == r4->mapSecId) { @@ -1653,22 +1649,22 @@ void PrintFlyTargetName(void) } } -void CreateFlyTargetGraphics(void) +static void CreateFlyTargetGraphics(void) { struct SpriteSheet spriteSheet; - LZ77UnCompWram(gUnknown_083E784C, ewram888); + LZ77UnCompWram(sFlyTargetIcons_ImageLZ, ewram888); spriteSheet.data = ewram888; spriteSheet.size = 0x1C0; spriteSheet.tag = 2; LoadSpriteSheet(&spriteSheet); - LoadSpritePalette(&gUnknown_083E79CC); + LoadSpritePalette(&sFlyTargetIconSpritePalette); CreateCityTownFlyTargetIcons(); CreateSpecialAreaFlyTargetIcons(); } // Draws a light overlay on cities and towns that the player can fly to -void CreateCityTownFlyTargetIcons(void) +static void CreateCityTownFlyTargetIcons(void) { u16 canFlyFlag = 0x80F; u16 i; @@ -1708,20 +1704,20 @@ void CreateCityTownFlyTargetIcons(void) // Draws a red box on other fly targets // The Battle Tower is the only one of these -void CreateSpecialAreaFlyTargetIcons(void) +static void CreateSpecialAreaFlyTargetIcons(void) { u16 i; - for (i = 0; gSpecialFlyAreas[i][1] != MAPSEC_NONE; i++) + for (i = 0; sSpecialFlyAreas[i][1] != MAPSEC_NONE; i++) { u16 x; u16 y; u16 width; u16 height; - if (FlagGet(gSpecialFlyAreas[i][0])) + if (FlagGet(sSpecialFlyAreas[i][0])) { - u16 mapSecId = gSpecialFlyAreas[i][1]; + u16 mapSecId = sSpecialFlyAreas[i][1]; u8 spriteId; GetRegionMapLocationPosition(mapSecId, &x, &y, &width, &height); @@ -1739,7 +1735,7 @@ void CreateSpecialAreaFlyTargetIcons(void) } } -void SpriteCB_FlyTargetIcons(struct Sprite *sprite) +static void SpriteCB_FlyTargetIcons(struct Sprite *sprite) { // Blink if our mapSecId is the one selected on the map if (ewram0.regionMap.mapSecId == sprite->data0) @@ -1759,7 +1755,7 @@ void SpriteCB_FlyTargetIcons(struct Sprite *sprite) } } -void sub_80FC5B4(void) +static void sub_80FC5B4(void) { switch (ewram0.unk4) { @@ -1775,7 +1771,7 @@ void sub_80FC5B4(void) } } -void sub_80FC600(void) +static void sub_80FC600(void) { if (ewram0.unk4 == 0) { @@ -1805,7 +1801,7 @@ void sub_80FC600(void) } } -void sub_80FC69C(void) +static void sub_80FC69C(void) { switch (ewram0.unk4) { @@ -1834,10 +1830,10 @@ void sub_80FC69C(void) sub_8053538((FlagGet(0x854) && ewram0.regionMap.everGrandeCityArea == 0) ? 20 : 11); break; default: - if (gUnknown_083E7920[ewram0.regionMap.mapSecId][2] != 0) - sub_8053538(gUnknown_083E7920[ewram0.regionMap.mapSecId][2]); + if (sUnknown_083E7920[ewram0.regionMap.mapSecId][2] != 0) + sub_8053538(sUnknown_083E7920[ewram0.regionMap.mapSecId][2]); else - warp1_set_2(gUnknown_083E7920[ewram0.regionMap.mapSecId][0], gUnknown_083E7920[ewram0.regionMap.mapSecId][1], -1); + warp1_set_2(sUnknown_083E7920[ewram0.regionMap.mapSecId][0], sUnknown_083E7920[ewram0.regionMap.mapSecId][1], -1); break; } sub_80865BC(); -- cgit v1.2.3