pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

sprite engine; tileset constants

Browse Source
This commit is contained in:
PikalaxALT 2015-11-13 00:49:27 -05:00
parent 40802da3cf
commit e0b4fc781a
19 changed files with 4805 additions and 4742 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
constants/tilemap_constants.asm
View File

@ -5,39 +5,39 @@ WATRTILE EQU 15
TALK EQU 1 << 4
const_value SET 1
const TILESET_JOHTO_OUTSIDE_1 ; 01
const TILESET_JOHTO_OUTSIDE_2 ; 02
const TILESET_KANTO_OUTSIDE ; 03
const TILESET_BATTLE_TOWER_OUTSIDE ; 04
const TILESET_HOUSE_1 ; 05
const TILESET_KRISS_HOUSE ; 06
const TILESET_POKECENTER ; 07
const TILESET_GATE ; 08
const TILESET_PORT ; 09
const TILESET_LAB ; 0a
const TILESET_POWER_PLANT ; 0b
const TILESET_MART ; 0c
const TILESET_CELADON_MANSION ; 0d
const TILESET_GAME_CORNER ; 0e
const TILESET_GYM_1 ; 0f
const TILESET_KURT_HOUSE ; 10
const TILESET_TRAIN_STATION ; 11
const TILESET_OLIVINE_GYM ; 12
const TILESET_LIGHTHOUSE ; 13
const TILESET_KRISS_HOUSE_2F ; 14
const TILESET_GOLDENROD_POKECOM_CENTER_2F_MOBILE ; 15
const TILESET_BATTLE_TOWER ; 16
const TILESET_SPROUT_TOWER ; 17
const TILESET_CAVE ; 18
const TILESET_PARK ; 19
const TILESET_RUINS_OF_ALPH ; 1a
const TILESET_RADIO_TOWER ; 1b
const TILESET_UNDERGROUND ; 1c
const TILESET_ICE_PATH ; 1d
const TILESET_WHIRL_ISLANDS ; 1e
const TILESET_ILEX_FOREST ; 1f
const TILESET_20 ; 20
const TILESET_HO_OH_WORD_ROOM ; 21
const TILESET_KABUTO_WORD_ROOM ; 22
const TILESET_OMANYTE_WORD_ROOM ; 23
const TILESET_AERODACTYL_WORD_ROOM ; 24
const TILESET_JOHTO_1 ; 01
const TILESET_JOHTO_2 ; 02
const TILESET_KANTO ; 03
const TILESET_BATTLE_TOWER_OUTSIDE ; 04
const TILESET_HOUSE_1 ; 05
const TILESET_KRISS_HOUSE ; 06
const TILESET_POKECENTER ; 07
const TILESET_GATE ; 08
const TILESET_PORT ; 09
const TILESET_LAB ; 0a
const TILESET_POWER_PLANT ; 0b
const TILESET_MART ; 0c
const TILESET_CELADON_MANSION ; 0d
const TILESET_GAME_CORNER ; 0e
const TILESET_GYM_1 ; 0f
const TILESET_KURT_HOUSE ; 10
const TILESET_TRAIN_STATION ; 11
const TILESET_OLIVINE_GYM ; 12
const TILESET_LIGHTHOUSE ; 13
const TILESET_KRISS_HOUSE_2F ; 14
const TILESET_POKECOM_CENTER ; 15
const TILESET_BATTLE_TOWER ; 16
const TILESET_SPROUT_TOWER ; 17
const TILESET_CAVE ; 18
const TILESET_PARK ; 19
const TILESET_RUINS_OF_ALPH ; 1a
const TILESET_RADIO_TOWER ; 1b
const TILESET_UNDERGROUND ; 1c
const TILESET_ICE_PATH ; 1d
const TILESET_WHIRL_ISLANDS ; 1e
const TILESET_ILEX_FOREST ; 1f
const TILESET_20 ; 20
const TILESET_HO_OH_WORD_ROOM ; 21
const TILESET_KABUTO_WORD_ROOM ; 22
const TILESET_OMANYTE_WORD_ROOM ; 23
const TILESET_AERODACTYL_WORD_ROOM ; 24

8
engine/color.asm
View File

@ -318,7 +318,7 @@ Function8bec: ; 8bec
lb bc, 6, 4
ld a, [EnemySafeguardCount]
and $3
call Function9663
call FillBoxCGB
call LoadDETile
ret
; 8c1d
@ -394,7 +394,7 @@ endr
.asm_8c82
lb bc, 2, 8
ld a, e
call Function9663
call FillBoxCGB
ret
; 8c8a
@ -618,7 +618,7 @@ Function9643: ; 9643
ret
; 9663
Function9663: ; 9663
FillBoxCGB: ; 9663
.row
push bc
push hl
@ -752,7 +752,7 @@ Function96f3: ; 96f3
.asm_9712
lb bc, 2, 8
ld a, e
call Function9663
call FillBoxCGB
ret
; 971a

26
engine/engine_flags.asm
View File

@ -22,7 +22,7 @@ ENDM
engine_flag wMomSavingMoney, 0 ; mom saving money ; $8
engine_flag wMomSavingMoney, 7 ; dst
engine_flag wdc39, 0
engine_flag wdc39, 0 ; unused, possibly related to a 2-day timer
engine_flag StatusFlags, 0 ; pokedex
engine_flag StatusFlags, 1 ; unown dex
@ -31,7 +31,7 @@ ENDM
engine_flag StatusFlags, 6 ; credits skip
engine_flag StatusFlags, 7 ; bug contest on ; $10
engine_flag StatusFlags2, 2 ; bug contest timer
engine_flag StatusFlags2, 1
engine_flag StatusFlags2, 1 ; ???
engine_flag StatusFlags2, 0 ; rockets in radio tower
engine_flag StatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd)
engine_flag StatusFlags2, 5 ; give pokerus
@ -71,14 +71,14 @@ ENDM
engine_flag UnlockedUnowns, 7 ; 8
; fly
engine_flag VisitedSpawns, 0 ; your house
engine_flag VisitedSpawns, 1 ; viridian pokecenter
engine_flag VisitedSpawns, 2 ; pallet
engine_flag VisitedSpawns, 3 ; viridian
engine_flag VisitedSpawns, 4 ; pewter
engine_flag VisitedSpawns, 5 ; cerulean ; $38
engine_flag VisitedSpawns, 6 ; rock tunnel
engine_flag VisitedSpawns, 7 ; vermilion
engine_flag VisitedSpawns, 0 ; your house
engine_flag VisitedSpawns, 1 ; viridian pokecenter
engine_flag VisitedSpawns, 2 ; pallet
engine_flag VisitedSpawns, 3 ; viridian
engine_flag VisitedSpawns, 4 ; pewter
engine_flag VisitedSpawns, 5 ; cerulean ; $38
engine_flag VisitedSpawns, 6 ; rock tunnel
engine_flag VisitedSpawns, 7 ; vermilion
engine_flag VisitedSpawns + 1, 0 ; lavender
engine_flag VisitedSpawns + 1, 1 ; saffron
engine_flag VisitedSpawns + 1, 2 ; celadon
@ -88,6 +88,7 @@ ENDM
engine_flag VisitedSpawns + 1, 6 ; new bark
engine_flag VisitedSpawns + 1, 7 ; cherrygrove
engine_flag VisitedSpawns + 2, 0 ; violet
; union cave
engine_flag VisitedSpawns + 2, 2 ; azalea
engine_flag VisitedSpawns + 2, 3 ; cianwood
engine_flag VisitedSpawns + 2, 4 ; goldenrod
@ -97,6 +98,7 @@ ENDM
engine_flag VisitedSpawns + 3, 0 ; lake of rage
engine_flag VisitedSpawns + 3, 1 ; blackthorn
engine_flag VisitedSpawns + 3, 2 ; silver cave
; fast ship
engine_flag VisitedSpawns + 3, 4 ; unused
engine_flag wLuckyNumberShowFlag, 0 ; lucky number show
@ -157,7 +159,7 @@ ENDM
engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget
engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece
engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see bittable1 $032b-e)
engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see EVENT_WADE_HAS_*** in constants/event_flags.asm)
engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80
engine_flag wDailyPhoneItemFlags, 4 ; alan has fire stone
engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone
@ -165,7 +167,7 @@ ENDM
engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone
engine_flag wDailyPhoneItemFlags + 1, 0 ; tiffany has pink bow
engine_flag wDailyPhoneItemFlags + 1, 1 ; wilton has item (see bittable1 $032f-31)
engine_flag wDailyPhoneItemFlags + 1, 1 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm)
engine_flag wDailyPhoneTimeOfDayFlags, 0
engine_flag wDailyPhoneTimeOfDayFlags, 1 ; $88

