pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

more map attribute getters and some cleanup in home/map.asm

Browse Source
This commit is contained in:
yenatch 2013-12-11 21:42:56 -05:00
parent d461689704
commit 418878d932
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
home/map.asm
View File

@ -96,21 +96,22 @@ Function2173: ; 2173
Function217a: ; 217a Function217a: ; 217a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, [TilesetBlocksBank] ld a, [TilesetBlocksBank]
rst Bankswitch rst Bankswitch
call Function2198 call Function2198
ld a, $60 ld a, $60
ld hl, TileMap ld hl, TileMap
ld bc, $0168 ld bc, TileMapEnd - TileMap
call ByteFill call ByteFill
ld a, $13 ld a, $13
rst Bankswitch rst Bankswitch
call $515b call $515b
pop af pop af
rst Bankswitch rst Bankswitch
ret ret
; 2198 ; 2198
@ -412,7 +413,7 @@ Function2317: ; 2317
Function2326: ; 2326 Function2326: ; 2326
call Function2c3d call Function2c3d
call Function2c1c call SwitchToMapBank
call GetSecondaryMapHeaderPointer call GetSecondaryMapHeaderPointer
call Function235c call Function235c
call Function2368 call Function2368
@ -473,26 +474,26 @@ Function2368: ; 2368
jr z, .asm_2384 jr z, .asm_2384
ld de, NorthMapConnection ld de, NorthMapConnection
call GetMapConnection call GetMapConnection
.asm_2384 .asm_2384
bit 2, b bit 2, b
jr z, .asm_238e jr z, .asm_238e
ld de, SouthMapConnection ld de, SouthMapConnection
call GetMapConnection call GetMapConnection
.asm_238e .asm_238e
bit 1, b bit 1, b
jr z, .asm_2398 jr z, .asm_2398
ld de, WestMapConnection ld de, WestMapConnection
call GetMapConnection call GetMapConnection
.asm_2398 .asm_2398
bit 0, b bit 0, b
jr z, .asm_23a2 jr z, .asm_23a2
ld de, EastMapConnection ld de, EastMapConnection
call GetMapConnection call GetMapConnection
.asm_23a2 .asm_23a2
ret ret
; 23a3 ; 23a3
@ -712,8 +713,8 @@ Function24ba: ; 24ba
Function24cd: ; 24cd Function24cd: ; 24cd
ld hl, OverworldMap ld hl, OverworldMap
ld bc, $0514 ld bc, OverworldMapEnd - OverworldMap
ld a, $0 ld a, 0
call ByteFill call ByteFill
call Function24e4 call Function24e4
call FillMapConnections call FillMapConnections
@ -727,17 +728,18 @@ Function24cd: ; 24cd
Function24e4: ; 24e4 Function24e4: ; 24e4
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld hl, OverworldMap ld hl, OverworldMap
ld a, [MapWidth] ld a, [MapWidth]
ld [hConnectedMapWidth], a ld [hConnectedMapWidth], a
add $6 add $6
ld [hConnectionStripLength], a ld [hConnectionStripLength], a
ld c, a ld c, a
ld b, $0 ld b, 0
add hl, bc add hl, bc
add hl, bc add hl, bc
add hl, bc add hl, bc
ld c, $3 ld c, 3
add hl, bc add hl, bc
ld a, [MapBlockDataBank] ld a, [MapBlockDataBank]
rst Bankswitch rst Bankswitch
@ -764,13 +766,12 @@ Function24e4: ; 24e4
ld l, a ld l, a
jr nc, .asm_251e jr nc, .asm_251e
inc h inc h
.asm_251e .asm_251e
dec b dec b
jr nz, .asm_250c jr nz, .asm_250c
pop af pop af
rst Bankswitch rst Bankswitch
ret ret
; 2524 ; 2524
@ -1052,6 +1053,7 @@ Function2674: ; 2674
Function269a: ; 269a Function269a: ; 269a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, b ld a, b
rst Bankswitch rst Bankswitch
@ -1065,9 +1067,9 @@ Function269a: ; 269a
call PrintTextBoxText call PrintTextBoxText
xor a xor a
ld [hOAMUpdate], a ld [hOAMUpdate], a
pop af pop af
rst Bankswitch rst Bankswitch
ret ret
; 26b7 ; 26b7
@ -2012,7 +2014,7 @@ Function2bae: ; 2bae
ld b, a ld b, a
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
call Function2c24 call SwitchToAnyMapBank
callba Function8c001 callba Function8c001
call Function2173 call Function2173
call Function2821 call Function2821
@ -2102,28 +2104,28 @@ GetAnyMapHeaderMember: ; 0x2c0c
; 0x2c1c ; 0x2c1c
Function2c1c: ; 2c1c SwitchToMapBank: ; 2c1c
ld a, [MapGroup] ld a, [MapGroup]
ld b, a ld b, a
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
; 2c24 ; 2c24
Function2c24: ; 2c24 SwitchToAnyMapBank: ; 2c24
call Function2c31 call GetAnyMapBank
rst Bankswitch rst Bankswitch
ret ret
; 2c29 ; 2c29
Function2c29: ; 2c29 GetMapBank: ; 2c29
ld a, [MapGroup] ld a, [MapGroup]
ld b, a ld b, a
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
; 2c31 ; 2c31
Function2c31: ; 2c31 GetAnyMapBank: ; 2c31
push hl push hl
push de push de
ld de, $0000 ld de, $0000
@ -2220,7 +2222,7 @@ Function2c98: ; 2c98
ret ret
; 2c99 ; 2c99
Function2c99: ; 2c99 GetAnyMapPermission: ; 2c99
push hl push hl
push de push de
push bc push bc
@ -2233,7 +2235,7 @@ Function2c99: ; 2c99
ret ret
; 2ca7 ; 2ca7
Function2ca7: ; 2ca7 GetAnyMapTileset: ; 2ca7
ld de, $0001 ld de, $0001
call GetAnyMapHeaderMember call GetAnyMapHeaderMember
ld a, c ld a, c

6
main.asm
View File

@ -106615,7 +106615,7 @@ Function1046df: ; 1046df (41:46df)
ld b, a ld b, a
ld a, [$d148] ld a, [$d148]
ld c, a ld c, a
call Function2c99 call GetAnyMapPermission
call CheckIndoorMap call CheckIndoorMap
ret nz ret nz
ld a, [$d14a] ld a, [$d14a]
@ -106644,14 +106644,14 @@ Function104718: ; 104718 (41:4718)
ld b, a ld b, a
ld a, [$d148] ld a, [$d148]
ld c, a ld c, a
call Function2c99 call GetAnyMapPermission
call CheckIndoorMap call CheckIndoorMap
ret nz ret nz
ld a, [$d147] ld a, [$d147]
ld b, a ld b, a
ld a, [$d148] ld a, [$d148]
ld c, a ld c, a
call Function2ca7 call GetAnyMapTileset
ld a, c ld a, c
cp $7 cp $7
jr z, .asm_104743 jr z, .asm_104743

2
wram.asm
View File

@ -377,7 +377,7 @@ SpritesEnd:
TileMap: ; c4a0 TileMap: ; c4a0
; 20x18 grid of 8x8 tiles ; 20x18 grid of 8x8 tiles
ds 360 ds 360
TileMapEnd:
SECTION "BattleMons",WRAM0[$c608] SECTION "BattleMons",WRAM0[$c608]