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

Doesn't build.

1 files changed, 63 insertions, 71 deletions

diff --git a/scripts/route24.asm b/scripts/route24.asm
index 6916cbe7..6eba1d35 100755
--- a/scripts/route24.asm
+++ b/scripts/route24.asm
@@ -22,22 +22,19 @@ Route24ScriptPointers: ; 513cb (14:53cb)
 	dw Route24Script4
 
 Route24Script0: ; 513d5 (14:53d5)
-	ld a, [wd7ef]
-	bit 0, a
+	CheckEvent EVENT_GOT_NUGGET
 	jp nz, CheckFightingMapTrainers
-	ld hl, CoordsData_5140e ; $540e
+	ld hl, CoordsData_5140e
 	call ArePlayerCoordsInArray
 	jp nc, CheckFightingMapTrainers
 	xor a
 	ld [hJoyHeld], a
 	ld a, $1
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	ld hl, wd7f0
-	bit 1, [hl]
-	res 1, [hl]
+	CheckAndResetEvent EVENT_NUGGET_REWARD_AVAILABLE
 	ret z
-	ld a, $80
+	ld a, D_DOWN
 	ld [wSimulatedJoypadStatesEnd], a
 	ld a, $1
 	ld [wSimulatedJoypadStatesIndex], a
@@ -61,16 +58,15 @@ Route24Script4: ; 51411 (14:5411)
 	ret
 
 Route24Script3: ; 51422 (14:5422)
-	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
+	ld a, [W_ISINBATTLE]
 	cp $ff
 	jp z, Route24Script_513c0
 	call UpdateSprites
 	ld a, $f0
 	ld [wJoyIgnore], a
-	ld hl, wd7ef
-	set 1, [hl]
+	SetEvent EVENT_BEAT_ROUTE24_ROCKET
 	ld a, $1
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	xor a
 	ld [wJoyIgnore], a
@@ -87,79 +83,76 @@ Route24TextPointers: ; 5144b (14:544b)
 	dw Route24Text5
 	dw Route24Text6
 	dw Route24Text7
-	dw Predef5CText
+	dw PickUpItemText
 
 Route24TrainerHeaders: ; 5145b (14:545b)
 Route24TrainerHeader0: ; 5145b (14:545b)
-	db $2 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_0
 	db ($4 << 4) ; trainer's view range
-	dw wd7ef ; flag's byte
-	dw Route24BattleText1 ; 0x5571 TextBeforeBattle
-	dw Route24AfterBattleText1 ; 0x557b TextAfterBattle
-	dw Route24EndBattleText1 ; 0x5576 TextEndBattle
-	dw Route24EndBattleText1 ; 0x5576 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_0
+	dw Route24BattleText1 ; TextBeforeBattle
+	dw Route24AfterBattleText1 ; TextAfterBattle
+	dw Route24EndBattleText1 ; TextEndBattle
+	dw Route24EndBattleText1 ; TextEndBattle
 
 Route24TrainerHeader2: ; 51467 (14:5467)
-	db $3 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2
 	db ($1 << 4) ; trainer's view range
-	dw wd7ef ; flag's byte
-	dw Route24BattleText2 ; 0x5580 TextBeforeBattle
-	dw Route24AfterBattleText2 ; 0x558a TextAfterBattle
-	dw Route24EndBattleText2 ; 0x5585 TextEndBattle
-	dw Route24EndBattleText2 ; 0x5585 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2
+	dw Route24BattleText2 ; TextBeforeBattle
+	dw Route24AfterBattleText2 ; TextAfterBattle
+	dw Route24EndBattleText2 ; TextEndBattle
+	dw Route24EndBattleText2 ; TextEndBattle
 
 Route24TrainerHeader3: ; 51473 (14:5473)
-	db $4 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3
 	db ($1 << 4) ; trainer's view range
-	dw wd7ef ; flag's byte
-	dw Route24BattleText3 ; 0x558f TextBeforeBattle
-	dw Route24AfterBattleText3 ; 0x5599 TextAfterBattle
-	dw Route24EndBattleText3 ; 0x5594 TextEndBattle
-	dw Route24EndBattleText3 ; 0x5594 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3
+	dw Route24BattleText3 ; TextBeforeBattle
+	dw Route24AfterBattleText3 ; TextAfterBattle
+	dw Route24EndBattleText3 ; TextEndBattle
+	dw Route24EndBattleText3 ; TextEndBattle
 
 Route24TrainerHeader4: ; 5147f (14:547f)
-	db $5 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4
 	db ($1 << 4) ; trainer's view range