2
engine/events.asm
View File

@ -511,7 +511,7 @@ CheckTimeEvents: ; 9693a
jr nz, .nothing
ld hl, StatusFlags2
bit 2, [hl]
bit 2, [hl] ; bug contest
jr z, .do_daily
callba CheckBugContestTimer

4
engine/events_2.asm
View File

@ -3,8 +3,8 @@
WarpToSpawnPoint:: ; 97c28
ld hl, StatusFlags2
res 1, [hl]
res 2, [hl]
res 1, [hl] ; ??
res 2, [hl] ; bug contest
ret
; 97c30

2
engine/flypoints.asm
View File

@ -496,7 +496,7 @@ Function91d9b: ; 91d9b
.asm_91db7
ld a, [StatusFlags]
bit 6, a
bit 6, a ; hall of fame
ret z
ld a, [hWY]
and a

6
engine/map_objects.asm
View File

@ -717,7 +717,7 @@ Function46a6: ; 46a6
ld e, a
push bc
call Function2a3c
call GetCoordTile
pop bc
ld hl, OBJECT_STANDING_TILE
@ -922,7 +922,7 @@ Function47bc: ; 47bc
add hl, bc
ld e, [hl]
push bc
call Function2a3c
call GetCoordTile
pop bc
ld hl, OBJECT_STANDING_TILE
add hl, bc
@ -2874,7 +2874,7 @@ Function5688: ; 5688
ld hl, OBJECT_MAP_Y
add hl, bc
ld e, [hl]
call Function2a3c
call GetCoordTile
pop bc
ld hl, OBJECT_STANDING_TILE
add hl, bc

1480
engine/overworld.asm Executable file
View File

File diff suppressed because it is too large Load Diff

8
engine/pokedex.asm
View File

@ -65,12 +65,8 @@ InitPokedex: ; 40063
call ClearTileMap
call Function414b7
ld hl, wc6d0
IF DEF(CRYSTAL11)
ld bc, $0116
ELSE
ld bc, $0115
ENDC
ld hl, wPokedexDataStart
ld bc, wPokedexDataEnd - wPokedexDataStart
xor a
call ByteFill

4166
engine/sprites.asm
View File

File diff suppressed because it is too large Load Diff

20
event/mom.asm
View File

@ -45,11 +45,11 @@ endr
; 16254
.CheckIfBankInitialized: ; 16254
ld a, [wBankOfMomMode]
ld a, [wMomSavingMoney]
bit 7, a
jr nz, .savingmoneyalready
set 7, a
ld [wBankOfMomMode], a
ld [wMomSavingMoney], a
ld a, $1
jr .done_0
@ -75,7 +75,7 @@ endr
ld a, %10000000
.done_1
ld [wBankOfMomMode], a
ld [wMomSavingMoney], a
ld hl, UnknownText_0x16653
call PrintText
ld a, $8
@ -168,7 +168,7 @@ endr
ld de, StringBuffer2 + 3
ld bc, 3
call CopyBytes
ld bc, wd851
ld bc, wMomsMoney
ld de, StringBuffer2
callba GiveMoney
jr c, .CantDepositThatMuch
@ -176,7 +176,7 @@ endr
ld de, Money
callba TakeMoney
ld hl, StringBuffer2
ld de, wd851
ld de, wMomsMoney
ld bc, 3
call CopyBytes
ld de, SFX_TRANSACTION
@ -232,7 +232,7 @@ endr
ld de, StringBuffer2 + 3
ld bc, 3
call CopyBytes
ld de, wd851
ld de, wMomsMoney
ld bc, StringBuffer2
callba CompareMoney
jr c, .InsufficientFundsInBank
@ -241,7 +241,7 @@ endr
callba GiveMoney
jr c, .NotEnoughRoomInWallet
ld bc, StringBuffer2 + 3
ld de, wd851
ld de, wMomsMoney
callba TakeMoney
ld hl, StringBuffer2
ld de, Money
@ -279,7 +279,7 @@ endr
call YesNoBox
jr c, .StopSavingMoney
ld a, $81
ld [wBankOfMomMode], a
ld [wMomSavingMoney], a
ld hl, UnknownText_0x16685
call PrintText
ld a, $8
@ -288,7 +288,7 @@ endr
.StopSavingMoney
ld a, $80
ld [wBankOfMomMode], a
ld [wMomSavingMoney], a
ld a, $7
ld [wJumptableIndex], a
ret
@ -461,7 +461,7 @@ Function1651a: ; 1651a
ld de, String_16699
call PlaceString
hlcoord 12, 2
ld de, wd851
ld de, wMomsMoney
lb bc, PRINTNUM_MONEY | 3, 6
call PrintNum
hlcoord 1, 4

245
home/map.asm
View File

