Merge pull request #228 from yenatch/nuke-globals

Nuke globals.asm

8 files changed, 24 insertions, 24 deletions

diff --git a/engine/color.asm b/engine/color.asm
index 5a050e7f2..b26954923 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -865,7 +865,7 @@ Function9853: ; 9853
 ; 9890
 
 
-Function9890: ; 9890
+Function9890:: ; 9890
 	call CheckCGB
 	ret z
 	ld a, $1
diff --git a/engine/credits.asm b/engine/credits.asm
index 677e1639b..fabd409da 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -114,7 +114,7 @@ const_value SET -7
 	const CREDITS_END
 
 
-Function109847: ; 109847
+Function109847:: ; 109847
 	bit 6, b
 	ld a, $0
 	jr z, .asm_10984f
diff --git a/engine/events.asm b/engine/events.asm
index 9e4c1e98a..a26982499 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -3,7 +3,7 @@ INCLUDE "includes.asm"
 
 SECTION "Events", ROMX, BANK[EVENTS]
 
-OverworldLoop: ; 966b0
+OverworldLoop:: ; 966b0
 	xor a
 	ld [MapStatus], a
 .loop
@@ -30,7 +30,7 @@ Function966cb: ; 966cb
 	ret
 ; 966d0
 
-Function966d0: ; 966d0
+Function966d0:: ; 966d0
 	ld a, $ff
 	ld [ScriptFlags3], a
 	ret
@@ -419,7 +419,7 @@ CheckTileEvent: ; 96874
 ; 968c7
 
 
-Function968c7: ; 968c7
+Function968c7:: ; 968c7
 	ld hl, $d452
 	ld a, [hl]
 	and a
diff --git a/engine/events_2.asm b/engine/events_2.asm
index 682fd8237..68f5027ab 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -5,14 +5,14 @@ INCLUDE "includes.asm"
 
 SECTION "Events 2", ROMX, BANK[EVENTS]
 
-Function97c28: ; 97c28
+Function97c28:: ; 97c28
 	ld hl, StatusFlags2
 	res 1, [hl]
 	res 2, [hl]
 	ret
 ; 97c30
 
-Function97c30: ; 97c30
+Function97c30:: ; 97c30
 	ld a, [$d45c]
 	and a
 	ret z
@@ -32,7 +32,7 @@ Function97c30: ; 97c30
 	ret
 ; 97c4f
 
-Function97c4f: ; 97c4f
+Function97c4f:: ; 97c4f
 	ld hl, $d45c
 	ld a, [hl]
 	and a
@@ -48,7 +48,7 @@ Function97c4f: ; 97c4f
 	ret
 ; 97c5f
 
-Function97c5f: ; 97c5f
+Function97c5f:: ; 97c5f
 	call GetFacingTileCoord
 	ld [EngineBuffer1], a
 	ld c, a
@@ -99,7 +99,7 @@ Function97c5f: ; 97c5f
 ; 97cc0
 
 
-Function97cc0: ; 97cc0
+Function97cc0:: ; 97cc0
 ; Rock Smash encounter
 
 	call Function968c7
@@ -146,7 +146,7 @@ RockSmashBattleScript: ; 97cf9
 	end
 ; 97cfd
 
-Function97cfd: ; 97cfd
+Function97cfd:: ; 97cfd
 	ld hl, StatusFlags
 	bit 5, [hl]
 	jr nz, .asm_97d21
@@ -178,7 +178,7 @@ Function97d23: ; 97d23
 	ret
 ; 97d31
 
-Function97d31: ; 97d31
+Function97d31:: ; 97d31
 ; Pick a random mon out of ContestMons.
 
 .asm_97d31
@@ -266,7 +266,7 @@ ContestMons: ; 97d87
 	db -1, VENOMOTH,   30, 40
 ; 97db3
 
-Function97db3: ; 97db3
+Function97db3:: ; 97db3
 	nop
 	nop
 	; fallthrough
@@ -319,7 +319,7 @@ Function97db5: ; 97db5
 	ret
 ; 97df9
 
-Function97df9: ; 97df9
+Function97df9:: ; 97df9
 	ld hl, $d6de
 	ld de, $0006
 	ld c, $4
@@ -332,7 +332,7 @@ Function97df9: ; 97df9
 	ret
 ; 97e08
 
-Function97e08: ; 97e08
+Function97e08:: ; 97e08
 	ld hl, $d6de
 	xor a
 .asm_97e0c
@@ -365,7 +365,7 @@ Function97e25: ; 97e25
 	ret
 ; 97e31
 
-Function97e31: ; 97e31
+Function97e31:: ; 97e31
 	push bc
 	push de
 	call Function97e45
@@ -403,7 +403,7 @@ Function97e45: ; 97e45
 	ret
 ; 97e5c
 
-Function97e5c: ; 97e5c
+Function97e5c:: ; 97e5c
 	ld hl, $d6de
 	ld de, $0006
 	ld c, $4
diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm
index 50653823b..202f077e6 100644
--- a/engine/fruit_trees.asm
+++ b/engine/fruit_trees.asm
@@ -1,4 +1,4 @@
-FruitTreeScript: ; 44000
+FruitTreeScript:: ; 44000
 	3callasm GetCurTreeFruit
 	loadfont
 	copybytetovar CurFruit
diff --git a/engine/landmarks.asm b/engine/landmarks.asm
index a6ea6be68..1d050da77 100644
--- a/engine/landmarks.asm
+++ b/engine/landmarks.asm
@@ -15,7 +15,7 @@ GetLandmarkCoords: ; 0x1ca896
 ; 0x1ca8a5
 
 
-GetLandmarkName: ; 0x1ca8a5
+GetLandmarkName:: ; 0x1ca8a5
 ; Copy the name of landmark e to StringBuffer1.
 	push hl
 	push de
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 58648514b..5f1612677 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -1,7 +1,7 @@
 ; Event scripting commands.
 
 
-Function96c56: ; 96c56
+Function96c56:: ; 96c56
 	push af
 	ld a, 1
 	ld [ScriptMode], a
@@ -10,7 +10,7 @@ Function96c56: ; 96c56
 ; 96c5e
 
 
-ScriptEvents: ; 96c5e
+ScriptEvents:: ; 96c5e
 	call StartScript
 .loop
 	ld a, [ScriptMode]
@@ -1658,7 +1658,7 @@ ScriptCall: ; 0x974cb
 	ret
 ; 0x974f3
 
-Unknown_0x974f3: ; 0x974f3
+Unknown_0x974f3:: ; 0x974f3
 	ld a, [ScriptBank]
 	or $80
 	ld [ScriptBank], a
@@ -2952,7 +2952,7 @@ Script_changeblock: ; 0x97acc
 	ret
 ; 0x97ae3
 
-Script_reloadmappart: ; 0x97ae3
+Script_reloadmappart:: ; 0x97ae3
 ; script command 0x7c
 
 	xor a
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm
index 95283ad19..1cd74c4c2 100644
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -1,4 +1,4 @@
-StdScripts: ; bc000
+StdScripts:: ; bc000
 	dbw BANK(PokeCenterNurseScript), PokeCenterNurseScript
 	dbw BANK(UnknownScript_0xbc162), UnknownScript_0xbc162
 	dbw BANK(UnknownScript_0xbc166), UnknownScript_0xbc166