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
include/global.h
+1 -1
View File
@@ -745,7 +745,7 @@ struct SaveBlock1
/*0x0638*/ u16 trainerRematchStepCounter; /*0x0638*/ u16 trainerRematchStepCounter;
/*0x063A*/ u8 ALIGNED(2) trainerRematches[100]; /*0x063A*/ u8 ALIGNED(2) trainerRematches[100];
/*0x06A0*/ struct ObjectEvent objectEvents[MAP_OBJECTS_COUNT]; /*0x06A0*/ struct ObjectEvent objectEvents[MAP_OBJECTS_COUNT];
/*0x08E0*/ struct ObjectEventTemplate mapObjectTemplates[64]; /*0x08E0*/ struct ObjectEventTemplate objectEventTemplates[64];
/*0x0EE0*/ u8 flags[FLAGS_COUNT]; /*0x0EE0*/ u8 flags[FLAGS_COUNT];
/*0x1000*/ u16 vars[VARS_COUNT]; /*0x1000*/ u16 vars[VARS_COUNT];
/*0x1200*/ u32 gameStats[NUM_GAME_STATS]; /*0x1200*/ u32 gameStats[NUM_GAME_STATS];
src/quest_log.c
+16 -16
View File
@@ -571,30 +571,30 @@ static void sub_8110BE8(u8 a0)
sub_815A008(questLog); sub_815A008(questLog);
for (i = 0; i < NELEMS(gSaveBlock1Ptr->mapObjectTemplates); i++) for (i = 0; i < NELEMS(gSaveBlock1Ptr->objectEventTemplates); i++)
{ {
if (gSaveBlock1Ptr->mapObjectTemplates[i].x < 0) if (gSaveBlock1Ptr->objectEventTemplates[i].x < 0)
{ {
questLog->npcData[i].x = -1 * gSaveBlock1Ptr->mapObjectTemplates[i].x; questLog->npcData[i].x = -1 * gSaveBlock1Ptr->objectEventTemplates[i].x;
questLog->npcData[i].negx = TRUE; questLog->npcData[i].negx = TRUE;
} }
else else
{ {
questLog->npcData[i].x = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].x; questLog->npcData[i].x = (u8)gSaveBlock1Ptr->objectEventTemplates[i].x;
questLog->npcData[i].negx = FALSE; questLog->npcData[i].negx = FALSE;
} }
if (gSaveBlock1Ptr->mapObjectTemplates[i].y < 0) if (gSaveBlock1Ptr->objectEventTemplates[i].y < 0)
{ {
questLog->npcData[i].y = (-gSaveBlock1Ptr->mapObjectTemplates[i].y << 24) >> 24; questLog->npcData[i].y = (-gSaveBlock1Ptr->objectEventTemplates[i].y << 24) >> 24;
questLog->npcData[i].negy = TRUE; questLog->npcData[i].negy = TRUE;
} }
else else
{ {
questLog->npcData[i].y = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].y; questLog->npcData[i].y = (u8)gSaveBlock1Ptr->objectEventTemplates[i].y;
questLog->npcData[i].negy = FALSE; questLog->npcData[i].negy = FALSE;
} }
questLog->npcData[i].elevation = gSaveBlock1Ptr->mapObjectTemplates[i].elevation; questLog->npcData[i].elevation = gSaveBlock1Ptr->objectEventTemplates[i].elevation;
questLog->npcData[i].movementType = gSaveBlock1Ptr->mapObjectTemplates[i].movementType; questLog->npcData[i].movementType = gSaveBlock1Ptr->objectEventTemplates[i].movementType;
} }
} }
@@ -776,18 +776,18 @@ static void sub_8111150(u8 a0)
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
{ {
if (questLog->npcData[i].negx) if (questLog->npcData[i].negx)
gSaveBlock1Ptr->mapObjectTemplates[i].x = -questLog->npcData[i].x; gSaveBlock1Ptr->objectEventTemplates[i].x = -questLog->npcData[i].x;
else else
gSaveBlock1Ptr->mapObjectTemplates[i].x = questLog->npcData[i].x; gSaveBlock1Ptr->objectEventTemplates[i].x = questLog->npcData[i].x;
if (questLog->npcData[i].negy) if (questLog->npcData[i].negy)
gSaveBlock1Ptr->mapObjectTemplates[i].y = -(u8)questLog->npcData[i].y; gSaveBlock1Ptr->objectEventTemplates[i].y = -(u8)questLog->npcData[i].y;
else else
gSaveBlock1Ptr->mapObjectTemplates[i].y = questLog->npcData[i].y; gSaveBlock1Ptr->objectEventTemplates[i].y = questLog->npcData[i].y;
gSaveBlock1Ptr->mapObjectTemplates[i].elevation = questLog->npcData[i].elevation; gSaveBlock1Ptr->objectEventTemplates[i].elevation = questLog->npcData[i].elevation;
gSaveBlock1Ptr->mapObjectTemplates[i].movementType = questLog->npcData[i].movementType; gSaveBlock1Ptr->objectEventTemplates[i].movementType = questLog->npcData[i].movementType;
} }
sub_815A1F8(questLog, gSaveBlock1Ptr->mapObjectTemplates); sub_815A1F8(questLog, gSaveBlock1Ptr->objectEventTemplates);
} }
void sub_8111274(u8 a0, u8 a1) void sub_8111274(u8 a0, u8 a1)
src/quest_log_815A008.c
+2 -2
View File
@@ -51,7 +51,7 @@ void sub_815A008(struct QuestLog * questLog)
void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates) void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
{ {
u32 i, j; u32 i, j;
const struct QuestLogMapObject * questLogObjectEvents = questLog->unk_008; const struct QuestLogObjectEvent * questLogObjectEvents = questLog->unk_008;
CpuFill16(0, gObjectEvents, sizeof(gObjectEvents)); CpuFill16(0, gObjectEvents, sizeof(gObjectEvents));
@@ -129,7 +129,7 @@ void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTempl
} }
} }
CpuCopy16(gObjectEvents, gSaveBlock1Ptr->mapObjects, sizeof(gObjectEvents)); CpuCopy16(gObjectEvents, gSaveBlock1Ptr->objectEvents, sizeof(gObjectEvents));
} }
void sub_815A540(void) void sub_815A540(void)
src/sea_cottage_special_anim.c
+1 -1
View File
@@ -4,7 +4,7 @@
#include "menu.h" #include "menu.h"
#include "field_player_avatar.h" #include "field_player_avatar.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "field_map_obj.h" #include "event_object_movement.h"
#include "field_camera.h" #include "field_camera.h"
static EWRAM_DATA u8 gUnknown_2039984 = 0; static EWRAM_DATA u8 gUnknown_2039984 = 0;
src/shop.c
+5 -5
View File
@@ -31,7 +31,7 @@
#include "menu_indicators.h" #include "menu_indicators.h"
#include "field_player_avatar.h" #include "field_player_avatar.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "field_map_obj.h" #include "event_object_movement.h"
#include "money.h" #include "money.h"
#include "quest_log.h" #include "quest_log.h"
#include "script.h" #include "script.h"
@@ -743,11 +743,11 @@ static void sub_809B764(void)
static void BuyMenuDrawMapBg(void) static void BuyMenuDrawMapBg(void)
{ {
s16 i, j, x, y; s16 i, j, x, y;
const struct MapData *mapData; const struct MapLayout *mapLayout;
u16 metatile; u16 metatile;
u8 metatileLayerType; u8 metatileLayerType;
mapData = gMapHeader.mapData; mapLayout = gMapHeader.mapLayout;
GetXYCoordsOneStepInFrontOfPlayer(&x, &y); GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
x -= 2; x -= 2;
y -= 3; y -= 3;
@@ -761,11 +761,11 @@ static void BuyMenuDrawMapBg(void)
if (metatile < NUM_METATILES_IN_PRIMARY) 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 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);
} }
} }
} }
src/vs_seeker.c
+3 -3
View File
@@ -613,7 +613,7 @@ static void sub_810C3B8(u8 taskId)
void sub_810C444(void) void sub_810C444(void)
{ {
struct ObjectEventTemplate * templates = gSaveBlock1Ptr->mapObjectTemplates; struct ObjectEventTemplate * templates = gSaveBlock1Ptr->objectEventTemplates;
u8 i; u8 i;
u8 r6; u8 r6;
u8 sp0; u8 sp0;
@@ -857,7 +857,7 @@ static void Task_VsSeeker_2(u8 taskId)
static void GatherNearbyTrainerInfo(void) static void GatherNearbyTrainerInfo(void)
{ {
struct ObjectEventTemplate *templates = gSaveBlock1Ptr->mapObjectTemplates; struct ObjectEventTemplate *templates = gSaveBlock1Ptr->objectEventTemplates;
u8 fieldObjectId = 0; u8 fieldObjectId = 0;
u8 vsSeekerObjectIdx = 0; u8 vsSeekerObjectIdx = 0;
s32 mapObjectIdx; s32 mapObjectIdx;
@@ -1223,7 +1223,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
void sub_810CB90(void) void sub_810CB90(void)
{ {
u8 sp0 = 0; u8 sp0 = 0;
struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->mapObjectTemplates; struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->objectEventTemplates;
s32 r9 = sub_810CE10(sVsSeekerData, gTrainerBattleOpponent_A); s32 r9 = sub_810CE10(sVsSeekerData, gTrainerBattleOpponent_A);
if (r9 != -1) if (r9 != -1)