Merge pull request #220 from PikalaxALT/trainer_rematch

Decompile trainer_rematch

5 files changed, 14 insertions, 23 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 6668f0d1f..42c5aa1ad 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1161,7 +1161,7 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_0x376
 	setflag FLAG_0x374
 	setflag FLAG_0x375
-	setflag FLAG_0x3C1
+	setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
 	setflag FLAG_0x378
 	setflag FLAG_0x2F0
 	setflag FLAG_0x2F5
@@ -1177,7 +1177,7 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_0x38F
 	setflag FLAG_0x393
 	setflag FLAG_0x358
-	setflag FLAG_0x390
+	setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
 	setflag FLAG_0x2FD
 	setflag FLAG_0x398
 	setflag FLAG_0x399
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
index 1c48e9710..40578a907 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -5,18 +5,18 @@ MauvilleCity_MapScripts:: @ 81DF385
 MauvilleCity_MapScript1_1DF38B: @ 81DF38B
 	setflag FLAG_VISITED_MAUVILLE_CITY
 	clearflag FLAG_0x09D
-	clearflag FLAG_0x3C1
+	clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
 	setflag FLAG_SYS_TV_START
 	clearflag FLAG_0x063
 	setvar VAR_0x4093, 0
-	checkflag FLAG_0x0D1
+	checkflag FLAG_GOT_TM24_FROM_WATTSON
 	call_if 1, MauvilleCity_EventScript_1DF3A9
 	end
 
 MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9
-	clearflag FLAG_0x391
-	setflag FLAG_0x390
-	setflag FLAG_0x05B
+	clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
+	setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
+	setflag FLAG_WATTSON_REMATCH_AVAILABLE
 	return
 
 MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3
@@ -424,15 +424,15 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F
 MauvilleCity_EventScript_1DF73A:: @ 81DF73A
 	lock
 	faceplayer
-	checkflag FLAG_0x0D1
+	checkflag FLAG_GOT_TM24_FROM_WATTSON
 	goto_eq MauvilleCity_EventScript_1DF7B0
 	compare VAR_0x40BA, 2
 	goto_eq MauvilleCity_EventScript_1DF784
-	checkflag FLAG_0x0D0
+	checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
 	goto_eq MauvilleCity_EventScript_1DF77A
 	msgbox MauvilleCity_Text_1DFFE4, 4
 	giveitem_std ITEM_BASEMENT_KEY
-	setflag FLAG_0x0D0
+	setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
 	msgbox MauvilleCity_Text_1E0154, 4
 	release
 	end
@@ -447,7 +447,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784
 	giveitem_std ITEM_TM24
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_EventScript_272054
-	setflag FLAG_0x0D1
+	setflag FLAG_GOT_TM24_FROM_WATTSON
 	msgbox MauvilleCity_Text_1E02AA, 4
 	release
 	end
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 627ae904c..2751e345e 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -423,8 +423,8 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
 	setflag FLAG_BADGE05_GET
 	special sub_813B9A0
 	call PetalburgCity_Gym_EventScript_2721F8
-	setflag FLAG_0x391
-	clearflag FLAG_0x390
+	setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
+	clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
 	setvar VAR_0x8008, 5
 	call PetalburgCity_Gym_EventScript_271F43
 	clearflag FLAG_0x3AC
diff --git a/data/trainer_rematch.s b/data/trainer_rematch.s
deleted file mode 100644
index e3a05ba8b..000000000
--- a/data/trainer_rematch.s
+++ /dev/null
@@ -1,10 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_0862AD34:: @ 862AD34
-	.2byte 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048
-
-gUnknown_0862AD44:: @ 862AD44
-	.2byte 0x0041, 0x0042, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0000
diff --git a/data/unk_transition.s b/data/unk_transition.s
index 2dc54e22d..db5744d08 100644
--- a/data/unk_transition.s
+++ b/data/unk_transition.s
@@ -3,6 +3,7 @@
 
 	.section .rodata
 
+	.align 2, 0
 gUnknown_0862AD54:: @ 862AD54
 	.incbin "graphics/battle_transitions/frontier_transition.4bpp.lz"