Merge pull request #693 from pret/porymap-6

Update for Porymap 6

Author: GriffinRichards

.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

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 <AUTO_GEN_TARGETS>"
 
 ifeq ($(MODERN),0)
 $(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork

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

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,

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

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",

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"
     },
     {

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

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,

data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc

@@ -1,5 +1,3 @@
-.set LOCALID_EEVEE_POKEBALL, 2
-
 CeladonCity_Condominiums_RoofRoom_MapScripts::
 	.byte 0