From 6b0268e0c0fb98014cb72f8a918a33c0645162d2 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 10 Jan 2017 23:15:38 -0500 Subject: finish decompiling field_control_avatar.c (#182) * start decompiling field_control_avatar.c * remove field_control_player_avatar.c * finish decompiling * cleanup * var and flag constants --- src/field_poison.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/field_poison.c') diff --git a/src/field_poison.c b/src/field_poison.c index 9b21ac5f3..6a243c280 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -106,7 +106,7 @@ void ExecuteWhiteOut(void) ScriptContext1_Stop(); } -u8 overworld_poison(void) +s32 overworld_poison(void) { struct Pokemon *pkmn = &gPlayerParty[0]; u32 numPoisoned = 0; -- cgit v1.2.3 From 648c6c7093f5173694562929f615380f297ad306 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 13:41:12 +0100 Subject: Move `gStringVar` declarations to text.h --- src/field_poison.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/field_poison.c') diff --git a/src/field_poison.c b/src/field_poison.c index 6a243c280..0e19833c5 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -5,6 +5,7 @@ #include "script.h" #include "string_util.h" #include "task.h" +#include "text.h" extern struct Pokemon gPlayerParty[6]; extern u16 gScriptResult; -- cgit v1.2.3 From 801877553db80267a62c0c3c0b2805b6716d1ef9 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:38:44 +0100 Subject: Remove trailing whitespace --- src/field_poison.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/field_poison.c') diff --git a/src/field_poison.c b/src/field_poison.c index 0e19833c5..dff5abd31 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -15,7 +15,7 @@ bool32 CheckMonIsValid(struct Pokemon *pkmn) { // UB: Too few arguments for function 'GetMonData' u16 species2 = GetMonData(pkmn, MON_DATA_SPECIES2); - + if (species2 == 0 || species2 == 0x19C) return FALSE; else @@ -26,7 +26,7 @@ bool32 AllMonsFainted(void) { struct Pokemon *pkmn = &gPlayerParty[0]; int i; - + for (i = 0; i < 6; i++, pkmn++) { // UB: Too few arguments for function 'GetMonData' @@ -40,7 +40,7 @@ void MonFaintFromPoisonOnField(u8 partyMember) { struct Pokemon *pkmn = &gPlayerParty[partyMember]; u32 val = 0; - + AdjustFriendship(pkmn, 7); SetMonData(pkmn, MON_DATA_STATUS, (u8*)&val); GetMonData(pkmn, MON_DATA_NICKNAME, gStringVar1); @@ -50,7 +50,7 @@ void MonFaintFromPoisonOnField(u8 partyMember) bool32 CheckMonFaintedFromPoison(u8 partyMember) { struct Pokemon *pkmn = &gPlayerParty[partyMember]; - + // UB: Too few arguments for function 'GetMonData' if (CheckMonIsValid(pkmn) && GetMonData(pkmn, MON_DATA_HP) == 0 && pokemon_ailments_get_primary(GetMonData(pkmn, MON_DATA_STATUS)) == 1) @@ -69,7 +69,7 @@ enum void Task_WhiteOut(u8 taskId) { s16 *taskData = gTasks[taskId].data; - + switch (taskData[TD_STATE]) { case 0: //Check if Pokemon have fainted due to poison @@ -113,11 +113,11 @@ s32 overworld_poison(void) u32 numPoisoned = 0; u32 numFainting = 0; int i; - + for(i = 0; i < 6; i++) { u32 hp; - + // UB: Too few arguments for function 'GetMonData' if (GetMonData(pkmn, MON_DATA_SANITY_BIT2) != 0 && pokemon_ailments_get_primary(GetMonData(pkmn, MON_DATA_STATUS)) == 1) -- cgit v1.2.3 From bcaab977727ded65c9eeaef9dbef9e9441d26fb7 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 21 Jan 2017 16:48:06 -0800 Subject: formatting --- src/field_poison.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/field_poison.c') diff --git a/src/field_poison.c b/src/field_poison.c index dff5abd31..8e49080b0 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -114,7 +114,7 @@ s32 overworld_poison(void) u32 numFainting = 0; int i; - for(i = 0; i < 6; i++) + for (i = 0; i < 6; i++) { u32 hp; @@ -123,20 +123,20 @@ s32 overworld_poison(void) && pokemon_ailments_get_primary(GetMonData(pkmn, MON_DATA_STATUS)) == 1) { hp = GetMonData(pkmn, MON_DATA_HP); - if(hp != 0) + if (hp != 0) hp--; - if(hp == 0) + if (hp == 0) numFainting++; //Pokemon will now faint due to poison SetMonData(pkmn, MON_DATA_HP, (u8 *)&hp); numPoisoned++; } pkmn++; } - if(numFainting != 0 || numPoisoned != 0) + if (numFainting != 0 || numPoisoned != 0) DoFieldPoisonEffect(); - if(numFainting != 0) + if (numFainting != 0) return 2; - if(numPoisoned != 0) + if (numPoisoned != 0) return 1; return 0; } -- cgit v1.2.3