diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-17 12:39:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 12:39:08 -0400 |
| commit | 33ecfb46e498a8e6001ad59fb6ef1484534423e3 (patch) | |
| tree | cf0e64725391724741b6e129db26897d3f1ad005 /src | |
| parent | 39da49495dcf429fa1927b110514c2f4bc577e47 (diff) | |
| parent | ab87c909986a73d2d131d791d8ad146281ef7a8c (diff) | |
Merge pull request #1005 from GriffinRichards/fix-rme
Revert city_zoom_tiles.png name
Diffstat (limited to 'src')
| -rw-r--r-- | src/graphics.c | 2 | ||||
| -rwxr-xr-x | src/pokenav_region_map.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/graphics.c b/src/graphics.c index 9548d37c8..83fab7dee 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1348,7 +1348,7 @@ const u16 gPokenavMessageBox_Pal[] = INCBIN_U16("graphics/pokenav/message.gbapal const u32 gPokenavMessageBox_Gfx[] = INCBIN_U32("graphics/pokenav/message.4bpp.lz"); const u32 gPokenavMessageBox_Tilemap[] = INCBIN_U32("graphics/pokenav/message.bin.lz"); -const u16 gRegionMapCityZoomTiles_Pal[] = INCBIN_U16("graphics/pokenav/city_zoom_tiles.gbapal"); +const u16 gRegionMapCityZoomTiles_Pal[] = INCBIN_U16("graphics/pokenav/zoom_tiles.gbapal"); const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("graphics/pokenav/city_zoom_text.4bpp.lz"); const u16 gPokenavConditionCancel_Pal[] = INCBIN_U16("graphics/pokenav/cancel.gbapal"); diff --git a/src/pokenav_region_map.c b/src/pokenav_region_map.c index 59eaf6b71..dff6b8c6c 100755 --- a/src/pokenav_region_map.c +++ b/src/pokenav_region_map.c @@ -75,7 +75,7 @@ extern const u16 gRegionMapCityZoomTiles_Pal[]; extern const u32 gRegionMapCityZoomText_Gfx[]; static const u16 sMapSecInfoWindow_Pal[] = INCBIN_U16("graphics/pokenav/region_map_info_window.gbapal"); -static const u32 sRegionMapCityZoomTiles_Gfx[] = INCBIN_U32("graphics/pokenav/city_zoom_tiles.4bpp.lz"); +static const u32 sRegionMapCityZoomTiles_Gfx[] = INCBIN_U32("graphics/pokenav/zoom_tiles.4bpp.lz"); #include "data/region_map/city_map_tilemaps.h" |