summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-01 03:41:55 -0400
committerhuderlem <huderlem@gmail.com>2019-11-01 17:22:45 -0500
commitdd01942c4f41d65fb861a42097108e5f5d9b93e9 (patch)
tree731039cb819d01ec241c093939632a671d1d2f34 /include
parent6eaac9ea9d221e37d801064c73ce61dc3467b643 (diff)
Document aqua/magma hideout scripts
Diffstat (limited to 'include')
-rw-r--r--include/field_screen_effect.h4
-rw-r--r--include/script.h2
-rw-r--r--include/trainer_see.h8
3 files changed, 7 insertions, 7 deletions
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index af594611e..42f077dc3 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -37,8 +37,8 @@ void AnimateFlash(u8 flashLevel);
void WriteBattlePyramidViewScanlineEffectBuffer(void);
void sub_80B0244(void);
void sub_80B0268(void);
-void sub_80B0534(void);
-void sub_80B058C(void);
+void DoOrbEffect(void);
+void FadeOutOrbEffect(void);
void sub_80B05B4(void);
void WriteFlashScanlineEffectBuffer(u8 flashLevel);
bool8 walkrun_is_standing_still(void);
diff --git a/include/script.h b/include/script.h
index cfe493479..3f92964ac 100644
--- a/include/script.h
+++ b/include/script.h
@@ -62,6 +62,6 @@ u8 *GetSavedRamScriptIfValid(void);
void InitRamScript_NoEventObject(u8 *script, u16 scriptSize);
// srccmd.h
-void sub_809BE48(u16 npcId);
+void SetMovingNpcId(u16 npcId);
#endif // GUARD_SCRIPT_H
diff --git a/include/trainer_see.h b/include/trainer_see.h
index a9b92d71b..daf9d0298 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -9,11 +9,11 @@ struct ApproachingTrainer
u8 taskId;
};
-extern u16 gUnknown_03006080;
-extern u8 gUnknown_03006084[4];
+extern u16 gWhichTrainerToFaceAfterBattle;
+extern u8 gPostBattleMovementScript[4];
extern struct ApproachingTrainer gApproachingTrainers[2];
extern u8 gNoOfApproachingTrainers;
-extern u8 gUnknown_030060AC;
+extern bool8 gTrainerApproachedPlayer;
extern u8 gApproachingTrainerId;
bool8 CheckForTrainersWantingBattle(void);
@@ -25,6 +25,6 @@ u8 FldEff_QuestionMarkIcon(void);
u8 FldEff_HeartIcon(void);
u8 GetCurrentApproachingTrainerEventObjectId(void);
u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId);
-void sub_80B4808(void);
+void PlayerFaceTrainerAfterBattle(void);
#endif // GUARD_TRAINER_SEE_H