diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_effect.c | 4 | ||||
| -rw-r--r-- | src/fldeff_cut.c | 6 | ||||
| -rw-r--r-- | src/fldeff_strength.c | 2 | ||||
| -rw-r--r-- | src/rom6.c | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 00814192e..f047c78a3 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -561,7 +561,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y) PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10); if (spriteId == 0xFFFF) return 0x40; - + return spriteId; } #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); if (spriteId == 0xFFFF) return 0x40; - + return spriteId; } diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 615de0202..bdc9b7868 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -266,7 +266,7 @@ bool8 SetUpFieldMove_Cut(void) tileCuttable = TRUE; j = 0; - while (1) + do { if (sHyperCutStruct[i].unk2[j] == 0) break; @@ -275,9 +275,7 @@ bool8 SetUpFieldMove_Cut(void) tileCuttable = FALSE; break; } - if (++j >= 2) - break; - } + } while (++j <= 1); if (tileCuttable == TRUE) { diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 52b76edb4..fb5aa5e95 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -14,7 +14,7 @@ static void sub_8145E74(void); // text bool8 SetUpFieldMove_Strength(void) { - if (SetLastTalkedObjectInFrontOfPlayer(87) == TRUE) + if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/rom6.c b/src/rom6.c index cec2cfcb6..6c7439622 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -118,14 +118,14 @@ static void sub_813561C(u8 taskId) bool8 SetUpFieldMove_RockSmash(void) { - if(ShouldDoBrailleStrengthEffect()) + if (ShouldDoBrailleStrengthEffect()) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_8179834; return TRUE; } - else if (SetLastTalkedObjectInFrontOfPlayer(0x56) == TRUE) + else if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_81356C4; |