ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 11:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into use_pokeblock

Browse Source 
# Conflicts:
#	include/menu_specialized.h
This commit is contained in:
Marcus Huderle 2019-03-23 10:14:31 -05:00
commit a5ee2c14fd
24 changed files with 725 additions and 1742 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
data/event_scripts.s
View File

@ -442,28 +442,28 @@ gStdScripts_End:: @ 81DC2CC
EventScript_SecretBasePC:: @ 823B4BB
lockall
playse SE_PC_LOGIN
message Text_276805
message Text_SecretBaseBootUpPC
dofieldeffect FLDEFF_PCTURN_ON
waitstate
waitmessage
waitbuttonpress
playse SE_SELECT
goto EventScript_23B4D3
goto EventScript_SecretBasePCShowMainMenu
end
EventScript_23B4D3:: @ 823B4D3
message Text_27681A
EventScript_SecretBasePCShowMainMenu:: @ 823B4D3
message Text_SecretBasePCStartMenu
waitmessage
goto_if_set FLAG_DECORATION_16, EventScript_23B4EF
goto_if_set FLAG_DECORATION_16, EventScript_SecretBasePCMainMenuChoice
goto EventScript_23B531
end
gUnknown_0823B4E8:: @ 823B4E8
gUnknown_0823B4E8:: @ 823B4E8 ;EventScript_SecretBasePCCancel?
lockall
goto EventScript_23B4D3
goto EventScript_SecretBasePCShowMainMenu
end
EventScript_23B4EF:: @ 823B4EF
EventScript_SecretBasePCMainMenuChoice:: @ 823B4EF
multichoice 0, 0, 6, 0
switch VAR_RESULT
case 0, EventScript_23B581
@ -485,7 +485,7 @@ EventScript_23B531:: @ 823B531
EventScript_23B568:: @ 823B568
msgbox Text_2766AA, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_23B4D3
goto_if_eq EventScript_SecretBasePCShowMainMenu
closemessage
special sub_80E9AC0
releaseall
@ -501,7 +501,7 @@ EventScript_23B585:: @ 823B585
EventScript_RecordMixingSecretBasePC:: @ 823B589
lockall
message Text_276805
message Text_SecretBaseBootUpPC
playse SE_PC_LOGIN
dofieldeffect FLDEFF_PCTURN_ON
waitstate
@ -512,7 +512,7 @@ EventScript_RecordMixingSecretBasePC:: @ 823B589
end
EventScript_23B5A1:: @ 823B5A1
message Text_27681A
message Text_SecretBasePCStartMenu
waitmessage
multichoice 0, 0, 7, 0
switch VAR_RESULT
@ -533,7 +533,7 @@ EventScript_23B5F0:: @ 823B5F0
compare VAR_RESULT, 1
goto_if_eq EventScript_23B62F
compare VAR_RESULT, 2
goto_if_eq EventScript_23B652
goto_if_eq EventScript_CantRegisterTooManyBases
special sub_80E980C
msgbox Text_276707, MSGBOX_YESNO
compare VAR_RESULT, 0
@ -554,8 +554,8 @@ EventScript_23B62F:: @ 823B62F
releaseall
end
EventScript_23B652:: @ 823B652
msgbox Text_27676F, MSGBOX_SIGN
EventScript_CantRegisterTooManyBases:: @ 823B652
msgbox Text_TooManyBasesDeleteSome, MSGBOX_SIGN
special DoSecretBasePCTurnOffEffect
closemessage
releaseall
@ -1099,7 +1099,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
compare VAR_FOSSIL_MANIAC_STATE, 0
call_if_eq EverGrandeCity_HallOfFame_EventScript_271839
clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
call EverGrandeCity_HallOfFame_EventScript_2718CC
call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
@ -1147,7 +1147,7 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
return
EventScript_WhiteOut:: @ 8271857
call EverGrandeCity_HallOfFame_EventScript_2718CC
call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
goto EventScript_ResetMrBriney
end
@ -1192,7 +1192,7 @@ EventScript_MoveMrBrineyToRoute108:: @ 82718B3
clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
end
EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC
EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC
clearflag FLAG_DEFEATED_ELITE_4_SYDNEY
clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
clearflag FLAG_DEFEATED_ELITE_4_GLACIA
@ -1337,13 +1337,13 @@ OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19
OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43
specialvar VAR_RESULT, IsPokerusInParty
compare VAR_RESULT, 1
goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A5F
goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_Explain_Pokerus
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719B1
end
OldaleTown_PokemonCenter_1F_EventScript_271A5F:: @ 8271A5F
message gUnknown_08272F07
OldaleTown_PokemonCenter_1F_EventScript_Explain_Pokerus:: @ 8271A5F
message gText_PokerusExplanation
setflag FLAG_POKERUS_EXPLAINED
return
@ -1437,7 +1437,7 @@ EventScript_271B85:: @ 8271B85
EventScript_271B95:: @ 8271B95
message gUnknown_08272A78
waitfanfare
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
setvar VAR_RESULT, 1
return
@ -1491,13 +1491,13 @@ Std_FindItem:: @ 8271BFD
checkitemtype VAR_0x8000
call EventScript_271B08
compare VAR_0x8007, 1
call_if_eq EventScript_271C3A
call_if_eq EventScript_PickItemUp
compare VAR_0x8007, 0
call_if_eq EventScript_271CA1
release
return
EventScript_271C3A:: @ 8271C3A
EventScript_PickItemUp:: @ 8271C3A
removeobject VAR_LAST_TALKED
giveitem VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, sub_81398C0
@ -1513,20 +1513,20 @@ EventScript_271C3A:: @ 8271C3A
special CallBattlePyramidFunction
compare VAR_RESULT, 1
goto_if_eq EventScript_271C86
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
return
EventScript_271C86:: @ 8271C86
msgbox gUnknown_08272AEA, MSGBOX_DEFAULT
msgbox gText_PlayerPutItemInBag, MSGBOX_DEFAULT
return
EventScript_271C8F:: @ 8271C8F
bufferitemnameplural 0, VAR_0x8004, VAR_0x8005
message gUnknown_082731A9
message gText_PlayerFoundOneItemTwoLines
return
EventScript_271C9B:: @ 8271C9B
message gUnknown_08272ABF
message gText_PlayerFoundOneItem
return
EventScript_271CA1:: @ 8271CA1
@ -1561,12 +1561,12 @@ EventScript_271CE8:: @ 8271CE8
EventScript_271D0E:: @ 8271D0E
bufferitemnameplural 0, VAR_0x8004, 1
message gUnknown_082731A9
message gText_PlayerFoundOneItemTwoLines
goto EventScript_271D2A
end
EventScript_271D1F:: @ 8271D1F
message gUnknown_08272ABF
message gText_PlayerFoundOneItem
goto EventScript_271D2A
end
@ -1575,14 +1575,14 @@ EventScript_271D2A:: @ 8271D2A
waitfanfare
bufferitemnameplural 1, VAR_0x8004, 1
copyvar VAR_0x8004, VAR_0x8008
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
special sub_80EDCE8
special SetFlagInVar
releaseall
end
EventScript_271D47:: @ 8271D47
msgbox gUnknown_08272ABF, MSGBOX_DEFAULT
msgbox gText_PlayerFoundOneItem, MSGBOX_DEFAULT
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
setvar VAR_RESULT, 0
releaseall
@ -1591,7 +1591,7 @@ EventScript_271D47:: @ 8271D47
EventScript_271D5E:: @ 8271D5E
lock
faceplayer
msgbox Text_27260D, MSGBOX_YESNO
msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq EventScript_271D83
compare VAR_RESULT, 0
@ -1605,7 +1605,7 @@ EventScript_271D83:: @ 8271D83
faceplayer
EventScript_271D89:: @ 8271D89
message Text_272640
message Text_WouldNotLikeToMixRecords
waitmessage
waitbuttonpress
release
@ -1616,7 +1616,7 @@ EventScript_PC:: @ 8271D92
setvar VAR_0x8004, 0
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox Text_27265A, MSGBOX_DEFAULT
msgbox Text_BootUpPC, MSGBOX_DEFAULT
goto EventScript_271DAC
end
@ -1639,7 +1639,7 @@ EventScript_271DBC:: @ 8271DBC
EventScript_271DF9:: @ 8271DF9
playse SE_PC_LOGIN
msgbox gUnknown_082726C2, MSGBOX_DEFAULT
msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT
special PlayerPC
waitstate
goto EventScript_271DAC
@ -1649,18 +1649,18 @@ EventScript_271E0E:: @ 8271E0E
playse SE_PC_LOGIN
call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35
call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E
msgbox gUnknown_082726A3, MSGBOX_DEFAULT
msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT
special ShowPokemonStorageSystemPC
waitstate
goto EventScript_271DAC
end
EventScript_271E35:: @ 8271E35
msgbox gUnknown_0827268C, MSGBOX_DEFAULT
msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT
return
EventScript_271E3E:: @ 8271E3E
msgbox gUnknown_082726D4, MSGBOX_DEFAULT
msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT
return
EventScript_271E47:: @ 8271E47
@ -1717,20 +1717,20 @@ Route109_EventScript_271E95:: @ 8271E95
EventScript_UseSurf:: @ 8271EA0
checkpartymove MOVE_SURF
compare VAR_RESULT, 6
goto_if_eq EventScript_271ED6
goto_if_eq EventScript_CantSurf
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
lockall
msgbox gUnknown_08272FD6, MSGBOX_YESNO
msgbox gText_WantToUseSurf, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_271ED5
msgbox gUnknown_0827300D, MSGBOX_DEFAULT
goto_if_eq EventScript_CancelSurf
msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT
dofieldeffect FLDEFF_USE_SURF
EventScript_271ED5:: @ 8271ED5
EventScript_CancelSurf:: @ 8271ED5
releaseall
EventScript_271ED6:: @ 8271ED6
EventScript_CantSurf:: @ 8271ED6
end
Common_EventScript_SetupRivalGender:: @ 8271ED7
@ -2464,56 +2464,56 @@ Movement_2725CB:: @ 82725CB
step_end
EventScript_PictureBookShelf:: @ 82725CE
msgbox Text_2A81E5, MSGBOX_SIGN
msgbox Text_PictureBookShelf, MSGBOX_SIGN
end
EventScript_BookShelf:: @ 82725D7
msgbox Text_2A820D, MSGBOX_SIGN
msgbox Text_BookShelf, MSGBOX_SIGN
end
EventScript_PokemonCenterBookshelf:: @ 82725E0
msgbox Text_2A8232, MSGBOX_SIGN
EventScript_PokemonCenterBookShelf:: @ 82725E0
msgbox Text_PokemonCenterBookShelf, MSGBOX_SIGN
end
EventScript_Vase:: @ 82725E9
msgbox Text_2A8276, MSGBOX_SIGN
msgbox Text_Vase, MSGBOX_SIGN
end
EventScript_TrashCan:: @ 82725F2
msgbox Text_2A82B3, MSGBOX_SIGN
EventScript_EmptyTrashCan:: @ 82725F2
msgbox Text_EmptyTrashCan, MSGBOX_SIGN
end
EventScript_ShopShelf:: @ 82725FB
msgbox Text_2A82BF, MSGBOX_SIGN
msgbox Text_ShopShelf, MSGBOX_SIGN
end
EventScript_Blueprint:: @ 8272604
msgbox Text_2A82F7, MSGBOX_SIGN
msgbox Text_Blueprint, MSGBOX_SIGN
end
Text_27260D: @ 827260D
Text_WouldYouLikeToMixRecords: @ 827260D
.string "Would you like to mix records with\n"
.string "other TRAINERS?$"
Text_272640: @ 8272640
Text_WouldNotLikeToMixRecords: @ 8272640
.string "We hope to see you again!$"
Text_27265A: @ 827265A
Text_BootUpPC: @ 827265A
.string "{PLAYER} booted up the PC.$"
gText_WhichPCShouldBeAccessed:: @ 827266F
.string "Which PC should be accessed?$"
gUnknown_0827268C:: @ 827268C
gText_AccessedSomeonesPC:: @ 827268C
.string "Accessed SOMEONE'S PC.$"
gUnknown_082726A3:: @ 82726A3
gText_StorageSystemOpened:: @ 82726A3
.string "POKéMON Storage System opened.$"
gUnknown_082726C2:: @ 82726C2
gText_AccessedPlayersPC:: @ 82726C2
.string "Accessed {PLAYER}'s PC.$"
gUnknown_082726D4:: @ 82726D4
gText_AccessedLanettesPC:: @ 82726D4
.string "Accessed LANETTE's PC.$"
gUnknown_082726EB:: @ 82726EB
@ -2561,16 +2561,16 @@ gUnknown_08272A78:: @ 8272A78
gUnknown_08272A89:: @ 8272A89
.string "The BAG is full…$"
gUnknown_08272A9A:: @ 8272A9A
gText_PutItemInPocket:: @ 8272A9A
.string "{PLAYER} put away the {STR_VAR_2}\nin the {STR_VAR_3} POCKET.$"
gUnknown_08272ABF:: @ 8272ABF
gText_PlayerFoundOneItem:: @ 8272ABF
.string "{PLAYER} found one {STR_VAR_2}!$"
gText_TooBadBagIsFull:: @ 8272AD0
.string "Too bad!\nThe BAG is full…$"
gUnknown_08272AEA:: @ 8272AEA
gText_PlayerPutItemInBag:: @ 8272AEA
.string "{PLAYER} put away the {STR_VAR_2}\nin the BAG.$"
gUnknown_08272B09:: @ 8272B09
@ -2597,13 +2597,13 @@ gUnknown_08272C1D:: @ 8272C1D
gUnknown_08272C5F:: @ 8272C5F
.string "The sandstorm is vicious.\nIt's impossible to keep going.$"
gUnknown_08272C98:: @ 8272C98
gText_SelectWithoutRegisteredItem:: @ 8272C98
.string "An item in the BAG can be\nregistered to SELECT for easy use.$"
gUnknown_08272CD5:: @ 8272CD5
.string "There's an e-mail from POKéMON TRAINER\nSCHOOL.\p… … … … … …\pA POKéMON may learn up to four moves.\pA TRAINER's expertise is tested on the\nmove sets chosen for POKéMON.\p… … … … … …$"
gUnknown_08272D87:: @ 8272D87
gText_PlayerHouseBootPC:: @ 8272D87
.string "{PLAYER} booted up the PC.$"
gUnknown_08272D9C:: @ 8272D9C
@ -2615,13 +2615,13 @@ gUnknown_08272DB3:: @ 8272DB3
gUnknown_08272DE3:: @ 8272DE3
.string "{PLAYER} is out of usable\nPOKéMON!\p{PLAYER} whited out!$"
gUnknown_08272E0F:: @ 8272E0F
gText_RegisteredTrainerinPokeNav:: @ 8272E0F
.string "Registered {STR_VAR_1} {STR_VAR_2}\nin the POKéNAV.$"
gUnknown_08272E30:: @ 8272E30
.string "Do you know the TM SECRET POWER?\pOur group, we love the TM SECRET\nPOWER.\pOne of our members will give it to you.\nCome back and show me if you get it.\pWe'll accept you as a member and sell\nyou good stuff in secrecy.$"
gUnknown_08272F07:: @ 8272F07
gText_PokerusExplanation:: @ 8272F07
.string "Your POKéMON may be infected with\nPOKéRUS.\pLittle is known about the POKéRUS\nexcept that they are microscopic life-\lforms that attach to POKéMON.\pWhile infected, POKéMON are said to\ngrow exceptionally well.$"
.include "data/text/surf.inc"
@ -2650,13 +2650,13 @@ gUnknown_08273161:: @ 8273161
gUnknown_08273178:: @ 8273178
.string "Thank you for accessing the\nMYSTERY GIFT System.$"
gUnknown_082731A9:: @ 82731A9
gText_PlayerFoundOneItemTwoLines:: @ 82731A9
.string "{PLAYER} found one {STR_VAR_1}\n{STR_VAR_2}!$"
gUnknown_082731BD:: @ 82731BD
gText_Sudowoodo_Attacked:: @ 82731BD
.string "The weird tree doesn't like the\nWAILMER PAIL!\pThe weird tree attacked!$"
gUnknown_08273204:: @ 8273204
gText_LegendaryFlewAway:: @ 8273204
.string "The {STR_VAR_1} flew away!$"
gText_PkmnTransferredSomeonesPC:: @ 8273216
@ -2674,7 +2674,7 @@ gText_PkmnBoxLanettesPCFull:: @ 82732D9
gUnknown_0827331C:: @ 827331C
.string "There's no more room for POKéMON!\pThe POKéMON BOXES are full and\ncan't accept any more!$"
gUnknown_08273374:: @ 8273374
gText_NicknameThisPokemon:: @ 8273374
.string "Do you want to give a nickname to\nthis {STR_VAR_1}?$"
gUnknown_0827339F:: @ 827339F
@ -2707,8 +2707,8 @@ gText_UnusualWeatherEnded_Rain:: @ 8273656
gText_UnusualWeatherEnded_Sun:: @ 8273684
.string "The intense sunshine appears to\nhave subsided…$"
EventScript_2736B3:: @ 82736B3
msgbox gUnknown_08272C98, MSGBOX_SIGN
EventScript_SelectWithoutRegisteredItem:: @ 82736B3
msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN
end
EventScript_Poison:: @ 82736BC
@ -2862,7 +2862,7 @@ TerraCave_End_EventScript_273776:: @ 8273776
removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0
bufferspeciesname 0, VAR_0x8004
msgbox gUnknown_08273204, MSGBOX_DEFAULT
msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
release
end
@ -3433,7 +3433,7 @@ Std_RegisteredInMatchCall:: @ 82742C9
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox gUnknown_08272E0F, MSGBOX_DEFAULT
msgbox gText_RegisteredTrainerinPokeNav, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@ -4207,31 +4207,31 @@ MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D
.include "data/text/berries.inc"
.include "data/text/shoal_cave.inc"
Text_2A81E5: @ 82A81E5
Text_PictureBookShelf: @ 82A81E5
.string "There's a set of POKéMON picture books.$"
Text_2A820D: @ 82A820D
Text_BookShelf: @ 82A820D
.string "It's filled with all sorts of books.$"
Text_2A8232: @ 82A8232
Text_PokemonCenterBookShelf: @ 82A8232
.string "POKéMON magazines!\n"
.string "POKéMON PAL…\p"
.string "POKéMON HANDBOOK…\n"
.string "ADORABLE POKéMON…$"
Text_2A8276: @ 82A8276
Text_Vase: @ 82A8276
.string "This vase looks expensive…\n"
.string "Peered inside…\p"
.string "But, it was empty.$"
Text_2A82B3: @ 82A82B3
Text_EmptyTrashCan: @ 82A82B3
.string "It's empty.$"
Text_2A82BF: @ 82A82BF
Text_ShopShelf: @ 82A82BF
.string "The shelves brim with all sorts of\n"
.string "POKéMON merchandise.$"
Text_2A82F7: @ 82A82F7
Text_Blueprint: @ 82A82F7
.string "A blueprint of some sort?\n"
.string "It's too complicated!$"