@ -1232,128 +1232,129 @@ UnmaskObject:: ; 271e
; 272a
Function272a:: ; 272a
ScrollMapDown:: ; 272a
hlcoord 0, 0
ld de, BGMapBuffer
call Function27b7
ld c, $28
call BackupBGMapRow
ld c, 2 * SCREEN_WIDTH
call FarCallScrollBGMapPalettes
ld a, [wd152]
ld a, [wBGMapAnchorLo]
ld e, a
ld a, [wd153]
ld a, [wBGMapAnchorHi]
ld d, a
call Function27d3
call UpdateBGMapRow
ld a, $1
ld [hBGMapUpdate], a
ret
; 2748
Function2748:: ; 2748
hlcoord 0, 16
ScrollMapUp:: ; 2748
hlcoord 0, SCREEN_HEIGHT - 2
ld de, BGMapBuffer
call Function27b7
ld c, $28
call BackupBGMapRow
ld c, 2 * SCREEN_WIDTH
call FarCallScrollBGMapPalettes
ld a, [wd152]
ld a, [wBGMapAnchorLo]
ld l, a
ld a, [wd153]
ld a, [wBGMapAnchorHi]
ld h, a
ld bc, $0200
add hl, bc
; cap d at VBGMap1 / $100
ld a, h
and $3
or $98
and %00000011
or VBGMap0 / $100
ld e, l
ld d, a
call Function27d3
call UpdateBGMapRow
ld a, $1
ld [hBGMapUpdate], a
ret
; 2771
Function2771:: ; 2771
ScrollMapLeft:: ; 2771
hlcoord 0, 0
ld de, BGMapBuffer
call Function27c0
ld c, $24
call BackupBGMapColumn
ld c, 2 * SCREEN_HEIGHT
call FarCallScrollBGMapPalettes
ld a, [wd152]
ld a, [wBGMapAnchorLo]
ld e, a
ld a, [wd153]
ld a, [wBGMapAnchorHi]
ld d, a
call Function27f8
call UpdateBGMapColumn
ld a, $1
ld [hBGMapUpdate], a
ret
; 278f
Function278f:: ; 278f
hlcoord 18, 0
ScrollMapRight:: ; 278f
hlcoord SCREEN_WIDTH - 2, 0
ld de, BGMapBuffer
call Function27c0
ld c, $24
call BackupBGMapColumn
ld c, 2 * SCREEN_HEIGHT
call FarCallScrollBGMapPalettes
ld a, [wd152]
ld a, [wBGMapAnchorLo]
ld e, a
and $e0
and %11100000
ld b, a
ld a, e
add $12
and $1f
add SCREEN_HEIGHT
and %00011111
or b
ld e, a
ld a, [wd153]
ld a, [wBGMapAnchorHi]
ld d, a
call Function27f8
call UpdateBGMapColumn
ld a, $1
ld [hBGMapUpdate], a
ret
; 27b7
Function27b7:: ; 27b7
ld c, $28
.asm_27b9
BackupBGMapRow:: ; 27b7
ld c, 2 * SCREEN_WIDTH
.loop
ld a, [hli]
ld [de], a
inc de
dec c
jr nz, .asm_27b9
jr nz, .loop
ret
; 27c0
Function27c0:: ; 27c0
ld c, $12
.asm_27c2
BackupBGMapColumn:: ; 27c0
ld c, SCREEN_HEIGHT
.loop
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
inc de
ld a, $13
ld a, SCREEN_WIDTH - 1
add l
ld l, a
jr nc, .asm_27cf
jr nc, .skip
inc h
.asm_27cf
.skip
dec c
jr nz, .asm_27c2
jr nz, .loop
ret
; 27d3
Function27d3:: ; 27d3
UpdateBGMapRow:: ; 27d3
ld hl, BGMapBufferPtrs
push de
call .asm_27df
call .iteration
pop de
ld a, $20
add e
ld e, a
.asm_27df
ld c, $a
.asm_27e1
.iteration
ld c, 10
.loop
ld a, e
ld [hli], a
ld a, d
@ -1369,16 +1370,16 @@ endr
or b
ld e, a
dec c
jr nz, .asm_27e1
ld a, $14
ld [$ffdc], a
jr nz, .loop
ld a, SCREEN_WIDTH
ld [hFFDC], a
ret
; 27f8
Function27f8:: ; 27f8
UpdateBGMapColumn:: ; 27f8
ld hl, BGMapBufferPtrs
ld c, $12
.asm_27fd
ld c, SCREEN_HEIGHT
.loop
ld a, e
ld [hli], a
ld a, d
@ -1386,72 +1387,81 @@ Function27f8:: ; 27f8
ld a, $20
add e
ld e, a
jr nc, .asm_280e
jr nc, .skip
inc d
; cap d at VBGMap1 / $100
ld a, d
and $3
or $98
or VBGMap0 / $100
ld d, a
.asm_280e
.skip
dec c
jr nz, .asm_27fd
ld a, $12
ld [$ffdc], a
jr nz, .loop
ld a, SCREEN_HEIGHT
ld [hFFDC], a
ret
; 2816
Function2816:: ; 2816
; unreferenced
ld hl, BGMapBuffer
ld bc, $0078
ld bc, SGBPredef - BGMapBuffer
xor a
call ByteFill
ret
; 2821
Function2821:: ; 2821
LoadTileset:: ; 2821
ld hl, TilesetAddress
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [TilesetBank]
ld e, a
ld a, [rSVBK]
push af
ld a, $6
ld [rSVBK], a
ld a, e
ld de, w6_d000
call FarDecompress
ld hl, w6_d000
ld de, VTiles2
ld bc, $60 tiles
call CopyBytes
ld a, [rVBK]
push af
ld a, $1
ld [rVBK], a
ld hl, w6_d600
ld de, VTiles2
ld bc, $60 tiles
call CopyBytes
pop af
ld [rVBK], a
pop af
ld [rSVBK], a
ld a, [wTileset]
cp $1
jr z, .asm_286f
cp $2
jr z, .asm_286f
cp $4
jr z, .asm_286f
jr .asm_2875
.asm_286f
ld a, [wTileset]
cp TILESET_JOHTO_1
jr z, .load_roof
cp TILESET_JOHTO_2
jr z, .load_roof
cp TILESET_BATTLE_TOWER_OUTSIDE
jr z, .load_roof
jr .skip_roof
.load_roof
callba LoadMapGroupRoof
.asm_2875
.skip_roof
xor a
ld [hTileAnimFrame], a
ret
@ -1497,40 +1507,40 @@ SaveScreen:: ; 289d
ld [hMapObjectIndexBuffer], a
ld a, [wd151]
and a
jr z, .asm_28cb
cp $1
jr z, .asm_28c0
cp $2
jr z, .asm_28d4
cp $3
jr z, .asm_28da
jr z, .down
cp UP
jr z, .up
cp LEFT
jr z, .left
cp RIGHT
jr z, .right
ret
.asm_28c0
.up
ld de, wdcbf
ld a, [hMapObjectIndexBuffer]
ld c, a
ld b, $0
add hl, bc
jr .asm_28ce
jr .vertical
.asm_28cb
.down
ld de, XCoord + 1
.asm_28ce
.vertical
ld b, $6
ld c, $4
jr Function28f7
.asm_28d4
.left
ld de, XCoord + 2
inc hl
jr .asm_28dd
jr .horizontal
.asm_28da
.right
ld de, XCoord + 1
.asm_28dd
.horizontal
ld b, $5
ld c, $5
jr Function28f7
@ -1543,54 +1553,56 @@ LoadNeighboringBlockData:: ; 28e3
ld l, a
ld a, [MapWidth]
add $6
ld [hMapObjectIndexBuffer], a
ld [hConnectionStripLength], a
ld de, XCoord + 1
ld b, $6
ld c, $5
Function28f7:: ; 28f7
.asm_28f7
.loop1
push bc
push hl
push de
.asm_28fa
.loop2
ld a, [de]
inc de
ld [hli], a
dec b
jr nz, .asm_28fa
jr nz, .loop2
pop de
ld a, e
add $6
ld e, a
jr nc, .asm_2908
jr nc, .okay
inc d
.asm_2908
.okay
pop hl
ld a, [hMapObjectIndexBuffer]
ld a, [hConnectionStripLength]
ld c, a
ld b, $0
add hl, bc
pop bc
dec c
jr nz, .asm_28f7
jr nz, .loop1
ret
; 2914
Function2914:: ; 2914
xor a
ld [TilePermissions], a
call Function296c
call Function294d
call GetLeftRightCollision
call GetUpDownCollision
; get coords of current tile
ld a, [PlayerMapX]
ld d, a
ld a, [PlayerMapY]
ld e, a
call Function2a3c
call GetCoordTile
ld [PlayerStandingTile], a
call Function29ff
ret nz
ld a, [PlayerStandingTile]
and 7
ld hl, .data_2945
@ -1610,37 +1622,41 @@ Function2914:: ; 2914
db 1, 2, 4, 8, 9, 10, 5, 6
; 294d
Function294d:: ; 294d
GetUpDownCollision:: ; 294d
ld a, [PlayerMapX]
ld d, a
ld a, [PlayerMapY]
ld e, a
push de
inc e
call Function2a3c
call GetCoordTile
ld [TileDown], a
call Function298b
pop de
dec e
call Function2a3c
call GetCoordTile
ld [TileUp], a
call Function29a8
ret
; 296c
Function296c:: ; 296c
GetLeftRightCollision:: ; 296c
ld a, [PlayerMapX]
ld d, a
ld a, [PlayerMapY]
ld e, a
push de
dec d
call Function2a3c
call GetCoordTile
ld [TileLeft], a
call Function29e2
pop de
inc d
call Function2a3c
call GetCoordTile
ld [TileRight], a
call Function29c5
ret
@ -1650,7 +1666,7 @@ Function298b:: ; 298b
call Function29ff
ret nz
ld a, [TileDown]
and $7
and 7
cp $2
jr z, .ok
cp $6
@ -1660,7 +1676,7 @@ Function298b:: ; 298b
.ok
ld a, [TilePermissions]
or $8
or FACE_DOWN
ld [TilePermissions], a
ret
; 29a8
@ -1669,7 +1685,7 @@ Function29a8:: ; 29a8
call Function29ff
ret nz
ld a, [TileUp]
and $7
and 7
cp $3
jr z, .ok
cp $4
@ -1679,7 +1695,7 @@ Function29a8:: ; 29a8
.ok
ld a, [TilePermissions]
or $4
or FACE_UP
ld [TilePermissions], a
ret
; 29c5
@ -1688,7 +1704,7 @@ Function29c5:: ; 29c5
call Function29ff
ret nz
ld a, [TileRight]
and $7
and 7
cp $1
jr z, .ok
cp $5
@ -1698,7 +1714,7 @@ Function29c5:: ; 29c5
.ok
ld a, [TilePermissions]
or $1
or FACE_RIGHT
ld [TilePermissions], a
ret
; 29e2
@ -1707,7 +1723,7 @@ Function29e2:: ; 29e2
call Function29ff
ret nz
ld a, [TileLeft]
and $7
and 7
cp $0
jr z, .ok
cp $4
@ -1717,7 +1733,7 @@ Function29e2:: ; 29e2
.ok
ld a, [TilePermissions]
or $2
or FACE_LEFT
ld [TilePermissions], a
ret
; 29ff
@ -1778,7 +1794,8 @@ endr
; 2a3c
Function2a3c:: ; 2a3c
GetCoordTile:: ; 2a3c
; Get the collision byte for tile d, e
call GetBlockLocation
ld a, [hl]
and a
@ -2065,7 +2082,7 @@ Function2bae:: ; 2bae
call SwitchToAnyMapBank
callba Function8c001
call OverworldTextModeSwitch
call Function2821
call LoadTileset
ld a, 9
call SkipMusic
pop af

