From 033580da9623d6519c35efcb3594552d3389772d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 5 Apr 2019 16:11:24 -0500 Subject: Document secret base --- data/scripts/secret_base.inc | 38 +++++++++++++++++++++++--------------- data/scripts/secret_power_tm.inc | 8 -------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 347513636..a20469345 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -310,8 +310,8 @@ SecretBase_RedCave1_Text_275944: @ 8275944 .string "Are you speechless?$" EventScript_2759F1:: @ 82759F1 - special sub_80E8C98 - special sub_80E8BC8 + special GetSecretBaseTypeInFrontOfPlayer + special CheckPlayerHasSecretBase compare VAR_RESULT, 1 goto_if_eq EventScript_275BE8 checkpartymove MOVE_SECRET_POWER @@ -432,11 +432,11 @@ EventScript_275B5B:: @ 8275B5B playse SE_KAIDAN setvar VAR_INIT_SECRET_BASE, 0 setflag FLAG_DECORATION_0 - special sub_80E8E18 - special sub_80E9068 + special SetPlayerSecretBase + special EnterSecretBase setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 - special sub_80E933C + special InitSecretBaseDecorationSprites setvar VAR_SECRET_BASE_INITIALIZED, 1 waitstate end @@ -450,13 +450,13 @@ SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 goto_if_eq SecretBase_RedCave1_EventScript_275BAB closemessage playse SE_KAIDAN - special sub_80E9A90 + special ClearAndLeaveSecretBase end SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB closemessage setflag FLAG_RECEIVED_SECRET_POWER - special sub_80E91F8 + special EnterNewlyCreatedSecretBase waitstate end @@ -469,18 +469,18 @@ EventScript_275BB7:: @ 8275BB7 lockall setvar VAR_INIT_SECRET_BASE, 1 playse SE_KAIDAN - special sub_80E9744 + special IsCurSecretBaseOwnedByAnotherPlayer compare VAR_RESULT, 0 goto_if_eq EventScript_275BDB clearflag FLAG_DECORATION_0 - special sub_80E9068 + special EnterSecretBase setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end EventScript_275BDB:: @ 8275BDB setflag FLAG_DECORATION_0 - special sub_80E9068 + special EnterSecretBase setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end @@ -500,7 +500,7 @@ EventScript_275BE8:: @ 8275BE8 compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE fadescreenswapbuffers 1 - special sub_80E9B70 + special MoveOutOfSecretBaseFromOutside closemessage fadescreenswapbuffers 0 msgbox Text_276A95, MSGBOX_YESNO @@ -569,7 +569,7 @@ SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 EventScript_275D0C:: @ 8275D0C setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 - special sub_80E933C + special InitSecretBaseDecorationSprites setvar VAR_SECRET_BASE_INITIALIZED, 1 end @@ -626,7 +626,7 @@ SecretBase_YellowCave1_EventScript_275D64:: @ 8275D64 SecretBase_YellowCave2_EventScript_275D64:: @ 8275D64 SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64 SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64 - special sub_80EA354 + special GetSecretBaseOwnerInteractionState compare VAR_0x8004, 0 goto_if_eq SecretBase_RedCave1_EventScript_275DD6 compare VAR_0x8004, 1 @@ -1010,7 +1010,7 @@ SecretBase_RedCave1_EventScript_27627C:: @ 827627C end SecretBase_RedCave1_EventScript_276286:: @ 8276286 - special sub_80EA2E4 + special PrepSecretBaseBattleFlags setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE setvar VAR_0x8005, 0 special DoSpecialTrainerBattle @@ -1039,12 +1039,20 @@ SecretBase_RedCave1_EventScript_2762C5:: @ 82762C5 .include "data/scripts/secret_power_tm.inc" +SecretBase_EventScript_DollInteract:: @ 82766A2 + special sub_80EB290 + end + +SecretBase_EventScript_CushionInteract:: @ 82766A6 + special sub_80EB2C8 + end + Text_2766AA: @ 82766AA .string "All decorations and furniture in your\n" .string "SECRET BASE will be returned to your PC.\p" .string "Is that okay?$" -Text_276707: @ 8276707 +Text_WantToRegisterSecretBase: @ 8276707 .string "Do you want to register\n" .string "{STR_VAR_1}'s SECRET BASE?$" diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index ed7216357..647064829 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -103,11 +103,3 @@ Route111_Movement_276696: @ 8276696 walk_down walk_down step_end - -EventScript_SecretPower1:: @ 82766A2 - special sub_80EB290 - end - -EventScript_SecretPower2:: @ 82766A6 - special sub_80EB2C8 - end -- cgit v1.2.3 From 621e5d22639a3228c4522de342afd8010ab71689 Mon Sep 17 00:00:00 2001 From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com> Date: Thu, 4 Apr 2019 22:40:35 -0400 Subject: Start documenting field move scripts --- data/scripts/field_move_scripts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 024ffbf85..e9ef97122 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -10,7 +10,7 @@ Route120_EventScript_2906BB:: @ 82906BB Route121_EventScript_2906BB:: @ 82906BB Route123_EventScript_2906BB:: @ 82906BB lockall - goto_if_unset FLAG_BADGE01_GET, Route103_EventScript_290721 + goto_if_unset FLAG_BADGE01_GET, Route103_EventScript_CheckTreeCantCut checkpartymove MOVE_CUT compare VAR_RESULT, 6 goto_if_eq Route103_EventScript_290721 @@ -45,7 +45,7 @@ Route103_Movement_29071F: @ 829071F cut_tree step_end -Route103_EventScript_290721:: @ 8290721 +Route103_EventScript_CheckTreeCantCut:: @ 8290721 msgbox Route103_Text_29077D, MSGBOX_DEFAULT releaseall end -- cgit v1.2.3 From 4a09a5da330cfb855989ed5390efaef219d73ecc Mon Sep 17 00:00:00 2001 From: Fontbane Date: Thu, 4 Apr 2019 23:26:53 -0400 Subject: Doc field move scripts completely, use fldeff constants for dofieldeffect Fix labels Fix labels again Delete extra boulder scripts Now it should build fine --- data/scripts/field_move_scripts.inc | 240 ++++++++++++++++-------------------- data/scripts/secret_base.inc | 8 +- 2 files changed, 108 insertions(+), 140 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index e9ef97122..fa64783b5 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -1,221 +1,189 @@ -PetalburgWoods_EventScript_2906BB:: @ 82906BB -Route103_EventScript_2906BB:: @ 82906BB -Route104_EventScript_2906BB:: @ 82906BB -Route110_TrickHousePuzzle1_EventScript_2906BB:: @ 82906BB -Route111_EventScript_2906BB:: @ 82906BB -Route116_EventScript_2906BB:: @ 82906BB -Route117_EventScript_2906BB:: @ 82906BB -Route118_EventScript_2906BB:: @ 82906BB -Route120_EventScript_2906BB:: @ 82906BB -Route121_EventScript_2906BB:: @ 82906BB -Route123_EventScript_2906BB:: @ 82906BB + +EventScript_CutTree:: @ 82906BB lockall - goto_if_unset FLAG_BADGE01_GET, Route103_EventScript_CheckTreeCantCut + goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut checkpartymove MOVE_CUT compare VAR_RESULT, 6 - goto_if_eq Route103_EventScript_290721 + goto_if_eq EventScript_CheckTreeCantCut setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_CUT - msgbox Route103_Text_29072E, MSGBOX_YESNO + msgbox Text_WantToCut, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq Route103_EventScript_29072B - msgbox Route103_Text_290771, MSGBOX_DEFAULT + goto_if_eq EventScript_CancelCut + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage - dofieldeffect 2 + dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate - goto Route103_EventScript_290710 + goto EventScript_CutTreeDown end -Route103_EventScript_290705:: @ 8290705 +EventScript_FldEffCut:: @ 8290705 lockall - dofieldeffect 2 + dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate - goto Route103_EventScript_290710 + goto EventScript_CutTreeDown end -Route103_EventScript_290710:: @ 8290710 - applymovement VAR_LAST_TALKED, Route103_Movement_29071F +EventScript_CutTreeDown:: @ 8290710 + applymovement VAR_LAST_TALKED, Movement_CutTreeDown waitmovement 0 removeobject VAR_LAST_TALKED releaseall end -Route103_Movement_29071F: @ 829071F +Movement_CutTreeDown: @ 829071F cut_tree step_end -Route103_EventScript_CheckTreeCantCut:: @ 8290721 - msgbox Route103_Text_29077D, MSGBOX_DEFAULT +EventScript_CheckTreeCantCut:: @ 8290721 + msgbox Text_CantCut, MSGBOX_DEFAULT releaseall end -Route103_EventScript_29072B:: @ 829072B +EventScript_CancelCut:: @ 829072B closemessage releaseall end -Route103_Text_29072E: @ 829072E +Text_WantToCut: @ 829072E .string "This tree looks like it can be\n" .string "CUT down!\p" .string "Would you like to CUT it?$" -Route103_Text_290771: @ 8290771 -Route111_Text_290771: @ 8290771 +Text_MonUsedHM: @ 8290771 .string "{STR_VAR_1} used {STR_VAR_2}!$" -Route103_Text_29077D: @ 829077D +Text_CantCut: @ 829077D .string "This tree looks like it can be\n" .string "CUT down!$" -GraniteCave_B2F_EventScript_2907A6:: @ 82907A6 -MirageTower_3F_EventScript_2907A6:: @ 82907A6 -MirageTower_4F_EventScript_2907A6:: @ 82907A6 -Route110_TrickHousePuzzle3_EventScript_2907A6:: @ 82907A6 -Route111_EventScript_2907A6:: @ 82907A6 -Route114_EventScript_2907A6:: @ 82907A6 -Route115_EventScript_2907A6:: @ 82907A6 -RusturfTunnel_EventScript_2907A6:: @ 82907A6 -SafariZone_North_EventScript_2907A6:: @ 82907A6 -SafariZone_Northeast_EventScript_2907A6:: @ 82907A6 -SeafloorCavern_Room1_EventScript_2907A6:: @ 82907A6 -SeafloorCavern_Room2_EventScript_2907A6:: @ 82907A6 -SeafloorCavern_Room5_EventScript_2907A6:: @ 82907A6 -VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6 +EventScript_RockSmash:: @ 82907A6 lockall - goto_if_unset FLAG_BADGE03_GET, Route111_EventScript_29082D + goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock checkpartymove MOVE_ROCK_SMASH compare VAR_RESULT, 6 - goto_if_eq Route111_EventScript_29082D + goto_if_eq EventScript_CantSmashRock setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_ROCK_SMASH - msgbox Route111_Text_29083A, MSGBOX_YESNO + msgbox Text_WantToSmash, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_290837 - msgbox Route111_Text_290771, MSGBOX_DEFAULT + goto_if_eq EventScript_CancelSmash + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage - dofieldeffect 37 + dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate - goto Route111_EventScript_2907FB + goto EventScript_RockSmash end -Route111_EventScript_2907F0:: @ 82907F0 +EventScript_FldEffRockSmash:: @ 82907F0 lockall - dofieldeffect 37 + dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate - goto Route111_EventScript_2907FB + goto EventScript_RockSmash end -Route111_EventScript_2907FB:: @ 82907FB - applymovement VAR_LAST_TALKED, Route111_Movement_29082B +EventScript_SmashRock:: @ 82907FB + applymovement VAR_LAST_TALKED, Movement_SmashRock waitmovement 0 removeobject VAR_LAST_TALKED specialvar VAR_RESULT, TryUpdateRusturfTunnelState compare VAR_RESULT, 1 - goto_if_eq Route111_EventScript_290829 + goto_if_eq EventScript_EndSmash special RockSmashWildEncounter compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_290829 + goto_if_eq EventScript_EndSmash waitstate releaseall end -Route111_EventScript_290829:: @ 8290829 +EventScript_EndSmash:: @ 8290829 releaseall end -Route111_Movement_29082B: @ 829082B +Movement_SmashRock: @ 829082B rock_smash_break step_end -Route111_EventScript_29082D:: @ 829082D - msgbox Route111_Text_29087F, MSGBOX_DEFAULT +EventScript_CantSmashRock:: @ 829082D + msgbox Text_CantSmash, MSGBOX_DEFAULT releaseall end -Route111_EventScript_290837:: @ 8290837 +EventScript_CancelSmash:: @ 8290837 closemessage releaseall end -Route111_Text_29083A: @ 829083A +Text_WantToSmash: @ 829083A .string "This rock appears to be breakable.\n" .string "Would you like to use ROCK SMASH?$" -Route111_Text_29087F: @ 829087F +Text_CantSmash: @ 829087F .string "It's a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" -FieryPath_EventScript_2908BA:: @ 82908BA -MagmaHideout_1F_EventScript_2908BA:: @ 82908BA -Route110_TrickHousePuzzle4_EventScript_2908BA:: @ 82908BA -SeafloorCavern_Room1_EventScript_2908BA:: @ 82908BA -SeafloorCavern_Room2_EventScript_2908BA:: @ 82908BA -SeafloorCavern_Room3_EventScript_2908BA:: @ 82908BA -SeafloorCavern_Room5_EventScript_2908BA:: @ 82908BA -SeafloorCavern_Room8_EventScript_2908BA:: @ 82908BA -ShoalCave_LowTideLowerRoom_EventScript_2908BA:: @ 82908BA -VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA +EventScript_StrengthBoulder:: @ 82908BA lockall - goto_if_unset FLAG_BADGE04_GET, FieryPath_EventScript_290915 - goto_if_set FLAG_SYS_USE_STRENGTH, FieryPath_EventScript_29091F + goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength + goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder checkpartymove MOVE_STRENGTH compare VAR_RESULT, 6 - goto_if_eq FieryPath_EventScript_290915 + goto_if_eq EventScript_CantStrength setfieldeffectargument 0, VAR_RESULT - msgbox FieryPath_Text_29092C, MSGBOX_YESNO + msgbox Text_WantToStrength, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq FieryPath_EventScript_290929 + goto_if_eq EventScript_CancelStrength closemessage - dofieldeffect 40 + dofieldeffect FLDEFF_USE_STRENGTH waitstate - goto FieryPath_EventScript_290908 + goto EventScript_ActivateStrength end -FieryPath_EventScript_2908FD:: @ 82908FD +EventScript_FldEffStrength:: @ 82908FD lockall - dofieldeffect 40 + dofieldeffect FLDEFF_USE_STRENGTH waitstate - goto FieryPath_EventScript_290908 + goto EventScript_ActivateStrength end -FieryPath_EventScript_290908:: @ 8290908 +EventScript_ActivateStrength:: @ 8290908 setflag FLAG_SYS_USE_STRENGTH - msgbox FieryPath_Text_29098C, MSGBOX_DEFAULT + msgbox Text_MonUsedStrength, MSGBOX_DEFAULT releaseall end -FieryPath_EventScript_290915:: @ 8290915 - msgbox FieryPath_Text_2909D6, MSGBOX_DEFAULT +EventScript_CantStrength:: @ 8290915 + msgbox Text_CantStrength, MSGBOX_DEFAULT releaseall end -FieryPath_EventScript_29091F:: @ 829091F - msgbox FieryPath_Text_290A16, MSGBOX_DEFAULT +EventScript_CheckActivatedBoulder:: @ 829091F + msgbox Text_StrengthActivated, MSGBOX_DEFAULT releaseall end -FieryPath_EventScript_290929:: @ 8290929 +EventScript_CancelStrength:: @ 8290929 closemessage releaseall end -FieryPath_Text_29092C: @ 829092C +Text_WantToStrength: @ 829092C .string "It's a big boulder, but a POKéMON\n" .string "may be able to push it aside.\p" .string "Would you like to use STRENGTH?$" -FieryPath_Text_29098C: @ 829098C +Text_MonUsedStrength: @ 829098C .string "{STR_VAR_1} used STRENGTH!\p" .string "{STR_VAR_1}'s STRENGTH made it\n" .string "possible to move boulders around!$" -FieryPath_Text_2909D6: @ 82909D6 +Text_CantStrength: @ 82909D6 .string "It's a big boulder, but a POKéMON\n" .string "may be able to push it aside.$" -FieryPath_Text_290A16: @ 8290A16 +Text_StrengthActivated: @ 8290A16 .string "STRENGTH made it possible to move\n" .string "boulders around.$" @@ -223,59 +191,59 @@ EventScript_UseWaterfall:: @ 8290A49 lockall checkpartymove MOVE_WATERFALL compare VAR_RESULT, 6 - goto_if_eq EventScript_290A84 + goto_if_eq EventScript_CantWaterfall bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT - msgbox Text_290AC3, MSGBOX_YESNO + msgbox Text_WantToWaterfall, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_290A8C - msgbox Text_290AFC, MSGBOX_DEFAULT - dofieldeffect 43 - goto EventScript_290A8C + goto_if_eq EventScript_EndWaterfall + msgbox Text_MonUsedWaterfall, MSGBOX_DEFAULT + dofieldeffect FLDEFF_USE_WATERFALL + goto EventScript_EndWaterfall EventScript_CannotUseWaterfall:: @ 8290A83 lockall -EventScript_290A84:: @ 8290A84 - msgbox Text_290A8E, MSGBOX_DEFAULT +EventScript_CantWaterfall:: @ 8290A84 + msgbox Text_CantWaterfall, MSGBOX_DEFAULT -EventScript_290A8C:: @ 8290A8C +EventScript_EndWaterfall:: @ 8290A8C releaseall end -Text_290A8E: @ 8290A8E +Text_CantWaterfall: @ 8290A8E .string "A wall of water is crashing down with\n" .string "a mighty roar.$" -Text_290AC3: @ 8290AC3 +Text_WantToWaterfall: @ 8290AC3 .string "It's a large waterfall.\n" .string "Would you like to use WATERFALL?$" -Text_290AFC: @ 8290AFC +Text_MonUsedWaterfall: @ 8290AFC .string "{STR_VAR_1} used WATERFALL.$" EventScript_UseDive:: @ 8290B0F lockall checkpartymove MOVE_DIVE compare VAR_RESULT, 6 - goto_if_eq EventScript_290B4E + goto_if_eq EventScript_CantDive bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 - msgbox Text_290BE8, MSGBOX_YESNO + msgbox Text_WantToDive, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_290B58 - msgbox Text_290C1A, MSGBOX_DEFAULT - dofieldeffect 44 - goto EventScript_290B58 + goto_if_eq EventScript_EndDive + msgbox Text_MonUsedDive, MSGBOX_DEFAULT + dofieldeffect FLDEFF_USE_DIVE + goto EventScript_EndDive end -EventScript_290B4E:: @ 8290B4E - msgbox Text_290BAA, MSGBOX_DEFAULT +EventScript_CantDive:: @ 8290B4E + msgbox Text_CantDive, MSGBOX_DEFAULT releaseall end -EventScript_290B58:: @ 8290B58 +EventScript_EndDive:: @ 8290B58 releaseall end @@ -283,50 +251,50 @@ EventScript_UseDiveUnderwater:: @ 8290B5A lockall checkpartymove MOVE_DIVE compare VAR_RESULT, 6 - goto_if_eq EventScript_290B99 + goto_if_eq EventScript_CantSurface bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 - msgbox Text_290C6E, MSGBOX_YESNO + msgbox Text_WantToSurface, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_290BA8 - msgbox Text_290C1A, MSGBOX_DEFAULT - dofieldeffect 44 - goto EventScript_290BA8 + goto_if_eq EventScript_EndSurface + msgbox Text_MonUsedDive, MSGBOX_DEFAULT + dofieldeffect FLDEFF_USE_DIVE + goto EventScript_EndSurface end -EventScript_290B99:: @ 8290B99 +EventScript_CantSurface:: @ 8290B99 lockall - msgbox Text_290C28, MSGBOX_DEFAULT - goto EventScript_290BA8 + msgbox Text_CantSurface, MSGBOX_DEFAULT + goto EventScript_EndSurface end -EventScript_290BA8:: @ 8290BA8 +EventScript_EndSurface:: @ 8290BA8 releaseall end -Text_290BAA: @ 8290BAA +Text_CantDive: @ 8290BAA .string "The sea is deep here. A POKéMON\n" .string "may be able to go underwater.$" -Text_290BE8: @ 8290BE8 +Text_WantToDive: @ 8290BE8 .string "The sea is deep here.\n" .string "Would you like to use DIVE?$" -Text_290C1A: @ 8290C1A +Text_MonUsedDive: @ 8290C1A .string "{STR_VAR_1} used DIVE.$" -Text_290C28: @ 8290C28 +Text_CantSurface: @ 8290C28 .string "Light is filtering down from above.\n" .string "A POKéMON may be able to surface.$" -Text_290C6E: @ 8290C6E +Text_WantToSurface: @ 8290C6E .string "Light is filtering down from above.\n" .string "Would you like to use DIVE?$" -EventScript_290CAE:: @ 8290CAE - msgbox Text_290CB7, MSGBOX_SIGN +EventScript_FailSweetScent:: @ 8290CAE + msgbox Text_FailSweetScent, MSGBOX_SIGN end -Text_290CB7: @ 8290CB7 +Text_FailSweetScent: @ 8290CB7 .string "Looks like there's nothing here…$" diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index a20469345..81bd388f8 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -339,7 +339,7 @@ EventScript_275A50:: @ 8275A50 msgbox gText_23B704, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE - msgbox Route103_Text_290771, MSGBOX_DEFAULT + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE waitstate @@ -371,7 +371,7 @@ EventScript_275AA9:: @ 8275AA9 msgbox Text_274779, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE - msgbox Route103_Text_290771, MSGBOX_DEFAULT + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_TREE waitstate @@ -403,7 +403,7 @@ EventScript_275B02:: @ 8275B02 msgbox Text_274825, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE - msgbox Route103_Text_290771, MSGBOX_DEFAULT + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB waitstate @@ -508,7 +508,7 @@ EventScript_275BE8:: @ 8275BE8 goto_if_eq EventScript_275CDE bufferpartymonnick 0, VAR_0x8004 buffermovename 1, MOVE_SECRET_POWER - msgbox Route103_Text_290771, MSGBOX_DEFAULT + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage closemessage compare VAR_0x8007, 1 -- cgit v1.2.3 From 6a14cd418e256e0a0c2569cf6da5c95a8cf04b74 Mon Sep 17 00:00:00 2001 From: Fontbane <36677462+Fontbane@users.noreply.github.com> Date: Fri, 5 Apr 2019 19:39:45 -0400 Subject: Match --- data/scripts/field_move_scripts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index fa64783b5..6eae55294 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -74,14 +74,14 @@ EventScript_RockSmash:: @ 82907A6 closemessage dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate - goto EventScript_RockSmash + goto EventScript_SmashRock end EventScript_FldEffRockSmash:: @ 82907F0 lockall dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate - goto EventScript_RockSmash + goto EventScript_SmashRock end EventScript_SmashRock:: @ 82907FB -- cgit v1.2.3 From 2c076f1f3e8700e081c39792bd5a756511f86c7d Mon Sep 17 00:00:00 2001 From: Fontbane Date: Tue, 16 Apr 2019 10:40:32 -0400 Subject: Doc most OnTransitions --- data/scripts/cable_club.inc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index c755493dc..816fa9e6e 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1,20 +1,20 @@ -BattleFrontier_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -DewfordTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF: @ 8276ACF -FallarborTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -FortreeCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -LilycoveCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -MauvilleCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -MossdeepCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -OldaleTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -PetalburgCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -RustboroCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -SlateportCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -SootopolisCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF +BattleFrontier_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +DewfordTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +EverGrandeCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +EverGrandeCity_PokemonLeague_2F_MapScript1_OnTransition: @ 8276ACF +FallarborTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +FortreeCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +LavaridgeTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +LilycoveCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +MauvilleCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +MossdeepCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +OldaleTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +PacifidlogTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +PetalburgCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +RustboroCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +SlateportCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +SootopolisCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +VerdanturfTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF call OldaleTown_PokemonCenter_2F_EventScript_276AD5 end -- cgit v1.2.3 From 901a83d249a511e45a79d3358bdbdf1a594013ab Mon Sep 17 00:00:00 2001 From: Fontbane Date: Mon, 22 Apr 2019 16:31:51 -0400 Subject: Fix some labels and include decorations.h Include decorations.h in shop.c Include decorations.h in event_scripts.s --- data/scripts/cable_club.inc | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 816fa9e6e..fe3fa9fae 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1,24 +1,8 @@ -BattleFrontier_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -DewfordTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -EverGrandeCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -EverGrandeCity_PokemonLeague_2F_MapScript1_OnTransition: @ 8276ACF -FallarborTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -FortreeCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -LavaridgeTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -LilycoveCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -MauvilleCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -MossdeepCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -OldaleTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -PacifidlogTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -PetalburgCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -RustboroCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -SlateportCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -SootopolisCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -VerdanturfTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF - call OldaleTown_PokemonCenter_2F_EventScript_276AD5 - end - -OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5 +PokemonCenter_2F_OnTransition: @ 8276ACF + call OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift + end + +OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift:: @ 8276AD5 specialvar VAR_RESULT, sub_813B514 compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB -- cgit v1.2.3