Merge pull request #204 from yenatch/master

Some uncommented code.

engine/scripting.asm

@@ -3187,9 +3187,9 @@ Script_halloffame: ; 0x97bd5
 
 	ld hl, $cfbc
 	res 0, [hl]
-	callba HallOfFame1
+	callba Mobile_HallOfFame
-	callba HallOfFame2
+	callba Mobile_HallOfFame2
-	callba HallOfFame3
+	callba HallOfFame
 	ld hl, $cfbc
 	set 0, [hl]
 	jr DisplayCredits

engine/title.asm

@@ -0,0 +1,475 @@
+_TitleScreen: ; 10ed67
+
+	call WhiteBGMap
+	call ClearSprites
+	call ClearTileMap
+	
+; Turn BG Map update off
+	xor a
+	ld [hBGMapMode], a
+	
+; Reset timing variables
+	ld hl, $cf63
+	ld [hli], a ; cf63 ; Scene?
+	ld [hli], a ; cf64
+	ld [hli], a ; cf65 ; Timer lo
+	ld [hl], a  ; cf66 ; Timer hi
+	
+; Turn LCD off
+	call DisableLCD
+	
+	
+; VRAM bank 1
+	ld a, 1
+	ld [rVBK], a
+	
+	
+; Decompress running Suicune gfx
+	ld hl, TitleSuicuneGFX
+	ld de, VTiles1
+	call Decompress
+	
+	
+; Clear screen palettes
+	ld hl, VBGMap0
+	ld bc, $0280
+	xor a
+	call ByteFill
+	
+
+; Fill tile palettes:
+
+; BG Map 1:
+
+; line 0 (copyright)
+	ld hl, VBGMap1
+	ld bc, $0020 ; one row
+	ld a, 7 ; palette
+	call ByteFill
+
+
+; BG Map 0:
+
+; Apply logo gradient:
+
+; lines 3-4
+	ld hl, $9860 ; (0,3)
+	ld bc, $0040 ; 2 rows
+	ld a, 2
+	call ByteFill
+; line 5
+	ld hl, $98a0 ; (0,5)
+	ld bc, $0020 ; 1 row
+	ld a, 3
+	call ByteFill
+; line 6
+	ld hl, $98c0 ; (0,6)
+	ld bc, $0020 ; 1 row
+	ld a, 4
+	call ByteFill
+; line 7
+	ld hl, $98e0 ; (0,7)
+	ld bc, $0020 ; 1 row
+	ld a, 5
+	call ByteFill
+; lines 8-9
+	ld hl, $9900 ; (0,8)
+	ld bc, $0040 ; 2 rows
+	ld a, 6
+	call ByteFill
+	
+
+; 'CRYSTAL VERSION'
+	ld hl, $9925 ; (5,9)
+	ld bc, $000b ; length of version text
+	ld a, 1
+	call ByteFill
+	
+; Suicune gfx
+	ld hl, $9980 ; (0,12)
+	ld bc, $00c0 ; the rest of the screen
+	ld a, 8
+	call ByteFill
+	
+	
+; Back to VRAM bank 0
+	ld a, $0
+	ld [rVBK], a
+	
+	
+; Decompress logo
+	ld hl, TitleLogoGFX
+	ld de, VTiles1
+	call Decompress
+	
+; Decompress background crystal
+	ld hl, TitleCrystalGFX
+	ld de, VTiles0
+	call Decompress
+	
+	
+; Clear screen tiles
+	ld hl, VBGMap0
+	ld bc, $0800
+	ld a, $7f
+	call ByteFill
+	
+; Draw Pokemon logo
+	ld hl, $c4dc ; TileMap(0,3)
+	ld bc, $0714 ; 20x7
+	ld d, $80
+	ld e, $14
+	call DrawGraphic
+	
+; Draw copyright text
+	ld hl, $9c03 ; BGMap1(3,0)
+	ld bc, $010d ; 13x1
+	ld d, $c
+	ld e, $10
+	call DrawGraphic
+	
+; Initialize running Suicune?
+	ld d, $0
+	call Function10eed2
+	
+; Initialize background crystal
+	call Function10ef06
+	
+; Save WRAM bank
+	ld a, [rSVBK]
+	push af
+; WRAM bank 5
+	ld a, 5
+	ld [rSVBK], a
+	
+; Update palette colors
+	ld hl, TitleScreenPalettes
+	ld de, $d000
+	ld bc, $0080
+	call CopyBytes
+	
+	ld hl, TitleScreenPalettes
+	ld de, $d080
+	ld bc, $0080
+	call CopyBytes
+	
+; Restore WRAM bank
+	pop af
+	ld [rSVBK], a
+	
+	
+; LY/SCX trickery starts here
+	
+	ld a, [rSVBK]
+	push af
+	ld a, 5 ; BANK(LYOverrides)
+	ld [rSVBK], a
+	
+; Make alternating lines come in from opposite sides
+
+; ( This part is actually totally pointless, you can't
+;   see anything until these values are overwritten!  )
+
+	ld b, 80 / 2 ; alternate for 80 lines
+	ld hl, LYOverrides
+.loop
+; $00 is the middle position
+	ld [hl], +112 ; coming from the left
+	inc hl
+	ld [hl], -112 ; coming from the right
+	inc hl
+	dec b
+	jr nz, .loop
+	
+; Make sure the rest of the buffer is empty
+	ld hl, LYOverrides + 80
+	xor a
+	ld bc, LYOverridesEnd - (LYOverrides + 80)
+	call ByteFill
+	
+; Let LCD Stat know we're messing around with SCX
+	ld a, rSCX - rJOYP
+	ld [hLCDStatCustom], a
+	
+	pop af
+	ld [rSVBK], a
+	
+	
+; Reset audio
+	call ChannelsOff
+	call EnableLCD
+	
+; Set sprite size to 8x16
+	ld a, [rLCDC]
+	set 2, a
+	ld [rLCDC], a
+	
+	ld a, +112
+	ld [hSCX], a
+	ld a, 8
+	ld [hSCY], a
+	ld a, 7
+	ld [hWX], a
+	ld a, -112
+	ld [hWY], a
+	
+	ld a, $1
+	ld [hCGBPalUpdate], a
+	
+; Update BG Map 0 (bank 0)
+	ld [hBGMapMode], a
+	
+	xor a
+	ld [DefaultFlypoint], a
+	
+; Play starting sound effect
+	call SFXChannelsOff
+	ld de, SFX_TITLE_SCREEN_ENTRANCE
+	call StartSFX
+	
+	ret
+; 10eea7
+
+Function10eea7: ; 10eea7
+	ld hl, DefaultFlypoint
+	ld a, [hl]
+	ld c, a
+	inc [hl]
+	and $7
+	ret nz
+	ld a, c
+	and $18
+	sla a
+	swap a
+	ld e, a
+	ld d, $0
+	ld hl, $6ece
+	add hl, de
+	ld d, [hl]
+	xor a
+	ld [hBGMapMode], a
+	call Function10eed2
+	ld a, $1
+	ld [hBGMapMode], a
+	ld a, $3
+	ld [hBGMapThird], a
+	ret
+; 10eece
+
+INCBIN "baserom.gbc", $10eece, $10eed2 - $10eece
+
+
+Function10eed2: ; 10eed2
+	ld hl, $c596
+	ld b, $6
+.asm_10eed7
+	ld c, $8
+.asm_10eed9
+	ld a, d
+	ld [hli], a
+	inc d
+	dec c
+	jr nz, .asm_10eed9
+	ld a, $c
+	add l
+	ld l, a
+	ld a, $0
+	adc h
+	ld h, a
+	ld a, $8
+	add d
+	ld d, a
+	dec b
+	jr nz, .asm_10eed7
+	ret
+; 10eeef
+
+Function10eeef: ; 10eeef
+.asm_10eeef
+	push de
+	push bc
+	push hl
+.asm_10eef2
+	ld a, d
+	ld [hli], a
+	inc d
+	dec c
+	jr nz, .asm_10eef2
+	pop hl
+	ld bc, $0014
+	add hl, bc
+	pop bc
+	pop de
+	ld a, e
+	add d
+	ld d, a
+	dec b
+	jr nz, .asm_10eeef
+	ret
+; 10ef06
+
+Function10ef06: ; 10ef06
+	ld hl, Sprites
+	ld d, $de
+	ld e, $0
+	ld c, $5
+.asm_10ef0f
+	push bc
+	call Function10ef1c
+	pop bc
+	ld a, $10
+	add d
+	ld d, a
+	dec c
+	jr nz, .asm_10ef0f
+	ret
+; 10ef1c
+
+Function10ef1c: ; 10ef1c
+	ld c, $6
+	ld b, $40
+.asm_10ef20
+	ld a, d
+	ld [hli], a
+	ld a, b
+	ld [hli], a
+	add $8
+	ld b, a
+	ld a, e
+	ld [hli], a
+	inc e
+	inc e
+	ld a, $80
+	ld [hli], a
+	dec c
+	jr nz, .asm_10ef20
+	ret
+; 10ef32
+
+
+AnimateTitleCrystal: ; 10ef32
+; Move the title screen crystal downward until it's fully visible
+
+; Stop at y=6
+; y is really from the bottom of the sprite, which is two tiles high
+	ld hl, Sprites
+	ld a, [hl]
+	cp 6 + 16
+	ret z
+	
+; Move all 30 parts of the crystal down by 2
+	ld c, 30
+.loop
+	ld a, [hl]
+	add 2
+	ld [hli], a
+	inc hl
+	inc hl
+	inc hl
+	dec c
+	jr nz, .loop
+	
+	ret
+; 10ef46
+
+TitleSuicuneGFX: ; 10ef46
+INCBIN "gfx/title/suicune.lz"
+; 10f31b
+
+INCBIN "baserom.gbc", $10f31b, $10f326 - $10f31b
+
+TitleLogoGFX: ; 10f326
+INCBIN "gfx/title/logo.lz"
+; 10fced
+
+INCBIN "baserom.gbc", $10fced, $10fcee - $10fced
+
+TitleCrystalGFX: ; 10fcee
+INCBIN "gfx/title/crystal.lz"
+; 10fed7
+
+INCBIN "baserom.gbc", $10fed7, $10fede - $10fed7
+
+TitleScreenPalettes:
+; BG
+	RGB 00, 00, 00
+	RGB 19, 00, 00
+	RGB 15, 08, 31
+	RGB 15, 08, 31
+	
+	RGB 00, 00, 00
+	RGB 31, 31, 31
+	RGB 15, 16, 31
+	RGB 31, 01, 13
+	
+	RGB 00, 00, 00
+	RGB 07, 07, 07
+	RGB 31, 31, 31
+	RGB 02, 03, 30
+	
+	RGB 00, 00, 00
+	RGB 13, 13, 13
+	RGB 31, 31, 18
+	RGB 02, 03, 30
+	
+	RGB 00, 00, 00
+	RGB 19, 19, 19
+	RGB 29, 28, 12
+	RGB 02, 03, 30
+	
+	RGB 00, 00, 00
+	RGB 25, 25, 25
+	RGB 28, 25, 06
+	RGB 02, 03, 30
+	
+	RGB 00, 00, 00
+	RGB 31, 31, 31
+	RGB 26, 21, 00
+	RGB 02, 03, 30
+	
+	RGB 00, 00, 00
+	RGB 11, 11, 19
+	RGB 31, 31, 31
+	RGB 00, 00, 00
+	
+; OBJ
+	RGB 00, 00, 00
+	RGB 10, 00, 15
+	RGB 17, 05, 22
+	RGB 19, 09, 31
+	
+	RGB 31, 31, 31
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	
+	RGB 31, 31, 31
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	
+	RGB 31, 31, 31
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	
+	RGB 31, 31, 31
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	
+	RGB 31, 31, 31
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	
+	RGB 31, 31, 31
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	
+	RGB 31, 31, 31
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+

