diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-14 14:07:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-14 14:07:32 -0500 |
| commit | 8c66bde7153cd29be3fd17dccb3fef6b09dd8ee4 (patch) | |
| tree | 21964480572d1cf8f95c49b798f955e3bbe19be2 | |
| parent | b422fd4a499e44889243dc5087b34fdd9f85c6aa (diff) | |
| parent | 515dde69afea00d7eafd0693ee423fcc1ae0bac5 (diff) | |
Merge pull request #388 from GriffinRichards/constants-localids
Use more LOCALID constants
50 files changed, 372 insertions, 231 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index c20e19129..ae7545a95 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,3 +1,6 @@ +.set LOCALID_DEOXYS_ROCK, 1 +.set LOCALID_DEOXYS, 2 + BirthIsland_Exterior_MapScripts:: @ 8165203 map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume @@ -36,7 +39,7 @@ BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return - removeobject 2 + removeobject LOCALID_DEOXYS return BirthIsland_Exterior_EventScript_Triangle:: @ 8165271 @@ -66,21 +69,21 @@ BirthIsland_Exterior_EventScript_NotSolved3:: @ 81652BE end BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0 - addobject 2 + addobject LOCALID_DEOXYS waitse - setfieldeffectarg 0, 1 + setfieldeffectarg 0, LOCALID_DEOXYS_ROCK setfieldeffectarg 1, 56 setfieldeffectarg 2, 2 - dofieldeffect 68 + dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK playbgm MUS_ENCOUNTER_DEOXYS, 0 - waitfieldeffect 68 - applymovement 2, Movement_DeoxysApproach + waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK + applymovement LOCALID_DEOXYS, Movement_DeoxysApproach waitmovement 0 waitse playmoncry SPECIES_DEOXYS, 2 delay 40 waitmoncry - setvar VAR_LAST_TALKED, 2 + setvar VAR_LAST_TALKED, LOCALID_DEOXYS setvar VAR_0x8004, SPECIES_DEOXYS setvar VAR_0x8005, 30 @ Level setvar VAR_0x8006, ITEM_NONE diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index a7d7eddc4..a7bb1c2de 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -1,3 +1,6 @@ +.set LOCALID_FAT_MAN, 2 +.set LOCALID_POLIWRATH, 3 + CeladonCity_MapScripts:: @ 8166C8F map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition .byte 0 @@ -33,7 +36,7 @@ CeladonCity_EventScript_FatMan:: @ 8166CC5 faceplayer msgbox CeladonCity_Text_MyTrustedPalPoliwrath closemessage - applymovement 2, Movement_FaceOriginalDirection + applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection waitmovement 0 release end @@ -46,7 +49,7 @@ CeladonCity_EventScript_Poliwrath:: @ 8166CDC msgbox CeladonCity_Text_Poliwrath closemessage waitmoncry - applymovement 3, Movement_FaceOriginalDirection + applymovement LOCALID_POLIWRATH, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 96a1a69a4..04242aeab 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_EEVEE_POKEBALL, 2 + CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 .byte 0 @@ -20,7 +22,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D end CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6 - removeobject 2 + removeobject LOCALID_EEVEE_POKEBALL playfanfare MUS_LEVEL_UP message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage @@ -35,7 +37,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6 end CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA - removeobject 2 + removeobject LOCALID_EEVEE_POKEBALL playfanfare MUS_LEVEL_UP message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index f0c865ef5..25b50d373 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_GRUNT, 11 + CeladonCity_GameCorner_MapScripts:: @ 816C646 map_script MAP_SCRIPT_ON_LOAD, CeladonCity_GameCorner_OnLoad .byte 0 @@ -425,17 +427,17 @@ CeladonCity_GameCorner_Text_DefeatedGrunt:: @ 816CB10 call_if_eq CeladonCity_GameCorner_Text_GruntExitWest compare VAR_FACING, DIR_WEST call_if_ne CeladonCity_GameCorner_Text_GruntExit - removeobject 11 + removeobject LOCALID_GRUNT release end CeladonCity_GameCorner_Text_GruntExitWest:: @ 816CB34 - applymovement 11, CeladonCity_GameCorner_Movement_GruntExitWest + applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExitWest waitmovement 0 return CeladonCity_GameCorner_Text_GruntExit:: @ 816CB3F - applymovement 11, CeladonCity_GameCorner_Movement_GruntExit + applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExit waitmovement 0 return diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index b1fc63b5e..a40786e45 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -1,8 +1,9 @@ -.equ LOCALID_POLICEMAN, 1 -.equ LOCALID_GRUNT, 2 -.equ LOCALID_SLOWBRO, 5 -.equ LOCALID_LASS, 6 -.equ LOCALID_RIVAL, 8 +.set LOCALID_POLICEMAN, 1 +.set LOCALID_GRUNT, 2 +.set LOCALID_SLOWBRO, 5 +.set LOCALID_LASS, 6 +.set LOCALID_RIVAL, 8 +.set LOCALID_WOMAN, 11 CeruleanCity_MapScripts:: @ 8166471 map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition @@ -276,7 +277,7 @@ CeruleanCity_EventScript_Woman:: @ 8166738 faceplayer msgbox CeruleanCity_Text_WantBrightRedBicycle closemessage - applymovement 11, Movement_FaceOriginalDirection + applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index bb4e69bcc..d5ae8aec3 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_WONDER_NEWS_BERRY_MAN, 1 + CeruleanCity_House4_MapScripts:: @ 816ACEE .byte 0 @@ -47,7 +49,7 @@ CeruleanCity_House4_EventScript_News2:: @ 816AD89 end CeruleanCity_House4_EventScript_NewsNotSpread:: @ 816ADAF - applymovement 1, Movement_FacePlayer + applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_FacePlayer waitmovement 0 msgbox CeruleanCity_House4_Text_WishCouldShareNewsWithOthers release @@ -72,7 +74,7 @@ CeruleanCity_House4_EventScript_NewsSpread2:: @ 816ADE9 end CeruleanCity_House4_EventScript_NewsDone:: @ 816AE0F - applymovement 1, Movement_FacePlayer + applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_FacePlayer waitmovement 0 msgbox CeruleanCity_House4_Text_EnjoyingMyselfWithAllSortsOfNews release @@ -80,11 +82,11 @@ CeruleanCity_House4_EventScript_NewsDone:: @ 816AE0F CeruleanCity_House4_EventScript_MovementReactionToNews:: @ 816AE23 playse SE_PIN - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_FacePlayer + applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_FacePlayer waitmovement 0 - applymovement 1, Movement_Delay48 + applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_Delay48 waitmovement 0 return diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index c2d95a706..444f0b810 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -1,3 +1,10 @@ +.set LOCALID_QUINN, 1 +.set LOCALID_AVERY, 3 +.set LOCALID_RAMON, 4 +.set LOCALID_DEREK, 5 +.set LOCALID_DUSTY, 6 +.set LOCALID_ZAC, 7 + CinnabarIsland_Gym_MapScripts:: @ 816D94B map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_Gym_OnLoad .byte 0 @@ -270,13 +277,13 @@ CinnabarIsland_Gym_EventScript_BattleQuinn:: @ 816DC7A CinnabarIsland_Gym_EventScript_QuinnApproachLeft:: @ 816DCB4 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 1, CinnabarIsland_Gym_Movement_QuinnApproachLeft + applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_QuinnApproachRight:: @ 816DCC6 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 1, CinnabarIsland_Gym_Movement_QuinnApproachRight + applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachRight waitmovement 0 return @@ -346,13 +353,13 @@ CinnabarIsland_Gym_EventScript_BattleAvery:: @ 816DD51 CinnabarIsland_Gym_EventScript_AveryApproachLeft:: @ 816DD8B applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery - applymovement 3, CinnabarIsland_Gym_Movement_AveryApproachLeft + applymovement LOCALID_AVERY, CinnabarIsland_Gym_Movement_AveryApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_AveryApproachRight:: @ 816DD9D applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery - applymovement 3, CinnabarIsland_Gym_Movement_AveryApproachRight + applymovement LOCALID_AVERY, CinnabarIsland_Gym_Movement_AveryApproachRight waitmovement 0 return @@ -431,13 +438,13 @@ CinnabarIsland_Gym_EventScript_BattleRamon:: @ 816DE2F CinnabarIsland_Gym_EventScript_RamonApproachLeft:: @ 816DE69 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 4, CinnabarIsland_Gym_Movement_RamonApproachLeft + applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_RamonApproachRight:: @ 816DE7B applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 4, CinnabarIsland_Gym_Movement_RamonApproachRight + applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachRight waitmovement 0 return @@ -507,13 +514,13 @@ CinnabarIsland_Gym_EventScript_BattleDerek:: @ 816DF06 CinnabarIsland_Gym_EventScript_DerekApproachLeft:: @ 816DF40 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 5, CinnabarIsland_Gym_Movement_DerekApproachLeft + applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_DerekApproachRight:: @ 816DF52 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 5, CinnabarIsland_Gym_Movement_DerekApproachRight + applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachRight waitmovement 0 return @@ -583,13 +590,13 @@ CinnabarIsland_Gym_EventScript_BattleDusty:: @ 816DFDD CinnabarIsland_Gym_EventScript_DustyApproachLeft:: @ 816E017 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 6, CinnabarIsland_Gym_Movement_DustyApproachLeft + applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_DustyApproachRight:: @ 816E029 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 6, CinnabarIsland_Gym_Movement_DustyApproachRight + applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachRight waitmovement 0 return @@ -659,13 +666,13 @@ CinnabarIsland_Gym_EventScript_BattleZac:: @ 816E0B4 CinnabarIsland_Gym_EventScript_ZacApproachLeft:: @ 816E0EE applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 7, CinnabarIsland_Gym_Movement_ZacApproachLeft + applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_ZacApproachRight:: @ 816E100 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement 7, CinnabarIsland_Gym_Movement_ZacApproachRight + applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachRight waitmovement 0 return diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 40ede6c6e..76cc85424 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_BILL, 7 + CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -45,7 +47,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A call_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast compare VAR_FACING, DIR_WEST call_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest - removeobject 7 + removeobject LOCALID_BILL setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 clearflag FLAG_HIDE_CINNABAR_BILL warp MAP_CINNABAR_ISLAND, 255, 14, 11 @@ -54,19 +56,19 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A end CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth:: @ 816E96F - applymovement 7, CinnabarIsland_PokemonCenter_1F_Movement_BillExit + applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth waitmovement 0 return CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast:: @ 816E981 - applymovement 7, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast + applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast waitmovement 0 return CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest:: @ 816E993 - applymovement 7, CinnabarIsland_PokemonCenter_1F_Movement_BillExit + applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest waitmovement 0 return diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 747823b0d..6b602538b 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_SELPHY, 1 + FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D map_script MAP_SCRIPT_ON_RESUME, FiveIsland_LostCave_Room10_OnResume map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_LostCave_Room10_OnFrame @@ -18,10 +20,10 @@ FiveIsland_LostCave_Room10_OnFrame:: @ 8164C48 FiveIsland_LostCave_Room10_EventScript_FindSelphyScene:: @ 8164C52 lockall textcolor 1 - applymovement 1, FiveIsland_LostCave_Room10_Movement_SelphyWander + applymovement LOCALID_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyWander waitmovement 0 delay 100 - applymovement 1, FiveIsland_LostCave_Room10_Movement_SelphyApproach + applymovement LOCALID_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyApproach waitmovement 0 msgbox FiveIsland_LostCave_Room10_Text_SelphyIntro goto_if_questlog FiveIsland_LostCave_Room10_EventScript_SelphyQuestLog diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index e32c16494..ffd3d05a7 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_MEMORIAL_MAN, 1 + FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 .byte 0 @@ -7,11 +9,11 @@ FiveIsland_MemorialPillar_EventScript_MemorialMan:: @ 81689D3 goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_ReturnedForTM42 msgbox FiveIsland_MemorialPillar_Text_ScrubScrub closemessage - applymovement 1, Movement_FacePlayer + applymovement LOCALID_MEMORIAL_MAN, Movement_FacePlayer waitmovement 0 delay 45 msgbox FiveIsland_MemorialPillar_Text_YourMonsLookHealthy - applymovement 1, Movement_WalkInPlaceFastestUp + applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix release @@ -55,7 +57,7 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: @ 8168A9B removeitem ITEM_LEMONADE, 1 msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade closemessage - applymovement 1, Movement_WalkInPlaceFastestRight + applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestRight waitmovement 0 delay 45 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft @@ -71,7 +73,7 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: @ 8168A9B FiveIsland_MemorialPillar_EventScript_ReceivedTM42:: @ 8168AE8 msgbox FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo - applymovement 1, Movement_WalkInPlaceFastestUp + applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestUp waitmovement 0 setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR return diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index d09dc5369..9a2d609b9 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_DAYCARE_WOMAN, 1 + FourIsland_PokemonDayCare_MapScripts:: @ 817193F .byte 0 @@ -128,7 +130,7 @@ FourIsland_PokemonDayCare_CheckEnoughMoney:: @ 8171AEB end FourIsland_PokemonDayCare_RetrieveMon:: @ 8171B05 - applymovement 1, FourIsland_PokemonDayCare_Movement_RetrieveMon + applymovement LOCALID_DAYCARE_WOMAN, FourIsland_PokemonDayCare_Movement_RetrieveMon waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index e0523d2ee..989450066 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_DOOR_GUARD, 4 + IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -12,7 +14,7 @@ IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor:: @ 816EA79 goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return - setobjectxyperm 4, 4, 2 + setobjectxyperm LOCALID_DOOR_GUARD, 4, 2 return IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard:: @ 816EA8A diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 36d82ca18..83d5c7e6c 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -1,3 +1,6 @@ +.set LOCALID_GRUNT1, 2 +.set LOCALID_GRUNT2, 3 + MtEmber_Exterior_MapScripts:: @ 8163946 map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Exterior_OnTransition map_script MAP_SCRIPT_ON_LOAD, MtEmber_Exterior_OnLoad @@ -10,8 +13,8 @@ MtEmber_Exterior_OnTransition:: @ 8163951 end MtEmber_Exterior_EventScript_RocketsFaceDown:: @ 8163960 - setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN - setobjectmovementtype 3, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype LOCALID_GRUNT1, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype LOCALID_GRUNT2, MOVEMENT_TYPE_FACE_DOWN return MtEmber_Exterior_OnLoad:: @ 8163969 @@ -38,7 +41,7 @@ MtEmber_Exterior_EventScript_Grunt1Defeated:: @ 816399E end MtEmber_Exterior_EventScript_BattleGrunt1:: @ 81639A8 - applymovement 2, Movement_FacePlayer + applymovement LOCALID_GRUNT1, Movement_FacePlayer waitmovement 0 playbgm MUS_ENCOUNTER_ROCKET, 0 msgbox MtEmber_Exterior_Text_Grunt1Intro @@ -52,8 +55,8 @@ MtEmber_Exterior_EventScript_DefeatedBothGrunts:: @ 81639DB msgbox MtEmber_Exterior_Text_WellRegroupDontStepInsideThere closemessage fadescreen FADE_TO_BLACK - removeobject 2 - removeobject 3 + removeobject LOCALID_GRUNT1 + removeobject LOCALID_GRUNT2 fadescreen FADE_FROM_BLACK release end @@ -66,7 +69,7 @@ MtEmber_Exterior_EventScript_Grunt2:: @ 81639F0 goto_if_eq MtEmber_Exterior_EventScript_BattleGrunt2 msgbox MtEmber_Exterior_Text_YoureInTheWayGetLost closemessage - applymovement 3, Movement_FaceOriginalDirection + applymovement LOCALID_GRUNT2, Movement_FaceOriginalDirection waitmovement 0 release end @@ -92,18 +95,18 @@ MtEmber_Exterior_EventScript_RocketPasswordScene:: @ 8163A4E message MtEmber_Exterior_Text_WhatsPasswordAgain waitmessage playse SE_PIN - applymovement 3, Movement_QuestionMark + applymovement LOCALID_GRUNT2, Movement_QuestionMark waitmovement 0 waitbuttonpress msgbox MtEmber_Exterior_Text_FirstPasswordGoldeen - applymovement 2, Movement_WalkInPlaceFastestDown + applymovement LOCALID_GRUNT1, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 2, Movement_ExclamationMark + applymovement LOCALID_GRUNT1, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_Delay48 + applymovement LOCALID_GRUNT1, Movement_Delay48 waitmovement 0 - applymovement 3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_GRUNT2, Movement_WalkInPlaceFastestDown waitmovement 0 call MtEmber_Exterior_EventScript_RocketsFaceDown msgbox MtEmber_Exterior_Text_SnoopsBeenListeningIn diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index a031e598b..43026392d 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_RUBY, 1 + MtEmber_RubyPath_B3F_MapScripts:: @ 8163C48 .byte 0 @@ -6,7 +8,7 @@ MtEmber_RubyPath_B5F_EventScript_Ruby:: @ 8163C49 lock faceplayer setflag FLAG_GOT_RUBY - removeobject 1 + removeobject LOCALID_RUBY giveitem_msg MtEmber_RubyPath_B3F_Text_FoundARuby, ITEM_RUBY, 1, MUS_OBTAIN_KEY_ITEM release end diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 09cea7949..2a490f13e 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_LUGIA, 1 + NavelRock_Base_MapScripts:: @ 81650E7 map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Base_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Base_OnResume @@ -25,7 +27,7 @@ NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return - removeobject 1 + removeobject LOCALID_LUGIA return NavelRock_Base_EventScript_Lugia:: @ 8165134 diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index d7459dcde..32b163542 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_HO_OH, 1 + NavelRock_Summit_MapScripts:: @ 8164F9F map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Summit_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Summit_OnResume @@ -28,7 +30,7 @@ NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return - removeobject 1 + removeobject LOCALID_HO_OH return NavelRock_Summit_EventScript_HoOh:: @ 8164FFB @@ -40,7 +42,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB setvar VAR_0x8004, 3 @ Num loops setvar VAR_0x8005, 35 @ Delay special LoopWingFlapSound - applymovement 1, Movement_HoOhAppear + applymovement LOCALID_HO_OH, Movement_HoOhAppear applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp waitmovement 0 delay 50 @@ -55,7 +57,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB setvar VAR_0x8005, 35 @ Delay special LoopWingFlapSound applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown - applymovement 1, Movement_HoOhApproach + applymovement LOCALID_HO_OH, Movement_HoOhApproach waitmovement 0 special RemoveCameraObject setvar VAR_0x8004, SPECIES_HO_OH @@ -66,7 +68,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB special StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - setvar VAR_LAST_TALKED, 1 + setvar VAR_LAST_TALKED, LOCALID_HO_OH specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NavelRock_Summit_EventScript_DefeatedHoOh diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 0fa5219aa..04d2b11f0 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -1,3 +1,5 @@ +.equ LOCALID_MOM, 1 + PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 .byte 0 @@ -11,7 +13,7 @@ PalletTown_PlayersHouse_1F_EventScript_Mom:: @ 8168C09 compare VAR_RESULT, FEMALE call_if_eq PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale closemessage - applymovement 1, Movement_FaceOriginalDirection + applymovement LOCALID_MOM, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index f6b07a7f9..d2f94072c 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_NIDORAN, 3 + PewterCity_House1_MapScripts:: @ 816A71C .byte 0 @@ -16,7 +18,7 @@ PewterCity_House1_EventScript_Nidoran:: @ 816A736 lock faceplayer call PewterCity_House1_EventScript_DoNidoranCry - applymovement 3, Movement_FaceOriginalDirection + applymovement LOCALID_NIDORAN, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 1b481d392..e8bf7705a 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -1,3 +1,6 @@ +.set LOCALID_SCIENTIST1, 1 +.set LOCALID_OLD_AMBER, 4 + PewterCity_Museum_1F_MapScripts:: @ 816A31A .byte 0 @@ -24,14 +27,14 @@ PewterCity_Museum_1F_EventScript_Scientist1BehindCounter:: @ 816A348 PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter:: @ 816A367 msgbox PewterCity_Museum_1F_Text_AmberContainsGeneticMatter - applymovement 1, Movement_FaceOriginalDirection + applymovement LOCALID_SCIENTIST1, Movement_FaceOriginalDirection waitmovement 0 release end PewterCity_Museum_1F_EventScript_ExplainAmber:: @ 816A37B msgbox PewterCity_Museum_1F_Text_AmberIsFossilizedSap - applymovement 1, Movement_FaceOriginalDirection + applymovement LOCALID_SCIENTIST1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -158,7 +161,7 @@ PewterCity_Museum_1F_EventScript_OldAmberScientist:: @ 816A4AE compare VAR_RESULT, FALSE goto_if_eq PewterCity_Museum_1F_EventScript_NoRoomForOldAmber setflag FLAG_GOT_OLD_AMBER - removeobject 4 + removeobject LOCALID_OLD_AMBER giveitem_msg PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan, ITEM_OLD_AMBER, 1, MUS_OBTAIN_KEY_ITEM release end diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 123c73f51..04085b5bb 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_BRUNO, 1 + PokemonLeague_BrunosRoom_MapScripts:: @ 8162685 map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_BrunosRoom_OnResume map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_BrunosRoom_OnLoad @@ -107,16 +109,16 @@ PokemonLeague_BrunosRoom_EventScript_DefeatedBruno:: @ 81627B0 end PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft:: @ 81627EF - applymovement 1, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestLeft waitmovement 0 return PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight:: @ 81627FA - applymovement 1, Movement_WalkInPlaceFastestRight + applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestRight waitmovement 0 return PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown:: @ 8162805 - applymovement 1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestDown waitmovement 0 return diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index e806d0157..69ba2c973 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_PROF_OAK, 1 + PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_HallOfFame_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_HallOfFame_OnWarp @@ -20,13 +22,13 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom waitmovement 0 - applymovement 1, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 delay 18 msgbox PokemonLeague_HallOfFame_Text_OakCongratulations closemessage - applymovement 1, Movement_WalkInPlaceFastestUp + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 65afbdcb4..9bea13a2e 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_LANCE, 1 + PokemonLeague_LancesRoom_MapScripts:: @ 816292D map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LancesRoom_OnResume map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LancesRoom_OnLoad @@ -146,12 +148,12 @@ PokemonLeague_LancesRoom_EventScript_DefeatedLance:: @ 8162AAB end PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayLeft:: @ 8162AC6 - applymovement 1, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft + applymovement LOCALID_LANCE, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft waitmovement 0 return PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayRight:: @ 8162AD1 - applymovement 1, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight + applymovement LOCALID_LANCE, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight waitmovement 0 return diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 20cbe6090..5d8091adc 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_RIVAL, 1 + PokemonTower_2F_MapScripts:: @ 8163285 .byte 0 @@ -24,12 +26,12 @@ PokemonTower_2F_EventScript_Rival:: @ 81632A7 call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerRight compare VAR_TEMP_1, 1 call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerDown - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_Delay48 + applymovement LOCALID_RIVAL, Movement_Delay48 waitmovement 0 msgbox PokemonTower_2F_Text_RivalIntro - setvar VAR_LAST_TALKED, 1 + setvar VAR_LAST_TALKED, LOCALID_RIVAL compare VAR_STARTER_MON, 2 call_if_eq PokemonTower_2F_EventScript_RivalSquirtle compare VAR_STARTER_MON, 1 @@ -46,19 +48,19 @@ PokemonTower_2F_EventScript_Rival:: @ 81632A7 playse SE_EXIT delay 25 fadedefaultbgm - removeobject 1 + removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_POKEMON_TOWER_2F, 1 releaseall end PokemonTower_2F_EventScript_RivalFacePlayerRight:: @ 8163339 - applymovement 1, Movement_WalkInPlaceFastestRight + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return PokemonTower_2F_EventScript_RivalFacePlayerDown:: @ 816334B - applymovement 1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -76,12 +78,12 @@ PokemonTower_2F_EventScript_RivalCharmander:: @ 8163373 return PokemonTower_2F_EventScript_RivalExitRight:: @ 816337E - applymovement 1, PokemonTower_2F_Movement_RivalExitRight + applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitRight waitmovement 0 return PokemonTower_2F_EventScript_RivalExitDown:: @ 8163389 - applymovement 1, PokemonTower_2F_Movement_RivalExitDown + applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitDown waitmovement 0 return diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 12f69cedf..a701e543f 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -1,3 +1,7 @@ +.set LOCALID_GRUNT1, 2 +.set LOCALID_GRUNT2, 3 +.set LOCALID_GRUNT3, 4 + PokemonTower_7F_MapScripts:: @ 8163559 .byte 0 @@ -30,25 +34,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt1:: @ 81635A1 goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitRight compare VAR_0x8004, 9 goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitLeft - applymovement 2, PokemonTower_7F_Movement_Grunt1Exit + applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1Exit waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt1 end PokemonTower_7F_EventScript_Grunt1ExitMid:: @ 81635E0 - applymovement 2, PokemonTower_7F_Movement_Grunt1ExitMid + applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitMid waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt1 end PokemonTower_7F_EventScript_Grunt1ExitRight:: @ 81635F0 - applymovement 2, PokemonTower_7F_Movement_Grunt1ExitRight + applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt1 end PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600 - applymovement 2, PokemonTower_7F_Movement_Grunt1ExitLeft + applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitLeft waitmovement 0 playse SE_EXIT delay 25 @@ -56,7 +60,7 @@ PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600 end PokemonTower_7F_EventScript_RemoveGrunt1:: @ 8163616 - removeobject 2 + removeobject LOCALID_GRUNT1 release end @@ -116,25 +120,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt2:: @ 8163658 goto_if_eq PokemonTower_7F_EventScript_Grunt2ExitLeft compare VAR_0x8004, 13 goto_if_eq PokemonTower_7F_EventScript_Grunt2ExitRight - applymovement 3, PokemonTower_7F_Movement_Grunt2Exit + applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2Exit waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt2 end PokemonTower_7F_EventScript_Grunt2ExitLeft:: @ 8163699 - applymovement 3, PokemonTower_7F_Movement_Grunt2ExitLeft + applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitLeft waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt2 end PokemonTower_7F_EventScript_Grunt2ExitRight:: @ 81636A9 - applymovement 3, PokemonTower_7F_Movement_Grunt2ExitRight + applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt2 end PokemonTower_7F_EventScript_RemoveGrunt2:: @ 81636B9 - removeobject 3 + removeobject LOCALID_GRUNT2 release end @@ -181,25 +185,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt3:: @ 81636F1 goto_if_eq PokemonTower_7F_EventScript_Grunt3ExitRight compare VAR_0x8004, 9 goto_if_eq PokemonTower_7F_EventScript_Grunt3ExitLeft - applymovement 4, PokemonTower_7F_Movement_Grunt3Exit + applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3Exit waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt3 end PokemonTower_7F_EventScript_Grunt3ExitRight:: @ 8163725 - applymovement 4, PokemonTower_7F_Movement_Grunt3ExitRight + applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt3 end PokemonTower_7F_EventScript_Grunt3ExitLeft:: @ 8163735 - applymovement 4, PokemonTower_7F_Movement_Grunt3ExitLeft + applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitLeft waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt3 end PokemonTower_7F_EventScript_RemoveGrunt3:: @ 8163745 - removeobject 4 + removeobject LOCALID_GRUNT3 release end diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 177269724..3ca746ed6 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_RIVAL, 1 + Route22_MapScripts:: @ 816828B .byte 0 @@ -10,21 +12,21 @@ Route22_EventScript_EarlyRivalTriggerTop:: @ 816828C Route22_EventScript_EarlyRivalTriggerMid:: @ 8168298 lockall setvar VAR_TEMP_1, 1 - setobjectxyperm 1, 25, 5 + setobjectxyperm LOCALID_RIVAL, 25, 5 goto Route22_EventScript_EarlyRival end Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB lockall setvar VAR_TEMP_1, 2 - setobjectxyperm 1, 25, 5 + setobjectxyperm LOCALID_RIVAL, 25, 5 goto Route22_EventScript_EarlyRival end Route22_EventScript_EarlyRival:: @ 81682BE textcolor 0 playbgm MUS_ENCOUNTER_RIVAL, 0 - addobject 1 + addobject LOCALID_RIVAL compare VAR_TEMP_1, 0 call_if_eq Route22_EventScript_EarlyRivalApproach compare VAR_TEMP_1, 1 @@ -50,18 +52,18 @@ Route22_EventScript_EarlyRival:: @ 81682BE compare VAR_TEMP_1, 2 call_if_eq Route22_EventScript_EarlyRivalExitBottom fadedefaultbgm - removeobject 1 + removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_ROUTE22, 2 releaseall end Route22_EventScript_EarlyRivalApproach:: @ 8168350 - applymovement 1, Route22_Movement_RivalApproach + applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach waitmovement 0 return Route22_EventScript_EarlyRivalApproachBottom:: @ 816835B - applymovement 1, Route22_Movement_RivalApproachBottom + applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return @@ -79,12 +81,12 @@ Route22_EventScript_EarlyRivalCharmander:: @ 816838B return Route22_EventScript_EarlyRivalExit:: @ 816839A - applymovement 1, Route22_Movement_EarlyRivalExit + applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExit waitmovement 0 return Route22_EventScript_EarlyRivalExitBottom:: @ 81683A5 - applymovement 1, Route22_Movement_EarlyRivalExitBottom + applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExitBottom waitmovement 0 return @@ -170,21 +172,21 @@ Route22_EventScript_LateRivalTriggerTop:: @ 81683ED Route22_EventScript_LateRivalTriggerMid:: @ 81683F9 lockall setvar VAR_TEMP_1, 1 - setobjectxyperm 1, 25, 5 + setobjectxyperm LOCALID_RIVAL, 25, 5 goto Route22_EventScript_LateRival end Route22_EventScript_LateRivalTriggerBottom:: @ 816840C lockall setvar VAR_TEMP_1, 2 - setobjectxyperm 1, 25, 5 + setobjectxyperm LOCALID_RIVAL, 25, 5 goto Route22_EventScript_LateRival end Route22_EventScript_LateRival:: @ 816841F textcolor 0 playbgm MUS_ENCOUNTER_RIVAL, 0 - addobject 1 + addobject LOCALID_RIVAL compare VAR_TEMP_1, 0 call_if_eq Route22_EventScript_LateRivalApproach compare VAR_TEMP_1, 1 @@ -192,7 +194,7 @@ Route22_EventScript_LateRival:: @ 816841F compare VAR_TEMP_1, 2 call_if_eq Route22_EventScript_LateRivalApproachBottom msgbox Route22_Text_LateRivalIntro - setvar VAR_LAST_TALKED, 1 + setvar VAR_LAST_TALKED, LOCALID_RIVAL compare VAR_STARTER_MON, 2 call_if_eq Route22_EventScript_LateRivalSquirtle compare VAR_STARTER_MON, 1 @@ -203,21 +205,21 @@ Route22_EventScript_LateRival:: @ 816841F closemessage delay 10 playbgm MUS_RIVAL_EXIT, 0 - applymovement 1, Route22_Movement_LateRivalExit + applymovement LOCALID_RIVAL, Route22_Movement_LateRivalExit waitmovement 0 fadedefaultbgm - removeobject 1 + removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_ROUTE22, 4 releaseall end Route22_EventScript_LateRivalApproach:: @ 816849C - applymovement 1, Route22_Movement_RivalApproach + applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach waitmovement 0 return Route22_EventScript_LateRivalApproachBottom:: @ 81684A7 - applymovement 1, Route22_Movement_RivalApproachBottom + applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index fd6c792f0..e75830cd7 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -1,3 +1,11 @@ +.set LOCALID_CASCADE_BADGE_GUARD, 1 +.set LOCALID_THUNDER_BADGE_GUARD, 2 +.set LOCALID_RAINBOW_BADGE_GUARD, 3 +.set LOCALID_SOUL_BADGE_GUARD, 4 +.set LOCALID_MARSH_BADGE_GUARD, 5 +.set LOCALID_VOLCANO_BADGE_GUARD, 6 +.set LOCALID_EARTH_BADGE_GUARD, 7 + Route23_MapScripts:: @ 81684EB map_script MAP_SCRIPT_ON_TRANSITION, Route23_OnTransition .byte 0 @@ -70,7 +78,7 @@ Route23_EventScript_EarthBadgeGuard:: @ 8168572 Route23_EventScript_CascadeBadgeGuardTrigger:: @ 8168583 lockall setvar VAR_TEMP_1, 2 - setvar VAR_0x8009, 1 + setvar VAR_0x8009, LOCALID_CASCADE_BADGE_GUARD getstdstring 0, STDSTRING_CASCADE_BADGE goto Route23_EventScript_BadgeGuardTrigger end @@ -78,7 +86,7 @@ Route23_EventScript_CascadeBadgeGuardTrigger:: @ 8168583 Route23_EventScript_ThunderBadgeGuardTrigger:: @ 8168598 lockall setvar VAR_TEMP_1, 3 - setvar VAR_0x8009, 2 + setvar VAR_0x8009, LOCALID_THUNDER_BADGE_GUARD getstdstring 0, STDSTRING_THUNDER_BADGE goto Route23_EventScript_BadgeGuardTrigger end @@ -86,7 +94,7 @@ Route23_EventScript_ThunderBadgeGuardTrigger:: @ 8168598 Route23_EventScript_RainbowBadgeGuardTrigger:: @ 81685AD lockall setvar VAR_TEMP_1, 4 - setvar VAR_0x8009, 3 + setvar VAR_0x8009, LOCALID_RAINBOW_BADGE_GUARD getstdstring 0, STDSTRING_RAINBOW_BADGE goto Route23_EventScript_BadgeGuardTrigger end @@ -94,7 +102,7 @@ Route23_EventScript_RainbowBadgeGuardTrigger:: @ 81685AD Route23_EventScript_SoulBadgeGuardTrigger:: @ 81685C2 lockall setvar VAR_TEMP_1, 5 - setvar VAR_0x8009, 4 + setvar VAR_0x8009, LOCALID_SOUL_BADGE_GUARD getstdstring 0, STDSTRING_SOUL_BADGE goto Route23_EventScript_BadgeGuardTrigger end @@ -102,7 +110,7 @@ Route23_EventScript_SoulBadgeGuardTrigger:: @ 81685C2 Route23_EventScript_MarshBadgeGuardTrigger:: @ 81685D7 lockall setvar VAR_TEMP_1, 6 - setvar VAR_0x8009, 5 + setvar VAR_0x8009, LOCALID_MARSH_BADGE_GUARD getstdstring 0, STDSTRING_MARSH_BADGE goto Route23_EventScript_BadgeGuardTrigger end @@ -110,7 +118,7 @@ Route23_EventScript_MarshBadgeGuardTrigger:: @ 81685D7 Route23_EventScript_VolcanoBadgeGuardTrigger:: @ 81685EC lockall setvar VAR_TEMP_1, 7 - setvar VAR_0x8009, 6 + setvar VAR_0x8009, LOCALID_VOLCANO_BADGE_GUARD getstdstring 0, STDSTRING_VOLCANO_BADGE goto Route23_EventScript_BadgeGuardTrigger end @@ -118,7 +126,7 @@ Route23_EventScript_VolcanoBadgeGuardTrigger:: @ 81685EC Route23_EventScript_EarthBadgeGuardTrigger:: @ 8168601 lockall setvar VAR_TEMP_1, 8 - setvar VAR_0x8009, 7 + setvar VAR_0x8009, LOCALID_EARTH_BADGE_GUARD getstdstring 0, STDSTRING_EARTH_BADGE goto Route23_EventScript_BadgeGuardTrigger end diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index be6042ea9..4a2bbe5d1 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_RIVAL, 1 + SSAnne_2F_Corridor_MapScripts:: @ 81608DE .byte 0 @@ -24,9 +26,9 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 playse SE_EXIT delay 5 playbgm MUS_ENCOUNTER_RIVAL, 0 - addobject 1 + addobject LOCALID_RIVAL delay 10 - applymovement 1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 delay 20 compare VAR_TEMP_1, 0 @@ -36,7 +38,7 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 compare VAR_TEMP_1, 2 call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachRight msgbox SSAnne_2F_Corridor_Text_RivalIntro - setvar VAR_LAST_TALKED, 1 + setvar VAR_LAST_TALKED, LOCALID_RIVAL compare VAR_STARTER_MON, 2 call_if_eq SSAnne_2F_Corridor_EventScript_RivalSquirtle compare VAR_STARTER_MON, 1 @@ -54,25 +56,25 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 compare VAR_TEMP_1, 2 call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitRight fadedefaultbgm - removeobject 1 + removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 releaseall end SSAnne_2F_Corridor_EventScript_RivalApproachLeft:: @ 81609AD - applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachLeft + applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachLeft waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalApproachMid:: @ 81609B8 - applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachMid + applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachMid applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalApproachRight:: @ 81609CA applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight - applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachRight + applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachRight waitmovement 0 return @@ -89,17 +91,17 @@ SSAnne_2F_Corridor_EventScript_RivalCharmander:: @ 81609F2 return SSAnne_2F_Corridor_EventScript_RivalExitLeft:: @ 81609FD - applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitLeft + applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitLeft waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalExitMid:: @ 8160A08 - applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitMid + applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitMid waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalExitRight:: @ 8160A13 - applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitRight + applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitRight waitmovement 0 return diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 8b89783e9..2e087148a 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_CAPTAIN, 1 + SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 .byte 0 @@ -12,7 +14,7 @@ SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A waitfanfare call EventScript_RestorePrevTextColor delay 50 - applymovement 1, Movement_FacePlayer + applymovement LOCALID_CAPTAIN, Movement_FacePlayer waitmovement 0 msgbox SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_OBTAIN_KEY_ITEM @@ -26,13 +28,13 @@ SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A SSAnne_CaptainsOffice_EventScript_NoRoomForCut:: @ 8160BA0 msgbox SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis closemessage - applymovement 1, Movement_FaceOriginalDirection + applymovement LOCALID_CAPTAIN, Movement_FaceOriginalDirection waitmovement 0 release end SSAnne_CaptainsOffice_EventScript_AlreadyGotCut:: @ 8160BB5 - applymovement 1, Movement_FacePlayer + applymovement LOCALID_CAPTAIN, Movement_FacePlayer waitmovement 0 msgbox SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon release diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 3596ab81d..eb06748b9 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_SS_ANNE, 1 + SSAnne_Exterior_MapScripts:: @ 8160840 map_script MAP_SCRIPT_ON_TRANSITION, SSAnne_Exterior_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SSAnne_Exterior_OnFrame @@ -22,7 +24,7 @@ SSAnne_Exterior_ExitSSAnne:: @ 8160859 delay 50 special DoSSAnneDepartureCutscene waitstate - removeobject 1 + removeobject LOCALID_SS_ANNE applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_Exit waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 2 diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 4b74cd43d..e035cc16e 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_DOOR_GUARD_GRUNT, 6 + SaffronCity_MapScripts:: @ 816735F map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_OnTransition .byte 0 @@ -8,7 +10,7 @@ SaffronCity_OnTransition:: @ 8167365 end SaffronCity_EventScript_MoveDoorGuardGrunt:: @ 8167372 - setobjectxyperm 6, 33, 31 + setobjectxyperm LOCALID_DOOR_GUARD_GRUNT, 33, 31 return SaffronCity_EventScript_RocketGrunt1:: @ 816737A @@ -42,7 +44,7 @@ SaffronCity_EventScript_RocketGrunt7:: @ 81673B0 SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9 lock goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep - applymovement 6, Movement_FacePlayer + applymovement LOCALID_DOOR_GUARD_GRUNT, Movement_FacePlayer waitmovement 0 msgbox SaffronCity_Text_ImASecurityGuard release diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index dd791a58f..ef2bb7131 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -1,3 +1,12 @@ +.set LOCALID_BATTLE_GIRL, 1 +.set LOCALID_LITTLE_GIRL, 2 +.set LOCALID_YOUNGSTER, 3 +.set LOCALID_GENTLEMAN, 4 +.set LOCALID_WOMAN, 5 +.set LOCALID_ROCKER, 6 +.set LOCALID_BEAUTY, 7 +.set LOCALID_BLACK_BELT, 8 + SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonTrainerFanClub_OnFrame map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonTrainerFanClub_OnTransition @@ -10,16 +19,16 @@ SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 816F0D4 lockall textcolor 1 - applymovement 1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BATTLE_GIRL, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_BATTLE_GIRL, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_Delay48 + applymovement LOCALID_BATTLE_GIRL, Movement_Delay48 waitmovement 0 msgbox SaffronCity_PokemonTrainerFanClub_Text_HuhYou closemessage - applymovement 1, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer + applymovement LOCALID_BATTLE_GIRL, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 @@ -118,43 +127,43 @@ SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F1 end SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 816F207 - setobjectxyperm 1, 5, 2 - setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_BATTLE_GIRL, 5, 2 + setobjectmovementtype LOCALID_BATTLE_GIRL, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 816F213 - setobjectxyperm 3, 7, 4 - setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_YOUNGSTER, 7, 4 + setobjectmovementtype LOCALID_YOUNGSTER, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 816F21F - setobjectxyperm 4, 2, 2 - setobjectmovementtype 4, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_GENTLEMAN, 2, 2 + setobjectmovementtype LOCALID_GENTLEMAN, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 816F22B - setobjectxyperm 2, 3, 4 - setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_LITTLE_GIRL, 3, 4 + setobjectmovementtype LOCALID_LITTLE_GIRL, MOVEMENT_TYPE_FACE_RIGHT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 816F237 - setobjectxyperm 6, 4, 6 - setobjectmovementtype 6, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_ROCKER, 4, 6 + setobjectmovementtype LOCALID_ROCKER, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 816F243 - setobjectxyperm 5, 10, 3 - setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_WOMAN, 10, 3 + setobjectmovementtype LOCALID_WOMAN, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 816F24F - setobjectxyperm 7, 7, 5 - setobjectmovementtype 7, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_BEAUTY, 7, 5 + setobjectmovementtype LOCALID_BEAUTY, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 816F25B - setobjectxyperm 8, 9, 6 - setobjectmovementtype 8, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_BLACK_BELT, 9, 6 + setobjectmovementtype LOCALID_BLACK_BELT, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: @ 816F267 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index eff2b5c82..4ef749d71 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_BALDING_MAN, 1 + SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 .byte 0 @@ -5,11 +7,11 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183 lock goto_if_set FLAG_TEMP_2, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced playbgm MUS_SCHOOL, 0 - applymovement 1, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance + applymovement LOCALID_BALDING_MAN, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm delay 30 - applymovement 1, Movement_FacePlayer + applymovement LOCALID_BALDING_MAN, Movement_FacePlayer waitmovement 0 msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn textcolor 3 @@ -39,7 +41,7 @@ SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown:: @ 8172206 return SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced:: @ 8172211 - applymovement 1, Movement_FacePlayer + applymovement LOCALID_BALDING_MAN, Movement_FacePlayer waitmovement 0 msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn release diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 6f973074b..9bc7be467 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,3 +1,11 @@ +.set LOCALID_BOULDER1, 1 +.set LOCALID_BOULDER2, 2 +.set LOCALID_BOULDER3, 3 +.set LOCALID_BOULDER4, 4 +.set LOCALID_BOULDER5, 5 +.set LOCALID_BOULDER6, 6 +.set LOCALID_BOULDER7, 7 + .equ NUM_SWITCHES_PRESSED, VAR_TEMP_8 SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC @@ -18,13 +26,13 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 end SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: @ 8164E07 - setobjectxyperm 1, 7, 2 - setobjectxyperm 2, 4, 4 - setobjectxyperm 3, 10, 4 - setobjectxyperm 4, 5, 6 - setobjectxyperm 5, 9, 6 - setobjectxyperm 6, 5, 8 - setobjectxyperm 7, 9, 8 + setobjectxyperm LOCALID_BOULDER1, 7, 2 + setobjectxyperm LOCALID_BOULDER2, 4, 4 + setobjectxyperm LOCALID_BOULDER3, 10, 4 + setobjectxyperm LOCALID_BOULDER4, 5, 6 + setobjectxyperm LOCALID_BOULDER5, 9, 6 + setobjectxyperm LOCALID_BOULDER6, 5, 8 + setobjectxyperm LOCALID_BOULDER7, 9, 8 return SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: @ 8164E39 diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index eceaad4be..26c81dd4f 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -1,3 +1,7 @@ +.set LOCALID_GIOVANNI, 3 +.set LOCALID_GRUNT1, 4 +.set LOCALID_GRUNT2, 6 + SilphCo_11F_MapScripts:: @ 8161DEE map_script MAP_SCRIPT_ON_LOAD, SilphCo_11F_OnLoad .byte 0 @@ -60,7 +64,7 @@ SilphCo_11F_EventScript_GiovanniTriggerRight:: @ 8161E94 SilphCo_11F_EventScript_BattleGiovanni:: @ 8161EA0 textcolor 0 - applymovement 3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFastestDown waitmovement 0 delay 25 msgbox SilphCo_11F_Text_GiovanniIntro @@ -69,14 +73,14 @@ SilphCo_11F_EventScript_BattleGiovanni:: @ 8161EA0 call_if_eq SilphCo_11F_EventScript_GiovanniApproachLeft compare VAR_TEMP_1, 1 call_if_eq SilphCo_11F_EventScript_GiovanniApproachRight - setvar VAR_LAST_TALKED, 3 + setvar VAR_LAST_TALKED, LOCALID_GIOVANNI trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, SilphCo_11F_Text_GiovanniDefeat msgbox SilphCo_11F_Text_GiovanniPostBattle closemessage fadescreen FADE_TO_BLACK - removeobject 3 - removeobject 4 - removeobject 6 + removeobject LOCALID_GIOVANNI + removeobject LOCALID_GRUNT1 + removeobject LOCALID_GRUNT2 fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_SILPH_CO_11F, 1 setflag FLAG_HIDE_SAFFRON_ROCKETS @@ -85,13 +89,13 @@ SilphCo_11F_EventScript_BattleGiovanni:: @ 8161EA0 end SilphCo_11F_EventScript_GiovanniApproachLeft:: @ 8161F00 - applymovement 3, SilphCo_11F_Movement_GiovanniApproachLeft + applymovement LOCALID_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachLeft applymovement OBJ_EVENT_ID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni waitmovement 0 return SilphCo_11F_EventScript_GiovanniApproachRight:: @ 8161F12 - applymovement 3, SilphCo_11F_Movement_GiovanniApproachRight + applymovement LOCALID_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachRight waitmovement 0 return diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index c43c8bad1..c276483f5 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -1,3 +1,6 @@ +.set LOCALID_RIVAL, 1 +.set LOCALID_WORKER_M2, 8 + SilphCo_7F_MapScripts:: @ 8161984 map_script MAP_SCRIPT_ON_LOAD, SilphCo_7F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_7F_OnTransition @@ -15,7 +18,7 @@ SilphCo_7F_OnTransition:: @ 81619AB end SilphCo_7F_EventScript_SetObjRocketsGone:: @ 81619B7 - setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype LOCALID_WORKER_M2, MOVEMENT_TYPE_FACE_UP return SilphCo_7F_EventScript_RivalTriggerTop:: @ 81619BC @@ -33,10 +36,10 @@ SilphCo_7F_EventScript_RivalTriggerBottom:: @ 81619C8 SilphCo_7F_EventScript_RivalScene:: @ 81619D4 textcolor 0 playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown - applymovement 1, Movement_Delay48 + applymovement LOCALID_RIVAL, Movement_Delay48 waitmovement 0 msgbox SilphCo_7F_Text_RivalWhatKeptYou compare VAR_TEMP_1, 0 @@ -44,7 +47,7 @@ SilphCo_7F_EventScript_RivalScene:: @ 81619D4 compare VAR_TEMP_1, 1 call_if_eq SilphCo_7F_EventScript_RivalApproachBottom msgbox SilphCo_7F_Text_RivalIntro - setvar VAR_LAST_TALKED, 1 + setvar VAR_LAST_TALKED, LOCALID_RIVAL compare VAR_STARTER_MON, 2 call_if_eq SilphCo_7F_EventScript_RivalSquirtle compare VAR_STARTER_MON, 1 @@ -60,7 +63,7 @@ SilphCo_7F_EventScript_RivalScene:: @ 81619D4 call_if_eq SilphCo_7F_EventScript_RivalExitBottom playse SE_WARP_IN fadedefaultbgm - removeobject 1 + removeobject LOCALID_RIVAL waitse setvar VAR_MAP_SCENE_SILPH_CO_7F, 1 releaseall @@ -68,7 +71,7 @@ SilphCo_7F_EventScript_RivalScene:: @ 81619D4 SilphCo_7F_EventScript_RivalApproachTop:: @ 8161A73 closemessage - applymovement 1, SilphCo_7F_Movement_RivalApproachTop + applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalApproachTop waitmovement 0 return @@ -88,12 +91,12 @@ SilphCo_7F_EventScript_RivalCharmander:: @ 8161A96 return SilphCo_7F_EventScript_RivalExitTop:: @ 8161AA1 - applymovement 1, SilphCo_7F_Movement_RivalExitTop + applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitTop waitmovement 0 return SilphCo_7F_EventScript_RivalExitBottom:: @ 8161AAC - applymovement 1, SilphCo_7F_Movement_RivalExitBottom + applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitBottom waitmovement 0 return diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 48888b357..988c98a39 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_SCIENTIST, 1 + SixIsland_RuinValley_MapScripts:: @ 8168B53 map_script MAP_SCRIPT_ON_LOAD, SixIsland_RuinValley_OnLoad .byte 0 @@ -13,10 +15,10 @@ SixIsland_RuinValley_EventScript_OpenDottedHoleDoor:: @ 8168B63 SixIsland_RuinValley_EventScript_Scientist:: @ 8168B6D lock msgbox SixIsland_RuinValley_Text_CantFigureOutHowToGetInside - applymovement 1, Movement_FacePlayer + applymovement LOCALID_SCIENTIST, Movement_FacePlayer waitmovement 0 msgbox SixIsland_RuinValley_Text_IFoundThisPlace - applymovement 1, Movement_FaceOriginalDirection + applymovement LOCALID_SCIENTIST, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index dae40d985..fc4f76703 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_LOSTELLE, 1 + ThreeIsland_BerryForest_MapScripts:: @ 8163C71 map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_BerryForest_OnTransition .byte 0 @@ -12,9 +14,9 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83 faceplayer msgbox ThreeIsland_BerryForest_Text_HelpScaryPokemon playse SE_PIN - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_LOSTELLE, Movement_ExclamationMark waitmovement 0 - applymovement 1, ThreeIsland_BerryForest_Movement_LostelleLookAround + applymovement LOCALID_LOSTELLE, ThreeIsland_BerryForest_Movement_LostelleLookAround waitmovement 0 msgbox ThreeIsland_BerryForest_Text_HereItComesAgain goto_if_questlog EventScript_ReleaseEnd @@ -24,7 +26,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83 setwildbattle SPECIES_HYPNO, 30, ITEM_NONE dowildbattle special QuestLog_CutRecording - applymovement 1, Movement_FacePlayer + applymovement LOCALID_LOSTELLE, Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis giveitem ITEM_IAPAPA_BERRY diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 7729b3536..cfec31c53 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_PROSPECTOR, 1 + ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_DunsparceTunnel_OnTransition .byte 0 @@ -17,8 +19,8 @@ ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut:: @ 8164D50 return ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall:: @ 8164D54 - setobjectxyperm 1, 6, 3 - setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_PROSPECTOR, 6, 3 + setobjectmovementtype LOCALID_PROSPECTOR, MOVEMENT_TYPE_FACE_RIGHT return ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60 @@ -30,7 +32,7 @@ ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60 goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold msgbox ThreeIsland_DunsparceTunnel_Text_ProspectingForGold closemessage - applymovement 1, Movement_FaceOriginalDirection + applymovement LOCALID_PROSPECTOR, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc index 016cc9e3d..eaf3f2568 100644 --- a/data/maps/TrainerTower_Lobby/scripts.inc +++ b/data/maps/TrainerTower_Lobby/scripts.inc @@ -1,3 +1,9 @@ +.set LOCALID_NURSE, 1 +.set LOCALID_MART_CLERK, 2 +.set LOCALID_RECEPTIONIST, 3 +.set LOCALID_COOLTRAINER_F, 4 +.set LOCALID_BALDING_MAN, 5 + TrainerTower_Lobby_MapScripts:: @ 8164839 map_script MAP_SCRIPT_ON_RESUME, TrainerTower_Lobby_OnResume map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerTower_Lobby_OnReturnToField @@ -20,11 +26,11 @@ TrainerTower_Lobby_OnResumeEnd:: @ 8164886 end TrainerTower_Lobby_OnReturnToField:: @ 8164887 - addobject 1 - addobject 2 - addobject 3 - addobject 4 - addobject 5 + addobject LOCALID_NURSE + addobject LOCALID_MART_CLERK + addobject LOCALID_RECEPTIONIST + addobject LOCALID_COOLTRAINER_F + addobject LOCALID_BALDING_MAN end TrainerTower_Lobby_OnLoad:: @ 8164897 diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index 35222ba8b..7a9b758a0 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,3 +1,12 @@ +.set LOCALID_UNION_ROOM_PLAYER_4, 2 +.set LOCALID_UNION_ROOM_PLAYER_8, 3 +.set LOCALID_UNION_ROOM_PLAYER_7, 4 +.set LOCALID_UNION_ROOM_PLAYER_6, 5 +.set LOCALID_UNION_ROOM_PLAYER_5, 6 +.set LOCALID_UNION_ROOM_PLAYER_3, 7 +.set LOCALID_UNION_ROOM_PLAYER_2, 8 +.set LOCALID_UNION_ROOM_PLAYER_1, 9 + UnionRoom_MapScripts:: @ 816047C map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition @@ -12,14 +21,14 @@ UnionRoom_OnResume:: @ 8160487 setflag FLAG_HIDE_UNION_ROOM_PLAYER_6 setflag FLAG_HIDE_UNION_ROOM_PLAYER_7 setflag FLAG_HIDE_UNION_ROOM_PLAYER_8 - removeobject 9 - removeobject 8 - removeobject 7 - removeobject 2 - removeobject 6 - removeobject 5 - removeobject 4 - removeobject 3 + removeobject LOCALID_UNION_ROOM_PLAYER_1 + removeobject LOCALID_UNION_ROOM_PLAYER_2 + removeobject LOCALID_UNION_ROOM_PLAYER_3 + removeobject LOCALID_UNION_ROOM_PLAYER_4 + removeobject LOCALID_UNION_ROOM_PLAYER_5 + removeobject LOCALID_UNION_ROOM_PLAYER_6 + removeobject LOCALID_UNION_ROOM_PLAYER_7 + removeobject LOCALID_UNION_ROOM_PLAYER_8 special UnionRoomSpecial end diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index a7ba114e1..00d67ed08 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -1,5 +1,8 @@ -.equ SPOKE_TO_WOMAN_LAST, FLAG_TEMP_2 -.equ SPOKE_TO_FAT_MAN_LAST, FLAG_TEMP_3 +.set LOCALID_WOMAN, 5 +.set LOCALID_FAT_MAN, 6 + +.set SPOKE_TO_WOMAN_LAST, FLAG_TEMP_2 +.set SPOKE_TO_FAT_MAN_LAST, FLAG_TEMP_3 VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E .byte 0 @@ -56,7 +59,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman:: @ 816B528 goto_if_set SPOKE_TO_FAT_MAN_LAST, VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan msgbox VermilionCity_PokemonFanClub_Text_AdoreMySeel closemessage - applymovement 5, Movement_FaceOriginalDirection + applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection waitmovement 0 setflag SPOKE_TO_WOMAN_LAST release @@ -65,7 +68,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman:: @ 816B528 VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan:: @ 816B54B msgbox VermilionCity_PokemonFanClub_Text_SeelFarMoreAttractive closemessage - applymovement 5, Movement_FaceOriginalDirection + applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection waitmovement 0 clearflag SPOKE_TO_FAT_MAN_LAST release @@ -77,7 +80,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan:: @ 816B563 goto_if_set SPOKE_TO_WOMAN_LAST, VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman msgbox VermilionCity_PokemonFanClub_Text_AdmirePikachusTail closemessage - applymovement 6, Movement_FaceOriginalDirection + applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection waitmovement 0 setflag SPOKE_TO_FAT_MAN_LAST release @@ -86,7 +89,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan:: @ 816B563 VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman:: @ 816B586 msgbox VermilionCity_PokemonFanClub_Text_PikachuTwiceAsCute closemessage - applymovement 6, Movement_FaceOriginalDirection + applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection waitmovement 0 clearflag SPOKE_TO_WOMAN_LAST release diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 5e66c480f..864788ccf 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -1,4 +1,6 @@ -.equ LOCALID_TUTORIAL_MAN, 4 +.set LOCALID_OLD_MAN, 3 +.set LOCALID_TUTORIAL_MAN, 4 +.set LOCALID_WOMAN, 5 ViridianCity_MapScripts:: @ 81658D3 map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition @@ -91,7 +93,7 @@ ViridianCity_EventScript_OldMan:: @ 81659CA goto_if_eq ViridianCity_EventScript_OldManGymLeaderReturned msgbox ViridianCity_Text_GymClosedWonderWhoLeaderIs closemessage - applymovement 3, Movement_FaceOriginalDirection + applymovement LOCALID_OLD_MAN, Movement_FaceOriginalDirection waitmovement 0 release end @@ -190,7 +192,7 @@ ViridianCity_EventScript_Woman:: @ 8165AC4 ViridianCity_EventScript_WomanRoadBlocked:: @ 8165ADB msgbox ViridianCity_Text_GrandpaHasntHadCoffeeYet closemessage - applymovement 5, Movement_FaceOriginalDirection + applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index c14dceddf..397337837 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_GIOVANNI, 8 + ViridianCity_Gym_MapScripts:: @ 8169EC9 .byte 0 @@ -8,7 +10,7 @@ ViridianCity_Gym_EventScript_Giovanni:: @ 8169ECA msgbox ViridianCity_Gym_Text_GiovanniPostBattle closemessage fadescreen FADE_TO_BLACK - removeobject 8 + removeobject LOCALID_GIOVANNI fadescreen FADE_FROM_BLACK release end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 0c08b447d..5458b0f4b 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -1,3 +1,6 @@ +.set LOCALID_WOMAN, 1 +.set LOCALID_LASS, 2 + ViridianCity_House2_MapScripts:: @ 816A07C .byte 0 @@ -6,7 +9,7 @@ ViridianCity_House2_EventScript_Lass:: @ 816A07D faceplayer msgbox ViridianCity_House2_Text_TryingToMemorizeNotes closemessage - applymovement 2, Movement_WalkInPlaceFastestUp + applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp waitmovement 0 release end @@ -16,7 +19,7 @@ ViridianCity_House2_EventScript_Woman:: @ 816A094 faceplayer msgbox ViridianCity_House2_Text_ReadBlackboardCarefully closemessage - applymovement 1, Movement_FaceOriginalDirection + applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection waitmovement 0 release end @@ -36,7 +39,7 @@ ViridianCity_House2_EventScript_Notebook:: @ 816A0AB compare VAR_RESULT, NO goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook msgbox ViridianCity_House2_Text_NotebookFourthPage - applymovement 2, Movement_WalkInPlaceFastestUp + applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 1 msgbox ViridianCity_House2_Text_HeyDontLookAtMyNotes diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 31d99c12c..da6d66923 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_CLERK, 1 + ViridianCity_Mart_MapScripts:: @ 816A1D3 map_script MAP_SCRIPT_ON_LOAD, ViridianCity_Mart_OnLoad map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_Mart_OnFrame @@ -19,11 +21,11 @@ ViridianCity_Mart_OnFrame:: @ 816A1FB ViridianCity_Mart_EventScript_ParcelScene:: @ 816A205 lockall textcolor 0 - applymovement 1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_CLERK, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox ViridianCity_Mart_Text_YouCameFromPallet closemessage - applymovement 1, ViridianCity_Mart_Movement_FacePlayer + applymovement LOCALID_CLERK, ViridianCity_Mart_Movement_FacePlayer applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Mart_Movement_ApproachCounter waitmovement 0 msgbox ViridianCity_Mart_Text_TakeThisToProfOak diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 205b452c5..43fb61017 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -446,6 +446,8 @@ EventScript_BodySlamTaught:: @ 81C4DE2 release end +.set LOCALID_CAPE_BRINK_TUTOR, 1 + TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording @@ -518,22 +520,22 @@ CapeBrinkTutor_EventScript_ChooseMon:: @ 81C4EDA end CapeBrinkTutor_EventScript_JumpInPlaceDown:: @ 81C4EF0 - applymovement 1, Movement_JumpInPlaceDown + applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceDown waitmovement 0 return CapeBrinkTutor_EventScript_JumpInPlaceUp:: @ 81C4EFB - applymovement 1, Movement_JumpInPlaceUp + applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceUp waitmovement 0 return CapeBrinkTutor_EventScript_JumpInPlaceLeft:: @ 81C4F06 - applymovement 1, Movement_JumpInPlaceLeft + applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceLeft waitmovement 0 return CapeBrinkTutor_EventScript_JumpInPlaceRight:: @ 81C4F11 - applymovement 1, Movement_JumpInPlaceRight + applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceRight waitmovement 0 return diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 253e2837a..6b702f1a6 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -1,3 +1,5 @@ +.set LOCALID_STICKER_MAN, 1 + CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867 lockall showmoneybox 0, 0, 0 @@ -74,12 +76,12 @@ FourIsland_House2_EventScript_StickerMan:: @ 81B2938 FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951 setflag FLAG_MET_STICKER_MAN msgbox FourIsland_House2_Text_WishICouldShowOffStickers - applymovement 1, Movement_FacePlayer + applymovement LOCALID_STICKER_MAN, Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_STICKER_MAN, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_Delay48 + applymovement LOCALID_STICKER_MAN, Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 goto_if_eq FourIsland_House2_EventScript_StickerManNothingToBrag @@ -89,7 +91,7 @@ FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951 end FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994 - applymovement 1, Movement_FacePlayer + applymovement LOCALID_STICKER_MAN, Movement_FacePlayer waitmovement 0 goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording diff --git a/data/scripts/white_out.inc b/data/scripts/white_out.inc index 2758737bc..7c2199c8e 100644 --- a/data/scripts/white_out.inc +++ b/data/scripts/white_out.inc @@ -19,10 +19,12 @@ EventScript_AfterWhiteOutHealMsg:: @ 81A8DCF msgbox Text_MonsHealed return +@ LOCALID_MOM set by PalletTown_PlayersHouse_1F + EventScript_AfterWhiteOutMomHeal:: @ 81A8DD8 lockall textcolor 1 - applymovement 1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_MOM, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Text_HadQuiteAnExperienceTakeRest call EventScript_OutOfCenterPartyHeal diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index a4ecd3e21..92795246a 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -69,7 +69,7 @@ #define FLDEFF_USE_VS_SEEKER 65 #define FLDEFF_DOUBLE_EXCL_MARK_ICON 66 #define FLDEFF_MOVE_DEOXYS_ROCK 67 -#define FLDEFF_UNK_44 68 // TODO: related to ??? +#define FLDEFF_DESTROY_DEOXYS_ROCK 68 #define FLDEFF_UNK_45 69 // TODO: related to fame checker photos #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H diff --git a/src/field_effect.c b/src/field_effect.c index d656b8107..a5533c466 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -3764,7 +3764,7 @@ u32 FldEff_Unk44(void) } else { - FieldEffectActiveListRemove(FLDEFF_UNK_44); + FieldEffectActiveListRemove(FLDEFF_DESTROY_DEOXYS_ROCK); } return FALSE; } @@ -3846,7 +3846,7 @@ static void Unk44Effect_2(s16 *data, u8 taskId) { InstallCameraPanAheadCallback(); RemoveObjectEventByLocalIdAndMap(data[6], data[7], data[8]); - FieldEffectActiveListRemove(FLDEFF_UNK_44); + FieldEffectActiveListRemove(FLDEFF_DESTROY_DEOXYS_ROCK); DestroyTask(taskId); } } |