diff options
| -rw-r--r-- | FAQ.md | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | data/battle_tower/classes.asm | 4 | ||||
| -rw-r--r-- | engine/events/battle_tower/load_trainer.asm | 2 | ||||
| -rwxr-xr-x | engine/events/battle_tower/trainer_text.asm | 4 | ||||
| -rw-r--r-- | main.asm | 2 | ||||
| -rwxr-xr-x | mobile/mobile_5c.asm | 2 | ||||
| -rw-r--r-- | wram.asm | 4 |
8 files changed, 11 insertions, 11 deletions
@@ -14,7 +14,7 @@ ## 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" @@ -53,7 +53,7 @@ tools: $(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. # As a side effect, they're evaluated immediately instead of when the rule is invoked. diff --git a/data/battle_tower/classes.asm b/data/battle_tower/classes.asm index c5ef7a1c6..96b1910da 100644 --- a/data/battle_tower/classes.asm +++ b/data/battle_tower/classes.asm @@ -23,7 +23,7 @@ BattleTowerTrainers: ; 1f814e db "KAUFMAN@@@", SWIMMERM db "LANCASTER@", SKIER db "McMAHILL@@", CAMPER -if !DEF(CRYSTAL11) +if !DEF(_CRYSTAL11) BattleTowerTrainersEnd: endc ; The following can only be sampled in Crystal 1.1. @@ -76,7 +76,7 @@ endc db "DYKSTRA@@@", SWIMMERF db "EATON@@@@@", BIKER db "WONG@@@@@@", FIREBREATHER -if DEF(CRYSTAL11) +if DEF(_CRYSTAL11) BattleTowerTrainersEnd: endc ; 1f8450 diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm index 5389f3f2e..bf8b20a27 100644 --- a/engine/events/battle_tower/load_trainer.asm +++ b/engine/events/battle_tower/load_trainer.asm @@ -26,7 +26,7 @@ Function_LoadOpponentTrainerAndPokemons: ; 1f8000 ld a, [hRandomAdd] add b ld b, a ; b contains the nr of the trainer -if DEF(CRYSTAL11) +if DEF(_CRYSTAL11) and $7f else and $1f diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm index 21704ff2d..96c91caa9 100755 --- a/engine/events/battle_tower/trainer_text.asm +++ b/engine/events/battle_tower/trainer_text.asm @@ -7,7 +7,7 @@ BattleTowerText:: ; 11c000 push af ld a, BANK(BT_OTTrainerClass) ld [rSVBK], a -if DEF(CRYSTAL11) +if DEF(_CRYSTAL11) ld hl, BT_OTTrainerClass else ; BUG ALERT @@ -16,7 +16,7 @@ else ; uses it to get the gender of the trainer. ; As a consequence, the enemy trainer's dialog will ; always be sampled from the female array. - ld hl, BT_OTName + 5 + ld hl, BT_OTName + NAME_LENGTH_JAPANESE - 1 endc ld a, [hl] dec a @@ -645,7 +645,7 @@ INCLUDE "engine/events/odd_egg.asm" SECTION "Mobile Stadium 2", ROMX -if DEF(CRYSTAL11) +if DEF(_CRYSTAL11) INCBIN "mobile/stadium/stadium2_2.bin" else INCBIN "mobile/stadium/stadium2_1.bin" diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 97d4f5e38..38f1f679c 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -936,7 +936,7 @@ GameBoyN64GFX: INCBIN "gfx/trade/game_boy_n64.2bpp" Tilemap_1733af: -if DEF(CRYSTAL11) +if DEF(_CRYSTAL11) INCBIN "gfx/unknown/1733af_corrupt.tilemap" else INCBIN "gfx/unknown/1733af.tilemap" @@ -827,7 +827,7 @@ wDexListingCursorBackup:: db wBackupDexListingCursor:: db wBackupDexListingPage:: db wDexCurrentLocation:: db -if DEF(CRYSTAL11) +if DEF(_CRYSTAL11) wPokedexStatus:: db wPokedexDataEnd:: else @@ -1312,7 +1312,7 @@ wCardFlipWhichCard:: db NEXTU ; cf64 ; pokedex wDexEntryPrevJumptableIndex:: db -if !DEF(CRYSTAL11) +if !DEF(_CRYSTAL11) wPokedexStatus:: db endc |