dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix rebase conflicts

Browse Source
This commit is contained in:
garak
2019-12-12 16:10:45 -05:00
parent fc13e1ef6f
commit 7a0edab573
6 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shop.c
+5 -5
View File
@@ -31,7 +31,7 @@
#include "menu_indicators.h"
#include "field_player_avatar.h"
#include "fieldmap.h"
#include "field_map_obj.h"
#include "event_object_movement.h"
#include "money.h"
#include "quest_log.h"
#include "script.h"
@@ -743,11 +743,11 @@ static void sub_809B764(void)
static void BuyMenuDrawMapBg(void)
{
s16 i, j, x, y;
const struct MapData *mapData;
const struct MapLayout *mapLayout;
u16 metatile;
u8 metatileLayerType;
mapData = gMapHeader.mapData;
mapLayout = gMapHeader.mapLayout;
GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
x -= 2;
y -= 3;
@@ -761,11 +761,11 @@ static void BuyMenuDrawMapBg(void)
if (metatile < NUM_METATILES_IN_PRIMARY)
{
BuyMenuDrawMapMetatile(i, j, (u16*)mapData->primaryTileset->metatiles + metatile * 8, metatileLayerType);
BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType);
}
else
{
BuyMenuDrawMapMetatile(i, j, (u16*)mapData->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
}
}
}