undo revert

This commit is contained in:
DizzyEggg 2017-10-23 14:40:22 +02:00
parent 5b05811dd9
commit 356eb34e32
137 changed files with 11131 additions and 15649 deletions

View File

@ -24,7 +24,7 @@ CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp
CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef
LD := $(DEVKITARM)/bin/arm-none-eabi-ld
LDFLAGS = -Map $(MAP)
LDFLAGS = -Map ../../$(MAP)
OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy
@ -102,7 +102,7 @@ $(C_BUILDDIR)/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
ifeq ($(NODEP),)
$(C_BUILDDIR)/%.o: c_dep = $(shell $(SCANINC) $(C_SUBDIR)/$*.c)
$(C_BUILDDIR)/%.o: c_dep = $(shell $(SCANINC) -I include $(C_SUBDIR)/$*.c)
else
$(C_BUILDDIR)/%.o: c_dep :=
endif

File diff suppressed because it is too large Load Diff

View File

@ -1,459 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start SetDecorationInventoriesPointers
SetDecorationInventoriesPointers: @ 81617F4
push {r4,lr}
ldr r0, =gDecorationInventories
mov r12, r0
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r2, =0x00002734
adds r0, r1, r2
mov r4, r12
str r0, [r4]
movs r3, 0xA
strb r3, [r4, 0x4]
adds r2, 0xA
adds r0, r1, r2
str r0, [r4, 0x8]
strb r3, [r4, 0xC]
ldr r4, =0x00002748
adds r0, r1, r4
mov r2, r12
str r0, [r2, 0x10]
strb r3, [r2, 0x14]
adds r4, 0xA
adds r0, r1, r4
str r0, [r2, 0x18]
movs r2, 0x1E
mov r0, r12
strb r2, [r0, 0x1C]
adds r4, 0x1E
adds r0, r1, r4
mov r4, r12
str r0, [r4, 0x20]
mov r0, r12
adds r0, 0x24
strb r2, [r0]
ldr r2, =0x0000278e
adds r0, r1, r2
str r0, [r4, 0x28]
mov r0, r12
adds r0, 0x2C
strb r3, [r0]
ldr r4, =0x00002798
adds r0, r1, r4
mov r2, r12
str r0, [r2, 0x30]
adds r2, 0x34
movs r0, 0x28
strb r0, [r2]
adds r4, 0x28
adds r1, r4
mov r0, r12
str r1, [r0, 0x38]
adds r0, 0x3C
strb r3, [r0]
bl sub_8126968
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end SetDecorationInventoriesPointers
thumb_func_start ClearDecorationInventory
ClearDecorationInventory: @ 8161880
push {r4,r5,lr}
lsls r0, 24
movs r3, 0
ldr r1, =gDecorationInventories
lsrs r2, r0, 21
adds r0, r2, r1
ldrb r0, [r0, 0x4]
cmp r3, r0
bcs _081618AA
adds r5, r1, 0
movs r4, 0
_08161896:
adds r0, r2, r5
ldr r1, [r0]
adds r1, r3
strb r4, [r1]
adds r1, r3, 0x1
lsls r1, 24
lsrs r3, r1, 24
ldrb r0, [r0, 0x4]
cmp r3, r0
bcc _08161896
_081618AA:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end ClearDecorationInventory
thumb_func_start ClearDecorationInventories
ClearDecorationInventories: @ 81618B4
push {r4,lr}
movs r4, 0
_081618B8:
adds r0, r4, 0
bl ClearDecorationInventory
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x7
bls _081618B8
pop {r4}
pop {r0}
bx r0
thumb_func_end ClearDecorationInventories
thumb_func_start sub_81618D0
sub_81618D0: @ 81618D0
push {r4,lr}
lsls r0, 24
movs r2, 0
ldr r1, =gDecorationInventories
lsrs r0, 21
adds r0, r1
movs r1, 0x4
ldrsb r1, [r0, r1]
cmp r2, r1
bge _0816190C
adds r4, r0, 0
adds r3, r1, 0
_081618E8:
lsls r0, r2, 24
asrs r1, r0, 24
ldr r0, [r4]
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _08161900
adds r0, r1, 0
b _08161910
.pool
_08161900:
adds r0, r1, 0x1
lsls r0, 24
lsrs r2, r0, 24
asrs r0, 24
cmp r0, r3
blt _081618E8
_0816190C:
movs r0, 0x1
negs r0, r0
_08161910:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81618D0
thumb_func_start CheckHasDecoration
CheckHasDecoration: @ 8161918
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r1, =gDecorations
lsls r0, r3, 5
adds r0, r1
ldrb r0, [r0, 0x13]
movs r2, 0
ldr r1, =gDecorationInventories
lsls r0, 3
adds r0, r1
ldrb r1, [r0, 0x4]
cmp r2, r1
bcs _08161956
ldr r4, [r0]
_08161936:
adds r0, r4, r2
ldrb r0, [r0]
cmp r0, r3
bne _0816194C
movs r0, 0x1
b _08161958
.pool
_0816194C:
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, r1
bcc _08161936
_08161956:
movs r0, 0
_08161958:
pop {r4}
pop {r1}
bx r1
thumb_func_end CheckHasDecoration
thumb_func_start DecorationAdd
DecorationAdd: @ 8161960
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
cmp r4, 0
beq _081619A0
ldr r1, =gDecorations
lsls r0, r4, 5
adds r0, r1
ldrb r5, [r0, 0x13]
adds r0, r5, 0
bl sub_81618D0
lsls r0, 24
asrs r2, r0, 24
movs r0, 0x1
negs r0, r0
cmp r2, r0
beq _081619A0
ldr r0, =gDecorationInventories
lsls r1, r5, 3
adds r1, r0
ldr r0, [r1]
adds r0, r2
strb r4, [r0]
movs r0, 0x1
b _081619A2
.pool
_081619A0:
movs r0, 0
_081619A2:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end DecorationAdd
thumb_func_start DecorationCheckSpace
DecorationCheckSpace: @ 81619A8
push {lr}
lsls r0, 24
lsrs r0, 24
cmp r0, 0
beq _081619D4
ldr r1, =gDecorations
lsls r0, 5
adds r0, r1
ldrb r0, [r0, 0x13]
bl sub_81618D0
lsls r0, 24
asrs r0, 24
movs r1, 0x1
negs r1, r1
cmp r0, r1
beq _081619D4
movs r0, 0x1
b _081619D6
.pool
_081619D4:
movs r0, 0
_081619D6:
pop {r1}
bx r1
thumb_func_end DecorationCheckSpace
thumb_func_start DecorationRemove
DecorationRemove: @ 81619DC
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
movs r3, 0
cmp r5, 0
bne _081619F8
b _08161A26
_081619EA:
movs r0, 0
strb r0, [r1]
adds r0, r6, 0
bl sub_8161A38
movs r0, 0x1
b _08161A28
_081619F8:
ldr r2, =gDecorationInventories
ldr r1, =gDecorations
lsls r0, r5, 5
adds r0, r1
ldrb r4, [r0, 0x13]
lsls r0, r4, 3
adds r0, r2
ldrb r1, [r0, 0x4]
cmp r3, r1
bcs _08161A26
adds r6, r4, 0
adds r4, r0, 0
adds r2, r1, 0
_08161A12:
ldr r0, [r4]
adds r1, r0, r3
ldrb r0, [r1]
cmp r0, r5
beq _081619EA
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r2
bcc _08161A12
_08161A26:
movs r0, 0
_08161A28:
pop {r4-r6}
pop {r1}
bx r1
.pool
thumb_func_end DecorationRemove
thumb_func_start sub_8161A38
sub_8161A38: @ 8161A38
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
lsls r0, 24
movs r6, 0
ldr r2, =gDecorationInventories
lsrs r0, 21
adds r1, r0, r2
ldrb r3, [r1, 0x4]
cmp r6, r3
bcs _08161ABC
adds r7, r0, 0
mov r10, r1
mov r0, r10
str r0, [sp]
_08161A5C:
adds r1, r6, 0x1
lsls r0, r1, 24
lsrs r3, r0, 24
adds r2, r7, 0
mov r12, r1
mov r1, r10
ldrb r1, [r1, 0x4]
cmp r3, r1
bcs _08161AAE
ldr r0, =gDecorationInventories
mov r9, r0
adds r1, r0, 0
mov r8, r1
_08161A76:
mov r0, r9
adds r5, r2, r0
ldr r1, [r5]
adds r0, r1, r3
ldrb r4, [r0]
adds r2, r4, 0
cmp r2, 0
beq _08161A9C
adds r0, r1, r6
ldrb r1, [r0]
cmp r1, 0
beq _08161A92
cmp r1, r2
bls _08161A9C
_08161A92:
ldrb r1, [r0]
strb r4, [r0]
ldr r0, [r5]
adds r0, r3
strb r1, [r0]
_08161A9C:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
adds r2, r7, 0
mov r1, r8
adds r0, r2, r1
ldrb r0, [r0, 0x4]
cmp r3, r0
bcc _08161A76
_08161AAE:
mov r3, r12
lsls r0, r3, 24
lsrs r6, r0, 24
ldr r0, [sp]
ldrb r0, [r0, 0x4]
cmp r6, r0
bcc _08161A5C
_08161ABC:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_8161A38
thumb_func_start sub_8161AD0
sub_8161AD0: @ 8161AD0
push {r4,r5,lr}
lsls r0, 24
movs r4, 0
movs r3, 0
ldr r2, =gDecorationInventories
lsrs r1, r0, 21
adds r0, r1, r2
ldrb r0, [r0, 0x4]
cmp r4, r0
bcs _08161B04
adds r5, r2, 0
_08161AE6:
adds r2, r1, r5
ldr r0, [r2]
adds r0, r3
ldrb r0, [r0]
cmp r0, 0
beq _08161AF8
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
_08161AF8:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
ldrb r2, [r2, 0x4]
cmp r3, r2
bcc _08161AE6
_08161B04:
adds r0, r4, 0
pop {r4,r5}
pop {r1}
bx r1
.pool
thumb_func_end sub_8161AD0
thumb_func_start sub_8161B10
sub_8161B10: @ 8161B10
push {r4,r5,lr}
movs r5, 0
movs r4, 0
_08161B16:
adds r0, r4, 0
bl sub_8161AD0
adds r0, r5, r0
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x7
bls _08161B16
adds r0, r5, 0
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8161B10
.align 2, 0 @ Don't pad with nop.

