remove address comments

1 files changed, 106 insertions, 106 deletions

diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index f4cd32d8..b91abd43 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -1,4 +1,4 @@
-OaksLabScript: ; 1cb0e (7:4b0e)
+OaksLabScript:
 	CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2
 	call nz, OaksLabScript_1d076
 	ld a, $1
@@ -9,7 +9,7 @@ OaksLabScript: ; 1cb0e (7:4b0e)
 	ld a, [wOaksLabCurScript]
 	jp CallFunctionInTable
 
-OaksLabScriptPointers: ; 1cb28 (7:4b28)
+OaksLabScriptPointers:
 	dw OaksLabScript0
 	dw OaksLabScript1
 	dw OaksLabScript2
@@ -30,7 +30,7 @@ OaksLabScriptPointers: ; 1cb28 (7:4b28)
 	dw OaksLabScript17
 	dw OaksLabScript18
 
-OaksLabScript0: ; 1cb4e (7:4b4e)
+OaksLabScript0:
 	CheckEvent EVENT_OAK_APPEARED_IN_PALLET
 	ret z
 	ld a, [wNPCMovementScriptFunctionNum]
@@ -46,7 +46,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript1: ; 1cb6e (7:4b6e)
+OaksLabScript1:
 	ld a, $8
 	ld [H_SPRITEINDEX], a
 	ld de, OakEntryMovement
@@ -56,13 +56,13 @@ OaksLabScript1: ; 1cb6e (7:4b6e)
 	ld [wOaksLabCurScript], a
 	ret
 
-OakEntryMovement: ; 1cb7e (7:4b7e)
+OakEntryMovement:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db $FF
 
-OaksLabScript2: ; 1cb82 (7:4b82)
+OaksLabScript2:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -77,7 +77,7 @@ OaksLabScript2: ; 1cb82 (7:4b82)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript3: ; 1cba2 (7:4ba2)
+OaksLabScript3:
 	call Delay3
 	ld hl, wSimulatedJoypadStatesEnd
 	ld de, PlayerEntryMovementRLE
@@ -100,11 +100,11 @@ OaksLabScript3: ; 1cba2 (7:4ba2)
 	ld [wOaksLabCurScript], a
 	ret
 
-PlayerEntryMovementRLE: ; 1cbcf (7:4bcf)
+PlayerEntryMovementRLE:
 	db D_UP,$8
 	db $ff
 
-OaksLabScript4: ; 1cbd2 (7:4bd2)
+OaksLabScript4:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -124,7 +124,7 @@ OaksLabScript4: ; 1cbd2 (7:4bd2)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript5: ; 1cbfd (7:4bfd)
+OaksLabScript5:
 	ld a, $fc
 	ld [wJoyIgnore], a
 	ld a, $11
@@ -150,7 +150,7 @@ OaksLabScript5: ; 1cbfd (7:4bfd)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript6: ; 1cc36 (7:4c36)
+OaksLabScript6:
 	ld a, [wYCoord]
 	cp $6
 	ret nz
@@ -180,7 +180,7 @@ OaksLabScript6: ; 1cc36 (7:4c36)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript7: ; 1cc72 (7:4c72)
+OaksLabScript7:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -190,7 +190,7 @@ OaksLabScript7: ; 1cc72 (7:4c72)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript8: ; 1cc80 (7:4c80)
+OaksLabScript8:
 	ld a, [wPlayerStarter]
 	cp STARTER1
 	jr z, .Charmander
@@ -288,7 +288,7 @@ OaksLabScript8: ; 1cc80 (7:4c80)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript9: ; 1cd00 (7:4d00)
+OaksLabScript9:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -339,7 +339,7 @@ OaksLabScript9: ; 1cd00 (7:4d00)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript10: ; 1cd6d (7:4d6d)
+OaksLabScript10:
 	ld a, [wYCoord]
 	cp $6
 	ret nz
@@ -375,7 +375,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript11: ; 1cdb9 (7:4db9)
+OaksLabScript11:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -414,7 +414,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript12: ; 1ce03 (7:4e03)
+OaksLabScript12:
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld a, PLAYER_DIR_UP
@@ -435,7 +435,7 @@ OaksLabScript12: ; 1ce03 (7:4e03)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript13: ; 1ce32 (7:4e32)
+OaksLabScript13:
 	ld c, 20
 	call DelayFrames
 	ld a, $10
