Merge branch 'master' of https://github.com/pret/pokered

2 files changed, 18 insertions, 213 deletions

diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm
deleted file mode 100644
index d6112df7..00000000
--- a/scripts/beach_house.asm
+++ /dev/null
@@ -1,195 +0,0 @@
-BeachHouseScript:
-	call $3c29
-	ret
-
-BeachHouseTextPointers:
-	dw SurfinDudeText
-	dw BeachHousePikachuText
-	dw BeachHouseSign1Text
-	dw BeachHouseSign2Text
-	dw BeachHouseSign3Text
-	dw BeachHouseSign4Text
-
-SurfinDudeText:
-	TX_ASM
-	ld a,[$d471]
-	bit 6,a
-	jr nz,.next
-	ld hl,.SurfinDudeText4
-	call PrintText
-	jr .done
-.next
-	ld hl,$d492
-	bit 0,[hl]
-	set 0,[hl]
-	jr nz,.next2
-	ld hl,.SurfinDudeText1
-	jr .next3
-.next2
-	ld hl,.SurfinDudeText3
-.next3
-	call PrintText
-	call YesNoChoice
-	ld a,[wCurrentMenuItem]
-	and a
-	jr nz,.xf226b
-	ld a,1
-	ld [$cc3c],a
-	ld b,$3e
-	ld hl,$4000
-	call $3e84
-	ld hl,$d492
-	set 1,[hl]
-	jr .done
-.xf226b
-	ld hl,.SurfinDudeText2
-	call PrintText
-.done
-	jp TextScriptEnd
-
-.SurfinDudeText1
-	TX_FAR _SurfinDudeText1
-	db "@"
-.SurfinDudeText2
-	TX_FAR _SurfinDudeText2
-	db "@"
-.SurfinDudeText3
-	TX_FAR _SurfinDudeText3
-	db "@"
-.SurfinDudeText4
-	TX_FAR _SurfinDudeText4
-	db "@"
-
-BeachHousePikachuText:
-	TX_ASM
-	ld hl,.BeachHousePikachuText
-	call PrintText
-	ld a,PIKACHU
-	call PlayCry
-	call WaitForSoundToFinish
-	jp TextScriptEnd
-
-.BeachHousePikachuText
-	TX_FAR _BeachHousePikachuText
-	db "@"
-
-BeachHouseSign1Text:
-	TX_ASM
-	ld hl,.BeachHouseSign1Text2
-	ld a,[$d471]
-	bit 6,a
-	jr z,.next
-	ld hl,.BeachHouseSign1Text1
-.next
-	call PrintText
-	jp TextScriptEnd
-
-.BeachHouseSign1Text1
-	TX_FAR _BeachHouseSign1Text1
-	db "@"
-.BeachHouseSign1Text2
-	TX_FAR _BeachHouseSign1Text2
-	db "@"
-
-BeachHouseSign2Text:
-	TX_ASM
-	ld hl,.BeachHouseSign2Text2
-	ld a,[$d471]
-	bit 6,a
-	jr z,.next
-	ld hl,.BeachHouseSign2Text1
-.next
-	call PrintText
-	jp TextScriptEnd
-
-.BeachHouseSign2Text1
-	TX_FAR _BeachHouseSign2Text1
-	db "@"
-.BeachHouseSign2Text2
-	TX_FAR _BeachHouseSign2Text2
-	db "@"
-
-BeachHouseSign3Text:
-	TX_ASM
-	ld hl,.BeachHouseSign3Text2
-	ld a,[$d471]
-	bit 6,a
-	jr z,.next
-	ld hl,.BeachHouseSign3Text1
-.next
-	call PrintText
-	jp TextScriptEnd
-
-.BeachHouseSign3Text1
-	TX_FAR _BeachHouseSign3Text1
-	db "@"
-.BeachHouseSign3Text2
-	TX_FAR _BeachHouseSign3Text2
-	db "@"
-
-BeachHouseSign4Text:
-	TX_ASM
-	ld a,1
-	ld [$cc3c],a
-	ld a,[$d471]
-	bit 6,a
-	jr z,.xf2369
-
-	ld hl,$d492
-	bit 1,[hl]
-	jr z,.next2
-	ld a,0
-	ld [$cc3c],a
-.next2
-	ld hl,.BeachHousePrinterText2
-	call PrintText
-	ld a,[$d492]
-	bit 1,a
-	jr z,.xf236f
-
-	ld a,1
-	ld [$cc3c],a
-	ld hl,.BeachHousePrinterText3
-	call PrintText
-	call YesNoChoice
-	ld a,[wCurrentMenuItem]
-	and a
-	jp z,$63d0 ; 0xf23d0
-	call $36ec
-	ld hl,$d72f
-	set 6,[hl]
-	xor a
-	ld [$cfca],a
-	ld hl,$510a
-	ld b,$3a
-	call $3e84
-	call $3852
-	ld hl,$d72f
-	res 6,[hl]
-	call $3dd8
-	call $2f83
-	call $3dc2
-	call $36f8
-	call $3ddb
-	call $3de0
-	ld a,1
-	ld [$cfca],a
-	jr .xf236f
-.xf2369
-	ld hl,.BeachHousePrinterText1
-	call PrintText
-.xf236f
-	jp TextScriptEnd
-
-.BeachHousePrinterText1
-	TX_FAR _BeachHousePrinterText1
-	db $d,"@"
-.BeachHousePrinterText2
-	TX_FAR _BeachHousePrinterText2
-	db $d,"@"
-.BeachHousePrinterText3
-	TX_FAR _BeachHousePrinterText3
-	db "@"
-.xf2383
-	TX_FAR _BeachHousePrinterText4
-	db "@"
diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm
index e639caf9..866c04b0 100755
--- a/scripts/bikeshop.asm
+++ b/scripts/bikeshop.asm
@@ -1,12 +1,12 @@
-BikeShopScript: ; 1d73c (7:573c)
+BikeShopScript:
 	jp EnableAutoTextBoxDrawing
 