event/dratini.asm

@@ -0,0 +1,112 @@
+SpecialDratini: ; 0x8b170
+; if ScriptVar is 0 or 1, change the moveset of the last Dratini in the party.
+;  0: give it a special moveset with Extremespeed.
+;  1: give it the normal moveset of a level 15 Dratini.
+
+	ld a, [ScriptVar]
+	cp $2
+	ret nc
+	ld bc, PartyCount
+	ld a, [bc]
+	ld hl, 0
+	call GetNthPartyMon
+	ld a, [bc]
+	ld c, a
+	ld de, PartyMon2 - PartyMon1
+.CheckForDratini
+; start at the end of the party and search backwards for a Dratini
+	ld a, [hl]
+	cp DRATINI
+	jr z, .GiveMoveset
+	ld a, l
+	sub e
+	ld l, a
+	ld a, h
+	sbc d
+	ld h, a
+	dec c
+	jr nz, .CheckForDratini
+	ret
+
+.GiveMoveset
+	push hl
+	ld a, [ScriptVar]
+	ld hl, .Movesets
+	ld bc, .Moveset1 - .Moveset0
+	call AddNTimes
+
+	; get address of mon's first move
+	pop de
+	inc de
+	inc de
+
+.GiveMoves
+	ld a, [hl]
+	and a ; is the move 00?
+	ret z ; if so, we're done here
+
+	push hl
+	push de
+	ld [de], a ; give the Pokémon the new move
+
+	; get the PP of the new move
+	dec a
+	ld hl, Moves + PlayerMovePP - PlayerMoveStruct
+	ld bc, Move2 - Move1
+	call AddNTimes
+	ld a, BANK(Moves)
+	call GetFarByte
+
+	; get the address of the move's PP and update the PP
+	ld hl, PartyMon1PP - PartyMon1Moves
+	add hl, de
+	ld [hl], a
+
+	pop de
+	pop hl
+	inc de
+	inc hl
+	jr .GiveMoves
+
+.Movesets
+.Moveset0
+; Dratini does not normally learn Extremespeed. This is a special gift.
+	db WRAP
+	db THUNDER_WAVE
+	db TWISTER
+	db EXTREMESPEED
+	db 0
+.Moveset1
+; This is the normal moveset of a level 15 Dratini
+	db WRAP
+	db LEER
+	db THUNDER_WAVE
+	db TWISTER
+	db 0
+
+GetNthPartyMon: ; 0x8b1ce
+; inputs:
+; hl must be set to 0 before calling this function.
+; a must be set to the number of Pokémon in the party.
+
+; outputs:
+; returns the address of the last Pokémon in the party in hl.
+; sets carry if a is 0.
+
+	ld de, PartyMon1
+	add hl, de
+	and a
+	jr z, .EmptyParty
+	dec a
+	ret z
+	ld de, PartyMon2 - PartyMon1
+.loop
+	add hl, de
+	dec a
+	jr nz, .loop
+	ret
+.EmptyParty
+	scf
+	ret
+; 8b1e1
+

