diff options
| author | Cameron Hall <cameronghall@cox.net> | 2018-01-27 17:03:40 -0600 | 
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2018-01-27 17:03:40 -0600 | 
| commit | fe400f60b6609d37d2b8a0c2aec75321adc3e95f (patch) | |
| tree | f7286ace15509d8ca5b4171d7d2e7bad45447776 /src/engine | |
| parent | 2d5fdddf69bbbe524a32b6b6f104aeb60bb1cebd (diff) | |
add comments for pool loads in C files
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/cable_club.c | 56 | ||||
| -rw-r--r-- | src/engine/link.c | 8 | ||||
| -rw-r--r-- | src/engine/mystery_event_menu.c | 92 | ||||
| -rw-r--r-- | src/engine/reset_rtc_screen.c | 34 | ||||
| -rw-r--r-- | src/engine/save_failed_screen.c | 34 | 
5 files changed, 112 insertions, 112 deletions
| diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index c656b2203..ff73e638e 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -104,7 +104,7 @@ int debug_sub_808A4D0()      asm("\  	push	{lr}\n\  	add	r1, r0, #0\n\ -	ldr	r0, ._3\n\ +	ldr	r0, ._3         @ sub_8082F68\n\  	cmp	r1, r0\n\  	bne	._1	@cond_branch\n\  	mov	r0, #0x1\n\ @@ -114,7 +114,7 @@ int debug_sub_808A4D0()  ._3:\n\  	.word	sub_8082F68+1\n\  ._1:\n\ -	ldr	r0, ._7\n\ +	ldr	r0, ._7         @ sub_8082FEC\n\  	cmp	r1, r0\n\  	bne	._5	@cond_branch\n\  	mov	r0, #0x11\n\ @@ -124,7 +124,7 @@ int debug_sub_808A4D0()  ._7:\n\  	.word	sub_8082FEC+1\n\  ._5:\n\ -	ldr	r0, ._11\n\ +	ldr	r0, ._11        @ sub_808303C\n\  	cmp	r1, r0\n\  	bne	._9	@cond_branch\n\  	mov	r0, #0x12\n\ @@ -134,7 +134,7 @@ int debug_sub_808A4D0()  ._11:\n\  	.word	sub_808303C+1\n\  ._9:\n\ -	ldr	r0, ._15\n\ +	ldr	r0, ._15        @ sub_8083188\n\  	cmp	r1, r0\n\  	bne	._13	@cond_branch\n\  	mov	r0, #0x13\n\ @@ -144,7 +144,7 @@ int debug_sub_808A4D0()  ._15:\n\  	.word	sub_8083188+1\n\  ._13:\n\ -	ldr	r0, ._19\n\ +	ldr	r0, ._19        @ sub_80830E4\n\  	cmp	r1, r0\n\  	bne	._17	@cond_branch\n\  	mov	r0, #0x14\n\ @@ -154,7 +154,7 @@ int debug_sub_808A4D0()  ._19:\n\  	.word	sub_80830E4+1\n\  ._17:\n\ -	ldr	r0, ._23\n\ +	ldr	r0, ._23        @ sub_80831F8\n\  	cmp	r1, r0\n\  	bne	._21	@cond_branch\n\  	mov	r0, #0x21\n\ @@ -164,7 +164,7 @@ int debug_sub_808A4D0()  ._23:\n\  	.word	sub_80831F8+1\n\  ._21:\n\ -	ldr	r0, ._27\n\ +	ldr	r0, ._27        @ sub_8083314\n\  	cmp	r1, r0\n\  	bne	._25	@cond_branch\n\  	mov	r0, #0x2\n\ @@ -174,7 +174,7 @@ int debug_sub_808A4D0()  ._27:\n\  	.word	sub_8083314+1\n\  ._25:\n\ -	ldr	r0, ._31\n\ +	ldr	r0, ._31        @ sub_80833C4\n\  	cmp	r1, r0\n\  	beq	._29	@cond_branch\n\  	mov	r0, #0x0\n\ @@ -199,7 +199,7 @@ void debug_sub_808A55C()  	push	{r7}\n\  	lsl	r0, r0, #0x18\n\  	lsr	r7, r0, #0x18\n\ -	ldr	r2, ._37\n\ +	ldr	r2, ._37        @ gTasks\n\  	lsl	r0, r7, #0x2\n\  	add	r0, r0, r7\n\  	lsl	r0, r0, #0x3\n\ @@ -224,13 +224,13 @@ void debug_sub_808A55C()  	add	r0, r0, #0x1\n\  	strh	r0, [r4, #0xa]\n\  ._33:\n\ -	ldr	r0, ._37 + 4\n\ +	ldr	r0, ._37 + 4    @ gShouldAdvanceLinkState\n\  	ldrb	r0, [r0]\n\  	mov	r1, #0x2\n\  	mov	r2, #0x0\n\  	mov	r3, #0x2\n\  	bl	PrintHex\n\ -	ldr	r0, ._37 + 8\n\ +	ldr	r0, ._37 + 8    @ gBlockSendBuffer\n\  	ldrb	r0, [r0]\n\  	mov	r1, #0x16\n\  	mov	r2, #0x5\n\ @@ -244,14 +244,14 @@ void debug_sub_808A55C()  	mov	r5, #0xa0\n\  	lsl	r5, r5, #0x13\n\  ._35:\n\ -	ldr	r0, ._37 + 12\n\ +	ldr	r0, ._37 + 12   @ gLinkPlayerPending\n\  	add	r0, r4, r0\n\  	ldrb	r0, [r0]\n\  	lsr	r1, r5, #0x18\n\  	mov	r2, #0x0\n\  	mov	r3, #0x1\n\  	bl	PrintHex\n\ -	ldr	r1, ._37 + 16\n\ +	ldr	r1, ._37 + 16   @ gBlockRecvBuffer\n\  	lsl	r0, r4, #0x8\n\  	add	r0, r0, r1\n\  	ldrh	r0, [r0]\n\ @@ -268,13 +268,13 @@ void debug_sub_808A55C()  	add	r4, r4, #0x1\n\  	cmp	r4, #0x3\n\  	ble	._35	@cond_branch\n\ -	ldr	r4, ._37 + 20\n\ +	ldr	r4, ._37 + 20   @ gLinkStatus\n\  	ldr	r0, [r4]\n\  	mov	r1, #0xf\n\  	mov	r2, #0x0\n\  	mov	r3, #0x8\n\  	bl	PrintHex\n\ -	ldr	r0, ._37 + 24\n\ +	ldr	r0, ._37 + 24   @ gLink\n\  	ldrb	r0, [r0, #0x1]\n\  	mov	r1, #0x2\n\  	mov	r2, #0xa\n\ @@ -294,13 +294,13 @@ void debug_sub_808A55C()  	mov	r2, #0xa\n\  	mov	r3, #0x2\n\  	bl	PrintHex\n\ -	ldr	r0, ._37 + 28\n\ +	ldr	r0, ._37 + 28   @ gReceivedRemoteLinkPlayers\n\  	ldrb	r0, [r0]\n\  	mov	r1, #0x2\n\  	mov	r2, #0xc\n\  	mov	r3, #0x1\n\  	bl	PrintHex\n\ -	ldr	r0, ._37 + 32\n\ +	ldr	r0, ._37 + 32   @ gSpecialVar_Result\n\  	ldrh	r0, [r0]\n\  	mov	r1, #0xb\n\  	mov	r2, #0x8\n\ @@ -328,7 +328,7 @@ void debug_sub_808A55C()  	mov	r2, #0xa\n\  	mov	r3, #0x1\n\  	bl	PrintHex\n\ -	ldr	r2, ._37\n\ +	ldr	r2, ._37        @ gTasks\n\  	mov	r3, r8\n\  	add	r0, r3, r7\n\  	lsl	r0, r0, #0x3\n\ @@ -347,7 +347,7 @@ void debug_sub_808A55C()  	mov	r2, #0xc\n\  	mov	r3, #0x2\n\  	bl	PrintHex\n\ -	ldr	r0, ._37 + 36\n\ +	ldr	r0, ._37 + 36   @ gLinkCallback\n\  	ldr	r0, [r0]\n\  	mov	r1, #0x2\n\  	mov	r2, #0xd\n\ @@ -360,7 +360,7 @@ void debug_sub_808A55C()  	mov	r2, #0x2\n\  	mov	r3, #0x1\n\  	bl	PrintHex\n\ -	ldr	r0, ._37 + 40\n\ +	ldr	r0, ._37 + 40   @ gLinkPlayers\n\  	mov	r6, #0x80\n\  	lsl	r6, r6, #0x12\n\  	add	r5, r0, #0\n\ @@ -379,7 +379,7 @@ void debug_sub_808A55C()  	sub	r4, r4, #0x1\n\  	cmp	r4, #0\n\  	bge	._36	@cond_branch\n\ -	ldr	r0, ._37 + 44\n\ +	ldr	r0, ._37 + 44   @ 0x4000128\n\  	ldrh	r0, [r0]\n\  	mov	r1, #0x2\n\  	mov	r2, #0x6\n\ @@ -430,7 +430,7 @@ static void sub_8082CD4(u8 arg0, u8 arg1)  	mov	r2, #0x1f\n\  	mov	r3, #0x2\n\  	bl	InitLinkTestBG_Unused\n\ -	ldr	r4, ._40\n\ +	ldr	r4, ._40        @ sub_8082F20\n\  	add	r0, r4, #0\n\  	bl	FindTaskIdByFunc\n\  	lsl	r0, r0, #0x18\n\ @@ -443,14 +443,14 @@ static void sub_8082CD4(u8 arg0, u8 arg1)  	add	r4, r0, #0\n\  	lsl	r4, r4, #0x18\n\  	lsr	r4, r4, #0x18\n\ -	ldr	r5, ._40 + 4\n\ +	ldr	r5, ._40 + 4    @ gTasks\n\  	lsl	r0, r4, #0x2\n\  	add	r0, r0, r4\n\  	lsl	r0, r0, #0x3\n\  	add	r0, r0, r5\n\  	strh	r7, [r0, #0xa]\n\  	strh	r6, [r0, #0xc]\n\ -	ldr	r0, ._40 + 8\n\ +	ldr	r0, ._40 + 8    @ debug_sub_808A55C\n\  	mov	r1, #0x50\n\  	bl	CreateTask\n\  	lsl	r0, r0, #0x18\n\ @@ -1297,7 +1297,7 @@ void debug_sub_808B778()  {      asm("\  	push	{r4, lr}\n\ -	ldr	r4, ._390\n\ +	ldr	r4, ._390       @ debug_sub_808B7A8\n\  	add	r0, r4, #0\n\  	bl	FuncIsActiveTask\n\  	lsl	r0, r0, #0x18\n\ @@ -1307,7 +1307,7 @@ void debug_sub_808B778()  	mov	r1, #0x50\n\  	bl	CreateTask\n\  ._389:\n\ -	ldr	r1, ._390 + 4\n\ +	ldr	r1, ._390 + 4   @ unk_3004E98\n\  	ldr	r0, [r1]\n\  	add	r0, r0, #0x1\n\  	str	r0, [r1]\n\ @@ -1328,7 +1328,7 @@ void debug_sub_808B7A8()  	push	{lr}\n\  	lsl	r0, r0, #0x18\n\  	lsr	r0, r0, #0x18\n\ -	ldr	r2, ._393\n\ +	ldr	r2, ._393       @ gTasks\n\  	lsl	r1, r0, #0x2\n\  	add	r1, r1, r0\n\  	lsl	r1, r1, #0x3\n\ @@ -1342,7 +1342,7 @@ void debug_sub_808B7A8()  	bne	._392	@cond_branch\n\  	mov	r0, #0x0\n\  	strh	r0, [r1, #0x8]\n\ -	ldr	r2, ._393 + 4\n\ +	ldr	r2, ._393 + 4   @ unk_3004E94\n\  	ldrh	r0, [r2]\n\  	mov	r1, #0x1\n\  	orr	r0, r0, r1\n\ diff --git a/src/engine/link.c b/src/engine/link.c index 8888f22f5..00c084069 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -1050,7 +1050,7 @@ void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0)          "	add	r6, r1, #0\n"          "	add	r4, r3, #0\n"          "	ldr	r0, [sp, #0x38]\n" -        "	ldr	r1, ._347\n" +        "	ldr	r1, ._347       @ unk_20238D0\n"          "	ldr	r1, [r1]\n"          "	cmp	r1, r0\n"          "	bne	._345	@cond_branch\n" @@ -1059,7 +1059,7 @@ void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0)          "	mov	r4, #0x8\n"          "._342:\n"          "	mov	r3, sp\n" -        "	ldr	r0, ._347 + 4\n" +        "	ldr	r0, ._347 + 4   @ debugTileMap\n"          "	mov	r8, r0\n"          "	lsl	r2, r2, #0x6\n"          "	mov	ip, r2\n" @@ -1087,8 +1087,8 @@ void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0)          "	sub	r3, r0, #4\n"          "	cmp	r4, #0\n"          "	ble	._345	@cond_branch\n" -        "	ldr	r7, ._347 + 8\n" -        "	ldr	r6, ._347 + 12\n" +        "	ldr	r7, ._347 + 8   @ debugCharacterBase\n" +        "	ldr	r6, ._347 + 12  @ unk_20238C8\n"          "	add	r2, r4, #0\n"          "._346:\n"          "	ldr	r1, [r7]\n" diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index 116b60477..bc14c760d 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -350,7 +350,7 @@ void debug_sub_815D04C()          "	push	{r4, r5, r6, lr}\n"          "	lsl	r0, r0, #0x18\n"          "	lsr	r5, r0, #0x18\n" -        "	ldr	r1, ._125\n" +        "	ldr	r1, ._125       @ gTasks\n"          "	lsl	r0, r5, #0x2\n"          "	add	r0, r0, r5\n"          "	lsl	r0, r0, #0x3\n" @@ -364,7 +364,7 @@ void debug_sub_815D04C()          "	mov	r2, #0xd\n"          "	mov	r3, #0x7\n"          "	bl	Menu_DrawStdWindowFrame\n" -        "	ldr	r1, ._125 + 4\n" +        "	ldr	r1, ._125 + 4   @ gUnknown_Debug_842E2D0\n"          "	mov	r2, #0xa\n"          "	ldsh	r0, [r4, r2]\n"          "	lsl	r0, r0, #0x3\n" @@ -377,7 +377,7 @@ void debug_sub_815D04C()          "	add	r0, r0, #0x1\n"          "	strh	r0, [r4, #0x8]\n"          "._121:\n" -        "	ldr	r2, ._125 + 8\n" +        "	ldr	r2, ._125 + 8   @ gMain\n"          "	ldrh	r1, [r2, #0x2e]\n"          "	mov	r0, #0x20\n"          "	and	r0, r0, r1\n" @@ -389,7 +389,7 @@ void debug_sub_815D04C()          "	ldsh	r0, [r4, r2]\n"          "	cmp	r0, #0\n"          "	bne	._123	@cond_branch\n" -        "	ldr	r0, ._125 + 12\n" +        "	ldr	r0, ._125 + 12  @ gUnknown_Debug_842E350\n"          "	ldrb	r0, [r0]\n"          "	sub	r0, r0, #0x1\n"          "	b	._124\n" @@ -404,7 +404,7 @@ void debug_sub_815D04C()          "	sub	r0, r1, #1\n"          "._124:\n"          "	strh	r0, [r4, #0xa]\n" -        "	ldr	r0, ._130\n" +        "	ldr	r0, ._130       @ gTasks\n"          "	lsl	r1, r5, #0x2\n"          "	add	r1, r1, r5\n"          "	lsl	r1, r1, #0x3\n" @@ -417,14 +417,14 @@ void debug_sub_815D04C()          "	and	r0, r0, r1\n"          "	cmp	r0, #0\n"          "	beq	._127	@cond_branch\n" -        "	ldr	r1, ._130\n" +        "	ldr	r1, ._130       @ gTasks\n"          "	lsl	r2, r5, #0x2\n"          "	add	r0, r2, r5\n"          "	lsl	r0, r0, #0x3\n"          "	add	r4, r0, r1\n"          "	mov	r0, #0xa\n"          "	ldsh	r3, [r4, r0]\n" -        "	ldr	r0, ._130 + 4\n" +        "	ldr	r0, ._130 + 4   @ gUnknown_Debug_842E350\n"          "	ldrb	r0, [r0]\n"          "	sub	r0, r0, #0x1\n"          "	cmp	r3, r0\n" @@ -452,7 +452,7 @@ void debug_sub_815D04C()          "	and	r0, r0, r1\n"          "	cmp	r0, #0\n"          "	beq	._132	@cond_branch\n" -        "	ldr	r1, ._133\n" +        "	ldr	r1, ._133       @ gTasks\n"          "	lsl	r0, r5, #0x2\n"          "	add	r0, r0, r5\n"          "	lsl	r0, r0, #0x3\n" @@ -460,13 +460,13 @@ void debug_sub_815D04C()          "	mov	r2, #0xa\n"          "	ldsh	r1, [r0, r2]\n"          "	lsl	r1, r1, #0x3\n" -        "	ldr	r0, ._133 + 4\n" +        "	ldr	r0, ._133 + 4   @ gUnknown_Debug_842E2D0\n"          "	add	r0, r0, #0x4\n"          "	add	r1, r1, r0\n" -        "	ldr	r0, ._133 + 8\n" +        "	ldr	r0, ._133 + 8   @ \n"          "	ldr	r1, [r1]\n"          "	bl	_call_via_r1\n" -        "	ldr	r0, ._133 + 12\n" +        "	ldr	r0, ._133 + 12  @ \n"          "	add	r1, r6, r0\n"          "	ldrb	r0, [r1]\n"          "	add	r0, r0, #0x1\n" @@ -516,8 +516,8 @@ void debug_sub_815D1D8()      asm(          "	push	{r4, lr}\n"          "	add	sp, sp, #0xfffffffc\n" -        "	ldr	r1, ._139\n" -        "	ldr	r2, ._139 + 4\n" +        "	ldr	r1, ._139       @ gMain\n" +        "	ldr	r2, ._139 + 4   @ 0x43c\n"          "	add	r0, r1, r2\n"          "	ldrb	r0, [r0]\n"          "	add	r4, r1, #0\n" @@ -526,7 +526,7 @@ void debug_sub_815D1D8()          "	b	._196\n"          "._137:\n"          "	lsl	r0, r0, #0x2\n" -        "	ldr	r1, ._139 + 8\n" +        "	ldr	r1, ._139 + 8   @ \n"          "	add	r0, r0, r1\n"          "	ldr	r0, [r0]\n"          "	mov	pc, r0\n" @@ -562,8 +562,8 @@ void debug_sub_815D1D8()          "	mov	r2, #0x10\n"          "	mov	r3, #0x0\n"          "	bl	BeginNormalPaletteFade\n" -        "	ldr	r1, ._155\n" -        "	ldr	r0, ._155 + 4\n" +        "	ldr	r1, ._155       @ gMain\n" +        "	ldr	r0, ._155 + 4   @ 0x43c\n"          "	add	r1, r1, r0\n"          "	b	._189\n"          "._156:\n" @@ -572,7 +572,7 @@ void debug_sub_815D1D8()          "	.word	gMain\n"          "	.word	0x43c\n"          "._143:\n" -        "	ldr	r0, ._161\n" +        "	ldr	r0, ._161       @ gPaletteFade\n"          "	ldrb	r1, [r0, #0x7]\n"          "	mov	r0, #0x80\n"          "	and	r0, r0, r1\n" @@ -586,16 +586,16 @@ void debug_sub_815D1D8()          "	and	r0, r0, r1\n"          "	cmp	r0, #0\n"          "	beq	._159	@cond_branch\n" -        "	ldr	r1, ._161 + 4\n" +        "	ldr	r1, ._161 + 4   @ gUnknown_Debug_30030E0\n"          "	ldrb	r0, [r1]\n"          "	add	r0, r0, #0x1\n"          "	strb	r0, [r1]\n"          "._159:\n" -        "	ldr	r0, ._161 + 8\n" +        "	ldr	r0, ._161 + 8   @ Str_843DA70\n"          "	mov	r1, #0x4\n"          "	mov	r2, #0xf\n"          "	bl	MenuPrintMessage\n" -        "	ldr	r2, ._161 + 12\n" +        "	ldr	r2, ._161 + 12  @ 0x43c\n"          "	add	r1, r4, r2\n"          "	b	._189\n"          "._162:\n" @@ -612,14 +612,14 @@ void debug_sub_815D1D8()          "	bne	._163	@cond_branch\n"          "	b	._196\n"          "._163:\n" -        "	ldr	r1, ._166\n" -        "	ldr	r0, ._166 + 4\n" +        "	ldr	r1, ._166       @ gMain\n" +        "	ldr	r0, ._166 + 4   @ 0x43c\n"          "	add	r1, r1, r0\n"          "	ldrb	r0, [r1]\n"          "	add	r0, r0, #0x1\n"          "	strb	r0, [r1]\n" -        "	ldr	r1, ._166 + 8\n" -        "	ldr	r2, ._166 + 12\n" +        "	ldr	r1, ._166 + 8   @ gLinkType\n" +        "	ldr	r2, ._166 + 12  @ 0x5501\n"          "	add	r0, r2, #0\n"          "	strh	r0, [r1]\n"          "	bl	OpenLink\n" @@ -632,18 +632,18 @@ void debug_sub_815D1D8()          "	.word	gLinkType\n"          "	.word	0x5501\n"          "._145:\n" -        "	ldr	r0, ._171\n" +        "	ldr	r0, ._171       @ gReceivedRemoteLinkPlayers\n"          "	ldrb	r0, [r0]\n"          "	cmp	r0, #0\n"          "	bne	._168	@cond_branch\n"          "	b	._196\n"          "._168:\n" -        "	ldr	r1, ._171 + 4\n" +        "	ldr	r1, ._171 + 4   @ 0x43c\n"          "	add	r0, r4, r1\n"          "	ldrb	r1, [r0]\n"          "	add	r1, r1, #0x1\n"          "	strb	r1, [r0]\n" -        "	ldr	r0, ._171 + 8\n" +        "	ldr	r0, ._171 + 8   @ Str_843DA84\n"          "	mov	r1, #0x4\n"          "	mov	r2, #0xf\n"          "	bl	MenuPrintMessage\n" @@ -661,11 +661,11 @@ void debug_sub_815D1D8()          "	bne	._173	@cond_branch\n"          "	b	._196\n"          "._173:\n" -        "	ldr	r0, ._176\n" +        "	ldr	r0, ._176       @ debug_sub_815D04C\n"          "	mov	r1, #0xa\n"          "	bl	CreateTask\n" -        "	ldr	r1, ._176 + 4\n" -        "	ldr	r2, ._176 + 8\n" +        "	ldr	r1, ._176 + 4   @ gMain\n" +        "	ldr	r2, ._176 + 8   @ 0x43c\n"          "	add	r1, r1, r2\n"          "	b	._189\n"          "._177:\n" @@ -675,16 +675,16 @@ void debug_sub_815D1D8()          "	.word	gMain\n"          "	.word	0x43c\n"          "._148:\n" -        "	ldr	r0, ._179\n" +        "	ldr	r0, ._179       @ Str_843DA98\n"          "	mov	r1, #0x4\n"          "	mov	r2, #0xf\n"          "	bl	MenuPrintMessage\n" -        "	ldr	r1, ._179 + 4\n" -        "	ldr	r2, ._179 + 8\n" +        "	ldr	r1, ._179 + 4   @ 0x2004000\n" +        "	ldr	r2, ._179 + 8   @ 0x2004\n"          "	mov	r0, #0x0\n"          "	bl	SendBlock\n" -        "	ldr	r1, ._179 + 12\n" -        "	ldr	r0, ._179 + 16\n" +        "	ldr	r1, ._179 + 12  @ gMain\n" +        "	ldr	r0, ._179 + 16  @ 0x43c\n"          "	add	r1, r1, r0\n"          "	b	._189\n"          "._180:\n" @@ -701,8 +701,8 @@ void debug_sub_815D1D8()          "	lsl	r0, r0, #0x18\n"          "	cmp	r0, #0\n"          "	beq	._196	@cond_branch\n" -        "	ldr	r1, ._183\n" -        "	ldr	r2, ._183 + 4\n" +        "	ldr	r1, ._183       @ gMain\n" +        "	ldr	r2, ._183 + 4   @ 0x43c\n"          "	add	r1, r1, r2\n"          "	b	._189\n"          "._184:\n" @@ -712,8 +712,8 @@ void debug_sub_815D1D8()          "	.word	0x43c\n"          "._150:\n"          "	bl	sub_800832C\n" -        "	ldr	r1, ._186\n" -        "	ldr	r0, ._186 + 4\n" +        "	ldr	r1, ._186       @ gMain\n" +        "	ldr	r0, ._186 + 4   @ 0x43c\n"          "	add	r1, r1, r0\n"          "	b	._189\n"          "._187:\n" @@ -722,7 +722,7 @@ void debug_sub_815D1D8()          "	.word	gMain\n"          "	.word	0x43c\n"          "._151:\n" -        "	ldr	r0, ._190\n" +        "	ldr	r0, ._190       @ gReceivedRemoteLinkPlayers\n"          "	ldrb	r0, [r0]\n"          "	cmp	r0, #0\n"          "	bne	._196	@cond_branch\n" @@ -731,12 +731,12 @@ void debug_sub_815D1D8()          "	mov	r2, #0x1a\n"          "	mov	r3, #0x12\n"          "	bl	Menu_BlankWindowRect\n" -        "	ldr	r0, ._190 + 4\n" +        "	ldr	r0, ._190 + 4   @ Str_843DAA3\n"          "	mov	r1, #0x4\n"          "	mov	r2, #0xf\n"          "	bl	Menu_PrintText\n" -        "	ldr	r1, ._190 + 8\n" -        "	ldr	r2, ._190 + 12\n" +        "	ldr	r1, ._190 + 8   @ gMain\n" +        "	ldr	r2, ._190 + 12  @ 0x43c\n"          "	add	r1, r1, r2\n"          "	b	._189\n"          "._191:\n" @@ -759,7 +759,7 @@ void debug_sub_815D1D8()          "	mov	r2, #0x0\n"          "	mov	r3, #0x10\n"          "	bl	BeginNormalPaletteFade\n" -        "	ldr	r0, ._194\n" +        "	ldr	r0, ._194       @ 0x43c\n"          "	add	r1, r4, r0\n"          "._189:\n"          "	ldrb	r0, [r1]\n" @@ -771,13 +771,13 @@ void debug_sub_815D1D8()          "._194:\n"          "	.word	0x43c\n"          "._153:\n" -        "	ldr	r0, ._197\n" +        "	ldr	r0, ._197       @ gPaletteFade\n"          "	ldrb	r1, [r0, #0x7]\n"          "	mov	r0, #0x80\n"          "	and	r0, r0, r1\n"          "	cmp	r0, #0\n"          "	bne	._196	@cond_branch\n" -        "	ldr	r0, ._197 + 4\n" +        "	ldr	r0, ._197 + 4   @ CB2_InitTitleScreen\n"          "	bl	SetMainCallback2\n"          "._196:\n"          "	bl	RunTasks\n" diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 9324ea1c1..8b67f39a5 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -602,7 +602,7 @@ void debug_sub_806F8F8(void)  {      asm("\  	push	{lr}\n\ -	ldr	r0, ._131\n\ +	ldr	r0, ._131       @ CB2_InitResetRtcScreen\n\  	bl	SetMainCallback2\n\  	pop	{r0}\n\  	bx	r0\n\ @@ -622,7 +622,7 @@ void debug_sub_806F908(u8 a)  	lsl	r0, r5, #0x2\n\  	add	r0, r0, r5\n\  	lsl	r0, r0, #0x3\n\ -	ldr	r2, ._136\n\ +	ldr	r2, ._136       @ gTasks\n\  	add	r4, r0, r2\n\  	mov	r1, #0x0\n\  	ldsh	r0, [r4, r1]\n\ @@ -636,7 +636,7 @@ void debug_sub_806F908(u8 a)  ._136:\n\  	.word	gTasks+0x8\n\  ._133:\n\ -	ldr	r0, ._139\n\ +	ldr	r0, ._139       @ Task_ResetRtc_0\n\  	mov	r1, #0x50\n\  	bl	CreateTask\n\  	lsl	r0, r0, #0x18\n\ @@ -666,7 +666,7 @@ void debug_sub_806F908(u8 a)  	ldsh	r0, [r2, r1]\n\  	cmp	r0, #0x1\n\  	bne	._142	@cond_branch\n\ -	ldr	r3, ._143\n\ +	ldr	r3, ._143       @ gLocalTime\n\  	mov	r1, #0x0\n\  	ldsh	r0, [r3, r1]\n\  	mov	r1, #0x2\n\ @@ -700,7 +700,7 @@ void debug_sub_806F99C()      asm("\  	push	{lr}\n\  	bl	RtcCalcLocalTime\n\ -	ldr	r0, ._145\n\ +	ldr	r0, ._145       @ debug_sub_806F908\n\  	mov	r1, #0x50\n\  	bl	CreateTask\n\  	bl	ScriptContext2_Enable\n\ @@ -717,14 +717,14 @@ void debug_sub_806F9B8()  {      asm("\  	push	{lr}\n\ -	ldr	r2, ._147\n\ -	ldr	r0, ._147 + 4\n\ +	ldr	r2, ._147       @ gLocalTime\n\ +	ldr	r0, ._147 + 4   @ gSaveBlock2\n\  	add	r0, r0, #0xa0\n\  	ldr	r1, [r0, #0x4]\n\  	ldr	r0, [r0]\n\  	str	r0, [r2]\n\  	str	r1, [r2, #0x4]\n\ -	ldr	r0, ._147 + 8\n\ +	ldr	r0, ._147 + 8   @ debug_sub_806F908\n\  	mov	r1, #0x50\n\  	bl	CreateTask\n\  	bl	ScriptContext2_Enable\n\ @@ -752,9 +752,9 @@ void debug_sub_806F9E4()  	lsl	r0, r7, #0x2\n\  	add	r0, r0, r7\n\  	lsl	r0, r0, #0x3\n\ -	ldr	r1, ._153\n\ +	ldr	r1, ._153       @ gTasks\n\  	add	r5, r0, r1\n\ -	ldr	r6, ._153 + 4\n\ +	ldr	r6, ._153 + 4   @ gStringVar4\n\  	mov	r1, #0x0\n\  	ldsh	r0, [r5, r1]\n\  	cmp	r0, #0x1\n\ @@ -793,19 +793,19 @@ void debug_sub_806F9E4()  	mov	r1, #0x2\n\  	mov	r2, #0xa\n\  	bl	Menu_PrintText\n\ -	ldr	r0, ._158\n\ +	ldr	r0, ._158       @ gUnknown_Debug_0839AE94\n\  	mov	r1, #0xc\n\  	mov	r2, #0xc\n\  	bl	Menu_PrintText\n\ -	ldr	r0, ._158 + 4\n\ +	ldr	r0, ._158 + 4   @ gUnknown_Debug_0839AE99\n\  	mov	r1, #0x14\n\  	mov	r2, #0xc\n\  	bl	Menu_PrintText\n\ -	ldr	r0, ._158 + 8\n\ +	ldr	r0, ._158 + 8   @ gUnknown_Debug_0839AEA7\n\  	mov	r1, #0x1\n\  	mov	r2, #0xe\n\  	bl	Menu_PrintText\n\ -	ldr	r0, ._158 + 12\n\ +	ldr	r0, ._158 + 12  @ gUnknown_Debug_0839AE9D\n\  	mov	r1, #0x1\n\  	mov	r2, #0x10\n\  	bl	Menu_PrintText\n\ @@ -833,7 +833,7 @@ void debug_sub_806F9E4()  	mov	r0, #0x28\n\  	add	r0, r0, r6\n\  	mov	sl, r0\n\ -	ldr	r4, ._163\n\ +	ldr	r4, ._163       @ gLocalTime\n\  	mov	r1, #0x2\n\  	ldsb	r1, [r4, r1]\n\  	mov	r2, #0x3\n\ @@ -850,7 +850,7 @@ void debug_sub_806F9E4()  	mov	r2, #0x1\n\  	mov	r3, #0x4\n\  	bl	ConvertIntToDecimalStringN\n\ -	ldr	r0, ._163 + 4\n\ +	ldr	r0, ._163 + 4   @ gSaveBlock2\n\  	ldrb	r0, [r0, #0x12]\n\  	cmp	r0, #0\n\  	bne	._160	@cond_branch\n\ @@ -885,7 +885,7 @@ void debug_sub_806F9E4()  	.word	gLocalTime\n\  	.word	gSaveBlock2\n\  ._161:\n\ -	ldr	r0, ._166\n\ +	ldr	r0, ._166       @ gMain\n\  	ldrh	r1, [r0, #0x2e]\n\  	mov	r0, #0x1\n\  	and	r0, r0, r1\n\ diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c index 7902427e0..49cf166d4 100644 --- a/src/engine/save_failed_screen.c +++ b/src/engine/save_failed_screen.c @@ -157,12 +157,12 @@ void CB2_WipeSave()      asm(          "	push	{r4, r5, lr}\n"          "	mov	r4, #0x0\n" -        "	ldr	r0, ._20\n" +        "	ldr	r0, ._20        @ gSaveFailedClockInfo\n"          "	mov	r2, #0x1\n"          "	strh	r2, [r0]\n" -        "	ldr	r0, ._20 + 4\n" +        "	ldr	r0, ._20 + 4    @ gUnknown_Debug_03004BD0\n"          "	ldr	r0, [r0]\n" -        "	ldr	r1, ._20 + 8\n" +        "	ldr	r1, ._20 + 8    @ gDamagedSaveSectors\n"          "	cmp	r0, #0\n"          "	beq	._12	@cond_branch\n"          "	str	r2, [r1]\n" @@ -182,11 +182,11 @@ void CB2_WipeSave()          "	mov	r2, #0x1c\n"          "	mov	r3, #0x13\n"          "	bl	Menu_DrawStdWindowFrame\n" -        "	ldr	r0, ._20 + 12\n" +        "	ldr	r0, ._20 + 12   @ gSystemText_CheckCompleteSaveAttempt\n"          "	mov	r1, #0x2\n"          "	mov	r2, #0xb\n"          "	bl	Menu_PrintText\n" -        "	ldr	r0, ._20 + 16\n" +        "	ldr	r0, ._20 + 16   @ gSaveFailedType\n"          "	ldrb	r0, [r0]\n"          "	bl	Save_WriteDataInternal\n"          "	ldr	r0, [r5]\n" @@ -197,7 +197,7 @@ void CB2_WipeSave()          "	mov	r2, #0x1c\n"          "	mov	r3, #0x13\n"          "	bl	Menu_DrawStdWindowFrame\n" -        "	ldr	r0, ._20 + 20\n" +        "	ldr	r0, ._20 + 20   @ gSystemText_SaveFailedBackupCheck\n"          "	mov	r1, #0x2\n"          "	mov	r2, #0xb\n"          "	bl	Menu_PrintText\n" @@ -218,11 +218,11 @@ void CB2_WipeSave()          "	mov	r2, #0x1c\n"          "	mov	r3, #0x13\n"          "	bl	Menu_DrawStdWindowFrame\n" -        "	ldr	r0, ._20 + 24\n" +        "	ldr	r0, ._20 + 24   @ gSystemText_BackupDamagedGameContinue\n"          "	mov	r1, #0x2\n"          "	mov	r2, #0xb\n"          "	bl	Menu_PrintText\n" -        "	ldr	r0, ._20 + 28\n" +        "	ldr	r0, ._20 + 28   @ CB2_FadeAndReturnToTitleScreen\n"          "	bl	SetMainCallback2\n"          "	b	._23\n"          "._21:\n" @@ -242,11 +242,11 @@ void CB2_WipeSave()          "	mov	r2, #0x1c\n"          "	mov	r3, #0x13\n"          "	bl	Menu_DrawStdWindowFrame\n" -        "	ldr	r0, ._24\n" +        "	ldr	r0, ._24        @ gGameContinueCallback\n"          "	ldr	r0, [r0]\n"          "	cmp	r0, #0\n"          "	bne	._22	@cond_branch\n" -        "	ldr	r0, ._24 + 4\n" +        "	ldr	r0, ._24 + 4    @ gSystemText_SaveCompletedGameEnd\n"          "	mov	r1, #0x2\n"          "	mov	r2, #0xb\n"          "	bl	Menu_PrintText\n" @@ -262,11 +262,11 @@ void CB2_WipeSave()          "	mov	r2, #0x1c\n"          "	mov	r3, #0x13\n"          "	bl	Menu_DrawStdWindowFrame\n" -        "	ldr	r0, ._27\n" +        "	ldr	r0, ._27        @ gSystemText_BackupDamagedGameContinue\n"          "	mov	r1, #0x2\n"          "	mov	r2, #0xb\n"          "	bl	Menu_PrintText\n" -        "	ldr	r0, ._27 + 4\n" +        "	ldr	r0, ._27 + 4    @ CB2_GameplayCannotBeContinued\n"          "	bl	SetMainCallback2\n"          "	b	._26\n"          "._28:\n" @@ -275,12 +275,12 @@ void CB2_WipeSave()          "	.word	gSystemText_BackupDamagedGameContinue\n"          "	.word	CB2_GameplayCannotBeContinued+1\n"          "._22:\n" -        "	ldr	r0, ._29\n" +        "	ldr	r0, ._29        @ gSystemText_SaveCompletedPressA\n"          "	mov	r1, #0x2\n"          "	mov	r2, #0xb\n"          "	bl	Menu_PrintText\n"          "._23:\n" -        "	ldr	r0, ._29 + 4\n" +        "	ldr	r0, ._29 + 4    @ CB2_FadeAndReturnToTitleScreen\n"          "	bl	SetMainCallback2\n"          "._26:\n"          "	pop	{r4, r5}\n" @@ -420,20 +420,20 @@ bool8 VerifySectorWipe(u16 sector)          "	push	{lr}\n"          "	lsl	r0, r0, #0x10\n"          "	lsr	r0, r0, #0x10\n" -        "	ldr	r2, ._50\n" +        "	ldr	r2, ._50        @ \n"          "	mov	r3, #0x80\n"          "	lsl	r3, r3, #0x5\n"          "	mov	r1, #0x0\n"          "	bl	ReadFlash\n"          "	mov	r0, #0x0\n" -        "	ldr	r1, ._50 + 4\n" +        "	ldr	r1, ._50 + 4    @ \n"          "._49:\n"          "	add	r0, r0, #0x1\n"          "	lsl	r0, r0, #0x10\n"          "	lsr	r0, r0, #0x10\n"          "	cmp	r0, r1\n"          "	bls	._49	@cond_branch\n" -        "	ldr	r0, ._50 + 8\n" +        "	ldr	r0, ._50 + 8    @ \n"          "	ldrb	r0, [r0]\n"          "	pop	{r1}\n"          "	bx	r1\n" | 
