Skip to content

Commit b45060e

Browse files
committed
A/Album/HG: Hexagon Force rework v2 complete, fix Geometrical Dominator music desync on Huge/Album
Level 16 of Geometry Dash. Released with Update 1.8 on Aug 7, 2014.
1 parent 5497ef1 commit b45060e

24 files changed

+1026
-940
lines changed

LEVELS/LEVEL DATA/lvlset_A/HexagonForce.tmx

Lines changed: 83 additions & 83 deletions
Large diffs are not rendered by default.

LEVELS/LEVEL DATA/lvlset_A/retray.tmx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<export target="../LEVELS/LEVEL DATA/lvlset_A/retray.csv" format="csv"/>
66
</editorsettings>
77
<tileset firstgid="1" name="famidash" tilewidth="16" tileheight="16" tilecount="256" columns="16">
8-
<image source="../GRAPHICS/famidash.bmp" width="256" height="256"/>
8+
<image source="../../../GRAPHICS/famidash.bmp" width="256" height="256"/>
99
</tileset>
1010
<tileset firstgid="257" name="sprites" tilewidth="16" tileheight="16" tilecount="256" columns="16">
11-
<image source="../GRAPHICS/sprites.png" width="256" height="256"/>
11+
<image source="../../../GRAPHICS/sprites.png" width="256" height="256"/>
1212
</tileset>
1313
<layer id="1" width="635" height="27">
1414
<data encoding="csv">

LEVELS/LEVEL DATA/lvlset_C/everyend.tmx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<export target="../LEVELS/LEVEL DATA/lvlset_C/everyend.csv" format="csv"/>
55
</editorsettings>
66
<tileset firstgid="1" name="famidash" tilewidth="16" tileheight="16" tilecount="256" columns="16">
7-
<image source="../GRAPHICS/famidash.bmp" width="256" height="256"/>
7+
<image source="../../../GRAPHICS/famidash.bmp" width="256" height="256"/>
88
</tileset>
99
<tileset firstgid="257" name="sprites" tilewidth="16" tileheight="16" tilecount="256" columns="16">
10-
<image source="../GRAPHICS/sprites.png" width="256" height="256"/>
10+
<image source="../../../GRAPHICS/sprites.png" width="256" height="256"/>
1111
</tileset>
1212
<layer id="1" width="4573" height="57">
1313
<data encoding="csv">

LEVELS/LEVEL DATA/lvlset_C/sonicwave.tmx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<export target="../LEVELS/LEVEL DATA/lvlset_C/sonicwave.csv" format="csv"/>
66
</editorsettings>
77
<tileset firstgid="1" name="famidash" tilewidth="16" tileheight="16" tilecount="256" columns="16">
8-
<image source="../GRAPHICS/famidash.bmp" width="256" height="256"/>
8+
<image source="../../../GRAPHICS/famidash.bmp" width="256" height="256"/>
99
</tileset>
1010
<tileset firstgid="257" name="sprites" tilewidth="16" tileheight="16" tilecount="256" columns="16">
11-
<image source="../GRAPHICS/sprites.png" width="256" height="256"/>
11+
<image source="../../../GRAPHICS/sprites.png" width="256" height="256"/>
1212
</tileset>
1313
<layer id="1" width="1568" height="27">
1414
<data encoding="csv">

LEVELS/LEVEL DATA/lvlset_HUGE/hexagonforce.tmx

Lines changed: 83 additions & 83 deletions
Large diffs are not rendered by default.
7.9 KB
Binary file not shown.
560 Bytes
Binary file not shown.
1.58 KB
Binary file not shown.

LEVELS/include/lvlset_A/all_level_data.s

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,33 @@
5454
.incbin "EXPORTS/dash.lz.0.bin" ; Size: 8132
5555

5656

