Merge branch 'master' of github.com:pret/pokefirered into trade

2 files changed, 26 insertions, 26 deletions

diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json
index 52ce32061..8763c72fa 100644
--- a/data/maps/SixIsland_PatternBush/map.json
+++ b/data/maps/SixIsland_PatternBush/map.json
@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "28",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
       "x": 48,
       "y": 15,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "28",
+      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
       "x": 10,
       "y": 5,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "20",
+      "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
       "x": 51,
       "y": 6,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "20",
+      "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
       "x": 12,
       "y": 13,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "20",
+      "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
       "x": 37,
       "y": 23,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "18",
+      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
       "x": 32,
       "y": 5,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "18",
+      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
       "x": 52,
       "y": 20,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "22",
+      "graphics_id": "MAP_OBJ_GFX_LASS",
       "x": 8,
       "y": 21,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "22",
+      "graphics_id": "MAP_OBJ_GFX_LASS",
       "x": 39,
       "y": 6,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "39",
+      "graphics_id": "MAP_OBJ_GFX_CAMPER",
       "x": 3,
       "y": 9,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "40",
+      "graphics_id": "MAP_OBJ_GFX_PICNICKER",
       "x": 19,
       "y": 24,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "56",
+      "graphics_id": "MAP_OBJ_GFX_HIKER",
       "x": 30,
       "y": 19,
       "elevation": 3,
diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc
index 0575b4855..11192b895 100644
--- a/data/maps/SixIsland_PatternBush/scripts.inc
+++ b/data/maps/SixIsland_PatternBush/scripts.inc
@@ -6,9 +6,9 @@ SixIsland_PatternBush_MapScript1_16455F:: @ 816455F
 	setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH
 	getplayerxy VAR_0x4001, VAR_0x4002
 	compare_var_to_value VAR_0x4001, 50
-	call_if 4, EventScript_16457E
+	call_if ge, EventScript_16457E
 	compare_var_to_value VAR_0x4001, 49
-	call_if 3, EventScript_164587
+	call_if le, EventScript_164587
 	end
 
 EventScript_16457E:: @ 816457E
@@ -20,61 +20,61 @@ EventScript_164587:: @ 8164587
 	return
 
 SixIsland_PatternBush_EventScript_164590:: @ 8164590
-	trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_BETHANY, 0, Text_17BF3A, Text_17BF66
 	msgbox gUnknown_817BF97, 6
 	end
 
 SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7
-	trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_ALLISON, 0, Text_17BFEB, Text_17C028
 	msgbox gUnknown_817C056, 6
 	end
 
 SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE
-	trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_GARRET, 0, Text_17C0BE, Text_17C0F2
 	msgbox gUnknown_817C113, 6
 	end
 
 SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5
-	trainerbattle 0, 612, 0, Text_17C155, Text_17C196
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_JONAH, 0, Text_17C155, Text_17C196
 	msgbox gUnknown_817C1D0, 6
 	end
 
 SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC
-	trainerbattle 0, 613, 0, Text_17C246, Text_17C275
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_VANCE, 0, Text_17C246, Text_17C275
 	msgbox gUnknown_817C2A4, 6
 	end
 
 SixIsland_PatternBush_EventScript_164603:: @ 8164603
-	trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_NASH, 0, Text_17C2D9, Text_17C30D
 	msgbox gUnknown_817C31C, 6
 	end
 
 SixIsland_PatternBush_EventScript_16461A:: @ 816461A
-	trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CORDELL, 0, Text_17C373, Text_17C3A5
 	msgbox gUnknown_817C3CE, 6
 	end
 
 SixIsland_PatternBush_EventScript_164631:: @ 8164631
-	trainerbattle 0, 616, 0, Text_17C42B, Text_17C458
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_DALIA, 0, Text_17C42B, Text_17C458
 	msgbox gUnknown_817C490, 6
 	end
 
 SixIsland_PatternBush_EventScript_164648:: @ 8164648
-	trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JOANA, 0, Text_17C4FE, Text_17C552
 	msgbox gUnknown_817C590, 6
 	end
 
 SixIsland_PatternBush_EventScript_16465F:: @ 816465F
-	trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_RILEY, 0, Text_17C5DB, Text_17C609
 	msgbox gUnknown_817C615, 6
 	end
 
 SixIsland_PatternBush_EventScript_164676:: @ 8164676
-	trainerbattle 0, 619, 0, Text_17C63E, Text_17C660
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MARCY, 0, Text_17C63E, Text_17C660
 	msgbox gUnknown_817C68E, 6
 	end
 
 SixIsland_PatternBush_EventScript_16468D:: @ 816468D
-	trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LAYTON, 0, Text_17C6C9, Text_17C6FB
 	msgbox gUnknown_817C728, 6
 	end