96
data/field_effect_scripts.s
View File

@ -16,26 +16,26 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_SurfBlob
.4byte gFieldEffectScript_UseSurf
.4byte gFieldEffectScript_GroundImpactDust
.4byte gFieldEffectScript_Unknown11
.4byte gFieldEffectScript_UseSecretPowerCave
.4byte gFieldEffectScript_BikeHopTallGrass
.4byte gFieldEffectScript_SandFootprints
.4byte gFieldEffectScript_BikeHopBigSplash
.4byte gFieldEffectScript_Splash
.4byte gFieldEffectScript_BikeHopSmallSplash
.4byte gFieldEffectScript_LongGrass
.4byte gFieldEffectScript_Unknown18
.4byte gFieldEffectScript_JumpLongGrass
.4byte gFieldEffectScript_Unknown19
.4byte gFieldEffectScript_Unknown20
.4byte gFieldEffectScript_Unknown21
.4byte gFieldEffectScript_Unknown22
.4byte gFieldEffectScript_BerryTreeGrowthSparkle
.4byte gFieldEffectScript_DeepSandFootprints
.4byte gFieldEffectScript_Unknown25
.4byte gFieldEffectScript_Unknown26
.4byte gFieldEffectScript_Unknown27
.4byte gFieldEffectScript_PokeCenterHeal
.4byte gFieldEffectScript_UseSecretPowerTree
.4byte gFieldEffectScript_UseSecretPowerShrub
.4byte gFieldEffectScript_TreeDisguise
.4byte gFieldEffectScript_MountainDisguise
.4byte gFieldEffectScript_Unknown30
.4byte gFieldEffectScript_NPCUseFly
.4byte gFieldEffectScript_UseFly
.4byte gFieldEffectScript_FlyIn
.4byte gFieldEffectScript_QuestionMarkIcon
@ -43,35 +43,35 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_BikeTireTracks
.4byte gFieldEffectScript_SandDisguisePlaceholder
.4byte gFieldEffectScript_UseRockSmash
.4byte gFieldEffectScript_Unknown38
.4byte gFieldEffectScript_Unknown39
.4byte gFieldEffectScript_Unknown40
.4byte gFieldEffectScript_UseDig
.4byte gFieldEffectScript_SandPile
.4byte gFieldEffectScript_UseStrength
.4byte gFieldEffectScript_ShortGrass
.4byte gFieldEffectScript_HotSpringsWater
.4byte gFieldEffectScript_Unknown43
.4byte gFieldEffectScript_Unknown44
.4byte gFieldEffectScript_Unknown45
.4byte gFieldEffectScript_UseWaterfall
.4byte gFieldEffectScript_UseDive
.4byte gFieldEffectScript_Pokeball
.4byte gFieldEffectScript_HeartIcon
.4byte gFieldEffectScript_Unknown47
.4byte gFieldEffectScript_Unknown48
.4byte gFieldEffectScript_JumpOutOfAsh
.4byte gFieldEffectScript_Unknown50
.4byte gFieldEffectScript_Unknown51
.4byte gFieldEffectScript_Unknown52
.4byte gFieldEffectScript_LavaridgeGymWarp
.4byte gFieldEffectScript_SweetScent
.4byte gFieldEffectScript_SandPillar
.4byte gFieldEffectScript_Bubbles
.4byte gFieldEffectScript_Unknown54
.4byte gFieldEffectScript_Unknown55
.4byte gFieldEffectScript_Unknown56
.4byte gFieldEffectScript_Unknown57
.4byte gFieldEffectScript_Unknown58
.4byte gFieldEffectScript_Sparkle
.4byte gFieldEffectScript_ShowSecretPowerCave
.4byte gFieldEffectScript_ShowSecretPowerTree
.4byte gFieldEffectScript_ShowSecretPowerShrub
.4byte gFieldEffectScript_ShowCutGrass
.4byte gFieldEffectScript_FieldMoveShowMonInit
.4byte gFieldEffectScript_UsePuzzleEffect
.4byte gFieldEffectScript_Unknown61
.4byte gFieldEffectScript_Unknown62
.4byte gFieldEffectScript_Unknown63
.4byte gFieldEffectScript_SecretBaseBootPC
.4byte gFieldEffectScript_HallOfFameRecord
.4byte gFieldEffectScript_UseTeleport
.4byte gFieldEffectScript_Rayquaza
.4byte gFieldEffectScript_Unknown65
.4byte gFieldEffectScript_Unknown66
.4byte gFieldEffectScript_MoveDeoxysRock
gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
field_eff_callnative FldEff_ExclamationMarkIcon
@ -117,7 +117,7 @@ gFieldEffectScript_GroundImpactDust:: @ 82DBB28
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Dust
field_eff_end
gFieldEffectScript_Unknown11:: @ 82DBB32
gFieldEffectScript_UseSecretPowerCave:: @ 82DBB32
field_eff_callnative FldEff_UseSecretPowerCave
field_eff_end
@ -145,7 +145,7 @@ gFieldEffectScript_LongGrass:: @ 82DBB6A
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_LongGrass
field_eff_end
gFieldEffectScript_Unknown18:: @ 82DBB74
gFieldEffectScript_JumpLongGrass:: @ 82DBB74
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpLongGrass
field_eff_end
@ -173,16 +173,16 @@ gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_DeepSandFootprints
field_eff_end
gFieldEffectScript_Unknown25:: @ 82DBBB6
gFieldEffectScript_PokeCenterHeal:: @ 82DBBB6
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_PokecenterHeal
field_eff_end
gFieldEffectScript_Unknown26:: @ 82DBBC5
gFieldEffectScript_UseSecretPowerTree:: @ 82DBBC5
field_eff_callnative FldEff_UseSecretPowerTree
field_eff_end
gFieldEffectScript_Unknown27:: @ 82DBBCB
gFieldEffectScript_UseSecretPowerShrub:: @ 82DBBCB
field_eff_callnative FldEff_UseSecretPowerShrub
field_eff_end
@ -194,7 +194,7 @@ gFieldEffectScript_MountainDisguise:: @ 82DBBD7
field_eff_callnative ShowMountainDisguiseFieldEffect
field_eff_end
gFieldEffectScript_Unknown30:: @ 82DBBDD
gFieldEffectScript_NPCUseFly:: @ 82DBBDD
field_eff_callnative FldEff_NPCFlyOut
field_eff_end
@ -226,15 +226,15 @@ gFieldEffectScript_UseRockSmash:: @ 82DBC0F
field_eff_callnative FldEff_UseRockSmash
field_eff_end
gFieldEffectScript_Unknown40:: @ 82DBC15
gFieldEffectScript_UseStrength:: @ 82DBC15
field_eff_callnative sub_8145E2C
field_eff_end
gFieldEffectScript_Unknown38:: @ 82DBC1B
gFieldEffectScript_UseDig:: @ 82DBC1B
field_eff_callnative FldEff_UseDig
field_eff_end
gFieldEffectScript_Unknown39:: @ 82DBC21
gFieldEffectScript_SandPile:: @ 82DBC21
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandPile
field_eff_end
@ -246,15 +246,15 @@ gFieldEffectScript_HotSpringsWater:: @ 82DBC35
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_HotSpringsWater
field_eff_end
gFieldEffectScript_Unknown43:: @ 82DBC3F
gFieldEffectScript_UseWaterfall:: @ 82DBC3F
field_eff_callnative FldEff_UseWaterfall
field_eff_end
gFieldEffectScript_Unknown44:: @ 82DBC45
gFieldEffectScript_UseDive:: @ 82DBC45
field_eff_callnative FldEff_UseDive
field_eff_end
gFieldEffectScript_Unknown45:: @ 82DBC4B
gFieldEffectScript_Pokeball:: @ 82DBC4B
field_eff_loadpal gFieldEffectObjectPaletteInfo10
field_eff_callnative FldEff_Pokeball
field_eff_end
@ -275,15 +275,15 @@ gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_PopOutOfAsh
field_eff_end
gFieldEffectScript_Unknown50:: @ 82DBC76
gFieldEffectScript_LavaridgeGymWarp:: @ 82DBC76
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_LavaridgeGymWarp
field_eff_end
gFieldEffectScript_Unknown51:: @ 82DBC80
gFieldEffectScript_SweetScent:: @ 82DBC80
field_eff_callnative FldEff_SweetScent
field_eff_end
gFieldEffectScript_Unknown52:: @ 82DBC86
gFieldEffectScript_SandPillar:: @ 82DBC86
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar
field_eff_end
@ -291,23 +291,23 @@ gFieldEffectScript_Bubbles:: @ 82DBC90
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Bubbles
field_eff_end
gFieldEffectScript_Unknown54:: @ 82DBC9A
gFieldEffectScript_Sparkle:: @ 82DBC9A
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, FldEff_Sparkle
field_eff_end
gFieldEffectScript_Unknown55:: @ 82DBCA4
gFieldEffectScript_ShowSecretPowerCave:: @ 82DBCA4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave
field_eff_end
gFieldEffectScript_Unknown56:: @ 82DBCAE
gFieldEffectScript_ShowSecretPowerTree:: @ 82DBCAE
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree
field_eff_end
gFieldEffectScript_Unknown57:: @ 82DBCB8
gFieldEffectScript_ShowSecretPowerShrub:: @ 82DBCB8
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub
field_eff_end
gFieldEffectScript_Unknown58:: @ 82DBCC2
gFieldEffectScript_ShowCutGrass:: @ 82DBCC2
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass
field_eff_end
@ -319,16 +319,16 @@ gFieldEffectScript_UsePuzzleEffect:: @ 82DBCD2
field_eff_callnative FldEff_UsePuzzleEffect
field_eff_end
gFieldEffectScript_Unknown61:: @ 82DBCD8
gFieldEffectScript_SecretBaseBootPC:: @ 82DBCD8
field_eff_callnative FldEff_SecretBasePCTurnOn
field_eff_end
gFieldEffectScript_Unknown62:: @ 82DBCDE
gFieldEffectScript_HallOfFameRecord:: @ 82DBCDE
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, FldEff_HallOfFameRecord
field_eff_end
gFieldEffectScript_Unknown63:: @ 82DBCED
gFieldEffectScript_UseTeleport:: @ 82DBCED
field_eff_callnative FldEff_UseTeleport
field_eff_end
@ -340,6 +340,6 @@ gFieldEffectScript_Unknown65:: @ 82DBCF9
field_eff_callnative sub_80B9ADC
field_eff_end
gFieldEffectScript_Unknown66:: @ 82DBCFF
gFieldEffectScript_MoveDeoxysRock:: @ 82DBCFF
field_eff_callnative Fldeff_MoveDeoxysRock
field_eff_end