57-
.segment "DAT_BANK_02" ; Total bank size: 8035 bytes
57+
.segment "DAT_BANK_02" ; Total bank size: 8106 bytes
58+
.export level_data_hexagonforce
59+
level_data_hexagonforce:
60+
; Header
61+
.byte <sprite_data_hexagonforce ;____________ Sprite data ptr, low byte
62+
.byte >sprite_data_hexagonforce ;____________ Sprite data ptr, high byte
63+
.byte <(.bank(sprite_data_hexagonforce)) ;___ Sprite data bank
64+
.byte song_hexagon_force ;___________________ Song ID
65+
.byte (0 << 4) | 0 ;_________________________ Starting game mode and speed
66+
.byte ($B0) ;________________________________ Spawn Y Position (high byte)
67+
.byte ($00) ;________________________________ Spawn Y Position (low byte)
68+
.byte ($02) ;________________________________ Y Scroll Position (high byte)
69+
.byte ($EF) ;________________________________ Y Scroll Position (low byte)
70+
.byte ($07) ;________________________________ Max Fall Speed (high byte)
71+
.byte (0 << 0) | (1 << 1) ;__________________ Force platformer, Disable parallax
72+
.byte _DECO1 ;_______________________________ Deco type
73+
.byte _SPIKESA ;_____________________________ Spike set
74+
.byte _BLOCKSB ;_____________________________ Block set
75+
.byte _SAWBLADESA ;__________________________ Sawblade set
76+
.byte $13 ;__________________________________ Starting background color
77+
.byte $03 ;__________________________________ Starting ground color
78+
.byte 40 ;___________________________________ Level height
79+
; Level data
80+
.incbin "EXPORTS/hexagonforce.lz.0.bin" ; Size: 8088
81+
82+
83+
.segment "DAT_BANK_03" ; Total bank size: 8035 bytes
5884
.export level_data_rainbowtylenol
5985
level_data_rainbowtylenol:
6086
; Header
@@ -80,7 +106,7 @@
80106
.incbin "EXPORTS/rainbowtylenol.lz.0.bin" ; Size: 8017
81107

82108

83-
.segment "DAT_BANK_03" ; Total bank size: 7542 bytes
109+
.segment "DAT_BANK_04" ; Total bank size: 8102 bytes
84110
.export level_data_fingerdash
85111
level_data_fingerdash:
86112
; Header
@@ -105,34 +131,13 @@
105131
; Level data
106132
.incbin "EXPORTS/fingerdash.lz.bin" ; Size: 7524
107133

108-
109-
.segment "DAT_BANK_04" ; Total bank size: 8182 bytes
110-
.export level_data_hexagonforce
111-
level_data_hexagonforce:
112-
; Header
113-
.byte <sprite_data_hexagonforce ;____________ Sprite data ptr, low byte
114-
.byte >sprite_data_hexagonforce ;____________ Sprite data ptr, high byte
115-
.byte <(.bank(sprite_data_hexagonforce)) ;___ Sprite data bank
116-
.byte song_hexagon_force ;___________________ Song ID
117-
.byte (0 << 4) | 0 ;_________________________ Starting game mode and speed
118-
.byte ($B0) ;________________________________ Spawn Y Position (high byte)
119-
.byte ($00) ;________________________________ Spawn Y Position (low byte)
120-
.byte ($02) ;________________________________ Y Scroll Position (high byte)
121-
.byte ($EF) ;________________________________ Y Scroll Position (low byte)
122-
.byte ($06) ;________________________________ Max Fall Speed (high byte)
123-
.byte (0 << 0) | (1 << 1) ;__________________ Force platformer, Disable parallax
124-
.byte _DECO1 ;_______________________________ Deco type
125-
.byte _SPIKESB ;_____________________________ Spike set
126-
.byte _BLOCKSB ;_____________________________ Block set
127-
.byte _SAWBLADESA ;__________________________ Sawblade set
128-
.byte $02 ;__________________________________ Starting background color
129-
.byte $12 ;__________________________________ Starting ground color
130-
.byte 40 ;___________________________________ Level height
134+
.export level_data_hexagonforce_0
135+
level_data_hexagonforce_0:
131136
; Level data
132-
.incbin "EXPORTS/hexagonforce.lz.bin" ; Size: 6953
137+
.incbin "EXPORTS/hexagonforce.lz.1.bin" ; Size: 560
133138

134139

135-
.segment "DAT_BANK_05" ; Total bank size: 8097 bytes
140+
.segment "DAT_BANK_05" ; Total bank size: 8162 bytes
136141
.export level_data_groundtospace
137142
level_data_groundtospace:
138143
; Header
@@ -689,13 +694,13 @@
689694

690695

691696
.segment "DAT_BANK_15" ; Total bank size: 8191 bytes
692-
.export level_data_extraordinaryexcitement_2
693-
level_data_extraordinaryexcitement_2:
697+
.export level_data_extraordinaryexcitement_3
698+
level_data_extraordinaryexcitement_3:
694699
; Level data
695700
.incbin "EXPORTS/extraordinaryexcitement.lz.1.bin" ; Size: 4630
696701

