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

Doesn't build.

1 files changed, 41 insertions, 31 deletions

diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm
index 474aaa60..8bcc2b17 100755
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@@ -21,23 +21,23 @@ SSAnne2Script4: ; 613bd (18:53bd)
 	ret
 
 SSAnne2Script0: ; 613be (18:53be)
-	ld hl, CoordsData_61411 ; $5411
+	ld hl, CoordsData_61411
 	call ArePlayerCoordsInArray
 	ret nc
 	ld a, $ff
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
 	ld c, BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
 	call PlayMusic
-	ld a, [wWhichTrade]
+	ld a, [wCoordIndex]
 	ld [$ffdb], a
 	ld a, HS_SS_ANNE_2_RIVAL
-	ld [wcc4d], a
+	ld [wMissableObjectIndex], a
 	predef ShowObject
 	call Delay3
 	ld a, $2
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	call SetSpriteMovementBytesToFF
 	xor a
 	ld [hJoyHeld], a
@@ -45,9 +45,9 @@ SSAnne2Script0: ; 613be (18:53be)
 	ld [wJoyIgnore], a
 	ld a, [$ffdb]
 	cp $2
-	jr nz, .asm_61400 ; 0x613f9 $5
+	jr nz, .asm_61400
 	ld de, MovementData_6140c
-	jr .asm_61403 ; 0x613fe $3
+	jr .asm_61403
 .asm_61400
 	ld de, MovementData_6140d
 .asm_61403
@@ -57,28 +57,33 @@ SSAnne2Script0: ; 613be (18:53be)
 	ret
 
 MovementData_6140c: ; 6140c (18:540c)
-	db $00
+	db NPC_MOVEMENT_DOWN
 
 MovementData_6140d: ; 6140d (18:540d)
-	db $00,$00,$00,$FF
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db $FF
 
 CoordsData_61411: ; 61411 (18:5411)
-	db $08,$24,$08,$25,$FF
+	db $08,$24
+	db $08,$25
+	db $FF
 
 SSAnne2Script_61416: ; 61416 (18:5416)
-	ld a, [W_XCOORD] ; wd362
+	ld a, [W_XCOORD]
 	cp $25
 	jr nz, .asm_61426
-	ld a, $2
-	ld [wd528], a
-	ld a, $c
+	ld a, PLAYER_DIR_LEFT
+	ld [wPlayerMovingDirection], a
+	ld a, SPRITE_FACING_RIGHT
 	jr .asm_61427
 .asm_61426
-	xor a
+	xor a ; SPRITE_FACING_DOWN
 .asm_61427
-	ld [$ff8d], a
+	ld [hSpriteFacingDirection], a
 	ld a, $2
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_SPRITEINDEX], a
 	jp SetSpriteFacingDirectionAndDelay
 
 SSAnne2Script1: ; 61430 (18:5430)
@@ -89,21 +94,21 @@ SSAnne2Script1: ; 61430 (18:5430)
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $2
-	ld [$ff8c], a
+	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call Delay3
-	ld a, SONY2 + $c8
+	ld a, OPP_SONY2
 	ld [W_CUROPPONENT], a
 
 	; select which team to use during the encounter
 	ld a, [W_RIVALSTARTER]
 	cp STARTER2
-	jr nz, .NotSquirtle ; 0x61451 $4
+	jr nz, .NotSquirtle
 	ld a, $1
 	jr .done
 .NotSquirtle
 	cp STARTER3
-	jr nz, .Charmander ; 0x61459 $4
+	jr nz, .Charmander
 	ld a, $2
 	jr .done
 .Charmander
@@ -124,24 +129,24 @@ SSAnne2Script2: ; 6146d (18:546d)
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld a, $3
-	ld [$ff8c], a
+	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $2
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	call SetSpriteMovementBytesToFF
 	ld a, [W_XCOORD]
 	cp $25
-	jr nz, .asm_61497 ; 0x61490 $5
+	jr nz, .asm_61497
 	ld de, MovementData_614b9
-	jr .asm_6149a ; 0x61495 $3
+	jr .asm_6149a
 .asm_61497
 	ld de, MovementData_614b7
 .asm_6149a
 	ld a, $2
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	call MoveSprite
 	ld a, $ff
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
 	callba Music_RivalAlternateStart
 	ld a, $3
@@ -149,10 +154,15 @@ SSAnne2Script2: ; 6146d (18:546d)
 	ret
 
 MovementData_614b7: ; 614b7 (18:54b7)
-	db $C0,$00
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_DOWN
 
 MovementData_614b9: ; 614b9 (18:54b9)
-	db $00,$00,$00,$00,$FF
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_DOWN
+	db $FF
 
 SSAnne2Script3: ; 614be (18:54be)
 	ld a, [wd730]
@@ -161,7 +171,7 @@ SSAnne2Script3: ; 614be (18:54be)
 	xor a
 	ld [wJoyIgnore], a
 	ld a, HS_SS_ANNE_2_RIVAL
-	ld [wcc4d], a
+	ld [wMissableObjectIndex], a
 	predef HideObject
 	call PlayDefaultMusic
 	ld a, $4
@@ -178,7 +188,7 @@ SSAnne2Text1: ; 614e1 (18:54e1)
 	db "@"
 
 SSAnne2Text2: ; 614e6 (18:54e6)
-	db $8
+	TX_ASM
 	ld hl, SSAnneRivalBeforeBattleText
 	call PrintText
 	ld hl, wd72d