Merge pull request #48 from yenatch/master

Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.

1 files changed, 17 insertions, 19 deletions

diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm
index 962fa643..1273305e 100755
--- a/scripts/halloffameroom.asm
+++ b/scripts/halloffameroom.asm
@@ -6,7 +6,7 @@ HallofFameRoomScript: ; 5a49e (16:649e)
 
 HallofFameRoomScript_5a4aa: ; 5a4aa (16:64aa)
 	xor a
-	ld [wJoypadForbiddenButtonsMask], a
+	ld [wJoyIgnore], a
 	ld [W_HALLOFFAMEROOMCURSCRIPT], a
 	ret
 
@@ -21,14 +21,13 @@ HallofFameRoomScript3: ; 5a4ba (16:64ba)
 
 HallofFameRoomScript2: ; 5a4bb (16:64bb)
 	call Delay3
-	ld a, [$d358]
+	ld a, [wd358]
 	push af
 	xor a
-	ld [wJoypadForbiddenButtonsMask], a
-	ld a, $55
-	call Predef
+	ld [wJoyIgnore], a
+	predef HallOfFamePC
 	pop af
-	ld [$d358], a
+	ld [wd358], a
 	ld hl, W_FLAGS_D733
 	res 1, [hl]
 	inc hl
@@ -40,7 +39,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
 	ld [hl], a
 	ld [W_LANCECURSCRIPT], a
 	ld [W_HALLOFFAMEROOMCURSCRIPT], a
-	ld hl, $d863
+	ld hl, wd863
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
@@ -58,16 +57,16 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
 	dec b
 	jr nz, .asm_5a4ff ; 0x5a505 $f8
 	call WaitForTextScrollButtonPress
-	jp InitGame
+	jp Init
 
 HallofFameRoomScript0: ; 5a50d (16:650d)
 	ld a, $ff
-	ld [wJoypadForbiddenButtonsMask], a
-	ld hl, $ccd3
+	ld [wJoyIgnore], a
+	ld hl, wccd3
 	ld de, RLEMovement5a528
 	call DecodeRLEList
 	dec a
-	ld [$cd38], a
+	ld [wcd38], a
 	call Func_3486
 	ld a, $1
 	ld [W_HALLOFFAMEROOMCURSCRIPT], a
@@ -78,11 +77,11 @@ RLEMovement5a528: ; 5a528 (16:6528)
 	db $ff
 
 HallofFameRoomScript1: ; 5a52b (16:652b)
-	ld a, [$cd38]
+	ld a, [wcd38]
 	and a
 	ret nz
 	ld a, $1
-	ld [$d528], a
+	ld [wd528], a
 	ld a, $1
 	ld [$ff8c], a
 	call SetSpriteMovementBytesToFF
@@ -91,18 +90,17 @@ HallofFameRoomScript1: ; 5a52b (16:652b)
 	call Func_34a6
 	call Delay3
 	xor a
-	ld [wJoypadForbiddenButtonsMask], a
+	ld [wJoyIgnore], a
 	inc a
-	ld [$d528], a
+	ld [wd528], a
 	ld a, $1
 	ld [$ff8c], a
 	call DisplayTextID
 	ld a, $ff
-	ld [wJoypadForbiddenButtonsMask], a
+	ld [wJoyIgnore], a
 	ld a, $8
-	ld [$cc4d], a
-	ld a, $11
-	call Predef
+	ld [wcc4d], a
+	predef HideObject
 	ld a, $2
 	ld [W_HALLOFFAMEROOMCURSCRIPT], a
 	ret