From 2b1c03dd2e2567eb21c0f3b74a4fc40eeb4c8054 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 6 Oct 2015 21:41:57 -0700 Subject: [PATCH] replace unknown addresses with labels --- asm/emerald.s | 116 +++++++++++++++++++++++++------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/asm/emerald.s b/asm/emerald.s index c35638638f..45ee4e4dfe 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -1667,10 +1667,10 @@ sub_8009638: @ 8009638 ldr r0, =0x020229c6 ldrh r0, [r0] str r0, [r5, 0x14] - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strh r0, [r5, 0x1A] - ldr r0, =0x082e9530 + ldr r0, =gUnknown_82E9530 ldrb r0, [r0] movs r2, 0x80 lsls r2, 7 @@ -91373,7 +91373,7 @@ _0803653A: ands r0, r1 cmp r0, 0 beq _08036568 - ldr r0, =0x082e9530 + ldr r0, =gUnknown_82E9530 ldrb r0, [r0] cmp r0, 0x2 bne _08036560 @@ -91496,7 +91496,7 @@ _08036646: ands r0, r1 cmp r0, 0 beq _08036674 - ldr r0, =0x082e9530 + ldr r0, =gUnknown_82E9530 ldrb r0, [r0] cmp r0, 0x2 bne _0803666C @@ -183555,7 +183555,7 @@ _08067C8A: movs r1, 0x2 mov r2, sp bl pokemon_setattr_encrypted - ldr r2, =0x082e9531 + ldr r2, =gUnknown_82E9531 adds r0, r7, 0 movs r1, 0x3 bl pokemon_setattr_encrypted @@ -183612,7 +183612,7 @@ _08067C8A: movs r1, 0x24 add r2, sp, 0x10 bl pokemon_setattr_encrypted - ldr r2, =0x082e9530 + ldr r2, =gUnknown_82E9530 adds r0, r7, 0 movs r1, 0x25 bl pokemon_setattr_encrypted @@ -332127,7 +332127,7 @@ sub_80B0A18: @ 80B0A18 movs r0, 0xC0 lsls r0, 6 str r0, [r1] - ldr r0, =0x082e9530 + ldr r0, =gUnknown_82E9530 ldrb r0, [r0] cmp r0, 0x2 bne _080B0A50 @@ -371801,7 +371801,7 @@ sub_80C4F50: @ 80C4F50 ldr r1, [r0] cmp r1, 0 bne _080C4F7C - ldr r0, =0x082e9530 + ldr r0, =gUnknown_82E9530 ldrb r1, [r0] subs r0, r1, 0x4 lsls r0, 24 @@ -450101,7 +450101,7 @@ _080EC84E: strh r0, [r6, 0x10] adds r0, r6, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r6, 0x2] strb r5, [r6, 0x3] @@ -450242,7 +450242,7 @@ _080EC940: bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x2] _080EC9B4: @@ -450362,7 +450362,7 @@ sub_80ECA38: @ 80ECA38 bl gf_strcpy adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x1D] ldrb r0, [r6, 0x1E] @@ -450476,7 +450476,7 @@ _080ECBA4: bl gf_strcpy adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x19] cmp r0, 0x1 @@ -450592,7 +450592,7 @@ _080ECC68: strb r0, [r4, 0x2] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x14] cmp r0, 0x1 @@ -450664,7 +450664,7 @@ sub_80ECD00: @ 80ECD00 bl gf_strcpy adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x17] cmp r0, 0x1 @@ -450859,7 +450859,7 @@ sub_80ECEB4: @ 80ECEB4 .align 2, 0 .pool _080ECF30: - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] cmp r0, 0x1 beq _080ECF48 @@ -450953,7 +450953,7 @@ sub_80ECF5C: @ 80ECF5C strb r0, [r4, 0x13] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x1E] cmp r0, 0x1 @@ -451176,7 +451176,7 @@ _080ED1F6: strb r0, [r6, 0x1B] adds r0, r6, 0 bl sub_80ECA10 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r6, 0x1D] cmp r0, 0x1 @@ -451285,7 +451285,7 @@ _080ED2B6: bl gf_strcpy adds r0, r5, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r5, 0x3] _080ED2F2: @@ -451386,7 +451386,7 @@ sub_80ED320: @ 80ED320 bl sub_8009370 adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x1E] mov r2, r8 @@ -451567,7 +451567,7 @@ sub_80ED548: @ 80ED548 strh r0, [r4, 0x2] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x18] pop {r4} @@ -451604,7 +451604,7 @@ sub_80ED5B8: @ 80ED5B8 strh r5, [r4, 0x2] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x18] pop {r4,r5} @@ -451689,7 +451689,7 @@ sub_80ED610: @ 80ED610 strh r0, [r5, 0x2] adds r0, r5, 0 bl sub_80ECA10 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r5, 0xD] cmp r0, 0x1 @@ -451826,7 +451826,7 @@ _080ED72E: strh r3, [r4, 0x16] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x18] _080ED7E4: @@ -452098,7 +452098,7 @@ sub_80ED9A8: @ 80ED9A8 bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x6] _080EDA18: @@ -452212,7 +452212,7 @@ sub_80EDA80: @ 80EDA80 bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0xB] ldr r0, [r7] @@ -452342,7 +452342,7 @@ _080EDC1C: bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0xC] _080EDC40: @@ -452403,7 +452403,7 @@ sub_80EDC60: @ 80EDC60 bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x9] _080EDCCE: @@ -452464,7 +452464,7 @@ sub_80EDCE8: @ 80EDCE8 bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x5] _080EDD56: @@ -452579,7 +452579,7 @@ _080EDE12: bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x8] _080EDE54: @@ -452969,7 +452969,7 @@ sub_80EE104: @ 80EE104 bl sub_80EDFB4 adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0xC] _080EE168: @@ -453127,7 +453127,7 @@ _080EE2B2: _080EE2B6: adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0xE] _080EE2C2: @@ -453188,7 +453188,7 @@ sub_80EE2CC: @ 80EE2CC strh r0, [r4, 0x2] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x5] _080EE33A: @@ -453297,7 +453297,7 @@ _080EE408: strh r2, [r4, 0xE] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x11] _080EE426: @@ -453365,7 +453365,7 @@ sub_80EE44C: @ 80EE44C strb r7, [r4, 0x3] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x4] _080EE4BE: @@ -453439,7 +453439,7 @@ sub_80EE4DC: @ 80EE4DC strb r0, [r5, 0x3] adds r0, r5, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r5, 0xF] cmp r0, 0x1 @@ -453724,7 +453724,7 @@ sub_80EE72C: @ 80EE72C strh r0, [r4, 0x6] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x8] _080EE79C: @@ -454033,7 +454033,7 @@ _080EEA3C: _080EEA46: adds r0, r7, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r7, 0xC] _080EEA52: @@ -454117,7 +454117,7 @@ _080EEA86: str r4, [r5, 0xC] adds r0, r5, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r5, 0x1B] cmp r0, 0x1 @@ -454263,7 +454263,7 @@ sub_80EEBF4: @ 80EEBF4 strh r0, [r4, 0x2] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x5] _080EEC60: @@ -535816,7 +535816,7 @@ _08118230: ands r2, r0 cmp r2, 0 beq _08118250 - ldr r0, =0x082e9530 + ldr r0, =gUnknown_82E9530 ldrb r0, [r0] cmp r0, 0x2 beq _08118250 @@ -552361,7 +552361,7 @@ sub_81200A0: @ 81200A0 ldr r3, =0x00002e51 adds r0, r2, r3 strb r1, [r0] - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r1, [r0] adds r3, 0x1 adds r0, r2, r3 @@ -552398,7 +552398,7 @@ sub_81200F8: @ 81200F8 movs r0, 0x1 strb r0, [r1] strb r2, [r1, 0x1] - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r1, 0x2] bx lr @@ -552424,7 +552424,7 @@ sub_8120128: @ 8120128 movs r0, 0x4 strb r0, [r2] strb r3, [r2, 0x1] - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] ldr r2, =0x00002e48 adds r1, r2 @@ -554411,7 +554411,7 @@ sub_8120FDC: @ 8120FDC ldr r0, [r1] adds r0, 0x34 add r0, r8 - ldr r1, =0x082e9531 + ldr r1, =gUnknown_82E9531 ldrb r1, [r1] strb r1, [r0] pop {r3,r4} @@ -687074,7 +687074,7 @@ _08163FF4: adds r4, 0x1 cmp r4, 0x3 ble _08163FCC - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] mov r7, r8 strb r0, [r7] @@ -689599,7 +689599,7 @@ _0816554C: cmp r7, r0 bne _08165564 add r0, sp, 0x10 - ldr r1, =0x082e9531 + ldr r1, =gUnknown_82E9531 ldrb r1, [r1] strb r1, [r0] b _0816585A @@ -690406,7 +690406,7 @@ sub_8165B88: @ 8165B88 lsls r0, 1 cmp r2, r0 bne _08165BA4 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 b _08165C28 .align 2, 0 .pool @@ -690414,7 +690414,7 @@ _08165BA4: ldr r0, =0x0000012b cmp r2, r0 bhi _08165BB8 - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 b _08165C28 .align 2, 0 .pool @@ -750917,7 +750917,7 @@ _08184F64: ldrb r0, [r2, 0x8] strb r0, [r3, 0xC] strh r5, [r3, 0xE] - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strh r0, [r3, 0x10] movs r5, 0 @@ -767522,7 +767522,7 @@ sub_818DB7C: @ 818DB7C strb r3, [r0, 0x3] ldr r1, [r2] strh r3, [r1, 0xE] - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r1, 0x12] bl sub_818DB20 @@ -767782,7 +767782,7 @@ sub_818DD84: @ 818DD84 adds r1, 0x4 bl sub_818DCF4 ldr r1, [r4] - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r1, 0x12] movs r7, 0 @@ -767997,7 +767997,7 @@ sub_818DF68: @ 818DF68 strb r1, [r0, 0x1] movs r3, 0 adds r4, r2, 0 - ldr r6, =0x082e9531 + ldr r6, =gUnknown_82E9531 adds r5, r4, 0 ldr r0, =0x0000ffff adds r2, r0, 0 @@ -768392,7 +768392,7 @@ sub_818E298: @ 818E298 .pool _0818E2C0: ldr r0, [r4] - ldr r1, =0x082e9531 + ldr r1, =gUnknown_82E9531 ldrb r1, [r1] adds r0, 0x2D strb r1, [r0] @@ -768665,7 +768665,7 @@ _0818E4C2: ldr r1, [r6] bl strcpy_limit_7_chars ldr r0, [r4] - ldr r1, =0x082e9531 + ldr r1, =gUnknown_82E9531 ldrb r1, [r1] adds r0, 0x2D strb r1, [r0] @@ -768837,7 +768837,7 @@ sub_818E638: @ 818E638 strb r2, [r0, 0x1] bl sub_818E604 ldr r1, [r4] - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r1, 0xE] pop {r4} @@ -768904,7 +768904,7 @@ sub_818E6B0: @ 818E6B0 ldm r0!, {r2,r3} stm r1!, {r2,r3} ldr r1, [r4] - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r1, 0xE] _0818E6EA: @@ -802810,7 +802810,7 @@ _0819FB48: adds r2, r7, r3 lsls r2, 2 adds r0, r2 - ldr r4, =0x082e9531 + ldr r4, =gUnknown_82E9531 ldrb r1, [r4] ldr r3, =0x0000011b adds r0, r3 @@ -806117,7 +806117,7 @@ _081A14C2: adds r0, r1, r2 bl gf_strcpy ldr r1, [r5] - ldr r0, =0x082e9531 + ldr r0, =gUnknown_82E9531 ldrb r0, [r0] ldr r2, =0x0000011b adds r1, r2