File diff suppressed because it is too large Load Diff

View File

@ -1192,7 +1192,7 @@ _080E9462:
mov r3, r10
ldrb r1, [r3]
lsls r1, 5
ldr r2, =gUnknown_085A5C24
ldr r2, =gDecorations + 0x1c
adds r1, r2
ldr r1, [r1]
ldrh r1, [r1]

View File

@ -351,7 +351,7 @@ sub_8133CF4: @ 8133CF4
ldr r5, =gScriptResult
_08133CFA:
adds r0, r4, 0
bl sub_8161AD0
bl CountDecorationCategoryN
lsls r0, 24
cmp r0, 0
beq _08133D10
@ -395,7 +395,7 @@ sub_8133D2C: @ 8133D2C
cmp r1, r0
beq _08133D72
adds r0, r1, 0
bl sub_81618D0
bl GetFirstEmptyDecorSlot
lsls r0, 24
asrs r0, 24
movs r1, 0x1
@ -433,15 +433,15 @@ sub_8133DA0: @ 8133DA0
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
bl sub_81279C4
bl IsSelectedDecorInThePC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08133DFC
ldr r5, =gSpecialVar_0x8006
ldr r0, =gUnknown_0203A172
ldr r0, =gCurDecorationIndex
ldrb r1, [r0]
ldr r0, =gUnknown_0203A14C
ldr r0, =gCurDecorInventoryItems
ldr r0, [r0]
adds r0, r1
ldrb r0, [r0]

