mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Merge remote-tracking branch 'kanzure/master'
This commit is contained in:
commit
044d0f7f04
@ -53,6 +53,7 @@ Select the following packages:
|
|||||||
* git
|
* git
|
||||||
* python
|
* python
|
||||||
* python-setuptools
|
* python-setuptools
|
||||||
|
* gcc
|
||||||
* libsasl2
|
* libsasl2
|
||||||
* ca-certificates
|
* ca-certificates
|
||||||
|
|
||||||
@ -66,8 +67,8 @@ Then set up the repository. In the **Cygwin terminal**:
|
|||||||
cd pokecrystal
|
cd pokecrystal
|
||||||
git submodule init
|
git submodule init
|
||||||
git submodule update
|
git submodule update
|
||||||
sudo easy_install pip
|
easy_install pip
|
||||||
sudo pip install -r extras/requirements.txt
|
pip install -r extras/requirements.txt
|
||||||
|
|
||||||
- Copy your Pokémon Crystal rom to the directory. Name it **baserom.gbc**.
|
- Copy your Pokémon Crystal rom to the directory. Name it **baserom.gbc**.
|
||||||
|
|
||||||
|
27
main.asm
27
main.asm
@ -28038,7 +28038,7 @@ Function16290: ; 16290
|
|||||||
jr .asm_162a4
|
jr .asm_162a4
|
||||||
|
|
||||||
.asm_1629f
|
.asm_1629f
|
||||||
call Function16439
|
call DSTChecks
|
||||||
ld a, $7
|
ld a, $7
|
||||||
|
|
||||||
.asm_162a4
|
.asm_162a4
|
||||||
@ -28248,20 +28248,22 @@ Function16433: ; 16433
|
|||||||
ret
|
ret
|
||||||
; 16439
|
; 16439
|
||||||
|
|
||||||
Function16439: ; 16439
|
DSTChecks: ; 16439
|
||||||
|
; check the time; avoid changing DST if doing so would change the current day
|
||||||
ld a, [$d4c2]
|
ld a, [$d4c2]
|
||||||
bit 7, a
|
bit 7, a
|
||||||
ld a, [hHours]
|
ld a, [hHours]
|
||||||
jr z, .asm_16447
|
jr z, .asm_16447
|
||||||
and a
|
and a ; within one hour of 00:00?
|
||||||
jr z, .asm_1644b
|
jr z, .LostBooklet
|
||||||
jr .asm_16468
|
jr .next
|
||||||
|
|
||||||
.asm_16447
|
.asm_16447
|
||||||
cp $17
|
cp 23 ; within one hour of 23:00?
|
||||||
jr nz, .asm_16468
|
jr nz, .next
|
||||||
|
; fallthrough
|
||||||
|
|
||||||
.asm_1644b
|
.LostBooklet
|
||||||
call Function164ea
|
call Function164ea
|
||||||
bccoord 1, 14
|
bccoord 1, 14
|
||||||
ld hl, UnknownText_0x164f4
|
ld hl, UnknownText_0x164f4
|
||||||
@ -28270,11 +28272,11 @@ Function16439: ; 16439
|
|||||||
ret c
|
ret c
|
||||||
call Function164ea
|
call Function164ea
|
||||||
bccoord 1, 14
|
bccoord 1, 14
|
||||||
ld hl, UnknownText_0x164f9
|
ld hl, LostInstructionBookletText
|
||||||
call Function13e5
|
call Function13e5
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.asm_16468
|
.next
|
||||||
call Function164ea
|
call Function164ea
|
||||||
bccoord 1, 14
|
bccoord 1, 14
|
||||||
ld a, [$d4c2]
|
ld a, [$d4c2]
|
||||||
@ -28354,8 +28356,9 @@ UnknownText_0x164f4: ; 0x164f4
|
|||||||
db "@"
|
db "@"
|
||||||
; 0x164f9
|
; 0x164f9
|
||||||
|
|
||||||
UnknownText_0x164f9: ; 0x164f9
|
LostInstructionBookletText: ; 0x164f9
|
||||||
; I lost the in- struction booklet for the #GEAR. Come back again in a while.
|
; I lost the instruction booklet for the POKéGEAR.
|
||||||
|
; Come back again in a while.
|
||||||
text_jump UnknownText_0x1c60d1
|
text_jump UnknownText_0x1c60d1
|
||||||
db "@"
|
db "@"
|
||||||
; 0x164fe
|
; 0x164fe
|
||||||
|
Loading…
Reference in New Issue
Block a user