summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-03-04 10:42:40 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-03-04 18:26:54 -0500
commit4df660dc76b5f35d2a89e0cb627180b79e9caa12 (patch)
treef05f6f7c4f82c18de34a494f93207165ab89dd08 /data
parent13e06bf7f88be6d25f420704b76828ed6f24cbc2 (diff)
Add enums for help system text, label help context
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s1
-rw-r--r--data/maps/PalletTown_PlayersHouse_2F/scripts.inc8
-rw-r--r--data/scripts/hall_of_fame.inc2
-rw-r--r--data/scripts/pc.inc18
-rw-r--r--data/scripts/pokedex_rating.inc8
-rw-r--r--data/specials.inc8
6 files changed, 23 insertions, 22 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 3c221d2aa..ed293ba64 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -35,6 +35,7 @@
#include "constants/daycare.h"
#include "constants/easy_chat.h"
#include "constants/trainer_card.h"
+#include "constants/help_system.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.set FALSE, 0
diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
index 975da4be1..943056ea3 100644
--- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
@@ -32,15 +32,15 @@ PalletTown_PlayersHouse_2F_EventScript_Sign:: @ 8168CDB
PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4
goto_if_questlog EventScript_ReleaseEnd
lockall
- setvar VAR_0x8004, 32
- special HelpSystem_SetSomeVariable
+ setvar VAR_0x8004, HELPCONTEXT_BEDROOM_PC
+ special Script_SetHelpContext
setvar VAR_0x8004, 1
special AnimatePcTurnOn
playse SE_PC_ON
msgbox Text_PlayerBootedUpPC
special BedroomPC
waitstate
- special sub_812B35C
+ special SetHelpContextForMap
releaseall
end
@@ -48,6 +48,6 @@ EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17
setvar VAR_0x8004, 1
playse SE_PC_OFF
special AnimatePcTurnOff
- special sub_812B35C
+ special SetHelpContextForMap
releaseall
end
diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc
index 5ce427a6a..5657ff2dd 100644
--- a/data/scripts/hall_of_fame.inc
+++ b/data/scripts/hall_of_fame.inc
@@ -1,7 +1,7 @@
EventScript_SetDefeatedEliteFourFlagsVars:: @ 81A651A
clearflag FLAG_HIDE_POSTGAME_GOSSIPERS
call EventScript_ResetEliteFour
- special Special_UpdateTrainerFanClubGameClear
+ special Script_UpdateTrainerFanClubGameClear
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, FALSE
call_if_eq EventScript_SetReadyTryGiveNationalDexScene
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc
index af9eca601..0c71b9c76 100644
--- a/data/scripts/pc.inc
+++ b/data/scripts/pc.inc
@@ -2,8 +2,8 @@ EventScript_PC:: @ 81A6955
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled
- setvar VAR_0x8004, 27
- special HelpSystem_SetSomeVariable
+ setvar VAR_0x8004, HELPCONTEXT_PC
+ special Script_SetHelpContext
setvar VAR_0x8004, 0
special AnimatePcTurnOn
playse SE_PC_ON
@@ -50,8 +50,8 @@ EventScript_AccessPokemonStorage:: @ 81A6A05
msgbox Text_OpenedPkmnStorage
special ShowPokemonStorageSystem
waitstate
- setvar VAR_0x8004, 27
- special HelpSystem_SetSomeVariable
+ setvar VAR_0x8004, HELPCONTEXT_PC
+ special Script_SetHelpContext
goto EventScript_PCMainMenu
end
@@ -67,19 +67,19 @@ EventScript_TurnOffPC:: @ 81A6A46
setvar VAR_0x8004, 0
playse SE_PC_OFF
special AnimatePcTurnOff
- special sub_812B35C
+ special SetHelpContextForMap
releaseall
end
EventScript_AccessHallOfFame:: @ 81A6A56
goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
playse SE_PC_LOGIN
- setvar VAR_0x8004, 31
- special HelpSystem_BackupSomeVariable
- special HelpSystem_SetSomeVariable
+ setvar VAR_0x8004, HELPCONTEXT_PC_MISC
+ special BackupHelpContext
+ special Script_SetHelpContext
special HallOfFamePCBeginFade
waitstate
- special HelpSystem_RestoreSomeVariable
+ special RestoreHelpContext
goto EventScript_ChoosePCMenu
end
diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc
index c8b126e60..79f4ad84c 100644
--- a/data/scripts/pokedex_rating.inc
+++ b/data/scripts/pokedex_rating.inc
@@ -35,9 +35,9 @@ PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC
return
PokedexRating_EventScript_Rate:: @ 81A73E0
- setvar VAR_0x8004, 31
- special HelpSystem_BackupSomeVariable
- special HelpSystem_SetSomeVariable
+ setvar VAR_0x8004, HELPCONTEXT_PC_MISC
+ special BackupHelpContext
+ special Script_SetHelpContext
setvar VAR_0x8004, 0
specialvar VAR_RESULT, GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
@@ -80,5 +80,5 @@ PokedexRating_EventScript_DexComplete:: @ 81A747E
end
PokedexRating_EventScript_EndRating:: @ 81A748F
- special HelpSystem_RestoreSomeVariable
+ special RestoreHelpContext
return
diff --git a/data/specials.inc b/data/specials.inc
index 3f9addacb..0d7670f63 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -389,9 +389,9 @@ gSpecials:: @ 815FD60
def_special TakePokemonFromRoute5Daycare
def_special DoSeagallopFerryScene
def_special DoesPlayerPartyContainSpecies
- def_special HelpSystem_SetSomeVariable
- def_special HelpSystem_BackupSomeVariable
- def_special HelpSystem_RestoreSomeVariable
+ def_special Script_SetHelpContext
+ def_special BackupHelpContext
+ def_special RestoreHelpContext
def_special ValidateReceivedWonderCard
def_special sub_810B810
def_special InitUnionRoom
@@ -408,7 +408,7 @@ gSpecials:: @ 815FD60
def_special ChooseMonForMoveTutor
def_special ChooseMonForWirelessMinigame
def_special SetBattledTrainerFlag
- def_special sub_812B35C
+ def_special SetHelpContextForMap
def_special DoSSAnneDepartureCutscene
def_special IsPokemonJumpSpeciesInParty
def_special IsNationalPokedexEnabled