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

Merge remote-tracking branch 'upstream/master' into misc_docs

Browse Source 
# Conflicts:
#	src/field_weather_effect.c
This commit is contained in:
Marcus Huderle
2019-04-02 18:29:51 -05:00
parent 1241700b20 d8c9f1b30f
commit 181baf9fe5
110 changed files with 9476 additions and 10106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/event_object_movement.h
View File

@@ -413,5 +413,10 @@ u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *);
u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *);
u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *);
u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *);
void sub_8097C44(u8 var, bool32 var2);
bool32 sub_8097C8C(u8 var);
void sub_8097BB4(u8 var1, u8 graphicsId);
void sub_8097CC4(u8 var1, u8 var2);
bool32 sub_8097D9C(u8 var);
#endif //GUARD_FIELD_EVENT_OBJ_H