diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_effect.h | 4 | ||||
| -rw-r--r-- | include/fldeff_cut.h | 10 | ||||
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/metatile_behavior.h | 2 | ||||
| -rw-r--r-- | include/party_menu.h | 2 | ||||
| -rw-r--r-- | include/rom6.h | 2 |
6 files changed, 14 insertions, 8 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index 800048605..9c9501bfa 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -78,8 +78,8 @@ enum FieldEffectScriptIdx }; extern s32 gFieldEffectArguments[8]; -extern void (*gUnknown_0203CEEC)(void); -extern bool8 (*gUnknown_03005DB0)(void); +extern void (*gPostMenuFieldCallback)(void); +extern bool8 (*gFieldCallback2)(void); u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); diff --git a/include/fldeff_cut.h b/include/fldeff_cut.h index f985fd82d..c89d3b6ca 100644 --- a/include/fldeff_cut.h +++ b/include/fldeff_cut.h @@ -1,7 +1,13 @@ #ifndef GUARD_FLDEFF_CUT_H #define GUARD_FLDEFF_CUT_H -void sub_80D423C(s16, s16); -void sub_80D42B8(s16, s16); +extern const struct SpritePalette gFieldEffectObjectPaletteInfo6; + +bool8 SetUpFieldMove_Cut(void); +bool8 FldEff_UseCutOnGrass(void); +bool8 FldEff_UseCutOnTree(void); +bool8 FldEff_CutGrass(void); +void sub_80D423C(s16 x, s16 y); +void sub_80D42B8(s16 x, s16 y); #endif // GUARD_FLDEFF_CUT_H diff --git a/include/global.h b/include/global.h index d26184270..f4d5202ab 100644 --- a/include/global.h +++ b/include/global.h @@ -859,7 +859,7 @@ struct MapPosition { s16 x; s16 y; - u8 height; + s8 height; }; struct UnkStruct_8054FF8 diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index 4b9fd2488..86a67ab3e 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -74,7 +74,7 @@ bool8 MetatileBehavior_IsPuddle(u8); bool8 MetatileBehavior_IsTallGrass(u8); bool8 MetatileBehavior_IsLongGrass(u8); bool8 MetatileBehavior_IsBerryTreeSoil(u8); -bool8 MetatileBehavior_IsAsh(u8); +bool8 MetatileBehavior_IsAshGrass(u8); bool8 MetatileBehavior_IsUnusedFootprintMetatile(u8); bool8 MetatileBehavior_IsBridge(u8); u8 MetatileBehavior_GetBridgeSth(u8); diff --git a/include/party_menu.h b/include/party_menu.h index c96eb0d9d..2cf17f1e4 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -28,7 +28,7 @@ void DoWallyTutorialBagMenu(void); u8 pokemon_ailments_get_primary(u32 status); u8 *GetMonNickname(struct Pokemon *mon, u8 *dst); u8 GetCursorSelectionMonId(void); -bool8 FieldCallback_Teleport(void); +bool8 FieldCallback_PrepareFadeInFromMenu(void); void sub_81B7F60(void); void sub_81B0FCC(u8 partyIdx, u8 a); diff --git a/include/rom6.h b/include/rom6.h index 058504fe2..629df57fe 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -12,7 +12,7 @@ void UpdateFrontierManiac(u16 days); void UpdateFrontierGambler(u16 days); void SetShoalItemFlag(u16 days); -bool8 npc_before_player_of_type(u8); +bool8 SetLastTalkedObjectInFrontOfPlayer(u8); u8 oei_task_add(void); #endif //GUARD_ROM6_H |