Merge pull request #196 from Rangi42/polishedmaps

Rename map files, labels, and constants to be consistent and work with Polished Map

1 files changed, 85 insertions, 0 deletions

diff --git a/scripts/CinnabarIsland.asm b/scripts/CinnabarIsland.asm
new file mode 100755
index 00000000..b6346a9c
--- /dev/null
+++ b/scripts/CinnabarIsland.asm
@@ -0,0 +1,85 @@
+CinnabarIsland_Script:
+	call EnableAutoTextBoxDrawing
+	ld hl, wCurrentMapScriptFlags
+	set 5, [hl]
+	ResetEvent EVENT_MANSION_SWITCH_ON
+	ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL
+	ld hl, CinnabarIsland_ScriptPointers
+	ld a, [wCinnabarIslandCurScript]
+	jp CallFunctionInTable
+
+CinnabarIsland_ScriptPointers:
+	dw CinnabarIslandScript0
+	dw CinnabarIslandScript1
+
+CinnabarIslandScript0:
+	ld b, SECRET_KEY
+	call IsItemInBag
+	ret nz
+	ld a, [wYCoord]
+	cp $4
+	ret nz
+	ld a, [wXCoord]
+	cp $12
+	ret nz
+	ld a, PLAYER_DIR_UP
+	ld [wPlayerMovingDirection], a
+	ld a, $8
+	ld [hSpriteIndexOrTextID], a
+	call DisplayTextID
+	xor a
+	ld [hJoyHeld], a
+	ld a, $1
+	ld [wSimulatedJoypadStatesIndex], a
+	ld a, D_DOWN
+	ld [wSimulatedJoypadStatesEnd], a
+	call StartSimulatingJoypadStates
+	xor a
+	ld [wSpriteStateData1 + 9], a
+	ld [wJoyIgnore], a
+	ld a, $1
+	ld [wCinnabarIslandCurScript], a
+	ret
+
+CinnabarIslandScript1:
+	ld a, [wSimulatedJoypadStatesIndex]
+	and a
+	ret nz
+	call Delay3
+	ld a, $0
+	ld [wCinnabarIslandCurScript], a
+	ret
+
+CinnabarIsland_TextPointers:
+	dw CinnabarIslandText1
+	dw CinnabarIslandText2
+	dw CinnabarIslandText3
+	dw MartSignText
+	dw PokeCenterSignText
+	dw CinnabarIslandText6
+	dw CinnabarIslandText7
+	dw CinnabarIslandText8
+
+CinnabarIslandText8:
+	TX_FAR _CinnabarIslandText8
+	db "@"
+
+CinnabarIslandText1:
+	TX_FAR _CinnabarIslandText1
+	db "@"
+
+CinnabarIslandText2:
+	TX_FAR _CinnabarIslandText2
+	db "@"
+
+CinnabarIslandText3:
+	TX_FAR _CinnabarIslandText3
+	db "@"
+
+CinnabarIslandText6:
+	TX_FAR _CinnabarIslandText6
+	db "@"
+
+CinnabarIslandText7:
+	TX_FAR _CinnabarIslandText7
+	db "@"