@@ -470,7 +470,7 @@ OaksLabScript13: ; 1ce32 (7:4e32)
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-OaksLabScript14: ; 1ce6d (7:4e6d)
+OaksLabScript14:
 	ld a, [wd730]
 	bit 0, a
 	jr nz, .asm_1ce8c
@@ -506,7 +506,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d)
 .done
 	ret
 
-OaksLabScript15: ; 1ceb0 (7:4eb0)
+OaksLabScript15:
 	xor a
 	ld [hJoyHeld], a
 	call EnableAutoTextBoxDrawing
@@ -538,7 +538,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript_1cefd: ; 1cefd (7:4efd)
+OaksLabScript_1cefd:
 	ld a, $1
 	ld [H_SPRITEINDEX], a
 	ld a, SPRITE_FACING_UP
@@ -550,7 +550,7 @@ OaksLabScript_1cefd: ; 1cefd (7:4efd)
 	ld [hSpriteFacingDirection], a
 	jp SetSpriteFacingDirectionAndDelay
 
-OaksLabScript16: ; 1cf12 (7:4f12)
+OaksLabScript16:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -624,7 +624,7 @@ OaksLabScript16: ; 1cf12 (7:4f12)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript17: ; 1cfd4 (7:4fd4)
+OaksLabScript17:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -647,10 +647,10 @@ OaksLabScript17: ; 1cfd4 (7:4fd4)
 	ld [wOaksLabCurScript], a
 	ret
 
-OaksLabScript18: ; 1d009 (7:5009)
+OaksLabScript18:
 	ret
 
-OaksLabScript_RemoveParcel: ; 1d00a (7:500a)
+OaksLabScript_RemoveParcel:
 	ld hl, wBagItems
 	ld bc, $0000
 .loop
@@ -670,7 +670,7 @@ OaksLabScript_RemoveParcel: ; 1d00a (7:500a)
 	ld [wItemQuantity], a
 	jp RemoveItemFromInventory
 
-OaksLabScript_1d02b: ; 1d02b (7:502b)
+OaksLabScript_1d02b:
 	ld a, $7c
 	ld [$ffeb], a
 	ld a, $8
@@ -711,7 +711,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
 	call SetSpritePosition1
 	ret
 
-OaksLabScript_1d076: ; 1d076 (7:5076)
+OaksLabScript_1d076:
 	ld hl, OaksLabTextPointers + $36 ; starts at OaksLabText28
 	ld a, l
 	ld [wMapTextPtr], a
@@ -719,7 +719,7 @@ OaksLabScript_1d076: ; 1d076 (7:5076)
 	ld [wMapTextPtr+1], a
 	ret
 
-OaksLabTextPointers: ; 1d082 (7:5082)
+OaksLabTextPointers:
 	dw OaksLabText1
 	dw OaksLabText2
 	dw OaksLabText3
@@ -759,8 +759,8 @@ OaksLabTextPointers: ; 1d082 (7:5082)
 	dw OaksLabText37
 	dw OaksLabText38
 
-OaksLabText28: ; 1d0ce (7:50ce)
-OaksLabText1: ; 1d0ce (7:50ce)
+OaksLabText28:
+OaksLabText1:
 	TX_ASM
 	CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2
 	jr nz, .asm_1d0de
@@ -779,20 +779,20 @@ OaksLabText1: ; 1d0ce (7:50ce)
 .asm_1d0f0
 	jp TextScriptEnd
 
-OaksLabGaryText1: ; 1d0f3 (7:50f3)
+OaksLabGaryText1:
 	TX_FAR _OaksLabGaryText1
 	db "@"
 
-OaksLabText40: ; 1d0f8 (7:50f8)
+OaksLabText40:
 	TX_FAR _OaksLabText40
 	db "@"
 
-OaksLabText41: ; 1d0fd (7:50fd)
+OaksLabText41:
 	TX_FAR _OaksLabText41
 	db "@"
 
-OaksLabText29: ; 1d102 (7:5102)
-OaksLabText2: ; 1d102 (7:5102)
+OaksLabText29:
+OaksLabText2:
 	TX_ASM
 	ld a, STARTER2
 	ld [wRivalStarterTemp], a
