Fix rgbds v0.4.1 warnings

8 files changed, 31 insertions, 31 deletions

diff --git a/src/audio/music1.asm b/src/audio/music1.asm
index 0407f6c..a3a6e9e 100644
--- a/src/audio/music1.asm
+++ b/src/audio/music1.asm
@@ -1150,7 +1150,7 @@ Music1_SetChannelStackPointer: ; f4705 (3d:4705)
 	ld [hl], d
 	ret
 
-Music1_PlayNextNote_pop ; f4710 (3d:4710)
+Music1_PlayNextNote_pop: ; f4710 (3d:4710)
 	pop hl
 	jp Music1_PlayNextNote
 
@@ -1321,7 +1321,7 @@ Func_f480a: ; f480a (3d:480a)
 	ld [de], a
 .asm_f4829
 	ret
-asm_f482a
+asm_f482a:
 	xor a
 	ld [wddef], a
 	ld hl, rNR42
diff --git a/src/audio/music2.asm b/src/audio/music2.asm
index 499aafc..e13389e 100644
--- a/src/audio/music2.asm
+++ b/src/audio/music2.asm
@@ -1321,7 +1321,7 @@ Func_f880a: ; f880a (3e:480a)
 	ld [de], a
 .asm_f8829
 	ret
-asm_f882a
+asm_f882a:
 	xor a
 	ld [wddef], a
 	ld hl, rNR42
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm
index 090ecf0..398f35f 100644
--- a/src/engine/bank01.asm
+++ b/src/engine/bank01.asm
@@ -130,7 +130,7 @@ StartDuel: ; 409f (1:409f)
 ;	fallthrough
 
 ; the loop returns here after every turn switch
-MainDuelLoop ; 40ee (1:40ee)
+MainDuelLoop: ; 40ee (1:40ee)
 	xor a
 	ld [wCurrentDuelMenuItem], a
 	call UpdateSubstatusConditions_StartOfTurn
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index 07e903e..d96d7ff 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -309,7 +309,7 @@ Func_c258: ; c258 (3:4258)
 	ldh a, [hffb0]
 	push af
 	ld a, $2
-asm_c25d
+asm_c25d:
 	ldh [hffb0], a
 	push hl
 	call Func_c268
@@ -847,7 +847,7 @@ Func_c687: ; c687 (3:4687)
 	ld a, [wd339]
 	call Func_c694
 	pop bc
-    ret
+	ret
 
 Func_c694: ; c694 (3:4694)
 	push hl
@@ -1920,7 +1920,7 @@ ScriptCommand_StartBattle: ; cd01 (3:4d01)
 	ld l, LOADED_NPC_ID
 	call GetItemInLoadedNPCIndex
 	ld a, [hl]
-asm_cd2f
+asm_cd2f:
 	ld [wd0c4], a
 	ld [wcc14], a
 	push af
@@ -2103,7 +2103,7 @@ ScriptCommand_MoveWramNPC: ; ce52 (3:4e52)
 
 ; Executes movement on an arbitrary NPC using values in a and on the stack
 ; Changes and fixes Temp NPC using stack values
-ExecuteArbitraryNPCMovementFromStack
+ExecuteArbitraryNPCMovementFromStack:
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	call ExecuteNPCMovement
@@ -2219,21 +2219,21 @@ Func_cf12: ; cf12 (3:4f12)
 	ld a, c
 	call GetCardCountInCollection
 
-asm_cf16
+asm_cf16:
 	or a
 	jr nz, asm_cf1f
 
-asm_cf19
+asm_cf19:
 	call SetScriptControlByteFail
 	jp IncreaseScriptPointerBy4
 
-asm_cf1f
+asm_cf1f:
 	call SetScriptControlBytePass
 	call GetScriptArgs2AfterPointer
 	jr z, asm_cf2a
 	jp SetScriptPointer
 
-asm_cf2a
+asm_cf2a:
 	jp IncreaseScriptPointerBy4
 
 Func_cf2d: ; cf2d (3:4f2d)
@@ -2640,7 +2640,7 @@ Func_d1b3: ; d1b3 (3:51b3)
 
 .asm_d1c3
 	ld hl, $51dc
-asm_d1c6
+asm_d1c6:
 	ld e, a
 	add a
 	add e
@@ -2917,7 +2917,7 @@ ScriptCommand_TryGivePCPack: ; d3c9 (3:53c9)
 	jp IncreaseScriptPointerBy2
 
 ScriptCommand_nop: ; d3d1 (3:53d1)
-    jp IncreaseScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 Func_d3d4: ; d3d4 (3:53d4)
 	ld a, [wd693]
@@ -3037,11 +3037,11 @@ ScriptCommand_JumpIfFlagEqual: ; d484 (3:5484)
 	cp c
 	jr z, ScriptEventPassedTryJump
 
-ScriptEventFailedNoJump ; d48a (3:548a)
+ScriptEventFailedNoJump: ; d48a (3:548a)
 	call SetScriptControlByteFail
 	jp IncreaseScriptPointerBy5
 
-ScriptEventPassedTryJump ; d490 (3:5490)
+ScriptEventPassedTryJump: ; d490 (3:5490)
 	call SetScriptControlBytePass
 	call GetScriptArgs3AfterPointer
 	jr z, .noJumpAddress
@@ -3876,7 +3876,7 @@ ScriptJump_ImakuniCommon: ; dd60 (3:5d60)
 	run_command ScriptCommand_QuitScriptFully
 ; 0xdd78
 
