Get rid of globals.asm. Use ::s to export labels between objects.

globals.asm was a hack that:
- gave rgbasm an extra 100k lines to read
- increased reliance on the python preprocessor
- made the makefile a mess
- gave object creation an extra step
- wasn't even necessary

This speeds up build time by at least a third.
This commit is contained in:
yenatch 2014-01-27 16:22:41 -05:00
parent 6bde08504f
commit 1b9ee46af9
277 changed files with 4346 additions and 4358 deletions

View file

@ -1,4 +1,4 @@
Music_TitleScreen: ; 7c249 (1f:4249)
Music_TitleScreen:: ; 7c249 (1f:4249)
db ( $C0 | CH0 )
dw Music_TitleScreen_Ch1
db CH1
@ -8,7 +8,7 @@ Music_TitleScreen: ; 7c249 (1f:4249)
db CH3
dw Music_TitleScreen_Ch4
Music_Credits: ; 7c255 (1f:4255)
Music_Credits:: ; 7c255 (1f:4255)
db ( $80 | CH0 )
dw Music_Credits_Ch1
db CH1
@ -16,7 +16,7 @@ Music_Credits: ; 7c255 (1f:4255)
db CH2
dw Music_Credits_Ch3
Music_HallOfFame: ; 7c25e (1f:425e)
Music_HallOfFame:: ; 7c25e (1f:425e)
db ( $80 | CH0 )
dw Music_HallOfFame_Ch1
db CH1
@ -24,7 +24,7 @@ Music_HallOfFame: ; 7c25e (1f:425e)
db CH2
dw Music_HallOfFame_Ch3
Music_OaksLab: ; 7c267 (1f:4267)
Music_OaksLab:: ; 7c267 (1f:4267)
db ( $80 | CH0 )
dw Music_OaksLab_Ch1
db CH1
@ -32,13 +32,13 @@ Music_OaksLab: ; 7c267 (1f:4267)
db CH2
dw Music_OaksLab_Ch3
Music_JigglypuffSong: ; 7c270 (1f:4270)
Music_JigglypuffSong:: ; 7c270 (1f:4270)
db $40
dw Music_JigglypuffSong_Ch1
db CH1
dw Music_JigglypuffSong_Ch2
Music_BikeRiding: ; 7c276 (1f:4276)
Music_BikeRiding:: ; 7c276 (1f:4276)
db ( $C0 | CH0 )
dw Music_BikeRiding_Ch1
db CH1
@ -48,7 +48,7 @@ Music_BikeRiding: ; 7c276 (1f:4276)
db CH3
dw Music_BikeRiding_Ch4
Music_Surfing: ; 7c282 (1f:4282)
Music_Surfing:: ; 7c282 (1f:4282)
db ( $80 | CH0 )
dw Music_Surfing_Ch1
db CH1
@ -56,7 +56,7 @@ Music_Surfing: ; 7c282 (1f:4282)
db CH2
dw Music_Surfing_Ch3
Music_GameCorner: ; 7c28b (1f:428b)
Music_GameCorner:: ; 7c28b (1f:428b)
db ( $80 | CH0 )
dw Music_GameCorner_Ch1
db CH1
@ -64,7 +64,7 @@ Music_GameCorner: ; 7c28b (1f:428b)
db CH2
dw Music_GameCorner_Ch3
Music_IntroBattle: ; 7c294 (1f:4294)
Music_IntroBattle:: ; 7c294 (1f:4294)
db ( $C0 | CH0 )
dw Music_IntroBattle_Ch1
db CH1
@ -75,7 +75,7 @@ Music_IntroBattle: ; 7c294 (1f:4294)
dw Music_IntroBattle_Ch4
; Power Plant, Unknown Dungeon, Rocket HQ
Music_Dungeon1: ; 7c2a0 (1f:42a0)
Music_Dungeon1:: ; 7c2a0 (1f:42a0)
db ( $C0 | CH0 )
dw Music_Dungeon1_Ch1
db CH1
@ -86,7 +86,7 @@ Music_Dungeon1: ; 7c2a0 (1f:42a0)
dw Music_Dungeon1_Ch4
; Viridian Forest, Seafoam Islands
Music_Dungeon2: ; 7c2ac (1f:42ac)
Music_Dungeon2:: ; 7c2ac (1f:42ac)
db ( $C0 | CH0 )
dw Music_Dungeon2_Ch1
db CH1
@ -97,7 +97,7 @@ Music_Dungeon2: ; 7c2ac (1f:42ac)
dw Music_Dungeon2_Ch4
; Mt. Moon, Rock Tunnel, Victory Road
Music_Dungeon3: ; 7c2b8 (1f:42b8)
Music_Dungeon3:: ; 7c2b8 (1f:42b8)
db ( $C0 | CH0 )
dw Music_Dungeon3_Ch1
db CH1
@ -107,7 +107,7 @@ Music_Dungeon3: ; 7c2b8 (1f:42b8)
db CH3
dw Music_Dungeon3_Ch4
Music_CinnabarMansion: ; 7c2c4 (1f:42c4)
Music_CinnabarMansion:: ; 7c2c4 (1f:42c4)
db ( $C0 | CH0 )
dw Music_CinnabarMansion_Ch1
db CH1
@ -117,7 +117,7 @@ Music_CinnabarMansion: ; 7c2c4 (1f:42c4)
db CH3
dw Music_CinnabarMansion_Ch4
Music_PokemonTower: ; 7c2d0 (1f:42d0)
Music_PokemonTower:: ; 7c2d0 (1f:42d0)
db ( $80 | CH0 )
dw Music_PokemonTower_Ch1
db CH1
@ -125,7 +125,7 @@ Music_PokemonTower: ; 7c2d0 (1f:42d0)
db CH2
dw Music_PokemonTower_Ch3
Music_SilphCo: ; 7c2d9 (1f:42d9)
Music_SilphCo:: ; 7c2d9 (1f:42d9)
db ( $80 | CH0 )
dw Music_SilphCo_Ch1
db CH1
@ -133,7 +133,7 @@ Music_SilphCo: ; 7c2d9 (1f:42d9)
db CH2
dw Music_SilphCo_Ch3
Music_MeetEvilTrainer: ; 7c2e2 (1f:42e2)
Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2)
db ( $80 | CH0 )
dw Music_MeetEvilTrainer_Ch1
db CH1
@ -141,7 +141,7 @@ Music_MeetEvilTrainer: ; 7c2e2 (1f:42e2)
db CH2
dw Music_MeetEvilTrainer_Ch3
Music_MeetFemaleTrainer: ; 7c2eb (1f:42eb)
Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb)
db ( $80 | CH0 )
dw Music_MeetFemaleTrainer_Ch1
db CH1
@ -149,7 +149,7 @@ Music_MeetFemaleTrainer: ; 7c2eb (1f:42eb)
db CH2
dw Music_MeetFemaleTrainer_Ch3
Music_MeetMaleTrainer: ; 7c2f4 (1f:42f4)
Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4)
db ( $80 | CH0 )
dw Music_MeetMaleTrainer_Ch1
db CH1