From 6e8c3883e430b567f7aa8f9230e366e03610bd5a Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Wed, 8 Jun 2016 05:44:58 -0600 Subject: Part 1 of syncing with pokered. --- scripts/cinnabarisland.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'scripts/cinnabarisland.asm') diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index a6fa3af7..2c6fda4e 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -1,4 +1,4 @@ -CinnabarIslandScript: ; 1ca19 (7:4a19) +CinnabarIslandScript: call EnableAutoTextBoxDrawing ld hl, wd126 set 5, [hl] @@ -8,11 +8,11 @@ CinnabarIslandScript: ; 1ca19 (7:4a19) ld a, [W_CINNABARISLANDCURSCRIPT] jp JumpTable -CinnabarIslandScriptPointers: ; 1ca34 (7:4a34) +CinnabarIslandScriptPointers: dw CinnabarIslandScript0 dw CinnabarIslandScript1 -CinnabarIslandScript0: ; 1ca38 (7:4a38) +CinnabarIslandScript0: ld b, SECRET_KEY call IsItemInBag ret nz @@ -41,7 +41,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld [W_CINNABARISLANDCURSCRIPT], a ret -CinnabarIslandScript1: ; 1ca73 (7:4a73) +CinnabarIslandScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -50,7 +50,7 @@ CinnabarIslandScript1: ; 1ca73 (7:4a73) ld [W_CINNABARISLANDCURSCRIPT], a ret -CinnabarIslandTextPointers: ; 1ca81 (7:4a81) +CinnabarIslandTextPointers: dw CinnabarIslandText1 dw CinnabarIslandText2 dw CinnabarIslandText3 @@ -60,26 +60,26 @@ CinnabarIslandTextPointers: ; 1ca81 (7:4a81) dw CinnabarIslandText7 dw CinnabarIslandText8 -CinnabarIslandText8: ; 1ca91 (7:4a91) +CinnabarIslandText8: TX_FAR _CinnabarIslandText8 db "@" -CinnabarIslandText1: ; 1ca96 (7:4a96) +CinnabarIslandText1: TX_FAR _CinnabarIslandText1 db "@" -CinnabarIslandText2: ; 1ca9b (7:4a9b) +CinnabarIslandText2: TX_FAR _CinnabarIslandText2 db "@" -CinnabarIslandText3: ; 1caa0 (7:4aa0) +CinnabarIslandText3: TX_FAR _CinnabarIslandText3 db "@" -CinnabarIslandText6: ; 1caa5 (7:4aa5) +CinnabarIslandText6: TX_FAR _CinnabarIslandText6 db "@" -CinnabarIslandText7: ; 1caaa (7:4aaa) +CinnabarIslandText7: TX_FAR _CinnabarIslandText7 db "@" -- cgit v1.2.3 From 269f2c3ba72776e975f5b00d9a1361cadbda42a7 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 11 Jun 2016 15:45:24 -0500 Subject: Sync with pokered from August 29, 2015 to April 6, 2016 --- scripts/cinnabarisland.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/cinnabarisland.asm') diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index 3a2e9a2b..a0fa4172 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -1,11 +1,11 @@ CinnabarIslandScript: ; 1ca19 (7:4a19) call EnableAutoTextBoxDrawing - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ResetEvent EVENT_MANSION_SWITCH_ON ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL ld hl, CinnabarIslandScriptPointers - ld a, [W_CINNABARISLANDCURSCRIPT] + ld a, [wCinnabarIslandCurScript] jp JumpTable CinnabarIslandScriptPointers: ; 1ca34 (7:4a34) @@ -38,7 +38,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld [wSpriteStateData1 + 9], a ld [wJoyIgnore], a ld a, $1 - ld [W_CINNABARISLANDCURSCRIPT], a + ld [wCinnabarIslandCurScript], a ret CinnabarIslandScript1: ; 1ca73 (7:4a73) @@ -47,7 +47,7 @@ CinnabarIslandScript1: ; 1ca73 (7:4a73) ret nz call Delay3 ld a, $0 - ld [W_CINNABARISLANDCURSCRIPT], a + ld [wCinnabarIslandCurScript], a ret CinnabarIslandTextPointers: ; 1ca81 (7:4a81) -- cgit v1.2.3