Skip to content

Commit

Permalink
Merge branch 'master' into ProjectSonic1TwoEight
Browse files Browse the repository at this point in the history
  • Loading branch information
@Clownacy
Clownacy committed Sep 14, 2015
2 parents 165035c + 6145a74 commit fa4ab79
Show file tree
Hide file tree
Showing 181 changed files with 1,027 additions and 1,009 deletions.
46 changes: 23 additions & 23 deletions _inc/AnimateLevelGfx.asm
View file
Expand Up @@ -5,7 +5,7 @@
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


AnimateLevelGfx: ; XREF: Demo_Time; VBla_0C_NoChg
AnimateLevelGfx:
tst.w (f_pause).w ; is the game paused?
bne.s @ispaused ; if yes, branch
lea (vdp_data_port).l,a6
Expand All @@ -30,7 +30,7 @@ AniArt_Index: dc.w AniArt_GHZ-AniArt_Index, AniArt_none-AniArt_Index
; Animated pattern routine - Green Hill
; ---------------------------------------------------------------------------

AniArt_GHZ: ; XREF: AniArt_Index
AniArt_GHZ:

AniArt_GHZ_Waterfall:

Expand Down Expand Up @@ -107,7 +107,7 @@ AniArt_GHZ_Smallflower:
; Animated pattern routine - Marble
; ---------------------------------------------------------------------------

AniArt_MZ: ; XREF: AniArt_Index
AniArt_MZ:

AniArt_MZ_Lava:

Expand Down Expand Up @@ -191,7 +191,7 @@ AniArt_MZ_Torch:
; Animated pattern routine - Scrap Brain
; ---------------------------------------------------------------------------

AniArt_SBZ: ; XREF: AniArt_Index
AniArt_SBZ:

@size: = 12 ; number of tiles per frame

Expand Down Expand Up @@ -269,7 +269,7 @@ AniArt_SBZ: ; XREF: AniArt_Index
; Animated pattern routine - ending sequence
; ---------------------------------------------------------------------------

AniArt_Ending: ; XREF: AniArt_Index
AniArt_Ending:

AniArt_Ending_BigFlower:

Expand Down Expand Up @@ -371,7 +371,7 @@ AniArt_Ending_Flower4:
rts
; ===========================================================================

AniArt_none: ; XREF: AniArt_Index
AniArt_none:
rts

; ---------------------------------------------------------------------------
Expand Down Expand Up @@ -413,14 +413,14 @@ AniArt_MZextra: dc.w loc_1C3EE-AniArt_MZextra, loc_1C3FA-AniArt_MZextra
dc.w loc_1C4E8-AniArt_MZextra, loc_1C4FA-AniArt_MZextra
; ===========================================================================

loc_1C3EE: ; XREF: AniArt_MZextra
loc_1C3EE:
move.l (a1),(a6)
lea $10(a1),a1
dbf d1,loc_1C3EE
rts
; ===========================================================================

loc_1C3FA: ; XREF: AniArt_MZextra
loc_1C3FA:
move.l 2(a1),d0
move.b 1(a1),d0
ror.l #8,d0
Expand All @@ -430,14 +430,14 @@ loc_1C3FA: ; XREF: AniArt_MZextra
rts
; ===========================================================================

loc_1C410: ; XREF: AniArt_MZextra
loc_1C410:
move.l 2(a1),(a6)
lea $10(a1),a1
dbf d1,loc_1C410
rts
; ===========================================================================

loc_1C41E: ; XREF: AniArt_MZextra
loc_1C41E:
move.l 4(a1),d0
move.b 3(a1),d0
ror.l #8,d0
Expand All @@ -447,14 +447,14 @@ loc_1C41E: ; XREF: AniArt_MZextra
rts
; ===========================================================================

loc_1C434: ; XREF: AniArt_MZextra
loc_1C434:
move.l 4(a1),(a6)
lea $10(a1),a1
dbf d1,loc_1C434
rts
; ===========================================================================

loc_1C442: ; XREF: AniArt_MZextra
loc_1C442:
move.l 6(a1),d0
move.b 5(a1),d0
ror.l #8,d0
Expand All @@ -464,14 +464,14 @@ loc_1C442: ; XREF: AniArt_MZextra
rts
; ===========================================================================

loc_1C458: ; XREF: AniArt_MZextra
loc_1C458:
move.l 6(a1),(a6)
lea $10(a1),a1
dbf d1,loc_1C458
rts
; ===========================================================================

loc_1C466: ; XREF: AniArt_MZextra
loc_1C466:
move.l 8(a1),d0
move.b 7(a1),d0
ror.l #8,d0
Expand All @@ -481,14 +481,14 @@ loc_1C466: ; XREF: AniArt_MZextra
rts
; ===========================================================================

loc_1C47C: ; XREF: AniArt_MZextra
loc_1C47C:
move.l 8(a1),(a6)
lea $10(a1),a1
dbf d1,loc_1C47C
rts
; ===========================================================================

loc_1C48A: ; XREF: AniArt_MZextra
loc_1C48A:
move.l $A(a1),d0
move.b 9(a1),d0
ror.l #8,d0
Expand All @@ -498,14 +498,14 @@ loc_1C48A: ; XREF: AniArt_MZextra
rts
; ===========================================================================

loc_1C4A0: ; XREF: AniArt_MZextra
loc_1C4A0:
move.l $A(a1),(a6)
lea $10(a1),a1
dbf d1,loc_1C4A0
rts
; ===========================================================================

loc_1C4AE: ; XREF: AniArt_MZextra
loc_1C4AE:
move.l $C(a1),d0
move.b $B(a1),d0
ror.l #8,d0
Expand All @@ -515,14 +515,14 @@ loc_1C4AE: ; XREF: AniArt_MZextra
rts
; ===========================================================================