-BikeShopTextPointers: ; 1d73f (7:573f)
+BikeShopTextPointers:
 	dw BikeShopText1
 	dw BikeShopText2
 	dw BikeShopText3
 
-BikeShopText1: ; 1d745 (7:5745)
+BikeShopText1:
 	TX_ASM
 	CheckEvent EVENT_GOT_BICYCLE
 	jr z, .asm_260d4
@@ -78,56 +78,56 @@ BikeShopText1: ; 1d745 (7:5745)
 .Done
 	jp TextScriptEnd
 
-BikeShopMenuText: ; 1d7f8 (7:57f8)
+BikeShopMenuText:
 	db   "BICYCLE"
 	next "CANCEL@"
 
-BikeShopMenuPrice: ; 1d807 (7:5807)
+BikeShopMenuPrice:
 	db "¥1000000@"
 
-BikeShopText_1d810: ; 1d810 (7:5810)
+BikeShopText_1d810:
 	TX_FAR _BikeShopText_1d810
 	db "@"
 
-BikeShopText_1d815: ; 1d815 (7:5815)
+BikeShopText_1d815:
 	TX_FAR _BikeShopText_1d815
 	db "@"
 
-BikeShopCantAffordText: ; 1d81a (7:581a)
+BikeShopCantAffordText:
 	TX_FAR _BikeShopCantAffordText
 	db "@"
 
-BikeShopText_1d81f: ; 1d81f (7:581f)
+BikeShopText_1d81f:
 	TX_FAR _BikeShopText_1d81f
 	db "@"
 
-BikeShopText_1d824: ; 1d824 (7:5824)
+BikeShopText_1d824:
 	TX_FAR _BikeShopText_1d824
 	db $11, "@"
 
-BikeShopComeAgainText: ; 1d82a (7:582a)
+BikeShopComeAgainText:
 	TX_FAR _BikeShopComeAgainText
 	db "@"
 
-BikeShopText_1d82f: ; 1d82f (7:582f)
+BikeShopText_1d82f:
 	TX_FAR _BikeShopText_1d82f
 	db "@"
 
-BikeShopText_1d834: ; 1d834 (7:5834)
+BikeShopText_1d834:
 	TX_FAR _BikeShopText_1d834
 	db "@"
 
-BikeShopText2: ; 1d839 (7:5839)
+BikeShopText2:
 	TX_ASM
 	ld hl, BikeShopText_1d843
 	call PrintText
 	jp TextScriptEnd
 
-BikeShopText_1d843: ; 1d843 (7:5843)
+BikeShopText_1d843:
 	TX_FAR _BikeShopText_1d843
 	db "@"
 
-BikeShopText3: ; 1d848 (7:5848)
+BikeShopText3:
 	TX_ASM
 	CheckEvent EVENT_GOT_BICYCLE
 	ld hl, BikeShopText_1d861
@@ -137,10 +137,10 @@ BikeShopText3: ; 1d848 (7:5848)
 	call PrintText
 	jp TextScriptEnd
 
-BikeShopText_1d85c: ; 1d85c (7:585c)
+BikeShopText_1d85c:
 	TX_FAR _BikeShopText_1d85c
 	db "@"
 
-BikeShopText_1d861: ; 1d861 (7:5861)
+BikeShopText_1d861:
 	TX_FAR _BikeShopText_1d861
 	db "@"