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

Doesn't build.

1 files changed, 131 insertions, 117 deletions

diff --git a/scripts/route22.asm b/scripts/route22.asm
index 9181380a..1244f0ff 100755
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -22,7 +22,7 @@ Route22Script7: ; 50ed5 (14:4ed5)
 	ret
 
 Route22Script_50ed6: ; 50ed6 (14:4ed6)
-	ld a, [W_RIVALSTARTER] ; wd715
+	ld a, [W_RIVALSTARTER]
 	ld b, a
 .asm_50eda
 	ld a, [hli]
@@ -32,43 +32,45 @@ Route22Script_50ed6: ; 50ed6 (14:4ed6)
 	jr .asm_50eda
 .asm_50ee1
 	ld a, [hl]
-	ld [W_TRAINERNO], a ; wd05d
+	ld [W_TRAINERNO], a
 	ret
 
 Route22MoveRivalSprite: ; 50ee6 (14:4ee6)
-	ld de, Route22RivalMovementData ; $4efb
+	ld de, Route22RivalMovementData
 	ld a, [wcf0d]
 	cp $1
 	jr z, .asm_50ef1
 	inc de
 .asm_50ef1
 	call MoveSprite
-	ld a, $c
-	ld [$ff8d], a
+	ld a, SPRITE_FACING_RIGHT
+	ld [hSpriteFacingDirection], a
 	jp SetSpriteFacingDirectionAndDelay
 
 Route22RivalMovementData: ; 50efb (14:4efb)
-	db $C0,$C0,$C0,$C0,$FF ; move right 4 times
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_RIGHT
+	db $FF
 
 Route22Script0: ; 50f00 (14:4f00)
-	ld a, [wd7eb]
-	bit 7, a
+	CheckEvent EVENT_ROUTE22_RIVAL_WANTS_BATTLE
 	ret z
-	ld hl, .Route22RivalBattleCoords  ; $4f2d
+	ld hl, .Route22RivalBattleCoords
 	call ArePlayerCoordsInArray
 	ret nc
-	ld a, [wWhichTrade]
+	ld a, [wCoordIndex]
 	ld [wcf0d], a
 	xor a
 	ld [hJoyHeld], a
 	ld a, $f0
 	ld [wJoyIgnore], a
-	ld a, $2
-	ld [wd528], a
-	ld a, [wd7eb]
-	bit 0, a ; is this the rival battle at the beginning of the game?
-	jr nz, .firstRivalBattle ; 0x50f25 $b
-	bit 1, a ; is this the rival at the end of the game?
+	ld a, PLAYER_DIR_LEFT
+	ld [wPlayerMovingDirection], a
+	CheckEvent EVENT_1ST_ROUTE22_RIVAL_BATTLE
+	jr nz, .firstRivalBattle
+	CheckEventReuseA EVENT_2ND_ROUTE22_RIVAL_BATTLE ; is this the rival at the end of the game?
 	jp nz, Route22Script_5104e
 	ret
 
@@ -79,22 +81,22 @@ Route22Script0: ; 50f00 (14:4f00)
 
 .firstRivalBattle
 	ld a, $1
-	ld [wcd4f], a
-	xor a
-	ld [wcd50], a
+	ld [wEmotionBubbleSpriteIndex], a
+	xor a ; EXCLAMATION_BUBBLE
+	ld [wWhichEmotionBubble], a
 	predef EmotionBubble
 	ld a, [wWalkBikeSurfState]
 	and a
-	jr z, .asm_50f4e ; 0x50f44 $8
+	jr z, .asm_50f4e
 	ld a, $ff
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
 .asm_50f4e
 	ld c, BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
 	call PlayMusic
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	call Route22MoveRivalSprite
 	ld a, $1
 	ld [W_ROUTE22CURSCRIPT], a
@@ -106,22 +108,22 @@ Route22Script1: ; 50f62 (14:4f62)
 	ret nz
 	ld a, [wcf0d]
 	cp $1
-	jr nz, .asm_50f78 ; 0x50f6d $9
-	ld a, $4
-	ld [wd528], a
-	ld a, $4
-	jr .asm_50f7a ; 0x50f76 $2
+	jr nz, .asm_50f78
+	ld a, PLAYER_DIR_DOWN
+	ld [wPlayerMovingDirection], a
+	ld a, SPRITE_FACING_UP
+	jr .asm_50f7a
 .asm_50f78
-	ld a, $c
+	ld a, SPRITE_FACING_RIGHT
 .asm_50f7a
-	ld [$ff8d], a
+	ld [hSpriteFacingDirection], a
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	call SetSpriteFacingDirectionAndDelay
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $1
-	ld [$ff8c], a
+	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld hl, wd72d
 	set 6, [hl]
@@ -129,9 +131,9 @@ Route22Script1: ; 50f62 (14:4f62)
 	ld hl, Route22RivalDefeatedText1
 	ld de, Route22Text_511bc
 	call SaveEndBattleTextPointers
-	ld a, SONY1 + $c8
+	ld a, OPP_SONY1
 	ld [W_CUROPPONENT], a
