Merge pull request #207 from GriffinRichards/sync-script

Sync scripts with pokeemerald

2 files changed, 44 insertions, 58 deletions

diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json
index 24db68596..34f5bbfce 100644
--- a/data/maps/TwoIsland/map.json
+++ b/data/maps/TwoIsland/map.json
@@ -107,7 +107,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_EventScript_1BEAAF",
+      "script": "TwoIsland_EventScript_ItemRevive",
       "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE"
     },
     {
diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc
index 3d35a89c1..59c4ca6f9 100644
--- a/data/maps/TwoIsland/scripts.inc
+++ b/data/maps/TwoIsland/scripts.inc
@@ -1,46 +1,36 @@
 TwoIsland_MapScripts:: @ 8167564
-	map_script 3, TwoIsland_MapScript1_16756A
+	map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_OnTransition
 	.byte 0
 
-TwoIsland_MapScript1_16756A:: @ 816756A
+TwoIsland_OnTransition:: @ 816756A
 	setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND
 	setflag FLAG_VISITED_TWO_ISLAND
 	call EventScript_167576
 	end
 
 EventScript_167576:: @ 8167576
-	checkflag FLAG_SYS_CAN_LINK_WITH_RS
-	goto_if TRUE, EventScript_167597
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if TRUE, EventScript_1675B8
-	checkflag FLAG_RESCUED_LOSTELLE
-	goto_if TRUE, EventScript_1675D9
+	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167597
+	goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1675B8
+	goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_1675D9
 	goto EventScript_1675E8
 	end
 
 EventScript_167597:: @ 8167597
-	checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
-	goto_if FALSE, EventScript_1675EE
-	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
-	goto_if FALSE, EventScript_1675F4
-	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2
-	goto_if FALSE, EventScript_1675FD
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1675FD
 	goto EventScript_167606
 	end
 
 EventScript_1675B8:: @ 81675B8
-	checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
-	goto_if FALSE, EventScript_1675EE
-	checkflag FLAG_RESCUED_LOSTELLE
-	goto_if FALSE, EventScript_1675EE
-	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
-	goto_if FALSE, EventScript_1675F4
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE
+	goto_if_unset FLAG_RESCUED_LOSTELLE, EventScript_1675EE
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4
 	goto EventScript_1675FD
 	end
 
 EventScript_1675D9:: @ 81675D9
-	checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
-	goto_if FALSE, EventScript_1675EE
+	goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE
 	goto EventScript_1675F4
 	end
 
@@ -69,22 +59,21 @@ EventScript_167606:: @ 8167606
 
 TwoIsland_EventScript_16760F:: @ 816760F
 	special sub_8110AB4
-	compare_var_to_value VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	compare VAR_RESULT, 2
+	goto_if_eq EventScript_1A7AE0
 	lock
 	faceplayer
-	compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4
-	goto_if eq, EventScript_167646
-	compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3
-	goto_if eq, EventScript_16765E
-	compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2
-	goto_if eq, EventScript_167676
+	compare VAR_MAP_SCENE_TWO_ISLAND, 4
+	goto_if_eq EventScript_167646
+	compare VAR_MAP_SCENE_TWO_ISLAND, 3
+	goto_if_eq EventScript_16765E
+	compare VAR_MAP_SCENE_TWO_ISLAND, 2
+	goto_if_eq EventScript_167676
 	goto EventScript_16768E
 	end
 
 EventScript_167646:: @ 8167646
-	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3
-	goto_if TRUE, EventScript_1676A6
+	goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, EventScript_1676A6
 	setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3
 	message Text_181CAE
 	waitmessage
@@ -92,8 +81,7 @@ EventScript_167646:: @ 8167646
 	end
 
 EventScript_16765E:: @ 816765E
-	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2
-	goto_if TRUE, EventScript_1676A6
+	goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1676A6
 	setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2
 	message Text_181C77
 	waitmessage
@@ -101,8 +89,7 @@ EventScript_16765E:: @ 816765E
 	end
 
 EventScript_167676:: @ 8167676
-	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
-	goto_if TRUE, EventScript_1676A6
+	goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1676A6
 	setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
 	message Text_181B7C
 	waitmessage
@@ -110,8 +97,7 @@ EventScript_167676:: @ 8167676
 	end
 
 EventScript_16768E:: @ 816768E
-	checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
-	goto_if TRUE, EventScript_1676A6
+	goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1676A6
 	setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
 	message Text_181AFE
 	waitmessage
@@ -119,20 +105,20 @@ EventScript_16768E:: @ 816768E
 	end
 
 EventScript_1676A6:: @ 81676A6
-	message Text_1A6211
+	message Text_MayIHelpYou
 	waitmessage
-	compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4
-	goto_if eq, EventScript_167728
-	compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3
-	goto_if eq, EventScript_167708
-	compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2
-	goto_if eq, EventScript_1676EC
+	compare VAR_MAP_SCENE_TWO_ISLAND, 4
+	goto_if_eq EventScript_167728
+	compare VAR_MAP_SCENE_TWO_ISLAND, 3
+	goto_if_eq EventScript_167708
+	compare VAR_MAP_SCENE_TWO_ISLAND, 2
+	goto_if_eq EventScript_1676EC
 	goto EventScript_1676D3
 	end
 
 EventScript_1676D3:: @ 81676D3
 	pokemart Items_1676E4
-	msgbox gUnknown_81A5190
+	msgbox Text_PleaseComeAgain
 	release
 	end
 
@@ -146,7 +132,7 @@ Items_1676E4:: @ 81676E4
 
 EventScript_1676EC:: @ 81676EC
 	pokemart Items_1676FC
-	msgbox gUnknown_81A5190
+	msgbox Text_PleaseComeAgain
 	release
 	end
 
@@ -162,7 +148,7 @@ Items_1676FC:: @ 81676FC
 
 EventScript_167708:: @ 8167708
 	pokemart Items_167718
-	msgbox gUnknown_81A5190
+	msgbox Text_PleaseComeAgain
 	release
 	end
 
@@ -180,7 +166,7 @@ Items_167718:: @ 8167718
 
 EventScript_167728:: @ 8167728
 	pokemart Items_167738
-	msgbox gUnknown_81A5190
+	msgbox Text_PleaseComeAgain
 	release
 	end
 
@@ -199,11 +185,11 @@ Items_167738:: @ 8167738
 	end
 
 TwoIsland_EventScript_16774C:: @ 816774C
-	msgbox gUnknown_8181D2F, 2
+	msgbox gUnknown_8181D2F, MSGBOX_NPC
 	end
 
 TwoIsland_EventScript_167755:: @ 8167755
-	msgbox gUnknown_8181DCA, 2
+	msgbox gUnknown_8181DCA, MSGBOX_NPC
 	end
 
 TwoIsland_EventScript_16775E:: @ 816775E
@@ -215,25 +201,25 @@ TwoIsland_EventScript_16775E:: @ 816775E
 	end
 
 TwoIsland_EventScript_167777:: @ 8167777
-	msgbox gUnknown_8181F28, 2
+	msgbox gUnknown_8181F28, MSGBOX_NPC
 	end
 
 TwoIsland_EventScript_167780:: @ 8167780
-	msgbox gUnknown_8181F5D, 2
+	msgbox gUnknown_8181F5D, MSGBOX_NPC
 	end
 
 TwoIsland_EventScript_167789:: @ 8167789
-	msgbox gUnknown_8181FCE, 2
+	msgbox gUnknown_8181FCE, MSGBOX_NPC
 	end
 
 TwoIsland_EventScript_167792:: @ 8167792
-	msgbox gUnknown_8181A88, 3
+	msgbox gUnknown_8181A88, MSGBOX_SIGN
 	end
 
 TwoIsland_EventScript_16779B:: @ 816779B
-	msgbox gUnknown_8181AA7, 3
+	msgbox gUnknown_8181AA7, MSGBOX_SIGN
 	end
 
 TwoIsland_EventScript_1677A4:: @ 81677A4
-	msgbox gUnknown_8181AC8, 3
+	msgbox gUnknown_8181AC8, MSGBOX_SIGN
 	end