-	dw wd7ef ; flag's byte
-	dw Route24BattleText4 ; 0x559e TextBeforeBattle
-	dw Route24AfterBattleText4 ; 0x55a8 TextAfterBattle
-	dw Route24EndBattleText4 ; 0x55a3 TextEndBattle
-	dw Route24EndBattleText4 ; 0x55a3 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4
+	dw Route24BattleText4 ; TextBeforeBattle
+	dw Route24AfterBattleText4 ; TextAfterBattle
+	dw Route24EndBattleText4 ; TextEndBattle
+	dw Route24EndBattleText4 ; TextEndBattle
 
 Route24TrainerHeader5: ; 5148b (14:548b)
-	db $6 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5
 	db ($1 << 4) ; trainer's view range
-	dw wd7ef ; flag's byte
-	dw Route24BattleText5 ; 0x55ad TextBeforeBattle
-	dw Route24AfterBattleText5 ; 0x55b7 TextAfterBattle
-	dw Route24EndBattleText5 ; 0x55b2 TextEndBattle
-	dw Route24EndBattleText5 ; 0x55b2 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5
+	dw Route24BattleText5 ; TextBeforeBattle
+	dw Route24AfterBattleText5 ; TextAfterBattle
+	dw Route24EndBattleText5 ; TextEndBattle
+	dw Route24EndBattleText5 ; TextEndBattle
 
 Route24TrainerHeader6: ; 51497 (14:5497)
-	db $7 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_6
 	db ($1 << 4) ; trainer's view range
-	dw wd7ef ; flag's byte
-	dw Route24BattleText6 ; 0x55bc TextBeforeBattle
-	dw Route24AfterBattleText6 ; 0x55c6 TextAfterBattle
-	dw Route24EndBattleText6 ; 0x55c1 TextEndBattle
-	dw Route24EndBattleText6 ; 0x55c1 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_6
+	dw Route24BattleText6 ; TextBeforeBattle
+	dw Route24AfterBattleText6 ; TextAfterBattle
+	dw Route24EndBattleText6 ; TextEndBattle
+	dw Route24EndBattleText6 ; TextEndBattle
 
 	db $ff
 
 Route24Text1: ; 514a4 (14:54a4)
-	db $8
-	ld hl, wd7f0
-	res 1, [hl]
-	ld a, [wd7ef]
-	bit 0, a
-	jr nz, .asm_a03f5 ; 0x514af $48
+	TX_ASM
+	ResetEvent EVENT_NUGGET_REWARD_AVAILABLE
+	CheckEvent EVENT_GOT_NUGGET
+	jr nz, .asm_514f9
 	ld hl, Route24Text_51510
 	call PrintText
-	ld bc, (NUGGET << 8) | 1
+	lb bc, NUGGET, 1
 	call GiveItem
 	jr nc, .BagFull
-	ld hl, wd7ef
-	set 0, [hl]
+	SetEvent EVENT_GOT_NUGGET
 	ld hl, Route24Text_5151a
 	call PrintText
 	ld hl, Route24Text_51526
@@ -170,7 +163,7 @@ Route24Text1: ; 514a4 (14:54a4)
 	ld hl, Route24Text_5152b
 	ld de, Route24Text_5152b
 	call SaveEndBattleTextPointers
-	ld a, [$ff8c]
+	ld a, [hSpriteIndexOrTextID]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
@@ -180,25 +173,24 @@ Route24Text1: ; 514a4 (14:54a4)
 	ld [W_ROUTE24CURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
 	jp TextScriptEnd
-.asm_a03f5 ; 0x514f9
+.asm_514f9
 	ld hl, Route24Text_51530
 	call PrintText
 	jp TextScriptEnd
 .BagFull
 	ld hl, Route24Text_51521
 	call PrintText
-	ld hl, wd7f0
-	set 1, [hl]
+	SetEvent EVENT_NUGGET_REWARD_AVAILABLE
 	jp TextScriptEnd
 
 Route24Text_51510: ; 51510 (14:5510)
-	TX_FAR _Route24Text_51510 ; 0x92721
+	TX_FAR _Route24Text_51510
 	db $0B
-	TX_FAR _Route24Text_51515 ; 0x92755
+	TX_FAR _Route24Text_51515
 	db "@"
 
 Route24Text_5151a: ; 5151a (14:551a)
-	TX_FAR _Route24Text_5151a ; 0x92779
+	TX_FAR _Route24Text_5151a
 	db $0B, $6, "@"
 
 Route24Text_51521: ; 51521 (14:5521)
@@ -218,37 +210,37 @@ Route24Text_51530: ; 51530 (14:5530)
 	db "@"
 
 Route24Text2: ; 51535 (14:5535)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route24TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text3: ; 5153f (14:553f)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route24TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text4: ; 51549 (14:5549)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route24TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text5: ; 51553 (14:5553)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route24TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text6: ; 5155d (14:555d)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route24TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text7: ; 51567 (14:5567)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route24TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd