diff options
| -rw-r--r-- | INSTALL.md | 5 | ||||
| -rw-r--r-- | engine/map_objects.asm | 6 | ||||
| -rw-r--r-- | home/map.asm | 28 | ||||
| -rw-r--r-- | main.asm | 6 | ||||
| -rw-r--r-- | maps/PokeCenter2F.asm | 4 |
5 files changed, 26 insertions, 23 deletions
diff --git a/INSTALL.md b/INSTALL.md index 82158e80c..26e18ffe8 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -10,6 +10,7 @@ Note that this requires python2.7 for the moment. cd .. git clone --recursive git://github.com/kanzure/pokecrystal.git + easy_install pypng cd pokecrystal To build **pokecrystal.gbc**: @@ -33,6 +34,7 @@ In the shell, run: cd .. git clone --recursive git://github.com/kanzure/pokecrystal.git + easy_install pypng cd pokecrystal To build **pokecrystal.gbc**: @@ -44,7 +46,7 @@ To build **pokecrystal.gbc**: To build on Windows, use [**Cygwin**](http://cygwin.com/install.html) (32-bit). -In the installer, select the following packages: `make` `git` `python` `python-setuptools` `gcc` `libsasl2` `ca-certificates` +In the installer, select the following packages: `make` `git` `python` `python-setuptools` `gcc-core` `libsasl2-3` `ca-certificates` Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/). Put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. @@ -52,6 +54,7 @@ Put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. In the **Cygwin terminal**: git clone --recursive git://github.com/kanzure/pokecrystal.git + easy_install pypng cd pokecrystal To build: diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 5819381d8..888952ab8 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2660,7 +2660,7 @@ Function5579: ; 5579 Function5582: ; 5582 ld de, ObjectStructs - ld a, $d + ld a, NUM_OBJECT_STRUCTS .loop push af ld hl, OBJECT_04 @@ -2780,7 +2780,7 @@ Function561d: ; 561d ; 5629 Function5629: ; 5629 - cp $10 + cp NUM_OBJECTS ret nc call GetMapObject ld hl, MAPOBJECT_OBJECT_STRUCT_ID @@ -2788,7 +2788,7 @@ Function5629: ; 5629 ld a, [hl] cp -1 ret z - cp $d + cp NUM_OBJECT_STRUCTS ret nc call GetObjectStruct call GetObjectSprite diff --git a/home/map.asm b/home/map.asm index 7a226a90e..8dccf51a0 100644 --- a/home/map.asm +++ b/home/map.asm @@ -393,7 +393,7 @@ LoadMapAttributes:: ; 2309 call SwitchToMapScriptHeaderBank call Function234f xor a - call Function2336 + call ReadMapEventHeader ret ; 2317 @@ -402,7 +402,7 @@ LoadMapAttributes_IgnoreHidden:: ; 2317 call SwitchToMapScriptHeaderBank call Function234f ld a, $1 - call Function2336 + call ReadMapEventHeader ret ; 2326 @@ -415,7 +415,7 @@ Function2326:: ; 2326 ret ; 2336 -Function2336:: ; 2336 +ReadMapEventHeader:: ; 2336 push af ld hl, MapEventHeaderPointer ld a, [hli] @@ -424,13 +424,13 @@ Function2336:: ; 2336 rept 2 inc hl endr - call Function23da - call Function23f1 - call Function2408 + call ReadWarps + call ReadCoordEvents + call ReadSignposts pop af and a ret nz - call Function241f + call ReadObjectEvents ret ; 234f @@ -539,7 +539,7 @@ Function23c3:: ; 23c3 ret ; 23da -Function23da:: ; 23da +ReadWarps:: ; 23da ld a, [hli] ld c, a ld [wdbfb], a @@ -555,7 +555,7 @@ Function23da:: ; 23da ret ; 23f1 -Function23f1:: ; 23f1 +ReadCoordEvents:: ; 23f1 ld a, [hli] ld c, a ld [wCurrentMapXYTriggerCount], a @@ -571,7 +571,7 @@ Function23f1:: ; 23f1 ret ; 2408 -Function2408:: ; 2408 +ReadSignposts:: ; 2408 ld a, [hli] ld c, a ld [wCurrentMapSignpostCount], a @@ -587,7 +587,7 @@ Function2408:: ; 2408 ret ; 241f -Function241f:: ; 241f +ReadObjectEvents:: ; 241f push hl call Function2471 pop de @@ -651,12 +651,12 @@ Function2457:: ; 2457 Function2471:: ; 2471 ld hl, ObjectStruct1 - ld bc, 40 * 12 + ld bc, OBJECT_STRUCT_LENGTH * (NUM_OBJECT_STRUCTS - 1) xor a call ByteFill ld hl, ObjectStruct1 - ld de, 40 - ld c, $c + ld de, OBJECT_STRUCT_LENGTH + ld c, NUM_OBJECT_STRUCTS - 1 xor a .asm_2484 ld [hl], a @@ -25237,7 +25237,7 @@ MenuDataHeader_0x24547: ; 0x24547 Function2454f: ; 2454f ld hl, wd81e xor a - ld bc, $10 + ld bc, NUM_OBJECTS call ByteFill nop ld bc, MapObjects @@ -25255,13 +25255,13 @@ Function2454f: ; 2454f ld [de], a inc de pop bc - ld hl, $10 + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l pop af inc a - cp $10 + cp NUM_OBJECTS jr nz, .loop ret diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 61170f12f..532d63bf1 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -302,7 +302,7 @@ LinkReceptionistScript_TimeCapsule: special Special_SetBitsForTimeCapsuleRequest faceplayer loadfont - writetext Text_TimeCapsuleRecptionistIntro + writetext Text_TimeCapsuleReceptionistIntro yesorno iffalse .Cancel special Special_CheckTimeCapsuleCompatibility @@ -839,7 +839,7 @@ Text_TradeReceptionistIntro: line "trade?" done -Text_TimeCapsuleRecptionistIntro: +Text_TimeCapsuleReceptionistIntro: text "Welcome to CABLE" line "CLUB TIME CAPSULE." |