pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Relabel some map_object struct fields (#1029)

Browse Source
This commit is contained in:
vulcandth
2023-01-03 21:16:08 -06:00
committed by GitHub
parent 2d40e99d11
commit c01409be5a
7 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
home/map_objects.asm
View File

@@ -227,7 +227,7 @@ CheckObjectVisibility::
ret
CheckObjectTime::
ld hl, MAPOBJECT_HOUR
ld hl, MAPOBJECT_HOUR_1
add hl, bc
ld a, [hl]
cp -1
@@ -264,10 +264,10 @@ CheckObjectTime::
db NITE
.check_hour
ld hl, MAPOBJECT_HOUR
ld hl, MAPOBJECT_HOUR_1
add hl, bc
ld d, [hl]
ld hl, MAPOBJECT_TIMEOFDAY
ld hl, MAPOBJECT_HOUR_2
add hl, bc
ld e, [hl]
ld hl, hHours

6
home/trainers.asm
View File

@@ -31,10 +31,10 @@ _CheckTrainerBattle::
jr z, .next
; Is a trainer
ld hl, MAPOBJECT_COLOR
ld hl, MAPOBJECT_TYPE
add hl, de
ld a, [hl]
and $f
and MAPOBJECT_TYPE_MASK
cp OBJECTTYPE_TRAINER
jr nz, .next
@@ -51,7 +51,7 @@ _CheckTrainerBattle::
jr nc, .next
; ...within their sight range
ld hl, MAPOBJECT_RANGE
ld hl, MAPOBJECT_SIGHT_RANGE
add hl, de
ld a, [hl]
cp b