dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine special prefixes, drop more

Browse Source
This commit is contained in:
GriffinR
2020-03-04 10:42:16 -05:00
parent ce3e1b8af0
commit 13e06bf7f8
23 changed files with 98 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/pc.inc
+4 -4
View File
@@ -3,7 +3,7 @@ EventScript_PC:: @ 81A6955
lockall
goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled
setvar VAR_0x8004, 27
special Special_SetSomeVariable
special HelpSystem_SetSomeVariable
setvar VAR_0x8004, 0
special AnimatePcTurnOn
playse SE_PC_ON
@@ -20,7 +20,7 @@ EventScript_PCDisabled:: @ 81A698E
EventScript_PCMainMenu:: @ 81A6998
message Text_AccessWhichPC
waitmessage
special ScrSpecial_CreatePCMenu
special CreatePCMenu
waitstate
goto EventScript_ChoosePCMenu
end
@@ -51,7 +51,7 @@ EventScript_AccessPokemonStorage:: @ 81A6A05
special ShowPokemonStorageSystem
waitstate
setvar VAR_0x8004, 27
special Special_SetSomeVariable
special HelpSystem_SetSomeVariable
goto EventScript_PCMainMenu
end
@@ -76,7 +76,7 @@ EventScript_AccessHallOfFame:: @ 81A6A56
playse SE_PC_LOGIN
setvar VAR_0x8004, 31
special HelpSystem_BackupSomeVariable
special Special_SetSomeVariable
special HelpSystem_SetSomeVariable
special HallOfFamePCBeginFade
waitstate
special HelpSystem_RestoreSomeVariable
data/scripts/pokedex_rating.inc
+1 -1
View File
@@ -37,7 +37,7 @@ PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC
PokedexRating_EventScript_Rate:: @ 81A73E0
setvar VAR_0x8004, 31
special HelpSystem_BackupSomeVariable
special Special_SetSomeVariable
special HelpSystem_SetSomeVariable
setvar VAR_0x8004, 0
specialvar VAR_RESULT, GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
data/scripts/trainer_battle.inc
+2 -2
View File
@@ -10,7 +10,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1
faceplayer
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
specialvar VAR_RESULT, Script_HasTrainerBeenFought
compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoTrainerBattle
special PlayTrainerEncounterMusic
@@ -24,7 +24,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
lock
faceplayer
call EventScript_RevealTrainer
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
specialvar VAR_RESULT, Script_HasTrainerBeenFought
compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoDoubleTrainerBattle
special HasEnoughMonsForDoubleBattle