Merge pull request #283 from yenatch/master

no more baserom

INSTALL.md

@@ -10,8 +10,6 @@
 	git clone --recursive git://github.com/kanzure/pokecrystal.git
 	cd pokecrystal
 
-- Copy a Pokémon Crystal rom into `pokecrystal/`. Name it **baserom.gbc**. Eventually this will not be required.
-
 To build **pokecrystal.gbc**:
 
 	make
@@ -35,8 +33,6 @@ In the shell, run:
 	git clone --recursive git://github.com/kanzure/pokecrystal.git
 	cd pokecrystal
 
-- Copy a Pokémon Crystal rom into `pokecrystal/`. Name it **baserom.gbc**. Eventually this will not be required.
-
 To build **pokecrystal.gbc**:
 
 	make
@@ -56,8 +52,6 @@ In the **Cygwin terminal**:
 	git clone --recursive git://github.com/kanzure/pokecrystal.git
 	cd pokecrystal
 
-- Copy a Pokémon Crystal rom into `C:\cygwin\home\<username>\pokecrystal`. Name it **baserom.gbc**. Eventually this will not be required.
-
 To build:
 
 	make
@@ -91,7 +85,3 @@ ssh"):
 
 	cd /vagrant/pokecrystal
 	make
-
-To make the build work you will need to copy baserom.gbc into the "pokecrystal"
-directory inside the "virtualbox" directory on the host machine. Eventually
-this will not be required.

Makefile

@@ -1,4 +1,5 @@
 PYTHON := python
+MD5 := md5sum -c --quiet
 
 .SUFFIXES:
 .SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .lz .pal .bin .blk .tilemap