2
data/maps/BattleFrontier_OutsideEast/scripts.inc
View File

@ -121,7 +121,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
playse 269
applymovement 14, BattleFrontier_OutsideEast_Movement_242D69
waitmovement 0
msgbox gUnknown_082731BD, MSGBOX_DEFAULT
msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT
closemessage
waitse
playmoncry SPECIES_SUDOWOODO, 2

6
data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
View File

@ -151,7 +151,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
bufferstdstring 2, 14
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
random 64
compare VAR_RESULT, 0
goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
@ -163,7 +163,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
bufferstdstring 2, 14
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
random 64
compare VAR_RESULT, 0
goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
@ -175,7 +175,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
bufferstdstring 2, 14
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436
end

2
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
View File

@ -257,7 +257,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
setvar VAR_0x8004, 1
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, MSGBOX_DEFAULT
msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT
special BedroomPC
waitstate
releaseall

2
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
View File

@ -315,7 +315,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
setvar VAR_0x8004, 2
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, MSGBOX_DEFAULT
msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT
special BedroomPC
waitstate
releaseall

12
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
View File

@ -347,7 +347,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 4
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@ -358,7 +358,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 4
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
call LittlerootTown_ProfessorBirchsLab_EventScript_273797
@ -392,7 +392,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 5
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@ -403,7 +403,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 5
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
call LittlerootTown_ProfessorBirchsLab_EventScript_273797
@ -437,7 +437,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 6
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@ -448,7 +448,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 6
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
call LittlerootTown_ProfessorBirchsLab_EventScript_273797