View File

@ -5,4 +5,4 @@
.align 2, 0
gUnknown_085A1F94:: @ 85A1F94
.incbin "baserom.gba", 0x5a1f94, 0x3c74
.incbin "baserom.gba", 0x5a1f94, 0x2580

View File

@ -1,86 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gDecorations:: @ 85A5C08
.incbin "baserom.gba", 0x5a5c08, 0x1c
gUnknown_085A5C24:: @ 85A5C24
.incbin "baserom.gba", 0x5a5c24, 0xf04
gUnknown_085A6B28:: @ 85A6B28
.incbin "baserom.gba", 0x5a6b28, 0x20
gUnknown_085A6B48:: @ 85A6B48
.incbin "baserom.gba", 0x5a6b48, 0x20
gUnknown_085A6B68:: @ 85A6B68
.incbin "baserom.gba", 0x5a6b68, 0x10
gUnknown_085A6B78:: @ 85A6B78
.incbin "baserom.gba", 0x5a6b78, 0x18
gUnknown_085A6B90:: @ 85A6B90
.incbin "baserom.gba", 0x5a6b90, 0x20
gUnknown_085A6BB0:: @ 85A6BB0
.incbin "baserom.gba", 0x5a6bb0, 0x20
gUnknown_085A6BD0:: @ 85A6BD0
.incbin "baserom.gba", 0x5a6bd0, 0x18
gUnknown_085A6BE8:: @ 85A6BE8
.incbin "baserom.gba", 0x5a6be8, 0x5c8
gUnknown_085A71B0:: @ 85A71B0
.incbin "baserom.gba", 0x5a71b0, 0xa0
gUnknown_085A7250:: @ 85A7250
.incbin "baserom.gba", 0x5a7250, 0x3c
gUnknown_085A728C:: @ 85A728C
.incbin "baserom.gba", 0x5a728c, 0x18
gUnknown_085A72A4:: @ 85A72A4
.incbin "baserom.gba", 0x5a72a4, 0x18
gUnknown_085A72BC:: @ 85A72BC
.incbin "baserom.gba", 0x5a72bc, 0x8
gUnknown_085A72C4:: @ 85A72C4
.incbin "baserom.gba", 0x5a72c4, 0x8
gUnknown_085A72CC:: @ 85A72CC
.incbin "baserom.gba", 0x5a72cc, 0x8
gUnknown_085A72D4:: @ 85A72D4
.incbin "baserom.gba", 0x5a72d4, 0x10
gUnknown_085A72E4:: @ 85A72E4
.incbin "baserom.gba", 0x5a72e4, 0x8
gUnknown_085A72EC:: @ 85A72EC
.incbin "baserom.gba", 0x5a72ec, 0x8
gUnknown_085A72F4:: @ 85A72F4
.incbin "baserom.gba", 0x5a72f4, 0x54
gUnknown_085A7348:: @ 85A7348
.incbin "baserom.gba", 0x5a7348, 0x8
gUnknown_085A7350:: @ 85A7350
.incbin "baserom.gba", 0x5a7350, 0x88
gUnknown_085A73D8:: @ 85A73D8
.incbin "baserom.gba", 0x5a73d8, 0x8
gUnknown_085A73E0:: @ 85A73E0
.incbin "baserom.gba", 0x5a73e0, 0x24
gUnknown_085A7404:: @ 85A7404
.incbin "baserom.gba", 0x5a7404, 0x18
gUnknown_085A741C:: @ 85A741C
.incbin "baserom.gba", 0x5a741c, 0x8

