summaryrefslogtreecommitdiff
path: root/event
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-04-10 15:01:49 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-04-10 15:01:49 -0400
commit6be4cd4da98093bf1b9362c946e693c89e4713ad (patch)
tree88d23a4b4a79f318b918ceeb3ff24c4ef1700b59 /event
parentbf73772a560ddfdf0b404ba3f85eb26542031b7b (diff)
Local labels starting with lowercase letters are no longer decorated with a trailing colon
Diffstat (limited to 'event')
-rw-r--r--event/battle_tower.asm4
-rw-r--r--event/buena.asm10
-rwxr-xr-xevent/celebi.asm2
-rwxr-xr-xevent/field_moves.asm2
-rwxr-xr-xevent/forced_movement.asm8
-rwxr-xr-xevent/itemball.asm6
-rw-r--r--event/magikarp.asm2
-rw-r--r--event/mom.asm6
-rwxr-xr-xevent/overworld.asm14
-rwxr-xr-xevent/poisonstep.asm2
10 files changed, 28 insertions, 28 deletions
diff --git a/event/battle_tower.asm b/event/battle_tower.asm
index a938e34c7..091fe7fe1 100644
--- a/event/battle_tower.asm
+++ b/event/battle_tower.asm
@@ -300,7 +300,7 @@ VerifyUniqueness: ; 8b2e9
ret
; 8b31a
-.nextmon: ; 8b31a
+.nextmon ; 8b31a
push bc
ld bc, PARTYMON_STRUCT_LENGTH
add hl, bc
@@ -309,7 +309,7 @@ VerifyUniqueness: ; 8b2e9
ret
; 8b322
-.isegg: ; 8b322
+.isegg ; 8b322
push bc
ld b, a
ld a, [de]
diff --git a/event/buena.asm b/event/buena.asm
index 433ecf014..5cff72d53 100644
--- a/event/buena.asm
+++ b/event/buena.asm
@@ -236,7 +236,7 @@ Buena_PlacePrizeMenuBox: ; 8b0d6
ret
; 8b0dd
-.menudataheader: ; 0x8b0dd
+.menudataheader ; 0x8b0dd
db $40 ; flags
db 00, 00 ; start coords
db 11, 17 ; end coords
@@ -288,13 +288,13 @@ Buena_PrizeMenu: ; 8b0e2
dba .prizepoints
; 8b129
-.indices: ; 8b129
+.indices ; 8b129
db 9
db 1, 2, 3, 4, 5, 6, 7, 8, 9
db -1
; 8b134
-.prizeitem: ; 8b134
+.prizeitem ; 8b134
ld a, [MenuSelection]
call Buena_getprize
ld a, [hl]
@@ -306,7 +306,7 @@ Buena_PrizeMenu: ; 8b0e2
ret
; 8b147
-.prizepoints: ; 8b147
+.prizepoints ; 8b147
ld a, [MenuSelection]
call Buena_getprize
inc hl
@@ -328,7 +328,7 @@ endr
ret
; 8b15e
-.prizes: ; 8b15e
+.prizes ; 8b15e
db ULTRA_BALL, 2
db FULL_RESTORE, 2
db NUGGET, 3
diff --git a/event/celebi.asm b/event/celebi.asm
index 9048f7b38..c6d8346b0 100755
--- a/event/celebi.asm
+++ b/event/celebi.asm
@@ -279,7 +279,7 @@ endr
; 49b6e (12:5b6e)
-.sinewave: ; 49b6e
+.sinewave ; 49b6e
sine_wave $100
; 49bae
diff --git a/event/field_moves.asm b/event/field_moves.asm
index 658a21698..cf9e1bef0 100755
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -174,7 +174,7 @@ endr
; 8ca1b
-.dw: ; 8ca1b (23:4a1b)
+.dw ; 8ca1b (23:4a1b)
dw Cut_SpawnAnimateTree
dw Cut_SpawnAnimateLeaves
dw Cut_StartWaiting
diff --git a/event/forced_movement.asm b/event/forced_movement.asm
index b6e6091ff..aa0473803 100755
--- a/event/forced_movement.asm
+++ b/event/forced_movement.asm
@@ -7,22 +7,22 @@ Script_ForcedMovement:: ; 0x1253d
end
; 0x12550
-.up: ; 0x12550
+.up ; 0x12550
applymovement PLAYER, .MovementData_up
end
; 0x12555
-.down: ; 0x12555
+.down ; 0x12555
applymovement PLAYER, .MovementData_down
end
; 0x1255a
-.right: ; 0x1255a
+.right ; 0x1255a
applymovement PLAYER, .MovementData_right
end
; 0x1255f
-.left: ; 0x1255f
+.left ; 0x1255f
applymovement PLAYER, .MovementData_left
end
; 0x12564
diff --git a/event/itemball.asm b/event/itemball.asm
index 083d7efc2..ed0c6a9e0 100755
--- a/event/itemball.asm
+++ b/event/itemball.asm
@@ -11,7 +11,7 @@ FindItemInBallScript:: ; 0x122ce
end
; 0x122e3
-.no_room: ; 0x122e3
+.no_room ; 0x122e3
opentext
writetext .text_found
waitbutton
@@ -21,13 +21,13 @@ FindItemInBallScript:: ; 0x122ce
end
; 0x122ee
-.text_found: ; 0x122ee
+.text_found ; 0x122ee
; found @ !
text_jump UnknownText_0x1c0a1c
db "@"
; 0x122f3
-.text_bag_full: ; 0x122f3
+.text_bag_full ; 0x122f3
; But can't carry any more items.
text_jump UnknownText_0x1c0a2c
db "@"
diff --git a/event/magikarp.asm b/event/magikarp.asm
index 4f8df1999..b9f73552c 100644
--- a/event/magikarp.asm
+++ b/event/magikarp.asm
@@ -86,7 +86,7 @@ Magikarp_LoadFeetInchesChars: ; fbbae
ret
; fbbbb
-.feetinchchars: ; fbbb
+.feetinchchars ; fbbb
INCBIN "gfx/unknown/0fbbbb.2bpp"
; fbbdb
diff --git a/event/mom.asm b/event/mom.asm
index 176fc85ee..d2b7d2a7c 100644
--- a/event/mom.asm
+++ b/event/mom.asm
@@ -32,7 +32,7 @@ endr
jp [hl]
; 16242
-.dw: ; 16242
+.dw ; 16242
dw .CheckIfBankInitialized
dw .InitializeBank
@@ -534,7 +534,7 @@ Function16571: ; 16571
ret
; 165b9
-.dpadaction: ; 165b9
+.dpadaction ; 165b9
ld hl, hJoyLast
ld a, [hl]
and D_UP
@@ -586,7 +586,7 @@ Function16571: ; 16571
ret
; 16607
-.getdigitquantity: ; 16607
+.getdigitquantity ; 16607
ld a, [wMomBankDigitCursorPosition]
push de
ld e, a
diff --git a/event/overworld.asm b/event/overworld.asm
index c1a68dc77..c9fe754fe 100755
--- a/event/overworld.asm
+++ b/event/overworld.asm
@@ -286,7 +286,7 @@ CutTreeBlockPointers: ; c862
dbw TILESET_ILEX_FOREST, .ilex
db -1
-.johto1: ; Johto OW
+.johto1 ; Johto OW
; Which meta tile are we facing, which should we replace it with, and which animation?
db $03, $02, $01 ; grass
db $5b, $3c, $00 ; tree
@@ -295,11 +295,11 @@ CutTreeBlockPointers: ; c862
db $67, $3e, $00 ; tree
db -1
-.johto2: ; Goldenrod area
+.johto2 ; Goldenrod area
db $03, $02, $01 ; grass
db -1
-.kanto: ; Kanto OW
+.kanto ; Kanto OW
db $0b, $0a, $01 ; grass
db $32, $6d, $00 ; tree
db $33, $6c, $00 ; tree
@@ -308,12 +308,12 @@ CutTreeBlockPointers: ; c862
db $60, $6e, $00 ; tree
db -1
-.park: ; National Park
+.park ; National Park
db $13, $03, $01 ; grass
db $03, $04, $01 ; grass
db -1
-.ilex: ; Ilex Forest
+.ilex ; Ilex Forest
db $0f, $17, $00
db -1
@@ -321,7 +321,7 @@ WhirlpoolBlockPointers: ; c8a4
dbw TILESET_JOHTO_1, .johto
db -1
-.johto: ; c8a8
+.johto ; c8a8
db $07, $36, $00
db -1
@@ -471,7 +471,7 @@ UsedSurfScript: ; c986
applymovement PLAYER, MovementBuffer ; PLAYER, MovementBuffer
end
-.empty_fn: ; c9a2
+.empty_fn ; c9a2
callba MobileFn_1060bb ; empty
ret
diff --git a/event/poisonstep.asm b/event/poisonstep.asm
index c0f2e1b9c..1e81e188f 100755
--- a/event/poisonstep.asm
+++ b/event/poisonstep.asm
@@ -118,7 +118,7 @@ DoPoisonStep:: ; 505da
end
; 50677
-.whiteout: ; 50677
+.whiteout ; 50677
farjump Script_OverworldWhiteout
; 5067b