Remove the last address comments

except for wram.asm and sram.asm
also delete unused yellow file

6 files changed, 16 insertions, 271 deletions

diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm
index 060d5b16..2b72ef97 100755
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@@ -80,10 +80,10 @@ DaisyUseMapText:
 	TX_FAR _DaisyUseMapText
 	db "@"
 
-BluesHouseText2: ; 0x19bc4 Daisy, walking around
+BluesHouseText2: ; Daisy, walking around
 	TX_FAR _BluesHouseText2
 	db "@"
 
-BluesHouseText3: ; 0x19bc9 map on table
+BluesHouseText3: ; map on table
 	TX_FAR _BluesHouseText3
 	db "@"
diff --git a/scripts/fuchsiahouse3.asm b/scripts/fuchsiahouse3.asm
index 9e2c6d4b..fe1da024 100755
--- a/scripts/fuchsiahouse3.asm
+++ b/scripts/fuchsiahouse3.asm
@@ -52,7 +52,7 @@ FuchsiaHouse3Text_561c2:
 	db $0B
 	db "@"
 
-UnusedText_561c8: ; 561c8
+UnusedText_561c8:
 	para "つり こそ"
 	line "おとこの ロマン だ!"
 
diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm
index 50cfb970..a06dfd54 100755
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@@ -189,26 +189,26 @@ OakWalksUpText:
 	TX_FAR _OakWalksUpText
 	db "@"
 
-PalletTownText2: ; 0x18fd3 girl
+PalletTownText2: ; girl
 	TX_FAR _PalletTownText2
 	db "@"
 
-PalletTownText3: ; 0x18fd8 fat man
+PalletTownText3: ; fat man
 	TX_FAR _PalletTownText3
 	db "@"
 
-PalletTownText4: ; 0x18fdd sign by lab
+PalletTownText4: ; sign by lab
 	TX_FAR _PalletTownText4
 	db "@"
 
-PalletTownText5: ; 0x18fe2 sign by fence
+PalletTownText5: ; sign by fence
 	TX_FAR _PalletTownText5
 	db "@"
 
-PalletTownText6: ; 0x18fe7 sign by Red’s house
+PalletTownText6: ; sign by Red’s house
 	TX_FAR _PalletTownText6
 	db "@"
 
-PalletTownText7: ; 0x18fec sign by Blue’s house
+PalletTownText7: ; sign by Blue’s house
 	TX_FAR _PalletTownText7
 	db "@"
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm
index 15c79b4d..348534b4 100755
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -142,7 +142,7 @@ CoordsData_60de3:
 	db $07,$0C
 	dw MovementData_60e22
 
-MovementData_60e13: ; 60e13
+MovementData_60e13:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -152,7 +152,7 @@ MovementData_60e13: ; 60e13
 	db NPC_MOVEMENT_LEFT
 	db $FF
 
-MovementData_60e1b: ; 60e1b
+MovementData_60e1b:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
@@ -161,7 +161,7 @@ MovementData_60e1b: ; 60e1b
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-MovementData_60e22: ; 60e22
+MovementData_60e22:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -169,7 +169,7 @@ MovementData_60e22: ; 60e22
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-MovementData_60e28: ; 60e28
+MovementData_60e28:
 	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -179,7 +179,7 @@ MovementData_60e28: ; 60e28
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-MovementData_60e30: ; 60e30
+MovementData_60e30:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -188,7 +188,7 @@ MovementData_60e30: ; 60e30
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-MovementData_60e37: ; 60e37
+MovementData_60e37:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm
index 92f37970..cbfb35c8 100755
--- a/scripts/redshouse1f.asm
+++ b/scripts/redshouse1f.asm
@@ -49,7 +49,7 @@ MomHealText2:
 	TX_FAR _MomHealText2
 	db "@"
 
