1 files changed, 57 insertions, 55 deletions
diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm
index 0b63708b..7380f98f 100755
--- a/scripts/silphco5.asm
+++ b/scripts/silphco5.asm
@@ -13,54 +13,56 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
-	ld hl, SilphCo5Coords
+	ld hl, SilphCo5GateCoords
 	call SilphCo4Script_19d5d
 	call SilphCo5Script_19f9e
-	ld a, [wd82c]
-	bit 0, a
-	jr nz, .asm_19f74 ; 0x19f63 $f
+	CheckEvent EVENT_SILPH_CO_5_UNLOCKED_DOOR1
+	jr nz, .asm_19f74
 	push af
 	ld a, $5f
-	ld [wd09f], a
-	ld bc, $0203
+	ld [wNewTileBlockID], a
+	lb bc, 2, 3
 	predef ReplaceTileBlock
 	pop af
 .asm_19f74
-	bit 1, a
-	jr nz, .asm_19f87 ; 0x19f76 $f
+	CheckEventAfterBranchReuseA EVENT_SILPH_CO_5_UNLOCKED_DOOR2, EVENT_SILPH_CO_5_UNLOCKED_DOOR1
+	jr nz, .asm_19f87
 	push af
 	ld a, $5f
-	ld [wd09f], a
-	ld bc, $0603
+	ld [wNewTileBlockID], a
+	lb bc, 6, 3
 	predef ReplaceTileBlock
 	pop af
 .asm_19f87
-	bit 2, a
+	CheckEventAfterBranchReuseA EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR2
 	ret nz
 	ld a, $5f
-	ld [wd09f], a
-	ld bc, $0507
+	ld [wNewTileBlockID], a
+	lb bc, 5, 7
 	predef_jump ReplaceTileBlock
 
-SilphCo5Coords: ; 19f97 (6:5f97) ; coords?
-	db $02, $03, $06, $03, $05, $07, $ff
+SilphCo5GateCoords: ; 19f97 (6:5f97)
+	db $02,$03
+	db $06,$03
+	db $05,$07
+	db $FF
 
 SilphCo5Script_19f9e: ; 19f9e (6:5f9e)
-	ld hl, wd82c
+	EventFlagAddress hl, EVENT_SILPH_CO_5_UNLOCKED_DOOR1
 	ld a, [$ffe0]
 	and a
 	ret z
 	cp $1
-	jr nz, .asm_19fac ; 0x19fa7 $3
-	set 0, [hl]
+	jr nz, .next1
+	SetEventReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR1
 	ret
-.asm_19fac
+.next1
 	cp $2
-	jr nz, .asm_19fb3 ; 0x19fae $3
-	set 1, [hl]
+	jr nz, .next2
+	SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR2, EVENT_SILPH_CO_5_UNLOCKED_DOOR1
 	ret
-.asm_19fb3
-	set 2, [hl]
+.next2
+	SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1
 	ret
 
 SilphCo5ScriptPointers: ; 19fb6 (6:5fb6)
@@ -74,54 +76,54 @@ SilphCo5TextPointers: ; 19fbc (6:5fbc)
 	dw SilphCo5Text3
 	dw SilphCo5Text4
 	dw SilphCo5Text5
-	dw Predef5CText
-	dw Predef5CText
-	dw Predef5CText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
 	dw SilphCo5Text9
 	dw SilphCo5Text10
 	dw SilphCo5Text11
 
 SilphCo5TrainerHeaders: ; 19fd2 (6:5fd2)
 Silphco5TrainerHeader0: ; 19fd2 (6:5fd2)
-	db $2 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0
 	db ($1 << 4) ; trainer's view range
-	dw wd82b ; flag's byte
-	dw SilphCo5BattleText2 ; 0x6024 TextBeforeBattle
-	dw SilphCo5AfterBattleText2 ; 0x602e TextAfterBattle
-	dw SilphCo5EndBattleText2 ; 0x6029 TextEndBattle
-	dw SilphCo5EndBattleText2 ; 0x6029 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0
+	dw SilphCo5BattleText2 ; TextBeforeBattle
+	dw SilphCo5AfterBattleText2 ; TextAfterBattle
+	dw SilphCo5EndBattleText2 ; TextEndBattle
+	dw SilphCo5EndBattleText2 ; TextEndBattle
 
 Silphco5TrainerHeader2: ; 19fde (6:5fde)
-	db $3 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dw wd82b ; flag's byte
-	dw SilphCo5BattleText3 ; 0x603d TextBeforeBattle
-	dw SilphCo5AfterBattleText3 ; 0x6047 TextAfterBattle
-	dw SilphCo5EndBattleText3 ; 0x6042 TextEndBattle
-	dw SilphCo5EndBattleText3 ; 0x6042 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2
+	dw SilphCo5BattleText3 ; TextBeforeBattle
+	dw SilphCo5AfterBattleText3 ; TextAfterBattle
+	dw SilphCo5EndBattleText3 ; TextEndBattle
+	dw SilphCo5EndBattleText3 ; TextEndBattle
 
 Silphco5TrainerHeader3: ; 19fea (6:5fea)
-	db $4 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dw wd82b ; flag's byte
-	dw SilphCo5BattleText4 ; 0x6056 TextBeforeBattle
-	dw SilphCo5AfterBattleText4 ; 0x6060 TextAfterBattle
-	dw SilphCo5EndBattleText4 ; 0x605b TextEndBattle
-	dw SilphCo5EndBattleText4 ; 0x605b TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3
+	dw SilphCo5BattleText4 ; TextBeforeBattle
+	dw SilphCo5AfterBattleText4 ; TextAfterBattle
+	dw SilphCo5EndBattleText4 ; TextEndBattle
+	dw SilphCo5EndBattleText4 ; TextEndBattle
 
 Silphco5TrainerHeader4: ; 19ff6 (6:5ff6)
-	db $5 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dw wd82b ; flag's byte
-	dw SilphCo5BattleText5 ; 0x606f TextBeforeBattle
-	dw SilphCo5AfterBattleText5 ; 0x6079 TextAfterBattle
-	dw SilphCo5EndBattleText5 ; 0x6074 TextEndBattle
-	dw SilphCo5EndBattleText5 ; 0x6074 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_4
+	dw SilphCo5BattleText5 ; TextBeforeBattle
+	dw SilphCo5AfterBattleText5 ; TextAfterBattle
+	dw SilphCo5EndBattleText5 ; TextEndBattle
+	dw SilphCo5EndBattleText5 ; TextEndBattle
 
 	db $ff
 
 SilphCo5Text1: ; 1a003 (6:6003)
-	db $08 ; asm
+	TX_ASM
 	ld hl, SilphCo5Text_1a010
 	ld de, SilphCo5Text_1a015
 	call SilphCo6Script_1a22f
@@ -136,7 +138,7 @@ SilphCo5Text_1a015: ; 1a015 (6:6015)
 	db "@"
 
 SilphCo5Text2: ; 1a01a (6:601a)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Silphco5TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -154,7 +156,7 @@ SilphCo5AfterBattleText2: ; 1a02e (6:602e)
 	db "@"
 
 SilphCo5Text3: ; 1a033 (6:6033)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Silphco5TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -172,7 +174,7 @@ SilphCo5AfterBattleText3: ; 1a047 (6:6047)
 	db "@"
 
 SilphCo5Text4: ; 1a04c (6:604c)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Silphco5TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -190,7 +192,7 @@ SilphCo5AfterBattleText4: ; 1a060 (6:6060)
 	db "@"
 
 SilphCo5Text5: ; 1a065 (6:6065)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Silphco5TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd