summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-07-05 06:03:21 -0700
committerYamaArashi <shadow962@live.com>2016-07-05 06:03:21 -0700
commit7b01b8e827c8ecca6ad68b74d621b535bab33b8d (patch)
treea143a74280627c1838a171a15783d23f706f170f /data/scripts
parent86b7c742692565a5eb9b5824378b3e2c74f555c5 (diff)
convert .global to double colon
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.s36
-rw-r--r--data/scripts/maps/IslandCave.s3
-rw-r--r--data/scripts/maps/LittlerootTown_MaysHouse_2F.s3
3 files changed, 14 insertions, 28 deletions
diff --git a/data/scripts/cable_club.s b/data/scripts/cable_club.s
index e6d5221d6..32bb55a08 100644
--- a/data/scripts/cable_club.s
+++ b/data/scripts/cable_club.s
@@ -603,24 +603,21 @@ gUnknown_081A4363:: @ 81A4363
releaseall
end
- .global gUnknown_081A436F
-gUnknown_081A436F: @ 81A436F
+gUnknown_081A436F:: @ 81A436F
SingleBattleColosseum_EventScript_1A436F:: @ 81A436F
setvar 0x8005, 0
special 32
waitstate
end
- .global gUnknown_081A4379
-gUnknown_081A4379: @ 81A4379
+gUnknown_081A4379:: @ 81A4379
SingleBattleColosseum_EventScript_1A4379:: @ 81A4379
setvar 0x8005, 1
special 32
waitstate
end
- .global gUnknown_081A4383
-gUnknown_081A4383: @ 81A4383
+gUnknown_081A4383:: @ 81A4383
DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383
fadescreen 1
special 41
@@ -632,8 +629,7 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383
waitstate
end
- .global gUnknown_081A439E
-gUnknown_081A439E: @ 81A439E
+gUnknown_081A439E:: @ 81A439E
DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E
fadescreen 1
special 41
@@ -645,8 +641,7 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E
waitstate
end
- .global gUnknown_081A43B9
-gUnknown_081A43B9: @ 81A43B9
+gUnknown_081A43B9:: @ 81A43B9
DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9
fadescreen 1
special 41
@@ -658,8 +653,7 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9
waitstate
end
- .global gUnknown_081A43D4
-gUnknown_081A43D4: @ 81A43D4
+gUnknown_081A43D4:: @ 81A43D4
DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4
fadescreen 1
special 41
@@ -674,16 +668,14 @@ DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4
DoubleBattleColosseum_EventScript_1A43EF:: @ 81A43EF
end
- .global gUnknown_081A43F0
-gUnknown_081A43F0: @ 81A43F0
+gUnknown_081A43F0:: @ 81A43F0
TradeCenter_EventScript_1A43F0:: @ 81A43F0
setvar 0x8005, 0
special 33
waitstate
end
- .global gUnknown_081A43FA
-gUnknown_081A43FA: @ 81A43FA
+gUnknown_081A43FA:: @ 81A43FA
TradeCenter_EventScript_1A43FA:: @ 81A43FA
setvar 0x8005, 1
special 33
@@ -702,8 +694,7 @@ TradeCenter_EventScript_1A43FA:: @ 81A43FA
waitstate
end
- .global gUnknown_081A4418
-gUnknown_081A4418: @ 81A4418
+gUnknown_081A4418:: @ 81A4418
RecordCorner_EventScript_1A4418:: @ 81A4418
setvar 0x8005, 0
special 27
@@ -712,8 +703,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418
jumpif 5, RecordCorner_EventScript_1A446C
end
- .global gUnknown_081A442D
-gUnknown_081A442D: @ 81A442D
+gUnknown_081A442D:: @ 81A442D
RecordCorner_EventScript_1A442D:: @ 81A442D
setvar 0x8005, 1
special 27
@@ -722,8 +712,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D
jumpif 5, RecordCorner_EventScript_1A446C
end
- .global gUnknown_081A4442
-gUnknown_081A4442: @ 81A4442
+gUnknown_081A4442:: @ 81A4442
RecordCorner_EventScript_1A4442:: @ 81A4442
setvar 0x8005, 2
special 27
@@ -732,8 +721,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442
jumpif 5, RecordCorner_EventScript_1A446C
end
- .global gUnknown_081A4457
-gUnknown_081A4457: @ 81A4457
+gUnknown_081A4457:: @ 81A4457
RecordCorner_EventScript_1A4457:: @ 81A4457
setvar 0x8005, 3
special 27
diff --git a/data/scripts/maps/IslandCave.s b/data/scripts/maps/IslandCave.s
index 19a236d11..b52b13b5a 100644
--- a/data/scripts/maps/IslandCave.s
+++ b/data/scripts/maps/IslandCave.s
@@ -31,8 +31,7 @@ IslandCave_MapScript1_15EF15:: @ 815EF15
setflag 2133
end
- .global gUnknown_0815EF19
-gUnknown_0815EF19: @ 815EF19
+gUnknown_0815EF19:: @ 815EF19
setmaptile 7, 19, 554, 1
setmaptile 8, 19, 555, 1
setmaptile 9, 19, 556, 1
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.s b/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
index cd05edddf..7871940ca 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
@@ -189,8 +189,7 @@ LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30
step_13
step_end
- .global gUnknown_08152C39
-gUnknown_08152C39: @ 8152C39
+gUnknown_08152C39:: @ 8152C39
LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39
lockall