From 7eacb24cf7a889121e654c678bd4026aecd301b1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 1 Nov 2017 21:10:47 -0400 Subject: [PATCH] Start ripping graphics/data for region_map --- data/region_map.s | 30 ---------- graphics/pokenav/brendan_icon.pal | 19 ++++++ graphics/pokenav/brendan_icon.png | Bin 0 -> 239 bytes graphics/pokenav/cursor.gbapal | Bin 0 -> 32 bytes .../unk_859f5ec.pal => pokenav/cursor.pal} | 0 graphics/pokenav/cursor_large.png | Bin 0 -> 194 bytes graphics/pokenav/cursor_small.png | Bin 0 -> 168 bytes graphics/pokenav/fly_target_icons.pal | 19 ++++++ graphics/pokenav/fly_target_icons.png | Bin 0 -> 291 bytes graphics/pokenav/map_frame.bin | Bin 0 -> 1280 bytes graphics/pokenav/map_frame.gbapal | Bin 0 -> 32 bytes graphics/pokenav/map_frame.png | Bin 0 -> 160 bytes graphics/pokenav/may_icon.pal | 19 ++++++ graphics/pokenav/may_icon.png | Bin 0 -> 245 bytes graphics/pokenav/region_map.pal | 35 +++++++++++ graphics/pokenav/region_map.png | Bin 0 -> 3959 bytes graphics/pokenav/region_map_map.bin | Bin 0 -> 4096 bytes graphics_file_rules.mk | 5 ++ ld_script.txt | 1 + src/region_map.c | 56 +++++++++--------- 20 files changed, 127 insertions(+), 57 deletions(-) create mode 100644 graphics/pokenav/brendan_icon.pal create mode 100644 graphics/pokenav/brendan_icon.png create mode 100644 graphics/pokenav/cursor.gbapal rename graphics/{unknown/unk_859f5ec.pal => pokenav/cursor.pal} (100%) create mode 100644 graphics/pokenav/cursor_large.png create mode 100644 graphics/pokenav/cursor_small.png create mode 100644 graphics/pokenav/fly_target_icons.pal create mode 100644 graphics/pokenav/fly_target_icons.png create mode 100644 graphics/pokenav/map_frame.bin create mode 100644 graphics/pokenav/map_frame.gbapal create mode 100644 graphics/pokenav/map_frame.png create mode 100644 graphics/pokenav/may_icon.pal create mode 100644 graphics/pokenav/may_icon.png create mode 100644 graphics/pokenav/region_map.pal create mode 100644 graphics/pokenav/region_map.png create mode 100644 graphics/pokenav/region_map_map.bin diff --git a/data/region_map.s b/data/region_map.s index b1e88be791..d4ea89636f 100644 --- a/data/region_map.s +++ b/data/region_map.s @@ -4,36 +4,6 @@ .section .rodata .align 2, 0 -gUnknown_0859F5EC:: @ 859F5EC - .incbin "graphics/unknown/unk_859f5ec.gbapal" - -gUnknown_0859F60C:: @ 859F60C - .incbin "baserom.gba", 0x59f60c, 0x44 - -gUnknown_0859F650:: @ 859F650 - .incbin "baserom.gba", 0x59f650, 0xec - -gUnknown_0859F73C:: @ 859F73C - .incbin "baserom.gba", 0x59f73c, 0x40 - -gUnknown_0859F77C:: @ 859F77C - .incbin "baserom.gba", 0x59f77c, 0xd64 - -gUnknown_085A04E0:: @ 85A04E0 - .incbin "baserom.gba", 0x5a04e0, 0x34c - -gUnknown_085A082C:: @ 85A082C - .incbin "baserom.gba", 0x5a082c, 0x20 - -gUnknown_085A084C:: @ 85A084C - .incbin "baserom.gba", 0x5a084c, 0x80 - -gUnknown_085A08CC:: @ 85A08CC - .incbin "baserom.gba", 0x5a08cc, 0x20 - -gUnknown_085A08EC:: @ 85A08EC - .incbin "baserom.gba", 0x5a08ec, 0x80 - gUnknown_085A096C:: @ 85A096C .incbin "baserom.gba", 0x5a096c, 0x1a4 diff --git a/graphics/pokenav/brendan_icon.pal b/graphics/pokenav/brendan_icon.pal new file mode 100644 index 0000000000..a83ed903f3 --- /dev/null +++ b/graphics/pokenav/brendan_icon.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +57 74 123 +41 57 98 +24 41 82 +16 32 57 +222 230 238 +115 205 115 +74 148 82 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/pokenav/brendan_icon.png b/graphics/pokenav/brendan_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..19e39bb29e1a2d8937ab3ce0b656b4c4e36bd7d0 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDUEk3&B|J5!3k50KarMTMB z(bB70(=tgyGe|(e^4_y|#b=AXrUd;@iaP4(`2YWZpeB8Vb3#Chu_VYZn8D%MjWi%9 z*VDx@gkxrMf&(LCz^t#DEnL0TTw-0-mc`FPCLGvPuAkoI@*{j*l<8~c2_LJUuP)vE zomn!zd~fx3t9gx$uJHmKc9sSkR&bbkaadUz7+6S~W@^l4xVk|?T2tD(VN1QC**Esg h^anrw?`J&8$iSnbC|$$$EE;GrgQu&X%Q~loCIF(9Rb&7F literal 0 HcmV?d00001 diff --git a/graphics/pokenav/cursor.gbapal b/graphics/pokenav/cursor.gbapal new file mode 100644 index 0000000000000000000000000000000000000000..eb55e2159d0084152a8313d4e402ce50dfd2862b GIT binary patch literal 32 gcmc~{`d|OQeonPz@wL3-G=Zd^NX@`wJ`8XG0OM>5E&u=k literal 0 HcmV?d00001 diff --git a/graphics/unknown/unk_859f5ec.pal b/graphics/pokenav/cursor.pal similarity index 100% rename from graphics/unknown/unk_859f5ec.pal rename to graphics/pokenav/cursor.pal diff --git a/graphics/pokenav/cursor_large.png b/graphics/pokenav/cursor_large.png new file mode 100644 index 0000000000000000000000000000000000000000..eeda68a0e17f5c9b3b252ac0390e2dcb1bf8c197 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^3P7B|!VDz)cyd<*DT4r?5Z9zR4FAF4*|TqF&pz9- z<=&h*XPcXkCM9k0@>*hOI0vW@863AN*ahVKdb&7bP0l+XkK5~4#i literal 0 HcmV?d00001 diff --git a/graphics/pokenav/cursor_small.png b/graphics/pokenav/cursor_small.png new file mode 100644 index 0000000000000000000000000000000000000000..031e7ed164f2bb055f65da7577a753e962be5989 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt#WnVfYUQ&z^ldd-mCu zE%)ZkIosTPG%0C|m)8+w_r?1zM=fGmw%X$(F3@HXIj;9y%PXHO`>FVdQ&MBb@08_R% AfB*mh literal 0 HcmV?d00001 diff --git a/graphics/pokenav/fly_target_icons.pal b/graphics/pokenav/fly_target_icons.pal new file mode 100644 index 0000000000..c0f2cc4e97 --- /dev/null +++ b/graphics/pokenav/fly_target_icons.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 0 0 +0 0 0 +0 0 0 +205 205 205 +0 0 0 +0 0 0 +255 213 222 +255 164 197 +197 98 115 +131 131 123 +98 90 90 +49 49 65 +0 0 0 +0 0 0 +255 255 255 diff --git a/graphics/pokenav/fly_target_icons.png b/graphics/pokenav/fly_target_icons.png new file mode 100644 index 0000000000000000000000000000000000000000..7a997afc58b4ac2a38f1662a7bd2a3605ede4d74 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoR!VDzYlu|i?ltF+`h%1o(55!<__Uu^*f(ykh9Ly#W6%;>e9Zwf`=7&TCXi<=jIXBh39@XfSM$}r5D;we zXn&yf<;orb%@s#wfAC&8WWhM~ScB`GI4(oe7t2+ze_?Y;?6{NgWJ>h>puATMM^4O1 zx$1wub>|aiwph)cqLcI2$gP@u_`oFAiP9OZvRPHFL3WB>zF$|G*1rh+%DO@J|DmHl Z*O(h>)YY6$yJ-yahNr8a%Q~loCIFC!a&-Uz literal 0 HcmV?d00001 diff --git a/graphics/pokenav/map_frame.bin b/graphics/pokenav/map_frame.bin new file mode 100644 index 0000000000000000000000000000000000000000..eb8e9ee6269091937e004c649b1971e55854afd0 GIT binary patch literal 1280 zcmZP+U?LMTiZBQ;2rvUNd60Qj|7iG)rXMnM4>0Eqiu}VU!9*rxlmV3+EEGU$=m!Al CohtnR literal 0 HcmV?d00001 diff --git a/graphics/pokenav/map_frame.gbapal b/graphics/pokenav/map_frame.gbapal new file mode 100644 index 0000000000000000000000000000000000000000..6ac633fd5276ed86fa15cb90e9ff67e2c0d69b29 GIT binary patch literal 32 mcmZQz*jXP@-(zT*{+*G5;e6JCP!-qxT>m*rMHztLe?0)Wg9`Kj literal 0 HcmV?d00001 diff --git a/graphics/pokenav/map_frame.png b/graphics/pokenav/map_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..f64171746a783319e2a95b5d820e9fe59af904ae GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^5xy)t_L3|7=4@GO|ip$o4Oz?E|b6Mw<&;$V9 CUon{g literal 0 HcmV?d00001 diff --git a/graphics/pokenav/may_icon.pal b/graphics/pokenav/may_icon.pal new file mode 100644 index 0000000000..2833b2613e --- /dev/null +++ b/graphics/pokenav/may_icon.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +98 98 115 +41 57 65 +164 106 82 +74 49 57 +205 205 222 +106 213 65 +65 172 32 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/pokenav/may_icon.png b/graphics/pokenav/may_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5e1809fa5abff4c0a78e7fac95426e67747a958f GIT binary patch literal 245 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 literal 0 HcmV?d00001 diff --git a/graphics/pokenav/region_map_map.bin b/graphics/pokenav/region_map_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..889fd6d363f3c4700f0103305ffe09c141695393 GIT binary patch literal 4096 zcmZQz00KrPW)MXtU}0rrW9Q)HVqgJck^u`h4=*3TfS?e&Fpmfio2VFxCWuQ&N=eJe z%E>DzDhVsAu(7GCkz|6phNhObj;@}*fuWJHiK&^ng{2iK23XtJ+S&6uI667IxEi~; zdw64jwvOa^z^*vEwJe(RLCN zd%nJ>PMj znGt}ly#ow#2DpBP%XjxM++(bgManaged) { - decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, gUnknown_0859F77C, 0, 0, 0); + decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, sRegionMapBkgnd_GfxLZ, 0, 0, 0); } else { - LZ77UnCompVram(gUnknown_0859F77C, (u16 *)BG_CHAR_ADDR(2)); + LZ77UnCompVram(sRegionMapBkgnd_GfxLZ, (u16 *)BG_CHAR_ADDR(2)); } break; case 1: @@ -189,25 +191,25 @@ bool8 sub_8122DB0(void) { if (!free_temp_tile_data_buffers_if_possible()) { - decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, gUnknown_085A04E0, 0, 0, 1); + decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, sRegionMapBkgnd_TilemapLZ, 0, 0, 1); } } else { - LZ77UnCompVram(gUnknown_085A04E0, (u16 *)BG_SCREEN_ADDR(28)); + LZ77UnCompVram(sRegionMapBkgnd_TilemapLZ, (u16 *)BG_SCREEN_ADDR(28)); } break; case 2: if (!free_temp_tile_data_buffers_if_possible()) { - LoadPalette(gUnknown_0859F73C, 0x70, 0x60); + LoadPalette(sRegionMapBkgnd_Pal, 0x70, 0x60); } break; case 3: - LZ77UnCompWram(gUnknown_0859F60C, gRegionMap->cursorSmallImage); + LZ77UnCompWram(sRegionMapCursorSmallGfxLZ, gRegionMap->cursorSmallImage); break; case 4: - LZ77UnCompWram(gUnknown_0859F650, gRegionMap->cursorLargeImage); + LZ77UnCompWram(sRegionMapCursorLargeGfxLZ, gRegionMap->cursorLargeImage); break; case 5: RegionMap_InitializeStateBasedOnPlayerLocation(); @@ -1103,8 +1105,8 @@ void sub_8124278(void) void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag) { u8 spriteId; - struct SpriteSheet sheet = {gUnknown_085A084C, 0x80, tileTag}; - struct SpritePalette palette = {gUnknown_085A082C, paletteTag}; + struct SpriteSheet sheet = {sRegionMapPlayerIcon_BrendanGfx, 0x80, tileTag}; + struct SpritePalette palette = {sRegionMapPlayerIcon_BrendanPal, paletteTag}; struct SpriteTemplate template = {tileTag, paletteTag, &gUnknown_085A1C20, gUnknown_085A1C30, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; if (sub_8124668(gMapHeader.regionMapSectionId)) @@ -1114,8 +1116,8 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag) } if (gSaveBlock2Ptr->playerGender == FEMALE) { - sheet.data = gUnknown_085A08EC; - palette.data = gUnknown_085A08CC; + sheet.data = sRegionMapPlayerIcon_MayGfx; + palette.data = sRegionMapPlayerIcon_MayPal; } LoadSpriteSheet(&sheet); LoadSpritePalette(&palette); @@ -1411,13 +1413,13 @@ static void sub_81248D4(void) do_scheduled_bg_tilemap_copies_to_vram(); } -void sub_81248F4(void callback(void)) +static void sub_81248F4(void callback(void)) { gUnknown_0203A148->unk_000 = callback; gUnknown_0203A148->unk_004 = 0; } -void sub_8124904(void) +static void sub_8124904(void) { u16 i; bool32 flag;