@@ -802,8 +802,8 @@ OaksLabText2: ; 1d102 (7:5102)
 	ld b, $2
 	jr OaksLabScript_1d133
 
-OaksLabText30: ; 1d113 (7:5113)
-OaksLabText3: ; 1d113 (7:5113)
+OaksLabText30:
+OaksLabText3:
 	TX_ASM
 	ld a, STARTER3
 	ld [wRivalStarterTemp], a
@@ -813,8 +813,8 @@ OaksLabText3: ; 1d113 (7:5113)
 	ld b, $3
 	jr OaksLabScript_1d133
 
-OaksLabText31: ; 1d124 (7:5124)
-OaksLabText4: ; 1d124 (7:5124)
+OaksLabText31:
+OaksLabText4:
 	TX_ASM
 	ld a, STARTER1
 	ld [wRivalStarterTemp], a
@@ -823,7 +823,7 @@ OaksLabText4: ; 1d124 (7:5124)
 	ld a, STARTER3
 	ld b, $4
 
-OaksLabScript_1d133: ; 1d133 (7:5133)
+OaksLabScript_1d133:
 	ld [wcf91], a
 	ld [wd11e], a
 	ld a, b
@@ -836,11 +836,11 @@ OaksLabScript_1d133: ; 1d133 (7:5133)
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText39: ; 1d152 (7:5152)
+OaksLabText39:
 	TX_FAR _OaksLabText39
 	db "@"
 
-OaksLabScript_1d157: ; 1d157 (7:5157)
+OaksLabScript_1d157:
 	ld a, $5
 	ld [H_SPRITEINDEX], a
 	ld a, $9
@@ -868,28 +868,28 @@ OaksLabScript_1d157: ; 1d157 (7:5157)
 	jr z, OaksLabLookAtSquirtle
 	jr OaksLabLookAtBulbasaur
 
-OaksLabLookAtCharmander: ; 1d195 (7:5195)
+OaksLabLookAtCharmander:
 	ld hl, OaksLabCharmanderText
 	jr OaksLabMonChoiceMenu
-OaksLabCharmanderText: ; 1d19a (7:519a)
+OaksLabCharmanderText:
 	TX_FAR _OaksLabCharmanderText
 	db "@"
 
-OaksLabLookAtSquirtle: ; 1d19f (7:519f)
+OaksLabLookAtSquirtle:
 	ld hl, OaksLabSquirtleText
 	jr OaksLabMonChoiceMenu
-OaksLabSquirtleText: ; 1d1a4 (7:51a4)
+OaksLabSquirtleText:
 	TX_FAR _OaksLabSquirtleText
 	db "@"
 
-OaksLabLookAtBulbasaur: ; 1d1a9 (7:51a9)
+OaksLabLookAtBulbasaur:
 	ld hl, OaksLabBulbasaurText
 	jr OaksLabMonChoiceMenu
-OaksLabBulbasaurText: ; 1d1ae (7:51ae)
+OaksLabBulbasaurText:
 	TX_FAR _OaksLabBulbasaurText
 	db "@"
 
-OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
+OaksLabMonChoiceMenu:
 	call PrintText
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -935,19 +935,19 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
 	ld [wJoyIgnore], a
 	ld a, $8
 	ld [wOaksLabCurScript], a
-OaksLabMonChoiceEnd: ; 1d21f (7:521f)
+OaksLabMonChoiceEnd:
 	jp TextScriptEnd
 
-OaksLabMonEnergeticText: ; 1d222 (7:5222)
+OaksLabMonEnergeticText:
 	TX_FAR _OaksLabMonEnergeticText
 	db "@"
 
-OaksLabReceivedMonText: ; 1d227 (7:5227)
+OaksLabReceivedMonText:
 	TX_FAR _OaksLabReceivedMonText
 	TX_SFX_KEY_ITEM
 	db "@"
 
-OaksLabScript_1d22d: ; 1d22d (7:522d)
+OaksLabScript_1d22d:
 	ld a, $5
 	ld [H_SPRITEINDEX], a
 	ld a, $9
@@ -958,12 +958,12 @@ OaksLabScript_1d22d: ; 1d22d (7:522d)
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabLastMonText: ; 1d243 (7:5243)
+OaksLabLastMonText:
 	TX_FAR _OaksLabLastMonText
 	db "@"
 