home/pokedex_flags.asm

@@ -0,0 +1,40 @@
+SetSeenAndCaughtMon: ; 3380
+	push af
+	ld c, a
+	ld hl, PokedexCaught
+	ld b, SET_FLAG
+	call PokedexFlagAction
+	pop af
+	; fallthrough
+; 338b
+
+SetSeenMon: ; 338b
+	ld c, a
+	ld hl, PokedexSeen
+	ld b, SET_FLAG
+	jr PokedexFlagAction
+; 3393
+
+CheckCaughtMon: ; 3393
+	ld c, a
+	ld hl, PokedexCaught
+	ld b, CHECK_FLAG
+	jr PokedexFlagAction
+; 339b
+
+CheckSeenMon: ; 339b
+	ld c, a
+	ld hl, PokedexSeen
+	ld b, CHECK_FLAG
+	; fallthrough
+; 33a1
+
+PokedexFlagAction: ; 33a1
+	ld d, 0
+	ld a, PREDEF_FLAG
+	call Predef
+	ld a, c
+	and a
+	ret
+; 33ab
+

home/window.asm

@@ -0,0 +1,96 @@
+ResetWindow: ; 2dba
+
+	call Function1fbf
+	ld a, [hROMBank]
+	push af
+	ld a, BANK(Function6454) ; and BANK(Function64bf)
+	rst Bankswitch
+
+	call Function6454
+	call Function2e20
+	call Function64bf
+
+	pop af
+	rst Bankswitch
+	ret
+; 2dcf
+
+
+Function2dcf: ; 2dcf
+	ld a, [hOAMUpdate]
+	push af
+	ld a, $1
+	ld [hOAMUpdate], a
+	call Function2de2
+	pop af
+	ld [hOAMUpdate], a
+	ld hl, VramState
+	res 6, [hl]
+	ret
+; 2de2
+
+Function2de2: ; 2de2
+	call Function1fbf
+	xor a
+	ld [hBGMapMode], a
+	call Function2173
+	call Function2e20
+	xor a
+	ld [hBGMapMode], a
+	call Function2e31
+	ld a, $90
+	ld [hWY], a
+	call Functione4a
+	callba Functionb8000
+	callba Function106594
+	ret
+; 2e08
+
+Function2e08: ; 2e08
+	call Function1fbf
+	ld a, [hROMBank]
+	push af
+	ld a, BANK(Function6454) ; and BANK(Function64bf)
+	rst Bankswitch
+
+	call Function6454
+	call SpeechTextBox
+	call Function2e20
+	call Function64bf
+	pop af
+	rst Bankswitch
+
+	ret
+; 2e20
+
+Function2e20: ; 2e20
+	ld a, [hOAMUpdate]
+	push af
+	ld a, $1
+	ld [hOAMUpdate], a
+	callba Function104110
+	pop af
+	ld [hOAMUpdate], a
+	ret
+; 2e31
+
+Function2e31: ; 2e31
+	ld a, [hOAMUpdate]
+	push af
+	ld a, [hBGMapMode]
+	push af
+	xor a
+	ld [hBGMapMode], a
+	ld a, $1
+	ld [hOAMUpdate], a
+	call Function1ad2
+	xor a
+	ld [hOAMUpdate], a
+	call DelayFrame
+	pop af
+	ld [hBGMapMode], a
+	pop af
+	ld [hOAMUpdate], a
+	ret
+; 2e4e
+

