ref: 9b65ac4a810e19917f0623bfbc6a709b18237163
parent: 5a0c3528939ad00b79e9b8e024e0d9a33b0789da
author: Bryan Bishop <[email protected]>
date: Mon May 21 06:56:28 EDT 2012
replace some more 1-byte incbins
--- a/main.asm
+++ b/main.asm
@@ -88250,58 +88250,49 @@
UnknownScript_0x1a0957: ; 0x1a0957
jumpstd $0019
-; 0x1a095a
+ end
+; 0x1a095b
-INCBIN "baserom.gbc",$1a095a,$01
-
UnknownScript_0x1a095b: ; 0x1a095b
jumpstd $001a
-; 0x1a095e
+ end
+; 0x1a095f
-INCBIN "baserom.gbc",$1a095e,$1a095f - $1a095e
-
UnknownScript_0x1a095f: ; 0x1a095f
jumpstd $001b
-; 0x1a0962
+ end
+; 0x1a0963
-INCBIN "baserom.gbc",$1a0962,$01
-
UnknownScript_0x1a0963: ; 0x1a0963
jumpstd $001c
-; 0x1a0966
+ end
+; 0x1a0967
-INCBIN "baserom.gbc",$1a0966,$1a0967 - $1a0966
-
UnknownScript_0x1a0967: ; 0x1a0967
jumpstd $001d
-; 0x1a096a
+ end
+; 0x1a096b
-INCBIN "baserom.gbc",$1a096a,$01
-
UnknownScript_0x1a096b: ; 0x1a096b
jumpstd $001e
-; 0x1a096e
+ end
+; 0x1a096f
-INCBIN "baserom.gbc",$1a096e,$01
-
UnknownScript_0x1a096f: ; 0x1a096f
jumpstd $001f
-; 0x1a0972
+ end
+; 0x1a0973
-INCBIN "baserom.gbc",$1a0972,$1a0973 - $1a0972
-
UnknownScript_0x1a0973: ; 0x1a0973
jumpstd $0020
-; 0x1a0976
+ end
+; 0x1a0977
-INCBIN "baserom.gbc",$1a0976,$1a0977 - $1a0976
-
UnknownScript_0x1a0977: ; 0x1a0977
jumpstd $0021
-; 0x1a097a
+ end
+; 0x1a097b
-INCBIN "baserom.gbc",$1a097a,$01
-
TrainerCooltrainermBlake: ; 0x1a097b
; bit/flag number
dw $552
@@ -88445,46 +88436,39 @@
UnknownScript_0x1a0a2f: ; 0x1a0a2f
jumpstd $0023
-; 0x1a0a32
+ end
+; 0x1a0a33
-INCBIN "baserom.gbc",$1a0a32,$01
-
UnknownScript_0x1a0a33: ; 0x1a0a33
jumpstd $0024
-; 0x1a0a36
+ end
+; 0x1a0a37
-INCBIN "baserom.gbc",$1a0a36,$1a0a37 - $1a0a36
-
UnknownScript_0x1a0a37: ; 0x1a0a37
jumpstd $0025
-; 0x1a0a3a
+ end
+; 0x1a0a3b
-INCBIN "baserom.gbc",$1a0a3a,$1a0a3b - $1a0a3a
-
UnknownScript_0x1a0a3b: ; 0x1a0a3b
jumpstd $0026
-; 0x1a0a3e
+ end
+; 0x1a0a3f
-INCBIN "baserom.gbc",$1a0a3e,$01
-
UnknownScript_0x1a0a3f: ; 0x1a0a3f
jumpstd $0027
-; 0x1a0a42
+ end
+; 0x1a0a43
-INCBIN "baserom.gbc",$1a0a42,$01
-
UnknownScript_0x1a0a43: ; 0x1a0a43
jumpstd $0028
-; 0x1a0a46
+ end
+; 0x1a0a47
-INCBIN "baserom.gbc",$1a0a46,$01
-
UnknownScript_0x1a0a47: ; 0x1a0a47
jumpstd $0029
-; 0x1a0a4a
+ end
+; 0x1a0a4b
-INCBIN "baserom.gbc",$1a0a4a,$1a0a4b - $1a0a4a
-
TrainerCooltrainerfMegan: ; 0x1a0a4b
; bit/flag number
dw $565
@@ -89301,59 +89285,50 @@
UnknownScript_0x1a1783: ; 0x1a1783
jumpstd $0019
-; 0x1a1786
+ end
+; 0x1a1787
-INCBIN "baserom.gbc",$1a1786,$01
-
UnknownScript_0x1a1787: ; 0x1a1787
jumpstd $001a
-; 0x1a178a
+ end
+; 0x1a178b
-INCBIN "baserom.gbc",$1a178a,$1a178b - $1a178a
-
UnknownScript_0x1a178b: ; 0x1a178b
jumpstd $001b
-; 0x1a178e
+ end
+; 0x1a178f
-INCBIN "baserom.gbc",$1a178e,$01
-
UnknownScript_0x1a178f: ; 0x1a178f
jumpstd $001c
-; 0x1a1792
+ end
+; 0x1a1793
-INCBIN "baserom.gbc",$1a1792,$1a1793 - $1a1792
-
UnknownScript_0x1a1793: ; 0x1a1793
jumpstd $001d
-; 0x1a1796
+ end
+; 0x1a1797
-INCBIN "baserom.gbc",$1a1796,$01
-
UnknownScript_0x1a1797: ; 0x1a1797
jumpstd $001e
-; 0x1a179a
+ end
+; 0x1a179b
-INCBIN "baserom.gbc",$1a179a,$1a179b - $1a179a
-
UnknownScript_0x1a179b: ; 0x1a179b
jumpstd $001f
-; 0x1a179e
+ end
+; 0x1a179f
-INCBIN "baserom.gbc",$1a179e,$1a179f - $1a179e
-
UnknownScript_0x1a179f: ; 0x1a179f
setbit1 $0338
jumpstd $0021
-; 0x1a17a5
+ end
+; 0x1a17a6
-INCBIN "baserom.gbc",$1a17a5,$1a17a6 - $1a17a5
-
UnknownScript_0x1a17a6: ; 0x1a17a6
jumpstd $0022
-; 0x1a17a9
+ end
+; 0x1a17aa
-INCBIN "baserom.gbc",$1a17a9,$1a17aa - $1a17a9
-
TrainerYoungsterMikey: ; 0x1a17aa
; bit/flag number
dw $5aa
@@ -89837,58 +89812,49 @@
UnknownScript_0x1a1e0b: ; 0x1a1e0b
jumpstd $0023
-; 0x1a1e0e
+ end
+; 0x1a1e0f
-INCBIN "baserom.gbc",$1a1e0e,$1a1e0f - $1a1e0e
-
UnknownScript_0x1a1e0f: ; 0x1a1e0f
jumpstd $0024
-; 0x1a1e12
+ end
+; 0x1a1e13
-INCBIN "baserom.gbc",$1a1e12,$01
-
UnknownScript_0x1a1e13: ; 0x1a1e13
jumpstd $0025
-; 0x1a1e16
+ end
+; 0x1a1e17
-INCBIN "baserom.gbc",$1a1e16,$1a1e17 - $1a1e16
-
UnknownScript_0x1a1e17: ; 0x1a1e17
jumpstd $0026
-; 0x1a1e1a
+ end
+; 0x1a1e1b
-INCBIN "baserom.gbc",$1a1e1a,$01
-
UnknownScript_0x1a1e1b: ; 0x1a1e1b
jumpstd $0027
-; 0x1a1e1e
+ end
+; 0x1a1e1f
-INCBIN "baserom.gbc",$1a1e1e,$01
-
UnknownScript_0x1a1e1f: ; 0x1a1e1f
jumpstd $0028
-; 0x1a1e22
+ end
+; 0x1a1e23
-INCBIN "baserom.gbc",$1a1e22,$1a1e23 - $1a1e22
-
UnknownScript_0x1a1e23: ; 0x1a1e23
jumpstd $0029
-; 0x1a1e26
+ end
+; 0x1a1e27
-INCBIN "baserom.gbc",$1a1e26,$01
-
UnknownScript_0x1a1e27: ; 0x1a1e27
jumpstd $002a
-; 0x1a1e2a
+ end
+; 0x1a1e2b
-INCBIN "baserom.gbc",$1a1e2a,$01
-
UnknownScript_0x1a1e2b: ; 0x1a1e2b
jumpstd $002b
-; 0x1a1e2e
+ end
+; 0x1a1e2f
-INCBIN "baserom.gbc",$1a1e2e,$1a1e2f - $1a1e2e
-
TrainerSchoolboyChad1: ; 0x1a1e2f
; bit/flag number
dw $475
@@ -89998,46 +89964,39 @@
UnknownScript_0x1a1ee9: ; 0x1a1ee9
jumpstd $0019
-; 0x1a1eec
+ end
+; 0x1a1eed
-INCBIN "baserom.gbc",$1a1eec,$01
-
UnknownScript_0x1a1eed: ; 0x1a1eed
jumpstd $001a
-; 0x1a1ef0
+ end
+; 0x1a1ef1
-INCBIN "baserom.gbc",$1a1ef0,$1a1ef1 - $1a1ef0
-
UnknownScript_0x1a1ef1: ; 0x1a1ef1
jumpstd $001b
-; 0x1a1ef4
+ end
+; 0x1a1ef5
-INCBIN "baserom.gbc",$1a1ef4,$1a1ef5 - $1a1ef4
-
UnknownScript_0x1a1ef5: ; 0x1a1ef5
jumpstd $001c
-; 0x1a1ef8
+ end
+; 0x1a1ef9
-INCBIN "baserom.gbc",$1a1ef8,$01
-
UnknownScript_0x1a1ef9: ; 0x1a1ef9
jumpstd $001d
-; 0x1a1efc
+ end
+; 0x1a1efd
-INCBIN "baserom.gbc",$1a1efc,$01
-
UnknownScript_0x1a1efd: ; 0x1a1efd
jumpstd $001e
-; 0x1a1f00
+ end
+; 0x1a1f01
-INCBIN "baserom.gbc",$1a1f00,$01
-
UnknownScript_0x1a1f01: ; 0x1a1f01
jumpstd $001f
-; 0x1a1f04
+ end
+; 0x1a1f05
-INCBIN "baserom.gbc",$1a1f04,$1a1f05 - $1a1f04
-
TrainerBeautyValerie: ; 0x1a1f05
; bit/flag number
dw $4bc
@@ -91830,46 +91789,39 @@
UnknownScript_0x1a4dbf: ; 0x1a4dbf
jumpstd $0019
-; 0x1a4dc2
+ end
+; 0x1a4dc3
-INCBIN "baserom.gbc",$1a4dc2,$01
-
UnknownScript_0x1a4dc3: ; 0x1a4dc3
jumpstd $001a
-; 0x1a4dc6
+ end
+; 0x1a4dc7
-INCBIN "baserom.gbc",$1a4dc6,$1a4dc7 - $1a4dc6
-
UnknownScript_0x1a4dc7: ; 0x1a4dc7
jumpstd $001b
-; 0x1a4dca
+ end
+; 0x1a4dcb
-INCBIN "baserom.gbc",$1a4dca,$01
-
UnknownScript_0x1a4dcb: ; 0x1a4dcb
jumpstd $001c
-; 0x1a4dce
+ end
+; 0x1a4dcf
-INCBIN "baserom.gbc",$1a4dce,$01
-
UnknownScript_0x1a4dcf: ; 0x1a4dcf
jumpstd $001d
-; 0x1a4dd2
+ end
+; 0x1a4dd3
-INCBIN "baserom.gbc",$1a4dd2,$01
-
UnknownScript_0x1a4dd3: ; 0x1a4dd3
jumpstd $001e
-; 0x1a4dd6
+ end
+; 0x1a4dd7
-INCBIN "baserom.gbc",$1a4dd6,$01
-
UnknownScript_0x1a4dd7: ; 0x1a4dd7
jumpstd $001f
-; 0x1a4dda
+ end
+; 0x1a4ddb
-INCBIN "baserom.gbc",$1a4dda,$1a4ddb - $1a4dda
-
TrainerCooltrainerfJoyce: ; 0x1a4ddb
; bit/flag number
dw $562
@@ -91984,46 +91936,39 @@
UnknownScript_0x1a4e7b: ; 0x1a4e7b
jumpstd $0023
-; 0x1a4e7e
+ end
+; 0x1a4e7f
-INCBIN "baserom.gbc",$1a4e7e,$1a4e7f - $1a4e7e
-
UnknownScript_0x1a4e7f: ; 0x1a4e7f
jumpstd $0024
-; 0x1a4e82
+ end
+; 0x1a4e83
-INCBIN "baserom.gbc",$1a4e82,$01
-
UnknownScript_0x1a4e83: ; 0x1a4e83
jumpstd $0025
-; 0x1a4e86
+ end
+; 0x1a4e87
-INCBIN "baserom.gbc",$1a4e86,$1a4e87 - $1a4e86
-
UnknownScript_0x1a4e87: ; 0x1a4e87
jumpstd $0026
-; 0x1a4e8a
+ end
+; 0x1a4e8b
-INCBIN "baserom.gbc",$1a4e8a,$01
-
UnknownScript_0x1a4e8b: ; 0x1a4e8b
jumpstd $0027
-; 0x1a4e8e
+ end
+; 0x1a4e8f
-INCBIN "baserom.gbc",$1a4e8e,$01
-
UnknownScript_0x1a4e8f: ; 0x1a4e8f
jumpstd $0028
-; 0x1a4e92
+ end
+; 0x1a4e93
-INCBIN "baserom.gbc",$1a4e92,$01
-
UnknownScript_0x1a4e93: ; 0x1a4e93
jumpstd $0029
-; 0x1a4e96
+ end
+; 0x1a4e97
-INCBIN "baserom.gbc",$1a4e96,$1a4e97 - $1a4e96
-
TrainerPsychicRichard: ; 0x1a4e97
; bit/flag number
dw $442
@@ -92477,57 +92422,48 @@
UnknownScript_0x1a554c: ; 0x1a554c
jumpstd $0019
-; 0x1a554f
+ end
+; 0x1a5550
-INCBIN "baserom.gbc",$1a554f,$1a5550 - $1a554f
-
UnknownScript_0x1a5550: ; 0x1a5550
jumpstd $001a
-; 0x1a5553
+ end
+; 0x1a5554
-INCBIN "baserom.gbc",$1a5553,$01
-
UnknownScript_0x1a5554: ; 0x1a5554
jumpstd $001b
-; 0x1a5557
+ end
+; 0x1a5558
-INCBIN "baserom.gbc",$1a5557,$01
-
UnknownScript_0x1a5558: ; 0x1a5558
jumpstd $001c
-; 0x1a555b
+ end
+; 0x1a555c
-INCBIN "baserom.gbc",$1a555b,$1a555c - $1a555b
-
UnknownScript_0x1a555c: ; 0x1a555c
jumpstd $001d
-; 0x1a555f
+ end
+; 0x1a5560
-INCBIN "baserom.gbc",$1a555f,$1a5560 - $1a555f
-
UnknownScript_0x1a5560: ; 0x1a5560
jumpstd $001e
-; 0x1a5563
+ end
+; 0x1a5564
-INCBIN "baserom.gbc",$1a5563,$01
-
UnknownScript_0x1a5564: ; 0x1a5564
jumpstd $001f
-; 0x1a5567
+ end
+; 0x1a5568
-INCBIN "baserom.gbc",$1a5567,$01
-
UnknownScript_0x1a5568: ; 0x1a5568
jumpstd $0020
-; 0x1a556b
+ end
+; 0x1a556c
-INCBIN "baserom.gbc",$1a556b,$1a556c - $1a556b
-
UnknownScript_0x1a556c: ; 0x1a556c
jumpstd $0021
-; 0x1a556f
-
-INCBIN "baserom.gbc",$1a556f,$1a5570 - $1a556f
+ end
+; 0x1a5570
UnknownScript_0x1a5570: ; 0x1a5570
faceplayer