From 46a057b4dc4df7fc00c2fe159e48a4845a5522ea Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 1 May 2014 18:36:07 -0400 Subject: [PATCH 1/3] Install: gcc is required. Sudo doesn't exist in cygwin. --- INSTALL.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 8d52954c8..ca38695af 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -53,6 +53,7 @@ Select the following packages: * git * python * python-setuptools +* gcc * libsasl2 * ca-certificates @@ -66,8 +67,8 @@ Then set up the repository. In the **Cygwin terminal**: cd pokecrystal git submodule init git submodule update - sudo easy_install pip - sudo pip install -r extras/requirements.txt + easy_install pip + pip install -r extras/requirements.txt - Copy your Pokémon Crystal rom to the directory. Name it **baserom.gbc**. From 5be729c757991ec3cfa202830b2d46d0619d2ab2 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Fri, 2 May 2014 03:37:58 +0200 Subject: [PATCH 2/3] Use correct menu header identifier in PokeCom Center. --- maps/GoldenrodPokeComCenter2FMobile.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 624555c35..eb16abcde 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -75,7 +75,7 @@ MapGoldenrodPokeComCenter2FMobileSignpost1Script: ; 0x62624 closetext UnknownScript_0x62629: ; 0x62629 reloadmappart - loadmenudata $664c + loadmenudata MenuDataHeader_0x6264c interpretmenu2 writebackup if_equal $1, UnknownScript_0x6263a From 1fbe471b74908be6e89777857bf7407ef427225b Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Tue, 17 Jun 2014 04:53:58 -0600 Subject: [PATCH 3/3] Use better constants/comments in DST near-midnight checks. --- main.asm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/main.asm b/main.asm index d87cc9323..988d4e32f 100644 --- a/main.asm +++ b/main.asm @@ -28051,7 +28051,7 @@ Function16290: ; 16290 jr .asm_162a4 .asm_1629f - call Function16439 + call DSTChecks ld a, $7 .asm_162a4 @@ -28261,20 +28261,22 @@ Function16433: ; 16433 ret ; 16439 -Function16439: ; 16439 +DSTChecks: ; 16439 +; check the time; avoid changing DST if doing so would change the current day ld a, [$d4c2] bit 7, a ld a, [hHours] jr z, .asm_16447 - and a - jr z, .asm_1644b - jr .asm_16468 + and a ; within one hour of 00:00? + jr z, .LostBooklet + jr .next .asm_16447 - cp $17 - jr nz, .asm_16468 + cp 23 ; within one hour of 23:00? + jr nz, .next + ; fallthrough -.asm_1644b +.LostBooklet call Function164ea bccoord 1, 14 ld hl, UnknownText_0x164f4 @@ -28283,11 +28285,11 @@ Function16439: ; 16439 ret c call Function164ea bccoord 1, 14 - ld hl, UnknownText_0x164f9 + ld hl, LostInstructionBookletText call Function13e5 ret -.asm_16468 +.next call Function164ea bccoord 1, 14 ld a, [$d4c2] @@ -28367,8 +28369,9 @@ UnknownText_0x164f4: ; 0x164f4 db "@" ; 0x164f9 -UnknownText_0x164f9: ; 0x164f9 - ; I lost the in- struction booklet for the #GEAR. Come back again in a while. +LostInstructionBookletText: ; 0x164f9 + ; I lost the instruction booklet for the POKéGEAR. + ; Come back again in a while. text_jump UnknownText_0x1c60d1 db "@" ; 0x164fe