loc_1C4C4: ; XREF: AniArt_MZextra
loc_1C4C4:
move.l $C(a1),(a6)
lea $10(a1),a1
dbf d1,loc_1C4C4
rts
; ===========================================================================

loc_1C4D2: ; XREF: AniArt_MZextra
loc_1C4D2:
move.l $C(a1),d0
rol.l #8,d0
move.b 0(a1),d0
Expand All @@ -532,15 +532,15 @@ loc_1C4D2: ; XREF: AniArt_MZextra
rts
; ===========================================================================

loc_1C4E8: ; XREF: AniArt_MZextra
loc_1C4E8:
move.w $E(a1),(a6)
move.w 0(a1),(a6)
lea $10(a1),a1
dbf d1,loc_1C4E8
rts
; ===========================================================================

loc_1C4FA: ; XREF: AniArt_MZextra
loc_1C4FA:
move.l 0(a1),d0
move.b $F(a1),d0
ror.l #8,d0
Expand All @@ -556,7 +556,7 @@ loc_1C4FA: ; XREF: AniArt_MZextra
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


AniArt_GiantRing: ; XREF: AnimateLevelGfx
AniArt_GiantRing:
tst.w (v_gfxbigring).w
bne.s loc_1C518
rts
Expand Down
28 changes: 14 additions & 14 deletions _inc/DeformLayers (JP1).asm
View file
Expand Up @@ -5,7 +5,7 @@
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


DeformLayers: ; XREF: GM_TitleScr; GM_Level; GM_Ending
DeformLayers:
tst.b (f_nobgscroll).w
beq.s loc_628E
rts
Expand Down Expand Up @@ -44,7 +44,7 @@ Deform_Index: dc.w Deform_GHZ-Deform_Index, Deform_LZ-Deform_Index
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


Deform_GHZ: ; XREF: Deform_Index
Deform_GHZ:
move.w (v_scrshiftx).w,d4
ext.l d4
asl.l #5,d4
Expand Down Expand Up @@ -146,7 +146,7 @@ loc_63A4:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


Deform_LZ: ; XREF: Deform_Index
Deform_LZ:
move.w (v_scrshiftx).w,d4
ext.l d4
asl.l #7,d4
Expand Down Expand Up @@ -223,7 +223,7 @@ Lz_Scroll_Data:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


Deform_MZ: ; XREF: Deform_Index
Deform_MZ:
move.w (v_scrshiftx).w,d4
ext.l d4
asl.l #6,d4
Expand Down Expand Up @@ -322,7 +322,7 @@ loc_6632:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


Deform_SLZ: ; XREF: Deform_Index
Deform_SLZ:
move.w ($FFFFF73C).w,d5
ext.l d5
asl.l #7,d5
Expand Down Expand Up @@ -418,7 +418,7 @@ loc_66EA:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


Deform_SYZ: ; XREF: Deform_Index
Deform_SYZ:
move.w ($FFFFF73C).w,d5
ext.l d5
asl.l #4,d5
Expand Down Expand Up @@ -497,7 +497,7 @@ loc_6798:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


Deform_SBZ: ; XREF: Deform_Index
Deform_SBZ:
tst.b (v_act).w
bne.w Bg_Scroll_SBz_2
move.w (v_scrshiftx).w,d4
Expand Down Expand Up @@ -609,7 +609,7 @@ loc_68D2:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


ScrollHoriz: ; XREF: DeformLayers
ScrollHoriz:
move.w (v_screenposx).w,d4 ; save old screen position
bsr.s MoveScreenHoriz
move.w (v_screenposx).w,d0
Expand All @@ -636,7 +636,7 @@ locret_65B0:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


MoveScreenHoriz: ; XREF: ScrollHoriz
MoveScreenHoriz:
move.w (v_player+obX).w,d0
sub.w (v_screenposx).w,d0 ; Sonic's distance from left edge of screen
subi.w #144,d0 ; is distance less than 144px?
Expand Down Expand Up @@ -692,7 +692,7 @@ loc_6610:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


ScrollVertical: ; XREF: DeformLayers
ScrollVertical:
moveq #0,d1
move.w (v_player+obY).w,d0
sub.w (v_screenposy).w,d0 ; Sonic's distance from top of screen
Expand Down Expand Up @@ -850,7 +850,7 @@ locret_6766:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


ScrollBlock1: ; XREF: Deform_GHZ; et al
ScrollBlock1:
move.l ($FFFFF708).w,d2
move.l d2,d0
add.l d4,d0
Expand Down Expand Up @@ -915,7 +915,7 @@ Exit_Bg_Scroll_Y:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


ScrollBlock2: ; XREF: Deform_SLZ
ScrollBlock2:
move.w ($FFFFF70C).w,d3
move.w d0,($FFFFF70C).w
move.w d0,d1
Expand All @@ -938,7 +938,7 @@ Exit_Scroll_Block2:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


ScrollBlock3: ; XREF: Deform_GHZ; et al
ScrollBlock3:
move.l ($FFFFF708).w,d2
move.l d2,d0
add.l d4,d0
Expand All @@ -965,7 +965,7 @@ Exit_Scroll_Block3:
; ||||||||||||||| S U B R O U T I N E |||||||||||||||||||||||||||||||||||||||


ScrollBlock4: ; XREF: Deform_GHZ
ScrollBlock4:
move.l ($FFFFF710).w,d2
move.l d2,d0
add.l d4,d0
Expand Down

0 comments on commit fa4ab79

Please sign in to comment.