From df4d1d31cb34d28777a92f621761a501356b7b8b Mon Sep 17 00:00:00 2001 From: Abe Pralle Date: Sat, 30 May 2020 21:07:40 -0700 Subject: [PATCH] Updating source --- Source/L0313.asm | 2 +- Source/class.asm | 2 +- Source/gfx.asm | 270 +++++++++++++++++++++++------------------------ Source/l0000.asm | 2 +- Source/l0001.asm | 2 +- Source/l0002.asm | 2 +- Source/l0003.asm | 2 +- Source/l0004.asm | 2 +- Source/l0005.asm | 2 +- Source/l0006.asm | 2 +- Source/l0007.asm | 2 +- Source/l0008.asm | 2 +- Source/l0009.asm | 2 +- Source/l0010.asm | 2 +- Source/l0011.asm | 2 +- Source/l0012.asm | 2 +- Source/l0013.asm | 2 +- Source/l0014.asm | 2 +- Source/l0015.asm | 2 +- Source/l0103.asm | 2 +- Source/l0104.asm | 2 +- Source/l0105.asm | 2 +- Source/l0106.asm | 2 +- Source/l0107.asm | 2 +- Source/l0108.asm | 2 +- Source/l0109.asm | 2 +- Source/l0110.asm | 2 +- Source/l0111.asm | 2 +- Source/l0112.asm | 2 +- Source/l0113.asm | 2 +- Source/l0114.asm | 2 +- Source/l0115.asm | 2 +- Source/l0200.asm | 2 +- Source/l0201.asm | 2 +- Source/l0203.asm | 2 +- Source/l0204.asm | 2 +- Source/l0205.asm | 2 +- Source/l0211.asm | 2 +- Source/l0212.asm | 2 +- Source/l0213.asm | 2 +- Source/l0214.asm | 2 +- Source/l0215.asm | 2 +- Source/l0300.asm | 2 +- Source/l0301.asm | 2 +- Source/l0302.asm | 2 +- Source/l0303.asm | 2 +- Source/l0304.asm | 2 +- Source/l0305.asm | 2 +- Source/l0306.asm | 2 +- Source/l0307.asm | 2 +- Source/l0308.asm | 2 +- Source/l0309.asm | 2 +- Source/l0310.asm | 2 +- Source/l0311.asm | 2 +- Source/l0312.asm | 2 +- Source/l0314.asm | 2 +- Source/l0315.asm | 2 +- Source/l0400.asm | 2 +- Source/l0401.asm | 2 +- Source/l0402.asm | 2 +- Source/l0403.asm | 2 +- Source/l0404.asm | 2 +- Source/l0405.asm | 2 +- Source/l0406.asm | 2 +- Source/l0407.asm | 2 +- Source/l0408.asm | 2 +- Source/l0409.asm | 2 +- Source/l0410.asm | 2 +- Source/l0411.asm | 2 +- Source/l0412.asm | 2 +- Source/l0413.asm | 2 +- Source/l0500.asm | 2 +- Source/l0501.asm | 2 +- Source/l0502.asm | 2 +- Source/l0503.asm | 2 +- Source/l0504.asm | 2 +- Source/l0505.asm | 2 +- Source/l0506.asm | 2 +- Source/l0507.asm | 2 +- Source/l0508.asm | 2 +- Source/l0509.asm | 2 +- Source/l0510.asm | 2 +- Source/l0512.asm | 2 +- Source/l0600.asm | 2 +- Source/l0601.asm | 2 +- Source/l0602.asm | 2 +- Source/l0603.asm | 2 +- Source/l0604.asm | 2 +- Source/l0605.asm | 2 +- Source/l0606.asm | 2 +- Source/l0607.asm | 2 +- Source/l0608.asm | 2 +- Source/l0609.asm | 2 +- Source/l0610.asm | 2 +- Source/l0612.asm | 2 +- Source/l0700.asm | 2 +- Source/l0701.asm | 2 +- Source/l0702.asm | 2 +- Source/l0703.asm | 2 +- Source/l0704.asm | 2 +- Source/l0705.asm | 2 +- Source/l0706.asm | 2 +- Source/l0707.asm | 2 +- Source/l0708.asm | 2 +- Source/l0709.asm | 2 +- Source/l0710.asm | 2 +- Source/l0711.asm | 2 +- Source/l0712.asm | 2 +- Source/l0800.asm | 2 +- Source/l0801.asm | 2 +- Source/l0802.asm | 2 +- Source/l0803.asm | 2 +- Source/l0804.asm | 2 +- Source/l0805.asm | 2 +- Source/l0806.asm | 2 +- Source/l0807.asm | 2 +- Source/l0808.asm | 2 +- Source/l0809.asm | 2 +- Source/l0810.asm | 2 +- Source/l0811.asm | 2 +- Source/l0812.asm | 2 +- Source/l0900.asm | 2 +- Source/l0901.asm | 2 +- Source/l0902.asm | 2 +- Source/l0903.asm | 2 +- Source/l0904.asm | 2 +- Source/l0905.asm | 2 +- Source/l0906.asm | 2 +- Source/l0907.asm | 2 +- Source/l0908.asm | 2 +- Source/l0909.asm | 2 +- Source/l0910.asm | 2 +- Source/l0911.asm | 2 +- Source/l0912.asm | 2 +- Source/l1000.asm | 2 +- Source/l1001.asm | 2 +- Source/l1002.asm | 2 +- Source/l1003.asm | 2 +- Source/l1004.asm | 2 +- Source/l1005.asm | 2 +- Source/l1006.asm | 2 +- Source/l1007.asm | 2 +- Source/l1008.asm | 2 +- Source/l1009.asm | 2 +- Source/l1010.asm | 2 +- Source/l1011.asm | 2 +- Source/l1012.asm | 2 +- Source/l1100.asm | 4 +- Source/l1101.asm | 4 +- Source/l1102.asm | 4 +- Source/l1103.asm | 10 +- Source/l1104.asm | 8 +- Source/l1105.asm | 6 +- Source/l1111.asm | 2 +- Source/l1112.asm | 4 +- Source/l1200.asm | 22 ++-- Source/l1201.asm | 2 +- Source/l1202.asm | 2 +- Source/l1203.asm | 4 +- Source/l1204.asm | 8 +- Source/l1212.asm | 2 +- Source/l1300.asm | 2 +- Source/l1301.asm | 2 +- Source/l1302.asm | 2 +- Source/l1304.asm | 4 +- Source/l1312.asm | 2 +- Source/l1400.asm | 32 +++--- Source/l1401.asm | 10 +- Source/l1402.asm | 4 +- Source/l1403.asm | 2 +- Source/l1412.asm | 2 +- Source/l1500.asm | 2 +- Source/l1502.asm | 16 +-- Source/l1503.asm | 6 +- Source/l1504.asm | 4 +- Source/l1512.asm | 2 +- Source/map.asm | 14 +-- Source/music.asm | 8 +- 178 files changed, 379 insertions(+), 379 deletions(-) diff --git a/Source/L0313.asm b/Source/L0313.asm index 7f61b4a..6bb96fd 100644 --- a/Source/L0313.asm +++ b/Source/L0313.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0313Section",DATA +SECTION "Level0313Section",ROMX ;--------------------------------------------------------------------- L0313_Contents:: diff --git a/Source/class.asm b/Source/class.asm index e0714ef..0bf5848 100644 --- a/Source/class.asm +++ b/Source/class.asm @@ -11543,7 +11543,7 @@ WispCheck: jp SetFacing ;----GetFireTargetAsObject-------------------------------------------- -GetFireTargetAsObject +GetFireTargetAsObject: ld a,[fireBulletLocation] ld l,a ld a,[fireBulletLocation+1] diff --git a/Source/gfx.asm b/Source/gfx.asm index e871947..326269f 100644 --- a/Source/gfx.asm +++ b/Source/gfx.asm @@ -123,7 +123,7 @@ InitGfx:: or 1 ld [$ffff],a - ;turn LCD on + ;turn LCD on ld a,%11000011 ld [$ff40], a ;lcdc control @@ -170,7 +170,7 @@ VMemCopy:: push hl push af - ;test if screen is on + ;test if screen is on ldio a,[$ff40] and %10000000 jr nz,.screenIsOn @@ -236,7 +236,7 @@ MemSet:: ;--------------------------------------------------------------------- ; Routine: MemCopy -; Arguments: a - RAM bank +; Arguments: a - RAM bank ; bc - non-zero length in bytes ; de - destination starting address ; hl - source start address @@ -361,10 +361,10 @@ DMALoad:: ret ;--------------------------------------------------------------------- -; Routine: DisplayOff +; Routine: DisplayOff ; Arguments: ; Alters: af -; Description: Waits for VBlank then turns of the display +; Description: Waits for VBlank then turns of the display ;--------------------------------------------------------------------- DisplayOff:: ;skip if the display is off already @@ -385,7 +385,7 @@ DisplayOff:: ld [$ff40],a pop af ;retrieve original interrupt settings ld [$ffff],a - + .waitVRAM ld a,[$ff41] ;STAT register and %00000010 ;bit 1 needs to be zero to access VRAM @@ -490,12 +490,12 @@ PrepLevel:: xor a ldh [$ff43], a ;set screen offsets to 0 - ldh [$ff42], a + ldh [$ff42], a xor a ldh [$ff4a], a ;set window offsets to 7,0 ld a,7 - ldh [$ff4b], a + ldh [$ff4b], a xor a ld [specialFX],a @@ -692,8 +692,8 @@ oamHandlerFinish: ;--------------------------------------------------------------------- ; Routine: SetupCommonColor ; Arguments: b - Color Spec for entry to set up -; de - color for entry -; Description: Sets all 8 palettes (bg AND sprite) to have the same +; de - color for entry +; Description: Sets all 8 palettes (bg AND sprite) to have the same ; colors for the specified entry. ; Note: The format specification should have bit 7 set so it ; auto-selects the next palette @@ -716,7 +716,7 @@ SetupCommonColor:: ld c,16 -.loop +.loop ld a,e ;Get low byte of color ld [hl+],a ;store it in game palette @@ -765,14 +765,14 @@ SetupGamePalettes: ld hl,.stdPaletteData ld de,gamePalette ld a,32 ;set up 64 bytes (32 colors) - + .loop push af ld a,[hl+] ld [de],a ;copy of palette inc de ld a,[hl+] - ld [de],a + ld [de],a inc de ld a,c @@ -795,7 +795,7 @@ SetupGamePalettes: ld [de],a ;copy of palette inc de ld a,[hl+] - ld [de],a + ld [de],a inc de dec c @@ -930,7 +930,7 @@ TileIndexEToAddressDE: pop af ret - + ;--------------------------------------------------------------------- ; Routine: TileCopyRotateCCW @@ -972,7 +972,7 @@ TileCopyRotateCCW: dec a jr nz,.inner1 - + ld a,b ;save next two bytes of result ld [hl+],a ld a,c @@ -999,7 +999,7 @@ TileCopyRotateCCW: ; TileCopyShiftDown ; Arguments: e - Source tile index (0-15) ; l - Dest tile index (0-15) -; Description: Copies tiles while shifting 4 pixels in the specified +; Description: Copies tiles while shifting 4 pixels in the specified ; direction (except for plain TileCopy). Tile patterns ; should be stored in $c000-$c0ff. "Overlay" routines ; OR the source with the destination. @@ -1204,7 +1204,7 @@ TileCopyShiftDown: ; Arguments: a - number of tiles to duplicate (1+) ; c - index of first tile in tile mem ; Alters: af -; Description: Copies {a} number of tiles (a*16 bytes) from $c000 +; Description: Copies {a} number of tiles (a*16 bytes) from $c000 ; (backBuffer) to $8000 + c*16. ; Note: Uses current VRAM bank ;--------------------------------------------------------------------- @@ -1222,7 +1222,7 @@ DuplicateTilesToSpriteMem: add $80 ld d,a - ld a,c + ld a,c swap a and %11110000 ld e,a @@ -1307,7 +1307,7 @@ ENDC ; Routine: GenerateFacings ; Arguments: a - index (0-255) of the first of two consecutive ; tiles (frame1 and frame2) which should be facing -; east. Tiles should be located at $c000 +; east. Tiles should be located at $c000 ; (backBuffer). ; [curObjWidthHeight] - copy of FG attribute flags ; Description: Creates the following tiles at $9000-$97ff (indices @@ -1315,7 +1315,7 @@ ENDC ; a - North facing, frame 1 ; a+1 - Top half of North facing, frame 2 ; a+2 - Bottom half of North facing, frame 2 -; a+3...a+5 - East facing (frame1, left frame2, right +; a+3...a+5 - East facing (frame1, left frame2, right ; frame2) ; ; Duplicates any tiles in area $9000-$9800 into @@ -1400,7 +1400,7 @@ GenerateFacings:: call TileCopyShiftUp .copyBufferToVMem - ;Copy 6 tiles beginning at $c000+ to $9000+(c*16). + ;Copy 6 tiles beginning at $c000+ to $9000+(c*16). ;Next location after $97f0 is $8800. ld a,c cp 122 ;122+6 < 128 @@ -1506,7 +1506,7 @@ GenerateFacings:: ld l,5 call TileCopyRotateCCW - ;Copy 20 tiles beginning at $c000+ to $9000+(c*16). + ;Copy 20 tiles beginning at $c000+ to $9000+(c*16). ;Next location after $97f0 is $8800. ld a,c cp 108 ;108+20 < 128 @@ -1556,7 +1556,7 @@ GenerateFacings:: SECTION "Graphics",ROM0 ;--------------------------------------------------------------------- ; Routine: LoadGraphics -; Arguments: +; Arguments: ;--------------------------------------------------------------------- LoadGraphics: ld a,BANK(BGTiles) @@ -1709,7 +1709,7 @@ PrepareForInitialMapDraw:: ld [mapOffsetSouth],a ;north offset is -pitch - cpl + cpl inc a ld [mapOffsetNorth],a ld a,$ff @@ -1722,7 +1722,7 @@ PrepareForInitialMapDraw:: ; Arguments: None. ; Description: Centers camera on hero, then adjusts so that maximum ; amount of space on in all 4 directions is visible -; +; ;--------------------------------------------------------------------- AdjustCameraToHero:: ld a,[displayType] @@ -1779,7 +1779,7 @@ AdjustCameraToHero:: ld a,[mapPitch] cpl add 1 - ld e,a + ld e,a push hl .nloop add hl,de @@ -1788,7 +1788,7 @@ AdjustCameraToHero:: or a jr z,.nloop ;nothing at all here cp c ;found something, check if monster - jr nc,.nloop ;don't count monsters + jr nc,.nloop ;don't count monsters call GetBGAttributes and (BG_FLAG_WALKOVER|BG_FLAG_SHOOTOVER) ld a,MAPBANK @@ -1891,7 +1891,7 @@ AdjustCameraToHero:: ;now b is distance of closest wall to west ld h,d ;set hl back to original location - ld l,e + ld l,e ld d,b ;store west distance in d ld b,0 inc hl @@ -2018,7 +2018,7 @@ GentleCameraAdjust:: ;new i > old i sub b ;d = new_i - old_i - ld d,a + ld d,a ld a,[distToWall_E] ;a = dist_E + offset add d cp 11 @@ -2051,7 +2051,7 @@ GentleCameraAdjust:: ;new j > old j sub c ;d = new_j - old_j - ld d,a + ld d,a ld a,[distToWall_S] ;a = dist_S + offset add d cp 10 @@ -2259,7 +2259,7 @@ ScrollToCamera:: ld a,d dec a - ;first scroll sprites right by value to be masked off + ;first scroll sprites right by value to be masked off ld e,a ld hl,desiredPixelOffset_x ld a,[hl] @@ -2269,7 +2269,7 @@ ScrollToCamera:: call ScrollSpritesRight pop de ld a,e - cpl + cpl and %00000111 ld e,a ld a,[hl] @@ -2428,7 +2428,7 @@ ScrollToCamera:: pop de ld a,e - cpl + cpl and %00000111 ld e,a ld a,[hl] @@ -2534,10 +2534,10 @@ ScrollToCamera:: ret ;--------------------------------------------------------------------- -; Routines: ScrollSpritesLeft -; ScrollSpritesRight +; Routines: ScrollSpritesLeft +; ScrollSpritesRight ; ScrollSpritesUp -; ScrollSpritesDown +; ScrollSpritesDown ; Arguments: d - pixels to scroll ; Alters: af ; Description: Scrolls each of the 40 sprites (if their y-pos!=0) @@ -2685,7 +2685,7 @@ DrawMapToBackBuffer:: ;recopy FG tiles from shadow buffers ld a,TILESHADOWBANK ld [$ff70],a - + ldio a,[firstMonster] ld b,a @@ -2695,7 +2695,7 @@ DrawMapToBackBuffer:: pop hl pop de - + ld a,MAPBANK ld [$ff70],a ld a,h @@ -3437,7 +3437,7 @@ ShowTitle:: .loop xor a ;sprite attributes - ld [hl-],a + ld [hl-],a ld a,[de] ;letter inc de ld [hl-],a @@ -3447,7 +3447,7 @@ ShowTitle:: sla a sla a ld [hl-],a ;y coordinate - ld a,80 + ld a,80 ld [hl],a ld a,l ;add 7 to hl add 7 @@ -3510,7 +3510,7 @@ SetSpeakerToFirstHero:: ; Returns: [dialogSpeakerIndex] ; [dialogJoyIndex] ; Alters: af -; Description: +; Description: ;--------------------------------------------------------------------- SetSpeakerFromHeroIndex:: push de @@ -3564,14 +3564,14 @@ SetDialogJoy:: jr z,.cinemaType ld a,[canJoinMap] cp 2 ;asynchronous join? - jr z,.cinemaType + jr z,.cinemaType ld hl,curInput0 ld a,[dialogJoyIndex] or a ret z inc hl - ret + ret .cinemaType ld hl,myJoy @@ -3631,7 +3631,7 @@ CheckDialogContinue:: ld a,1 jr .done - + .returnFalse xor a .done @@ -3648,7 +3648,7 @@ CheckDialogContinue:: ; c - class index of speaking character ; de - pointer to gtx text ; Description: Shows the text centered at the top or bottom dialog -; bar & waits until the user presses a button to +; bar & waits until the user presses a button to ; continue. ; Alters: none ; Note: Format of gtx: @@ -3726,7 +3726,7 @@ ShowDialogAtTopCommon:: rlca ;times 8 = pixels for window rlca rlca - add 7 + add 7 ld [hblankWinOff],a ld a,143 @@ -3867,7 +3867,7 @@ ShowDialogWait:: ld [heroesIdle],a ret - + .waitInputZero DialogWaitInputZero:: call UpdateObjects @@ -3888,7 +3888,7 @@ DialogWaitInputZero:: ; b - lines to skip at top ; c - class index of speaking character ; de - pointer to gtx text beginning with #lines -; Description: +; Description: ; Alters: af ; Note: Format of gtx: ; BYTE number of lines @@ -3921,7 +3921,7 @@ ShowDialogCommon:: add 1 ld b,a ld hl,backBuffer - + .clearLines call ClearGTXLine push bc @@ -3982,7 +3982,7 @@ ShowDialogCommon:: ;--------------------------------------------------------------------- ; Routine: ClearGTXLine -; Arguments: +; Arguments: ; hl - backbuffer location to draw at ; Alters: af ;--------------------------------------------------------------------- @@ -4063,7 +4063,7 @@ GfxBlitBackBufferToWindow:: ;ld hl,$c000 ;source ;call VMemCopy ;ret - + ld a,$9c ;copy to window map memory ldio [backBufferDestHighByte],a ld a,1 @@ -4268,7 +4268,7 @@ DrawTileToTLCorner: ;class index in c, 1 line down in b ; Routine: ChooseFromDialogAlternates ; Arguments: de - pointer to gtx text ; Returns: de - adjusted pointer -; Alters: de +; Alters: de ; Description: de points to start of an indeterminate number of ; byte triplets of the form: ; [mask] [offsetL] [offsetH] @@ -4320,9 +4320,9 @@ ChooseFromDialogAlternates: ; Arguments: None. ; Returns: Nothing. ; Alters: af -; Description: Intended for use in cinemas and in-game dialog, -; resets the pc and sp to an address set with -; SetDialogSkip. Sets to the skip address if start is +; Description: Intended for use in cinemas and in-game dialog, +; resets the pc and sp to an address set with +; SetDialogSkip. Sets to the skip address if start is ; pushed, to fast-forward address if B is pushed. ;--------------------------------------------------------------------- CheckSkip:: @@ -4357,12 +4357,12 @@ CheckSkip:: push hl ld hl,levelCheckSkip ;fast forward address jr .restore - + .startPressed push hl ld hl,levelCheckSkip+2 ;skip address -.restore +.restore ld a,[hl] or a jr nz,.addressOkay @@ -4414,14 +4414,14 @@ CheckSkip:: .done pop hl ret - + ;--------------------------------------------------------------------- ; Routine: Delay ; Arguments: a - number of 1/60 seconds to delay ; Alters: af -; Description: Updates and displays objects for specified number of -; 1/60 seconds. Jumps to [levelCheckSkip] if start +; Description: Updates and displays objects for specified number of +; 1/60 seconds. Jumps to [levelCheckSkip] if start ; button is pressed if addr is non-null. ;--------------------------------------------------------------------- Delay:: @@ -4550,7 +4550,7 @@ GetRandomNumMask:: push bc push hl - ld b,a ;b is bitmask + ld b,a ;b is bitmask PUSHROM ld a,BANK(randomTable) @@ -4606,7 +4606,7 @@ SetupFadeFromWhite:: FadeCommonSetPaletteToWhite:: ld c,64 -.loop +.loop ld a,$ff ld [hl+],a ld a,$7f @@ -4775,7 +4775,7 @@ SetupFadeToBlack:: FadeCommonSetPaletteToBlack:: ld c,64 xor a -.loop +.loop ld [hl+],a ld [hl+],a dec c @@ -4823,7 +4823,7 @@ SetupFadeFromBlackBGOnly:: ;--------------------------------------------------------------------- ; Routine: BlackoutPalette -; Arguments: +; Arguments: ; Alters: af ; Description: Sets fadeCurPalette and final palette to all black ;--------------------------------------------------------------------- @@ -4900,7 +4900,7 @@ SetupFadeToBlackBGOnly:: FadeCommonSetPaletteToBlackBGOnly:: ld c,32 xor a -.loop +.loop ld [hl+],a ld [hl+],a dec c @@ -4995,7 +4995,7 @@ SetupFadeToGamePalette:: ld a,FADEBANK ld [$ff70],a - ;set final palette to be current game palette + ;set final palette to be current game palette ld hl,gamePalette ld de,fadeFinalPalette call FadeCommonCopyPalette @@ -5023,7 +5023,7 @@ SetupFadeToHalfbrite:: ld a,FADEBANK ld [$ff70],a - ;set final palette to be halfbrite game palette + ;set final palette to be halfbrite game palette ld hl,gamePalette ld de,fadeCurPalette ld c,64 @@ -5077,10 +5077,10 @@ FadeCommonGetColor: inc de ld b,a ret - + ;--------------------------------------------------------------------- -; Routine: FadeInit -; Arguments: a - number of steps +; Routine: FadeInit +; Arguments: a - number of steps ; [fadeCurPalette], [fadeFinalPalette] already setup ; with palettes to fade between ; Alters: af @@ -5100,7 +5100,7 @@ FadeInit:: ld a,FADEBANK ld [$ff70],a - ;for each color component, difference is (c2-c1) + ;for each color component, difference is (c2-c1) ;subtract each element of fadeCurPalette from fadeFinalPalette ;and store separate RGB offsets in fadeDelta. ;fadeCurPalette RGB elements in fadeCurRGB. @@ -5117,7 +5117,7 @@ FadeInit:: dec c jr nz,.clearError - ;begin by storing each color component of each color in + ;begin by storing each color component of each color in ;fadeCurPalette into fadeDelta ld a,64 ld hl,fadeDelta @@ -5180,7 +5180,7 @@ FadeInit:: ;--------------------------------------------------------------------- -; Routine: FadeStep +; Routine: FadeStep ; Alters: af ; Description: Peforms the next step of the fade in progress. ; Should only be called if [specialFX] & FX_FADE is 1. @@ -5356,7 +5356,7 @@ FadeStep:: ;>=32 ld c,0 .while_pos_ge_32 - sub b + sub b inc c cp b jr nc,.while_pos_ge_32 @@ -5428,7 +5428,7 @@ SetColors123AllPalettes:: push hl ld d,16 -.loop +.loop inc hl inc hl ld e,3 @@ -5481,7 +5481,7 @@ LighteningOut:: ld c,7 call .pause - + pop hl pop de pop bc @@ -5540,7 +5540,7 @@ LighteningIn:: call FadeCommonCopyPalette ld a,128 ldio [paletteBufferReady],a - + pop hl pop de pop bc @@ -5552,12 +5552,12 @@ LighteningIn:: ret ;--------------------------------------------------------------------- -; Routines: GetRedComponent -; GetGreenComponent -; GetBlueComponent -; SetRedComponent -; SetGreenComponent -; SetBlueComponent +; Routines: GetRedComponent +; GetGreenComponent +; GetBlueComponent +; SetRedComponent +; SetGreenComponent +; SetBlueComponent ; Arguments: Get: bc - 15 bit BGR value ; Set: bc - 15 bit BGR value, a - value to set ; Returns: Get: a - color component @@ -5702,7 +5702,7 @@ PlaySoundChannel1:: ld a,[musicOverride1] or a ret nz - + .playSound ld a,[hl+] ldio [$ff10],a @@ -5761,7 +5761,7 @@ PlaySoundChannel4:: ld a,[musicOverride4] or a ret nz - + .playSound ld a,[hl+] ldio [$ff20],a @@ -5894,11 +5894,11 @@ ResetSprites:: ;--------------------------------------------------------------------- -; Routine: AllocateSprite +; Routine: AllocateSprite ; Arguments: none ; Returns: a - 00-9C=success (lowptr), ff=failure ; Alters: af -; Description: Loops through spritesUsed flag table, finds a free +; Description: Loops through spritesUsed flag table, finds a free ; sprite, and returns that sprite's loPtr. ;--------------------------------------------------------------------- AllocateSprite:: @@ -5911,7 +5911,7 @@ AllocateSprite:: ret .freeSpriteExists - push bc + push bc push de push hl @@ -5936,7 +5936,7 @@ AllocateSprite:: .foundSprite dec hl ld a,1 ;mark sprite as used - ld [hl],a + ld [hl],a ld a,l ;return loptr in a inc a @@ -5955,7 +5955,7 @@ AllocateSprite:: ret ;--------------------------------------------------------------------- -; Routine: FreeSprite +; Routine: FreeSprite ; Arguments: a - loptr to sprite ; Alters: af ; Description: Sets the sprite's YPOS to zero @@ -6003,9 +6003,9 @@ FreeSprite:: ret ;--------------------------------------------------------------------- -; Routine: CreateMetaSprite -; Arguments: -; bc - width (b) and height (c) of metasprite, in 8x8 +; Routine: CreateMetaSprite +; Arguments: +; bc - width (b) and height (c) of metasprite, in 8x8 ; tiles. ; d - initial pattern number for first sprite. ; e - default attributes for each sprite. @@ -6081,8 +6081,8 @@ CreateMetaSprite:: ;--------------------------------------------------------------------- ; Routine: CreateMetaSpriteUsingMask -; Arguments: -; bc - width (b) and height (c) of metasprite, in 8x8 +; Arguments: +; bc - width (b) and height (c) of metasprite, in 8x8 ; tiles. ; d - initial pattern number for first sprite. ; e - default attributes for each sprite. @@ -6113,7 +6113,7 @@ CreateMetaSpriteUsingMask:: ;store total sprites used in metaSpriteInfo ld [hl+],a - ;go through and allocate each sprite marked with non-zero, + ;go through and allocate each sprite marked with non-zero, ;set it up, and store its loptr in the metaSpriteInfo push bc .height pop af ;setup width from original value @@ -6170,9 +6170,9 @@ CreateMetaSpriteUsingMask:: ret ;--------------------------------------------------------------------- -; Routine: ScrollMetaSprite +; Routine: ScrollMetaSprite ; Arguments: bc - x (b) and y (c) offset to scroll each sprite. -; hl - ptr to metaSpriteInfo created with +; hl - ptr to metaSpriteInfo created with ; CreateMetaSprite ; Alters: af ;--------------------------------------------------------------------- @@ -6202,10 +6202,10 @@ ScrollMetaSprite:: ret ;--------------------------------------------------------------------- -; Routine: SetMetaSpritePos +; Routine: SetMetaSpritePos ; Arguments: bc - desired x (b) and y (c) pixel position in sprite ; coords -; hl - ptr to metaSpriteInfo created with +; hl - ptr to metaSpriteInfo created with ; CreateMetaSprite ; Alters: af ;--------------------------------------------------------------------- @@ -6219,7 +6219,7 @@ SetMetaSpritePos:: ld h,((spriteOAMBuffer>>8) & $ff) ld a,c ;desired y pos - sub [hl] + sub [hl] ld c,a ;becomes offset to scroll inc hl @@ -6235,8 +6235,8 @@ SetMetaSpritePos:: ret ;--------------------------------------------------------------------- -; Routine: FreeMetaSprite -; Arguments: hl - ptr to metaSpriteInfo created with +; Routine: FreeMetaSprite +; Arguments: hl - ptr to metaSpriteInfo created with ; CreateMetaSprite ; Alters: af ;--------------------------------------------------------------------- @@ -6264,7 +6264,7 @@ FreeMetaSprite:: ; d - max sprites (must be >0) ; e - flags for allowed explosion types: ; :0 - small round explosions -; :1 - shrapnel plus +; :1 - shrapnel plus ; :2 - big (2x2) round explosions (4 sprites ea) ; hl - TL map corner (e.g. $d0ca) of explosion ; [bulletColor] @@ -6272,7 +6272,7 @@ FreeMetaSprite:: ; Alters: af ; Description: Creates a big explosion of randomly dispersed smaller ; explosions within the given area. -; +; ;--------------------------------------------------------------------- CreateBigExplosion:: push bc @@ -6308,11 +6308,11 @@ CreateBigExplosion:: ld d,1 jr .afterCreateExplosion .afterLimitToSmaller - + ;select random tile position within area ;width - ld a,b + ld a,b dec a call GetRandomNumZeroToN add h @@ -6475,7 +6475,7 @@ BlitMap:: push hl ldio a,[firstMonster] ld c,a - + .blitMapInner ld a,[de] cp c ;< first monster? @@ -6524,11 +6524,11 @@ BlitMap:: ;--------------------------------------------------------------------- ConvertLocHLToXY:: ld a,[mapPitchMinusOne] - and l + and l push af ;push a (x index) on stack ld a,h ;subtract $D000 from hl by adding $3000 - add $30 + add $30 ld h,a ld a,[mapPitchMinusOneComplement] ;times to left-shift .shift rlca ;shift a bit left out of a @@ -6536,7 +6536,7 @@ ConvertLocHLToXY:: sla l rl h jr .shift - + .shiftDone ld l,h pop af @@ -6600,7 +6600,7 @@ LCheckGetVectorToState:: ;--------------------------------------------------------------------- ; Routine: SaveIdle ; Arguments: None. -; Returns: +; Returns: ; Alters: af,hl ; Description: Saves the current state of [heroesIdle] and [allIdle] ; in [dialogIdleSettings] and activates both idle @@ -6621,7 +6621,7 @@ SaveIdle:: ;--------------------------------------------------------------------- ; Routine: RestoreIdle ; Arguments: None. -; Returns: +; Returns: ; Alters: af,hl ; Description: Restores the idle settings to what they were previous ; to SaveIdle @@ -6639,7 +6639,7 @@ RestoreIdle:: ;--------------------------------------------------------------------- ; Routine: MakeIdle ; Arguments: None. -; Returns: +; Returns: ; Alters: af ; Description: Sets [heroesIdle] and [allIdle] to 1 ;--------------------------------------------------------------------- @@ -6652,7 +6652,7 @@ MakeIdle:: ;--------------------------------------------------------------------- ; Routine: MakeNonIdle ; Arguments: None. -; Returns: +; Returns: ; Alters: af ; Description: Sets [heroesIdle] and [allIdle] to 0 ;--------------------------------------------------------------------- @@ -6676,7 +6676,7 @@ UseAlternatePalette:: ld a,FADEBANK ldio [$ff70],a - + ld c,16 ld hl,gamePalette+2 .loop call .halve @@ -6729,7 +6729,7 @@ GetMyHero:: ret ;--------------------------------------------------------------------- -; Routine: GetBGAttributes +; Routine: GetBGAttributes ; Arguments: a - class index ; Alters: af ; Returns: a - attributes for given class index @@ -6871,10 +6871,10 @@ DisableDialogBalloons:: ret ;--------------------------------------------------------------------- -; Routine: FindNextFreeSprite -; Arguments: de - ptr to position within spritesUsed to begin +; Routine: FindNextFreeSprite +; Arguments: de - ptr to position within spritesUsed to begin ; resetting -; hl - ptr to sprite OAM buffer corresponding to +; hl - ptr to sprite OAM buffer corresponding to ; de ; Alters: af,de,hl ; Returns: a - 0 on failure @@ -6912,7 +6912,7 @@ FindNextFreeSprite: ret ;--------------------------------------------------------------------- -; Routine: PutBalloonAboveObject +; Routine: PutBalloonAboveObject ; Arguments: de - ptr to object ; hl - ptr to sprite OAM buffer ; Alters: af @@ -6958,15 +6958,15 @@ PutBalloonAboveObject: ret ;--------------------------------------------------------------------- -; Routine: ResetFreeSprites -; Arguments: de - ptr to position within spritesUsed to begin +; Routine: ResetFreeSprites +; Arguments: de - ptr to position within spritesUsed to begin ; resetting -; hl - ptr to sprite OAM buffer corresponding to +; hl - ptr to sprite OAM buffer corresponding to ; de ; Alters: af,de,hl ; Returns: Nothing. -; Description: Sets y=0 of all sprites after initial position not -; flagged as in use; necessary for resetting +; Description: Sets y=0 of all sprites after initial position not +; flagged as in use; necessary for resetting ; environmental effects ;--------------------------------------------------------------------- ResetFreeSprites:: @@ -6998,7 +6998,7 @@ ResetFreeSprites:: ret ;--------------------------------------------------------------------- -; Routine: SetEnvEffect +; Routine: SetEnvEffect ; Arguments: a - env effect such as ENV_RAIN ; Alters: af ; Returns: Nothing. @@ -7021,7 +7021,7 @@ SetEnvEffect:: ;--------------------------------------------------------------------- -; Routine: UpdateEnvEffect +; Routine: UpdateEnvEffect ; Arguments: None. ; Alters: af ; Returns: Nothing. @@ -7579,7 +7579,7 @@ flakeSineTable: ;--------------------------------------------------------------------- ; EnvDisco -; Uses binary data "discoLights" to set all colors to purple in +; Uses binary data "discoLights" to set all colors to purple in ; drawing buffer except where lights are flashing. Uses levelVars[0] ; to determine current frame ;--------------------------------------------------------------------- @@ -7636,14 +7636,14 @@ EnvDisco: ret discoLights: -INCBIN "discolights.dat" +INCBIN "Data/discolights.dat" ;Not in HOME ;--------------------------------------------------------------------- -SECTION "FontSection",DATA,BANK[MAP0ROM] -fontData: - INCBIN "font.bin" +SECTION "FontSection",ROMX,BANK[MAP0ROM] +fontData: + INCBIN "Data/font.bin" blankTileData: DW 0,0,0,0,0,0,0,0 @@ -7712,7 +7712,7 @@ DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -;SECTION "InGameGraphicsSection1",DATA +;SECTION "InGameGraphicsSection1",ROMX ;select_hero_bg:: ; INCBIN "gamebg\\select_hero.bg" diff --git a/Source/l0000.asm b/Source/l0000.asm index 2859441..4ba9fb7 100644 --- a/Source/l0000.asm +++ b/Source/l0000.asm @@ -9,7 +9,7 @@ STATE_NORMAL EQU 1 STATE_HONEYTAKEN EQU 2 ;--------------------------------------------------------------------- -SECTION "LevelsSection0000",DATA,BANK[MAP0ROM] +SECTION "LevelsSection0000",ROMX,BANK[MAP0ROM] ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0001.asm b/Source/l0001.asm index 56a4ea8..7206b66 100644 --- a/Source/l0001.asm +++ b/Source/l0001.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 35 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0001Section",DATA +SECTION "Level0001Section",ROMX ;--------------------------------------------------------------------- L0001_Contents:: diff --git a/Source/l0002.asm b/Source/l0002.asm index c4cd5af..6272cab 100644 --- a/Source/l0002.asm +++ b/Source/l0002.asm @@ -13,7 +13,7 @@ STATE_TALKED EQU 2 ;--------------------------------------------------------------------- -SECTION "Level0002Section",DATA +SECTION "Level0002Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0003.asm b/Source/l0003.asm index f48e132..73802fc 100644 --- a/Source/l0003.asm +++ b/Source/l0003.asm @@ -13,7 +13,7 @@ STATE_TALKED2 EQU 3 ;--------------------------------------------------------------------- -SECTION "Level0003Section",DATA +SECTION "Level0003Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0004.asm b/Source/l0004.asm index f270ebb..2673deb 100644 --- a/Source/l0004.asm +++ b/Source/l0004.asm @@ -10,7 +10,7 @@ STATE_TALKED EQU 2 ;--------------------------------------------------------------------- -SECTION "Level0004Section",DATA +SECTION "Level0004Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0005.asm b/Source/l0005.asm index c3f6335..435c02a 100644 --- a/Source/l0005.asm +++ b/Source/l0005.asm @@ -7,7 +7,7 @@ INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0005Section",DATA +SECTION "Level0005Section",ROMX ;--------------------------------------------------------------------- L0005_Contents:: diff --git a/Source/l0006.asm b/Source/l0006.asm index 70429c9..bf47bf1 100644 --- a/Source/l0006.asm +++ b/Source/l0006.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0006Section",DATA +SECTION "Level0006Section",ROMX ;--------------------------------------------------------------------- L0006_Contents:: diff --git a/Source/l0007.asm b/Source/l0007.asm index 2222535..dd3844c 100644 --- a/Source/l0007.asm +++ b/Source/l0007.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0007Section",DATA +SECTION "Level0007Section",ROMX ;--------------------------------------------------------------------- L0007_Contents:: diff --git a/Source/l0008.asm b/Source/l0008.asm index f220c6b..8d5ca1b 100644 --- a/Source/l0008.asm +++ b/Source/l0008.asm @@ -10,7 +10,7 @@ STATE_NORMAL EQU 1 STATE_SPRAYTAKEN EQU 2 ;--------------------------------------------------------------------- -SECTION "Level0008Section",DATA +SECTION "Level0008Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0009.asm b/Source/l0009.asm index 72b2eb2..c205fbf 100644 --- a/Source/l0009.asm +++ b/Source/l0009.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0009Section",DATA +SECTION "Level0009Section",ROMX ;--------------------------------------------------------------------- L0009_Contents:: diff --git a/Source/l0010.asm b/Source/l0010.asm index 624631a..cbd5035 100644 --- a/Source/l0010.asm +++ b/Source/l0010.asm @@ -19,7 +19,7 @@ STATE_MASKTAKEN EQU 2 ;--------------------------------------------------------------------- -SECTION "Level0010Section",DATA +SECTION "Level0010Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0011.asm b/Source/l0011.asm index 1100429..99af774 100644 --- a/Source/l0011.asm +++ b/Source/l0011.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0011Section",DATA +SECTION "Level0011Section",ROMX ;--------------------------------------------------------------------- L0011_Contents:: diff --git a/Source/l0012.asm b/Source/l0012.asm index 170045e..91860f8 100644 --- a/Source/l0012.asm +++ b/Source/l0012.asm @@ -15,7 +15,7 @@ GRUNT_INDEX EQU 28 GYRO_INDEX EQU 29 ;--------------------------------------------------------------------- -SECTION "Level0012Section",DATA +SECTION "Level0012Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0013.asm b/Source/l0013.asm index b7bb731..3e49930 100644 --- a/Source/l0013.asm +++ b/Source/l0013.asm @@ -13,7 +13,7 @@ DROPSPEED2 EQU $0001 ;--------------------------------------------------------------------- -SECTION "Level0013Section",DATA +SECTION "Level0013Section",ROMX ;--------------------------------------------------------------------- L0013_Contents:: diff --git a/Source/l0014.asm b/Source/l0014.asm index b291f94..2cc7574 100644 --- a/Source/l0014.asm +++ b/Source/l0014.asm @@ -7,7 +7,7 @@ INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0014Section",DATA +SECTION "Level0014Section",ROMX ;--------------------------------------------------------------------- L0014_Contents:: diff --git a/Source/l0015.asm b/Source/l0015.asm index c43ea3d..11c16ca 100644 --- a/Source/l0015.asm +++ b/Source/l0015.asm @@ -7,7 +7,7 @@ INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0015Section",DATA +SECTION "Level0015Section",ROMX ;--------------------------------------------------------------------- L0015_Contents:: diff --git a/Source/l0103.asm b/Source/l0103.asm index 4baf7fe..cfc38e0 100644 --- a/Source/l0103.asm +++ b/Source/l0103.asm @@ -16,7 +16,7 @@ STATE_TALKED2 EQU 3 ;--------------------------------------------------------------------- -SECTION "Level0103Section",DATA +SECTION "Level0103Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0104.asm b/Source/l0104.asm index 66a488d..2675ec5 100644 --- a/Source/l0104.asm +++ b/Source/l0104.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0104Section",DATA +SECTION "Level0104Section",ROMX ;--------------------------------------------------------------------- L0104_Contents:: diff --git a/Source/l0105.asm b/Source/l0105.asm index 582074e..ce54dba 100644 --- a/Source/l0105.asm +++ b/Source/l0105.asm @@ -11,7 +11,7 @@ STATE_NORMAL EQU 1 STATE_HIVEDESTROYED EQU 2 ;--------------------------------------------------------------------- -SECTION "LevelsSection0105",DATA +SECTION "LevelsSection0105",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0106.asm b/Source/l0106.asm index 0a01263..a2e95bc 100644 --- a/Source/l0106.asm +++ b/Source/l0106.asm @@ -7,7 +7,7 @@ INCLUDE "Source/levels.inc" STATE_TALKED EQU 2 ;--------------------------------------------------------------------- -SECTION "LevelsSection0106",DATA +SECTION "LevelsSection0106",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0107.asm b/Source/l0107.asm index b1591ed..c99834b 100644 --- a/Source/l0107.asm +++ b/Source/l0107.asm @@ -32,7 +32,7 @@ EXPORT closeGateSound ;--------------------------------------------------------------------- -SECTION "LevelsSection1",DATA,BANK[MAP0ROM] +SECTION "LevelsSection1",ROMX,BANK[MAP0ROM] ;--------------------------------------------------------------------- L0107_Contents:: diff --git a/Source/l0108.asm b/Source/l0108.asm index 3e53762..56f5464 100644 --- a/Source/l0108.asm +++ b/Source/l0108.asm @@ -10,7 +10,7 @@ VAR_LIGHT EQU 0 VAR_SIGN EQU 1 ;--------------------------------------------------------------------- -SECTION "Level0108Section",DATA +SECTION "Level0108Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0109.asm b/Source/l0109.asm index 8856b1e..4fa9fd3 100644 --- a/Source/l0109.asm +++ b/Source/l0109.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0109Section",DATA +SECTION "Level0109Section",ROMX ;--------------------------------------------------------------------- L0109_Contents:: diff --git a/Source/l0110.asm b/Source/l0110.asm index d2781ab..b320d78 100644 --- a/Source/l0110.asm +++ b/Source/l0110.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0110Section",DATA +SECTION "Level0110Section",ROMX ;--------------------------------------------------------------------- L0110_Contents:: diff --git a/Source/l0111.asm b/Source/l0111.asm index 7be6bbb..e683efd 100644 --- a/Source/l0111.asm +++ b/Source/l0111.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0111Section",DATA +SECTION "Level0111Section",ROMX ;--------------------------------------------------------------------- L0111_Contents:: diff --git a/Source/l0112.asm b/Source/l0112.asm index b49d8a7..454ef97 100644 --- a/Source/l0112.asm +++ b/Source/l0112.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0112Section",DATA +SECTION "Level0112Section",ROMX ;--------------------------------------------------------------------- L0112_Contents:: diff --git a/Source/l0113.asm b/Source/l0113.asm index 8b58351..2b6bdda 100644 --- a/Source/l0113.asm +++ b/Source/l0113.asm @@ -8,7 +8,7 @@ INCLUDE "Source/levels.inc" CRATERINDEX EQU 30 ;--------------------------------------------------------------------- -SECTION "Level0113Section",DATA +SECTION "Level0113Section",ROMX ;--------------------------------------------------------------------- L0113_Contents:: diff --git a/Source/l0114.asm b/Source/l0114.asm index 496cd30..61613c2 100644 --- a/Source/l0114.asm +++ b/Source/l0114.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0114Section",DATA +SECTION "Level0114Section",ROMX ;--------------------------------------------------------------------- L0114_Contents:: diff --git a/Source/l0115.asm b/Source/l0115.asm index b9a924e..b8fbed4 100644 --- a/Source/l0115.asm +++ b/Source/l0115.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0115Section",DATA +SECTION "Level0115Section",ROMX ;--------------------------------------------------------------------- L0115_Contents:: diff --git a/Source/l0200.asm b/Source/l0200.asm index 8200e2b..25e96e2 100644 --- a/Source/l0200.asm +++ b/Source/l0200.asm @@ -12,7 +12,7 @@ VAR_FIRE EQU 0 VAR_WATER EQU 1 ;--------------------------------------------------------------------- -SECTION "Level0200Section",DATA +SECTION "Level0200Section",ROMX ;--------------------------------------------------------------------- L0200_Contents:: diff --git a/Source/l0201.asm b/Source/l0201.asm index a451a70..4a39622 100644 --- a/Source/l0201.asm +++ b/Source/l0201.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 1 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0201Section",DATA +SECTION "Level0201Section",ROMX ;--------------------------------------------------------------------- L0201_Contents:: diff --git a/Source/l0203.asm b/Source/l0203.asm index 8ed1fa4..bfdc0bd 100644 --- a/Source/l0203.asm +++ b/Source/l0203.asm @@ -5,7 +5,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "LevelsSection0203",DATA +SECTION "LevelsSection0203",ROMX ;--------------------------------------------------------------------- L0203_Contents:: diff --git a/Source/l0204.asm b/Source/l0204.asm index e41a2db..47a56c7 100644 --- a/Source/l0204.asm +++ b/Source/l0204.asm @@ -5,7 +5,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "LevelsSection0204",DATA +SECTION "LevelsSection0204",ROMX ;--------------------------------------------------------------------- L0204_Contents:: diff --git a/Source/l0205.asm b/Source/l0205.asm index d5b46d0..c6c1990 100644 --- a/Source/l0205.asm +++ b/Source/l0205.asm @@ -25,7 +25,7 @@ STATE_HIVE_DESTROYED EQU 2 ;--------------------------------------------------------------------- -SECTION "LevelsSection0205",DATA,BANK[MAP0ROM] +SECTION "LevelsSection0205",ROMX,BANK[MAP0ROM] ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0211.asm b/Source/l0211.asm index c365001..6b0199d 100644 --- a/Source/l0211.asm +++ b/Source/l0211.asm @@ -8,7 +8,7 @@ INCLUDE "Source/levels.inc" FIRST_HOLE EQU 26 ;--------------------------------------------------------------------- -SECTION "Level0211Section",DATA +SECTION "Level0211Section",ROMX ;--------------------------------------------------------------------- L0211_Contents:: diff --git a/Source/l0212.asm b/Source/l0212.asm index 7423a4f..7f8fb78 100644 --- a/Source/l0212.asm +++ b/Source/l0212.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0212Section",DATA +SECTION "Level0212Section",ROMX ;--------------------------------------------------------------------- L0212_Contents:: diff --git a/Source/l0213.asm b/Source/l0213.asm index 512e9a9..0b3c480 100644 --- a/Source/l0213.asm +++ b/Source/l0213.asm @@ -7,7 +7,7 @@ INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0213Section",DATA +SECTION "Level0213Section",ROMX ;--------------------------------------------------------------------- L0213_Contents:: diff --git a/Source/l0214.asm b/Source/l0214.asm index d694b67..7c7c831 100644 --- a/Source/l0214.asm +++ b/Source/l0214.asm @@ -7,7 +7,7 @@ INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0214Section",DATA +SECTION "Level0214Section",ROMX ;--------------------------------------------------------------------- L0214_Contents:: diff --git a/Source/l0215.asm b/Source/l0215.asm index 3e1fd6a..90a3dbe 100644 --- a/Source/l0215.asm +++ b/Source/l0215.asm @@ -8,7 +8,7 @@ INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0215Section",DATA +SECTION "Level0215Section",ROMX ;--------------------------------------------------------------------- L0215_Contents:: diff --git a/Source/l0300.asm b/Source/l0300.asm index 7521a5c..2088884 100644 --- a/Source/l0300.asm +++ b/Source/l0300.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0300Section",DATA +SECTION "Level0300Section",ROMX ;--------------------------------------------------------------------- L0300_Contents:: diff --git a/Source/l0301.asm b/Source/l0301.asm index 3dcaaa0..edbe3ae 100644 --- a/Source/l0301.asm +++ b/Source/l0301.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 1 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0301Section",DATA +SECTION "Level0301Section",ROMX ;--------------------------------------------------------------------- L0301_Contents:: diff --git a/Source/l0302.asm b/Source/l0302.asm index 998b8e9..b9d2b3c 100644 --- a/Source/l0302.asm +++ b/Source/l0302.asm @@ -11,7 +11,7 @@ VAR_WATER EQU 0 VAR_LIGHT EQU 1 ;--------------------------------------------------------------------- -SECTION "Level0302Section",DATA +SECTION "Level0302Section",ROMX ;--------------------------------------------------------------------- L0302_Contents:: diff --git a/Source/l0303.asm b/Source/l0303.asm index ad92fc7..ba913af 100644 --- a/Source/l0303.asm +++ b/Source/l0303.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 3 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0303Section",DATA +SECTION "Level0303Section",ROMX ;--------------------------------------------------------------------- L0303_Contents:: diff --git a/Source/l0304.asm b/Source/l0304.asm index 39997d7..04c0d5b 100644 --- a/Source/l0304.asm +++ b/Source/l0304.asm @@ -8,7 +8,7 @@ INCLUDE "Source/items.inc" ;--------------------------------------------------------------------- -SECTION "Level0304Section",DATA +SECTION "Level0304Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0305.asm b/Source/l0305.asm index eaaed6d..4c25cf9 100644 --- a/Source/l0305.asm +++ b/Source/l0305.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0305Section",DATA +SECTION "Level0305Section",ROMX ;--------------------------------------------------------------------- L0305_Contents:: diff --git a/Source/l0306.asm b/Source/l0306.asm index 502423e..806a112 100644 --- a/Source/l0306.asm +++ b/Source/l0306.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0306Section",DATA +SECTION "Level0306Section",ROMX ;--------------------------------------------------------------------- L0306_Contents:: diff --git a/Source/l0307.asm b/Source/l0307.asm index cc44f5c..29c15b9 100644 --- a/Source/l0307.asm +++ b/Source/l0307.asm @@ -8,7 +8,7 @@ INCLUDE "Source/items.inc" ;--------------------------------------------------------------------- -SECTION "Level0307Section",DATA +SECTION "Level0307Section",ROMX ;--------------------------------------------------------------------- L0307_Contents:: diff --git a/Source/l0308.asm b/Source/l0308.asm index d314c3b..9150455 100644 --- a/Source/l0308.asm +++ b/Source/l0308.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0308Section",DATA +SECTION "Level0308Section",ROMX ;--------------------------------------------------------------------- L0308_Contents:: diff --git a/Source/l0309.asm b/Source/l0309.asm index db9aa95..833b4bd 100644 --- a/Source/l0309.asm +++ b/Source/l0309.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0309Section",DATA +SECTION "Level0309Section",ROMX ;--------------------------------------------------------------------- L0309_Contents:: diff --git a/Source/l0310.asm b/Source/l0310.asm index f5052a8..a3cb74c 100644 --- a/Source/l0310.asm +++ b/Source/l0310.asm @@ -9,7 +9,7 @@ LIGHTINDEX EQU 59 VAR_LIGHT EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0310Section",DATA +SECTION "Level0310Section",ROMX ;--------------------------------------------------------------------- L0310_Contents:: diff --git a/Source/l0311.asm b/Source/l0311.asm index 302fc50..106efcd 100644 --- a/Source/l0311.asm +++ b/Source/l0311.asm @@ -8,7 +8,7 @@ INCLUDE "Source/levels.inc" FIRST_HOLE EQU 25 ;--------------------------------------------------------------------- -SECTION "Level0311Section",DATA +SECTION "Level0311Section",ROMX ;--------------------------------------------------------------------- L0311_Contents:: diff --git a/Source/l0312.asm b/Source/l0312.asm index ba3cc8b..4180645 100644 --- a/Source/l0312.asm +++ b/Source/l0312.asm @@ -10,7 +10,7 @@ HIVE_INDEX EQU 15 STATE_HIVE_DESTROYED EQU 2 ;--------------------------------------------------------------------- -SECTION "Level0312Section",DATA +SECTION "Level0312Section",ROMX ;--------------------------------------------------------------------- L0312_Contents:: diff --git a/Source/l0314.asm b/Source/l0314.asm index 77bb022..052afc7 100644 --- a/Source/l0314.asm +++ b/Source/l0314.asm @@ -8,7 +8,7 @@ INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0314Section",DATA +SECTION "Level0314Section",ROMX ;--------------------------------------------------------------------- L0314_Contents:: diff --git a/Source/l0315.asm b/Source/l0315.asm index 66f724c..7917fd8 100644 --- a/Source/l0315.asm +++ b/Source/l0315.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0315Section",DATA +SECTION "Level0315Section",ROMX ;--------------------------------------------------------------------- L0315_Contents:: diff --git a/Source/l0400.asm b/Source/l0400.asm index f9fc13a..14ae8ec 100644 --- a/Source/l0400.asm +++ b/Source/l0400.asm @@ -8,7 +8,7 @@ INCLUDE "Source/items.inc" ;--------------------------------------------------------------------- -SECTION "Level0400Section",DATA +SECTION "Level0400Section",ROMX ;--------------------------------------------------------------------- L0400_Contents:: diff --git a/Source/l0401.asm b/Source/l0401.asm index b59095d..20cf6c0 100644 --- a/Source/l0401.asm +++ b/Source/l0401.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0401Section",DATA +SECTION "Level0401Section",ROMX ;--------------------------------------------------------------------- L0401_Contents:: diff --git a/Source/l0402.asm b/Source/l0402.asm index a494075..f6ab4be 100644 --- a/Source/l0402.asm +++ b/Source/l0402.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0402Section",DATA +SECTION "Level0402Section",ROMX ;--------------------------------------------------------------------- L0402_Contents:: diff --git a/Source/l0403.asm b/Source/l0403.asm index bbfd1f8..b3fd4ca 100644 --- a/Source/l0403.asm +++ b/Source/l0403.asm @@ -7,7 +7,7 @@ INCLUDE "Source/levels.inc" INCLUDE "Source/items.inc" ;--------------------------------------------------------------------- -SECTION "Level0403Section",DATA +SECTION "Level0403Section",ROMX ;--------------------------------------------------------------------- L0403_Contents:: diff --git a/Source/l0404.asm b/Source/l0404.asm index f09f900..a59330b 100644 --- a/Source/l0404.asm +++ b/Source/l0404.asm @@ -8,7 +8,7 @@ INCLUDE "Source/items.inc" ;--------------------------------------------------------------------- -SECTION "Level0404Section",DATA +SECTION "Level0404Section",ROMX ;--------------------------------------------------------------------- L0404_Contents:: diff --git a/Source/l0405.asm b/Source/l0405.asm index 8dfcc34..38d6c54 100644 --- a/Source/l0405.asm +++ b/Source/l0405.asm @@ -20,7 +20,7 @@ STATE_AFTERWEDDING EQU 2 ;--------------------------------------------------------------------- -SECTION "Level0405Section",DATA +SECTION "Level0405Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0406.asm b/Source/l0406.asm index 59628c7..98b485d 100644 --- a/Source/l0406.asm +++ b/Source/l0406.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0406Section",DATA +SECTION "Level0406Section",ROMX ;--------------------------------------------------------------------- L0406_Contents:: diff --git a/Source/l0407.asm b/Source/l0407.asm index f7ca508..6b0d99e 100644 --- a/Source/l0407.asm +++ b/Source/l0407.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0407Section",DATA +SECTION "Level0407Section",ROMX ;--------------------------------------------------------------------- L0407_Contents:: diff --git a/Source/l0408.asm b/Source/l0408.asm index a9bd379..556c75a 100644 --- a/Source/l0408.asm +++ b/Source/l0408.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0408Section",DATA +SECTION "Level0408Section",ROMX ;--------------------------------------------------------------------- L0408_Contents:: diff --git a/Source/l0409.asm b/Source/l0409.asm index 08b792f..529b02c 100644 --- a/Source/l0409.asm +++ b/Source/l0409.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0409Section",DATA +SECTION "Level0409Section",ROMX ;--------------------------------------------------------------------- L0409_Contents:: diff --git a/Source/l0410.asm b/Source/l0410.asm index 5e0f5ef..64ebcfb 100644 --- a/Source/l0410.asm +++ b/Source/l0410.asm @@ -13,7 +13,7 @@ VAR_HFENCE EQU 0 VAR_VFENCE EQU 1 ;--------------------------------------------------------------------- -SECTION "Level0410Section",DATA +SECTION "Level0410Section",ROMX ;--------------------------------------------------------------------- L0410_Contents:: diff --git a/Source/l0411.asm b/Source/l0411.asm index 90002ce..08d58df 100644 --- a/Source/l0411.asm +++ b/Source/l0411.asm @@ -8,7 +8,7 @@ INCLUDE "Source/levels.inc" FIRST_HOLE EQU 32 ;--------------------------------------------------------------------- -SECTION "Level0411Section",DATA +SECTION "Level0411Section",ROMX ;--------------------------------------------------------------------- L0411_Contents:: diff --git a/Source/l0412.asm b/Source/l0412.asm index fced2d7..237ab11 100644 --- a/Source/l0412.asm +++ b/Source/l0412.asm @@ -14,7 +14,7 @@ STATE_FIXED_TALKED EQU 4 STATE_HIVE_DESTROYED EQU 2 ;from 0312 ;--------------------------------------------------------------------- -SECTION "Level0412Section",DATA +SECTION "Level0412Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0413.asm b/Source/l0413.asm index eafe0e0..67bdf94 100644 --- a/Source/l0413.asm +++ b/Source/l0413.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0413Section",DATA +SECTION "Level0413Section",ROMX ;--------------------------------------------------------------------- L0413_Contents:: diff --git a/Source/l0500.asm b/Source/l0500.asm index 42682ab..acfa631 100644 --- a/Source/l0500.asm +++ b/Source/l0500.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0500Section",DATA +SECTION "Level0500Section",ROMX ;--------------------------------------------------------------------- L0500_Contents:: diff --git a/Source/l0501.asm b/Source/l0501.asm index f12e69a..5451900 100644 --- a/Source/l0501.asm +++ b/Source/l0501.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0501Section",DATA +SECTION "Level0501Section",ROMX ;--------------------------------------------------------------------- L0501_Contents:: diff --git a/Source/l0502.asm b/Source/l0502.asm index 8475a06..bb1c151 100644 --- a/Source/l0502.asm +++ b/Source/l0502.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0502Section",DATA +SECTION "Level0502Section",ROMX ;--------------------------------------------------------------------- L0502_Contents:: diff --git a/Source/l0503.asm b/Source/l0503.asm index 5f6eab1..6b35da7 100644 --- a/Source/l0503.asm +++ b/Source/l0503.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0503Section",DATA +SECTION "Level0503Section",ROMX ;--------------------------------------------------------------------- L0503_Contents:: diff --git a/Source/l0504.asm b/Source/l0504.asm index 858c6e4..81c6bd5 100644 --- a/Source/l0504.asm +++ b/Source/l0504.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0504Section",DATA +SECTION "Level0504Section",ROMX ;--------------------------------------------------------------------- L0504_Contents:: diff --git a/Source/l0505.asm b/Source/l0505.asm index 1f88fd5..3818f85 100644 --- a/Source/l0505.asm +++ b/Source/l0505.asm @@ -19,7 +19,7 @@ STATE_AFTERWEDDING EQU 2 ;--------------------------------------------------------------------- -SECTION "Level0505Section",DATA +SECTION "Level0505Section",ROMX ;--------------------------------------------------------------------- L0505_Contents:: diff --git a/Source/l0506.asm b/Source/l0506.asm index 320daba..def1c80 100644 --- a/Source/l0506.asm +++ b/Source/l0506.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0506Section",DATA +SECTION "Level0506Section",ROMX ;--------------------------------------------------------------------- L0506_Contents:: diff --git a/Source/l0507.asm b/Source/l0507.asm index 2c6edf2..2f07b81 100644 --- a/Source/l0507.asm +++ b/Source/l0507.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 1 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0507Section",DATA +SECTION "Level0507Section",ROMX ;--------------------------------------------------------------------- L0507_Contents:: diff --git a/Source/l0508.asm b/Source/l0508.asm index e7d5766..360da7f 100644 --- a/Source/l0508.asm +++ b/Source/l0508.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0508Section",DATA +SECTION "Level0508Section",ROMX ;--------------------------------------------------------------------- L0508_Contents:: diff --git a/Source/l0509.asm b/Source/l0509.asm index 642bd45..d684384 100644 --- a/Source/l0509.asm +++ b/Source/l0509.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0509Section",DATA +SECTION "Level0509Section",ROMX ;--------------------------------------------------------------------- L0509_Contents:: diff --git a/Source/l0510.asm b/Source/l0510.asm index e6b972b..2c3c9dc 100644 --- a/Source/l0510.asm +++ b/Source/l0510.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0510Section",DATA +SECTION "Level0510Section",ROMX ;--------------------------------------------------------------------- L0510_Contents:: diff --git a/Source/l0512.asm b/Source/l0512.asm index 066b2b3..74deb8c 100644 --- a/Source/l0512.asm +++ b/Source/l0512.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0512Section",DATA +SECTION "Level0512Section",ROMX ;--------------------------------------------------------------------- L0512_Contents:: diff --git a/Source/l0600.asm b/Source/l0600.asm index 170ddaf..526fecb 100644 --- a/Source/l0600.asm +++ b/Source/l0600.asm @@ -9,7 +9,7 @@ LIGHTINDEX EQU 57 VAR_LIGHT EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0600Section",DATA +SECTION "Level0600Section",ROMX ;--------------------------------------------------------------------- L0600_Contents:: diff --git a/Source/l0601.asm b/Source/l0601.asm index 0635bc3..6fd5f7c 100644 --- a/Source/l0601.asm +++ b/Source/l0601.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0601Section",DATA +SECTION "Level0601Section",ROMX ;--------------------------------------------------------------------- L0601_Contents:: diff --git a/Source/l0602.asm b/Source/l0602.asm index fc6438a..c36d03f 100644 --- a/Source/l0602.asm +++ b/Source/l0602.asm @@ -9,7 +9,7 @@ VAR_FIRE EQU 0 FIRE_INDEX EQU 24 ;--------------------------------------------------------------------- -SECTION "Level0602Section",DATA +SECTION "Level0602Section",ROMX ;--------------------------------------------------------------------- L0602_Contents:: diff --git a/Source/l0603.asm b/Source/l0603.asm index 190ad66..3700ebc 100644 --- a/Source/l0603.asm +++ b/Source/l0603.asm @@ -9,7 +9,7 @@ VAR_FIRE EQU 0 FIRE_INDEX EQU 19 ;--------------------------------------------------------------------- -SECTION "Level0603Section",DATA +SECTION "Level0603Section",ROMX ;--------------------------------------------------------------------- L0603_Contents:: diff --git a/Source/l0604.asm b/Source/l0604.asm index d1285ce..e3a6f75 100644 --- a/Source/l0604.asm +++ b/Source/l0604.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0604Section",DATA +SECTION "Level0604Section",ROMX ;--------------------------------------------------------------------- L0604_Contents:: diff --git a/Source/l0605.asm b/Source/l0605.asm index e6f2009..71893aa 100644 --- a/Source/l0605.asm +++ b/Source/l0605.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0605Section",DATA +SECTION "Level0605Section",ROMX ;--------------------------------------------------------------------- L0605_Contents:: diff --git a/Source/l0606.asm b/Source/l0606.asm index 77fe79a..9a668af 100644 --- a/Source/l0606.asm +++ b/Source/l0606.asm @@ -9,7 +9,7 @@ LIGHTINDEX EQU 57 VAR_LIGHT EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0606Section",DATA +SECTION "Level0606Section",ROMX ;--------------------------------------------------------------------- L0606_Contents:: diff --git a/Source/l0607.asm b/Source/l0607.asm index 08c4feb..cb4fc8f 100644 --- a/Source/l0607.asm +++ b/Source/l0607.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0607Section",DATA +SECTION "Level0607Section",ROMX ;--------------------------------------------------------------------- L0607_Contents:: diff --git a/Source/l0608.asm b/Source/l0608.asm index 060e498..be4b699 100644 --- a/Source/l0608.asm +++ b/Source/l0608.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0608Section",DATA +SECTION "Level0608Section",ROMX ;--------------------------------------------------------------------- L0608_Contents:: diff --git a/Source/l0609.asm b/Source/l0609.asm index cbe9a5e..59a1734 100644 --- a/Source/l0609.asm +++ b/Source/l0609.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 4 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0609Section",DATA +SECTION "Level0609Section",ROMX ;--------------------------------------------------------------------- L0609_Contents:: diff --git a/Source/l0610.asm b/Source/l0610.asm index 8dd8b33..fc8fdbc 100644 --- a/Source/l0610.asm +++ b/Source/l0610.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 2 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0610Section",DATA +SECTION "Level0610Section",ROMX ;--------------------------------------------------------------------- L0610_Contents:: diff --git a/Source/l0612.asm b/Source/l0612.asm index e7906ea..c23ab7a 100644 --- a/Source/l0612.asm +++ b/Source/l0612.asm @@ -25,7 +25,7 @@ STATE_NORMAL EQU 9 ;--------------------------------------------------------------------- -SECTION "Level0612Section",DATA +SECTION "Level0612Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l0700.asm b/Source/l0700.asm index 31f1780..f35923f 100644 --- a/Source/l0700.asm +++ b/Source/l0700.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0700Section",DATA +SECTION "Level0700Section",ROMX ;--------------------------------------------------------------------- L0700_Contents:: diff --git a/Source/l0701.asm b/Source/l0701.asm index 4075271..61b1d3f 100644 --- a/Source/l0701.asm +++ b/Source/l0701.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0701Section",DATA +SECTION "Level0701Section",ROMX ;--------------------------------------------------------------------- L0701_Contents:: diff --git a/Source/l0702.asm b/Source/l0702.asm index 7fdf93a..486f4ba 100644 --- a/Source/l0702.asm +++ b/Source/l0702.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0702Section",DATA +SECTION "Level0702Section",ROMX ;--------------------------------------------------------------------- L0702_Contents:: diff --git a/Source/l0703.asm b/Source/l0703.asm index 6f158c1..88b09dd 100644 --- a/Source/l0703.asm +++ b/Source/l0703.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0703Section",DATA +SECTION "Level0703Section",ROMX ;--------------------------------------------------------------------- L0703_Contents:: diff --git a/Source/l0704.asm b/Source/l0704.asm index 9ce84c5..daca82e 100644 --- a/Source/l0704.asm +++ b/Source/l0704.asm @@ -10,7 +10,7 @@ LIGHTINDEX EQU 65 VAR_LIGHT EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0704Section",DATA +SECTION "Level0704Section",ROMX ;--------------------------------------------------------------------- L0704_Contents:: diff --git a/Source/l0705.asm b/Source/l0705.asm index ca95c9a..fc885c0 100644 --- a/Source/l0705.asm +++ b/Source/l0705.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0705Section",DATA +SECTION "Level0705Section",ROMX ;--------------------------------------------------------------------- L0705_Contents:: diff --git a/Source/l0706.asm b/Source/l0706.asm index f9ed037..b24e431 100644 --- a/Source/l0706.asm +++ b/Source/l0706.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0706Section",DATA +SECTION "Level0706Section",ROMX ;--------------------------------------------------------------------- L0706_Contents:: diff --git a/Source/l0707.asm b/Source/l0707.asm index 85c91ae..f02156b 100644 --- a/Source/l0707.asm +++ b/Source/l0707.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0707Section",DATA +SECTION "Level0707Section",ROMX ;--------------------------------------------------------------------- L0707_Contents:: diff --git a/Source/l0708.asm b/Source/l0708.asm index 5ff91e2..42ab5c8 100644 --- a/Source/l0708.asm +++ b/Source/l0708.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0708Section",DATA +SECTION "Level0708Section",ROMX ;--------------------------------------------------------------------- L0708_Contents:: diff --git a/Source/l0709.asm b/Source/l0709.asm index 30d8902..68992af 100644 --- a/Source/l0709.asm +++ b/Source/l0709.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 2 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0709Section",DATA +SECTION "Level0709Section",ROMX ;--------------------------------------------------------------------- L0709_Contents:: diff --git a/Source/l0710.asm b/Source/l0710.asm index 92e2782..642cbe3 100644 --- a/Source/l0710.asm +++ b/Source/l0710.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 3 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0710Section",DATA +SECTION "Level0710Section",ROMX ;--------------------------------------------------------------------- L0710_Contents:: diff --git a/Source/l0711.asm b/Source/l0711.asm index b848685..91f73af 100644 --- a/Source/l0711.asm +++ b/Source/l0711.asm @@ -13,7 +13,7 @@ import classBSPlayerSpace import classHaikuPlayerSpace ;--------------------------------------------------------------------- -SECTION "Level0711Section",DATA +SECTION "Level0711Section",ROMX ;--------------------------------------------------------------------- L0711_Contents:: diff --git a/Source/l0712.asm b/Source/l0712.asm index d48f9aa..1e738e1 100644 --- a/Source/l0712.asm +++ b/Source/l0712.asm @@ -9,7 +9,7 @@ LIGHTINDEX EQU 46 VAR_LIGHT EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0712Section",DATA +SECTION "Level0712Section",ROMX ;--------------------------------------------------------------------- L0712_Contents:: diff --git a/Source/l0800.asm b/Source/l0800.asm index b9a9582..f3781c5 100644 --- a/Source/l0800.asm +++ b/Source/l0800.asm @@ -11,7 +11,7 @@ VAR_WATER1 EQU 0 VAR_WATER2 EQU 1 ;--------------------------------------------------------------------- -SECTION "Level0800Section",DATA +SECTION "Level0800Section",ROMX ;--------------------------------------------------------------------- L0800_Contents:: diff --git a/Source/l0801.asm b/Source/l0801.asm index 07faf96..524e5c9 100644 --- a/Source/l0801.asm +++ b/Source/l0801.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0801Section",DATA +SECTION "Level0801Section",ROMX ;--------------------------------------------------------------------- L0801_Contents:: diff --git a/Source/l0802.asm b/Source/l0802.asm index 689167e..a332360 100644 --- a/Source/l0802.asm +++ b/Source/l0802.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0802Section",DATA +SECTION "Level0802Section",ROMX ;--------------------------------------------------------------------- L0802_Contents:: diff --git a/Source/l0803.asm b/Source/l0803.asm index 8f8ff07..241dd09 100644 --- a/Source/l0803.asm +++ b/Source/l0803.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 24 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0803Section",DATA +SECTION "Level0803Section",ROMX ;--------------------------------------------------------------------- L0803_Contents:: diff --git a/Source/l0804.asm b/Source/l0804.asm index 1d2da48..0c0fcee 100644 --- a/Source/l0804.asm +++ b/Source/l0804.asm @@ -10,7 +10,7 @@ VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0804Section",DATA +SECTION "Level0804Section",ROMX ;--------------------------------------------------------------------- L0804_Contents:: diff --git a/Source/l0805.asm b/Source/l0805.asm index 01369f6..ab0dc9d 100644 --- a/Source/l0805.asm +++ b/Source/l0805.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0805Section",DATA +SECTION "Level0805Section",ROMX ;--------------------------------------------------------------------- L0805_Contents:: diff --git a/Source/l0806.asm b/Source/l0806.asm index ec058e6..a821d53 100644 --- a/Source/l0806.asm +++ b/Source/l0806.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0806Section",DATA +SECTION "Level0806Section",ROMX ;--------------------------------------------------------------------- L0806_Contents:: diff --git a/Source/l0807.asm b/Source/l0807.asm index 47a500b..a6d002b 100644 --- a/Source/l0807.asm +++ b/Source/l0807.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0807Section",DATA +SECTION "Level0807Section",ROMX ;--------------------------------------------------------------------- L0807_Contents:: diff --git a/Source/l0808.asm b/Source/l0808.asm index 0a53d99..560852d 100644 --- a/Source/l0808.asm +++ b/Source/l0808.asm @@ -12,7 +12,7 @@ VAR_VFENCE EQU 1 ;--------------------------------------------------------------------- -SECTION "Level0808Section",DATA +SECTION "Level0808Section",ROMX ;--------------------------------------------------------------------- L0808_Contents:: diff --git a/Source/l0809.asm b/Source/l0809.asm index e45d163..7700f7a 100644 --- a/Source/l0809.asm +++ b/Source/l0809.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0809Section",DATA +SECTION "Level0809Section",ROMX ;--------------------------------------------------------------------- L0809_Contents:: diff --git a/Source/l0810.asm b/Source/l0810.asm index e73c64c..3b16b08 100644 --- a/Source/l0810.asm +++ b/Source/l0810.asm @@ -9,7 +9,7 @@ LIGHTINDEX EQU 40 VAR_LIGHT EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0810Section",DATA +SECTION "Level0810Section",ROMX ;--------------------------------------------------------------------- L0810_Contents:: diff --git a/Source/l0811.asm b/Source/l0811.asm index 664703b..1477f95 100644 --- a/Source/l0811.asm +++ b/Source/l0811.asm @@ -9,7 +9,7 @@ STATE_DEFUSED EQU 2 ;--------------------------------------------------------------------- -SECTION "Level0811Section",DATA +SECTION "Level0811Section",ROMX ;--------------------------------------------------------------------- L0811_Contents:: diff --git a/Source/l0812.asm b/Source/l0812.asm index b661f79..bcfb35c 100644 --- a/Source/l0812.asm +++ b/Source/l0812.asm @@ -9,7 +9,7 @@ FIREINDEX EQU 88 VAR_FIRE EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0812Section",DATA +SECTION "Level0812Section",ROMX ;--------------------------------------------------------------------- L0812_Contents:: diff --git a/Source/l0900.asm b/Source/l0900.asm index 2eb7408..8a71871 100644 --- a/Source/l0900.asm +++ b/Source/l0900.asm @@ -8,7 +8,7 @@ INCLUDE "Source/items.inc" ;--------------------------------------------------------------------- -SECTION "Level0900Section",DATA +SECTION "Level0900Section",ROMX ;--------------------------------------------------------------------- L0900_Contents:: diff --git a/Source/l0901.asm b/Source/l0901.asm index ab6a69e..74adb3b 100644 --- a/Source/l0901.asm +++ b/Source/l0901.asm @@ -11,7 +11,7 @@ VAR_HFENCE EQU 0 VAR_VFENCE EQU 1 ;--------------------------------------------------------------------- -SECTION "Level0901Section",DATA +SECTION "Level0901Section",ROMX ;--------------------------------------------------------------------- L0901_Contents:: diff --git a/Source/l0902.asm b/Source/l0902.asm index 700d22b..63a06ae 100644 --- a/Source/l0902.asm +++ b/Source/l0902.asm @@ -9,7 +9,7 @@ LIGHTINDEX EQU 70 VAR_LIGHT EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0902Section",DATA +SECTION "Level0902Section",ROMX ;--------------------------------------------------------------------- L0902_Contents:: diff --git a/Source/l0903.asm b/Source/l0903.asm index 9bb1523..2a13b8e 100644 --- a/Source/l0903.asm +++ b/Source/l0903.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0903Section",DATA +SECTION "Level0903Section",ROMX ;--------------------------------------------------------------------- L0903_Contents:: diff --git a/Source/l0904.asm b/Source/l0904.asm index d2de068..ac65576 100644 --- a/Source/l0904.asm +++ b/Source/l0904.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0904Section",DATA +SECTION "Level0904Section",ROMX ;--------------------------------------------------------------------- L0904_Contents:: diff --git a/Source/l0905.asm b/Source/l0905.asm index 41251de..3628e92 100644 --- a/Source/l0905.asm +++ b/Source/l0905.asm @@ -9,7 +9,7 @@ LIGHTINDEX EQU 41 VAR_LIGHT EQU 0 ;--------------------------------------------------------------------- -SECTION "Level0905Section",DATA +SECTION "Level0905Section",ROMX ;--------------------------------------------------------------------- L0905_Contents:: diff --git a/Source/l0906.asm b/Source/l0906.asm index 80bf53e..cf63211 100644 --- a/Source/l0906.asm +++ b/Source/l0906.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0906Section",DATA +SECTION "Level0906Section",ROMX ;--------------------------------------------------------------------- L0906_Contents:: diff --git a/Source/l0907.asm b/Source/l0907.asm index 6e0a253..573c456 100644 --- a/Source/l0907.asm +++ b/Source/l0907.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0907Section",DATA +SECTION "Level0907Section",ROMX ;--------------------------------------------------------------------- L0907_Contents:: diff --git a/Source/l0908.asm b/Source/l0908.asm index 6c6158e..d7ef84f 100644 --- a/Source/l0908.asm +++ b/Source/l0908.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0908Section",DATA +SECTION "Level0908Section",ROMX ;--------------------------------------------------------------------- L0908_Contents:: diff --git a/Source/l0909.asm b/Source/l0909.asm index b9099ff..92e5ee5 100644 --- a/Source/l0909.asm +++ b/Source/l0909.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0909Section",DATA +SECTION "Level0909Section",ROMX ;--------------------------------------------------------------------- L0909_Contents:: diff --git a/Source/l0910.asm b/Source/l0910.asm index ed00626..db17732 100644 --- a/Source/l0910.asm +++ b/Source/l0910.asm @@ -7,7 +7,7 @@ INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level0910Section",DATA +SECTION "Level0910Section",ROMX ;--------------------------------------------------------------------- L0910_Contents:: diff --git a/Source/l0911.asm b/Source/l0911.asm index 2834795..ac4090a 100644 --- a/Source/l0911.asm +++ b/Source/l0911.asm @@ -9,7 +9,7 @@ STATE_DEFUSED EQU 2 ;--------------------------------------------------------------------- -SECTION "Level0911Section",DATA +SECTION "Level0911Section",ROMX ;--------------------------------------------------------------------- L0911_Contents:: diff --git a/Source/l0912.asm b/Source/l0912.asm index bf30261..8dfe785 100644 --- a/Source/l0912.asm +++ b/Source/l0912.asm @@ -15,7 +15,7 @@ VAR_TALKEDTELEPORT EQU 2 ;--------------------------------------------------------------------- -SECTION "Level0912Section",DATA +SECTION "Level0912Section",ROMX ;--------------------------------------------------------------------- dialog: l0912_sign_gtx: diff --git a/Source/l1000.asm b/Source/l1000.asm index f7e5dfe..06ac5a6 100644 --- a/Source/l1000.asm +++ b/Source/l1000.asm @@ -25,7 +25,7 @@ STATE_NORMAL EQU 3 ;--------------------------------------------------------------------- -SECTION "Level1000Section",DATA +SECTION "Level1000Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l1001.asm b/Source/l1001.asm index eb9bbe0..7fd41e4 100644 --- a/Source/l1001.asm +++ b/Source/l1001.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level1001Section",DATA +SECTION "Level1001Section",ROMX ;--------------------------------------------------------------------- L1001_Contents:: diff --git a/Source/l1002.asm b/Source/l1002.asm index 6a34480..b32d1a7 100644 --- a/Source/l1002.asm +++ b/Source/l1002.asm @@ -8,7 +8,7 @@ INCLUDE "Source/items.inc" ;--------------------------------------------------------------------- -SECTION "Level1002Section",DATA +SECTION "Level1002Section",ROMX ;--------------------------------------------------------------------- L1002_Contents:: diff --git a/Source/l1003.asm b/Source/l1003.asm index 5ed791b..e4640d7 100644 --- a/Source/l1003.asm +++ b/Source/l1003.asm @@ -11,7 +11,7 @@ LIGHTINDEX EQU 64 VAR_LIGHT EQU 1 ;--------------------------------------------------------------------- -SECTION "Level1003Section",DATA +SECTION "Level1003Section",ROMX ;--------------------------------------------------------------------- L1003_Contents:: diff --git a/Source/l1004.asm b/Source/l1004.asm index 4e29439..fc97bf1 100644 --- a/Source/l1004.asm +++ b/Source/l1004.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level1004Section",DATA +SECTION "Level1004Section",ROMX ;--------------------------------------------------------------------- L1004_Contents:: diff --git a/Source/l1005.asm b/Source/l1005.asm index 49fdf86..6096578 100644 --- a/Source/l1005.asm +++ b/Source/l1005.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level1005Section",DATA +SECTION "Level1005Section",ROMX ;--------------------------------------------------------------------- L1005_Contents:: diff --git a/Source/l1006.asm b/Source/l1006.asm index 40b35f2..05d34dc 100644 --- a/Source/l1006.asm +++ b/Source/l1006.asm @@ -8,7 +8,7 @@ INCLUDE "Source/items.inc" ;--------------------------------------------------------------------- -SECTION "Level1006Section",DATA +SECTION "Level1006Section",ROMX ;--------------------------------------------------------------------- L1006_Contents:: diff --git a/Source/l1007.asm b/Source/l1007.asm index 5eb42e6..2ed7c4f 100644 --- a/Source/l1007.asm +++ b/Source/l1007.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 1 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level1007Section",DATA +SECTION "Level1007Section",ROMX ;--------------------------------------------------------------------- L1007_Contents:: diff --git a/Source/l1008.asm b/Source/l1008.asm index 89de2e9..f00532f 100644 --- a/Source/l1008.asm +++ b/Source/l1008.asm @@ -9,7 +9,7 @@ WATERINDEX EQU 1 VAR_WATER EQU 0 ;--------------------------------------------------------------------- -SECTION "Level1008Section",DATA +SECTION "Level1008Section",ROMX ;--------------------------------------------------------------------- L1008_Contents:: diff --git a/Source/l1009.asm b/Source/l1009.asm index 1a49f07..773145e 100644 --- a/Source/l1009.asm +++ b/Source/l1009.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level1009Section",DATA +SECTION "Level1009Section",ROMX ;--------------------------------------------------------------------- L1009_Contents:: diff --git a/Source/l1010.asm b/Source/l1010.asm index 4c5ac39..dbd40a7 100644 --- a/Source/l1010.asm +++ b/Source/l1010.asm @@ -13,7 +13,7 @@ VAR_TALKED EQU 0 VAR_DICELIGHT EQU 3 ;--------------------------------------------------------------------- -SECTION "Level1010Section",DATA +SECTION "Level1010Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l1011.asm b/Source/l1011.asm index 6056291..ab1946a 100644 --- a/Source/l1011.asm +++ b/Source/l1011.asm @@ -9,7 +9,7 @@ STATE_DEFUSED EQU 2 ;--------------------------------------------------------------------- -SECTION "Level1011Section",DATA +SECTION "Level1011Section",ROMX ;--------------------------------------------------------------------- L1011_Contents:: diff --git a/Source/l1012.asm b/Source/l1012.asm index bce1b6a..9fc2ce4 100644 --- a/Source/l1012.asm +++ b/Source/l1012.asm @@ -9,7 +9,7 @@ STATE_NORMAL EQU 1 STATE_READBOOK EQU 2 ;--------------------------------------------------------------------- -SECTION "Level1012Section",DATA +SECTION "Level1012Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l1100.asm b/Source/l1100.asm index 2273dd7..432785d 100644 --- a/Source/l1100.asm +++ b/Source/l1100.asm @@ -12,7 +12,7 @@ EXITAPPOMATTOX EQU $1300 ;--------------------------------------------------------------------- -SECTION "L1100Gfx1",DATA +SECTION "L1100Gfx1",ROMX ;--------------------------------------------------------------------- select_grenade_sp: INCBIN "..\\fgbpix\\charselect\\select_grenade.sp" @@ -21,7 +21,7 @@ select_grenade_name_bg: INCBIN "..\\fgbpix\\charselect\\kgname.bg" ;--------------------------------------------------------------------- -SECTION "L1100Section",DATA +SECTION "L1100Section",ROMX ;--------------------------------------------------------------------- select_hero_bg: diff --git a/Source/l1101.asm b/Source/l1101.asm index 35bae90..7d4daa2 100644 --- a/Source/l1101.asm +++ b/Source/l1101.asm @@ -17,14 +17,14 @@ JOINDIR EQU EXIT_D ;JOINDIR EQU EXIT_W ;--------------------------------------------------------------------- -SECTION "LevelsSection1101_data2",DATA +SECTION "LevelsSection1101_data2",ROMX ;--------------------------------------------------------------------- bullet_sp: INCBIN "..\\fgbpix\\menu\\menucursor.sp" ;--------------------------------------------------------------------- -SECTION "LevelsSection1101",DATA +SECTION "LevelsSection1101",ROMX ;--------------------------------------------------------------------- L1101_Contents:: diff --git a/Source/l1102.asm b/Source/l1102.asm index a38aa91..2b5ba38 100644 --- a/Source/l1102.asm +++ b/Source/l1102.asm @@ -12,7 +12,7 @@ NEXTLEVEL EQU $0313 NEXTLEVELDIR EQU EXIT_D ;--------------------------------------------------------------------- -SECTION "Level1102Section2",DATA +SECTION "Level1102Section2",ROMX ;--------------------------------------------------------------------- flour_bg:: INCBIN "..\\fgbpix\\mainchardialog\\flour_triumph.bg" @@ -63,7 +63,7 @@ nar_crewquarters_bg: INCBIN "..\\fgbpix\\main_intro\\nar_crewquarters.bg" ;--------------------------------------------------------------------- -SECTION "Level1102Section",DATA +SECTION "Level1102Section",ROMX ;--------------------------------------------------------------------- L1102_Contents:: diff --git a/Source/l1103.asm b/Source/l1103.asm index a2b04db..ae60411 100644 --- a/Source/l1103.asm +++ b/Source/l1103.asm @@ -11,7 +11,7 @@ VAR_HERO EQU 11 ;--------------------------------------------------------------------- -SECTION "Level1103Gfx1",DATA +SECTION "Level1103Gfx1",ROMX ;--------------------------------------------------------------------- gyro_tree_bg: INCBIN "..\\fgbpix\\wedding\\gyro_tree.bg" @@ -23,7 +23,7 @@ gang_watches_wedding_bg: INCBIN "..\\fgbpix\\wedding\\gang_watches_wedding.bg" ;--------------------------------------------------------------------- -SECTION "Level1103Gfx2",DATA +SECTION "Level1103Gfx2",ROMX ;--------------------------------------------------------------------- preacher_bg: INCBIN "..\\fgbpix\\wedding\\preacher.bg" @@ -35,7 +35,7 @@ flour_at_wedding_bg: INCBIN "..\\fgbpix\\wedding\\flour_at_wedding.bg" ;--------------------------------------------------------------------- -SECTION "Level1103Gfx3",DATA +SECTION "Level1103Gfx3",ROMX ;--------------------------------------------------------------------- flower_at_wedding_bg: INCBIN "..\\fgbpix\\wedding\\flower_at_wedding.bg" @@ -47,7 +47,7 @@ gyro_big_bg: INCBIN "..\\fgbpix\\wedding\\gyro_big.bg" ;--------------------------------------------------------------------- -SECTION "Level1103Dialog",DATA +SECTION "Level1103Dialog",ROMX ;--------------------------------------------------------------------- dialog: @@ -125,7 +125,7 @@ lady_dontbesilly_gtx: ;--------------------------------------------------------------------- -SECTION "Level1103Section",DATA +SECTION "Level1103Section",ROMX ;--------------------------------------------------------------------- L1103_Contents:: diff --git a/Source/l1104.asm b/Source/l1104.asm index a102027..9e6cd9a 100644 --- a/Source/l1104.asm +++ b/Source/l1104.asm @@ -8,7 +8,7 @@ INCLUDE "Source/levels.inc" VAR_TAKEOFFPOS EQU 0 ;--------------------------------------------------------------------- -SECTION "Level1104Gfx1",DATA +SECTION "Level1104Gfx1",ROMX ;--------------------------------------------------------------------- appx_takeoff_bg: INCBIN "..\\fgbpix\\ending\\appx_takeoff.bg" @@ -17,7 +17,7 @@ station_tactical_bg:: INCBIN "..\\fgbpix\\ending\\station_tactical.bg" ;--------------------------------------------------------------------- -SECTION "Level1104Gfx2",DATA +SECTION "Level1104Gfx2",ROMX ;--------------------------------------------------------------------- small_station_approach_bg: INCBIN "..\\fgbpix\\ending\\small_station_approach.bg" @@ -26,7 +26,7 @@ big_station_approach_bg: INCBIN "..\\fgbpix\\ending\\big_station_approach.bg" ;--------------------------------------------------------------------- -SECTION "Level1104Gfx3",DATA +SECTION "Level1104Gfx3",ROMX ;--------------------------------------------------------------------- appx_takeoff_sprites_sp: INCBIN "..\\fgbpix\\ending\\appx_takeoff_sprites.sp" @@ -42,7 +42,7 @@ big_station_sprites_sp: ;--------------------------------------------------------------------- -SECTION "Level1104Section",DATA +SECTION "Level1104Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l1105.asm b/Source/l1105.asm index fe286cb..d9a8f90 100644 --- a/Source/l1105.asm +++ b/Source/l1105.asm @@ -8,7 +8,7 @@ INCLUDE "Source/levels.inc" VAR_SELECTION EQU 0 ;--------------------------------------------------------------------- -SECTION "Level1105Gfx1",DATA +SECTION "Level1105Gfx1",ROMX ;--------------------------------------------------------------------- savegame_bg: INCBIN "..\\fgbpix\\appomattox\\savegame.bg" @@ -17,13 +17,13 @@ cantsave_bg: INCBIN "..\\fgbpix\\appomattox\\cantsave.bg" ;--------------------------------------------------------------------- -SECTION "Level1105Gfx2",DATA +SECTION "Level1105Gfx2",ROMX ;--------------------------------------------------------------------- cantsave_flying_bg: INCBIN "..\\fgbpix\\appomattox\\cantsave_flying.bg" ;--------------------------------------------------------------------- -SECTION "Level1105Section",DATA +SECTION "Level1105Section",ROMX ;--------------------------------------------------------------------- L1105_Contents:: diff --git a/Source/l1111.asm b/Source/l1111.asm index b28a71c..739a099 100644 --- a/Source/l1111.asm +++ b/Source/l1111.asm @@ -9,7 +9,7 @@ STATE_DEFUSED EQU 2 ;--------------------------------------------------------------------- -SECTION "Level1111Section",DATA +SECTION "Level1111Section",ROMX ;--------------------------------------------------------------------- L1111_Contents:: diff --git a/Source/l1112.asm b/Source/l1112.asm index 1ed632e..29bed83 100644 --- a/Source/l1112.asm +++ b/Source/l1112.asm @@ -25,7 +25,7 @@ STATE_AVERTED EQU 2 ;--------------------------------------------------------------------- -SECTION "Level1112Gfx1",DATA +SECTION "Level1112Gfx1",ROMX ;--------------------------------------------------------------------- success_bg: INCBIN "..\\fgbpix\\disco\\success.bg" @@ -34,7 +34,7 @@ party_over_bg: INCBIN "..\\fgbpix\\disco\\party_over.bg" ;--------------------------------------------------------------------- -SECTION "Level1112Section",DATA +SECTION "Level1112Section",ROMX ;--------------------------------------------------------------------- L1112_Contents:: diff --git a/Source/l1200.asm b/Source/l1200.asm index e805fe2..e4f878b 100644 --- a/Source/l1200.asm +++ b/Source/l1200.asm @@ -8,7 +8,7 @@ INCLUDE "Source/gfx.inc" TEMPKLUDGE EQU 50 ;--------------------------------------------------------------------- -SECTION "L1200DataSection",DATA +SECTION "L1200DataSection",ROMX ;--------------------------------------------------------------------- logo160_bg: INCBIN "..\\fgbpix\\logo\\logo160.bg" @@ -20,7 +20,7 @@ fgbtitle_bg: INCBIN "..\\fgbpix\\logo\\fgbtitle.bg" ;--------------------------------------------------------------------- -SECTION "L1200DataSection2",DATA +SECTION "L1200DataSection2",ROMX ;--------------------------------------------------------------------- kiwi1_bg:: INCBIN "..\\fgbpix\\intro\\kiwi1.bg" @@ -38,7 +38,7 @@ landing_sprites_sp:: INCBIN "..\\fgbpix\\intro\\landing_sprites.sp" ;--------------------------------------------------------------------- -SECTION "L1200DataSection3",DATA +SECTION "L1200DataSection3",ROMX ;--------------------------------------------------------------------- titlesprite_sp: INCBIN "..\\fgbpix\\logo\\titlesprite.sp" @@ -50,7 +50,7 @@ ocloud1_bg: INCBIN "..\\fgbpix\\logo\\ocloud1.bg" ;--------------------------------------------------------------------- -SECTION "L1200DataSection4",DATA +SECTION "L1200DataSection4",ROMX ;--------------------------------------------------------------------- ocloud2_bg: INCBIN "..\\fgbpix\\logo\\ocloud2.bg" @@ -60,7 +60,7 @@ ocloud3_bg: ;--------------------------------------------------------------------- -SECTION "L1200DataSection5",DATA +SECTION "L1200DataSection5",ROMX ;--------------------------------------------------------------------- ocloud4_bg: INCBIN "..\\fgbpix\\logo\\ocloud4.bg" @@ -70,7 +70,7 @@ ocloud5_bg: ;--------------------------------------------------------------------- -SECTION "L1200DataSection6",DATA +SECTION "L1200DataSection6",ROMX ;--------------------------------------------------------------------- ocloud6_bg: INCBIN "..\\fgbpix\\logo\\ocloud6.bg" @@ -80,7 +80,7 @@ ocloud7_bg: ;--------------------------------------------------------------------- -SECTION "L1200DataSection7",DATA +SECTION "L1200DataSection7",ROMX ;--------------------------------------------------------------------- ocloud8_bg: INCBIN "..\\fgbpix\\logo\\ocloud8.bg" @@ -90,7 +90,7 @@ ocloud9_bg: ;--------------------------------------------------------------------- -SECTION "L1200DataSection8",DATA +SECTION "L1200DataSection8",ROMX ;--------------------------------------------------------------------- oclouda_bg: INCBIN "..\\fgbpix\\logo\\oclouda.bg" @@ -100,7 +100,7 @@ ocloudb_bg: ;--------------------------------------------------------------------- -SECTION "L1200DataSection9",DATA +SECTION "L1200DataSection9",ROMX ;--------------------------------------------------------------------- ocloudc_bg: INCBIN "..\\fgbpix\\logo\\ocloudc.bg" @@ -110,7 +110,7 @@ ocloudd_bg: ;--------------------------------------------------------------------- -SECTION "L1200DataSection10",DATA +SECTION "L1200DataSection10",ROMX ;--------------------------------------------------------------------- ocloude_bg: INCBIN "..\\fgbpix\\logo\\ocloude.bg" @@ -119,7 +119,7 @@ ocloudf_bg: INCBIN "..\\fgbpix\\logo\\ocloudf.bg" ;--------------------------------------------------------------------- -SECTION "L1200CodeSection",DATA +SECTION "L1200CodeSection",ROMX ;--------------------------------------------------------------------- L1200_Contents:: DW L1200_Load diff --git a/Source/l1201.asm b/Source/l1201.asm index b460ddc..5477a8e 100644 --- a/Source/l1201.asm +++ b/Source/l1201.asm @@ -8,7 +8,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "LevelsSection1201",DATA,BANK[MAP0ROM] +SECTION "LevelsSection1201",ROMX,BANK[MAP0ROM] ;--------------------------------------------------------------------- L1201_Contents:: diff --git a/Source/l1202.asm b/Source/l1202.asm index d1b3488..ef46341 100644 --- a/Source/l1202.asm +++ b/Source/l1202.asm @@ -9,7 +9,7 @@ STATE_BASHUTTLE EQU 1 STATE_SKIPPYSHUTTLE EQU 2 ;--------------------------------------------------------------------- -SECTION "Level1202Section",DATA +SECTION "Level1202Section",ROMX ;--------------------------------------------------------------------- L1202_Contents:: diff --git a/Source/l1203.asm b/Source/l1203.asm index bf7debb..2afa92a 100644 --- a/Source/l1203.asm +++ b/Source/l1203.asm @@ -8,7 +8,7 @@ INCLUDE "Source/items.inc" ;--------------------------------------------------------------------- -SECTION "Level1203Gfx1",DATA +SECTION "Level1203Gfx1",ROMX ;--------------------------------------------------------------------- in_prison_bg: INCBIN "..\\fgbpix\\wedding\\in_prison.bg" @@ -17,7 +17,7 @@ bs_driving_bg: INCBIN "..\\fgbpix\\wedding\\bs_driving.bg" ;--------------------------------------------------------------------- -SECTION "Level1203Section",DATA +SECTION "Level1203Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l1204.asm b/Source/l1204.asm index f9bba9c..4c7ebed 100644 --- a/Source/l1204.asm +++ b/Source/l1204.asm @@ -7,7 +7,7 @@ INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level1204Gfx1",DATA +SECTION "Level1204Gfx1",ROMX ;--------------------------------------------------------------------- gyro_screen_bg: INCBIN "..\\fgbpix\\ending\\gyro_screen.bg" @@ -19,7 +19,7 @@ minuteslater_bg: INCBIN "..\\fgbpix\\ending\\minuteslater.bg" ;--------------------------------------------------------------------- -SECTION "Level1204Gfx2",DATA +SECTION "Level1204Gfx2",ROMX ;--------------------------------------------------------------------- appland3d2_bg: INCBIN "..\\fgbpix\\ending\\appland3d2.bg" @@ -28,7 +28,7 @@ appland_sprites_sp: INCBIN "..\\fgbpix\\ending\\appland_sprites.sp" ;--------------------------------------------------------------------- -SECTION "Level1204Gfx2",DATA +SECTION "Level1204Gfx2",ROMX ;--------------------------------------------------------------------- willtheyland_bg: INCBIN "..\\fgbpix\\promo\\willtheyland.bg" @@ -40,7 +40,7 @@ publish_bg: INCBIN "..\\fgbpix\\promo\\publish.bg" ;--------------------------------------------------------------------- -SECTION "Level1204Section",DATA +SECTION "Level1204Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l1212.asm b/Source/l1212.asm index 9edc5fa..ac3e3e8 100644 --- a/Source/l1212.asm +++ b/Source/l1212.asm @@ -18,7 +18,7 @@ STATE_MAKESURE EQU 1 STATE_SUCKS EQU 2 ;--------------------------------------------------------------------- -SECTION "Level1212Section",DATA +SECTION "Level1212Section",ROMX ;--------------------------------------------------------------------- dialog: diff --git a/Source/l1300.asm b/Source/l1300.asm index 9ceb509..ff358c6 100644 --- a/Source/l1300.asm +++ b/Source/l1300.asm @@ -20,7 +20,7 @@ VAR_HAIKU EQU 4 ;--------------------------------------------------------------------- -SECTION "Level1300Section",DATA +SECTION "Level1300Section",ROMX ;--------------------------------------------------------------------- L1300_Contents:: diff --git a/Source/l1301.asm b/Source/l1301.asm index 6ab40b1..ea2a30b 100644 --- a/Source/l1301.asm +++ b/Source/l1301.asm @@ -10,7 +10,7 @@ VAR_MAPJ EQU 1 ;--------------------------------------------------------------------- -SECTION "Level1301Section",DATA +SECTION "Level1301Section",ROMX ;--------------------------------------------------------------------- fgbmap_bg: diff --git a/Source/l1302.asm b/Source/l1302.asm index 3943069..4b673fa 100644 --- a/Source/l1302.asm +++ b/Source/l1302.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level1302Section",DATA +SECTION "Level1302Section",ROMX ;--------------------------------------------------------------------- L1302_Contents:: diff --git a/Source/l1304.asm b/Source/l1304.asm index 3473a80..107a860 100644 --- a/Source/l1304.asm +++ b/Source/l1304.asm @@ -6,13 +6,13 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level1304Gfx",DATA +SECTION "Level1304Gfx",ROMX ;--------------------------------------------------------------------- backinside_bg: INCBIN "..\\fgbpix\\charselect\\backinside.bg" ;--------------------------------------------------------------------- -SECTION "Level1304Section",DATA +SECTION "Level1304Section",ROMX ;--------------------------------------------------------------------- L1304_Contents:: diff --git a/Source/l1312.asm b/Source/l1312.asm index 2832263..ca0f751 100644 --- a/Source/l1312.asm +++ b/Source/l1312.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level1312Section",DATA +SECTION "Level1312Section",ROMX ;--------------------------------------------------------------------- L1312_Contents:: diff --git a/Source/l1400.asm b/Source/l1400.asm index b92b3e6..6f54cc8 100644 --- a/Source/l1400.asm +++ b/Source/l1400.asm @@ -14,92 +14,92 @@ VAR_SELSTAGE EQU 6 ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ1",DATA +SECTION "Level1402SectionLZ1",ROMX ;--------------------------------------------------------------------- lz_mist_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_mist.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ2",DATA +SECTION "Level1402SectionLZ2",ROMX ;--------------------------------------------------------------------- lz_ice1_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_ice1.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ3",DATA +SECTION "Level1402SectionLZ3",ROMX ;--------------------------------------------------------------------- lz_gate_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_gate.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ4",DATA +SECTION "Level1402SectionLZ4",ROMX ;--------------------------------------------------------------------- lz_brokenwall_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_brokenwall.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ5",DATA +SECTION "Level1402SectionLZ5",ROMX ;--------------------------------------------------------------------- lz_canyon_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_canyon.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ6",DATA +SECTION "Level1402SectionLZ6",ROMX ;--------------------------------------------------------------------- lz_desert_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_desert.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ7",DATA +SECTION "Level1402SectionLZ7",ROMX ;--------------------------------------------------------------------- lz_graves_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_graves.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ8",DATA +SECTION "Level1402SectionLZ8",ROMX ;--------------------------------------------------------------------- lz_icecubes_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_icecubes.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ9",DATA +SECTION "Level1402SectionLZ9",ROMX ;--------------------------------------------------------------------- lz_jungle_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_jungle.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ10",DATA +SECTION "Level1402SectionLZ10",ROMX ;--------------------------------------------------------------------- lz_mountains_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_mountains.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ11",DATA +SECTION "Level1402SectionLZ11",ROMX ;--------------------------------------------------------------------- lz_ocean_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_ocean.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ12",DATA +SECTION "Level1402SectionLZ12",ROMX ;--------------------------------------------------------------------- lz_pencil_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_pencil.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionLZ13",DATA +SECTION "Level1402SectionLZ13",ROMX ;--------------------------------------------------------------------- lz_treepath_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_treepath.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionData3",DATA +SECTION "Level1402SectionData3",ROMX ;--------------------------------------------------------------------- lz_trees1_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_trees1.bg" ;--------------------------------------------------------------------- -SECTION "Level1402SectionData2",DATA +SECTION "Level1402SectionData2",ROMX ;--------------------------------------------------------------------- cloud0_bg:: INCBIN "..\\fgbpix\\appomattox\\cloud0.bg" @@ -113,7 +113,7 @@ cloud4_bg:: INCBIN "..\\fgbpix\\appomattox\\cloud4.bg" ;--------------------------------------------------------------------- -SECTION "Level1400Section",DATA +SECTION "Level1400Section",ROMX ;--------------------------------------------------------------------- cloud5_bg:: diff --git a/Source/l1401.asm b/Source/l1401.asm index 51149fb..938a982 100644 --- a/Source/l1401.asm +++ b/Source/l1401.asm @@ -22,13 +22,13 @@ VAR_LASTDIR EQU 11 ;--------------------------------------------------------------------- -SECTION "Level1401Gfx2",DATA +SECTION "Level1401Gfx2",ROMX ;--------------------------------------------------------------------- nokey_bg:: INCBIN "..\\fgbpix\\appomattox\\nokey.bg" ;--------------------------------------------------------------------- -SECTION "Level1401Gfx",DATA +SECTION "Level1401Gfx",ROMX ;--------------------------------------------------------------------- lz_zorhaus_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_zorhaus.bg" @@ -40,7 +40,7 @@ lz_croutongate_bg:: INCBIN "..\\fgbpix\\appomattox\\lz_croutongate.bg" ;--------------------------------------------------------------------- -SECTION "Level1401SectionDataControlPanel",DATA +SECTION "Level1401SectionDataControlPanel",ROMX ;--------------------------------------------------------------------- controlpanel_bg:: INCBIN "..\\fgbpix\\appomattox\\controlpanel.bg" @@ -49,7 +49,7 @@ panelsprites_sp:: INCBIN "..\\fgbpix\\appomattox\\panelsprites.sp" ;--------------------------------------------------------------------- -SECTION "Level1401Waves",DATA +SECTION "Level1401Waves",ROMX ;--------------------------------------------------------------------- appwaves0_dat:: INCBIN "..\\fgbpix\\appomattox\\appwaves0.dat" @@ -68,7 +68,7 @@ appwaves4_dat:: ;--------------------------------------------------------------------- -SECTION "Level1401Section",DATA +SECTION "Level1401Section",ROMX ;--------------------------------------------------------------------- L1401_Contents:: diff --git a/Source/l1402.asm b/Source/l1402.asm index 5fc1b8b..cc9eb8c 100644 --- a/Source/l1402.asm +++ b/Source/l1402.asm @@ -7,7 +7,7 @@ INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level1402SectionData2",DATA +SECTION "Level1402SectionData2",ROMX ;--------------------------------------------------------------------- spacepan_bg: INCBIN "..\\fgbpix\\distress\\spacepan.bg" @@ -16,7 +16,7 @@ final_bg: INCBIN "..\\fgbpix\\distress\\final.bg" ;--------------------------------------------------------------------- -SECTION "Level1402Section",DATA +SECTION "Level1402Section",ROMX ;--------------------------------------------------------------------- L1402_Contents:: diff --git a/Source/l1403.asm b/Source/l1403.asm index ed0f3b7..a87a328 100644 --- a/Source/l1403.asm +++ b/Source/l1403.asm @@ -19,7 +19,7 @@ VAR_EXHAUST_FRAME EQU 7 ;--------------------------------------------------------------------- -SECTION "Level1403Section",DATA +SECTION "Level1403Section",ROMX ;--------------------------------------------------------------------- L1403_Contents:: diff --git a/Source/l1412.asm b/Source/l1412.asm index ec59955..1cb05e3 100644 --- a/Source/l1412.asm +++ b/Source/l1412.asm @@ -6,7 +6,7 @@ INCLUDE "Source/defs.inc" INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level1412Section",DATA +SECTION "Level1412Section",ROMX ;--------------------------------------------------------------------- L1412_Contents:: diff --git a/Source/l1500.asm b/Source/l1500.asm index 3d40977..44eea57 100644 --- a/Source/l1500.asm +++ b/Source/l1500.asm @@ -7,7 +7,7 @@ INCLUDE "Source/levels.inc" ;--------------------------------------------------------------------- -SECTION "Level1500Section",DATA +SECTION "Level1500Section",ROMX ;--------------------------------------------------------------------- deathscreen_bg: diff --git a/Source/l1502.asm b/Source/l1502.asm index de949e8..3eac5b2 100644 --- a/Source/l1502.asm +++ b/Source/l1502.asm @@ -11,7 +11,7 @@ TEMPKLUDGE EQU 0 ;--------------------------------------------------------------------- -SECTION "Level1502Gfx1",DATA +SECTION "Level1502Gfx1",ROMX ;--------------------------------------------------------------------- flour_gang_mono_bg: INCBIN "..\\fgbpix\\distress\\flour_gang_mono.bg" @@ -27,7 +27,7 @@ nar_certaindanger_bg: ;--------------------------------------------------------------------- -SECTION "Level1502Gfx2",DATA +SECTION "Level1502Gfx2",ROMX ;--------------------------------------------------------------------- flourdriving_bg:: INCBIN "..\\fgbpix\\distress\\flourdriving.bg" @@ -39,7 +39,7 @@ bs_bg:: INCBIN "..\\fgbpix\\distress\\bs.bg" ;--------------------------------------------------------------------- -SECTION "Level1502Gfx3",DATA +SECTION "Level1502Gfx3",ROMX ;--------------------------------------------------------------------- remote_bg: INCBIN "..\\fgbpix\\distress\\remote.bg" @@ -48,7 +48,7 @@ flowerviewscreen_bg:: INCBIN "..\\fgbpix\\distress\\flowerviewscreen.bg" ;--------------------------------------------------------------------- -SECTION "Level1502Gfx4",DATA +SECTION "Level1502Gfx4",ROMX ;--------------------------------------------------------------------- yacht_under_fire_bg: INCBIN "..\\fgbpix\\distress\\yacht_under_fire.bg" @@ -57,7 +57,7 @@ pirate_sprites_sp: INCBIN "..\\fgbpix\\distress\\pirate_sprites.sp" ;--------------------------------------------------------------------- -SECTION "Level1502Gfx5",DATA +SECTION "Level1502Gfx5",ROMX ;--------------------------------------------------------------------- starfield_bg: INCBIN "..\\fgbpix\\intro\\starfield.bg" @@ -66,14 +66,14 @@ starfield_sprite_sp:: INCBIN "..\\fgbpix\\intro\\starfield_sprite.sp" ;--------------------------------------------------------------------- -SECTION "Level1502Gfx6",DATA +SECTION "Level1502Gfx6",ROMX ;--------------------------------------------------------------------- appomattox_tokiwi_bg:: INCBIN "..\\fgbpix\\distress\\appomattox_tokiwi.bg" ;--------------------------------------------------------------------- -SECTION "Level1502Dialog",DATA +SECTION "Level1502Dialog",ROMX ;--------------------------------------------------------------------- dialog: captain_cider_gtx: @@ -153,7 +153,7 @@ ba_goneawhile_gtx:: ;--------------------------------------------------------------------- -SECTION "Level1502Section",DATA +SECTION "Level1502Section",ROMX ;--------------------------------------------------------------------- L1502_Contents:: diff --git a/Source/l1503.asm b/Source/l1503.asm index 3fce80c..28a6eb6 100644 --- a/Source/l1503.asm +++ b/Source/l1503.asm @@ -18,7 +18,7 @@ VAR_DESTBANK EQU 5 VAR_SELSTAGE EQU 6 ;--------------------------------------------------------------------- -SECTION "Level1503Gfx1",DATA +SECTION "Level1503Gfx1",ROMX ;--------------------------------------------------------------------- downramp_bg:: INCBIN "..\\fgbpix\\distress\\downramp.bg" @@ -27,7 +27,7 @@ downramp_sprites_sp: INCBIN "..\\fgbpix\\distress\\downramp_sprites.sp" ;--------------------------------------------------------------------- -SECTION "Level1503Gfx2",DATA +SECTION "Level1503Gfx2",ROMX ;--------------------------------------------------------------------- flower_and_flour_establishing_bg: INCBIN "..\\fgbpix\\distress\\flower_and_flour_establishing.bg" @@ -36,7 +36,7 @@ flour_and_flower_bg: INCBIN "..\\fgbpix\\distress\\flour_and_flower.bg" ;--------------------------------------------------------------------- -SECTION "Level1503Section",DATA +SECTION "Level1503Section",ROMX ;--------------------------------------------------------------------- L1503_Contents:: diff --git a/Source/l1504.asm b/Source/l1504.asm index 5b21a25..b008fd9 100644 --- a/Source/l1504.asm +++ b/Source/l1504.asm @@ -20,7 +20,7 @@ STATE_BOTHEXITED EQU 4 ;--------------------------------------------------------------------- -SECTION "Level1504Gfx1",DATA +SECTION "Level1504Gfx1",ROMX ;--------------------------------------------------------------------- at_gunpoint_bg: INCBIN "..\\fgbpix\\distress\\at_gunpoint.bg" @@ -29,7 +29,7 @@ at_gunpoint_sprites_sp: INCBIN "..\\fgbpix\\distress\\at_gunpoint_sprites.sp" ;--------------------------------------------------------------------- -SECTION "Level1504Section",DATA +SECTION "Level1504Section",ROMX ;--------------------------------------------------------------------- L1504_Contents:: diff --git a/Source/l1512.asm b/Source/l1512.asm index fa3c45b..eb9ea89 100644 --- a/Source/l1512.asm +++ b/Source/l1512.asm @@ -11,7 +11,7 @@ VAR_BGKILLED EQU 15 ;--------------------------------------------------------------------- -SECTION "Level1512Section",DATA +SECTION "Level1512Section",ROMX ;--------------------------------------------------------------------- L1512_Contents:: diff --git a/Source/map.asm b/Source/map.asm index 62b97ed..c9c3a38 100644 --- a/Source/map.asm +++ b/Source/map.asm @@ -3682,7 +3682,7 @@ RandomizeFlightCodes:: ;--------------------------------------------------------------------- ; map data ;--------------------------------------------------------------------- -SECTION "MapLookupTableSection",DATA +SECTION "MapLookupTableSection",ROMX MapLookupTable: ;calculate index number 0-255 from xxyy with "i = yy*16 + xx" @@ -3944,8 +3944,8 @@ DW BANK(L1315_Contents),L1315_Contents ;253 DW BANK(L1415_Contents),L1415_Contents ;254 DW BANK(L1515_Contents),L1515_Contents ;255 -;SECTION "BGTileSection",DATA,BANK[BGTILEROM] -SECTION "BGTileSection",DATA[$4000],BANK[BGTILEROM1] +;SECTION "BGTileSection",ROMX,BANK[BGTILEROM] +SECTION "BGTileSection",ROMX[$4000],BANK[BGTILEROM1] BGTiles:: DB 0,0,0,0, 0,0,0,0, 0,0,0,0,0,0,0,0 ;blank tile zero INCBIN "bgTiles1-256.bin" @@ -3953,7 +3953,7 @@ INCBIN "bgTiles257-512.bin" INCBIN "bgTiles513-768.bin" INCBIN "bgTiles769-979.bin" -SECTION "BGTileSection2",DATA[$4000],BANK[BGTILEROM2] +SECTION "BGTileSection2",ROMX[$4000],BANK[BGTILEROM2] BGTiles1024:: DB 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 INCBIN "bgTiles1024-1279.bin" @@ -3963,7 +3963,7 @@ INCBIN "bgTiles1792-2047.bin" ;DS 16*((1024-256)-1) ;pad tiles -SECTION "BGColorTable",DATA[$4000] +SECTION "BGColorTable",ROMX[$4000] bg_colorTable:: ;defines a byte for the tile attribute (color) for each class ;0=Grey, 1=Red, 2=Blue, 3=Green, 4=Purple, 5=Yellow, 6=Brown/Orange, 7=Fuscia ;+8=can walk over @@ -4084,7 +4084,7 @@ bg_colorTable:: ;defines a byte for the tile attribute (color) for each class ;+16=can shoot over ;+32=attackable -SECTION "FGTileSection",DATA[$4800] +SECTION "FGTileSection",ROMX[$4800] FGTiles: INCBIN "fgTiles2048-2302.bin" ;monsta tiles INCBIN "fgTiles2304-2559.bin" ;monsta tiles @@ -4128,7 +4128,7 @@ DB 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ;2468 +420 ; 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 ;--------------------------------------------------------------------- -SECTION "MapBGPix",DATA +SECTION "MapBGPix",ROMX ;--------------------------------------------------------------------- waitingToJoin_bg: INCBIN "..\\fgbpix\\menu\\waitingToJoin.bg" diff --git a/Source/music.asm b/Source/music.asm index d9fb6a1..1e94e95 100644 --- a/Source/music.asm +++ b/Source/music.asm @@ -621,7 +621,7 @@ ld b,b ;--------------------------------------------------------------------- -SECTION "MusicData1",DATA +SECTION "MusicData1",ROMX ;--------------------------------------------------------------------- instrumentDefaults: .instrument1 @@ -655,7 +655,7 @@ haiku_gbm:: INCBIN "music\\maybe_haiku.gbm.bin" ;--------------------------------------------------------------------- -SECTION "MusicData2",DATA +SECTION "MusicData2",ROMX ;--------------------------------------------------------------------- moon_base_ba_gbm:: @@ -683,7 +683,7 @@ takeoff_gbm:: INCBIN "music\\takeoff.gbm.bin" ;--------------------------------------------------------------------- -SECTION "MusicData3",DATA +SECTION "MusicData3",ROMX ;--------------------------------------------------------------------- spaceish_gbm:: @@ -699,7 +699,7 @@ death_gbm:: INCBIN "music\\death.gbm.bin" ;--------------------------------------------------------------------- -SECTION "MusicData4",DATA +SECTION "MusicData4",ROMX ;--------------------------------------------------------------------- jungle_gbm:: INCBIN "music\\jungle.gbm.bin"