697702

698-
.segment "DAT_BANK_16" ; Total bank size: 7991 bytes
703+
.segment "DAT_BANK_16" ; Total bank size: 8026 bytes
699704
.export level_data_electroman
700705
level_data_electroman:
701706
; Header
@@ -820,8 +825,8 @@
820825
; Level data
821826
.incbin "EXPORTS/foresttemple.lz.bin" ; Size: 4392
822827

823-
.export level_data_rainbowtylenol_1
824-
level_data_rainbowtylenol_1:
828+
.export level_data_rainbowtylenol_2
829+
level_data_rainbowtylenol_2:
825830
; Level data
826831
.incbin "EXPORTS/rainbowtylenol.lz.1.bin" ; Size: 3691
827832

@@ -979,8 +984,8 @@
979984
; Level data
980985
.incbin "EXPORTS/retray.lz.bin" ; Size: 2712
981986

982-
.export level_data_dash_0
983-
level_data_dash_0:
987+
.export level_data_dash_1
988+
level_data_dash_1:
984989
; Level data
985990
.incbin "EXPORTS/dash.lz.1.bin" ; Size: 100
986991

@@ -1061,7 +1066,7 @@
10611066
.incbin "EXPORTS/polargeist.lz.bin" ; Size: 1743
10621067

10631068

1064-
.segment "DAT_BANK_21" ; Total bank size: 8138 bytes
1069+
.segment "DAT_BANK_22" ; Total bank size: 8159 bytes
10651070
.export level_data_dryout
10661071
level_data_dryout:
10671072
; Header
@@ -1086,8 +1091,6 @@
10861091
; Level data
10871092
.incbin "EXPORTS/dryout.lz.bin" ; Size: 1521
10881093

1089-
1090-
.segment "DAT_BANK_22" ; Total bank size: 8126 bytes
10911094
.export level_data_backontrack
10921095
level_data_backontrack:
10931096
; Header
@@ -1113,7 +1116,7 @@
11131116
.incbin "EXPORTS/backontrack.lz.bin" ; Size: 1382
11141117

11151118

1116-
.segment "DAT_BANK_23" ; Total bank size: 4886 bytes
1119+
.segment "DAT_BANK_23" ; Total bank size: 5987 bytes
11171120
.export level_data_thechallenge
11181121
level_data_thechallenge:
11191122
; Header

LEVELS/include/lvlset_A/all_level_table.s

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,22 @@ _level_list_bank:
143143
.byte .lobyte(.bank(level_data_foresttemple))
144144

145145
_level_chunk_list_lo:
146-
.byte .lobyte(level_data_dash_0)
147-
.byte .lobyte(level_data_rainbowtylenol_1)
148-
.byte .lobyte(level_data_extraordinaryexcitement_2)
146+
.byte .lobyte(level_data_hexagonforce_0)
147+
.byte .lobyte(level_data_dash_1)
148+
.byte .lobyte(level_data_rainbowtylenol_2)
149+
.byte .lobyte(level_data_extraordinaryexcitement_3)
149150

150151
_level_chunk_list_hi:
151-
.byte .hibyte(level_data_dash_0)
152-
.byte .hibyte(level_data_rainbowtylenol_1)
153-
.byte .hibyte(level_data_extraordinaryexcitement_2)
152+
.byte .hibyte(level_data_hexagonforce_0)
153+
.byte .hibyte(level_data_dash_1)
154+
.byte .hibyte(level_data_rainbowtylenol_2)
155+
.byte .hibyte(level_data_extraordinaryexcitement_3)
154156

155157
_level_chunk_list_bank:
156-
.byte .lobyte(.bank(level_data_dash_0))
157-
.byte .lobyte(.bank(level_data_rainbowtylenol_1))
158-
.byte .lobyte(.bank(level_data_extraordinaryexcitement_2))
158+
.byte .lobyte(.bank(level_data_hexagonforce_0))
159+
.byte .lobyte(.bank(level_data_dash_1))
160+
.byte .lobyte(.bank(level_data_rainbowtylenol_2))
161+
.byte .lobyte(.bank(level_data_extraordinaryexcitement_3))
159162

160163
.define MID_LEVEL_LENGTHS_ENABLED 0
161164
.define HIGH_LEVEL_LENGTHS_ENABLED 0

0 commit comments

Comments
 (0)