diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-11 01:54:49 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-11 01:54:49 -0500 |
| commit | 2d0506ecf9daa96f42cbfc1ee4fd612020241dd5 (patch) | |
| tree | 07e9244ba02d4279d33e740f2a16a4f1128ad027 | |
| parent | b45f89f80c62d22cbc2a4b38ae63a2da67878ee4 (diff) | |
Group item and deco data more
| -rw-r--r-- | data/decorations/mystery_gift_decos.asm (renamed from data/mystery_gift_decos.asm) | 0 | ||||
| -rw-r--r-- | data/items/marts.asm | 1 | ||||
| -rw-r--r-- | data/items/mystery_gift_items.asm (renamed from data/mystery_gift_items.asm) | 0 | ||||
| -rwxr-xr-x | engine/mystery_gift_2.asm | 4 |
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" |