4
data/maps/MossdeepCity_StevensHouse/scripts.inc
View File

@ -95,7 +95,7 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865
MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
call MossdeepCity_StevensHouse_EventScript_2228EB
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_StevensHouse_EventScript_222901
call MossdeepCity_StevensHouse_EventScript_27378B
@ -105,7 +105,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD
call MossdeepCity_StevensHouse_EventScript_2228EB
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_StevensHouse_EventScript_2228E0
call MossdeepCity_StevensHouse_EventScript_273797

4
data/maps/Route110_TrickHouseEnd/scripts.inc
View File

@ -45,7 +45,7 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
faceplayer
msgbox Route110_TrickHouseEnd_Text_26B08D, MSGBOX_DEFAULT
setvar VAR_TEMP_2, 1
switch VAR_0x4044
switch VAR_TRICK_HOUSE_LEVEL
case 0, Route110_TrickHouseEnd_EventScript_26AD84
case 1, Route110_TrickHouseEnd_EventScript_26ADC0
case 2, Route110_TrickHouseEnd_EventScript_26ADFC
@ -196,7 +196,7 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
applymovement 1, Route110_TrickHouseEnd_Movement_269E3F
waitmovement 0
removeobject 1
addvar VAR_0x4044, 1
addvar VAR_TRICK_HOUSE_LEVEL, 1
return
Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF

