mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-01-23 09:16:20 -08:00
Merge commit '8b8de40' into merge-mrwint
Conflicts: main.asm
This commit is contained in:
commit
9d02e1063f
44
main.asm
44
main.asm
@ -31141,22 +31141,54 @@ SECTION "bank7",ROMX,BANK[$7]
|
|||||||
Function1c000: ; 1c000
|
Function1c000: ; 1c000
|
||||||
ld a, [MapGroup]
|
ld a, [MapGroup]
|
||||||
ld e, a
|
ld e, a
|
||||||
ld d, $0
|
ld d, 0
|
||||||
ld hl, $4021
|
ld hl, MapGroupRoofs
|
||||||
add hl, de
|
add hl, de
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
cp $ff
|
cp $ff
|
||||||
ret z
|
ret z
|
||||||
ld hl, $403c
|
ld hl, Roofs
|
||||||
ld bc, $0090
|
ld bc, $90
|
||||||
call AddNTimes
|
call AddNTimes
|
||||||
ld de, $90a0
|
ld de, $90a0
|
||||||
ld bc, $0090
|
ld bc, $90
|
||||||
call CopyBytes
|
call CopyBytes
|
||||||
ret
|
ret
|
||||||
; 1c021
|
; 1c021
|
||||||
|
|
||||||
INCBIN "baserom.gbc",$1c021,$1c30c - $1c021
|
MapGroupRoofs: ; 1c021i
|
||||||
|
db -1 ; group 1
|
||||||
|
db 3 ; group 2
|
||||||
|
db 2 ; group 3
|
||||||
|
db -1 ; group 4
|
||||||
|
db 1 ; group 5
|
||||||
|
db 2 ; group 6
|
||||||
|
db -1 ; group 7
|
||||||
|
db -1 ; group 8
|
||||||
|
db 2 ; group 9
|
||||||
|
db 2 ; group 10
|
||||||
|
db 1 ; group 11
|
||||||
|
db 4 ; group 12
|
||||||
|
db -1 ; group 13
|
||||||
|
db -1 ; group 14
|
||||||
|
db -1 ; group 15
|
||||||
|
db -1 ; group 16
|
||||||
|
db -1 ; group 17
|
||||||
|
db -1 ; group 18
|
||||||
|
db -1 ; group 19
|
||||||
|
db 0 ; group 20
|
||||||
|
db -1 ; group 21
|
||||||
|
db -1 ; group 22
|
||||||
|
db 3 ; group 23
|
||||||
|
db -1 ; group 24
|
||||||
|
db 0 ; group 25
|
||||||
|
db -1 ; group 26
|
||||||
|
db 0 ; group 27
|
||||||
|
; 1c03c
|
||||||
|
|
||||||
|
Roofs: ; 1c03c
|
||||||
|
INCBIN "baserom.gbc", $1c03c, $1c30c - $1c03c
|
||||||
|
; 1c30c
|
||||||
|
|
||||||
INCLUDE "tilesets/data_2.asm"
|
INCLUDE "tilesets/data_2.asm"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user