-	ld hl, StarterMons_50faf ; $4faf
+	ld hl, StarterMons_50faf
 	call Route22Script_50ed6
 	ld a, $2
 	ld [W_ROUTE22CURSCRIPT], a
@@ -148,33 +150,32 @@ Route22Script2: ; 50fb5 (14:4fb5)
 	cp $ff
 	jp z, Route22Script_50ece
 	ld a, [wSpriteStateData1 + 9]
-	and a
-	jr nz, .asm_50fc7 ; 0x50fc1 $4
-	ld a, $4
-	jr .asm_50fc9 ; 0x50fc5 $2
-.asm_50fc7
-	ld a, $c
-.asm_50fc9
-	ld [$ff8d], a
+	and a ; cp SPRITE_FACING_DOWN
+	jr nz, .notDown
+	ld a, SPRITE_FACING_UP
+	jr .done
+.notDown
+	ld a, SPRITE_FACING_RIGHT
+.done
+	ld [hSpriteFacingDirection], a
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	call SetSpriteFacingDirectionAndDelay
 	ld a, $f0
 	ld [wJoyIgnore], a
-	ld hl, wd7eb
-	set 5, [hl]
+	SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
 	ld a, $1
-	ld [$ff8c], a
+	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $ff
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
 	callba Music_RivalAlternateStart
 	ld a, [wcf0d]
 	cp $1
-	jr nz, .asm_50fff ; 0x50ff8 $5
+	jr nz, .asm_50fff
 	call Route22Script_51008
-	jr .asm_51002 ; 0x50ffd $3
+	jr .asm_51002
 .asm_50fff
 	call Route22Script_5100d
 .asm_51002
@@ -183,21 +184,38 @@ Route22Script2: ; 50fb5 (14:4fb5)
 	ret
 
 Route22Script_51008: ; 51008 (14:5008)
-	ld de, Route22RivalExitMovementData1 ; $5017
-	jr asm_51010
+	ld de, Route22RivalExitMovementData1
+	jr Route22MoveRival1
 
 Route22Script_5100d: ; 5100d (14:500d)
-	ld de, Route22RivalExitMovementData2 ; $501f
-asm_51010
+	ld de, Route22RivalExitMovementData2
+Route22MoveRival1: ; 51010 (14:5010)
 	ld a, $1
-	ld [H_SPRITEHEIGHT], a
+	ld [H_SPRITEINDEX], a
 	jp MoveSprite
 
 Route22RivalExitMovementData1: ; 51017 (14:5017)
-	db $C0,$C0,$00,$00,$00,$00,$00,$FF
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db $FF
 
 Route22RivalExitMovementData2: ; 5101f (14:501f)
-	db $40,$C0,$C0,$C0,$00,$00,$00,$00,$00,$00,$FF
+	db NPC_MOVEMENT_UP
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db $FF
 
 Route22Script3: ; 5102a (14:502a)
 	ld a, [wd730]
@@ -206,35 +224,33 @@ Route22Script3: ; 5102a (14:502a)
 	xor a
 	ld [wJoyIgnore], a
 	ld a, HS_ROUTE_22_RIVAL_1
-	ld [wcc4d], a
+	ld [wMissableObjectIndex], a
 	predef HideObject
 	call PlayDefaultMusic
-	ld hl, wd7eb
-	res 0, [hl]
-	res 7, [hl]
+	ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
 	ld a, $0
 	ld [W_ROUTE22CURSCRIPT], a
 	ret
 
 Route22Script_5104e: ; 5104e (14:504e)
 	ld a, $2
-	ld [wcd4f], a
-	xor a
-	ld [wcd50], a
+	ld [wEmotionBubbleSpriteIndex], a
+	xor a ; EXCLAMATION_BUBBLE
+	ld [wWhichEmotionBubble], a
 	predef EmotionBubble
 	ld a, [wWalkBikeSurfState]
 	and a
 	jr z, .skipYVisibilityTesta
 	ld a, $ff
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
 .skipYVisibilityTesta
 	ld a, $ff
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
 	callba Music_RivalAlternateTempo
 	ld a, $2
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_SPRITEINDEX], a
 	call Route22MoveRivalSprite
 	ld a, $4
 	ld [W_ROUTE22CURSCRIPT], a
@@ -245,35 +261,35 @@ Route22Script4: ; 51087 (14:5087)
 	bit 0, a
 	ret nz
 	ld a, $2
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_SPRITEINDEX], a
 	ld a, [wcf0d]
 	cp $1
 	jr nz, .asm_510a1
-	ld a, $4
-	ld [wd528], a
-	ld a, $4
+	ld a, PLAYER_DIR_DOWN
+	ld [wPlayerMovingDirection], a
+	ld a, SPRITE_FACING_UP
 	jr .asm_510a8
 .asm_510a1
-	ld a, $2
-	ld [wd528], a
-	ld a, $c
+	ld a, PLAYER_DIR_LEFT
+	ld [wPlayerMovingDirection], a
+	ld a, SPRITE_FACING_RIGHT
 .asm_510a8