@@ -56,9 +57,8 @@ crystal: pokecrystal.gbc
 clean:
 	rm -f $(roms) $(all_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
 
-baserom.gbc: ;
+compare: pokecrystal.gbc pokecrystal11.gbc
-	@echo "Wait! Need baserom.gbc first. Check README and INSTALL for details." && false
+	@$(MD5) roms.md5
-
 
 %.asm: ;
 $(all_obj): $$*.asm $$($$*_dep)
@@ -70,12 +70,10 @@ $(all_obj): $$*.asm $$($$*_dep)
 pokecrystal11.gbc: $(crystal11_obj)
 	rgblink -n $*.sym -m $*.map -o $@ $^
 	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@
-	cmp crystal11.gbc $@
 
 pokecrystal.gbc: $(crystal_obj)
 	rgblink -n $*.sym -m $*.map -o $@ $^
 	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
-	cmp baserom.gbc $@
 
 
 pngs:

README.md

@@ -2,9 +2,10 @@
 
 This is a disassembly of Pokémon Crystal.
 
-The following rom is used as a base:
+It builds the following roms:
 
 * Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `md5: 9f2922b235a5eeb78d65594e82ef5dde`
+* Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `md5: 301899b8087289a6436b0a241fbbb474`
 
 To set up the repository, see [**INSTALL.md**](INSTALL.md).
 

extras

@@ -1 +1 @@
-Subproject commit a87f66964cc602ff5575efebf27c388ef03fa94d
+Subproject commit 46492bd9075313a52622cc585fe7b2ca404cbdcd

lib/mobile/main.asm

@@ -4866,58 +4866,65 @@ Function111f97: ; 111f97 (44:5f97)
 	ds 14
 
 Unknown_112000: ; 112000
-INCBIN "baserom.gbc", $112000, $112001 - $112000
+	db $4b
 
 Unknown_112001: ; 112001
-INCBIN "baserom.gbc", $112001, $112006 - $112001
+	db $99, $66, $10, $00, $00
 
 Unknown_112006: ; 112006
-INCBIN "baserom.gbc", $112006, $112013 - $112006
+	db $08, "NINTENDO", $02, $77, $80, $00
 
 Unknown_112013: ; 112013
-INCBIN "baserom.gbc", $112013, $11201d - $112013
+	db $99, $66, $11, $00, $00, $00, $00, $11, $80, $00
 
 Unknown_11201d: ; 11201d
-INCBIN "baserom.gbc", $11201d, $112023 - $11201d
+	db $99, $66, $12, $00, $00, $00
 
 Unknown_112023: ; 112023
-INCBIN "baserom.gbc", $112023, $11202d - $112023
+	db $99, $66, $13, $00, $00, $00, $00, $13, $80, $00
 
 Unknown_11202d: ; 11202d
-INCBIN "baserom.gbc", $11202d, $112037 - $11202d
+	db $99, $66, $17, $00, $00, $00, $00, $17, $80, $00
 
 Unknown_112037: ; 112037
-INCBIN "baserom.gbc", $112037, $11203c - $112037
+	db $99, $66, $21, $00, $00
 
 Unknown_11203c: ; 11203c
-INCBIN "baserom.gbc", $11203c, $112046 - $11203c
+	db $99, $66, $22, $00, $00, $00, $00, $22, $80, $00
 
 Unknown_112046: ; 112046
-INCBIN "baserom.gbc", $112046, $112052 - $112046
+	db $99, $66, $19, $00, $00, $02, $00, $60, $00, $7b, $80, $00
 
 Unknown_112052: ; 112052
-INCBIN "baserom.gbc", $112052, $11205e - $112052
+	db $99, $66, $19, $00, $00, $02, $60, $60, $00, $db, $80, $00
 
 Unknown_11205e: ; 11205e
-INCBIN "baserom.gbc", $11205e, $112063 - $11205e
+	db $99, $66, $1a, $00, $00
 
 Unknown_112063: ; 112063
-INCBIN "baserom.gbc", $112063, $112068 - $112063
+	db $99, $66, $28, $00, $00
 
 Unknown_112068: ; 112068
-INCBIN "baserom.gbc", $112068, $112072 - $112068
+	db $99, $66, $14, $00, $00, $00, $00, $14, $80, $00
 
 Unknown_112072: ; 112072
-INCBIN "baserom.gbc", $112072, $11207d - $112072
+	db $99, $66, $15, $00, $00, $01, $ff, $01, $15, $80, $00
 
 Unknown_11207d: ; 11207d
-INCBIN "baserom.gbc", $11207d, $112083 - $11207d
+	db $99, $66, $23, $00, $00, $06
 
 Unknown_112083: ; 112083
-INCBIN "baserom.gbc", $112083, $112089 - $112083
+	db $99, $66, $24, $00, $00, $01
 
 Unknown_112089: ; 112089
-INCBIN "baserom.gbc", $112089, $11209e - $112089
+	db $ec, $14, $c9
+	db $e4, $0f, $0e
+	db $e0, $0c, $53
+	db $c4, $07, $94
+	db $b0, $05, $ee
+	db $ec, $10, $b4
+	db $e4, $0c, $dd
+; 11209e
 
 Unknown_11209e:
 	db "HELO ", 0
@@ -8496,14 +8503,14 @@ Function1136c1: ; 1136c1
 
 .asm_113734
 	ld hl, $cc0c
-	ld a, $8e
+	ld a, Unknown_113b8e % $100
 	ld [hli], a
-	ld a, $7b
+	ld a, Unknown_113b8e / $100
 	ld [hl], a
 	ld hl, $cc0e
-	ld a, $70
+	ld a, Unknown_113a70 % $100
 	ld [hli], a
-	ld a, $7a
+	ld a, Unknown_113a70 / $100
 	ld [hl], a
 	ld hl, $cbe7
 	ld de, $cc18
@@ -8586,7 +8593,7 @@ Function1136c1: ; 1136c1
 	ld [$cc0d], a
 	ld a, l
 	ld [$cc0c], a
-	cp $8e
+	cp $8e ; XXX (Unknown_113b8e + $100) % $100 ???
 	jp nz, .asm_113751
 	ld de, $cc18
 	ld hl, $cbe7
@@ -9020,13 +9027,55 @@ Unknown_113a55: ; 113a55
 	db "Authorization: GB00 name=", $22, 0
 ; 113a70
 
-INCBIN "baserom.gbc", $113a70, $113b70 - $113a70
+Unknown_113a70:
+	db $00, $00, $00, $07, $06, $04, $00, $0c, $04, $08, $00, $11, $02, $0c, $00, $16
+	db $00, $10, $00, $07, $06, $14, $00, $0c, $04, $18, $00, $11, $02, $1c, $00, $16
+	db $00, $20, $00, $07, $06, $24, $00, $0c, $04, $28, $00, $11, $02, $2c, $00, $16
+	db $00, $30, $00, $07, $06, $34, $00, $0c, $04, $38, $00, $11, $02, $3c, $00, $16
+	db $10, $04, $00, $05, $16, $18, $00, $09, $14, $2c, $00, $0e, $12, $00, $00, $14
+	db $10, $14, $00, $05, $16, $28, $00, $09, $14, $3c, $00, $0e, $12, $10, $00, $14
+	db $10, $24, $00, $05, $16, $38, $00, $09, $14, $0c, $00, $0e, $12, $20, $00, $14
+	db $10, $34, $00, $05, $16, $08, $00, $09, $14, $1c, $00, $0e, $12, $30, $00, $14
+	db $20, $14, $00, $04, $26, $20, $00, $0b, $24, $2c, $00, $10, $22, $38, $00, $17
+	db $20, $04, $00, $04, $26, $10, $00, $0b, $24, $1c, $00, $10, $22, $28, $00, $17
+	db $20, $34, $00, $04, $26, $00, $00, $0b, $24, $0c, $00, $10, $22, $18, $00, $17
+	db $20, $24, $00, $04, $26, $30, $00, $0b, $24, $3c, $00, $10, $22, $08, $00, $17
+	db $30, $00, $00, $06, $36, $1c, $00, $0a, $34, $38, $00, $0f, $32, $14, $00, $15
+	db $30, $30, $00, $06, $36, $0c, $00, $0a, $34, $28, $00, $0f, $32, $04, $00, $15
+	db $30, $20, $00, $06, $36, $3c, $00, $0a, $34, $18, $00, $0f, $32, $34, $00, $15
+	db $30, $10, $00, $06, $36, $2c, $00, $0a, $34, $08, $00, $0f, $32, $24, $00, $15
+; 113b70
 
 Unknown_113b70: ; 113b70
-INCBIN "baserom.gbc", $113b70, $113b7e - $113b70
+	dw $cbe7
+	dw $cbeb
+	dw $cbef
+	dw $cbf3
+	dw $cbe7
+	dw $cbeb
+	dw $cbef
 
 Unknown_113b7e: ; 113b7e
-INCBIN "baserom.gbc", $113b7e, $113c8e - $113b7e
+	db $01,$23,$45,$67,$89,$ab,$cd,$ef
+	db $fe,$dc,$ba,$98,$76,$54,$32,$10
+
+Unknown_113b8e:
+	db $78, $a4, $6a, $d7, $56, $b7, $c7, $e8, $db, $70, $20, $24, $ee, $ce, $bd, $c1
+	db $af, $0f, $7c, $f5, $2a, $c6, $87, $47, $13, $46, $30, $a8, $01, $95, $46, $fd
+	db $d8, $98, $80, $69, $af, $f7, $44, $8b, $b1, $5b, $ff, $ff, $be, $d7, $5c, $89
+	db $22, $11, $90, $6b, $93, $71, $98, $fd, $8e, $43, $79, $a6, $21, $08, $b4, $49
+	db $62, $25, $1e, $f6, $40, $b3, $40, $c0, $51, $5a, $5e, $26, $aa, $c7, $b6, $e9
+	db $5d, $10, $2f, $d6, $53, $14, $44, $02, $81, $e6, $a1, $d8, $c8, $fb, $d3, $e7
+	db $e6, $cd, $e1, $21, $d6, $07, $37, $c3, $87, $0d, $d5, $f4, $ed, $14, $5a, $45
+	db $05, $e9, $e3, $a9, $f8, $a3, $ef, $fc, $d9, $02, $6f, $67, $8a, $4c, $2a, $8d
+	db $42, $39, $fa, $ff, $81, $f6, $71, $87, $22, $61, $9d, $6d, $0c, $38, $e5, $fd
+	db $44, $ea, $be, $a4, $a9, $cf, $de, $4b, $60, $4b, $bb, $f6, $70, $bc, $bf, $be
+	db $c6, $7e, $9b, $28, $fa, $27, $a1, $ea, $85, $30, $ef, $d4, $05, $1d, $88, $04
+	db $39, $d0, $d4, $d9, $e5, $99, $db, $e6, $f8, $7c, $a2, $1f, $65, $56, $ac, $c4
+	db $44, $22, $29, $f4, $97, $ff, $2a, $43, $a7, $23, $94, $ab, $39, $a0, $93, $fc
+	db $c3, $59, $5b, $65, $92, $cc, $0c, $8f, $7d, $f4, $ef, $ff, $d1, $5d, $84, $85
+	db $4f, $7e, $a8, $6f, $e0, $e6, $2c, $fe, $14, $43, $01, $a3, $a1, $11, $08, $4e
+	db $82, $7e, $53, $f7, $35, $f2, $3a, $bd, $bb, $d2, $d7, $2a, $91, $d3, $86, $eb
 
 Function113c8e: ; 113c8e
 	ld a, c

main.asm

@@ -41747,7 +41747,14 @@ Function49856: ; 49856
 ; 4985a
 
 Unknown_4985a: ; unreferenced
-INCBIN "baserom.gbc",$4985a,$4989a - $4985a
+	db $ab, $03, $57, $24, $ac, $0e, $13, $32
+	db $be, $30, $5b, $4c, $47, $60, $ed, $f2
+	db $ab, $03, $55, $26, $aa, $0a, $13, $3a
+	db $be, $28, $33, $24, $6e, $71, $df, $b0
+	db $a8, $00, $e5, $e0, $9a, $fc, $f4, $2c
+	db $fe, $4c, $a3, $5e, $c6, $3a, $ab, $4d
+	db $a8, $00, $b5, $b0, $de, $e8, $fc, $1c
+	db $ba, $66, $f7, $0e, $ba, $5e, $43, $bd
 
 Function4989a: ; 4989a
 	call DelayFrame
@@ -51477,7 +51484,20 @@ INCLUDE "data/base_stats.asm"
 PokemonNames::
 INCLUDE "data/pokemon_names.asm"
 
-INCBIN "baserom.gbc",$53d84,$53d9c - $53d84
+Unknown_53d84: ; unreferenced
+	db $1a, $15
+	db $33, $16
+	db $4b, $17
+	db $62, $18
+	db $79, $19
+	db $90, $1a
+	db $a8, $1b
+	db $c4, $1c
+	db $e0, $1d
+	db $f6, $1e
+	db $ff, $1f
+	db $ff, $20
+; 53d9c
 
 UnknownEggPic:: ; 53d9c
 ; Another egg pic. This is shifted up a few pixels.
@@ -56372,7 +56392,7 @@ MenuDataHeader_0x8810d: ; 0x8810d
 	db 09, 06 ; start coords
 	db 12, 19 ; end coords
 
-INCBIN "baserom.gbc",$88112,$88116 - $88112
+	db 0, 0, -1, 0 ; XXX
 
 Function88116: ; 88116
 	call Function1cfd
@@ -82034,7 +82054,11 @@ Functione124e: ; e124e
 ; e126d
 
 Unknown_e126d: ; e126d
-INCBIN "baserom.gbc",$e126d,$e127d - $e126d
+	db $00, $01, $02, $03
+	db $04, $05, $06, $0b
+	db $0c, $11, $12, $17
+	db $18, $1d, $1e, $23
+; e127d
 
 Functione127d: ; e127d
 	call Functione128d
@@ -82400,7 +82424,12 @@ Functione1481: ; e1481
 ; e148f
 
 Unknown_e148f: ; e148f
-INCBIN "baserom.gbc", $e148f, $e14a0 - $e148f
+	db $e0
+	db $00, $03, $06, $09
+	db $24, $27, $2a, $2d
+	db $48, $4b, $4e, $51
+	db $6c, $6f, $72, $75
+; e14a0
 
 Functione14a0: ; e14a0
 	ld hl, Unknown_e14b5
@@ -82423,7 +82452,13 @@ Functione14a0: ; e14a0
 ; e14b5
 
 Unknown_e14b5: ; e14b5
-INCBIN "baserom.gbc", $e14b5, $e14d9 - $e14b5
+	db $00, $00, $00, $00, $00, $00
+	db $00, $01, $02, $03, $04, $00
+	db $00, $05, $06, $07, $08, $00
+	db $00, $09, $0a, $0b, $0c, $00
+	db $00, $0d, $0e, $0f, $10, $00
+	db $00, $00, $00, $00, $00, $00
+; e14d9
 
 Functione14d9: ; e14d9
 	call Functione1481
@@ -82467,13 +82502,73 @@ Functione14d9: ; e14d9
 ; e150f
 
 Unknown_e150f: ; e150f
-INCBIN "baserom.gbc",$e150f,$e1534 - $e150f
+	db $f4, $f4, $00, $00
+	db $f4, $fc, $01, $00
+	db $f4, $04, $02, $00
+	db $fc, $f4, $0c, $00
+	db $fc, $fc, $0d, $00
+	db $fc, $04, $0e, $00
+	db $04, $f4, $18, $00
+	db $04, $fc, $19, $00
+	db $04, $04, $1a, $00
+	db $ff
 
 Unknown_e1534: ; e1534
-INCBIN "baserom.gbc",$e1534,$e1559 - $e1534
+	db $f4, $f4, $00, $00
+	db $f4, $fc, $01, $00
+	db $f4, $04, $00, $20
+	db $fc, $f4, $02, $00
+	db $fc, $fc, $03, $00
+	db $fc, $04, $02, $20
+	db $04, $f4, $00, $40
+	db $04, $fc, $01, $40
+	db $04, $04, $00, $60
+	db $ff
 
 Unknown_e1559: ; e1559
-INCBIN "baserom.gbc",$e1559,$e1631 - $e1559
+
+macro_e1559: macro
+	db \1, \2
+	dwcoord \3, \4
+	db \5, \6
+endm
+
+	macro_e1559 $1c, $1c,  1,  0, $ee, $00
+	macro_e1559 $34, $1c,  4,  0, $ee, $00
+	macro_e1559 $4c, $1c,  7,  0, $ee, $00
+	macro_e1559 $64, $1c, 10,  0, $ee, $00
+	macro_e1559 $7c, $1c, 13,  0, $ee, $00
+	macro_e1559 $94, $1c, 16,  0, $ee, $00
+	macro_e1559 $1c, $34,  1,  3, $ee, $00
+	macro_e1559 $34, $34,  4,  3, $ef, $00
+	macro_e1559 $4c, $34,  7,  3, $ef, $00
+	macro_e1559 $64, $34, 10,  3, $ef, $00
+	macro_e1559 $7c, $34, 13,  3, $ef, $00
+	macro_e1559 $94, $34, 16,  3, $ee, $00
+	macro_e1559 $1c, $4c,  1,  6, $ee, $00
+	macro_e1559 $34, $4c,  4,  6, $ef, $00
+	macro_e1559 $4c, $4c,  7,  6, $ef, $00
+	macro_e1559 $64, $4c, 10,  6, $ef, $00
+	macro_e1559 $7c, $4c, 13,  6, $ef, $00
+	macro_e1559 $94, $4c, 16,  6, $ee, $00
+	macro_e1559 $1c, $64,  1,  9, $ee, $00
+	macro_e1559 $34, $64,  4,  9, $ef, $00
+	macro_e1559 $4c, $64,  7,  9, $ef, $00
+	macro_e1559 $64, $64, 10,  9, $ef, $00
+	macro_e1559 $7c, $64, 13,  9, $ef, $00
+	macro_e1559 $94, $64, 16,  9, $ee, $00
+	macro_e1559 $1c, $7c,  1, 12, $ee, $00
+	macro_e1559 $34, $7c,  4, 12, $ef, $00
+	macro_e1559 $4c, $7c,  7, 12, $ef, $00
+	macro_e1559 $64, $7c, 10, 12, $ef, $00
+	macro_e1559 $7c, $7c, 13, 12, $ef, $00
+	macro_e1559 $94, $7c, 16, 12, $ee, $00
+	macro_e1559 $1c, $94,  1, 15, $ee, $00
+	macro_e1559 $34, $94,  4, 15, $ee, $00
+	macro_e1559 $4c, $94,  7, 15, $ee, $00
+	macro_e1559 $64, $94, 10, 15, $ee, $00
+	macro_e1559 $7c, $94, 13, 15, $ee, $00
+	macro_e1559 $94, $94, 16, 15, $ee, $00
 
 Functione1631: ; e1631
 	ld hl, VTiles2
@@ -85888,7 +85983,7 @@ Functione36f9: ; e36f9 (38:76f9)
 	ret
 ; e3778 (38:7778)
 
-INCBIN "baserom.gbc",$e3778,$e377b - $e3778
+	hlcoord 11, 7 ; XXX
 
 MenuDataHeader_0xe377b: ; 0xe377b
 	db $40 ; flags
@@ -91302,7 +91397,7 @@ Unknown_fd15e: ; fd15e
 	db $01, $86, $a0, $00, $59, $10, $02, $1a ; SNORLAX_DOLL
 ; fd1ae
 
-INCBIN "baserom.gbc", $fd1ae, $fd1b1 - $fd1ae
+	db 0, 0, 0 ; XXX
 
 UnknownText_0xfd1b1: ; 0xfd1b1
 	; Hi,  ! How are you?
@@ -91340,13 +91435,13 @@ UnknownText_0xfd1ca: ; 0xfd1ca
 	db "@"
 ; 0xfd1cf
 
-INCBIN "baserom.gbc", $fd1cf, $fd1d0 - $fd1cf
+	db 0 ; XXX
 
 Functionfd1d0: ; fd1d0
 	ret
 ; fd1d1
 
-INCBIN "baserom.gbc", $fd1d1, $fd1d2 - $fd1d1
+	ret ; XXX
 
 
 INCLUDE "misc/mobile_40.asm"
@@ -94047,7 +94142,22 @@ Function1058e9: ; 1058e9 (41:58e9)
 ; 1058f0 (41:58f0)
 
 OAM_1058f0: ; 1058f0
-INCBIN "baserom.gbc",$1058f0,$105930 - $1058f0
+	db $11, $34, $00, $00
+	db $11, $3c, $01, $00
+	db $11, $44, $02, $00
+	db $11, $4c, $03, $00
+	db $19, $34, $04, $00
+	db $19, $3c, $05, $00
+	db $19, $44, $06, $00
+	db $19, $4c, $07, $00
+	db $01, $5c, $00, $00
+	db $01, $64, $01, $00
+	db $01, $6c, $02, $00
+	db $01, $74, $03, $00
+	db $09, $5c, $04, $00
+	db $09, $64, $05, $00
+	db $09, $6c, $06, $00
+	db $09, $74, $07, $00
 
 ; japanese mystery gift gfx
 MysteryGiftJP_GFX: ; 105930
@@ -96414,12 +96524,12 @@ INCLUDE "text/battle_tower.asm"
 
 SECTION "bank7C", ROMX, BANK[$7C]
 
-INCBIN "baserom.gbc",$1f0000,$1f09d8 - $1f0000
+INCBIN "unknown/1f0000.bin"
 
 
 SECTION "bank7D", ROMX, BANK[$7D]
 
-INCBIN "baserom.gbc",$1f4000,$1f4003 - $1f4000
+	db $cc, $6b, $1e ; XXX
 
 Function1f4003: ; 1f4003
 	ld a, $6
@@ -96433,7 +96543,7 @@ Function1f4003: ; 1f4003
 ; 1f4018
 
 Unknown_1f4018:
-INCBIN "baserom.gbc", $1f4018, $1f4dbe - $1f4018
+INCBIN "unknown/1f4018.bin"
 
 Function1f4dbe: ; 1f4dbe
 	ld a, $6
@@ -96447,7 +96557,7 @@ Function1f4dbe: ; 1f4dbe
 ; 1f4dd3
 
 Unknown_1f4dd3:
-INCBIN "baserom.gbc", $1f4dd3, $1f5d9f - $1f4dd3
+INCBIN "unknown/1f4dd3.bin"
 
 Function1f5d9f: ; 1f5d9f
 	ld a, $6
@@ -96461,7 +96571,7 @@ Function1f5d9f: ; 1f5d9f
 ; 1f5db4
 
 Unknown_1f5db4:
-INCBIN "baserom.gbc", $1f5db4, $1f636a - $1f5db4
+INCBIN "unknown/1f5db4.bin"
 
 
 SECTION "bank7E", ROMX, BANK[$7E]

misc/mobile_40.asm

@@ -1980,8 +1980,7 @@ Function100c98: ; 100c98
 ; 100cad
 
 Unknown_100cad: ; 100cad
-INCBIN "baserom.gbc",$100cad,$100cb5 - $100cad
+	db $0a, $01, $ff, $01, $a0, $00, $20, $c3
-
 
 Function100cb5: ; 100cb5
 	call Function100dd8
@@ -6305,7 +6304,7 @@ String_102a26: ; 102a26
 ; 102a33
 
 Unknown_102a33:
-INCBIN "baserom.gbc", $102a33, $102a3b - $102a33
+	db $08, $0b, $02, $01, $80, $00, $20, $01
 
 Function102a3b: ; 102a3b
 	ld a, [wcd30]
@@ -6455,7 +6454,7 @@ Function102b68: ; 102b68 ; unreferenced
 ; 102b73
 
 Unknown_102b73:
-INCBIN "baserom.gbc", $102b73, $102b7b - $102b73
+	db $09, $06, $ff, $01, $a0, $00, $10, $c1
 
 Function102b7b: ; 102b7b
 	xor a
@@ -6472,7 +6471,7 @@ Function102b7b: ; 102b7b
 ; 102b94
 
 Unknown_102b94:
-INCBIN "baserom.gbc", $102b94, $102b9c - $102b94
+	db $01, $06, $ff, $01, $a0, $00, $10, $c1
 
 Function102b9c: ; 102b9c
 	ld a, [wcd4d]

misc/mobile_42.asm

@@ -9,7 +9,7 @@ Function108000: ; 108000
 ; 10800b
 
 Unknown_10800b:
-INCBIN "baserom.gbc", $10800b, $108012 - $10800b
+	db $0d, $12, $10, $03, $06, $0f, $0c
 
 Function108012:
 	ld a, $80
@@ -24,7 +24,7 @@ asm_108018:
 ; 108021
 
 Unknown_108021:
-INCBIN "baserom.gbc", $108021, $108026 - $108021
+	db $11, $07, $08, $0e, $0c
 
 Function108026: ; 108026
 	ld a, $0
@@ -40,7 +40,7 @@ asm_10802c:
 ; 108035
 
 Unknown_108035:
-INCBIN "baserom.gbc", $108035, $10803d - $108035
+	db $01, $12, $02, $03, $05, $08, $0b, $0c
 
 Function10803d: ; 10803d
 	ld a, $0
@@ -50,7 +50,7 @@ Function10803d: ; 10803d
 ; 108048
 
 Unknown_108048:
-INCBIN "baserom.gbc", $108048, $10804d - $108048
+	db $11, $07, $08, $13, $0c
 
 Function10804d: ; 10804d
 	ld a, $0
@@ -60,7 +60,7 @@ Function10804d: ; 10804d
 ; 108058
 
 Unknown_108058:
-INCBIN "baserom.gbc", $108058, $10805b - $108058
+	db $11, $0e, $0c
 
 Function10805b: ; 10805b
 	ld hl, wc734

misc/mobile_5f.asm

@@ -93,11 +93,89 @@ INCBIN "gfx/mobile/select.2bpp"
 
 HaveWantMap: ; 17cb83
 ; Interleaved tile/palette map.
-INCBIN "baserom.gbc", $17cb83, $17cff3 - $17cb83
+INCBIN "gfx/mobile/havewant_map.bin"
 
 HaveWantPals: ; 17cff3
 ; BG and OBJ palettes.
-INCBIN "baserom.gbc", $17cff3, $17d073 - $17cff3
+	RGB  0,  0,  0
+	RGB 21, 21, 21
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB  4, 17, 29
+	RGB  6, 19, 31
+	RGB 31, 31, 31
+
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB  2, 13, 18
+	RGB  6, 19, 31
+	RGB 31, 31, 31
+
+	RGB  0,  0,  0
+	RGB 31,  5,  5
+	RGB 29, 21, 21
+	RGB 31, 31, 31
+
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB  4, 17, 29
+	RGB  6, 19, 31
+	RGB  2, 15, 27
+
+	RGB  0,  0,  0
+	RGB 28, 19, 18
+	RGB 25,  9,  0
+	RGB  0,  0,  0
+
+	RGB  0,  0,  0
+	RGB 31, 27, 27
+	RGB 31, 10,  4
+	RGB 29,  0,  0
+
+	RGB  0,  0,  0
+	RGB 31, 31, 31
+	RGB 26,  8, 23
+	RGB 22,  0, 16
+
+	RGB  0,  0,  0
+	RGB 31, 31, 31
+	RGB 20,  8, 31
+	RGB 15,  1, 26
+
+	RGB  0,  0,  0
+	RGB 31, 31, 31
+	RGB 17, 12, 31
+	RGB 12,  6, 31
+
+	RGB  0, 16,  0
+	RGB 11, 11, 14
+	RGB  5,  5,  7
+	RGB 31, 31, 31
+
+	RGB  0, 31,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+
+	RGB 16, 31,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
+	RGB  0,  0,  0
 
 
 Function17d073: ; 17d073
@@ -258,7 +336,8 @@ Function17d187: ; 17d187
 ; 17d194
 
 Unknown_17d194:
-INCBIN "baserom.gbc", $17d194, $17d199 - $17d194
+	db "クりス@@"
+; 17d198
 
 Function17d199: ; 17d199
 	ld hl, Unknown_17d1a6
@@ -269,7 +348,7 @@ Function17d199: ; 17d199
 ; 17d1a6
 
 Unknown_17d1a6:
-INCBIN "baserom.gbc", $17d1a6, $17d1ab - $17d1a6
+	db "?????"
 
 Function17d1ab: ; 17d1ab
 	ld a, $50
@@ -284,7 +363,8 @@ Function17d1ab: ; 17d1ab
 ; 17d1c3
 
 Unknown_17d1c3:
-INCBIN "baserom.gbc", $17d1c3, $17d1c9 - $17d1c3
+	db "こんにちは@"
+; 17d1c9
 
 Function17d1c9: ; 17d1c9
 	ld a, $50

roms.md5

@@ -0,0 +1,2 @@
+9f2922b235a5eeb78d65594e82ef5dde  pokecrystal.gbc
+301899b8087289a6436b0a241fbbb474  pokecrystal11.gbc

tilesets/palette_maps.asm

@@ -105,7 +105,9 @@ Tileset20PalMap: ; 0x4caf5
 INCBIN "tilesets/20_palette_map.bin"
 ; 0x4cb65
 
-INCBIN "baserom.gbc", $4cb65, $4cbd5 - $4cb65
+UnusedPalMap1:
+INCBIN "tilesets/unused_palette_map_1.bin"
+; 4cbd5
 
 Tileset29PalMap: ; 0x4cbd5
 INCBIN "tilesets/29_palette_map.bin"
@@ -127,5 +129,6 @@ Tileset04PalMap: ; 0x4cd95
 INCBIN "tilesets/04_palette_map.bin"
 ; 0x4ce05
 
-INCBIN "baserom.gbc", $4ce05, $4ce1f - $4ce05
+UnusedPalMap2:
-
+INCBIN "tilesets/unused_palette_map_2.bin"
+; 4ce1f

tilesets/unused_palette_map_2.bin

@@ -0,0 +1 @@
+