From e789ee48b65e8cc08104ef06de4b08c9ef9d117d Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 20 Sep 2020 14:02:39 -0400 Subject: Capitalize DEF --- data/super_palettes.inc | 2 +- data/trainers/parties.asm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'data') 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:: -- cgit v1.2.3