View File

@ -881,7 +881,10 @@ gUnknown_08DAAFEC:: @ 8DAAFEC
.include "data/graphics/items/item_graphics.inc"
@ 8DB7AA0
.incbin "baserom.gba", 0xdb7aa0, 0x2a78
.include "data/graphics/decorations/decoration_graphics.inc"
@ 8DBA14C
.incbin "baserom.gba", 0xdba14c, 0x3cc
gUnknown_08DBA518:: @ 8DBA518
.incbin "baserom.gba", 0xdba518, 0x80

View File

@ -0,0 +1,252 @@
gUnknown_08DB7AA0::
.incbin "graphics/decorations/decor_heavy_desk.4bpp.lz"
gUnknown_08DB7B34::
.incbin "graphics/decorations/decor_heavy_desk.gbapal.lz"
gUnknown_08DB7B5C::
.incbin "graphics/decorations/decor_ragged_desk.4bpp.lz"
gUnknown_08DB7BEC::
.incbin "graphics/decorations/decor_ragged_desk.gbapal.lz"
gUnknown_08DB7C08::
.incbin "graphics/decorations/decor_comfort_desk.4bpp.lz"
gUnknown_08DB7CE8::
.incbin "graphics/decorations/decor_comfort_desk.gbapal.lz"
gUnknown_08DB7D08::
.incbin "graphics/decorations/decor_pretty_desk.4bpp.lz"
gUnknown_08DB7DCC::
.incbin "graphics/decorations/decor_pretty_desk.gbapal.lz"
gUnknown_08DB7DF4::
.incbin "graphics/decorations/decor_brick_desk.4bpp.lz"
gUnknown_08DB7EA0::
.incbin "graphics/decorations/decor_brick_desk.gbapal.lz"
gUnknown_08DB7EC4::
.incbin "graphics/decorations/decor_camp_desk.4bpp.lz"
gUnknown_08DB7F60::
.incbin "graphics/decorations/decor_camp_desk.gbapal.lz"
gUnknown_08DB7F7C::
.incbin "graphics/decorations/decor_hard_desk.4bpp.lz"
gUnknown_08DB8070::
.incbin "graphics/decorations/decor_hard_desk.gbapal.lz"
gUnknown_08DB808C::
.incbin "graphics/decorations/decor_red_plant.4bpp.lz"
gUnknown_08DB8138::
.incbin "graphics/decorations/decor_red_plant.gbapal.lz"
gUnknown_08DB8160::
.incbin "graphics/decorations/decor_tropical_plant.4bpp.lz"
gUnknown_08DB8218::
.incbin "graphics/decorations/decor_tropical_plant.gbapal.lz"
gUnknown_08DB823C::
.incbin "graphics/decorations/decor_pretty_flowers.4bpp.lz"
gUnknown_08DB8300::
.incbin "graphics/decorations/decor_pretty_flowers.gbapal.lz"
gUnknown_08DB8328::
.incbin "graphics/decorations/decor_colorful_plant.4bpp.lz"
gUnknown_08DB8430::
.incbin "graphics/decorations/decor_colorful_plant.gbapal.lz"
gUnknown_08DB8458::
.incbin "graphics/decorations/decor_big_plant.4bpp.lz"
gUnknown_08DB8528::
.incbin "graphics/decorations/decor_big_plant.gbapal.lz"
gUnknown_08DB854C::
.incbin "graphics/decorations/decor_gorgeous_plant.4bpp.lz"
gUnknown_08DB862C::
.incbin "graphics/decorations/decor_gorgeous_plant.gbapal.lz"
gUnknown_08DB8654::
.incbin "graphics/decorations/decor_red_brick.4bpp.lz"
gUnknown_08DB86C4::
.incbin "graphics/decorations/decor_red_brick.gbapal.lz"
gUnknown_08DB86E0::
.incbin "graphics/decorations/decor_yellow_brick.4bpp.lz"
gUnknown_08DB8750::
.incbin "graphics/decorations/decor_yellow_brick.gbapal.lz"
gUnknown_08DB876C::
.incbin "graphics/decorations/decor_blue_brick.4bpp.lz"
gUnknown_08DB87DC::
.incbin "graphics/decorations/decor_blue_brick.gbapal.lz"
gUnknown_08DB87F8::
.incbin "graphics/decorations/decor_red_tent.4bpp.lz"
gUnknown_08DB88D8::
.incbin "graphics/decorations/decor_red_tent.gbapal.lz"
gUnknown_08DB8900::
.incbin "graphics/decorations/decor_blue_tent.4bpp.lz"
gUnknown_08DB89E0::
.incbin "graphics/decorations/decor_blue_tent.gbapal.lz"
gUnknown_08DB8A08::
.incbin "graphics/decorations/decor_solid_board.4bpp.lz"
gUnknown_08DB8A68::
.incbin "graphics/decorations/decor_solid_board.gbapal.lz"
gUnknown_08DB8A84::
.incbin "graphics/decorations/decor_slide.4bpp.lz"
gUnknown_08DB8B40::
.incbin "graphics/decorations/decor_slide.gbapal.lz"
gUnknown_08DB8B68::
.incbin "graphics/decorations/decor_tire.4bpp.lz"
gUnknown_08DB8C40::
.incbin "graphics/decorations/decor_tire.gbapal.lz"
gUnknown_08DB8C5C::
.incbin "graphics/decorations/decor_stand.4bpp.lz"
gUnknown_08DB8CF4::
.incbin "graphics/decorations/decor_stand.gbapal.lz"
gUnknown_08DB8D18::
.incbin "graphics/decorations/decor_breakable_door.4bpp.lz"
gUnknown_08DB8DB0::
.incbin "graphics/decorations/decor_breakable_door.gbapal.lz"
gUnknown_08DB8DD4::
.incbin "graphics/decorations/decor_sand_ornament.4bpp.lz"
gUnknown_08DB8E80::
.incbin "graphics/decorations/decor_sand_ornament.gbapal.lz"
gUnknown_08DB8EA0::
.incbin "graphics/decorations/decor_glass_ornament.4bpp.lz"
gUnknown_08DB8F58::
.incbin "graphics/decorations/decor_glass_ornament.gbapal.lz"
gUnknown_08DB8F7C::
.incbin "graphics/decorations/decor_surf_mat.4bpp.lz"
gUnknown_08DB9038::
.incbin "graphics/decorations/decor_surf_mat.gbapal.lz"
gUnknown_08DB9058::
.incbin "graphics/decorations/decor_thunder_mat.4bpp.lz"
gUnknown_08DB9130::
.incbin "graphics/decorations/decor_thunder_mat.gbapal.lz"
gUnknown_08DB9154::
.incbin "graphics/decorations/decor_fire_blast_mat.4bpp.lz"
gUnknown_08DB9218::
.incbin "graphics/decorations/decor_fire_blast_mat.gbapal.lz"
gUnknown_08DB9234::
.incbin "graphics/decorations/decor_powder_snow_mat.4bpp.lz"
gUnknown_08DB92FC::
.incbin "graphics/decorations/decor_powder_snow_mat.gbapal.lz"
gUnknown_08DB931C::
.incbin "graphics/decorations/decor_attract_mat.4bpp.lz"
gUnknown_08DB93E8::
.incbin "graphics/decorations/decor_attract_mat.gbapal.lz"
gUnknown_08DB940C::
.incbin "graphics/decorations/decor_fissure_mat.4bpp.lz"
gUnknown_08DB94CC::
.incbin "graphics/decorations/decor_fissure_mat.gbapal.lz"
gUnknown_08DB94E8::
.incbin "graphics/decorations/decor_spikes_mat.4bpp.lz"
gUnknown_08DB95AC::
.incbin "graphics/decorations/decor_spikes_mat.gbapal.lz"
gUnknown_08DB95D0::
.incbin "graphics/decorations/decor_snorlax_doll.4bpp.lz"
gUnknown_08DB96C4::
.incbin "graphics/decorations/decor_snorlax_doll.gbapal.lz"
gUnknown_08DB96EC::
.incbin "graphics/decorations/decor_rhydon_doll.4bpp.lz"
gUnknown_08DB97F4::
.incbin "graphics/decorations/decor_rhydon_doll.gbapal.lz"
gUnknown_08DB981C::
.incbin "graphics/decorations/decor_lapras_doll.4bpp.lz"
gUnknown_08DB9908::
.incbin "graphics/decorations/decor_lapras_doll.gbapal.lz"
gUnknown_08DB9930::
.incbin "graphics/decorations/decor_venusaur_doll.4bpp.lz"
gUnknown_08DB9A54::
.incbin "graphics/decorations/decor_venusaur_doll.gbapal.lz"
gUnknown_08DB9A7C::
.incbin "graphics/decorations/decor_charizard_doll.4bpp.lz"
gUnknown_08DB9B7C::
.incbin "graphics/decorations/decor_charizard_doll.gbapal.lz"
gUnknown_08DB9BA4::
.incbin "graphics/decorations/decor_blastoise_doll.4bpp.lz"
gUnknown_08DB9CB0::
.incbin "graphics/decorations/decor_blastoise_doll.gbapal.lz"
gUnknown_08DB9CD8::
.incbin "graphics/decorations/decor_wailmer_doll.4bpp.lz"
gUnknown_08DB9DAC::
.incbin "graphics/decorations/decor_wailmer_doll.gbapal.lz"
gUnknown_08DB9DD4::
.incbin "graphics/decorations/decor_regice_doll.4bpp.lz"
gUnknown_08DB9EE4::
.incbin "graphics/decorations/decor_regice_doll.gbapal.lz"
gUnknown_08DB9F08::
.incbin "graphics/decorations/decor_regirock_doll.4bpp.lz"
gUnknown_08DB9FFC::
.incbin "graphics/decorations/decor_regirock_doll.gbapal.lz"
gUnknown_08DBA020::
.incbin "graphics/decorations/decor_registeel_doll.4bpp.lz"
gUnknown_08DBA12C::
.incbin "graphics/decorations/decor_registeel_doll.gbapal.lz"

