diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_scripts.h | 1 | ||||
| -rw-r--r-- | include/field_fadetransition.h | 8 | ||||
| -rw-r--r-- | include/metatile_behavior.h | 6 | ||||
| -rw-r--r-- | include/overworld.h | 1 | ||||
| -rw-r--r-- | include/script.h | 1 |
5 files changed, 13 insertions, 4 deletions
diff --git a/include/event_scripts.h b/include/event_scripts.h index 1a2b26bf2..afc509909 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1257,5 +1257,6 @@ extern const u8 EventScript_CantUseWaterfall[]; extern const u8 gUnknown_81A8CED[]; extern const u8 EventScript_FieldPoison[]; extern const u8 EventScript_EggHatch[]; +extern const u8 EventScript_1C1361[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index a1fe590fa..d649fc02f 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -9,7 +9,7 @@ void DoDiveWarp(void); void DoDoorWarp(void); void DoFallWarp(void); -void sub_807E59C(void); +void DoTeleportWarp(void); void sub_807E500(void); void sub_807DF64(void); void WarpFadeOutScreen(void); @@ -22,5 +22,11 @@ void sub_807DCE4(void); bool32 sub_807E418(void); void palette_bg_faded_fill_black(void); +void sub_807E4A0(u16 metatileBehavior, u16 delay); +void DoEscalatorWarp(u8 a0); +void DoLavaridgeGymB1FWarp(void); +void DoLavaridgeGym1FWarp(void); +void DoTeleportWarp(void); +void DoUnionRoomWarp(void); #endif // GUARD_FIELD_FADETRANSITION_H diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index 91a1824e5..2ae011e5f 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -89,9 +89,9 @@ bool8 MetatileBehavior_UnusedReturnFalse_5(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_6(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_7(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_8(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_12(u8 metatileBehavior); -bool8 MetatileBheavior_IsMB_68(u8 metatileBehavior); -bool8 MetatileBehavior_IsRegularWarp(u8 metatileBehavior); +bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 metatileBehavior); +bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior); +bool8 MetatileBehavior_IsWarpPad(u8 metatileBehavior); bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsWater(u8 metatileBehavior); bool8 MetatileBehavior_IsFallWarp(u8 metatileBehavior); diff --git a/include/overworld.h b/include/overworld.h index 37274dfb4..546c4f00e 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -194,6 +194,7 @@ void SetMainCallback1(MainCallback cb); void CB1_Overworld(void); void sub_80568C4(void); u8 GetLastUsedWarpMapSectionId(void); +void StoreInitialPlayerAvatarState(void); extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; diff --git a/include/script.h b/include/script.h index 38da71774..b56fedec9 100644 --- a/include/script.h +++ b/include/script.h @@ -77,6 +77,7 @@ bool8 sub_806997C(void); u8 sub_80699B0(void); void sub_8069A54(void); bool8 sub_8069A04(void); +void sub_80699E0(void); extern const u8 *gRAMScriptPtr; extern u8 gUnknown_20370A0; |