Merge branch 'master' of https://github.com/iimarckus/pokered

Doesn't build.

1 files changed, 35 insertions, 35 deletions

diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm
index 7b0c67c1..bdaac452 100755
--- a/scripts/silphco3.asm
+++ b/scripts/silphco3.asm
@@ -13,40 +13,41 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71)
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
-	ld hl, DataTable_59fa8 ; $5fa8
+	ld hl, SilphCo3GateCoords
 	call SilphCo2Script_59d43
 	call SilphCo3Script_59fad
-	ld a, [wd828]
-	bit 0, a
+	CheckEvent EVENT_SILPH_CO_3_UNLOCKED_DOOR1
 	jr nz, .asm_59f98
 	push af
 	ld a, $5f
-	ld [wd09f], a
-	ld bc, $404
+	ld [wNewTileBlockID], a
+	lb bc, 4, 4
 	predef ReplaceTileBlock
 	pop af
 .asm_59f98
-	bit 1, a
+	CheckEventAfterBranchReuseA EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1
 	ret nz
 	ld a, $5f
-	ld [wd09f], a
-	ld bc, $408
+	ld [wNewTileBlockID], a
+	lb bc, 4, 8
 	predef_jump ReplaceTileBlock
 
-DataTable_59fa8: ; 59fa8 (16:5fa8)
-	db $04,$04,$04,$08,$FF
+SilphCo3GateCoords: ; 59fa8 (16:5fa8)
+	db $04,$04
+	db $04,$08
+	db $FF
 
 SilphCo3Script_59fad: ; 59fad (16:5fad)
-	ld hl, wd828
+	EventFlagAddress hl, EVENT_SILPH_CO_3_UNLOCKED_DOOR1
 	ld a, [$ffe0]
 	and a
 	ret z
 	cp $1
-	jr nz, .asm_59fbb
-	set 0, [hl]
+	jr nz, .next
+	SetEventReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR1
 	ret
-.asm_59fbb
-	set 1, [hl]
+.next
+	SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1
 	ret
 
 SilphCo3ScriptPointers: ; 59fbe (16:5fbe)
@@ -58,37 +59,36 @@ SilphCo3TextPointers: ; 59fc4 (16:5fc4)
 	dw SilphCo3Text1
 	dw SilphCo3Text2
 	dw SilphCo3Text3
-	dw Predef5CText
+	dw PickUpItemText
 
 SilphCo3TrainerHeaders: ; 59fcc (16:5fcc)
 SilphCo3TrainerHeader0: ; 59fcc (16:5fcc)
-	db $2 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0
 	db ($2 << 4) ; trainer's view range
-	dw wd827 ; flag's byte
-	dw SilphCo3BattleText1 ; 0x600d TextBeforeBattle
-	dw SilphCo3AfterBattleText1 ; 0x6017 TextAfterBattle
-	dw SilphCo3EndBattleText1 ; 0x6012 TextEndBattle
-	dw SilphCo3EndBattleText1 ; 0x6012 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_0
+	dw SilphCo3BattleText1 ; TextBeforeBattle
+	dw SilphCo3AfterBattleText1 ; TextAfterBattle
+	dw SilphCo3EndBattleText1 ; TextEndBattle
+	dw SilphCo3EndBattleText1 ; TextEndBattle
 
 SilphCo3TrainerHeader1: ; 59fd8 (16:5fd8)
-	db $3 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dw wd827 ; flag's byte
-	dw SilphCo3BattleText2 ; 0x6026 TextBeforeBattle
-	dw SilphCo3AfterBattleText2 ; 0x6030 TextAfterBattle
-	dw SilphCo3EndBattleText2 ; 0x602b TextEndBattle
-	dw SilphCo3EndBattleText2 ; 0x602b TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_1
+	dw SilphCo3BattleText2 ; TextBeforeBattle
+	dw SilphCo3AfterBattleText2 ; TextAfterBattle
+	dw SilphCo3EndBattleText2 ; TextEndBattle
+	dw SilphCo3EndBattleText2 ; TextEndBattle
 
 	db $ff
 
 SilphCo3Text1: ; 59fe5 (16:5fe5)
-	db $08 ; asm
-	ld a, [wd838]
-	bit 7, a
+	TX_ASM
+	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ld hl, SilphCo3Text_59ffe
-	jr nz, asm_8c56f ; 0x59fee
+	jr nz, .asm_59fee
 	ld hl, SilphCo3Text_59ff9
-asm_8c56f ; 0x59ff3
+.asm_59fee
 	call PrintText
 	jp TextScriptEnd
 
@@ -101,7 +101,7 @@ SilphCo3Text_59ffe: ; 59ffe (16:5ffe)
 	db "@"
 
 SilphCo3Text2: ; 5a003 (16:6003)
-	db $08 ; asm
+	TX_ASM
 	ld hl, SilphCo3TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -119,7 +119,7 @@ SilphCo3AfterBattleText1: ; 5a017 (16:6017)
 	db "@"
 
 SilphCo3Text3: ; 5a01c (16:601c)
-	db $08 ; asm
+	TX_ASM
 	ld hl, SilphCo3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd