summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2020-09-20 14:02:39 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2020-09-20 14:02:39 -0400
commite789ee48b65e8cc08104ef06de4b08c9ef9d117d (patch)
treeed908702f2c4b82a36329944b644be954c231776
parentfac958b280056922a1828b71a04d84a36e1e807a (diff)
Capitalize DEF
-rw-r--r--data/super_palettes.inc2
-rw-r--r--data/trainers/parties.asm5
-rw-r--r--gfx.asm4
3 files changed, 6 insertions, 5 deletions
diff --git a/data/super_palettes.inc b/data/super_palettes.inc
index cf654c3..67142ab 100644
--- a/data/super_palettes.inc
+++ b/data/super_palettes.inc
@@ -38,7 +38,7 @@ SuperPalettes::
RGB 28,28,28, 30,26,15, 26,20,00, 04,04,04 ; YELLOW_BAR
RGB 28,28,28, 30,26,15, 26,10,06, 04,04,04 ; RED_BAR
RGB 28,28,28, 20,26,31, 17,23,10, 04,04,04 ; TOWN_MAP
-if def(GOLD)
+if DEF(GOLD)
RGB 28,28,28, 24,20,10, 21,00,04, 04,04,04 ; LOGO_1
else
RGB 28,28,28, 18,18,18, 21,00,04, 04,04,04 ; LOGO_1
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index ff3137e..cb50776 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -15,7 +15,8 @@ INCLUDE "data/trainers/party_pointers.inc"
; TODO: decode all data
-if def(GOLD)
+if DEF(GOLD)
+
HayatoGroup::
; Leftover Youngster data from Red/Blue
db 11, MON_KORATTA, MON_ARBO, 0
@@ -619,8 +620,8 @@ KimonoGirlGroup::
db "こうめ@", TRAINERTYPE_ITEM_MOVES
db 10, DEX_PIPPI, ITEM_NONE, MOVE_CHARM, MOVE_SWEET_KISS, MOVE_POUND, MOVE_NONE
db -1 ; end
-else
+else
SECTION "data/trainers/parties.asm@Trainer Parties 1 TEMPORARY", ROMX
AkaneGroup::
diff --git a/gfx.asm b/gfx.asm
index 7beeb89..7b4fd1e 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -45,7 +45,7 @@ Corrupteda66cGFX:
INCBIN "gfx/sgb/corrupted_a66c.2bpp"
SGBBorderGFX::
-if def(GOLD)
+if DEF(GOLD)
INCBIN "gfx/sgb/sgb_border_gold.2bpp"
else
INCBIN "gfx/sgb/sgb_border_silver.2bpp"
@@ -66,7 +66,7 @@ Corruptedba93GFX:
INCBIN "gfx/sgb/corrupted_ba93.2bpp"
SECTION "gfx.asm@Title Screen GFX", ROMX
-if def(GOLD)
+if DEF(GOLD)
TitleScreenGFX:: INCBIN "gfx/title/title.2bpp"
TitleScreenVersionGFX:: INCBIN "gfx/title/title_gold_version.2bpp"
TitleScreenHoOhGFX:: INCBIN "gfx/title/title_hooh.2bpp"