64
data/maps/Route110_TrickHouseEntrance/scripts.inc
View File

@ -27,7 +27,7 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
compare VAR_0x4044, 8
compare VAR_TRICK_HOUSE_LEVEL, 8
goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
end
@ -44,21 +44,21 @@ Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3
Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
compare VAR_0x4044, 1
compare VAR_TRICK_HOUSE_LEVEL, 1
call_if_eq Route110_TrickHouseEntrance_EventScript_269B61
compare VAR_0x4044, 2
compare VAR_TRICK_HOUSE_LEVEL, 2
call_if_eq Route110_TrickHouseEntrance_EventScript_269B6B
compare VAR_0x4044, 3
compare VAR_TRICK_HOUSE_LEVEL, 3
call_if_eq Route110_TrickHouseEntrance_EventScript_269B75
compare VAR_0x4044, 4
compare VAR_TRICK_HOUSE_LEVEL, 4
call_if_eq Route110_TrickHouseEntrance_EventScript_269B7F
compare VAR_0x4044, 5
compare VAR_TRICK_HOUSE_LEVEL, 5
call_if_eq Route110_TrickHouseEntrance_EventScript_269B89
compare VAR_0x4044, 6
compare VAR_TRICK_HOUSE_LEVEL, 6
call_if_eq Route110_TrickHouseEntrance_EventScript_269B93
compare VAR_0x4044, 7
compare VAR_TRICK_HOUSE_LEVEL, 7
call_if_eq Route110_TrickHouseEntrance_EventScript_269B9D
compare VAR_0x4044, 8
compare VAR_TRICK_HOUSE_LEVEL, 8
call_if_eq Route110_TrickHouseEntrance_EventScript_269BA7
return
@ -139,7 +139,7 @@ Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26
addobject 1
hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
switch VAR_0x4044
switch VAR_TRICK_HOUSE_LEVEL
case 0, Route110_TrickHouseEntrance_EventScript_269C8C
case 1, Route110_TrickHouseEntrance_EventScript_269C94
case 2, Route110_TrickHouseEntrance_EventScript_269C9C
@ -205,7 +205,7 @@ Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
lockall
delay 20
compare VAR_0x4044, 0
compare VAR_TRICK_HOUSE_LEVEL, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_269E48
msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT
closemessage
@ -240,21 +240,21 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48
waitmovement 0
compare VAR_0x4044, 0
compare VAR_TRICK_HOUSE_LEVEL, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE
compare VAR_0x4044, 1
compare VAR_TRICK_HOUSE_LEVEL, 1
call_if_eq Route110_TrickHouseEntrance_EventScript_269DF7
compare VAR_0x4044, 2
compare VAR_TRICK_HOUSE_LEVEL, 2
call_if_eq Route110_TrickHouseEntrance_EventScript_269E00
compare VAR_0x4044, 3
compare VAR_TRICK_HOUSE_LEVEL, 3
call_if_eq Route110_TrickHouseEntrance_EventScript_269E09
compare VAR_0x4044, 4
compare VAR_TRICK_HOUSE_LEVEL, 4
call_if_eq Route110_TrickHouseEntrance_EventScript_269E12
compare VAR_0x4044, 5
compare VAR_TRICK_HOUSE_LEVEL, 5
call_if_eq Route110_TrickHouseEntrance_EventScript_269E1B
compare VAR_0x4044, 6
compare VAR_TRICK_HOUSE_LEVEL, 6
call_if_eq Route110_TrickHouseEntrance_EventScript_269E24
compare VAR_0x4044, 7
compare VAR_TRICK_HOUSE_LEVEL, 7
call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D
closemessage
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
@ -343,19 +343,19 @@ Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F
applymovement 1, Common_Movement_FacePlayer
waitmovement 0
msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT
compare VAR_0x4044, 1
compare VAR_TRICK_HOUSE_LEVEL, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_269EEF
compare VAR_0x4044, 2
compare VAR_TRICK_HOUSE_LEVEL, 2
goto_if_eq Route110_TrickHouseEntrance_EventScript_269F1B
compare VAR_0x4044, 3
compare VAR_TRICK_HOUSE_LEVEL, 3
goto_if_eq Route110_TrickHouseEntrance_EventScript_269F47
compare VAR_0x4044, 4
compare VAR_TRICK_HOUSE_LEVEL, 4
goto_if_eq Route110_TrickHouseEntrance_EventScript_269F73
compare VAR_0x4044, 5
compare VAR_TRICK_HOUSE_LEVEL, 5
goto_if_eq Route110_TrickHouseEntrance_EventScript_269F9F
compare VAR_0x4044, 6
compare VAR_TRICK_HOUSE_LEVEL, 6
goto_if_eq Route110_TrickHouseEntrance_EventScript_269FCB
compare VAR_0x4044, 7
compare VAR_TRICK_HOUSE_LEVEL, 7
goto_if_eq Route110_TrickHouseEntrance_EventScript_269FF7
end
@ -510,7 +510,7 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7
waitmovement 0
switch VAR_0x4044
switch VAR_TRICK_HOUSE_LEVEL
case 0, Route110_TrickHouseEntrance_EventScript_26A1A9
case 1, Route110_TrickHouseEntrance_EventScript_26A1B4
case 2, Route110_TrickHouseEntrance_EventScript_26A1BF
@ -579,7 +579,7 @@ Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201
end
Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B
compare VAR_0x4044, 8
compare VAR_TRICK_HOUSE_LEVEL, 8
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A220
msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT
releaseall
@ -592,7 +592,7 @@ Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220
Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A
lockall
switch VAR_0x4044
switch VAR_TRICK_HOUSE_LEVEL
case 0, Route110_TrickHouseEntrance_EventScript_26A289
case 1, Route110_TrickHouseEntrance_EventScript_26A2B2
case 2, Route110_TrickHouseEntrance_EventScript_26A2DB
@ -727,11 +727,11 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8
lockall
msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT
releaseall
compare VAR_0x4044, 0
compare VAR_TRICK_HOUSE_LEVEL, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_26A429
compare VAR_0x4044, 1
compare VAR_TRICK_HOUSE_LEVEL, 1
call_if_eq Route110_TrickHouseEntrance_EventScript_26A439
compare VAR_0x4044, 2
compare VAR_TRICK_HOUSE_LEVEL, 2
call_if_eq Route110_TrickHouseEntrance_EventScript_26A449
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
end

