summaryrefslogtreecommitdiff
path: root/menu
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-01-27 16:22:41 -0500
committeryenatch <yenatch@gmail.com>2014-01-27 16:24:13 -0500
commit1b9ee46af9f8baac0d266a54130115a719788377 (patch)
tree8ac61c0752dc74da0677cb26fe4db6362db5b2b7 /menu
parent6bde08504fdc336b1d458bab0bed4ef649cae25a (diff)
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.
Diffstat (limited to 'menu')
-rw-r--r--menu/pc.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/menu/pc.asm b/menu/pc.asm
index 8b31f822..acaf2bf5 100644
--- a/menu/pc.asm
+++ b/menu/pc.asm
@@ -1,5 +1,5 @@
-Func_213c8: ; 213c8 (8:53c8)
+Func_213c8:: ; 213c8 (8:53c8)
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
call SaveScreenTilesToBuffer2
@@ -115,8 +115,8 @@ PKMNLeaguePCText: ; 214b2 (8:54b2)
LogOffPCText: ; 214ba (8:54ba)
db "LOG OFF@"
-Func_214c2: ; 214c2 (8:54c2)
-BillsPC_: ; 0x214c2
+Func_214c2:: ; 214c2 (8:54c2)
+BillsPC_:: ; 0x214c2
ld hl, $d730
set 6, [hl]
xor a
@@ -374,7 +374,7 @@ BillsPCMenuText: ; 216e1 (8:56e1)
BoxNoPCText: ; 21713 (8:5713)
db "BOX No.@"
-Func_2171b: ; 2171b (8:571b)
+Func_2171b:: ; 2171b (8:571b)
ld hl, $d173
ld bc, $002c
jr .asm_21729 ; 0x21721 $6
@@ -536,7 +536,7 @@ MonWasReleasedText: ; 0x21820
TX_FAR _MonWasReleasedText
db "@"
-Func_21825: ; 5824 (8:5825)
+Func_21825:: ; 5824 (8:5825)
ld a, [$ff00+$aa]
cp $1
ret z
@@ -554,7 +554,7 @@ Func_21825: ; 5824 (8:5825)
ld a, $22
jp Func_3ef5
-Func_21845: ; 5845 (8:5845)
+Func_21845:: ; 5845 (8:5845)
ld a, [$ff00+$aa]
cp $2
ret z
@@ -572,7 +572,7 @@ Func_21845: ; 5845 (8:5845)
ld a, $22
jp Func_3ef5
-UnnamedText_21865: ; 21865 (8:5865)
+UnnamedText_21865:: ; 21865 (8:5865)
TX_FAR _UnnamedText_21865
db "@"
@@ -583,6 +583,6 @@ UnnamedText_21865: ; 21865 (8:5865)
ld a, $23
jp Func_3ef5
-Unknown_21878: ; 21878 (8:5878)
+Unknown_21878:: ; 21878 (8:5878)
db $FD