diff options
Diffstat (limited to 'include')
| -rwxr-xr-x[-rw-r--r--] | include/asm.inc.h | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/field_effect.h | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/rom4.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 7c090dec2..3837af64b 100644..100755 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -207,9 +207,9 @@ void sub_8083A84(TaskFunc); s32 sub_8083BF4(u8 id); // asm/field_effect.o -u8 CreateTrainerSprite_BirchSpeech(u8, u16, u16, u8, void *); -void LoadTrainerGfx_TrainerCard(u8 gender, int, void *); -u8 CreateBirchSprite(u8, u8, u8); +u8 CreateTrainerSprite_BirchSpeech(u8, s16, s16, u8, u8 *); +void LoadTrainerGfx_TrainerCard(u8 gender, u16, u8 *); +u8 CreateBirchSprite(s16, s16, u8); // asm/unknown_task.o void remove_some_task(void); diff --git a/include/field_effect.h b/include/field_effect.h index e3e80b3df..d35ca599b 100644..100755 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -80,6 +80,8 @@ extern struct SpriteTemplate gUnknown_02024E8C; extern const struct SpritePalette *sub_80409C8(u16, u32, u32); +extern u8 gLastFieldPokeMenuOpened; + u32 FieldEffectStart(u8 id); bool8 FieldEffectCmd_loadtiles(u8 **script, u32 *val); bool8 FieldEffectCmd_loadfadedpal(u8 **script, u32 *val); diff --git a/include/rom4.h b/include/rom4.h index 476a0e103..ab63068b2 100644..100755 --- a/include/rom4.h +++ b/include/rom4.h @@ -18,7 +18,7 @@ struct LinkPlayerMapObject }; // sub_8052F5C -// flag_var_implications_of_teleport_ +void flag_var_implications_of_teleport_(void); void new_game(void); void sub_8053014(void); void sub_8053050(void); |