-OaksLabText32: ; 1d248 (7:5248)
-OaksLabText5: ; 1d248 (7:5248)
+OaksLabText32:
+OaksLabText5:
 	TX_ASM
 	CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS
 	jr nz, .asm_1d266
@@ -1034,208 +1034,208 @@ OaksLabText5: ; 1d248 (7:5248)
 .asm_1d2ed
 	jp TextScriptEnd
 
-OaksLabText_1d2f0: ; 1d2f0 (7:52f0)
+OaksLabText_1d2f0:
 	TX_FAR _OaksLabText_1d2f0
 	db "@"
 
-OaksLabText_1d2f5: ; 1d2f5 (7:52f5)
+OaksLabText_1d2f5:
 	TX_FAR _OaksLabText_1d2f5
 	db "@"
 
-OaksLabText_1d2fa: ; 1d2fa (7:52fa)
+OaksLabText_1d2fa:
 	TX_FAR _OaksLabText_1d2fa
 	db "@"
 
-OaksLabDeliverParcelText: ; 1d2ff (7:52ff)
+OaksLabDeliverParcelText:
 	TX_FAR _OaksLabDeliverParcelText1
 	TX_SFX_KEY_ITEM
 	TX_FAR _OaksLabDeliverParcelText2
 	db "@"
 
-OaksLabAroundWorldText: ; 1d309 (7:5309)
+OaksLabAroundWorldText:
 	TX_FAR _OaksLabAroundWorldText
 	db "@"
 
-OaksLabGivePokeballsText: ; 1d30e (7:530e)
+OaksLabGivePokeballsText:
 	TX_FAR _OaksLabGivePokeballsText1
 	TX_SFX_KEY_ITEM
 	TX_FAR _OaksLabGivePokeballsText2
 	db "@"
 
-OaksLabPleaseVisitText: ; 1d318 (7:5318)
+OaksLabPleaseVisitText:
 	TX_FAR _OaksLabPleaseVisitText
 	db "@"
 
-OaksLabText_1d31d: ; 1d31d (7:531d)
+OaksLabText_1d31d:
 	TX_FAR _OaksLabText_1d31d
 	db "@"
 
-OaksLabText34: ; 1d322 (7:5322)
-OaksLabText33: ; 1d322 (7:5322)
-OaksLabText7: ; 1d322 (7:5322)
-OaksLabText6: ; 1d322 (7:5322)
+OaksLabText34:
+OaksLabText33:
+OaksLabText7:
+OaksLabText6:
 	TX_ASM
 	ld hl, OaksLabText_1d32c
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText_1d32c: ; 1d32c (7:532c)
+OaksLabText_1d32c:
 	TX_FAR _OaksLabText_1d32c
 	db "@"
 
-OaksLabText35: ; 1d331 (7:5331)
-OaksLabText8: ; 1d331 (7:5331)
+OaksLabText35:
+OaksLabText8:
 	TX_FAR _OaksLabText8
 	db "@"
 
-OaksLabText36: ; 1d336 (7:5336)
-OaksLabText9: ; 1d336 (7:5336)
+OaksLabText36:
+OaksLabText9:
 	TX_ASM
 	ld hl, OaksLabText_1d340
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText_1d340: ; 1d340 (7:5340)
+OaksLabText_1d340:
 	TX_FAR _OaksLabText_1d340
 	db "@"
 
-OaksLabText17: ; 1d345 (7:5345)
+OaksLabText17:
 	TX_ASM
 	ld hl, OaksLabRivalWaitingText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalWaitingText: ; 1d34f (7:534f)
+OaksLabRivalWaitingText:
 	TX_FAR _OaksLabRivalWaitingText
 	db "@"
 
-OaksLabText18: ; 1d354 (7:5354)
+OaksLabText18:
 	TX_ASM
 	ld hl, OaksLabChooseMonText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabChooseMonText: ; 1d35e (7:535e)
+OaksLabChooseMonText:
 	TX_FAR _OaksLabChooseMonText
 	db "@"
 
-OaksLabText19: ; 1d363 (7:5363)
+OaksLabText19:
 	TX_ASM
 	ld hl, OaksLabRivalInterjectionText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalInterjectionText: ; 1d36d (7:536d)
