through mevent_message

2019-03-31 12:36:48 -04:00
parent 813de11154
commit fb5c19a33b
3 changed files with 86 additions and 138 deletions
--- a/asm/mystery_gift.s
+++ b/asm/mystery_gift.s
@@ -5,144 +5,6 @@

 	.text

-	thumb_func_start mevent_message
-mevent_message: @ 8018F0C
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r1, 24
-	lsrs r6, r1, 24
-	lsls r2, 24
-	lsrs r5, r2, 24
-	movs r2, 0
-	str r2, [r4]
-	cmp r3, 0xE
-	bls _08018F22
-	b _08019034
-_08018F22:
-	lsls r0, r3, 2
-	ldr r1, =_08018F30
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_08018F30:
-	.4byte _08018F6C
-	.4byte _08018F78
-	.4byte _08018F84
-	.4byte _08018F9C
-	.4byte _08018FB4
-	.4byte _08018FC0
-	.4byte _08018FCC
-	.4byte _08018FD8
-	.4byte _08018FE4
-	.4byte _08018FF0
-	.4byte _08018FFC
-	.4byte _08019014
-	.4byte _08019020
-	.4byte _0801902C
-	.4byte _08019030
-_08018F6C:
-	movs r0, 0
-	str r0, [r4]
-	ldr r2, =gText_NothingSentOver
-	b _08019034
-	.pool
-_08018F78:
-	movs r0, 0
-	str r0, [r4]
-	ldr r2, =gText_RecordUploadedViaWireless
-	b _08019034
-	.pool
-_08018F84:
-	movs r0, 0x1
-	str r0, [r4]
-	ldr r2, =gText_WonderCardReceivedFrom
-	cmp r5, 0
-	bne _08019034
-	ldr r2, =gText_WonderCardReceived
-	b _08019034
-	.pool
-_08018F9C:
-	movs r0, 0x1
-	str r0, [r4]
-	ldr r2, =gText_WonderNewsReceivedFrom
-	cmp r5, 0
-	bne _08019034
-	ldr r2, =gText_WonderNewsReceived
-	b _08019034
-	.pool
-_08018FB4:
-	movs r0, 0x1
-	str r0, [r4]
-	ldr r2, =gText_NewStampReceived
-	b _08019034
-	.pool
-_08018FC0:
-	movs r0, 0
-	str r0, [r4]
-	ldr r2, =gText_AlreadyHadCard
-	b _08019034
-	.pool
-_08018FCC:
-	movs r0, 0
-	str r0, [r4]
-	ldr r2, =gText_AlreadyHadStamp
-	b _08019034
-	.pool
-_08018FD8:
-	movs r0, 0
-	str r0, [r4]
-	ldr r2, =gText_AlreadyHadNews
-	b _08019034
-	.pool
-_08018FE4:
-	movs r0, 0
-	str r0, [r4]
-	ldr r2, =gText_NoMoreRoomForStamps
-	b _08019034
-	.pool
-_08018FF0:
-	movs r0, 0
-	str r0, [r4]
-	ldr r2, =gText_CommunicationCanceled
-	b _08019034
-	.pool
-_08018FFC:
-	movs r0, 0
-	str r0, [r4]
-	ldr r2, =gText_CantAcceptNewsFromTrainer
-	cmp r6, 0
-	bne _08019034
-	ldr r2, =gText_CantAcceptCardFromTrainer
-	b _08019034
-	.pool
-_08019014:
-	movs r0, 0
-	str r0, [r4]
-	ldr r2, =gText_CommunicationError
-	b _08019034
-	.pool
-_08019020:
-	movs r0, 0x1
-	str r0, [r4]
-	ldr r2, =gText_NewTrainerReceived
-	b _08019034
-	.pool
-_0801902C:
-	movs r0, 0x1
-	b _08019032
-_08019030:
-	movs r0, 0
-_08019032:
-	str r0, [r4]
-_08019034:
-	adds r0, r2, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end mevent_message
-
 	thumb_func_start mevent_08142CE8
 mevent_08142CE8: @ 801903C
 	push {r4-r6,lr}