-NPCMovement_dd78 ; dd78 (3:5d78)
+NPCMovement_dd78: ; dd78 (3:5d78)
 	db SOUTH
 	db SOUTH
 	db SOUTH
@@ -5004,7 +5004,7 @@ Script_LostToFirstRonaldFight: ; e8f7 (3:68f7)
 	run_command ScriptCommand_PrintTextString
 	tx Text064e
 
-ScriptJump_FinishedFirstRonaldFight
+ScriptJump_FinishedFirstRonaldFight:
 	run_command ScriptCommand_SetFlagValue
 	db EVENT_FLAG_4C
 	db $02
@@ -5097,7 +5097,7 @@ Script_LostToSecondRonaldFight: ; e955 (3:6955)
 	run_command ScriptCommand_PrintTextString
 	tx Text0653
 
-ScriptJump_FinishedSecondRonaldFight ; e959 (3:6959)
+ScriptJump_FinishedSecondRonaldFight: ; e959 (3:6959)
 	run_command ScriptCommand_SetFlagValue
 	db EVENT_FLAG_4D
 	db $02
@@ -5970,7 +5970,7 @@ Script_f433: ; f433 (3:7433)
 	run_command ScriptCommand_Jump
 	dw WonAtChallengeHall.ows_f4a4
 
-WonAtChallengeHall; f441 (3:7441)
+WonAtChallengeHall: ; f441 (3:7441)
 	start_script
 	run_command ScriptCommand_DoFrames
 	db 20
diff --git a/src/engine/bank05.asm b/src/engine/bank05.asm
index 762d5c8..f7927af 100644
--- a/src/engine/bank05.asm
+++ b/src/engine/bank05.asm
@@ -3979,7 +3979,7 @@ CheckForEvolutionInDeck: ; 16451 (5:6451)
 	ret
 ; 0x16488
 
-Func_16488 ; 16488 (5:6488)
+Func_16488: ; 16488 (5:6488)
 	INCROM $16488, $164a1
 
 ; have AI choose an energy card to play, but do not play it.
@@ -5845,7 +5845,7 @@ HandleNidoranFCallForFamily:
 ; checks for certain card IDs of Fighting color in deck.
 ; if any of them are found, return a score of
 ; $80 + slots available in bench.
-HandleMarowak1CallForFriend
+HandleMarowak1CallForFriend:
 	ld e, GEODUDE
 	ld a, CARD_LOCATION_DECK
 	call CheckIfAnyCardIDinLocation
@@ -7375,5 +7375,5 @@ HandleLegendaryArticunoEnergyScoring: ; 175bd (5:75bd)
 	ret
 ; 0x175c9
 
-Func_175c9 ; 175c9 (5:75c9)
+Func_175c9: ; 175c9 (5:75c9)
 	INCROM $175c9, $18000
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 19f5e1f..574cbb8 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -717,7 +717,7 @@ OpenInPlayAreaScreen_HandleInput: ; 183bb (6:43bb)
 	or a
 	ret
 
-ZeroObjectPositionsAndToggleOAMCopy_Bank6 ; 184bf (6:44bf)
+ZeroObjectPositionsAndToggleOAMCopy_Bank6: ; 184bf (6:44bf)
 	call ZeroObjectPositions
 	ld a, $01
 	ld [wVBlankOAMCopyToggle], a
@@ -1613,14 +1613,14 @@ Func_1a68d: ; 1a68d (6:668d)
 	ld [de], a
 	lb de, $38, $9f
 	call SetupText
-    bank1call InitAndDrawCardListScreenLayout
+	bank1call InitAndDrawCardListScreenLayout
 	ldtx hl, ChooseTheCardYouWishToExamineText
 	ldtx de, Text0196
 	bank1call SetCardListHeaderText
 	ld a, A_BUTTON | START
 	ld [wNoItemSelectionMenuKeys], a
-    bank1call DisplayCardList
-    ret
+	bank1call DisplayCardList
+	ret
 
 CommentedOut_1a6cc: ; 1a6cc (6:66cc)
 	ret
@@ -1975,7 +1975,7 @@ PrintPlayerNameFromInput:
 rept 10
 	textfw3 "_"
 endr
-    done
+	done
 
 ; check if button pressed.
 ; if pressed, set the carry bit on.
@@ -2749,7 +2749,7 @@ LoadHalfWidthTextCursorTile:
 
 .data
 rept TILE_SIZE
-    db $f0
+	db $f0
 endr
 
 ; it's only for naming the deck.
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index b656f90..bacf5e3 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -330,7 +330,7 @@ Func_80274: ; 80274 (20:4274)
 
 Func_80279: ; 80279 (20:4279)
 	call Func_802bb
-asm_8027c
+asm_8027c:
 	push hl
 	push bc
 	push de
diff --git a/src/macros/data.asm b/src/macros/data.asm
index f2a2210..36eed8d 100644
--- a/src/macros/data.asm
+++ b/src/macros/data.asm
@@ -56,7 +56,7 @@ textpointer: MACRO
 	dw ((\1 + ($4000 * (BANK(\1) - 1))) - (TextOffsets + ($4000 * (BANK(TextOffsets) - 1)))) & $ffff
 	db ((\1 + ($4000 * (BANK(\1) - 1))) - (TextOffsets + ($4000 * (BANK(TextOffsets) - 1)))) >> 16
 	const \1_
-GLOBAL \1_
+EXPORT \1_
 ENDM
 
 energy: MACRO