summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/decorations/mystery_gift_decos.asm (renamed from data/mystery_gift_decos.asm)0
-rw-r--r--data/items/marts.asm1
-rw-r--r--data/items/mystery_gift_items.asm (renamed from data/mystery_gift_items.asm)0
-rwxr-xr-xengine/mystery_gift_2.asm4
4 files changed, 3 insertions, 2 deletions
diff --git a/data/mystery_gift_decos.asm b/data/decorations/mystery_gift_decos.asm
index bdd4694c6..bdd4694c6 100644
--- a/data/mystery_gift_decos.asm
+++ b/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
index b2379071e..b2379071e 100644
--- a/data/mystery_gift_items.asm
+++ b/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"