From a2d206665c6fffbd962375f262b7fbb05c7b7478 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Tue, 30 Mar 2021 13:11:51 -0500
Subject: Move some data and Splitting (#32)

* move friend area settings to src

* split out playtime into different C file and decomp a few more funcs

* time -> play_time

* fix include

* split out more wonder mail stuff

* unify 203B2C0 and unkDungeon structs. snuck in a decomp func too

* split out more menu screens

* work some more on trade items

* doc a few more things

* add a close nonmatch and decomp nullsub and small func

* rollback struct attempt since it causes nonmatchings

* only one func left in asm

* death to trade_item asm and unify into one C file

* more docing and cleanup

* label main menu and trade items menu global menu struct

* doc itemMode
---
 asm/code_8095014.s | 96 ------------------------------------------------------
 1 file changed, 96 deletions(-)

(limited to 'asm/code_8095014.s')

diff --git a/asm/code_8095014.s b/asm/code_8095014.s
index e7ba8b6..9a119ae 100644
--- a/asm/code_8095014.s
+++ b/asm/code_8095014.s
@@ -5,102 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8095118
-sub_8095118:
-	push {r4,lr}
-	ldr r4, _0809517C
-	ldr r0, [r4]
-	movs r2, 0xC0
-	lsls r2, 3
-	movs r1, 0
-	bl MemoryFill8
-	ldr r0, _08095180
-	ldr r0, [r0]
-	movs r1, 0
-	movs r2, 0x5C
-	bl MemoryFill8
-	movs r2, 0
-	movs r1, 0
-	movs r3, 0x1F
-_0809513A:
-	ldr r0, [r4]
-	adds r0, r1
-	strb r2, [r0]
-	ldr r0, [r4]
-	adds r0, r1
-	adds r0, 0x22
-	strb r2, [r0]
-	ldr r0, [r4]
-	adds r0, r1
-	adds r0, 0x2D
-	strb r2, [r0]
-	adds r1, 0x30
-	subs r3, 0x1
-	cmp r3, 0
-	bge _0809513A
-	ldr r2, _08095184
-	ldr r1, [r2]
-	movs r0, 0
-	str r0, [r1]
-	movs r3, 0
-	movs r4, 0x1
-	negs r4, r4
-_08095166:
-	ldr r0, [r2]
-	lsls r1, r3, 2
-	adds r0, 0x4
-	adds r0, r1
-	str r4, [r0]
-	adds r3, 0x1
-	cmp r3, 0x1F
-	ble _08095166
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809517C: .4byte gUnknown_203B480
-_08095180: .4byte gUnknown_203B484
-_08095184: .4byte gUnknown_203B48C
-	thumb_func_end sub_8095118
-
-	thumb_func_start nullsub_206
-nullsub_206:
-	bx lr
-	thumb_func_end nullsub_206
-
-	thumb_func_start nullsub_207
-nullsub_207:
-	bx lr
-	thumb_func_end nullsub_207
-
-	thumb_func_start sub_8095190
-sub_8095190:
-	push {lr}
-	movs r2, 0x2
-	ldr r0, _080951A8
-	ldr r0, [r0]
-	adds r1, r0, 0
-	adds r1, 0x60
-_0809519C:
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _080951AC
-	adds r0, r2, 0
-	b _080951B8
-	.align 2, 0
-_080951A8: .4byte gUnknown_203B480
-_080951AC:
-	adds r1, 0x30
-	adds r2, 0x1
-	cmp r2, 0x1F
-	ble _0809519C
-	movs r0, 0x1
-	negs r0, r0
-_080951B8:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8095190
-
 	thumb_func_start sub_80951BC
 sub_80951BC:
 	push {r4,lr}
-- 
cgit v1.2.3