From 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 4 Nov 2020 00:06:44 -0600
Subject: Sync with pokered

---
 scripts/HallOfFame.asm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'scripts/HallOfFame.asm')

diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm
index af424089..fd13719b 100755
--- a/scripts/HallOfFame.asm
+++ b/scripts/HallOfFame.asm
@@ -45,7 +45,7 @@ HallofFameRoomScript2:
 	ld [wHallOfFameCurScript], a
 	ld a, PALLET_TOWN
 	ld [wLastBlackoutMap], a
-	callba SaveSAVtoSRAM
+	farcall SaveSAVtoSRAM
 	ld b, 5
 .delayLoop
 	ld c, 600 / 5
@@ -69,8 +69,8 @@ HallofFameRoomScript0:
 	ret
 
 RLEMovement5a528:
-	db D_UP,$5
-	db $ff
+	db D_UP, 5
+	db -1 ; end
 
 HallofFameRoomScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
@@ -79,10 +79,10 @@ HallofFameRoomScript1:
 	ld a, PLAYER_DIR_RIGHT
 	ld [wPlayerMovingDirection], a
 	ld a, $1
-	ld [H_SPRITEINDEX], a
+	ldh [hSpriteIndex], a
 	call SetSpriteMovementBytesToFF
 	ld a, SPRITE_FACING_LEFT
-	ld [hSpriteFacingDirection], a
+	ldh [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
 	call Delay3
 	xor a
@@ -90,7 +90,7 @@ HallofFameRoomScript1:
 	inc a ; PLAYER_DIR_RIGHT
 	ld [wPlayerMovingDirection], a
 	ld a, $1
-	ld [hSpriteIndexOrTextID], a
+	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $ff
 	ld [wJoyIgnore], a
@@ -105,5 +105,5 @@ HallOfFame_TextPointers:
 	dw HallofFameRoomText1
 
 HallofFameRoomText1:
-	TX_FAR _HallofFameRoomText1
-	db "@"
+	text_far _HallofFameRoomText1
+	text_end
-- 
cgit v1.3.1-sl0p