lib/mobile/main.asm

@@ -0,0 +1,17 @@
+; A library included as part of the Mobile Adapter GB SDK.
+
+INCBIN "baserom.gbc", $110000, $110fad - $110000
+
+URIPrefix: ; 0x110fad
+	ascii "http://"
+HTTPDownloadURL: ; 0x110fb4
+	ascii "gameboy.datacenter.ne.jp/cgb/download"
+HTTPUploadURL: ; 0x110fd9
+	ascii "gameboy.datacenter.ne.jp/cgb/upload"
+HTTPUtilityURL: ; 0x110ffc
+	ascii "gameboy.datacenter.ne.jp/cgb/utility"
+HTTPRankingURL: ; 0x111020
+	ascii "gameboy.datacenter.ne.jp/cgb/ranking"
+
+INCBIN "baserom.gbc", $111044, $113f84 - $111044
+

menu/mon_icons.asm

@@ -0,0 +1,349 @@
+ReadMonMenuIcon: ; 8eab3
+	cp EGG
+	jr z, .egg
+	dec a
+	ld hl, MonMenuIcons
+	ld e, a
+	ld d, 0
+	add hl, de
+	ld a, [hl]
+	ret
+.egg
+	ld a, ICON_EGG
+	ret
+; 8eac4
+
+MonMenuIcons: ; 8eac4
+	db ICON_BULBASAUR    ; BULBASAUR
+	db ICON_BULBASAUR    ; IVYSAUR
+	db ICON_BULBASAUR    ; VENUSAUR
+	db ICON_CHARMANDER   ; CHARMANDER
+	db ICON_CHARMANDER   ; CHARMELEON
+	db ICON_BIGMON       ; CHARIZARD
+	db ICON_SQUIRTLE     ; SQUIRTLE
+	db ICON_SQUIRTLE     ; WARTORTLE
+	db ICON_SQUIRTLE     ; BLASTOISE
+	db ICON_CATERPILLAR  ; CATERPIE
+	db ICON_CATERPILLAR  ; METAPOD
+	db ICON_MOTH         ; BUTTERFREE
+	db ICON_CATERPILLAR  ; WEEDLE
+	db ICON_CATERPILLAR  ; KAKUNA
+	db ICON_BUG          ; BEEDRILL
+	db ICON_BIRD         ; PIDGEY
+	db ICON_BIRD         ; PIDGEOTTO
+	db ICON_BIRD         ; PIDGEOT
+	db ICON_FOX          ; RATTATA
+	db ICON_FOX          ; RATICATE
+	db ICON_BIRD         ; SPEAROW
+	db ICON_BIRD         ; FEAROW
+	db ICON_SERPENT      ; EKANS
+	db ICON_SERPENT      ; ARBOK
+	db ICON_PIKACHU      ; PIKACHU
+	db ICON_PIKACHU      ; RAICHU
+	db ICON_MONSTER      ; SANDSHREW
+	db ICON_MONSTER      ; SANDSLASH
+	db ICON_FOX          ; NIDORAN_F
+	db ICON_FOX          ; NIDORINA
+	db ICON_MONSTER      ; NIDOQUEEN
+	db ICON_FOX          ; NIDORAN_M
+	db ICON_FOX          ; NIDORINO
+	db ICON_MONSTER      ; NIDOKING
+	db ICON_CLEFAIRY     ; CLEFAIRY
+	db ICON_CLEFAIRY     ; CLEFABLE
+	db ICON_FOX          ; VULPIX
+	db ICON_FOX          ; NINETALES
+	db ICON_JIGGLYPUFF   ; JIGGLYPUFF
+	db ICON_JIGGLYPUFF   ; WIGGLYTUFF
+	db ICON_BAT          ; ZUBAT
+	db ICON_BAT          ; GOLBAT
+	db ICON_ODDISH       ; ODDISH
+	db ICON_ODDISH       ; GLOOM
+	db ICON_ODDISH       ; VILEPLUME
+	db ICON_BUG          ; PARAS
+	db ICON_BUG          ; PARASECT
+	db ICON_CATERPILLAR  ; VENONAT
+	db ICON_MOTH         ; VENOMOTH
+	db ICON_DIGLETT      ; DIGLETT
+	db ICON_DIGLETT      ; DUGTRIO
+	db ICON_FOX          ; MEOWTH
+	db ICON_FOX          ; PERSIAN
+	db ICON_MONSTER      ; PSYDUCK
+	db ICON_MONSTER      ; GOLDUCK
+	db ICON_FIGHTER      ; MANKEY
+	db ICON_FIGHTER      ; PRIMEAPE
+	db ICON_FOX          ; GROWLITHE
+	db ICON_FOX          ; ARCANINE
+	db ICON_POLIWAG      ; POLIWAG
+	db ICON_POLIWAG      ; POLIWHIRL
+	db ICON_POLIWAG      ; POLIWRATH
+	db ICON_HUMANSHAPE   ; ABRA
+	db ICON_HUMANSHAPE   ; KADABRA
+	db ICON_HUMANSHAPE   ; ALAKAZAM
+	db ICON_FIGHTER      ; MACHOP
+	db ICON_FIGHTER      ; MACHOKE
+	db ICON_FIGHTER      ; MACHAMP
+	db ICON_ODDISH       ; BELLSPROUT
+	db ICON_ODDISH       ; WEEPINBELL
+	db ICON_ODDISH       ; VICTREEBEL
+	db ICON_JELLYFISH    ; TENTACOOL
+	db ICON_JELLYFISH    ; TENTACRUEL
+	db ICON_GEODUDE      ; GEODUDE
+	db ICON_GEODUDE      ; GRAVELER
+	db ICON_GEODUDE      ; GOLEM
+	db ICON_EQUINE       ; PONYTA
+	db ICON_EQUINE       ; RAPIDASH
+	db ICON_SLOWPOKE     ; SLOWPOKE
+	db ICON_SLOWPOKE     ; SLOWBRO
+	db ICON_VOLTORB      ; MAGNEMITE
+	db ICON_VOLTORB      ; MAGNETON
+	db ICON_BIRD         ; FARFETCH_D
+	db ICON_BIRD         ; DODUO
+	db ICON_BIRD         ; DODRIO
+	db ICON_LAPRAS       ; SEEL
+	db ICON_LAPRAS       ; DEWGONG
+	db ICON_BLOB         ; GRIMER
+	db ICON_BLOB         ; MUK
+	db ICON_SHELL        ; SHELLDER
+	db ICON_SHELL        ; CLOYSTER
+	db ICON_GHOST        ; GASTLY
+	db ICON_GHOST        ; HAUNTER
+	db ICON_GHOST        ; GENGAR
+	db ICON_SERPENT      ; ONIX
+	db ICON_HUMANSHAPE   ; DROWZEE
+	db ICON_HUMANSHAPE   ; HYPNO
+	db ICON_SHELL        ; KRABBY
+	db ICON_SHELL        ; KINGLER
+	db ICON_VOLTORB      ; VOLTORB
+	db ICON_VOLTORB      ; ELECTRODE
+	db ICON_ODDISH       ; EXEGGCUTE
+	db ICON_ODDISH       ; EXEGGUTOR
+	db ICON_MONSTER      ; CUBONE
+	db ICON_MONSTER      ; MAROWAK
+	db ICON_FIGHTER      ; HITMONLEE
+	db ICON_FIGHTER      ; HITMONCHAN
+	db ICON_MONSTER      ; LICKITUNG
+	db ICON_BLOB         ; KOFFING
+	db ICON_BLOB         ; WEEZING
+	db ICON_EQUINE       ; RHYHORN
+	db ICON_MONSTER      ; RHYDON
+	db ICON_CLEFAIRY     ; CHANSEY
+	db ICON_ODDISH       ; TANGELA
+	db ICON_MONSTER      ; KANGASKHAN
+	db ICON_FISH         ; HORSEA
+	db ICON_FISH         ; SEADRA
+	db ICON_FISH         ; GOLDEEN
+	db ICON_FISH         ; SEAKING
+	db ICON_STARYU       ; STARYU
+	db ICON_STARYU       ; STARMIE
+	db ICON_HUMANSHAPE   ; MR__MIME
+	db ICON_BUG          ; SCYTHER
+	db ICON_HUMANSHAPE   ; JYNX
+	db ICON_HUMANSHAPE   ; ELECTABUZZ
+	db ICON_HUMANSHAPE   ; MAGMAR
+	db ICON_BUG          ; PINSIR
+	db ICON_EQUINE       ; TAUROS
+	db ICON_FISH         ; MAGIKARP
+	db ICON_GYARADOS     ; GYARADOS
+	db ICON_LAPRAS       ; LAPRAS
+	db ICON_BLOB         ; DITTO
+	db ICON_FOX          ; EEVEE
+	db ICON_FOX          ; VAPOREON
+	db ICON_FOX          ; JOLTEON
+	db ICON_FOX          ; FLAREON
+	db ICON_VOLTORB      ; PORYGON
+	db ICON_SHELL        ; OMANYTE
+	db ICON_SHELL        ; OMASTAR
+	db ICON_SHELL        ; KABUTO
+	db ICON_SHELL        ; KABUTOPS
+	db ICON_BIRD         ; AERODACTYL
+	db ICON_SNORLAX      ; SNORLAX
+	db ICON_BIRD         ; ARTICUNO
+	db ICON_BIRD         ; ZAPDOS
+	db ICON_BIRD         ; MOLTRES
+	db ICON_SERPENT      ; DRATINI
+	db ICON_SERPENT      ; DRAGONAIR
+	db ICON_BIGMON       ; DRAGONITE
+	db ICON_HUMANSHAPE   ; MEWTWO
+	db ICON_HUMANSHAPE   ; MEW
+	db ICON_ODDISH       ; CHIKORITA
+	db ICON_ODDISH       ; BAYLEEF
+	db ICON_ODDISH       ; MEGANIUM
+	db ICON_FOX          ; CYNDAQUIL
+	db ICON_FOX          ; QUILAVA
+	db ICON_FOX          ; TYPHLOSION
+	db ICON_MONSTER      ; TOTODILE
+	db ICON_MONSTER      ; CROCONAW
+	db ICON_MONSTER      ; FERALIGATR
+	db ICON_FOX          ; SENTRET
+	db ICON_FOX          ; FURRET
+	db ICON_BIRD         ; HOOTHOOT
+	db ICON_BIRD         ; NOCTOWL
+	db ICON_BUG          ; LEDYBA
+	db ICON_BUG          ; LEDIAN
+	db ICON_BUG          ; SPINARAK
+	db ICON_BUG          ; ARIADOS
+	db ICON_BAT          ; CROBAT
+	db ICON_FISH         ; CHINCHOU
+	db ICON_FISH         ; LANTURN
+	db ICON_PIKACHU      ; PICHU
+	db ICON_CLEFAIRY     ; CLEFFA
+	db ICON_JIGGLYPUFF   ; IGGLYBUFF
+	db ICON_CLEFAIRY     ; TOGEPI
+	db ICON_BIRD         ; TOGETIC
+	db ICON_BIRD         ; NATU
+	db ICON_BIRD         ; XATU
+	db ICON_FOX          ; MAREEP
+	db ICON_MONSTER      ; FLAAFFY
+	db ICON_MONSTER      ; AMPHAROS
+	db ICON_ODDISH       ; BELLOSSOM
+	db ICON_JIGGLYPUFF   ; MARILL
+	db ICON_JIGGLYPUFF   ; AZUMARILL
+	db ICON_SUDOWOODO    ; SUDOWOODO
+	db ICON_POLIWAG      ; POLITOED
+	db ICON_ODDISH       ; HOPPIP
+	db ICON_ODDISH       ; SKIPLOOM
+	db ICON_ODDISH       ; JUMPLUFF
+	db ICON_MONSTER      ; AIPOM
+	db ICON_ODDISH       ; SUNKERN
+	db ICON_ODDISH       ; SUNFLORA
+	db ICON_BUG          ; YANMA
+	db ICON_MONSTER      ; WOOPER
+	db ICON_MONSTER      ; QUAGSIRE
+	db ICON_FOX          ; ESPEON
+	db ICON_FOX          ; UMBREON
+	db ICON_BIRD         ; MURKROW
+	db ICON_SLOWPOKE     ; SLOWKING
+	db ICON_GHOST        ; MISDREAVUS
+	db ICON_UNOWN        ; UNOWN
+	db ICON_GHOST        ; WOBBUFFET
+	db ICON_EQUINE       ; GIRAFARIG
+	db ICON_BUG          ; PINECO
+	db ICON_BUG          ; FORRETRESS
+	db ICON_SERPENT      ; DUNSPARCE
+	db ICON_BUG          ; GLIGAR
+	db ICON_SERPENT      ; STEELIX
+	db ICON_MONSTER      ; SNUBBULL
+	db ICON_MONSTER      ; GRANBULL
+	db ICON_FISH         ; QWILFISH
+	db ICON_BUG          ; SCIZOR
+	db ICON_BUG          ; SHUCKLE
+	db ICON_BUG          ; HERACROSS
+	db ICON_FOX          ; SNEASEL
+	db ICON_MONSTER      ; TEDDIURSA
+	db ICON_MONSTER      ; URSARING
+	db ICON_BLOB         ; SLUGMA
+	db ICON_BLOB         ; MAGCARGO
+	db ICON_EQUINE       ; SWINUB
+	db ICON_EQUINE       ; PILOSWINE
+	db ICON_SHELL        ; CORSOLA
+	db ICON_FISH         ; REMORAID
+	db ICON_FISH         ; OCTILLERY
+	db ICON_MONSTER      ; DELIBIRD
+	db ICON_FISH         ; MANTINE
+	db ICON_BIRD         ; SKARMORY
+	db ICON_FOX          ; HOUNDOUR
+	db ICON_FOX          ; HOUNDOOM
+	db ICON_BIGMON       ; KINGDRA
+	db ICON_EQUINE       ; PHANPY
+	db ICON_EQUINE       ; DONPHAN
+	db ICON_VOLTORB      ; PORYGON2
+	db ICON_EQUINE       ; STANTLER
+	db ICON_MONSTER      ; SMEARGLE
+	db ICON_FIGHTER      ; TYROGUE
+	db ICON_FIGHTER      ; HITMONTOP
+	db ICON_HUMANSHAPE   ; SMOOCHUM
+	db ICON_HUMANSHAPE   ; ELEKID
+	db ICON_HUMANSHAPE   ; MAGBY
+	db ICON_EQUINE       ; MILTANK
+	db ICON_CLEFAIRY     ; BLISSEY
+	db ICON_FOX          ; RAIKOU
+	db ICON_FOX          ; ENTEI
+	db ICON_FOX          ; SUICUNE
+	db ICON_MONSTER      ; LARVITAR
+	db ICON_MONSTER      ; PUPITAR
+	db ICON_MONSTER      ; TYRANITAR
+	db ICON_LUGIA        ; LUGIA
+	db ICON_HO_OH        ; HO_OH
+	db ICON_HUMANSHAPE   ; CELEBI
+
+IconPointers:
+	dw NullIcon
+	dw PoliwagIcon
+	dw JigglypuffIcon
+	dw DiglettIcon
+	dw PikachuIcon
+	dw StaryuIcon
+	dw FishIcon
+	dw BirdIcon
+	dw MonsterIcon
+	dw ClefairyIcon
+	dw OddishIcon
+	dw BugIcon
+	dw GhostIcon
+	dw LaprasIcon
+	dw HumanshapeIcon
+	dw FoxIcon
+	dw EquineIcon
+	dw ShellIcon
+	dw BlobIcon
+	dw SerpentIcon
+	dw VoltorbIcon
+	dw SquirtleIcon
+	dw BulbasaurIcon
+	dw CharmanderIcon
+	dw CaterpillarIcon
+	dw UnownIcon
+	dw GeodudeIcon
+	dw FighterIcon
+	dw EggIcon
+	dw JellyfishIcon
+	dw MothIcon
+	dw BatIcon
+	dw SnorlaxIcon
+	dw HoOhIcon
+	dw LugiaIcon
+	dw GyaradosIcon
+	dw SlowpokeIcon
+	dw SudowoodoIcon
+	dw BigmonIcon
+
+NullIcon:
+PoliwagIcon:      INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d
+JigglypuffIcon:   INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d
+DiglettIcon:      INCBIN "gfx/icon/diglett.2bpp" ; 0x8ed0d
+PikachuIcon:      INCBIN "gfx/icon/pikachu.2bpp" ; 0x8ed8d
+StaryuIcon:       INCBIN "gfx/icon/staryu.2bpp" ; 0x8ee0d
+FishIcon:         INCBIN "gfx/icon/fish.2bpp" ; 0x8ee8d
+BirdIcon:         INCBIN "gfx/icon/bird.2bpp" ; 0x8ef0d
+MonsterIcon:      INCBIN "gfx/icon/monster.2bpp" ; 0x8ef8d
+ClefairyIcon:     INCBIN "gfx/icon/clefairy.2bpp" ; 0x8f00d
+OddishIcon:       INCBIN "gfx/icon/oddish.2bpp" ; 0x8f08d
+BugIcon:          INCBIN "gfx/icon/bug.2bpp" ; 0x8f10d
+GhostIcon:        INCBIN "gfx/icon/ghost.2bpp" ; 0x8f18d
+LaprasIcon:       INCBIN "gfx/icon/lapras.2bpp" ; 0x8f20d
+HumanshapeIcon:   INCBIN "gfx/icon/humanshape.2bpp" ; 0x8f28d
+FoxIcon:          INCBIN "gfx/icon/fox.2bpp" ; 0x8f30d
+EquineIcon:       INCBIN "gfx/icon/equine.2bpp" ; 0x8f38d
+ShellIcon:        INCBIN "gfx/icon/shell.2bpp" ; 0x8f40d
+BlobIcon:         INCBIN "gfx/icon/blob.2bpp" ; 0x8f48d
+SerpentIcon:      INCBIN "gfx/icon/serpent.2bpp" ; 0x8f50d
+VoltorbIcon:      INCBIN "gfx/icon/voltorb.2bpp" ; 0x8f58d
+SquirtleIcon:     INCBIN "gfx/icon/squirtle.2bpp" ; 0x8f60d
+BulbasaurIcon:    INCBIN "gfx/icon/bulbasaur.2bpp" ; 0x8f68d
+CharmanderIcon:   INCBIN "gfx/icon/charmander.2bpp" ; 0x8f70d
+CaterpillarIcon:  INCBIN "gfx/icon/caterpillar.2bpp" ; 0x8f78d
+UnownIcon:        INCBIN "gfx/icon/unown.2bpp" ; 0x8f80d
+GeodudeIcon:      INCBIN "gfx/icon/geodude.2bpp" ; 0x8f88d
+FighterIcon:      INCBIN "gfx/icon/fighter.2bpp" ; 0x8f90d
+EggIcon:          INCBIN "gfx/icon/egg.2bpp" ; 0x8f98d
+JellyfishIcon:    INCBIN "gfx/icon/jellyfish.2bpp" ; 0x8fa0d
+MothIcon:         INCBIN "gfx/icon/moth.2bpp" ; 0x8fa8d
+BatIcon:          INCBIN "gfx/icon/bat.2bpp" ; 0x8fb0d
+SnorlaxIcon:      INCBIN "gfx/icon/snorlax.2bpp" ; 0x8fb8d
+HoOhIcon:         INCBIN "gfx/icon/ho_oh.2bpp" ; 0x8fc0d
+LugiaIcon:        INCBIN "gfx/icon/lugia.2bpp" ; 0x8fc8d
+GyaradosIcon:     INCBIN "gfx/icon/gyarados.2bpp" ; 0x8fd0d
+SlowpokeIcon:     INCBIN "gfx/icon/slowpoke.2bpp" ; 0x8fd8d
+SudowoodoIcon:    INCBIN "gfx/icon/sudowoodo.2bpp" ; 0x8fe0d
+BigmonIcon:       INCBIN "gfx/icon/bigmon.2bpp" ; 0x8fe8d
+