2
home/palettes.asm
View File

@ -347,7 +347,9 @@ FarCallScrollBGMapPalettes:: ; dbd
push af
ld a, BANK(ScrollBGMapPalettes)
rst Bankswitch
call ScrollBGMapPalettes
pop af
rst Bankswitch
ret

1
hram.asm
View File

@ -96,6 +96,7 @@ hOAMUpdate EQU $ffd8
hSPBuffer EQU $ffd9
hBGMapUpdate EQU $ffdb
hFFDC EQU $ffdc
hMapAnims EQU $ffde
hTileAnimFrame EQU $ffdf

2979
main.asm
View File

File diff suppressed because it is too large Load Diff

146
maps/map_headers.asm
View File

@ -41,9 +41,9 @@ MapGroup1:
map_header Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_DAY, 1
map_header Route39Barn, TILESET_KURT_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, 1
map_header Route39Farmhouse, TILESET_HOUSE_1, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, 1
map_header Route38, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_AUTO, 1
map_header Route39, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_39, MUSIC_ROUTE_37, 0, PALETTE_AUTO, 1
map_header OlivineCity, TILESET_JOHTO_OUTSIDE_1, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, 1
map_header Route38, TILESET_JOHTO_1, ROUTE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_AUTO, 1
map_header Route39, TILESET_JOHTO_1, ROUTE, ROUTE_39, MUSIC_ROUTE_37, 0, PALETTE_AUTO, 1
map_header OlivineCity, TILESET_JOHTO_1, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, 1
MapGroup2:
@ -51,9 +51,9 @@ MapGroup2:
map_header MahoganyGym, TILESET_GYM_1, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, 1, PALETTE_DAY, 1
map_header MahoganyPokeCenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, 1
map_header Route42, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, 3
map_header Route44, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, 4
map_header MahoganyTown, TILESET_JOHTO_OUTSIDE_1, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, 1
map_header Route42, TILESET_JOHTO_1, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, 3
map_header Route44, TILESET_JOHTO_1, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, 4
map_header MahoganyTown, TILESET_JOHTO_1, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, 1
MapGroup3:
@ -78,7 +78,7 @@ MapGroup3:
map_header RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, 1<<7 | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, 1
map_header RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, 1<<7 | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, 1
map_header RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, 1<<7 | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, 1
map_header RuinsofAlphOutside, TILESET_JOHTO_OUTSIDE_1, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_AUTO, 4
map_header RuinsofAlphOutside, TILESET_JOHTO_1, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_AUTO, 4
map_header RuinsofAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, 1
map_header RuinsofAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, 1
map_header RuinsofAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, 1
@ -137,7 +137,7 @@ MapGroup3:
map_header DarkCaveVioletEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, 1, PALETTE_DARK, 3
map_header DarkCaveBlackthornEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, 1, PALETTE_DARK, 3
map_header DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, 1, PALETTE_NITE, 5
map_header DragonsDenB1F, TILESET_JOHTO_OUTSIDE_1, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, 1, PALETTE_NITE, 5
map_header DragonsDenB1F, TILESET_JOHTO_1, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, 1, PALETTE_NITE, 5
map_header DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, 1, PALETTE_NITE, 1
map_header TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, 1, PALETTE_NITE, 3
map_header DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, 1, PALETTE_NITE, 1
@ -159,7 +159,7 @@ MapGroup4:
map_header EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, 1
map_header EcruteakGym, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, 1, PALETTE_DAY, 1
map_header EcruteakItemfinderHouse, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, 1
map_header EcruteakCity, TILESET_JOHTO_OUTSIDE_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, 4
map_header EcruteakCity, TILESET_JOHTO_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, 4
MapGroup5:
@ -170,9 +170,9 @@ MapGroup5:
map_header BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, 1
map_header BlackthornPokeCenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header MoveDeletersHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, 1
map_header Route45, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_45, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 9
map_header Route46, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_46, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 1
map_header BlackthornCity, TILESET_JOHTO_OUTSIDE_1, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, 4
map_header Route45, TILESET_JOHTO_1, ROUTE, ROUTE_45, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 9
map_header Route46, TILESET_JOHTO_1, ROUTE, ROUTE_46, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 1
map_header BlackthornCity, TILESET_JOHTO_1, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, 4
MapGroup6:
@ -180,10 +180,10 @@ MapGroup6:
map_header CinnabarPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_DAY, 1
map_header SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, 1, PALETTE_DAY, 1
map_header Route19, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header Route20, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_20, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 2
map_header Route21, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_21, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 2
map_header CinnabarIsland, TILESET_KANTO_OUTSIDE, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, 2
map_header Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header Route20, TILESET_KANTO, ROUTE, ROUTE_20, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 2
map_header Route21, TILESET_KANTO, ROUTE, ROUTE_21, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 2
map_header CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, 2
MapGroup7:
@ -198,12 +198,12 @@ MapGroup7:
map_header Route10PokeCenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header PowerPlant, TILESET_POWER_PLANT, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, 1
map_header BillsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, 1
map_header Route4, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_4, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 0
map_header Route9, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_9, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 3
map_header Route10North, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_10, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 3
map_header Route24, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_24, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 3
map_header Route25, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_25, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 3
map_header CeruleanCity, TILESET_KANTO_OUTSIDE, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, 0
map_header Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 0
map_header Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 3
map_header Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 3
map_header Route24, TILESET_KANTO, ROUTE, ROUTE_24, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 3
map_header Route25, TILESET_KANTO, ROUTE, ROUTE_25, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 3
map_header CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, 0
MapGroup8:
@ -212,8 +212,8 @@ MapGroup8:
map_header AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, 1
map_header KurtsHouse, TILESET_KURT_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, 1
map_header AzaleaGym, TILESET_GYM_1, INDOOR, AZALEA_TOWN, MUSIC_GYM, 1, PALETTE_DAY, 1
map_header Route33, TILESET_JOHTO_OUTSIDE_2, ROUTE, ROUTE_33, MUSIC_ROUTE_30, 0, PALETTE_AUTO, 1
map_header AzaleaTown, TILESET_JOHTO_OUTSIDE_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, 1
map_header Route33, TILESET_JOHTO_2, ROUTE, ROUTE_33, MUSIC_ROUTE_30, 0, PALETTE_AUTO, 1
map_header AzaleaTown, TILESET_JOHTO_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, 1
MapGroup9:
@ -221,16 +221,16 @@ MapGroup9:
map_header LakeofRageMagikarpHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, 1
map_header Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, 1
map_header Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, 1
map_header Route43, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, 4
map_header LakeofRage, TILESET_JOHTO_OUTSIDE_1, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, 8
map_header Route43, TILESET_JOHTO_1, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, 4
map_header LakeofRage, TILESET_JOHTO_1, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, 8
MapGroup10:
map_header Route32, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_AUTO, 11
map_header Route35, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 4
map_header Route36, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 1
map_header Route37, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_37, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 1
map_header VioletCity, TILESET_JOHTO_OUTSIDE_1, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, 4
map_header Route32, TILESET_JOHTO_1, ROUTE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_AUTO, 11
map_header Route35, TILESET_JOHTO_1, ROUTE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 4
map_header Route36, TILESET_JOHTO_1, ROUTE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 1
map_header Route37, TILESET_JOHTO_1, ROUTE, ROUTE_37, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 1
map_header VioletCity, TILESET_JOHTO_1, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, 4
map_header VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, 1
map_header VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, 1, PALETTE_DAY, 1
map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, 1
@ -246,8 +246,8 @@ MapGroup10:
MapGroup11:
map_header Route34, TILESET_JOHTO_OUTSIDE_2, ROUTE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 1
map_header GoldenrodCity, TILESET_JOHTO_OUTSIDE_2, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_AUTO, 1
map_header Route34, TILESET_JOHTO_2, ROUTE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 1
map_header GoldenrodCity, TILESET_JOHTO_2, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_AUTO, 1
map_header GoldenrodGym, TILESET_GYM_1, INDOOR, GOLDENROD_CITY, MUSIC_GYM, 1, PALETTE_DAY, 1
map_header GoldenrodBikeShop, TILESET_OLIVINE_GYM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, 1
map_header GoldenrodHappinessRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, 1
@ -266,16 +266,16 @@ MapGroup11:
map_header GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, 1
map_header GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, 0, PALETTE_DAY, 1
map_header GoldenrodPokeCenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header GoldenrodPokeComCenter2FMobile, TILESET_GOLDENROD_POKECOM_CENTER_2F_MOBILE, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_DAY, 1
map_header Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_DAY, 1
map_header DayCare, TILESET_HOUSE_1, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, 1
MapGroup12:
map_header Route6, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 4
map_header Route11, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_11, MUSIC_ROUTE_12, 0, PALETTE_AUTO, 1
map_header VermilionCity, TILESET_KANTO_OUTSIDE, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_AUTO, 2
map_header Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 4
map_header Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, 0, PALETTE_AUTO, 1
map_header VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_AUTO, 2
map_header VermilionHouseFishingSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, 1
map_header VermilionPokeCenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header VermilionPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, 1
@ -289,8 +289,8 @@ MapGroup12:
MapGroup13:
map_header Route1, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_1, MUSIC_ROUTE_1, 0, PALETTE_AUTO, 1
map_header PalletTown, TILESET_KANTO_OUTSIDE, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_AUTO, 2
map_header Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, 0, PALETTE_AUTO, 1
map_header PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_AUTO, 2
map_header RedsHouse1F, TILESET_KRISS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, 1
map_header RedsHouse2F, TILESET_KRISS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, 1
map_header BluesHouse, TILESET_HOUSE_1, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, 1
@ -298,8 +298,8 @@ MapGroup13:
MapGroup14:
map_header Route3, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_3, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header PewterCity, TILESET_KANTO_OUTSIDE, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, 1
map_header Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, 1
map_header PewterNidoranSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, 1
map_header PewterGym, TILESET_SPROUT_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, 1, PALETTE_DAY, 1
map_header PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, 1
@ -318,13 +318,13 @@ MapGroup15:
map_header FastShipB1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, 1
map_header OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, 1
map_header VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, 1
map_header MountMoonSquare, TILESET_KANTO_OUTSIDE, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, 0, PALETTE_AUTO, 1
map_header MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, 0, PALETTE_AUTO, 1
map_header MountMoonGiftShop, TILESET_KURT_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, 1
map_header TinTowerRoof, TILESET_SPROUT_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_AUTO, 1
MapGroup16:
map_header Route23, TILESET_KANTO_OUTSIDE, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, 1
map_header Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, 1
map_header IndigoPlateauPokeCenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, 1
map_header WillsRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, 1
map_header KogasRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, 1
@ -335,11 +335,11 @@ MapGroup16:
MapGroup17:
map_header Route13, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_13, MUSIC_ROUTE_12, 0, PALETTE_AUTO, 13
map_header Route14, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_14, MUSIC_ROUTE_12, 0, PALETTE_AUTO, 1
map_header Route15, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_15, MUSIC_ROUTE_12, 0, PALETTE_AUTO, 1
map_header Route18, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_18, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header FuchsiaCity, TILESET_KANTO_OUTSIDE, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_AUTO, 8
map_header Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, 0, PALETTE_AUTO, 13
map_header Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, 0, PALETTE_AUTO, 1
map_header Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, 0, PALETTE_AUTO, 1
map_header Route18, TILESET_KANTO, ROUTE, ROUTE_18, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header FuchsiaCity, TILESET_KANTO, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_AUTO, 8
map_header FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, 1
map_header SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, 1
map_header FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, 1, PALETTE_DAY, 1
@ -351,10 +351,10 @@ MapGroup17:
MapGroup18:
map_header Route8, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_8, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header Route12, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_12, MUSIC_ROUTE_12, 0, PALETTE_AUTO, 13
map_header Route10South, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_10, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 3
map_header LavenderTown, TILESET_KANTO_OUTSIDE, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_AUTO, 1
map_header Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, 0, PALETTE_AUTO, 13
map_header Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 3
map_header LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_AUTO, 1
map_header LavenderPokeCenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header LavenderPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header MrFujisHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, 1
@ -368,8 +368,8 @@ MapGroup18:
MapGroup19:
map_header Route28, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, 4
map_header SilverCaveOutside, TILESET_KANTO_OUTSIDE, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, 4
map_header Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, 4
map_header SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, 4
map_header SilverCavePokeCenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header Route28FamousSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, 1
@ -384,10 +384,10 @@ MapGroup20:
MapGroup21:
map_header Route7, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_7, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header Route16, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_16, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header Route17, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 0
map_header CeladonCity, TILESET_KANTO_OUTSIDE, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_AUTO, 0
map_header Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 0
map_header CeladonCity, TILESET_KANTO, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_AUTO, 0
map_header CeladonDeptStore1F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, 1
map_header CeladonDeptStore2F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, 1
map_header CeladonDeptStore3F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, 1
@ -413,9 +413,9 @@ MapGroup21:
MapGroup22:
map_header Route40, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_40, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 1
map_header Route41, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_41, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 2
map_header CianwoodCity, TILESET_JOHTO_OUTSIDE_1, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, 1
map_header Route40, TILESET_JOHTO_1, ROUTE, ROUTE_40, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 1
map_header Route41, TILESET_JOHTO_1, ROUTE, ROUTE_41, MUSIC_ROUTE_36, 0, PALETTE_AUTO, 2
map_header CianwoodCity, TILESET_JOHTO_1, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, 1
map_header ManiasHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, 1
map_header CianwoodGym, TILESET_SPROUT_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, 1, PALETTE_DAY, 1
map_header CianwoodPokeCenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
@ -432,9 +432,9 @@ MapGroup22:
MapGroup23:
map_header Route2, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_2, MUSIC_ROUTE_2, 0, PALETTE_AUTO, 1
map_header Route22, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_22, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 4
map_header ViridianCity, TILESET_KANTO_OUTSIDE, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, 4
map_header Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, 0, PALETTE_AUTO, 1
map_header Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 4
map_header ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, 4
map_header ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, 1, PALETTE_DAY, 1
map_header ViridianNicknameSpeechHouse, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, 1
map_header TrainerHouse1F, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, 1
@ -448,10 +448,10 @@ MapGroup23:
MapGroup24:
map_header Route26, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_26, MUSIC_ROUTE_26, 0, PALETTE_AUTO, 2
map_header Route27, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_27, MUSIC_ROUTE_26, 0, PALETTE_AUTO, 2
map_header Route29, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_AUTO, 1
map_header NewBarkTown, TILESET_JOHTO_OUTSIDE_1, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_AUTO, 2
map_header Route26, TILESET_JOHTO_1, ROUTE, ROUTE_26, MUSIC_ROUTE_26, 0, PALETTE_AUTO, 2
map_header Route27, TILESET_JOHTO_1, ROUTE, ROUTE_27, MUSIC_ROUTE_26, 0, PALETTE_AUTO, 2
map_header Route29, TILESET_JOHTO_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_AUTO, 1
map_header NewBarkTown, TILESET_JOHTO_1, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_AUTO, 2
map_header ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, 0, PALETTE_DAY, 1
map_header KrissHouse1F, TILESET_KRISS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, 1
map_header KrissHouse2F, TILESET_KRISS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, 1
@ -464,8 +464,8 @@ MapGroup24:
MapGroup25:
map_header Route5, TILESET_KANTO_OUTSIDE, ROUTE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header SaffronCity, TILESET_KANTO_OUTSIDE, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, 1
map_header Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_AUTO, 1
map_header SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, 1
map_header FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, 1
map_header SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, 1, PALETTE_DAY, 1
map_header SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, 1
@ -482,9 +482,9 @@ MapGroup25:
MapGroup26:
map_header Route30, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_30, MUSIC_ROUTE_30, 0, PALETTE_AUTO, 4
map_header Route31, TILESET_JOHTO_OUTSIDE_1, ROUTE, ROUTE_31, MUSIC_ROUTE_30, 0, PALETTE_AUTO, 4
map_header CherrygroveCity, TILESET_JOHTO_OUTSIDE_1, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, 1
map_header Route30, TILESET_JOHTO_1, ROUTE, ROUTE_30, MUSIC_ROUTE_30, 0, PALETTE_AUTO, 4
map_header Route31, TILESET_JOHTO_1, ROUTE, ROUTE_31, MUSIC_ROUTE_30, 0, PALETTE_AUTO, 4
map_header CherrygroveCity, TILESET_JOHTO_1, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, 1
map_header CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, 1
map_header CherrygrovePokeCenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, 1
map_header CherrygroveGymSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, 1