+OaksLabRivalInterjectionText:
 	TX_FAR _OaksLabRivalInterjectionText
 	db "@"
 
-OaksLabText20: ; 1d372 (7:5372)
+OaksLabText20:
 	TX_ASM
 	ld hl, OaksLabBePatientText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabBePatientText: ; 1d37c (7:537c)
+OaksLabBePatientText:
 	TX_FAR _OaksLabBePatientText
 	db "@"
 
-OaksLabText12: ; 1d381 (7:5381)
+OaksLabText12:
 	TX_ASM
 	ld hl, OaksLabLeavingText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabLeavingText: ; 1d38b (7:538b)
+OaksLabLeavingText:
 	TX_FAR _OaksLabLeavingText
 	db "@"
 
-OaksLabText13: ; 1d390 (7:5390)
+OaksLabText13:
 	TX_ASM
 	ld hl, OaksLabRivalPickingMonText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalPickingMonText: ; 1d39a (7:539a)
+OaksLabRivalPickingMonText:
 	TX_FAR _OaksLabRivalPickingMonText
 	db "@"
 
-OaksLabText14: ; 1d39f (7:539f)
+OaksLabText14:
 	TX_ASM
 	ld hl, OaksLabRivalReceivedMonText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalReceivedMonText: ; 1d3a9 (7:53a9)
+OaksLabRivalReceivedMonText:
 	TX_FAR _OaksLabRivalReceivedMonText
 	TX_SFX_KEY_ITEM
 	db "@"
 
-OaksLabText15: ; 1d3af (7:53af)
+OaksLabText15:
 	TX_ASM
 	ld hl, OaksLabRivalChallengeText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalChallengeText: ; 1d3b9 (7:53b9)
+OaksLabRivalChallengeText:
 	TX_FAR _OaksLabRivalChallengeText
 	db "@"
 
-OaksLabText_1d3be: ; 1d3be (7:53be)
+OaksLabText_1d3be:
 	TX_FAR _OaksLabText_1d3be
 	db "@"
 
-OaksLabText_1d3c3: ; 1d3c3 (7:53c3)
+OaksLabText_1d3c3:
 	TX_FAR _OaksLabText_1d3c3
 	db "@"
 
-OaksLabText16: ; 1d3c8 (7:53c8)
+OaksLabText16:
 	TX_ASM
 	ld hl, OaksLabRivalToughenUpText
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalToughenUpText: ; 1d3d2 (7:53d2)
+OaksLabRivalToughenUpText:
 	TX_FAR _OaksLabRivalToughenUpText
 	db "@"
 
-OaksLabText21: ; 1d3d7 (7:53d7)
+OaksLabText21:
 	TX_FAR _OaksLabText21
 	db "@"
 
-OaksLabText22: ; 1d3dc (7:53dc)
+OaksLabText22:
 	TX_FAR _OaksLabText22
 	db "@"
 
-OaksLabText23: ; 1d3e1 (7:53e1)
+OaksLabText23:
 	TX_FAR _OaksLabText23
 	db "@"
 
-OaksLabText24: ; 1d3e6 (7:53e6)
+OaksLabText24:
 	TX_FAR _OaksLabText24
 	db "@"
 
-OaksLabText25: ; 1d3eb (7:53eb)
+OaksLabText25:
 	TX_FAR _OaksLabText25
 	TX_SFX_KEY_ITEM
 	db "@"
 
-OaksLabText26: ; 1d3f1 (7:53f1)
+OaksLabText26:
 	TX_FAR _OaksLabText26
 	db "@"
 
-OaksLabText27: ; 1d3f6 (7:53f6)
+OaksLabText27:
 	TX_FAR _OaksLabText27
 	db "@"
 
-OaksLabText38: ; 1d3fb (7:53fb)
-OaksLabText37: ; 1d3fb (7:53fb)
-OaksLabText11: ; 1d3fb (7:53fb)
-OaksLabText10: ; 1d3fb (7:53fb)
+OaksLabText38:
+OaksLabText37:
+OaksLabText11:
+OaksLabText10:
 	TX_ASM
 	ld hl, OaksLabText_1d405
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText_1d405: ; 1d405 (7:5405)
+OaksLabText_1d405:
 	TX_FAR _OaksLabText_1d405
 	db "@"