predef/cgb.asm

@@ -224,7 +224,7 @@ Function8edb: ; 8edb
 	call Function9643
 	ld hl, $68ca
 	call Function9643
-	ld hl, $4f52
+	ld hl, Palette8f52
 	ld de, $d018
 	ld bc, $0018
 	ld a, $5
@@ -257,7 +257,24 @@ Function8edb: ; 8edb
 	ret
 ; 8f52
 
-INCBIN "baserom.gbc", $8f52, $8f70 - $8f52
+Palette8f52: ; 8f52
+	RGB 31, 31, 31
+	RGB 31, 19, 31
+	RGB 31, 15, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 21, 31, 14
+	RGB 17, 31, 00
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 17, 31, 31
+	RGB 17, 31, 31
+	RGB 00, 00, 00
+; 8f6a
+
+INCBIN "baserom.gbc", $8f6a, $8f70 - $8f6a
 
 Function8f70: ; 8f70
 	ld de, Unkn1Pals
@@ -267,7 +284,7 @@ Function8f70: ; 8f70
 	ld a, [CurPartySpecies]
 	cp $ff
 	jr nz, .asm_8f8a
-	ld hl, $4fba
+	ld hl, Palette8fba
 	call Function9630
 	jr .asm_8f90
 
@@ -282,7 +299,7 @@ Function8f70: ; 8f70
 	ld a, $1
 	call Function9663
 	call Function971a
