dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

review cut changes

Browse Source
This commit is contained in:
DizzyEggg
2018-06-17 12:39:58 +02:00
parent 3bcd30969a
commit 9329ffc2bc
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_effect.c
+2 -2
View File
@@ -561,7 +561,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y)
PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10); PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10);
if (spriteId == 0xFFFF) if (spriteId == 0xFFFF)
return 0x40; return 0x40;
return spriteId; return spriteId;
} }
#else #else
@@ -623,7 +623,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio
PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10); PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10);
if (spriteId == 0xFFFF) if (spriteId == 0xFFFF)
return 0x40; return 0x40;
return spriteId; return spriteId;
} }
src/fldeff_cut.c
+2 -4
View File
@@ -266,7 +266,7 @@ bool8 SetUpFieldMove_Cut(void)
tileCuttable = TRUE; tileCuttable = TRUE;
j = 0; j = 0;
while (1) do
{ {
if (sHyperCutStruct[i].unk2[j] == 0) if (sHyperCutStruct[i].unk2[j] == 0)
break; break;
@@ -275,9 +275,7 @@ bool8 SetUpFieldMove_Cut(void)
tileCuttable = FALSE; tileCuttable = FALSE;
break; break;
} }
if (++j >= 2) } while (++j <= 1);
break;
}
if (tileCuttable == TRUE) if (tileCuttable == TRUE)
{ {
src/fldeff_strength.c
+1 -1
View File
@@ -14,7 +14,7 @@ static void sub_8145E74(void);
// text // text
bool8 SetUpFieldMove_Strength(void) bool8 SetUpFieldMove_Strength(void)
{ {
if (SetLastTalkedObjectInFrontOfPlayer(87) == TRUE) if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE)
{ {
gSpecialVar_Result = GetCursorSelectionMonId(); gSpecialVar_Result = GetCursorSelectionMonId();
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
src/rom6.c
+2 -2
View File
@@ -118,14 +118,14 @@ static void sub_813561C(u8 taskId)
bool8 SetUpFieldMove_RockSmash(void) bool8 SetUpFieldMove_RockSmash(void)
{ {
if(ShouldDoBrailleStrengthEffect()) if (ShouldDoBrailleStrengthEffect())
{ {
gSpecialVar_Result = GetCursorSelectionMonId(); gSpecialVar_Result = GetCursorSelectionMonId();
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
gPostMenuFieldCallback = sub_8179834; gPostMenuFieldCallback = sub_8179834;
return TRUE; return TRUE;
} }
else if (SetLastTalkedObjectInFrontOfPlayer(0x56) == TRUE) else if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE)
{ {
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
gPostMenuFieldCallback = sub_81356C4; gPostMenuFieldCallback = sub_81356C4;