From 2c2f4255cb96c3fea95e5fac7655c00cabff9cfb Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Wed, 31 Aug 2016 01:13:47 -0700 Subject: trader decorations --- asm/rom5.s | 2 +- data/data2.s | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/asm/rom5.s b/asm/rom5.s index 10f080e98..ae74d1da6 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -294076,7 +294076,7 @@ _081099E0: .align 2, 0 _08109A14: .4byte 0x020284c8 _08109A18: .4byte gUnknown_083F62D8 -_08109A1C: .4byte gUnknown_083F62E8 +_08109A1C: .4byte gTraderDecorations thumb_func_end sub_81099CC thumb_func_start sub_8109A20 diff --git a/data/data2.s b/data/data2.s index ca086c4bd..d73459037 100644 --- a/data/data2.s +++ b/data/data2.s @@ -23735,8 +23735,11 @@ gUnknown_083F62D8:: @ 83F62D8 .4byte SecretBaseText_Dennis .4byte SecretBaseText_Roberto -gUnknown_083F62E8:: @ 83F62E8 - .incbin "baserom.gba", 0x003f62e8, 0x4 +gTraderDecorations:: @ 83F62E8 + .byte DECOR_DUSKULL_DOLL + .byte DECOR_BALL_CUSHION + .byte DECOR_TIRE + .byte DECOR_PRETTY_FLOWERS gUnknown_083F62EC:: @ 83F62EC .incbin "graphics/misc/birch_bag.gbapal" -- cgit v1.2.3