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

more landmark constants and rename FlypointPerms -> VisitedSpawns

Browse Source
This commit is contained in:
yenatch 2013-11-29 00:38:22 -05:00
parent 400ced34f0
commit b18beef4d5
3 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
engine/engine_flags.asm
View File

@ -69,33 +69,33 @@
dwb UnlockedUnowns, %10000000 ; 8 dwb UnlockedUnowns, %10000000 ; 8
; fly ; fly
dwb FlypointPerms, %00000001 ; your house dwb VisitedSpawns, %00000001 ; your house
dwb FlypointPerms, %00000010 ; viridian pokecenter dwb VisitedSpawns, %00000010 ; viridian pokecenter
dwb FlypointPerms, %00000100 ; pallet dwb VisitedSpawns, %00000100 ; pallet
dwb FlypointPerms, %00001000 ; viridian dwb VisitedSpawns, %00001000 ; viridian
dwb FlypointPerms, %00010000 ; pewter dwb VisitedSpawns, %00010000 ; pewter
dwb FlypointPerms, %00100000 ; cerulean ; $38 dwb VisitedSpawns, %00100000 ; cerulean ; $38
dwb FlypointPerms, %01000000 ; rock tunnel dwb VisitedSpawns, %01000000 ; rock tunnel
dwb FlypointPerms, %10000000 ; vermilion dwb VisitedSpawns, %10000000 ; vermilion
dwb FlypointPerms + 1, %00000001 ; lavender dwb VisitedSpawns + 1, %00000001 ; lavender
dwb FlypointPerms + 1, %00000010 ; saffron dwb VisitedSpawns + 1, %00000010 ; saffron
dwb FlypointPerms + 1, %00000100 ; celadon dwb VisitedSpawns + 1, %00000100 ; celadon
dwb FlypointPerms + 1, %00001000 ; fuchsia dwb VisitedSpawns + 1, %00001000 ; fuchsia
dwb FlypointPerms + 1, %00010000 ; cinnabar dwb VisitedSpawns + 1, %00010000 ; cinnabar
dwb FlypointPerms + 1, %00100000 ; indigo plateau ; $40 dwb VisitedSpawns + 1, %00100000 ; indigo plateau ; $40
dwb FlypointPerms + 1, %01000000 ; new bark dwb VisitedSpawns + 1, %01000000 ; new bark
dwb FlypointPerms + 1, %10000000 ; cherrygrove dwb VisitedSpawns + 1, %10000000 ; cherrygrove
dwb FlypointPerms + 2, %00000001 ; violet dwb VisitedSpawns + 2, %00000001 ; violet
dwb FlypointPerms + 2, %00000100 ; azalea dwb VisitedSpawns + 2, %00000100 ; azalea
dwb FlypointPerms + 2, %00001000 ; cianwood dwb VisitedSpawns + 2, %00001000 ; cianwood
dwb FlypointPerms + 2, %00010000 ; goldenrod dwb VisitedSpawns + 2, %00010000 ; goldenrod
dwb FlypointPerms + 2, %00100000 ; olivine dwb VisitedSpawns + 2, %00100000 ; olivine
dwb FlypointPerms + 2, %01000000 ; ecruteak ; $48 dwb VisitedSpawns + 2, %01000000 ; ecruteak ; $48
dwb FlypointPerms + 2, %10000000 ; mahogany dwb VisitedSpawns + 2, %10000000 ; mahogany
dwb FlypointPerms + 3, %00000001 ; lake of rage dwb VisitedSpawns + 3, %00000001 ; lake of rage
dwb FlypointPerms + 3, %00000010 ; blackthorn dwb VisitedSpawns + 3, %00000010 ; blackthorn
dwb FlypointPerms + 3, %00000100 ; silver cave dwb VisitedSpawns + 3, %00000100 ; silver cave
dwb FlypointPerms + 3, %00010000 ; unused dwb VisitedSpawns + 3, %00010000 ; unused
dwb $dc9d, %00000001 ; lucky number show dwb $dc9d, %00000001 ; lucky number show
dwb $d84d, %00001000 dwb $d84d, %00001000

30
main.asm
View File

