From 2d0506ecf9daa96f42cbfc1ee4fd612020241dd5 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 01:54:49 -0500 Subject: [PATCH] Group item and deco data more --- data/{ => decorations}/mystery_gift_decos.asm | 0 data/items/marts.asm | 1 + data/{ => items}/mystery_gift_items.asm | 0 engine/mystery_gift_2.asm | 4 ++-- 4 files changed, 3 insertions(+), 2 deletions(-) rename data/{ => decorations}/mystery_gift_decos.asm (100%) rename data/{ => items}/mystery_gift_items.asm (100%) diff --git a/data/mystery_gift_decos.asm b/data/decorations/mystery_gift_decos.asm similarity index 100% rename from data/mystery_gift_decos.asm rename to data/decorations/mystery_gift_decos.asm diff --git a/data/items/marts.asm b/data/items/marts.asm index 36572a9c7..fd156225d 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -1,4 +1,5 @@ Marts: ; 160a9 +; entries correspond to MART_* constants dw MartCherrygrove dw MartCherrygroveDex dw MartViolet diff --git a/data/mystery_gift_items.asm b/data/items/mystery_gift_items.asm similarity index 100% rename from data/mystery_gift_items.asm rename to data/items/mystery_gift_items.asm diff --git a/engine/mystery_gift_2.asm b/engine/mystery_gift_2.asm index 1d180f714..0baaabef3 100755 --- a/engine/mystery_gift_2.asm +++ b/engine/mystery_gift_2.asm @@ -147,6 +147,6 @@ MysteryGiftFallbackItem: ; 2c722 (b:4722) ; 2c725 (b:4725) -INCLUDE "data/mystery_gift_items.asm" +INCLUDE "data/items/mystery_gift_items.asm" -INCLUDE "data/mystery_gift_decos.asm" +INCLUDE "data/decorations/mystery_gift_decos.asm"