summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-03-20 17:27:21 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-03-20 17:27:21 -0400
commit2edc21281e4bd49af1dc1632ecbc9f0b21657f92 (patch)
tree6a19c636c6e1f54428515aadc1081d951931cd4a /include
parent95c7e3d067b7ac8e6cb8ef76f58713b0c8b128ec (diff)
Document symbols reffed in field_control_avatar
Diffstat (limited to 'include')
-rw-r--r--include/event_scripts.h50
-rw-r--r--include/metatile_behavior.h10
-rw-r--r--include/wild_encounter.h4
3 files changed, 32 insertions, 32 deletions
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 0f076ed28..437b6dcee 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -1218,32 +1218,32 @@ extern const u8 PalletTown_PlayersHouse_2F_EventScript_PC[];
extern const u8 EventScript_HiddenItemScript[];
extern const u8 EventScript_PC[];
extern const u8 EventScript_WallTownMap[];
-extern const u8 gUnknown_81A7606[];
-extern const u8 gUnknown_81A760F[];
-extern const u8 gUnknown_81A7618[];
-extern const u8 gUnknown_81A7633[];
-extern const u8 gUnknown_81A763C[];
-extern const u8 gUnknown_81A7621[];
-extern const u8 gUnknown_81A7645[];
-extern const u8 gUnknown_81A762A[];
+extern const u8 EventScript_Bookshelf[];
+extern const u8 EventScript_PokeMartShelf[];
+extern const u8 EventScript_Food[];
+extern const u8 EventScript_ImpressiveMachine[];
+extern const u8 EventScript_Blueprints[];
+extern const u8 EventScript_VideoGame[];
+extern const u8 EventScript_Burglary[];
+extern const u8 EventScript_Computer[];
extern const u8 TrainerTower_EventScript_ShowTime[];
-extern const u8 gUnknown_81A764E[];
-extern const u8 gUnknown_81A7657[];
-extern const u8 gUnknown_81A7660[];
-extern const u8 gUnknown_81A7669[];
-extern const u8 gUnknown_81A7672[];
-extern const u8 gUnknown_81A767B[];
-extern const u8 gUnknown_81A7684[];
-extern const u8 gUnknown_81A768D[];
-extern const u8 gUnknown_81A7696[];
-extern const u8 gUnknown_81A769F[];
-extern const u8 gUnknown_81A76A8[];
-extern const u8 gUnknown_81A76B1[];
-extern const u8 gUnknown_81A76BA[];
-extern const u8 gUnknown_81A76C3[];
-extern const u8 gUnknown_81A76CC[];
-extern const u8 gUnknown_81A76D5[];
-extern const u8 CableClub_EventScript_81BBFD8[];
+extern const u8 EventScript_PlayerFacingTVScreen[];
+extern const u8 EventScript_Cabinet[];
+extern const u8 EventScript_Kitchen[];
+extern const u8 EventScript_Dresser[];
+extern const u8 EventScript_Snacks[];
+extern const u8 EventScript_Painting[];
+extern const u8 EventScript_PowerPlantMachine[];
+extern const u8 EventScript_Telephone[];
+extern const u8 EventScript_AdvertisingPoster[];
+extern const u8 EventScript_TastyFood[];
+extern const u8 EventScript_TrashBin[];
+extern const u8 EventScript_Cup[];
+extern const u8 EventScript_PolishedWindow[];
+extern const u8 EventScript_BeautifulSkyWindow[];
+extern const u8 EventScript_BlinkingLights[];
+extern const u8 EventScript_NeatlyLinedUpTools[];
+extern const u8 CableClub_EventScript_ShowWirelessCommunicationScreen[];
extern const u8 EventScript_Questionnaire[];
extern const u8 CableClub_EventScript_ShowBattleRecords[];
extern const u8 EventScript_Indigo_UltimateGoal[];
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 8af4664a0..d00b4b4a5 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -127,7 +127,7 @@ bool8 MetatileBehavior_IsKitchen(u8 metatileBehavior);
bool8 MetatileBehavior_IsDresser(u8 metatileBehavior);
bool8 MetatileBehavior_IsSnacks(u8 metatileBehavior);
bool8 MetatileBehavior_IsStrengthButton(u8 metatileBehavior);
-bool8 MetatileBehavior_IsPlayerFacingMB_8D(u8 tile, u8 playerDirection);
+bool8 MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor(u8 tile, u8 playerDirection);
bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 tile, u8 playerDirection);
bool8 MetatileBehavior_IsQuestionnaire(u8 metatileBehavior);
bool8 MetatileBehavior_IsIndigoPlateauMark(u8 metatileBehavior);
@@ -143,13 +143,13 @@ bool8 MetatileBehavior_IsAdvertisingPoster(u8 metatileBehavior);
bool8 MetatileBehavior_IsTastyFood(u8 metatileBehavior);
bool8 MetatileBehavior_IsTrashBin(u8 metatileBehavior);
bool8 MetatileBehavior_IsCup(u8 metatileBehavior);
-bool8 MetatileBehavior_ReturnFalse_19(u8 metatileBehavior);
-bool8 MetatileBehavior_ReturnFalse_20(u8 metatileBehavior);
+bool8 MetatileBehavior_IsPolishedWindow(u8 metatileBehavior);
+bool8 MetatileBehavior_IsBeautifulSkyWindow(u8 metatileBehavior);
bool8 MetatileBehavior_IsBlinkingLights(u8 metatileBehavior);
-bool8 MetatileBehavior_IsMB9F(u8 metatileBehavior);
+bool8 MetatileBehavior_IsIsNeatlyLinedUpTools(u8 metatileBehavior);
bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior);
bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior);
bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior);
-bool8 MetatileBehavior_IsMBA3(u8 metatileBehavior);
+bool8 MetatileBehavior_IsTrainerTowerMonitor(u8 metatileBehavior);
#endif // GUARD_METATILE_BEHAVIOR
diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index fd44b7d4a..8e151d55d 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -34,7 +34,7 @@ struct WildPokemonHeader
extern const struct WildPokemonHeader gWildMonHeaders[];
void DisableWildEncounters(bool8 disabled);
-bool8 StandardWildEncounter(u32 currMetaTileBehavior, u16 previousMetaTileBehavior);
+bool8 StandardWildEncounter(u32 currMetatileAttrs, u16 previousMetaTileBehavior);
bool8 SweetScentWildEncounter(void);
bool8 DoesCurrentMapHaveFishingMons(void);
void FishingWildEncounter(u8 rod);
@@ -46,6 +46,6 @@ u8 GetUnownLetterByPersonalityLoByte(u32 personality);
bool8 SweetScentWildEncounter(void);
void SeedWildEncounterRng(u16 randVal);
void ResetEncounterRateModifiers(void);
-bool8 TryStandardWildEncounter(u32 currMetatileBehavior);
+bool8 TryStandardWildEncounter(u32 currMetatileAttrs);
#endif // GUARD_WILD_ENCOUNTER_H