-	ld [$ff8d], a
+	ld [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $2
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, Route22RivalDefeatedText2 ; $51cb
-	ld de, Route22Text_511d0 ; $51d0
+	ld hl, Route22RivalDefeatedText2
+	ld de, Route22Text_511d0
 	call SaveEndBattleTextPointers
-	ld a, SONY2 + $c8
-	ld [W_CUROPPONENT], a ; wd059
-	ld hl, StarterMons_510d9 ; $50d9
+	ld a, OPP_SONY2
+	ld [W_CUROPPONENT], a
+	ld hl, StarterMons_510d9
 	call Route22Script_50ed6
 	ld a, $5
 	ld [W_ROUTE22CURSCRIPT], a
@@ -285,34 +301,33 @@ StarterMons_510d9: ; 510d9 (14:50d9)
 	db STARTER1,$0c
 
 Route22Script5: ; 510df (14:50df)
-	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
+	ld a, [W_ISINBATTLE]
 	cp $ff
 	jp z, Route22Script_50ece
 	ld a, $2
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_SPRITEINDEX], a
 	ld a, [wcf0d]
 	cp $1
 	jr nz, .asm_510fb
-	ld a, $4
-	ld [wd528], a
-	ld a, $4
+	ld a, PLAYER_DIR_DOWN
+	ld [wPlayerMovingDirection], a
+	ld a, SPRITE_FACING_UP
 	jr .asm_51102
 .asm_510fb
-	ld a, $2
-	ld [wd528], a
-	ld a, $c
+	ld a, PLAYER_DIR_LEFT
+	ld [wPlayerMovingDirection], a
+	ld a, SPRITE_FACING_RIGHT
 .asm_51102
-	ld [$ff8d], a
+	ld [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
 	ld a, $f0
 	ld [wJoyIgnore], a
-	ld hl, wd7eb
-	set 6, [hl]
+	SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
 	ld a, $2
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $ff
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
 	callba Music_RivalAlternateStartAndTempo
 	ld a, [wcf0d]
@@ -328,21 +343,24 @@ Route22Script5: ; 510df (14:50df)
 	ret
 
 Route22Script_5113d: ; 5113d (14:513d)
-	ld de, MovementData_5114c ; $514c
-	jr asm_51145
+	ld de, MovementData_5114c
+	jr Route22MoveRival2
 
 Route22Script_51142: ; 51142 (14:5142)
-	ld de, MovementData_5114d ; $514d
-asm_51145: ; 51145 (14:5145)
+	ld de, MovementData_5114d
+Route22MoveRival2: ; 51145 (14:5145)
 	ld a, $2
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_SPRITEINDEX], a
 	jp MoveSprite
 
 MovementData_5114c: ; 5114c (14:514c)
-	db $80 ; left
+	db NPC_MOVEMENT_LEFT
 
 MovementData_5114d: ; 5114d (14:514d)
-	db $80,$80,$80,$FF ; left x3
+	db NPC_MOVEMENT_LEFT
+	db NPC_MOVEMENT_LEFT
+	db NPC_MOVEMENT_LEFT
+	db $FF
 
 Route22Script6: ; 51151 (14:5151)
 	ld a, [wd730]
@@ -351,12 +369,10 @@ Route22Script6: ; 51151 (14:5151)
 	xor a
 	ld [wJoyIgnore], a
 	ld a, HS_ROUTE_22_RIVAL_2
-	ld [wcc4d], a
+	ld [wMissableObjectIndex], a
 	predef HideObject
 	call PlayDefaultMusic
-	ld hl, wd7eb
-	res 1, [hl]
-	res 7, [hl]
+	ResetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
 	ld a, $7
 	ld [W_ROUTE22CURSCRIPT], a
 	ret
@@ -367,31 +383,29 @@ Route22TextPointers: ; 51175 (14:5175)
 	dw Route22FrontGateText
 
 Route22Text1: ; 5117b (14:517b)
-	db $08 ; asm
-	ld a, [wd7eb]
-	bit 5, a
-	jr z, .asm_a88cf ; 0x51181
+	TX_ASM
+	CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
+	jr z, .asm_5118b
 	ld hl, Route22RivalAfterBattleText1
 	call PrintText
-	jr .asm_48088 ; 0x51189
-.asm_a88cf ; 0x5118b
+	jr .asm_51191
+.asm_5118b
 	ld hl, Route22RivalBeforeBattleText1
 	call PrintText
-.asm_48088 ; 0x51191
+.asm_51191
 	jp TextScriptEnd
 
 Route22Text2: ; 51194 (14:5194)
-	db $08 ; asm
-	ld a, [wd7eb]
-	bit 6, a
-	jr z, .asm_58c0a ; 0x5119a
+	TX_ASM
+	CheckEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
+	jr z, .asm_511a4
 	ld hl, Route22RivalAfterBattleText2
 	call PrintText
-	jr .asm_673ee ; 0x511a2
-.asm_58c0a ; 0x511a4
+	jr .asm_511aa
+.asm_511a4
 	ld hl, Route22RivalBeforeBattleText2
 	call PrintText
-.asm_673ee ; 0x511aa
+.asm_511aa
 	jp TextScriptEnd
 
 Route22RivalBeforeBattleText1: ; 511ad (14:51ad)