4
data/maps/Route119_WeatherInstitute_2F/scripts.inc
View File

@ -94,7 +94,7 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D
Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
call Route119_WeatherInstitute_2F_EventScript_2700DB
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA
call Route119_WeatherInstitute_2F_EventScript_27378B
@ -104,7 +104,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD
call Route119_WeatherInstitute_2F_EventScript_2700DB
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700D0
call Route119_WeatherInstitute_2F_EventScript_273797

8
data/maps/RustboroCity_DevonCorp_2F/scripts.inc
View File

@ -167,7 +167,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E
RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
call RustboroCity_DevonCorp_2F_EventScript_211AC4
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7
call RustboroCity_DevonCorp_2F_EventScript_27378B
@ -177,7 +177,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96
call RustboroCity_DevonCorp_2F_EventScript_211AC4
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AB9
call RustboroCity_DevonCorp_2F_EventScript_273797
@ -216,7 +216,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1
RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
call RustboroCity_DevonCorp_2F_EventScript_211B67
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A
call RustboroCity_DevonCorp_2F_EventScript_27378B
@ -226,7 +226,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39
call RustboroCity_DevonCorp_2F_EventScript_211B67
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B5C
call RustboroCity_DevonCorp_2F_EventScript_273797

2
data/maps/SkyPillar_Top/scripts.inc
View File