308
predef/cgb.asm
View File

@ -34,40 +34,40 @@ Predef_LoadSGBLayoutCGB: ; 8d59
; 8d7a
.jumptable: ; 8d7a
dw Function8db8
dw Function8ddb
dw Function8eb9
dw Function8edb
dw Function8f70
dw Function906e
dw Function90f8
dw Function9122
dw Function91ad
dw Function91c8
dw Function91d1
dw Function91e4
dw Function9228
dw Function9251
dw Function9373
dw Function93a6
dw Function93ba
dw Function9195
dw Function9499
dw Function94d0
dw Function93d3
dw Function9289
dw Function903e
dw Function8fca
dw Function925e
dw Function94fa
dw Function9529
dw Function9555
dw Function9578
dw Function9591
dw Function9542
dw _CGB00
dw _CGB01
dw _CGB02
dw _CGB03
dw _CGB04
dw _CGB05
dw _CGB06
dw _CGB07
dw _CGB08
dw _CGB09
dw _CGB0a
dw _CGB0b
dw _CGB0c
dw _CGB0d
dw _CGB0e
dw _CGB0f
dw _CGB10
dw _CGB11
dw _CGB12
dw _CGB13
dw _CGB14
dw _CGB15
dw _CGB16
dw _CGB17
dw _CGB18
dw _CGB19
dw _CGB1a
dw _CGB1b
dw _CGB1c
dw _CGB1d
dw _CGB1e
; 8db8
Function8db8: ; 8db8
_CGB00: ; 8db8
ld hl, PalPacket_9c66 + 1
ld de, wMapPals
ld c, $4
@ -82,7 +82,7 @@ Function8db8: ; 8db8
call CopyPalettes
jr Function8e23
Function8ddb: ; 8ddb
_CGB01: ; 8ddb
ld de, wMapPals
call Function9729
push hl
@ -126,25 +126,25 @@ Function8e23: ; 8e23
ld a, $2
call ByteFill
hlcoord 0, 4, AttrMap
ld bc, $080a
lb bc, 8, 10
ld a, $0
call Function9663
call FillBoxCGB
hlcoord 10, 0, AttrMap
ld bc, $070a
lb bc, 7, 10
ld a, $1
call Function9663
call FillBoxCGB
hlcoord 0, 0, AttrMap
ld bc, $040a
lb bc, 4, 10
ld a, $2
call Function9663
call FillBoxCGB
hlcoord 10, 7, AttrMap
ld bc, $050a
lb bc, 5, 10
ld a, $3
call Function9663
call FillBoxCGB
hlcoord 10, 11, AttrMap
ld bc, $0109
lb bc, 1, 9
ld a, $4
call Function9663
call FillBoxCGB
hlcoord 0, 12, AttrMap
ld bc, $0078
ld a, $7
@ -189,7 +189,7 @@ Function8e9f: ; 8e9f
ret
; 8eb9
Function8eb9: ; 8eb9
_CGB02: ; 8eb9
ld a, [PlayerGender]
bit 0, a
jr z, .asm_8ec5
@ -210,7 +210,7 @@ Function8eb9: ; 8eb9
ret
; 8edb
Function8edb: ; 8edb
_CGB03: ; 8edb
ld de, wMapPals
ld a, [wcda1]
ld l, a
@ -234,25 +234,25 @@ endr
call FarCopyWRAM
call Function9699
hlcoord 0, 0, AttrMap
ld bc, $0814
lb bc, 8, SCREEN_WIDTH
ld a, $1
call Function9663
call FillBoxCGB
hlcoord 10, 16, AttrMap
ld bc, $000a
ld a, $2
call ByteFill
hlcoord 13, 5, AttrMap
ld bc, $0202
lb bc, 2, 2
ld a, $3
call Function9663
call FillBoxCGB
hlcoord 15, 5, AttrMap
ld bc, $0202
lb bc, 2, 2
ld a, $4
call Function9663
call FillBoxCGB
hlcoord 17, 5, AttrMap
ld bc, $0202
lb bc, 2, 2
ld a, $5
call Function9663
call FillBoxCGB
call Function96b3
call Function96a4
ld a, $1
@ -285,7 +285,7 @@ Unknown_8f6a: ; 8f6a
RGB 17, 31, 31
; 8f70
Function8f70: ; 8f70
_CGB04: ; 8f70
ld de, wMapPals
ld a, $1d
call GetAthPalletFromPalettes9df6
@ -304,9 +304,9 @@ Function8f70: ; 8f70
.asm_8f90
call Function9699
hlcoord 1, 1, AttrMap
ld bc, $0707
lb bc, 7, 7
ld a, $1
call Function9663
call FillBoxCGB
call Function971a
ld hl, Palette8fc2
ld de, Unkn2Pals + $38
@ -333,7 +333,7 @@ Palette8fc2: ; 8fc2
RGB 00, 00, 00
; 8fca
Function8fca: ; 8fca
_CGB17: ; 8fca
ld de, wMapPals
ld a, $1d
call GetAthPalletFromPalettes9df6
@ -353,9 +353,9 @@ Function8fca: ; 8fca
.asm_8fed
call Function9699
hlcoord 1, 4, AttrMap
ld bc, $0707
lb bc, 7, 7
ld a, $1
call Function9663
call FillBoxCGB
call Function971a
call Function96b3
call Function96a4
@ -376,9 +376,9 @@ Function9009: ; 9009
.asm_901a
call Function9699
hlcoord 1, 1, AttrMap
ld bc, $0707
lb bc, 7, 7
ld a, $1
call Function9663
call FillBoxCGB
call Function971a
call Function96b3
call Function96a4
@ -394,7 +394,7 @@ Palette9036: ; 9036
RGB 00, 00, 00
; 903e
Function903e: ; 903e
_CGB16: ; 903e
ld de, wMapPals
ld a, $1d
call GetAthPalletFromPalettes9df6
@ -404,9 +404,9 @@ Function903e: ; 903e
call Function9643
call Function9699
hlcoord 7, 5, AttrMap
ld bc, $0707
lb bc, 7, 7
ld a, $1
call Function9663
call FillBoxCGB
call Function971a
call Function96b3
call Function96a4
@ -415,7 +415,7 @@ Function903e: ; 903e
ret
; 906e
Function906e: ; 906e
_CGB05: ; 906e
ld hl, Palettes_b7a9
ld de, wMapPals
ld bc, $0080
@ -423,41 +423,41 @@ Function906e: ; 906e
call FarCopyWRAM
call Function9699
hlcoord 0, 2, AttrMap
ld bc, $0a03
lb bc, 10, 3
ld a, $2
call Function9663
call FillBoxCGB
hlcoord 17, 2, AttrMap
ld bc, $0a03
lb bc, 10, 3
ld a, $2
call Function9663
call FillBoxCGB
hlcoord 0, 4, AttrMap
ld bc, $0603
lb bc, 6, 3
ld a, $3
call Function9663
call FillBoxCGB
hlcoord 17, 4, AttrMap
ld bc, $0603
lb bc, 6, 3
ld a, $3
call Function9663
call FillBoxCGB
hlcoord 0, 6, AttrMap
ld bc, $0203
lb bc, 2, 3
ld a, $4
call Function9663
call FillBoxCGB
hlcoord 17, 6, AttrMap
ld bc, $0203
lb bc, 2, 3
ld a, $4
call Function9663
call FillBoxCGB
hlcoord 4, 2, AttrMap
ld bc, $020c
lb bc, 2, 12
ld a, $1
call Function9663
call FillBoxCGB
hlcoord 3, 2, AttrMap
ld bc, $0a01
lb bc, 10, 1
ld a, $1
call Function9663
call FillBoxCGB
hlcoord 16, 2, AttrMap
ld bc, $0a01
lb bc, 10, 1
ld a, $1
call Function9663
call FillBoxCGB
hlcoord 0, 12, AttrMap
ld bc, $0078
ld a, $7
@ -469,7 +469,7 @@ Function906e: ; 906e
ret
; 90f8
Function90f8: ; 90f8
_CGB06: ; 90f8
ld hl, PalPacket_9ca6 + 1
call CopyFourPalettes
call Function9699
@ -478,9 +478,9 @@ Function90f8: ; 90f8
call GetAthPalletFromPalettes9df6
call LoadHLPaletteIntoDE
hlcoord 0, 6, AttrMap
ld bc, $0c14
lb bc, 12, SCREEN_WIDTH
ld a, $1
call Function9663
call FillBoxCGB
call Function96b3
call Function96a4
ld a, $1
@ -488,7 +488,7 @@ Function90f8: ; 90f8
ret
; 9122
Function9122: ; 9122
_CGB07: ; 9122
ld b, 0
ld hl, Jumptable_912d
rept 2
@ -561,7 +561,7 @@ Function9180: ; 9180
ret
; 9195
Function9195: ; 9195
_CGB11: ; 9195
ld hl, Palettes_b789
ld de, wMapPals
ld bc, $0028
@ -573,7 +573,7 @@ Function9195: ; 9195
ret
; 91ad
Function91ad: ; 91ad
_CGB08: ; 91ad
ld hl, Palettes_b641
ld de, wMapPals
ld bc, $0080
@ -586,14 +586,14 @@ Function91ad: ; 91ad
ret
; 91c8
Function91c8: ; 91c8
_CGB09: ; 91c8
call Functionb1de
ld a, $9
ld [SGBPredef], a
ret
; 91d1
Function91d1: ; 91d1
_CGB0a: ; 91d1
ld hl, PalPacket_9c56 + 1
call CopyFourPalettes
call Function8e9f
@ -603,7 +603,7 @@ Function91d1: ; 91d1
ret
; 91e4
Function91e4: ; 91e4
_CGB0b: ; 91e4
ld de, wMapPals
ld a, c
and a
@ -638,7 +638,7 @@ Function91e4: ; 91e4
ret
; 9228
Function9228: ; 9228
_CGB0c: ; 9228
ld hl, Palettes_b6f1
ld de, wMapPals
ld bc, $0028
@ -657,7 +657,7 @@ Function9228: ; 9228
ret
; 9251
Function9251: ; 9251
_CGB0d: ; 9251
ld hl, PalPacket_9cb6 + 1
call CopyFourPalettes
call Function9699
@ -665,7 +665,7 @@ Function9251: ; 9251
ret
; 925e
Function925e: ; 925e
_CGB18: ; 925e
ld hl, PalPacket_9bc6 + 1
call CopyFourPalettes
ld de, Unkn2Pals
@ -688,7 +688,7 @@ Function925e: ; 925e
ret
; 9289
Function9289: ; 9289
_CGB15: ; 9289
ld de, wMapPals
xor a
call Function976b
@ -728,7 +728,7 @@ Function9289: ; 9289
.asm_92e3
call ByteFill
hlcoord 14, 1, AttrMap
ld bc, $0705
lb bc, 7, 5
ld a, [PlayerGender]
and a
ld a, $0
@ -736,45 +736,45 @@ Function9289: ; 9289
ld a, $1
.asm_92f6
call Function9663
call FillBoxCGB
hlcoord 18, 1, AttrMap
ld [hl], $1
hlcoord 2, 11, AttrMap
ld bc, $0204
lb bc, 2, 4
ld a, $1
call Function9663
call FillBoxCGB
hlcoord 6, 11, AttrMap
ld bc, $0204
lb bc, 2, 4
ld a, $2
call Function9663
call FillBoxCGB
hlcoord 10, 11, AttrMap
ld bc, $0204
lb bc, 2, 4
ld a, $3
call Function9663
call FillBoxCGB
hlcoord 14, 11, AttrMap
ld bc, $0204
lb bc, 2, 4
ld a, $4
call Function9663
call FillBoxCGB
hlcoord 2, 14, AttrMap
ld bc, $0204
lb bc, 2, 4
ld a, $5
call Function9663
call FillBoxCGB
hlcoord 6, 14, AttrMap
ld bc, $0204
lb bc, 2, 4
ld a, $6
call Function9663
call FillBoxCGB
hlcoord 10, 14, AttrMap
ld bc, $0204
lb bc, 2, 4
ld a, $7
call Function9663
call FillBoxCGB
ld a, [PlayerGender]
and a
push af
jr z, .asm_935d
hlcoord 14, 14, AttrMap
ld bc, $0204
lb bc, 2, 4
ld a, $1
call Function9663
call FillBoxCGB
.asm_935d
pop af
@ -793,7 +793,7 @@ Function9289: ; 9289
ret
; 9373
Function9373: ; 9373
_CGB0e: ; 9373
ld de, wMapPals
ld a, $10
call GetAthPalletFromPalettes9df6
@ -809,9 +809,9 @@ endr
call Function9643
call Function9699
hlcoord 11, 1, AttrMap
ld bc, $0209
lb bc, 2, 9
ld a, $1
call Function9663
call FillBoxCGB
call Function96b3
call Function96a4
ld a, $1
@ -819,7 +819,7 @@ endr
ret
; 93a6
Function93a6: ; 93a6
_CGB0f: ; 93a6
ld hl, PalPacket_9c46 + 1
call CopyFourPalettes
call Function9699
@ -830,7 +830,7 @@ Function93a6: ; 93a6
ret
; 93ba
Function93ba: ; 93ba
_CGB10: ; 93ba
ld de, wMapPals
ld a, $1d
call GetAthPalletFromPalettes9df6
@ -843,7 +843,7 @@ Function93ba: ; 93ba
ret
; 93d3
Function93d3: ; 93d3
_CGB14: ; 93d3
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
jr z, .asm_93e6
@ -865,25 +865,25 @@ Function93d3: ; 93d3
call FarCopyWRAM
call Function9699
hlcoord 0, 0, AttrMap
ld bc, $010a
lb bc, 1, 10
ld a, $1
call Function9663
call FillBoxCGB
hlcoord 10, 0, AttrMap
ld bc, $010a
lb bc, 1, 10
ld a, $2
call Function9663
call FillBoxCGB
hlcoord 7, 2, AttrMap
ld bc, $0901
lb bc, 9, 1
ld a, $3
call Function9663
call FillBoxCGB
hlcoord 0, 7, AttrMap
ld bc, $0305
lb bc, 3, 5
ld a, $4
call Function9663
call FillBoxCGB
hlcoord 0, 3, AttrMap
ld bc, $0305
lb bc, 3, 5
ld a, $5
call Function9663
call FillBoxCGB
call Function96b3
call Function96a4
ld a, $1
@ -945,8 +945,8 @@ Palettes_9469: ; 9469
RGB 00, 00, 00
; 9499
Function9499: ; 9499
call Function91c8
_CGB12: ; 9499
call _CGB09
ld de, $0014
hlcoord 0, 0, AttrMap
ld a, [wMenuBorderTopCoord]
@ -975,23 +975,23 @@ Function9499: ; 9499
inc a
ld c, a
ld a, $0
call Function9663
call FillBoxCGB
call Function96b3
ret
; 94d0
Function94d0: ; 94d0
_CGB13: ; 94d0
ld hl, PalPacket_9ba6 + 1
call CopyFourPalettes
call Function9699
hlcoord 0, 4, AttrMap
ld bc, $0a14
lb bc, 10, SCREEN_WIDTH
ld a, $2
call Function9663
call FillBoxCGB
hlcoord 0, 6, AttrMap
ld bc, $0614
lb bc, 6, SCREEN_WIDTH
ld a, $1
call Function9663
call FillBoxCGB
call Function96b3
call Function96a4
ld a, $1
@ -999,7 +999,7 @@ Function94d0: ; 94d0
ret
; 94fa
Function94fa: ; 94fa
_CGB19: ; 94fa
ld de, wMapPals
ld a, $4e
call GetAthPalletFromPalettes9df6
@ -1023,7 +1023,7 @@ Palette_9521: ; 9521
RGB 00, 00, 00
; 9529
Function9529: ; 9529
_CGB1a: ; 9529
ld de, wMapPals
ld a, [CurPartySpecies]
ld bc, TempMonDVs
@ -1035,7 +1035,7 @@ Function9529: ; 9529
ret
; 9542
Function9542: ; 9542
_CGB1e: ; 9542
ld de, wMapPals
ld a, [CurPartySpecies]
call Function9775
@ -1045,7 +1045,7 @@ Function9542: ; 9542
ret
; 9555
Function9555: ; 9555
_CGB1b: ; 9555
ld hl, PalPacket_9cc6 + 1
call CopyFourPalettes
ld hl, Palettes_b681
@ -1061,7 +1061,7 @@ Function9555: ; 9555
ret
; 9578
Function9578: ; 9578
_CGB1c: ; 9578
ld de, wMapPals
ld a, [CurPartySpecies]
ld bc, TempMonDVs
@ -1073,7 +1073,7 @@ Function9578: ; 9578
ret
; 9591
Function9591: ; 9591
_CGB1d: ; 9591
ld hl, Palette95e0
ld de, wMapPals
ld bc, $0010
@ -1082,25 +1082,25 @@ Function9591: ; 9591
call Function96a4
call Function9699
hlcoord 3, 7, AttrMap
ld bc, $080e
lb bc, 8, 14
ld a, $1
call Function9663
call FillBoxCGB
hlcoord 1, 5, AttrMap
ld bc, $0112
lb bc, 1, 18
ld a, $1
call Function9663
call FillBoxCGB
hlcoord 1, 16, AttrMap
ld bc, $0112
lb bc, 1, 18
ld a, $1
call Function9663
call FillBoxCGB
hlcoord 0, 0, AttrMap
ld bc, $1102
lb bc, 17, 2
ld a, $1
call Function9663
call FillBoxCGB
hlcoord 18, 5, AttrMap
ld bc, $0c01
lb bc, 12, 1
ld a, $1
call Function9663
call FillBoxCGB
call Function96b3
ret
; 95e0

