through TryStartWarpEventScript

This commit is contained in:
PikalaxALT
2020-03-18 08:49:31 -04:00
parent ba7e4acfee
commit 4516c63652
11 changed files with 221 additions and 427 deletions
+1
View File
@@ -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
+7 -1
View File
@@ -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
+3 -3
View File
@@ -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);
+1
View File
@@ -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;
+1
View File
@@ -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;