@ -87,7 +87,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785
removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0
bufferspeciesname 0, VAR_0x8004
msgbox gUnknown_08273204, MSGBOX_DEFAULT
msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
releaseall
end

6
data/scripts/secret_base.inc
View File

@ -1052,7 +1052,7 @@ Text_276731: @ 8276731
.string "This data is already registered.\n"
.string "Would you like to delete it?$"
Text_27676F: @ 827676F
Text_TooManyBasesDeleteSome: @ 827676F
.string "Up to 10 locations can be registered.\p"
.string "Delete a location if you want to\n"
.string "register another location.$"
@ -1063,10 +1063,10 @@ Text_2767D1: @ 82767D1
Text_2767E9: @ 82767E9
.string "Data has been unregistered.$"
Text_276805: @ 8276805
Text_SecretBaseBootUpPC: @ 8276805
.string "{PLAYER} booted up the PC.$"
Text_27681A: @ 827681A
Text_SecretBasePCStartMenu: @ 827681A
.string "What would you like to do?$"
Text_276835: @ 8276835

4
data/text/surf.inc
View File

@ -1,5 +1,5 @@
gUnknown_08272FD6:: @ 8272FD6
gText_WantToUseSurf:: @ 8272FD6
.string "The water is dyed a deep blue…\nWould you like to SURF?$"
gUnknown_0827300D:: @ 827300D
gText_PlayerUsedSurf:: @ 827300D
.string "{STR_VAR_1} used SURF!$"

6
include/constants/field_effects.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_FIELD_EFFECT_CONSTANTS_H
#define GUARD_FIELD_EFFECT_CONSTANTS_H
#define FLDEFF_EXCLAMATION_MARK_ICON 0
#define FLDEFF_EXCLAMATION_MARK_ICON 0
#define FLDEFF_USE_CUT_ON_GRASS 1
#define FLDEFF_USE_CUT_ON_TREE 2
#define FLDEFF_SHADOW 3
@ -61,11 +61,11 @@
#define FLDEFF_SECRET_POWER_SHRUB 57
#define FLDEFF_CUT_GRASS 58
#define FLDEFF_FIELD_MOVE_SHOW_MON_INIT 59
#define FLDEFF_USE_TOMB_PUZZLE_EFFECT 60
#define FLDEFF_USE_TOMB_PUZZLE_EFFECT 60
#define FLDEFF_PCTURN_ON 61
#define FLDEFF_HALL_OF_FAME_RECORD 62
#define FLDEFF_USE_TELEPORT 63
#define FLDEFF_64 64
#define FLDEFF_RAYQUAZA 64
#define FLDEFF_65 65
#define FLDEFF_MOVE_DEOXYS_ROCK 66