-RedsHouse1FText2: ; 0x481c6 TV
+RedsHouse1FText2: ; TV
 	TX_ASM
 	ld a,[wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
diff --git a/scripts/safarizoneentrance-yellow.asm b/scripts/safarizoneentrance-yellow.asm
deleted file mode 100644
index da9a068e..00000000
--- a/scripts/safarizoneentrance-yellow.asm
+++ /dev/null
@@ -1,255 +0,0 @@
-.xf1f77
-	ld hl,.ForJust500Text
-	call PrintText
-	ld a,MONEY_BOX
-	ld [wTextBoxID],a
-	call DisplayTextBoxID
-	call YesNoChoice
-	ld a,[wCurrentMenuItem]
-	and a
-	jp nz,.PleaseComeAgain
-	ld hl,$d346 ; yellow d346
-	ld a,[hli]
-	or [hl]
-	inc hl
-	or [hl]
-	jr nz,.xf1f9f
-.xf1f98
-	call .xf20ce
-	jr c,.CantPayWalkDown
-	jr .xf1ff2
-
-.xf1f9f
-	xor a
-	ld [hMoney],a
-	ld a,$05
-	ld [hMoney + 1],a
-	ld a,$00
-	ld [hMoney + 2],a
-	call HasEnoughMoney
-	jr nc,.success
-	ld hl,.NotEnoughMoneyText
-	call PrintText
-	call .xf2077
-	jr c,.CantPayWalkDown
-	jr .xf1ff2
-
-.success
-	xor a
-	ld [wPriceTemp],a
-	ld a,$05
-	ld [wPriceTemp + 1],a
-	ld a,$00
-	ld [wPriceTemp + 2],a
-	ld hl,wPriceTemp + 2
-	ld de,wPlayerMoney + 2
-	ld c,3
-	predef SubBCDPredef
-	ld a,$b2
-	call $3736
-	call $373e
-	ld a,MONEY_BOX
-	ld [wTextBoxID],a
-	call DisplayTextBoxID
-	ld hl,.MakePaymentText
-	call PrintText
-	ld a,30
-	lb hl, (502 / $100),  (502 % $100)
-.xf1ff2
-	ld [wNumSafariBalls],a
-	ld a,h
-	ld [wSafariSteps],a
-	ld a,l
-	ld [wSafariSteps + 1],a
-	ld a,D_UP
-	ld c,3
-	call SafariZoneEntranceAutoWalk
-	SetEvent EVENT_IN_SAFARI_ZONE
-	ResetEventReuseHL EVENT_SAFARI_GAME_OVER
-	ld a,3
-	ld [wSafariZoneEntranceCurScript],a
-	jr .done
-
-.PleaseComeAgain
-	ld hl,.PleaseComeAgainText
-	call PrintText
-.CantPayWalkDown
-	ld a,D_DOWN
-	ld c,1
-	call SafariZoneEntranceAutoWalk
-	ld a,4
-	ld [wSafariZoneEntranceCurScript],a
-.done
-	ret
-
-.ForJust500Text
-	TX_FAR SafariZoneEntranceText_9e6e4
-	db "@"
-
-.MakePaymentText
-	TX_FAR SafariZoneEntranceText_9e747
-	db $b
-	TX_FAR _SafariZoneEntranceText_75360
-	db "@"
-
-.PleaseComeAgainText
-	TX_FAR _SafariZoneEntranceText_75365
-	db "@"
-
-.NotEnoughMoneyText
-	TX_FAR _SafariZoneEntranceText_7536a
-	db "@"
-
-.SafariZoneEntranceText2
-	ld hl,.FirstTimeQuestionText
-	call PrintText
-	call YesNoChoice
-	ld a,[wCurrentMenuItem]
-	and a
-	ld hl,.RegularText
-	jr nz,.Explanation
-	ld hl,.ExplanationText
-.Explanation
-	call PrintText
-	ret
-
-.FirstTimeQuestionText
-	TX_FAR _SafariZoneEntranceText_753e6
-	db "@"
-
-.ExplanationText
-	TX_FAR _SafariZoneEntranceText_753eb
-	db "@"
-
-.RegularText
-	TX_FAR _SafariZoneEntranceText_753f0
-	db "@"
-
-SafariZoneEntranceAutoWalk:
-	push af
-	ld b,0
-	ld a,c
-	ld [wSimulatedJoypadStatesIndex],a
-	ld hl,wSimulatedJoypadStatesEnd
-	pop af
-	call FillMemory
-	jp StartSimulatingJoypadStates
-
-.xf2077
-	ld hl,wPlayerMoney
-	ld de,$ff9f
-	ld bc,3
-	call $b1 ; yellow $00b1
-	xor a
-	ld [$ffa2],a
-	ld [$ffa3],a
-	ld a,$17 ; ¥17 per safari ball
-	ld [$ffa4],a
-	predef DivideBCDPredef3
-	ld a,[$ffa4]
-	call .xf211e
-	pop af
-	ld hl,$d346
-	xor a
-	ld bc,3
-	call FillMemory
-	ld hl,.OhAllRightText
-	call PrintText_NoCreatingTextBox
-	ld a,MONEY_BOX
-	ld a,[$d124]
-	call DisplayTextBoxID
-	ld hl,.CantGive30BallsText
-	call PrintText
-	pop af
-	inc a
-	jr z,.xf20bd
-	cp 29
-	jr c,.xf20bf
-.xf20bd
-	ld a,29
-.xf20bf
-	ld hl,$1f6
-	and a
-	ret
-
-.OhAllRightText
-	TX_FAR _SafariZoneLowCostText1
-	db "@"
-
-.CantGive30BallsText
-	TX_FAR _SafariZoneLowCostText2
-	db "@"
-
-.xf20ce
-	ld hl,$d70c
-	ld a,[hl]
-	push af
-	inc [hl]
-	ld e,a
-	ld d,0
-	ld hl,.lowcosttextpointers
-	add hl,de
-	add hl,de
-	ld a,[hli]
-	ld h,[hl]
-	ld l,a
-	call PrintText
-	pop af
-	cp 3
-	jr z,.next
-	scf
-	ret
-
-.next
-	ld hl,.xf20f6
-	call $3c46
-	ld a,1
-	ld hl,$01f6
-	and a
-	ret
-
-.xf20f6
-	TX_FAR _SafariZoneLowCostText3
-	db $b
-	TX_FAR _SafariZoneLowCostText4
-	db "@"
-
-.lowcosttextpointers
-	dw .xf210a
-	dw .xf210f
-	dw .xf2114
-	dw .xf2119
-	dw .xf2119
-
-.xf210a
-	TX_FAR _SafariZoneLowCostText5
-	db "@"
-
-.xf210f
-	TX_FAR _SafariZoneLowCostText6
-	db "@"
-
-.xf2114
-	TX_FAR _SafariZoneLowCostText7
-	db "@"
-
-.xf2119
-	TX_FAR _SafariZoneLowCostText8
-	db "@"
-
-.xf211e
-	push hl
-	ld c,a
-	and $f
-	ld l,a
-	ld h,0
-	ld a,c
-	and $f0
-	swap a
-	ld bc,$a
-	call $3a74
-	ld a,l
-	pop hl
-	ret
-
-.xf2133