ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-28 06:13:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

make field tasks compile

Browse Source
This commit is contained in:
DizzyEggg 2018-05-19 18:13:48 +02:00
parent d1798d0ed9
commit 1307fde8ca
8 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asm/field_tasks.s
View File

@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.align 2, 0 @ Don't pad with nop.

8
data/field_tasks.s
View File

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0

4
src/battle_setup.c
View File

@ -394,7 +394,7 @@ static void DoStandardWildBattle(void)
gBattleTypeFlags = 0; gBattleTypeFlags = 0;
if (InBattlePyramid()) if (InBattlePyramid())
{ {
VarSet(VAR_0x400E, 0); VarSet(VAR_TEMP_E, 0);
gBattleTypeFlags |= BATTLE_TYPE_PYRAMID; gBattleTypeFlags |= BATTLE_TYPE_PYRAMID;
} }
CreateBattleStartTask(GetWildBattleTransition(), 0); CreateBattleStartTask(GetWildBattleTransition(), 0);
@ -1258,7 +1258,7 @@ void BattleSetup_StartTrainerBattle(void)
if (InBattlePyramid()) if (InBattlePyramid())
{ {
VarSet(VAR_0x400E, 0); VarSet(VAR_TEMP_E, 0);
gBattleTypeFlags |= BATTLE_TYPE_PYRAMID; gBattleTypeFlags |= BATTLE_TYPE_PYRAMID;
if (gNoOfApproachingTrainers == 2) if (gNoOfApproachingTrainers == 2)

4
src/lilycove_lady.c
View File

@ -237,11 +237,11 @@ void sub_818D9C0(void)
{ {
LilycoveLady *lilycoveLady; LilycoveLady *lilycoveLady;
VarSet(VAR_0x4010, sUnknown_0860B07E[GetLilycoveLadyId()]); VarSet(VAR_OBJ_GFX_ID_0, sUnknown_0860B07E[GetLilycoveLadyId()]);
if (GetLilycoveLadyId() == LILYCOVE_LADY_CONTEST) if (GetLilycoveLadyId() == LILYCOVE_LADY_CONTEST)
{ {
lilycoveLady = &gSaveBlock1Ptr->lilycoveLady; lilycoveLady = &gSaveBlock1Ptr->lilycoveLady;
VarSet(VAR_0x4011, sUnknown_0860B074[lilycoveLady->contest.category]); VarSet(VAR_OBJ_GFX_ID_1, sUnknown_0860B074[lilycoveLady->contest.category]);
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
} }
else else

2
src/mauville_old_man.c
View File

@ -673,7 +673,7 @@ static void Task_BardSong(u8 taskId)
void ScrSpecial_SetMauvilleOldManMapObjGfx(void) void ScrSpecial_SetMauvilleOldManMapObjGfx(void)
{ {
VarSet(VAR_0x4010, MAP_OBJ_GFX_BARD); VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BARD);
} }
// Language fixers? // Language fixers?

6
src/rotating_gate.c
View File

@ -646,7 +646,7 @@ static void RotatingGate_ResetAllGateOrientations(void)
s32 i; s32 i;
u8 *ptr; u8 *ptr;
ptr = (u8 *)GetVarPointer(VAR_0x4000); ptr = (u8 *)GetVarPointer(VAR_TEMP_0);
for (i = 0; i < gRotatingGate_PuzzleCount; i++) for (i = 0; i < gRotatingGate_PuzzleCount; i++)
{ {
@ -656,12 +656,12 @@ static void RotatingGate_ResetAllGateOrientations(void)
static s32 RotatingGate_GetGateOrientation(u8 gateId) static s32 RotatingGate_GetGateOrientation(u8 gateId)
{ {
return ((u8 *)GetVarPointer(VAR_0x4000))[gateId]; return ((u8 *)GetVarPointer(VAR_TEMP_0))[gateId];
} }
static void RotatingGate_SetGateOrientation(u8 gateId, u8 orientation) static void RotatingGate_SetGateOrientation(u8 gateId, u8 orientation)
{ {
((u8 *)GetVarPointer(VAR_0x4000))[gateId] = orientation; ((u8 *)GetVarPointer(VAR_TEMP_0))[gateId] = orientation;
} }
static void RotatingGate_RotateInDirection(u8 gateId, u32 rotationDirection) static void RotatingGate_RotateInDirection(u8 gateId, u32 rotationDirection)

2
src/secret_base.c
View File

@ -592,7 +592,7 @@ void sub_80E9578(void)
void sub_80E95D4(void) void sub_80E95D4(void)
{ {
VarSet(VAR_0x401F, gUnknown_0858D060[sub_80EA20C(VarGet(VAR_0x4054))]); VarSet(VAR_OBJ_GFX_ID_F, gUnknown_0858D060[sub_80EA20C(VarGet(VAR_0x4054))]);
} }
void sub_80E9608(struct Coords16 *coords, struct MapEvents *events) void sub_80E9608(struct Coords16 *coords, struct MapEvents *events)

16
src/tv.c
View File

@ -3557,7 +3557,7 @@ void GetMomOrDadStringForTVMessage(void)
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F))
{ {
StringCopy(gStringVar1, gText_Mom); StringCopy(gStringVar1, gText_Mom);
VarSet(VAR_0x4003, 1); VarSet(VAR_TEMP_3, 1);
} }
} }
else else
@ -3565,21 +3565,21 @@ void GetMomOrDadStringForTVMessage(void)
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_1F)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_1F))
{ {
StringCopy(gStringVar1, gText_Mom); StringCopy(gStringVar1, gText_Mom);
VarSet(VAR_0x4003, 1); VarSet(VAR_TEMP_3, 1);
} }
} }
} }
if (VarGet(VAR_0x4003) == 1) if (VarGet(VAR_TEMP_3) == 1)
{ {
StringCopy(gStringVar1, gText_Mom); StringCopy(gStringVar1, gText_Mom);
} }
else if (VarGet(VAR_0x4003) == 2) else if (VarGet(VAR_TEMP_3) == 2)
{ {
StringCopy(gStringVar1, gText_Dad); StringCopy(gStringVar1, gText_Dad);
} }
else if (VarGet(VAR_0x4003) > 2) else if (VarGet(VAR_TEMP_3) > 2)
{ {
if (VarGet(VAR_0x4003) % 2 == 0) if (VarGet(VAR_TEMP_3) % 2 == 0)
StringCopy(gStringVar1, gText_Mom); StringCopy(gStringVar1, gText_Mom);
else else
StringCopy(gStringVar1, gText_Dad); StringCopy(gStringVar1, gText_Dad);
@ -3589,12 +3589,12 @@ void GetMomOrDadStringForTVMessage(void)
if (Random() % 2 != 0) if (Random() % 2 != 0)
{ {
StringCopy(gStringVar1, gText_Mom); StringCopy(gStringVar1, gText_Mom);
VarSet(VAR_0x4003, 1); VarSet(VAR_TEMP_3, 1);
} }
else else
{ {
StringCopy(gStringVar1, gText_Dad); StringCopy(gStringVar1, gText_Dad);
VarSet(VAR_0x4003, 2); VarSet(VAR_TEMP_3, 2);
} }
} }
} }