2
include/constants/vars.h
View File

@ -84,7 +84,7 @@
#define VAR_FANCLUB_UNKNOWN_1 0x4041
#define VAR_FANCLUB_UNKNOWN_2 0x4042
#define VAR_DEPT_STORE_FLOOR 0x4043
#define VAR_0x4044 0x4044
#define VAR_TRICK_HOUSE_LEVEL 0x4044
#define VAR_POKELOT_PRIZE_ITEM 0x4045
#define VAR_NATIONAL_DEX 0x4046
#define VAR_SEEDOT_SIZE_RECORD 0x4047

4
include/event_scripts.h
View File

@ -544,9 +544,9 @@ extern const u8 EventScript_RegionMap[];
extern const u8 EventScript_RunningShoesManual[];
extern const u8 EventScript_PictureBookShelf[];
extern const u8 EventScript_BookShelf[];
extern const u8 EventScript_PokemonCenterBookshelf[];
extern const u8 EventScript_PokemonCenterBookShelf[];
extern const u8 EventScript_Vase[];
extern const u8 EventScript_TrashCan[];
extern const u8 EventScript_EmptyTrashCan[];
extern const u8 EventScript_ShopShelf[];
extern const u8 EventScript_Blueprint[];
extern const u8 EventScript_WirelessBoxResults[];

10
include/menu_specialized.h
View File

@ -17,8 +17,8 @@ struct UnknownStruct_81D1ED4
/*0x014*/ struct UnknownSubStruct_81D1ED4 unk14[4][5];
/*0x064*/ struct UnknownSubStruct_81D1ED4 unk64[10][5];
/*0x12C*/ struct UnknownSubStruct_81D1ED4 unk12C[5];
/*0x13C*/ struct UnknownSubStruct_81D1ED4 unk13C[0x42];
/*0x248*/ struct UnknownSubStruct_81D1ED4 unk248[0x42];
/*0x140*/ u16 unk140[66][2];
/*0x248*/ u16 unk248[66][2];
/*0x350*/ u16 unk350;
/*0x352*/ u16 unk352;
/*0x354*/ u8 unk354;
@ -40,8 +40,8 @@ void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0);
bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0);
void sub_81D3464(void *arg0);
void sub_81D3480(void *arg0, u8 arg1, u8 arg2);
void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1);
void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]);
void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1);
void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2);
void MoveRelearnerPrintText(u8 *str);
bool16 MoveRelearnerRunTextPrinters(void);
void MoveRelearnerCreateYesNoMenu(void);
@ -49,4 +49,4 @@ u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices);
void InitMoveRelearnerWindows(bool8 useContextWindow);
void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation);
#endif // GUARD_MENU_SPECIALIZED_H
#endif // GUARD_MENU_SPECIALIZED_H

4
src/field_control_avatar.c
View File

@ -390,11 +390,11 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me
if (MetatileBehavior_IsBookShelf(metatileBehavior) == TRUE)
return EventScript_BookShelf;
if (MetatileBehavior_IsPokeCenterBookShelf(metatileBehavior) == TRUE)
return EventScript_PokemonCenterBookshelf;
return EventScript_PokemonCenterBookShelf;
if (MetatileBehavior_IsVase(metatileBehavior) == TRUE)
return EventScript_Vase;
if (MetatileBehavior_IsTrashCan(metatileBehavior) == TRUE)
return EventScript_TrashCan;
return EventScript_EmptyTrashCan;
if (MetatileBehavior_IsShopShelf(metatileBehavior) == TRUE)
return EventScript_ShopShelf;
if (MetatileBehavior_IsBlueprint(metatileBehavior) == TRUE)

2
src/field_effect_helpers.c
View File

@ -1508,7 +1508,7 @@ void sub_8155F80(struct Sprite *sprite)
}
}
SetGpuReg(REG_OFFSET_BG0VOFS, 0);
FieldEffectStop(sprite, FLDEFF_64);
FieldEffectStop(sprite, FLDEFF_RAYQUAZA);
break;
}

4
src/item_menu.c
View File

@ -447,7 +447,7 @@ static EWRAM_DATA struct TempWallyStruct *gUnknown_0203CE80 = 0;
extern u8 *const gPocketNamesStringsTable[];
extern u8* gReturnToXStringsTable[];
extern const u8 EventScript_2736B3[];
extern const u8 EventScript_SelectWithoutRegisteredItem[];
extern const u16 gUnknown_0860F074[];
void ResetBagScrollPositions(void)
@ -1900,7 +1900,7 @@ bool8 UseRegisteredKeyItemOnField(void)
else
gSaveBlock1Ptr->registeredItem = ITEM_NONE;
}
ScriptContext1_SetupScript(EventScript_2736B3);
ScriptContext1_SetupScript(EventScript_SelectWithoutRegisteredItem);
return TRUE;
}

2051
src/menu_specialized.c
View File

File diff suppressed because it is too large Load Diff

4
src/use_pokeblock.c
View File

@ -272,14 +272,14 @@ void sub_8166380(void)
gUnknown_0203BC90->field_50++;
break;
case 11:
sub_81D2754(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14[0]);
sub_81D2754(gUnknown_0203BCAC->field_7C58.unk0[0], gUnknown_0203BCAC->field_7C58.unk14[0]);
sub_81D20AC(&gUnknown_0203BCAC->field_7C58);
gUnknown_0203BC90->field_50++;
break;
case 12:
if (!sub_81D20BC(&gUnknown_0203BCAC->field_7C58))
{
sub_81D1F84(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14, gUnknown_0203BCAC->field_7C58.unk14);
sub_81D1F84(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14[0], gUnknown_0203BCAC->field_7C58.unk14[0]);
gUnknown_0203BC90->field_50++;
}
break;