some mobile link menu graphics

This commit is contained in:
yenatch 2013-12-13 20:50:08 -05:00
parent c7b19392a9
commit b113931b83
4 changed files with 114 additions and 26 deletions

BIN
gfx/mobile/havewant.2bpp Normal file

Binary file not shown.

Binary file not shown.

BIN
gfx/mobile/select.2bpp Normal file

Binary file not shown.

140
main.asm
View File

@ -117614,22 +117614,28 @@ Function178000:
SECTION "bank5F", ROMX, BANK[$5F] SECTION "bank5F", ROMX, BANK[$5F]
Function17c000: ; 17c000 Function17c000: ; 17c000
call DisableLCD call DisableLCD
ld hl, VTiles2 ld hl, VTiles2
ld bc, $0310 ld bc, $310
xor a xor a
call ByteFill call ByteFill
call Functione51 call Functione51
call Functione5f call Functione5f
ld hl, $4b83
ld hl, HaveWantMap
ld de, TileMap ld de, TileMap
ld bc, AttrMap ld bc, AttrMap
ld a, $12
.asm_17c01e ld a, SCREEN_HEIGHT
.y
push af push af
ld a, $14 ld a, SCREEN_WIDTH
push hl push hl
.asm_17c022 .x
push af push af
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
@ -117639,47 +117645,118 @@ Function17c000: ; 17c000
inc bc inc bc
pop af pop af
dec a dec a
jr nz, .asm_17c022 jr nz, .x
pop hl pop hl
push bc push bc
ld bc, $0040 ld bc, BG_MAP_WIDTH * 2
add hl, bc add hl, bc
pop bc pop bc
pop af pop af
dec a dec a
jr nz, .asm_17c01e jr nz, .y
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $5
ld a, 5 ; BANK(Unkn1Pals)
ld [rSVBK], a ld [rSVBK], a
ld hl, $4ff3
ld de, $d000 ld hl, HaveWantPals
ld bc, $0080 ld de, Unkn1Pals
ld bc, $80
call CopyBytes call CopyBytes
pop af pop af
ld [rSVBK], a ld [rSVBK], a
ld hl, $4983
ld hl, MobileSelectGFX
ld de, $8300 ld de, $8300
ld bc, $0200 ld bc, $200
call CopyBytes call CopyBytes
ld a, $1
ld a, 1
ld [rVBK], a ld [rVBK], a
ld hl, $4083
ld hl, HaveWantGFX
ld de, VTiles2 ld de, VTiles2
ld bc, $0800 ld bc, $800
call CopyBytes call CopyBytes
ld hl, $4883
ld hl, HaveWantGFX + $800
ld de, VTiles1 ld de, VTiles1
ld bc, Start ld bc, $100
call CopyBytes call CopyBytes
xor a xor a
ld [rVBK], a ld [rVBK], a
call EnableLCD call EnableLCD
callba Function104061 callba Function104061
ret ret
; 17c083 ; 17c083
INCBIN "baserom.gbc",$17c083,$17d0b3 - $17c083 HaveWantGFX: ; 17c083
INCBIN "gfx/mobile/havewant.2bpp"
MobileSelectGFX: ; 17c983
INCBIN "gfx/mobile/select.2bpp"
HaveWantMap: ; 17cb83
; Interleaved tile/palette map.
INCBIN "baserom.gbc", $17cb83, $17cff3 - $17cb83
HaveWantPals: ; 17cff3
; BG and OBJ palettes.
INCBIN "baserom.gbc", $17cff3, $17d073 - $17cff3
Function17d073: ; 17d073
.asm_17d073
ld a, [de]
inc de
and a
jr z, .asm_17d0ae
cp $60
jr nc, .asm_17d0ae
cp $4e
jr z, .asm_17d0ae
cp $50
jr z, .asm_17d0b1
cp $5
jr c, .asm_17d0ac
cp $14
jr c, .asm_17d0ae
cp $19
jr c, .asm_17d0ac
cp $1d
jr c, .asm_17d0ae
cp $26
jr c, .asm_17d0ac
cp $35
jr c, .asm_17d0ae
cp $3a
jr c, .asm_17d0ac
cp $3f
jr c, .asm_17d0ae
cp $40
jr c, .asm_17d0ac
cp $49
jr c, .asm_17d0ae
.asm_17d0ac
scf
ret
.asm_17d0ae
dec c
jr nz, .asm_17d073
.asm_17d0b1
and a
ret
; 17d0b3
Function17d0b3: ; 17d0b3 Function17d0b3: ; 17d0b3
.asm_17d0b3 .asm_17d0b3
@ -117751,13 +117828,15 @@ Function17d1f1: ; 17d1f1
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
dec a dec a
call SetSeenAndCaughtMon call SetSeenAndCaughtMon
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
cp $c9 cp UNOWN
jr nz, .asm_17d223 jr nz, .asm_17d223
ld hl, PartyMon1DVs ld hl, PartyMon1DVs
ld a, [PartyCount] ld a, [PartyCount]
dec a dec a
ld bc, $0030 ld bc, PartyMon2 - PartyMon1
call AddNTimes call AddNTimes
ld a, $2d ld a, $2d
call Predef call Predef
@ -117765,6 +117844,7 @@ Function17d1f1: ; 17d1f1
ld a, [$def4] ld a, [$def4]
and a and a
jr nz, .asm_17d223 jr nz, .asm_17d223
ld a, [UnownLetter] ld a, [UnownLetter]
ld [$def4], a ld [$def4], a
@ -117860,7 +117940,7 @@ Function17d2ce: ; 17d2ce
call Function17d45a call Function17d45a
pop af pop af
ld [rSVBK], a ld [rSVBK], a
ld de, $0066 ld de, MUSIC_MOBILE_CENTER
ld a, e ld a, e
ld [CurMusic], a ld [CurMusic], a
ld [MusicFadeIDLo], a ld [MusicFadeIDLo], a
@ -117943,7 +118023,7 @@ Function17d370: ; 17d370
call CopyBytes call CopyBytes
ld a, $1 ld a, $1
ld [rVBK], a ld [rVBK], a
ld hl, $66fe ld hl, PokemonNewsGFX
ld de, VTiles1 ld de, VTiles1
ld bc, $0480 ld bc, $0480
call CopyBytes call CopyBytes
@ -118099,7 +118179,15 @@ Function17d60b: ; 17d60b
ret ret
; 17d6a1 ; 17d6a1
INCBIN "baserom.gbc",$17d6a1,$17f036 - $17d6a1
INCBIN "baserom.gbc", $17d6a1, $17e6fe - $17d6a1
PokemonNewsGFX: ; 17e6fe
INCBIN "gfx/mobile/pokemon_news.2bpp"
INCBIN "baserom.gbc", $17eb7e, $17f036 - $17eb7e
Function17f036: ; 17f036 Function17f036: ; 17f036