View File

@ -40,7 +40,10 @@ gUnknown_0861CD14:: @ 861CD14
.incbin "baserom.gba", 0x61cd14, 0x18
gUnknown_0861CD2C:: @ 861CD2C
.incbin "baserom.gba", 0x61cd2c, 0xa7
.incbin "baserom.gba", 0x61cd2c, 0x27
gUnknown_0861CD53:: @ 861CD53
.incbin "baserom.gba", 0x61cd53, 0x80
gUnknown_0861CDD3:: @ 861CDD3
.incbin "baserom.gba", 0x61cdd3, 0x81

View File

@ -1517,52 +1517,52 @@ gUnknown_085EA79D:: @ 85EA79D
gUnknown_085EA7A9:: @ 85EA7A9
.string "{STR_VAR_3}{STR_VAR_1}/{STR_VAR_2}$"
gUnknown_085EA7B1:: @ 85EA7B1
gText_Decorate:: @ 85EA7B1
.string "DECORATE$"
gUnknown_085EA7BA:: @ 85EA7BA
gText_PutAway:: @ 85EA7BA
.string "PUT AWAY$"
gUnknown_085EA7C3:: @ 85EA7C3
gText_Toss2:: @ 85EA7C3
.string "TOSS$"
gText_Color161Shadow161:: @ 85EA7C8
.string "{COLOR 161}{SHADOW 161}$"
gUnknown_085EA7CF:: @ 85EA7CF
gText_PutOutSelectedDecorItem:: @ 85EA7CF
.string "Put out the selected decoration item.$"
gUnknown_085EA7F5:: @ 85EA7F5
gText_StoreChosenDecorInPC:: @ 85EA7F5
.string "Store the chosen decoration in the PC.$"
gUnknown_085EA81C:: @ 85EA81C
gText_ThrowAwayUnwantedDecors:: @ 85EA81C
.string "Throw away unwanted decorations.$"
gText_NoDecorations:: @ 85EA83D
.string "There are no decorations.{PAUSE_UNTIL_PRESS}$"
gUnknown_085EA859:: @ 85EA859
gText_Desk:: @ 85EA859
.string "DESK$"
gUnknown_085EA85E:: @ 85EA85E
gText_Chair:: @ 85EA85E
.string "CHAIR$"
gUnknown_085EA864:: @ 85EA864
gText_Plant:: @ 85EA864
.string "PLANT$"
gUnknown_085EA86A:: @ 85EA86A
gText_Ornament:: @ 85EA86A
.string "ORNAMENT$"
gUnknown_085EA873:: @ 85EA873
gText_Mat:: @ 85EA873
.string "MAT$"
gUnknown_085EA877:: @ 85EA877
gText_Poster:: @ 85EA877
.string "POSTER$"
gUnknown_085EA87E:: @ 85EA87E
gText_Doll:: @ 85EA87E
.string "DOLL$"
gUnknown_085EA883:: @ 85EA883
gText_Cushion:: @ 85EA883
.string "CUSHION$"
gText_Gold:: @ 85EA88B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
255 230 222
255 197 197
246 156 156
213 115 172
197 189 131
246 148 205
123 82 74
0 0 0
0 0 0
0 0 0
0 0 0
246 246 246
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 307 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
189 230 106
123 172 74
90 139 65
57 98 41
213 180 106
180 139 82
139 98 49
82 57 32
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
197 222 255
131 189 255
90 139 213
57 90 131
213 156 90
230 189 131
156 131 90
98 82 41
139 90 74
0 0 0
0 0 0
0 0 0
246 246 246
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 371 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
156 180 246
82 131 230
57 98 189
24 65 131
106 106 106
74 74 74
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
148 172 255
115 139 238
65 90 189
49 57 123
0 0 0
197 205 230
164 164 164
131 131 131
90 82 74
0 0 0
0 0 0
0 0 0
246 246 246
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 321 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
139 189 255
106 156 213
213 189 115
156 131 41
123 98 8
90 74 57
189 164 74
0 0 0
0 0 0
0 0 0
0 0 0
246 246 246
197 197 197

