Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Define NUM_FLYPOINTS

This commit is contained in:
Rangi 2020-07-21 11:48:39 -04:00
parent fc99117d88
commit a9941e28cc
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants/map_data_constants.asm
View File

@ -128,5 +128,6 @@ KANTO_FLYPOINT EQU const_value
const FLY_FUCHSIA const FLY_FUCHSIA
const FLY_CINNABAR const FLY_CINNABAR
const FLY_INDIGO const FLY_INDIGO
NUM_FLYPOINTS EQU const_value
MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm

2
data/maps/flypoints.asm
View File

@ -27,4 +27,4 @@ Flypoints:
db LANDMARK_FUCHSIA_CITY, SPAWN_FUCHSIA db LANDMARK_FUCHSIA_CITY, SPAWN_FUCHSIA
db LANDMARK_CINNABAR_ISLAND, SPAWN_CINNABAR db LANDMARK_CINNABAR_ISLAND, SPAWN_CINNABAR
db LANDMARK_INDIGO_PLATEAU, SPAWN_INDIGO db LANDMARK_INDIGO_PLATEAU, SPAWN_INDIGO
db -1 db -1 ; end

22
engine/pokegear/pokegear.asm
View File

@ -65,7 +65,7 @@ PokeGear:
ldh [hBGMapAddress], a ldh [hBGMapAddress], a
ld a, HIGH(vBGMap0) ld a, HIGH(vBGMap0)
ldh [hBGMapAddress + 1], a ldh [hBGMapAddress + 1], a
ld a, $90 ld a, SCREEN_HEIGHT_PX
ldh [hWY], a ldh [hWY], a
call ExitPokegearRadio_HandleMusic call ExitPokegearRadio_HandleMusic
ret ret
@ -269,7 +269,7 @@ InitPokegearTilemap:
ld a, HIGH(vBGMap0) ld a, HIGH(vBGMap0)
ldh [hBGMapAddress + 1], a ldh [hBGMapAddress + 1], a
call .UpdateBGMap call .UpdateBGMap
ld a, $90 ld a, SCREEN_HEIGHT_PX
jr .finish jr .finish
.kanto_0 .kanto_0
@ -2077,7 +2077,7 @@ _FlyMap:
pop af pop af
ldh [hInMenu], a ldh [hInMenu], a
call ClearBGPalettes call ClearBGPalettes
ld a, $90 ld a, SCREEN_HEIGHT_PX
ldh [hWY], a ldh [hWY], a
xor a ; LOW(vBGMap0) xor a ; LOW(vBGMap0)
ldh [hBGMapAddress], a ldh [hBGMapAddress], a
@ -2420,10 +2420,10 @@ Pokedex_GetArea:
.left .left
ldh a, [hWY] ldh a, [hWY]
cp $90 cp SCREEN_HEIGHT_PX
ret z ret z
call ClearSprites call ClearSprites
ld a, $90 ld a, SCREEN_HEIGHT_PX
ldh [hWY], a ldh [hWY], a
xor a ; JOHTO_REGION xor a ; JOHTO_REGION
call .GetAndPlaceNest call .GetAndPlaceNest
@ -2872,7 +2872,7 @@ Function92311:
pop af pop af
ldh [hInMenu], a ldh [hInMenu], a
call ClearBGPalettes call ClearBGPalettes
ld a, $90 ld a, SCREEN_HEIGHT_PX
ldh [hWY], a ldh [hWY], a
xor a ; LOW(vBGMap0) xor a ; LOW(vBGMap0)
ldh [hBGMapAddress], a ldh [hBGMapAddress], a
@ -2895,7 +2895,7 @@ Function92311:
.down_right .down_right
ld hl, wTownMapPlayerIconLandmark ld hl, wTownMapPlayerIconLandmark
ld a, [hl] ld a, [hl]
cp FLY_INDIGO cp NUM_FLYPOINTS - 1
jr c, .okay_dr jr c, .okay_dr
ld [hl], -1 ld [hl], -1
.okay_dr .okay_dr
@ -2907,7 +2907,7 @@ Function92311:
ld a, [hl] ld a, [hl]
and a and a
jr nz, .okay_ul jr nz, .okay_ul
ld [hl], FLY_INDIGO + 1 ld [hl], NUM_FLYPOINTS
.okay_ul .okay_ul
dec [hl] dec [hl]
.continue .continue
@ -2916,13 +2916,13 @@ Function92311:
jr c, .johto jr c, .johto
call FillKantoMap call FillKantoMap
xor a xor a
ld b, $9c ld b, HIGH(vBGMap1)
jr .finish jr .finish
.johto .johto
call FillJohtoMap call FillJohtoMap
ld a, $90 ld a, SCREEN_HEIGHT_PX
ld b, $98 ld b, HIGH(vBGMap0)
.finish .finish
ldh [hWY], a ldh [hWY], a
ld a, b ld a, b