25
predef/sgb.asm
View File

@ -33,12 +33,12 @@ Predef_LoadSGBLayout: ; 864c
dw .SGB05
dw .SGB06
dw .SGB07
dw .SGB08_1d
dw .SGB08
dw .SGB09
dw .SGB0a
dw .SGB0b
dw .SGB0c
dw .SGB0d_15
dw .SGB0d
dw .SGB0e
dw .SGB0f
dw .SGB10
@ -46,7 +46,7 @@ Predef_LoadSGBLayout: ; 864c
dw .SGB12
dw .SGB13
dw .SGB14
dw .SGB0d_15
dw .SGB15
dw .SGB16
dw .SGB17
dw .SGB18
@ -54,7 +54,7 @@ Predef_LoadSGBLayout: ; 864c
dw .SGB1a
dw .SGB1b
dw .SGB1c
dw .SGB08_1d
dw .SGB1d
dw .SGB1e
; 86ad
@ -67,10 +67,12 @@ Predef_LoadSGBLayout: ; 864c
.SGB01: ; 86b4
ld hl, BlkPacket_9aa6
call Function9809
ld hl, PalPacket_9ce6
ld de, wcda9
ld bc, $0010
call CopyBytes
ld a, [PlayerHPPal]
ld l, a
ld h, 0
@ -79,6 +81,7 @@ rept 2
endr
ld de, Palettes_a8be
add hl, de
ld a, [hli]
ld [wcda9 + 3], a
ld a, [hli]
@ -87,12 +90,14 @@ endr
ld [wcda9 + 5], a
ld a, [hl]
ld [wcda9 + 6], a
ld a, [EnemyHPPal]
ld l, a
ld h, $0
rept 2
add hl, hl
endr
ld de, Palettes_a8be
add hl, de
ld a, [hli]
@ -103,11 +108,14 @@ endr
ld [wcda9 + 11], a
ld a, [hl]
ld [wcda9 + 12], a
ld hl, PalPacket_9cf6
ld de, wcda9 + $10
ld bc, $0010
call CopyBytes
call Function9729
ld a, [hli]
ld [wcda9 + $13], a
ld a, [hli]
@ -125,6 +133,7 @@ endr
ld [wcda9 + $1b], a
ld a, [hl]
ld [wcda9 + $1c], a
ld hl, wcda9
ld de, wcda9 + $10
ld a, $1
@ -137,11 +146,13 @@ endr
ld de, wcda9
ld bc, $0010
call CopyBytes
ld hl, wcda9 + 1
ld [hl], $10
rept 2
inc hl
endr
ld a, [PlayerHPPal]
add $2f
ld [hl], a
@ -298,7 +309,8 @@ endr
ret
; 8860
.SGB08_1d: ; 8860
.SGB08:
.SGB1d: ; 8860
ld hl, PalPacket_9cb6
ld de, BlkPacket_9a86
ret
@ -414,7 +426,8 @@ endr
ret
; 891a
.SGB0d_15: ; 891a
.SGB0d:
.SGB15: ; 891a
ld hl, PalPacket_9cb6
ld de, BlkPacket_9a86
ret