@ -130,10 +130,10 @@ IsInJohto: ; 2f17
ld c, a ld c, a
call GetWorldMapLocation call GetWorldMapLocation
cp $5f ; SS Aqua cp FAST_SHIP
jr z, .Johto jr z, .Johto
cp $0 ; Poke Center 2F cp SPECIAL_MAP
jr nz, .CheckRegion jr nz, .CheckRegion
ld a, [BackupMapGroup] ld a, [BackupMapGroup]
@ -143,7 +143,7 @@ IsInJohto: ; 2f17
call GetWorldMapLocation call GetWorldMapLocation
.CheckRegion .CheckRegion
cp $2f ; Pallet Town cp KANTO_LANDMARK
jr nc, .Kanto jr nc, .Kanto
.Johto .Johto
@ -26533,7 +26533,7 @@ Function14dd7: ; 14dd7
ld de, $a009 ld de, $a009
ld bc, $082a ld bc, $082a
call CopyBytes call CopyBytes
ld hl, FlypointPerms ld hl, VisitedSpawns
ld de, $a833 ld de, $a833
ld bc, $0032 ld bc, $0032
call CopyBytes call CopyBytes
@ -26600,7 +26600,7 @@ Function14e55: ; 14e55
ld de, $b209 ld de, $b209
ld bc, $082a ld bc, $082a
call CopyBytes call CopyBytes
ld hl, FlypointPerms ld hl, VisitedSpawns
ld de, $ba33 ld de, $ba33
ld bc, $0032 ld bc, $0032
call CopyBytes call CopyBytes
@ -26783,7 +26783,7 @@ Function14fd7: ; 14fd7 (5:4fd7)
ld bc, $82a ld bc, $82a
call CopyBytes call CopyBytes
ld hl, $a833 ld hl, $a833
ld de, FlypointPerms ; $dca5 ld de, VisitedSpawns ; $dca5
ld bc, $32 ld bc, $32
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM
@ -26843,7 +26843,7 @@ Function15046: ; 15046 (5:5046)
ld bc, $82a ld bc, $82a
call CopyBytes call CopyBytes
ld hl, $ba33 ld hl, $ba33
ld de, FlypointPerms ; $dca5 ld de, VisitedSpawns ; $dca5
ld bc, $32 ld bc, $32
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM
@ -83085,7 +83085,7 @@ Function91c3c: ; 91c3c
ld de, Flypoints + 1 ld de, Flypoints + 1
add hl, de add hl, de
ld c, [hl] ld c, [hl]
call GetSpawnPermission call HasVisitedSpawn
pop hl pop hl
pop de pop de
pop bc pop bc
@ -83093,12 +83093,12 @@ Function91c3c: ; 91c3c
ret ret
; 91c50 ; 91c50
GetSpawnPermission: ; 91c50 HasVisitedSpawn: ; 91c50
; Return spawn point c permission flag in a ; Check if spawn point c has been visited.
ld hl, FlypointPerms ld hl, VisitedSpawns
ld b, $2 ld b, CHECK_FLAG
ld d, $0 ld d, 0
ld a, 3 ; PREDEF_GET_FLAG_NO ld a, PREDEF_FLAG
call Predef call Predef
ld a, c ld a, c
ret ret
@ -83231,7 +83231,7 @@ FlyMap: ; 91c90
push af push af
ld c, SPAWN_INDIGO_PLATEAU ld c, SPAWN_INDIGO_PLATEAU
call GetSpawnPermission call HasVisitedSpawn
and a and a
jr z, .NoKanto jr z, .NoKanto

4
wram.asm
View File

@ -1870,8 +1870,8 @@ StepCount: ; dc73
PoisonStepCount: ; dc74 PoisonStepCount: ; dc74
ds 1 ds 1
SECTION "FlypointPermissions", WRAMX[$dca5],BANK[1] SECTION "Visited Spawn Points", WRAMX[$dca5],BANK[1]
FlypointPerms: ; dca5 VisitedSpawns: ; dca5
ds 4 ds 4
SECTION "BackupMapInfo", WRAMX[$dcad],BANK[1] SECTION "BackupMapInfo", WRAMX[$dcad],BANK[1]