-	ld hl, $4fc2
+	ld hl, Palette8fc2
 	ld de, $d078
 	ld bc, $0008
 	ld a, $5
@@ -294,7 +311,18 @@ Function8f70: ; 8f70
 	ret
 ; 8fba
 
-INCBIN "baserom.gbc", $8fba, $8fca - $8fba
+Palette8fba: ; 8fba
+	RGB 11, 23, 00
+	RGB 07, 17, 00
+	RGB 06, 16, 03
+	RGB 05, 12, 01
+
+Palette8fc2: ; 8fc2
+	RGB 00, 00, 00
+	RGB 11, 23, 00
+	RGB 07, 17, 00
+	RGB 00, 00, 00
+; 8fca
 
 Function8fca: ; 8fca
 	ld de, Unkn1Pals
@@ -304,7 +332,7 @@ Function8fca: ; 8fca
 	ld a, [CurPartySpecies]
 	cp $ff
 	jr nz, .asm_8fe4
-	ld hl, $5036
+	ld hl, Palette9036
 	call Function9630
 	jr .asm_8fed
 
@@ -327,7 +355,14 @@ Function8fca: ; 8fca
 	ret
 ; 9009
 
-INCBIN "baserom.gbc", $9009, $903e - $9009
+INCBIN "baserom.gbc", $9009, $9036 - $9009
+
+Palette9036: ; 9036
+	RGB 31, 15, 00
+	RGB 23, 12, 00
+	RGB 15, 07, 00
+	RGB 00, 00, 00
+; 903e
 
 Function903e: ; 903e
 	ld de, Unkn1Pals
@@ -351,7 +386,7 @@ Function903e: ; 903e
 ; 906e
 
 Function906e: ; 906e
-	ld hl, $77a9
+	ld hl, Paletteb7a9
 	ld de, Unkn1Pals
 	ld bc, $0080
 	ld a, $5
@@ -889,7 +924,7 @@ Function9578: ; 9578
 ; 9591
 
 Function9591: ; 9591
-	ld hl, $55e0
+	ld hl, Palette95e0
 	ld de, Unkn1Pals
 	ld bc, $0010
 	ld a, $5
@@ -920,3 +955,15 @@ Function9591: ; 9591
 	ret
 ; 95e0
 
+Palette95e0: ; 95e0
+	RGB 31, 31, 31
+	RGB 16, 31, 14
+	RGB 05, 14, 21
+	RGB 05, 13, 10
+
+	RGB 31, 31, 31
+	RGB 11, 21, 25
+	RGB 05, 14, 21
+	RGB 00, 03, 19
+; 95f0
+