47
wram.asm
View File

@ -357,7 +357,7 @@ TilePermissions:: ; c2fe
ds 1
SECTION "PARTY ICONS", WRAM0 [$c300]
SECTION "c300", WRAM0 [$c300]
; wc300 - wc313 is a 10x2 dictionary.
wDict_c300:: ds 10 * 2
ds wDict_c300 - @
@ -392,9 +392,10 @@ wc364:: ds 16 ; c364
wc374:: ds 16 ; c374
wc384:: ds 16 ; c384
wc394:: ds 16 ; c394
wc3a4:: ds 8 ; c3a4
wc3ac:: ds 8 ; c3ac
wc3a4:: ds 16 ; c3a4
; wPartyMonMenuIconAnimsEnd::
ds -8
wc3ac:: ds 8 ; c3ac
wc3b4:: ds 1 ; something to do with wc314
wc3b5:: ds 1
@ -411,6 +412,8 @@ wc3bd:: ds 1
wc3be:: ds 1
wc3bf:: ds 1
wc3c0:: ds 1
; wc300_data_end
wc3c1:: ds 11
wc3cc:: ds 1
wc3cd:: ds 31
@ -672,6 +675,7 @@ PlayerSpdLevel:: ; c6ce
PlayerSAtkLevel:: ; c6cf
ds 1
wc6d0::
wPokedexDataStart::
PlayerSDefLevel:: ; c6d0
ds 1
wc6d1::
@ -906,8 +910,8 @@ wc7d0:: ds 1
wc7d1:: ds 1
wc7d2:: ds 1
wc7d3:: ds 1
wc7d4:: ds 1
wc7d5:: ds 1
wc7d4:: ds 1 ; Index of the topmost visible item in a scrolling menu
wc7d5:: ds 1 ; Which row the cursor is at in a scrolling menu (0-6)
wc7d6:: ds 1
wc7d7:: ds 1
wc7d8:: ds 1
@ -925,8 +929,14 @@ wc7e3:: ds 1
wc7e4:: ds 1
IF DEF(CRYSTAL11)
wPokedexStatus::
ELSE
wPokedexDataEnd::
ENDC
ds 3
ds 1
IF DEF(CRYSTAL11)
wPokedexDataEnd::
ENDC
ds 2
wMiscEnd::
@ -1694,11 +1704,14 @@ wd14b:: ds 1
wd14c:: ds 1 ; used in FollowNotExact
wd14d:: ds 1 ; used in FollowNotExact
; Player movement
wd14e:: ds 1
wd14f:: ds 1
wd150:: ds 1
wd151:: ds 1
wBGMapAnchorLo::
wd152:: ds 1
wBGMapAnchorHi::
wd153:: ds 1
UsedSprites:: ds 64
@ -2174,8 +2187,8 @@ object_struct: MACRO
\1Action:: ds 1
\1Object12:: ds 1
\1Facing:: ds 1
\1StandingTile:: ds 1
\1NextTile:: ds 1
\1StandingTile:: ds 1 ; collision
\1NextTile:: ds 1 ; collision
\1MapX:: ds 1
\1MapY:: ds 1
\1NextMapX:: ds 1
@ -2262,17 +2275,31 @@ CurTimeOfDay:: ; d848
wSecretID:: ds 1
wd84b:: ds 1
StatusFlags:: ; d84c
; 0 - pokedex
; 1 - unown dex
; 2 -
; 3 - pokerus
; 4 - rocket signal
; 5 - wild encounters on/off
; 6 - hall of fame
; 7 - bug contest on
ds 1
StatusFlags2:: ; d84d
; 0 - rockets
; 1 -
; 2 - bug contest timer
; 3 -
; 4 - bike shop call
; 5 - pokerus
; 6 - berry juice?
; 7 - rockets in mahogany
ds 1
Money:: ; d84e
ds 3
wd851::
wMomsMoney:: ; d851
ds 3
wBankOfMomMode::
wMomSavingMoney:: ; d854
ds 1