diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/events/specials.asm | 4 | ||||
| -rwxr-xr-x | engine/gfx/color.asm | 16 | ||||
| -rw-r--r-- | engine/menus/intro_menu.asm | 26 | ||||
| -rw-r--r-- | engine/pokemon/correct_nick_errors.asm | 2 |
4 files changed, 24 insertions, 24 deletions
diff --git a/engine/events/specials.asm b/engine/events/specials.asm index e51f3451..408bc508 100755 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -215,11 +215,11 @@ NameRival: ; c3f7 ret .DefaultName: -IF DEF(GOLD) +IF DEF(_GOLD) db "SILVER@" ENDC -IF DEF(SILVER) +IF DEF(_SILVER) db "GOLD@" ENDC diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 05c13b2b..3b83160c 100755 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -1343,20 +1343,20 @@ PalPacket_a235: db $79, $26, $08, $00, $0b, $39, $cd, $48, $0c, $d0, $34, $a5, $ PalPacket_a245: db $79, $1b, $08, $00, $0b, $ea, $ea, $ea, $ea, $ea, $a9, $01, $cd, $4f, $0c, $d0 PalPacket_a255: db $79, $10, $08, $00, $0b, $4c, $20, $08, $ea, $ea, $ea, $ea, $ea, $60, $ea, $ea -IF DEF(GOLD) +IF DEF(_GOLD) Palettes_a265: INCLUDE "gfx/pals/gold_a265.pal" ENDC -IF DEF(SILVER) +IF DEF(_SILVER) Palettes_a265: INCLUDE "gfx/pals/silver_a265.pal" ENDC -IF DEF(GOLD) +IF DEF(_GOLD) SGBBorderMap: INCBIN "gfx/sgb_border/gold.map" SGBBorderPalettes: INCLUDE "gfx/sgb_border/pals/gold.pal" SGBBorder: INCBIN "gfx/sgb_border/gold.2bpp" ENDC -IF DEF(SILVER) +IF DEF(_SILVER) SGBBorderMap: INCBIN "gfx/sgb_border/silver.map" SGBBorderPalettes: INCLUDE "gfx/sgb_border/pals/silver.pal" SGBBorder: INCBIN "gfx/sgb_border/silver.2bpp" @@ -1620,7 +1620,7 @@ Palettes_bac6: RGB 07, 07, 07 Palettes_bb36: -IF DEF(GOLD) +IF DEF(_GOLD) RGB 31, 31, 31 RGB 18, 23, 31 RGB 15, 20, 31 @@ -1647,7 +1647,7 @@ IF DEF(GOLD) RGB 0, 0, 0 ENDC -IF DEF(SILVER) +IF DEF(_SILVER) RGB 31, 31, 31 RGB 0, 12, 15 RGB 4, 8, 21 @@ -1738,7 +1738,7 @@ Palettes_bb9e: RGB 00, 00, 00 Palettes_bbbe: -IF DEF(GOLD) +IF DEF(_GOLD) RGB 31, 31, 31 RGB 24, 25, 28 RGB 24, 24, 09 @@ -1820,7 +1820,7 @@ IF DEF(GOLD) RGB 00, 00, 00 ENDC -IF DEF(SILVER) +IF DEF(_SILVER) RGB 31, 31, 31 RGB 25, 26, 14 RGB 20, 17, 31 diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 2ad9a396..7c46ed93 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -890,13 +890,13 @@ NamePlayer: ; 6085 (1:6085) db 5 db "NEW NAME@" .GoldSilver: -IF DEF(GOLD) +IF DEF(_GOLD) db "GOLD@" db "HIRO@" db "TAYLOR@" db "KARL@" ENDC -IF DEF(SILVER) +IF DEF(_SILVER) db "SILVER@" db "KAMON@" db "OSCAR@" @@ -1221,12 +1221,12 @@ Function6341: ; 6341 (1:6341) jr nz, .asm_6358 ld a, $d8 ldh [rBGP], a -IF DEF(GOLD) +IF DEF(_GOLD) ld a, $ff ldh [rOBP0], a ld a, $f8 ENDC -IF DEF(SILVER) +IF DEF(_SILVER) ld a, $f0 ldh [rOBP0], a ld a, $f0 @@ -1237,12 +1237,12 @@ ENDC .asm_6358 ld a, $e4 ldh [rBGP], a -IF DEF(GOLD) +IF DEF(_GOLD) ld a, $ff ldh [rOBP0], a ld a, $e4 ENDC -IF DEF(SILVER) +IF DEF(_SILVER) ld a, $f0 ldh [rOBP0], a ld a, $e0 @@ -1253,7 +1253,7 @@ ENDC .asm_6365 ld a, $e4 call DmgToCgbBGPals -IF DEF(SILVER) +IF DEF(_SILVER) ld a, $e0 ENDC call DmgToCgbObjPal0 @@ -1344,7 +1344,7 @@ TitleScreenFrame: ; 63da (1:63da) ret Function63fe: ; 63fe (1:63fe) -IF DEF(GOLD) +IF DEF(_GOLD) ldh a, [hVBlankCounter] and $7 ret nz @@ -1381,10 +1381,10 @@ Function6426: ld hl, wce63 inc [hl] ld hl, wce65 -IF DEF(GOLD) +IF DEF(_GOLD) ld de, $13c0 ENDC -IF DEF(SILVER) +IF DEF(_SILVER) ld de, $1140 ENDC ld [hl], e @@ -1474,7 +1474,7 @@ Function64b1: ; 64b1 (1:64b1) ld a, [wce65] and $3 ret nz -IF DEF(GOLD) +IF DEF(_GOLD) ld bc, wAnimatedObjectStruct10Index ld hl, $a add hl, bc @@ -1499,14 +1499,14 @@ IF DEF(GOLD) ld d, [hl] ENDC -IF DEF(SILVER) +IF DEF(_SILVER) ld de, $7c58 ENDC ld a, $f call InitSpriteAnimStruct ret -IF DEF(GOLD) +IF DEF(_GOLD) .Data_64e0: db $5c, $50, $00, $00 db $5c, $68, $5c, $58 diff --git a/engine/pokemon/correct_nick_errors.asm b/engine/pokemon/correct_nick_errors.asm index c7b6ff39..0f264a36 100644 --- a/engine/pokemon/correct_nick_errors.asm +++ b/engine/pokemon/correct_nick_errors.asm @@ -50,4 +50,4 @@ CorrectNickErrors:: ; 677e (1:677e) db "<ENEMY>", "<ENEMY>" + 1 db $49, "<TM>" + 1 db "<ROCKET>", "┘" + 1 - db -1 ; end
\ No newline at end of file + db -1 ; end |