mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
CRYSTAL11 → _CRYSTAL11
This commit is contained in:
parent
a8cf8979d9
commit
cc0fd6e12c
2
FAQ.md
2
FAQ.md
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
## What is pokecrystal11.gbc?
|
## What is pokecrystal11.gbc?
|
||||||
|
|
||||||
Version 1.1 of Pokémon Crystal, which fixed some issues with the initial international release. `make crystal11` defines `CRYSTAL11` so the assembly builds the changed version.
|
Version 1.1 of Pokémon Crystal, which fixed some issues with the initial international release. `make crystal11` defines `_CRYSTAL11` so the assembly builds the changed version.
|
||||||
|
|
||||||
|
|
||||||
## Can't build ROM; "ERROR: `UNION` already defined"
|
## Can't build ROM; "ERROR: `UNION` already defined"
|
||||||
|
2
Makefile
2
Makefile
@ -53,7 +53,7 @@ tools:
|
|||||||
|
|
||||||
|
|
||||||
$(crystal_obj): RGBASMFLAGS = -D _CRYSTAL
|
$(crystal_obj): RGBASMFLAGS = -D _CRYSTAL
|
||||||
$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL -D CRYSTAL11
|
$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL -D _CRYSTAL11
|
||||||
|
|
||||||
# The dep rules have to be explicit or else missing files won't be reported.
|
# The dep rules have to be explicit or else missing files won't be reported.
|
||||||
# As a side effect, they're evaluated immediately instead of when the rule is invoked.
|
# As a side effect, they're evaluated immediately instead of when the rule is invoked.
|
||||||
|
@ -23,7 +23,7 @@ BattleTowerTrainers: ; 1f814e
|
|||||||
db "KAUFMAN@@@", SWIMMERM
|
db "KAUFMAN@@@", SWIMMERM
|
||||||
db "LANCASTER@", SKIER
|
db "LANCASTER@", SKIER
|
||||||
db "McMAHILL@@", CAMPER
|
db "McMAHILL@@", CAMPER
|
||||||
if !DEF(CRYSTAL11)
|
if !DEF(_CRYSTAL11)
|
||||||
BattleTowerTrainersEnd:
|
BattleTowerTrainersEnd:
|
||||||
endc
|
endc
|
||||||
; The following can only be sampled in Crystal 1.1.
|
; The following can only be sampled in Crystal 1.1.
|
||||||
@ -76,7 +76,7 @@ endc
|
|||||||
db "DYKSTRA@@@", SWIMMERF
|
db "DYKSTRA@@@", SWIMMERF
|
||||||
db "EATON@@@@@", BIKER
|
db "EATON@@@@@", BIKER
|
||||||
db "WONG@@@@@@", FIREBREATHER
|
db "WONG@@@@@@", FIREBREATHER
|
||||||
if DEF(CRYSTAL11)
|
if DEF(_CRYSTAL11)
|
||||||
BattleTowerTrainersEnd:
|
BattleTowerTrainersEnd:
|
||||||
endc
|
endc
|
||||||
; 1f8450
|
; 1f8450
|
||||||
|
@ -26,7 +26,7 @@ Function_LoadOpponentTrainerAndPokemons: ; 1f8000
|
|||||||
ld a, [hRandomAdd]
|
ld a, [hRandomAdd]
|
||||||
add b
|
add b
|
||||||
ld b, a ; b contains the nr of the trainer
|
ld b, a ; b contains the nr of the trainer
|
||||||
if DEF(CRYSTAL11)
|
if DEF(_CRYSTAL11)
|
||||||
and $7f
|
and $7f
|
||||||
else
|
else
|
||||||
and $1f
|
and $1f
|
||||||
|
@ -7,7 +7,7 @@ BattleTowerText:: ; 11c000
|
|||||||
push af
|
push af
|
||||||
ld a, BANK(BT_OTTrainerClass)
|
ld a, BANK(BT_OTTrainerClass)
|
||||||
ld [rSVBK], a
|
ld [rSVBK], a
|
||||||
if DEF(CRYSTAL11)
|
if DEF(_CRYSTAL11)
|
||||||
ld hl, BT_OTTrainerClass
|
ld hl, BT_OTTrainerClass
|
||||||
else
|
else
|
||||||
; BUG ALERT
|
; BUG ALERT
|
||||||
@ -16,7 +16,7 @@ else
|
|||||||
; uses it to get the gender of the trainer.
|
; uses it to get the gender of the trainer.
|
||||||
; As a consequence, the enemy trainer's dialog will
|
; As a consequence, the enemy trainer's dialog will
|
||||||
; always be sampled from the female array.
|
; always be sampled from the female array.
|
||||||
ld hl, BT_OTName + 5
|
ld hl, BT_OTName + NAME_LENGTH_JAPANESE - 1
|
||||||
endc
|
endc
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
dec a
|
dec a
|
||||||
|
2
main.asm
2
main.asm
@ -645,7 +645,7 @@ INCLUDE "engine/events/odd_egg.asm"
|
|||||||
|
|
||||||
SECTION "Mobile Stadium 2", ROMX
|
SECTION "Mobile Stadium 2", ROMX
|
||||||
|
|
||||||
if DEF(CRYSTAL11)
|
if DEF(_CRYSTAL11)
|
||||||
INCBIN "mobile/stadium/stadium2_2.bin"
|
INCBIN "mobile/stadium/stadium2_2.bin"
|
||||||
else
|
else
|
||||||
INCBIN "mobile/stadium/stadium2_1.bin"
|
INCBIN "mobile/stadium/stadium2_1.bin"
|
||||||
|
@ -936,7 +936,7 @@ GameBoyN64GFX:
|
|||||||
INCBIN "gfx/trade/game_boy_n64.2bpp"
|
INCBIN "gfx/trade/game_boy_n64.2bpp"
|
||||||
|
|
||||||
Tilemap_1733af:
|
Tilemap_1733af:
|
||||||
if DEF(CRYSTAL11)
|
if DEF(_CRYSTAL11)
|
||||||
INCBIN "gfx/unknown/1733af_corrupt.tilemap"
|
INCBIN "gfx/unknown/1733af_corrupt.tilemap"
|
||||||
else
|
else
|
||||||
INCBIN "gfx/unknown/1733af.tilemap"
|
INCBIN "gfx/unknown/1733af.tilemap"
|
||||||
|
4
wram.asm
4
wram.asm
@ -827,7 +827,7 @@ wDexListingCursorBackup:: db
|
|||||||
wBackupDexListingCursor:: db
|
wBackupDexListingCursor:: db
|
||||||
wBackupDexListingPage:: db
|
wBackupDexListingPage:: db
|
||||||
wDexCurrentLocation:: db
|
wDexCurrentLocation:: db
|
||||||
if DEF(CRYSTAL11)
|
if DEF(_CRYSTAL11)
|
||||||
wPokedexStatus:: db
|
wPokedexStatus:: db
|
||||||
wPokedexDataEnd::
|
wPokedexDataEnd::
|
||||||
else
|
else
|
||||||
@ -1312,7 +1312,7 @@ wCardFlipWhichCard:: db
|
|||||||
NEXTU ; cf64
|
NEXTU ; cf64
|
||||||
; pokedex
|
; pokedex
|
||||||
wDexEntryPrevJumptableIndex:: db
|
wDexEntryPrevJumptableIndex:: db
|
||||||
if !DEF(CRYSTAL11)
|
if !DEF(_CRYSTAL11)
|
||||||
wPokedexStatus:: db
|
wPokedexStatus:: db
|
||||||
endc
|
endc
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user