diff --git a/.gitignore b/.gitignore index c5872bb89..5ed9cf3ff 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ ld_script_ruby.txt ld_script_sapphire.txt sound/**/*.bin sound/songs/midi/*.s +src/data/heal_locations.h src/data/items.h src/data/wild_encounters.h src/data/region_map/region_map_entries.h diff --git a/Makefile b/Makefile index 4719798af..d34ee28f7 100644 --- a/Makefile +++ b/Makefile @@ -264,7 +264,8 @@ generated: $(AUTO_GEN_TARGETS) %.rl: % ; $(GFX) $< $@ clean-generated: - -rm -f $(AUTO_GEN_TARGETS) + @rm -f $(AUTO_GEN_TARGETS) + @echo "rm -f " ifeq ($(MODERN),0) $(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 0135bc26d..142ad979d 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -610,10 +610,10 @@ .endm @ Blocks script execution until the movements being applied to the specified (localId) object finish. - @ If localId is 0, then the id of the last-moved object will be used instead. If the specified object - @ is not currently being manipulated with applymovement, then this command does nothing. + @ If localId is LOCALID_NONE (0), then the id of the last-moved object will be used instead. + @ If the specified object is not currently being manipulated with applymovement, then this command does nothing. @ If no map is specified, then the current map is used. - .macro waitmovement localId:req, map + .macro waitmovement localId=LOCALID_NONE, map .ifb \map .byte 0x51 .2byte \localId diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 255ca4645..654ddfc1c 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_BIRTH_ISLAND_EXTERIOR", "name": "BirthIsland_Exterior", "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR", - "music": "0xFFFF", + "music": "MUS_NONE", "region_map_section": "MAPSEC_BIRTH_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_METEORITE", "x": 15, @@ -30,6 +31,7 @@ "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE" }, { + "local_id": "LOCALID_BIRTH_ISLAND_DEOXYS", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 15, diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 64515f8d5..5bef2d0e9 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_DEOXYS_ROCK, 1 -.set LOCALID_DEOXYS, 2 - BirthIsland_Exterior_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume @@ -38,7 +35,7 @@ BirthIsland_Exterior_OnResume:: BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: specialvar VAR_RESULT, GetBattleOutcome goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return - removeobject LOCALID_DEOXYS + removeobject LOCALID_BIRTH_ISLAND_DEOXYS return BirthIsland_Exterior_EventScript_Triangle:: @@ -68,21 +65,21 @@ BirthIsland_Exterior_EventScript_NotSolved3:: end BirthIsland_Exterior_EventScript_Deoxys:: - addobject LOCALID_DEOXYS + addobject LOCALID_BIRTH_ISLAND_DEOXYS waitse - setfieldeffectargument 0, LOCALID_DEOXYS_ROCK - setfieldeffectargument 1, MAP_NUM(BIRTH_ISLAND_EXTERIOR) - setfieldeffectargument 2, MAP_GROUP(BIRTH_ISLAND_EXTERIOR) + setfieldeffectargument 0, LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK + setfieldeffectargument 1, MAP_NUM(MAP_BIRTH_ISLAND_EXTERIOR) + setfieldeffectargument 2, MAP_GROUP(MAP_BIRTH_ISLAND_EXTERIOR) dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK playbgm MUS_ENCOUNTER_DEOXYS, 0 waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK - applymovement LOCALID_DEOXYS, Movement_DeoxysApproach + applymovement LOCALID_BIRTH_ISLAND_DEOXYS, Movement_DeoxysApproach waitmovement 0 waitse playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER delay 40 waitmoncry - setvar VAR_LAST_TALKED, LOCALID_DEOXYS + setvar VAR_LAST_TALKED, LOCALID_BIRTH_ISLAND_DEOXYS seteventmon SPECIES_DEOXYS, 30 setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index d26338c28..2d329c4cb 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_BIRTH_ISLAND_HARBOR", "name": "BirthIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "0xFFFF", + "music": "MUS_NONE", "region_map_section": "MAPSEC_BIRTH_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index ec34003c3..99d4c3303 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -41,6 +41,7 @@ "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { + "local_id": "LOCALID_CELADON_FAT_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 38, @@ -55,6 +56,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CELADON_POLIWRATH", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLIWRATH", "x": 36, @@ -153,6 +155,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CELADON_BORDER_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 52, @@ -199,7 +202,7 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": -7, "y": 21, - "target_local_id": 7, + "target_local_id": "LOCALID_ROUTE16_CUT_TREE", "target_map": "MAP_ROUTE16" }, { diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index adf2f5457..901a7a392 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_FAT_MAN, 2 -.set LOCALID_POLIWRATH, 3 - CeladonCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition .byte 0 @@ -36,7 +33,7 @@ CeladonCity_EventScript_FatMan:: faceplayer msgbox CeladonCity_Text_MyTrustedPalPoliwrath closemessage - applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_CELADON_FAT_MAN, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -49,7 +46,7 @@ CeladonCity_EventScript_Poliwrath:: msgbox CeladonCity_Text_Poliwrath closemessage waitmoncry - applymovement LOCALID_POLIWRATH, Common_Movement_FaceOriginalDirection + applymovement LOCALID_CELADON_POLIWRATH, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 26d0871ed..20405357b 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -30,6 +30,7 @@ "flag": "0" }, { + "local_id": "LOCALID_EEVEE_POKEBALL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 9463564e7..72a109cc7 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_EEVEE_POKEBALL, 2 - CeladonCity_Condominiums_RoofRoom_MapScripts:: .byte 0 diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 51809f37c..3d2a43c7f 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -156,6 +156,7 @@ "flag": "0" }, { + "local_id": "LOCALID_GAME_CORNER_GRUNT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 11, diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index a0e4e67b4..dddd0aefa 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_GRUNT, 11 - CeladonCity_GameCorner_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, CeladonCity_GameCorner_OnLoad .byte 0 @@ -246,14 +244,14 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_EventScript_DontPlaySlotMachine - setfieldeffectargument 0, OBJ_EVENT_ID_PLAYER + setfieldeffectargument 0, LOCALID_PLAYER .ifdef BUGFIX - setfieldeffectargument 1, MAP_NUM(CELADON_CITY_GAME_CORNER) - setfieldeffectargument 2, MAP_GROUP(CELADON_CITY_GAME_CORNER) + setfieldeffectargument 1, MAP_NUM(MAP_CELADON_CITY_GAME_CORNER) + setfieldeffectargument 2, MAP_GROUP(MAP_CELADON_CITY_GAME_CORNER) .else @ Map num/group were provided in the wrong order - setfieldeffectargument 1, MAP_GROUP(CELADON_CITY_GAME_CORNER) - setfieldeffectargument 2, MAP_NUM(CELADON_CITY_GAME_CORNER) + setfieldeffectargument 1, MAP_GROUP(MAP_CELADON_CITY_GAME_CORNER) + setfieldeffectargument 2, MAP_NUM(MAP_CELADON_CITY_GAME_CORNER) .endif dofieldeffect FLDEFF_SMILEY_FACE_ICON waitfieldeffect FLDEFF_SMILEY_FACE_ICON @@ -421,17 +419,17 @@ CeladonCity_GameCorner_Text_DefeatedGrunt:: closemessage call_if_eq VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExitWest call_if_ne VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExit - removeobject LOCALID_GRUNT + removeobject LOCALID_GAME_CORNER_GRUNT release end CeladonCity_GameCorner_Text_GruntExitWest:: - applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExitWest + applymovement LOCALID_GAME_CORNER_GRUNT, CeladonCity_GameCorner_Movement_GruntExitWest waitmovement 0 return CeladonCity_GameCorner_Text_GruntExit:: - applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExit + applymovement LOCALID_GAME_CORNER_GRUNT, CeladonCity_GameCorner_Movement_GruntExit waitmovement 0 return diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 6cf24c45c..1beb9871f 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_CELADON_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index cebda4e35..14a76d95f 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ CeladonCity_PokemonCenter_1F_MapScripts:: .byte 0 CeladonCity_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_CELADON_CITY + setrespawn HEAL_LOCATION_CELADON_CITY end CeladonCity_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 5e534008d..7576e7ec9 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -37,6 +37,7 @@ ], "object_events": [ { + "local_id": "LOCALID_CERULEAN_POLICEMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 31, @@ -51,6 +52,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CERULEAN_GRUNT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 33, @@ -93,6 +95,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CERULEAN_SLOWBRO", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SLOWBRO", "x": 32, @@ -107,6 +110,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CERULEAN_LASS", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, @@ -135,6 +139,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CERULEAN_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 22, @@ -167,10 +172,11 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 50, "y": 18, - "target_local_id": 10, + "target_local_id": "LOCALID_ROUTE9_CUT_TREE", "target_map": "MAP_ROUTE9" }, { + "local_id": "LOCALID_CERULEAN_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 12, @@ -185,6 +191,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CERULEAN_CAVE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 1, diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 98b9faa0c..0621f6e96 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -1,10 +1,3 @@ -.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:: map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition .byte 0 @@ -15,9 +8,9 @@ CeruleanCity_OnTransition:: end CeruleanCity_EventScript_BlockExits:: - setobjectxyperm LOCALID_POLICEMAN, 30, 12 - setobjectxyperm LOCALID_SLOWBRO, 26, 31 - setobjectxyperm LOCALID_LASS, 27, 31 + setobjectxyperm LOCALID_CERULEAN_POLICEMAN, 30, 12 + setobjectxyperm LOCALID_CERULEAN_SLOWBRO, 26, 31 + setobjectxyperm LOCALID_CERULEAN_LASS, 27, 31 return CeruleanCity_EventScript_RivalTriggerLeft:: @@ -29,14 +22,14 @@ CeruleanCity_EventScript_RivalTriggerLeft:: CeruleanCity_EventScript_RivalTriggerMid:: lockall setvar VAR_TEMP_1, 1 - setobjectxyperm LOCALID_RIVAL, 23, 0 + setobjectxyperm LOCALID_CERULEAN_RIVAL, 23, 0 goto CeruleanCity_EventScript_Rival end CeruleanCity_EventScript_RivalTriggerRight:: lockall setvar VAR_TEMP_1, 2 - setobjectxyperm LOCALID_RIVAL, 24, 0 + setobjectxyperm LOCALID_CERULEAN_RIVAL, 24, 0 goto CeruleanCity_EventScript_Rival end @@ -44,11 +37,11 @@ CeruleanCity_EventScript_Rival:: textcolor NPC_TEXT_COLOR_MALE setvar VAR_MAP_SCENE_ROUTE22, 2 playbgm MUS_ENCOUNTER_RIVAL, 0 - addobject LOCALID_RIVAL - applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalEnter + addobject LOCALID_CERULEAN_RIVAL + applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalEnter waitmovement 0 msgbox CeruleanCity_Text_RivalIntro - setvar VAR_LAST_TALKED, LOCALID_RIVAL + setvar VAR_LAST_TALKED, LOCALID_CERULEAN_RIVAL call_if_eq VAR_STARTER_MON, 2, CeruleanCity_EventScript_RivalSquirtle call_if_eq VAR_STARTER_MON, 1, CeruleanCity_EventScript_RivalBulbasaur call_if_eq VAR_STARTER_MON, 0, CeruleanCity_EventScript_RivalCharmander @@ -65,10 +58,10 @@ CeruleanCity_EventScript_Rival:: giveitem ITEM_FAME_CHECKER msgbox CeruleanCity_Text_ExplainFameCheckerSmellYa closemessage - applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalExit + applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalExit waitmovement 0 fadedefaultbgm - removeobject LOCALID_RIVAL + removeobject LOCALID_CERULEAN_RIVAL releaseall end @@ -85,14 +78,14 @@ CeruleanCity_EventScript_RivalCharmander:: return CeruleanCity_EventScript_RivalStartExit:: - applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExit - applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExit + applymovement LOCALID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExit + applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalStartExit waitmovement 0 return CeruleanCity_EventScript_RivalStartExitRight:: - applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExitRight - applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExitRight + applymovement LOCALID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExitRight + applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalStartExitRight waitmovement 0 return @@ -189,7 +182,7 @@ CeruleanCity_EventScript_GruntDefeated:: msgbox CeruleanCity_Text_BetterGetMovingBye closemessage fadescreen FADE_TO_BLACK - removeobject LOCALID_GRUNT + removeobject LOCALID_CERULEAN_GRUNT fadescreen FADE_FROM_BLACK setflag FLAG_GOT_TM28_FROM_ROCKET release @@ -204,9 +197,9 @@ CeruleanCity_EventScript_NoRoomForTM28:: CeruleanCity_EventScript_GruntTriggerTop:: lockall setvar VAR_TEMP_1, 0 - applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_CERULEAN_GRUNT, Common_Movement_WalkInPlaceFasterUp waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 goto CeruleanCity_EventScript_GruntTrigger end @@ -214,9 +207,9 @@ CeruleanCity_EventScript_GruntTriggerTop:: CeruleanCity_EventScript_GruntTriggerBottom:: lockall setvar VAR_TEMP_1, 1 - applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_CERULEAN_GRUNT, Common_Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 goto CeruleanCity_EventScript_GruntTrigger end @@ -224,7 +217,7 @@ CeruleanCity_EventScript_GruntTriggerBottom:: CeruleanCity_EventScript_GruntTrigger:: textcolor NPC_TEXT_COLOR_MALE msgbox CeruleanCity_Text_GruntIntro - setvar VAR_LAST_TALKED, LOCALID_GRUNT + setvar VAR_LAST_TALKED, LOCALID_CERULEAN_GRUNT trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto CeruleanCity_EventScript_GruntDefeated @@ -235,7 +228,7 @@ CeruleanCity_EventScript_Policeman:: faceplayer msgbox CeruleanCity_Text_PeopleHereWereRobbed closemessage - applymovement LOCALID_POLICEMAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_CERULEAN_POLICEMAN, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -270,7 +263,7 @@ CeruleanCity_EventScript_Woman:: faceplayer msgbox CeruleanCity_Text_WantBrightRedBicycle closemessage - applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_CERULEAN_WOMAN, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -285,7 +278,7 @@ CeruleanCity_EventScript_Lass:: waitmessage delay 40 playse SE_PIN - applymovement LOCALID_SLOWBRO, Common_Movement_QuestionMark + applymovement LOCALID_CERULEAN_SLOWBRO, Common_Movement_QuestionMark waitmovement 0 delay 30 call_if_eq VAR_0x8008, 0, CeruleanCity_EventScript_SlowbroFailed1 diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 94190b086..108f40a1c 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -13,7 +13,7 @@ CeruleanCity_Gym_EventScript_MistyDefeated:: famechecker FAMECHECKER_MISTY, 1 setflag FLAG_DEFEATED_MISTY setflag FLAG_BADGE02_GET - setrespawn SPAWN_CERULEAN_CITY + setrespawn HEAL_LOCATION_CERULEAN_CITY set_gym_trainers 2 goto CeruleanCity_Gym_EventScript_GiveTM03 end diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index 48fad54a7..98ad025a6 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_WONDER_NEWS_BERRY_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index 42ddde3f2..afc16684b 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_WONDER_NEWS_BERRY_MAN, 1 - .set REWARD_TYPE, VAR_0x8004 .set REWARD_ITEM, VAR_0x8008 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 074444248..98ef71cd0 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_CERULEAN_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index 43325e929..9850fd25c 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ CeruleanCity_PokemonCenter_1F_MapScripts:: .byte 0 CeruleanCity_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_CERULEAN_CITY + setrespawn HEAL_LOCATION_CERULEAN_CITY end CeruleanCity_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 09e909d0c..9ea66b99a 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -55,6 +55,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CINNABAR_BILL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 20, @@ -69,6 +70,7 @@ "flag": "FLAG_HIDE_CINNABAR_BILL" }, { + "local_id": "LOCALID_CINNABAR_SEAGALLOP", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 23, diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index e2e17385a..3df941f11 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_BILL, 3 -.equ LOCALID_SEAGALLOP, 4 - CinnabarIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_OnFrame @@ -17,27 +14,27 @@ CinnabarIsland_OnTransition:: CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: savebgm MUS_FOLLOW_ME setflag FLAG_TEMP_2 - setobjectxyperm LOCALID_BILL, 15, 12 - setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT - setobjectxyperm LOCALID_SEAGALLOP, 30, 12 + setobjectxyperm LOCALID_CINNABAR_BILL, 15, 12 + setobjectmovementtype LOCALID_CINNABAR_BILL, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_CINNABAR_SEAGALLOP, 30, 12 return CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland:: getplayerxy VAR_0x8004, VAR_0x8005 goto_if_ge VAR_0x8004, 18, CinnabarIsland_EventScript_MoveSeagallopDown setflag FLAG_TEMP_2 - setobjectxyperm LOCALID_BILL, 18, 12 - setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP - setobjectxyperm LOCALID_SEAGALLOP, 30, 12 + setobjectxyperm LOCALID_CINNABAR_BILL, 18, 12 + setobjectmovementtype LOCALID_CINNABAR_BILL, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_CINNABAR_SEAGALLOP, 30, 12 return CinnabarIsland_EventScript_MoveSeagallopDown:: - setobjectxyperm LOCALID_SEAGALLOP, 30, 8 + setobjectxyperm LOCALID_CINNABAR_SEAGALLOP, 30, 8 return CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands:: - setobjectxyperm LOCALID_BILL, 21, 8 - setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_CINNABAR_BILL, 21, 8 + setobjectmovementtype LOCALID_CINNABAR_BILL, MOVEMENT_TYPE_FACE_UP return CinnabarIsland_EventScript_CheckUnlockGym:: @@ -70,9 +67,9 @@ CinnabarIsland_EventScript_ReturnFromSeviiIslands:: textcolor NPC_TEXT_COLOR_MALE msgbox CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain closemessage - applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExit + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillExit waitmovement 0 - removeobject LOCALID_BILL + removeobject LOCALID_CINNABAR_BILL setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4 setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE clearflag FLAG_HIDE_LOSTELLE_IN_HER_HOME @@ -94,9 +91,9 @@ CinnabarIsland_EventScript_BillScene:: call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer1 call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer2 playse SE_PIN - applymovement LOCALID_BILL, Common_Movement_ExclamationMark + applymovement LOCALID_CINNABAR_BILL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_BILL, Common_Movement_Delay48 + applymovement LOCALID_CINNABAR_BILL, Common_Movement_Delay48 waitmovement 0 call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer1 call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer2 @@ -107,24 +104,24 @@ CinnabarIsland_EventScript_BillScene:: end CinnabarIsland_EventScript_BillFacePlayer1:: - applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_CINNABAR_BILL, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return CinnabarIsland_EventScript_BillFacePlayer2:: - applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_CINNABAR_BILL, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return CinnabarIsland_EventScript_BillApproachPlayer1:: - applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer1 + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillApproachPlayer1 waitmovement 0 return CinnabarIsland_EventScript_BillApproachPlayer2:: - applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2 + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillApproachPlayer2 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return @@ -140,14 +137,14 @@ CinnabarIsland_EventScript_DeclineSailToOneIsland:: closemessage call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillExitToPokeCenter call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillReturnToPokeCenter - removeobject LOCALID_BILL + removeobject LOCALID_CINNABAR_BILL setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL releaseall end CinnabarIsland_EventScript_BillExitToPokeCenter:: - applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExitToPokeCenter + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillExitToPokeCenter waitmovement 0 return @@ -162,12 +159,12 @@ CinnabarIsland_Movement_BillExitToPokeCenter:: step_end CinnabarIsland_EventScript_BillReturnToPokeCenter:: - applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerWatchBillExit - applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachDoor + applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerWatchBillExit + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillApproachDoor waitmovement 0 opendoor 14, 11 waitdooranim - applymovement LOCALID_BILL, CinnabarIsland_Movement_BillReEnterPokeCenter + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillReEnterPokeCenter waitmovement 0 closedoor 14, 11 waitdooranim @@ -193,7 +190,7 @@ CinnabarIsland_Movement_BillReEnterPokeCenter:: @ Can be triggered outside, or after talking to Bill in the poke center CinnabarIsland_EventScript_SailToOneIsland:: call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_ApproachShore - addobject LOCALID_SEAGALLOP + addobject LOCALID_CINNABAR_SEAGALLOP call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArrive call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArriveExitedPokeCenter msgbox CinnabarIsland_Text_MyPalsBoatArrived @@ -201,7 +198,7 @@ CinnabarIsland_EventScript_SailToOneIsland:: call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoat call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoatExitedPokeCenter setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 - removeobject LOCALID_BILL + removeobject LOCALID_CINNABAR_BILL delay 40 setflag FLAG_HIDE_CINNABAR_SEAGALLOP setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1 @@ -211,31 +208,31 @@ CinnabarIsland_EventScript_SailToOneIsland:: end CinnabarIsland_EventScript_ApproachShore:: - applymovement LOCALID_BILL, CinnabarIsland_Movement_ApproachShore - applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ApproachShore + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_ApproachShore + applymovement LOCALID_PLAYER, CinnabarIsland_Movement_ApproachShore waitmovement 0 return CinnabarIsland_EventScript_BoatArrive:: - applymovement LOCALID_BILL, CinnabarIsland_Movement_BillFaceBoat - applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillFaceBoat + applymovement LOCALID_CINNABAR_SEAGALLOP, CinnabarIsland_Movement_BoatArrive waitmovement 0 return CinnabarIsland_EventScript_BoatArriveExitedPokeCenter:: - applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive + applymovement LOCALID_CINNABAR_SEAGALLOP, CinnabarIsland_Movement_BoatArrive waitmovement 0 return CinnabarIsland_EventScript_BoardBoat:: - applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoat - applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoat + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillBoardBoat + applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoat waitmovement 0 return CinnabarIsland_EventScript_BoardBoatExitedPokeCenter:: - applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoatFromShore - applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore + applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillBoardBoatFromShore + applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore waitmovement 0 return @@ -313,12 +310,12 @@ CinnabarIsland_Movement_PlayerBoardBoatFromShore:: @ Triggered when VAR_TEMP_1 is 0 CinnabarIsland_EventScript_GymDoorLocked:: lockall - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 msgbox CinnabarIsland_Text_DoorIsLocked closemessage - applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ForcePlayerFromDoor + applymovement LOCALID_PLAYER, CinnabarIsland_Movement_ForcePlayerFromDoor waitmovement 0 releaseall end diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 0a1fa5e2e..ba4ec7d86 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_QUINN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 25, @@ -44,6 +45,7 @@ "flag": "0" }, { + "local_id": "LOCALID_AVERY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 17, @@ -58,6 +60,7 @@ "flag": "0" }, { + "local_id": "LOCALID_RAMON", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 16, @@ -72,6 +75,7 @@ "flag": "0" }, { + "local_id": "LOCALID_DEREK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 16, @@ -86,6 +90,7 @@ "flag": "0" }, { + "local_id": "LOCALID_DUSTY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 4, @@ -100,6 +105,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ZAC", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 38ec546f6..b160155e0 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -1,10 +1,3 @@ -.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:: map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_Gym_OnLoad .byte 0 @@ -64,7 +57,7 @@ CinnabarIsland_Gym_EventScript_DefeatedBlaine:: famechecker FAMECHECKER_BLAINE, 1 setflag FLAG_DEFEATED_BLAINE setflag FLAG_BADGE07_GET - setrespawn SPAWN_CINNABAR_ISLAND + setrespawn HEAL_LOCATION_CINNABAR_ISLAND setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1 clearflag FLAG_HIDE_CINNABAR_BILL set_gym_trainers 7 @@ -271,13 +264,13 @@ CinnabarIsland_Gym_EventScript_BattleQuinn:: end CinnabarIsland_Gym_EventScript_QuinnApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_QuinnApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachRight waitmovement 0 return @@ -343,13 +336,13 @@ CinnabarIsland_Gym_EventScript_BattleAvery:: end CinnabarIsland_Gym_EventScript_AveryApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery + applymovement LOCALID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery applymovement LOCALID_AVERY, CinnabarIsland_Gym_Movement_AveryApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_AveryApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery + applymovement LOCALID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery applymovement LOCALID_AVERY, CinnabarIsland_Gym_Movement_AveryApproachRight waitmovement 0 return @@ -424,13 +417,13 @@ CinnabarIsland_Gym_EventScript_BattleRamon:: end CinnabarIsland_Gym_EventScript_RamonApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_RamonApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachRight waitmovement 0 return @@ -496,13 +489,13 @@ CinnabarIsland_Gym_EventScript_BattleDerek:: end CinnabarIsland_Gym_EventScript_DerekApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_DerekApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachRight waitmovement 0 return @@ -568,13 +561,13 @@ CinnabarIsland_Gym_EventScript_BattleDusty:: end CinnabarIsland_Gym_EventScript_DustyApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_DustyApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachRight waitmovement 0 return @@ -640,13 +633,13 @@ CinnabarIsland_Gym_EventScript_BattleZac:: end CinnabarIsland_Gym_EventScript_ZacApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_ZacApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachRight waitmovement 0 return diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 9491f5f43..a89d9c479 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_CINNABAR_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, @@ -100,6 +101,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { + "local_id": "LOCALID_CINNABAR_POKEMON_CENTER_BILL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 11, diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 5f0b86d7e..bb7f622bd 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,12 +1,10 @@ -.set LOCALID_BILL, 7 - CinnabarIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 CinnabarIsland_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_CINNABAR_ISLAND + setrespawn HEAL_LOCATION_CINNABAR_ISLAND end CinnabarIsland_PokemonCenter_1F_EventScript_Nurse:: @@ -43,7 +41,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: call_if_eq VAR_FACING, DIR_SOUTH, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth call_if_eq VAR_FACING, DIR_EAST, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast call_if_eq VAR_FACING, DIR_WEST, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest - removeobject LOCALID_BILL + removeobject LOCALID_CINNABAR_POKEMON_CENTER_BILL setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 clearflag FLAG_HIDE_CINNABAR_BILL warp MAP_CINNABAR_ISLAND, 14, 11 @@ -52,20 +50,20 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: end CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth:: - applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit - applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth + applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit + applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth waitmovement 0 return CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast:: - applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast - applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast + applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast + applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast waitmovement 0 return CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest:: - applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit - applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest + applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit + applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest waitmovement 0 return diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 2da00d1c3..ec4f16ca0 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -59,7 +59,7 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 32, "y": 9, - "target_local_id": 4, + "target_local_id": "LOCALID_FIVE_ISLAND_MEADOW_BORDER_TREE", "target_map": "MAP_FIVE_ISLAND_MEADOW" } ], diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index d7b55d659..55d7ceb1b 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_LOST_CAVE_SELPHY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 646136ff4..1ead85aa0 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_SELPHY, 1 - FiveIsland_LostCave_Room10_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, FiveIsland_LostCave_Room10_OnResume map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_LostCave_Room10_OnFrame @@ -20,10 +18,10 @@ FiveIsland_LostCave_Room10_OnFrame:: FiveIsland_LostCave_Room10_EventScript_FindSelphyScene:: lockall textcolor NPC_TEXT_COLOR_FEMALE - applymovement LOCALID_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyWander + applymovement LOCALID_LOST_CAVE_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyWander waitmovement 0 delay 100 - applymovement LOCALID_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyApproach + applymovement LOCALID_LOST_CAVE_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_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index b543265d1..0ca0d71df 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -69,6 +69,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "local_id": "LOCALID_FIVE_ISLAND_MEADOW_BORDER_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 8, diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 73c15634a..b49632264 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "local_id": "LOCALID_MEMORIAL_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 8, diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 0fb6a4a24..42ba87e91 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_MEMORIAL_MAN, 1 - FiveIsland_MemorialPillar_MapScripts:: .byte 0 @@ -57,7 +55,7 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: applymovement LOCALID_MEMORIAL_MAN, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 45 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 textcolor NPC_TEXT_COLOR_MALE msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index 7d8d75de3..530899734 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_FIVE_ISLAND_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index ac8c5328e..5c9016686 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_PokemonCenter_1F_MapScripts:: .byte 0 FiveIsland_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_FIVE_ISLAND + setrespawn HEAL_LOCATION_FIVE_ISLAND end FiveIsland_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 80ddcafab..190434771 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -120,6 +120,7 @@ "flag": "0" }, { + "local_id": "LOCALID_RESORT_GORGEOUS_SELPHY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 39, diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index 6ff14d475..df2b867b8 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_SELPHY, 8 - FiveIsland_ResortGorgeous_MapScripts:: map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_ResortGorgeous_OnWarp map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_ResortGorgeous_OnFrame @@ -10,7 +8,7 @@ FiveIsland_ResortGorgeous_OnWarp:: .2byte 0 FiveIsland_ResortGorgeous_EventScript_TurnPlayerNorth:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH end FiveIsland_ResortGorgeous_OnFrame:: @@ -22,15 +20,15 @@ FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene:: textcolor NPC_TEXT_COLOR_FEMALE msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow closemessage - applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_RESORT_GORGEOUS_SELPHY, Common_Movement_WalkInPlaceFasterUp waitmovement 0 opendoor 39, 8 waitdooranim - applymovement LOCALID_SELPHY, FiveIsland_ResortGorgeous_Movement_SelphyEnterHome + applymovement LOCALID_RESORT_GORGEOUS_SELPHY, FiveIsland_ResortGorgeous_Movement_SelphyEnterHome waitmovement 0 closedoor 39, 8 waitdooranim - removeobject LOCALID_SELPHY + removeobject LOCALID_RESORT_GORGEOUS_SELPHY clearflag FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 2 releaseall diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index bec5ba745..cf910dc53 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, @@ -30,6 +31,7 @@ "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY" }, { + "local_id": "LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 885ae0d87..32ec5021c 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_SELPHY, 1 -.equ LOCALID_BUTLER, 2 - .equ SHOWN_REQUESTED_MON, FLAG_TEMP_2 FiveIsland_ResortGorgeous_House_MapScripts:: @@ -39,12 +36,12 @@ FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: special SampleResortGorgeousMonAndReward msgbox FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou - addobject LOCALID_BUTLER - applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter + addobject LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter waitmovement 0 textcolor NPC_TEXT_COLOR_MALE msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady - applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterUp waitmovement 0 textcolor NPC_TEXT_COLOR_FEMALE msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation @@ -55,7 +52,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: call_if_eq VAR_FACING, DIR_SOUTH, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth call_if_eq VAR_FACING, DIR_EAST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast call_if_eq VAR_FACING, DIR_WEST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest - copyobjectxytoperm LOCALID_BUTLER + copyobjectxytoperm LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER msgbox FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks giveitem VAR_RESORT_GORGEOUS_REWARD goto_if_eq VAR_RESULT, FALSE, FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward @@ -65,30 +62,30 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: end FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth:: - applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth:: - applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast:: - applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterLeft - applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest:: - applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest + applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest waitmovement 0 return diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 63a27af82..876cb157b 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_WAREHOUSE_GRUNT2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 15, @@ -30,6 +31,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "local_id": "LOCALID_WAREHOUSE_GRUNT3", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 17, @@ -44,6 +46,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "local_id": "LOCALID_WAREHOUSE_ADMIN1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_F", "x": 27, @@ -58,6 +61,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "local_id": "LOCALID_WAREHOUSE_ADMIN2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 25, diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 26dd0a5b5..846909f0c 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -1,9 +1,3 @@ -.equ LOCALID_GRUNT1, 5 -.equ LOCALID_GRUNT2, 1 -.equ LOCALID_GRUNT3, 2 -.equ LOCALID_ADMIN1, 3 -.equ LOCALID_ADMIN2, 4 - .equ PLAYER_X_POS, VAR_0x8004 .equ PLAYER_Y_POS, VAR_0x8005 @@ -43,7 +37,7 @@ FiveIsland_RocketWarehouse_EventScript_Computer:: FiveIsland_RocketWarehouse_EventScript_Admin2Trigger:: lockall - applymovement LOCALID_ADMIN2, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_WAREHOUSE_ADMIN2, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 releaseall @@ -88,10 +82,10 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle closemessage fadescreen FADE_TO_BLACK - removeobject LOCALID_GRUNT2 - removeobject LOCALID_GRUNT3 - removeobject LOCALID_ADMIN2 - removeobject LOCALID_ADMIN1 + removeobject LOCALID_WAREHOUSE_GRUNT2 + removeobject LOCALID_WAREHOUSE_GRUNT3 + removeobject LOCALID_WAREHOUSE_ADMIN2 + removeobject LOCALID_WAREHOUSE_ADMIN1 setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 @@ -100,7 +94,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: end FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return @@ -138,32 +132,32 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1:: FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1:: goto_if_eq PLAYER_X_POS, 27, EventScript_Return - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar:: - applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar + applymovement LOCALID_WAREHOUSE_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar waitmovement 0 return FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch:: - applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch + applymovement LOCALID_WAREHOUSE_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch waitmovement 0 return FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch:: - applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_WAREHOUSE_ADMIN1, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft:: - applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_WAREHOUSE_ADMIN1, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown:: - applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_WAREHOUSE_ADMIN1, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index b347b7606..b807d3fbd 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_FOUR_ISLAND_DAYCARE_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 16, @@ -142,6 +143,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST" }, { + "local_id": "LOCALID_FOUR_ISLAND_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 8, diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 8d19847d2..9abec8cad 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_DAYCARE_MAN, 1 -.equ LOCALID_RIVAL, 10 - FourIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame @@ -18,7 +15,7 @@ FourIsland_EventScript_ShowRival:: FourIsland_EventScript_TrySetDayCareManPos:: goto_if_unset FLAG_PENDING_DAYCARE_EGG, FourIsland_EventScript_EndSetDayCareManPos - setobjectxyperm LOCALID_DAYCARE_MAN, 16, 14 + setobjectxyperm LOCALID_FOUR_ISLAND_DAYCARE_MAN, 16, 14 FourIsland_EventScript_EndSetDayCareManPos:: return @@ -29,25 +26,25 @@ FourIsland_OnFrame:: FourIsland_EventScript_RivalScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_FOUR_ISLAND_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_FOUR_ISLAND_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_FOUR_ISLAND_RIVAL, Common_Movement_Delay48 waitmovement 0 delay 25 - applymovement LOCALID_RIVAL, FourIsland_Movement_RivalApproach + applymovement LOCALID_FOUR_ISLAND_RIVAL, FourIsland_Movement_RivalApproach waitmovement 0 msgbox FourIsland_Text_RivalAlreadyGotEggBeSmellingYa closemessage - applymovement OBJ_EVENT_ID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit - applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit + applymovement LOCALID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit + applymovement LOCALID_FOUR_ISLAND_RIVAL, FourIsland_Movement_RivalExit waitmovement 0 fadedefaultbgm playse SE_EXIT delay 35 - removeobject LOCALID_RIVAL + removeobject LOCALID_FOUR_ISLAND_RIVAL setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 releaseall end diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index 70e18a4c3..7f456810b 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_STICKER_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index d4d06e357..38c893de1 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -19,7 +19,7 @@ FourIsland_IcefallCave_1F_OnFrame:: FourIsland_IcefallCave_1F_EventScript_FallDownHole:: lockall delay 20 - applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible + applymovement LOCALID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible waitmovement 0 playse SE_FALL delay 60 diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index be6cb7c39..8bcf653bd 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_ICEFALL_ROCKET1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 11, @@ -30,6 +31,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { + "local_id": "LOCALID_ICEFALL_ROCKET2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, @@ -44,6 +46,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { + "local_id": "LOCALID_ICEFALL_LORELEI", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LORELEI", "x": 12, @@ -58,6 +61,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" }, { + "local_id": "LOCALID_ICEFALL_ROCKET3", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 67faf20ac..07fa58a3d 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -1,8 +1,3 @@ -.equ LOCALID_ROCKET1, 1 -.equ LOCALID_ROCKET2, 2 -.equ LOCALID_LORELEI, 3 -.equ LOCALID_ROCKET3, 4 - FourIsland_IcefallCave_Back_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition .byte 0 @@ -19,39 +14,39 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: lockall textcolor NPC_TEXT_COLOR_FEMALE msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons - applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown + applymovement LOCALID_ICEFALL_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown waitmovement 0 textcolor NPC_TEXT_COLOR_MALE msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe closemessage playse SE_PIN - applymovement LOCALID_LORELEI, Common_Movement_ExclamationMark + applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement LOCALID_LORELEI, Common_Movement_Delay48 + applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_Delay48 waitmovement 0 textcolor NPC_TEXT_COLOR_FEMALE msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut closemessage - applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 18 - applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 35 - applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei - applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets - applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets + applymovement LOCALID_ICEFALL_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei + applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets + applymovement LOCALID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets waitmovement 0 - applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown + applymovement LOCALID_ICEFALL_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown waitmovement 0 playbgm MUS_ENCOUNTER_ROCKET, 0 textcolor NPC_TEXT_COLOR_MALE msgbox FourIsland_IcefallCave_Back_Text_GruntIntro - setvar VAR_LAST_TALKED, LOCALID_ROCKET3 + setvar VAR_LAST_TALKED, LOCALID_ICEFALL_ROCKET3 trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, FourIsland_IcefallCave_Back_Text_GruntDefeat - applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp + applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp waitmovement 0 textcolor NPC_TEXT_COLOR_FEMALE msgbox FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons @@ -64,24 +59,24 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: playmoncry SPECIES_LAPRAS, CRY_MODE_ENCOUNTER waitbuttonpress waitmoncry - applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat + applymovement LOCALID_ICEFALL_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat waitmovement 0 textcolor NPC_TEXT_COLOR_MALE msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland closemessage - applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit - applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit - applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit - applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit - applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit + applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit + applymovement LOCALID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit + applymovement LOCALID_ICEFALL_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit + applymovement LOCALID_ICEFALL_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit + applymovement LOCALID_ICEFALL_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit waitmovement 0 - removeobject LOCALID_ROCKET1 - removeobject LOCALID_ROCKET2 - removeobject LOCALID_ROCKET3 + removeobject LOCALID_ICEFALL_ROCKET1 + removeobject LOCALID_ICEFALL_ROCKET2 + removeobject LOCALID_ICEFALL_ROCKET3 delay 50 - applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer + applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 textcolor NPC_TEXT_COLOR_FEMALE msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index c6e9f2aba..8956a19b2 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_FOUR_ISLAND_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index 630ad96b3..3b9088454 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ FourIsland_PokemonCenter_1F_MapScripts:: .byte 0 FourIsland_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_FOUR_ISLAND + setrespawn HEAL_LOCATION_FOUR_ISLAND end FourIsland_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 380c5574d..e2314d313 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_FOUR_ISLAND_DAYCARE_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 2, diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index fb2a1fbc7..2ecd7d481 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_DAYCARE_WOMAN, 1 - FourIsland_PokemonDayCare_MapScripts:: .byte 0 @@ -113,7 +111,7 @@ FourIsland_PokemonDayCare_CheckEnoughMoney:: end FourIsland_PokemonDayCare_RetrieveMon:: - applymovement LOCALID_DAYCARE_WOMAN, FourIsland_PokemonDayCare_Movement_RetrieveMon + applymovement LOCALID_FOUR_ISLAND_DAYCARE_WOMAN, FourIsland_PokemonDayCare_Movement_RetrieveMon waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 9d1b7c252..ef8fe462c 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_FUCHSIA_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index 4aad5d24d..7dcd89587 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ FuchsiaCity_PokemonCenter_1F_MapScripts:: .byte 0 FuchsiaCity_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_FUCHSIA_CITY + setrespawn HEAL_LOCATION_FUCHSIA_CITY end FuchsiaCity_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 77cd336ce..959957400 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -12,11 +12,11 @@ FuchsiaCity_SafariZone_Entrance_OnFrame:: FuchsiaCity_SafariZone_Entrance_EventScript_ExitWalkIn:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter + applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter waitmovement 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain closemessage - applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit2 + applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit2 waitmovement 0 special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 @@ -29,7 +29,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitWarpIn:: textcolor NPC_TEXT_COLOR_MALE msgbox FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain closemessage - applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit + applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit waitmovement 0 special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 @@ -44,7 +44,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly:: goto_if_eq VAR_RESULT, NO, FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone msgbox FuchsiaCity_SafariZone_Entrance_Text_PleaseReturnSafariBalls closemessage - applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit + applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit waitmovement 0 special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 @@ -54,7 +54,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly:: FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone:: msgbox FuchsiaCity_SafariZone_Entrance_Text_GoodLuck closemessage - applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ReEnter + applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ReEnter waitmovement 0 warp MAP_SAFARI_ZONE_CENTER, 26, 30 waitstate @@ -100,7 +100,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft:: FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone:: textcolor NPC_TEXT_COLOR_MALE msgbox FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 showmoneybox 0, 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500, MSGBOX_YESNO @@ -134,17 +134,17 @@ FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: end FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneRight:: - applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneRight + applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneRight waitmovement 0 return FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneMid:: - applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneMid + applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneMid waitmovement 0 return FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneLeft:: - applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneLeft + applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneLeft waitmovement 0 return @@ -165,7 +165,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_NotEnoughMoney:: FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack:: closemessage hidemoneybox - applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ForceBack + applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ForceBack waitmovement 0 releaseall end diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 13d14c825..1d3903bf1 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "local_id": "LOCALID_CREDITS_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 11, @@ -36,6 +37,7 @@ "flag": "FLAG_HIDE_CREDITS_RIVAL" }, { + "local_id": "LOCALID_CREDITS_PROF_OAK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 11, diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 6c46913d7..b2291ca77 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_RIVAL, 1 -.equ LOCALID_PROF_OAK, 2 - IndigoPlateau_Exterior_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_Exterior_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_Exterior_OnFrame @@ -32,54 +29,54 @@ IndigoPlateau_Exterior_EventScript_Credits:: opendoor 11, 6 waitdooranim special SpawnCameraObject - addobject LOCALID_RIVAL - applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding - applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay + addobject LOCALID_CREDITS_RIVAL + applymovement LOCALID_CREDITS_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding + applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay waitmovement 0 closedoor 11, 6 waitdooranim @ Rival runs off - applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave - applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalLeave + applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave + applymovement LOCALID_CREDITS_RIVAL, IndigoPlateau_Exterior_Movement_RivalLeave waitmovement 0 delay 100 @ Oak exits building opendoor 11, 6 waitdooranim - addobject LOCALID_PROF_OAK - applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding + addobject LOCALID_CREDITS_PROF_OAK + applymovement LOCALID_CREDITS_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding waitmovement 0 closedoor 11, 6 waitdooranim delay 160 @ Oak looks at player, then walks off - applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave - applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakLeave + applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave + applymovement LOCALID_CREDITS_PROF_OAK, IndigoPlateau_Exterior_Movement_OakLeave waitmovement 0 delay 100 @ Player begin to leave - applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerBeginLeave + applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerBeginLeave waitmovement 0 delay 155 - applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerFaceLeague + applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerFaceLeague waitmovement 0 delay 90 @ Player runs off - applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerTurnAround + applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerTurnAround waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerLeave + applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerLeave waitmovement 0 @ Reset the map state and roll the credits special RemoveCameraObject setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0 - removeobject LOCALID_RIVAL - removeobject LOCALID_PROF_OAK + removeobject LOCALID_CREDITS_RIVAL + removeobject LOCALID_CREDITS_PROF_OAK special DoCredits waitstate releaseall diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 7955bd1cd..88f8487a9 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -30,6 +30,7 @@ "flag": "0" }, { + "local_id": "LOCALID_LEAGUE_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 13, @@ -58,6 +59,7 @@ "flag": "0" }, { + "local_id": "LOCALID_LEAGUE_DOOR_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 5, diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index bb6d74b5f..6b0120cf9 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,19 +1,17 @@ -.set LOCALID_DOOR_GUARD, 4 - IndigoPlateau_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 IndigoPlateau_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_INDIGO_PLATEAU + setrespawn HEAL_LOCATION_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled call_if_eq VAR_RESULT, TRUE, IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor end IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor:: goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return - setobjectxyperm LOCALID_DOOR_GUARD, 4, 2 + setobjectxyperm LOCALID_LEAGUE_DOOR_GUARD, 4, 2 return IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard:: diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 055802ae6..1c1c56edc 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_LAVENDER_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index a9ce2ec30..2f4cb3cb5 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ LavenderTown_PokemonCenter_1F_MapScripts:: .byte 0 LavenderTown_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_LAVENDER_TOWN + setrespawn HEAL_LOCATION_LAVENDER_TOWN end LavenderTown_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index a755bbd0b..e92128251 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -30,6 +30,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MT_EMBER_GRUNT1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 41, @@ -44,6 +45,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { + "local_id": "LOCALID_MT_EMBER_GRUNT2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 42, diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 6bfe3cbfa..fb8c5392f 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_GRUNT1, 2 -.set LOCALID_GRUNT2, 3 - MtEmber_Exterior_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Exterior_OnTransition map_script MAP_SCRIPT_ON_LOAD, MtEmber_Exterior_OnLoad @@ -12,8 +9,8 @@ MtEmber_Exterior_OnTransition:: end MtEmber_Exterior_EventScript_RocketsFaceDown:: - setobjectmovementtype LOCALID_GRUNT1, MOVEMENT_TYPE_FACE_DOWN - setobjectmovementtype LOCALID_GRUNT2, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype LOCALID_MT_EMBER_GRUNT1, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype LOCALID_MT_EMBER_GRUNT2, MOVEMENT_TYPE_FACE_DOWN return MtEmber_Exterior_OnLoad:: @@ -38,7 +35,7 @@ MtEmber_Exterior_EventScript_Grunt1Defeated:: end MtEmber_Exterior_EventScript_BattleGrunt1:: - applymovement LOCALID_GRUNT1, Common_Movement_FacePlayer + applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_FacePlayer waitmovement 0 playbgm MUS_ENCOUNTER_ROCKET, 0 msgbox MtEmber_Exterior_Text_Grunt1Intro @@ -52,8 +49,8 @@ MtEmber_Exterior_EventScript_DefeatedBothGrunts:: msgbox MtEmber_Exterior_Text_WellRegroupDontStepInsideThere closemessage fadescreen FADE_TO_BLACK - removeobject LOCALID_GRUNT1 - removeobject LOCALID_GRUNT2 + removeobject LOCALID_MT_EMBER_GRUNT1 + removeobject LOCALID_MT_EMBER_GRUNT2 fadescreen FADE_FROM_BLACK release end @@ -65,7 +62,7 @@ MtEmber_Exterior_EventScript_Grunt2:: goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4, MtEmber_Exterior_EventScript_BattleGrunt2 msgbox MtEmber_Exterior_Text_YoureInTheWayGetLost closemessage - applymovement LOCALID_GRUNT2, Common_Movement_FaceOriginalDirection + applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -91,18 +88,18 @@ MtEmber_Exterior_EventScript_RocketPasswordScene:: message MtEmber_Exterior_Text_WhatsPasswordAgain waitmessage playse SE_PIN - applymovement LOCALID_GRUNT2, Common_Movement_QuestionMark + applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_QuestionMark waitmovement 0 waitbuttonpress msgbox MtEmber_Exterior_Text_FirstPasswordGoldeen - applymovement LOCALID_GRUNT1, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_GRUNT1, Common_Movement_ExclamationMark + applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_GRUNT1, Common_Movement_Delay48 + applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_GRUNT2, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_WalkInPlaceFasterDown waitmovement 0 call MtEmber_Exterior_EventScript_RocketsFaceDown msgbox MtEmber_Exterior_Text_SnoopsBeenListeningIn diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 87a812708..ba1e1f222 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_RUBY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 5a1751eb9..949e17660 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_RUBY, 1 - MtEmber_RubyPath_B3F_MapScripts:: .byte 0 diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 259a6ed50..f1e0129d2 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_DOME_FOSSIL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 13, @@ -30,6 +31,7 @@ "flag": "FLAG_HIDE_DOME_FOSSIL" }, { + "local_id": "LOCALID_HELIX_FOSSIL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 14, @@ -44,6 +46,7 @@ "flag": "FLAG_HIDE_HELIX_FOSSIL" }, { + "local_id": "LOCALID_MIGUEL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 13, diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index d69d69d96..2cd079852 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -1,7 +1,3 @@ -.equ LOCALID_DOME_FOSSIL, 1 -.equ LOCALID_HELIX_FOSSIL, 2 -.equ LOCALID_MIGUEL, 3 - MtMoon_B2F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition .byte 0 diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index faa3eef81..feabdef64 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_NAVEL_ROCK_LUGIA", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LUGIA", "x": 10, diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 4919a5ac4..9984658a7 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_LUGIA, 1 - NavelRock_Base_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Base_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Base_OnResume @@ -26,7 +24,7 @@ NavelRock_Base_OnResume:: NavelRock_Base_EventScript_TryRemoveLugia:: specialvar VAR_RESULT, GetBattleOutcome goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return - removeobject LOCALID_LUGIA + removeobject LOCALID_NAVEL_ROCK_LUGIA return NavelRock_Base_EventScript_Lugia:: diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 64eb420c5..582e51e10 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_NAVEL_ROCK_HO_OH", "type": "object", "graphics_id": "OBJ_EVENT_GFX_HO_OH", "x": 9, diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 068f99a03..7dd3f0e94 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_HO_OH, 1 - NavelRock_Summit_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Summit_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Summit_OnResume @@ -29,7 +27,7 @@ NavelRock_Summit_OnResume:: NavelRock_Summit_EventScript_TryRemoveHoOh:: specialvar VAR_RESULT, GetBattleOutcome goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return - removeobject LOCALID_HO_OH + removeobject LOCALID_NAVEL_ROCK_HO_OH return NavelRock_Summit_EventScript_HoOh:: @@ -41,8 +39,8 @@ NavelRock_Summit_EventScript_HoOh:: setvar VAR_0x8004, 3 @ Num loops setvar VAR_0x8005, 35 @ Delay special LoopWingFlapSound - applymovement LOCALID_HO_OH, Movement_HoOhAppear - applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp + applymovement LOCALID_NAVEL_ROCK_HO_OH, Movement_HoOhAppear + applymovement LOCALID_CAMERA, Movement_CameraPanUp waitmovement 0 delay 50 setweather 0 @@ -55,8 +53,8 @@ NavelRock_Summit_EventScript_HoOh:: setvar VAR_0x8004, 3 @ Num loops setvar VAR_0x8005, 35 @ Delay special LoopWingFlapSound - applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown - applymovement LOCALID_HO_OH, Movement_HoOhApproach + applymovement LOCALID_CAMERA, Movement_CameraPanDown + applymovement LOCALID_NAVEL_ROCK_HO_OH, Movement_HoOhApproach waitmovement 0 special RemoveCameraObject seteventmon SPECIES_HO_OH, 70 @@ -64,7 +62,7 @@ NavelRock_Summit_EventScript_HoOh:: special StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - setvar VAR_LAST_TALKED, LOCALID_HO_OH + setvar VAR_LAST_TALKED, LOCALID_NAVEL_ROCK_HO_OH specialvar VAR_RESULT, GetBattleOutcome goto_if_eq VAR_RESULT, B_OUTCOME_WON, NavelRock_Summit_EventScript_DefeatedHoOh goto_if_eq VAR_RESULT, B_OUTCOME_RAN, NavelRock_Summit_EventScript_RanFromHoOh diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index f8ac5c92d..d6274409e 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_ONE_ISLAND_BILL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 12, diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 8cab73528..6afd7cd76 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_BILL, 1 - OneIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame @@ -16,21 +14,21 @@ OneIsland_OnFrame:: OneIsland_EventScript_EnterOneIslandFirstTime:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerExitHarbor + applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerExitHarbor waitmovement 0 msgbox OneIsland_Text_BillLetsGoSeeCelio closemessage - applymovement LOCALID_BILL, OneIsland_Movement_BillWalkToPokeCenter - applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerWalkToPokeCenter + applymovement LOCALID_ONE_ISLAND_BILL, OneIsland_Movement_BillWalkToPokeCenter + applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerWalkToPokeCenter waitmovement 0 opendoor 14, 5 waitdooranim - applymovement LOCALID_BILL, OneIsland_Movement_BillEnterPokeCenter - applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerEnterPokeCenter + applymovement LOCALID_ONE_ISLAND_BILL, OneIsland_Movement_BillEnterPokeCenter + applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerEnterPokeCenter waitmovement 0 closedoor 14, 5 waitdooranim - removeobject LOCALID_BILL + removeobject LOCALID_ONE_ISLAND_BILL setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 3 warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 9, 9 waitstate diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 0c0c2238e..84006d70e 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -8,7 +8,7 @@ OneIsland_Harbor_OnWarp:: .2byte 0 OneIsland_Harbor_EventScript_TurnPlayerNorth:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH end OneIsland_Harbor_OnFrame:: @@ -18,7 +18,7 @@ OneIsland_Harbor_OnFrame:: OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor + applymovement LOCALID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor waitmovement 0 setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2 warp MAP_ONE_ISLAND, 12, 18 diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 98c9bb585..d5a27329a 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_ONE_ISLAND_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 5, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 14, @@ -44,6 +46,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL" }, { + "local_id": "LOCALID_CELIO", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CELIO", "x": 15, diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index bb05cbec4..7ee71de1a 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_BILL, 2 -.equ LOCALID_CELIO, 3 - OneIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -28,7 +25,7 @@ OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn:: return OneIsland_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_ONE_ISLAND + setrespawn HEAL_LOCATION_ONE_ISLAND call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6, OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos call_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2, OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos @@ -39,15 +36,15 @@ OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone:: return OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos:: - setobjectxyperm LOCALID_BILL, 9, 8 - setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, 9, 8 + setobjectmovementtype LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, MOVEMENT_TYPE_FACE_UP setobjectxyperm LOCALID_CELIO, 15, 6 setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_UP return OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos:: - setobjectxyperm LOCALID_BILL, 14, 7 - setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, 14, 7 + setobjectmovementtype LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, MOVEMENT_TYPE_FACE_LEFT setobjectxyperm LOCALID_CELIO, 14, 8 setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_LEFT return @@ -59,11 +56,11 @@ OneIsland_PokemonCenter_1F_OnFrame:: OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio - applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio + applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 playse SE_PIN applymovement LOCALID_CELIO, Common_Movement_ExclamationMark @@ -74,13 +71,13 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut msgbox OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing - applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio - applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterRight waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 call_if_set FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp call_if_unset FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp @@ -92,12 +89,12 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours closemessage - applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou - applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_OBTAIN_KEY_ITEM @@ -112,7 +109,7 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: setflag FLAG_SYS_SEVII_MAP_123 msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater closemessage - applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterUp waitmovement 0 applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -192,7 +189,7 @@ OneIsland_PokemonCenter_1F_EventScript_Bill:: end OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll:: - applymovement LOCALID_BILL, Common_Movement_FacePlayer + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_FacePlayer waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore release @@ -440,7 +437,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom:: OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: textcolor NPC_TEXT_COLOR_MALE playse SE_PIN - applymovement LOCALID_BILL, Common_Movement_ExclamationMark + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_ExclamationMark waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer closemessage @@ -450,36 +447,36 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: call_if_eq VAR_TEMP_1, 4, OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom delay 10 msgbox OneIsland_PokemonCenter_1F_Text_BillWeGotItDone - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick - applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot msgbox OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe closemessage - applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 delay 10 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 15 msgbox OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto closemessage - applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 15 applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime closemessage delay 25 - applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit - applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit + applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit + applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit waitmovement 0 playse SE_EXIT setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL @@ -492,22 +489,22 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: end OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillTop:: - applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop + applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop waitmovement 0 return OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidTop:: - applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop + applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop waitmovement 0 return OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidBottom:: - applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom + applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom waitmovement 0 return OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom:: - applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom + applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom waitmovement 0 return diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 355411bc1..802d32dc6 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_PALLET_SIGN_LADY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 3, @@ -41,6 +42,7 @@ "flag": "0" }, { + "local_id": "LOCALID_PALLET_FAT_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, @@ -55,6 +57,7 @@ "flag": "0" }, { + "local_id": "LOCALID_PALLET_PROF_OAK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 10, diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 95f757e71..1384b7d6c 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_SIGN_LADY, 1 -.equ LOCALID_PROF_OAK, 3 - .equ SIGN_LADY_READY, VAR_TEMP_2 PalletTown_MapScripts:: @@ -27,13 +24,13 @@ PalletTown_EventScript_SetSignLadyDone:: PalletTown_EventScript_SetSignLadyPos:: goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_MoveSignLadyToRouteEntrance - setobjectxyperm LOCALID_SIGN_LADY, 5, 15 - setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_PALLET_SIGN_LADY, 5, 15 + setobjectmovementtype LOCALID_PALLET_SIGN_LADY, MOVEMENT_TYPE_FACE_UP return PalletTown_EventScript_MoveSignLadyToRouteEntrance:: - setobjectxyperm LOCALID_SIGN_LADY, 12, 2 - setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_PALLET_SIGN_LADY, 12, 2 + setobjectmovementtype LOCALID_PALLET_SIGN_LADY, MOVEMENT_TYPE_FACE_DOWN setvar SIGN_LADY_READY, TRUE return @@ -45,10 +42,10 @@ PalletTown_OnFrame:: PalletTown_EventScript_OakRatingScene:: lockall textcolor NPC_TEXT_COLOR_MALE - setobjectxyperm LOCALID_PROF_OAK, 14, 14 - setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT - addobject LOCALID_PROF_OAK - applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToPlayersDoor + setobjectxyperm LOCALID_PALLET_PROF_OAK, 14, 14 + setobjectmovementtype LOCALID_PALLET_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT + addobject LOCALID_PALLET_PROF_OAK + applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToPlayersDoor waitmovement 0 goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_EventScript_NotBeenToOneIslandYet msgbox PalletTown_Text_OakLetMeSeePokedex @@ -62,13 +59,13 @@ PalletTown_EventScript_OakRatingScene:: msgbox PalletTown_Text_CaughtXImpressiveFollowMe closemessage playbgm MUS_FOLLOW_ME, 0 - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse - applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse + applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse + applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse waitmovement 0 opendoor 16, 13 waitdooranim - applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab + applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterLab + applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerEnterLab waitmovement 0 closedoor 16, 13 waitdooranim @@ -82,9 +79,9 @@ PalletTown_EventScript_OakRatingScene:: PalletTown_EventScript_EndOakRatingScene:: closemessage - applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakExit + applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakExit waitmovement 0 - removeobject LOCALID_PROF_OAK + removeobject LOCALID_PALLET_PROF_OAK setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3 releaseall end @@ -190,13 +187,13 @@ PalletTown_EventScript_OakTrigger:: waitmessage delay 85 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark + applymovement LOCALID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 delay 30 - addobject LOCALID_PROF_OAK + addobject LOCALID_PALLET_PROF_OAK call_if_eq VAR_TEMP_1, 0, PalletTown_EventScript_OakEnterLeft call_if_eq VAR_TEMP_1, 1, PalletTown_EventScript_OakEnterRight delay 30 @@ -207,8 +204,8 @@ PalletTown_EventScript_OakTrigger:: call_if_eq VAR_TEMP_1, 1, PalletTown_EventScript_OakLeadPlayerToLabRight opendoor 16, 13 waitdooranim - applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab + applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterLab + applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerEnterLab waitmovement 0 closedoor 16, 13 waitdooranim @@ -223,24 +220,24 @@ PalletTown_EventScript_OakTrigger:: end PalletTown_EventScript_OakEnterLeft:: - applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLeft + applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterLeft waitmovement 0 return PalletTown_EventScript_OakEnterRight:: - applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterRight + applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterRight waitmovement 0 return PalletTown_EventScript_OakLeadPlayerToLabLeft:: - applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabLeft - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabLeft + applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToLabLeft + applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabLeft waitmovement 0 return PalletTown_EventScript_OakLeadPlayerToLabRight:: - applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabRight - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabRight + applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToLabRight + applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabRight waitmovement 0 return @@ -332,48 +329,48 @@ PalletTown_EventScript_SignLady:: goto_if_eq SIGN_LADY_READY, TRUE, PalletTown_EventScript_SignLadyStartShowSign goto_if_set FLAG_TEMP_2, PalletTown_EventScript_SignLadyGoReadSign msgbox PalletTown_Text_HmmIsThatRight - applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer + applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement LOCALID_SIGN_LADY, Common_Movement_ExclamationMark + applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_SIGN_LADY, Common_Movement_Delay48 + applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_Delay48 waitmovement 0 msgbox PalletTown_Text_OhLookLook closemessage call_if_eq VAR_FACING, DIR_EAST, PalletTown_EventScript_SignLadyMoveOutOfWayRight call_if_ne VAR_FACING, DIR_EAST, PalletTown_EventScript_SignLadyMoveOutOfWayLeft - copyobjectxytoperm LOCALID_SIGN_LADY + copyobjectxytoperm LOCALID_PALLET_SIGN_LADY setflag FLAG_TEMP_2 release end PalletTown_EventScript_SignLadyMoveOutOfWayRight:: - applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayRight + applymovement LOCALID_PALLET_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayRight waitmovement 0 return PalletTown_EventScript_SignLadyMoveOutOfWayLeft:: - applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayLeft + applymovement LOCALID_PALLET_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayLeft waitmovement 0 return PalletTown_EventScript_SignLadyDone:: - applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer + applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer waitmovement 0 msgbox PalletTown_Text_RaisingMonsToo release end PalletTown_EventScript_SignLadyGoReadSign:: - applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer + applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer waitmovement 0 msgbox PalletTown_Text_ReadItReadIt release end PalletTown_EventScript_SignLadyJustShowedSign:: - applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer + applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer waitmovement 0 msgbox PalletTown_Text_SignsAreUsefulArentThey release @@ -421,8 +418,8 @@ PalletTown_EventScript_TrainerTips:: PalletTown_EventScript_SignLadyTrigger:: lockall - applymovement LOCALID_SIGN_LADY, Common_Movement_WalkInPlaceFasterRight - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 call PalletTown_EventScript_SignLadyShowSign releaseall @@ -445,7 +442,7 @@ PalletTown_EventScript_SignLadyShowSign:: return PalletTown_EventScript_SignLadyStartShowSign:: - applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer + applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer waitmovement 0 call PalletTown_EventScript_SignLadyShowSign release diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index a03192be5..2643219a5 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_MOM", "type": "object", "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 8, diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index a5a7b35bb..889472d3c 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_MOM, 1 - PalletTown_PlayersHouse_1F_MapScripts:: .byte 0 diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index a26d8588a..edc6ac371 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -8,7 +8,7 @@ PalletTown_PlayersHouse_2F_OnTransition:: end PalletTown_PlayersHouse_2F_EventScript_SetRespawn:: - setrespawn SPAWN_PALLET_TOWN + setrespawn HEAL_LOCATION_PALLET_TOWN return PalletTown_PlayersHouse_2F_OnWarp:: @@ -16,7 +16,7 @@ PalletTown_PlayersHouse_2F_OnWarp:: .2byte 0 PalletTown_PlayersHouse_2F_FirstWarpIn:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1 end diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index ddbc3e3e2..be7265358 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -58,6 +58,7 @@ "flag": "0" }, { + "local_id": "LOCALID_OAKS_LAB_PROF_OAK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 6, @@ -72,6 +73,7 @@ "flag": "FLAG_HIDE_OAK_IN_HIS_LAB" }, { + "local_id": "LOCALID_BULBASAUR_BALL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, @@ -86,6 +88,7 @@ "flag": "FLAG_HIDE_BULBASAUR_BALL" }, { + "local_id": "LOCALID_SQUIRTLE_BALL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, @@ -100,6 +103,7 @@ "flag": "FLAG_HIDE_SQUIRTLE_BALL" }, { + "local_id": "LOCALID_CHARMANDER_BALL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, @@ -114,6 +118,7 @@ "flag": "FLAG_HIDE_CHARMANDER_BALL" }, { + "local_id": "LOCALID_OAKS_LAB_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 5, @@ -128,6 +133,7 @@ "flag": "FLAG_HIDE_RIVAL_IN_LAB" }, { + "local_id": "LOCALID_POKEDEX_1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POKEDEX", "x": 4, @@ -142,6 +148,7 @@ "flag": "FLAG_HIDE_POKEDEX" }, { + "local_id": "LOCALID_POKEDEX_2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POKEDEX", "x": 5, diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index c23534df8..90adf867d 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1,11 +1,3 @@ -.equ LOCALID_PROF_OAK, 4 -.equ LOCALID_BULBASAUR_BALL, 5 -.equ LOCALID_SQUIRTLE_BALL, 6 -.equ LOCALID_CHARMANDER_BALL, 7 -.equ LOCALID_RIVAL, 8 -.equ LOCALID_POKEDEX_1, 9 -.equ LOCALID_POKEDEX_2, 10 - .equ PLAYER_STARTER_NUM, VAR_TEMP_1 .equ PLAYER_STARTER_SPECIES, VAR_TEMP_2 .equ RIVAL_STARTER_SPECIES, VAR_TEMP_3 @@ -36,14 +28,14 @@ PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished:: return PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene:: - setobjectxyperm LOCALID_PROF_OAK, 6, 11 - setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 11 + setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_UP savebgm MUS_OAK return PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene:: - setobjectxyperm LOCALID_PROF_OAK, 6, 11 - setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 11 + setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_UP return PalletTown_ProfessorOaksLab_OnWarp:: @@ -51,7 +43,7 @@ PalletTown_ProfessorOaksLab_OnWarp:: .2byte 0 PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH end PalletTown_ProfessorOaksLab_OnFrame:: @@ -63,13 +55,13 @@ PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene:: @ 8169002 lockall setvar VAR_FACING, DIR_NORTH textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter waitmovement 0 - removeobject LOCALID_PROF_OAK - setobjectxyperm LOCALID_PROF_OAK, 6, 3 - setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN + removeobject LOCALID_OAKS_LAB_PROF_OAK + setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 3 + setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_HIDE_OAK_IN_HIS_LAB - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene end @@ -121,70 +113,70 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_RivalExit call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_RivalExit call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_RivalExit - removeobject LOCALID_RIVAL + removeobject LOCALID_OAKS_LAB_RIVAL fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 releaseall end PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: - setobjectxyperm LOCALID_RIVAL, 5, 10 - addobject LOCALID_RIVAL + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 5, 10 + addobject LOCALID_OAKS_LAB_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: - setobjectxyperm LOCALID_RIVAL, 6, 10 - addobject LOCALID_RIVAL + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10 + addobject LOCALID_OAKS_LAB_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: - setobjectxyperm LOCALID_RIVAL, 6, 10 - addobject LOCALID_RIVAL + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10 + addobject LOCALID_OAKS_LAB_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk - waitmovement LOCALID_PROF_OAK + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + waitmovement LOCALID_OAKS_LAB_PROF_OAK return PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast - waitmovement LOCALID_PROF_OAK + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast + waitmovement LOCALID_OAKS_LAB_PROF_OAK return PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk waitmovement 0 return @@ -207,15 +199,15 @@ PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth:: PalletTown_ProfessorOaksLab_ChooseStarterScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter waitmovement 0 - removeobject LOCALID_PROF_OAK - setobjectxyperm LOCALID_PROF_OAK, 6, 3 - setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN + removeobject LOCALID_OAKS_LAB_PROF_OAK + setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 3 + setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_HIDE_OAK_IN_HIS_LAB - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_WalkInPlaceFasterUp waitmovement 0 clearflag FLAG_DONT_TRANSITION_MUSIC savebgm MUS_DUMMY @@ -226,7 +218,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene:: msgbox PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne closemessage delay 30 - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalReact + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalReact waitmovement 0 msgbox PalletTown_ProfessorOaksLab_Text_RivalNoFairWhatAboutMe msgbox PalletTown_ProfessorOaksLab_Text_OakBePatientRival @@ -262,11 +254,11 @@ PalletTown_ProfessorOaksLab_Movement_RivalReact:: PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_PROF_OAK, Common_Movement_FaceDown + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FaceDown waitmovement 0 msgbox PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet closemessage - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp waitmovement 0 releaseall end @@ -296,13 +288,13 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight:: PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: textcolor NPC_TEXT_COLOR_MALE playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons closemessage - applymovement LOCALID_PROF_OAK, Common_Movement_FaceDown + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FaceDown waitmovement 0 goto_if_eq VAR_STARTER_MON, 0, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander goto_if_eq VAR_STARTER_MON, 1, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur @@ -320,19 +312,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle:: end PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end @@ -373,19 +365,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander:: end PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end @@ -429,19 +421,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur:: end PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end @@ -480,7 +472,7 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: call_if_eq VAR_TEMP_2, 1, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft call_if_eq VAR_TEMP_2, 2, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid call_if_eq VAR_TEMP_2, 3, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight - removeobject LOCALID_RIVAL + removeobject LOCALID_OAKS_LAB_RIVAL playse SE_EXIT fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 @@ -489,21 +481,21 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: end PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle - waitmovement LOCALID_RIVAL + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle + waitmovement LOCALID_OAKS_LAB_RIVAL return PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle - waitmovement LOCALID_RIVAL + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle + waitmovement LOCALID_OAKS_LAB_RIVAL return PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight - waitmovement LOCALID_RIVAL + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight + waitmovement LOCALID_OAKS_LAB_RIVAL return PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft:: @@ -625,9 +617,9 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: closemessage delay 30 playse SE_PIN - applymovement LOCALID_PROF_OAK, Common_Movement_ExclamationMark + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_PROF_OAK, Common_Movement_Delay48 + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_Delay48 waitmovement 0 call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast @@ -644,7 +636,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: delay 40 msgbox PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou closemessage - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterUp waitmovement 0 removeobject LOCALID_POKEDEX_1 delay 10 @@ -681,7 +673,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_RivalExit call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_RivalExit call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_RivalExit - removeobject LOCALID_RIVAL + removeobject LOCALID_OAKS_LAB_RIVAL fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2 @@ -692,23 +684,23 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: end PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver waitmovement 0 return @@ -729,25 +721,25 @@ PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth:: step_end PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk - waitmovement LOCALID_PROF_OAK + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk + waitmovement LOCALID_OAKS_LAB_PROF_OAK return PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast - waitmovement LOCALID_PROF_OAK + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast + waitmovement LOCALID_OAKS_LAB_PROF_OAK return PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk waitmovement 0 return @@ -804,7 +796,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexCompleted:: call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest - applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer waitmovement 0 closemessage delay 70 @@ -814,22 +806,22 @@ PalletTown_ProfessorOaksLab_EventScript_DexCompleted:: end PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedEast + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedEast waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest:: - applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedWest + applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedWest waitmovement 0 return @@ -956,87 +948,87 @@ PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls:: end PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth:: - setobjectxyperm LOCALID_RIVAL, 5, 10 - addobject LOCALID_RIVAL - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 5, 10 + addobject LOCALID_OAKS_LAB_RIVAL + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest:: - setobjectxyperm LOCALID_RIVAL, 6, 10 - addobject LOCALID_RIVAL - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10 + addobject LOCALID_OAKS_LAB_RIVAL + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth:: - setobjectxyperm LOCALID_RIVAL, 6, 10 - addobject LOCALID_RIVAL - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter + setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10 + addobject LOCALID_OAKS_LAB_RIVAL + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth:: - applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer waitmovement 0 delay 15 - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest:: - applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer waitmovement 0 delay 15 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast:: - applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer waitmovement 0 delay 15 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth:: - applymovement LOCALID_RIVAL, Common_Movement_FacePlayer - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_FacePlayer + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth:: - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest:: - applymovement LOCALID_RIVAL, Common_Movement_FacePlayer - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_FacePlayer + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth:: - applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit + applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_RivalExit:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return @@ -1088,7 +1080,7 @@ PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall:: end PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice:: - applymovement LOCALID_PROF_OAK, Common_Movement_FaceRight + applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FaceRight waitmovement 0 showmonpic PLAYER_STARTER_SPECIES, 10, 3 textcolor NPC_TEXT_COLOR_MALE @@ -1153,19 +1145,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter:: end PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur:: - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur + applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end diff --git a/data/maps/PalletTown_RivalsHouse/map.json b/data/maps/PalletTown_RivalsHouse/map.json index ad9b2880d..d3efdba83 100644 --- a/data/maps/PalletTown_RivalsHouse/map.json +++ b/data/maps/PalletTown_RivalsHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_DAISY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_DAISY", "x": 10, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TOWN_MAP", "type": "object", "graphics_id": "OBJ_EVENT_GFX_TOWN_MAP", "x": 6, diff --git a/data/maps/PalletTown_RivalsHouse/scripts.inc b/data/maps/PalletTown_RivalsHouse/scripts.inc index 1f0fd3381..a9e5e29b8 100644 --- a/data/maps/PalletTown_RivalsHouse/scripts.inc +++ b/data/maps/PalletTown_RivalsHouse/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_DAISY, 1 -.equ LOCALID_TOWN_MAP, 2 - .equ RECEIVED_TOWN_MAP, VAR_TEMP_1 PalletTown_RivalsHouse_MapScripts:: diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index ddc3481ca..82fe1beaf 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -41,6 +41,7 @@ "flag": "0" }, { + "local_id": "LOCALID_PEWTER_MUSEUM_GUIDE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 33, @@ -83,6 +84,7 @@ "flag": "0" }, { + "local_id": "LOCALID_PEWTER_GYM_GUIDE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 42, @@ -111,6 +113,7 @@ "flag": "FLAG_TEMP_12" }, { + "local_id": "LOCALID_PEWTER_AIDE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 46, diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 3cb0e4ccb..5b0f1b65f 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1,7 +1,3 @@ -.equ LOCALID_MUSEUM_GUIDE, 2 -.equ LOCALID_GYM_GUIDE, 5 -.equ LOCALID_AIDE, 7 - PewterCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_OnTransition .byte 0 @@ -22,40 +18,40 @@ PewterCity_EventScript_GymGuide:: call_if_eq VAR_FACING, DIR_EAST, PewterCity_EventScript_WalkToGymEast msgbox PewterCity_Text_GoTakeOnBrock closemessage - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GymGuideExit waitmovement 0 fadedefaultbgm - removeobject LOCALID_GYM_GUIDE + removeobject LOCALID_PEWTER_GYM_GUIDE clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE release end PewterCity_EventScript_WalkToGymEast:: - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideEast - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideEast + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymEast - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymEast + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymEast + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymEast waitmovement 0 return @ Unused PewterCity_EventScript_WalkToGymWest:: - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideWest - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideWest + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymWest - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymWest + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymWest + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymWest waitmovement 0 return @ Unused PewterCity_EventScript_WalkToGymNorth:: - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideNorth - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideNorth + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymNorth - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymNorth + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymNorth + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymNorth waitmovement 0 return @@ -292,44 +288,44 @@ PewterCity_EventScript_GymGuideTrigger:: call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_WalkToGymBottom msgbox PewterCity_Text_GoTakeOnBrock closemessage - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GymGuideExit waitmovement 0 fadedefaultbgm - removeobject LOCALID_GYM_GUIDE + removeobject LOCALID_PEWTER_GYM_GUIDE clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE releaseall end PewterCity_EventScript_WalkToGymTop:: - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadTop + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadTop waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymTop - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymTop + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymTop + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymTop waitmovement 0 return PewterCity_EventScript_WalkToGymMid:: - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadMid + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadMid waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymMid - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymMid + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymMid + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymMid waitmovement 0 return PewterCity_EventScript_WalkToGymBottom:: - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadBottom + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadBottom waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymBottom - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymBottom + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymBottom + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymBottom waitmovement 0 return @ Unused PewterCity_EventScript_WalkToGymRight:: - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideApproachPlayerRight + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideApproachPlayerRight waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymRight - applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymRight + applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight waitmovement 0 return @@ -448,35 +444,35 @@ PewterCity_EventScript_MuseumGuide:: msgbox PewterCity_Text_ThisIsTheMuseum closemessage delay 10 - applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_MuseumGuideExit + applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_MuseumGuideExit waitmovement 0 fadedefaultbgm - removeobject LOCALID_MUSEUM_GUIDE + removeobject LOCALID_PEWTER_MUSEUM_GUIDE clearflag FLAG_HIDE_PEWTER_MUSEUM_GUIDE release end PewterCity_EventScript_LeadToMuseumNorth:: - applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumNorth - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumNorth + applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumNorth + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumNorth waitmovement 0 return PewterCity_EventScript_LeadToMuseumSouth:: - applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumSouth - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumSouth + applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumSouth + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumSouth waitmovement 0 return PewterCity_EventScript_LeadToMuseumWest:: - applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumWest - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumWest + applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumWest + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumWest waitmovement 0 return PewterCity_EventScript_LeadToMuseumEast:: - applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumEast - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumEast + applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumEast + applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumEast waitmovement 0 return @@ -691,9 +687,9 @@ PewterCity_EventScript_AideGiveRunningShoes:: call_if_eq VAR_TEMP_1, 3, PewterCity_EventScript_AideNoticePlayer waitse playse SE_PIN - applymovement LOCALID_AIDE, Common_Movement_ExclamationMark + applymovement LOCALID_PEWTER_AIDE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_AIDE, Common_Movement_Delay48 + applymovement LOCALID_PEWTER_AIDE, Common_Movement_Delay48 waitmovement 0 msgbox PewterCity_Text_OhPlayer call_if_eq VAR_TEMP_1, 0, PewterCity_EventScript_AideApproachPlayer0 @@ -722,13 +718,13 @@ PewterCity_EventScript_AideGiveRunningShoes:: textcolor NPC_TEXT_COLOR_NEUTRAL msgbox PewterCity_Text_RunningShoesLetterFromMom closemessage - removeobject LOCALID_AIDE + removeobject LOCALID_PEWTER_AIDE setflag FLAG_SYS_B_DASH setvar VAR_MAP_SCENE_PEWTER_CITY, 2 return PewterCity_EventScript_AideNoticePlayer:: - applymovement LOCALID_AIDE, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PEWTER_AIDE, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -740,43 +736,43 @@ PewterCity_EventScript_AideApproachPlayer0:: PewterCity_EventScript_AideApproachPlayer1:: closemessage - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return PewterCity_EventScript_AideApproachPlayer2:: closemessage - applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid + applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideApproachPlayerMid waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return PewterCity_EventScript_AideApproachPlayer3:: closemessage - applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom + applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideApproachPlayerBottom waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return PewterCity_EventScript_AideExit0:: - applymovement LOCALID_AIDE, PewterCity_Movement_AideExit0 + applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit0 waitmovement 0 return PewterCity_EventScript_AideExit1:: - applymovement LOCALID_AIDE, PewterCity_Movement_AideExit1 + applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit1 waitmovement 0 return PewterCity_EventScript_AideExit2:: - applymovement LOCALID_AIDE, PewterCity_Movement_AideExit2 + applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit2 waitmovement 0 return PewterCity_EventScript_AideExit3:: - applymovement LOCALID_AIDE, PewterCity_Movement_AideExit3 + applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit3 waitmovement 0 return diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 097a58484..c578a3541 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -44,6 +44,7 @@ "flag": "0" }, { + "local_id": "LOCALID_PEWTER_HOUSE_NIDORAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M", "x": 6, diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index d4dfee4e8..cbdb3294f 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_NIDORAN, 3 - PewterCity_House1_MapScripts:: .byte 0 @@ -18,7 +16,7 @@ PewterCity_House1_EventScript_Nidoran:: lock faceplayer call PewterCity_House1_EventScript_DoNidoranCry - applymovement LOCALID_NIDORAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_PEWTER_HOUSE_NIDORAN, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 530760e18..13d818f11 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_MUSEUM_SCIENTIST1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 16, @@ -58,6 +59,7 @@ "flag": "0" }, { + "local_id": "LOCALID_OLD_AMBER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_AMBER", "x": 22, diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 28c09240b..e7688179f 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_SCIENTIST1, 1 -.set LOCALID_OLD_AMBER, 4 - PewterCity_Museum_1F_MapScripts:: .byte 0 @@ -22,14 +19,14 @@ PewterCity_Museum_1F_EventScript_Scientist1BehindCounter:: PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter:: msgbox PewterCity_Museum_1F_Text_AmberContainsGeneticMatter - applymovement LOCALID_SCIENTIST1, Common_Movement_FaceOriginalDirection + applymovement LOCALID_MUSEUM_SCIENTIST1, Common_Movement_FaceOriginalDirection waitmovement 0 release end PewterCity_Museum_1F_EventScript_ExplainAmber:: msgbox PewterCity_Museum_1F_Text_AmberIsFossilizedSap - applymovement LOCALID_SCIENTIST1, Common_Movement_FaceOriginalDirection + applymovement LOCALID_MUSEUM_SCIENTIST1, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -37,7 +34,7 @@ PewterCity_Museum_1F_EventScript_ExplainAmber:: PewterCity_Museum_1F_EventScript_EntranceTriggerLeft:: lockall setvar VAR_TEMP_1, 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 goto PewterCity_Museum_1F_EventScript_EntranceTrigger end @@ -45,7 +42,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerLeft:: PewterCity_Museum_1F_EventScript_EntranceTriggerMid:: lockall setvar VAR_TEMP_1, 1 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 goto PewterCity_Museum_1F_EventScript_EntranceTrigger end @@ -53,7 +50,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerMid:: PewterCity_Museum_1F_EventScript_EntranceTriggerRight:: lockall setvar VAR_TEMP_1, 2 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 goto PewterCity_Museum_1F_EventScript_EntranceTrigger end @@ -66,7 +63,7 @@ PewterCity_Museum_1F_EventScript_EntranceTrigger:: msgbox PewterCity_Museum_1F_Text_ComeAgain closemessage hidemoneybox - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit + applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit waitmovement 0 releaseall end @@ -89,17 +86,17 @@ PewterCity_Museum_1F_EventScript_TryPayForTicket:: end PewterCity_Museum_1F_EventScript_PlayerApproachCounterLeft:: - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterLeft + applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterLeft waitmovement 0 return PewterCity_Museum_1F_EventScript_PlayerApproachCounterMid:: - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterMid + applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterMid waitmovement 0 return PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight:: - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterRight + applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterRight waitmovement 0 return @@ -107,7 +104,7 @@ PewterCity_Museum_1F_EventScript_NotEnoughMoney:: msgbox PewterCity_Museum_1F_Text_DontHaveEnoughMoney closemessage hidemoneybox - applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit + applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit waitmovement 0 releaseall end diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index d8840a13b..28789f97b 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -44,6 +44,7 @@ "flag": "0" }, { + "local_id": "LOCALID_PEWTER_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index 80b45defb..a68ea93ba 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ PewterCity_PokemonCenter_1F_MapScripts:: .byte 0 PewterCity_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_PEWTER_CITY + setrespawn HEAL_LOCATION_PEWTER_CITY end PewterCity_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index f66f243b8..fd67829d2 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -28,7 +28,7 @@ PokemonLeague_AgathasRoom_OnWarp:: .2byte 0 PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH end PokemonLeague_AgathasRoom_OnFrame:: diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 3150972ac..e3d4a1af5 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_BRUNO", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BRUNO", "x": 6, diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index b1d6de506..1e71f2ede 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_BRUNO, 1 - PokemonLeague_BrunosRoom_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_BrunosRoom_OnResume map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_BrunosRoom_OnLoad @@ -30,7 +28,7 @@ PokemonLeague_BrunosRoom_OnWarp:: .2byte 0 PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH end PokemonLeague_BrunosRoom_OnFrame:: diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 32329b02d..ee7b8082e 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_CHAMPIONS_ROOM_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 6, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_CHAMPIONS_ROOM_PROF_OAK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 6, diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index cdbb93a2e..a3c532d6e 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_RIVAL, 1 -.equ LOCALID_PROF_OAK, 2 - PokemonLeague_ChampionsRoom_MapScripts:: map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume @@ -39,7 +36,7 @@ PokemonLeague_ChampionsRoom_OnWarp:: .2byte 0 PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH end PokemonLeague_ChampionsRoom_OnFrame:: @@ -50,7 +47,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: lockall textcolor NPC_TEXT_COLOR_MALE setflag FLAG_TEMP_2 - applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerEnter + applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerEnter waitmovement 0 delay 20 call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_ChampionsRoom_EventScript_Intro @@ -67,30 +64,30 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: setflag FLAG_TEMP_4 msgbox PokemonLeague_ChampionsRoom_Text_PostBattle playbgm MUS_SLOW_PALLET, 0 - addobject LOCALID_PROF_OAK + addobject LOCALID_CHAMPIONS_ROOM_PROF_OAK msgbox PokemonLeague_ChampionsRoom_Text_OakPlayer closemessage - applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter - applymovement LOCALID_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter - applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter + applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter + applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter + applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter waitmovement 0 delay 25 specialvar VAR_RESULT, GetStarterSpecies bufferspeciesname STR_VAR_1, VAR_RESULT msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterRight - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival closemessage - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 20 msgbox PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe closemessage delay 13 - applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit - applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit + applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit + applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit waitmovement 0 setvar VAR_TEMP_1, 1 warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 5, 12 diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index e728c6554..814436169 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_HALL_OF_FAME_PROF_OAK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 6, diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index e8fae588d..1b2431bc0 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_PROF_OAK, 1 - PokemonLeague_HallOfFame_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_HallOfFame_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_HallOfFame_OnWarp @@ -10,7 +8,7 @@ PokemonLeague_HallOfFame_OnWarp:: .2byte 0 PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH end PokemonLeague_HallOfFame_OnFrame:: @@ -20,16 +18,16 @@ PokemonLeague_HallOfFame_OnFrame:: PokemonLeague_HallOfFame_EventScript_EnterRoom:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom + applymovement LOCALID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom waitmovement 0 - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterLeft - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_HALL_OF_FAME_PROF_OAK, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 delay 18 msgbox PokemonLeague_HallOfFame_Text_OakCongratulations closemessage - applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterUp - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_HALL_OF_FAME_PROF_OAK, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 dofieldeffect FLDEFF_HALL_OF_FAME_RECORD @@ -37,7 +35,7 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: delay 40 setvar VAR_TEMP_1, 1 call EventScript_SetDefeatedEliteFourFlagsVars - setrespawn SPAWN_PALLET_TOWN + setrespawn HEAL_LOCATION_PALLET_TOWN fadescreenspeed FADE_TO_BLACK, 24 special EnterHallOfFame waitstate diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 4a1dde336..d9685ace2 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_LANCE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LANCE", "x": 6, diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 908c7a5d1..6d31155e7 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_LANCE, 1 - PokemonLeague_LancesRoom_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LancesRoom_OnResume map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LancesRoom_OnLoad @@ -30,7 +28,7 @@ PokemonLeague_LancesRoom_OnWarp:: .2byte 0 PokemonLeague_LancesRoom_EventScript_TurnPlayerNorth:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH end PokemonLeague_LancesRoom_OnFrame:: @@ -39,7 +37,7 @@ PokemonLeague_LancesRoom_OnFrame:: PokemonLeague_LancesRoom_EventScript_EnterRoom:: lockall - applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_LancesRoom_Movement_WalkThroughCorridor + applymovement LOCALID_PLAYER, PokemonLeague_LancesRoom_Movement_WalkThroughCorridor waitmovement 0 setflag FLAG_TEMP_2 call PokemonLeague_LancesRoom_EventScript_SetEntryClosed diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 7f56673d2..3da4d3fea 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -33,7 +33,7 @@ PokemonLeague_LoreleisRoom_OnWarp:: .2byte 0 PokemonLeague_LoreleisRoom_EventScript_TurnPlayerNorth:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH end PokemonLeague_LoreleisRoom_OnFrame:: diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 05e924e0f..c7828a303 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_POKEMON_TOWER_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 16, diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 04c079d3e..01e401001 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_RIVAL, 1 - PokemonTower_2F_MapScripts:: .byte 0 @@ -24,12 +22,12 @@ PokemonTower_2F_EventScript_Rival:: playbgm MUS_ENCOUNTER_RIVAL, 0 call_if_eq VAR_TEMP_1, 0, PokemonTower_2F_EventScript_RivalFacePlayerRight call_if_eq VAR_TEMP_1, 1, PokemonTower_2F_EventScript_RivalFacePlayerDown - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_Delay48 waitmovement 0 msgbox PokemonTower_2F_Text_RivalIntro - setvar VAR_LAST_TALKED, LOCALID_RIVAL + setvar VAR_LAST_TALKED, LOCALID_POKEMON_TOWER_RIVAL call_if_eq VAR_STARTER_MON, 2, PokemonTower_2F_EventScript_RivalSquirtle call_if_eq VAR_STARTER_MON, 1, PokemonTower_2F_EventScript_RivalBulbasaur call_if_eq VAR_STARTER_MON, 0, PokemonTower_2F_EventScript_RivalCharmander @@ -41,20 +39,20 @@ PokemonTower_2F_EventScript_Rival:: playse SE_EXIT delay 25 fadedefaultbgm - removeobject LOCALID_RIVAL + removeobject LOCALID_POKEMON_TOWER_RIVAL setvar VAR_MAP_SCENE_POKEMON_TOWER_2F, 1 releaseall end PokemonTower_2F_EventScript_RivalFacePlayerRight:: - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterRight - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return PokemonTower_2F_EventScript_RivalFacePlayerDown:: - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return @@ -71,12 +69,12 @@ PokemonTower_2F_EventScript_RivalCharmander:: return PokemonTower_2F_EventScript_RivalExitRight:: - applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitRight + applymovement LOCALID_POKEMON_TOWER_RIVAL, PokemonTower_2F_Movement_RivalExitRight waitmovement 0 return PokemonTower_2F_EventScript_RivalExitDown:: - applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitDown + applymovement LOCALID_POKEMON_TOWER_RIVAL, PokemonTower_2F_Movement_RivalExitDown waitmovement 0 return diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index ca0ff6895..ba5969ab1 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -11,7 +11,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: waitstate special QuestLog_CutRecording goto_if_eq VAR_RESULT, FALSE, PokemonTower_6F_EventScript_DefeatedMarowakGhost @ VAR_RESULT set by CB2_EndMarowakBattle - applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp + applymovement LOCALID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp waitmovement 0 releaseall end diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 75a293e4b..afda482b4 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_HIDE_TOWER_FUJI" }, { + "local_id": "LOCALID_POKEMON_TOWER_GRUNT1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, @@ -44,6 +45,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_1" }, { + "local_id": "LOCALID_POKEMON_TOWER_GRUNT2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, @@ -58,6 +60,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_2" }, { + "local_id": "LOCALID_POKEMON_TOWER_GRUNT3", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index f3a4d9b8e..616225564 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_GRUNT1, 2 -.set LOCALID_GRUNT2, 3 -.set LOCALID_GRUNT3, 4 - PokemonTower_7F_MapScripts:: .byte 0 @@ -31,25 +27,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt1:: goto_if_eq VAR_0x8004, 10, PokemonTower_7F_EventScript_Grunt1ExitMid goto_if_eq VAR_0x8004, 11, PokemonTower_7F_EventScript_Grunt1ExitRight goto_if_eq VAR_0x8004, 9, PokemonTower_7F_EventScript_Grunt1ExitLeft - applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1Exit + applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1Exit waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt1 end PokemonTower_7F_EventScript_Grunt1ExitMid:: - applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitMid + applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitMid waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt1 end PokemonTower_7F_EventScript_Grunt1ExitRight:: - applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitRight + applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt1 end PokemonTower_7F_EventScript_Grunt1ExitLeft:: - applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitLeft + applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitLeft waitmovement 0 playse SE_EXIT delay 25 @@ -57,7 +53,7 @@ PokemonTower_7F_EventScript_Grunt1ExitLeft:: end PokemonTower_7F_EventScript_RemoveGrunt1:: - removeobject LOCALID_GRUNT1 + removeobject LOCALID_POKEMON_TOWER_GRUNT1 release end @@ -115,25 +111,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt2:: getplayerxy VAR_0x8004, VAR_0x8005 goto_if_eq VAR_0x8004, 12, PokemonTower_7F_EventScript_Grunt2ExitLeft goto_if_eq VAR_0x8004, 13, PokemonTower_7F_EventScript_Grunt2ExitRight - applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2Exit + applymovement LOCALID_POKEMON_TOWER_GRUNT2, PokemonTower_7F_Movement_Grunt2Exit waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt2 end PokemonTower_7F_EventScript_Grunt2ExitLeft:: - applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitLeft + applymovement LOCALID_POKEMON_TOWER_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitLeft waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt2 end PokemonTower_7F_EventScript_Grunt2ExitRight:: - applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitRight + applymovement LOCALID_POKEMON_TOWER_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt2 end PokemonTower_7F_EventScript_RemoveGrunt2:: - removeobject LOCALID_GRUNT2 + removeobject LOCALID_POKEMON_TOWER_GRUNT2 release end @@ -178,25 +174,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt3:: getplayerxy VAR_0x8004, VAR_0x8005 goto_if_eq VAR_0x8004, 10, PokemonTower_7F_EventScript_Grunt3ExitRight goto_if_eq VAR_0x8004, 9, PokemonTower_7F_EventScript_Grunt3ExitLeft - applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3Exit + applymovement LOCALID_POKEMON_TOWER_GRUNT3, PokemonTower_7F_Movement_Grunt3Exit waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt3 end PokemonTower_7F_EventScript_Grunt3ExitRight:: - applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitRight + applymovement LOCALID_POKEMON_TOWER_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt3 end PokemonTower_7F_EventScript_Grunt3ExitLeft:: - applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitLeft + applymovement LOCALID_POKEMON_TOWER_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitLeft waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt3 end PokemonTower_7F_EventScript_RemoveGrunt3:: - removeobject LOCALID_GRUNT3 + removeobject LOCALID_POKEMON_TOWER_GRUNT3 release end diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 8ad0ad4e7..5c2631279 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_HIDEOUT_GIOVANNI", "type": "object", "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 19, @@ -30,6 +31,7 @@ "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" }, { + "local_id": "LOCALID_SILPH_SCOPE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, @@ -58,6 +60,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "local_id": "LOCALID_LIFT_KEY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 7d0c50b98..54cda4f48 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -1,7 +1,3 @@ -.equ LOCALID_GIOVANNI, 1 -.equ LOCALID_SILPH_SCOPE, 2 -.equ LOCALID_LIFT_KEY, 4 - .equ NUM_DOOR_GRUNTS_DEFEATED, VAR_TEMP_1 RocketHideout_B4F_MapScripts:: @@ -31,7 +27,7 @@ RocketHideout_B4F_EventScript_Giovanni:: msgbox RocketHideout_B4F_Text_GiovanniPostBattle fadescreen FADE_TO_BLACK closemessage - removeobject LOCALID_GIOVANNI + removeobject LOCALID_HIDEOUT_GIOVANNI addobject LOCALID_SILPH_SCOPE clearflag FLAG_HIDE_SILPH_SCOPE setflag FLAG_HIDE_CELADON_ROCKETS diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index a49cb927d..1e86ed1e1 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_ROUTE10_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 1624afbef..f721e04db 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ Route10_PokemonCenter_1F_MapScripts:: Route10_PokemonCenter_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F - setrespawn SPAWN_ROUTE10 + setrespawn HEAL_LOCATION_ROUTE10 end Route10_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index c3b58cf4b..8f5b97b9a 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -195,6 +195,7 @@ "flag": "FLAG_TEMP_13" }, { + "local_id": "LOCALID_ROUTE14_BORDER_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 1, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 433c045bb..2b33b5cc6 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -213,7 +213,7 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 73, "y": 7, - "target_local_id": 13, + "target_local_id": "LOCALID_ROUTE14_BORDER_TREE", "target_map": "MAP_ROUTE14" } ], diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 97a8592cb..c49959463 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -111,6 +111,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE16_CUT_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 41, diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index d0e52d70f..0619d1c5f 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -49,7 +49,7 @@ Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger:: textcolor NPC_TEXT_COLOR_MALE msgbox Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp closemessage - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 call_if_eq VAR_0x8008, 1, Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop @@ -58,28 +58,28 @@ Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger:: call_if_eq VAR_0x8008, 4, Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom msgbox Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad closemessage - applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkRight + applymovement LOCALID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkRight waitmovement 0 releaseall end Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: - applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp + applymovement LOCALID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp waitmovement 0 return Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid:: - applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp2 + applymovement LOCALID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp2 waitmovement 0 return Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: - applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp3 + applymovement LOCALID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp3 waitmovement 0 return Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom:: - applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp4 + applymovement LOCALID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp4 waitmovement 0 return diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 05e2526e4..083027b91 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -49,7 +49,7 @@ Route18_EastEntrance_1F_EventScript_NeedBikeTrigger:: textcolor NPC_TEXT_COLOR_MALE msgbox Route18_EastEntrance_1F_Text_ExcuseMe closemessage - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 call_if_eq VAR_0x8008, 1, Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop @@ -58,28 +58,28 @@ Route18_EastEntrance_1F_EventScript_NeedBikeTrigger:: call_if_eq VAR_0x8008, 4, Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom msgbox Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad closemessage - applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkRight + applymovement LOCALID_PLAYER, Route18_EastEntrance_1F_Movement_WalkRight waitmovement 0 releaseall end Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: - applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp + applymovement LOCALID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp waitmovement 0 return Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid:: - applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp2 + applymovement LOCALID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp2 waitmovement 0 return Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: - applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp3 + applymovement LOCALID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp3 waitmovement 0 return Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom:: - applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp4 + applymovement LOCALID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp4 waitmovement 0 return diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index ae86c838d..3f232d8d1 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -115,7 +115,7 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 6, "y": 85, - "target_local_id": 8, + "target_local_id": "LOCALID_VIRIDIAN_BORDER_TREE", "target_map": "MAP_VIRIDIAN_CITY" } ], diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 3a9bbe242..7fdfa0dff 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -101,7 +101,7 @@ "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, "y": -3, - "target_local_id": 2, + "target_local_id": "LOCALID_PALLET_FAT_MAN", "target_map": "MAP_PALLET_TOWN" } ], diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index ee918e6fa..6da244d40 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_ROUTE22_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 25, diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 6f45b8518..365f88d43 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_RIVAL, 1 - Route22_MapScripts:: .byte 0 @@ -12,21 +10,21 @@ Route22_EventScript_EarlyRivalTriggerTop:: Route22_EventScript_EarlyRivalTriggerMid:: lockall setvar VAR_TEMP_1, 1 - setobjectxyperm LOCALID_RIVAL, 25, 5 + setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5 goto Route22_EventScript_EarlyRival end Route22_EventScript_EarlyRivalTriggerBottom:: lockall setvar VAR_TEMP_1, 2 - setobjectxyperm LOCALID_RIVAL, 25, 5 + setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5 goto Route22_EventScript_EarlyRival end Route22_EventScript_EarlyRival:: textcolor NPC_TEXT_COLOR_MALE playbgm MUS_ENCOUNTER_RIVAL, 0 - addobject LOCALID_RIVAL + addobject LOCALID_ROUTE22_RIVAL call_if_eq VAR_TEMP_1, 0, Route22_EventScript_EarlyRivalApproach call_if_eq VAR_TEMP_1, 1, Route22_EventScript_EarlyRivalApproach call_if_eq VAR_TEMP_1, 2, Route22_EventScript_EarlyRivalApproachBottom @@ -43,19 +41,19 @@ Route22_EventScript_EarlyRival:: call_if_eq VAR_TEMP_1, 1, Route22_EventScript_EarlyRivalExit call_if_eq VAR_TEMP_1, 2, Route22_EventScript_EarlyRivalExitBottom fadedefaultbgm - removeobject LOCALID_RIVAL + removeobject LOCALID_ROUTE22_RIVAL setvar VAR_MAP_SCENE_ROUTE22, 2 releaseall end Route22_EventScript_EarlyRivalApproach:: - applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproach waitmovement 0 return Route22_EventScript_EarlyRivalApproachBottom:: - applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom - applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproachBottom + applymovement LOCALID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return @@ -72,12 +70,12 @@ Route22_EventScript_EarlyRivalCharmander:: return Route22_EventScript_EarlyRivalExit:: - applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExit + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_EarlyRivalExit waitmovement 0 return Route22_EventScript_EarlyRivalExitBottom:: - applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExitBottom + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_EarlyRivalExitBottom waitmovement 0 return @@ -163,26 +161,26 @@ Route22_EventScript_LateRivalTriggerTop:: Route22_EventScript_LateRivalTriggerMid:: lockall setvar VAR_TEMP_1, 1 - setobjectxyperm LOCALID_RIVAL, 25, 5 + setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5 goto Route22_EventScript_LateRival end Route22_EventScript_LateRivalTriggerBottom:: lockall setvar VAR_TEMP_1, 2 - setobjectxyperm LOCALID_RIVAL, 25, 5 + setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5 goto Route22_EventScript_LateRival end Route22_EventScript_LateRival:: textcolor NPC_TEXT_COLOR_MALE playbgm MUS_ENCOUNTER_RIVAL, 0 - addobject LOCALID_RIVAL + addobject LOCALID_ROUTE22_RIVAL call_if_eq VAR_TEMP_1, 0, Route22_EventScript_LateRivalApproach call_if_eq VAR_TEMP_1, 1, Route22_EventScript_LateRivalApproach call_if_eq VAR_TEMP_1, 2, Route22_EventScript_LateRivalApproachBottom msgbox Route22_Text_LateRivalIntro - setvar VAR_LAST_TALKED, LOCALID_RIVAL + setvar VAR_LAST_TALKED, LOCALID_ROUTE22_RIVAL call_if_eq VAR_STARTER_MON, 2, Route22_EventScript_LateRivalSquirtle call_if_eq VAR_STARTER_MON, 1, Route22_EventScript_LateRivalBulbasaur call_if_eq VAR_STARTER_MON, 0, Route22_EventScript_LateRivalCharmander @@ -190,22 +188,22 @@ Route22_EventScript_LateRival:: closemessage delay 10 playbgm MUS_RIVAL_EXIT, 0 - applymovement LOCALID_RIVAL, Route22_Movement_LateRivalExit + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_LateRivalExit waitmovement 0 fadedefaultbgm - removeobject LOCALID_RIVAL + removeobject LOCALID_ROUTE22_RIVAL setvar VAR_MAP_SCENE_ROUTE22, 4 releaseall end Route22_EventScript_LateRivalApproach:: - applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproach waitmovement 0 return Route22_EventScript_LateRivalApproachBottom:: - applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom - applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival + applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproachBottom + applymovement LOCALID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 7cbf5ed4e..9371d9ffa 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_CASCADE_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 15, @@ -41,6 +42,7 @@ "flag": "0" }, { + "local_id": "LOCALID_THUNDER_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 8, @@ -55,6 +57,7 @@ "flag": "0" }, { + "local_id": "LOCALID_RAINBOW_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 14, @@ -69,6 +72,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SOUL_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 16, @@ -83,6 +87,7 @@ "flag": "0" }, { + "local_id": "LOCALID_MARSH_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 10, @@ -97,6 +102,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VOLCANO_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 14, @@ -111,6 +117,7 @@ "flag": "0" }, { + "local_id": "LOCALID_EARTH_BADGE_GUARD", "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index 03d576bc1..d3912a16f 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -1,11 +1,3 @@ -.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:: map_script MAP_SCRIPT_ON_TRANSITION, Route23_OnTransition .byte 0 diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 0e8fd736f..83f1aefbb 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_ROUTE24_ROCKET", "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 12, diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 6a0befab8..3a7a74bd0 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_ROCKET, 1 - Route24_MapScripts:: .byte 0 @@ -40,7 +38,7 @@ Route24_EventScript_RocketTrigger:: textcolor NPC_TEXT_COLOR_MALE call_if_eq VAR_TEMP_1, 0, Route24_EventScript_RocketApproachPlayer call_if_eq VAR_TEMP_1, 1, Route24_EventScript_RocketMotionToPlayer - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 msgbox Route24_Text_JustEarnedFabulousPrize checkitemspace ITEM_NUGGET @@ -55,33 +53,33 @@ Route24_EventScript_BattleRocket:: waitmessage playbgm MUS_ENCOUNTER_ROCKET, 0 waitbuttonpress - setvar VAR_LAST_TALKED, LOCALID_ROCKET + setvar VAR_LAST_TALKED, LOCALID_ROUTE24_ROCKET trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat msgbox Route24_Text_YoudBecomeTopRocketLeader setvar VAR_MAP_SCENE_ROUTE24, 1 return Route24_EventScript_RocketApproachPlayer:: - applymovement LOCALID_ROCKET, Route24_Movement_RocketApproachPlayer + applymovement LOCALID_ROUTE24_ROCKET, Route24_Movement_RocketApproachPlayer waitmovement 0 return Route24_EventScript_RocketMotionToPlayer:: - applymovement LOCALID_ROCKET, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_ROUTE24_ROCKET, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return Route24_EventScript_NoRoomForNuggetTrigger:: msgbox Route24_Text_YouDontHaveAnyRoom closemessage - applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown + applymovement LOCALID_PLAYER, Route24_Movement_WalkDown waitmovement 0 call_if_eq VAR_TEMP_1, 0, Route24_EventScript_RocketWalkBackToPos release end Route24_EventScript_RocketWalkBackToPos:: - applymovement LOCALID_ROCKET, Route24_Movement_RocketWalkBackToPos + applymovement LOCALID_ROUTE24_ROCKET, Route24_Movement_RocketWalkBackToPos waitmovement 0 return diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 82dd50402..1bf5ab970 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_BILL_HUMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 7, @@ -30,6 +31,7 @@ "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { + "local_id": "LOCALID_BILL_CLEFAIRY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY", "x": 10, diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index b8f39b063..b4eb77a2f 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_BILL_HUMAN, 1 -.equ LOCALID_BILL_CLEFAIRY, 2 - .equ BILL_IN_TELEPORTER, FLAG_TEMP_2 .equ RETURN_AFTER_SS_TICKET, FLAG_TEMP_3 @@ -159,7 +156,7 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: clearflag BILL_IN_TELEPORTER setflag FLAG_HELPED_BILL_IN_SEA_COTTAGE special SpawnCameraObject - applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanToTeleporters + applymovement LOCALID_CAMERA, Route25_SeaCottage_Movement_CameraPanToTeleporters waitmovement 0 delay 35 playse SE_PIN @@ -194,7 +191,7 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillExitTeleporter waitmovement 0 waitfanfare - applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanBackFromTeleporters + applymovement LOCALID_CAMERA, Route25_SeaCottage_Movement_CameraPanBackFromTeleporters waitmovement 0 playse SE_CONTEST_CURTAIN_FALL closedoor 3, 3 diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 3273015c1..ba9f45b37 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -115,7 +115,7 @@ "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 109, "y": 3, - "target_local_id": 12, + "target_local_id": "LOCALID_CERULEAN_CAVE_GUARD", "target_map": "MAP_CERULEAN_CITY" } ], diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 52cf73b1d..ab3235ecf 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_ROUTE4_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 32d2ff660..d0098c043 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ Route4_PokemonCenter_1F_MapScripts:: Route4_PokemonCenter_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F - setrespawn SPAWN_ROUTE4 + setrespawn HEAL_LOCATION_ROUTE4 end Route4_PokemonCenter_1F_EventScript_Boy:: diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index 307de8b0d..588a27343 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -25,12 +25,12 @@ Route5_SouthEntrance_EventScript_GuardTriggerRight:: Route5_SouthEntrance_EventScript_GuardTrigger:: textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_BlockPlayerEntry + applymovement LOCALID_PLAYER, Route5_SouthEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end @@ -52,17 +52,17 @@ Route5_SouthEntrance_EventScript_GuardDrinkTea:: end Route5_SouthEntrance_EventScript_WalkToGuardLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardLeft + applymovement LOCALID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardLeft waitmovement 0 return Route5_SouthEntrance_EventScript_WalkToGuardMid:: - applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardMid + applymovement LOCALID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardMid waitmovement 0 return Route5_SouthEntrance_EventScript_WalkToGuardRight:: - applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardRight + applymovement LOCALID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardRight waitmovement 0 return diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index c7c8cb95e..fb203c9c5 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -25,12 +25,12 @@ Route6_NorthEntrance_EventScript_GuardTriggerRight:: Route6_NorthEntrance_EventScript_GuardTrigger:: textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_BlockPlayerEntry + applymovement LOCALID_PLAYER, Route6_NorthEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end @@ -52,17 +52,17 @@ Route6_NorthEntrance_EventScript_GuardDrinkTea:: end Route6_NorthEntrance_EventScript_WalkToGuardLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardLeft + applymovement LOCALID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardLeft waitmovement 0 return Route6_NorthEntrance_EventScript_WalkToGuardMid:: - applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardMid + applymovement LOCALID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardMid waitmovement 0 return Route6_NorthEntrance_EventScript_WalkToGuardRight:: - applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardRight + applymovement LOCALID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardRight waitmovement 0 return diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 255dbe841..5539f5b37 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -31,7 +31,7 @@ "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": -8, "y": 12, - "target_local_id": 10, + "target_local_id": "LOCALID_CELADON_BORDER_TREE", "target_map": "MAP_CELADON_CITY" } ], diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index a13ec857c..07244439a 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -25,12 +25,12 @@ Route7_EastEntrance_EventScript_GuardTriggerBottom:: Route7_EastEntrance_EventScript_GuardTrigger:: textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_BlockPlayerEntry + applymovement LOCALID_PLAYER, Route7_EastEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end @@ -52,17 +52,17 @@ Route7_EastEntrance_EventScript_GuardDrinkTea:: end Route7_EastEntrance_WalkToGuardTop:: - applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardTop + applymovement LOCALID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardTop waitmovement 0 return Route7_EastEntrance_WalkToGuardMid:: - applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardMid + applymovement LOCALID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardMid waitmovement 0 return Route7_EastEntrance_WalkToGuardBottom:: - applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardBottom + applymovement LOCALID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardBottom waitmovement 0 return diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index e0a8b5f27..2c36cff20 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -25,12 +25,12 @@ Route8_WestEntrance_EventScript_GuardTriggerBottom:: Route8_WestEntrance_EventScript_GuardTrigger:: textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_BlockPlayerEntry + applymovement LOCALID_PLAYER, Route8_WestEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end @@ -64,17 +64,17 @@ Route8_WestEntrance_EventScript_GuardDrinkTea:: end Route8_WestEntrance_EventScript_WalkToGuardTop:: - applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardTop + applymovement LOCALID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardTop waitmovement 0 return Route8_WestEntrance_EventScript_WalkToGuardMid:: - applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardMid + applymovement LOCALID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardMid waitmovement 0 return Route8_WestEntrance_EventScript_WalkToGuardBottom:: - applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardBottom + applymovement LOCALID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardBottom waitmovement 0 return diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index a60f193b4..8d961b931 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -153,6 +153,7 @@ "flag": "0" }, { + "local_id": "LOCALID_ROUTE9_CUT_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 2, diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 90934647d..56a20bb69 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SS_ANNE_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 30, diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 3d09bd4bb..280960b9b 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_RIVAL, 1 - SSAnne_2F_Corridor_MapScripts:: .byte 0 @@ -26,16 +24,16 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: playse SE_EXIT delay 5 playbgm MUS_ENCOUNTER_RIVAL, 0 - addobject LOCALID_RIVAL + addobject LOCALID_SS_ANNE_RIVAL delay 10 - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SS_ANNE_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 20 call_if_eq VAR_TEMP_1, 0, SSAnne_2F_Corridor_EventScript_RivalApproachLeft call_if_eq VAR_TEMP_1, 1, SSAnne_2F_Corridor_EventScript_RivalApproachMid call_if_eq VAR_TEMP_1, 2, SSAnne_2F_Corridor_EventScript_RivalApproachRight msgbox SSAnne_2F_Corridor_Text_RivalIntro - setvar VAR_LAST_TALKED, LOCALID_RIVAL + setvar VAR_LAST_TALKED, LOCALID_SS_ANNE_RIVAL call_if_eq VAR_STARTER_MON, 2, SSAnne_2F_Corridor_EventScript_RivalSquirtle call_if_eq VAR_STARTER_MON, 1, SSAnne_2F_Corridor_EventScript_RivalBulbasaur call_if_eq VAR_STARTER_MON, 0, SSAnne_2F_Corridor_EventScript_RivalCharmander @@ -47,25 +45,25 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: call_if_eq VAR_TEMP_1, 1, SSAnne_2F_Corridor_EventScript_RivalExitMid call_if_eq VAR_TEMP_1, 2, SSAnne_2F_Corridor_EventScript_RivalExitRight fadedefaultbgm - removeobject LOCALID_RIVAL + removeobject LOCALID_SS_ANNE_RIVAL setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 releaseall end SSAnne_2F_Corridor_EventScript_RivalApproachLeft:: - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachLeft + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachLeft waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalApproachMid:: - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachMid - applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachMid + applymovement LOCALID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachRight + applymovement LOCALID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachRight waitmovement 0 return @@ -82,17 +80,17 @@ SSAnne_2F_Corridor_EventScript_RivalCharmander:: return SSAnne_2F_Corridor_EventScript_RivalExitLeft:: - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitLeft + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitLeft waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalExitMid:: - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitMid + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitMid waitmovement 0 return SSAnne_2F_Corridor_EventScript_RivalExitRight:: - applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitRight + applymovement LOCALID_SS_ANNE_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitRight waitmovement 0 return diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 4282796c7..9d7417e62 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SS_ANNE_CAPTAIN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAPTAIN", "x": 5, diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 6ac9cb693..1a18816a0 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_CAPTAIN, 1 - SSAnne_CaptainsOffice_MapScripts:: .byte 0 @@ -14,7 +12,7 @@ SSAnne_CaptainsOffice_EventScript_Captain:: waitfanfare call EventScript_RestorePrevTextColor delay 50 - applymovement LOCALID_CAPTAIN, Common_Movement_FacePlayer + applymovement LOCALID_SS_ANNE_CAPTAIN, Common_Movement_FacePlayer waitmovement 0 msgbox SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_OBTAIN_KEY_ITEM @@ -28,13 +26,13 @@ SSAnne_CaptainsOffice_EventScript_Captain:: SSAnne_CaptainsOffice_EventScript_NoRoomForCut:: msgbox SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis closemessage - applymovement LOCALID_CAPTAIN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SS_ANNE_CAPTAIN, Common_Movement_FaceOriginalDirection waitmovement 0 release end SSAnne_CaptainsOffice_EventScript_AlreadyGotCut:: - applymovement LOCALID_CAPTAIN, Common_Movement_FacePlayer + applymovement LOCALID_SS_ANNE_CAPTAIN, Common_Movement_FacePlayer waitmovement 0 msgbox SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon release diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index c8b563471..1402b8833 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SS_ANNE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SS_ANNE", "x": 30, diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index ed084fb89..4f6d2fd0a 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_SS_ANNE, 1 - SSAnne_Exterior_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SSAnne_Exterior_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SSAnne_Exterior_OnFrame @@ -23,7 +21,7 @@ SSAnne_Exterior_ExitSSAnne:: special DoSSAnneDepartureCutscene waitstate removeobject LOCALID_SS_ANNE - applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_Exit + applymovement LOCALID_PLAYER, SSAnne_Exterior_Movement_Exit waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 2 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 @@ -33,12 +31,12 @@ SSAnne_Exterior_ExitSSAnne:: end SSAnne_Exterior_WalkDown:: - applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_WalkDown + applymovement LOCALID_PLAYER, SSAnne_Exterior_Movement_WalkDown waitmovement 0 return SSAnne_Exterior_WalkInPlaceDown:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 31eb5193c..77cba6c6d 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -108,6 +108,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { + "local_id": "LOCALID_SAFFRON_DOOR_GUARD_GRUNT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 34, diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 3d517bf43..b2950a4df 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_DOOR_GUARD_GRUNT, 6 - SaffronCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_OnTransition .byte 0 @@ -10,7 +8,7 @@ SaffronCity_OnTransition:: end SaffronCity_EventScript_MoveDoorGuardGrunt:: - setobjectxyperm LOCALID_DOOR_GUARD_GRUNT, 33, 31 + setobjectxyperm LOCALID_SAFFRON_DOOR_GUARD_GRUNT, 33, 31 return SaffronCity_EventScript_RocketGrunt1:: @@ -44,7 +42,7 @@ SaffronCity_EventScript_RocketGrunt7:: SaffronCity_EventScript_DoorGuardGrunt:: lock goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep - applymovement LOCALID_DOOR_GUARD_GRUNT, Common_Movement_FacePlayer + applymovement LOCALID_SAFFRON_DOOR_GUARD_GRUNT, Common_Movement_FacePlayer waitmovement 0 msgbox SaffronCity_Text_ImASecurityGuard release diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 062741bfa..1575a3c0b 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -72,6 +72,7 @@ "flag": "0" }, { + "local_id": "LOCALID_KARATE_MASTER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 6, diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index b66ad6cee..852552208 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_KARATE_MASTER, 5 - SaffronCity_Dojo_MapScripts:: .byte 0 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index dfb7b03be..429e53776 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SAFFRON_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 8b4390f0a..43d1d94d3 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ SaffronCity_PokemonCenter_1F_MapScripts:: .byte 0 SaffronCity_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_SAFFRON_CITY + setrespawn HEAL_LOCATION_SAFFRON_CITY end SaffronCity_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 02db9fdb5..a1f3687f6 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 7, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_LITTLE_GIRL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, @@ -44,6 +46,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_YOUNGSTER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, @@ -58,6 +61,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_GENTLEMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, @@ -72,6 +76,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, @@ -86,6 +91,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_ROCKER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 7, @@ -100,6 +106,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_BEAUTY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, @@ -114,6 +121,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { + "local_id": "LOCALID_TRAINER_FAN_CLUB_BLACK_BELT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 5, diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 698abf617..76b0ace0f 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -1,12 +1,3 @@ -.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:: map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonTrainerFanClub_OnFrame map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonTrainerFanClub_OnTransition @@ -19,18 +10,18 @@ SaffronCity_PokemonTrainerFanClub_OnFrame:: SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: lockall textcolor NPC_TEXT_COLOR_FEMALE - applymovement LOCALID_BATTLE_GIRL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_BATTLE_GIRL, Common_Movement_ExclamationMark + applymovement LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_BATTLE_GIRL, Common_Movement_Delay48 + applymovement LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, Common_Movement_Delay48 waitmovement 0 msgbox SaffronCity_PokemonTrainerFanClub_Text_HuhYou closemessage - applymovement LOCALID_BATTLE_GIRL, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer + applymovement LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 @@ -117,43 +108,43 @@ SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: end SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: - setobjectxyperm LOCALID_BATTLE_GIRL, 5, 2 - setobjectmovementtype LOCALID_BATTLE_GIRL, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, 5, 2 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: - setobjectxyperm LOCALID_YOUNGSTER, 7, 4 - setobjectmovementtype LOCALID_YOUNGSTER, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_YOUNGSTER, 7, 4 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_YOUNGSTER, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: - setobjectxyperm LOCALID_GENTLEMAN, 2, 2 - setobjectmovementtype LOCALID_GENTLEMAN, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_GENTLEMAN, 2, 2 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_GENTLEMAN, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: - setobjectxyperm LOCALID_LITTLE_GIRL, 3, 4 - setobjectmovementtype LOCALID_LITTLE_GIRL, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_LITTLE_GIRL, 3, 4 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_LITTLE_GIRL, MOVEMENT_TYPE_FACE_RIGHT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: - setobjectxyperm LOCALID_ROCKER, 4, 6 - setobjectmovementtype LOCALID_ROCKER, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_ROCKER, 4, 6 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_ROCKER, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: - setobjectxyperm LOCALID_WOMAN, 10, 3 - setobjectmovementtype LOCALID_WOMAN, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_WOMAN, 10, 3 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_WOMAN, MOVEMENT_TYPE_FACE_UP return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: - setobjectxyperm LOCALID_BEAUTY, 7, 5 - setobjectmovementtype LOCALID_BEAUTY, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_BEAUTY, 7, 5 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_BEAUTY, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: - setobjectxyperm LOCALID_BLACK_BELT, 9, 6 - setobjectmovementtype LOCALID_BLACK_BELT, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TRAINER_FAN_CLUB_BLACK_BELT, 9, 6 + setobjectmovementtype LOCALID_TRAINER_FAN_CLUB_BLACK_BELT, MOVEMENT_TYPE_FACE_LEFT return SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 353288d96..0f0494f1a 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -49,12 +49,12 @@ SeafoamIslands_B3F_EventScript_AddBoulderPresent:: return SeafoamIslands_B3F_EventScript_RideCurrentFar:: - applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentFar + applymovement LOCALID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentFar waitmovement 0 return SeafoamIslands_B3F_EventScript_RideCurrentClose:: - applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentClose + applymovement LOCALID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentClose waitmovement 0 return diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 9b25c704a..d6a905778 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -60,7 +60,7 @@ SeafoamIslands_B4F_OnWarp:: .2byte 0 SeafoamIslands_B4F_EventScript_WarpInOnCurrent:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH special ForcePlayerToStartSurfing end @@ -72,7 +72,7 @@ SeafoamIslands_B4F_OnFrame:: @ The current the player is forced in on from B3F SeafoamIslands_B4F_EventScript_EnterOnCurrent:: lockall - applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_EnterOnCurrent + applymovement LOCALID_PLAYER, SeafoamIslands_B4F_Movement_EnterOnCurrent waitmovement 0 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 0 releaseall @@ -104,12 +104,12 @@ SeafoamIslands_B4F_EventScript_AddBoulderPresent:: return SeafoamIslands_B4F_EventScript_RideCurrentFar:: - applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentFar + applymovement LOCALID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentFar waitmovement 0 return SeafoamIslands_B4F_EventScript_RideCurrentClose:: - applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentClose + applymovement LOCALID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentClose waitmovement 0 return @@ -142,7 +142,7 @@ SeafoamIslands_B4F_Movement_RideCurrentClose:: @ Triggers blocking re-entry to B3F SeafoamIslands_B4F_EventScript_UpwardCurrent:: lockall - applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_WalkUp + applymovement LOCALID_PLAYER, SeafoamIslands_B4F_Movement_WalkUp waitmovement 0 releaseall end diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index d775303af..e8b4c1a28 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_SWORDS_DANCE_TUTOR", "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 7, diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 4204f1811..1222c11c6 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 4, diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 056519ed2..5e7ce493b 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_OLD_WOMAN, 1 - .equ TRAINER_VISITING, VAR_TEMP_1 SevenIsland_House_Room1_MapScripts:: @@ -15,14 +13,14 @@ SevenIsland_House_Room1_OnTransition:: SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout:: setvar TRAINER_VISITING, TRUE - setobjectxyperm LOCALID_OLD_WOMAN, 4, 2 - setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN, 4, 2 + setobjectmovementtype LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN return SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor:: - setobjectxyperm LOCALID_OLD_WOMAN, 3, 2 - setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN, 3, 2 + setobjectmovementtype LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN, MOVEMENT_TYPE_FACE_RIGHT return SevenIsland_House_Room1_OnFrame:: @@ -34,12 +32,12 @@ SevenIsland_House_Room1_OnFrame:: SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: lockall textcolor NPC_TEXT_COLOR_FEMALE - applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerReEnterRoom + applymovement LOCALID_PLAYER, SevenIsland_House_Room1_Movement_PlayerReEnterRoom waitmovement 0 - applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer + applymovement LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer waitmovement 0 - copyobjectxytoperm LOCALID_OLD_WOMAN - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + copyobjectxytoperm LOCALID_SEVEN_ISLAND_HOUSE_OLD_WOMAN + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 call_if_eq VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, SevenIsland_House_Room1_EventScript_BattleWonComment call_if_eq VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, SevenIsland_House_Room1_EventScript_BattleLostComment @@ -124,19 +122,19 @@ SevenIsland_House_Room1_EventScript_ChooseParty:: SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth:: applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft - applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth + applymovement LOCALID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth waitmovement 0 return SevenIsland_House_Room1_EventScript_EnterBattleRoomEast:: applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight - applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast + applymovement LOCALID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast waitmovement 0 return SevenIsland_House_Room1_EventScript_EnterBattleRoomWest:: applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft - applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest + applymovement LOCALID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest waitmovement 0 return diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index e55eaa2aa..1ea473940 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -13,7 +13,7 @@ SevenIsland_House_Room2_OnFrame:: SevenIsland_House_Room2_EventScript_BattleVisitingTrainer:: lockall - applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerEnterRoom + applymovement LOCALID_PLAYER, SevenIsland_House_Room2_Movement_PlayerEnterRoom waitmovement 0 special BufferEReaderTrainerGreeting msgbox gStringVar4 @@ -27,7 +27,7 @@ SevenIsland_House_Room2_EventScript_BattleVisitingTrainer:: call_if_eq VAR_RESULT, 2, SevenIsland_House_Room2_EventScript_BattleLost closemessage special HealPlayerParty - applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerExitRoom + applymovement LOCALID_PLAYER, SevenIsland_House_Room2_Movement_PlayerExitRoom waitmovement 0 special LoadPlayerParty setvar VAR_TEMP_1, 1 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index 010db8bec..33d0e4423 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SEVEN_ISLAND_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 7d2400d67..784e76787 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_PokemonCenter_1F_MapScripts:: .byte 0 SevenIsland_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_SEVEN_ISLAND + setrespawn HEAL_LOCATION_SEVEN_ISLAND end SevenIsland_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 45e036fe0..a49b48869 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -115,7 +115,7 @@ "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": -2, - "target_local_id": 1, + "target_local_id": "LOCALID_SWORDS_DANCE_TUTOR", "target_map": "MAP_SEVEN_ISLAND" } ], diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index e5e14894a..df5d6cf6f 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_CHANSEY_DANCE_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, @@ -26,7 +27,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SevenIsland_SevaultCanyon_House_EventScript_BaldingMan", + "script": "SevenIsland_SevaultCanyon_House_EventScript_ChanseyDanceMan", "flag": "0" }, { diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 07cd151e7..52387c453 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -1,17 +1,17 @@ -.set LOCALID_BALDING_MAN, 1 +.set DID_CHANSEY_DANCE, FLAG_TEMP_2 SevenIsland_SevaultCanyon_House_MapScripts:: .byte 0 -SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: +SevenIsland_SevaultCanyon_House_EventScript_ChanseyDanceMan:: lock - goto_if_set FLAG_TEMP_2, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced + goto_if_set DID_CHANSEY_DANCE, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced playbgm MUS_SCHOOL, 0 - applymovement LOCALID_BALDING_MAN, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance + applymovement LOCALID_CHANSEY_DANCE_MAN, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm delay 30 - applymovement LOCALID_BALDING_MAN, Common_Movement_FacePlayer + applymovement LOCALID_CHANSEY_DANCE_MAN, Common_Movement_FacePlayer waitmovement 0 msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn textcolor NPC_TEXT_COLOR_NEUTRAL @@ -23,23 +23,23 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: call_if_ne VAR_FACING, DIR_SOUTH, SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown delay 30 playbgm MUS_SCHOOL, 0 - applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance + applymovement LOCALID_PLAYER, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm delay 30 call EventScript_OutOfCenterPartyHeal msgbox SevenIsland_SevaultCanyon_House_Text_YoureAllChipperNow - setflag FLAG_TEMP_2 + setflag DID_CHANSEY_DANCE release end SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced:: - applymovement LOCALID_BALDING_MAN, Common_Movement_FacePlayer + applymovement LOCALID_CHANSEY_DANCE_MAN, Common_Movement_FacePlayer waitmovement 0 msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn release diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index 639d495cb..811e146ee 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_TANOBY_KEY_BOULDER1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, @@ -44,6 +46,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER3", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, @@ -58,6 +61,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER4", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, @@ -72,6 +76,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER5", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, @@ -86,6 +91,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER6", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, @@ -100,6 +106,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TANOBY_KEY_BOULDER7", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index d2d059ac1..55777e307 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,11 +1,3 @@ -.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:: @@ -26,13 +18,13 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: end SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: - 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 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER1, 7, 2 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER2, 4, 4 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER3, 10, 4 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER4, 5, 6 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER5, 9, 6 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER6, 5, 8 + setobjectxyperm LOCALID_TANOBY_KEY_BOULDER7, 9, 8 return SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 118dd5d32..b9ecc70f5 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -44,6 +44,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SILPH_CO_GIOVANNI", "type": "object", "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 6, @@ -58,6 +59,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "local_id": "LOCALID_SILPH_CO_11F_GRUNT1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 16, @@ -86,6 +88,7 @@ "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" }, { + "local_id": "LOCALID_SILPH_CO_11F_GRUNT2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 2, diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 3cc1f6841..94aebcc2b 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_GIOVANNI, 3 -.set LOCALID_GRUNT1, 4 -.set LOCALID_GRUNT2, 6 - SilphCo_11F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_11F_OnLoad .byte 0 @@ -61,21 +57,21 @@ SilphCo_11F_EventScript_GiovanniTriggerRight:: SilphCo_11F_EventScript_BattleGiovanni:: textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_GIOVANNI, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SILPH_CO_GIOVANNI, Common_Movement_WalkInPlaceFasterDown waitmovement 0 delay 25 msgbox SilphCo_11F_Text_GiovanniIntro closemessage call_if_eq VAR_TEMP_1, 0, SilphCo_11F_EventScript_GiovanniApproachLeft call_if_eq VAR_TEMP_1, 1, SilphCo_11F_EventScript_GiovanniApproachRight - setvar VAR_LAST_TALKED, LOCALID_GIOVANNI + setvar VAR_LAST_TALKED, LOCALID_SILPH_CO_GIOVANNI trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, SilphCo_11F_Text_GiovanniDefeat msgbox SilphCo_11F_Text_GiovanniPostBattle closemessage fadescreen FADE_TO_BLACK - removeobject LOCALID_GIOVANNI - removeobject LOCALID_GRUNT1 - removeobject LOCALID_GRUNT2 + removeobject LOCALID_SILPH_CO_GIOVANNI + removeobject LOCALID_SILPH_CO_11F_GRUNT1 + removeobject LOCALID_SILPH_CO_11F_GRUNT2 fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_SILPH_CO_11F, 1 setflag FLAG_HIDE_SAFFRON_ROCKETS @@ -84,13 +80,13 @@ SilphCo_11F_EventScript_BattleGiovanni:: end SilphCo_11F_EventScript_GiovanniApproachLeft:: - applymovement LOCALID_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachLeft - applymovement OBJ_EVENT_ID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni + applymovement LOCALID_SILPH_CO_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachLeft + applymovement LOCALID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni waitmovement 0 return SilphCo_11F_EventScript_GiovanniApproachRight:: - applymovement LOCALID_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachRight + applymovement LOCALID_SILPH_CO_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachRight waitmovement 0 return diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index e1739bc2d..8c6929f72 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SILPH_CO_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 2, @@ -114,6 +115,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SILPH_CO_7F_WORKER_M2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 9, diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index d4db57800..7c6898d89 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_RIVAL, 1 -.set LOCALID_WORKER_M2, 8 - SilphCo_7F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_7F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_7F_OnTransition @@ -17,7 +14,7 @@ SilphCo_7F_OnTransition:: end SilphCo_7F_EventScript_SetObjRocketsGone:: - setobjectmovementtype LOCALID_WORKER_M2, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype LOCALID_SILPH_CO_7F_WORKER_M2, MOVEMENT_TYPE_FACE_UP return SilphCo_7F_EventScript_RivalTriggerTop:: @@ -35,16 +32,16 @@ SilphCo_7F_EventScript_RivalTriggerBottom:: SilphCo_7F_EventScript_RivalScene:: textcolor NPC_TEXT_COLOR_MALE playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_SILPH_CO_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SILPH_CO_RIVAL, Common_Movement_Delay48 waitmovement 0 msgbox SilphCo_7F_Text_RivalWhatKeptYou call_if_eq VAR_TEMP_1, 0, SilphCo_7F_EventScript_RivalApproachTop call_if_eq VAR_TEMP_1, 1, SilphCo_7F_EventScript_RivalApproachBottom msgbox SilphCo_7F_Text_RivalIntro - setvar VAR_LAST_TALKED, LOCALID_RIVAL + setvar VAR_LAST_TALKED, LOCALID_SILPH_CO_RIVAL call_if_eq VAR_STARTER_MON, 2, SilphCo_7F_EventScript_RivalSquirtle call_if_eq VAR_STARTER_MON, 1, SilphCo_7F_EventScript_RivalBulbasaur call_if_eq VAR_STARTER_MON, 0, SilphCo_7F_EventScript_RivalCharmander @@ -55,7 +52,7 @@ SilphCo_7F_EventScript_RivalScene:: call_if_eq VAR_TEMP_1, 1, SilphCo_7F_EventScript_RivalExitBottom playse SE_WARP_IN fadedefaultbgm - removeobject LOCALID_RIVAL + removeobject LOCALID_SILPH_CO_RIVAL waitse setvar VAR_MAP_SCENE_SILPH_CO_7F, 1 releaseall @@ -63,7 +60,7 @@ SilphCo_7F_EventScript_RivalScene:: SilphCo_7F_EventScript_RivalApproachTop:: closemessage - applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalApproachTop + applymovement LOCALID_SILPH_CO_RIVAL, SilphCo_7F_Movement_RivalApproachTop waitmovement 0 return @@ -83,12 +80,12 @@ SilphCo_7F_EventScript_RivalCharmander:: return SilphCo_7F_EventScript_RivalExitTop:: - applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitTop + applymovement LOCALID_SILPH_CO_RIVAL, SilphCo_7F_Movement_RivalExitTop waitmovement 0 return SilphCo_7F_EventScript_RivalExitBottom:: - applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitBottom + applymovement LOCALID_SILPH_CO_RIVAL, SilphCo_7F_Movement_RivalExitBottom waitmovement 0 return diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index fe9af6319..82b4a052c 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SAPPHIRE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAPPHIRE", "x": 7, @@ -30,6 +31,7 @@ "flag": "FLAG_HIDE_SAPPHIRE" }, { + "local_id": "LOCALID_DOTTED_HOLE_THIEF", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index bb32e7d0c..33b2b160b 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -1,6 +1,3 @@ -.equ LOCALID_SAPPHIRE, 1 -.equ LOCALID_THIEF, 2 - SixIsland_DottedHole_SapphireRoom_MapScripts:: .byte 0 @@ -13,10 +10,10 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: waitmessage waitfanfare closemessage - setobjectxyperm LOCALID_THIEF, 5, 0 - addobject LOCALID_THIEF + setobjectxyperm LOCALID_DOTTED_HOLE_THIEF, 5, 0 + addobject LOCALID_DOTTED_HOLE_THIEF playse SE_FALL - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn waitmovement 0 playse SE_M_STRENGTH call_if_eq VAR_FACING, DIR_NORTH, SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft @@ -53,101 +50,101 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: call_if_eq VAR_FACING, DIR_WEST, SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest playse SE_EXIT delay 35 - removeobject LOCALID_THIEF + removeobject LOCALID_DOTTED_HOLE_THIEF setflag FLAG_LEARNED_YES_NAH_CHANSEY release end @ Lots of redundant scripts below SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth:: - applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth + applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth:: - applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth + applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast:: - applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest + applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: - applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit - applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest + applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index b027d1990..a53a6df47 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SIX_ISLAND_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SIX_ISLAND_RIVAL", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 5, diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 9efdc8681..366a3d9c2 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_RIVAL, 2 - SixIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -7,7 +5,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: .byte 0 SixIsland_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_SIX_ISLAND + setrespawn HEAL_LOCATION_SIX_ISLAND call_if_eq VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, SixIsland_PokemonCenter_1F_EventScript_ShowRival end @@ -22,25 +20,25 @@ SixIsland_PokemonCenter_1F_OnFrame:: SixIsland_PokemonCenter_1F_EventScript_RivalScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_SIX_ISLAND_RIVAL, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark + applymovement LOCALID_SIX_ISLAND_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_RIVAL, Common_Movement_Delay48 + applymovement LOCALID_SIX_ISLAND_RIVAL, Common_Movement_Delay48 waitmovement 0 delay 25 - applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalApproach + applymovement LOCALID_SIX_ISLAND_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalApproach waitmovement 0 msgbox SixIsland_PokemonCenter_1F_Text_RivalImpossibleToGetAllMonsAroundHere closemessage - applymovement OBJ_EVENT_ID_PLAYER, SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit - applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit + applymovement LOCALID_PLAYER, SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit + applymovement LOCALID_SIX_ISLAND_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit waitmovement 0 fadedefaultbgm playse SE_EXIT delay 35 - removeobject LOCALID_RIVAL + removeobject LOCALID_SIX_ISLAND_RIVAL setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1 setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 releaseall diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 72cc69b52..0f182a588 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "local_id": "LOCALID_RUIN_VALLEY_SCIENTIST", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 24, diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 6df247886..d48dda239 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_SCIENTIST, 1 - SixIsland_RuinValley_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SixIsland_RuinValley_OnLoad .byte 0 @@ -15,10 +13,10 @@ SixIsland_RuinValley_EventScript_OpenDottedHoleDoor:: SixIsland_RuinValley_EventScript_Scientist:: lock msgbox SixIsland_RuinValley_Text_CantFigureOutHowToGetInside - applymovement LOCALID_SCIENTIST, Common_Movement_FacePlayer + applymovement LOCALID_RUIN_VALLEY_SCIENTIST, Common_Movement_FacePlayer waitmovement 0 msgbox SixIsland_RuinValley_Text_IFoundThisPlace - applymovement LOCALID_SCIENTIST, Common_Movement_FaceOriginalDirection + applymovement LOCALID_RUIN_VALLEY_SCIENTIST, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 69d733605..140e41ddc 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "local_id": "LOCALID_THREE_ISLAND_ANTIBIKER1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 7, @@ -41,6 +42,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { + "local_id": "LOCALID_THREE_ISLAND_ANTIBIKER2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 8, @@ -55,6 +57,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { + "local_id": "LOCALID_PAXTON", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 8, @@ -69,6 +72,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER3", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 9, @@ -83,6 +87,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 9, @@ -97,6 +102,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER4", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, @@ -111,6 +117,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, @@ -125,6 +132,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER5", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 11, @@ -209,6 +217,7 @@ "flag": "0" }, { + "local_id": "LOCALID_THREE_ISLAND_BIKER6", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 15, diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 589ddca21..8f3e0dfd2 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -1,13 +1,3 @@ -.equ LOCALID_ANTIBIKER1, 1 -.equ LOCALID_ANTIBIKER2, 2 -.equ LOCALID_PAXTON, 3 -.equ LOCALID_BIKER1, 5 -.equ LOCALID_BIKER2, 7 -.equ LOCALID_BIKER3, 4 -.equ LOCALID_BIKER4, 6 -.equ LOCALID_BIKER5, 8 -.equ LOCALID_BIKER6, 14 - ThreeIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_OnTransition .byte 0 @@ -23,8 +13,8 @@ ThreeIsland_EventScript_HideAntiBikers:: return ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers:: - setobjectmovementtype LOCALID_ANTIBIKER1, MOVEMENT_TYPE_LOOK_AROUND - setobjectmovementtype LOCALID_ANTIBIKER2, MOVEMENT_TYPE_LOOK_AROUND + setobjectmovementtype LOCALID_THREE_ISLAND_ANTIBIKER1, MOVEMENT_TYPE_LOOK_AROUND + setobjectmovementtype LOCALID_THREE_ISLAND_ANTIBIKER2, MOVEMENT_TYPE_LOOK_AROUND return ThreeIsland_EventScript_Biker:: @@ -44,14 +34,14 @@ ThreeIsland_EventScript_AntiBiker1:: end ThreeIsland_EventScript_AntiBiker1GotFullRestore:: - applymovement LOCALID_ANTIBIKER1, Common_Movement_FacePlayer + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, Common_Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_Text_YouveGotImpressiveMons release end ThreeIsland_EventScript_GiveFullRestore:: - applymovement LOCALID_ANTIBIKER1, Common_Movement_FacePlayer + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, Common_Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_Text_ThankYouOhYourMonGotHurt checkitemspace ITEM_FULL_RESTORE @@ -71,47 +61,47 @@ ThreeIsland_EventScript_NoRoomForFullRestore:: ThreeIsland_EventScript_BikerArgumentScene:: call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceLeft call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceLeft - applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 msgbox ThreeIsland_Text_GoBackToKanto call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceRight call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceRight call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceBiker - applymovement LOCALID_BIKER1, ThreeIsland_Movement_SpeakLeft + applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_SpeakLeft waitmovement 0 msgbox ThreeIsland_Text_BossIsOnHisWay call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceUp call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceUp call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceAntiBiker - applymovement LOCALID_ANTIBIKER2, ThreeIsland_Movement_SpeakRight + applymovement LOCALID_THREE_ISLAND_ANTIBIKER2, ThreeIsland_Movement_SpeakRight waitmovement 0 msgbox ThreeIsland_Text_GetOffIslandNow call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceRight call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceRight call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceBiker - applymovement LOCALID_BIKER3, ThreeIsland_Movement_SpeakLeft + applymovement LOCALID_THREE_ISLAND_BIKER3, ThreeIsland_Movement_SpeakLeft waitmovement 0 msgbox ThreeIsland_Text_WhosGonnaMakeMe return ThreeIsland_EventScript_PlayerFaceUp:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 return @ Unused ThreeIsland_EventScript_PlayerFaceDown:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return ThreeIsland_EventScript_PlayerFaceLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return ThreeIsland_EventScript_PlayerFaceRight:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 return @@ -136,7 +126,7 @@ ThreeIsland_EventScript_AntiBiker2:: end ThreeIsland_EventScript_AntiBiker2BikersGone:: - applymovement LOCALID_ANTIBIKER2, Common_Movement_FacePlayer + applymovement LOCALID_THREE_ISLAND_ANTIBIKER2, Common_Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_Text_LostelleWentOffTowardsBondBridge release @@ -145,19 +135,19 @@ ThreeIsland_EventScript_AntiBiker2BikersGone:: ThreeIsland_EventScript_BikerBossIntroTrigger:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 msgbox ThreeIsland_Text_AreYouBossGoBackToKanto applymovement LOCALID_PAXTON, ThreeIsland_Movement_SpeakLeft waitmovement 0 msgbox ThreeIsland_Text_JustGotHerePal - applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 msgbox ThreeIsland_Text_FollowersRaisingHavoc applymovement LOCALID_PAXTON, ThreeIsland_Movement_SpeakLeft waitmovement 0 msgbox ThreeIsland_Text_OughtToBeThankingUs - applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight + applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 msgbox ThreeIsland_Text_YouCowardsToughInPack setvar VAR_MAP_SCENE_THREE_ISLAND, 3 @@ -204,45 +194,45 @@ ThreeIsland_EventScript_BattleBikersTriggerRight:: ThreeIsland_EventScript_BattleBikersScene:: textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_BIKER1, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER1, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_BIKER1, Common_Movement_ExclamationMark + applymovement LOCALID_THREE_ISLAND_BIKER1, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_BIKER1, Common_Movement_Delay48 + applymovement LOCALID_THREE_ISLAND_BIKER1, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerApproach + applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_WannaMakeSomethingOfYourStaring, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, ThreeIsland_EventScript_LeaveBikersAlone msgbox ThreeIsland_Text_Biker1Intro - setvar VAR_LAST_TALKED, LOCALID_BIKER1 + setvar VAR_LAST_TALKED, LOCALID_THREE_ISLAND_BIKER1 trainerbattle_no_intro TRAINER_BIKER_GOON, ThreeIsland_Text_Biker1Defeat - applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerSpeak + applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_BikerSpeak waitmovement 0 msgbox ThreeIsland_Text_Biker1PostBattle closemessage - applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerApproach + applymovement LOCALID_THREE_ISLAND_BIKER2, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker2Intro - setvar VAR_LAST_TALKED, LOCALID_BIKER2 + setvar VAR_LAST_TALKED, LOCALID_THREE_ISLAND_BIKER2 trainerbattle_no_intro TRAINER_BIKER_GOON_2, ThreeIsland_Text_Biker2Defeat - applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerSpeak + applymovement LOCALID_THREE_ISLAND_BIKER2, ThreeIsland_Movement_BikerSpeak waitmovement 0 msgbox ThreeIsland_Text_Biker2PostBattle closemessage - applymovement LOCALID_BIKER3, ThreeIsland_Movement_BikerApproach + applymovement LOCALID_THREE_ISLAND_BIKER3, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker3Intro - setvar VAR_LAST_TALKED, LOCALID_BIKER3 + setvar VAR_LAST_TALKED, LOCALID_THREE_ISLAND_BIKER3 trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 - applymovement LOCALID_BIKER4, Common_Movement_WalkInPlaceFasterDown - applymovement LOCALID_BIKER5, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER4, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER5, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox ThreeIsland_Text_Biker3PostBattle closemessage @@ -260,46 +250,46 @@ ThreeIsland_EventScript_BattleBikersScene:: closemessage fadescreen FADE_TO_BLACK removeobject LOCALID_PAXTON - removeobject LOCALID_BIKER1 - removeobject LOCALID_BIKER2 - removeobject LOCALID_BIKER3 - removeobject LOCALID_BIKER4 - removeobject LOCALID_BIKER5 - removeobject LOCALID_BIKER6 + removeobject LOCALID_THREE_ISLAND_BIKER1 + removeobject LOCALID_THREE_ISLAND_BIKER2 + removeobject LOCALID_THREE_ISLAND_BIKER3 + removeobject LOCALID_THREE_ISLAND_BIKER4 + removeobject LOCALID_THREE_ISLAND_BIKER5 + removeobject LOCALID_THREE_ISLAND_BIKER6 fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_THREE_ISLAND, 4 releaseall end ThreeIsland_EventScript_PaxtonApproachLeft:: - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachLeft waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMidLeft:: - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidLeft waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMid:: - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid - applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton + applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMidRight:: - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown - applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachRight:: - applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown - applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton + applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight waitmovement 0 return @@ -307,9 +297,9 @@ ThreeIsland_EventScript_PaxtonApproachRight:: ThreeIsland_EventScript_LeaveBikersAlone:: msgbox ThreeIsland_Text_ThatsSmart closemessage - applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerLeaveBikers + applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerLeaveBikers waitmovement 0 - applymovement LOCALID_BIKER1, ThreeIsland_Movement_Biker1ReturnToPack + applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_Biker1ReturnToPack waitmovement 0 fadedefaultbgm releaseall diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 18151e232..f037061a0 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_BERRY_FOREST_LOSTELLE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 8aeed468c..9aefd0fc1 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_LOSTELLE, 1 - ThreeIsland_BerryForest_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_BerryForest_OnTransition .byte 0 @@ -14,9 +12,9 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: faceplayer msgbox ThreeIsland_BerryForest_Text_HelpScaryPokemon playse SE_PIN - applymovement LOCALID_LOSTELLE, Common_Movement_ExclamationMark + applymovement LOCALID_BERRY_FOREST_LOSTELLE, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_LOSTELLE, ThreeIsland_BerryForest_Movement_LostelleLookAround + applymovement LOCALID_BERRY_FOREST_LOSTELLE, ThreeIsland_BerryForest_Movement_LostelleLookAround waitmovement 0 msgbox ThreeIsland_BerryForest_Text_HereItComesAgain goto_if_questlog EventScript_ReleaseEnd @@ -26,7 +24,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: setwildbattle SPECIES_HYPNO, 30 dowildbattle special QuestLog_CutRecording - applymovement LOCALID_LOSTELLE, Common_Movement_FacePlayer + applymovement LOCALID_BERRY_FOREST_LOSTELLE, Common_Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis giveitem ITEM_IAPAPA_BERRY diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 6b40c01eb..851c70a53 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_PROSPECTOR", "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 23, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 2c66fb6f4..889af0420 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_PROSPECTOR, 1 - ThreeIsland_DunsparceTunnel_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_DunsparceTunnel_OnTransition .byte 0 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 40a381d8a..663610c18 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_THREE_ISLAND_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index e336cc956..2ac23be73 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: .byte 0 ThreeIsland_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_THREE_ISLAND + setrespawn HEAL_LOCATION_THREE_ISLAND end ThreeIsland_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 7547f513b..5304effe2 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 10, diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index b92b7b6b7..9d15aa978 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index e6adefa4b..a78eee80a 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index 82ad54a67..5fe5dce7a 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 706a18d53..5b1e39ebd 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index b10e110e0..3f64443c4 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 33fa4b6bc..db35b661c 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 5624035e3..0193e52d1 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -30,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, @@ -44,6 +45,7 @@ "flag": "FLAG_TEMP_2" }, { + "local_id": "LOCALID_TOWER_TRAINER_SINGLES", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_3" }, { + "local_id": "LOCALID_TOWER_TRAINER_KNOCKOUT", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -72,6 +75,7 @@ "flag": "FLAG_TEMP_4" }, { + "local_id": "LOCALID_TOWER_TRAINER_DOUBLES2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, diff --git a/data/maps/TrainerTower_Elevator/scripts.inc b/data/maps/TrainerTower_Elevator/scripts.inc index 07dd791f3..5aa850140 100644 --- a/data/maps/TrainerTower_Elevator/scripts.inc +++ b/data/maps/TrainerTower_Elevator/scripts.inc @@ -44,7 +44,7 @@ TrainerTower_Elevator_EventScript_SelectLobby:: setvar VAR_ELEVATOR_FLOOR, 3 special CloseElevatorCurrentFloorWindow delay 25 - applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator + applymovement LOCALID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator waitmovement 0 warp MAP_TRAINER_TOWER_LOBBY, 17, 8 waitstate diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index 8ca6a756d..bc3221e5c 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_TOWER_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 4, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TOWER_MART_CLERK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 14, @@ -44,6 +46,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TOWER_RECEPTIONIST", "type": "object", "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 11, @@ -58,6 +61,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TOWER_COOLTRAINER_F", "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 12, @@ -72,6 +76,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TOWER_BALDING_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc index e435cb33f..b2543ec3f 100644 --- a/data/maps/TrainerTower_Lobby/scripts.inc +++ b/data/maps/TrainerTower_Lobby/scripts.inc @@ -1,9 +1,3 @@ -.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:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_Lobby_OnResume map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerTower_Lobby_OnReturnToField @@ -19,17 +13,17 @@ TrainerTower_Lobby_OnResume:: goto_if_eq VAR_RESULT, FALSE, TrainerTower_Lobby_OnResumeEnd @ Never reached, above always FALSE setvar VAR_TEMP_0, 0 - setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 - applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + setobjectxy LOCALID_PLAYER, 9, 7 + applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist TrainerTower_Lobby_OnResumeEnd:: end TrainerTower_Lobby_OnReturnToField:: - addobject LOCALID_NURSE - addobject LOCALID_MART_CLERK - addobject LOCALID_RECEPTIONIST - addobject LOCALID_COOLTRAINER_F - addobject LOCALID_BALDING_MAN + addobject LOCALID_TOWER_NURSE + addobject LOCALID_TOWER_MART_CLERK + addobject LOCALID_TOWER_RECEPTIONIST + addobject LOCALID_TOWER_COOLTRAINER_F + addobject LOCALID_TOWER_BALDING_MAN end TrainerTower_Lobby_OnLoad:: @@ -52,7 +46,7 @@ TrainerTower_Lobby_OnFrame:: TrainerTower_Lobby_EventScript_ExitElevator:: lockall - applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator + applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator waitmovement 0 setmetatile 17, 10, METATILE_TrainerTower_CounterBarrier, 1 special DrawWholeMapView @@ -78,7 +72,7 @@ TrainerTower_Lobby_EventScript_Enter:: TrainerTower_Lobby_EventScript_LostChallenge:: lock faceplayer - applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist textcolor NPC_TEXT_COLOR_FEMALE msgbox TrainerTower_Lobby_Text_TooBadComeBackTryAgain goto TrainerTower_Lobby_EventScript_ExitChallenge @@ -87,12 +81,12 @@ TrainerTower_Lobby_EventScript_LostChallenge:: TrainerTower_Lobby_EventScript_ExitChallengeSpeakToReceptionist:: lock faceplayer - applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist textcolor NPC_TEXT_COLOR_FEMALE msgbox TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch TrainerTower_Lobby_EventScript_ExitChallenge:: closemessage - applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown + applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_WalkDown waitmovement 0 setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 release @@ -148,7 +142,7 @@ TrainerTower_Lobby_Mart_Items:: TrainerTower_Lobby_EventScript_EntryTrigger:: lockall - applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist textcolor NPC_TEXT_COLOR_FEMALE msgbox TrainerTower_Lobby_Text_WelcomeToTrainerTower ttower_getnumfloors @@ -197,7 +191,7 @@ TrainerTower_Lobby_EventScript_BeginChallenge:: TrainerTower_Lobby_EventScript_DeclineChallenge:: msgbox TrainerTower_Lobby_Text_PleaseVisitUsAgain closemessage - applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown + applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_WalkDown waitmovement 0 releaseall end diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index a37a6d584..fe81353a9 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_CAPE_BRINK_TUTOR", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 58f88994c..5c8be1cbc 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_JOYFUL_GAME_CORNER_DADDY", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 5, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_JOYFUL_GAME_CORNER_BIKER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 5, @@ -44,6 +46,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER" }, { + "local_id": "LOCALID_JOYFUL_GAME_CORNER_LOSTELLE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index a31f95dea..e1cfe47bd 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -1,7 +1,3 @@ -.equ LOCALID_DADDY, 1 -.equ LOCALID_BIKER, 2 -.equ LOCALID_LOSTELLE, 3 - TwoIsland_JoyfulGameCorner_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp @@ -14,9 +10,9 @@ TwoIsland_JoyfulGameCorner_OnTransition:: end TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos:: - setobjectxyperm LOCALID_DADDY, 6, 2 - setobjectmovementtype LOCALID_DADDY, MOVEMENT_TYPE_FACE_DOWN - setobjectmovementtype LOCALID_LOSTELLE, MOVEMENT_TYPE_LOOK_AROUND + setobjectxyperm LOCALID_JOYFUL_GAME_CORNER_DADDY, 6, 2 + setobjectmovementtype LOCALID_JOYFUL_GAME_CORNER_DADDY, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype LOCALID_JOYFUL_GAME_CORNER_LOSTELLE, MOVEMENT_TYPE_LOOK_AROUND setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 return @@ -26,7 +22,7 @@ TwoIsland_JoyfulGameCorner_OnWarp:: .2byte 0 TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth:: - turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH + turnobject LOCALID_PLAYER, DIR_NORTH end TwoIsland_JoyfulGameCorner_OnFrame:: @@ -43,7 +39,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: special BufferBigGuyOrBigGirlString msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy closemessage - applymovement LOCALID_LOSTELLE, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_JOYFUL_GAME_CORNER_LOSTELLE, Common_Movement_WalkInPlaceFasterDown waitmovement 0 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 releaseall @@ -52,41 +48,41 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyPacing + applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyPacing waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo closemessage - applymovement LOCALID_DADDY, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN - applymovement LOCALID_DADDY, Common_Movement_ExclamationMark + applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_DADDY, Common_Movement_Delay48 + applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyApproachPlayer + applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyApproachPlayer waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle closemessage playse SE_RS_DOOR waitse - applymovement OBJ_EVENT_ID_PLAYER, TwoIsland_JoyfulGameCorner_Movement_PlayerFaceDaddy + applymovement LOCALID_PLAYER, TwoIsland_JoyfulGameCorner_Movement_PlayerFaceDaddy waitmovement 0 playbgm MUS_ENCOUNTER_BOY, 0 - addobject LOCALID_BIKER - applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround + addobject LOCALID_JOYFUL_GAME_CORNER_BIKER + applymovement LOCALID_JOYFUL_GAME_CORNER_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland - applymovement LOCALID_BIKER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_JOYFUL_GAME_CORNER_BIKER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt msgbox TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing closemessage - applymovement LOCALID_BIKER, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_JOYFUL_GAME_CORNER_BIKER, Common_Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_EXIT - removeobject LOCALID_BIKER + removeobject LOCALID_JOYFUL_GAME_CORNER_BIKER fadedefaultbgm delay 60 msgbox TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 6daf7c00a..f294d71b0 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_TWO_ISLAND_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index 66ed1ecf5..f0c4d1747 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ TwoIsland_PokemonCenter_1F_MapScripts:: .byte 0 TwoIsland_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_TWO_ISLAND + setrespawn HEAL_LOCATION_TWO_ISLAND end TwoIsland_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 45c625f84..acbcd9c25 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -30,6 +30,7 @@ "flag": "0" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_4", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 1, @@ -44,6 +45,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_8", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 7, @@ -58,6 +60,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_7", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, @@ -72,6 +75,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_6", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 7, @@ -86,6 +90,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_5", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 13, @@ -100,6 +105,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_3", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, @@ -114,6 +120,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, @@ -128,6 +135,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" }, { + "local_id": "LOCALID_UNION_ROOM_PLAYER_1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index cda186af7..d0b7a9a42 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -97,6 +97,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VERMILION_FERRY_SAILOR", "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 24, diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 004d6e7c6..580560a5d 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -1,5 +1,3 @@ -.equ LOCALID_FERRY_SAILOR, 6 - VermilionCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_OnFrame @@ -11,7 +9,7 @@ VermilionCity_OnFrame:: VermilionCity_EventScript_ExitSSAnne:: lockall - applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_ExitSSAnne + applymovement LOCALID_PLAYER, VermilionCity_Movement_ExitSSAnne waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 3 releaseall @@ -191,8 +189,8 @@ VermilionCity_EventScript_ExitedTicketCheck:: VermilionCity_EventScript_CheckTicket:: textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterLeft - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_VERMILION_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 goto_if_eq VAR_MAP_SCENE_VERMILION_CITY, 3, VermilionCity_EventScript_CheckSeagallopPresentTrigger msgbox VermilionCity_Text_DoYouHaveATicket diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 4faf56365..e937f548e 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_VERMILION_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index b0a892f09..904b0a65d 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ VermilionCity_PokemonCenter_1F_MapScripts:: .byte 0 VermilionCity_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_VERMILION_CITY + setrespawn HEAL_LOCATION_VERMILION_CITY end VermilionCity_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 2ab3825ad..dd026da17 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -72,6 +72,7 @@ "flag": "0" }, { + "local_id": "LOCALID_POKEMON_FAN_CLUB_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, @@ -86,6 +87,7 @@ "flag": "0" }, { + "local_id": "LOCALID_POKEMON_FAN_CLUB_FAT_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 7, diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index b5c9e005c..c2bad7722 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -1,6 +1,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 @@ -57,7 +54,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman:: goto_if_set SPOKE_TO_FAT_MAN_LAST, VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan msgbox VermilionCity_PokemonFanClub_Text_AdoreMySeel closemessage - applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_POKEMON_FAN_CLUB_WOMAN, Common_Movement_FaceOriginalDirection waitmovement 0 setflag SPOKE_TO_WOMAN_LAST release @@ -66,7 +63,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman:: VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan:: msgbox VermilionCity_PokemonFanClub_Text_SeelFarMoreAttractive closemessage - applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_POKEMON_FAN_CLUB_WOMAN, Common_Movement_FaceOriginalDirection waitmovement 0 clearflag SPOKE_TO_FAT_MAN_LAST release @@ -78,7 +75,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan:: goto_if_set SPOKE_TO_WOMAN_LAST, VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman msgbox VermilionCity_PokemonFanClub_Text_AdmirePikachusTail closemessage - applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_POKEMON_FAN_CLUB_FAT_MAN, Common_Movement_FaceOriginalDirection waitmovement 0 setflag SPOKE_TO_FAT_MAN_LAST release @@ -87,7 +84,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan:: VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman:: msgbox VermilionCity_PokemonFanClub_Text_PikachuTwiceAsCute closemessage - applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_POKEMON_FAN_CLUB_FAT_MAN, Common_Movement_FaceOriginalDirection waitmovement 0 clearflag SPOKE_TO_WOMAN_LAST release diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 069f4213a..24d4550f9 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -72,6 +72,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { + "local_id": "LOCALID_VICTORY_ROAD_1F_BOULDER", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index c7db0fc69..e459d4298 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_BOULDER, 5 - VictoryRoad_1F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_1F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition @@ -26,7 +24,7 @@ VictoryRoad_1F_EventScript_FloorSwitch:: playse SE_ICE_BREAK special DrawWholeMapView waitse - copyobjectxytoperm LOCALID_BOULDER + copyobjectxytoperm LOCALID_VICTORY_ROAD_1F_BOULDER setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 releaseall end diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index ab71c632d..968726ccc 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -156,6 +156,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VICTORY_ROAD_2F_BOULDER1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, @@ -170,6 +171,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VICTORY_ROAD_2F_BOULDER2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 33, diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 7e8140e29..eb9af7d67 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_BOULDER1, 11 -.set LOCALID_BOULDER2, 12 - VictoryRoad_2F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_2F_OnLoad .byte 0 @@ -28,7 +25,7 @@ VictoryRoad_2F_EventScript_FloorSwitch1:: playse SE_ICE_BREAK special DrawWholeMapView waitse - copyobjectxytoperm LOCALID_BOULDER1 + copyobjectxytoperm LOCALID_VICTORY_ROAD_2F_BOULDER1 setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 releaseall end @@ -45,7 +42,7 @@ VictoryRoad_2F_EventScript_FloorSwitch2:: playse SE_ICE_BREAK special DrawWholeMapView waitse - copyobjectxytoperm LOCALID_BOULDER2 + copyobjectxytoperm LOCALID_VICTORY_ROAD_2F_BOULDER2 setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 releaseall end diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 1c62f8a19..982939220 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -100,6 +100,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { + "local_id": "LOCALID_VICTORY_ROAD_3F_BOULDER1", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 19, @@ -142,6 +143,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VICTORY_ROAD_3F_BOULDER2", "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 32, diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 23350fb8b..8621b4045 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_BOULDER1, 7 -.set LOCALID_BOULDER2, 10 - VictoryRoad_3F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_3F_OnLoad .byte 0 @@ -22,8 +19,8 @@ VictoryRoad_3F_EventScript_FloorSwitch:: playse SE_ICE_BREAK special DrawWholeMapView waitse - copyobjectxytoperm LOCALID_BOULDER1 - copyobjectxytoperm LOCALID_BOULDER2 + copyobjectxytoperm LOCALID_VICTORY_ROAD_3F_BOULDER1 + copyobjectxytoperm LOCALID_VICTORY_ROAD_3F_BOULDER2 setvar VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 releaseall end diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index ccd10d432..465d593ce 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -60,6 +60,7 @@ "flag": "FLAG_TEMP_11" }, { + "local_id": "LOCALID_VIRIDIAN_OLD_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 34, @@ -74,6 +75,7 @@ "flag": "0" }, { + "local_id": "LOCALID_TUTORIAL_MAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 21, @@ -88,6 +90,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VIRIDIAN_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 20, @@ -130,6 +133,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VIRIDIAN_BORDER_TREE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 18, diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 5793034d9..d6c71605b 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -1,7 +1,3 @@ -.set LOCALID_OLD_MAN, 3 -.set LOCALID_TUTORIAL_MAN, 4 -.set LOCALID_WOMAN, 5 - ViridianCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition .byte 0 @@ -43,12 +39,12 @@ ViridianCity_EventScript_TryUnlockGym:: ViridianCity_EventScript_GymDoorLocked:: lockall textcolor NPC_TEXT_COLOR_NEUTRAL - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 msgbox ViridianCity_Text_GymDoorsAreLocked closemessage - applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Movement_JumpDownLedge + applymovement LOCALID_PLAYER, ViridianCity_Movement_JumpDownLedge waitmovement 0 releaseall end @@ -88,7 +84,7 @@ ViridianCity_EventScript_OldMan:: goto_if_eq VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1, ViridianCity_EventScript_OldManGymLeaderReturned msgbox ViridianCity_Text_GymClosedWonderWhoLeaderIs closemessage - applymovement LOCALID_OLD_MAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_VIRIDIAN_OLD_MAN, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -180,7 +176,7 @@ ViridianCity_EventScript_Woman:: ViridianCity_EventScript_WomanRoadBlocked:: msgbox ViridianCity_Text_GrandpaHasntHadCoffeeYet closemessage - applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_VIRIDIAN_WOMAN, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -194,7 +190,7 @@ ViridianCity_EventScript_RoadBlocked:: textcolor NPC_TEXT_COLOR_MALE msgbox ViridianCity_Text_ThisIsPrivateProperty closemessage - applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Movement_WalkDown + applymovement LOCALID_PLAYER, ViridianCity_Movement_WalkDown waitmovement 0 releaseall end @@ -208,7 +204,7 @@ ViridianCity_EventScript_TutorialTriggerLeft:: textcolor NPC_TEXT_COLOR_MALE applymovement LOCALID_TUTORIAL_MAN, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 call ViridianCity_EventScript_DoTutorialBattle release @@ -219,7 +215,7 @@ ViridianCity_EventScript_TutorialTriggerRight:: textcolor NPC_TEXT_COLOR_MALE applymovement LOCALID_TUTORIAL_MAN, Common_Movement_WalkInPlaceFasterRight waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 call ViridianCity_EventScript_DoTutorialBattle release diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 12b470ba7..db4002398 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -114,6 +114,7 @@ "flag": "0" }, { + "local_id": "LOCALID_VIRIDIAN_GIOVANNI", "type": "object", "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 2, diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index c1ca590e0..3e07a41b7 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_GIOVANNI, 8 - ViridianCity_Gym_MapScripts:: .byte 0 @@ -10,7 +8,7 @@ ViridianCity_Gym_EventScript_Giovanni:: msgbox ViridianCity_Gym_Text_GiovanniPostBattle closemessage fadescreen FADE_TO_BLACK - removeobject LOCALID_GIOVANNI + removeobject LOCALID_VIRIDIAN_GIOVANNI fadescreen FADE_FROM_BLACK release end diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 23cbb6e81..e17af9765 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_VIRIDIAN_MART_CLERK", "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 4a2ed71d1..1210dd826 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -1,5 +1,3 @@ -.set LOCALID_CLERK, 1 - ViridianCity_Mart_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, ViridianCity_Mart_OnLoad map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_Mart_OnFrame @@ -21,12 +19,12 @@ ViridianCity_Mart_OnFrame:: ViridianCity_Mart_EventScript_ParcelScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_CLERK, Common_Movement_WalkInPlaceFasterDown + applymovement LOCALID_VIRIDIAN_MART_CLERK, Common_Movement_WalkInPlaceFasterDown waitmovement 0 msgbox ViridianCity_Mart_Text_YouCameFromPallet closemessage - applymovement LOCALID_CLERK, ViridianCity_Mart_Movement_FacePlayer - applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Mart_Movement_ApproachCounter + applymovement LOCALID_VIRIDIAN_MART_CLERK, ViridianCity_Mart_Movement_FacePlayer + applymovement LOCALID_PLAYER, ViridianCity_Mart_Movement_ApproachCounter waitmovement 0 msgbox ViridianCity_Mart_Text_TakeThisToProfOak setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 84ad95c4d..3556932f9 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_VIRIDIAN_NURSE", "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index ce6b68820..40d3d77f1 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ ViridianCity_PokemonCenter_1F_MapScripts:: .byte 0 ViridianCity_PokemonCenter_1F_OnTransition:: - setrespawn SPAWN_VIRIDIAN_CITY + setrespawn HEAL_LOCATION_VIRIDIAN_CITY end ViridianCity_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/ViridianCity_School/map.json b/data/maps/ViridianCity_School/map.json index 195161147..f9a6bac70 100644 --- a/data/maps/ViridianCity_School/map.json +++ b/data/maps/ViridianCity_School/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "local_id": "LOCALID_SCHOOL_WOMAN", "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, @@ -30,6 +31,7 @@ "flag": "0" }, { + "local_id": "LOCALID_SCHOOL_LASS", "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, diff --git a/data/maps/ViridianCity_School/scripts.inc b/data/maps/ViridianCity_School/scripts.inc index fdb02d481..e8a73080d 100644 --- a/data/maps/ViridianCity_School/scripts.inc +++ b/data/maps/ViridianCity_School/scripts.inc @@ -1,6 +1,3 @@ -.set LOCALID_WOMAN, 1 -.set LOCALID_LASS, 2 - ViridianCity_School_MapScripts:: .byte 0 @@ -9,7 +6,7 @@ ViridianCity_School_EventScript_Lass:: faceplayer msgbox ViridianCity_School_Text_TryingToMemorizeNotes closemessage - applymovement LOCALID_LASS, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_SCHOOL_LASS, Common_Movement_WalkInPlaceFasterUp waitmovement 0 release end @@ -19,7 +16,7 @@ ViridianCity_School_EventScript_Woman:: faceplayer msgbox ViridianCity_School_Text_ReadBlackboardCarefully closemessage - applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_SCHOOL_WOMAN, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -36,7 +33,7 @@ ViridianCity_School_EventScript_Notebook:: msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, ViridianCity_School_EventScript_StopReadingNotebook msgbox ViridianCity_School_Text_NotebookFourthPage - applymovement LOCALID_LASS, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_SCHOOL_LASS, Common_Movement_WalkInPlaceFasterUp waitmovement 0 textcolor NPC_TEXT_COLOR_FEMALE msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index e7f53ada2..423ac7ad3 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -108,7 +108,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom + applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 @@ -131,7 +131,7 @@ CableClub_EventScript_PlayerExitTradeCenter:: setvar VAR_CABLE_CLUB_STATE, 0 textcolor NPC_TEXT_COLOR_FEMALE goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight + applymovement LOCALID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 @@ -154,7 +154,7 @@ CableClub_EventScript_PlayerExitUnionRoom:: setvar VAR_CABLE_CLUB_STATE, 0 textcolor NPC_TEXT_COLOR_FEMALE goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight + applymovement LOCALID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 @@ -167,25 +167,25 @@ CableClub_EventScript_TrainerCardDataOverwritten:: playse SE_PIN message CableClub_Text_HopeToSeeYouAgain waitmessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom + applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return CableClub_EventScript_PlayerExitLinkRoom:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom + applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 return CableClub_EventScript_Tutorial:: lockall textcolor NPC_TEXT_COLOR_FEMALE - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox CableClub_Text_FirstTimeRightThisWay closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachCounter + applymovement LOCALID_PLAYER, Movement_PlayerApproachCounter waitmovement 0 delay 30 msgbox CableClub_Text_ExplainWirelessClubFirstTime @@ -297,13 +297,13 @@ CableClub_EventScript_EnterColosseum:: applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat OBJ_EVENT_ID_PLAYER, 0 + hideobjectat LOCALID_PLAYER, 0 closedoor 9, 1 waitdooranim release @@ -316,7 +316,7 @@ CableClub_EventScript_EnterColosseum:: @ Unused CableClub_EventScript_PlayerApproachLinkRoomRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomRight + applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomRight waitmovement 0 return @@ -395,13 +395,13 @@ CableClub_EventScript_EnterTradeCenter:: applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat OBJ_EVENT_ID_PLAYER, 0 + hideobjectat LOCALID_PLAYER, 0 closedoor 9, 1 waitdooranim release @@ -783,13 +783,13 @@ CableClub_EventScript_EnterUnionRoom:: delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 5, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat OBJ_EVENT_ID_PLAYER, 0 + hideobjectat LOCALID_PLAYER, 0 closedoor 5, 1 waitdooranim special Script_ResetUnionRoomTrade @@ -1060,13 +1060,13 @@ CableClub_EventScript_EnterWirelessLinkRoom:: applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat OBJ_EVENT_ID_PLAYER, 0 + hideobjectat LOCALID_PLAYER, 0 closedoor 9, 1 waitdooranim release @@ -1244,9 +1244,9 @@ CableClub_EventScript_EnterMinigame:: applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterMinigameRoom + applymovement LOCALID_PLAYER, Movement_PlayerEnterMinigameRoom waitmovement 0 - hideobjectat OBJ_EVENT_ID_PLAYER, 0 + hideobjectat LOCALID_PLAYER, 0 release waitstate end diff --git a/data/scripts/hole.inc b/data/scripts/hole.inc index 343458e7c..c280b83dd 100644 --- a/data/scripts/hole.inc +++ b/data/scripts/hole.inc @@ -11,7 +11,7 @@ EventScript_FixCrackedGround:: EventScript_FallDownHole:: lockall delay 20 - applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible + applymovement LOCALID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_FALL delay 60 @@ -23,7 +23,7 @@ EventScript_FallDownHole:: EventScript_DoFallWarp:: lockall delay 20 - applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible + applymovement LOCALID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_FALL delay 60 diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index fa56be624..e5b0f72b2 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -399,8 +399,6 @@ EventScript_BodySlamTaught:: release end -.set LOCALID_CAPE_BRINK_TUTOR, 1 - TwoIsland_CapeBrink_House_EventScript_StarterTutor:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording diff --git a/data/scripts/pokemon_league.inc b/data/scripts/pokemon_league.inc index f1d018499..973cdf1cd 100644 --- a/data/scripts/pokemon_league.inc +++ b/data/scripts/pokemon_league.inc @@ -1,5 +1,5 @@ PokemonLeague_EventScript_OpenDoor:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32 + applymovement LOCALID_PLAYER, Common_Movement_Delay32 waitmovement 0 playse SE_RS_DOOR call PokemonLeague_EventScript_SetDoorOpen @@ -8,7 +8,7 @@ PokemonLeague_EventScript_OpenDoor:: return PokemonLeague_EventScript_EnterRoom:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp5 + applymovement LOCALID_PLAYER, Common_Movement_WalkUp5 waitmovement 0 setflag FLAG_TEMP_2 playse SE_UNLOCK @@ -26,13 +26,13 @@ PokemonLeague_EventScript_PreventExit:: textcolor NPC_TEXT_COLOR_MALE msgbox Text_VoiceRangOutDontRunAway closemessage - applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_Movement_ForcePlayerIn + applymovement LOCALID_PLAYER, PokemonLeague_Movement_ForcePlayerIn waitmovement 0 releaseall end PokemonLeague_EventScript_OpenDoorLance:: - applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32 + applymovement LOCALID_PLAYER, Common_Movement_Delay32 waitmovement 0 playse SE_RS_DOOR setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1 diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc index 9d9a616cb..9c8729ad5 100644 --- a/data/scripts/route23.inc +++ b/data/scripts/route23.inc @@ -172,7 +172,7 @@ Route23_EventScript_MissingBoulderBadgeTrigger:: playse SE_BOO msgbox Text_CantLetYouPass closemessage - applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown + applymovement LOCALID_PLAYER, Route23_Movement_WalkDown applymovement VAR_0x8009, Common_Movement_WalkInPlaceFasterDown waitmovement 0 releaseall @@ -185,7 +185,7 @@ Route23_EventScript_MissingBadgeTrigger:: waitbuttonpress closemessage waitse - applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown + applymovement LOCALID_PLAYER, Route23_Movement_WalkDown applymovement VAR_0x8009, Common_Movement_WalkInPlaceFasterDown waitmovement 0 releaseall diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index f2c8bae3a..242b42023 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -117,8 +117,8 @@ EventScript_CancelSail:: VermilionCity_EventScript_WalkUpPier:: closemessage - applymovement LOCALID_FERRY_SAILOR, Common_Movement_FaceOriginalDirection - applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_WalkUp + applymovement LOCALID_VERMILION_FERRY_SAILOR, Common_Movement_FaceOriginalDirection + applymovement LOCALID_PLAYER, VermilionCity_Movement_WalkUp waitmovement 0 releaseall end @@ -134,12 +134,12 @@ EventScript_SeviiDestinationsPage1:: specialvar VAR_0x8006, GetSelectedSeagallopDestination switch VAR_0x8006 case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity - case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland - case SEAGALLOP_TWO_ISLAND, EventScript_SailToTwoIsland + case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland + case SEAGALLOP_TWO_ISLAND, EventScript_SailToTwoIsland case SEAGALLOP_THREE_ISLAND, EventScript_SailToThreeIsland - case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland - case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage2 - case SCR_MENU_CANCEL, EventScript_CancelSail + case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland + case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage2 + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_SeviiDestinationsPage2:: @@ -152,8 +152,8 @@ EventScript_SeviiDestinationsPage2:: case SEAGALLOP_FIVE_ISLAND, EventScript_SailToFiveIsland case SEAGALLOP_SIX_ISLAND, EventScript_SailToSixIsland case SEAGALLOP_SEVEN_ISLAND, EventScript_SailToSevenIsland - case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage1 - case SCR_MENU_CANCEL, EventScript_CancelSail + case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage1 + case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_SailToVermilionCity:: diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 3bb906554..a0487667d 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -1,5 +1,3 @@ -.set LOCALID_STICKER_MAN, 1 - CeladonCity_GameCorner_EventScript_PhotoPrinter:: lockall showmoneybox 0, 0 diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index e64f9b768..6a526e9fc 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -1,9 +1,3 @@ -@ Local IDs apply to all floors (not lobby or roof) -.equ LOCALID_TRAINER_DOUBLES1, 2 -.equ LOCALID_TRAINER_SINGLES, 3 -.equ LOCALID_TRAINER_KNOCKOUT, 4 -.equ LOCALID_TRAINER_DOUBLES2, 5 - .equ HIDE_TRAINER_DOUBLES1, FLAG_TEMP_2 .equ HIDE_TRAINER_SINGLES, FLAG_TEMP_3 .equ HIDE_TRAINER_KNOCKOUT, FLAG_TEMP_4 @@ -40,8 +34,8 @@ TrainerTower_EventScript_SetObjectsSingles:: setflag HIDE_TRAINER_KNOCKOUT setflag HIDE_TRAINER_DOUBLES2 setvar DISABLE_DOUBLES_TRIGGER, TRUE - setobjectxyperm LOCALID_TRAINER_SINGLES, 15, 13 - setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TOWER_TRAINER_SINGLES, 15, 13 + setobjectmovementtype LOCALID_TOWER_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT goto TrainerTower_EventScript_HideOwner TrainerTower_EventScript_SetObjectsDoubles:: @@ -50,29 +44,29 @@ TrainerTower_EventScript_SetObjectsDoubles:: setvar DISABLE_SINGLES_TRIGGER, TRUE ttower_isfloorcleared goto_if_eq VAR_RESULT, TRUE, TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten - setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12 - setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_LEFT - setobjectxyperm LOCALID_TRAINER_DOUBLES2, 10, 13 - setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES1, 10, 12 + setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES2, 10, 13 + setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT goto TrainerTower_EventScript_HideOwner TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten:: - setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12 - setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN - setobjectxyperm LOCALID_TRAINER_DOUBLES2, 11, 12 - setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES1, 10, 12 + setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES2, 11, 12 + setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_DOWN goto TrainerTower_EventScript_HideOwner @ Knockout challenge re-uses trainer objects TrainerTower_EventScript_SetObjectsKnockout:: setflag HIDE_TRAINER_DOUBLES2 setvar DISABLE_DOUBLES_TRIGGER, TRUE - setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 10 - setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN - setobjectxyperm LOCALID_TRAINER_SINGLES, 14, 13 - setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT - setobjectxyperm LOCALID_TRAINER_KNOCKOUT, 10, 16 - setobjectmovementtype LOCALID_TRAINER_KNOCKOUT, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_TOWER_TRAINER_DOUBLES1, 10, 10 + setobjectmovementtype LOCALID_TOWER_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_TOWER_TRAINER_SINGLES, 14, 13 + setobjectmovementtype LOCALID_TOWER_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TOWER_TRAINER_KNOCKOUT, 10, 16 + setobjectmovementtype LOCALID_TOWER_TRAINER_KNOCKOUT, MOVEMENT_TYPE_FACE_UP TrainerTower_EventScript_HideOwner: setflag HIDE_OWNER end @@ -109,12 +103,12 @@ TrainerTower_EventScript_TriggerBattle:: TrainerTower_EventScript_DoSingleBattle: ttower_encountermusic - applymovement LOCALID_TRAINER_SINGLES, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_SINGLES, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_Delay48 waitmovement 0 setvar DISABLE_SINGLES_TRIGGER, TRUE - applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach + applymovement LOCALID_TOWER_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach waitmovement 0 ttower_getspeech TRAINER_TOWER_TEXT_INTRO, 0 msgbox gStringVar4 @@ -144,31 +138,31 @@ TrainerTower_EventScript_DoKnockoutBattle:: TrainerTower_EventScript_DoKnockoutBattle1: ttower_encountermusic - applymovement LOCALID_TRAINER_KNOCKOUT, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_KNOCKOUT, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_KNOCKOUT, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_KNOCKOUT, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach + applymovement LOCALID_TOWER_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach waitmovement 0 goto TrainerTower_EventScript_DoKnockoutBattleIntro TrainerTower_EventScript_DoKnockoutBattle2:: ttower_encountermusic - applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach waitmovement 0 goto TrainerTower_EventScript_DoKnockoutBattleIntro TrainerTower_EventScript_DoKnockoutBattle3:: ttower_encountermusic - applymovement LOCALID_TRAINER_SINGLES, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_SINGLES, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_SINGLES, Common_Movement_Delay48 waitmovement 0 - applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach + applymovement LOCALID_TOWER_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach waitmovement 0 TrainerTower_EventScript_DoKnockoutBattleIntro: ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_1 @@ -203,13 +197,13 @@ TrainerTower_EventScript_DoThirdKnockoutBattle:: goto TrainerTower_EventScript_DoKnockoutBattle TrainerTower_EventScript_MoveDoublesTrainers:: - applymovement LOCALID_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay + applymovement LOCALID_TOWER_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay waitmovement 0 - applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown goto TrainerTower_EventScript_SetFloorCleared TrainerTower_EventScript_MoveLastKnockoutTrainer:: - applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay + applymovement LOCALID_TOWER_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay TrainerTower_EventScript_SetFloorCleared: ttower_clearedfloor end @@ -339,9 +333,9 @@ TrainerTower_EventScript_DoubleBattleTriggerTop:: ttower_checkdoubles goto_if_ne VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS, TrainerTower_EventScript_IneligibleForDoubleBattle ttower_encountermusic - applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_DOUBLES1, Common_Movement_Delay48 goto TrainerTower_EventScript_TriggerDoubleBattle TrainerTower_EventScript_DoubleBattleTriggerBottom:: @@ -349,9 +343,9 @@ TrainerTower_EventScript_DoubleBattleTriggerBottom:: ttower_checkdoubles goto_if_ne VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS, TrainerTower_EventScript_IneligibleForDoubleBattle ttower_encountermusic - applymovement LOCALID_TRAINER_DOUBLES2, Common_Movement_ExclamationMark + applymovement LOCALID_TOWER_TRAINER_DOUBLES2, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_TRAINER_DOUBLES2, Common_Movement_Delay48 + applymovement LOCALID_TOWER_TRAINER_DOUBLES2, Common_Movement_Delay48 TrainerTower_EventScript_TriggerDoubleBattle: waitmovement 0 setvar DISABLE_DOUBLES_TRIGGER, TRUE @@ -362,7 +356,7 @@ TrainerTower_EventScript_IneligibleForDoubleBattle:: playse SE_DING_DONG msgbox TrainerTower_Lobby_Text_NeedTwoMonsForDouble closemessage - applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Movement_PushPlayerBack + applymovement LOCALID_PLAYER, TrainerTower_Movement_PushPlayerBack waitmovement 0 releaseall end diff --git a/data/scripts/white_out.inc b/data/scripts/white_out.inc index 6ec14717b..ff4feb66f 100644 --- a/data/scripts/white_out.inc +++ b/data/scripts/white_out.inc @@ -19,8 +19,6 @@ EventScript_AfterWhiteOutHealMsg:: msgbox Text_MonsHealed return -@ LOCALID_MOM set by PalletTown_PlayersHouse_1F - EventScript_AfterWhiteOutMomHeal:: lockall textcolor NPC_TEXT_COLOR_FEMALE diff --git a/include/constants/.gitignore b/include/constants/.gitignore index 90e7a7440..5923892b4 100644 --- a/include/constants/.gitignore +++ b/include/constants/.gitignore @@ -1,3 +1,6 @@ # Will be moved to build/ eventually map_groups.h layouts.h +region_map_sections.h +map_event_ids.h +heal_locations.h diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 0eac72a29..31e2272d6 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -1,6 +1,8 @@ #ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H #define GUARD_CONSTANTS_EVENT_OBJECTS_H +#include "constants/map_event_ids.h" + #define OBJ_EVENT_GFX_RED_NORMAL 0 #define OBJ_EVENT_GFX_RED_BIKE 1 #define OBJ_EVENT_GFX_RED_SURF 2 @@ -192,18 +194,18 @@ #define OBJ_KIND_NORMAL 0 #define OBJ_KIND_CLONE 255 -// Special object event local ids -#define OBJ_EVENT_ID_PLAYER 0xFF -#define OBJ_EVENT_ID_CAMERA 0x7F +// Each object event template gets an ID that can be used to refer to it in scripts and elsewhere. +// This is referred to as the "local id" (and it's really just 1 + its index in the templates array). +// There are a few special IDs reserved for objects that don't have templates in the map data -- one for the player +// in regular offline play, five for linked players while playing Berry Blender, and one for an invisible object that +// can be spawned for the camera to track instead of the player. Additionally, the value 0 is reserved as an "empty" indicator. +#define LOCALID_NONE 0 +#define LOCALID_CAMERA 127 +#define LOCALID_BERRY_BLENDER_PLAYER_END 240 // This will use 5 (MAX_RFU_PLAYERS) IDs ending at 240, i.e. 236-240 +#define LOCALID_PLAYER 255 -// Object event local ids referenced in C files -#define LOCALID_UNION_ROOM_PLAYER_4 2 -#define LOCALID_UNION_ROOM_PLAYER_8 3 -#define LOCALID_UNION_ROOM_PLAYER_7 4 -#define LOCALID_UNION_ROOM_PLAYER_6 5 -#define LOCALID_UNION_ROOM_PLAYER_5 6 -#define LOCALID_UNION_ROOM_PLAYER_3 7 -#define LOCALID_UNION_ROOM_PLAYER_2 8 -#define LOCALID_UNION_ROOM_PLAYER_1 9 +// Aliases for old names. "object event id" normally refers to an index into gObjectEvents, which these are not. +#define OBJ_EVENT_ID_CAMERA LOCALID_CAMERA +#define OBJ_EVENT_ID_PLAYER LOCALID_PLAYER #endif // GUARD_CONSTANTS_EVENT_OBJECTS_H diff --git a/include/constants/heal_locations.h b/include/constants/heal_locations.h deleted file mode 100644 index 1c613d464..000000000 --- a/include/constants/heal_locations.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef GUARD_CONSTANTS_HEAL_LOCATIONS_H -#define GUARD_CONSTANTS_HEAL_LOCATIONS_H - -#define SPAWN_PALLET_TOWN 1 -#define SPAWN_VIRIDIAN_CITY 2 -#define SPAWN_PEWTER_CITY 3 -#define SPAWN_CERULEAN_CITY 4 -#define SPAWN_LAVENDER_TOWN 5 -#define SPAWN_VERMILION_CITY 6 -#define SPAWN_CELADON_CITY 7 -#define SPAWN_FUCHSIA_CITY 8 -#define SPAWN_CINNABAR_ISLAND 9 -#define SPAWN_INDIGO_PLATEAU 10 -#define SPAWN_SAFFRON_CITY 11 -#define SPAWN_ROUTE4 12 -#define SPAWN_ROUTE10 13 -#define SPAWN_ONE_ISLAND 14 -#define SPAWN_TWO_ISLAND 15 -#define SPAWN_THREE_ISLAND 16 -#define SPAWN_FOUR_ISLAND 17 -#define SPAWN_FIVE_ISLAND 18 -#define SPAWN_SEVEN_ISLAND 19 -#define SPAWN_SIX_ISLAND 20 - -#endif // GUARD_CONSTANTS_HEAL_LOCATIONS_H diff --git a/include/constants/maps.h b/include/constants/maps.h index 0452a6666..fe2b7fd14 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -10,8 +10,8 @@ #define MAP_UNDEFINED (0xFF | (0xFF << 8)) -#define MAP_GROUP(map) (MAP_##map >> 8) -#define MAP_NUM(map) (MAP_##map & 0xFF) +#define MAP_GROUP(map) (map >> 8) +#define MAP_NUM(map) (map & 0xFF) #define MAP(map) MAP_GROUP(map), MAP_NUM(map) diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h deleted file mode 100644 index 4fa9378f5..000000000 --- a/include/constants/region_map_sections.h +++ /dev/null @@ -1,214 +0,0 @@ -#ifndef GUARD_CONSTANTS_REGION_MAP_SECTIONS_H -#define GUARD_CONSTANTS_REGION_MAP_SECTIONS_H - -#define MAPSEC_LITTLEROOT_TOWN 0x00 -#define MAPSEC_OLDALE_TOWN 0x01 -#define MAPSEC_DEWFORD_TOWN 0x02 -#define MAPSEC_LAVARIDGE_TOWN 0x03 -#define MAPSEC_FALLARBOR_TOWN 0x04 -#define MAPSEC_VERDANTURF_TOWN 0x05 -#define MAPSEC_PACIFIDLOG_TOWN 0x06 -#define MAPSEC_PETALBURG_CITY 0x07 -#define MAPSEC_SLATEPORT_CITY 0x08 -#define MAPSEC_MAUVILLE_CITY 0x09 -#define MAPSEC_RUSTBORO_CITY 0x0A -#define MAPSEC_FORTREE_CITY 0x0B -#define MAPSEC_LILYCOVE_CITY 0x0C -#define MAPSEC_MOSSDEEP_CITY 0x0D -#define MAPSEC_SOOTOPOLIS_CITY 0x0E -#define MAPSEC_EVER_GRANDE_CITY 0x0F -#define MAPSEC_ROUTE_101 0x10 -#define MAPSEC_ROUTE_102 0x11 -#define MAPSEC_ROUTE_103 0x12 -#define MAPSEC_ROUTE_104 0x13 -#define MAPSEC_ROUTE_105 0x14 -#define MAPSEC_ROUTE_106 0x15 -#define MAPSEC_ROUTE_107 0x16 -#define MAPSEC_ROUTE_108 0x17 -#define MAPSEC_ROUTE_109 0x18 -#define MAPSEC_ROUTE_110 0x19 -#define MAPSEC_ROUTE_111 0x1A -#define MAPSEC_ROUTE_112 0x1B -#define MAPSEC_ROUTE_113 0x1C -#define MAPSEC_ROUTE_114 0x1D -#define MAPSEC_ROUTE_115 0x1E -#define MAPSEC_ROUTE_116 0x1F -#define MAPSEC_ROUTE_117 0x20 -#define MAPSEC_ROUTE_118 0x21 -#define MAPSEC_ROUTE_119 0x22 -#define MAPSEC_ROUTE_120 0x23 -#define MAPSEC_ROUTE_121 0x24 -#define MAPSEC_ROUTE_122 0x25 -#define MAPSEC_ROUTE_123 0x26 -#define MAPSEC_ROUTE_124 0x27 -#define MAPSEC_ROUTE_125 0x28 -#define MAPSEC_ROUTE_126 0x29 -#define MAPSEC_ROUTE_127 0x2A -#define MAPSEC_ROUTE_128 0x2B -#define MAPSEC_ROUTE_129 0x2C -#define MAPSEC_ROUTE_130 0x2D -#define MAPSEC_ROUTE_131 0x2E -#define MAPSEC_ROUTE_132 0x2F -#define MAPSEC_ROUTE_133 0x30 -#define MAPSEC_ROUTE_134 0x31 -#define MAPSEC_UNDERWATER_124 0x32 -#define MAPSEC_UNDERWATER_125 0x33 -#define MAPSEC_UNDERWATER_126 0x34 -#define MAPSEC_UNDERWATER_127 0x35 -#define MAPSEC_UNDERWATER_SOOTOPOLIS 0x36 -#define MAPSEC_GRANITE_CAVE 0x37 -#define MAPSEC_MT_CHIMNEY 0x38 -#define MAPSEC_SAFARI_ZONE 0x39 -#define MAPSEC_BATTLE_FRONTIER 0x3A -#define MAPSEC_PETALBURG_WOODS 0x3B -#define MAPSEC_RUSTURF_TUNNEL 0x3C -#define MAPSEC_ABANDONED_SHIP 0x3D -#define MAPSEC_NEW_MAUVILLE 0x3E -#define MAPSEC_METEOR_FALLS 0x3F -#define MAPSEC_METEOR_FALLS2 0x40 -#define MAPSEC_MT_PYRE 0x41 -#define MAPSEC_AQUA_HIDEOUT_OLD 0x42 -#define MAPSEC_SHOAL_CAVE 0x43 -#define MAPSEC_SEAFLOOR_CAVERN 0x44 -#define MAPSEC_UNDERWATER_128 0x45 -#define MAPSEC_VICTORY_ROAD 0x46 -#define MAPSEC_MIRAGE_ISLAND 0x47 -#define MAPSEC_CAVE_OF_ORIGIN 0x48 -#define MAPSEC_SOUTHERN_ISLAND 0x49 -#define MAPSEC_FIERY_PATH 0x4A -#define MAPSEC_FIERY_PATH2 0x4B -#define MAPSEC_JAGGED_PASS 0x4C -#define MAPSEC_JAGGED_PASS2 0x4D -#define MAPSEC_SEALED_CHAMBER 0x4E -#define MAPSEC_UNDERWATER_SEALED_CHAMBER 0x4F -#define MAPSEC_SCORCHED_SLAB 0x50 -#define MAPSEC_ISLAND_CAVE 0x51 -#define MAPSEC_DESERT_RUINS 0x52 -#define MAPSEC_ANCIENT_TOMB 0x53 -#define MAPSEC_INSIDE_OF_TRUCK 0x54 -#define MAPSEC_SKY_PILLAR 0x55 -#define MAPSEC_SECRET_BASE 0x56 -#define MAPSEC_DYNAMIC 0x57 - -#define MAPSECS_KANTO 0x58 - -#define MAPSEC_PALLET_TOWN 0x58 -#define MAPSEC_VIRIDIAN_CITY 0x59 -#define MAPSEC_PEWTER_CITY 0x5A -#define MAPSEC_CERULEAN_CITY 0x5B -#define MAPSEC_LAVENDER_TOWN 0x5C -#define MAPSEC_VERMILION_CITY 0x5D -#define MAPSEC_CELADON_CITY 0x5E -#define MAPSEC_FUCHSIA_CITY 0x5F -#define MAPSEC_CINNABAR_ISLAND 0x60 -#define MAPSEC_INDIGO_PLATEAU 0x61 -#define MAPSEC_SAFFRON_CITY 0x62 -#define MAPSEC_ROUTE_4_POKECENTER 0x63 -#define MAPSEC_ROUTE_10_POKECENTER 0x64 -#define MAPSEC_ROUTE_1 0x65 -#define MAPSEC_ROUTE_2 0x66 -#define MAPSEC_ROUTE_3 0x67 -#define MAPSEC_ROUTE_4 0x68 -#define MAPSEC_ROUTE_5 0x69 -#define MAPSEC_ROUTE_6 0x6A -#define MAPSEC_ROUTE_7 0x6B -#define MAPSEC_ROUTE_8 0x6C -#define MAPSEC_ROUTE_9 0x6D -#define MAPSEC_ROUTE_10 0x6E -#define MAPSEC_ROUTE_11 0x6F -#define MAPSEC_ROUTE_12 0x70 -#define MAPSEC_ROUTE_13 0x71 -#define MAPSEC_ROUTE_14 0x72 -#define MAPSEC_ROUTE_15 0x73 -#define MAPSEC_ROUTE_16 0x74 -#define MAPSEC_ROUTE_17 0x75 -#define MAPSEC_ROUTE_18 0x76 -#define MAPSEC_ROUTE_19 0x77 -#define MAPSEC_ROUTE_20 0x78 -#define MAPSEC_ROUTE_21 0x79 -#define MAPSEC_ROUTE_22 0x7A -#define MAPSEC_ROUTE_23 0x7B -#define MAPSEC_ROUTE_24 0x7C -#define MAPSEC_ROUTE_25 0x7D -#define MAPSEC_VIRIDIAN_FOREST 0x7E -#define MAPSEC_MT_MOON 0x7F -#define MAPSEC_S_S_ANNE 0x80 -#define MAPSEC_UNDERGROUND_PATH 0x81 -#define MAPSEC_UNDERGROUND_PATH_2 0x82 -#define MAPSEC_DIGLETTS_CAVE 0x83 -#define MAPSEC_KANTO_VICTORY_ROAD 0x84 -#define MAPSEC_ROCKET_HIDEOUT 0x85 -#define MAPSEC_SILPH_CO 0x86 -#define MAPSEC_POKEMON_MANSION 0x87 -#define MAPSEC_KANTO_SAFARI_ZONE 0x88 -#define MAPSEC_POKEMON_LEAGUE 0x89 -#define MAPSEC_ROCK_TUNNEL 0x8A -#define MAPSEC_SEAFOAM_ISLANDS 0x8B -#define MAPSEC_POKEMON_TOWER 0x8C -#define MAPSEC_CERULEAN_CAVE 0x8D -#define MAPSEC_POWER_PLANT 0x8E - -#define MAPSECS_SEVII_123 0x8F - -#define MAPSEC_ONE_ISLAND 0x8F -#define MAPSEC_TWO_ISLAND 0x90 -#define MAPSEC_THREE_ISLAND 0x91 -#define MAPSEC_FOUR_ISLAND 0x92 -#define MAPSEC_FIVE_ISLAND 0x93 -#define MAPSEC_SEVEN_ISLAND 0x94 -#define MAPSEC_SIX_ISLAND 0x95 -#define MAPSEC_KINDLE_ROAD 0x96 -#define MAPSEC_TREASURE_BEACH 0x97 -#define MAPSEC_CAPE_BRINK 0x98 -#define MAPSEC_BOND_BRIDGE 0x99 -#define MAPSEC_THREE_ISLE_PORT 0x9A -#define MAPSEC_SEVII_ISLE_6 0x9B -#define MAPSEC_SEVII_ISLE_7 0x9C -#define MAPSEC_SEVII_ISLE_8 0x9D -#define MAPSEC_SEVII_ISLE_9 0x9E -#define MAPSEC_RESORT_GORGEOUS 0x9F -#define MAPSEC_WATER_LABYRINTH 0xA0 -#define MAPSEC_FIVE_ISLE_MEADOW 0xA1 -#define MAPSEC_MEMORIAL_PILLAR 0xA2 -#define MAPSEC_OUTCAST_ISLAND 0xA3 -#define MAPSEC_GREEN_PATH 0xA4 -#define MAPSEC_WATER_PATH 0xA5 -#define MAPSEC_RUIN_VALLEY 0xA6 -#define MAPSEC_TRAINER_TOWER 0xA7 -#define MAPSEC_CANYON_ENTRANCE 0xA8 -#define MAPSEC_SEVAULT_CANYON 0xA9 -#define MAPSEC_TANOBY_RUINS 0xAA -#define MAPSEC_SEVII_ISLE_22 0xAB -#define MAPSEC_SEVII_ISLE_23 0xAC -#define MAPSEC_SEVII_ISLE_24 0xAD -#define MAPSEC_NAVEL_ROCK 0xAE -#define MAPSEC_MT_EMBER 0xAF -#define MAPSEC_BERRY_FOREST 0xB0 -#define MAPSEC_ICEFALL_CAVE 0xB1 -#define MAPSEC_ROCKET_WAREHOUSE 0xB2 -#define MAPSEC_TRAINER_TOWER_2 0xB3 -#define MAPSEC_DOTTED_HOLE 0xB4 -#define MAPSEC_LOST_CAVE 0xB5 -#define MAPSEC_PATTERN_BUSH 0xB6 -#define MAPSEC_ALTERING_CAVE 0xB7 -#define MAPSEC_TANOBY_CHAMBERS 0xB8 -#define MAPSEC_THREE_ISLE_PATH 0xB9 -#define MAPSEC_TANOBY_KEY 0xBA -#define MAPSEC_BIRTH_ISLAND 0xBB -#define MAPSEC_MONEAN_CHAMBER 0xBC -#define MAPSEC_LIPTOO_CHAMBER 0xBD -#define MAPSEC_WEEPTH_CHAMBER 0xBE -#define MAPSEC_DILFORD_CHAMBER 0xBF -#define MAPSEC_SCUFIB_CHAMBER 0xC0 -#define MAPSEC_RIXY_CHAMBER 0xC1 -#define MAPSEC_VIAPOIS_CHAMBER 0xC2 -#define MAPSEC_EMBER_SPA 0xC3 -#define MAPSEC_SPECIAL_AREA 0xC4 -#define MAPSEC_NONE 0xC5 -#define MAPSEC_COUNT 0xC6 - -#define METLOC_SPECIAL_EGG 0xFD -#define METLOC_IN_GAME_TRADE 0xFE -#define METLOC_FATEFUL_ENCOUNTER 0xFF - -#endif //GUARD_CONSTANTS_REGION_MAP_SECTIONS_H diff --git a/include/heal_location.h b/include/heal_location.h index 2480d1723..4c64def01 100644 --- a/include/heal_location.h +++ b/include/heal_location.h @@ -5,8 +5,8 @@ struct HealLocation { - s8 group; - s8 map; + s8 mapGroup; + s8 mapNum; s16 x; s16 y; }; diff --git a/json_data_rules.mk b/json_data_rules.mk index f3a04660c..eec18467a 100644 --- a/json_data_rules.mk +++ b/json_data_rules.mk @@ -19,8 +19,22 @@ $(DATA_SRC_SUBDIR)/region_map/region_map_entry_strings.h: $(DATA_SRC_SUBDIR)/reg $(C_BUILDDIR)/region_map.o: c_dep += $(DATA_SRC_SUBDIR)/region_map/region_map_entry_strings.h +AUTO_GEN_TARGETS += include/constants/region_map_sections.h +include/constants/region_map_sections.h: $(DATA_SRC_SUBDIR)/region_map/region_map_sections.json $(DATA_SRC_SUBDIR)/region_map/region_map_sections.constants.json.txt + $(JSONPROC) $^ $@ + AUTO_GEN_TARGETS += $(DATA_SRC_SUBDIR)/items.h $(DATA_SRC_SUBDIR)/items.h: $(DATA_SRC_SUBDIR)/items.json $(DATA_SRC_SUBDIR)/items.json.txt $(JSONPROC) $^ $@ $(C_BUILDDIR)/item.o: c_dep += $(DATA_SRC_SUBDIR)/items.h + +AUTO_GEN_TARGETS += $(DATA_SRC_SUBDIR)/heal_locations.h +$(DATA_SRC_SUBDIR)/heal_locations.h: $(DATA_SRC_SUBDIR)/heal_locations.json $(DATA_SRC_SUBDIR)/heal_locations.json.txt + $(JSONPROC) $^ $@ + +$(C_BUILDDIR)/heal_location.o: c_dep += $(DATA_SRC_SUBDIR)/heal_locations.h + +AUTO_GEN_TARGETS += include/constants/heal_locations.h +include/constants/heal_locations.h: $(DATA_SRC_SUBDIR)/heal_locations.json $(DATA_SRC_SUBDIR)/heal_locations.constants.json.txt + $(JSONPROC) $^ $@ diff --git a/map_data_rules.mk b/map_data_rules.mk index d1eb6c8cb..b32b85a91 100644 --- a/map_data_rules.mk +++ b/map_data_rules.mk @@ -11,11 +11,13 @@ INCLUDECONSTS_OUTDIR := include/constants AUTO_GEN_TARGETS += $(INCLUDECONSTS_OUTDIR)/map_groups.h AUTO_GEN_TARGETS += $(INCLUDECONSTS_OUTDIR)/layouts.h +AUTO_GEN_TARGETS += $(INCLUDECONSTS_OUTDIR)/map_event_ids.h MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/map.json)) MAP_CONNECTIONS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/connections.inc,$(MAP_DIRS)) MAP_EVENTS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/events.inc,$(MAP_DIRS)) MAP_HEADERS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/header.inc,$(MAP_DIRS)) +MAP_JSONS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/map.json,$(MAP_DIRS)) $(DATA_ASM_BUILDDIR)/maps.o: $(DATA_ASM_SUBDIR)/maps.s $(LAYOUTS_DIR)/layouts.inc $(LAYOUTS_DIR)/layouts_table.inc $(MAPS_DIR)/headers.inc $(MAPS_DIR)/groups.inc $(MAPS_DIR)/connections.inc $(MAP_CONNECTIONS) $(MAP_HEADERS) $(PREPROC) $< charmap.txt | $(CPP) -I include -nostdinc -undef -Wno-unicode - | $(PREPROC) -ie $< charmap.txt | $(AS) $(ASFLAGS) -o $@ @@ -30,3 +32,9 @@ $(MAPS_OUTDIR)/connections.inc $(MAPS_OUTDIR)/groups.inc $(MAPS_OUTDIR)/events.i $(LAYOUTS_OUTDIR)/layouts.inc $(LAYOUTS_OUTDIR)/layouts_table.inc $(INCLUDECONSTS_OUTDIR)/layouts.h: $(LAYOUTS_DIR)/layouts.json $(MAPJSON) layouts firered $< $(LAYOUTS_OUTDIR) $(INCLUDECONSTS_OUTDIR) + +# Generate constants for map events, which depend on data that's distributed across the map.json files. +# There's a lot of map.json files, so we print an abbreviated output with echo. +$(INCLUDECONSTS_OUTDIR)/map_event_ids.h: $(MAP_JSONS) + @$(MAPJSON) event_constants firered $^ $(INCLUDECONSTS_OUTDIR)/map_event_ids.h + @echo "$(MAPJSON) event_constants firered $(INCLUDECONSTS_OUTDIR)/map_event_ids.h" diff --git a/src/battle_records.c b/src/battle_records.c index 3fcc0646a..bbc463a46 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -442,7 +442,7 @@ static void UpdateBattleOutcomeOnTrainerCards(s32 battlerId) void UpdatePlayerLinkBattleRecords(s32 battlerId) { - if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(UNION_ROOM) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(UNION_ROOM)) + if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(MAP_UNION_ROOM) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_UNION_ROOM)) { UpdateBattleOutcomeOnTrainerCards(battlerId); AddOpponentLinkBattleRecord(&gSaveBlock2Ptr->linkBattleRecords, gTrainerCards[battlerId].rse.playerName, gTrainerCards[battlerId].rse.trainerId, gBattleOutcome, gLinkPlayers[battlerId].language); diff --git a/src/battle_setup.c b/src/battle_setup.c index 18b2a7acb..6d62084db 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -27,6 +27,7 @@ #include "battle_transition.h" #include "battle_controllers.h" #include "constants/battle_setup.h" +#include "constants/event_objects.h" #include "constants/items.h" #include "constants/maps.h" #include "constants/songs.h" @@ -219,14 +220,14 @@ static void CreateBattleStartTask(u8 transition, u16 song) // song == 0 means de static bool8 CheckSilphScopeInPokemonTower(u16 mapGroup, u16 mapNum) { - if (mapGroup == MAP_GROUP(POKEMON_TOWER_1F) - && (mapNum == MAP_NUM(POKEMON_TOWER_1F) - || mapNum == MAP_NUM(POKEMON_TOWER_2F) - || mapNum == MAP_NUM(POKEMON_TOWER_3F) - || mapNum == MAP_NUM(POKEMON_TOWER_4F) - || mapNum == MAP_NUM(POKEMON_TOWER_5F) - || mapNum == MAP_NUM(POKEMON_TOWER_6F) - || mapNum == MAP_NUM(POKEMON_TOWER_7F)) + if (mapGroup == MAP_GROUP(MAP_POKEMON_TOWER_1F) + && (mapNum == MAP_NUM(MAP_POKEMON_TOWER_1F) + || mapNum == MAP_NUM(MAP_POKEMON_TOWER_2F) + || mapNum == MAP_NUM(MAP_POKEMON_TOWER_3F) + || mapNum == MAP_NUM(MAP_POKEMON_TOWER_4F) + || mapNum == MAP_NUM(MAP_POKEMON_TOWER_5F) + || mapNum == MAP_NUM(MAP_POKEMON_TOWER_6F) + || mapNum == MAP_NUM(MAP_POKEMON_TOWER_7F)) && !(CheckBagHasItem(ITEM_SILPH_SCOPE, 1))) return TRUE; else @@ -709,7 +710,7 @@ static void InitTrainerBattleVariables(void) { sTrainerBattleMode = 0; gTrainerBattleOpponent_A = 0; - sTrainerObjectEventLocalId = 0; + sTrainerObjectEventLocalId = LOCALID_NONE; sTrainerAIntroSpeech = NULL; sTrainerADefeatSpeech = NULL; sTrainerVictorySpeech = NULL; @@ -776,7 +777,7 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co static void SetMapVarsToTrainer(void) { - if (sTrainerObjectEventLocalId != 0) + if (sTrainerObjectEventLocalId != LOCALID_NONE) { gSpecialVar_LastTalked = sTrainerObjectEventLocalId; gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); diff --git a/src/credits.c b/src/credits.c index c0b449b6d..8f89652a0 100644 --- a/src/credits.c +++ b/src/credits.c @@ -569,79 +569,79 @@ static const struct SpriteTemplate sGroundSpriteTemplate_Static = { }; static const struct CreditsOverworldCmd sOverworldCmd_Route23[] = { - CREDITSOVWLDLOADMAP(ROUTE23, 11, 107, 1), + CREDITSOVWLDLOADMAP(MAP_ROUTE23, 11, 107, 1), CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_ViridianCity[] = { - CREDITSOVWLDLOADMAP(VIRIDIAN_CITY, 30, 34, 1), + CREDITSOVWLDLOADMAP(MAP_VIRIDIAN_CITY, 30, 34, 1), CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_PewterCity[] = { - CREDITSOVWLDLOADMAP(PEWTER_CITY, 20, 26, 1), + CREDITSOVWLDLOADMAP(MAP_PEWTER_CITY, 20, 26, 1), CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_CeruleanCity[] = { - CREDITSOVWLDLOADMAP(CERULEAN_CITY, 8, 6, 1), + CREDITSOVWLDLOADMAP(MAP_CERULEAN_CITY, 8, 6, 1), CREDITSOVWLDSCROLL(1, 1, 0x0500), // Scroll right and down CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_Route25[] = { - CREDITSOVWLDLOADMAP(ROUTE25, 25, 6, 1), + CREDITSOVWLDLOADMAP(MAP_ROUTE25, 25, 6, 1), CREDITSOVWLDSCROLL(1, 0, 0x0500), // Scroll right CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_VermilionCity[] = { - CREDITSOVWLDLOADMAP(VERMILION_CITY, 9, 7, 1), + CREDITSOVWLDLOADMAP(MAP_VERMILION_CITY, 9, 7, 1), CREDITSOVWLDSCROLL(1, 1, 0x0500), // Scroll right and down CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_Route10[] = { - CREDITSOVWLDLOADMAP(ROUTE10, 11, 68, 1), + CREDITSOVWLDLOADMAP(MAP_ROUTE10, 11, 68, 1), CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_CeladonCity[] = { - CREDITSOVWLDLOADMAP(CELADON_CITY, 48, 16, 1), + CREDITSOVWLDLOADMAP(MAP_CELADON_CITY, 48, 16, 1), CREDITSOVWLDSCROLL(-1, 0, 0x0500), // Scroll left CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_SaffronCity[] = { - CREDITSOVWLDLOADMAP(SAFFRON_CITY, 39, 5, 1), + CREDITSOVWLDLOADMAP(MAP_SAFFRON_CITY, 39, 5, 1), CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_Route17[] = { - CREDITSOVWLDLOADMAP(ROUTE17, 7, 43, 1), + CREDITSOVWLDLOADMAP(MAP_ROUTE17, 7, 43, 1), CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_FuchsiaCity[] = { - CREDITSOVWLDLOADMAP(FUCHSIA_CITY, 28, 5, 1), + CREDITSOVWLDLOADMAP(MAP_FUCHSIA_CITY, 28, 5, 1), CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_CinnabarIsland[] = { - CREDITSOVWLDLOADMAP(CINNABAR_ISLAND, 13, 17, 1), + CREDITSOVWLDLOADMAP(MAP_CINNABAR_ISLAND, 13, 17, 1), CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up CREDITSOVWLDEND }; static const struct CreditsOverworldCmd sOverworldCmd_Route21[] = { - CREDITSOVWLDLOADMAP(ROUTE21_NORTH, 8, 20, 1), + CREDITSOVWLDLOADMAP(MAP_ROUTE21_NORTH, 8, 20, 1), CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up CREDITSOVWLDEND, }; diff --git a/src/data/heal_locations.constants.json.txt b/src/data/heal_locations.constants.json.txt new file mode 100644 index 000000000..e9ca860b3 --- /dev/null +++ b/src/data/heal_locations.constants.json.txt @@ -0,0 +1,14 @@ +#ifndef GUARD_CONSTANTS_HEAL_LOCATIONS_H +#define GUARD_CONSTANTS_HEAL_LOCATIONS_H + +{{ doNotModifyHeader }} + +enum { + HEAL_LOCATION_NONE, +## for heal_location in heal_locations + {{ heal_location.id }}, +## endfor + NUM_HEAL_LOCATIONS +}; + +#endif // GUARD_CONSTANTS_HEAL_LOCATIONS_H diff --git a/src/data/heal_locations.h b/src/data/heal_locations.h deleted file mode 100644 index 7e7388a1d..000000000 --- a/src/data/heal_locations.h +++ /dev/null @@ -1,71 +0,0 @@ -static const struct HealLocation sSpawnPoints[] = -{ - [SPAWN_PALLET_TOWN - 1] = {MAP_GROUP(PALLET_TOWN), MAP_NUM(PALLET_TOWN), 6, 8}, - [SPAWN_VIRIDIAN_CITY - 1] = {MAP_GROUP(VIRIDIAN_CITY), MAP_NUM(VIRIDIAN_CITY), 26, 27}, - [SPAWN_PEWTER_CITY - 1] = {MAP_GROUP(PEWTER_CITY), MAP_NUM(PEWTER_CITY), 17, 26}, - [SPAWN_CERULEAN_CITY - 1] = {MAP_GROUP(CERULEAN_CITY), MAP_NUM(CERULEAN_CITY), 22, 20}, - [SPAWN_LAVENDER_TOWN - 1] = {MAP_GROUP(LAVENDER_TOWN), MAP_NUM(LAVENDER_TOWN), 6, 6}, - [SPAWN_VERMILION_CITY - 1] = {MAP_GROUP(VERMILION_CITY), MAP_NUM(VERMILION_CITY), 15, 7}, - [SPAWN_CELADON_CITY - 1] = {MAP_GROUP(CELADON_CITY), MAP_NUM(CELADON_CITY), 48, 12}, - [SPAWN_FUCHSIA_CITY - 1] = {MAP_GROUP(FUCHSIA_CITY), MAP_NUM(FUCHSIA_CITY), 25, 32}, - [SPAWN_CINNABAR_ISLAND - 1] = {MAP_GROUP(CINNABAR_ISLAND), MAP_NUM(CINNABAR_ISLAND), 14, 12}, - [SPAWN_INDIGO_PLATEAU - 1] = {MAP_GROUP(INDIGO_PLATEAU_EXTERIOR), MAP_NUM(INDIGO_PLATEAU_EXTERIOR), 11, 7}, - [SPAWN_SAFFRON_CITY - 1] = {MAP_GROUP(SAFFRON_CITY), MAP_NUM(SAFFRON_CITY), 24, 39}, - [SPAWN_ROUTE4 - 1] = {MAP_GROUP(ROUTE4), MAP_NUM(ROUTE4), 12, 6}, - [SPAWN_ROUTE10 - 1] = {MAP_GROUP(ROUTE10), MAP_NUM(ROUTE10), 13, 21}, - [SPAWN_ONE_ISLAND - 1] = {MAP_GROUP(ONE_ISLAND), MAP_NUM(ONE_ISLAND), 14, 6}, - [SPAWN_TWO_ISLAND - 1] = {MAP_GROUP(TWO_ISLAND), MAP_NUM(TWO_ISLAND), 21, 8}, - [SPAWN_THREE_ISLAND - 1] = {MAP_GROUP(THREE_ISLAND), MAP_NUM(THREE_ISLAND), 14, 28}, - [SPAWN_FOUR_ISLAND - 1] = {MAP_GROUP(FOUR_ISLAND), MAP_NUM(FOUR_ISLAND), 18, 21}, - [SPAWN_FIVE_ISLAND - 1] = {MAP_GROUP(FIVE_ISLAND), MAP_NUM(FIVE_ISLAND), 18, 7}, - [SPAWN_SEVEN_ISLAND - 1] = {MAP_GROUP(SEVEN_ISLAND), MAP_NUM(SEVEN_ISLAND), 12, 4}, - [SPAWN_SIX_ISLAND - 1] = {MAP_GROUP(SIX_ISLAND), MAP_NUM(SIX_ISLAND), 11, 12}, -}; - -static const u16 sWhiteoutRespawnHealCenterMapIdxs[][2] = -{ - [SPAWN_PALLET_TOWN - 1] = {MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_1F), MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_1F)}, - [SPAWN_VIRIDIAN_CITY - 1] = {MAP_GROUP(VIRIDIAN_CITY_POKEMON_CENTER_1F), MAP_NUM(VIRIDIAN_CITY_POKEMON_CENTER_1F)}, - [SPAWN_PEWTER_CITY - 1] = {MAP_GROUP(PEWTER_CITY_POKEMON_CENTER_1F), MAP_NUM(PEWTER_CITY_POKEMON_CENTER_1F)}, - [SPAWN_CERULEAN_CITY - 1] = {MAP_GROUP(CERULEAN_CITY_POKEMON_CENTER_1F), MAP_NUM(CERULEAN_CITY_POKEMON_CENTER_1F)}, - [SPAWN_LAVENDER_TOWN - 1] = {MAP_GROUP(LAVENDER_TOWN_POKEMON_CENTER_1F), MAP_NUM(LAVENDER_TOWN_POKEMON_CENTER_1F)}, - [SPAWN_VERMILION_CITY - 1] = {MAP_GROUP(VERMILION_CITY_POKEMON_CENTER_1F), MAP_NUM(VERMILION_CITY_POKEMON_CENTER_1F)}, - [SPAWN_CELADON_CITY - 1] = {MAP_GROUP(CELADON_CITY_POKEMON_CENTER_1F), MAP_NUM(CELADON_CITY_POKEMON_CENTER_1F)}, - [SPAWN_FUCHSIA_CITY - 1] = {MAP_GROUP(FUCHSIA_CITY_POKEMON_CENTER_1F), MAP_NUM(FUCHSIA_CITY_POKEMON_CENTER_1F)}, - [SPAWN_CINNABAR_ISLAND - 1] = {MAP_GROUP(CINNABAR_ISLAND_POKEMON_CENTER_1F), MAP_NUM(CINNABAR_ISLAND_POKEMON_CENTER_1F)}, - [SPAWN_INDIGO_PLATEAU - 1] = {MAP_GROUP(INDIGO_PLATEAU_POKEMON_CENTER_1F), MAP_NUM(INDIGO_PLATEAU_POKEMON_CENTER_1F)}, - [SPAWN_SAFFRON_CITY - 1] = {MAP_GROUP(SAFFRON_CITY_POKEMON_CENTER_1F), MAP_NUM(SAFFRON_CITY_POKEMON_CENTER_1F)}, - [SPAWN_ROUTE4 - 1] = {MAP_GROUP(ROUTE4_POKEMON_CENTER_1F), MAP_NUM(ROUTE4_POKEMON_CENTER_1F)}, - [SPAWN_ROUTE10 - 1] = {MAP_GROUP(ROUTE10_POKEMON_CENTER_1F), MAP_NUM(ROUTE10_POKEMON_CENTER_1F)}, - [SPAWN_ONE_ISLAND - 1] = {MAP_GROUP(ONE_ISLAND_POKEMON_CENTER_1F), MAP_NUM(ONE_ISLAND_POKEMON_CENTER_1F)}, - [SPAWN_TWO_ISLAND - 1] = {MAP_GROUP(TWO_ISLAND_POKEMON_CENTER_1F), MAP_NUM(TWO_ISLAND_POKEMON_CENTER_1F)}, - [SPAWN_THREE_ISLAND - 1] = {MAP_GROUP(THREE_ISLAND_POKEMON_CENTER_1F), MAP_NUM(THREE_ISLAND_POKEMON_CENTER_1F)}, - [SPAWN_FOUR_ISLAND - 1] = {MAP_GROUP(FOUR_ISLAND_POKEMON_CENTER_1F), MAP_NUM(FOUR_ISLAND_POKEMON_CENTER_1F)}, - [SPAWN_FIVE_ISLAND - 1] = {MAP_GROUP(FIVE_ISLAND_POKEMON_CENTER_1F), MAP_NUM(FIVE_ISLAND_POKEMON_CENTER_1F)}, - [SPAWN_SEVEN_ISLAND - 1] = {MAP_GROUP(SEVEN_ISLAND_POKEMON_CENTER_1F), MAP_NUM(SEVEN_ISLAND_POKEMON_CENTER_1F)}, - [SPAWN_SIX_ISLAND - 1] = {MAP_GROUP(SIX_ISLAND_POKEMON_CENTER_1F), MAP_NUM(SIX_ISLAND_POKEMON_CENTER_1F)}, -}; - -static const u8 sWhiteoutRespawnHealerNpcIds[] = -{ - [SPAWN_PALLET_TOWN - 1] = 1, - [SPAWN_VIRIDIAN_CITY - 1] = 1, - [SPAWN_PEWTER_CITY - 1] = 3, - [SPAWN_CERULEAN_CITY - 1] = 1, - [SPAWN_LAVENDER_TOWN - 1] = 1, - [SPAWN_VERMILION_CITY - 1] = 1, - [SPAWN_CELADON_CITY - 1] = 1, - [SPAWN_FUCHSIA_CITY - 1] = 1, - [SPAWN_CINNABAR_ISLAND - 1] = 1, - [SPAWN_INDIGO_PLATEAU - 1] = 2, - [SPAWN_SAFFRON_CITY - 1] = 1, - [SPAWN_ROUTE4 - 1] = 1, - [SPAWN_ROUTE10 - 1] = 1, - [SPAWN_ONE_ISLAND - 1] = 1, - [SPAWN_TWO_ISLAND - 1] = 1, - [SPAWN_THREE_ISLAND - 1] = 1, - [SPAWN_FOUR_ISLAND - 1] = 1, - [SPAWN_FIVE_ISLAND - 1] = 1, - [SPAWN_SEVEN_ISLAND - 1] = 1, - [SPAWN_SIX_ISLAND - 1] = 1, -}; diff --git a/src/data/heal_locations.json b/src/data/heal_locations.json new file mode 100644 index 000000000..9802525b7 --- /dev/null +++ b/src/data/heal_locations.json @@ -0,0 +1,164 @@ +{ + "heal_locations": [ + { + "id": "HEAL_LOCATION_PALLET_TOWN", + "map": "MAP_PALLET_TOWN", + "x": 6, + "y": 8, + "respawn_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", + "respawn_npc": "LOCALID_MOM" + }, + { + "id": "HEAL_LOCATION_VIRIDIAN_CITY", + "map": "MAP_VIRIDIAN_CITY", + "x": 26, + "y": 27, + "respawn_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_VIRIDIAN_NURSE" + }, + { + "id": "HEAL_LOCATION_PEWTER_CITY", + "map": "MAP_PEWTER_CITY", + "x": 17, + "y": 26, + "respawn_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_PEWTER_NURSE" + }, + { + "id": "HEAL_LOCATION_CERULEAN_CITY", + "map": "MAP_CERULEAN_CITY", + "x": 22, + "y": 20, + "respawn_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_CERULEAN_NURSE" + }, + { + "id": "HEAL_LOCATION_LAVENDER_TOWN", + "map": "MAP_LAVENDER_TOWN", + "x": 6, + "y": 6, + "respawn_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_LAVENDER_NURSE" + }, + { + "id": "HEAL_LOCATION_VERMILION_CITY", + "map": "MAP_VERMILION_CITY", + "x": 15, + "y": 7, + "respawn_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_VERMILION_NURSE" + }, + { + "id": "HEAL_LOCATION_CELADON_CITY", + "map": "MAP_CELADON_CITY", + "x": 48, + "y": 12, + "respawn_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_CELADON_NURSE" + }, + { + "id": "HEAL_LOCATION_FUCHSIA_CITY", + "map": "MAP_FUCHSIA_CITY", + "x": 25, + "y": 32, + "respawn_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_FUCHSIA_NURSE" + }, + { + "id": "HEAL_LOCATION_CINNABAR_ISLAND", + "map": "MAP_CINNABAR_ISLAND", + "x": 14, + "y": 12, + "respawn_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_CINNABAR_NURSE" + }, + { + "id": "HEAL_LOCATION_INDIGO_PLATEAU", + "map": "MAP_INDIGO_PLATEAU_EXTERIOR", + "x": 11, + "y": 7, + "respawn_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_LEAGUE_NURSE" + }, + { + "id": "HEAL_LOCATION_SAFFRON_CITY", + "map": "MAP_SAFFRON_CITY", + "x": 24, + "y": 39, + "respawn_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_SAFFRON_NURSE" + }, + { + "id": "HEAL_LOCATION_ROUTE4", + "map": "MAP_ROUTE4", + "x": 12, + "y": 6, + "respawn_map": "MAP_ROUTE4_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_ROUTE4_NURSE" + }, + { + "id": "HEAL_LOCATION_ROUTE10", + "map": "MAP_ROUTE10", + "x": 13, + "y": 21, + "respawn_map": "MAP_ROUTE10_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_ROUTE10_NURSE" + }, + { + "id": "HEAL_LOCATION_ONE_ISLAND", + "map": "MAP_ONE_ISLAND", + "x": 14, + "y": 6, + "respawn_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_ONE_ISLAND_NURSE" + }, + { + "id": "HEAL_LOCATION_TWO_ISLAND", + "map": "MAP_TWO_ISLAND", + "x": 21, + "y": 8, + "respawn_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_TWO_ISLAND_NURSE" + }, + { + "id": "HEAL_LOCATION_THREE_ISLAND", + "map": "MAP_THREE_ISLAND", + "x": 14, + "y": 28, + "respawn_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_THREE_ISLAND_NURSE" + }, + { + "id": "HEAL_LOCATION_FOUR_ISLAND", + "map": "MAP_FOUR_ISLAND", + "x": 18, + "y": 21, + "respawn_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_FOUR_ISLAND_NURSE" + }, + { + "id": "HEAL_LOCATION_FIVE_ISLAND", + "map": "MAP_FIVE_ISLAND", + "x": 18, + "y": 7, + "respawn_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_FIVE_ISLAND_NURSE" + }, + { + "id": "HEAL_LOCATION_SEVEN_ISLAND", + "map": "MAP_SEVEN_ISLAND", + "x": 12, + "y": 4, + "respawn_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_SEVEN_ISLAND_NURSE" + }, + { + "id": "HEAL_LOCATION_SIX_ISLAND", + "map": "MAP_SIX_ISLAND", + "x": 11, + "y": 12, + "respawn_map": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", + "respawn_npc": "LOCALID_SIX_ISLAND_NURSE" + } + ] +} diff --git a/src/data/heal_locations.json.txt b/src/data/heal_locations.json.txt new file mode 100644 index 000000000..0dde0f5e4 --- /dev/null +++ b/src/data/heal_locations.json.txt @@ -0,0 +1,24 @@ +{{ doNotModifyHeader }} + +static const struct HealLocation sHealLocations[NUM_HEAL_LOCATIONS - 1] = { +## for heal_location in heal_locations + [{{ heal_location.id }} - 1] = { + .mapGroup = MAP_GROUP({{ heal_location.map }}), + .mapNum = MAP_NUM({{ heal_location.map }}), + .x = {{ heal_location.x }}, + .y = {{ heal_location.y }}, + }, +## endfor +}; + +static const u16 sWhiteoutRespawnHealCenterMapIdxs[NUM_HEAL_LOCATIONS - 1][2] = { +## for heal_location in heal_locations + [{{ heal_location.id }} - 1] = { MAP_GROUP({{ heal_location.respawn_map }}), MAP_NUM({{ heal_location.respawn_map }})}, +## endfor +}; + +static const u8 sWhiteoutRespawnHealerNpcIds[NUM_HEAL_LOCATIONS - 1] = { +## for heal_location in heal_locations + [{{ heal_location.id }} - 1] = {{ heal_location.respawn_npc }}, +## endfor +}; diff --git a/src/data/region_map/region_map_sections.constants.json.txt b/src/data/region_map/region_map_sections.constants.json.txt new file mode 100644 index 000000000..eeddea6ae --- /dev/null +++ b/src/data/region_map/region_map_sections.constants.json.txt @@ -0,0 +1,24 @@ +{{ doNotModifyHeader }} +#ifndef GUARD_CONSTANTS_REGION_MAP_SECTIONS_H +#define GUARD_CONSTANTS_REGION_MAP_SECTIONS_H + +enum { +## for map_section in map_sections + {{ map_section.id }}, +## endfor + MAPSEC_NONE, + MAPSEC_COUNT +}; + +// Values before KANTO_MAPSEC_START are assumed to have no data. +#define KANTO_MAPSEC_START MAPSEC_PALLET_TOWN + +// Values starting from SEVII_MAPSEC_START are assumed to have data in sSeviiMapsecs. +#define SEVII_MAPSEC_START MAPSEC_ONE_ISLAND + +// Special location IDs that use the same value space as MAPSECs. +#define METLOC_SPECIAL_EGG 0xFD +#define METLOC_IN_GAME_TRADE 0xFE +#define METLOC_FATEFUL_ENCOUNTER 0xFF + +#endif // GUARD_CONSTANTS_REGION_MAP_SECTIONS_H diff --git a/src/data/region_map/region_map_sections.entries.json.txt b/src/data/region_map/region_map_sections.entries.json.txt index 7cce3705c..fc5fee915 100644 --- a/src/data/region_map/region_map_sections.entries.json.txt +++ b/src/data/region_map/region_map_sections.entries.json.txt @@ -3,24 +3,30 @@ #define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H ## for map_section in map_sections -{% if isEmptyString(getVar(map_section.name)) and not existsIn(map_section, "name_clone") %}{{ setVar(map_section.name, map_section.map_section) }}{% endif %} +{% if existsIn(map_section, "name") and isEmptyString(getVar(map_section.name)) and not existsIn(map_section, "name_clone") %}{{ setVar(map_section.name, map_section.id) }}{% endif %} ## endfor static const u8 *const sMapNames[] = { ## for map_section in map_sections - [{{ map_section.map_section }} - MAPSECS_KANTO] = sMapsecName_{{ cleanString(map_section.name) }}{% if existsIn(map_section, "name_clone") %}_Clone{% endif %}, +{% if existsIn(map_section, "name") %} + [{{ map_section.id }} - KANTO_MAPSEC_START] = sMapsecName_{{ cleanString(map_section.name) }}{% if existsIn(map_section, "name_clone") %}_Clone{% endif %}, +{% endif %} ## endfor }; static const u16 sMapSectionTopLeftCorners[MAPSEC_COUNT][2] = { ## for map_section in map_sections - [{{ map_section.map_section }} - MAPSECS_KANTO] = { {{ map_section.x }}, {{ map_section.y }} }, +{% if existsIn(map_section, "x") and existsIn(map_section, "y") %} + [{{ map_section.id }} - KANTO_MAPSEC_START] = { {{ map_section.x }}, {{ map_section.y }} }, +{% endif %} ## endfor }; static const u16 sMapSectionDimensions[MAPSEC_COUNT][2] = { ## for map_section in map_sections - [{{ map_section.map_section }} - MAPSECS_KANTO] = { {{ map_section.width }}, {{ map_section.height }} }, +{% if existsIn(map_section, "width") and existsIn(map_section, "height") %} + [{{ map_section.id }} - KANTO_MAPSEC_START] = { {{ map_section.width }}, {{ map_section.height }} }, +{% endif %} ## endfor }; diff --git a/src/data/region_map/region_map_sections.json b/src/data/region_map/region_map_sections.json index 63947d4f0..601bff65d 100644 --- a/src/data/region_map/region_map_sections.json +++ b/src/data/region_map/region_map_sections.json @@ -1,7 +1,271 @@ { "map_sections": [ { - "map_section": "MAPSEC_PALLET_TOWN", + "id": "MAPSEC_LITTLEROOT_TOWN" + }, + { + "id": "MAPSEC_OLDALE_TOWN" + }, + { + "id": "MAPSEC_DEWFORD_TOWN" + }, + { + "id": "MAPSEC_LAVARIDGE_TOWN" + }, + { + "id": "MAPSEC_FALLARBOR_TOWN" + }, + { + "id": "MAPSEC_VERDANTURF_TOWN" + }, + { + "id": "MAPSEC_PACIFIDLOG_TOWN" + }, + { + "id": "MAPSEC_PETALBURG_CITY" + }, + { + "id": "MAPSEC_SLATEPORT_CITY" + }, + { + "id": "MAPSEC_MAUVILLE_CITY" + }, + { + "id": "MAPSEC_RUSTBORO_CITY" + }, + { + "id": "MAPSEC_FORTREE_CITY" + }, + { + "id": "MAPSEC_LILYCOVE_CITY" + }, + { + "id": "MAPSEC_MOSSDEEP_CITY" + }, + { + "id": "MAPSEC_SOOTOPOLIS_CITY" + }, + { + "id": "MAPSEC_EVER_GRANDE_CITY" + }, + { + "id": "MAPSEC_ROUTE_101" + }, + { + "id": "MAPSEC_ROUTE_102" + }, + { + "id": "MAPSEC_ROUTE_103" + }, + { + "id": "MAPSEC_ROUTE_104" + }, + { + "id": "MAPSEC_ROUTE_105" + }, + { + "id": "MAPSEC_ROUTE_106" + }, + { + "id": "MAPSEC_ROUTE_107" + }, + { + "id": "MAPSEC_ROUTE_108" + }, + { + "id": "MAPSEC_ROUTE_109" + }, + { + "id": "MAPSEC_ROUTE_110" + }, + { + "id": "MAPSEC_ROUTE_111" + }, + { + "id": "MAPSEC_ROUTE_112" + }, + { + "id": "MAPSEC_ROUTE_113" + }, + { + "id": "MAPSEC_ROUTE_114" + }, + { + "id": "MAPSEC_ROUTE_115" + }, + { + "id": "MAPSEC_ROUTE_116" + }, + { + "id": "MAPSEC_ROUTE_117" + }, + { + "id": "MAPSEC_ROUTE_118" + }, + { + "id": "MAPSEC_ROUTE_119" + }, + { + "id": "MAPSEC_ROUTE_120" + }, + { + "id": "MAPSEC_ROUTE_121" + }, + { + "id": "MAPSEC_ROUTE_122" + }, + { + "id": "MAPSEC_ROUTE_123" + }, + { + "id": "MAPSEC_ROUTE_124" + }, + { + "id": "MAPSEC_ROUTE_125" + }, + { + "id": "MAPSEC_ROUTE_126" + }, + { + "id": "MAPSEC_ROUTE_127" + }, + { + "id": "MAPSEC_ROUTE_128" + }, + { + "id": "MAPSEC_ROUTE_129" + }, + { + "id": "MAPSEC_ROUTE_130" + }, + { + "id": "MAPSEC_ROUTE_131" + }, + { + "id": "MAPSEC_ROUTE_132" + }, + { + "id": "MAPSEC_ROUTE_133" + }, + { + "id": "MAPSEC_ROUTE_134" + }, + { + "id": "MAPSEC_UNDERWATER_124" + }, + { + "id": "MAPSEC_UNDERWATER_125" + }, + { + "id": "MAPSEC_UNDERWATER_126" + }, + { + "id": "MAPSEC_UNDERWATER_127" + }, + { + "id": "MAPSEC_UNDERWATER_SOOTOPOLIS" + }, + { + "id": "MAPSEC_GRANITE_CAVE" + }, + { + "id": "MAPSEC_MT_CHIMNEY" + }, + { + "id": "MAPSEC_SAFARI_ZONE" + }, + { + "id": "MAPSEC_BATTLE_FRONTIER" + }, + { + "id": "MAPSEC_PETALBURG_WOODS" + }, + { + "id": "MAPSEC_RUSTURF_TUNNEL" + }, + { + "id": "MAPSEC_ABANDONED_SHIP" + }, + { + "id": "MAPSEC_NEW_MAUVILLE" + }, + { + "id": "MAPSEC_METEOR_FALLS" + }, + { + "id": "MAPSEC_METEOR_FALLS2" + }, + { + "id": "MAPSEC_MT_PYRE" + }, + { + "id": "MAPSEC_AQUA_HIDEOUT_OLD" + }, + { + "id": "MAPSEC_SHOAL_CAVE" + }, + { + "id": "MAPSEC_SEAFLOOR_CAVERN" + }, + { + "id": "MAPSEC_UNDERWATER_128" + }, + { + "id": "MAPSEC_VICTORY_ROAD" + }, + { + "id": "MAPSEC_MIRAGE_ISLAND" + }, + { + "id": "MAPSEC_CAVE_OF_ORIGIN" + }, + { + "id": "MAPSEC_SOUTHERN_ISLAND" + }, + { + "id": "MAPSEC_FIERY_PATH" + }, + { + "id": "MAPSEC_FIERY_PATH2" + }, + { + "id": "MAPSEC_JAGGED_PASS" + }, + { + "id": "MAPSEC_JAGGED_PASS2" + }, + { + "id": "MAPSEC_SEALED_CHAMBER" + }, + { + "id": "MAPSEC_UNDERWATER_SEALED_CHAMBER" + }, + { + "id": "MAPSEC_SCORCHED_SLAB" + }, + { + "id": "MAPSEC_ISLAND_CAVE" + }, + { + "id": "MAPSEC_DESERT_RUINS" + }, + { + "id": "MAPSEC_ANCIENT_TOMB" + }, + { + "id": "MAPSEC_INSIDE_OF_TRUCK" + }, + { + "id": "MAPSEC_SKY_PILLAR" + }, + { + "id": "MAPSEC_SECRET_BASE" + }, + { + "id": "MAPSEC_DYNAMIC" + }, + { + "id": "MAPSEC_PALLET_TOWN", "name": "PALLET TOWN", "x": 4, "y": 11, @@ -9,7 +273,7 @@ "height": 1 }, { - "map_section": "MAPSEC_VIRIDIAN_CITY", + "id": "MAPSEC_VIRIDIAN_CITY", "name": "VIRIDIAN CITY", "x": 4, "y": 8, @@ -17,7 +281,7 @@ "height": 1 }, { - "map_section": "MAPSEC_PEWTER_CITY", + "id": "MAPSEC_PEWTER_CITY", "name": "PEWTER CITY", "x": 4, "y": 4, @@ -25,7 +289,7 @@ "height": 1 }, { - "map_section": "MAPSEC_CERULEAN_CITY", + "id": "MAPSEC_CERULEAN_CITY", "name": "CERULEAN CITY", "x": 14, "y": 3, @@ -33,7 +297,7 @@ "height": 1 }, { - "map_section": "MAPSEC_LAVENDER_TOWN", + "id": "MAPSEC_LAVENDER_TOWN", "name": "LAVENDER TOWN", "x": 18, "y": 6, @@ -41,7 +305,7 @@ "height": 1 }, { - "map_section": "MAPSEC_VERMILION_CITY", + "id": "MAPSEC_VERMILION_CITY", "name": "VERMILION CITY", "x": 14, "y": 9, @@ -49,7 +313,7 @@ "height": 1 }, { - "map_section": "MAPSEC_CELADON_CITY", + "id": "MAPSEC_CELADON_CITY", "name": "CELADON CITY", "x": 11, "y": 6, @@ -57,7 +321,7 @@ "height": 1 }, { - "map_section": "MAPSEC_FUCHSIA_CITY", + "id": "MAPSEC_FUCHSIA_CITY", "name": "FUCHSIA CITY", "x": 12, "y": 12, @@ -65,7 +329,7 @@ "height": 1 }, { - "map_section": "MAPSEC_CINNABAR_ISLAND", + "id": "MAPSEC_CINNABAR_ISLAND", "name": "CINNABAR ISLAND", "x": 4, "y": 14, @@ -73,7 +337,7 @@ "height": 1 }, { - "map_section": "MAPSEC_INDIGO_PLATEAU", + "id": "MAPSEC_INDIGO_PLATEAU", "name": "INDIGO PLATEAU", "x": 2, "y": 3, @@ -81,7 +345,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SAFFRON_CITY", + "id": "MAPSEC_SAFFRON_CITY", "name": "SAFFRON CITY", "x": 14, "y": 6, @@ -89,7 +353,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_4_POKECENTER", + "id": "MAPSEC_ROUTE_4_POKECENTER", "name": "ROUTE 4", "name_clone": true, "x": 8, @@ -98,7 +362,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_10_POKECENTER", + "id": "MAPSEC_ROUTE_10_POKECENTER", "name": "ROUTE 10", "name_clone": true, "x": 18, @@ -107,7 +371,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_1", + "id": "MAPSEC_ROUTE_1", "name": "ROUTE 1", "x": 4, "y": 9, @@ -115,7 +379,7 @@ "height": 2 }, { - "map_section": "MAPSEC_ROUTE_2", + "id": "MAPSEC_ROUTE_2", "name": "ROUTE 2", "x": 4, "y": 5, @@ -123,7 +387,7 @@ "height": 3 }, { - "map_section": "MAPSEC_ROUTE_3", + "id": "MAPSEC_ROUTE_3", "name": "ROUTE 3", "x": 5, "y": 4, @@ -131,7 +395,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_4", + "id": "MAPSEC_ROUTE_4", "name": "ROUTE 4", "x": 8, "y": 3, @@ -139,7 +403,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_5", + "id": "MAPSEC_ROUTE_5", "name": "ROUTE 5", "x": 14, "y": 4, @@ -147,7 +411,7 @@ "height": 2 }, { - "map_section": "MAPSEC_ROUTE_6", + "id": "MAPSEC_ROUTE_6", "name": "ROUTE 6", "x": 14, "y": 7, @@ -155,7 +419,7 @@ "height": 2 }, { - "map_section": "MAPSEC_ROUTE_7", + "id": "MAPSEC_ROUTE_7", "name": "ROUTE 7", "x": 12, "y": 6, @@ -163,7 +427,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_8", + "id": "MAPSEC_ROUTE_8", "name": "ROUTE 8", "x": 15, "y": 6, @@ -171,7 +435,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_9", + "id": "MAPSEC_ROUTE_9", "name": "ROUTE 9", "x": 15, "y": 3, @@ -179,7 +443,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_10", + "id": "MAPSEC_ROUTE_10", "name": "ROUTE 10", "x": 18, "y": 3, @@ -187,7 +451,7 @@ "height": 3 }, { - "map_section": "MAPSEC_ROUTE_11", + "id": "MAPSEC_ROUTE_11", "name": "ROUTE 11", "x": 15, "y": 9, @@ -195,7 +459,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_12", + "id": "MAPSEC_ROUTE_12", "name": "ROUTE 12", "x": 18, "y": 7, @@ -203,7 +467,7 @@ "height": 5 }, { - "map_section": "MAPSEC_ROUTE_13", + "id": "MAPSEC_ROUTE_13", "name": "ROUTE 13", "x": 16, "y": 11, @@ -211,7 +475,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_14", + "id": "MAPSEC_ROUTE_14", "name": "ROUTE 14", "x": 15, "y": 11, @@ -219,7 +483,7 @@ "height": 2 }, { - "map_section": "MAPSEC_ROUTE_15", + "id": "MAPSEC_ROUTE_15", "name": "ROUTE 15", "x": 13, "y": 12, @@ -227,7 +491,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_16", + "id": "MAPSEC_ROUTE_16", "name": "ROUTE 16", "x": 7, "y": 6, @@ -235,7 +499,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_17", + "id": "MAPSEC_ROUTE_17", "name": "ROUTE 17", "x": 7, "y": 7, @@ -243,7 +507,7 @@ "height": 5 }, { - "map_section": "MAPSEC_ROUTE_18", + "id": "MAPSEC_ROUTE_18", "name": "ROUTE 18", "x": 7, "y": 12, @@ -251,7 +515,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_19", + "id": "MAPSEC_ROUTE_19", "name": "ROUTE 19", "x": 12, "y": 13, @@ -259,7 +523,7 @@ "height": 2 }, { - "map_section": "MAPSEC_ROUTE_20", + "id": "MAPSEC_ROUTE_20", "name": "ROUTE 20", "x": 5, "y": 14, @@ -267,7 +531,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_21", + "id": "MAPSEC_ROUTE_21", "name": "ROUTE 21", "x": 4, "y": 12, @@ -275,7 +539,7 @@ "height": 2 }, { - "map_section": "MAPSEC_ROUTE_22", + "id": "MAPSEC_ROUTE_22", "name": "ROUTE 22", "x": 2, "y": 8, @@ -283,7 +547,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROUTE_23", + "id": "MAPSEC_ROUTE_23", "name": "ROUTE 23", "x": 2, "y": 4, @@ -291,7 +555,7 @@ "height": 4 }, { - "map_section": "MAPSEC_ROUTE_24", + "id": "MAPSEC_ROUTE_24", "name": "ROUTE 24", "x": 14, "y": 1, @@ -299,7 +563,7 @@ "height": 2 }, { - "map_section": "MAPSEC_ROUTE_25", + "id": "MAPSEC_ROUTE_25", "name": "ROUTE 25", "x": 15, "y": 1, @@ -307,7 +571,7 @@ "height": 1 }, { - "map_section": "MAPSEC_VIRIDIAN_FOREST", + "id": "MAPSEC_VIRIDIAN_FOREST", "name": "VIRIDIAN FOREST", "x": 0, "y": 0, @@ -315,7 +579,7 @@ "height": 1 }, { - "map_section": "MAPSEC_MT_MOON", + "id": "MAPSEC_MT_MOON", "name": "MT. MOON", "x": 0, "y": 0, @@ -323,7 +587,7 @@ "height": 1 }, { - "map_section": "MAPSEC_S_S_ANNE", + "id": "MAPSEC_S_S_ANNE", "name": "S.S. ANNE", "x": 0, "y": 0, @@ -331,7 +595,7 @@ "height": 1 }, { - "map_section": "MAPSEC_UNDERGROUND_PATH", + "id": "MAPSEC_UNDERGROUND_PATH", "name": "UNDERGROUND PATH", "x": 0, "y": 0, @@ -339,7 +603,7 @@ "height": 1 }, { - "map_section": "MAPSEC_UNDERGROUND_PATH_2", + "id": "MAPSEC_UNDERGROUND_PATH_2", "name": "UNDERGROUND PATH", "name_clone": true, "x": 0, @@ -348,7 +612,7 @@ "height": 1 }, { - "map_section": "MAPSEC_DIGLETTS_CAVE", + "id": "MAPSEC_DIGLETTS_CAVE", "name": "DIGLETT'S CAVE", "x": 0, "y": 0, @@ -356,7 +620,7 @@ "height": 1 }, { - "map_section": "MAPSEC_KANTO_VICTORY_ROAD", + "id": "MAPSEC_KANTO_VICTORY_ROAD", "name": "VICTORY ROAD", "x": 0, "y": 0, @@ -364,7 +628,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROCKET_HIDEOUT", + "id": "MAPSEC_ROCKET_HIDEOUT", "name": "ROCKET HIDEOUT", "x": 0, "y": 0, @@ -372,7 +636,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SILPH_CO", + "id": "MAPSEC_SILPH_CO", "name": "SILPH CO.", "x": 0, "y": 0, @@ -380,7 +644,7 @@ "height": 1 }, { - "map_section": "MAPSEC_POKEMON_MANSION", + "id": "MAPSEC_POKEMON_MANSION", "name": "POKéMON MANSION", "x": 0, "y": 0, @@ -388,7 +652,7 @@ "height": 1 }, { - "map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "id": "MAPSEC_KANTO_SAFARI_ZONE", "name": "SAFARI ZONE", "x": 0, "y": 0, @@ -396,7 +660,7 @@ "height": 1 }, { - "map_section": "MAPSEC_POKEMON_LEAGUE", + "id": "MAPSEC_POKEMON_LEAGUE", "name": "POKéMON LEAGUE", "x": 0, "y": 0, @@ -404,7 +668,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROCK_TUNNEL", + "id": "MAPSEC_ROCK_TUNNEL", "name": "ROCK TUNNEL", "x": 0, "y": 0, @@ -412,7 +676,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SEAFOAM_ISLANDS", + "id": "MAPSEC_SEAFOAM_ISLANDS", "name": "SEAFOAM ISLANDS", "x": 0, "y": 0, @@ -420,7 +684,7 @@ "height": 1 }, { - "map_section": "MAPSEC_POKEMON_TOWER", + "id": "MAPSEC_POKEMON_TOWER", "name": "POKéMON TOWER", "x": 0, "y": 0, @@ -428,7 +692,7 @@ "height": 1 }, { - "map_section": "MAPSEC_CERULEAN_CAVE", + "id": "MAPSEC_CERULEAN_CAVE", "name": "CERULEAN CAVE", "x": 0, "y": 0, @@ -436,7 +700,7 @@ "height": 1 }, { - "map_section": "MAPSEC_POWER_PLANT", + "id": "MAPSEC_POWER_PLANT", "name": "POWER PLANT", "x": 0, "y": 0, @@ -444,7 +708,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ONE_ISLAND", + "id": "MAPSEC_ONE_ISLAND", "name": "ONE ISLAND", "x": 1, "y": 8, @@ -452,7 +716,7 @@ "height": 1 }, { - "map_section": "MAPSEC_TWO_ISLAND", + "id": "MAPSEC_TWO_ISLAND", "name": "TWO ISLAND", "x": 9, "y": 9, @@ -460,7 +724,7 @@ "height": 1 }, { - "map_section": "MAPSEC_THREE_ISLAND", + "id": "MAPSEC_THREE_ISLAND", "name": "THREE ISLAND", "x": 18, "y": 12, @@ -468,7 +732,7 @@ "height": 1 }, { - "map_section": "MAPSEC_FOUR_ISLAND", + "id": "MAPSEC_FOUR_ISLAND", "name": "FOUR ISLAND", "x": 3, "y": 4, @@ -476,7 +740,7 @@ "height": 1 }, { - "map_section": "MAPSEC_FIVE_ISLAND", + "id": "MAPSEC_FIVE_ISLAND", "name": "FIVE ISLAND", "x": 16, "y": 11, @@ -484,7 +748,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SEVEN_ISLAND", + "id": "MAPSEC_SEVEN_ISLAND", "name": "SEVEN ISLAND", "x": 5, "y": 8, @@ -492,7 +756,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SIX_ISLAND", + "id": "MAPSEC_SIX_ISLAND", "name": "SIX ISLAND", "x": 17, "y": 5, @@ -500,7 +764,7 @@ "height": 1 }, { - "map_section": "MAPSEC_KINDLE_ROAD", + "id": "MAPSEC_KINDLE_ROAD", "name": "KINDLE ROAD", "x": 2, "y": 3, @@ -508,7 +772,7 @@ "height": 6 }, { - "map_section": "MAPSEC_TREASURE_BEACH", + "id": "MAPSEC_TREASURE_BEACH", "name": "TREASURE BEACH", "x": 1, "y": 9, @@ -516,7 +780,7 @@ "height": 2 }, { - "map_section": "MAPSEC_CAPE_BRINK", + "id": "MAPSEC_CAPE_BRINK", "name": "CAPE BRINK", "x": 9, "y": 7, @@ -524,7 +788,7 @@ "height": 2 }, { - "map_section": "MAPSEC_BOND_BRIDGE", + "id": "MAPSEC_BOND_BRIDGE", "name": "BOND BRIDGE", "x": 13, "y": 12, @@ -532,7 +796,7 @@ "height": 1 }, { - "map_section": "MAPSEC_THREE_ISLE_PORT", + "id": "MAPSEC_THREE_ISLE_PORT", "name": "THREE ISLE PORT", "x": 18, "y": 13, @@ -540,7 +804,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SEVII_ISLE_6", + "id": "MAPSEC_SEVII_ISLE_6", "name": "SEVII ISLE 6", "x": 4, "y": 3, @@ -548,7 +812,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SEVII_ISLE_7", + "id": "MAPSEC_SEVII_ISLE_7", "name": "SEVII ISLE 7", "x": 5, "y": 4, @@ -556,7 +820,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SEVII_ISLE_8", + "id": "MAPSEC_SEVII_ISLE_8", "name": "SEVII ISLE 8", "x": 1, "y": 4, @@ -564,7 +828,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SEVII_ISLE_9", + "id": "MAPSEC_SEVII_ISLE_9", "name": "SEVII ISLE 9", "x": 4, "y": 5, @@ -572,7 +836,7 @@ "height": 2 }, { - "map_section": "MAPSEC_RESORT_GORGEOUS", + "id": "MAPSEC_RESORT_GORGEOUS", "name": "RESORT GORGEOUS", "x": 16, "y": 9, @@ -580,7 +844,7 @@ "height": 1 }, { - "map_section": "MAPSEC_WATER_LABYRINTH", + "id": "MAPSEC_WATER_LABYRINTH", "name": "WATER LABYRINTH", "x": 14, "y": 10, @@ -588,7 +852,7 @@ "height": 1 }, { - "map_section": "MAPSEC_FIVE_ISLE_MEADOW", + "id": "MAPSEC_FIVE_ISLE_MEADOW", "name": "FIVE ISLE MEADOW", "x": 17, "y": 10, @@ -596,7 +860,7 @@ "height": 3 }, { - "map_section": "MAPSEC_MEMORIAL_PILLAR", + "id": "MAPSEC_MEMORIAL_PILLAR", "name": "MEMORIAL PILLAR", "x": 18, "y": 12, @@ -604,7 +868,7 @@ "height": 3 }, { - "map_section": "MAPSEC_OUTCAST_ISLAND", + "id": "MAPSEC_OUTCAST_ISLAND", "name": "OUTCAST ISLAND", "x": 15, "y": 0, @@ -612,7 +876,7 @@ "height": 3 }, { - "map_section": "MAPSEC_GREEN_PATH", + "id": "MAPSEC_GREEN_PATH", "name": "GREEN PATH", "x": 15, "y": 3, @@ -620,7 +884,7 @@ "height": 1 }, { - "map_section": "MAPSEC_WATER_PATH", + "id": "MAPSEC_WATER_PATH", "name": "WATER PATH", "x": 18, "y": 3, @@ -628,7 +892,7 @@ "height": 5 }, { - "map_section": "MAPSEC_RUIN_VALLEY", + "id": "MAPSEC_RUIN_VALLEY", "name": "RUIN VALLEY", "x": 16, "y": 7, @@ -636,7 +900,7 @@ "height": 2 }, { - "map_section": "MAPSEC_TRAINER_TOWER", + "id": "MAPSEC_TRAINER_TOWER", "name": "TRAINER TOWER", "x": 5, "y": 6, @@ -644,7 +908,7 @@ "height": 2 }, { - "map_section": "MAPSEC_CANYON_ENTRANCE", + "id": "MAPSEC_CANYON_ENTRANCE", "name": "CANYON ENTRANCE", "x": 5, "y": 9, @@ -652,7 +916,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SEVAULT_CANYON", + "id": "MAPSEC_SEVAULT_CANYON", "name": "SEVAULT CANYON", "x": 6, "y": 9, @@ -660,7 +924,7 @@ "height": 3 }, { - "map_section": "MAPSEC_TANOBY_RUINS", + "id": "MAPSEC_TANOBY_RUINS", "name": "TANOBY RUINS", "x": 3, "y": 12, @@ -668,7 +932,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SEVII_ISLE_22", + "id": "MAPSEC_SEVII_ISLE_22", "name": "SEVII ISLE 22", "x": 9, "y": 12, @@ -676,7 +940,7 @@ "height": 3 }, { - "map_section": "MAPSEC_SEVII_ISLE_23", + "id": "MAPSEC_SEVII_ISLE_23", "name": "SEVII ISLE 23", "x": 3, "y": 14, @@ -684,7 +948,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SEVII_ISLE_24", + "id": "MAPSEC_SEVII_ISLE_24", "name": "SEVII ISLE 24", "x": 2, "y": 12, @@ -692,7 +956,7 @@ "height": 3 }, { - "map_section": "MAPSEC_NAVEL_ROCK", + "id": "MAPSEC_NAVEL_ROCK", "name": "NAVEL ROCK", "x": 10, "y": 8, @@ -700,7 +964,7 @@ "height": 1 }, { - "map_section": "MAPSEC_MT_EMBER", + "id": "MAPSEC_MT_EMBER", "name": "MT. EMBER", "x": 0, "y": 0, @@ -708,7 +972,7 @@ "height": 1 }, { - "map_section": "MAPSEC_BERRY_FOREST", + "id": "MAPSEC_BERRY_FOREST", "name": "BERRY FOREST", "x": 0, "y": 0, @@ -716,7 +980,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ICEFALL_CAVE", + "id": "MAPSEC_ICEFALL_CAVE", "name": "ICEFALL CAVE", "x": 0, "y": 0, @@ -724,7 +988,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ROCKET_WAREHOUSE", + "id": "MAPSEC_ROCKET_WAREHOUSE", "name": "ROCKET WAREHOUSE", "x": 0, "y": 0, @@ -732,7 +996,7 @@ "height": 1 }, { - "map_section": "MAPSEC_TRAINER_TOWER_2", + "id": "MAPSEC_TRAINER_TOWER_2", "name": "TRAINER TOWER", "name_clone": true, "x": 0, @@ -741,7 +1005,7 @@ "height": 1 }, { - "map_section": "MAPSEC_DOTTED_HOLE", + "id": "MAPSEC_DOTTED_HOLE", "name": "DOTTED HOLE", "x": 0, "y": 0, @@ -749,7 +1013,7 @@ "height": 1 }, { - "map_section": "MAPSEC_LOST_CAVE", + "id": "MAPSEC_LOST_CAVE", "name": "LOST CAVE", "x": 0, "y": 0, @@ -757,7 +1021,7 @@ "height": 1 }, { - "map_section": "MAPSEC_PATTERN_BUSH", + "id": "MAPSEC_PATTERN_BUSH", "name": "PATTERN BUSH", "x": 0, "y": 0, @@ -765,7 +1029,7 @@ "height": 1 }, { - "map_section": "MAPSEC_ALTERING_CAVE", + "id": "MAPSEC_ALTERING_CAVE", "name": "ALTERING CAVE", "x": 0, "y": 0, @@ -773,7 +1037,7 @@ "height": 1 }, { - "map_section": "MAPSEC_TANOBY_CHAMBERS", + "id": "MAPSEC_TANOBY_CHAMBERS", "name": "TANOBY CHAMBERS", "x": 0, "y": 0, @@ -781,7 +1045,7 @@ "height": 1 }, { - "map_section": "MAPSEC_THREE_ISLE_PATH", + "id": "MAPSEC_THREE_ISLE_PATH", "name": "THREE ISLE PATH", "x": 0, "y": 0, @@ -789,7 +1053,7 @@ "height": 1 }, { - "map_section": "MAPSEC_TANOBY_KEY", + "id": "MAPSEC_TANOBY_KEY", "name": "TANOBY KEY", "x": 0, "y": 0, @@ -797,7 +1061,7 @@ "height": 1 }, { - "map_section": "MAPSEC_BIRTH_ISLAND", + "id": "MAPSEC_BIRTH_ISLAND", "name": "BIRTH ISLAND", "x": 18, "y": 13, @@ -805,7 +1069,7 @@ "height": 1 }, { - "map_section": "MAPSEC_MONEAN_CHAMBER", + "id": "MAPSEC_MONEAN_CHAMBER", "name": "MONEAN CHAMBER", "x": 0, "y": 0, @@ -813,7 +1077,7 @@ "height": 1 }, { - "map_section": "MAPSEC_LIPTOO_CHAMBER", + "id": "MAPSEC_LIPTOO_CHAMBER", "name": "LIPTOO CHAMBER", "x": 0, "y": 0, @@ -821,7 +1085,7 @@ "height": 1 }, { - "map_section": "MAPSEC_WEEPTH_CHAMBER", + "id": "MAPSEC_WEEPTH_CHAMBER", "name": "WEEPTH CHAMBER", "x": 0, "y": 0, @@ -829,7 +1093,7 @@ "height": 1 }, { - "map_section": "MAPSEC_DILFORD_CHAMBER", + "id": "MAPSEC_DILFORD_CHAMBER", "name": "DILFORD CHAMBER", "x": 0, "y": 0, @@ -837,7 +1101,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SCUFIB_CHAMBER", + "id": "MAPSEC_SCUFIB_CHAMBER", "name": "SCUFIB CHAMBER", "x": 0, "y": 0, @@ -845,7 +1109,7 @@ "height": 1 }, { - "map_section": "MAPSEC_RIXY_CHAMBER", + "id": "MAPSEC_RIXY_CHAMBER", "name": "RIXY CHAMBER", "x": 0, "y": 0, @@ -853,7 +1117,7 @@ "height": 1 }, { - "map_section": "MAPSEC_VIAPOIS_CHAMBER", + "id": "MAPSEC_VIAPOIS_CHAMBER", "name": "VIAPOIS CHAMBER", "x": 0, "y": 0, @@ -861,7 +1125,7 @@ "height": 1 }, { - "map_section": "MAPSEC_EMBER_SPA", + "id": "MAPSEC_EMBER_SPA", "name": "EMBER SPA", "x": 0, "y": 0, @@ -869,7 +1133,7 @@ "height": 1 }, { - "map_section": "MAPSEC_SPECIAL_AREA", + "id": "MAPSEC_SPECIAL_AREA", "name": "CELADON DEPT.", "x": 0, "y": 0, diff --git a/src/data/region_map/region_map_sections.strings.json.txt b/src/data/region_map/region_map_sections.strings.json.txt index c81a10419..31a28c8f6 100644 --- a/src/data/region_map/region_map_sections.strings.json.txt +++ b/src/data/region_map/region_map_sections.strings.json.txt @@ -3,16 +3,18 @@ #define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRY_STRINGS_H ## for map_section in map_sections -{% if isEmptyString(getVar(map_section.name)) and not existsIn(map_section, "name_clone") %}{{ setVar(map_section.name, map_section.map_section) }}{% endif %} +{% if existsIn(map_section, "name") and isEmptyString(getVar(map_section.name)) and not existsIn(map_section, "name_clone") %}{{ setVar(map_section.name, map_section.id) }}{% endif %} ## endfor ## for map_section in map_sections -{% if getVar(map_section.name) == map_section.map_section %} +{% if existsIn(map_section, "name") %} +{% if getVar(map_section.name) == map_section.id %} static const u8 sMapsecName_{{ cleanString(map_section.name) }}[] = _("{{ map_section.name }}"); {% endif %} {% if existsIn(map_section, "name_clone") %} static const u8 sMapsecName_{{ cleanString(map_section.name) }}_Clone[] = _("{{ map_section.name }}"); {% endif %} +{% endif %} ## endfor #endif // GUARD_DATA_REGION_MAP_REGION_MAP_ENTRY_STRINGS_H diff --git a/src/data/wild_encounters.json.txt b/src/data/wild_encounters.json.txt index a972e88b1..c9eda0e26 100644 --- a/src/data/wild_encounters.json.txt +++ b/src/data/wild_encounters.json.txt @@ -84,8 +84,8 @@ const struct WildPokemonHeader {{ wild_encounter_group.label }}[] = #ifdef FIRERED {% endif %} { - .mapGroup = {% if wild_encounter_group.for_maps %}MAP_GROUP({{ removePrefix(encounter.map, "MAP_") }}){% else %}0{% endif %}, - .mapNum = {% if wild_encounter_group.for_maps %}MAP_NUM({{ removePrefix(encounter.map, "MAP_") }}){% else %}{{ loop.index1 }}{% endif %}, + .mapGroup = {% if wild_encounter_group.for_maps %}MAP_GROUP({{ encounter.map }}){% else %}0{% endif %}, + .mapNum = {% if wild_encounter_group.for_maps %}MAP_NUM({{ encounter.map }}){% else %}{{ loop.index1 }}{% endif %}, .landMonsInfo = {% if existsIn(encounter, "land_mons") %}&{{ encounter.base_label }}_LandMonsInfo{% else %}NULL{% endif %}, .waterMonsInfo = {% if existsIn(encounter, "water_mons") %}&{{ encounter.base_label }}_WaterMonsInfo{% else %}NULL{% endif %}, .rockSmashMonsInfo = {% if existsIn(encounter, "rock_smash_mons") %}&{{ encounter.base_label }}_RockSmashMonsInfo{% else %}NULL{% endif %}, @@ -96,8 +96,8 @@ const struct WildPokemonHeader {{ wild_encounter_group.label }}[] = {% endif %} ## endfor { - .mapGroup = MAP_GROUP(UNDEFINED), - .mapNum = MAP_NUM(UNDEFINED), + .mapGroup = MAP_GROUP(MAP_UNDEFINED), + .mapNum = MAP_NUM(MAP_UNDEFINED), .landMonsInfo = NULL, .waterMonsInfo = NULL, .rockSmashMonsInfo = NULL, diff --git a/src/event_object_lock.c b/src/event_object_lock.c index e9adbb680..316595ace 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -86,7 +86,7 @@ void FreezeObjects_WaitForPlayerAndSelected(void) void ClearPlayerHeldMovementAndUnfreezeObjectEvents(void) { - u8 objectEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + u8 objectEventId = GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]); ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); @@ -97,7 +97,7 @@ void UnionRoom_UnlockPlayerAndChatPartner(void) u8 objectEventId; if (gObjectEvents[gSelectedObjectEvent].active) ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); - objectEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + objectEventId = GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]); ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index b55faee3f..d2bffe5ec 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1206,9 +1206,9 @@ static const u8 sPlayerDirectionToCopyDirection[][4] = { static void ClearObjectEvent(struct ObjectEvent *objectEvent) { *objectEvent = (struct ObjectEvent){}; - objectEvent->localId = 0xFF; - objectEvent->mapNum = MAP_NUM(UNDEFINED); - objectEvent->mapGroup = MAP_GROUP(UNDEFINED); + objectEvent->localId = LOCALID_PLAYER; + objectEvent->mapNum = MAP_NUM(MAP_UNDEFINED); + objectEvent->mapGroup = MAP_GROUP(MAP_UNDEFINED); objectEvent->movementActionId = MOVEMENT_ACTION_NONE; } @@ -1257,7 +1257,7 @@ u8 GetFirstInactiveObjectEventId(void) u8 GetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) { - if (localId < OBJ_EVENT_ID_PLAYER) + if (localId < LOCALID_PLAYER) { return GetObjectEventIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId); } @@ -1317,7 +1317,7 @@ static u8 InitObjectEventStateFromTemplate(const struct ObjectEventTemplate *tem s16 x; s16 y; bool8 isClone = FALSE; - u8 localId = 0; + u8 localId = LOCALID_NONE; s16 x2 = 0; s16 y2 = 0; s16 x3 = 0; @@ -6776,7 +6776,7 @@ static bool8 MovementAction_FacePlayer_Step0(struct ObjectEvent *objectEvent, st { u8 playerObjectId; - if (!TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0, &playerObjectId)) { FaceDirection(objectEvent, sprite, GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y)); } @@ -6788,7 +6788,7 @@ static bool8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *objectEvent { u8 playerObjectId; - if (!TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0, &playerObjectId)) { FaceDirection(objectEvent, sprite, GetOppositeDirection(GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y))); } @@ -7977,7 +7977,7 @@ static void CalcWhetherObjectIsOffscreen(struct ObjectEvent *objectEvent, struct u16 x, y; u16 x2, y2; const struct ObjectEventGraphicsInfo *graphicsInfo; - s16 var; + s16 minX; objectEvent->offScreen = FALSE; graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); @@ -7994,21 +7994,21 @@ static void CalcWhetherObjectIsOffscreen(struct ObjectEvent *objectEvent, struct x2 = graphicsInfo->width + (s16)x; y2 = graphicsInfo->height + (s16)y; - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SSANNE_EXTERIOR) - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SSANNE_EXTERIOR) - && objectEvent->localId == 1) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SSANNE_EXTERIOR) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SSANNE_EXTERIOR) + && objectEvent->localId == LOCALID_SS_ANNE) { - var = -32; + minX = -32; } else { - var = -16; + minX = -16; } - if ((s16)x >= 256 || (s16)x2 < var) + if ((s16)x >= (DISPLAY_WIDTH + 16) || (s16)x2 < minX) { objectEvent->offScreen = TRUE; } - if ((s16)y >= 176 || (s16)y2 < -16) + if ((s16)y >= (DISPLAY_HEIGHT + 16) || (s16)y2 < -16) { objectEvent->offScreen = TRUE; } @@ -8691,7 +8691,7 @@ static void DoFlaggedGroundEffects(struct ObjectEvent *objEvent, struct Sprite * { u8 i; - if (objEvent->localId == OBJ_EVENT_ID_CAMERA && objEvent->invisible) + if (objEvent->localId == LOCALID_CAMERA && objEvent->invisible) return; for (i = 0; i < NELEMS(sGroundEffectFuncs); i++, flags >>= 1) diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index b1f4291e2..b1b646594 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -414,7 +414,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatil else objectEventId = GetObjectEventIdByPosition(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->elevation); - if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == LOCALID_PLAYER) return NULL; for (i = 0; i < MAX_LINK_PLAYERS; i++) @@ -435,14 +435,14 @@ static const u8 *GetInteractedObjectEventScript(struct MapPosition *position, u8 const u8 *script; objectEventId = GetObjectEventIdByPosition(position->x, position->y, position->elevation); - if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == LOCALID_PLAYER) { if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) return NULL; // Look for an object event on the other side of the counter. objectEventId = GetObjectEventIdByPosition(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->elevation); - if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == LOCALID_PLAYER) return NULL; } @@ -968,7 +968,7 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi warpEvent = &gMapHeader.events->warps[warpEventId]; - if (warpEvent->mapNum == MAP_NUM(DYNAMIC)) + if (warpEvent->mapNum == MAP_NUM(MAP_DYNAMIC)) { SetWarpDestinationToDynamicWarp(warpEvent->warpId); } @@ -979,7 +979,7 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi SetWarpDestinationToMapWarp(warpEvent->mapGroup, warpEvent->mapNum, warpEvent->warpId); UpdateEscapeWarp(position->x, position->y); mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->mapGroup, warpEvent->mapNum); - if (mapHeader->events->warps[warpEvent->warpId].mapNum == MAP_NUM(DYNAMIC)) + if (mapHeader->events->warps[warpEvent->warpId].mapNum == MAP_NUM(MAP_DYNAMIC)) SetDynamicWarp(mapHeader->events->warps[warpEventId].warpId, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, warpEventId); } } diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 1c185885a..4b0b40bcc 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -351,7 +351,7 @@ static void Task_ExitDoor(u8 taskId) { PlayerGetDestCoords(&task->data[12], &task->data[13]); SetPlayerVisibility(TRUE); - ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN); + ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN); task->data[0] = 8; } break; @@ -366,7 +366,7 @@ static void Task_ExitDoor(u8 taskId) case 9: if (FieldFadeTransitionBackgroundEffectIsFinished() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(Task_BarnDoorWipe)) { - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)]); task->data[0] = 4; } break; @@ -375,7 +375,7 @@ static void Task_ExitDoor(u8 taskId) if (FieldFadeTransitionBackgroundEffectIsFinished()) { SetPlayerVisibility(TRUE); - ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN); + ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN); task->data[0] = 2; } break; @@ -383,7 +383,7 @@ static void Task_ExitDoor(u8 taskId) if (walkrun_is_standing_still()) { task->data[1] = FieldAnimateDoorClose(*x, *y); - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)]); task->data[0] = 3; } break; @@ -417,7 +417,7 @@ static void Task_ExitNonAnimDoor(u8 taskId) if (FieldFadeTransitionBackgroundEffectIsFinished()) { SetPlayerVisibility(TRUE); - ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection())); task->data[0] = 2; } break; @@ -754,8 +754,8 @@ static void Task_DoorWarp(u8 taskId) case 1: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - ObjectEventClearHeldMovementIfActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); - ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_UP); + ObjectEventClearHeldMovementIfActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)]); + ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_UP); task->data[0] = 2; } break; @@ -763,7 +763,7 @@ static void Task_DoorWarp(u8 taskId) if (walkrun_is_standing_still()) { task->data[1] = FieldAnimateDoorClose(*xp, *yp - 1); - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)]); SetPlayerVisibility(FALSE); task->data[0] = 3; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index aa9ca815d..317c91c28 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1289,7 +1289,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) u8 objectEventId; struct ObjectEvent *objectEvent; - playerObjEventTemplate.localId = OBJ_EVENT_ID_PLAYER; + playerObjEventTemplate.localId = LOCALID_PLAYER; playerObjEventTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_GFX_NORMAL, gender); playerObjEventTemplate.x = x - 7; playerObjEventTemplate.y = y - 7; diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index f311e0f7a..af0012097 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -400,9 +400,9 @@ static void Task_RushInjuredPokemonToCenter(u8 taskId) CopyWindowToVram(windowId, COPYWIN_FULL); // Scene changes if last heal location was the player's house - loc = GetHealLocation(SPAWN_PALLET_TOWN); - if (gSaveBlock1Ptr->lastHealLocation.mapGroup == loc->group - && gSaveBlock1Ptr->lastHealLocation.mapNum == loc->map + loc = GetHealLocation(HEAL_LOCATION_PALLET_TOWN); + if (gSaveBlock1Ptr->lastHealLocation.mapGroup == loc->mapGroup + && gSaveBlock1Ptr->lastHealLocation.mapNum == loc->mapNum && gSaveBlock1Ptr->lastHealLocation.warpId == WARP_ID_NONE && gSaveBlock1Ptr->lastHealLocation.x == loc->x && gSaveBlock1Ptr->lastHealLocation.y == loc->y) diff --git a/src/field_specials.c b/src/field_specials.c index d7dbb6f81..08b7ced2d 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -317,7 +317,7 @@ void AnimatePcTurnOff() void SpawnCameraObject(void) { - u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_YOUNGSTER, 8, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + MAP_OFFSET, gSaveBlock1Ptr->pos.y + MAP_OFFSET, 3); + u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_YOUNGSTER, 8, LOCALID_CAMERA, gSaveBlock1Ptr->pos.x + MAP_OFFSET, gSaveBlock1Ptr->pos.y + MAP_OFFSET, 3); gObjectEvents[objectEventId].invisible = TRUE; CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId); } @@ -325,7 +325,7 @@ void SpawnCameraObject(void) void RemoveCameraObject(void) { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveObjectEventByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(LOCALID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } void BufferEReaderTrainerName(void) @@ -836,91 +836,91 @@ static const u8 sElevatorWindowAnimDuration[] = { void GetElevatorFloor(void) { u16 floor = 4; - if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(ROCKET_HIDEOUT_B1F)) + if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_ROCKET_HIDEOUT_B1F)) { switch (gSaveBlock1Ptr->dynamicWarp.mapNum) { - case MAP_NUM(SILPH_CO_1F): + case MAP_NUM(MAP_SILPH_CO_1F): floor = 4; break; - case MAP_NUM(SILPH_CO_2F): + case MAP_NUM(MAP_SILPH_CO_2F): floor = 5; break; - case MAP_NUM(SILPH_CO_3F): + case MAP_NUM(MAP_SILPH_CO_3F): floor = 6; break; - case MAP_NUM(SILPH_CO_4F): + case MAP_NUM(MAP_SILPH_CO_4F): floor = 7; break; - case MAP_NUM(SILPH_CO_5F): + case MAP_NUM(MAP_SILPH_CO_5F): floor = 8; break; - case MAP_NUM(SILPH_CO_6F): + case MAP_NUM(MAP_SILPH_CO_6F): floor = 9; break; - case MAP_NUM(SILPH_CO_7F): + case MAP_NUM(MAP_SILPH_CO_7F): floor = 10; break; - case MAP_NUM(SILPH_CO_8F): + case MAP_NUM(MAP_SILPH_CO_8F): floor = 11; break; - case MAP_NUM(SILPH_CO_9F): + case MAP_NUM(MAP_SILPH_CO_9F): floor = 12; break; - case MAP_NUM(SILPH_CO_10F): + case MAP_NUM(MAP_SILPH_CO_10F): floor = 13; break; - case MAP_NUM(SILPH_CO_11F): + case MAP_NUM(MAP_SILPH_CO_11F): floor = 14; break; - case MAP_NUM(ROCKET_HIDEOUT_B1F): + case MAP_NUM(MAP_ROCKET_HIDEOUT_B1F): floor = 3; break; - case MAP_NUM(ROCKET_HIDEOUT_B2F): + case MAP_NUM(MAP_ROCKET_HIDEOUT_B2F): floor = 2; break; - case MAP_NUM(ROCKET_HIDEOUT_B4F): + case MAP_NUM(MAP_ROCKET_HIDEOUT_B4F): floor = 0; break; } } - if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(CELADON_CITY_DEPARTMENT_STORE_1F)) + if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_CELADON_CITY_DEPARTMENT_STORE_1F)) { switch (gSaveBlock1Ptr->dynamicWarp.mapNum) { - case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_1F): + case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_1F): floor = 4; break; - case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_2F): + case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_2F): floor = 5; break; - case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_3F): + case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_3F): floor = 6; break; - case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_4F): + case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_4F): floor = 7; break; - case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_5F): + case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_5F): floor = 8; break; } } - if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(TRAINER_TOWER_1F)) + if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_TRAINER_TOWER_1F)) { switch (gSaveBlock1Ptr->dynamicWarp.mapNum) { - case MAP_NUM(TRAINER_TOWER_1F): - case MAP_NUM(TRAINER_TOWER_2F): - case MAP_NUM(TRAINER_TOWER_3F): - case MAP_NUM(TRAINER_TOWER_4F): - case MAP_NUM(TRAINER_TOWER_5F): - case MAP_NUM(TRAINER_TOWER_6F): - case MAP_NUM(TRAINER_TOWER_7F): - case MAP_NUM(TRAINER_TOWER_8F): - case MAP_NUM(TRAINER_TOWER_ROOF): + case MAP_NUM(MAP_TRAINER_TOWER_1F): + case MAP_NUM(MAP_TRAINER_TOWER_2F): + case MAP_NUM(MAP_TRAINER_TOWER_3F): + case MAP_NUM(MAP_TRAINER_TOWER_4F): + case MAP_NUM(MAP_TRAINER_TOWER_5F): + case MAP_NUM(MAP_TRAINER_TOWER_6F): + case MAP_NUM(MAP_TRAINER_TOWER_7F): + case MAP_NUM(MAP_TRAINER_TOWER_8F): + case MAP_NUM(MAP_TRAINER_TOWER_ROOF): floor = 15; break; - case MAP_NUM(TRAINER_TOWER_LOBBY): + case MAP_NUM(MAP_TRAINER_TOWER_LOBBY): floor = 3; break; } @@ -933,111 +933,111 @@ u16 InitElevatorFloorSelectMenuPos(void) sElevatorScroll = 0; sElevatorCursorPos = 0; - if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(ROCKET_HIDEOUT_B1F)) + if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_ROCKET_HIDEOUT_B1F)) { switch (gSaveBlock1Ptr->dynamicWarp.mapNum) { - case MAP_NUM(SILPH_CO_11F): + case MAP_NUM(MAP_SILPH_CO_11F): sElevatorScroll = 0; sElevatorCursorPos = 0; break; - case MAP_NUM(SILPH_CO_10F): + case MAP_NUM(MAP_SILPH_CO_10F): sElevatorScroll = 0; sElevatorCursorPos = 1; break; - case MAP_NUM(SILPH_CO_9F): + case MAP_NUM(MAP_SILPH_CO_9F): sElevatorScroll = 0; sElevatorCursorPos = 2; break; - case MAP_NUM(SILPH_CO_8F): + case MAP_NUM(MAP_SILPH_CO_8F): sElevatorScroll = 0; sElevatorCursorPos = 3; break; - case MAP_NUM(SILPH_CO_7F): + case MAP_NUM(MAP_SILPH_CO_7F): sElevatorScroll = 0; sElevatorCursorPos = 4; break; - case MAP_NUM(SILPH_CO_6F): + case MAP_NUM(MAP_SILPH_CO_6F): sElevatorScroll = 1; sElevatorCursorPos = 4; break; - case MAP_NUM(SILPH_CO_5F): + case MAP_NUM(MAP_SILPH_CO_5F): sElevatorScroll = 2; sElevatorCursorPos = 4; break; - case MAP_NUM(SILPH_CO_4F): + case MAP_NUM(MAP_SILPH_CO_4F): sElevatorScroll = 3; sElevatorCursorPos = 4; break; - case MAP_NUM(SILPH_CO_3F): + case MAP_NUM(MAP_SILPH_CO_3F): sElevatorScroll = 4; sElevatorCursorPos = 4; break; - case MAP_NUM(SILPH_CO_2F): + case MAP_NUM(MAP_SILPH_CO_2F): sElevatorScroll = 5; sElevatorCursorPos = 4; break; - case MAP_NUM(SILPH_CO_1F): + case MAP_NUM(MAP_SILPH_CO_1F): sElevatorScroll = 5; sElevatorCursorPos = 5; break; - case MAP_NUM(ROCKET_HIDEOUT_B1F): + case MAP_NUM(MAP_ROCKET_HIDEOUT_B1F): sElevatorScroll = 0; sElevatorCursorPos = 0; break; - case MAP_NUM(ROCKET_HIDEOUT_B2F): + case MAP_NUM(MAP_ROCKET_HIDEOUT_B2F): sElevatorScroll = 0; sElevatorCursorPos = 1; break; - case MAP_NUM(ROCKET_HIDEOUT_B4F): + case MAP_NUM(MAP_ROCKET_HIDEOUT_B4F): sElevatorScroll = 0; sElevatorCursorPos = 2; break; } } - if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(CELADON_CITY_DEPARTMENT_STORE_1F)) + if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_CELADON_CITY_DEPARTMENT_STORE_1F)) { switch (gSaveBlock1Ptr->dynamicWarp.mapNum) { - case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_5F): + case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_5F): sElevatorScroll = 0; sElevatorCursorPos = 0; break; - case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_4F): + case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_4F): sElevatorScroll = 0; sElevatorCursorPos = 1; break; - case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_3F): + case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_3F): sElevatorScroll = 0; sElevatorCursorPos = 2; break; - case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_2F): + case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_2F): sElevatorScroll = 0; sElevatorCursorPos = 3; break; - case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_1F): + case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_1F): sElevatorScroll = 0; sElevatorCursorPos = 4; break; } } - if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(TRAINER_TOWER_1F)) + if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_TRAINER_TOWER_1F)) { switch (gSaveBlock1Ptr->dynamicWarp.mapNum) { - case MAP_NUM(TRAINER_TOWER_1F): - case MAP_NUM(TRAINER_TOWER_2F): - case MAP_NUM(TRAINER_TOWER_3F): - case MAP_NUM(TRAINER_TOWER_4F): - case MAP_NUM(TRAINER_TOWER_5F): - case MAP_NUM(TRAINER_TOWER_6F): - case MAP_NUM(TRAINER_TOWER_7F): - case MAP_NUM(TRAINER_TOWER_8F): - case MAP_NUM(TRAINER_TOWER_ROOF): + case MAP_NUM(MAP_TRAINER_TOWER_1F): + case MAP_NUM(MAP_TRAINER_TOWER_2F): + case MAP_NUM(MAP_TRAINER_TOWER_3F): + case MAP_NUM(MAP_TRAINER_TOWER_4F): + case MAP_NUM(MAP_TRAINER_TOWER_5F): + case MAP_NUM(MAP_TRAINER_TOWER_6F): + case MAP_NUM(MAP_TRAINER_TOWER_7F): + case MAP_NUM(MAP_TRAINER_TOWER_8F): + case MAP_NUM(MAP_TRAINER_TOWER_ROOF): sElevatorScroll = 0; sElevatorCursorPos = 0; break; - case MAP_NUM(TRAINER_TOWER_LOBBY): + case MAP_NUM(MAP_TRAINER_TOWER_LOBBY): sElevatorScroll = 0; sElevatorCursorPos = 1; break; @@ -1777,18 +1777,18 @@ bool8 DoesPlayerPartyContainSpecies(void) } static const u8 sMartMaps[][3] = { - {MAP(VIRIDIAN_CITY_MART), 1}, - {MAP(PEWTER_CITY_MART), 3}, - {MAP(CERULEAN_CITY_MART), 1}, - {MAP(LAVENDER_TOWN_MART), 1}, - {MAP(VERMILION_CITY_MART), 1}, - {MAP(FUCHSIA_CITY_MART), 1}, - {MAP(CINNABAR_ISLAND_MART), 1}, - {MAP(SAFFRON_CITY_MART), 1}, - {MAP(THREE_ISLAND_MART), 1}, - {MAP(FOUR_ISLAND_MART), 1}, - {MAP(SEVEN_ISLAND_MART), 1}, - {MAP(SIX_ISLAND_MART), 1} + {MAP(MAP_VIRIDIAN_CITY_MART), 1}, + {MAP(MAP_PEWTER_CITY_MART), 3}, + {MAP(MAP_CERULEAN_CITY_MART), 1}, + {MAP(MAP_LAVENDER_TOWN_MART), 1}, + {MAP(MAP_VERMILION_CITY_MART), 1}, + {MAP(MAP_FUCHSIA_CITY_MART), 1}, + {MAP(MAP_CINNABAR_ISLAND_MART), 1}, + {MAP(MAP_SAFFRON_CITY_MART), 1}, + {MAP(MAP_THREE_ISLAND_MART), 1}, + {MAP(MAP_FOUR_ISLAND_MART), 1}, + {MAP(MAP_SEVEN_ISLAND_MART), 1}, + {MAP(MAP_SIX_ISLAND_MART), 1} }; u8 GetMartClerkObjectId(void) @@ -1813,57 +1813,57 @@ static const struct { u16 outside_grp; u16 outside_num; } sInsideOutsidePairs[] = { - [QL_LOCATION_HOME] = {MAP(PALLET_TOWN_PLAYERS_HOUSE_1F), MAP(PALLET_TOWN)}, - [QL_LOCATION_OAKS_LAB] = {MAP(PALLET_TOWN_PROFESSOR_OAKS_LAB), MAP(PALLET_TOWN)}, - [QL_LOCATION_VIRIDIAN_GYM] = {MAP(VIRIDIAN_CITY_GYM), MAP(VIRIDIAN_CITY)}, - [QL_LOCATION_LEAGUE_GATE_1] = {MAP(ROUTE22_NORTH_ENTRANCE), MAP(ROUTE22)}, - [QL_LOCATION_LEAGUE_GATE_2] = {MAP(ROUTE22_NORTH_ENTRANCE), MAP(ROUTE23)}, - [QL_LOCATION_VIRIDIAN_FOREST_1] = {MAP(VIRIDIAN_FOREST), MAP(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE)}, - [QL_LOCATION_VIRIDIAN_FOREST_2] = {MAP(VIRIDIAN_FOREST), MAP(ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE)}, - [QL_LOCATION_PEWTER_MUSEUM] = {MAP(PEWTER_CITY_MUSEUM_1F), MAP(PEWTER_CITY)}, - [QL_LOCATION_PEWTER_GYM] = {MAP(PEWTER_CITY_GYM), MAP(PEWTER_CITY)}, - [QL_LOCATION_MT_MOON_1] = {MAP(MT_MOON_1F), MAP(ROUTE4)}, - [QL_LOCATION_MT_MOON_2] = {MAP(MT_MOON_B1F), MAP(ROUTE4)}, - [QL_LOCATION_CERULEAN_GYM] = {MAP(CERULEAN_CITY_GYM), MAP(CERULEAN_CITY)}, - [QL_LOCATION_BIKE_SHOP] = {MAP(CERULEAN_CITY_BIKE_SHOP), MAP(CERULEAN_CITY)}, - [QL_LOCATION_BILLS_HOUSE] = {MAP(ROUTE25_SEA_COTTAGE), MAP(ROUTE25)}, - [QL_LOCATION_DAY_CARE] = {MAP(ROUTE5_POKEMON_DAY_CARE), MAP(ROUTE5)}, - [QL_LOCATION_UNDERGROUND_PATH_1] = {MAP(UNDERGROUND_PATH_NORTH_ENTRANCE), MAP(ROUTE5)}, - [QL_LOCATION_UNDERGROUND_PATH_2] = {MAP(UNDERGROUND_PATH_SOUTH_ENTRANCE), MAP(ROUTE6)}, - [QL_LOCATION_PKMN_FAN_CLUB] = {MAP(VERMILION_CITY_POKEMON_FAN_CLUB), MAP(VERMILION_CITY)}, - [QL_LOCATION_VERMILION_GYM] = {MAP(VERMILION_CITY_GYM), MAP(VERMILION_CITY)}, - [QL_LOCATION_SS_ANNE] = {MAP(SSANNE_1F_CORRIDOR), MAP(VERMILION_CITY)}, - [QL_LOCATION_DIGLETTS_CAVE_1] = {MAP(DIGLETTS_CAVE_NORTH_ENTRANCE), MAP(ROUTE2)}, - [QL_LOCATION_DIGLETTS_CAVE_2] = {MAP(DIGLETTS_CAVE_SOUTH_ENTRANCE), MAP(ROUTE11)}, - [QL_LOCATION_ROCK_TUNNEL_1] = {MAP(ROCK_TUNNEL_1F), MAP(ROUTE10)}, - [QL_LOCATION_ROCK_TUNNEL_2] = {MAP(ROCK_TUNNEL_1F), MAP(ROUTE10)}, - [QL_LOCATION_POWER_PLANT] = {MAP(POWER_PLANT), MAP(ROUTE10)}, - [QL_LOCATION_PKMN_TOWER] = {MAP(POKEMON_TOWER_1F), MAP(LAVENDER_TOWN)}, - [QL_LOCATION_VOLUNTEER_HOUSE] = {MAP(LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE), MAP(LAVENDER_TOWN)}, - [QL_LOCATION_NAME_RATERS_HOUSE] = {MAP(LAVENDER_TOWN_HOUSE2), MAP(LAVENDER_TOWN)}, - [QL_LOCATION_UNDERGROUND_PATH_3] = {MAP(UNDERGROUND_PATH_EAST_ENTRANCE), MAP(ROUTE8)}, - [QL_LOCATION_UNDERGROUND_PATH_4] = {MAP(UNDERGROUND_PATH_WEST_ENTRANCE), MAP(ROUTE7)}, - [QL_LOCATION_CELADON_DEPT_STORE] = {MAP(CELADON_CITY_DEPARTMENT_STORE_1F), MAP(CELADON_CITY)}, - [QL_LOCATION_CELADON_MANSION] = {MAP(CELADON_CITY_CONDOMINIUMS_1F), MAP(CELADON_CITY)}, - [QL_LOCATION_GAME_CORNER] = {MAP(CELADON_CITY_GAME_CORNER), MAP(CELADON_CITY)}, - [QL_LOCATION_CELADON_GYM] = {MAP(CELADON_CITY_GYM), MAP(CELADON_CITY)}, - [QL_LOCATION_CELADON_RESTAURANT] = {MAP(CELADON_CITY_RESTAURANT), MAP(CELADON_CITY)}, - [QL_LOCATION_ROCKET_HIDEOUT] = {MAP(ROCKET_HIDEOUT_B1F), MAP(CELADON_CITY_GAME_CORNER)}, - [QL_LOCATION_SAFARI_ZONE] = {MAP(SAFARI_ZONE_CENTER), MAP(FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE)}, - [QL_LOCATION_FUCHSIA_GYM] = {MAP(FUCHSIA_CITY_GYM), MAP(FUCHSIA_CITY)}, - [QL_LOCATION_WARDENS_HOME] = {MAP(FUCHSIA_CITY_WARDENS_HOUSE), MAP(FUCHSIA_CITY)}, - [QL_LOCATION_FIGHTING_DOJO] = {MAP(SAFFRON_CITY_DOJO), MAP(SAFFRON_CITY)}, - [QL_LOCATION_SAFFRON_GYM] = {MAP(SAFFRON_CITY_GYM), MAP(SAFFRON_CITY)}, - [QL_LOCATION_SILPH_CO] = {MAP(SILPH_CO_1F), MAP(SAFFRON_CITY)}, - [QL_LOCATION_SEAFOAM_ISLANDS_1] = {MAP(SEAFOAM_ISLANDS_1F), MAP(ROUTE20)}, - [QL_LOCATION_SEAFOAM_ISLANDS_2] = {MAP(SEAFOAM_ISLANDS_1F), MAP(ROUTE20)}, - [QL_LOCATION_PKMN_MANSION] = {MAP(POKEMON_MANSION_1F), MAP(CINNABAR_ISLAND)}, - [QL_LOCATION_CINNABAR_GYM] = {MAP(CINNABAR_ISLAND_GYM), MAP(CINNABAR_ISLAND)}, - [QL_LOCATION_CINNABAR_LAB] = {MAP(CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE), MAP(CINNABAR_ISLAND)}, - [QL_LOCATION_VICTORY_ROAD_1] = {MAP(VICTORY_ROAD_1F), MAP(ROUTE23)}, - [QL_LOCATION_VICTORY_ROAD_2] = {MAP(VICTORY_ROAD_2F), MAP(ROUTE23)}, - [QL_LOCATION_PKMN_LEAGUE] = {MAP(INDIGO_PLATEAU_POKEMON_CENTER_1F), MAP(INDIGO_PLATEAU_EXTERIOR)}, - [QL_LOCATION_CERULEAN_CAVE] = {MAP(CERULEAN_CAVE_1F), MAP(CERULEAN_CITY)} + [QL_LOCATION_HOME] = {MAP(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F), MAP(MAP_PALLET_TOWN)}, + [QL_LOCATION_OAKS_LAB] = {MAP(MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB), MAP(MAP_PALLET_TOWN)}, + [QL_LOCATION_VIRIDIAN_GYM] = {MAP(MAP_VIRIDIAN_CITY_GYM), MAP(MAP_VIRIDIAN_CITY)}, + [QL_LOCATION_LEAGUE_GATE_1] = {MAP(MAP_ROUTE22_NORTH_ENTRANCE), MAP(MAP_ROUTE22)}, + [QL_LOCATION_LEAGUE_GATE_2] = {MAP(MAP_ROUTE22_NORTH_ENTRANCE), MAP(MAP_ROUTE23)}, + [QL_LOCATION_VIRIDIAN_FOREST_1] = {MAP(MAP_VIRIDIAN_FOREST), MAP(MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE)}, + [QL_LOCATION_VIRIDIAN_FOREST_2] = {MAP(MAP_VIRIDIAN_FOREST), MAP(MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE)}, + [QL_LOCATION_PEWTER_MUSEUM] = {MAP(MAP_PEWTER_CITY_MUSEUM_1F), MAP(MAP_PEWTER_CITY)}, + [QL_LOCATION_PEWTER_GYM] = {MAP(MAP_PEWTER_CITY_GYM), MAP(MAP_PEWTER_CITY)}, + [QL_LOCATION_MT_MOON_1] = {MAP(MAP_MT_MOON_1F), MAP(MAP_ROUTE4)}, + [QL_LOCATION_MT_MOON_2] = {MAP(MAP_MT_MOON_B1F), MAP(MAP_ROUTE4)}, + [QL_LOCATION_CERULEAN_GYM] = {MAP(MAP_CERULEAN_CITY_GYM), MAP(MAP_CERULEAN_CITY)}, + [QL_LOCATION_BIKE_SHOP] = {MAP(MAP_CERULEAN_CITY_BIKE_SHOP), MAP(MAP_CERULEAN_CITY)}, + [QL_LOCATION_BILLS_HOUSE] = {MAP(MAP_ROUTE25_SEA_COTTAGE), MAP(MAP_ROUTE25)}, + [QL_LOCATION_DAY_CARE] = {MAP(MAP_ROUTE5_POKEMON_DAY_CARE), MAP(MAP_ROUTE5)}, + [QL_LOCATION_UNDERGROUND_PATH_1] = {MAP(MAP_UNDERGROUND_PATH_NORTH_ENTRANCE), MAP(MAP_ROUTE5)}, + [QL_LOCATION_UNDERGROUND_PATH_2] = {MAP(MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE), MAP(MAP_ROUTE6)}, + [QL_LOCATION_PKMN_FAN_CLUB] = {MAP(MAP_VERMILION_CITY_POKEMON_FAN_CLUB), MAP(MAP_VERMILION_CITY)}, + [QL_LOCATION_VERMILION_GYM] = {MAP(MAP_VERMILION_CITY_GYM), MAP(MAP_VERMILION_CITY)}, + [QL_LOCATION_SS_ANNE] = {MAP(MAP_SSANNE_1F_CORRIDOR), MAP(MAP_VERMILION_CITY)}, + [QL_LOCATION_DIGLETTS_CAVE_1] = {MAP(MAP_DIGLETTS_CAVE_NORTH_ENTRANCE), MAP(MAP_ROUTE2)}, + [QL_LOCATION_DIGLETTS_CAVE_2] = {MAP(MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE), MAP(MAP_ROUTE11)}, + [QL_LOCATION_ROCK_TUNNEL_1] = {MAP(MAP_ROCK_TUNNEL_1F), MAP(MAP_ROUTE10)}, + [QL_LOCATION_ROCK_TUNNEL_2] = {MAP(MAP_ROCK_TUNNEL_1F), MAP(MAP_ROUTE10)}, + [QL_LOCATION_POWER_PLANT] = {MAP(MAP_POWER_PLANT), MAP(MAP_ROUTE10)}, + [QL_LOCATION_PKMN_TOWER] = {MAP(MAP_POKEMON_TOWER_1F), MAP(MAP_LAVENDER_TOWN)}, + [QL_LOCATION_VOLUNTEER_HOUSE] = {MAP(MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE), MAP(MAP_LAVENDER_TOWN)}, + [QL_LOCATION_NAME_RATERS_HOUSE] = {MAP(MAP_LAVENDER_TOWN_HOUSE2), MAP(MAP_LAVENDER_TOWN)}, + [QL_LOCATION_UNDERGROUND_PATH_3] = {MAP(MAP_UNDERGROUND_PATH_EAST_ENTRANCE), MAP(MAP_ROUTE8)}, + [QL_LOCATION_UNDERGROUND_PATH_4] = {MAP(MAP_UNDERGROUND_PATH_WEST_ENTRANCE), MAP(MAP_ROUTE7)}, + [QL_LOCATION_CELADON_DEPT_STORE] = {MAP(MAP_CELADON_CITY_DEPARTMENT_STORE_1F), MAP(MAP_CELADON_CITY)}, + [QL_LOCATION_CELADON_MANSION] = {MAP(MAP_CELADON_CITY_CONDOMINIUMS_1F), MAP(MAP_CELADON_CITY)}, + [QL_LOCATION_GAME_CORNER] = {MAP(MAP_CELADON_CITY_GAME_CORNER), MAP(MAP_CELADON_CITY)}, + [QL_LOCATION_CELADON_GYM] = {MAP(MAP_CELADON_CITY_GYM), MAP(MAP_CELADON_CITY)}, + [QL_LOCATION_CELADON_RESTAURANT] = {MAP(MAP_CELADON_CITY_RESTAURANT), MAP(MAP_CELADON_CITY)}, + [QL_LOCATION_ROCKET_HIDEOUT] = {MAP(MAP_ROCKET_HIDEOUT_B1F), MAP(MAP_CELADON_CITY_GAME_CORNER)}, + [QL_LOCATION_SAFARI_ZONE] = {MAP(MAP_SAFARI_ZONE_CENTER), MAP(MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE)}, + [QL_LOCATION_FUCHSIA_GYM] = {MAP(MAP_FUCHSIA_CITY_GYM), MAP(MAP_FUCHSIA_CITY)}, + [QL_LOCATION_WARDENS_HOME] = {MAP(MAP_FUCHSIA_CITY_WARDENS_HOUSE), MAP(MAP_FUCHSIA_CITY)}, + [QL_LOCATION_FIGHTING_DOJO] = {MAP(MAP_SAFFRON_CITY_DOJO), MAP(MAP_SAFFRON_CITY)}, + [QL_LOCATION_SAFFRON_GYM] = {MAP(MAP_SAFFRON_CITY_GYM), MAP(MAP_SAFFRON_CITY)}, + [QL_LOCATION_SILPH_CO] = {MAP(MAP_SILPH_CO_1F), MAP(MAP_SAFFRON_CITY)}, + [QL_LOCATION_SEAFOAM_ISLANDS_1] = {MAP(MAP_SEAFOAM_ISLANDS_1F), MAP(MAP_ROUTE20)}, + [QL_LOCATION_SEAFOAM_ISLANDS_2] = {MAP(MAP_SEAFOAM_ISLANDS_1F), MAP(MAP_ROUTE20)}, + [QL_LOCATION_PKMN_MANSION] = {MAP(MAP_POKEMON_MANSION_1F), MAP(MAP_CINNABAR_ISLAND)}, + [QL_LOCATION_CINNABAR_GYM] = {MAP(MAP_CINNABAR_ISLAND_GYM), MAP(MAP_CINNABAR_ISLAND)}, + [QL_LOCATION_CINNABAR_LAB] = {MAP(MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE), MAP(MAP_CINNABAR_ISLAND)}, + [QL_LOCATION_VICTORY_ROAD_1] = {MAP(MAP_VICTORY_ROAD_1F), MAP(MAP_ROUTE23)}, + [QL_LOCATION_VICTORY_ROAD_2] = {MAP(MAP_VICTORY_ROAD_2F), MAP(MAP_ROUTE23)}, + [QL_LOCATION_PKMN_LEAGUE] = {MAP(MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F), MAP(MAP_INDIGO_PLATEAU_EXTERIOR)}, + [QL_LOCATION_CERULEAN_CAVE] = {MAP(MAP_CERULEAN_CAVE_1F), MAP(MAP_CERULEAN_CITY)} }; void QuestLog_CheckDepartingIndoorsMap(void) @@ -1894,12 +1894,12 @@ void QuestLog_TryRecordDepartedLocation(void) { if (locationId == QL_LOCATION_VIRIDIAN_FOREST_1) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE) - && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE))) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE) + && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE))) { data.mapSec = MAPSEC_ROUTE_2; - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE)) + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE)) data.locationId = locationId; else data.locationId = locationId + 1; @@ -1910,12 +1910,12 @@ void QuestLog_TryRecordDepartedLocation(void) } else if (locationId == QL_LOCATION_LEAGUE_GATE_1) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE22) && - (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE23))) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_ROUTE22) && + (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE22) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE23))) { data.mapSec = Overworld_GetMapHeaderByGroupAndId(sInsideOutsidePairs[locationId].inside_grp, sInsideOutsidePairs[locationId].inside_num)->regionMapSectionId; - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22)) + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE22)) data.locationId = locationId; else data.locationId = locationId + 1; @@ -2140,7 +2140,7 @@ void DoPokemonLeagueLightingEffect(void) } else { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM)) { data[0] = sChampionRoomLightingTimers[0]; data[2] = 8; @@ -2170,7 +2170,7 @@ static void Task_RunPokemonLeagueLightingEffect(u8 taskId) if (++data[1] == data[2]) data[1] = 0; - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM)) { data[0] = sChampionRoomLightingTimers[data[1]]; LoadPalette(sChampionRoomLightingPalettes[data[1]], BG_PLTT_ID(7), PLTT_SIZE_4BPP); @@ -2189,7 +2189,7 @@ static void Task_CancelPokemonLeagueLightingEffect(u8 taskId) s16 *data = gTasks[taskId].data; if (FlagGet(FLAG_TEMP_4) != FALSE) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM)) LoadPalette(sChampionRoomLightingPalettes[8], BG_PLTT_ID(7), PLTT_SIZE_4BPP); else LoadPalette(sEliteFourLightingPalettes[11], BG_PLTT_ID(7), PLTT_SIZE_4BPP); @@ -2296,8 +2296,8 @@ bool8 HasLearnedAllMovesFromCapeBrinkTutor(void) bool8 CutMoveRuinValleyCheck(void) { if (FlagGet(FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE) != TRUE - && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SIX_ISLAND_RUIN_VALLEY) - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SIX_ISLAND_RUIN_VALLEY) + && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SIX_ISLAND_RUIN_VALLEY) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SIX_ISLAND_RUIN_VALLEY) && gSaveBlock1Ptr->pos.x == 24 && gSaveBlock1Ptr->pos.y == 25 && GetPlayerFacingDirection() == DIR_NORTH @@ -2407,15 +2407,15 @@ static void MoveDeoxysObject(u8 num) u8 mapObjId; LoadPalette(sDeoxysObjectPals[num], OBJ_PLTT_ID(10), PLTT_SIZEOF(4)); ApplyGlobalFieldPaletteTint(10); - TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId); + TryGetObjectEventIdByLocalIdAndMap(LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId); if (num == 0) PlaySE(SE_M_CONFUSE_RAY); else PlaySE(SE_DEOXYS_MOVE); CreateTask(Task_WaitDeoxysFieldEffect, 8); - gFieldEffectArguments[0] = 1; - gFieldEffectArguments[1] = 56; - gFieldEffectArguments[2] = 2; + gFieldEffectArguments[0] = LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK; + gFieldEffectArguments[1] = MAP_NUM(MAP_BIRTH_ISLAND_EXTERIOR); + gFieldEffectArguments[2] = MAP_GROUP(MAP_BIRTH_ISLAND_EXTERIOR); gFieldEffectArguments[3] = sDeoxysCoords[num][0]; gFieldEffectArguments[4] = sDeoxysCoords[num][1]; if (num == 0) @@ -2423,7 +2423,7 @@ static void MoveDeoxysObject(u8 num) else gFieldEffectArguments[5] = 5; FieldEffectStart(FLDEFF_MOVE_DEOXYS_ROCK); - SetObjEventTemplateCoords(1, sDeoxysCoords[num][0], sDeoxysCoords[num][1]); + SetObjEventTemplateCoords(LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK, sDeoxysCoords[num][0], sDeoxysCoords[num][1]); } static void Task_WaitDeoxysFieldEffect(u8 taskId) @@ -2438,7 +2438,7 @@ static void Task_WaitDeoxysFieldEffect(u8 taskId) void IncrementBirthIslandRockStepCount(void) { u16 count = VarGet(VAR_DEOXYS_INTERACTION_STEP_COUNTER); - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BIRTH_ISLAND_EXTERIOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BIRTH_ISLAND_EXTERIOR)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_BIRTH_ISLAND_EXTERIOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_BIRTH_ISLAND_EXTERIOR)) { count++; if (count > 99) @@ -2469,7 +2469,7 @@ bool8 IsBadEggInParty(void) bool8 IsPlayerNotInTrainerTowerLobby(void) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_LOBBY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_LOBBY)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_TRAINER_TOWER_LOBBY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_LOBBY)) return FALSE; else return TRUE; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 8b4ec8763..05c7d7538 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -701,7 +701,7 @@ static void SetWarpsToRollCredits(void) VarSet(VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1); FlagSet(FLAG_DONT_SHOW_MAP_NAME_POPUP); gDisableMapMusicChangeOnMapLoad = 2; - SetWarpDestination(MAP_GROUP(INDIGO_PLATEAU_EXTERIOR), MAP_NUM(INDIGO_PLATEAU_EXTERIOR), -1, 11, 6); + SetWarpDestination(MAP_GROUP(MAP_INDIGO_PLATEAU_EXTERIOR), MAP_NUM(MAP_INDIGO_PLATEAU_EXTERIOR), -1, 11, 6); DoWarp(); ResetInitialPlayerAvatarState(); } diff --git a/src/heal_location.c b/src/heal_location.c index 75a826a4a..80700d49a 100644 --- a/src/heal_location.c +++ b/src/heal_location.c @@ -2,13 +2,14 @@ #include "heal_location.h" #include "event_data.h" #include "constants/maps.h" +#include "constants/map_event_ids.h" #include "constants/heal_locations.h" static void SetWhiteoutRespawnHealerNpcAsLastTalked(u32 healLocationIdx); -// Arrays described here because porymap will overrwrite the below data file +// Arrays described here because mapjson will overrwrite the below data file -// sSpawnPoints +// sHealLocations // This array defines the fly points for unlocked spawns. // sWhiteoutRespawnHealCenterMapIdxs @@ -30,32 +31,32 @@ static u32 GetHealLocationIndexFromMapGroupAndNum(u16 mapGroup, u16 mapNum) { u32 i; - for (i = 0; i < NELEMS(sSpawnPoints); i++) { - if (sSpawnPoints[i].group == mapGroup && sSpawnPoints[i].map == mapNum) + for (i = 0; i < ARRAY_COUNT(sHealLocations); i++) { + if (sHealLocations[i].mapGroup == mapGroup && sHealLocations[i].mapNum == mapNum) { return i + 1; } } - return 0; + return HEAL_LOCATION_NONE; } static const struct HealLocation * GetHealLocationPointerFromMapGroupAndNum(u16 mapGroup, u16 mapNum) { u32 i = GetHealLocationIndexFromMapGroupAndNum(mapGroup, mapNum); - if (i == 0) + if (i == HEAL_LOCATION_NONE) return NULL; - return &sSpawnPoints[i - 1]; + return &sHealLocations[i - 1]; } const struct HealLocation * GetHealLocation(u32 idx) { - if (idx == 0) + if (idx == HEAL_LOCATION_NONE) return NULL; - if (idx > NELEMS(sSpawnPoints)) + if (idx > ARRAY_COUNT(sHealLocations)) return NULL; - return &sSpawnPoints[idx - 1]; + return &sHealLocations[idx - 1]; } void SetWhiteoutRespawnWarpAndHealerNpc(struct WarpData * warp) @@ -69,33 +70,38 @@ void SetWhiteoutRespawnWarpAndHealerNpc(struct WarpData * warp) gSpecialVar_LastTalked = 1; warp->x = 4; warp->y = 11; - warp->mapGroup = MAP_GROUP(TRAINER_TOWER_LOBBY); - warp->mapNum = MAP_NUM(TRAINER_TOWER_LOBBY); + warp->mapGroup = MAP_GROUP(MAP_TRAINER_TOWER_LOBBY); + warp->mapNum = MAP_NUM(MAP_TRAINER_TOWER_LOBBY); warp->warpId = 0xFF; } else { healLocationIdx = GetHealLocationIndexFromMapGroupAndNum(gSaveBlock1Ptr->lastHealLocation.mapGroup, gSaveBlock1Ptr->lastHealLocation.mapNum); +#ifdef BUGFIX + // Avoid out of bounds read + if (healLocationIdx == HEAL_LOCATION_NONE) + return; +#endif warp->mapGroup = sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0]; warp->mapNum = sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1]; - warp->warpId = 0xFF; + warp->warpId = WARP_ID_NONE; - if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_1F)) + if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F)) { warp->x = 8; warp->y = 5; } - else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(INDIGO_PLATEAU_POKEMON_CENTER_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(INDIGO_PLATEAU_POKEMON_CENTER_1F)) + else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F)) { warp->x = 13; warp->y = 12; } - else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(ONE_ISLAND_POKEMON_CENTER_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(ONE_ISLAND_POKEMON_CENTER_1F)) + else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(MAP_ONE_ISLAND_POKEMON_CENTER_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(MAP_ONE_ISLAND_POKEMON_CENTER_1F)) { warp->x = 5; warp->y = 4; } - else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(TRAINER_TOWER_LOBBY) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(TRAINER_TOWER_LOBBY)) + else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(MAP_TRAINER_TOWER_LOBBY) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(MAP_TRAINER_TOWER_LOBBY)) { warp->x = 4; warp->y = 11; diff --git a/src/help_system.c b/src/help_system.c index 5f57730ce..00756538e 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -1743,22 +1743,22 @@ static const u16 sGymMaps[] = { }; static const u8 sDungeonMaps[][3] = { - { MAP_GROUP(VIRIDIAN_FOREST), MAP_NUM(VIRIDIAN_FOREST), 1 }, - { MAP_GROUP(MT_MOON_1F), MAP_NUM(MT_MOON_1F), 3 }, - { MAP_GROUP(ROCK_TUNNEL_1F), MAP_NUM(ROCK_TUNNEL_1F), 2 }, - { MAP_GROUP(DIGLETTS_CAVE_NORTH_ENTRANCE), MAP_NUM(DIGLETTS_CAVE_NORTH_ENTRANCE), 3 }, - { MAP_GROUP(SEAFOAM_ISLANDS_1F), MAP_NUM(SEAFOAM_ISLANDS_1F), 5 }, - { MAP_GROUP(VICTORY_ROAD_1F), MAP_NUM(VICTORY_ROAD_1F), 3 }, - { MAP_GROUP(CERULEAN_CAVE_1F), MAP_NUM(CERULEAN_CAVE_1F), 3 }, - { MAP_GROUP(MT_EMBER_RUBY_PATH_B4F), MAP_NUM(MT_EMBER_RUBY_PATH_B4F), 1 }, - { MAP_GROUP(MT_EMBER_SUMMIT_PATH_1F), MAP_NUM(MT_EMBER_SUMMIT_PATH_1F), 3 }, - { MAP_GROUP(MT_EMBER_RUBY_PATH_B5F), MAP_NUM(MT_EMBER_RUBY_PATH_B5F), 7 }, - { MAP_GROUP(THREE_ISLAND_BERRY_FOREST), MAP_NUM(THREE_ISLAND_BERRY_FOREST), 1 }, - { MAP_GROUP(SIX_ISLAND_PATTERN_BUSH), MAP_NUM(SIX_ISLAND_PATTERN_BUSH), 1 }, - { MAP_GROUP(FIVE_ISLAND_LOST_CAVE_ENTRANCE), MAP_NUM(FIVE_ISLAND_LOST_CAVE_ENTRANCE), 15 }, - { MAP_GROUP(FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE), MAP_NUM(FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE), 4 }, - { MAP_GROUP(SIX_ISLAND_ALTERING_CAVE), MAP_NUM(SIX_ISLAND_ALTERING_CAVE), 1 }, - { MAP_GROUP(SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER), MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER), 7 } + { MAP_GROUP(MAP_VIRIDIAN_FOREST), MAP_NUM(MAP_VIRIDIAN_FOREST), 1 }, + { MAP_GROUP(MAP_MT_MOON_1F), MAP_NUM(MAP_MT_MOON_1F), 3 }, + { MAP_GROUP(MAP_ROCK_TUNNEL_1F), MAP_NUM(MAP_ROCK_TUNNEL_1F), 2 }, + { MAP_GROUP(MAP_DIGLETTS_CAVE_NORTH_ENTRANCE), MAP_NUM(MAP_DIGLETTS_CAVE_NORTH_ENTRANCE), 3 }, + { MAP_GROUP(MAP_SEAFOAM_ISLANDS_1F), MAP_NUM(MAP_SEAFOAM_ISLANDS_1F), 5 }, + { MAP_GROUP(MAP_VICTORY_ROAD_1F), MAP_NUM(MAP_VICTORY_ROAD_1F), 3 }, + { MAP_GROUP(MAP_CERULEAN_CAVE_1F), MAP_NUM(MAP_CERULEAN_CAVE_1F), 3 }, + { MAP_GROUP(MAP_MT_EMBER_RUBY_PATH_B4F), MAP_NUM(MAP_MT_EMBER_RUBY_PATH_B4F), 1 }, + { MAP_GROUP(MAP_MT_EMBER_SUMMIT_PATH_1F), MAP_NUM(MAP_MT_EMBER_SUMMIT_PATH_1F), 3 }, + { MAP_GROUP(MAP_MT_EMBER_RUBY_PATH_B5F), MAP_NUM(MAP_MT_EMBER_RUBY_PATH_B5F), 7 }, + { MAP_GROUP(MAP_THREE_ISLAND_BERRY_FOREST), MAP_NUM(MAP_THREE_ISLAND_BERRY_FOREST), 1 }, + { MAP_GROUP(MAP_SIX_ISLAND_PATTERN_BUSH), MAP_NUM(MAP_SIX_ISLAND_PATTERN_BUSH), 1 }, + { MAP_GROUP(MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE), MAP_NUM(MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE), 15 }, + { MAP_GROUP(MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE), MAP_NUM(MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE), 4 }, + { MAP_GROUP(MAP_SIX_ISLAND_ALTERING_CAVE), MAP_NUM(MAP_SIX_ISLAND_ALTERING_CAVE), 1 }, + { MAP_GROUP(MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER), MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER), 7 } }; void SetHelpContextDontCheckBattle(u8 contextId) @@ -1847,14 +1847,14 @@ static bool8 IsInDungeonMap(void) } #define IN_PLAYERS_HOUSE \ - ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_1F) \ - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_1F)) \ - || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_2F) \ - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_2F))) \ + ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F) \ + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F)) \ + || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_PALLET_TOWN_PLAYERS_HOUSE_2F) \ + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN_PLAYERS_HOUSE_2F))) \ #define IN_OAKS_LAB \ - (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_PROFESSOR_OAKS_LAB) \ - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_PROFESSOR_OAKS_LAB)) \ + (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB) \ + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB)) \ void SetHelpContextForMap(void) { diff --git a/src/item.c b/src/item.c index 656968370..0587adf7d 100644 --- a/src/item.c +++ b/src/item.c @@ -589,7 +589,7 @@ void TrySetObtainedItemQuestLogEvent(u16 itemId) || itemId == ITEM_RUBY || itemId == ITEM_SAPPHIRE) { - if (itemId != ITEM_TOWN_MAP || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_RIVALS_HOUSE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_RIVALS_HOUSE))) + if (itemId != ITEM_TOWN_MAP || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_PALLET_TOWN_RIVALS_HOUSE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN_RIVALS_HOUSE))) { struct QuestLogEvent_StoryItem * data = malloc(sizeof(*data)); data->itemId = itemId; diff --git a/src/item_use.c b/src/item_use.c index f42eb81f7..954f4821d 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -714,11 +714,11 @@ void FieldUseFunc_VsSeeker(u8 taskId) if ((gMapHeader.mapType != MAP_TYPE_ROUTE && gMapHeader.mapType != MAP_TYPE_TOWN && gMapHeader.mapType != MAP_TYPE_CITY) - || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(VIRIDIAN_FOREST) - && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(VIRIDIAN_FOREST) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MT_EMBER_EXTERIOR) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(THREE_ISLAND_BERRY_FOREST) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SIX_ISLAND_PATTERN_BUSH)))) + || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_VIRIDIAN_FOREST) + && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_VIRIDIAN_FOREST) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_MT_EMBER_EXTERIOR) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_THREE_ISLAND_BERRY_FOREST) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SIX_ISLAND_PATTERN_BUSH)))) { PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]); } diff --git a/src/menu_helpers.c b/src/menu_helpers.c index afa850af6..584e94eaa 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -95,8 +95,8 @@ bool8 IsHoldingItemAllowed(u16 itemId) { // Enigma Berry can't be held in link areas if (itemId == ITEM_ENIGMA_BERRY - && ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRADE_CENTER) - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRADE_CENTER)) + && ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_TRADE_CENTER) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRADE_CENTER)) || InUnionRoom() == TRUE)) return FALSE; else diff --git a/src/new_game.c b/src/new_game.c index ab5fa9958..3768b3ccb 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -81,7 +81,7 @@ static void ClearBattleTower(void) static void WarpToPlayersRoom(void) { - SetWarpDestination(MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_2F), MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_2F), -1, 6, 6); + SetWarpDestination(MAP_GROUP(MAP_PALLET_TOWN_PLAYERS_HOUSE_2F), MAP_NUM(MAP_PALLET_TOWN_PLAYERS_HOUSE_2F), -1, 6, 6); WarpIntoMap(); } diff --git a/src/overworld.c b/src/overworld.c index c52a8edd2..1b81b360c 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -493,8 +493,8 @@ static const struct MapLayout *GetMapLayout(void) // Routines related to warps static const struct WarpData sDummyWarpData = { - .mapGroup = MAP_GROUP(UNDEFINED), - .mapNum = MAP_NUM(UNDEFINED), + .mapGroup = MAP_GROUP(MAP_UNDEFINED), + .mapNum = MAP_NUM(MAP_UNDEFINED), .warpId = 0xFF, .x = -1, .y = -1 @@ -519,9 +519,9 @@ static void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId static bool32 IsDummyWarp(struct WarpData *warp) { - if (warp->mapGroup != (s8)MAP_GROUP(UNDEFINED)) + if (warp->mapGroup != (s8)MAP_GROUP(MAP_UNDEFINED)) return FALSE; - else if (warp->mapNum != (s8)MAP_NUM(UNDEFINED)) + else if (warp->mapNum != (s8)MAP_NUM(MAP_UNDEFINED)) return FALSE; else if (warp->warpId != -1) return FALSE; @@ -611,7 +611,7 @@ void SetWarpDestinationToHealLocation(u8 healLocationId) { const struct HealLocation *warp = GetHealLocation(healLocationId); if (warp) - SetWarpDestination(warp->group, warp->map, -1, warp->x, warp->y); + SetWarpDestination(warp->mapGroup, warp->mapNum, -1, warp->x, warp->y); } void SetWarpDestinationToLastHealLocation(void) @@ -628,7 +628,7 @@ void SetLastHealLocationWarp(u8 healLocationId) { const struct HealLocation *healLocation = GetHealLocation(healLocationId); if (healLocation) - SetWarpData(&gSaveBlock1Ptr->lastHealLocation, healLocation->group, healLocation->map, -1, healLocation->x, healLocation->y); + SetWarpData(&gSaveBlock1Ptr->lastHealLocation, healLocation->mapGroup, healLocation->mapNum, -1, healLocation->x, healLocation->y); } void UpdateEscapeWarp(s16 x, s16 y) @@ -636,7 +636,7 @@ void UpdateEscapeWarp(s16 x, s16 y) u8 currMapType = GetCurrentMapType(); u8 destMapType = GetMapTypeByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum); u8 delta; - if (IsMapTypeOutdoors(currMapType) && IsMapTypeOutdoors(destMapType) != TRUE && !(gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(VIRIDIAN_FOREST) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(VIRIDIAN_FOREST))) + if (IsMapTypeOutdoors(currMapType) && IsMapTypeOutdoors(destMapType) != TRUE && !(gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_VIRIDIAN_FOREST) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_VIRIDIAN_FOREST))) { delta = GetPlayerFacingDirection() != DIR_SOUTH; SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x - 7, y - 7 + delta); @@ -690,7 +690,7 @@ void SetContinueGameWarpToHealLocation(u8 healLocationId) { const struct HealLocation *warp = GetHealLocation(healLocationId); if (warp) - SetWarpData(&gSaveBlock1Ptr->continueGameWarp, warp->group, warp->map, -1, warp->x, warp->y); + SetWarpData(&gSaveBlock1Ptr->continueGameWarp, warp->mapGroup, warp->mapNum, -1, warp->x, warp->y); } void SetContinueGameWarpToDynamicWarp(int unused) @@ -894,10 +894,10 @@ bool8 MetatileBehavior_IsSurfableInSeafoamIslands(u16 metatileBehavior) { if (MetatileBehavior_IsSurfable(metatileBehavior) != TRUE) return FALSE; - if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEAFOAM_ISLANDS_B3F) - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEAFOAM_ISLANDS_B3F)) - || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEAFOAM_ISLANDS_B4F) - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEAFOAM_ISLANDS_B4F))) + if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SEAFOAM_ISLANDS_B3F) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEAFOAM_ISLANDS_B3F)) + || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SEAFOAM_ISLANDS_B4F) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEAFOAM_ISLANDS_B4F))) return TRUE; return FALSE; } @@ -1019,7 +1019,7 @@ void Overworld_PlaySpecialMapMusic(void) if (gDisableMapMusicChangeOnMapLoad == MUSIC_DISABLE_KEEP) return; - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM)) { PlayerGetDestCoords(&x, &y); if (y - 7 < 11 && gMPlayInfo_BGM.songHeader == &mus_victory_gym_leader) diff --git a/src/party_menu.c b/src/party_menu.c index 87a1dd4dc..7f3a881e6 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -4087,9 +4087,9 @@ static void DisplayCantUseSurfMessage(void) GetXYCoordsOneStepInFrontOfPlayer(&x, &y); if (MetatileBehavior_IsFastWater(MapGridGetMetatileBehaviorAt(x, y)) == TRUE) DisplayPartyMenuStdMessage(PARTY_MSG_CURRENT_TOO_FAST); - else if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE17)) - && ((gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE17)) - || (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE18)))) + else if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_ROUTE17)) + && ((gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE17)) + || (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE18)))) DisplayPartyMenuStdMessage(PARTY_MSG_ENJOY_CYCLING); else DisplayPartyMenuStdMessage(PARTY_MSG_CANT_SURF_HERE); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 2ff2483b1..b3e3c7763 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -5212,7 +5212,7 @@ static bool32 CurrentMonIsFromGBA(void) static bool32 MapSecIsInKantoOrSevii(u8 mapSec) { - if (mapSec >= MAPSECS_KANTO && mapSec < MAPSEC_NONE) + if (mapSec >= KANTO_MAPSEC_START && mapSec < MAPSEC_NONE) return TRUE; return FALSE; } diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index ae61d68a6..cab6d3afe 100644 --- a/src/post_battle_event_funcs.c +++ b/src/post_battle_event_funcs.c @@ -28,7 +28,7 @@ bool8 EnterHallOfFame(void) SetGameStat(GAME_STAT_FIRST_HOF_PLAY_TIME, (gSaveBlock2Ptr->playTimeHours << 16) | (gSaveBlock2Ptr->playTimeMinutes << 8) | gSaveBlock2Ptr->playTimeSeconds); } SetContinueGameWarpStatus(); - SetContinueGameWarpToHealLocation(SPAWN_PALLET_TOWN); + SetContinueGameWarpToHealLocation(HEAL_LOCATION_PALLET_TOWN); gaveAtLeastOneRibbon = FALSE; for (i = 0, r7 = &ribbonState; i < PARTY_SIZE; i++) { diff --git a/src/quest_log.c b/src/quest_log.c index 53de75e81..0a2f76f2c 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -472,8 +472,8 @@ void TryStartQuestLogPlayback(u8 taskId) static void Task_BeginQuestLogPlayback(u8 taskId) { - gSaveBlock1Ptr->location.mapGroup = MAP_GROUP(ROUTE1); - gSaveBlock1Ptr->location.mapNum = MAP_NUM(ROUTE1); + gSaveBlock1Ptr->location.mapGroup = MAP_GROUP(MAP_ROUTE1); + gSaveBlock1Ptr->location.mapNum = MAP_NUM(MAP_ROUTE1); gSaveBlock1Ptr->location.warpId = WARP_ID_NONE; sCurrentSceneNum = 0; gDisableMapMusicChangeOnMapLoad = 1; @@ -1340,7 +1340,7 @@ void SaveQuestLogData(void) void QL_UpdateObject(struct Sprite *sprite) { struct ObjectEvent *objectEvent = &gObjectEvents[sprite->data[0]]; - if (objectEvent->localId == OBJ_EVENT_ID_PLAYER) + if (objectEvent->localId == LOCALID_PLAYER) { if (sMovementScripts[0][0] != MOVEMENT_ACTION_NONE) { diff --git a/src/quest_log_events.c b/src/quest_log_events.c index 87abb45c5..7714d887a 100644 --- a/src/quest_log_events.c +++ b/src/quest_log_events.c @@ -551,36 +551,36 @@ void SetQuestLogEvent(u16 eventId, const u16 * data) static bool8 InQuestLogDisabledLocation(void) { // In Trainer Tower - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_1F) - && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_1F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_2F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_3F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_4F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_5F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_6F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_7F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_8F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ROOF) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_LOBBY) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ELEVATOR))) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_TRAINER_TOWER_1F) + && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_1F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_2F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_3F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_4F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_5F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_6F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_7F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_8F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_ROOF) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_LOBBY) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_ELEVATOR))) return TRUE; // In pokemon trainer fan club - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB) - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB)) return TRUE; // In E-Reader house - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEVEN_ISLAND_HOUSE_ROOM1) && - (gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_HOUSE_ROOM1) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_HOUSE_ROOM2))) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SEVEN_ISLAND_HOUSE_ROOM1) && + (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_HOUSE_ROOM1) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_HOUSE_ROOM2))) return TRUE; // In elevator - if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROCKET_HIDEOUT_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROCKET_HIDEOUT_ELEVATOR)) - || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SILPH_CO_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SILPH_CO_ELEVATOR)) - || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ELEVATOR)) - || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(CELADON_CITY_DEPARTMENT_STORE_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_ELEVATOR))) + if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_ROCKET_HIDEOUT_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROCKET_HIDEOUT_ELEVATOR)) + || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SILPH_CO_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SILPH_CO_ELEVATOR)) + || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_TRAINER_TOWER_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_ELEVATOR)) + || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR))) return TRUE; return FALSE; diff --git a/src/region_map.c b/src/region_map.c index 912d76145..baa0d45a3 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -826,114 +826,114 @@ static const u8 sTextColors[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_CO #include "data/region_map/region_map_layout_sevii_67.h" static const u8 sMapFlyDestinations[][3] = { - [MAPSEC_PALLET_TOWN - MAPSECS_KANTO] = {MAP(PALLET_TOWN), SPAWN_PALLET_TOWN}, - [MAPSEC_VIRIDIAN_CITY - MAPSECS_KANTO] = {MAP(VIRIDIAN_CITY), SPAWN_VIRIDIAN_CITY}, - [MAPSEC_PEWTER_CITY - MAPSECS_KANTO] = {MAP(PEWTER_CITY), SPAWN_PEWTER_CITY}, - [MAPSEC_CERULEAN_CITY - MAPSECS_KANTO] = {MAP(CERULEAN_CITY), SPAWN_CERULEAN_CITY}, - [MAPSEC_LAVENDER_TOWN - MAPSECS_KANTO] = {MAP(LAVENDER_TOWN), SPAWN_LAVENDER_TOWN}, - [MAPSEC_VERMILION_CITY - MAPSECS_KANTO] = {MAP(VERMILION_CITY), SPAWN_VERMILION_CITY}, - [MAPSEC_CELADON_CITY - MAPSECS_KANTO] = {MAP(CELADON_CITY), SPAWN_CELADON_CITY}, - [MAPSEC_FUCHSIA_CITY - MAPSECS_KANTO] = {MAP(FUCHSIA_CITY), SPAWN_FUCHSIA_CITY}, - [MAPSEC_CINNABAR_ISLAND - MAPSECS_KANTO] = {MAP(CINNABAR_ISLAND), SPAWN_CINNABAR_ISLAND}, - [MAPSEC_INDIGO_PLATEAU - MAPSECS_KANTO] = {MAP(INDIGO_PLATEAU_EXTERIOR), SPAWN_INDIGO_PLATEAU}, - [MAPSEC_SAFFRON_CITY - MAPSECS_KANTO] = {MAP(SAFFRON_CITY), SPAWN_SAFFRON_CITY}, - [MAPSEC_ROUTE_4_POKECENTER - MAPSECS_KANTO] = {MAP(ROUTE4), SPAWN_ROUTE4}, - [MAPSEC_ROUTE_10_POKECENTER - MAPSECS_KANTO] = {MAP(ROUTE10), SPAWN_ROUTE10}, - [MAPSEC_ROUTE_1 - MAPSECS_KANTO] = {MAP(ROUTE1), 0}, - [MAPSEC_ROUTE_2 - MAPSECS_KANTO] = {MAP(ROUTE2), 0}, - [MAPSEC_ROUTE_3 - MAPSECS_KANTO] = {MAP(ROUTE3), 0}, - [MAPSEC_ROUTE_4 - MAPSECS_KANTO] = {MAP(ROUTE4), 0}, - [MAPSEC_ROUTE_5 - MAPSECS_KANTO] = {MAP(ROUTE5), 0}, - [MAPSEC_ROUTE_6 - MAPSECS_KANTO] = {MAP(ROUTE6), 0}, - [MAPSEC_ROUTE_7 - MAPSECS_KANTO] = {MAP(ROUTE7), 0}, - [MAPSEC_ROUTE_8 - MAPSECS_KANTO] = {MAP(ROUTE8), 0}, - [MAPSEC_ROUTE_9 - MAPSECS_KANTO] = {MAP(ROUTE9), 0}, - [MAPSEC_ROUTE_10 - MAPSECS_KANTO] = {MAP(ROUTE10), 0}, - [MAPSEC_ROUTE_11 - MAPSECS_KANTO] = {MAP(ROUTE11), 0}, - [MAPSEC_ROUTE_12 - MAPSECS_KANTO] = {MAP(ROUTE12), 0}, - [MAPSEC_ROUTE_13 - MAPSECS_KANTO] = {MAP(ROUTE13), 0}, - [MAPSEC_ROUTE_14 - MAPSECS_KANTO] = {MAP(ROUTE14), 0}, - [MAPSEC_ROUTE_15 - MAPSECS_KANTO] = {MAP(ROUTE15), 0}, - [MAPSEC_ROUTE_16 - MAPSECS_KANTO] = {MAP(ROUTE16), 0}, - [MAPSEC_ROUTE_17 - MAPSECS_KANTO] = {MAP(ROUTE17), 0}, - [MAPSEC_ROUTE_18 - MAPSECS_KANTO] = {MAP(ROUTE18), 0}, - [MAPSEC_ROUTE_19 - MAPSECS_KANTO] = {MAP(ROUTE19), 0}, - [MAPSEC_ROUTE_20 - MAPSECS_KANTO] = {MAP(ROUTE20), 0}, - [MAPSEC_ROUTE_21 - MAPSECS_KANTO] = {MAP(ROUTE21_NORTH), 0}, - [MAPSEC_ROUTE_22 - MAPSECS_KANTO] = {MAP(ROUTE22), 0}, - [MAPSEC_ROUTE_23 - MAPSECS_KANTO] = {MAP(ROUTE23), 0}, - [MAPSEC_ROUTE_24 - MAPSECS_KANTO] = {MAP(ROUTE24), 0}, - [MAPSEC_ROUTE_25 - MAPSECS_KANTO] = {MAP(ROUTE25), 0}, - [MAPSEC_VIRIDIAN_FOREST - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_MT_MOON - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_S_S_ANNE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_UNDERGROUND_PATH - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_UNDERGROUND_PATH_2 - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_DIGLETTS_CAVE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_KANTO_VICTORY_ROAD - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_ROCKET_HIDEOUT - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_SILPH_CO - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_POKEMON_MANSION - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_KANTO_SAFARI_ZONE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_POKEMON_LEAGUE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_ROCK_TUNNEL - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_SEAFOAM_ISLANDS - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_POKEMON_TOWER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_CERULEAN_CAVE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_POWER_PLANT - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_ONE_ISLAND - MAPSECS_KANTO] = {MAP(ONE_ISLAND), SPAWN_ONE_ISLAND}, - [MAPSEC_TWO_ISLAND - MAPSECS_KANTO] = {MAP(TWO_ISLAND), SPAWN_TWO_ISLAND}, - [MAPSEC_THREE_ISLAND - MAPSECS_KANTO] = {MAP(THREE_ISLAND), SPAWN_THREE_ISLAND}, - [MAPSEC_FOUR_ISLAND - MAPSECS_KANTO] = {MAP(FOUR_ISLAND), SPAWN_FOUR_ISLAND}, - [MAPSEC_FIVE_ISLAND - MAPSECS_KANTO] = {MAP(FIVE_ISLAND), SPAWN_FIVE_ISLAND}, - [MAPSEC_SEVEN_ISLAND - MAPSECS_KANTO] = {MAP(SEVEN_ISLAND), SPAWN_SEVEN_ISLAND}, - [MAPSEC_SIX_ISLAND - MAPSECS_KANTO] = {MAP(SIX_ISLAND), SPAWN_SIX_ISLAND}, - [MAPSEC_KINDLE_ROAD - MAPSECS_KANTO] = {MAP(ONE_ISLAND_KINDLE_ROAD), 0}, - [MAPSEC_TREASURE_BEACH - MAPSECS_KANTO] = {MAP(ONE_ISLAND_TREASURE_BEACH), 0}, - [MAPSEC_CAPE_BRINK - MAPSECS_KANTO] = {MAP(TWO_ISLAND_CAPE_BRINK), 0}, - [MAPSEC_BOND_BRIDGE - MAPSECS_KANTO] = {MAP(THREE_ISLAND_BOND_BRIDGE), 0}, - [MAPSEC_THREE_ISLE_PORT - MAPSECS_KANTO] = {MAP(THREE_ISLAND_PORT), 0}, - [MAPSEC_SEVII_ISLE_6 - MAPSECS_KANTO] = {MAP(PROTOTYPE_SEVII_ISLE_6), 0}, - [MAPSEC_SEVII_ISLE_7 - MAPSECS_KANTO] = {MAP(PROTOTYPE_SEVII_ISLE_7), 0}, - [MAPSEC_SEVII_ISLE_8 - MAPSECS_KANTO] = {MAP(PROTOTYPE_SEVII_ISLE_8), 0}, - [MAPSEC_SEVII_ISLE_9 - MAPSECS_KANTO] = {MAP(PROTOTYPE_SEVII_ISLE_9), 0}, - [MAPSEC_RESORT_GORGEOUS - MAPSECS_KANTO] = {MAP(FIVE_ISLAND_RESORT_GORGEOUS), 0}, - [MAPSEC_WATER_LABYRINTH - MAPSECS_KANTO] = {MAP(FIVE_ISLAND_WATER_LABYRINTH), 0}, - [MAPSEC_FIVE_ISLE_MEADOW - MAPSECS_KANTO] = {MAP(FIVE_ISLAND_MEADOW), 0}, - [MAPSEC_MEMORIAL_PILLAR - MAPSECS_KANTO] = {MAP(FIVE_ISLAND_MEMORIAL_PILLAR), 0}, - [MAPSEC_OUTCAST_ISLAND - MAPSECS_KANTO] = {MAP(SIX_ISLAND_OUTCAST_ISLAND), 0}, - [MAPSEC_GREEN_PATH - MAPSECS_KANTO] = {MAP(SIX_ISLAND_GREEN_PATH), 0}, - [MAPSEC_WATER_PATH - MAPSECS_KANTO] = {MAP(SIX_ISLAND_WATER_PATH), 0}, - [MAPSEC_RUIN_VALLEY - MAPSECS_KANTO] = {MAP(SIX_ISLAND_RUIN_VALLEY), 0}, - [MAPSEC_TRAINER_TOWER - MAPSECS_KANTO] = {MAP(SEVEN_ISLAND_TRAINER_TOWER), 0}, - [MAPSEC_CANYON_ENTRANCE - MAPSECS_KANTO] = {MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE), 0}, - [MAPSEC_SEVAULT_CANYON - MAPSECS_KANTO] = {MAP(SEVEN_ISLAND_SEVAULT_CANYON), 0}, - [MAPSEC_TANOBY_RUINS - MAPSECS_KANTO] = {MAP(SEVEN_ISLAND_TANOBY_RUINS), 0}, - [MAPSEC_SEVII_ISLE_22 - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_SEVII_ISLE_23 - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_SEVII_ISLE_24 - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_NAVEL_ROCK - MAPSECS_KANTO] = {MAP(NAVEL_ROCK_EXTERIOR), 0}, - [MAPSEC_MT_EMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_BERRY_FOREST - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_ICEFALL_CAVE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_ROCKET_WAREHOUSE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_TRAINER_TOWER_2 - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_DOTTED_HOLE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_LOST_CAVE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_PATTERN_BUSH - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_ALTERING_CAVE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_TANOBY_CHAMBERS - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_THREE_ISLE_PATH - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_TANOBY_KEY - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_BIRTH_ISLAND - MAPSECS_KANTO] = {MAP(BIRTH_ISLAND_EXTERIOR), 0}, - [MAPSEC_MONEAN_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_LIPTOO_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_WEEPTH_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_DILFORD_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_SCUFIB_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_RIXY_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_VIAPOIS_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, - [MAPSEC_EMBER_SPA - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, + [MAPSEC_PALLET_TOWN - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_PALLET_TOWN}, + [MAPSEC_VIRIDIAN_CITY - KANTO_MAPSEC_START] = {MAP(MAP_VIRIDIAN_CITY), HEAL_LOCATION_VIRIDIAN_CITY}, + [MAPSEC_PEWTER_CITY - KANTO_MAPSEC_START] = {MAP(MAP_PEWTER_CITY), HEAL_LOCATION_PEWTER_CITY}, + [MAPSEC_CERULEAN_CITY - KANTO_MAPSEC_START] = {MAP(MAP_CERULEAN_CITY), HEAL_LOCATION_CERULEAN_CITY}, + [MAPSEC_LAVENDER_TOWN - KANTO_MAPSEC_START] = {MAP(MAP_LAVENDER_TOWN), HEAL_LOCATION_LAVENDER_TOWN}, + [MAPSEC_VERMILION_CITY - KANTO_MAPSEC_START] = {MAP(MAP_VERMILION_CITY), HEAL_LOCATION_VERMILION_CITY}, + [MAPSEC_CELADON_CITY - KANTO_MAPSEC_START] = {MAP(MAP_CELADON_CITY), HEAL_LOCATION_CELADON_CITY}, + [MAPSEC_FUCHSIA_CITY - KANTO_MAPSEC_START] = {MAP(MAP_FUCHSIA_CITY), HEAL_LOCATION_FUCHSIA_CITY}, + [MAPSEC_CINNABAR_ISLAND - KANTO_MAPSEC_START] = {MAP(MAP_CINNABAR_ISLAND), HEAL_LOCATION_CINNABAR_ISLAND}, + [MAPSEC_INDIGO_PLATEAU - KANTO_MAPSEC_START] = {MAP(MAP_INDIGO_PLATEAU_EXTERIOR), HEAL_LOCATION_INDIGO_PLATEAU}, + [MAPSEC_SAFFRON_CITY - KANTO_MAPSEC_START] = {MAP(MAP_SAFFRON_CITY), HEAL_LOCATION_SAFFRON_CITY}, + [MAPSEC_ROUTE_4_POKECENTER - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE4), HEAL_LOCATION_ROUTE4}, + [MAPSEC_ROUTE_10_POKECENTER - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE10), HEAL_LOCATION_ROUTE10}, + [MAPSEC_ROUTE_1 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE1), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_2 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE2), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_3 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE3), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_4 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE4), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_5 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE5), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_6 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE6), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_7 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE7), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_8 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE8), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_9 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE9), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_10 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE10), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_11 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE11), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_12 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE12), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_13 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE13), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_14 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE14), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_15 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE15), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_16 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE16), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_17 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE17), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_18 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE18), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_19 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE19), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_20 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE20), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_21 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE21_NORTH), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_22 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE22), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_23 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE23), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_24 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE24), HEAL_LOCATION_NONE}, + [MAPSEC_ROUTE_25 - KANTO_MAPSEC_START] = {MAP(MAP_ROUTE25), HEAL_LOCATION_NONE}, + [MAPSEC_VIRIDIAN_FOREST - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_MT_MOON - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_S_S_ANNE - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_UNDERGROUND_PATH - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_UNDERGROUND_PATH_2 - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_DIGLETTS_CAVE - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_KANTO_VICTORY_ROAD - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_ROCKET_HIDEOUT - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_SILPH_CO - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_POKEMON_MANSION - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_KANTO_SAFARI_ZONE - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_POKEMON_LEAGUE - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_ROCK_TUNNEL - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_SEAFOAM_ISLANDS - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_POKEMON_TOWER - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_CERULEAN_CAVE - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_POWER_PLANT - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_ONE_ISLAND - KANTO_MAPSEC_START] = {MAP(MAP_ONE_ISLAND), HEAL_LOCATION_ONE_ISLAND}, + [MAPSEC_TWO_ISLAND - KANTO_MAPSEC_START] = {MAP(MAP_TWO_ISLAND), HEAL_LOCATION_TWO_ISLAND}, + [MAPSEC_THREE_ISLAND - KANTO_MAPSEC_START] = {MAP(MAP_THREE_ISLAND), HEAL_LOCATION_THREE_ISLAND}, + [MAPSEC_FOUR_ISLAND - KANTO_MAPSEC_START] = {MAP(MAP_FOUR_ISLAND), HEAL_LOCATION_FOUR_ISLAND}, + [MAPSEC_FIVE_ISLAND - KANTO_MAPSEC_START] = {MAP(MAP_FIVE_ISLAND), HEAL_LOCATION_FIVE_ISLAND}, + [MAPSEC_SEVEN_ISLAND - KANTO_MAPSEC_START] = {MAP(MAP_SEVEN_ISLAND), HEAL_LOCATION_SEVEN_ISLAND}, + [MAPSEC_SIX_ISLAND - KANTO_MAPSEC_START] = {MAP(MAP_SIX_ISLAND), HEAL_LOCATION_SIX_ISLAND}, + [MAPSEC_KINDLE_ROAD - KANTO_MAPSEC_START] = {MAP(MAP_ONE_ISLAND_KINDLE_ROAD), HEAL_LOCATION_NONE}, + [MAPSEC_TREASURE_BEACH - KANTO_MAPSEC_START] = {MAP(MAP_ONE_ISLAND_TREASURE_BEACH), HEAL_LOCATION_NONE}, + [MAPSEC_CAPE_BRINK - KANTO_MAPSEC_START] = {MAP(MAP_TWO_ISLAND_CAPE_BRINK), HEAL_LOCATION_NONE}, + [MAPSEC_BOND_BRIDGE - KANTO_MAPSEC_START] = {MAP(MAP_THREE_ISLAND_BOND_BRIDGE), HEAL_LOCATION_NONE}, + [MAPSEC_THREE_ISLE_PORT - KANTO_MAPSEC_START] = {MAP(MAP_THREE_ISLAND_PORT), HEAL_LOCATION_NONE}, + [MAPSEC_SEVII_ISLE_6 - KANTO_MAPSEC_START] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_6), HEAL_LOCATION_NONE}, + [MAPSEC_SEVII_ISLE_7 - KANTO_MAPSEC_START] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_7), HEAL_LOCATION_NONE}, + [MAPSEC_SEVII_ISLE_8 - KANTO_MAPSEC_START] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_8), HEAL_LOCATION_NONE}, + [MAPSEC_SEVII_ISLE_9 - KANTO_MAPSEC_START] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_9), HEAL_LOCATION_NONE}, + [MAPSEC_RESORT_GORGEOUS - KANTO_MAPSEC_START] = {MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS), HEAL_LOCATION_NONE}, + [MAPSEC_WATER_LABYRINTH - KANTO_MAPSEC_START] = {MAP(MAP_FIVE_ISLAND_WATER_LABYRINTH), HEAL_LOCATION_NONE}, + [MAPSEC_FIVE_ISLE_MEADOW - KANTO_MAPSEC_START] = {MAP(MAP_FIVE_ISLAND_MEADOW), HEAL_LOCATION_NONE}, + [MAPSEC_MEMORIAL_PILLAR - KANTO_MAPSEC_START] = {MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR), HEAL_LOCATION_NONE}, + [MAPSEC_OUTCAST_ISLAND - KANTO_MAPSEC_START] = {MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND), HEAL_LOCATION_NONE}, + [MAPSEC_GREEN_PATH - KANTO_MAPSEC_START] = {MAP(MAP_SIX_ISLAND_GREEN_PATH), HEAL_LOCATION_NONE}, + [MAPSEC_WATER_PATH - KANTO_MAPSEC_START] = {MAP(MAP_SIX_ISLAND_WATER_PATH), HEAL_LOCATION_NONE}, + [MAPSEC_RUIN_VALLEY - KANTO_MAPSEC_START] = {MAP(MAP_SIX_ISLAND_RUIN_VALLEY), HEAL_LOCATION_NONE}, + [MAPSEC_TRAINER_TOWER - KANTO_MAPSEC_START] = {MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER), HEAL_LOCATION_NONE}, + [MAPSEC_CANYON_ENTRANCE - KANTO_MAPSEC_START] = {MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE), HEAL_LOCATION_NONE}, + [MAPSEC_SEVAULT_CANYON - KANTO_MAPSEC_START] = {MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON), HEAL_LOCATION_NONE}, + [MAPSEC_TANOBY_RUINS - KANTO_MAPSEC_START] = {MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS), HEAL_LOCATION_NONE}, + [MAPSEC_SEVII_ISLE_22 - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_SEVII_ISLE_23 - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_SEVII_ISLE_24 - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_NAVEL_ROCK - KANTO_MAPSEC_START] = {MAP(MAP_NAVEL_ROCK_EXTERIOR), HEAL_LOCATION_NONE}, + [MAPSEC_MT_EMBER - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_BERRY_FOREST - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_ICEFALL_CAVE - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_ROCKET_WAREHOUSE - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_TRAINER_TOWER_2 - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_DOTTED_HOLE - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_LOST_CAVE - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_PATTERN_BUSH - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_ALTERING_CAVE - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_TANOBY_CHAMBERS - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_THREE_ISLE_PATH - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_TANOBY_KEY - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_BIRTH_ISLAND - KANTO_MAPSEC_START] = {MAP(MAP_BIRTH_ISLAND_EXTERIOR), HEAL_LOCATION_NONE}, + [MAPSEC_MONEAN_CHAMBER - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_LIPTOO_CHAMBER - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_WEEPTH_CHAMBER - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_DILFORD_CHAMBER - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_SCUFIB_CHAMBER - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_RIXY_CHAMBER - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_VIAPOIS_CHAMBER - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, + [MAPSEC_EMBER_SPA - KANTO_MAPSEC_START] = {MAP(MAP_PALLET_TOWN), HEAL_LOCATION_NONE}, }; static void RegionMap_DarkenPalette(u16 *pal, u16 size, u16 tint) @@ -1029,7 +1029,7 @@ static void InitRegionMapType(void) sRegionMap->permissions[MAPPERM_HAS_SWITCH_BUTTON] = FALSE; region = REGIONMAP_KANTO; j = REGIONMAP_KANTO; - if (gMapHeader.regionMapSectionId >= MAPSECS_SEVII_123) + if (gMapHeader.regionMapSectionId >= SEVII_MAPSEC_START) { // Mapsec is in Sevii Islands, determine which map to use while (region == REGIONMAP_KANTO) @@ -1470,7 +1470,7 @@ static void DisplayCurrentDungeonName(void) mapsecId = GetDungeonMapsecUnderCursor(); if (mapsecId != MAPSEC_NONE) { - descOffset = mapsecId - MAPSECS_KANTO; + descOffset = mapsecId - KANTO_MAPSEC_START; SetDispCnt(1, FALSE); sRegionMap->dungeonWinTop = TRUE; sRegionMap->dungeonWinLeft = StringLength(sMapNames[descOffset]); @@ -3154,7 +3154,7 @@ static void GetPlayerPositionOnRegionMap(void) break; } - sMapCursor->selectedMapsec -= MAPSECS_KANTO; + sMapCursor->selectedMapsec -= KANTO_MAPSEC_START; divisor = width / sMapSectionDimensions[sMapCursor->selectedMapsec][0]; if (divisor == 0) divisor = 1; @@ -3210,7 +3210,7 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void) case MAPSEC_UNDERGROUND_PATH: sMapCursor->x = 14; sMapCursor->y = 7; - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(UNDERGROUND_PATH_NORTH_ENTRANCE)) + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_UNDERGROUND_PATH_NORTH_ENTRANCE)) { sMapCursor->x = 14; // optimized out but required to match sMapCursor->y = 5; @@ -3219,7 +3219,7 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void) case MAPSEC_UNDERGROUND_PATH_2: sMapCursor->x = 12; sMapCursor->y = 6; - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(UNDERGROUND_PATH_EAST_ENTRANCE)) + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_UNDERGROUND_PATH_EAST_ENTRANCE)) { sMapCursor->x = 15; sMapCursor->y = 6; // optimized out but required to match @@ -3273,12 +3273,12 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void) sMapCursor->y = 6; break; case MAPSEC_ROUTE_2: - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN)) + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN)) { sMapCursor->x = 4; sMapCursor->y = 7; } - else if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(CERULEAN_CITY)) + else if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_CERULEAN_CITY)) { sMapCursor->x = 4; sMapCursor->y = 5; @@ -3289,19 +3289,19 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void) } break; case MAPSEC_ROUTE_21: - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE21_NORTH)) + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE21_NORTH)) { sMapCursor->x = 4; sMapCursor->y = 12; } - else if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE21_SOUTH)) + else if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE21_SOUTH)) { sMapCursor->x = 4; sMapCursor->y = 13; } break; case MAPSEC_ROUTE_5: - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(VIRIDIAN_CITY)) + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_VIRIDIAN_CITY)) { sMapCursor->x = 14; sMapCursor->y = 5; @@ -3312,7 +3312,7 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void) } break; case MAPSEC_ROUTE_6: - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN)) + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN)) { sMapCursor->x = 14; sMapCursor->y = 7; @@ -3323,7 +3323,7 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void) } break; case MAPSEC_ROUTE_7: - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN)) + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN)) { sMapCursor->x = 13; sMapCursor->y = 6; @@ -3334,7 +3334,7 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void) } break; case MAPSEC_ROUTE_8: - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN)) + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN)) { sMapCursor->x = 15; sMapCursor->y = 6; @@ -3785,15 +3785,15 @@ static bool32 IsCeladonDeptStoreMapsec(u16 mapsec) return FALSE; if (mapsec != MAPSEC_CELADON_CITY) return FALSE; - if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(CELADON_CITY_DEPARTMENT_STORE_1F)) + if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(MAP_CELADON_CITY_DEPARTMENT_STORE_1F)) return FALSE; - if (gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_1F) - && gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_2F) - && gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_3F) - && gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_4F) - && gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_5F) - && gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_ROOF) - && gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_ELEVATOR)) + if (gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_1F) + && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_2F) + && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_3F) + && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_4F) + && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_5F) + && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF) + && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR)) return FALSE; return TRUE; } @@ -3803,7 +3803,7 @@ u8 *GetMapName(u8 *dst0, u16 mapsec, u16 fill) u8 *dst; u16 i; u16 idx; - if ((idx = mapsec - MAPSECS_KANTO) <= MAPSEC_SPECIAL_AREA - MAPSECS_KANTO) + if ((idx = mapsec - KANTO_MAPSEC_START) <= MAPSEC_SPECIAL_AREA - KANTO_MAPSEC_START) { if (IsCeladonDeptStoreMapsec(mapsec) == TRUE) dst = StringCopy(dst0, sMapsecName_CELADON_DEPT_); @@ -4022,7 +4022,7 @@ static void FreeFlyMap(u8 taskId) static void SetFlyWarpDestination(u16 mapsec) { - u16 idx = mapsec - MAPSECS_KANTO; + u16 idx = mapsec - KANTO_MAPSEC_START; if (sMapFlyDestinations[idx][2]) { SetWarpDestinationToHealLocation(sMapFlyDestinations[idx][2]); diff --git a/src/renewable_hidden_items.c b/src/renewable_hidden_items.c index e13829e93..fe039140b 100644 --- a/src/renewable_hidden_items.c +++ b/src/renewable_hidden_items.c @@ -22,8 +22,8 @@ static void SampleRenewableItemFlags(void); static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { { - .mapGroup = MAP_GROUP(ROUTE20), - .mapNum = MAP_NUM(ROUTE20), + .mapGroup = MAP_GROUP(MAP_ROUTE20), + .mapNum = MAP_NUM(MAP_ROUTE20), .rare = { NO_ITEM, NO_ITEM, @@ -56,8 +56,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(ROUTE21_NORTH), - .mapNum = MAP_NUM(ROUTE21_NORTH), + .mapGroup = MAP_GROUP(MAP_ROUTE21_NORTH), + .mapNum = MAP_NUM(MAP_ROUTE21_NORTH), .rare = { NO_ITEM, NO_ITEM, @@ -90,8 +90,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), - .mapNum = MAP_NUM(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), + .mapGroup = MAP_GROUP(MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), + .mapNum = MAP_NUM(MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), .rare = { HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER), NO_ITEM, @@ -124,8 +124,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(UNDERGROUND_PATH_EAST_WEST_TUNNEL), - .mapNum = MAP_NUM(UNDERGROUND_PATH_EAST_WEST_TUNNEL), + .mapGroup = MAP_GROUP(MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL), + .mapNum = MAP_NUM(MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL), .rare = { HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER), NO_ITEM, @@ -158,8 +158,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(SEVEN_ISLAND_TANOBY_RUINS), - .mapNum = MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS), + .mapGroup = MAP_GROUP(MAP_SEVEN_ISLAND_TANOBY_RUINS), + .mapNum = MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS), .rare = { HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4), HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE), @@ -192,8 +192,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(MT_MOON_B1F), - .mapNum = MAP_NUM(MT_MOON_B1F), + .mapGroup = MAP_GROUP(MAP_MT_MOON_B1F), + .mapNum = MAP_NUM(MAP_MT_MOON_B1F), .rare = { HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM), HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2), @@ -226,8 +226,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(THREE_ISLAND_BERRY_FOREST), - .mapNum = MAP_NUM(THREE_ISLAND_BERRY_FOREST), + .mapGroup = MAP_GROUP(MAP_THREE_ISLAND_BERRY_FOREST), + .mapNum = MAP_NUM(MAP_THREE_ISLAND_BERRY_FOREST), .rare = { HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY), HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY), @@ -260,8 +260,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(ONE_ISLAND_TREASURE_BEACH), - .mapNum = MAP_NUM(ONE_ISLAND_TREASURE_BEACH), + .mapGroup = MAP_GROUP(MAP_ONE_ISLAND_TREASURE_BEACH), + .mapNum = MAP_NUM(MAP_ONE_ISLAND_TREASURE_BEACH), .rare = { HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL), HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2), @@ -294,8 +294,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(THREE_ISLAND_BOND_BRIDGE), - .mapNum = MAP_NUM(THREE_ISLAND_BOND_BRIDGE), + .mapGroup = MAP_GROUP(MAP_THREE_ISLAND_BOND_BRIDGE), + .mapNum = MAP_NUM(MAP_THREE_ISLAND_BOND_BRIDGE), .rare = { NO_ITEM, NO_ITEM, @@ -328,8 +328,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(FOUR_ISLAND), - .mapNum = MAP_NUM(FOUR_ISLAND), + .mapGroup = MAP_GROUP(MAP_FOUR_ISLAND), + .mapNum = MAP_NUM(MAP_FOUR_ISLAND), .rare = { NO_ITEM, NO_ITEM, @@ -362,8 +362,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(FIVE_ISLAND_MEMORIAL_PILLAR), - .mapNum = MAP_NUM(FIVE_ISLAND_MEMORIAL_PILLAR), + .mapGroup = MAP_GROUP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR), + .mapNum = MAP_NUM(MAP_FIVE_ISLAND_MEMORIAL_PILLAR), .rare = { HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL), NO_ITEM, @@ -396,8 +396,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(FIVE_ISLAND_RESORT_GORGEOUS), - .mapNum = MAP_NUM(FIVE_ISLAND_RESORT_GORGEOUS), + .mapGroup = MAP_GROUP(MAP_FIVE_ISLAND_RESORT_GORGEOUS), + .mapNum = MAP_NUM(MAP_FIVE_ISLAND_RESORT_GORGEOUS), .rare = { HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL), HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE), @@ -430,8 +430,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(SIX_ISLAND_OUTCAST_ISLAND), - .mapNum = MAP_NUM(SIX_ISLAND_OUTCAST_ISLAND), + .mapGroup = MAP_GROUP(MAP_SIX_ISLAND_OUTCAST_ISLAND), + .mapNum = MAP_NUM(MAP_SIX_ISLAND_OUTCAST_ISLAND), .rare = { HIDDEN_ID(FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE), HIDDEN_ID(FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL), @@ -464,8 +464,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(SIX_ISLAND_GREEN_PATH), - .mapNum = MAP_NUM(SIX_ISLAND_GREEN_PATH), + .mapGroup = MAP_GROUP(MAP_SIX_ISLAND_GREEN_PATH), + .mapNum = MAP_NUM(MAP_SIX_ISLAND_GREEN_PATH), .rare = { NO_ITEM, NO_ITEM, @@ -498,8 +498,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { } }, { - .mapGroup = MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER), - .mapNum = MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER), + .mapGroup = MAP_GROUP(MAP_SEVEN_ISLAND_TRAINER_TOWER), + .mapNum = MAP_NUM(MAP_SEVEN_ISLAND_TRAINER_TOWER), .rare = { HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL), NO_ITEM, diff --git a/src/roamer.c b/src/roamer.c index f1f9a0743..b3f262386 100644 --- a/src/roamer.c +++ b/src/roamer.c @@ -19,7 +19,7 @@ enum EWRAM_DATA u8 sLocationHistory[3][2] = {}; EWRAM_DATA u8 sRoamerLocation[2] = {}; -#define ___ MAP_NUM(UNDEFINED) // For empty spots in the location table +#define ___ MAP_NUM(MAP_UNDEFINED) // For empty spots in the location table // Note: There are two potential softlocks that can occur with this table if its maps are // changed in particular ways. They can be avoided by ensuring the following: @@ -34,31 +34,31 @@ EWRAM_DATA u8 sRoamerLocation[2] = {}; // that map then the roamer will be significantly less likely to move away // from that map when it lands there. static const u8 sRoamerLocations[][7] = { - {MAP_NUM(ROUTE1), MAP_NUM(ROUTE2), MAP_NUM(ROUTE21_NORTH), MAP_NUM(ROUTE22), ___, ___, ___}, - {MAP_NUM(ROUTE2), MAP_NUM(ROUTE1), MAP_NUM(ROUTE3), MAP_NUM(ROUTE22), ___, ___, ___}, - {MAP_NUM(ROUTE3), MAP_NUM(ROUTE2), MAP_NUM(ROUTE4), ___, ___, ___, ___}, - {MAP_NUM(ROUTE4), MAP_NUM(ROUTE3), MAP_NUM(ROUTE5), MAP_NUM(ROUTE9), MAP_NUM(ROUTE24), ___, ___}, - {MAP_NUM(ROUTE5), MAP_NUM(ROUTE4), MAP_NUM(ROUTE6), MAP_NUM(ROUTE7), MAP_NUM(ROUTE8), MAP_NUM(ROUTE9), MAP_NUM(ROUTE24)}, - {MAP_NUM(ROUTE6), MAP_NUM(ROUTE5), MAP_NUM(ROUTE7), MAP_NUM(ROUTE8), MAP_NUM(ROUTE11), ___, ___}, - {MAP_NUM(ROUTE7), MAP_NUM(ROUTE5), MAP_NUM(ROUTE6), MAP_NUM(ROUTE8), MAP_NUM(ROUTE16), ___, ___}, - {MAP_NUM(ROUTE8), MAP_NUM(ROUTE5), MAP_NUM(ROUTE6), MAP_NUM(ROUTE7), MAP_NUM(ROUTE10), MAP_NUM(ROUTE12), ___}, - {MAP_NUM(ROUTE9), MAP_NUM(ROUTE4), MAP_NUM(ROUTE5), MAP_NUM(ROUTE10), MAP_NUM(ROUTE24), ___, ___}, - {MAP_NUM(ROUTE10), MAP_NUM(ROUTE8), MAP_NUM(ROUTE9), MAP_NUM(ROUTE12), ___, ___, ___}, - {MAP_NUM(ROUTE11), MAP_NUM(ROUTE6), MAP_NUM(ROUTE12), ___, ___, ___, ___}, - {MAP_NUM(ROUTE12), MAP_NUM(ROUTE10), MAP_NUM(ROUTE11), MAP_NUM(ROUTE13), ___, ___, ___}, - {MAP_NUM(ROUTE13), MAP_NUM(ROUTE12), MAP_NUM(ROUTE14), ___, ___, ___, ___}, - {MAP_NUM(ROUTE14), MAP_NUM(ROUTE13), MAP_NUM(ROUTE15), ___, ___, ___, ___}, - {MAP_NUM(ROUTE15), MAP_NUM(ROUTE14), MAP_NUM(ROUTE18), MAP_NUM(ROUTE19), ___, ___, ___}, - {MAP_NUM(ROUTE16), MAP_NUM(ROUTE7), MAP_NUM(ROUTE17), ___, ___, ___, ___}, - {MAP_NUM(ROUTE17), MAP_NUM(ROUTE16), MAP_NUM(ROUTE18), ___, ___, ___, ___}, - {MAP_NUM(ROUTE18), MAP_NUM(ROUTE15), MAP_NUM(ROUTE17), MAP_NUM(ROUTE19), ___, ___, ___}, - {MAP_NUM(ROUTE19), MAP_NUM(ROUTE15), MAP_NUM(ROUTE18), MAP_NUM(ROUTE20), ___, ___, ___}, - {MAP_NUM(ROUTE20), MAP_NUM(ROUTE19), MAP_NUM(ROUTE21_NORTH), ___, ___, ___, ___}, - {MAP_NUM(ROUTE21_NORTH), MAP_NUM(ROUTE1), MAP_NUM(ROUTE20), ___, ___, ___, ___}, - {MAP_NUM(ROUTE22), MAP_NUM(ROUTE1), MAP_NUM(ROUTE2), MAP_NUM(ROUTE23), ___, ___, ___}, - {MAP_NUM(ROUTE23), MAP_NUM(ROUTE22), MAP_NUM(ROUTE2), ___, ___, ___, ___}, - {MAP_NUM(ROUTE24), MAP_NUM(ROUTE4), MAP_NUM(ROUTE5), MAP_NUM(ROUTE9), ___, ___, ___}, - {MAP_NUM(ROUTE25), MAP_NUM(ROUTE24), MAP_NUM(ROUTE9), ___, ___, ___, ___}, + {MAP_NUM(MAP_ROUTE1), MAP_NUM(MAP_ROUTE2), MAP_NUM(MAP_ROUTE21_NORTH), MAP_NUM(MAP_ROUTE22), ___, ___, ___}, + {MAP_NUM(MAP_ROUTE2), MAP_NUM(MAP_ROUTE1), MAP_NUM(MAP_ROUTE3), MAP_NUM(MAP_ROUTE22), ___, ___, ___}, + {MAP_NUM(MAP_ROUTE3), MAP_NUM(MAP_ROUTE2), MAP_NUM(MAP_ROUTE4), ___, ___, ___, ___}, + {MAP_NUM(MAP_ROUTE4), MAP_NUM(MAP_ROUTE3), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE9), MAP_NUM(MAP_ROUTE24), ___, ___}, + {MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE4), MAP_NUM(MAP_ROUTE6), MAP_NUM(MAP_ROUTE7), MAP_NUM(MAP_ROUTE8), MAP_NUM(MAP_ROUTE9), MAP_NUM(MAP_ROUTE24)}, + {MAP_NUM(MAP_ROUTE6), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE7), MAP_NUM(MAP_ROUTE8), MAP_NUM(MAP_ROUTE11), ___, ___}, + {MAP_NUM(MAP_ROUTE7), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE6), MAP_NUM(MAP_ROUTE8), MAP_NUM(MAP_ROUTE16), ___, ___}, + {MAP_NUM(MAP_ROUTE8), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE6), MAP_NUM(MAP_ROUTE7), MAP_NUM(MAP_ROUTE10), MAP_NUM(MAP_ROUTE12), ___}, + {MAP_NUM(MAP_ROUTE9), MAP_NUM(MAP_ROUTE4), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE10), MAP_NUM(MAP_ROUTE24), ___, ___}, + {MAP_NUM(MAP_ROUTE10), MAP_NUM(MAP_ROUTE8), MAP_NUM(MAP_ROUTE9), MAP_NUM(MAP_ROUTE12), ___, ___, ___}, + {MAP_NUM(MAP_ROUTE11), MAP_NUM(MAP_ROUTE6), MAP_NUM(MAP_ROUTE12), ___, ___, ___, ___}, + {MAP_NUM(MAP_ROUTE12), MAP_NUM(MAP_ROUTE10), MAP_NUM(MAP_ROUTE11), MAP_NUM(MAP_ROUTE13), ___, ___, ___}, + {MAP_NUM(MAP_ROUTE13), MAP_NUM(MAP_ROUTE12), MAP_NUM(MAP_ROUTE14), ___, ___, ___, ___}, + {MAP_NUM(MAP_ROUTE14), MAP_NUM(MAP_ROUTE13), MAP_NUM(MAP_ROUTE15), ___, ___, ___, ___}, + {MAP_NUM(MAP_ROUTE15), MAP_NUM(MAP_ROUTE14), MAP_NUM(MAP_ROUTE18), MAP_NUM(MAP_ROUTE19), ___, ___, ___}, + {MAP_NUM(MAP_ROUTE16), MAP_NUM(MAP_ROUTE7), MAP_NUM(MAP_ROUTE17), ___, ___, ___, ___}, + {MAP_NUM(MAP_ROUTE17), MAP_NUM(MAP_ROUTE16), MAP_NUM(MAP_ROUTE18), ___, ___, ___, ___}, + {MAP_NUM(MAP_ROUTE18), MAP_NUM(MAP_ROUTE15), MAP_NUM(MAP_ROUTE17), MAP_NUM(MAP_ROUTE19), ___, ___, ___}, + {MAP_NUM(MAP_ROUTE19), MAP_NUM(MAP_ROUTE15), MAP_NUM(MAP_ROUTE18), MAP_NUM(MAP_ROUTE20), ___, ___, ___}, + {MAP_NUM(MAP_ROUTE20), MAP_NUM(MAP_ROUTE19), MAP_NUM(MAP_ROUTE21_NORTH), ___, ___, ___, ___}, + {MAP_NUM(MAP_ROUTE21_NORTH), MAP_NUM(MAP_ROUTE1), MAP_NUM(MAP_ROUTE20), ___, ___, ___, ___}, + {MAP_NUM(MAP_ROUTE22), MAP_NUM(MAP_ROUTE1), MAP_NUM(MAP_ROUTE2), MAP_NUM(MAP_ROUTE23), ___, ___, ___}, + {MAP_NUM(MAP_ROUTE23), MAP_NUM(MAP_ROUTE22), MAP_NUM(MAP_ROUTE2), ___, ___, ___, ___}, + {MAP_NUM(MAP_ROUTE24), MAP_NUM(MAP_ROUTE4), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE9), ___, ___, ___}, + {MAP_NUM(MAP_ROUTE25), MAP_NUM(MAP_ROUTE24), MAP_NUM(MAP_ROUTE9), ___, ___, ___, ___}, {___, ___, ___, ___, ___, ___, ___} }; @@ -184,7 +184,7 @@ void RoamerMove(void) mapNum = sRoamerLocations[locSet][(Random() % (NUM_LOCATIONS_PER_SET - 1)) + 1]; if (!(sLocationHistory[2][MAP_GRP] == ROAMER_MAP_GROUP && sLocationHistory[2][MAP_NUM] == mapNum) - && mapNum != MAP_NUM(UNDEFINED)) + && mapNum != MAP_NUM(MAP_UNDEFINED)) break; } sRoamerLocation[MAP_NUM] = mapNum; diff --git a/src/scrcmd.c b/src/scrcmd.c index ea45a38a2..f7481f862 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -765,7 +765,7 @@ bool8 ScrCmd_warphole(struct ScriptContext * ctx) u16 y; PlayerGetDestCoords(&x, &y); - if (mapGroup == MAP_GROUP(UNDEFINED) && mapNum == MAP_NUM(UNDEFINED)) + if (mapGroup == MAP_GROUP(MAP_UNDEFINED) && mapNum == MAP_NUM(MAP_UNDEFINED)) SetWarpDestinationToFixedHoleWarp(x - MAP_OFFSET, y - MAP_OFFSET); else SetWarpDestination(mapGroup, mapNum, WARP_ID_NONE, x - MAP_OFFSET, y - MAP_OFFSET); @@ -1010,7 +1010,7 @@ bool8 ScrCmd_waitmovement(struct ScriptContext * ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - if (localId != 0) + if (localId != LOCALID_NONE) sMovingNpcId = localId; sMovingNpcMapGroup = gSaveBlock1Ptr->location.mapGroup; sMovingNpcMapNum = gSaveBlock1Ptr->location.mapNum; @@ -1024,7 +1024,7 @@ bool8 ScrCmd_waitmovementat(struct ScriptContext * ctx) u8 mapBank; u8 mapId; - if (localId != 0) + if (localId != LOCALID_NONE) sMovingNpcId = localId; mapBank = ScriptReadByte(ctx); mapId = ScriptReadByte(ctx); @@ -1232,7 +1232,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext * ctx) u8 playerObjectId; HideFieldMessageBox(); - playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + playerObjectId = GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); @@ -1246,7 +1246,7 @@ bool8 ScrCmd_release(struct ScriptContext * ctx) HideFieldMessageBox(); if (gObjectEvents[gSelectedObjectEvent].active) ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); - playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + playerObjectId = GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); diff --git a/src/script.c b/src/script.c index 4d021606d..d0433bdda 100644 --- a/src/script.c +++ b/src/script.c @@ -540,9 +540,9 @@ bool32 ValidateRamScript(void) struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; if (scriptData->magic != RAM_SCRIPT_MAGIC) return FALSE; - if (scriptData->mapGroup != MAP_GROUP(UNDEFINED)) + if (scriptData->mapGroup != MAP_GROUP(MAP_UNDEFINED)) return FALSE; - if (scriptData->mapNum != MAP_NUM(UNDEFINED)) + if (scriptData->mapNum != MAP_NUM(MAP_UNDEFINED)) return FALSE; if (scriptData->objectId != 0xFF) return FALSE; @@ -558,9 +558,9 @@ u8 *GetSavedRamScriptIfValid(void) return NULL; if (scriptData->magic != RAM_SCRIPT_MAGIC) return NULL; - if (scriptData->mapGroup != MAP_GROUP(UNDEFINED)) + if (scriptData->mapGroup != MAP_GROUP(MAP_UNDEFINED)) return NULL; - if (scriptData->mapNum != MAP_NUM(UNDEFINED)) + if (scriptData->mapNum != MAP_NUM(MAP_UNDEFINED)) return NULL; if (scriptData->objectId != 0xFF) return NULL; @@ -579,5 +579,5 @@ void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize) { if (scriptSize > sizeof(gSaveBlock1Ptr->ramScript.data.script)) scriptSize = sizeof(gSaveBlock1Ptr->ramScript.data.script); - InitRamScript(script, scriptSize, MAP_GROUP(UNDEFINED), MAP_NUM(UNDEFINED), 0xFF); + InitRamScript(script, scriptSize, MAP_GROUP(MAP_UNDEFINED), MAP_NUM(MAP_UNDEFINED), 0xFF); } diff --git a/src/script_movement.c b/src/script_movement.c index 55c26ded8..e4c7fc761 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -84,7 +84,7 @@ bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 *movem return FALSE; } } - moveScrId = GetMovementScriptIdFromObjectEventId(taskId, OBJ_EVENT_ID_PLAYER); + moveScrId = GetMovementScriptIdFromObjectEventId(taskId, LOCALID_PLAYER); if (moveScrId == OBJECT_EVENTS_COUNT) { return TRUE; diff --git a/src/seagallop.c b/src/seagallop.c index 04e719085..8d00eadaf 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -61,17 +61,17 @@ static const struct BgTemplate sBGTemplates[] = { static const s8 sSeag[][4] = { // Map X Y - [SEAGALLOP_VERMILION_CITY] = {MAP(VERMILION_CITY), 0x17, 0x20}, - [SEAGALLOP_ONE_ISLAND] = {MAP(ONE_ISLAND_HARBOR), 0x08, 0x05}, - [SEAGALLOP_TWO_ISLAND] = {MAP(TWO_ISLAND_HARBOR), 0x08, 0x05}, - [SEAGALLOP_THREE_ISLAND] = {MAP(THREE_ISLAND_HARBOR), 0x08, 0x05}, - [SEAGALLOP_FOUR_ISLAND] = {MAP(FOUR_ISLAND_HARBOR), 0x08, 0x05}, - [SEAGALLOP_FIVE_ISLAND] = {MAP(FIVE_ISLAND_HARBOR), 0x08, 0x05}, - [SEAGALLOP_SIX_ISLAND] = {MAP(SIX_ISLAND_HARBOR), 0x08, 0x05}, - [SEAGALLOP_SEVEN_ISLAND] = {MAP(SEVEN_ISLAND_HARBOR), 0x08, 0x05}, - [SEAGALLOP_CINNABAR_ISLAND] = {MAP(CINNABAR_ISLAND), 0x15, 0x07}, - [SEAGALLOP_NAVEL_ROCK] = {MAP(NAVEL_ROCK_HARBOR), 0x08, 0x05}, - [SEAGALLOP_BIRTH_ISLAND] = {MAP(BIRTH_ISLAND_HARBOR), 0x08, 0x05} + [SEAGALLOP_VERMILION_CITY] = {MAP(MAP_VERMILION_CITY), 0x17, 0x20}, + [SEAGALLOP_ONE_ISLAND] = {MAP(MAP_ONE_ISLAND_HARBOR), 0x08, 0x05}, + [SEAGALLOP_TWO_ISLAND] = {MAP(MAP_TWO_ISLAND_HARBOR), 0x08, 0x05}, + [SEAGALLOP_THREE_ISLAND] = {MAP(MAP_THREE_ISLAND_HARBOR), 0x08, 0x05}, + [SEAGALLOP_FOUR_ISLAND] = {MAP(MAP_FOUR_ISLAND_HARBOR), 0x08, 0x05}, + [SEAGALLOP_FIVE_ISLAND] = {MAP(MAP_FIVE_ISLAND_HARBOR), 0x08, 0x05}, + [SEAGALLOP_SIX_ISLAND] = {MAP(MAP_SIX_ISLAND_HARBOR), 0x08, 0x05}, + [SEAGALLOP_SEVEN_ISLAND] = {MAP(MAP_SEVEN_ISLAND_HARBOR), 0x08, 0x05}, + [SEAGALLOP_CINNABAR_ISLAND] = {MAP(MAP_CINNABAR_ISLAND), 0x15, 0x07}, + [SEAGALLOP_NAVEL_ROCK] = {MAP(MAP_NAVEL_ROCK_HARBOR), 0x08, 0x05}, + [SEAGALLOP_BIRTH_ISLAND] = {MAP(MAP_BIRTH_ISLAND_HARBOR), 0x08, 0x05} }; // Bitpacked array. In the commented section, right-most bit is the @@ -495,8 +495,8 @@ u8 GetSeagallopNumber(void) bool8 IsPlayerLeftOfVermilionSailor(void) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(VERMILION_CITY) - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(VERMILION_CITY) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_VERMILION_CITY) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_VERMILION_CITY) && gSaveBlock1Ptr->pos.x < 24) return TRUE; diff --git a/src/trainer_see.c b/src/trainer_see.c index 5d234adfd..399d3e8a0 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -449,7 +449,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCreateCameraObj(u8 taskId, stru { int specialObjectId; task->tData5 = 0; - specialObjectId = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_YOUNGSTER, 7, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); + specialObjectId = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_YOUNGSTER, 7, LOCALID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); gObjectEvents[specialObjectId].invisible = TRUE; CameraObjectSetFollowedObjectId(gObjectEvents[specialObjectId].spriteId); task->tFuncId++; @@ -459,7 +459,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCreateCameraObj(u8 taskId, stru static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { u8 specialObjectId; - TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId); + TryGetObjectEventIdByLocalIdAndMap(LOCALID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId); if (ObjectEventIsMovementOverridden(&gObjectEvents[specialObjectId]) && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[specialObjectId])) return FALSE; @@ -482,7 +482,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, stru static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { u8 specialObjectId; - TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId); + TryGetObjectEventIdByLocalIdAndMap(LOCALID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId); if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) return FALSE; @@ -498,7 +498,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, st else { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveObjectEventByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(LOCALID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); task->tData5 = 0; task->tFuncId = 2; } diff --git a/src/union_room.c b/src/union_room.c index 172c41f33..282353238 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -1571,7 +1571,7 @@ static void Task_StartActivity(u8 taskId) HealPlayerParty(); SavePlayerParty(); LoadPlayerBag(); - WarpForCableClubActivity(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_SINGLE_BATTLE); + WarpForCableClubActivity(MAP_GROUP(MAP_BATTLE_COLOSSEUM_2P), MAP_NUM(MAP_BATTLE_COLOSSEUM_2P), 6, 8, USING_SINGLE_BATTLE); SetMainCallback2(CB2_TransitionToCableClub); break; case ACTIVITY_BATTLE_DOUBLE: @@ -1580,7 +1580,7 @@ static void Task_StartActivity(u8 taskId) SavePlayerParty(); LoadPlayerBag(); CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE); - WarpForCableClubActivity(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_DOUBLE_BATTLE); + WarpForCableClubActivity(MAP_GROUP(MAP_BATTLE_COLOSSEUM_2P), MAP_NUM(MAP_BATTLE_COLOSSEUM_2P), 6, 8, USING_DOUBLE_BATTLE); SetMainCallback2(CB2_TransitionToCableClub); break; case ACTIVITY_BATTLE_MULTI: @@ -1589,13 +1589,13 @@ static void Task_StartActivity(u8 taskId) SavePlayerParty(); LoadPlayerBag(); CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE); - WarpForCableClubActivity(MAP_GROUP(BATTLE_COLOSSEUM_4P), MAP_NUM(BATTLE_COLOSSEUM_4P), 5, 8, USING_MULTI_BATTLE); + WarpForCableClubActivity(MAP_GROUP(MAP_BATTLE_COLOSSEUM_4P), MAP_NUM(MAP_BATTLE_COLOSSEUM_4P), 5, 8, USING_MULTI_BATTLE); SetMainCallback2(CB2_TransitionToCableClub); break; case ACTIVITY_TRADE: CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE); CleanupOverworldWindowsAndTilemaps(); - WarpForCableClubActivity(MAP_GROUP(TRADE_CENTER), MAP_NUM(TRADE_CENTER), 5, 8, USING_TRADE_CENTER); + WarpForCableClubActivity(MAP_GROUP(MAP_TRADE_CENTER), MAP_NUM(MAP_TRADE_CENTER), 5, 8, USING_TRADE_CENTER); SetMainCallback2(CB2_TransitionToCableClub); break; case ACTIVITY_TRADE | IN_UNION_ROOM: @@ -4132,8 +4132,8 @@ static bool32 PollPartnerYesNoResponse(struct WirelessLink_URoom * uroom) bool32 InUnionRoom(void) { - return gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNION_ROOM) - && gSaveBlock1Ptr->location.mapNum == MAP_NUM(UNION_ROOM) + return gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_UNION_ROOM) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_UNION_ROOM) ? TRUE : FALSE; } diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 91136a51f..4d98548a7 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -33,6 +33,8 @@ #define MAX_REMATCH_PARTIES 6 #define SKIP 0xFFFF +#define NO_REMATCH_LOCALID LOCALID_PLAYER + enum { VSSEEKER_NOT_CHARGED, @@ -118,446 +120,446 @@ static bool8 ObjectEventIdIsSane(u8 objectEventId); static u8 GetRandomFaceDirectionMovementType(); static const struct RematchData sRematches[] = { - { {TRAINER_YOUNGSTER_BEN, TRAINER_YOUNGSTER_BEN_2, SKIP, TRAINER_YOUNGSTER_BEN_3, TRAINER_YOUNGSTER_BEN_4}, MAP(ROUTE3) }, - { {TRAINER_YOUNGSTER_CALVIN, TRAINER_YOUNGSTER_CALVIN}, MAP(ROUTE3) }, + { {TRAINER_YOUNGSTER_BEN, TRAINER_YOUNGSTER_BEN_2, SKIP, TRAINER_YOUNGSTER_BEN_3, TRAINER_YOUNGSTER_BEN_4}, MAP(MAP_ROUTE3) }, + { {TRAINER_YOUNGSTER_CALVIN, TRAINER_YOUNGSTER_CALVIN}, MAP(MAP_ROUTE3) }, { {TRAINER_BUG_CATCHER_COLTON, TRAINER_BUG_CATCHER_COLTON_2, SKIP, TRAINER_BUG_CATCHER_COLTON_3, SKIP, TRAINER_BUG_CATCHER_COLTON_4}, - MAP(ROUTE3) }, + MAP(MAP_ROUTE3) }, { {TRAINER_BUG_CATCHER_GREG, TRAINER_BUG_CATCHER_GREG}, - MAP(ROUTE3) }, + MAP(MAP_ROUTE3) }, { {TRAINER_BUG_CATCHER_JAMES, TRAINER_BUG_CATCHER_JAMES}, - MAP(ROUTE3) }, + MAP(MAP_ROUTE3) }, { {TRAINER_LASS_JANICE, TRAINER_LASS_JANICE_2, SKIP, TRAINER_LASS_JANICE_3}, - MAP(ROUTE3) }, + MAP(MAP_ROUTE3) }, { {TRAINER_LASS_SALLY, TRAINER_LASS_SALLY}, - MAP(ROUTE3) }, + MAP(MAP_ROUTE3) }, { {TRAINER_LASS_ROBIN, TRAINER_LASS_ROBIN}, - MAP(ROUTE3) }, + MAP(MAP_ROUTE3) }, { {TRAINER_LASS_CRISSY, TRAINER_LASS_CRISSY}, - MAP(ROUTE4) }, + MAP(MAP_ROUTE4) }, { {TRAINER_YOUNGSTER_TIMMY, TRAINER_YOUNGSTER_TIMMY_2, SKIP, TRAINER_YOUNGSTER_TIMMY_3, SKIP, TRAINER_YOUNGSTER_TIMMY_4}, - MAP(ROUTE24) }, + MAP(MAP_ROUTE24) }, { {TRAINER_BUG_CATCHER_CALE, TRAINER_BUG_CATCHER_CALE}, - MAP(ROUTE24) }, + MAP(MAP_ROUTE24) }, { {TRAINER_LASS_RELI, TRAINER_LASS_RELI_2, SKIP, TRAINER_LASS_RELI_3}, - MAP(ROUTE24) }, + MAP(MAP_ROUTE24) }, { {TRAINER_LASS_ALI, TRAINER_LASS_ALI}, - MAP(ROUTE24) }, + MAP(MAP_ROUTE24) }, { {TRAINER_CAMPER_SHANE, TRAINER_CAMPER_SHANE}, - MAP(ROUTE24) }, + MAP(MAP_ROUTE24) }, { {TRAINER_CAMPER_ETHAN, TRAINER_CAMPER_ETHAN}, - MAP(ROUTE24) }, + MAP(MAP_ROUTE24) }, { {TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY}, - MAP(ROUTE25) }, + MAP(MAP_ROUTE25) }, { {TRAINER_YOUNGSTER_DAN, TRAINER_YOUNGSTER_DAN}, - MAP(ROUTE25) }, + MAP(MAP_ROUTE25) }, { {TRAINER_YOUNGSTER_CHAD, TRAINER_YOUNGSTER_CHAD_2, SKIP, TRAINER_YOUNGSTER_CHAD_3, TRAINER_YOUNGSTER_CHAD_4}, - MAP(ROUTE25) }, + MAP(MAP_ROUTE25) }, { {TRAINER_PICNICKER_KELSEY, TRAINER_PICNICKER_KELSEY_2, SKIP, TRAINER_PICNICKER_KELSEY_3, TRAINER_PICNICKER_KELSEY_4}, - MAP(ROUTE25) }, + MAP(MAP_ROUTE25) }, { {TRAINER_LASS_HALEY, TRAINER_LASS_HALEY}, - MAP(ROUTE25) }, + MAP(MAP_ROUTE25) }, { {TRAINER_HIKER_FRANKLIN, SKIP, TRAINER_HIKER_FRANKLIN_2}, - MAP(ROUTE25) }, + MAP(MAP_ROUTE25) }, { {TRAINER_HIKER_NOB, TRAINER_HIKER_NOB}, - MAP(ROUTE25) }, + MAP(MAP_ROUTE25) }, { {TRAINER_HIKER_WAYNE, TRAINER_HIKER_WAYNE}, - MAP(ROUTE25) }, + MAP(MAP_ROUTE25) }, { {TRAINER_CAMPER_FLINT, TRAINER_CAMPER_FLINT}, - MAP(ROUTE25) }, + MAP(MAP_ROUTE25) }, { {TRAINER_BUG_CATCHER_KEIGO, TRAINER_BUG_CATCHER_KEIGO}, - MAP(ROUTE6) }, + MAP(MAP_ROUTE6) }, { {TRAINER_BUG_CATCHER_ELIJAH, TRAINER_BUG_CATCHER_ELIJAH}, - MAP(ROUTE6) }, + MAP(MAP_ROUTE6) }, { {TRAINER_CAMPER_RICKY, TRAINER_CAMPER_RICKY_2, SKIP, TRAINER_CAMPER_RICKY_3, SKIP, TRAINER_CAMPER_RICKY_4}, - MAP(ROUTE6) }, + MAP(MAP_ROUTE6) }, { {TRAINER_CAMPER_JEFF, TRAINER_CAMPER_JEFF_2, SKIP, TRAINER_CAMPER_JEFF_3, SKIP, TRAINER_CAMPER_JEFF_4}, - MAP(ROUTE6) }, + MAP(MAP_ROUTE6) }, { {TRAINER_PICNICKER_NANCY, TRAINER_PICNICKER_NANCY}, - MAP(ROUTE6) }, + MAP(MAP_ROUTE6) }, { {TRAINER_PICNICKER_ISABELLE, TRAINER_PICNICKER_ISABELLE_2, SKIP, TRAINER_PICNICKER_ISABELLE_3, TRAINER_PICNICKER_ISABELLE_4}, - MAP(ROUTE6) }, + MAP(MAP_ROUTE6) }, { {TRAINER_YOUNGSTER_EDDIE, TRAINER_YOUNGSTER_EDDIE}, - MAP(ROUTE11) }, + MAP(MAP_ROUTE11) }, { {TRAINER_YOUNGSTER_DILLON, TRAINER_YOUNGSTER_DILLON}, - MAP(ROUTE11) }, + MAP(MAP_ROUTE11) }, { {TRAINER_YOUNGSTER_YASU, SKIP, TRAINER_YOUNGSTER_YASU_2, SKIP, TRAINER_YOUNGSTER_YASU_3}, - MAP(ROUTE11) }, + MAP(MAP_ROUTE11) }, { {TRAINER_YOUNGSTER_DAVE, TRAINER_YOUNGSTER_DAVE}, - MAP(ROUTE11) }, + MAP(MAP_ROUTE11) }, { {TRAINER_ENGINEER_BRAXTON, TRAINER_ENGINEER_BRAXTON}, - MAP(ROUTE11) }, + MAP(MAP_ROUTE11) }, { {TRAINER_ENGINEER_BERNIE, SKIP, SKIP, TRAINER_ENGINEER_BERNIE_2}, - MAP(ROUTE11) }, + MAP(MAP_ROUTE11) }, { {TRAINER_GAMER_HUGO, TRAINER_GAMER_HUGO}, - MAP(ROUTE11) }, + MAP(MAP_ROUTE11) }, { {TRAINER_GAMER_JASPER, TRAINER_GAMER_JASPER}, - MAP(ROUTE11) }, + MAP(MAP_ROUTE11) }, { {TRAINER_GAMER_DIRK, TRAINER_GAMER_DIRK}, - MAP(ROUTE11) }, + MAP(MAP_ROUTE11) }, { {TRAINER_GAMER_DARIAN, SKIP, SKIP, TRAINER_GAMER_DARIAN_2}, - MAP(ROUTE11) }, + MAP(MAP_ROUTE11) }, { {TRAINER_BUG_CATCHER_BRENT, TRAINER_BUG_CATCHER_BRENT}, - MAP(ROUTE9) }, + MAP(MAP_ROUTE9) }, { {TRAINER_BUG_CATCHER_CONNER, TRAINER_BUG_CATCHER_CONNER}, - MAP(ROUTE9) }, + MAP(MAP_ROUTE9) }, { {TRAINER_CAMPER_CHRIS, SKIP, TRAINER_CAMPER_CHRIS_2, TRAINER_CAMPER_CHRIS_3, SKIP, TRAINER_CAMPER_CHRIS_4}, - MAP(ROUTE9) }, + MAP(MAP_ROUTE9) }, { {TRAINER_CAMPER_DREW, TRAINER_CAMPER_DREW}, - MAP(ROUTE9) }, + MAP(MAP_ROUTE9) }, { {TRAINER_PICNICKER_ALICIA, SKIP, TRAINER_PICNICKER_ALICIA_2, TRAINER_PICNICKER_ALICIA_3, SKIP, TRAINER_PICNICKER_ALICIA_4}, - MAP(ROUTE9) }, + MAP(MAP_ROUTE9) }, { {TRAINER_PICNICKER_CAITLIN, TRAINER_PICNICKER_CAITLIN}, - MAP(ROUTE9) }, + MAP(MAP_ROUTE9) }, { {TRAINER_HIKER_ALAN, TRAINER_HIKER_ALAN}, - MAP(ROUTE9) }, + MAP(MAP_ROUTE9) }, { {TRAINER_HIKER_BRICE, TRAINER_HIKER_BRICE}, - MAP(ROUTE9) }, + MAP(MAP_ROUTE9) }, { {TRAINER_HIKER_JEREMY, SKIP, SKIP, TRAINER_HIKER_JEREMY_2}, - MAP(ROUTE9) }, + MAP(MAP_ROUTE9) }, { {TRAINER_PICNICKER_HEIDI, TRAINER_PICNICKER_HEIDI}, - MAP(ROUTE10) }, + MAP(MAP_ROUTE10) }, { {TRAINER_PICNICKER_CAROL, TRAINER_PICNICKER_CAROL}, - MAP(ROUTE10) }, + MAP(MAP_ROUTE10) }, { {TRAINER_POKEMANIAC_MARK, SKIP, SKIP, TRAINER_POKEMANIAC_MARK_2, SKIP, TRAINER_POKEMANIAC_MARK_3}, - MAP(ROUTE10) }, + MAP(MAP_ROUTE10) }, { {TRAINER_POKEMANIAC_HERMAN, SKIP, SKIP, TRAINER_POKEMANIAC_HERMAN_2, SKIP, TRAINER_POKEMANIAC_HERMAN_3}, - MAP(ROUTE10) }, + MAP(MAP_ROUTE10) }, { {TRAINER_HIKER_CLARK, TRAINER_HIKER_CLARK}, - MAP(ROUTE10) }, + MAP(MAP_ROUTE10) }, { {TRAINER_HIKER_TRENT, SKIP, SKIP, TRAINER_HIKER_TRENT_2}, - MAP(ROUTE10) }, + MAP(MAP_ROUTE10) }, { {TRAINER_LASS_PAIGE, TRAINER_LASS_PAIGE}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_LASS_ANDREA, TRAINER_LASS_ANDREA}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_LASS_MEGAN, SKIP, TRAINER_LASS_MEGAN_2, SKIP, TRAINER_LASS_MEGAN_3}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_LASS_JULIA, TRAINER_LASS_JULIA}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_SUPER_NERD_AIDAN, TRAINER_SUPER_NERD_AIDAN}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_SUPER_NERD_GLENN, SKIP, SKIP, TRAINER_SUPER_NERD_GLENN_2}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_SUPER_NERD_LESLIE, TRAINER_SUPER_NERD_LESLIE}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_GAMER_STAN, TRAINER_GAMER_STAN}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_GAMER_RICH, SKIP, SKIP, TRAINER_GAMER_RICH_2}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_TWINS_ELI_ANNE, SKIP, SKIP, TRAINER_TWINS_ELI_ANNE_2}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_BIKER_RICARDO, TRAINER_BIKER_RICARDO}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_BIKER_JAREN, SKIP, SKIP, TRAINER_BIKER_JAREN_2}, - MAP(ROUTE8) }, + MAP(MAP_ROUTE8) }, { {TRAINER_FISHERMAN_NED, TRAINER_FISHERMAN_NED}, - MAP(ROUTE12) }, + MAP(MAP_ROUTE12) }, { {TRAINER_FISHERMAN_CHIP, TRAINER_FISHERMAN_CHIP}, - MAP(ROUTE12) }, + MAP(MAP_ROUTE12) }, { {TRAINER_FISHERMAN_HANK, TRAINER_FISHERMAN_HANK}, - MAP(ROUTE12) }, + MAP(MAP_ROUTE12) }, { {TRAINER_FISHERMAN_ELLIOT, SKIP, SKIP, TRAINER_FISHERMAN_ELLIOT_2}, - MAP(ROUTE12) }, + MAP(MAP_ROUTE12) }, { {TRAINER_FISHERMAN_ANDREW, TRAINER_FISHERMAN_ANDREW}, - MAP(ROUTE12) }, + MAP(MAP_ROUTE12) }, { {TRAINER_ROCKER_LUCA, SKIP, SKIP, TRAINER_ROCKER_LUCA_2}, - MAP(ROUTE12) }, + MAP(MAP_ROUTE12) }, { {TRAINER_CAMPER_JUSTIN, TRAINER_CAMPER_JUSTIN}, - MAP(ROUTE12) }, + MAP(MAP_ROUTE12) }, { {TRAINER_YOUNG_COUPLE_GIA_JES, SKIP, SKIP, TRAINER_YOUNG_COUPLE_GIA_JES_2, SKIP, TRAINER_YOUNG_COUPLE_GIA_JES_3}, - MAP(ROUTE12) }, + MAP(MAP_ROUTE12) }, { {TRAINER_BIKER_JARED, TRAINER_BIKER_JARED}, - MAP(ROUTE13) }, + MAP(MAP_ROUTE13) }, { {TRAINER_BEAUTY_LOLA, TRAINER_BEAUTY_LOLA}, - MAP(ROUTE13) }, + MAP(MAP_ROUTE13) }, { {TRAINER_BEAUTY_SHEILA, SKIP, SKIP, SKIP, TRAINER_BEAUTY_SHEILA_2}, - MAP(ROUTE13) }, + MAP(MAP_ROUTE13) }, { {TRAINER_BIRD_KEEPER_SEBASTIAN, TRAINER_BIRD_KEEPER_SEBASTIAN}, - MAP(ROUTE13) }, + MAP(MAP_ROUTE13) }, { {TRAINER_BIRD_KEEPER_PERRY, TRAINER_BIRD_KEEPER_PERRY}, - MAP(ROUTE13) }, + MAP(MAP_ROUTE13) }, { {TRAINER_BIRD_KEEPER_ROBERT, SKIP, SKIP, TRAINER_BIRD_KEEPER_ROBERT_2, TRAINER_BIRD_KEEPER_ROBERT_3}, - MAP(ROUTE13) }, + MAP(MAP_ROUTE13) }, { {TRAINER_PICNICKER_ALMA, TRAINER_PICNICKER_ALMA}, - MAP(ROUTE13) }, + MAP(MAP_ROUTE13) }, { {TRAINER_PICNICKER_SUSIE, SKIP, SKIP, TRAINER_PICNICKER_SUSIE_2, TRAINER_PICNICKER_SUSIE_3, TRAINER_PICNICKER_SUSIE_4}, - MAP(ROUTE13) }, + MAP(MAP_ROUTE13) }, { {TRAINER_PICNICKER_VALERIE, TRAINER_PICNICKER_VALERIE}, - MAP(ROUTE13) }, + MAP(MAP_ROUTE13) }, { {TRAINER_PICNICKER_GWEN, TRAINER_PICNICKER_GWEN}, - MAP(ROUTE13) }, + MAP(MAP_ROUTE13) }, { {TRAINER_BIKER_MALIK, TRAINER_BIKER_MALIK}, - MAP(ROUTE14) }, + MAP(MAP_ROUTE14) }, { {TRAINER_BIKER_LUKAS, SKIP, SKIP, SKIP, TRAINER_BIKER_LUKAS_2}, - MAP(ROUTE14) }, + MAP(MAP_ROUTE14) }, { {TRAINER_BIKER_ISAAC, TRAINER_BIKER_ISAAC}, - MAP(ROUTE14) }, + MAP(MAP_ROUTE14) }, { {TRAINER_BIKER_GERALD, TRAINER_BIKER_GERALD}, - MAP(ROUTE14) }, + MAP(MAP_ROUTE14) }, { {TRAINER_BIRD_KEEPER_DONALD, TRAINER_BIRD_KEEPER_DONALD}, - MAP(ROUTE14) }, + MAP(MAP_ROUTE14) }, { {TRAINER_BIRD_KEEPER_BENNY, SKIP, SKIP, TRAINER_BIRD_KEEPER_BENNY_2, TRAINER_BIRD_KEEPER_BENNY_3}, - MAP(ROUTE14) }, + MAP(MAP_ROUTE14) }, { {TRAINER_BIRD_KEEPER_CARTER, TRAINER_BIRD_KEEPER_CARTER}, - MAP(ROUTE14) }, + MAP(MAP_ROUTE14) }, { {TRAINER_BIRD_KEEPER_MITCH, TRAINER_BIRD_KEEPER_MITCH}, - MAP(ROUTE14) }, + MAP(MAP_ROUTE14) }, { {TRAINER_BIRD_KEEPER_BECK, TRAINER_BIRD_KEEPER_BECK}, - MAP(ROUTE14) }, + MAP(MAP_ROUTE14) }, { {TRAINER_BIRD_KEEPER_MARLON, SKIP, SKIP, TRAINER_BIRD_KEEPER_MARLON_2, TRAINER_BIRD_KEEPER_MARLON_3}, - MAP(ROUTE14) }, + MAP(MAP_ROUTE14) }, { {TRAINER_TWINS_KIRI_JAN, TRAINER_TWINS_KIRI_JAN}, - MAP(ROUTE14) }, + MAP(MAP_ROUTE14) }, { {TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST}, - MAP(ROUTE15) }, + MAP(MAP_ROUTE15) }, { {TRAINER_BIKER_ALEX, TRAINER_BIKER_ALEX}, - MAP(ROUTE15) }, + MAP(MAP_ROUTE15) }, { {TRAINER_BEAUTY_GRACE, SKIP, SKIP, SKIP, TRAINER_BEAUTY_GRACE_2}, - MAP(ROUTE15) }, + MAP(MAP_ROUTE15) }, { {TRAINER_BEAUTY_OLIVIA, TRAINER_BEAUTY_OLIVIA}, - MAP(ROUTE15) }, + MAP(MAP_ROUTE15) }, { {TRAINER_BIRD_KEEPER_EDWIN, TRAINER_BIRD_KEEPER_EDWIN}, - MAP(ROUTE15) }, + MAP(MAP_ROUTE15) }, { {TRAINER_BIRD_KEEPER_CHESTER, SKIP, SKIP, TRAINER_BIRD_KEEPER_CHESTER_2, TRAINER_BIRD_KEEPER_CHESTER_3}, - MAP(ROUTE15) }, + MAP(MAP_ROUTE15) }, { {TRAINER_PICNICKER_YAZMIN, TRAINER_PICNICKER_YAZMIN}, - MAP(ROUTE15) }, + MAP(MAP_ROUTE15) }, { {TRAINER_PICNICKER_KINDRA, TRAINER_PICNICKER_KINDRA}, - MAP(ROUTE15) }, + MAP(MAP_ROUTE15) }, { {TRAINER_PICNICKER_BECKY, SKIP, SKIP, TRAINER_PICNICKER_BECKY_2, TRAINER_PICNICKER_BECKY_3, TRAINER_PICNICKER_BECKY_4}, - MAP(ROUTE15) }, + MAP(MAP_ROUTE15) }, { {TRAINER_PICNICKER_CELIA, TRAINER_PICNICKER_CELIA}, - MAP(ROUTE15) }, + MAP(MAP_ROUTE15) }, { {TRAINER_CRUSH_KIN_RON_MYA, SKIP, SKIP, TRAINER_CRUSH_KIN_RON_MYA_2, TRAINER_CRUSH_KIN_RON_MYA_3, TRAINER_CRUSH_KIN_RON_MYA_4}, - MAP(ROUTE15) }, + MAP(MAP_ROUTE15) }, { {TRAINER_BIKER_LAO, TRAINER_BIKER_LAO}, - MAP(ROUTE16) }, + MAP(MAP_ROUTE16) }, { {TRAINER_BIKER_HIDEO, TRAINER_BIKER_HIDEO}, - MAP(ROUTE16) }, + MAP(MAP_ROUTE16) }, { {TRAINER_BIKER_RUBEN, SKIP, SKIP, SKIP, TRAINER_BIKER_RUBEN_2}, - MAP(ROUTE16) }, + MAP(MAP_ROUTE16) }, { {TRAINER_CUE_BALL_KOJI, TRAINER_CUE_BALL_KOJI}, - MAP(ROUTE16) }, + MAP(MAP_ROUTE16) }, { {TRAINER_CUE_BALL_LUKE, TRAINER_CUE_BALL_LUKE}, - MAP(ROUTE16) }, + MAP(MAP_ROUTE16) }, { {TRAINER_CUE_BALL_CAMRON, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_CAMRON_2}, - MAP(ROUTE16) }, + MAP(MAP_ROUTE16) }, { {TRAINER_YOUNG_COUPLE_LEA_JED, TRAINER_YOUNG_COUPLE_LEA_JED}, - MAP(ROUTE16) }, + MAP(MAP_ROUTE16) }, { {TRAINER_BIKER_BILLY, TRAINER_BIKER_BILLY}, - MAP(ROUTE17) }, + MAP(MAP_ROUTE17) }, { {TRAINER_BIKER_NIKOLAS, TRAINER_BIKER_NIKOLAS}, - MAP(ROUTE17) }, + MAP(MAP_ROUTE17) }, { {TRAINER_BIKER_JAXON, SKIP, SKIP, SKIP, TRAINER_BIKER_JAXON_2}, - MAP(ROUTE17) }, + MAP(MAP_ROUTE17) }, { {TRAINER_BIKER_WILLIAM, TRAINER_BIKER_WILLIAM}, - MAP(ROUTE17) }, + MAP(MAP_ROUTE17) }, { {TRAINER_CUE_BALL_RAUL, TRAINER_CUE_BALL_RAUL}, - MAP(ROUTE17) }, + MAP(MAP_ROUTE17) }, { {TRAINER_CUE_BALL_ISAIAH, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_ISAIAH_2}, - MAP(ROUTE17) }, + MAP(MAP_ROUTE17) }, { {TRAINER_CUE_BALL_ZEEK, TRAINER_CUE_BALL_ZEEK}, - MAP(ROUTE17) }, + MAP(MAP_ROUTE17) }, { {TRAINER_CUE_BALL_JAMAL, TRAINER_CUE_BALL_JAMAL}, - MAP(ROUTE17) }, + MAP(MAP_ROUTE17) }, { {TRAINER_CUE_BALL_COREY, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_COREY_2}, - MAP(ROUTE17) }, + MAP(MAP_ROUTE17) }, { {TRAINER_BIKER_VIRGIL, TRAINER_BIKER_VIRGIL}, - MAP(ROUTE17) }, + MAP(MAP_ROUTE17) }, { {TRAINER_BIRD_KEEPER_WILTON, TRAINER_BIRD_KEEPER_WILTON}, - MAP(ROUTE18) }, + MAP(MAP_ROUTE18) }, { {TRAINER_BIRD_KEEPER_RAMIRO, TRAINER_BIRD_KEEPER_RAMIRO}, - MAP(ROUTE18) }, + MAP(MAP_ROUTE18) }, { {TRAINER_BIRD_KEEPER_JACOB, SKIP, SKIP, TRAINER_BIRD_KEEPER_JACOB_2, TRAINER_BIRD_KEEPER_JACOB_3}, - MAP(ROUTE18) }, + MAP(MAP_ROUTE18) }, { {TRAINER_SWIMMER_MALE_RICHARD, TRAINER_SWIMMER_MALE_RICHARD}, - MAP(ROUTE19) }, + MAP(MAP_ROUTE19) }, { {TRAINER_SWIMMER_MALE_REECE, TRAINER_SWIMMER_MALE_REECE}, - MAP(ROUTE19) }, + MAP(MAP_ROUTE19) }, { {TRAINER_SWIMMER_MALE_MATTHEW, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_MATTHEW_2}, - MAP(ROUTE19) }, + MAP(MAP_ROUTE19) }, { {TRAINER_SWIMMER_MALE_DOUGLAS, TRAINER_SWIMMER_MALE_DOUGLAS}, - MAP(ROUTE19) }, + MAP(MAP_ROUTE19) }, { {TRAINER_SWIMMER_MALE_DAVID, TRAINER_SWIMMER_MALE_DAVID}, - MAP(ROUTE19) }, + MAP(MAP_ROUTE19) }, { {TRAINER_SWIMMER_MALE_TONY, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_TONY_2}, - MAP(ROUTE19) }, + MAP(MAP_ROUTE19) }, { {TRAINER_SWIMMER_MALE_AXLE, TRAINER_SWIMMER_MALE_AXLE}, - MAP(ROUTE19) }, + MAP(MAP_ROUTE19) }, { {TRAINER_SWIMMER_FEMALE_ANYA, TRAINER_SWIMMER_FEMALE_ANYA}, - MAP(ROUTE19) }, + MAP(MAP_ROUTE19) }, { {TRAINER_SWIMMER_FEMALE_ALICE, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_ALICE_2}, - MAP(ROUTE19) }, + MAP(MAP_ROUTE19) }, { {TRAINER_SWIMMER_FEMALE_CONNIE, TRAINER_SWIMMER_FEMALE_CONNIE}, - MAP(ROUTE19) }, + MAP(MAP_ROUTE19) }, { {TRAINER_SIS_AND_BRO_LIA_LUC, TRAINER_SIS_AND_BRO_LIA_LUC}, - MAP(ROUTE19) }, + MAP(MAP_ROUTE19) }, { {TRAINER_SWIMMER_MALE_BARRY, TRAINER_SWIMMER_MALE_BARRY}, - MAP(ROUTE20) }, + MAP(MAP_ROUTE20) }, { {TRAINER_SWIMMER_MALE_DEAN, TRAINER_SWIMMER_MALE_DEAN}, - MAP(ROUTE20) }, + MAP(MAP_ROUTE20) }, { {TRAINER_SWIMMER_MALE_DARRIN, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_DARRIN_2}, - MAP(ROUTE20) }, + MAP(MAP_ROUTE20) }, { {TRAINER_SWIMMER_FEMALE_TIFFANY, TRAINER_SWIMMER_FEMALE_TIFFANY}, - MAP(ROUTE20) }, + MAP(MAP_ROUTE20) }, { {TRAINER_SWIMMER_FEMALE_NORA, TRAINER_SWIMMER_FEMALE_NORA}, - MAP(ROUTE20) }, + MAP(MAP_ROUTE20) }, { {TRAINER_SWIMMER_FEMALE_MELISSA, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_MELISSA_2}, - MAP(ROUTE20) }, + MAP(MAP_ROUTE20) }, { {TRAINER_SWIMMER_FEMALE_SHIRLEY, TRAINER_SWIMMER_FEMALE_SHIRLEY}, - MAP(ROUTE20) }, + MAP(MAP_ROUTE20) }, { {TRAINER_BIRD_KEEPER_ROGER, TRAINER_BIRD_KEEPER_ROGER}, - MAP(ROUTE20) }, + MAP(MAP_ROUTE20) }, { {TRAINER_PICNICKER_MISSY, SKIP, SKIP, SKIP, TRAINER_PICNICKER_MISSY_2, TRAINER_PICNICKER_MISSY_3}, - MAP(ROUTE20) }, + MAP(MAP_ROUTE20) }, { {TRAINER_PICNICKER_IRENE, TRAINER_PICNICKER_IRENE}, - MAP(ROUTE20) }, + MAP(MAP_ROUTE20) }, { {TRAINER_FISHERMAN_RONALD, TRAINER_FISHERMAN_RONALD}, - MAP(ROUTE21_NORTH) }, + MAP(MAP_ROUTE21_NORTH) }, { {TRAINER_FISHERMAN_CLAUDE, TRAINER_FISHERMAN_CLAUDE}, - MAP(ROUTE21_NORTH) }, + MAP(MAP_ROUTE21_NORTH) }, { {TRAINER_FISHERMAN_WADE, SKIP, SKIP, SKIP, TRAINER_FISHERMAN_WADE_2}, - MAP(ROUTE21_NORTH) }, + MAP(MAP_ROUTE21_NORTH) }, { {TRAINER_FISHERMAN_NOLAN, TRAINER_FISHERMAN_NOLAN}, - MAP(ROUTE21_NORTH) }, + MAP(MAP_ROUTE21_NORTH) }, { {TRAINER_SWIMMER_MALE_SPENCER, TRAINER_SWIMMER_MALE_SPENCER}, - MAP(ROUTE21_NORTH) }, + MAP(MAP_ROUTE21_NORTH) }, { {TRAINER_SWIMMER_MALE_JACK, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_JACK_2}, - MAP(ROUTE21_NORTH) }, + MAP(MAP_ROUTE21_NORTH) }, { {TRAINER_SWIMMER_MALE_JEROME, TRAINER_SWIMMER_MALE_JEROME}, - MAP(ROUTE21_NORTH) }, + MAP(MAP_ROUTE21_NORTH) }, { {TRAINER_SWIMMER_MALE_ROLAND, TRAINER_SWIMMER_MALE_ROLAND}, - MAP(ROUTE21_NORTH) }, + MAP(MAP_ROUTE21_NORTH) }, { {TRAINER_SIS_AND_BRO_LIL_IAN, SKIP, SKIP, SKIP, TRAINER_SIS_AND_BRO_LIL_IAN_2, TRAINER_SIS_AND_BRO_LIL_IAN_3}, - MAP(ROUTE21_NORTH) }, + MAP(MAP_ROUTE21_NORTH) }, { {TRAINER_SWIMMER_FEMALE_MARIA, TRAINER_SWIMMER_FEMALE_MARIA}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_SWIMMER_FEMALE_ABIGAIL, TRAINER_SWIMMER_FEMALE_ABIGAIL}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_SWIMMER_MALE_FINN, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_FINN_2}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_SWIMMER_MALE_GARRETT, TRAINER_SWIMMER_MALE_GARRETT}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_FISHERMAN_TOMMY, TRAINER_FISHERMAN_TOMMY}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_CRUSH_GIRL_SHARON, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_SHARON_2, TRAINER_CRUSH_GIRL_SHARON_3}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_CRUSH_GIRL_TANYA, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_TANYA_2, TRAINER_CRUSH_GIRL_TANYA_3}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_BLACK_BELT_SHEA, SKIP, SKIP, SKIP, TRAINER_BLACK_BELT_SHEA_2, TRAINER_BLACK_BELT_SHEA_3}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_BLACK_BELT_HUGH, SKIP, SKIP, SKIP, TRAINER_BLACK_BELT_HUGH_2, TRAINER_BLACK_BELT_HUGH_3}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_CAMPER_BRYCE, TRAINER_CAMPER_BRYCE}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_PICNICKER_CLAIRE, TRAINER_PICNICKER_CLAIRE}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_CRUSH_KIN_MIK_KIA, SKIP, SKIP, SKIP, TRAINER_CRUSH_KIN_MIK_KIA_2, TRAINER_CRUSH_KIN_MIK_KIA_3}, - MAP(ONE_ISLAND_KINDLE_ROAD) }, + MAP(MAP_ONE_ISLAND_KINDLE_ROAD) }, { {TRAINER_SWIMMER_FEMALE_AMARA, TRAINER_SWIMMER_FEMALE_AMARA}, - MAP(ONE_ISLAND_TREASURE_BEACH) }, + MAP(MAP_ONE_ISLAND_TREASURE_BEACH) }, { {TRAINER_AROMA_LADY_NIKKI, TRAINER_AROMA_LADY_NIKKI}, - MAP(THREE_ISLAND_BOND_BRIDGE) }, + MAP(MAP_THREE_ISLAND_BOND_BRIDGE) }, { {TRAINER_AROMA_LADY_VIOLET, TRAINER_AROMA_LADY_VIOLET}, - MAP(THREE_ISLAND_BOND_BRIDGE) }, + MAP(MAP_THREE_ISLAND_BOND_BRIDGE) }, { {TRAINER_TUBER_AMIRA, SKIP, SKIP, SKIP, TRAINER_TUBER_AMIRA_2}, - MAP(THREE_ISLAND_BOND_BRIDGE) }, + MAP(MAP_THREE_ISLAND_BOND_BRIDGE) }, { {TRAINER_TUBER_ALEXIS, TRAINER_TUBER_ALEXIS}, - MAP(THREE_ISLAND_BOND_BRIDGE) }, + MAP(MAP_THREE_ISLAND_BOND_BRIDGE) }, { {TRAINER_SWIMMER_FEMALE_TISHA, TRAINER_SWIMMER_FEMALE_TISHA}, - MAP(THREE_ISLAND_BOND_BRIDGE) }, + MAP(MAP_THREE_ISLAND_BOND_BRIDGE) }, { {TRAINER_TWINS_JOY_MEG, SKIP, SKIP, SKIP, TRAINER_TWINS_JOY_MEG_2}, - MAP(THREE_ISLAND_BOND_BRIDGE) }, + MAP(MAP_THREE_ISLAND_BOND_BRIDGE) }, { {TRAINER_PAINTER_DAISY, TRAINER_PAINTER_DAISY}, - MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, + MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) }, { {TRAINER_PAINTER_CELINA, TRAINER_PAINTER_CELINA}, - MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, + MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) }, { {TRAINER_PAINTER_RAYNA, SKIP, SKIP, SKIP, SKIP, TRAINER_PAINTER_RAYNA_2}, - MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, + MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) }, { {TRAINER_LADY_JACKI, TRAINER_LADY_JACKI}, - MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, + MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) }, { {TRAINER_LADY_GILLIAN, TRAINER_LADY_GILLIAN}, - MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, + MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) }, { {TRAINER_YOUNGSTER_DESTIN, SKIP, SKIP, SKIP, SKIP, TRAINER_YOUNGSTER_DESTIN_2}, - MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, + MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) }, { {TRAINER_SWIMMER_MALE_TOBY, TRAINER_SWIMMER_MALE_TOBY}, - MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, + MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) }, { {TRAINER_PKMN_BREEDER_ALIZE, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_BREEDER_ALIZE_2}, - MAP(FIVE_ISLAND_WATER_LABYRINTH) }, + MAP(MAP_FIVE_ISLAND_WATER_LABYRINTH) }, { {TRAINER_BIRD_KEEPER_MILO, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_MILO_2}, - MAP(FIVE_ISLAND_MEMORIAL_PILLAR) }, + MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) }, { {TRAINER_BIRD_KEEPER_CHAZ, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_CHAZ_2}, - MAP(FIVE_ISLAND_MEMORIAL_PILLAR) }, + MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) }, { {TRAINER_BIRD_KEEPER_HAROLD, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_HAROLD_2}, - MAP(FIVE_ISLAND_MEMORIAL_PILLAR) }, + MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) }, { {TRAINER_FISHERMAN_TYLOR, TRAINER_FISHERMAN_TYLOR}, - MAP(SIX_ISLAND_OUTCAST_ISLAND) }, + MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) }, { {TRAINER_SWIMMER_MALE_MYMO, TRAINER_SWIMMER_MALE_MYMO}, - MAP(SIX_ISLAND_OUTCAST_ISLAND) }, + MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) }, { {TRAINER_SWIMMER_FEMALE_NICOLE, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_NICOLE_2}, - MAP(SIX_ISLAND_OUTCAST_ISLAND) }, + MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) }, { {TRAINER_SIS_AND_BRO_AVA_GEB, TRAINER_SIS_AND_BRO_AVA_GEB}, - MAP(SIX_ISLAND_OUTCAST_ISLAND) }, + MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) }, { {TRAINER_PSYCHIC_JACLYN, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_JACLYN_2}, - MAP(SIX_ISLAND_GREEN_PATH) }, + MAP(MAP_SIX_ISLAND_GREEN_PATH) }, { {TRAINER_AROMA_LADY_ROSE, TRAINER_AROMA_LADY_ROSE}, - MAP(SIX_ISLAND_WATER_PATH) }, + MAP(MAP_SIX_ISLAND_WATER_PATH) }, { {TRAINER_JUGGLER_EDWARD, TRAINER_JUGGLER_EDWARD}, - MAP(SIX_ISLAND_WATER_PATH) }, + MAP(MAP_SIX_ISLAND_WATER_PATH) }, { {TRAINER_SWIMMER_MALE_SAMIR, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_SAMIR_2}, - MAP(SIX_ISLAND_WATER_PATH) }, + MAP(MAP_SIX_ISLAND_WATER_PATH) }, { {TRAINER_SWIMMER_FEMALE_DENISE, TRAINER_SWIMMER_FEMALE_DENISE}, - MAP(SIX_ISLAND_WATER_PATH) }, + MAP(MAP_SIX_ISLAND_WATER_PATH) }, { {TRAINER_TWINS_MIU_MIA, TRAINER_TWINS_MIU_MIA}, - MAP(SIX_ISLAND_WATER_PATH) }, + MAP(MAP_SIX_ISLAND_WATER_PATH) }, { {TRAINER_HIKER_EARL, SKIP, SKIP, SKIP, SKIP, TRAINER_HIKER_EARL_2}, - MAP(SIX_ISLAND_WATER_PATH) }, + MAP(MAP_SIX_ISLAND_WATER_PATH) }, { {TRAINER_RUIN_MANIAC_STANLY, TRAINER_RUIN_MANIAC_STANLY}, - MAP(SIX_ISLAND_RUIN_VALLEY) }, + MAP(MAP_SIX_ISLAND_RUIN_VALLEY) }, { {TRAINER_RUIN_MANIAC_FOSTER, TRAINER_RUIN_MANIAC_FOSTER}, - MAP(SIX_ISLAND_RUIN_VALLEY) }, + MAP(MAP_SIX_ISLAND_RUIN_VALLEY) }, { {TRAINER_RUIN_MANIAC_LARRY, SKIP, SKIP, SKIP, SKIP, TRAINER_RUIN_MANIAC_LARRY_2}, - MAP(SIX_ISLAND_RUIN_VALLEY) }, + MAP(MAP_SIX_ISLAND_RUIN_VALLEY) }, { {TRAINER_HIKER_DARYL, TRAINER_HIKER_DARYL}, - MAP(SIX_ISLAND_RUIN_VALLEY) }, + MAP(MAP_SIX_ISLAND_RUIN_VALLEY) }, { {TRAINER_POKEMANIAC_HECTOR, SKIP, SKIP, SKIP, SKIP, TRAINER_POKEMANIAC_HECTOR_2}, - MAP(SIX_ISLAND_RUIN_VALLEY) }, + MAP(MAP_SIX_ISLAND_RUIN_VALLEY) }, { {TRAINER_PSYCHIC_DARIO, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_DARIO_2}, - MAP(SEVEN_ISLAND_TRAINER_TOWER) }, + MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER) }, { {TRAINER_PSYCHIC_RODETTE, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_RODETTE_2}, - MAP(SEVEN_ISLAND_TRAINER_TOWER) }, + MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER) }, { {TRAINER_AROMA_LADY_MIAH, TRAINER_AROMA_LADY_MIAH}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, { {TRAINER_YOUNG_COUPLE_EVE_JON, TRAINER_YOUNG_COUPLE_EVE_JON}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, { {TRAINER_JUGGLER_MASON, SKIP, SKIP, SKIP, SKIP, TRAINER_JUGGLER_MASON_2}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, { {TRAINER_PKMN_RANGER_NICOLAS, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_NICOLAS_2}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, { {TRAINER_PKMN_RANGER_MADELINE, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_MADELINE_2}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, { {TRAINER_CRUSH_GIRL_CYNDY, SKIP, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_CYNDY_2}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) }, { {TRAINER_TAMER_EVAN, SKIP, SKIP, SKIP, SKIP, TRAINER_TAMER_EVAN_2}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) }, { {TRAINER_PKMN_RANGER_JACKSON, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_JACKSON_2}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) }, { {TRAINER_PKMN_RANGER_KATELYN, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_KATELYN_2}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) }, { {TRAINER_COOLTRAINER_LEROY, SKIP, SKIP, SKIP, SKIP, TRAINER_COOLTRAINER_LEROY_2}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) }, { {TRAINER_COOLTRAINER_MICHELLE, SKIP, SKIP, SKIP, SKIP, TRAINER_COOLTRAINER_MICHELLE_2}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) }, { {TRAINER_COOL_COUPLE_LEX_NYA, SKIP, SKIP, SKIP, SKIP, TRAINER_COOL_COUPLE_LEX_NYA_2}, - MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, + MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) }, { {TRAINER_RUIN_MANIAC_BRANDON, TRAINER_RUIN_MANIAC_BRANDON}, - MAP(SEVEN_ISLAND_TANOBY_RUINS) }, + MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) }, { {TRAINER_RUIN_MANIAC_BENJAMIN, TRAINER_RUIN_MANIAC_BENJAMIN}, - MAP(SEVEN_ISLAND_TANOBY_RUINS) }, + MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) }, { {TRAINER_PAINTER_EDNA, TRAINER_PAINTER_EDNA}, - MAP(SEVEN_ISLAND_TANOBY_RUINS) }, + MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) }, { {TRAINER_GENTLEMAN_CLIFFORD, TRAINER_GENTLEMAN_CLIFFORD}, - MAP(SEVEN_ISLAND_TANOBY_RUINS) }, + MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) }, }; static const u8 sMovementScript_Wait48[] = { @@ -823,12 +825,12 @@ static void GatherNearbyTrainerInfo(void) vsSeekerObjectIdx++; } } - sVsSeeker->trainerInfo[vsSeekerObjectIdx].localId = 0xFF; + sVsSeeker->trainerInfo[vsSeekerObjectIdx].localId = NO_REMATCH_LOCALID; } static void Task_VsSeeker_3(u8 taskId) { - if (ScriptMovement_IsObjectMovementFinished(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup)) + if (ScriptMovement_IsObjectMovementFinished(NO_REMATCH_LOCALID, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup)) { if (sVsSeeker->responseCode == VSSEEKER_RESPONSE_NO_RESPONSE) { @@ -852,7 +854,7 @@ static u8 CanUseVsSeeker(void) u8 vsSeekerChargeSteps = gSaveBlock1Ptr->trainerRematchStepCounter; if (vsSeekerChargeSteps == 100) { - if (GetRematchableTrainerLocalId() == 0xFF) + if (GetRematchableTrainerLocalId() == NO_REMATCH_LOCALID) return VSSEEKER_NO_ONE_IN_RANGE; else return VSSEEKER_CAN_USE; @@ -873,7 +875,7 @@ static u8 GetVsSeekerResponseInArea(const struct RematchData * vsSeekerData) u8 response = 0; s32 vsSeekerIdx = 0; - while (sVsSeeker->trainerInfo[vsSeekerIdx].localId != 0xFF) + while (sVsSeeker->trainerInfo[vsSeekerIdx].localId != NO_REMATCH_LOCALID) { if (IsTrainerVisibleOnScreen(&sVsSeeker->trainerInfo[vsSeekerIdx]) == TRUE) { @@ -1258,7 +1260,7 @@ static u8 GetRematchableTrainerLocalId(void) u8 idx; u8 i; - for (i = 0; sVsSeeker->trainerInfo[i].localId != 0xFF; i++) + for (i = 0; sVsSeeker->trainerInfo[i].localId != NO_REMATCH_LOCALID; i++) { if (IsTrainerVisibleOnScreen(&sVsSeeker->trainerInfo[i]) == 1) { @@ -1267,7 +1269,7 @@ static u8 GetRematchableTrainerLocalId(void) } } - return 0xFF; + return NO_REMATCH_LOCALID; } static void StartTrainerObjectMovementScript(struct VsSeekerTrainerInfo * trainerInfo, const u8 * script) @@ -1304,7 +1306,7 @@ static void StartAllRespondantIdleMovements(void) for (i = 0; i < sVsSeeker->numRematchableTrainers; i++) { - for (j = 0; sVsSeeker->trainerInfo[j].localId != 0xFF; j++) + for (j = 0; sVsSeeker->trainerInfo[j].localId != NO_REMATCH_LOCALID; j++) { if (sVsSeeker->trainerInfo[j].trainerIdx == sVsSeeker->trainerIdxArray[i]) { diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 125cdac6a..fa358c028 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -180,14 +180,14 @@ static u16 GetCurrentMapWildMonHeaderId(void) for (i = 0; ; i++) { const struct WildPokemonHeader * wildHeader = &gWildMonHeaders[i]; - if (wildHeader->mapGroup == MAP_GROUP(UNDEFINED)) + if (wildHeader->mapGroup == MAP_GROUP(MAP_UNDEFINED)) break; if (gWildMonHeaders[i].mapGroup == gSaveBlock1Ptr->location.mapGroup && gWildMonHeaders[i].mapNum == gSaveBlock1Ptr->location.mapNum) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SIX_ISLAND_ALTERING_CAVE) && - gSaveBlock1Ptr->location.mapNum == MAP_NUM(SIX_ISLAND_ALTERING_CAVE)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SIX_ISLAND_ALTERING_CAVE) && + gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SIX_ISLAND_ALTERING_CAVE)) { u16 alteringCaveId = VarGet(VAR_ALTERING_CAVE_WILD_SET); if (alteringCaveId >= NUM_ALTERING_CAVE_TABLES) @@ -209,15 +209,15 @@ static bool8 UnlockedTanobyOrAreNotInTanoby(void) { if (FlagGet(FLAG_SYS_UNLOCKED_TANOBY_RUINS)) return TRUE; - if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER)) + if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER)) return TRUE; - if (!(gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER) + if (!(gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER) )) return TRUE; return FALSE; @@ -234,7 +234,7 @@ static void GenerateWildMon(u16 species, u8 level, u8 slot) } else { - chamber = gSaveBlock1Ptr->location.mapNum - MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER); + chamber = gSaveBlock1Ptr->location.mapNum - MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER); personality = GenerateUnownPersonalityByLetter(sUnownLetterSlots[chamber][slot]); CreateMon(&gEnemyParty[0], species, level, USE_RANDOM_IVS, TRUE, personality, FALSE, 0); } diff --git a/src/wild_pokemon_area.c b/src/wild_pokemon_area.c index 1fc25e12c..e824811d1 100644 --- a/src/wild_pokemon_area.c +++ b/src/wild_pokemon_area.c @@ -181,7 +181,7 @@ s32 GetSpeciesPokedexAreaMarkers(u16 species, struct Subsprite * subsprites) alteringCaveNum = VarGet(VAR_ALTERING_CAVE_WILD_SET); if (alteringCaveNum >= NUM_ALTERING_CAVE_TABLES) alteringCaveNum = 0; - for (i = 0, areaCount = 0; gWildMonHeaders[i].mapGroup != MAP_GROUP(UNDEFINED); i++) + for (i = 0, areaCount = 0; gWildMonHeaders[i].mapGroup != MAP_GROUP(MAP_UNDEFINED); i++) { mapSecId = GetMapSecIdFromWildMonHeader(&gWildMonHeaders[i]); if (mapSecId == MAPSEC_ALTERING_CAVE) diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 94328b485..8d8ec4e4e 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -96,6 +96,29 @@ string json_to_string(const Json &data, const string &field = "", bool silent = return output; } +string get_generated_warning(const string &filename, bool isAsm) { + string comment = isAsm ? "@" : "//"; + + ostringstream warning; + warning << comment << "\n" + << comment << " DO NOT MODIFY THIS FILE! It is auto-generated from " << filename << "\n" + << comment << "\n\n"; + return warning.str(); +} + +string get_include_guard_start(const string &name) { + ostringstream guard; + guard << "#ifndef GUARD_" << name << "_H\n" + << "#define GUARD_" << name << "_H\n\n"; + return guard.str(); +} + +string get_include_guard_end(const string &name) { + ostringstream guard; + guard << "#endif // GUARD_" << name << "_H\n"; + return guard.str(); +} + string generate_map_header_text(Json map_data, Json layouts_data) { string map_layout_id = json_to_string(map_data, "layout"); @@ -114,8 +137,7 @@ string generate_map_header_text(Json map_data, Json layouts_data) { ostringstream text; string mapName = json_to_string(map_data, "name"); - - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n"; + text << get_generated_warning("data/maps/" + mapName + "/map.json", true); text << mapName << ":\n" << "\t.4byte " << json_to_string(layout, "name") << "\n"; @@ -167,12 +189,10 @@ string generate_map_connections_text(Json map_data) { if (map_data["connections"] == Json()) return string("\n"); - ostringstream text; - string mapName = json_to_string(map_data, "name"); - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n"; - + ostringstream text; + text << get_generated_warning("data/maps/" + mapName + "/map.json", true); text << mapName << "_MapConnectionsList:\n"; for (auto &connection : map_data["connections"].array_items()) { @@ -193,11 +213,11 @@ string generate_map_events_text(Json map_data) { if (map_data.object_items().find("shared_events_map") != map_data.object_items().end()) return string("\n"); - ostringstream text; - string mapName = json_to_string(map_data, "name"); - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n\t.align 2\n\n"; + ostringstream text; + text << get_generated_warning("data/maps/" + mapName + "/map.json", true); + text << "\t.align 2\n\n"; string objects_label, warps_label, coords_label, bgs_label; @@ -371,10 +391,52 @@ void process_map(string map_filepath, string layouts_filepath, string output_dir write_text_file(out_dir + "connections.inc", connections_text); } +void process_event_constants(const vector &map_filepaths, string output_ids_file) { + string warning = get_generated_warning("data/maps/*/map.json", false); + + string guard_name = "CONSTANTS_MAP_EVENT_IDS"; + ostringstream ids_file_text; + ids_file_text << get_include_guard_start(guard_name) << warning; + + for (const string &filepath : map_filepaths) { + string err; + string map_json_text = read_text_file(filepath); + Json map_data = Json::parse(map_json_text, err); + if (map_data == Json()) + FATAL_ERROR("Failed to read '%s' while generating map event constants: %s\n", filepath.c_str(), err.c_str()); + + string map_id = json_to_string(map_data, "id"); + + // Get IDs from the object/clone events. + ostringstream map_ids_text; + auto obj_events = map_data["object_events"].array_items(); + for (unsigned int i = 0; i < obj_events.size(); i++) { + auto obj_event = obj_events[i]; + if (obj_event.object_items().find("local_id") != obj_event.object_items().end()) + map_ids_text << "#define " << json_to_string(obj_event, "local_id") << " " << i + 1 << "\n"; + } + // Get IDs from the warp events. + auto warp_events = map_data["warp_events"].array_items(); + for (unsigned int i = 0; i < warp_events.size(); i++) { + auto warp_event = warp_events[i]; + if (warp_event.object_items().find("warp_id") != warp_event.object_items().end()) + map_ids_text << "#define " << json_to_string(warp_event, "warp_id") << " " << i << "\n"; + } + // Only output if we found any IDs + string temp = map_ids_text.str(); + if (!temp.empty()) { + ids_file_text << "// " << map_id << "\n" << temp << "\n"; + } + } + + ids_file_text << get_include_guard_end(guard_name); + write_text_file(output_ids_file, ids_file_text.str()); +} + string generate_groups_text(Json groups_data) { ostringstream text; - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n"; + text << get_generated_warning("data/maps/map_groups.json", true); for (auto &key : groups_data["group_order"].array_items()) { string group = json_to_string(key); @@ -415,7 +477,7 @@ string generate_connections_text(Json groups_data, string include_path) { ostringstream text; - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n"; + text << get_generated_warning("data/maps/map_groups.json", true); for (Json map_name : map_names) text << "\t.include \"" << include_path << "/" << json_to_string(map_name) << "/connections.inc\"\n"; @@ -432,7 +494,7 @@ string generate_headers_text(Json groups_data, string include_path) { ostringstream text; - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n"; + text << get_generated_warning("data/maps/map_groups.json", true); for (string map_name : map_names) text << "\t.include \"" << include_path << "/" << map_name << "/header.inc\"\n"; @@ -449,7 +511,7 @@ string generate_events_text(Json groups_data, string include_path) { ostringstream text; - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from " << include_path << "/map_groups.json\n@\n\n"; + text << get_generated_warning(include_path + "/map_groups.json", true); for (string map_name : map_names) text << "\t.include \"" << include_path << "/" << map_name << "/events.inc\"\n"; @@ -460,12 +522,9 @@ string generate_events_text(Json groups_data, string include_path) { string generate_map_constants_text(string groups_filepath, Json groups_data) { string file_dir = file_parent(groups_filepath) + sep; + string guard_name = "CONSTANTS_MAP_GROUPS"; ostringstream text; - - text << "#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n" - << "#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n"; - - text << "//\n// DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n//\n\n"; + text << get_include_guard_start(guard_name) << get_generated_warning("data/maps/map_groups.json", false); int group_num = 0; @@ -498,7 +557,7 @@ string generate_map_constants_text(string groups_filepath, Json groups_data) { } text << "#define MAP_GROUPS_COUNT " << group_num << "\n\n"; - text << "#endif // GUARD_CONSTANTS_MAP_GROUPS_H\n"; + text << get_include_guard_end(guard_name); return text.str(); } @@ -530,7 +589,7 @@ void process_groups(string groups_filepath, string output_asm, string output_c) string generate_layout_headers_text(Json layouts_data) { ostringstream text; - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/layouts/layouts.json\n@\n\n"; + text << get_generated_warning("data/layouts/layouts.json", true); for (auto &layout : layouts_data["layouts"].array_items()) { if (layout == Json::object()) continue; @@ -563,7 +622,7 @@ string generate_layout_headers_text(Json layouts_data) { string generate_layouts_table_text(Json layouts_data) { ostringstream text; - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/layouts/layouts.json\n@\n\n"; + text << get_generated_warning("data/layouts/layouts.json", true); text << "\t.align 2\n" << json_to_string(layouts_data, "layouts_table_label") << "::\n"; @@ -578,12 +637,9 @@ string generate_layouts_table_text(Json layouts_data) { } string generate_layouts_constants_text(Json layouts_data) { + string guard_name = "CONSTANTS_LAYOUTS"; ostringstream text; - - text << "#ifndef GUARD_CONSTANTS_LAYOUTS_H\n" - << "#define GUARD_CONSTANTS_LAYOUTS_H\n\n"; - - text << "//\n// DO NOT MODIFY THIS FILE! It is auto-generated from data/layouts/layouts.json\n//\n\n"; + text << get_include_guard_start(guard_name) << get_generated_warning("data/layouts/layouts.json", false); int i = 1; for (auto &layout : layouts_data["layouts"].array_items()) { @@ -592,7 +648,7 @@ string generate_layouts_constants_text(Json layouts_data) { i++; } - text << "\n#endif // GUARD_CONSTANTS_LAYOUTS_H\n"; + text << get_include_guard_end(guard_name); return text.str(); } @@ -627,9 +683,6 @@ int main(int argc, char *argv[]) { char *mode_arg = argv[1]; string mode(mode_arg); - if (mode != "layouts" && mode != "map" && mode != "groups") - FATAL_ERROR("ERROR: must be 'layouts', 'map', or 'groups'.\n"); - if (mode == "map") { if (argc != 6) FATAL_ERROR("USAGE: mapjson map \n"); @@ -663,8 +716,24 @@ int main(int argc, char *argv[]) { process_layouts(filepath, output_asm, output_c); } + else if (mode == "event_constants") { + if (argc < 5) + FATAL_ERROR("USAGE: mapjson event_constants [additional_map_files] "); + + infer_separator(argv[3]); + + vector filepaths; + const int firstMapFileArg = 3; + const int lastMapFileArg = argc - 2; + for (int i = firstMapFileArg; i <= lastMapFileArg; i++) { + filepaths.push_back(argv[i]); + } + string output_ids_file(argv[argc - 1]); + + process_event_constants(filepaths, output_ids_file); + } else { - FATAL_ERROR("ERROR: must be 'layouts', 'map', or 'groups'.\n"); + FATAL_ERROR("ERROR: must be 'layouts', 'map', 'event_constants', or 'groups'.\n"); } return 0;