Binary file not shown.

After

Width:  |  Height:  |  Size: 274 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
255 180 82
230 139 49
189 90 16
0 0 0
0 0 0
0 0 0
197 197 197
148 148 156
106 106 98
74 74 74
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 270 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
205 189 123
172 156 90
148 131 65
123 98 32
82 57 41
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
238 172 98
255 205 74
222 156 41
115 74 24
164 98 24
0 0 0
230 82 65
180 49 32
0 0 0
0 0 0
0 0 0
246 246 246
255 238 197

Binary file not shown.

After

Width:  |  Height:  |  Size: 349 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
205 180 115
180 139 98
131 90 57
156 222 90
139 189 139
98 148 98
41 90 57
106 189 255
255 123 172
255 213 74
0 0 0
238 238 238
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 371 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
180 222 139
139 189 139
90 139 90
41 90 41
115 164 115
0 0 0
164 131 65
115 82 57
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
255 180 82
238 148 41
213 98 24
139 65 41
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
205 189 131
189 172 106
156 139 74
123 106 41
98 74 32
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
0 0 0
189 230 255
156 197 255
115 164 238
82 139 189
57 98 131
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
238 246 246
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
180 222 139
139 180 139
90 139 106
49 82 41
0 0 0
148 115 82
115 82 24
0 0 0
230 230 230
164 164 164
106 106 106
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
197 197 197
156 156 156
115 115 115
98 98 98
74 74 74
139 139 139
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 325 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
180 180 197
148 148 156
90 90 90
255 180 82
230 139 49
197 90 8
90 41 8
0 0 0
123 123 123
65 65 65
106 106 115
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 268 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
189 230 255
115 180 246
74 139 189
32 90 139
0 0 0
0 0 0
246 197 131
222 156 98
197 156 123
106 74 41
0 0 0
246 246 246
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 349 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
238 238 246
180 205 255
131 164 205
197 222 255
213 238 255
98 131 172
148 180 222
49 82 123
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
189 222 255
156 197 255
0 0 0
131 164 246
49 82 123
0 0 0
0 0 0
0 0 0
180 180 180
131 131 131
90 90 90
246 246 246
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
0 0 0
205 180 74
156 139 32
90 74 49
123 106 41
115 180 98
74 123 57
41 82 32
255 205 180
123 74 49
238 156 139
246 246 246
222 197 197

