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

Rename specials according to Ruby

Browse Source
This commit is contained in:
PikalaxALT
2019-10-24 16:31:38 -04:00
parent 440d062936
commit a18e9c27e1
42 changed files with 553 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+256 -256
View File
File diff suppressed because it is too large Load Diff
data/maps/BirthIsland_Exterior/scripts.inc
+1 -1
View File
@@ -92,7 +92,7 @@ EventScript_1652C0:: @ 81652C0
setvar VAR_0x8006, 0
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_807F9D8
special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
data/maps/CeruleanCave_B1F/scripts.inc
+1 -1
View File
@@ -41,7 +41,7 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
waitbuttonpress
setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_807F9D8
special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
+4 -4
View File
@@ -48,7 +48,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
faceplayer
setvar VAR_0x8008, 7
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_8053A9C
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
checkflag FLAG_DID_TANGENY_TRADE
goto_if TRUE, EventScript_16E3D4
@@ -61,14 +61,14 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_16E3BC
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_8053D2C
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare_var_to_var VAR_RESULT, VAR_0x8009
goto_if ne, EventScript_16E3C6
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_8053D68
special sub_8054440
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
msgbox gUnknown_81A5B4A
setflag FLAG_DID_TANGENY_TRADE
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+6 -6
View File
@@ -10,9 +10,9 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE
faceplayer
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_172043
compare_var_to_value VAR_RESORT_GOREGOUS_REQUESTED_MON, 0xFFFF
compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF
goto_if eq, EventScript_171F0B
compare_var_to_value VAR_RESORT_GOREGOUS_REQUESTED_MON, SPECIES_NONE
compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE
goto_if ne, EventScript_171F19
msgbox gUnknown_81A42A0
goto EventScript_171EFE
@@ -30,7 +30,7 @@ EventScript_171F0B:: @ 8171F0B
end
EventScript_171F19:: @ 8171F19
copyvar VAR_0x8004, VAR_RESORT_GOREGOUS_REQUESTED_MON
copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_171F34
@@ -62,11 +62,11 @@ EventScript_171F34:: @ 8171F34
call_if eq, EventScript_17201A
moveobjectoffscreen 2
msgbox gUnknown_81A458E
giveitem VAR_RESORT_GOREGOUS_REWARD
giveitem VAR_RESORT_GORGEOUS_REWARD
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_172025
setflag FLAG_TEMP_2
setvar VAR_RESORT_GOREGOUS_REQUESTED_MON, 0
setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0
release
end
@@ -104,7 +104,7 @@ EventScript_172025:: @ 8172025
textcolor 1
msgbox gUnknown_81A461B
setflag FLAG_TEMP_2
setvar VAR_RESORT_GOREGOUS_REQUESTED_MON, 0
setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0
release
end
data/maps/FuchsiaCity_House3/scripts.inc
+3 -3
View File
@@ -16,7 +16,7 @@ EventScript_16D8B0:: @ 816D8B0
waitstate
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_16D941
special sub_80BFC14
special IsSelectedMonEgg
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16D937
special ScrSpecial_CountPokemonMoves
@@ -24,7 +24,7 @@ EventScript_16D8B0:: @ 816D8B0
goto_if eq, EventScript_16D92A
msgbox gUnknown_8199445
fadescreen 1
special Special_ChooseMoveToDelete
special SelectMove
fadescreen 0
compare_var_to_value VAR_0x8005, 4
goto_if eq, EventScript_16D8B0
@@ -36,7 +36,7 @@ EventScript_16D8B0:: @ 816D8B0
end
EventScript_16D919:: @ 816D919
special Special_DeleteSelectedMove
special DeleteMonMove
playfanfare MUS_ME_WASURE
waitfanfare
msgbox gUnknown_81994B1
data/maps/LavenderTown_House2/scripts.inc
+1 -1
View File
@@ -58,7 +58,7 @@ EventScript_16B311:: @ 816B311
EventScript_16B31B:: @ 816B31B
msgbox gUnknown_8193B36
call EventScript_1A74EB
specialvar VAR_RESULT, sub_80CBFA0
specialvar VAR_RESULT, NameRaterWasNicknameChanged
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16B345
data/maps/MtEmber_Summit/scripts.inc
+1 -1
View File
@@ -41,7 +41,7 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
playbgm MUS_EXEYE, 0
waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_807F9D8
special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
data/maps/NavelRock_Base/scripts.inc
+1 -1
View File
@@ -65,7 +65,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134
setvar VAR_0x8006, 0
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_807F9D8
special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
data/maps/NavelRock_Summit/scripts.inc
+1 -1
View File
@@ -69,7 +69,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
setvar VAR_0x8006, 0
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_807F9D8
special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
setvar VAR_LAST_TALKED, 1
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+1 -1
View File
@@ -41,7 +41,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
special Special_AnimatePcTurnOn
playse SE_PC_ON
msgbox gUnknown_81A5420
special sub_80EB6AC
special BedroomPC
waitstate
special sub_812B35C
releaseall
data/maps/PokemonTower_6F/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
special sub_807F904
special ScrSpecial_StartMarowakBattle
waitstate
special sub_8112364
compare_var_to_value VAR_RESULT, 0
data/maps/PowerPlant/scripts.inc
+1 -1
View File
@@ -54,7 +54,7 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
playbgm MUS_EXEYE, 0
waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_807F9D8
special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
data/maps/Route12_FishingHouse/scripts.inc
+3 -3
View File
@@ -39,14 +39,14 @@ EventScript_16FF7F:: @ 816FF7F
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_16FFF5
special sub_80A096C
special GetMagikarpSizeRecordInfo
msgbox gUnknown_819F2DB
special Special_ChooseMonFromParty
waitstate
copyvar VAR_RESULT, VAR_0x8004
compare_var_to_value VAR_RESULT, 6
goto_if ge, EventScript_16FFFF
special sub_80A0984
special CompareMagikarpSize
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_170001
compare_var_to_value VAR_RESULT, 2
@@ -110,7 +110,7 @@ Route12_FishingHouse_EventScript_170067:: @ 8170067
end
EventScript_17007B:: @ 817007B
special sub_80A096C
special GetMagikarpSizeRecordInfo
msgbox gUnknown_819F4CF
releaseall
end
data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+41 -41
View File
@@ -78,37 +78,37 @@ SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144
end
EventScript_16F15B:: @ 816F15B
special sub_81132CC
special UpdateMovedSaffronFanClubMembers
setvar VAR_0x8004, 0
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F207
setvar VAR_0x8004, 1
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F213
setvar VAR_0x8004, 2
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F21F
setvar VAR_0x8004, 3
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F22B
setvar VAR_0x8004, 4
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F237
setvar VAR_0x8004, 5
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F243
setvar VAR_0x8004, 6
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F24F
setvar VAR_0x8004, 7
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_16F25B
end
@@ -165,13 +165,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
lock
faceplayer
setvar VAR_0x8004, 0
special sub_81133A4
special BufferStreakTrainerText
compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F2EE
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F2C0
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F2E4
msgbox gUnknown_819C420
@@ -179,7 +179,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
end
EventScript_16F2C0:: @ 816F2C0
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F2DA
msgbox gUnknown_819C390
@@ -205,13 +205,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
lock
faceplayer
setvar VAR_0x8004, 3
special sub_81133A4
special BufferStreakTrainerText
compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F365
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F337
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F35B
msgbox gUnknown_819CBD3
@@ -219,7 +219,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
end
EventScript_16F337:: @ 816F337
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F351
msgbox gUnknown_819CB32
@@ -245,13 +245,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
lock
faceplayer
setvar VAR_0x8004, 1
special sub_81133A4
special BufferStreakTrainerText
compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F3DC
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F3AE
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F3D2
msgbox gUnknown_819C6BA
@@ -259,7 +259,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
end
EventScript_16F3AE:: @ 816F3AE
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F3C8
msgbox gUnknown_819C5A9
@@ -285,13 +285,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
lock
faceplayer
setvar VAR_0x8004, 2
special sub_81133A4
special BufferStreakTrainerText
compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F453
specialvar VAR_RESULT, sub_8113364
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F425
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F449
msgbox gUnknown_819C986
@@ -299,7 +299,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
end
EventScript_16F425:: @ 816F425
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F43F
msgbox gUnknown_819C81E
@@ -325,11 +325,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
lock
faceplayer
setvar VAR_0x8004, 5
special sub_81133A4
specialvar VAR_RESULT, sub_8113364
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F491
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F4B5
msgbox gUnknown_819D01F
@@ -337,7 +337,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
end
EventScript_16F491:: @ 816F491
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F4AB
msgbox gUnknown_819CEDF
@@ -358,11 +358,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
lock
faceplayer
setvar VAR_0x8004, 4
special sub_81133A4
specialvar VAR_RESULT, sub_8113364
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F4F3
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F517
msgbox gUnknown_819CDDA
@@ -370,7 +370,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
end
EventScript_16F4F3:: @ 816F4F3
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F50D
msgbox gUnknown_819CCF3
@@ -391,11 +391,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
lock
faceplayer
setvar VAR_0x8004, 6
special sub_81133A4
specialvar VAR_RESULT, sub_8113364
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F555
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F579
msgbox gUnknown_819D1AE
@@ -403,7 +403,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
end
EventScript_16F555:: @ 816F555
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F56F
msgbox gUnknown_819D0E3
@@ -424,11 +424,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
lock
faceplayer
setvar VAR_0x8004, 7
special sub_81133A4
specialvar VAR_RESULT, sub_8113364
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F5B7
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 7
goto_if eq, EventScript_16F5DB
msgbox gUnknown_819D3D2
@@ -436,7 +436,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
end
EventScript_16F5B7:: @ 816F5B7
specialvar VAR_RESULT, sub_8113288
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16F5D1
msgbox gUnknown_819D2B4
data/maps/SeafoamIslands_B4F/scripts.inc
+1 -1
View File
@@ -179,7 +179,7 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
playbgm MUS_EXEYE, 0
waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_807F9D8
special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
data/maps/SevenIsland_House_Room1/scripts.inc
+1 -1
View File
@@ -105,7 +105,7 @@ EventScript_170987:: @ 8170987
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_170A11
special SavePlayerParty
special sub_80A03D8
special ReducePlayerPartyToThree
msgbox gUnknown_81A07C4
closemessage
compare_var_to_value VAR_FACING, 2
data/maps/SevenIsland_House_Room2/scripts.inc
+3 -3
View File
@@ -4,7 +4,7 @@ SevenIsland_House_Room2_MapScripts:: @ 8170A7E
.byte 0
SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89
special sub_80E5E70
special SetEReaderTrainerGfxId
end
SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D
@@ -15,12 +15,12 @@ EventScript_170A97:: @ 8170A97
lockall
applymovement 255, Movement_170B22
waitmovement 0
special sub_80E7538
special PrintEReaderTrainerGreeting
msgbox gStringVar4
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
special sub_80E6900
special StartSpecialBattle
waitstate
compare_var_to_value VAR_RESULT, 3
call_if eq, EventScript_170AFE
data/maps/SixIsland_WaterPath_House1/scripts.inc
+3 -3
View File
@@ -12,14 +12,14 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1720E5
special sub_80A0918
special GetHeracrossSizeRecordInfo
msgbox gUnknown_81A4A3F
special Special_ChooseMonFromParty
waitstate
copyvar VAR_RESULT, VAR_0x8004
compare_var_to_value VAR_RESULT, 6
goto_if ge, EventScript_1720EF
special sub_80A0930
special CompareHeracrossSize
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_1720F1
compare_var_to_value VAR_RESULT, 2
@@ -83,7 +83,7 @@ SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157
end
EventScript_17216B:: @ 817216B
special sub_80A0918
special GetHeracrossSizeRecordInfo
msgbox gUnknown_81A4C6E
releaseall
end
data/maps/TwoIsland_House/scripts.inc
+3 -3
View File
@@ -53,11 +53,11 @@ EventScript_1716A5:: @ 81716A5
EventScript_1716BE:: @ 81716BE
msgbox gUnknown_81A2CC3
special sub_80BF93C
special SelectMoveTutorMon
waitstate
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_17179E
special sub_80BFC14
special IsSelectedMonEgg
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_171790
compare_var_to_value VAR_0x8005, 0
@@ -67,7 +67,7 @@ EventScript_1716BE:: @ 81716BE
EventScript_1716F4:: @ 81716F4
msgbox gUnknown_81A2CE1
special sub_80E4634
special DisplayMoveTutorMenu
waitstate
compare_var_to_value VAR_0x8004, 0
goto_if eq, EventScript_1716BE
data/maps/ViridianCity/scripts.inc
+2 -2
View File
@@ -151,7 +151,7 @@ EventScript_165A65:: @ 8165A65
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
special sub_807F888
special ScrSpecial_StartOldManTutorialBattle
waitstate
release
end
@@ -246,7 +246,7 @@ EventScript_165B4C:: @ 8165B4C
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
special sub_807F888
special ScrSpecial_StartOldManTutorialBattle
waitstate
lock
faceplayer
data/specials.inc
+55 -56
View File
@@ -7,11 +7,10 @@
.set __special__, 0
.align 2
gSpecials:: @ 815FD60
def_special sp000_heal_pokemon
def_special SetCableClubWarp
def_special sub_807E654
def_special DoCableClubWarp
def_special sub_807E704
def_special sub_8081744
def_special sub_8081770
@@ -60,16 +59,16 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special IsEnigmaBerryValid
def_special sub_80803CC
def_special sub_80805D8
def_special sub_8080618
def_special ScrSpecial_GetTrainerBattleMode
def_special ScrSpecial_ShowTrainerIntroSpeech
def_special ScrSpecial_ShowTrainerNonBattlingSpeech
def_special ScrSpecial_HasTrainerBeenFought
def_special ScrSpecial_EndTrainerApproach
def_special PlayTrainerEncounterMusic
def_special sub_810CD4C
def_special sub_810CEB4
def_special sub_80805B0
def_special sub_808C6A8
def_special ShouldTryRematchBattle
def_special ScrSpecial_GetTrainerEyeRematchFlag
def_special ScrSpecial_StartTrainerEyeRematch
def_special ShowPokemonStorageSystem
def_special CheckForAlivePartyMons
def_special nullsub_75
def_special nullsub_75
@@ -128,16 +127,16 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80A0918
def_special sub_80A0930
def_special sub_80A096C
def_special sub_80A0984
def_special sub_80CBFA0
def_special GetHeracrossSizeRecordInfo
def_special CompareHeracrossSize
def_special GetMagikarpSizeRecordInfo
def_special CompareMagikarpSize
def_special NameRaterWasNicknameChanged
def_special TV_CopyNicknameToStringVar1AndEnsureTerminated
def_special TV_CheckMonOTIDEqualsPlayerID
def_special nullsub_75
def_special nullsub_75
def_special sub_80BDB1C
def_special BufferRandomHobbyOrLifestyleString
def_special nullsub_75
def_special RegisteredItemHandleBikeSwap
def_special CalculatePlayerPartyCount
@@ -166,17 +165,17 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_807F888
def_special ScrSpecial_StartOldManTutorialBattle
def_special ChangePokemonNickname
def_special Special_ChooseMonFromParty
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_8113364
def_special sub_8113288
def_special sub_81133A4
def_special ShouldMoveSaffronFanClubMember
def_special GetNumMovedSaffronFanClubMembers
def_special BufferStreakTrainerText
def_special sub_8113064
def_special sub_81132CC
def_special UpdateMovedSaffronFanClubMembers
def_special sub_8113510
def_special sub_81130A8
def_special sub_8113530
@@ -204,12 +203,12 @@ gSpecials:: @ 815FD60
def_special TakePokemonFromDaycare
def_special ScriptHatchMon
def_special EggHatch
def_special sub_8046EAC
def_special DaycareMonReceivedMail
def_special Special_BattleRecords
def_special IsEnoughForCostInVar0x8005
def_special SubtractMoneyFromVar0x8005
def_special ExecuteWhiteOut
def_special sub_80CA3C4
def_special sp0C8_whiteout_maybe
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -222,18 +221,18 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special Special_GetPokedexCount
def_special sub_80CA524
def_special Special_GetProfOaksRatingMessage
def_special Special_AnimatePcTurnOn
def_special Special_AnimatePcTurnOff
def_special Special_GetElevatorFloor
def_special nullsub_75
def_special nullsub_75
def_special sub_80BF93C
def_special Special_ChooseMoveToDelete
def_special Special_DeleteSelectedMove
def_special SelectMoveTutorMon
def_special SelectMove
def_special DeleteMonMove
def_special ScrSpecial_GetPokemonNicknameAndMoveName
def_special ScrSpecial_CountPokemonMoves
def_special sub_80E4634
def_special DisplayMoveTutorMenu
def_special nullsub_75
def_special nullsub_75
def_special Special_GetPlayerAvatarBike
@@ -241,30 +240,30 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special Special_GetLeadMonFriendship
def_special sub_80E5970
def_special sub_80E5C28
def_special sub_80E6648
def_special sub_80E67FC
def_special sub_80E7538
def_special sub_80E6900
def_special sub_80E6A0C
def_special sub_80E6C8C
def_special sub_80E6E14
def_special sub_80E6FB8
def_special sub_80E7058
def_special sub_80E71D0
def_special sub_80E724C
def_special sub_80E72B8
def_special sub_80A0380
def_special ChooseNextBattleTowerTrainer
def_special CheckPartyBattleTowerBanlist
def_special PrintBattleTowerTrainerGreeting
def_special PrintEReaderTrainerGreeting
def_special StartSpecialBattle
def_special SetBattleTowerProperty
def_special BattleTowerUtil
def_special SetBattleTowerParty
def_special SaveBattleTowerProgress
def_special BattleTower_SoftReset
def_special DetermineBattleTowerPrize
def_special GiveBattleTowerPrize
def_special AwardBattleTowerRibbons
def_special ChooseBattleTowerPlayerParty
def_special ValidateEReaderTrainer
def_special nullsub_75
def_special sub_80A03D8
def_special sub_80EB6AC
def_special sub_80EB6FC
def_special ReducePlayerPartyToThree
def_special BedroomPC
def_special PlayerPC
def_special Special_TownMap
def_special sub_8053A9C
def_special sub_8053D68
def_special sub_8054440
def_special sub_8053D2C
def_special GetInGameTradeSpeciesInfo
def_special CreateInGameTradePokemon
def_special DoInGameTradeScene
def_special GetTradeSpecies
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -320,9 +319,9 @@ gSpecials:: @ 815FD60
def_special Special_CheckPartyPokerus
def_special sub_806E99C
def_special Special_ShakeScreen
def_special sub_807FA68
def_special sub_807F9D8
def_special sub_807FABC
def_special Special_StartGroudonKyogreBattle
def_special Special_StartLegendaryBattle
def_special Special_StartRegiBattle
def_special sub_8080398
def_special nullsub_75
def_special nullsub_75
@@ -331,13 +330,13 @@ gSpecials:: @ 815FD60
def_special DoFallWarp
def_special nullsub_75
def_special nullsub_75
def_special sub_80E5E70
def_special sub_807F998
def_special SetEReaderTrainerGfxId
def_special ScrSpecial_StartSouthernIslandBattle
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special Special_GetSpeciesOfPartySlot_x8004
def_special sub_80BFC14
def_special IsSelectedMonEgg
def_special nullsub_75
def_special nullsub_75
def_special LoadPlayerBag
@@ -347,11 +346,11 @@ gSpecials:: @ 815FD60
def_special HasAllKantoMons
def_special Special_BufferMonOTNameAndCompareToPlayerName
def_special nullsub_75
def_special sub_80E759C
def_special Dummy_TryEnableBravoTrainerBattleTower
def_special GetNameOfEnigmaBerryInPlayerParty
def_special nullsub_75
def_special sub_810B82C
def_special sub_807F904
def_special ScrSpecial_StartMarowakBattle
def_special Special_ForcePlayerOntoBike
def_special Special_ListMenu
def_special Special_ReturnToListMenu