Binary file not shown.

After

Width:  |  Height:  |  Size: 318 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 205 98
49 49 49
238 222 172
213 197 139
180 164 106
148 131 74
123 98 49
82 65 32
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
238 123 123
189 74 65
148 32 32
123 16 16
106 106 106
74 74 74
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
222 115 123
189 74 82
139 32 32
82 32 16
0 0 0
115 164 106
65 123 57
24 82 41
0 0 0
205 172 98
156 123 82
106 82 57
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 300 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
246 123 123
222 90 90
180 49 49
115 49 57
0 0 0
197 205 230
164 164 164
131 131 131
90 82 74
0 0 0
0 0 0
0 0 0
246 246 246
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 317 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
238 238 255
180 189 205
139 148 172
82 98 115
115 123 139
0 0 0
0 0 0
246 180 65
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
0 0 0
180 164 98
123 115 49
82 74 49
0 0 0
205 115 82
148 65 82
0 0 0
189 74 24
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
238 238 238
197 197 197
164 164 164
123 123 131
82 82 90
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
172 82 65
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
222 222 222
164 164 164
189 189 189
139 139 139
106 106 106
82 82 82
230 197 115
189 148 74
131 98 74
0 0 0
0 0 0
0 0 0
246 246 246
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 367 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
213 197 156
189 164 90
148 123 49
90 74 24
131 106 32
172 148 74
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 286 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
148 189 238
106 148 205
65 115 172
180 222 255
0 0 0
0 0 0
0 0 0
213 213 213
189 189 189
156 156 156
106 106 106
0 0 0
246 246 246
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 293 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
0 0 0
131 139 164
82 90 115
0 0 0
255 238 222
255 197 148
222 156 90
139 90 49
172 106 49
230 172 123
0 0 0
238 238 238
189 189 197

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
189 164 98
156 131 65
123 90 41
106 90 74
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 221 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 213 98
49 49 49
0 0 0
148 197 148
106 172 115
82 148 90
139 156 98
222 205 139
180 164 98
205 189 131
49 98 57
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
255 180 156
238 115 106
197 65 65
0 0 0
0 0 0
0 0 0
197 197 197
172 172 172
131 131 131
106 106 106
0 0 0
0 0 0
246 246 246
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 264 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
205 238 255
164 205 255
148 180 255
115 148 222
57 90 156
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
246 246 255
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 298 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
0 0 0
189 222 255
172 205 238
139 172 205
139 156 164
255 230 123
90 106 115
0 0 0
0 0 0
0 0 0
0 0 0
238 246 255
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
0 0 0
238 238 238
189 189 189
164 164 164
131 131 131
98 98 98
74 74 74
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
197 172 82
164 139 49
131 106 16
82 65 16
0 0 0
0 0 0
148 222 90
106 180 49
74 131 24
32 90 24
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 307 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
197 255 222
123 189 57
82 148 24
74 115 24
41 82 32
238 156 139
213 98 90
164 74 74
115 57 65
230 189 65
131 98 24
82 32 41
246 246 246

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
0 0 0
0 0 0
106 148 172
74 115 148
57 98 123
57 65 106
230 180 106
205 148 82
180 139 57
115 74 41
0 0 0
213 213 213
246 246 246
164 164 164

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 197 98
49 49 49
255 230 106
222 197 49
180 156 8
148 123 0
106 106 106
74 74 74
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 205 164
255 255 255
98 98 98
213 213 205
230 230 230
197 197 197
0 0 0
238 238 238
197 197 197
148 148 148
255 0 0
180 0 0
255 197 197
82 82 255
49 49 180
197 197 255

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 213 180
255 197 148
222 148 115
123 65 65
57 74 123
41 57 98
24 41 82
16 32 57
222 230 238
255 197 90
189 156 90
255 98 90
197 65 65
255 255 255
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 222 205
222 164 148
205 131 115
123 90 82
98 98 115
41 57 65
164 106 82
74 49 57
205 205 222
255 197 90
189 156 90
255 98 90
197 65 65
255 255 255
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 B

Some files were not shown because too many files have changed in this diff Show More