diff options
| author | YamaArashi <shadow962@live.com> | 2016-11-05 14:57:02 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-11-05 15:10:37 -0700 |
| commit | 716476e798c19e528bfa502444118d7fb412f88d (patch) | |
| tree | 7b8169062d4848ed2edd4fa98add7fff135b3909 | |
| parent | e31301d6ea7a772df3f25b7ce60d261e0c039cc0 (diff) | |
script special variables
47 files changed, 821 insertions, 805 deletions
diff --git a/asm/berry_blender.s b/asm/berry_blender.s index 4936cc58d..f8cde5a8d 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -323,7 +323,7 @@ sub_804E538: @ 804E538 movs r1, 0 strb r1, [r0] strb r1, [r2] - ldr r0, _0804E564 @ =gUnknown_0202E8CC + ldr r0, _0804E564 @ =gSpecialVar_0x8004 ldrb r0, [r0] bl sub_804E884 ldr r0, _0804E568 @ =sub_804E56C @@ -333,7 +333,7 @@ sub_804E538: @ 804E538 .align 2, 0 _0804E55C: .4byte gUnknown_03004854 _0804E560: .4byte 0x02018000 -_0804E564: .4byte gUnknown_0202E8CC +_0804E564: .4byte gSpecialVar_0x8004 _0804E568: .4byte sub_804E56C thumb_func_end sub_804E538 @@ -864,7 +864,7 @@ sub_804E990: @ 804E990 adds r0, r2 str r1, [r0] movs r2, 0 - ldr r5, _0804E9E0 @ =gUnknown_0202E8CC + ldr r5, _0804E9E0 @ =gSpecialVar_0x8004 adds r4, r3, 0 movs r3, 0 _0804E9B4: @@ -887,7 +887,7 @@ _0804E9B4: .align 2, 0 _0804E9D8: .4byte gUnknown_03004854 _0804E9DC: .4byte 0x02018000 -_0804E9E0: .4byte gUnknown_0202E8CC +_0804E9E0: .4byte gSpecialVar_0x8004 _0804E9E4: .4byte sub_804E9F8 _0804E9E8: ldr r0, _0804E9F4 @ =sub_804F378 @@ -1227,7 +1227,7 @@ _0804ED48: movs r4, 0xBE lsls r4, 1 adds r0, r4 - ldr r1, _0804ED8C @ =word_203855E + ldr r1, _0804ED8C @ =gScriptItemId ldrh r1, [r1] bl sub_804E844 ldr r0, _0804ED90 @ =gBlockSendBuffer @@ -1244,7 +1244,7 @@ _0804ED48: str r5, [r0] b _0804F0CE .align 2, 0 -_0804ED8C: .4byte word_203855E +_0804ED8C: .4byte gScriptItemId _0804ED90: .4byte gBlockSendBuffer _0804ED94: bl sub_8007ECC @@ -2050,7 +2050,7 @@ _0804F3A0: .4byte _0804F754 _0804F3F8: bl sub_804F0F4 - ldr r4, _0804F46C @ =word_203855E + ldr r4, _0804F46C @ =gScriptItemId ldrh r1, [r4] movs r0, 0 bl sub_80516C4 @@ -2105,7 +2105,7 @@ _0804F442: strb r2, [r3, 0x1] b _0804F7E6 .align 2, 0 -_0804F46C: .4byte word_203855E +_0804F46C: .4byte gScriptItemId _0804F470: .4byte gUnknown_03004854 _0804F474: bl sub_804E2EC @@ -2499,7 +2499,7 @@ _0804F754: ldr r0, _0804F80C @ =sub_80501FC bl SetMainCallback2 movs r4, 0 - ldr r0, _0804F810 @ =gUnknown_0202E8CC + ldr r0, _0804F810 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r4, r0 bge _0804F7B8 @@ -2521,7 +2521,7 @@ _0804F792: lsls r3, 17 adds r5, r3 adds r4, 0x1 - ldr r0, _0804F810 @ =gUnknown_0202E8CC + ldr r0, _0804F810 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r4, r0 blt _0804F792 @@ -2560,7 +2560,7 @@ _0804F7E6: _0804F804: .4byte gUnknown_03004854 _0804F808: .4byte 0x0000014b _0804F80C: .4byte sub_80501FC -_0804F810: .4byte gUnknown_0202E8CC +_0804F810: .4byte gSpecialVar_0x8004 _0804F814: .4byte gUnknown_08216308 _0804F818: .4byte 0x00000193 thumb_func_end sub_804F378 @@ -3364,7 +3364,7 @@ sub_804FE70: @ 804FE70 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r0, _0804FF40 @ =gUnknown_0202E8CC + ldr r0, _0804FF40 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 beq _0804FEB6 @@ -3468,7 +3468,7 @@ _0804FF26: adds r0, 0x1 b _0804FFCA .align 2, 0 -_0804FF40: .4byte gUnknown_0202E8CC +_0804FF40: .4byte gSpecialVar_0x8004 _0804FF44: .4byte gSendCmd _0804FF48: .4byte gRecvCmds _0804FF4C: .4byte 0x00004444 @@ -3596,7 +3596,7 @@ _0805003E: bge _0805005C b _0804FED8 _0805005C: - ldr r0, _080500A0 @ =gUnknown_0202E8CC + ldr r0, _080500A0 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 beq _08050088 @@ -3631,7 +3631,7 @@ _08050088: .align 2, 0 _08050098: .4byte gMPlay_BGM _0805009C: .4byte gUnknown_03004854 -_080500A0: .4byte gUnknown_0202E8CC +_080500A0: .4byte gSpecialVar_0x8004 _080500A4: .4byte gRecvCmds thumb_func_end sub_804FE70 @@ -4863,14 +4863,14 @@ _080509CC: lsls r0, 24 lsrs r4, r0, 24 _080509E4: - ldr r0, _080509F4 @ =gUnknown_0202E8CC + ldr r0, _080509F4 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r4, r0 bcc _080509CC b _08050C82 .align 2, 0 _080509F0: .4byte gUnknown_03004854 -_080509F4: .4byte gUnknown_0202E8CC +_080509F4: .4byte gSpecialVar_0x8004 _080509F8: ldr r1, _08050A24 @ =gUnknown_03004854 ldr r3, [r1] @@ -7647,7 +7647,7 @@ _08051F86: movs r1, 0x1 movs r2, 0xF bl MenuPrintMessage - ldr r0, _08051FF4 @ =word_203855E + ldr r0, _08051FF4 @ =gScriptItemId ldrh r0, [r0] movs r1, 0x1 bl RemoveBagItem @@ -7662,7 +7662,7 @@ _08051FE2: .align 2, 0 _08051FEC: .4byte gUnknown_03004854 _08051FF0: .4byte sub_8052BD0 -_08051FF4: .4byte word_203855E +_08051FF4: .4byte gScriptItemId _08051FF8: bl MenuUpdateWindowText lsls r0, 24 diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s index c1b2c586c..738f02d42 100644 --- a/asm/berry_tag_screen.s +++ b/asm/berry_tag_screen.s @@ -159,7 +159,7 @@ _0814615C: _08146168: .4byte gMain _0814616C: .4byte 0x0000043c _08146170: - ldr r0, _08146188 @ =word_203855E + ldr r0, _08146188 @ =gScriptItemId ldrb r0, [r0] adds r0, 0x7B lsls r0, 24 @@ -171,10 +171,10 @@ _08146170: strb r0, [r1] b _0814620C .align 2, 0 -_08146188: .4byte word_203855E +_08146188: .4byte gScriptItemId _0814618C: .4byte gUnknown_0203932C _08146190: - ldr r0, _081461A8 @ =word_203855E + ldr r0, _081461A8 @ =gScriptItemId ldrb r0, [r0] adds r0, 0x7B lsls r0, 24 @@ -185,7 +185,7 @@ _08146190: adds r1, r0 b _08146212 .align 2, 0 -_081461A8: .4byte word_203855E +_081461A8: .4byte gScriptItemId _081461AC: .4byte gMain _081461B0: .4byte 0x0000043c _081461B4: @@ -591,7 +591,7 @@ _081464E0: .4byte gMain thumb_func_start sub_81464E4 sub_81464E4: @ 81464E4 push {r4-r7,lr} - ldr r4, _0814659C @ =word_203855E + ldr r4, _0814659C @ =gScriptItemId ldrb r0, [r4] adds r0, 0x7C lsls r0, 24 @@ -669,7 +669,7 @@ _0814654E: bl MenuPrint b _081465BA .align 2, 0 -_0814659C: .4byte word_203855E +_0814659C: .4byte gScriptItemId _081465A0: .4byte gStringVar1 _081465A4: .4byte gOtherText_Size _081465A8: .4byte gStringVar2 @@ -1047,7 +1047,7 @@ _0814686C: _0814686E: strb r0, [r6, 0xC] _08146870: - ldr r2, _081468AC @ =word_203855E + ldr r2, _081468AC @ =gScriptItemId movs r0, 0x3 lsls r0, 2 adds r0, r6 @@ -1074,7 +1074,7 @@ _08146870: pop {r0} bx r0 .align 2, 0 -_081468AC: .4byte word_203855E +_081468AC: .4byte gScriptItemId _081468B0: .4byte gUnknown_03005D24 _081468B4: .4byte gUnknown_0203932C _081468B8: .4byte gSprites @@ -1089,7 +1089,7 @@ sub_81468BC: @ 81468BC movs r3, 0x13 bl MenuZeroFillWindowRect bl sub_81464E4 - ldr r4, _081468F8 @ =word_203855E + ldr r4, _081468F8 @ =gScriptItemId ldrb r0, [r4] adds r0, 0x7B lsls r0, 24 @@ -1108,7 +1108,7 @@ sub_81468BC: @ 81468BC pop {r0} bx r0 .align 2, 0 -_081468F8: .4byte word_203855E +_081468F8: .4byte gScriptItemId _081468FC: .4byte gUnknown_0203932C thumb_func_end sub_81468BC diff --git a/asm/cable_car.s b/asm/cable_car.s index 083ae8aa6..47afb097f 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -428,7 +428,7 @@ _0812358C: .4byte gCableCarPylonHookTilemapEntries _08123590: .4byte gMain _08123594: .4byte 0x0000043c _08123598: - ldr r0, _08123664 @ =gUnknown_0202E8CC + ldr r0, _08123664 @ =gSpecialVar_0x8004 ldrb r0, [r0] bl sub_81248AC ldr r0, _08123668 @ =gUnknown_02039274 @@ -521,7 +521,7 @@ _08123598: adds r0, 0x1 b _0812370C .align 2, 0 -_08123664: .4byte gUnknown_0202E8CC +_08123664: .4byte gSpecialVar_0x8004 _08123668: .4byte gUnknown_02039274 _0812366C: .4byte 0x02019090 _08123670: .4byte gMain @@ -568,7 +568,7 @@ _081236B0: ldr r0, _081236F4 @ =sub_8123878 movs r1, 0 bl CreateTask - ldr r0, _081236F8 @ =gUnknown_0202E8CC + ldr r0, _081236F8 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _08123700 @@ -580,7 +580,7 @@ _081236E8: .4byte 0x04000200 _081236EC: .4byte sub_8123C40 _081236F0: .4byte sub_8123724 _081236F4: .4byte sub_8123878 -_081236F8: .4byte gUnknown_0202E8CC +_081236F8: .4byte gSpecialVar_0x8004 _081236FC: .4byte sub_81239E4 _08123700: ldr r0, _0812371C @ =sub_8123AF8 @@ -1326,7 +1326,7 @@ sub_8123CB8: @ 8123CB8 ldrb r0, [r6, 0x1] cmp r0, 0xFF beq _08123D84 - ldr r0, _08123D24 @ =gUnknown_0202E8CC + ldr r0, _08123D24 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _08123D34 @@ -1367,7 +1367,7 @@ _08123D0A: b _08123D84 .align 2, 0 _08123D20: .4byte gUnknown_02039274 -_08123D24: .4byte gUnknown_0202E8CC +_08123D24: .4byte gSpecialVar_0x8004 _08123D28: .4byte 0x47800000 _08123D2C: .4byte 0x3e0f5c29 _08123D30: .4byte 0x3d89374c @@ -1427,7 +1427,7 @@ sub_8123D98: @ 8123D98 bne _08123DA8 b _08123EB0 _08123DA8: - ldr r0, _08123E08 @ =gUnknown_0202E8CC + ldr r0, _08123E08 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _08123E18 @@ -1468,7 +1468,7 @@ _08123DEC: b _08123E68 .align 2, 0 _08123E04: .4byte gUnknown_02039274 -_08123E08: .4byte gUnknown_0202E8CC +_08123E08: .4byte gSpecialVar_0x8004 _08123E0C: .4byte 0x47800000 _08123E10: .4byte 0x3e0f5c29 _08123E14: .4byte 0x3d89374c @@ -1764,7 +1764,7 @@ _08124024: strh r3, [r0] adds r0, 0x2 strh r3, [r0] - ldr r0, _08124064 @ =gUnknown_0202E8CC + ldr r0, _08124064 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _0812406C @@ -1782,7 +1782,7 @@ _08124024: b _08124082 .align 2, 0 _08124060: .4byte REG_WININ -_08124064: .4byte gUnknown_0202E8CC +_08124064: .4byte gSpecialVar_0x8004 _08124068: .4byte gUnknown_02039274 _0812406C: ldr r1, _081240F4 @ =gUnknown_02039274 @@ -1902,7 +1902,7 @@ sub_8124118: @ 8124118 ldr r0, [r0] str r0, [sp, 0x1C] str r1, [sp, 0x20] - ldr r0, _08124240 @ =gUnknown_0202E8CC + ldr r0, _08124240 @ =gSpecialVar_0x8004 ldrh r0, [r0] mov r8, r6 mov r10, r5 @@ -2004,7 +2004,7 @@ _08124230: .4byte gMtChimneyHikerGraphicsIDs _08124234: .4byte gMtChimneyHikerCoords _08124238: .4byte gMtChimneyHikerMovementDelayTable _0812423C: .4byte gUnknown_08401D9C -_08124240: .4byte gUnknown_0202E8CC +_08124240: .4byte gSpecialVar_0x8004 _08124244: .4byte gSaveBlock2 _08124248: .4byte sub_8123D98 _0812424C: .4byte gSprites @@ -2148,7 +2148,7 @@ _08124322: lsrs r0, 16 add r0, r8 ldrb r0, [r0] - ldr r5, _08124410 @ =gUnknown_0202E8CC + ldr r5, _08124410 @ =gSpecialVar_0x8004 ldrh r4, [r5] lsls r4, 2 add r1, sp, 0x1C @@ -2218,7 +2218,7 @@ _08124400: .4byte gSpriteTemplate_8401D40 _08124404: .4byte 0x00000109 _08124408: .4byte 0xfff80000 _0812440C: .4byte gSpriteTemplate_8401D70 -_08124410: .4byte gUnknown_0202E8CC +_08124410: .4byte gSpecialVar_0x8004 _08124414: adds r0, r4, 0 movs r1, 0x7 diff --git a/asm/cable_club.s b/asm/cable_club.s index c8d038338..c1275ee1d 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -973,7 +973,7 @@ sub_808347C: @ 808347C push {r4,lr} movs r3, 0x2 movs r2, 0x2 - ldr r0, _08083494 @ =gUnknown_0202E8CC + ldr r0, _08083494 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x2 beq _080834B0 @@ -983,7 +983,7 @@ sub_808347C: @ 808347C beq _0808349E b _080834CC .align 2, 0 -_08083494: .4byte gUnknown_0202E8CC +_08083494: .4byte gSpecialVar_0x8004 _08083498: cmp r0, 0x5 beq _080834C0 @@ -1233,7 +1233,7 @@ sub_8083664: @ 8083664 .align 2, 0 _08083678: .4byte sub_8083710 _0808367C: - ldr r0, _08083690 @ =gUnknown_0202E8CC + ldr r0, _08083690 @ =gSpecialVar_0x8004 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x4 @@ -1244,7 +1244,7 @@ _0808367C: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08083690: .4byte gUnknown_0202E8CC +_08083690: .4byte gSpecialVar_0x8004 _08083694: .4byte _08083698 .align 2, 0 _08083698: @@ -1545,7 +1545,7 @@ _080838E8: ldr r0, _08083900 @ =0x000001cb bl current_map_music_set__default_for_battle _080838EE: - ldr r0, _08083904 @ =gUnknown_0202E8CC + ldr r0, _08083904 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x2 beq _08083918 @@ -1556,7 +1556,7 @@ _080838EE: b _0808392E .align 2, 0 _08083900: .4byte 0x000001cb -_08083904: .4byte gUnknown_0202E8CC +_08083904: .4byte gSpecialVar_0x8004 _08083908: cmp r0, 0x5 beq _08083924 @@ -1605,7 +1605,7 @@ sub_8083958: @ 8083958 bl copy_player_party_from_sav1 bl copy_bags_and_unk_data_to_save_blocks bl sub_810FEFC - ldr r0, _08083990 @ =gUnknown_0202E8CC + ldr r0, _08083990 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x5 beq _0808397E @@ -1623,7 +1623,7 @@ _0808397E: pop {r0} bx r0 .align 2, 0 -_08083990: .4byte gUnknown_0202E8CC +_08083990: .4byte gSpecialVar_0x8004 _08083994: .4byte gUnknown_03004860 _08083998: .4byte gMain _0808399C: .4byte sub_805465C @@ -1633,7 +1633,7 @@ _080839A0: .4byte sub_8071B28 thumb_func_start sub_80839A4 sub_80839A4: @ 80839A4 push {lr} - ldr r0, _080839CC @ =gUnknown_0202E8CC + ldr r0, _080839CC @ =gSpecialVar_0x8004 ldrh r1, [r0] subs r0, r1, 0x1 lsls r0, 16 @@ -1651,7 +1651,7 @@ _080839C0: pop {r0} bx r0 .align 2, 0 -_080839CC: .4byte gUnknown_0202E8CC +_080839CC: .4byte gSpecialVar_0x8004 thumb_func_end sub_80839A4 thumb_func_start sub_80839D0 @@ -1703,14 +1703,14 @@ _08083A20: cmp r0, 0 beq _08083A7E bl sub_8055574 - ldr r0, _08083A3C @ =gUnknown_0202E8CE + ldr r0, _08083A3C @ =gSpecialVar_0x8005 ldrb r0, [r0] bl sub_8007270 movs r0, 0x2 strh r0, [r5, 0x8] b _08083A7E .align 2, 0 -_08083A3C: .4byte gUnknown_0202E8CE +_08083A3C: .4byte gSpecialVar_0x8005 _08083A40: bl sub_80554F8 cmp r0, 0x1 @@ -1928,14 +1928,14 @@ _08083BD8: .4byte sub_80B9484 thumb_func_start sub_8083BDC sub_8083BDC: @ 8083BDC push {lr} - ldr r0, _08083BEC @ =gUnknown_0202E8D0 + ldr r0, _08083BEC @ =gSpecialVar_0x8006 ldrb r0, [r0] ldr r1, _08083BF0 @ =c2_exit_to_overworld_1_continue_scripts_restart_music bl sub_8093130 pop {r0} bx r0 .align 2, 0 -_08083BEC: .4byte gUnknown_0202E8D0 +_08083BEC: .4byte gSpecialVar_0x8006 _08083BF0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_end sub_8083BDC @@ -1945,7 +1945,7 @@ sub_8083BF4: @ 8083BF4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08083C34 @ =gUnknown_0202E8D0 + ldr r0, _08083C34 @ =gSpecialVar_0x8006 strh r4, [r0] ldr r0, _08083C38 @ =gStringVar1 lsls r1, r4, 3 @@ -1970,7 +1970,7 @@ sub_8083BF4: @ 8083BF4 movs r0, 0x1 b _08083C4A .align 2, 0 -_08083C34: .4byte gUnknown_0202E8D0 +_08083C34: .4byte gSpecialVar_0x8006 _08083C38: .4byte gStringVar1 _08083C3C: .4byte gLinkPlayers + 0x8 _08083C40: .4byte gStringVar2 diff --git a/asm/choose_party.s b/asm/choose_party.s index 762e48e61..21988162b 100644 --- a/asm/choose_party.s +++ b/asm/choose_party.s @@ -2092,7 +2092,7 @@ _08122E84: ldr r1, _08122EA4 @ =gUnknown_03005CE0 movs r0, 0xFF strb r0, [r1] - ldr r1, _08122EA8 @ =gUnknown_0202E8CC + ldr r1, _08122EA8 @ =gSpecialVar_0x8004 movs r0, 0xFF strh r0, [r1] adds r0, r4, 0 @@ -2103,7 +2103,7 @@ _08122E9C: bx r0 .align 2, 0 _08122EA4: .4byte gUnknown_03005CE0 -_08122EA8: .4byte gUnknown_0202E8CC +_08122EA8: .4byte gSpecialVar_0x8004 thumb_func_end sub_8122E0C thumb_func_start sub_8122EAC @@ -2203,7 +2203,7 @@ sub_8122F70: @ 8122F70 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08122F88 @ =gUnknown_0202E8CC + ldr r2, _08122F88 @ =gSpecialVar_0x8004 ldr r1, _08122F8C @ =gUnknown_03005CE0 ldrb r1, [r1] strh r1, [r2] @@ -2211,7 +2211,7 @@ sub_8122F70: @ 8122F70 pop {r0} bx r0 .align 2, 0 -_08122F88: .4byte gUnknown_0202E8CC +_08122F88: .4byte gSpecialVar_0x8004 _08122F8C: .4byte gUnknown_03005CE0 thumb_func_end sub_8122F70 diff --git a/asm/contest.s b/asm/contest.s index bab1bf067..044a43aad 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6187,7 +6187,7 @@ _080AE48E: movs r0, 0x4 b _080AE50A _080AE49E: - ldr r0, _080AE4B0 @ =gUnknown_0203869C + ldr r0, _080AE4B0 @ =gSpecialVar_0x8011 ldrh r0, [r0] cmp r0, 0x4 bhi _080AE4F2 @@ -6197,7 +6197,7 @@ _080AE49E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AE4B0: .4byte gUnknown_0203869C +_080AE4B0: .4byte gSpecialVar_0x8011 _080AE4B4: .4byte _080AE4B8 .align 2, 0 _080AE4B8: @@ -6234,7 +6234,7 @@ _080AE4F2: movs r0, 0 b _080AE50A _080AE4F6: - ldr r0, _080AE510 @ =gUnknown_0203869E + ldr r0, _080AE510 @ =gSpecialVar_0x8010 adds r2, r1, 0 ldrh r1, [r0] movs r0, 0x2 @@ -6249,7 +6249,7 @@ _080AE50A: pop {r1} bx r1 .align 2, 0 -_080AE510: .4byte gUnknown_0203869E +_080AE510: .4byte gSpecialVar_0x8010 thumb_func_end sub_80AE47C thumb_func_start sub_80AE514 @@ -13239,7 +13239,7 @@ contest_get_move_excitement: @ 80B19FC ldrb r1, [r0, 0x1] lsls r1, 29 lsrs r1, 29 - ldr r0, _080B1A28 @ =gUnknown_0203869C + ldr r0, _080B1A28 @ =gSpecialVar_0x8011 ldrh r2, [r0] lsls r0, r2, 2 adds r0, r2 @@ -13251,7 +13251,7 @@ contest_get_move_excitement: @ 80B19FC .align 2, 0 _080B1A20: .4byte gContestExcitementTable _080B1A24: .4byte gContestMoves -_080B1A28: .4byte gUnknown_0203869C +_080B1A28: .4byte gSpecialVar_0x8011 thumb_func_end contest_get_move_excitement thumb_func_start sub_80B1A2C @@ -15401,7 +15401,7 @@ _080B2AB6: _080B2AC8: .4byte gUnknown_02038690 _080B2ACC: .4byte gUnknown_02038695 _080B2AD0: - ldr r0, _080B2AE4 @ =gUnknown_0203869C + ldr r0, _080B2AE4 @ =gSpecialVar_0x8011 ldrh r0, [r0] cmp r0, 0x4 bhi _080B2B16 @@ -15411,7 +15411,7 @@ _080B2AD0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B2AE4: .4byte gUnknown_0203869C +_080B2AE4: .4byte gSpecialVar_0x8011 _080B2AE8: .4byte _080B2AEC .align 2, 0 _080B2AEC: @@ -15492,7 +15492,7 @@ _080B2B16: mov r1, r9 cmp r1, 0xFF beq _080B2BB8 - ldr r0, _080B2BB0 @ =gUnknown_0203869C + ldr r0, _080B2BB0 @ =gSpecialVar_0x8011 ldrh r1, [r0] ldr r0, _080B2BB4 @ =0x00002e06 add r0, r8 @@ -15505,7 +15505,7 @@ _080B2BA0: .4byte gUnknown_02038570 _080B2BA4: .4byte 0x00002e04 _080B2BA8: .4byte 0x00002e07 _080B2BAC: .4byte 0x00002e12 -_080B2BB0: .4byte gUnknown_0203869C +_080B2BB0: .4byte gSpecialVar_0x8011 _080B2BB4: .4byte 0x00002e06 _080B2BB8: ldr r0, _080B2BC0 @ =0x00002e06 @@ -15659,7 +15659,7 @@ _080B2CCA: .align 2, 0 _080B2CD0: .4byte gSaveBlock1 + 0x2DFC _080B2CD4: - ldr r0, _080B2CE8 @ =gUnknown_0203869C + ldr r0, _080B2CE8 @ =gSpecialVar_0x8011 ldrh r0, [r0] cmp r0, 0x4 bhi _080B2D14 @@ -15669,7 +15669,7 @@ _080B2CD4: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B2CE8: .4byte gUnknown_0203869C +_080B2CE8: .4byte gSpecialVar_0x8011 _080B2CEC: .4byte _080B2CF0 .align 2, 0 _080B2CF0: diff --git a/asm/contest_ai.s b/asm/contest_ai.s index fdc9afbb3..5b25685d4 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -1316,7 +1316,7 @@ _0812923C: thumb_func_start contest_ai_get_contest_type contest_ai_get_contest_type: @ 8129244 ldr r1, _08129258 @ =0x020192e4 - ldr r0, _0812925C @ =gUnknown_0203869C + ldr r0, _0812925C @ =gSpecialVar_0x8011 ldrh r0, [r0] strh r0, [r1, 0x18] ldr r1, _08129260 @ =gUnknown_02039238 @@ -1326,7 +1326,7 @@ contest_ai_get_contest_type: @ 8129244 bx lr .align 2, 0 _08129258: .4byte 0x020192e4 -_0812925C: .4byte gUnknown_0203869C +_0812925C: .4byte gSpecialVar_0x8011 _08129260: .4byte gUnknown_02039238 thumb_func_end contest_ai_get_contest_type diff --git a/asm/contest_effect.s b/asm/contest_effect.s index 32dc389b4..26c810341 100644 --- a/asm/contest_effect.s +++ b/asm/contest_effect.s @@ -2413,7 +2413,7 @@ ContestEffect_44: @ 80B8EBC adds r0, r3 ldrb r0, [r0, 0x1] lsls r0, 29 - ldr r1, _080B8EF8 @ =gUnknown_0203869C + ldr r1, _080B8EF8 @ =gSpecialVar_0x8011 lsrs r0, 29 ldrh r1, [r1] cmp r0, r1 @@ -2428,7 +2428,7 @@ _080B8EEA: .align 2, 0 _080B8EF0: .4byte gContestMoves _080B8EF4: .4byte 0x020192d0 -_080B8EF8: .4byte gUnknown_0203869C +_080B8EF8: .4byte gSpecialVar_0x8011 thumb_func_end ContestEffect_44 thumb_func_start ContestEffect_45 diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index f57ffac1e..f308993d9 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -1714,7 +1714,7 @@ sub_80C2E14: @ 80C2E14 bl sub_80BE284 movs r0, 0x2 bl sub_810FB10 - ldr r0, _080C2E88 @ =gUnknown_0203869E + ldr r0, _080C2E88 @ =gSpecialVar_0x8010 ldrb r0, [r0] bl sub_80B2A7C movs r0, 0xFE @@ -1751,7 +1751,7 @@ sub_80C2E14: @ 80C2E14 .align 2, 0 _080C2E80: .4byte gUnknown_02038690 _080C2E84: .4byte gUnknown_02038695 -_080C2E88: .4byte gUnknown_0203869E +_080C2E88: .4byte gSpecialVar_0x8010 _080C2E8C: .4byte 0x02000000 _080C2E90: .4byte 0x00015ddf _080C2E94: .4byte 0x00015dde @@ -2972,7 +2972,7 @@ _080C3808: .4byte gUnknown_0203869A _080C380C: .4byte 0x0600e000 _080C3810: .4byte gUnknown_08E964B8 _080C3814: - ldr r0, _080C3830 @ =gUnknown_0203869E + ldr r0, _080C3830 @ =gSpecialVar_0x8010 ldrh r2, [r0] cmp r2, 0 bne _080C383C @@ -2987,7 +2987,7 @@ _080C3814: str r1, [sp, 0xC] b _080C3870 .align 2, 0 -_080C3830: .4byte gUnknown_0203869E +_080C3830: .4byte gSpecialVar_0x8010 _080C3834: .4byte 0x0600e000 _080C3838: .4byte gUnknown_08E964B8 _080C383C: @@ -3041,7 +3041,7 @@ _080C3884: bl sub_809D104 _080C389E: adds r4, 0xD - ldr r0, _080C38C8 @ =gUnknown_0203869C + ldr r0, _080C38C8 @ =gSpecialVar_0x8011 ldrh r0, [r0] cmp r0, 0 bne _080C38CC @@ -3059,7 +3059,7 @@ _080C389E: .align 2, 0 _080C38C0: .4byte 0x0600e000 _080C38C4: .4byte gUnknown_08E964B8 -_080C38C8: .4byte gUnknown_0203869C +_080C38C8: .4byte gSpecialVar_0x8011 _080C38CC: cmp r0, 0x1 bne _080C38EC @@ -4546,9 +4546,9 @@ sub_80C43F4: @ 80C43F4 adds r5, r0, 0 cmp r5, 0 beq _080C4422 - ldr r4, _080C4434 @ =gUnknown_0203869C + ldr r4, _080C4434 @ =gSpecialVar_0x8011 ldrb r0, [r4] - ldr r1, _080C4438 @ =gUnknown_0203869E + ldr r1, _080C4438 @ =gSpecialVar_0x8010 ldrb r1, [r1] bl sub_80AE398 ldrb r0, [r4] @@ -4562,8 +4562,8 @@ _080C4422: .align 2, 0 _080C442C: .4byte gUnknown_02038694 _080C4430: .4byte gPlayerParty -_080C4434: .4byte gUnknown_0203869C -_080C4438: .4byte gUnknown_0203869E +_080C4434: .4byte gSpecialVar_0x8011 +_080C4438: .4byte gSpecialVar_0x8010 _080C443C: .4byte gScriptResult thumb_func_end sub_80C43F4 @@ -4577,7 +4577,7 @@ sub_80C4440: @ 80C4440 muls r1, r0 ldr r0, _080C4468 @ =gPlayerParty adds r2, r1, r0 - ldr r0, _080C446C @ =gUnknown_0203869C + ldr r0, _080C446C @ =gSpecialVar_0x8011 ldrh r0, [r0] cmp r0, 0x4 bhi _080C44B2 @@ -4589,7 +4589,7 @@ sub_80C4440: @ 80C4440 .align 2, 0 _080C4464: .4byte gUnknown_02038694 _080C4468: .4byte gPlayerParty -_080C446C: .4byte gUnknown_0203869C +_080C446C: .4byte gSpecialVar_0x8011 _080C4470: .4byte _080C4474 .align 2, 0 _080C4474: @@ -4619,7 +4619,7 @@ _080C44A0: movs r1, 0x36 _080C44A4: bl GetMonData - ldr r1, _080C44BC @ =gUnknown_0203869E + ldr r1, _080C44BC @ =gSpecialVar_0x8010 ldrh r1, [r1] cmp r0, r1 bls _080C44B2 @@ -4630,7 +4630,7 @@ _080C44B2: pop {r1} bx r1 .align 2, 0 -_080C44BC: .4byte gUnknown_0203869E +_080C44BC: .4byte gSpecialVar_0x8010 thumb_func_end sub_80C4440 thumb_func_start sub_80C44C0 @@ -4646,7 +4646,7 @@ sub_80C44C0: @ 80C44C0 beq _080C44D4 b _080C465E _080C44D4: - ldr r0, _080C44F0 @ =gUnknown_0203869C + ldr r0, _080C44F0 @ =gSpecialVar_0x8011 ldrh r0, [r0] cmp r0, 0x4 bls _080C44DE @@ -4660,7 +4660,7 @@ _080C44DE: .align 2, 0 _080C44E8: .4byte gUnknown_02038690 _080C44EC: .4byte gUnknown_02038695 -_080C44F0: .4byte gUnknown_0203869C +_080C44F0: .4byte gSpecialVar_0x8011 _080C44F4: .4byte _080C44F8 .align 2, 0 _080C44F8: @@ -4682,7 +4682,7 @@ _080C450C: lsrs r1, r0, 24 mov r0, sp strb r1, [r0] - ldr r0, _080C4550 @ =gUnknown_0203869E + ldr r0, _080C4550 @ =gSpecialVar_0x8010 ldrh r0, [r0] cmp r1, r0 bls _080C4530 @@ -4704,7 +4704,7 @@ _080C4538: .align 2, 0 _080C4548: .4byte gUnknown_02038694 _080C454C: .4byte gPlayerParty -_080C4550: .4byte gUnknown_0203869E +_080C4550: .4byte gSpecialVar_0x8010 _080C4554: mov r4, sp ldr r7, _080C458C @ =gUnknown_02038694 @@ -4718,7 +4718,7 @@ _080C4554: strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080C4594 @ =gUnknown_0203869E + ldr r0, _080C4594 @ =gSpecialVar_0x8010 ldrh r0, [r0] cmp r2, r0 bhi _080C465E @@ -4735,7 +4735,7 @@ _080C4554: .align 2, 0 _080C458C: .4byte gUnknown_02038694 _080C4590: .4byte gPlayerParty -_080C4594: .4byte gUnknown_0203869E +_080C4594: .4byte gSpecialVar_0x8010 _080C4598: mov r4, sp ldr r7, _080C45D0 @ =gUnknown_02038694 @@ -4749,7 +4749,7 @@ _080C4598: strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080C45D8 @ =gUnknown_0203869E + ldr r0, _080C45D8 @ =gSpecialVar_0x8010 ldrh r0, [r0] cmp r2, r0 bhi _080C465E @@ -4766,7 +4766,7 @@ _080C4598: .align 2, 0 _080C45D0: .4byte gUnknown_02038694 _080C45D4: .4byte gPlayerParty -_080C45D8: .4byte gUnknown_0203869E +_080C45D8: .4byte gSpecialVar_0x8010 _080C45DC: mov r4, sp ldr r7, _080C4618 @ =gUnknown_02038694 @@ -4780,7 +4780,7 @@ _080C45DC: strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080C4620 @ =gUnknown_0203869E + ldr r0, _080C4620 @ =gSpecialVar_0x8010 ldrh r0, [r0] cmp r2, r0 bhi _080C465E @@ -4800,7 +4800,7 @@ _080C4610: .align 2, 0 _080C4618: .4byte gUnknown_02038694 _080C461C: .4byte gPlayerParty -_080C4620: .4byte gUnknown_0203869E +_080C4620: .4byte gSpecialVar_0x8010 _080C4624: mov r4, sp ldr r7, _080C4668 @ =gUnknown_02038694 @@ -4814,7 +4814,7 @@ _080C4624: strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080C4670 @ =gUnknown_0203869E + ldr r0, _080C4670 @ =gSpecialVar_0x8010 ldrh r0, [r0] cmp r2, r0 bhi _080C465E @@ -4837,7 +4837,7 @@ _080C465E: .align 2, 0 _080C4668: .4byte gUnknown_02038694 _080C466C: .4byte gPlayerParty -_080C4670: .4byte gUnknown_0203869E +_080C4670: .4byte gSpecialVar_0x8010 thumb_func_end sub_80C44C0 thumb_func_start sub_80C4674 @@ -4912,7 +4912,7 @@ sub_80C46EC: @ 80C46EC cmp r0, 0 beq _080C4720 ldr r0, _080C4714 @ =gStringVar1 - ldr r1, _080C4718 @ =gUnknown_0202E8D0 + ldr r1, _080C4718 @ =gSpecialVar_0x8006 ldrh r2, [r1] lsls r1, r2, 3 subs r1, r2 @@ -4924,11 +4924,11 @@ sub_80C46EC: @ 80C46EC .align 2, 0 _080C4710: .4byte gUnknown_0203869A _080C4714: .4byte gStringVar1 -_080C4718: .4byte gUnknown_0202E8D0 +_080C4718: .4byte gSpecialVar_0x8006 _080C471C: .4byte gLinkPlayers + 0x8 _080C4720: ldr r0, _080C4734 @ =gStringVar1 - ldr r1, _080C4738 @ =gUnknown_0202E8D0 + ldr r1, _080C4738 @ =gSpecialVar_0x8006 ldrh r1, [r1] lsls r1, 6 ldr r2, _080C473C @ =gUnknown_0203857D @@ -4939,7 +4939,7 @@ _080C4730: bx r0 .align 2, 0 _080C4734: .4byte gStringVar1 -_080C4738: .4byte gUnknown_0202E8D0 +_080C4738: .4byte gSpecialVar_0x8006 _080C473C: .4byte gUnknown_0203857D thumb_func_end sub_80C46EC @@ -4947,14 +4947,14 @@ _080C473C: .4byte gUnknown_0203857D sub_80C4740: @ 80C4740 push {lr} ldr r0, _080C4750 @ =gStringVar3 - ldr r1, _080C4754 @ =gUnknown_0202E8D0 + ldr r1, _080C4754 @ =gSpecialVar_0x8006 ldrb r1, [r1] bl sub_80C4698 pop {r0} bx r0 .align 2, 0 _080C4750: .4byte gStringVar3 -_080C4754: .4byte gUnknown_0202E8D0 +_080C4754: .4byte gSpecialVar_0x8006 thumb_func_end sub_80C4740 thumb_func_start sub_80C4758 @@ -4962,9 +4962,9 @@ sub_80C4758: @ 80C4758 push {r4-r6,lr} movs r1, 0 movs r2, 0 - ldr r5, _080C4794 @ =gUnknown_0202E8CC + ldr r5, _080C4794 @ =gSpecialVar_0x8004 ldr r4, _080C4798 @ =gUnknown_02038670 - ldr r0, _080C479C @ =gUnknown_0202E8D0 + ldr r0, _080C479C @ =gSpecialVar_0x8006 ldrh r0, [r0] lsls r0, 1 adds r0, r4 @@ -4991,16 +4991,16 @@ _080C4780: pop {r0} bx r0 .align 2, 0 -_080C4794: .4byte gUnknown_0202E8CC +_080C4794: .4byte gSpecialVar_0x8004 _080C4798: .4byte gUnknown_02038670 -_080C479C: .4byte gUnknown_0202E8D0 +_080C479C: .4byte gSpecialVar_0x8006 thumb_func_end sub_80C4758 thumb_func_start sub_80C47A0 sub_80C47A0: @ 80C47A0 - ldr r2, _080C47B4 @ =gUnknown_0202E8CC + ldr r2, _080C47B4 @ =gSpecialVar_0x8004 ldr r1, _080C47B8 @ =gUnknown_02038670 - ldr r0, _080C47BC @ =gUnknown_0202E8D0 + ldr r0, _080C47BC @ =gSpecialVar_0x8006 ldrh r0, [r0] lsls r0, 1 adds r0, r1 @@ -5008,9 +5008,9 @@ sub_80C47A0: @ 80C47A0 strh r0, [r2] bx lr .align 2, 0 -_080C47B4: .4byte gUnknown_0202E8CC +_080C47B4: .4byte gSpecialVar_0x8004 _080C47B8: .4byte gUnknown_02038670 -_080C47BC: .4byte gUnknown_0202E8D0 +_080C47BC: .4byte gSpecialVar_0x8006 thumb_func_end sub_80C47A0 thumb_func_start sub_80C47C0 @@ -5019,7 +5019,7 @@ sub_80C47C0: @ 80C47C0 movs r1, 0 ldr r2, _080C47E8 @ =gUnknown_02038690 ldrb r0, [r2] - ldr r3, _080C47EC @ =gUnknown_0202E8CE + ldr r3, _080C47EC @ =gSpecialVar_0x8005 cmp r0, 0 beq _080C47E0 _080C47CE: @@ -5038,7 +5038,7 @@ _080C47E0: bx r0 .align 2, 0 _080C47E8: .4byte gUnknown_02038690 -_080C47EC: .4byte gUnknown_0202E8CE +_080C47EC: .4byte gSpecialVar_0x8005 thumb_func_end sub_80C47C0 thumb_func_start sub_80C47F0 @@ -5181,9 +5181,9 @@ _080C48F0: .4byte sub_80C489C thumb_func_start sub_80C48F4 sub_80C48F4: @ 80C48F4 - ldr r2, _080C4908 @ =gUnknown_0202E8CC + ldr r2, _080C4908 @ =gSpecialVar_0x8004 ldr r1, _080C490C @ =gUnknown_02038570 - ldr r0, _080C4910 @ =gUnknown_0202E8D0 + ldr r0, _080C4910 @ =gSpecialVar_0x8006 ldrh r0, [r0] lsls r0, 6 adds r0, r1 @@ -5191,9 +5191,9 @@ sub_80C48F4: @ 80C48F4 strh r0, [r2] bx lr .align 2, 0 -_080C4908: .4byte gUnknown_0202E8CC +_080C4908: .4byte gSpecialVar_0x8004 _080C490C: .4byte gUnknown_02038570 -_080C4910: .4byte gUnknown_0202E8D0 +_080C4910: .4byte gSpecialVar_0x8006 thumb_func_end sub_80C48F4 thumb_func_start sub_80C4914 @@ -5243,13 +5243,13 @@ _080C4968: .4byte sub_80C4914 thumb_func_start sub_80C496C sub_80C496C: @ 80C496C - ldr r0, _080C4978 @ =gUnknown_0202E8CC + ldr r0, _080C4978 @ =gSpecialVar_0x8004 ldr r1, _080C497C @ =gUnknown_02038695 ldrb r1, [r1] strh r1, [r0] bx lr .align 2, 0 -_080C4978: .4byte gUnknown_0202E8CC +_080C4978: .4byte gSpecialVar_0x8004 _080C497C: .4byte gUnknown_02038695 thumb_func_end sub_80C496C @@ -5362,7 +5362,7 @@ sub_80C4A44: @ 80C4A44 lsls r0, 24 lsrs r5, r0, 24 movs r3, 0 - ldr r0, _080C4AA0 @ =gUnknown_0202E8CC + ldr r0, _080C4AA0 @ =gSpecialVar_0x8004 mov r8, r0 add r1, sp, 0x4 mov r12, r1 @@ -5404,7 +5404,7 @@ _080C4A96: movs r0, 0 b _080C4AAA .align 2, 0 -_080C4AA0: .4byte gUnknown_0202E8CC +_080C4AA0: .4byte gSpecialVar_0x8004 _080C4AA4: .4byte gTasks + 0x8 _080C4AA8: movs r0, 0x1 @@ -5433,7 +5433,7 @@ _080C4AB8: bl sub_80C4B34 ldr r1, _080C4AFC @ =gUnknown_0203869B strb r0, [r1] - ldr r0, _080C4B00 @ =gUnknown_0203869C + ldr r0, _080C4B00 @ =gSpecialVar_0x8011 ldrb r0, [r0] bl sub_80AE82C ldr r1, _080C4B04 @ =sub_80C8EBC @@ -5449,7 +5449,7 @@ _080C4AB8: .align 2, 0 _080C4AF8: .4byte gTasks + 0x8 _080C4AFC: .4byte gUnknown_0203869B -_080C4B00: .4byte gUnknown_0203869C +_080C4B00: .4byte gSpecialVar_0x8011 _080C4B04: .4byte sub_80C8EBC _080C4B08: .4byte sub_80C4B0C thumb_func_end sub_80C4A44 @@ -5504,7 +5504,7 @@ sub_80C4B5C: @ 80C4B5C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080C4B84 @ =gUnknown_0202E8CC + ldr r0, _080C4B84 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x1 bne _080C4B90 @@ -5521,7 +5521,7 @@ sub_80C4B5C: @ 80C4B5C str r0, [r1] b _080C4B9E .align 2, 0 -_080C4B84: .4byte gUnknown_0202E8CC +_080C4B84: .4byte gSpecialVar_0x8004 _080C4B88: .4byte gTasks _080C4B8C: .4byte sub_80C4BA4 _080C4B90: diff --git a/asm/daycare.s b/asm/daycare.s index b846c4fe7..68cae0daf 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -469,7 +469,7 @@ _08041644: .4byte gPlayerParty sub_8041648: @ 8041648 push {lr} ldr r0, _0804165C @ =gSaveBlock1 + 0x2F9C - ldr r1, _08041660 @ =gUnknown_0202E8CC + ldr r1, _08041660 @ =gSpecialVar_0x8004 ldrb r1, [r1] bl sub_8041570 lsls r0, 16 @@ -478,7 +478,7 @@ sub_8041648: @ 8041648 bx r1 .align 2, 0 _0804165C: .4byte gSaveBlock1 + 0x2F9C -_08041660: .4byte gUnknown_0202E8CC +_08041660: .4byte gSpecialVar_0x8004 thumb_func_end sub_8041648 thumb_func_start sub_8041664 @@ -619,17 +619,17 @@ _0804176C: .4byte gStringVar2 sub_8041770: @ 8041770 push {lr} ldr r0, _08041784 @ =gSaveBlock1 + 0x2F9C - ldr r1, _08041788 @ =gUnknown_0202E8CC + ldr r1, _08041788 @ =gSpecialVar_0x8004 ldrb r1, [r1] bl sub_8041728 - ldr r1, _0804178C @ =gUnknown_0202E8CE + ldr r1, _0804178C @ =gSpecialVar_0x8005 strh r0, [r1] pop {r0} bx r0 .align 2, 0 _08041784: .4byte gSaveBlock1 + 0x2F9C -_08041788: .4byte gUnknown_0202E8CC -_0804178C: .4byte gUnknown_0202E8CE +_08041788: .4byte gSpecialVar_0x8004 +_0804178C: .4byte gSpecialVar_0x8005 thumb_func_end sub_8041770 thumb_func_start sub_8041790 @@ -657,7 +657,7 @@ _080417B4: .4byte 0x000030b0 thumb_func_start sub_80417B8 sub_80417B8: @ 80417B8 push {r4,r5,lr} - ldr r5, _080417D8 @ =gUnknown_0202E8CC + ldr r5, _080417D8 @ =gSpecialVar_0x8004 ldrh r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -671,7 +671,7 @@ sub_80417B8: @ 80417B8 movs r0, 0 b _080417EC .align 2, 0 -_080417D8: .4byte gUnknown_0202E8CC +_080417D8: .4byte gSpecialVar_0x8004 _080417DC: .4byte gSaveBlock1 + 0x2F9C _080417E0: ldrb r1, [r5] @@ -2062,13 +2062,13 @@ _08042244: str r0, [sp] cmp r0, 0 bne _08042278 - ldr r0, _08042274 @ =gUnknown_0202E8CC + ldr r0, _08042274 @ =gSpecialVar_0x8004 strh r6, [r0] movs r0, 0x1 b _08042292 .align 2, 0 _08042270: .4byte gPlayerParty -_08042274: .4byte gUnknown_0202E8CC +_08042274: .4byte gSpecialVar_0x8004 _08042278: subs r0, 0x1 str r0, [sp] diff --git a/asm/decoration.s b/asm/decoration.s index 064a93b06..c507b599d 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -2397,9 +2397,9 @@ sub_80FF474: @ 80FF474 movs r6, 0 ldr r0, _080FF54C @ =gMapHeader mov r8, r0 - ldr r1, _080FF550 @ =gUnknown_0202E8CE + ldr r1, _080FF550 @ =gSpecialVar_0x8005 mov r9, r1 - ldr r2, _080FF554 @ =gUnknown_0202E8D0 + ldr r2, _080FF554 @ =gSpecialVar_0x8006 mov r10, r2 ldr r7, _080FF558 @ =gSaveBlock1 _080FF490: @@ -2472,7 +2472,7 @@ _080FF4E0: strh r1, [r2] ldr r1, _080FF568 @ =gUnknown_020391A6 ldrh r1, [r1] - ldr r4, _080FF56C @ =gUnknown_0202E8D2 + ldr r4, _080FF56C @ =gSpecialVar_0x8007 strh r1, [r4] ldrb r1, [r7, 0x5] ldrb r2, [r7, 0x4] @@ -2495,14 +2495,14 @@ _080FF4E0: b _080FF57A .align 2, 0 _080FF54C: .4byte gMapHeader -_080FF550: .4byte gUnknown_0202E8CE -_080FF554: .4byte gUnknown_0202E8D0 +_080FF550: .4byte gSpecialVar_0x8005 +_080FF554: .4byte gSpecialVar_0x8006 _080FF558: .4byte gSaveBlock1 _080FF55C: .4byte 0x00003f20 _080FF560: .4byte gUnknown_02038900 _080FF564: .4byte gUnknown_020391A4 _080FF568: .4byte gUnknown_020391A6 -_080FF56C: .4byte gUnknown_0202E8D2 +_080FF56C: .4byte gSpecialVar_0x8007 _080FF570: adds r0, r6, 0x1 lsls r0, 24 @@ -5255,12 +5255,12 @@ _08100A78: .4byte 0x0201f000 thumb_func_start sub_8100A7C sub_8100A7C: @ 8100A7C push {r4-r6,lr} - ldr r6, _08100A9C @ =gUnknown_0202E8CE + ldr r6, _08100A9C @ =gSpecialVar_0x8005 movs r0, 0 strh r0, [r6] ldr r2, _08100AA0 @ =gScriptResult strh r0, [r2] - ldr r4, _08100AA4 @ =gUnknown_0202E8CC + ldr r4, _08100AA4 @ =gSpecialVar_0x8004 ldr r1, _08100AA8 @ =gUnknown_02039234 ldrh r0, [r4] ldrb r1, [r1] @@ -5270,17 +5270,17 @@ sub_8100A7C: @ 8100A7C strh r0, [r2] b _08100B0A .align 2, 0 -_08100A9C: .4byte gUnknown_0202E8CE +_08100A9C: .4byte gSpecialVar_0x8005 _08100AA0: .4byte gScriptResult -_08100AA4: .4byte gUnknown_0202E8CC +_08100AA4: .4byte gSpecialVar_0x8004 _08100AA8: .4byte gUnknown_02039234 _08100AAC: - ldr r1, _08100AB4 @ =gUnknown_0202E8D0 + ldr r1, _08100AB4 @ =gSpecialVar_0x8006 ldrb r0, [r2] strh r0, [r1] b _08100B0A .align 2, 0 -_08100AB4: .4byte gUnknown_0202E8D0 +_08100AB4: .4byte gSpecialVar_0x8006 _08100AB8: ldr r3, _08100B10 @ =gDecorations ldr r2, _08100B14 @ =0x0201f000 @@ -5345,9 +5345,9 @@ sub_8100B20: @ 8100B20 bcs _08100B64 adds r3, r0, 0 ldr r5, [r3, 0x4] - ldr r0, _08100B50 @ =gUnknown_0202E8CC + ldr r0, _08100B50 @ =gSpecialVar_0x8004 ldrh r4, [r0] - ldr r6, _08100B54 @ =gUnknown_0202E8CE + ldr r6, _08100B54 @ =gSpecialVar_0x8005 _08100B38: lsls r0, r2, 1 adds r0, r2 @@ -5361,8 +5361,8 @@ _08100B38: b _08100B64 .align 2, 0 _08100B4C: .4byte gMapHeader -_08100B50: .4byte gUnknown_0202E8CC -_08100B54: .4byte gUnknown_0202E8CE +_08100B50: .4byte gSpecialVar_0x8004 +_08100B54: .4byte gSpecialVar_0x8005 _08100B58: adds r0, r2, 0x1 lsls r0, 24 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index fc4692828..e98a76c8c 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -10,7 +10,7 @@ sub_80E60D8: @ 80E60D8 push {r4-r7,lr} movs r4, 0x3 - ldr r0, _080E60F4 @ =gUnknown_0202E8CC + ldr r0, _080E60F4 @ =gSpecialVar_0x8004 ldrh r1, [r0] adds r7, r0, 0 cmp r1, 0xD @@ -23,7 +23,7 @@ _080E60E8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E60F4: .4byte gUnknown_0202E8CC +_080E60F4: .4byte gSpecialVar_0x8004 _080E60F8: .4byte _080E60FC .align 2, 0 _080E60FC: @@ -62,7 +62,7 @@ _080E614C: .align 2, 0 _080E6150: .4byte gSaveBlock1 + 0x2B40 _080E6154: - ldr r0, _080E6164 @ =gUnknown_0202E8CE + ldr r0, _080E6164 @ =gSpecialVar_0x8005 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -71,7 +71,7 @@ _080E6154: adds r1, r0, r1 b _080E624C .align 2, 0 -_080E6164: .4byte gUnknown_0202E8CE +_080E6164: .4byte gSpecialVar_0x8005 _080E6168: .4byte gSaveBlock1 + 0x2B4C _080E616C: ldr r0, _080E6194 @ =gSaveBlock1 + 0x2D94 @@ -99,39 +99,39 @@ _080E617C: _080E6194: .4byte gSaveBlock1 + 0x2D94 _080E6198: .4byte sub_80546B8 _080E619C: - ldr r0, _080E61B0 @ =gUnknown_0202E8CE + ldr r0, _080E61B0 @ =gSpecialVar_0x8005 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 ldr r1, _080E61B4 @ =gSaveBlock1 + 0x273C adds r1, r0, r1 - ldr r0, _080E61B8 @ =gUnknown_0202E8D0 + ldr r0, _080E61B8 @ =gSpecialVar_0x8006 ldrb r4, [r0] b _080E6276 .align 2, 0 -_080E61B0: .4byte gUnknown_0202E8CE +_080E61B0: .4byte gSpecialVar_0x8005 _080E61B4: .4byte gSaveBlock1 + 0x273C -_080E61B8: .4byte gUnknown_0202E8D0 +_080E61B8: .4byte gSpecialVar_0x8006 _080E61BC: - ldr r0, _080E61D4 @ =gUnknown_0202E8CE + ldr r0, _080E61D4 @ =gSpecialVar_0x8005 ldrh r0, [r0] lsls r1, r0, 3 adds r1, r0 lsls r1, 2 ldr r0, _080E61D8 @ =gSaveBlock1 + 0x2754 adds r1, r0 - ldr r0, _080E61DC @ =gUnknown_0202E8D0 + ldr r0, _080E61DC @ =gSpecialVar_0x8006 ldrh r0, [r0] lsls r0, 1 adds r1, r0 b _080E624A .align 2, 0 -_080E61D4: .4byte gUnknown_0202E8CE +_080E61D4: .4byte gSpecialVar_0x8005 _080E61D8: .4byte gSaveBlock1 + 0x2754 -_080E61DC: .4byte gUnknown_0202E8D0 +_080E61DC: .4byte gSpecialVar_0x8006 _080E61E0: - ldr r0, _080E61F4 @ =gUnknown_0202E8CE + ldr r0, _080E61F4 @ =gSpecialVar_0x8005 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -141,7 +141,7 @@ _080E61E0: movs r4, 0 b _080E6276 .align 2, 0 -_080E61F4: .4byte gUnknown_0202E8CE +_080E61F4: .4byte gSpecialVar_0x8005 _080E61F8: .4byte gSaveBlock1 + 0x273A _080E61FC: movs r1, 0 @@ -156,25 +156,25 @@ _080E6200: _080E620C: .4byte gSaveBlock1 + 0x2B16 _080E6210: .4byte 0x0000ffff _080E6214: - ldr r0, _080E6230 @ =gUnknown_0202E8CE + ldr r0, _080E6230 @ =gSpecialVar_0x8005 ldrh r0, [r0] lsls r1, r0, 3 adds r1, r0 lsls r1, 2 ldr r0, _080E6234 @ =gSaveBlock1 + 0x273C adds r1, r0 - ldr r0, _080E6238 @ =gUnknown_0202E8D0 + ldr r0, _080E6238 @ =gSpecialVar_0x8006 ldrh r0, [r0] lsls r0, 1 adds r1, r0 movs r4, 0 b _080E6276 .align 2, 0 -_080E6230: .4byte gUnknown_0202E8CE +_080E6230: .4byte gSpecialVar_0x8005 _080E6234: .4byte gSaveBlock1 + 0x273C -_080E6238: .4byte gUnknown_0202E8D0 +_080E6238: .4byte gSpecialVar_0x8006 _080E623C: - ldr r0, _080E6254 @ =gUnknown_0202E8CE + ldr r0, _080E6254 @ =gSpecialVar_0x8005 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -188,7 +188,7 @@ _080E624C: mov r12, r0 b _080E627A .align 2, 0 -_080E6254: .4byte gUnknown_0202E8CE +_080E6254: .4byte gSpecialVar_0x8005 _080E6258: .4byte gSaveBlock1 + 0x2750 _080E625C: .4byte sub_80546B8 _080E6260: @@ -1734,7 +1734,7 @@ _080E6E5C: ldrb r0, [r5, 0x8] cmp r0, 0 bne _080E6E82 - ldr r4, _080E6ECC @ =gUnknown_0202E8CC + ldr r4, _080E6ECC @ =gSpecialVar_0x8004 bl sub_80E8094 lsls r0, 24 lsrs r0, 24 @@ -1744,7 +1744,7 @@ _080E6E82: cmp r0, 0x9 bne _080E6E9C bl sub_80E81C0 - ldr r4, _080E6ECC @ =gUnknown_0202E8CC + ldr r4, _080E6ECC @ =gSpecialVar_0x8004 ldr r1, _080E6ED0 @ =0x00009c7c adds r0, r5, r1 bl sub_80FA364 @@ -1765,7 +1765,7 @@ _080E6E9C: _080E6EB0: strh r6, [r7] _080E6EB2: - ldr r4, _080E6ECC @ =gUnknown_0202E8CC + ldr r4, _080E6ECC @ =gSpecialVar_0x8004 bl sub_80E810C lsls r0, 24 lsrs r0, 24 @@ -1776,7 +1776,7 @@ _080E6EBE: b _080E6F5E .align 2, 0 _080E6EC8: .4byte gScriptResult -_080E6ECC: .4byte gUnknown_0202E8CC +_080E6ECC: .4byte gSpecialVar_0x8004 _080E6ED0: .4byte 0x00009c7c _080E6ED4: .4byte 0x0000ffff _080E6ED8: .4byte sub_80E752C @@ -11279,7 +11279,7 @@ _080EB7BE: thumb_func_start sub_80EB7C4 sub_80EB7C4: @ 80EB7C4 push {r4,r5,lr} - ldr r0, _080EB7D8 @ =gUnknown_0202E8CC + ldr r0, _080EB7D8 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x1 beq _080EB7F0 @@ -11289,7 +11289,7 @@ sub_80EB7C4: @ 80EB7C4 beq _080EB7E6 b _080EB82E .align 2, 0 -_080EB7D8: .4byte gUnknown_0202E8CC +_080EB7D8: .4byte gSpecialVar_0x8004 _080EB7DC: cmp r0, 0x2 beq _080EB810 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 5fcd5778b..b8dae1bba 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -245,13 +245,13 @@ _08042AA4: .4byte gStringVar1 thumb_func_start ScriptHatchMon ScriptHatchMon: @ 8042AA8 push {lr} - ldr r0, _08042AB8 @ =gUnknown_0202E8CC + ldr r0, _08042AB8 @ =gSpecialVar_0x8004 ldrb r0, [r0] bl AddHatchedMonToParty pop {r0} bx r0 .align 2, 0 -_08042AB8: .4byte gUnknown_0202E8CC +_08042AB8: .4byte gSpecialVar_0x8004 thumb_func_end ScriptHatchMon thumb_func_start sub_8042ABC @@ -325,7 +325,7 @@ _08042B42: sub_8042B4C: @ 8042B4C push {lr} ldr r0, _08042B60 @ =gSaveBlock1 + 0x2F9C - ldr r1, _08042B64 @ =gUnknown_0202E8CC + ldr r1, _08042B64 @ =gSpecialVar_0x8004 ldrb r1, [r1] bl sub_8042ABC lsls r0, 24 @@ -334,7 +334,7 @@ sub_8042B4C: @ 8042B4C bx r1 .align 2, 0 _08042B60: .4byte gSaveBlock1 + 0x2F9C -_08042B64: .4byte gUnknown_0202E8CC +_08042B64: .4byte gSpecialVar_0x8004 thumb_func_end sub_8042B4C thumb_func_start EggHatchCreateMonSprite @@ -562,7 +562,7 @@ _08042D34: ldr r1, _08042D74 @ =gUnknown_0300481C ldr r0, _08042D78 @ =0x02018000 str r0, [r1] - ldr r1, _08042D7C @ =gUnknown_0202E8CC + ldr r1, _08042D7C @ =gSpecialVar_0x8004 ldrh r1, [r1] strb r1, [r0, 0x4] adds r0, 0x3A @@ -579,17 +579,17 @@ _08042D34: adds r0, 0x1 strb r0, [r1] bl GetCurrentMapMusic - ldr r1, _08042D8C @ =gUnknown_0202E8CE + ldr r1, _08042D8C @ =gSpecialVar_0x8005 strh r0, [r1] b _08042F6E .align 2, 0 _08042D74: .4byte gUnknown_0300481C _08042D78: .4byte 0x02018000 -_08042D7C: .4byte gUnknown_0202E8CC +_08042D7C: .4byte gSpecialVar_0x8004 _08042D80: .4byte VBlankCB_EggHatch _08042D84: .4byte gMain _08042D88: .4byte 0x0000043c -_08042D8C: .4byte gUnknown_0202E8CE +_08042D8C: .4byte gSpecialVar_0x8005 _08042D90: ldr r5, _08042DBC @ =gWindowConfig_81E6F84 adds r0, r5, 0 @@ -809,7 +809,7 @@ _08042F84: .4byte gUnknown_0300481C thumb_func_start EggHatchSetMonNickname EggHatchSetMonNickname: @ 8042F88 push {lr} - ldr r0, _08042FA8 @ =gUnknown_0202E8CC + ldr r0, _08042FA8 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -823,7 +823,7 @@ EggHatchSetMonNickname: @ 8042F88 pop {r0} bx r0 .align 2, 0 -_08042FA8: .4byte gUnknown_0202E8CC +_08042FA8: .4byte gSpecialVar_0x8004 _08042FAC: .4byte gPlayerParty _08042FB0: .4byte gStringVar3 _08042FB4: .4byte c2_exit_to_overworld_2_switch diff --git a/asm/item_menu.s b/asm/item_menu.s index 04e6e04ec..324541240 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -3487,7 +3487,7 @@ _080A4C40: _080A4C4C: cmp r6, 0 bne _080A4C68 - ldr r0, _080A4C64 @ =word_203855E + ldr r0, _080A4C64 @ =gScriptItemId ldrh r0, [r0] bl sub_80A4B90 adds r3, r0, 0 @@ -3495,7 +3495,7 @@ _080A4C4C: .align 2, 0 _080A4C5C: .4byte gUnknown_02038564 _080A4C60: .4byte gUnknown_083C1640 -_080A4C64: .4byte word_203855E +_080A4C64: .4byte gScriptItemId _080A4C68: ldr r0, _080A4CC4 @ =gUnknown_03000704 ldr r0, [r0] @@ -4155,7 +4155,7 @@ _080A5190: ldrsh r1, [r5, r0] cmp r1, 0 bne _080A51E8 - ldr r0, _080A51DC @ =word_203855E + ldr r0, _080A51DC @ =gScriptItemId strh r1, [r0] ldr r1, _080A51E0 @ =gUnknown_083C16BC ldr r0, _080A51E4 @ =gUnknown_03000701 @@ -4170,7 +4170,7 @@ _080A5190: .align 2, 0 _080A51D4: .4byte gUnknown_03005D10 _080A51D8: .4byte gUnknown_02038559 -_080A51DC: .4byte word_203855E +_080A51DC: .4byte gScriptItemId _080A51E0: .4byte gUnknown_083C16BC _080A51E4: .4byte gUnknown_03000701 _080A51E8: @@ -4193,7 +4193,7 @@ _080A51F0: ldrb r1, [r1, 0x1] adds r0, r1 strb r0, [r2] - ldr r3, _080A5254 @ =word_203855E + ldr r3, _080A5254 @ =gScriptItemId ldrb r0, [r2] ldr r1, _080A5258 @ =gUnknown_03005D24 ldr r1, [r1] @@ -4221,7 +4221,7 @@ _080A51F0: b _080A526A .align 2, 0 _080A5250: .4byte gUnknown_02038560 -_080A5254: .4byte word_203855E +_080A5254: .4byte gScriptItemId _080A5258: .4byte gUnknown_03005D24 _080A525C: .4byte gUnknown_083C16BC _080A5260: .4byte gUnknown_03000701 @@ -4245,7 +4245,7 @@ _080A5272: ldrb r0, [r2] cmp r0, 0x5 beq _080A52B6 - ldr r0, _080A52A8 @ =word_203855E + ldr r0, _080A52A8 @ =gScriptItemId strh r1, [r0] ldr r1, _080A52AC @ =gUnknown_083C16BC ldrb r0, [r2] @@ -4258,7 +4258,7 @@ _080A5272: b _080A52B6 .align 2, 0 _080A52A4: .4byte gUnknown_03000701 -_080A52A8: .4byte word_203855E +_080A52A8: .4byte gScriptItemId _080A52AC: .4byte gUnknown_083C16BC _080A52B0: adds r0, r4, 0 @@ -4923,7 +4923,7 @@ _080A57F0: .4byte gUnknown_02038559 _080A57F4: .4byte gUnknown_083C16AE _080A57F8: .4byte gUnknown_02038564 _080A57FC: - ldr r0, _080A581C @ =word_203855E + ldr r0, _080A581C @ =gScriptItemId ldrh r0, [r0] bl sub_80F92F4 lsls r0, 24 @@ -4938,7 +4938,7 @@ _080A57FC: movs r5, 0x9 b _080A582C .align 2, 0 -_080A581C: .4byte word_203855E +_080A581C: .4byte gScriptItemId _080A5820: .4byte gUnknown_02038564 _080A5824: ldr r1, _080A5880 @ =gUnknown_02038564 @@ -5355,7 +5355,7 @@ sub_80A5B78: @ 80A5B78 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _080A5BB0 @ =word_203855E + ldr r5, _080A5BB0 @ =gScriptItemId ldrh r0, [r5] bl ItemId_GetFieldFunc cmp r0, 0 @@ -5376,7 +5376,7 @@ sub_80A5B78: @ 80A5B78 bl sub_80A5BF8 b _080A5BF2 .align 2, 0 -_080A5BB0: .4byte word_203855E +_080A5BB0: .4byte gScriptItemId _080A5BB4: ldr r1, _080A5BE0 @ =gTasks lsls r0, r4, 2 @@ -5391,7 +5391,7 @@ _080A5BB4: asrs r0, 24 cmp r0, 0x3 beq _080A5BEC - ldr r0, _080A5BE8 @ =word_203855E + ldr r0, _080A5BE8 @ =gScriptItemId ldrh r0, [r0] bl ItemId_GetFieldFunc adds r1, r0, 0 @@ -5401,7 +5401,7 @@ _080A5BB4: .align 2, 0 _080A5BE0: .4byte gTasks _080A5BE4: .4byte gUnknown_02038559 -_080A5BE8: .4byte word_203855E +_080A5BE8: .4byte gScriptItemId _080A5BEC: adds r0, r4, 0 bl sub_80C9C7C @@ -5775,7 +5775,7 @@ sub_80A5EA0: @ 80A5EA0 beq _080A5EF8 movs r0, 0x5 bl PlaySE - ldr r0, _080A5EEC @ =word_203855E + ldr r0, _080A5EEC @ =gScriptItemId ldrh r0, [r0] ldr r2, _080A5EF0 @ =gTasks lsls r1, r4, 2 @@ -5790,7 +5790,7 @@ sub_80A5EA0: @ 80A5EA0 b _080A5F0C .align 2, 0 _080A5EE8: .4byte gMain -_080A5EEC: .4byte word_203855E +_080A5EEC: .4byte gScriptItemId _080A5EF0: .4byte gTasks _080A5EF4: .4byte gUnknown_083C16F4 _080A5EF8: @@ -5891,7 +5891,7 @@ sub_80A5FAC: @ 80A5FAC ldr r0, _080A5FD0 @ =gSaveBlock1 ldr r1, _080A5FD4 @ =0x00000496 adds r4, r0, r1 - ldr r5, _080A5FD8 @ =word_203855E + ldr r5, _080A5FD8 @ =gScriptItemId ldrh r0, [r4] ldrh r1, [r5] cmp r0, r1 @@ -5902,7 +5902,7 @@ sub_80A5FAC: @ 80A5FAC .align 2, 0 _080A5FD0: .4byte gSaveBlock1 _080A5FD4: .4byte 0x00000496 -_080A5FD8: .4byte word_203855E +_080A5FD8: .4byte gScriptItemId _080A5FDC: bl sub_80A413C ldrh r0, [r5] @@ -5988,7 +5988,7 @@ DisplayCannotBeHeldMessage: @ 80A607C lsls r4, 24 lsrs r4, 24 bl sub_80A73FC - ldr r0, _080A60B4 @ =word_203855E + ldr r0, _080A60B4 @ =gScriptItemId ldrh r0, [r0] ldr r1, _080A60B8 @ =gStringVar1 bl CopyItemName @@ -6006,7 +6006,7 @@ DisplayCannotBeHeldMessage: @ 80A607C pop {r0} bx r0 .align 2, 0 -_080A60B4: .4byte word_203855E +_080A60B4: .4byte gScriptItemId _080A60B8: .4byte gStringVar1 _080A60BC: .4byte gStringVar4 _080A60C0: .4byte gOtherText_CantBeHeld @@ -6022,7 +6022,7 @@ ItemMenu_Give: @ 80A60C8 adds r6, r4, 0 movs r0, 0x5 bl PlaySE - ldr r5, _080A60FC @ =word_203855E + ldr r5, _080A60FC @ =gScriptItemId ldrh r0, [r5] bl sub_80F931C lsls r0, 24 @@ -6037,7 +6037,7 @@ ItemMenu_Give: @ 80A60C8 bl DisplayCannotUseItemMessage b _080A616E .align 2, 0 -_080A60FC: .4byte word_203855E +_080A60FC: .4byte gScriptItemId _080A6100: .4byte gOtherText_CantWriteMail _080A6104: .4byte sub_80A6024 _080A6108: @@ -6185,7 +6185,7 @@ sub_80A6214: @ 80A6214 adds r0, 0x1 lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _080A6248 @ =word_203855E + ldr r4, _080A6248 @ =gScriptItemId ldrh r0, [r4] bl sub_80F931C lsls r0, 24 @@ -6199,7 +6199,7 @@ sub_80A6214: @ 80A6214 b _080A6280 .align 2, 0 _080A6244: .4byte gUnknown_02038559 -_080A6248: .4byte word_203855E +_080A6248: .4byte gScriptItemId _080A624C: .4byte gOtherText_CantWriteMail _080A6250: .4byte sub_80A6024 _080A6254: @@ -6355,7 +6355,7 @@ sub_80A6354: @ 80A6354 adds r1, r2, 0 bl sub_80A48E8 bl sub_80A73FC - ldr r4, _080A63D0 @ =word_203855E + ldr r4, _080A63D0 @ =gScriptItemId ldrh r0, [r4] ldr r1, _080A63D4 @ =gStringVar2 bl CopyItemName @@ -6378,7 +6378,7 @@ sub_80A6354: @ 80A6354 _080A63C4: .4byte gTasks _080A63C8: .4byte gUnknown_03005D10 _080A63CC: .4byte gUnknown_02038559 -_080A63D0: .4byte word_203855E +_080A63D0: .4byte gScriptItemId _080A63D4: .4byte gStringVar2 _080A63D8: .4byte gStringVar4 _080A63DC: .4byte gOtherText_CantBuyThat @@ -6523,7 +6523,7 @@ _080A64F8: movs r3, 0xB bl sub_80A418C _080A6506: - ldr r0, _080A651C @ =word_203855E + ldr r0, _080A651C @ =gScriptItemId ldrh r0, [r0] movs r1, 0x1 bl BuyMenuDisplayMessage @@ -6533,7 +6533,7 @@ _080A6506: pop {r0} bx r0 .align 2, 0 -_080A651C: .4byte word_203855E +_080A651C: .4byte gScriptItemId thumb_func_end sub_80A648C thumb_func_start sub_80A6520 @@ -6590,7 +6590,7 @@ sub_80A6574: @ 80A6574 lsrs r5, 24 movs r0, 0x5F bl PlaySE - ldr r0, _080A65A0 @ =word_203855E + ldr r0, _080A65A0 @ =gScriptItemId ldrh r0, [r0] ldr r1, _080A65A4 @ =gTasks lsls r4, r5, 2 @@ -6605,7 +6605,7 @@ sub_80A6574: @ 80A6574 pop {r0} bx r0 .align 2, 0 -_080A65A0: .4byte word_203855E +_080A65A0: .4byte gScriptItemId _080A65A4: .4byte gTasks _080A65A8: .4byte sub_80A6548 thumb_func_end sub_80A6574 @@ -6629,7 +6629,7 @@ sub_80A65AC: @ 80A65AC movs r2, 0x6 movs r3, 0x6 bl sub_80A36B8 - ldr r0, _080A6604 @ =word_203855E + ldr r0, _080A6604 @ =gScriptItemId ldrh r0, [r0] ldr r1, _080A6608 @ =gStringVar2 bl CopyItemName @@ -6650,7 +6650,7 @@ sub_80A65AC: @ 80A65AC bx r0 .align 2, 0 _080A6600: .4byte gBG1TilemapBuffer -_080A6604: .4byte word_203855E +_080A6604: .4byte gScriptItemId _080A6608: .4byte gStringVar2 _080A660C: .4byte gStringVar4 _080A6610: .4byte gOtherText_SoldItem @@ -6721,7 +6721,7 @@ Task_BuyHowManyDialogueHandleInput: @ 80A6670 movs r2, 0xC movs r3, 0xB bl MenuZeroFillWindowRect - ldr r0, _080A66AC @ =word_203855E + ldr r0, _080A66AC @ =gScriptItemId ldrh r0, [r0] ldr r2, _080A66B0 @ =gTasks lsls r1, r5, 2 @@ -6732,7 +6732,7 @@ Task_BuyHowManyDialogueHandleInput: @ 80A6670 bl BuyMenuDisplayMessage b _080A6758 .align 2, 0 -_080A66AC: .4byte word_203855E +_080A66AC: .4byte gScriptItemId _080A66B0: .4byte gTasks _080A66B4: ldr r0, _080A6724 @ =gMain @@ -6756,7 +6756,7 @@ _080A66B4: movs r3, 0xD bl sub_80A36B8 ldr r4, _080A672C @ =gStringVar1 - ldr r0, _080A6730 @ =word_203855E + ldr r0, _080A6730 @ =gScriptItemId ldrh r0, [r0] bl ItemId_GetPrice lsls r0, 16 @@ -6787,7 +6787,7 @@ _080A66B4: _080A6724: .4byte gMain _080A6728: .4byte gBG1TilemapBuffer _080A672C: .4byte gStringVar1 -_080A6730: .4byte word_203855E +_080A6730: .4byte gScriptItemId _080A6734: .4byte gTasks _080A6738: .4byte gStringVar4 _080A673C: .4byte gOtherText_CanPay @@ -7240,7 +7240,7 @@ sub_80A6A84: @ 80A6A84 mov r8, r0 ldr r0, _080A6AEC @ =gBG1TilemapBuffer bl sub_80A4DA4 - ldr r0, _080A6AF0 @ =word_203855E + ldr r0, _080A6AF0 @ =gScriptItemId ldrh r0, [r0] ldr r1, _080A6AF4 @ =gStringVar1 bl CopyItemName @@ -7272,7 +7272,7 @@ sub_80A6A84: @ 80A6A84 .align 2, 0 _080A6AE8: .4byte gTasks + 0x8 _080A6AEC: .4byte gBG1TilemapBuffer -_080A6AF0: .4byte word_203855E +_080A6AF0: .4byte gScriptItemId _080A6AF4: .4byte gStringVar1 _080A6AF8: .4byte gStringVar2 _080A6AFC: .4byte sub_80A5E1C @@ -7339,7 +7339,7 @@ sub_80A6B64: @ 80A6B64 lsls r5, r0, 3 ldr r6, _080A6B9C @ =gTasks + 0x8 adds r7, r5, r6 - ldr r0, _080A6BA0 @ =word_203855E + ldr r0, _080A6BA0 @ =gScriptItemId mov r8, r0 ldrh r0, [r0] bl ItemId_GetImportance @@ -7357,7 +7357,7 @@ sub_80A6B64: @ 80A6B64 b _080A6BD2 .align 2, 0 _080A6B9C: .4byte gTasks + 0x8 -_080A6BA0: .4byte word_203855E +_080A6BA0: .4byte gScriptItemId _080A6BA4: .4byte sub_80A6B00 _080A6BA8: mov r1, r8 @@ -7556,7 +7556,7 @@ sub_80A6D1C: @ 80A6D1C bl player_bitmagic bl sub_80594C0 bl sub_80597F4 - ldr r1, _080A6D78 @ =word_203855E + ldr r1, _080A6D78 @ =gScriptItemId ldrh r0, [r4] strh r0, [r1] ldrh r0, [r4] @@ -7575,7 +7575,7 @@ sub_80A6D1C: @ 80A6D1C .align 2, 0 _080A6D70: .4byte gSaveBlock1 _080A6D74: .4byte 0x00000496 -_080A6D78: .4byte word_203855E +_080A6D78: .4byte gScriptItemId _080A6D7C: .4byte gTasks _080A6D80: movs r0, 0 @@ -7868,7 +7868,7 @@ _080A6FD8: .4byte gUnknown_083C1640 thumb_func_start sub_80A6FDC sub_80A6FDC: @ 80A6FDC push {lr} - ldr r0, _080A6FF8 @ =word_203855E + ldr r0, _080A6FF8 @ =gScriptItemId ldrh r0, [r0] bl ItemId_GetBattleUsage lsls r0, 24 @@ -7881,7 +7881,7 @@ sub_80A6FDC: @ 80A6FDC movs r0, 0x2 b _080A7012 .align 2, 0 -_080A6FF8: .4byte word_203855E +_080A6FF8: .4byte gScriptItemId _080A6FFC: .4byte gUnknown_03000704 _080A7000: .4byte gUnknown_083C1708 _080A7004: .4byte gUnknown_02038564 @@ -8006,7 +8006,7 @@ ItemMenu_UseInBattle: @ 80A70F4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080A7120 @ =word_203855E + ldr r4, _080A7120 @ =gScriptItemId ldrh r0, [r4] bl ItemId_GetBattleFunc cmp r0, 0 @@ -8023,7 +8023,7 @@ _080A711A: pop {r0} bx r0 .align 2, 0 -_080A7120: .4byte word_203855E +_080A7120: .4byte gScriptItemId thumb_func_end ItemMenu_UseInBattle thumb_func_start sub_80A7124 @@ -8196,7 +8196,7 @@ _080A727A: bl sub_80F98A4 movs r0, 0x3 bl sub_80F98A4 - ldr r1, _080A72D8 @ =word_203855E + ldr r1, _080A72D8 @ =gScriptItemId movs r0, 0x4 strh r0, [r1] ldr r1, _080A72DC @ =gUnknown_03000704 @@ -8231,7 +8231,7 @@ _080A727A: bl sub_80A6DF0 b _080A7358 .align 2, 0 -_080A72D8: .4byte word_203855E +_080A72D8: .4byte gScriptItemId _080A72DC: .4byte gUnknown_03000704 _080A72E0: .4byte gUnknown_083C1708 _080A72E4: .4byte gUnknown_02038564 @@ -8913,13 +8913,13 @@ _080A77B0: .4byte gUnknown_03000704 _080A77B4: cmp r1, 0x1 bne _080A77C8 - ldr r0, _080A77C4 @ =word_203855E + ldr r0, _080A77C4 @ =gScriptItemId ldrh r0, [r0] bl sub_80A4B90 adds r3, r0, 0 b _080A77DC .align 2, 0 -_080A77C4: .4byte word_203855E +_080A77C4: .4byte gScriptItemId _080A77C8: ldr r2, _080A781C @ =gUnknown_083C1640 ldrb r0, [r4, 0x1] diff --git a/asm/item_use.s b/asm/item_use.s index dcb8a68dc..b32a308be 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -11,7 +11,7 @@ sub_80C8FAC: @ 80C8FAC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080C8FD0 @ =word_203855E + ldr r1, _080C8FD0 @ =gScriptItemId ldrh r0, [r1] cmp r0, 0xAF bne _080C8FD8 @@ -26,7 +26,7 @@ sub_80C8FAC: @ 80C8FAC lsrs r3, r0, 24 b _080C8FE6 .align 2, 0 -_080C8FD0: .4byte word_203855E +_080C8FD0: .4byte gScriptItemId _080C8FD4: .4byte gTasks _080C8FD8: ldrh r0, [r1] @@ -243,7 +243,7 @@ sub_80C9154: @ 80C9154 cmp r0, 0 bne _080C9180 mov r1, sp - ldr r0, _080C918C @ =word_203855E + ldr r0, _080C918C @ =gScriptItemId ldrh r0, [r0] strh r0, [r1, 0x20] ldr r1, _080C9190 @ =sub_80A5D04 @@ -259,7 +259,7 @@ _080C9180: bx r0 .align 2, 0 _080C9188: .4byte gPaletteFade -_080C918C: .4byte word_203855E +_080C918C: .4byte gScriptItemId _080C9190: .4byte sub_80A5D04 thumb_func_end sub_80C9154 @@ -395,7 +395,7 @@ ItemUseOnFieldCB_Bike: @ 80C929C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080C92E0 @ =word_203855E + ldr r4, _080C92E0 @ =gScriptItemId ldrh r0, [r4] bl ItemId_GetSecondaryId lsls r0, 24 @@ -421,7 +421,7 @@ _080C92CA: pop {r0} bx r0 .align 2, 0 -_080C92E0: .4byte word_203855E +_080C92E0: .4byte gScriptItemId thumb_func_end ItemUseOnFieldCB_Bike thumb_func_start CanFish @@ -537,7 +537,7 @@ ItemUseOnFieldCB_Rod: @ 80C93B8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080C93DC @ =word_203855E + ldr r0, _080C93DC @ =gScriptItemId ldrh r0, [r0] bl ItemId_GetSecondaryId lsls r0, 24 @@ -549,7 +549,7 @@ ItemUseOnFieldCB_Rod: @ 80C93B8 pop {r0} bx r0 .align 2, 0 -_080C93DC: .4byte word_203855E +_080C93DC: .4byte gScriptItemId thumb_func_end ItemUseOnFieldCB_Rod thumb_func_start ItemUseOutOfBattle_Itemfinder @@ -1666,7 +1666,7 @@ unref_sub_80C9BF8: @ 80C9BF8 movs r3, 0x14 bl MenuZeroFillWindowRect ldr r4, _080C9C40 @ =gUnknown_083D61DC - ldr r0, _080C9C44 @ =word_203855E + ldr r0, _080C9C44 @ =gScriptItemId ldrh r0, [r0] bl ItemId_GetSecondaryId lsls r0, 24 @@ -1681,11 +1681,11 @@ unref_sub_80C9BF8: @ 80C9BF8 .align 2, 0 _080C9C3C: .4byte gTasks _080C9C40: .4byte gUnknown_083D61DC -_080C9C44: .4byte word_203855E +_080C9C44: .4byte gScriptItemId _080C9C48: .4byte sub_80C9BB8 _080C9C4C: ldr r4, _080C9C70 @ =gUnknown_083D61DC - ldr r0, _080C9C74 @ =word_203855E + ldr r0, _080C9C74 @ =gScriptItemId ldrh r0, [r0] bl ItemId_GetSecondaryId lsls r0, 24 @@ -1702,7 +1702,7 @@ _080C9C68: bx r0 .align 2, 0 _080C9C70: .4byte gUnknown_083D61DC -_080C9C74: .4byte word_203855E +_080C9C74: .4byte gScriptItemId _080C9C78: .4byte sub_80C9BD8 thumb_func_end unref_sub_80C9BF8 @@ -1752,7 +1752,7 @@ _080C9CD8: .4byte gTasks _080C9CDC: .4byte c2_exit_to_overworld_2_switch _080C9CE0: .4byte sub_80A5B00 _080C9CE4: - ldr r0, _080C9CFC @ =word_203855E + ldr r0, _080C9CFC @ =gScriptItemId ldrh r0, [r0] bl ItemId_GetFieldFunc adds r1, r0, 0 @@ -1764,7 +1764,7 @@ _080C9CF4: pop {r0} bx r0 .align 2, 0 -_080C9CFC: .4byte word_203855E +_080C9CFC: .4byte gScriptItemId thumb_func_end sub_80C9C7C thumb_func_start sub_80C9D00 @@ -1773,7 +1773,7 @@ sub_80C9D00: @ 80C9D00 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080C9D28 @ =word_203855E + ldr r0, _080C9D28 @ =gScriptItemId ldrh r0, [r0] movs r1, 0x1 bl RemoveBagItem @@ -1786,7 +1786,7 @@ sub_80C9D00: @ 80C9D00 pop {r0} bx r0 .align 2, 0 -_080C9D28: .4byte word_203855E +_080C9D28: .4byte gScriptItemId _080C9D2C: .4byte gUnknown_081A1654 thumb_func_end sub_80C9D00 @@ -1989,7 +1989,7 @@ ItemUseOutOfBattle_TMHM: @ 80C9E90 movs r2, 0xD movs r3, 0x14 bl MenuZeroFillWindowRect - ldr r0, _080C9EBC @ =word_203855E + ldr r0, _080C9EBC @ =gScriptItemId ldrh r1, [r0] movs r0, 0xA9 lsls r0, 1 @@ -2002,7 +2002,7 @@ ItemUseOutOfBattle_TMHM: @ 80C9E90 bl DisplayItemMessageOnField b _080C9ED4 .align 2, 0 -_080C9EBC: .4byte word_203855E +_080C9EBC: .4byte gScriptItemId _080C9EC0: .4byte gOtherText_BootedHM _080C9EC4: .4byte sub_80C9EE4 _080C9EC8: @@ -2060,7 +2060,7 @@ sub_80C9F10: @ 80C9F10 beq _080C9F5C _080C9F2A: ldr r4, _080C9F68 @ =gStringVar1 - ldr r0, _080C9F6C @ =word_203855E + ldr r0, _080C9F6C @ =gScriptItemId ldrh r0, [r0] bl ItemIdToBattleMoveId lsls r0, 16 @@ -2087,7 +2087,7 @@ _080C9F5C: .align 2, 0 _080C9F64: .4byte gMain _080C9F68: .4byte gStringVar1 -_080C9F6C: .4byte word_203855E +_080C9F6C: .4byte gScriptItemId _080C9F70: .4byte gMoveNames _080C9F74: .4byte gStringVar4 _080C9F78: .4byte gOtherText_ContainsMove @@ -2145,7 +2145,7 @@ _080C9FD8: .4byte sub_806F06C thumb_func_start sub_80C9FDC sub_80C9FDC: @ 80C9FDC push {r4,lr} - ldr r4, _080CA004 @ =word_203855E + ldr r4, _080CA004 @ =gScriptItemId ldrh r0, [r4] movs r1, 0x1 bl RemoveBagItem @@ -2160,7 +2160,7 @@ sub_80C9FDC: @ 80C9FDC pop {r0} bx r0 .align 2, 0 -_080CA004: .4byte word_203855E +_080CA004: .4byte gScriptItemId _080CA008: .4byte gStringVar2 _080CA00C: .4byte gStringVar4 _080CA010: .4byte gOtherText_UsedItem @@ -2177,7 +2177,7 @@ ItemUseOutOfBattle_Repel: @ 80CA014 lsls r0, 16 cmp r0, 0 bne _080CA060 - ldr r0, _080CA054 @ =word_203855E + ldr r0, _080CA054 @ =gScriptItemId ldrh r0, [r0] bl ItemId_GetHoldEffectParam adds r1, r0, 0 @@ -2194,7 +2194,7 @@ ItemUseOutOfBattle_Repel: @ 80CA014 b _080CA06C .align 2, 0 _080CA050: .4byte 0x00004021 -_080CA054: .4byte word_203855E +_080CA054: .4byte gScriptItemId _080CA058: .4byte gStringVar4 _080CA05C: .4byte sub_80A5C48 _080CA060: @@ -2216,14 +2216,14 @@ _080CA078: .4byte sub_80A5C48 sub_80CA07C: @ 80CA07C push {lr} bl sub_80A3E0C - ldr r0, _080CA090 @ =word_203855E + ldr r0, _080CA090 @ =gScriptItemId ldrh r0, [r0] ldr r1, _080CA094 @ =gStringVar2 bl CopyItemName pop {r0} bx r0 .align 2, 0 -_080CA090: .4byte word_203855E +_080CA090: .4byte gScriptItemId _080CA094: .4byte gStringVar2 thumb_func_end sub_80CA07C @@ -2267,7 +2267,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80CA0DC lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, _080CA10C @ =word_203855E + ldr r0, _080CA10C @ =gScriptItemId ldrh r0, [r0] cmp r0, 0x2B bne _080CA124 @@ -2284,7 +2284,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80CA0DC adds r0, r4 b _080CA146 .align 2, 0 -_080CA10C: .4byte word_203855E +_080CA10C: .4byte gScriptItemId _080CA110: .4byte 0x0000084d _080CA114: .4byte 0x0000084e _080CA118: .4byte gStringVar4 @@ -2447,7 +2447,7 @@ ItemUseInBattle_PokeBall: @ 80CA244 lsls r0, 24 cmp r0, 0 bne _080CA26C - ldr r0, _080CA268 @ =word_203855E + ldr r0, _080CA268 @ =gScriptItemId ldrh r0, [r0] movs r1, 0x1 bl RemoveBagItem @@ -2455,7 +2455,7 @@ ItemUseInBattle_PokeBall: @ 80CA244 bl sub_80A7094 b _080CA284 .align 2, 0 -_080CA268: .4byte word_203855E +_080CA268: .4byte gScriptItemId _080CA26C: movs r0, 0 movs r1, 0xD @@ -2520,7 +2520,7 @@ sub_80CA2BC: @ 80CA2BC ble _080CA2FC movs r0, 0x1 bl PlaySE - ldr r4, _080CA308 @ =word_203855E + ldr r4, _080CA308 @ =gScriptItemId ldrh r0, [r4] movs r1, 0x1 bl RemoveBagItem @@ -2537,7 +2537,7 @@ _080CA2FC: bx r0 .align 2, 0 _080CA304: .4byte gTasks -_080CA308: .4byte word_203855E +_080CA308: .4byte gScriptItemId _080CA30C: .4byte sub_80CA294 thumb_func_end sub_80CA2BC @@ -2561,7 +2561,7 @@ ItemUseInBattle_StatIncrease: @ 80CA310 muls r0, r4 ldr r1, _080CA364 @ =gPlayerParty adds r0, r1 - ldr r1, _080CA368 @ =word_203855E + ldr r1, _080CA368 @ =gScriptItemId ldrh r1, [r1] lsls r4, 24 lsrs r4, 24 @@ -2582,7 +2582,7 @@ ItemUseInBattle_StatIncrease: @ 80CA310 _080CA35C: .4byte gUnknown_02024A6A _080CA360: .4byte gUnknown_02024E6C _080CA364: .4byte gPlayerParty -_080CA368: .4byte word_203855E +_080CA368: .4byte gScriptItemId _080CA36C: .4byte gOtherText_WontHaveAnyEffect _080CA370: .4byte sub_80A5C48 _080CA374: @@ -2712,7 +2712,7 @@ unref_sub_80CA448: @ 80CA448 movs r2, 0xD movs r3, 0x14 bl MenuZeroFillWindowRect - ldr r4, _080CA494 @ =word_203855E + ldr r4, _080CA494 @ =gScriptItemId ldrh r1, [r4] movs r0, 0 movs r2, 0 @@ -2737,7 +2737,7 @@ unref_sub_80CA448: @ 80CA448 bl DisplayItemMessageOnField b _080CA4B8 .align 2, 0 -_080CA494: .4byte word_203855E +_080CA494: .4byte gScriptItemId _080CA498: .4byte gPlayerParty _080CA49C: .4byte gStringVar1 _080CA4A0: .4byte gStringVar4 @@ -2807,7 +2807,7 @@ ItemUseOutOfBattle_EnigmaBerry: @ 80CA520 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080CA544 @ =word_203855E + ldr r0, _080CA544 @ =gScriptItemId ldrh r0, [r0] bl sub_8070E48 lsls r0, 24 @@ -2823,7 +2823,7 @@ _080CA53A: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CA544: .4byte word_203855E +_080CA544: .4byte gScriptItemId _080CA548: .4byte _080CA54C .align 2, 0 _080CA54C: @@ -2936,7 +2936,7 @@ ItemUseInBattle_EnigmaBerry: @ 80CA64C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080CA66C @ =word_203855E + ldr r0, _080CA66C @ =gScriptItemId ldrh r0, [r0] bl sub_8070E48 lsls r0, 24 @@ -2949,7 +2949,7 @@ ItemUseInBattle_EnigmaBerry: @ 80CA64C ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CA66C: .4byte word_203855E +_080CA66C: .4byte gScriptItemId _080CA670: .4byte _080CA674 .align 2, 0 _080CA674: diff --git a/asm/matuda_debug_menu.s b/asm/matuda_debug_menu.s index b6026ddf9..7fc379f13 100644 --- a/asm/matuda_debug_menu.s +++ b/asm/matuda_debug_menu.s @@ -322,7 +322,7 @@ _080A9D6E: bl sub_80C4B34 ldr r1, _080A9DAC @ =gUnknown_0203869B strb r0, [r1] - ldr r0, _080A9DB0 @ =gUnknown_0203869C + ldr r0, _080A9DB0 @ =gSpecialVar_0x8011 ldrb r0, [r0] bl sub_80AE82C movs r0, 0 @@ -338,7 +338,7 @@ _080A9D6E: .align 2, 0 _080A9DA8: .4byte gTasks _080A9DAC: .4byte gUnknown_0203869B -_080A9DB0: .4byte gUnknown_0203869C +_080A9DB0: .4byte gSpecialVar_0x8011 _080A9DB4: .4byte sub_80C8EBC _080A9DB8: .4byte sub_80A9DBC thumb_func_end sub_80A9D58 @@ -828,8 +828,8 @@ _080AA17A: lsrs r5, r0, 24 cmp r5, 0x5 bls _080AA17A - ldr r1, _080AA258 @ =gUnknown_0203869C - ldr r4, _080AA25C @ =gUnknown_0203869E + ldr r1, _080AA258 @ =gSpecialVar_0x8011 + ldr r4, _080AA25C @ =gSpecialVar_0x8010 movs r0, 0 strh r0, [r4] strh r0, [r1] @@ -899,8 +899,8 @@ _080AA248: .4byte gUnknown_02038570 _080AA24C: .4byte gUnknown_083C9276 _080AA250: .4byte gUnknown_083C9364 _080AA254: .4byte gMenuWindow -_080AA258: .4byte gUnknown_0203869C -_080AA25C: .4byte gUnknown_0203869E +_080AA258: .4byte gSpecialVar_0x8011 +_080AA25C: .4byte gSpecialVar_0x8010 _080AA260: .4byte gUnknown_083C9337 _080AA264: .4byte gUnknown_083C933B _080AA268: .4byte gUnknown_083C92B4 @@ -2174,11 +2174,11 @@ _080AAC1A: bl sub_80AA5BC asrs r4, 24 strh r4, [r5, 0x34] - ldr r0, _080AAC54 @ =gUnknown_0203869C + ldr r0, _080AAC54 @ =gSpecialVar_0x8011 strh r4, [r0] lsls r4, 24 lsrs r4, 24 - ldr r0, _080AAC58 @ =gUnknown_0203869E + ldr r0, _080AAC58 @ =gSpecialVar_0x8010 ldrb r1, [r0] adds r0, r4, 0 bl sub_80AE398 @@ -2194,8 +2194,8 @@ _080AAC1A: pop {r0} bx r0 .align 2, 0 -_080AAC54: .4byte gUnknown_0203869C -_080AAC58: .4byte gUnknown_0203869E +_080AAC54: .4byte gSpecialVar_0x8011 +_080AAC58: .4byte gSpecialVar_0x8010 thumb_func_end sub_80AABF0 thumb_func_start sub_80AAC5C @@ -2205,16 +2205,16 @@ sub_80AAC5C: @ 80AAC5C lsls r1, 24 cmp r1, 0 ble _080AAC78 - ldr r1, _080AAC74 @ =gUnknown_0203869E + ldr r1, _080AAC74 @ =gSpecialVar_0x8010 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] adds r4, r1, 0 b _080AAC86 .align 2, 0 -_080AAC74: .4byte gUnknown_0203869E +_080AAC74: .4byte gSpecialVar_0x8010 _080AAC78: - ldr r0, _080AACBC @ =gUnknown_0203869E + ldr r0, _080AACBC @ =gSpecialVar_0x8010 ldrh r2, [r0] adds r4, r0, 0 cmp r2, 0 @@ -2231,7 +2231,7 @@ _080AAC86: _080AAC92: ldrb r0, [r4] bl sub_80AA5E8 - ldr r0, _080AACC0 @ =gUnknown_0203869C + ldr r0, _080AACC0 @ =gSpecialVar_0x8011 ldrb r0, [r0] ldrb r1, [r4] bl sub_80AE398 @@ -2247,8 +2247,8 @@ _080AAC92: pop {r0} bx r0 .align 2, 0 -_080AACBC: .4byte gUnknown_0203869E -_080AACC0: .4byte gUnknown_0203869C +_080AACBC: .4byte gSpecialVar_0x8010 +_080AACC0: .4byte gSpecialVar_0x8011 thumb_func_end sub_80AAC5C thumb_func_start sub_80AACC4 @@ -2328,7 +2328,7 @@ sub_80AAD44: @ 80AAD44 _080AAD56: lsls r0, r4, 24 lsrs r0, 24 - ldr r1, _080AAD7C @ =gUnknown_0203869C + ldr r1, _080AAD7C @ =gSpecialVar_0x8011 ldrb r1, [r1] bl sub_80AE770 strh r0, [r5] @@ -2344,7 +2344,7 @@ _080AAD72: bx r0 .align 2, 0 _080AAD78: .4byte gUnknown_02038670 -_080AAD7C: .4byte gUnknown_0203869C +_080AAD7C: .4byte gSpecialVar_0x8011 _080AAD80: .4byte sub_805469C thumb_func_end sub_80AAD44 @@ -2707,7 +2707,7 @@ _080AB044: subs r2, 0x1 cmp r2, r5 bgt _080AB044 - ldr r1, _080AB080 @ =gUnknown_0203869C + ldr r1, _080AB080 @ =gSpecialVar_0x8011 movs r0, 0 strh r0, [r1] adds r4, r1, 0 @@ -2729,7 +2729,7 @@ _080AB058: .align 2, 0 _080AB078: .4byte gUnknown_02038695 _080AB07C: .4byte gUnknown_02038690 -_080AB080: .4byte gUnknown_0203869C +_080AB080: .4byte gSpecialVar_0x8011 thumb_func_end sub_80AB02C thumb_func_start unref_sub_80AB084 diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index 4cd52107c..7dfaa890e 100644 --- a/asm/mauville_old_man.s +++ b/asm/mauville_old_man.s @@ -219,7 +219,7 @@ _080F7B9C: .4byte gSaveBlock2 sub_80F7BA0: @ 80F7BA0 push {r4-r7,lr} ldr r1, _080F7C48 @ =gSaveBlock1 + 0x2D94 - ldr r0, _080F7C4C @ =gUnknown_0202E8CC + ldr r0, _080F7C4C @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r5, r1, 0 adds r5, 0xE @@ -312,14 +312,14 @@ _080F7C3A: bx r0 .align 2, 0 _080F7C48: .4byte gSaveBlock1 + 0x2D94 -_080F7C4C: .4byte gUnknown_0202E8CC +_080F7C4C: .4byte gSpecialVar_0x8004 _080F7C50: .4byte gStringVar4 thumb_func_end sub_80F7BA0 thumb_func_start sub_80F7C54 sub_80F7C54: @ 80F7C54 push {lr} - ldr r0, _080F7C6C @ =gUnknown_0202E8CC + ldr r0, _080F7C6C @ =gSpecialVar_0x8004 ldrb r0, [r0] bl sub_80F7F80 bl MenuDisplayMessageBox @@ -327,7 +327,7 @@ sub_80F7C54: @ 80F7C54 pop {r0} bx r0 .align 2, 0 -_080F7C6C: .4byte gUnknown_0202E8CC +_080F7C6C: .4byte gSpecialVar_0x8004 thumb_func_end sub_80F7C54 thumb_func_start sub_80F7C70 @@ -789,7 +789,7 @@ _080F7FCC: .4byte _080F817A _080F7FE4: ldr r2, _080F8034 @ =gSaveBlock1 + 0x2D94 - ldr r0, _080F8038 @ =gUnknown_0202E8CC + ldr r0, _080F8038 @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r1, r2, 0 adds r1, 0xE @@ -833,7 +833,7 @@ _080F8016: b _080F817A .align 2, 0 _080F8034: .4byte gSaveBlock1 + 0x2D94 -_080F8038: .4byte gUnknown_0202E8CC +_080F8038: .4byte gSpecialVar_0x8004 _080F803C: .4byte 0x0000ffff _080F8040: ldrb r1, [r6] diff --git a/asm/money.s b/asm/money.s index 72e5cda54..65d8b87a1 100644 --- a/asm/money.s +++ b/asm/money.s @@ -451,7 +451,7 @@ sub_80B7CE8: @ 80B7CE8 lsls r1, 3 adds r0, r1 ldr r0, [r0] - ldr r1, _080B7D08 @ =gUnknown_0202E8CE + ldr r1, _080B7D08 @ =gSpecialVar_0x8005 ldrh r1, [r1] bl IsEnoughMoney lsls r0, 24 @@ -460,21 +460,21 @@ sub_80B7CE8: @ 80B7CE8 bx r1 .align 2, 0 _080B7D04: .4byte gSaveBlock1 -_080B7D08: .4byte gUnknown_0202E8CE +_080B7D08: .4byte gSpecialVar_0x8005 thumb_func_end sub_80B7CE8 thumb_func_start sub_80B7D0C sub_80B7D0C: @ 80B7D0C push {lr} ldr r0, _080B7D1C @ =gSaveBlock1 + 0x490 - ldr r1, _080B7D20 @ =gUnknown_0202E8CE + ldr r1, _080B7D20 @ =gSpecialVar_0x8005 ldrh r1, [r1] bl sub_80B79E0 pop {r0} bx r0 .align 2, 0 _080B7D1C: .4byte gSaveBlock1 + 0x490 -_080B7D20: .4byte gUnknown_0202E8CE +_080B7D20: .4byte gSpecialVar_0x8005 thumb_func_end sub_80B7D0C .align 2, 0 @ Don't pad with nop. diff --git a/asm/rom6.s b/asm/rom6.s index 91c92d971..697769d17 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -32,7 +32,7 @@ npc_before_player_of_type: @ 810B2D4 ldrb r0, [r2, 0x5] cmp r0, r5 bne _0810B320 - ldr r1, _0810B31C @ =gUnknown_0202E8DE + ldr r1, _0810B31C @ =gScriptLastTalked ldrb r0, [r2, 0x8] strh r0, [r1] movs r0, 0x1 @@ -40,7 +40,7 @@ npc_before_player_of_type: @ 810B2D4 .align 2, 0 _0810B314: .4byte gUnknown_0203923C _0810B318: .4byte gMapObjects -_0810B31C: .4byte gUnknown_0202E8DE +_0810B31C: .4byte gScriptLastTalked _0810B320: movs r0, 0 _0810B322: @@ -2047,7 +2047,7 @@ sub_810C31C: @ 810C31C ldrb r0, [r0] cmp r0, 0x1 bls _0810C342 - ldr r0, _0810C35C @ =word_203855E + ldr r0, _0810C35C @ =gScriptItemId strh r5, [r0] _0810C342: ldr r0, _0810C360 @ =gTasks @@ -2063,7 +2063,7 @@ _0810C342: bx r0 .align 2, 0 _0810C358: .4byte gUnknown_02039244 -_0810C35C: .4byte word_203855E +_0810C35C: .4byte gScriptItemId _0810C360: .4byte gTasks _0810C364: .4byte sub_810C2C8 thumb_func_end sub_810C31C @@ -2111,7 +2111,7 @@ _0810C37C: movs r1, 0x8 adds r2, r4, 0 bl InitMenu - ldr r2, _0810C3FC @ =word_203855E + ldr r2, _0810C3FC @ =gScriptItemId ldr r1, _0810C400 @ =gUnknown_02039248 ldrb r0, [r1] ldrb r1, [r1, 0x1] @@ -2134,7 +2134,7 @@ _0810C3EC: .4byte gWindowConfig_81E6E50 _0810C3F0: .4byte gUnknown_0203924C _0810C3F4: .4byte gUnknown_083F7EF4 _0810C3F8: .4byte gUnknown_03000758 -_0810C3FC: .4byte word_203855E +_0810C3FC: .4byte gScriptItemId _0810C400: .4byte gUnknown_02039248 _0810C404: .4byte gTasks _0810C408: .4byte sub_810C40C @@ -2237,7 +2237,7 @@ sub_810C4C4: @ 810C4C4 cmp r0, 0 bne _0810C4F0 bl sub_810C2B0 - ldr r0, _0810C4FC @ =word_203855E + ldr r0, _0810C4FC @ =gScriptItemId ldrh r0, [r0] lsls r0, 3 ldr r1, _0810C500 @ =gSaveBlock1 + 0x7F8 @@ -2252,7 +2252,7 @@ _0810C4F0: bx r0 .align 2, 0 _0810C4F8: .4byte gPaletteFade -_0810C4FC: .4byte word_203855E +_0810C4FC: .4byte gScriptItemId _0810C500: .4byte gSaveBlock1 + 0x7F8 _0810C504: .4byte sub_810B96C thumb_func_end sub_810C4C4 @@ -2577,7 +2577,7 @@ sub_810C788: @ 810C788 bl GetNature lsls r0, 24 lsrs r0, 24 - ldr r7, _0810C838 @ =word_203855E + ldr r7, _0810C838 @ =gScriptItemId ldrh r1, [r7] lsls r1, 3 ldr r5, _0810C83C @ =gSaveBlock1 + 0x7F8 @@ -2652,7 +2652,7 @@ _0810C808: bx r0 .align 2, 0 _0810C834: .4byte gEnemyParty -_0810C838: .4byte word_203855E +_0810C838: .4byte gScriptItemId _0810C83C: .4byte gSaveBlock1 + 0x7F8 _0810C840: .4byte gUnknown_030041C0 _0810C844: .4byte gUnknown_083F7EB8 @@ -2668,7 +2668,7 @@ sub_810C854: @ 810C854 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r4, _0810C8B8 @ =word_203855E + ldr r4, _0810C8B8 @ =gScriptItemId ldrb r0, [r4] bl sub_80C8478 ldr r0, _0810C8BC @ =gStringVar1 @@ -2710,7 +2710,7 @@ sub_810C854: @ 810C854 pop {r0} bx r0 .align 2, 0 -_0810C8B8: .4byte word_203855E +_0810C8B8: .4byte gScriptItemId _0810C8BC: .4byte gStringVar1 _0810C8C0: .4byte gUnknown_083F7EB8 _0810C8C4: .4byte gSaveBlock1 @@ -4240,29 +4240,29 @@ _0810D438: .4byte 0x00004049 thumb_func_start ScriptGetPokedexInfo ScriptGetPokedexInfo: @ 810D43C push {lr} - ldr r0, _0810D458 @ =gUnknown_0202E8CC + ldr r0, _0810D458 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _0810D460 movs r0, 0 bl GetHoennPokedexCount - ldr r1, _0810D45C @ =gUnknown_0202E8CE + ldr r1, _0810D45C @ =gSpecialVar_0x8005 strh r0, [r1] movs r0, 0x1 bl GetHoennPokedexCount b _0810D470 .align 2, 0 -_0810D458: .4byte gUnknown_0202E8CC -_0810D45C: .4byte gUnknown_0202E8CE +_0810D458: .4byte gSpecialVar_0x8004 +_0810D45C: .4byte gSpecialVar_0x8005 _0810D460: movs r0, 0 bl GetNationalPokedexCount - ldr r1, _0810D480 @ =gUnknown_0202E8CE + ldr r1, _0810D480 @ =gSpecialVar_0x8005 strh r0, [r1] movs r0, 0x1 bl GetNationalPokedexCount _0810D470: - ldr r1, _0810D484 @ =gUnknown_0202E8D0 + ldr r1, _0810D484 @ =gSpecialVar_0x8006 strh r0, [r1] bl IsNationalPokedex lsls r0, 16 @@ -4270,8 +4270,8 @@ _0810D470: pop {r1} bx r1 .align 2, 0 -_0810D480: .4byte gUnknown_0202E8CE -_0810D484: .4byte gUnknown_0202E8D0 +_0810D480: .4byte gSpecialVar_0x8005 +_0810D484: .4byte gSpecialVar_0x8006 thumb_func_end ScriptGetPokedexInfo thumb_func_start GetPokedexRatingText @@ -4483,14 +4483,14 @@ _0810D5FC: .4byte gUnknown_081C4ADA thumb_func_start ShowPokedexRatingMessage ShowPokedexRatingMessage: @ 810D600 push {lr} - ldr r0, _0810D614 @ =gUnknown_0202E8CC + ldr r0, _0810D614 @ =gSpecialVar_0x8004 ldrh r0, [r0] bl GetPokedexRatingText bl ShowFieldMessage pop {r0} bx r0 .align 2, 0 -_0810D614: .4byte gUnknown_0202E8CC +_0810D614: .4byte gSpecialVar_0x8004 thumb_func_end ShowPokedexRatingMessage thumb_func_start AccessHallOfFamePC @@ -5317,7 +5317,7 @@ _0810DC56: lsls r0, 24 lsrs r6, r0, 24 _0810DC5C: - ldr r0, _0810DC78 @ =gUnknown_0202E8CC + ldr r0, _0810DC78 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r6, r0 bcc _0810DBDC @@ -5331,7 +5331,7 @@ _0810DC5C: bx r0 .align 2, 0 _0810DC74: .4byte gLinkPlayers -_0810DC78: .4byte gUnknown_0202E8CC +_0810DC78: .4byte gSpecialVar_0x8004 thumb_func_end sub_810DB28 thumb_func_start sub_810DC7C @@ -5340,7 +5340,7 @@ sub_810DC7C: @ 810DC7C movs r4, 0 ldr r5, _0810DC9C @ =gUnknown_083F8364 _0810DC82: - ldr r0, _0810DCA0 @ =gUnknown_0202E8CC + ldr r0, _0810DCA0 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r4, r0 bne _0810DCA8 @@ -5353,7 +5353,7 @@ _0810DC82: b _0810DCB6 .align 2, 0 _0810DC9C: .4byte gUnknown_083F8364 -_0810DCA0: .4byte gUnknown_0202E8CC +_0810DCA0: .4byte gSpecialVar_0x8004 _0810DCA4: .4byte 0x00000206 _0810DCA8: lsls r1, r4, 2 @@ -5816,7 +5816,7 @@ sub_810E09C: @ 810E09C ldrb r0, [r0] cmp r0, r2 bne _0810E0F8 - ldr r0, _0810E0F0 @ =gUnknown_0202E8CC + ldr r0, _0810E0F0 @ =gSpecialVar_0x8004 ldrb r0, [r0] ldr r2, _0810E0F4 @ =gUnknown_083F8376 lsls r1, 1 @@ -5840,7 +5840,7 @@ sub_810E09C: @ 810E09C _0810E0E4: .4byte gUnknown_083F8370 _0810E0E8: .4byte gUnknown_02039259 _0810E0EC: .4byte gUnknown_02039258 -_0810E0F0: .4byte gUnknown_0202E8CC +_0810E0F0: .4byte gSpecialVar_0x8004 _0810E0F4: .4byte gUnknown_083F8376 _0810E0F8: adds r0, r2, 0x1 @@ -6012,7 +6012,7 @@ _0810E21E: thumb_func_start sub_810E230 sub_810E230: @ 810E230 push {lr} - ldr r0, _0810E244 @ =gUnknown_0202E8CC + ldr r0, _0810E244 @ =gSpecialVar_0x8004 ldrb r0, [r0] ldr r1, _0810E248 @ =gUnknown_083F8376 ldrh r1, [r1, 0x8] @@ -6020,7 +6020,7 @@ sub_810E230: @ 810E230 pop {r0} bx r0 .align 2, 0 -_0810E244: .4byte gUnknown_0202E8CC +_0810E244: .4byte gSpecialVar_0x8004 _0810E248: .4byte gUnknown_083F8376 thumb_func_end sub_810E230 @@ -6037,18 +6037,18 @@ _0810E258: .4byte gStringVar4 thumb_func_start StorePlayerCoordsInVars StorePlayerCoordsInVars: @ 810E25C - ldr r1, _0810E26C @ =gUnknown_0202E8CC + ldr r1, _0810E26C @ =gSpecialVar_0x8004 ldr r2, _0810E270 @ =gSaveBlock1 ldrh r0, [r2] strh r0, [r1] - ldr r1, _0810E274 @ =gUnknown_0202E8CE + ldr r1, _0810E274 @ =gSpecialVar_0x8005 ldrh r0, [r2, 0x2] strh r0, [r1] bx lr .align 2, 0 -_0810E26C: .4byte gUnknown_0202E8CC +_0810E26C: .4byte gSpecialVar_0x8004 _0810E270: .4byte gSaveBlock1 -_0810E274: .4byte gUnknown_0202E8CE +_0810E274: .4byte gSpecialVar_0x8005 thumb_func_end StorePlayerCoordsInVars thumb_func_start GetPlayerTrainerIdOnesDigit @@ -6136,7 +6136,7 @@ _0810E308: .4byte gUnknown_02024D26 CableCarWarp: @ 810E30C push {lr} sub sp, 0x4 - ldr r0, _0810E32C @ =gUnknown_0202E8CC + ldr r0, _0810E32C @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 beq _0810E330 @@ -6150,7 +6150,7 @@ CableCarWarp: @ 810E30C bl warp1_set b _0810E342 .align 2, 0 -_0810E32C: .4byte gUnknown_0202E8CC +_0810E32C: .4byte gSpecialVar_0x8004 _0810E330: movs r2, 0x1 negs r2, r2 @@ -6169,13 +6169,13 @@ _0810E342: thumb_func_start SetFlagInVar SetFlagInVar: @ 810E348 push {lr} - ldr r0, _0810E358 @ =gUnknown_0202E8CC + ldr r0, _0810E358 @ =gSpecialVar_0x8004 ldrh r0, [r0] bl FlagSet pop {r0} bx r0 .align 2, 0 -_0810E358: .4byte gUnknown_0202E8CC +_0810E358: .4byte gSpecialVar_0x8004 thumb_func_end SetFlagInVar thumb_func_start GetWeekCount @@ -6425,14 +6425,14 @@ PCTurnOffEffect_1: @ 810E508 lsls r0, 16 cmp r0, 0 beq _0810E544 - ldr r0, _0810E528 @ =gUnknown_0202E8CC + ldr r0, _0810E528 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _0810E52C movs r3, 0x4 b _0810E566 .align 2, 0 -_0810E528: .4byte gUnknown_0202E8CC +_0810E528: .4byte gSpecialVar_0x8004 _0810E52C: cmp r0, 0x1 bne _0810E538 @@ -6448,14 +6448,14 @@ _0810E538: .align 2, 0 _0810E540: .4byte 0x00000259 _0810E544: - ldr r0, _0810E550 @ =gUnknown_0202E8CC + ldr r0, _0810E550 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _0810E554 movs r3, 0x5 b _0810E566 .align 2, 0 -_0810E550: .4byte gUnknown_0202E8CC +_0810E550: .4byte gSpecialVar_0x8004 _0810E554: cmp r0, 0x1 bne _0810E560 @@ -6535,14 +6535,14 @@ _0810E5D6: _0810E5D8: movs r5, 0xFF _0810E5DA: - ldr r0, _0810E5E8 @ =gUnknown_0202E8CC + ldr r0, _0810E5E8 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _0810E5EC movs r4, 0x4 b _0810E5FE .align 2, 0 -_0810E5E8: .4byte gUnknown_0202E8CC +_0810E5E8: .4byte gSpecialVar_0x8004 _0810E5EC: cmp r0, 0x1 bne _0810E5F8 @@ -6789,7 +6789,7 @@ ScriptAddElevatorMenuItem: @ 810E7AC lsls r3, 24 lsrs r3, 24 mov r8, r3 - ldr r0, _0810E81C @ =gUnknown_0202E8CC + ldr r0, _0810E81C @ =gSpecialVar_0x8004 ldrh r1, [r0] adds r2, r0, 0 ldr r3, _0810E820 @ =gUnknown_03000760 @@ -6835,7 +6835,7 @@ _0810E7E8: pop {r0} bx r0 .align 2, 0 -_0810E81C: .4byte gUnknown_0202E8CC +_0810E81C: .4byte gSpecialVar_0x8004 _0810E820: .4byte gUnknown_03000760 thumb_func_end ScriptAddElevatorMenuItem @@ -6991,7 +6991,7 @@ sub_810E944: @ 810E944 movs r3, 0x40 bl sub_8072BD8 ldr r1, _0810E97C @ =gUnknown_083F8380 - ldr r0, _0810E980 @ =gUnknown_0202E8CE + ldr r0, _0810E980 @ =gSpecialVar_0x8005 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -7005,7 +7005,7 @@ sub_810E944: @ 810E944 .align 2, 0 _0810E978: .4byte gOtherText_NowOn _0810E97C: .4byte gUnknown_083F8380 -_0810E980: .4byte gUnknown_0202E8CE +_0810E980: .4byte gSpecialVar_0x8005 thumb_func_end sub_810E944 thumb_func_start sub_810E984 @@ -7079,7 +7079,7 @@ _0810E9E8: str r5, [sp, 0x4] movs r0, 0 bl saved_warp2_set_2 - ldr r1, _0810EA54 @ =gUnknown_0202E8CE + ldr r1, _0810EA54 @ =gSpecialVar_0x8005 ldrh r0, [r1] ldrb r2, [r4] cmp r0, r2 @@ -7102,7 +7102,7 @@ _0810EA44: .4byte gMain _0810EA48: .4byte gUnknown_0203925B _0810EA4C: .4byte gUnknown_0203925A _0810EA50: .4byte gUnknown_03000760 -_0810EA54: .4byte gUnknown_0202E8CE +_0810EA54: .4byte gSpecialVar_0x8005 _0810EA58: .4byte gScriptResult _0810EA5C: ldr r0, _0810EA88 @ =gScriptResult @@ -7110,7 +7110,7 @@ _0810EA5C: ldrb r0, [r4] strh r0, [r1] bl sub_810EBEC - ldr r0, _0810EA8C @ =gUnknown_0202E8DE + ldr r0, _0810EA8C @ =gScriptLastTalked ldrb r0, [r0] ldr r2, _0810EA90 @ =gSaveBlock1 ldrb r1, [r2, 0x5] @@ -7124,7 +7124,7 @@ _0810EA5C: b _0810EABC .align 2, 0 _0810EA88: .4byte gScriptResult -_0810EA8C: .4byte gUnknown_0202E8DE +_0810EA8C: .4byte gScriptLastTalked _0810EA90: .4byte gSaveBlock1 _0810EA94: movs r0, 0x2 @@ -7690,28 +7690,28 @@ _0810EF08: .4byte gUnknown_0203925C thumb_func_start SetTrickHouseEndRoomFlag SetTrickHouseEndRoomFlag: @ 810EF0C push {lr} - ldr r1, _0810EF1C @ =gUnknown_0202E8CC + ldr r1, _0810EF1C @ =gSpecialVar_0x8004 ldr r0, _0810EF20 @ =0x00000259 strh r0, [r1] bl FlagSet pop {r0} bx r0 .align 2, 0 -_0810EF1C: .4byte gUnknown_0202E8CC +_0810EF1C: .4byte gSpecialVar_0x8004 _0810EF20: .4byte 0x00000259 thumb_func_end SetTrickHouseEndRoomFlag thumb_func_start ResetTrickHouseEndRoomFlag ResetTrickHouseEndRoomFlag: @ 810EF24 push {lr} - ldr r1, _0810EF34 @ =gUnknown_0202E8CC + ldr r1, _0810EF34 @ =gSpecialVar_0x8004 ldr r0, _0810EF38 @ =0x00000259 strh r0, [r1] bl FlagReset pop {r0} bx r0 .align 2, 0 -_0810EF34: .4byte gUnknown_0202E8CC +_0810EF34: .4byte gSpecialVar_0x8004 _0810EF38: .4byte 0x00000259 thumb_func_end ResetTrickHouseEndRoomFlag @@ -8378,7 +8378,7 @@ sub_810F424: @ 810F424 ldrh r2, [r2] adds r1, r2 ldr r2, _0810F464 @ =gUnknown_083F83E0 - ldr r0, _0810F468 @ =gUnknown_0202E8CC + ldr r0, _0810F468 @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r0, r2 ldrb r0, [r0] @@ -8395,7 +8395,7 @@ _0810F458: .4byte gSaveBlock1 _0810F45C: .4byte 0x00002dd4 _0810F460: .4byte 0x00002dd6 _0810F464: .4byte gUnknown_083F83E0 -_0810F468: .4byte gUnknown_0202E8CC +_0810F468: .4byte gSpecialVar_0x8004 _0810F46C: .4byte gUnknown_083F83EC _0810F470: ldr r4, _0810F484 @ =gUnknown_083F83F8 @@ -8415,7 +8415,7 @@ _0810F484: .4byte gUnknown_083F83F8 thumb_func_start sub_810F488 sub_810F488: @ 810F488 push {lr} - ldr r1, _0810F4A0 @ =gUnknown_0202E8CC + ldr r1, _0810F4A0 @ =gSpecialVar_0x8004 ldr r0, _0810F4A4 @ =0x00000277 strh r0, [r1] bl FlagGet @@ -8425,7 +8425,7 @@ sub_810F488: @ 810F488 movs r0, 0x1 b _0810F4AA .align 2, 0 -_0810F4A0: .4byte gUnknown_0202E8CC +_0810F4A0: .4byte gSpecialVar_0x8004 _0810F4A4: .4byte 0x00000277 _0810F4A8: movs r0, 0 @@ -8437,7 +8437,7 @@ _0810F4AA: thumb_func_start sub_810F4B0 sub_810F4B0: @ 810F4B0 push {lr} - ldr r1, _0810F4C8 @ =gUnknown_0202E8CC + ldr r1, _0810F4C8 @ =gSpecialVar_0x8004 movs r0, 0x9E lsls r0, 2 strh r0, [r1] @@ -8448,7 +8448,7 @@ sub_810F4B0: @ 810F4B0 movs r0, 0x1 b _0810F4CE .align 2, 0 -_0810F4C8: .4byte gUnknown_0202E8CC +_0810F4C8: .4byte gSpecialVar_0x8004 _0810F4CC: movs r0, 0 _0810F4CE: @@ -8459,7 +8459,7 @@ _0810F4CE: thumb_func_start sub_810F4D4 sub_810F4D4: @ 810F4D4 push {lr} - ldr r1, _0810F4EC @ =gUnknown_0202E8CC + ldr r1, _0810F4EC @ =gSpecialVar_0x8004 ldr r0, _0810F4F0 @ =0x00000279 strh r0, [r1] bl FlagGet @@ -8469,7 +8469,7 @@ sub_810F4D4: @ 810F4D4 movs r0, 0x1 b _0810F4F6 .align 2, 0 -_0810F4EC: .4byte gUnknown_0202E8CC +_0810F4EC: .4byte gSpecialVar_0x8004 _0810F4F0: .4byte 0x00000279 _0810F4F4: movs r0, 0 @@ -8481,7 +8481,7 @@ _0810F4F6: thumb_func_start sub_810F4FC sub_810F4FC: @ 810F4FC push {lr} - ldr r1, _0810F514 @ =gUnknown_0202E8CC + ldr r1, _0810F514 @ =gSpecialVar_0x8004 ldr r0, _0810F518 @ =0x0000027a strh r0, [r1] bl FlagGet @@ -8491,7 +8491,7 @@ sub_810F4FC: @ 810F4FC movs r0, 0x1 b _0810F51E .align 2, 0 -_0810F514: .4byte gUnknown_0202E8CC +_0810F514: .4byte gSpecialVar_0x8004 _0810F518: .4byte 0x0000027a _0810F51C: movs r0, 0 @@ -8810,14 +8810,14 @@ sub_810F758: @ 810F758 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _0810F7A0 @ =gUnknown_0202E8CE + ldr r0, _0810F7A0 @ =gSpecialVar_0x8005 ldrh r2, [r0] movs r0, 0 strh r2, [r1, 0x8] strh r0, [r1, 0xA] strh r0, [r1, 0xC] strh r0, [r1, 0xE] - ldr r0, _0810F7A4 @ =gUnknown_0202E8CC + ldr r0, _0810F7A4 @ =gSpecialVar_0x8004 ldrh r0, [r0] strh r0, [r1, 0x10] movs r0, 0x5 @@ -8831,8 +8831,8 @@ sub_810F758: @ 810F758 .align 2, 0 _0810F798: .4byte sub_810F7A8 _0810F79C: .4byte gTasks -_0810F7A0: .4byte gUnknown_0202E8CE -_0810F7A4: .4byte gUnknown_0202E8CC +_0810F7A0: .4byte gSpecialVar_0x8005 +_0810F7A4: .4byte gSpecialVar_0x8004 thumb_func_end sub_810F758 thumb_func_start sub_810F7A8 @@ -8998,7 +8998,7 @@ _0810F8CC: thumb_func_start ScriptGetPartyMonSpecies ScriptGetPartyMonSpecies: @ 810F8D4 push {lr} - ldr r0, _0810F8F4 @ =gUnknown_0202E8CC + ldr r0, _0810F8F4 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -9012,7 +9012,7 @@ ScriptGetPartyMonSpecies: @ 810F8D4 pop {r1} bx r1 .align 2, 0 -_0810F8F4: .4byte gUnknown_0202E8CC +_0810F8F4: .4byte gSpecialVar_0x8004 _0810F8F8: .4byte gPlayerParty thumb_func_end ScriptGetPartyMonSpecies @@ -9083,7 +9083,7 @@ _0810F968: .4byte gLocalTime thumb_func_start sub_810F96C sub_810F96C: @ 810F96C push {r4,lr} - ldr r0, _0810F994 @ =gUnknown_0202E8CC + ldr r0, _0810F994 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -9101,7 +9101,7 @@ sub_810F96C: @ 810F96C movs r0, 0x1 b _0810F9A6 .align 2, 0 -_0810F994: .4byte gUnknown_0202E8CC +_0810F994: .4byte gSpecialVar_0x8004 _0810F998: .4byte gPlayerParty _0810F99C: .4byte gStringVar1 _0810F9A0: .4byte gSaveBlock2 @@ -9596,7 +9596,7 @@ sub_810FD60: @ 810FD60 ldr r1, _0810FD78 @ =0x000013c2 adds r0, r1 ldrh r0, [r0] - ldr r1, _0810FD7C @ =gUnknown_0202E8CC + ldr r1, _0810FD7C @ =gSpecialVar_0x8004 ldrh r1, [r1] asrs r0, r1 movs r1, 0x1 @@ -9605,7 +9605,7 @@ sub_810FD60: @ 810FD60 .align 2, 0 _0810FD74: .4byte gSaveBlock1 _0810FD78: .4byte 0x000013c2 -_0810FD7C: .4byte gUnknown_0202E8CC +_0810FD7C: .4byte gSpecialVar_0x8004 thumb_func_end sub_810FD60 thumb_func_start sub_810FD80 @@ -9638,7 +9638,7 @@ sub_810FDAC: @ 810FDAC push {lr} movs r3, 0 movs r2, 0 - ldr r0, _0810FDC8 @ =gUnknown_0202E8CC + ldr r0, _0810FDC8 @ =gSpecialVar_0x8004 ldrh r0, [r0] subs r0, 0x8 cmp r0, 0x7 @@ -9649,7 +9649,7 @@ sub_810FDAC: @ 810FDAC ldr r0, [r0] mov pc, r0 .align 2, 0 -_0810FDC8: .4byte gUnknown_0202E8CC +_0810FDC8: .4byte gSpecialVar_0x8004 _0810FDCC: .4byte _0810FDD0 .align 2, 0 _0810FDD0: @@ -9849,7 +9849,7 @@ _0810FF5C: .4byte 0x000013c2 thumb_func_start sub_810FF60 sub_810FF60: @ 810FF60 push {lr} - ldr r0, _0810FF74 @ =gUnknown_0202E8CC + ldr r0, _0810FF74 @ =gSpecialVar_0x8004 ldrb r0, [r0] bl sub_810FB10 lsls r0, 24 @@ -9857,7 +9857,7 @@ sub_810FF60: @ 810FF60 pop {r1} bx r1 .align 2, 0 -_0810FF74: .4byte gUnknown_0202E8CC +_0810FF74: .4byte gSpecialVar_0x8004 thumb_func_end sub_810FF60 .align 2, 0 @ Don't pad with nop. diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s index fca2788e0..226e5dfde 100644 --- a/asm/rom_800D42C.s +++ b/asm/rom_800D42C.s @@ -64555,7 +64555,7 @@ sub_802E03C: @ 802E03C ands r0, r1 cmp r0, 0 bne _0802E062 - ldr r0, _0802E074 @ =word_203855E + ldr r0, _0802E074 @ =gScriptItemId ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 @@ -64567,7 +64567,7 @@ _0802E062: _0802E068: .4byte gMain _0802E06C: .4byte sub_800F808 _0802E070: .4byte gPaletteFade -_0802E074: .4byte word_203855E +_0802E074: .4byte gScriptItemId thumb_func_end sub_802E03C thumb_func_start bx_wait_t1 diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s index 7746aa5fd..d439aaf39 100644 --- a/asm/rom_8065394.s +++ b/asm/rom_8065394.s @@ -573,13 +573,13 @@ _0806832C: ble _08068320 ldr r0, _08068358 @ =gSelectedMapObject strb r3, [r0] - ldr r1, _0806835C @ =gUnknown_0202E8DE + ldr r1, _0806835C @ =gScriptLastTalked adds r0, r2, r3 lsls r0, 2 adds r0, r5 ldrb r0, [r0, 0x8] strh r0, [r1] - ldr r0, _08068360 @ =gUnknown_0202E8E0 + ldr r0, _08068360 @ =gScriptFacing strh r6, [r0] adds r0, r3, 0 bl GetFieldObjectScriptPointerByFieldObjectId @@ -590,8 +590,8 @@ _0806834E: .align 2, 0 _08068354: .4byte gLinkPlayerMapObjects _08068358: .4byte gSelectedMapObject -_0806835C: .4byte gUnknown_0202E8DE -_08068360: .4byte gUnknown_0202E8E0 +_0806835C: .4byte gScriptLastTalked +_08068360: .4byte gScriptFacing thumb_func_end sub_80682A8 thumb_func_start sub_8068364 @@ -663,13 +663,13 @@ _080683E4: .4byte gUnknown_0821664C _080683E8: ldr r0, _08068414 @ =gSelectedMapObject strb r3, [r0] - ldr r4, _08068418 @ =gUnknown_0202E8DE + ldr r4, _08068418 @ =gScriptLastTalked adds r0, r2, r3 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x8] strh r0, [r4] - ldr r0, _0806841C @ =gUnknown_0202E8E0 + ldr r0, _0806841C @ =gScriptFacing strh r6, [r0] adds r0, r3, 0 bl GetFieldObjectScriptPointerByFieldObjectId @@ -683,8 +683,8 @@ _0806840C: bx r1 .align 2, 0 _08068414: .4byte gSelectedMapObject -_08068418: .4byte gUnknown_0202E8DE -_0806841C: .4byte gUnknown_0202E8E0 +_08068418: .4byte gScriptLastTalked +_0806841C: .4byte gScriptFacing thumb_func_end sub_8068364 thumb_func_start TryGetInvisibleMapObjectScript @@ -755,13 +755,13 @@ _080684A4: beq _080684F8 b _08068494 _080684AA: - ldr r1, _080684CC @ =gUnknown_0202E8CC + ldr r1, _080684CC @ =gSpecialVar_0x8004 lsrs r0, r2, 16 movs r3, 0x96 lsls r3, 2 adds r0, r3 strh r0, [r1] - ldr r0, _080684D0 @ =gUnknown_0202E8CE + ldr r0, _080684D0 @ =gSpecialVar_0x8005 strh r2, [r0] ldrh r0, [r1] bl FlagGet @@ -772,13 +772,13 @@ _080684AA: ldr r0, _080684D4 @ =HiddenItemScript b _080684FA .align 2, 0 -_080684CC: .4byte gUnknown_0202E8CC -_080684D0: .4byte gUnknown_0202E8CE +_080684CC: .4byte gSpecialVar_0x8004 +_080684D0: .4byte gSpecialVar_0x8005 _080684D4: .4byte HiddenItemScript _080684D8: cmp r5, 0x2 bne _08068494 - ldr r0, _080684F0 @ =gUnknown_0202E8CC + ldr r0, _080684F0 @ =gSpecialVar_0x8004 strh r2, [r0] bl sub_80BC050 lsls r0, 24 @@ -787,7 +787,7 @@ _080684D8: ldr r0, _080684F4 @ =gUnknown_081A2C51 b _080684FA .align 2, 0 -_080684F0: .4byte gUnknown_0202E8CC +_080684F0: .4byte gSpecialVar_0x8004 _080684F4: .4byte gUnknown_081A2C51 _080684F8: adds r0, r2, 0 diff --git a/asm/rom_806D7F8.s b/asm/rom_806D7F8.s index 609e0a362..8f95428c3 100644 --- a/asm/rom_806D7F8.s +++ b/asm/rom_806D7F8.s @@ -3683,7 +3683,7 @@ sub_806F490: @ 806F490 adds r0, r1 ldr r1, _0806F514 @ =TaskDummy str r1, [r0] - ldr r0, _0806F518 @ =word_203855E + ldr r0, _0806F518 @ =gScriptItemId ldrh r1, [r0] ldr r2, _0806F51C @ =sub_808B508 adds r0, r3, 0 @@ -3726,7 +3726,7 @@ _0806F506: _0806F50C: .4byte gPaletteFade _0806F510: .4byte gTasks _0806F514: .4byte TaskDummy -_0806F518: .4byte word_203855E +_0806F518: .4byte gScriptItemId _0806F51C: .4byte sub_808B508 _0806F520: .4byte 0x0201c000 _0806F524: .4byte gStringVar1 @@ -3792,7 +3792,7 @@ sub_806F588: @ 806F588 adds r0, r1 ldr r1, _0806F5F0 @ =TaskDummy str r1, [r0] - ldr r0, _0806F5F4 @ =word_203855E + ldr r0, _0806F5F4 @ =gScriptItemId ldrh r1, [r0] ldr r2, _0806F5F8 @ =sub_808B508 adds r0, r3, 0 @@ -3823,7 +3823,7 @@ _0806F5E0: _0806F5E8: .4byte gPaletteFade _0806F5EC: .4byte gTasks _0806F5F0: .4byte TaskDummy -_0806F5F4: .4byte word_203855E +_0806F5F4: .4byte gScriptItemId _0806F5F8: .4byte sub_808B508 _0806F5FC: .4byte gStringVar2 _0806F600: .4byte 0x0201c000 diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s index b584e32ba..3a67bbf81 100644 --- a/asm/rom_80859BC.s +++ b/asm/rom_80859BC.s @@ -9327,7 +9327,7 @@ sub_808A228: @ 808A228 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0808A268 @ =word_203855E + ldr r0, _0808A268 @ =gScriptItemId ldrh r0, [r0] bl itemid_is_mail lsls r0, 24 @@ -9353,7 +9353,7 @@ sub_808A228: @ 808A228 str r1, [r0] b _0808A29A .align 2, 0 -_0808A268: .4byte word_203855E +_0808A268: .4byte gScriptItemId _0808A26C: .4byte gUnknown_0202E8F4 _0808A270: .4byte gTasks _0808A274: .4byte sub_808A180 @@ -9394,7 +9394,7 @@ sub_808A2AC: @ 808A2AC ands r0, r1 cmp r0, 0 bne _0808A2CA - ldr r0, _0808A2D4 @ =word_203855E + ldr r0, _0808A2D4 @ =gScriptItemId ldrh r1, [r0] ldr r2, _0808A2D8 @ =sub_808A228 adds r0, r3, 0 @@ -9404,7 +9404,7 @@ _0808A2CA: bx r0 .align 2, 0 _0808A2D0: .4byte gPaletteFade -_0808A2D4: .4byte word_203855E +_0808A2D4: .4byte gScriptItemId _0808A2D8: .4byte sub_808A228 thumb_func_end sub_808A2AC @@ -9452,14 +9452,14 @@ sub_808A330: @ 808A330 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0808A344 @ =word_203855E + ldr r1, _0808A344 @ =gScriptItemId ldrh r1, [r1] ldr r2, _0808A348 @ =sub_808A2DC bl sub_806E964 pop {r0} bx r0 .align 2, 0 -_0808A344: .4byte word_203855E +_0808A344: .4byte gScriptItemId _0808A348: .4byte sub_808A2DC thumb_func_end sub_808A330 @@ -9551,7 +9551,7 @@ _0808A3F0: thumb_func_start sub_808A3F8 sub_808A3F8: @ 808A3F8 push {r4,lr} - ldr r0, _0808A460 @ =word_203855E + ldr r0, _0808A460 @ =gScriptItemId ldrh r0, [r0] bl itemid_is_mail lsls r0, 24 @@ -9594,7 +9594,7 @@ sub_808A3F8: @ 808A3F8 bl SetMainCallback2 b _0808A4C6 .align 2, 0 -_0808A460: .4byte word_203855E +_0808A460: .4byte gScriptItemId _0808A464: .4byte sub_808A330 _0808A468: .4byte gPaletteFade _0808A46C: .4byte gUnknown_03005CE0 @@ -9609,7 +9609,7 @@ _0808A47E: movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r0, _0808A4A8 @ =word_203855E + ldr r0, _0808A4A8 @ =gScriptItemId ldrh r0, [r0] cmp r0, 0 beq _0808A4B4 @@ -9623,7 +9623,7 @@ _0808A47E: b _0808A4C6 .align 2, 0 _0808A4A4: .4byte gPaletteFade -_0808A4A8: .4byte word_203855E +_0808A4A8: .4byte gScriptItemId _0808A4AC: .4byte sub_808A2AC _0808A4B0: .4byte sub_808A358 _0808A4B4: @@ -9764,7 +9764,7 @@ sub_808A5BC: @ 808A5BC bne _0808A5EA ldr r0, _0808A5F4 @ =gUnknown_03005CE0 ldrb r0, [r0] - ldr r1, _0808A5F8 @ =word_203855E + ldr r1, _0808A5F8 @ =gScriptItemId ldrh r1, [r1] movs r2, 0 bl sub_806EBF0 @@ -9782,7 +9782,7 @@ _0808A5EA: .align 2, 0 _0808A5F0: .4byte gPaletteFade _0808A5F4: .4byte gUnknown_03005CE0 -_0808A5F8: .4byte word_203855E +_0808A5F8: .4byte gScriptItemId _0808A5FC: .4byte gTasks _0808A600: .4byte sub_808A1E0 thumb_func_end sub_808A5BC @@ -10861,7 +10861,7 @@ _0808AE82: thumb_func_start sub_808AE8C sub_808AE8C: @ 808AE8C push {r4-r6,lr} - ldr r0, _0808AED8 @ =word_203855E + ldr r0, _0808AED8 @ =gScriptItemId ldrb r0, [r0] subs r0, 0x21 lsls r0, 24 @@ -10896,10 +10896,10 @@ _0808AECE: bl sub_806BC3C b _0808AF10 .align 2, 0 -_0808AED8: .4byte word_203855E +_0808AED8: .4byte gScriptItemId _0808AEDC: .4byte gPlayerParty _0808AEE0: - ldr r0, _0808AF04 @ =word_203855E + ldr r0, _0808AF04 @ =gScriptItemId ldrh r0, [r0] bl ItemIdToBattleMoveId adds r1, r0, 0 @@ -10915,7 +10915,7 @@ _0808AEE0: bl sub_806BC3C b _0808AF10 .align 2, 0 -_0808AF04: .4byte word_203855E +_0808AF04: .4byte gScriptItemId _0808AF08: adds r0, r5, 0 movs r1, 0x8C @@ -10951,7 +10951,7 @@ _0808AF24: bl GetMonData cmp r0, 0 bne _0808AF58 - ldr r0, _0808AF7C @ =word_203855E + ldr r0, _0808AF7C @ =gScriptItemId ldrh r2, [r0] adds r0, r4, 0 movs r1, 0x3 @@ -10976,7 +10976,7 @@ _0808AF66: bx r0 .align 2, 0 _0808AF78: .4byte gPlayerParty -_0808AF7C: .4byte word_203855E +_0808AF7C: .4byte gScriptItemId thumb_func_end sub_808AF20 thumb_func_start sub_808AF80 @@ -10993,7 +10993,7 @@ _0808AF84: ldrb r0, [r0] cmp r0, 0 bne _0808AFC6 - ldr r0, _0808AFB8 @ =word_203855E + ldr r0, _0808AFB8 @ =gScriptItemId ldrh r0, [r0] bl CheckIfItemIsTMHMOrEvolutionStone lsls r0, 24 @@ -11006,7 +11006,7 @@ _0808AF84: .align 2, 0 _0808AFB0: .4byte 0x0201b260 _0808AFB4: .4byte gUnknown_02038561 -_0808AFB8: .4byte word_203855E +_0808AFB8: .4byte gScriptItemId _0808AFBC: bl sub_808AE8C b _0808AFC6 @@ -11083,7 +11083,7 @@ _0808B048: beq _0808B08C b _0808B0AC _0808B052: - ldr r0, _0808B070 @ =word_203855E + ldr r0, _0808B070 @ =gScriptItemId ldrh r0, [r0] bl CheckIfItemIsTMHMOrEvolutionStone lsls r0, 24 @@ -11097,7 +11097,7 @@ _0808B052: bl sub_806AF4C b _0808B0AC .align 2, 0 -_0808B070: .4byte word_203855E +_0808B070: .4byte gScriptItemId _0808B074: .4byte sub_808B0C0 _0808B078: ldr r2, _0808B088 @ =sub_808B0C0 @@ -11185,7 +11185,7 @@ _0808B120: cmp r0, 0 bne _0808B13C ldr r3, _0808B170 @ =gUnknown_03004AE4 - ldr r0, _0808B174 @ =word_203855E + ldr r0, _0808B174 @ =gScriptItemId ldrh r1, [r0] ldr r2, _0808B178 @ =sub_808B224 ldr r3, [r3] @@ -11197,7 +11197,7 @@ _0808B13C: bne _0808B154 movs r0, 0x5 bl PlaySE - ldr r0, _0808B174 @ =word_203855E + ldr r0, _0808B174 @ =gScriptItemId ldrh r1, [r0] ldr r2, _0808B17C @ =sub_808B2EC adds r0, r4, 0 @@ -11215,7 +11215,7 @@ _0808B154: .align 2, 0 _0808B16C: .4byte gUnknown_02038561 _0808B170: .4byte gUnknown_03004AE4 -_0808B174: .4byte word_203855E +_0808B174: .4byte gScriptItemId _0808B178: .4byte sub_808B224 _0808B17C: .4byte sub_808B2EC _0808B180: .4byte sub_808B2B4 @@ -11280,7 +11280,7 @@ sub_808B1EC: @ 808B1EC cmp r0, 0 bne _0808B20E ldr r3, _0808B218 @ =gUnknown_03004AE4 - ldr r0, _0808B21C @ =word_203855E + ldr r0, _0808B21C @ =gScriptItemId ldrh r1, [r0] ldr r2, _0808B220 @ =sub_808B224 ldr r3, [r3] @@ -11293,7 +11293,7 @@ _0808B20E: .align 2, 0 _0808B214: .4byte gPaletteFade _0808B218: .4byte gUnknown_03004AE4 -_0808B21C: .4byte word_203855E +_0808B21C: .4byte gScriptItemId _0808B220: .4byte sub_808B224 thumb_func_end sub_808B1EC @@ -11625,7 +11625,7 @@ sub_808B4A4: @ 808B4A4 bne _0808B4D2 ldr r0, _0808B4DC @ =gUnknown_03005CE0 ldrb r0, [r0] - ldr r1, _0808B4E0 @ =word_203855E + ldr r1, _0808B4E0 @ =gScriptItemId ldrh r1, [r1] movs r2, 0x1 bl sub_806EBF0 @@ -11643,7 +11643,7 @@ _0808B4D2: .align 2, 0 _0808B4D8: .4byte gPaletteFade _0808B4DC: .4byte gUnknown_03005CE0 -_0808B4E0: .4byte word_203855E +_0808B4E0: .4byte gScriptItemId _0808B4E4: .4byte gTasks _0808B4E8: .4byte sub_808B4EC thumb_func_end sub_808B4A4 diff --git a/asm/rom_8094928.s b/asm/rom_8094928.s index 6b6f9e4e5..231f13e9c 100644 --- a/asm/rom_8094928.s +++ b/asm/rom_8094928.s @@ -928,7 +928,7 @@ _08095000: ldrb r4, [r0] cmp r4, 0x3 bne _0809503C - ldr r0, _08095028 @ =word_203855E + ldr r0, _08095028 @ =gScriptItemId ldrh r0, [r0] bl sub_8070E48 lsls r0, 24 @@ -943,7 +943,7 @@ _08095000: b _0809503C .align 2, 0 _08095024: .4byte gUnknown_02038473 -_08095028: .4byte word_203855E +_08095028: .4byte gScriptItemId _0809502C: .4byte 0x0201b000 _08095030: .4byte 0x00000259 _08095034: @@ -1080,7 +1080,7 @@ _0809512C: ldrb r0, [r0] cmp r0, 0x3 bne _08095164 - ldr r5, _08095158 @ =word_203855E + ldr r5, _08095158 @ =gScriptItemId ldrh r0, [r5] bl sub_8070E48 lsls r0, 24 @@ -1095,7 +1095,7 @@ _0809512C: .align 2, 0 _08095150: .4byte gPaletteFade _08095154: .4byte gUnknown_02038473 -_08095158: .4byte word_203855E +_08095158: .4byte gScriptItemId _0809515C: .4byte gUnknown_03004AE4 _08095160: .4byte sub_80952E4 _08095164: @@ -1127,7 +1127,7 @@ _08095178: bne _0809521C bl sub_806D5A4 ldr r3, _080951BC @ =gUnknown_03004AE4 - ldr r0, _080951C0 @ =word_203855E + ldr r0, _080951C0 @ =gScriptItemId ldrh r1, [r0] ldr r2, _080951C4 @ =sub_80952E4 ldr r3, [r3] @@ -1139,7 +1139,7 @@ _080951AA: _080951B4: .4byte gUnknown_02038473 _080951B8: .4byte gPlayerParty _080951BC: .4byte gUnknown_03004AE4 -_080951C0: .4byte word_203855E +_080951C0: .4byte gScriptItemId _080951C4: .4byte sub_80952E4 _080951C8: movs r0, 0x5 @@ -2396,7 +2396,7 @@ _08095C0C: .4byte gPlayerParty thumb_func_start sub_8095C10 sub_8095C10: @ 8095C10 push {lr} - ldr r0, _08095C24 @ =gUnknown_0202E8CC + ldr r0, _08095C24 @ =gSpecialVar_0x8004 ldrb r0, [r0] bl sub_8095BB4 lsls r0, 24 @@ -2404,7 +2404,7 @@ sub_8095C10: @ 8095C10 pop {r1} bx r1 .align 2, 0 -_08095C24: .4byte gUnknown_0202E8CC +_08095C24: .4byte gSpecialVar_0x8004 thumb_func_end sub_8095C10 thumb_func_start sub_8095C28 @@ -19532,7 +19532,7 @@ _0809E3A0: ldrb r1, [r1] adds r0, 0x7A strb r1, [r0] - ldr r1, _0809E3C0 @ =gUnknown_0202E8CE + ldr r1, _0809E3C0 @ =gSpecialVar_0x8005 ldrb r0, [r0] strh r0, [r1] adds r0, r4, 0 @@ -19540,7 +19540,7 @@ _0809E3A0: b _0809E3EE .align 2, 0 _0809E3BC: .4byte 0x02018000 -_0809E3C0: .4byte gUnknown_0202E8CE +_0809E3C0: .4byte gSpecialVar_0x8005 _0809E3C4: movs r0, 0x20 bl PlaySE @@ -19557,7 +19557,7 @@ _0809E3D4: adds r0, 0x7A movs r1, 0x4 strb r1, [r0] - ldr r0, _0809E3F8 @ =gUnknown_0202E8CE + ldr r0, _0809E3F8 @ =gSpecialVar_0x8005 strh r1, [r0] adds r0, r4, 0 bl sub_809E0FC @@ -19567,7 +19567,7 @@ _0809E3EE: bx r0 .align 2, 0 _0809E3F4: .4byte 0x02018000 -_0809E3F8: .4byte gUnknown_0202E8CE +_0809E3F8: .4byte gSpecialVar_0x8005 thumb_func_end sub_809E260 thumb_func_start sub_809E3FC diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s index e2b20f0df..cbc5697a6 100644 --- a/asm/rom_81258BC.s +++ b/asm/rom_81258BC.s @@ -1127,7 +1127,7 @@ sub_812B758: @ 812B758 ands r0, r1 cmp r0, 0 bne _0812B77E - ldr r0, _0812B790 @ =word_203855E + ldr r0, _0812B790 @ =gScriptItemId ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 @@ -1139,7 +1139,7 @@ _0812B77E: _0812B784: .4byte gMain _0812B788: .4byte sub_800F808 _0812B78C: .4byte gPaletteFade -_0812B790: .4byte word_203855E +_0812B790: .4byte gScriptItemId thumb_func_end sub_812B758 thumb_func_start sub_812B794 @@ -15587,7 +15587,7 @@ sub_81326D8: @ 81326D8 str r0, [r4] bl sub_81332A0 ldr r1, [r4] - ldr r0, _08132780 @ =gUnknown_0202E8CC + ldr r0, _08132780 @ =gSpecialVar_0x8004 ldrh r0, [r0] ldr r2, _08132784 @ =0x000002c5 adds r1, r2 @@ -15635,7 +15635,7 @@ sub_81326D8: @ 81326D8 .align 2, 0 _08132778: .4byte gUnknown_030007B0 _0813277C: .4byte 0x02017000 -_08132780: .4byte gUnknown_0202E8CC +_08132780: .4byte gSpecialVar_0x8004 _08132784: .4byte 0x000002c5 _08132788: .4byte sub_813265C _0813278C: .4byte gWindowConfig_81E7240 @@ -15657,7 +15657,7 @@ sub_81327A4: @ 81327A4 str r0, [r4] bl sub_8133558 ldr r1, [r4] - ldr r0, _0813284C @ =gUnknown_0202E8CE + ldr r0, _0813284C @ =gSpecialVar_0x8005 ldrh r0, [r0] ldr r2, _08132850 @ =0x000002c6 adds r1, r2 @@ -15711,7 +15711,7 @@ sub_81327A4: @ 81327A4 .align 2, 0 _08132844: .4byte gUnknown_030007B0 _08132848: .4byte 0x02017000 -_0813284C: .4byte gUnknown_0202E8CE +_0813284C: .4byte gSpecialVar_0x8005 _08132850: .4byte 0x000002c6 _08132854: .4byte sub_813265C _08132858: .4byte gWindowConfig_81E7240 @@ -16015,7 +16015,7 @@ _08132AD0: beq _08132B34 ldr r0, _08132B2C @ =gOtherText_PokeLearnedMove bl sub_81328E8 - ldr r1, _08132B30 @ =gUnknown_0202E8CC + ldr r1, _08132B30 @ =gSpecialVar_0x8004 movs r0, 0x1 strh r0, [r1] ldr r1, [r4] @@ -16027,7 +16027,7 @@ _08132B20: .4byte 0x000002c5 _08132B24: .4byte gPlayerParty _08132B28: .4byte 0xffff0000 _08132B2C: .4byte gOtherText_PokeLearnedMove -_08132B30: .4byte gUnknown_0202E8CC +_08132B30: .4byte gSpecialVar_0x8004 _08132B34: ldr r1, [r4] movs r0, 0x10 @@ -16089,11 +16089,11 @@ _08132B98: cmp r4, 0 bne _08132BB4 bl sub_8133CA4 - ldr r0, _08132BB0 @ =gUnknown_0202E8CC + ldr r0, _08132BB0 @ =gSpecialVar_0x8004 strh r4, [r0] b _08132FCE .align 2, 0 -_08132BB0: .4byte gUnknown_0202E8CC +_08132BB0: .4byte gSpecialVar_0x8004 _08132BB4: movs r0, 0x1 negs r0, r0 @@ -16524,7 +16524,7 @@ _08132EA4: ldr r1, [r7] movs r0, 0x1E strb r0, [r1] - ldr r1, _08132F54 @ =gUnknown_0202E8CC + ldr r1, _08132F54 @ =gSpecialVar_0x8004 movs r0, 0x1 strh r0, [r1] b _08132FD6 @@ -16536,7 +16536,7 @@ _08132F44: .4byte gMoveNames _08132F48: .4byte 0x000002c6 _08132F4C: .4byte gStringVar2 _08132F50: .4byte gOtherText_ForgotMove123 -_08132F54: .4byte gUnknown_0202E8CC +_08132F54: .4byte gSpecialVar_0x8004 _08132F58: bl MenuUpdateWindowText lsls r0, 24 @@ -21238,7 +21238,7 @@ _081352FE: ldr r1, _081353CC @ =gStringVar1 movs r0, 0xFF strb r0, [r1] - ldr r1, _081353D0 @ =gUnknown_0202E8CC + ldr r1, _081353D0 @ =gSpecialVar_0x8004 movs r0, 0x1 strh r0, [r1] movs r0, 0 @@ -21281,7 +21281,7 @@ _081353A8: _081353C4: .4byte gPlayerParty _081353C8: .4byte gScriptResult _081353CC: .4byte gStringVar1 -_081353D0: .4byte gUnknown_0202E8CC +_081353D0: .4byte gSpecialVar_0x8004 _081353D4: .4byte gBattleTowerBanlist _081353D8: .4byte 0x0000ffff _081353DC: .4byte gUnknown_08400E2C @@ -21312,7 +21312,7 @@ _08135414: .4byte gStringVar1 _08135418: .4byte gUnknown_08400E2C _0813541C: .4byte gUnknown_08400E36 _08135420: - ldr r1, _08135450 @ =gUnknown_0202E8CC + ldr r1, _08135450 @ =gSpecialVar_0x8004 movs r0, 0 strh r0, [r1] ldr r2, _08135454 @ =gSaveBlock2 @@ -21337,7 +21337,7 @@ _0813543E: pop {r0} bx r0 .align 2, 0 -_08135450: .4byte gUnknown_0202E8CC +_08135450: .4byte gSpecialVar_0x8004 _08135454: .4byte gSaveBlock2 _08135458: .4byte 0x00000554 thumb_func_end CheckPartyBattleTowerBanlist @@ -21405,7 +21405,7 @@ _081354C8: .4byte 0xffffc14c sub_81354CC: @ 81354CC push {r4,r5,lr} sub sp, 0x4 - ldr r0, _081354E4 @ =gUnknown_0202E8CC + ldr r0, _081354E4 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x1 beq _081354E8 @@ -21415,7 +21415,7 @@ sub_81354CC: @ 81354CC beq _0813551C b _08135520 .align 2, 0 -_081354E4: .4byte gUnknown_0202E8CC +_081354E4: .4byte gSpecialVar_0x8004 _081354E8: movs r5, 0 _081354EA: @@ -21485,7 +21485,7 @@ _08135568: .4byte sub_800E7C4 sub_813556C: @ 813556C push {r4,r5,lr} sub sp, 0x4 - ldr r0, _08135584 @ =gUnknown_0202E8CC + ldr r0, _08135584 @ =gSpecialVar_0x8004 ldrh r2, [r0] cmp r2, 0x1 beq _081355AC @@ -21495,7 +21495,7 @@ sub_813556C: @ 813556C beq _0813558E b _08135648 .align 2, 0 -_08135584: .4byte gUnknown_0202E8CC +_08135584: .4byte gSpecialVar_0x8004 _08135588: cmp r2, 0x2 beq _08135600 @@ -21604,7 +21604,7 @@ sub_8135668: @ 8135668 ldrb r0, [r0] lsls r0, 31 lsrs r4, r0, 31 - ldr r0, _08135694 @ =gUnknown_0202E8CC + ldr r0, _08135694 @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r5, r1, 0 cmp r0, 0xE @@ -21619,7 +21619,7 @@ _08135682: .align 2, 0 _0813568C: .4byte gSaveBlock2 _08135690: .4byte 0x00000554 -_08135694: .4byte gUnknown_0202E8CC +_08135694: .4byte gSpecialVar_0x8004 _08135698: .4byte _0813569C .align 2, 0 _0813569C: @@ -21647,16 +21647,16 @@ _081356D8: ldr r3, _081356F8 @ =0x000160fb adds r0, r3 strb r2, [r0] - ldr r0, _081356FC @ =gUnknown_0202E8CE + ldr r0, _081356FC @ =gSpecialVar_0x8005 ldrh r0, [r0] b _08135898 .align 2, 0 _081356F0: .4byte 0x02000000 _081356F4: .4byte 0x00000556 _081356F8: .4byte 0x000160fb -_081356FC: .4byte gUnknown_0202E8CE +_081356FC: .4byte gSpecialVar_0x8005 _08135700: - ldr r0, _08135714 @ =gUnknown_0202E8CE + ldr r0, _08135714 @ =gSpecialVar_0x8005 ldrb r0, [r0] ldr r1, _08135718 @ =0x00000554 adds r3, r5, r1 @@ -21667,7 +21667,7 @@ _08135700: negs r0, r0 b _08135810 .align 2, 0 -_08135714: .4byte gUnknown_0202E8CE +_08135714: .4byte gSpecialVar_0x8005 _08135718: .4byte 0x00000554 _0813571C: lsls r1, r4, 1 @@ -21681,22 +21681,22 @@ _08135726: adds r0, r5, r3 _0813572C: adds r1, r0 - ldr r0, _0813573C @ =gUnknown_0202E8CE + ldr r0, _0813573C @ =gSpecialVar_0x8005 ldrh r0, [r0] strh r0, [r1] b _0813589A .align 2, 0 _08135738: .4byte 0x0000055c -_0813573C: .4byte gUnknown_0202E8CE +_0813573C: .4byte gSpecialVar_0x8005 _08135740: - ldr r0, _0813574C @ =gUnknown_0202E8CE + ldr r0, _0813574C @ =gSpecialVar_0x8005 ldrh r1, [r0] ldr r2, _08135750 @ =0x00000564 adds r0, r5, r2 strb r1, [r0] b _0813589A .align 2, 0 -_0813574C: .4byte gUnknown_0202E8CE +_0813574C: .4byte gSpecialVar_0x8005 _08135750: .4byte 0x00000564 _08135754: movs r2, 0 @@ -21780,7 +21780,7 @@ _081357F0: .4byte 0x0000055c _081357F4: .4byte 0x00000595 _081357F8: .4byte gScriptResult _081357FC: - ldr r0, _08135818 @ =gUnknown_0202E8CE + ldr r0, _08135818 @ =gSpecialVar_0x8005 ldrb r0, [r0] ldr r1, _0813581C @ =0x00000554 adds r3, r5, r1 @@ -21796,7 +21796,7 @@ _08135810: strb r0, [r3] b _0813589A .align 2, 0 -_08135818: .4byte gUnknown_0202E8CE +_08135818: .4byte gSpecialVar_0x8005 _0813581C: .4byte 0x00000554 _08135820: ldr r2, _08135830 @ =0x00000572 @@ -21874,7 +21874,7 @@ sub_81358A4: @ 81358A4 ldrb r0, [r0] lsls r0, 31 lsrs r4, r0, 31 - ldr r0, _081358D0 @ =gUnknown_0202E8CC + ldr r0, _081358D0 @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r3, r1, 0 cmp r0, 0xE @@ -21889,7 +21889,7 @@ _081358BE: .align 2, 0 _081358C8: .4byte gSaveBlock2 _081358CC: .4byte 0x00000554 -_081358D0: .4byte gUnknown_0202E8CC +_081358D0: .4byte gSpecialVar_0x8004 _081358D4: .4byte _081358D8 .align 2, 0 _081358D8: @@ -22243,7 +22243,7 @@ sub_8135BA0: @ 8135BA0 ldrb r0, [r0] lsls r0, 31 lsrs r5, r0, 31 - ldr r0, _08135C24 @ =gUnknown_0202E8CC + ldr r0, _08135C24 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x3 beq _08135BBA @@ -22273,7 +22273,7 @@ _08135BD8: ldr r2, _08135C30 @ =0x00000555 adds r0, r4, r2 strb r1, [r0] - ldr r0, _08135C24 @ =gUnknown_0202E8CC + ldr r0, _08135C24 @ =gSpecialVar_0x8004 ldrh r1, [r0] cmp r1, 0x3 beq _08135BF8 @@ -22300,7 +22300,7 @@ _08135BF8: .align 2, 0 _08135C1C: .4byte gSaveBlock2 _08135C20: .4byte 0x00000554 -_08135C24: .4byte gUnknown_0202E8CC +_08135C24: .4byte gSpecialVar_0x8004 _08135C28: .4byte 0x0000055c _08135C2C: .4byte gUnknown_02024D26 _08135C30: .4byte 0x00000555 @@ -24160,7 +24160,7 @@ _08136B0E: lsls r0, 24 cmp r0, 0 bne _08136B32 - ldr r0, _08136B3C @ =word_203855E + ldr r0, _08136B3C @ =gScriptItemId ldrb r0, [r0] bl sub_810CA6C ldr r0, _08136B40 @ =sub_8136B44 @@ -24171,7 +24171,7 @@ _08136B32: bx r0 .align 2, 0 _08136B38: .4byte gMain -_08136B3C: .4byte word_203855E +_08136B3C: .4byte gScriptItemId _08136B40: .4byte sub_8136B44 thumb_func_end sub_81369CC @@ -25460,7 +25460,7 @@ sub_81374FC: @ 81374FC ands r0, r1 cmp r0, 0 bne _08137522 - ldr r0, _08137534 @ =word_203855E + ldr r0, _08137534 @ =gScriptItemId ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 @@ -25472,7 +25472,7 @@ _08137522: _08137528: .4byte gMain _0813752C: .4byte sub_800F808 _08137530: .4byte gPaletteFade -_08137534: .4byte word_203855E +_08137534: .4byte gScriptItemId thumb_func_end sub_81374FC thumb_func_start sub_8137538 diff --git a/asm/rom_81473B8.s b/asm/rom_81473B8.s index babd1d40d..6c26c034a 100644 --- a/asm/rom_81473B8.s +++ b/asm/rom_81473B8.s @@ -1010,14 +1010,14 @@ _08147C08: .align 2, 0 _08147C10: .4byte gUnknown_084121DC _08147C14: - ldr r0, _08147C24 @ =word_203855E + ldr r0, _08147C24 @ =gScriptItemId ldrb r0, [r0] bl sub_8147C90 ldr r0, _08147C28 @ =gUnknown_02039350 bl LoadCompressedObjectPalette b _08147C40 .align 2, 0 -_08147C24: .4byte word_203855E +_08147C24: .4byte gScriptItemId _08147C28: .4byte gUnknown_02039350 _08147C2C: ldr r0, _08147C34 @ =gBattleTerrainTiles_Building @@ -1296,7 +1296,7 @@ sub_8147E40: @ 8147E40 muls r5, r0 ldr r0, _08147E98 @ =gPlayerParty adds r5, r0 - ldr r0, _08147E9C @ =word_203855E + ldr r0, _08147E9C @ =gScriptItemId ldrh r4, [r0] lsls r4, 3 ldr r0, _08147EA0 @ =gSaveBlock1 + 0x7F8 @@ -1326,7 +1326,7 @@ sub_8147E40: @ 8147E40 .align 2, 0 _08147E94: .4byte gUnknown_02039310 _08147E98: .4byte gPlayerParty -_08147E9C: .4byte word_203855E +_08147E9C: .4byte gScriptItemId _08147EA0: .4byte gSaveBlock1 + 0x7F8 _08147EA4: .4byte gUnknown_02039312 _08147EA8: .4byte gStringVar1 diff --git a/asm/roulette.s b/asm/roulette.s index c94d51157..919819bbe 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -166,7 +166,7 @@ sub_8115238: @ 8115238 adds r0, r5, 0 movs r1, 0 bl memset - ldr r0, _081152C8 @ =gUnknown_0202E8CC + ldr r0, _081152C8 @ =gSpecialVar_0x8004 ldrh r2, [r0] movs r0, 0x1 ands r0, r2 @@ -224,7 +224,7 @@ _08115276: .align 2, 0 _081152C0: .4byte gUnknown_083F8EC4 _081152C4: .4byte 0x02019000 -_081152C8: .4byte gUnknown_0202E8CC +_081152C8: .4byte gSpecialVar_0x8004 _081152CC: .4byte gUnknown_083F8DF4 _081152D0: .4byte gUnknown_083F8DF0 _081152D4: .4byte gPlttBufferUnfaded @@ -3174,7 +3174,7 @@ sub_8116AB0: @ 8116AB0 ldrb r4, [r4, 0x19] cmp r0, r4 bcs _08116B08 - ldr r1, _08116B04 @ =gUnknown_0202E8CC + ldr r1, _08116B04 @ =gSpecialVar_0x8004 movs r0, 0x1 b _08116B0C .align 2, 0 @@ -3183,9 +3183,9 @@ _08116AF4: .4byte 0x0000ffff _08116AF8: .4byte gSaveBlock1 _08116AFC: .4byte gTasks _08116B00: .4byte 0x00000494 -_08116B04: .4byte gUnknown_0202E8CC +_08116B04: .4byte gSpecialVar_0x8004 _08116B08: - ldr r1, _08116B34 @ =gUnknown_0202E8CC + ldr r1, _08116B34 @ =gSpecialVar_0x8004 movs r0, 0 _08116B0C: strh r0, [r1] @@ -3208,7 +3208,7 @@ _08116B0C: pop {r0} bx r0 .align 2, 0 -_08116B34: .4byte gUnknown_0202E8CC +_08116B34: .4byte gSpecialVar_0x8004 _08116B38: .4byte gTasks _08116B3C: .4byte sub_8116B40 thumb_func_end sub_8116AB0 @@ -4606,7 +4606,7 @@ sub_81175DC: @ 81175DC cmp r0, 0x3C ble _0811761C _08117608: - ldr r1, _0811762C @ =gUnknown_0202E8CC + ldr r1, _0811762C @ =gSpecialVar_0x8004 movs r0, 0x1 strh r0, [r1] bl MenuZeroFillScreen @@ -4620,7 +4620,7 @@ _0811761C: .align 2, 0 _08117624: .4byte gTasks _08117628: .4byte gMain -_0811762C: .4byte gUnknown_0202E8CC +_0811762C: .4byte gSpecialVar_0x8004 thumb_func_end sub_81175DC thumb_func_start sub_8117630 @@ -4630,7 +4630,7 @@ sub_8117630: @ 8117630 lsls r4, 24 lsrs r4, 24 ldr r2, _0811768C @ =gUnknown_083F8DF0 - ldr r0, _08117690 @ =gUnknown_0202E8CC + ldr r0, _08117690 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x1 ands r0, r1 @@ -4668,7 +4668,7 @@ sub_8117630: @ 8117630 bx r0 .align 2, 0 _0811768C: .4byte gUnknown_083F8DF0 -_08117690: .4byte gUnknown_0202E8CC +_08117690: .4byte gSpecialVar_0x8004 _08117694: .4byte gStringVar1 _08117698: .4byte gStringVar4 _0811769C: .4byte gUnknown_081C40DF @@ -4712,7 +4712,7 @@ Task_Roulette_0: @ 81176A8 movs r2, 0x1 bl MenuPrint_RightAligned ldr r2, _08117768 @ =gUnknown_083F8DF0 - ldr r1, _0811776C @ =gUnknown_0202E8CC + ldr r1, _0811776C @ =gSpecialVar_0x8004 mov r8, r1 ldrh r1, [r1] movs r0, 0x1 @@ -4763,7 +4763,7 @@ _0811775C: .4byte gTasks _08117760: .4byte gStringVar4 _08117764: .4byte gOtherText_Coins _08117768: .4byte gUnknown_083F8DF0 -_0811776C: .4byte gUnknown_0202E8CC +_0811776C: .4byte gSpecialVar_0x8004 _08117770: .4byte gUnknown_081C4139 _08117774: .4byte sub_8117630 _08117778: .4byte 0x0000ffff diff --git a/asm/script_pokemon_util_80C4BF0.s b/asm/script_pokemon_util_80C4BF0.s index b579877d6..a0fa7f7af 100644 --- a/asm/script_pokemon_util_80C4BF0.s +++ b/asm/script_pokemon_util_80C4BF0.s @@ -39,7 +39,7 @@ _080C4C24: .4byte 0x00001364 thumb_func_start sub_80C4C28 sub_80C4C28: @ 80C4C28 push {lr} - ldr r0, _080C4C40 @ =gUnknown_0202E8CE + ldr r0, _080C4C40 @ =gSpecialVar_0x8005 ldrb r0, [r0] adds r1, r0, 0 cmp r0, 0x1 @@ -50,7 +50,7 @@ sub_80C4C28: @ 80C4C28 beq _080C4C4A b _080C4C56 .align 2, 0 -_080C4C40: .4byte gUnknown_0202E8CE +_080C4C40: .4byte gSpecialVar_0x8005 _080C4C44: cmp r1, 0x2 beq _080C4C52 @@ -67,12 +67,12 @@ _080C4C52: _080C4C56: movs r1, 0x64 _080C4C58: - ldr r0, _080C4C60 @ =gUnknown_0202E8CC + ldr r0, _080C4C60 @ =gSpecialVar_0x8004 strh r1, [r0] pop {r0} bx r0 .align 2, 0 -_080C4C60: .4byte gUnknown_0202E8CC +_080C4C60: .4byte gSpecialVar_0x8004 thumb_func_end sub_80C4C28 thumb_func_start sub_80C4C64 @@ -88,7 +88,7 @@ sub_80C4C64: @ 80C4C64 thumb_func_start sub_80C4C78 sub_80C4C78: @ 80C4C78 push {lr} - ldr r0, _080C4C8C @ =gUnknown_0203869C + ldr r0, _080C4C8C @ =gSpecialVar_0x8011 ldrh r0, [r0] cmp r0, 0x4 bhi _080C4CB8 @@ -98,7 +98,7 @@ sub_80C4C78: @ 80C4C78 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C4C8C: .4byte gUnknown_0203869C +_080C4C8C: .4byte gSpecialVar_0x8011 _080C4C90: .4byte _080C4C94 .align 2, 0 _080C4C94: @@ -130,22 +130,22 @@ _080C4CBA: ldrh r1, [r0] cmp r1, 0 bne _080C4CDC - ldr r0, _080C4CD8 @ =gUnknown_0202E8CC + ldr r0, _080C4CD8 @ =gSpecialVar_0x8004 strh r1, [r0] b _080C4CE2 .align 2, 0 _080C4CD0: .4byte gSaveBlock1 _080C4CD4: .4byte 0x00002e04 -_080C4CD8: .4byte gUnknown_0202E8CC +_080C4CD8: .4byte gSpecialVar_0x8004 _080C4CDC: - ldr r1, _080C4CE8 @ =gUnknown_0202E8CC + ldr r1, _080C4CE8 @ =gSpecialVar_0x8004 movs r0, 0x1 strh r0, [r1] _080C4CE2: pop {r0} bx r0 .align 2, 0 -_080C4CE8: .4byte gUnknown_0202E8CC +_080C4CE8: .4byte gSpecialVar_0x8004 thumb_func_end sub_80C4C78 thumb_func_start sub_80C4CEC @@ -167,7 +167,7 @@ sub_80C4CF8: @ 80C4CF8 ldrb r0, [r0] cmp r0, 0 bne _080C4D40 - ldr r0, _080C4D30 @ =gUnknown_0203869E + ldr r0, _080C4D30 @ =gSpecialVar_0x8010 ldrh r0, [r0] cmp r0, 0x3 bne _080C4D40 @@ -179,25 +179,25 @@ sub_80C4CF8: @ 80C4CF8 ldr r0, _080C4D38 @ =0x0000031f cmp r1, r0 ble _080C4D40 - ldr r1, _080C4D3C @ =gUnknown_0202E8CC + ldr r1, _080C4D3C @ =gSpecialVar_0x8004 movs r0, 0x1 b _080C4D44 .align 2, 0 _080C4D28: .4byte gUnknown_02038690 _080C4D2C: .4byte gUnknown_02038695 -_080C4D30: .4byte gUnknown_0203869E +_080C4D30: .4byte gSpecialVar_0x8010 _080C4D34: .4byte gUnknown_02038678 _080C4D38: .4byte 0x0000031f -_080C4D3C: .4byte gUnknown_0202E8CC +_080C4D3C: .4byte gSpecialVar_0x8004 _080C4D40: - ldr r1, _080C4D4C @ =gUnknown_0202E8CC + ldr r1, _080C4D4C @ =gSpecialVar_0x8004 movs r0, 0 _080C4D44: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_080C4D4C: .4byte gUnknown_0202E8CC +_080C4D4C: .4byte gSpecialVar_0x8004 thumb_func_end sub_80C4CF8 thumb_func_start sub_80C4D50 @@ -238,7 +238,7 @@ sub_80C4D80: @ 80C4D80 sub sp, 0x8 ldr r0, _080C4EA0 @ =gUnknown_02038670 mov r12, r0 - ldr r1, _080C4EA4 @ =gUnknown_0202E8D0 + ldr r1, _080C4EA4 @ =gSpecialVar_0x8006 mov r8, r1 ldr r2, _080C4EA8 @ =gStringVar1 mov r9, r2 @@ -386,7 +386,7 @@ _080C4E78: b _080C4EC4 .align 2, 0 _080C4EA0: .4byte gUnknown_02038670 -_080C4EA4: .4byte gUnknown_0202E8D0 +_080C4EA4: .4byte gSpecialVar_0x8006 _080C4EA8: .4byte gStringVar1 _080C4EAC: .4byte gUnknown_0203869A _080C4EB0: .4byte gStringVar2 @@ -405,15 +405,15 @@ _080C4EC4: cmp r7, r0 bne _080C4EE4 _080C4ED0: - ldr r0, _080C4EE0 @ =gUnknown_0202E8D0 + ldr r0, _080C4EE0 @ =gSpecialVar_0x8006 strh r4, [r0] b _080C4EEA .align 2, 0 _080C4ED8: .4byte gStringVar2 _080C4EDC: .4byte gUnknown_0203857D -_080C4EE0: .4byte gUnknown_0202E8D0 +_080C4EE0: .4byte gSpecialVar_0x8006 _080C4EE4: - ldr r1, _080C4EFC @ =gUnknown_0202E8D0 + ldr r1, _080C4EFC @ =gSpecialVar_0x8006 adds r0, r4, 0x4 strh r0, [r1] _080C4EEA: @@ -426,7 +426,7 @@ _080C4EEA: pop {r0} bx r0 .align 2, 0 -_080C4EFC: .4byte gUnknown_0202E8D0 +_080C4EFC: .4byte gSpecialVar_0x8006 thumb_func_end sub_80C4D80 thumb_func_start ShowContestWinnerCleanup @@ -540,7 +540,7 @@ GiveMonArtistRibbon: @ 80C4FBC ldrb r0, [r0] cmp r0, 0 bne _080C5038 - ldr r0, _080C502C @ =gUnknown_0203869E + ldr r0, _080C502C @ =gSpecialVar_0x8010 ldrh r0, [r0] cmp r0, 0x3 bne _080C5038 @@ -568,7 +568,7 @@ _080C501C: .4byte gUnknown_02038694 _080C5020: .4byte gPlayerParty _080C5024: .4byte gUnknown_02038690 _080C5028: .4byte gUnknown_02038695 -_080C502C: .4byte gUnknown_0203869E +_080C502C: .4byte gSpecialVar_0x8010 _080C5030: .4byte gUnknown_02038678 _080C5034: .4byte 0x0000031f _080C5038: @@ -612,7 +612,7 @@ ShowContestEntryMonPic: @ 80C5050 movs r3, 0xD bl MenuDrawTextWindow ldr r2, _080C5140 @ =gUnknown_02038570 - ldr r0, _080C5144 @ =gUnknown_0202E8D0 + ldr r0, _080C5144 @ =gSpecialVar_0x8006 ldrh r1, [r0] lsls r1, 6 adds r0, r1, r2 @@ -704,7 +704,7 @@ _080C512A: .align 2, 0 _080C513C: .4byte sub_80C5190 _080C5140: .4byte gUnknown_02038570 -_080C5144: .4byte gUnknown_0202E8D0 +_080C5144: .4byte gSpecialVar_0x8006 _080C5148: .4byte gTasks _080C514C: .4byte gMonFrontPicTable _080C5150: .4byte gMonFrontPicCoords diff --git a/asm/script_pokemon_util_80F99CC.s b/asm/script_pokemon_util_80F99CC.s index 805fadadd..af550f47e 100644 --- a/asm/script_pokemon_util_80F99CC.s +++ b/asm/script_pokemon_util_80F99CC.s @@ -371,7 +371,7 @@ _080F9C98: bl sub_806CA38 ldr r1, _080F9CB8 @ =gUnknown_02038694 strb r0, [r1] - ldr r2, _080F9CBC @ =gUnknown_0202E8CC + ldr r2, _080F9CBC @ =gSpecialVar_0x8004 ldrb r0, [r1] strh r0, [r2] adds r0, r4, 0 @@ -379,14 +379,14 @@ _080F9C98: b _080F9CD8 .align 2, 0 _080F9CB8: .4byte gUnknown_02038694 -_080F9CBC: .4byte gUnknown_0202E8CC +_080F9CBC: .4byte gSpecialVar_0x8004 _080F9CC0: movs r0, 0x5 bl PlaySE ldr r1, _080F9CE0 @ =gUnknown_02038694 movs r0, 0xFF strb r0, [r1] - ldr r1, _080F9CE4 @ =gUnknown_0202E8CC + ldr r1, _080F9CE4 @ =gSpecialVar_0x8004 movs r0, 0xFF strh r0, [r1] adds r0, r4, 0 @@ -397,7 +397,7 @@ _080F9CD8: bx r0 .align 2, 0 _080F9CE0: .4byte gUnknown_02038694 -_080F9CE4: .4byte gUnknown_0202E8CC +_080F9CE4: .4byte gSpecialVar_0x8004 thumb_func_end sub_80F9C6C thumb_func_start sub_80F9CE8 @@ -619,13 +619,13 @@ _080F9E8C: .4byte gPaletteFade _080F9E90: movs r0, 0x5 bl PlaySE - ldr r4, _080F9EC4 @ =gUnknown_0202E8CC + ldr r4, _080F9EC4 @ =gSpecialVar_0x8004 adds r0, r6, 0 bl sub_806CA38 lsls r0, 24 lsrs r0, 24 strh r0, [r4] - ldr r5, _080F9EC8 @ =gUnknown_0202E8CE + ldr r5, _080F9EC8 @ =gSpecialVar_0x8005 ldrh r1, [r4] movs r0, 0x64 muls r0, r1 @@ -639,13 +639,13 @@ _080F9E90: bl sub_8123138 b _080F9EE2 .align 2, 0 -_080F9EC4: .4byte gUnknown_0202E8CC -_080F9EC8: .4byte gUnknown_0202E8CE +_080F9EC4: .4byte gSpecialVar_0x8004 +_080F9EC8: .4byte gSpecialVar_0x8005 _080F9ECC: .4byte gPlayerParty _080F9ED0: movs r0, 0x5 bl PlaySE - ldr r1, _080F9EE8 @ =gUnknown_0202E8CC + ldr r1, _080F9EE8 @ =gSpecialVar_0x8004 movs r0, 0xFF strh r0, [r1] adds r0, r6, 0 @@ -655,7 +655,7 @@ _080F9EE2: pop {r0} bx r0 .align 2, 0 -_080F9EE8: .4byte gUnknown_0202E8CC +_080F9EE8: .4byte gSpecialVar_0x8004 thumb_func_end sub_80F9E64 thumb_func_start sub_80F9EEC @@ -663,7 +663,7 @@ sub_80F9EEC: @ 80F9EEC push {r4,lr} sub sp, 0x4 ldr r0, _080F9F20 @ =gPlayerParty - ldr r1, _080F9F24 @ =gUnknown_0202E8CC + ldr r1, _080F9F24 @ =gSpecialVar_0x8004 ldrb r1, [r1] ldr r2, _080F9F28 @ =gPlayerPartyCount ldrb r2, [r2] @@ -686,7 +686,7 @@ sub_80F9EEC: @ 80F9EEC bx r0 .align 2, 0 _080F9F20: .4byte gPlayerParty -_080F9F24: .4byte gUnknown_0202E8CC +_080F9F24: .4byte gSpecialVar_0x8004 _080F9F28: .4byte gPlayerPartyCount _080F9F2C: .4byte c2_exit_to_overworld_2_switch _080F9F30: .4byte 0x02018000 @@ -703,7 +703,7 @@ sub_80F9F3C: @ 80F9F3C movs r4, 0 adds r5, r1, 0 _080F9F48: - ldr r0, _080F9F7C @ =gUnknown_0202E8CC + ldr r0, _080F9F7C @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -728,21 +728,21 @@ _080F9F66: bx r0 .align 2, 0 _080F9F78: .4byte gScriptResult -_080F9F7C: .4byte gUnknown_0202E8CC +_080F9F7C: .4byte gSpecialVar_0x8004 _080F9F80: .4byte gPlayerParty thumb_func_end sub_80F9F3C thumb_func_start sub_80F9F84 sub_80F9F84: @ 80F9F84 push {r4,r5,lr} - ldr r0, _080F9FC4 @ =gUnknown_0202E8CC + ldr r0, _080F9FC4 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 adds r5, r1, 0 muls r5, r0 ldr r0, _080F9FC8 @ =gPlayerParty adds r5, r0 - ldr r0, _080F9FCC @ =gUnknown_0202E8CE + ldr r0, _080F9FCC @ =gSpecialVar_0x8005 ldrh r1, [r0] adds r1, 0xD adds r0, r5, 0 @@ -763,9 +763,9 @@ sub_80F9F84: @ 80F9F84 pop {r0} bx r0 .align 2, 0 -_080F9FC4: .4byte gUnknown_0202E8CC +_080F9FC4: .4byte gSpecialVar_0x8004 _080F9FC8: .4byte gPlayerParty -_080F9FCC: .4byte gUnknown_0202E8CE +_080F9FCC: .4byte gSpecialVar_0x8005 _080F9FD0: .4byte gStringVar1 _080F9FD4: .4byte gStringVar2 _080F9FD8: .4byte gMoveNames @@ -898,14 +898,14 @@ sub_80FA0DC: @ 80FA0DC push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _080FA13C @ =gUnknown_0202E8CC + ldr r0, _080FA13C @ =gSpecialVar_0x8004 mov r8, r0 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 ldr r5, _080FA140 @ =gPlayerParty adds r0, r5 - ldr r4, _080FA144 @ =gUnknown_0202E8CE + ldr r4, _080FA144 @ =gSpecialVar_0x8005 ldrb r2, [r4] movs r1, 0 bl SetMonMoveSlot @@ -919,7 +919,7 @@ sub_80FA0DC: @ 80FA0DC cmp r4, 0x2 bhi _080FA130 _080FA10E: - ldr r0, _080FA13C @ =gUnknown_0202E8CC + ldr r0, _080FA13C @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -942,15 +942,15 @@ _080FA130: pop {r0} bx r0 .align 2, 0 -_080FA13C: .4byte gUnknown_0202E8CC +_080FA13C: .4byte gSpecialVar_0x8004 _080FA140: .4byte gPlayerParty -_080FA144: .4byte gUnknown_0202E8CE +_080FA144: .4byte gSpecialVar_0x8005 thumb_func_end sub_80FA0DC thumb_func_start sub_80FA148 sub_80FA148: @ 80FA148 push {r4,lr} - ldr r0, _080FA170 @ =gUnknown_0202E8CC + ldr r0, _080FA170 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -970,7 +970,7 @@ _080FA16A: pop {r0} bx r0 .align 2, 0 -_080FA170: .4byte gUnknown_0202E8CC +_080FA170: .4byte gSpecialVar_0x8004 _080FA174: .4byte gPlayerParty _080FA178: .4byte gScriptResult thumb_func_end sub_80FA148 diff --git a/asm/secret_base.s b/asm/secret_base.s index bf00894ad..72c467e70 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -170,13 +170,13 @@ _080BB5B8: thumb_func_start sub_80BB5D0 sub_80BB5D0: @ 80BB5D0 ldr r0, _080BB5DC @ =gUnknown_020387DC - ldr r1, _080BB5E0 @ =gUnknown_0202E8CC + ldr r1, _080BB5E0 @ =gSpecialVar_0x8004 ldrh r1, [r1] strb r1, [r0] bx lr .align 2, 0 _080BB5DC: .4byte gUnknown_020387DC -_080BB5E0: .4byte gUnknown_0202E8CC +_080BB5E0: .4byte gSpecialVar_0x8004 thumb_func_end sub_80BB5D0 thumb_func_start sub_80BB5E4 @@ -343,7 +343,7 @@ _080BB702: thumb_func_start sub_80BB70C sub_80BB70C: @ 80BB70C push {r4,lr} - ldr r4, _080BB720 @ =gUnknown_0202E8D2 + ldr r4, _080BB720 @ =gSpecialVar_0x8007 bl sub_80BB66C lsls r0, 24 lsrs r0, 24 @@ -352,7 +352,7 @@ sub_80BB70C: @ 80BB70C pop {r0} bx r0 .align 2, 0 -_080BB720: .4byte gUnknown_0202E8D2 +_080BB720: .4byte gSpecialVar_0x8007 thumb_func_end sub_80BB70C thumb_func_start unref_sub_80BB724 @@ -1290,7 +1290,7 @@ _080BBE4E: bcs _080BBE8E ldr r0, [r2, 0x4] ldrh r1, [r0, 0x14] - ldr r4, _080BBF8C @ =gUnknown_0202E8CC + ldr r4, _080BBF8C @ =gSpecialVar_0x8004 ldrh r0, [r4] adds r0, 0xAE adds r7, r4, 0 @@ -1320,13 +1320,13 @@ _080BBE8E: ldrb r0, [r0] cmp r5, r0 beq _080BBF5E - ldr r7, _080BBF90 @ =gUnknown_0202E8D0 + ldr r7, _080BBF90 @ =gSpecialVar_0x8006 ldr r2, [sp, 0x8] adds r1, r2, r6 ldrb r0, [r1] lsrs r0, 4 strh r0, [r7] - ldr r6, _080BBF94 @ =gUnknown_0202E8D2 + ldr r6, _080BBF94 @ =gSpecialVar_0x8007 ldrb r1, [r1] movs r0, 0xF ands r0, r1 @@ -1380,7 +1380,7 @@ _080BBEDA: ldrb r0, [r4] ldr r1, _080BBF9C @ =gScriptResult strh r0, [r1] - ldr r2, _080BBF8C @ =gUnknown_0202E8CC + ldr r2, _080BBF8C @ =gSpecialVar_0x8004 ldrh r0, [r2] adds r0, 0xAE lsls r0, 16 @@ -1408,7 +1408,7 @@ _080BBEDA: ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl sub_805C78C - ldr r3, _080BBF8C @ =gUnknown_0202E8CC + ldr r3, _080BBF8C @ =gSpecialVar_0x8004 ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] @@ -1434,9 +1434,9 @@ _080BBF7C: .4byte gSaveBlock1 + 0x1A1A _080BBF80: .4byte gSaveBlock1 _080BBF84: .4byte gDecorations _080BBF88: .4byte gMapHeader -_080BBF8C: .4byte gUnknown_0202E8CC -_080BBF90: .4byte gUnknown_0202E8D0 -_080BBF94: .4byte gUnknown_0202E8D2 +_080BBF8C: .4byte gSpecialVar_0x8004 +_080BBF90: .4byte gSpecialVar_0x8006 +_080BBF94: .4byte gSpecialVar_0x8007 _080BBF98: .4byte 0x00003f20 _080BBF9C: .4byte gScriptResult _080BBFA0: .4byte gDecorations + 0x1C @@ -3392,7 +3392,7 @@ _080BCEB2: ldr r0, _080BCF08 @ =0x000008c2 bl FlagSet _080BCED4: - ldr r4, _080BCF14 @ =gUnknown_0202E8CC + ldr r4, _080BCF14 @ =gSpecialVar_0x8004 lsls r0, r5, 24 lsrs r0, 24 bl sub_80BCCA4 @@ -3419,7 +3419,7 @@ _080BCF04: .4byte 0x00004054 _080BCF08: .4byte 0x000008c2 _080BCF0C: .4byte gSaveBlock1 _080BCF10: .4byte 0x00001a09 -_080BCF14: .4byte gUnknown_0202E8CC +_080BCF14: .4byte gSpecialVar_0x8004 _080BCF18: .4byte gScriptResult thumb_func_end sub_80BCE90 diff --git a/asm/trade.s b/asm/trade.s index f1a195c5e..ae857d1c3 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -7302,7 +7302,7 @@ _0804B7C0: .4byte _0804B9E0 _0804B7F4: ldr r1, _0804B8E0 @ =gUnknown_020297D8 - ldr r0, _0804B8E4 @ =gUnknown_0202E8CE + ldr r0, _0804B8E4 @ =gSpecialVar_0x8005 ldrh r0, [r0] movs r6, 0 strb r0, [r1] @@ -7407,7 +7407,7 @@ _0804B7F4: b _0804B9F2 .align 2, 0 _0804B8E0: .4byte gUnknown_020297D8 -_0804B8E4: .4byte gUnknown_0202E8CE +_0804B8E4: .4byte gSpecialVar_0x8005 _0804B8E8: .4byte gLinkPlayers + 0x8 _0804B8EC: .4byte gSaveBlock2 _0804B8F0: .4byte gEnemyParty @@ -8495,7 +8495,7 @@ _0804C230: .4byte gStringVar3 _0804C234: .4byte gPlayerParty _0804C238: .4byte gStringVar2 _0804C23C: - ldr r0, _0804C280 @ =gUnknown_0202E8CC + ldr r0, _0804C280 @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 @@ -8509,7 +8509,7 @@ _0804C23C: ldr r0, _0804C28C @ =gStringVar3 adds r1, r4, 0 bl StringCopy10 - ldr r0, _0804C290 @ =gUnknown_0202E8CE + ldr r0, _0804C290 @ =gSpecialVar_0x8005 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -8527,11 +8527,11 @@ _0804C278: pop {r0} bx r0 .align 2, 0 -_0804C280: .4byte gUnknown_0202E8CC +_0804C280: .4byte gSpecialVar_0x8004 _0804C284: .4byte gIngameTrades _0804C288: .4byte gStringVar1 _0804C28C: .4byte gStringVar3 -_0804C290: .4byte gUnknown_0202E8CE +_0804C290: .4byte gSpecialVar_0x8005 _0804C294: .4byte gPlayerParty _0804C298: .4byte gStringVar2 thumb_func_end sub_804C1A8 @@ -10567,7 +10567,7 @@ _0804D4B8: .align 2, 0 _0804D4C8: .4byte gMain _0804D4CC: - ldr r0, _0804D510 @ =gUnknown_0202E8CE + ldr r0, _0804D510 @ =gSpecialVar_0x8005 ldrb r0, [r0] movs r1, 0 bl sub_804BA94 @@ -10599,7 +10599,7 @@ _0804D4CC: bl TradeEvolutionScene b _0804D538 .align 2, 0 -_0804D510: .4byte gUnknown_0202E8CE +_0804D510: .4byte gSpecialVar_0x8005 _0804D514: .4byte gUnknown_03005E94 _0804D518: .4byte sub_804BBCC _0804D51C: .4byte gUnknown_020297D8 @@ -11060,7 +11060,7 @@ _0804D898: .4byte SpriteCallbackDummy thumb_func_start sub_804D89C sub_804D89C: @ 804D89C push {r4-r6,lr} - ldr r0, _0804D8D0 @ =gUnknown_0202E8CC + ldr r0, _0804D8D0 @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 @@ -11084,7 +11084,7 @@ sub_804D89C: @ 804D89C pop {r1} bx r1 .align 2, 0 -_0804D8D0: .4byte gUnknown_0202E8CC +_0804D8D0: .4byte gSpecialVar_0x8004 _0804D8D4: .4byte gIngameTrades _0804D8D8: .4byte gStringVar1 _0804D8DC: .4byte gSpeciesNames @@ -11095,14 +11095,14 @@ _0804D8E0: .4byte gStringVar2 sub_804D8E4: @ 804D8E4 push {r4,lr} sub sp, 0x20 - ldr r0, _0804D92C @ =gUnknown_0202E8CC + ldr r0, _0804D92C @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 lsls r4, 2 ldr r0, _0804D930 @ =gIngameTrades adds r4, r0 - ldr r0, _0804D934 @ =gUnknown_0202E8CE + ldr r0, _0804D934 @ =gSpecialVar_0x8005 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -11126,9 +11126,9 @@ sub_804D8E4: @ 804D8E4 pop {r0} bx r0 .align 2, 0 -_0804D92C: .4byte gUnknown_0202E8CC +_0804D92C: .4byte gSpecialVar_0x8004 _0804D930: .4byte gIngameTrades -_0804D934: .4byte gUnknown_0202E8CE +_0804D934: .4byte gSpecialVar_0x8005 _0804D938: .4byte gPlayerParty _0804D93C: .4byte gStringVar1 _0804D940: .4byte gStringVar2 @@ -11359,7 +11359,7 @@ _0804DB28: .4byte gIngameTradeMail thumb_func_start sub_804DB2C sub_804DB2C: @ 804DB2C push {r4-r6,lr} - ldr r6, _0804DB58 @ =gUnknown_0202E8CE + ldr r6, _0804DB58 @ =gSpecialVar_0x8005 ldrh r0, [r6] movs r5, 0x64 muls r0, r5 @@ -11378,7 +11378,7 @@ sub_804DB2C: @ 804DB2C lsrs r0, 16 b _0804DB62 .align 2, 0 -_0804DB58: .4byte gUnknown_0202E8CE +_0804DB58: .4byte gSpecialVar_0x8005 _0804DB5C: .4byte gPlayerParty _0804DB60: movs r0, 0 @@ -11391,16 +11391,16 @@ _0804DB62: thumb_func_start sub_804DB68 sub_804DB68: @ 804DB68 push {lr} - ldr r0, _0804DB7C @ =gUnknown_0202E8CE + ldr r0, _0804DB7C @ =gSpecialVar_0x8005 ldrb r0, [r0] - ldr r1, _0804DB80 @ =gUnknown_0202E8CC + ldr r1, _0804DB80 @ =gSpecialVar_0x8004 ldrb r1, [r1] bl sub_804D948 pop {r0} bx r0 .align 2, 0 -_0804DB7C: .4byte gUnknown_0202E8CE -_0804DB80: .4byte gUnknown_0202E8CC +_0804DB7C: .4byte gSpecialVar_0x8005 +_0804DB80: .4byte gSpecialVar_0x8004 thumb_func_end sub_804DB68 thumb_func_start sub_804DB84 diff --git a/asm/trader.s b/asm/trader.s index f7fd5ccae..be3627e90 100644 --- a/asm/trader.s +++ b/asm/trader.s @@ -278,16 +278,16 @@ sub_8109B34: @ 8109B34 lsrs r1, 24 cmp r1, 0x78 bls _08109B54 - ldr r1, _08109B4C @ =gUnknown_0202E8CC + ldr r1, _08109B4C @ =gSpecialVar_0x8004 ldr r2, _08109B50 @ =0x0000ffff adds r0, r2, 0 strh r0, [r1] b _08109B58 .align 2, 0 -_08109B4C: .4byte gUnknown_0202E8CC +_08109B4C: .4byte gSpecialVar_0x8004 _08109B50: .4byte 0x0000ffff _08109B54: - ldr r0, _08109B78 @ =gUnknown_0202E8CC + ldr r0, _08109B78 @ =gSpecialVar_0x8004 strh r1, [r0] _08109B58: bl sub_8072DEC @@ -303,7 +303,7 @@ _08109B58: pop {r0} bx r0 .align 2, 0 -_08109B78: .4byte gUnknown_0202E8CC +_08109B78: .4byte gSpecialVar_0x8004 thumb_func_end sub_8109B34 thumb_func_start sub_8109B7C @@ -345,7 +345,7 @@ _08109BC2: beq _08109C28 movs r0, 0x5 bl PlaySE - ldr r5, _08109BFC @ =gUnknown_0202E8CE + ldr r5, _08109BFC @ =gSpecialVar_0x8005 bl GetMenuCursorPos lsls r0, 24 lsrs r0, 24 @@ -365,7 +365,7 @@ _08109BC2: bl sub_8109B34 b _08109C3E .align 2, 0 -_08109BFC: .4byte gUnknown_0202E8CE +_08109BFC: .4byte gSpecialVar_0x8005 _08109C00: .4byte gTasks _08109C04: ldr r0, _08109C24 @ =gStringVar1 @@ -452,11 +452,11 @@ sub_8109C90: @ 8109C90 movs r0, 0 strh r0, [r6] ldr r4, _08109CE0 @ =gDecorations - ldr r5, _08109CE4 @ =gUnknown_0202E8CC + ldr r5, _08109CE4 @ =gSpecialVar_0x8004 ldrh r0, [r5] lsls r0, 5 adds r2, r0, r4 - ldr r0, _08109CE8 @ =gUnknown_0202E8D0 + ldr r0, _08109CE8 @ =gSpecialVar_0x8006 ldrh r0, [r0] lsls r0, 5 adds r0, r4 @@ -487,8 +487,8 @@ _08109CD6: .align 2, 0 _08109CDC: .4byte gScriptResult _08109CE0: .4byte gDecorations -_08109CE4: .4byte gUnknown_0202E8CC -_08109CE8: .4byte gUnknown_0202E8D0 +_08109CE4: .4byte gSpecialVar_0x8004 +_08109CE8: .4byte gSpecialVar_0x8006 _08109CEC: .4byte gStringVar2 thumb_func_end sub_8109C90 @@ -528,7 +528,7 @@ sub_8109D04: @ 8109D04 lsrs r0, 24 cmp r0, 0x1 bne _08109D8C - ldr r5, _08109D70 @ =gUnknown_0202E8D0 + ldr r5, _08109D70 @ =gSpecialVar_0x8006 ldr r0, _08109D74 @ =gUnknown_020388F5 ldrb r1, [r0] ldr r0, _08109D78 @ =gUnknown_020388D0 @@ -537,7 +537,7 @@ sub_8109D04: @ 8109D04 ldrb r0, [r0] strh r0, [r5] ldr r0, _08109D7C @ =gStringVar3 - ldr r1, _08109D80 @ =gUnknown_0202E8CC + ldr r1, _08109D80 @ =gSpecialVar_0x8004 ldrh r1, [r1] lsls r1, 5 ldr r4, _08109D84 @ =gDecorations + 0x1 @@ -551,15 +551,15 @@ sub_8109D04: @ 8109D04 b _08109D94 .align 2, 0 _08109D6C: .4byte gUnknown_020388F7 -_08109D70: .4byte gUnknown_0202E8D0 +_08109D70: .4byte gSpecialVar_0x8006 _08109D74: .4byte gUnknown_020388F5 _08109D78: .4byte gUnknown_020388D0 _08109D7C: .4byte gStringVar3 -_08109D80: .4byte gUnknown_0202E8CC +_08109D80: .4byte gSpecialVar_0x8004 _08109D84: .4byte gDecorations + 0x1 _08109D88: .4byte gStringVar2 _08109D8C: - ldr r1, _08109DA4 @ =gUnknown_0202E8D0 + ldr r1, _08109DA4 @ =gSpecialVar_0x8006 ldr r2, _08109DA8 @ =0x0000ffff adds r0, r2, 0 strh r0, [r1] @@ -571,7 +571,7 @@ _08109D94: pop {r0} bx r0 .align 2, 0 -_08109DA4: .4byte gUnknown_0202E8D0 +_08109DA4: .4byte gSpecialVar_0x8006 _08109DA8: .4byte 0x0000ffff thumb_func_end sub_8109D04 @@ -587,7 +587,7 @@ sub_8109DAC: @ 8109DAC movs r2, 0x1D movs r3, 0x13 bl MenuZeroFillWindowRect - ldr r1, _08109DDC @ =gUnknown_0202E8D0 + ldr r1, _08109DDC @ =gSpecialVar_0x8006 movs r0, 0 strh r0, [r1] adds r0, r4, 0 @@ -597,20 +597,20 @@ sub_8109DAC: @ 8109DAC pop {r0} bx r0 .align 2, 0 -_08109DDC: .4byte gUnknown_0202E8D0 +_08109DDC: .4byte gSpecialVar_0x8006 thumb_func_end sub_8109DAC thumb_func_start sub_8109DE0 sub_8109DE0: @ 8109DE0 push {r4-r6,lr} ldr r4, _08109E20 @ =gSaveBlock1 + 0x2D94 - ldr r6, _08109E24 @ =gUnknown_0202E8D0 + ldr r6, _08109E24 @ =gSpecialVar_0x8006 ldrb r0, [r6] bl sub_81340A8 - ldr r0, _08109E28 @ =gUnknown_0202E8CC + ldr r0, _08109E28 @ =gSpecialVar_0x8004 ldrb r0, [r0] bl IsThereStorageSpaceForDecoration - ldr r5, _08109E2C @ =gUnknown_0202E8CE + ldr r5, _08109E2C @ =gSpecialVar_0x8005 ldrh r1, [r5] movs r0, 0xB muls r0, r1 @@ -632,9 +632,9 @@ sub_8109DE0: @ 8109DE0 bx r0 .align 2, 0 _08109E20: .4byte gSaveBlock1 + 0x2D94 -_08109E24: .4byte gUnknown_0202E8D0 -_08109E28: .4byte gUnknown_0202E8CC -_08109E2C: .4byte gUnknown_0202E8CE +_08109E24: .4byte gSpecialVar_0x8006 +_08109E28: .4byte gSpecialVar_0x8004 +_08109E2C: .4byte gSpecialVar_0x8005 _08109E30: .4byte gSaveBlock2 thumb_func_end sub_8109DE0 @@ -327,7 +327,7 @@ _080BDA08: .4byte gUnknown_03004870 thumb_func_start sub_80BDA0C sub_80BDA0C: @ 80BDA0C ldr r2, _080BDA24 @ =gSaveBlock1 - ldr r0, _080BDA28 @ =gUnknown_0202E8CC + ldr r0, _080BDA28 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -339,7 +339,7 @@ sub_80BDA0C: @ 80BDA0C bx lr .align 2, 0 _080BDA24: .4byte gSaveBlock1 -_080BDA28: .4byte gUnknown_0202E8CC +_080BDA28: .4byte gSpecialVar_0x8004 _080BDA2C: .4byte 0x00002738 thumb_func_end sub_80BDA0C @@ -386,7 +386,7 @@ _080BDA70: thumb_func_start special_0x4a special_0x4a: @ 80BDA78 push {lr} - ldr r2, _080BDAA4 @ =gUnknown_0202E8CC + ldr r2, _080BDAA4 @ =gSpecialVar_0x8004 ldrh r1, [r2] lsls r0, r1, 3 adds r0, r1 @@ -407,7 +407,7 @@ special_0x4a: @ 80BDA78 lsrs r0, 24 b _080BDAAE .align 2, 0 -_080BDAA4: .4byte gUnknown_0202E8CC +_080BDAA4: .4byte gSpecialVar_0x8004 _080BDAA8: .4byte gSaveBlock1 + 0x2738 _080BDAAC: ldrb r0, [r2] @@ -804,80 +804,80 @@ _080BDD84: .4byte _080BDE1C .4byte _080BDE30 _080BDDA4: - ldr r1, _080BDDB0 @ =gUnknown_0202E8CC + ldr r1, _080BDDB0 @ =gSpecialVar_0x8004 movs r0, 0xE strh r0, [r1] - ldr r1, _080BDDB4 @ =gUnknown_0202E8CE + ldr r1, _080BDDB4 @ =gSpecialVar_0x8005 movs r0, 0xD b _080BDE3A .align 2, 0 -_080BDDB0: .4byte gUnknown_0202E8CC -_080BDDB4: .4byte gUnknown_0202E8CE +_080BDDB0: .4byte gSpecialVar_0x8004 +_080BDDB4: .4byte gSpecialVar_0x8005 _080BDDB8: - ldr r1, _080BDDC4 @ =gUnknown_0202E8CC + ldr r1, _080BDDC4 @ =gSpecialVar_0x8004 movs r0, 0x5 strh r0, [r1] - ldr r1, _080BDDC8 @ =gUnknown_0202E8CE + ldr r1, _080BDDC8 @ =gSpecialVar_0x8005 movs r0, 0x6 b _080BDE3A .align 2, 0 -_080BDDC4: .4byte gUnknown_0202E8CC -_080BDDC8: .4byte gUnknown_0202E8CE +_080BDDC4: .4byte gSpecialVar_0x8004 +_080BDDC8: .4byte gSpecialVar_0x8005 _080BDDCC: - ldr r1, _080BDDD8 @ =gUnknown_0202E8CC + ldr r1, _080BDDD8 @ =gSpecialVar_0x8004 movs r0, 0x12 strh r0, [r1] - ldr r1, _080BDDDC @ =gUnknown_0202E8CE + ldr r1, _080BDDDC @ =gSpecialVar_0x8005 movs r0, 0x11 b _080BDE3A .align 2, 0 -_080BDDD8: .4byte gUnknown_0202E8CC -_080BDDDC: .4byte gUnknown_0202E8CE +_080BDDD8: .4byte gSpecialVar_0x8004 +_080BDDDC: .4byte gSpecialVar_0x8005 _080BDDE0: - ldr r1, _080BDDEC @ =gUnknown_0202E8CC + ldr r1, _080BDDEC @ =gSpecialVar_0x8004 movs r0, 0x15 strh r0, [r1] - ldr r1, _080BDDF0 @ =gUnknown_0202E8CE + ldr r1, _080BDDF0 @ =gSpecialVar_0x8005 movs r0, 0x16 b _080BDE3A .align 2, 0 -_080BDDEC: .4byte gUnknown_0202E8CC -_080BDDF0: .4byte gUnknown_0202E8CE +_080BDDEC: .4byte gSpecialVar_0x8004 +_080BDDF0: .4byte gSpecialVar_0x8005 _080BDDF4: - ldr r1, _080BDE00 @ =gUnknown_0202E8CC + ldr r1, _080BDE00 @ =gSpecialVar_0x8004 movs r0, 0x8 strh r0, [r1] - ldr r1, _080BDE04 @ =gUnknown_0202E8CE + ldr r1, _080BDE04 @ =gSpecialVar_0x8005 movs r0, 0x9 b _080BDE3A .align 2, 0 -_080BDE00: .4byte gUnknown_0202E8CC -_080BDE04: .4byte gUnknown_0202E8CE +_080BDE00: .4byte gSpecialVar_0x8004 +_080BDE04: .4byte gSpecialVar_0x8005 _080BDE08: - ldr r1, _080BDE14 @ =gUnknown_0202E8CC + ldr r1, _080BDE14 @ =gSpecialVar_0x8004 movs r0, 0x13 strh r0, [r1] - ldr r1, _080BDE18 @ =gUnknown_0202E8CE + ldr r1, _080BDE18 @ =gSpecialVar_0x8005 movs r0, 0x14 b _080BDE3A .align 2, 0 -_080BDE14: .4byte gUnknown_0202E8CC -_080BDE18: .4byte gUnknown_0202E8CE +_080BDE14: .4byte gSpecialVar_0x8004 +_080BDE18: .4byte gSpecialVar_0x8005 _080BDE1C: - ldr r1, _080BDE28 @ =gUnknown_0202E8CC + ldr r1, _080BDE28 @ =gSpecialVar_0x8004 movs r0, 0x17 strh r0, [r1] - ldr r1, _080BDE2C @ =gUnknown_0202E8CE + ldr r1, _080BDE2C @ =gSpecialVar_0x8005 movs r0, 0x18 b _080BDE3A .align 2, 0 -_080BDE28: .4byte gUnknown_0202E8CC -_080BDE2C: .4byte gUnknown_0202E8CE +_080BDE28: .4byte gSpecialVar_0x8004 +_080BDE2C: .4byte gSpecialVar_0x8005 _080BDE30: - ldr r1, _080BDE40 @ =gUnknown_0202E8CC + ldr r1, _080BDE40 @ =gSpecialVar_0x8004 movs r0, 0xA strh r0, [r1] - ldr r1, _080BDE44 @ =gUnknown_0202E8CE + ldr r1, _080BDE44 @ =gSpecialVar_0x8005 movs r0, 0xB _080BDE3A: strh r0, [r1] @@ -885,14 +885,14 @@ _080BDE3C: pop {r0} bx r0 .align 2, 0 -_080BDE40: .4byte gUnknown_0202E8CC -_080BDE44: .4byte gUnknown_0202E8CE +_080BDE40: .4byte gSpecialVar_0x8004 +_080BDE44: .4byte gSpecialVar_0x8005 thumb_func_end GabbyAndTySetScriptVarsToFieldObjectLocalIds thumb_func_start sub_80BDE48 sub_80BDE48: @ 80BDE48 push {lr} - ldr r0, _080BDE60 @ =gUnknown_0202E8CE + ldr r0, _080BDE60 @ =gSpecialVar_0x8005 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x6 @@ -903,7 +903,7 @@ sub_80BDE48: @ 80BDE48 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BDE60: .4byte gUnknown_0202E8CE +_080BDE60: .4byte gSpecialVar_0x8005 _080BDE64: .4byte _080BDE68 .align 2, 0 _080BDE68: @@ -1446,7 +1446,7 @@ sub_80BE284: @ 80BE284 negs r0, r0 ands r0, r2 orrs r0, r1 - ldr r1, _080BE310 @ =gUnknown_0203869C + ldr r1, _080BE310 @ =gSpecialVar_0x8011 ldrb r2, [r1] movs r1, 0x7 ands r1, r2 @@ -1454,7 +1454,7 @@ sub_80BE284: @ 80BE284 negs r2, r2 ands r0, r2 orrs r0, r1 - ldr r1, _080BE314 @ =gUnknown_0203869E + ldr r1, _080BE314 @ =gSpecialVar_0x8010 ldrb r1, [r1] ands r3, r1 lsls r3, 3 @@ -1488,8 +1488,8 @@ _080BE2FE: _080BE304: .4byte gSaveBlock1 + 0x2A98 _080BE308: .4byte 0xfffffca0 _080BE30C: .4byte gUnknown_03005D38 -_080BE310: .4byte gUnknown_0203869C -_080BE314: .4byte gUnknown_0203869E +_080BE310: .4byte gSpecialVar_0x8011 +_080BE314: .4byte gSpecialVar_0x8010 _080BE318: .4byte gUnknown_02038694 _080BE31C: .4byte gPlayerParty thumb_func_end sub_80BE284 @@ -1553,7 +1553,7 @@ _080BE39C: movs r0, 0x64 _080BE39E: strb r0, [r6, 0x1A] - ldr r0, _080BE3B8 @ =gUnknown_0202E8CC + ldr r0, _080BE3B8 @ =gSpecialVar_0x8004 ldrh r0, [r0] strb r0, [r6, 0x1B] adds r0, r6, 0 @@ -1564,7 +1564,7 @@ _080BE39E: pop {r0} bx r0 .align 2, 0 -_080BE3B8: .4byte gUnknown_0202E8CC +_080BE3B8: .4byte gSpecialVar_0x8004 thumb_func_end sub_80BE320 thumb_func_start sub_80BE3BC @@ -1665,7 +1665,7 @@ sub_80BE478: @ 80BE478 ldrh r0, [r0] cmp r0, 0x1 beq _080BE548 - ldr r0, _080BE558 @ =gUnknown_0202E8CC + ldr r0, _080BE558 @ =gSpecialVar_0x8004 mov r8, r0 ldrh r0, [r0] movs r7, 0x64 @@ -1755,7 +1755,7 @@ _080BE548: bx r0 .align 2, 0 _080BE554: .4byte gScriptResult -_080BE558: .4byte gUnknown_0202E8CC +_080BE558: .4byte gSpecialVar_0x8004 _080BE55C: .4byte gPlayerParty _080BE560: .4byte gStringVar1 _080BE564: .4byte gSaveBlock2 @@ -1766,7 +1766,7 @@ _080BE56C: .4byte gSaveBlock1 + 0x2738 thumb_func_start StartMassOutbreak StartMassOutbreak: @ 80BE570 push {r4,lr} - ldr r0, _080BE5F0 @ =gUnknown_0202E8CC + ldr r0, _080BE5F0 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -1830,7 +1830,7 @@ StartMassOutbreak: @ 80BE570 pop {r0} bx r0 .align 2, 0 -_080BE5F0: .4byte gUnknown_0202E8CC +_080BE5F0: .4byte gSpecialVar_0x8004 _080BE5F4: .4byte gSaveBlock1 + 0x2738 _080BE5F8: .4byte 0x000003d5 thumb_func_end StartMassOutbreak @@ -1953,7 +1953,7 @@ sub_80BE6A0: @ 80BE6A0 ands r1, r2 orrs r1, r0 strb r1, [r4, 0x4] - ldr r0, _080BE76C @ =gUnknown_0202E8D2 + ldr r0, _080BE76C @ =gSpecialVar_0x8007 ldrb r0, [r0] lsls r0, 4 movs r2, 0xF @@ -2004,7 +2004,7 @@ sub_80BE6A0: @ 80BE6A0 _080BE760: .4byte gUnknown_03005D38 _080BE764: .4byte gSaveBlock1 + 0x2738 _080BE768: .4byte gPlayerParty -_080BE76C: .4byte gUnknown_0202E8D2 +_080BE76C: .4byte gSpecialVar_0x8007 _080BE770: .4byte gSaveBlock2 thumb_func_end sub_80BE6A0 @@ -2887,14 +2887,14 @@ _080BEE12: lsls r0, 1 cmp r1, r0 bne _080BEE3A - ldr r0, _080BEE2C @ =gUnknown_0202E8DE + ldr r0, _080BEE2C @ =gScriptLastTalked ldrh r0, [r0] cmp r0, 0x1A beq _080BEE0E b _080BEE3A .align 2, 0 _080BEE28: .4byte gSaveBlock1 -_080BEE2C: .4byte gUnknown_0202E8DE +_080BEE2C: .4byte gScriptLastTalked _080BEE30: ldr r0, _080BEE40 @ =gSaveBlock1 ldrh r1, [r0, 0x4] @@ -3181,7 +3181,7 @@ _080BF05C: .4byte gUnknown_083CE048 thumb_func_start SetContestCategoryStringVarForInterview SetContestCategoryStringVarForInterview: @ 80BF060 push {lr} - ldr r0, _080BF080 @ =gUnknown_0202E8CC + ldr r0, _080BF080 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -3196,7 +3196,7 @@ SetContestCategoryStringVarForInterview: @ 80BF060 pop {r0} bx r0 .align 2, 0 -_080BF080: .4byte gUnknown_0202E8CC +_080BF080: .4byte gSpecialVar_0x8004 _080BF084: .4byte gSaveBlock1 + 0x2738 thumb_func_end SetContestCategoryStringVarForInterview @@ -3514,7 +3514,7 @@ sub_80BF2C4: @ 80BF2C4 ldr r1, _080BF2E0 @ =gScriptResult movs r0, 0 strh r0, [r1] - ldr r0, _080BF2E4 @ =gUnknown_0202E8CE + ldr r0, _080BF2E4 @ =gSpecialVar_0x8005 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x6 @@ -3526,7 +3526,7 @@ sub_80BF2C4: @ 80BF2C4 mov pc, r0 .align 2, 0 _080BF2E0: .4byte gScriptResult -_080BF2E4: .4byte gUnknown_0202E8CE +_080BF2E4: .4byte gSpecialVar_0x8005 _080BF2E8: .4byte _080BF2EC .align 2, 0 _080BF2EC: @@ -4051,7 +4051,7 @@ sub_80BF6D8: @ 80BF6D8 bl sub_80BF720 ldr r1, _080BF704 @ =gUnknown_03005D38 strb r0, [r1] - ldr r2, _080BF708 @ =gUnknown_0202E8D0 + ldr r2, _080BF708 @ =gSpecialVar_0x8006 ldrb r1, [r1] lsls r1, 24 asrs r1, 24 @@ -4068,7 +4068,7 @@ sub_80BF6D8: @ 80BF6D8 .align 2, 0 _080BF700: .4byte gSaveBlock1 + 0x2738 _080BF704: .4byte gUnknown_03005D38 -_080BF708: .4byte gUnknown_0202E8D0 +_080BF708: .4byte gSpecialVar_0x8006 _080BF70C: .4byte gScriptResult _080BF710: ldr r1, _080BF71C @ =gScriptResult @@ -4428,7 +4428,7 @@ sub_80BF974: @ 80BF974 push {r4,lr} movs r1, 0 ldr r4, _080BF994 @ =gSaveBlock1 - ldr r0, _080BF998 @ =gUnknown_0202E8CC + ldr r0, _080BF998 @ =gSpecialVar_0x8004 ldrh r2, [r0] ldr r3, _080BF99C @ =0x00002738 _080BF980: @@ -4444,7 +4444,7 @@ _080BF980: b _080BF9AC .align 2, 0 _080BF994: .4byte gSaveBlock1 -_080BF998: .4byte gUnknown_0202E8CC +_080BF998: .4byte gSpecialVar_0x8004 _080BF99C: .4byte 0x00002738 _080BF9A0: adds r0, r1, 0x1 @@ -4462,7 +4462,7 @@ _080BF9AC: thumb_func_start sub_80BF9B4 sub_80BF9B4: @ 80BF9B4 push {r4,lr} - ldr r0, _080BF9E0 @ =gUnknown_0202E8CC + ldr r0, _080BF9E0 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -4481,7 +4481,7 @@ sub_80BF9B4: @ 80BF9B4 movs r0, 0x1 b _080BF9F2 .align 2, 0 -_080BF9E0: .4byte gUnknown_0202E8CC +_080BF9E0: .4byte gSpecialVar_0x8004 _080BF9E4: .4byte gPlayerParty _080BF9E8: .4byte gStringVar1 _080BF9EC: .4byte gStringVar3 @@ -4501,7 +4501,7 @@ sub_80BF9F8: @ 80BF9F8 mov r4, r8 push {r4-r6} sub sp, 0x8 - ldr r0, _080BFAA0 @ =gUnknown_0202E8CC + ldr r0, _080BFAA0 @ =gSpecialVar_0x8004 mov r9, r0 ldrh r0, [r0] movs r1, 0x64 @@ -4573,7 +4573,7 @@ sub_80BF9F8: @ 80BF9F8 pop {r0} bx r0 .align 2, 0 -_080BFAA0: .4byte gUnknown_0202E8CC +_080BFAA0: .4byte gSpecialVar_0x8004 _080BFAA4: .4byte gPlayerParty _080BFAA8: .4byte gStringVar3 _080BFAAC: .4byte gStringVar2 @@ -4583,7 +4583,7 @@ _080BFAB0: .4byte c2_080CC144 thumb_func_start c2_080CC144 c2_080CC144: @ 80BFAB4 push {lr} - ldr r0, _080BFAD4 @ =gUnknown_0202E8CC + ldr r0, _080BFAD4 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -4596,7 +4596,7 @@ c2_080CC144: @ 80BFAB4 pop {r0} bx r0 .align 2, 0 -_080BFAD4: .4byte gUnknown_0202E8CC +_080BFAD4: .4byte gSpecialVar_0x8004 _080BFAD8: .4byte gPlayerParty _080BFADC: .4byte gStringVar2 thumb_func_end c2_080CC144 @@ -4604,7 +4604,7 @@ _080BFADC: .4byte gStringVar2 thumb_func_start sub_80BFAE0 sub_80BFAE0: @ 80BFAE0 push {r4,lr} - ldr r0, _080BFB04 @ =gUnknown_0202E8CC + ldr r0, _080BFB04 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -4620,7 +4620,7 @@ sub_80BFAE0: @ 80BFAE0 pop {r0} bx r0 .align 2, 0 -_080BFB04: .4byte gUnknown_0202E8CC +_080BFB04: .4byte gSpecialVar_0x8004 _080BFB08: .4byte gPlayerParty _080BFB0C: .4byte gStringVar1 thumb_func_end sub_80BFAE0 @@ -4630,7 +4630,7 @@ sub_80BFB10: @ 80BFB10 push {r4,lr} bl sub_80BFB94 adds r4, r0, 0 - ldr r0, _080BFB38 @ =gUnknown_0202E8CC + ldr r0, _080BFB38 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -4645,7 +4645,7 @@ sub_80BFB10: @ 80BFB10 movs r0, 0 b _080BFB48 .align 2, 0 -_080BFB38: .4byte gUnknown_0202E8CC +_080BFB38: .4byte gSpecialVar_0x8004 _080BFB3C: .4byte gPlayerParty _080BFB40: .4byte gScriptResult _080BFB44: @@ -6290,7 +6290,7 @@ _080C07C0: .4byte 0x00002abd DoTVShow: @ 80C07C4 push {lr} ldr r2, _080C07F8 @ =gSaveBlock1 - ldr r0, _080C07FC @ =gUnknown_0202E8CC + ldr r0, _080C07FC @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -6318,7 +6318,7 @@ _080C07EE: mov pc, r0 .align 2, 0 _080C07F8: .4byte gSaveBlock1 -_080C07FC: .4byte gUnknown_0202E8CC +_080C07FC: .4byte gSpecialVar_0x8004 _080C0800: .4byte 0x00002739 _080C0804: .4byte _080C0808 .align 2, 0 @@ -6428,7 +6428,7 @@ _080C0914: thumb_func_start DoTVShowBravoTrainerPokemonProfile DoTVShowBravoTrainerPokemonProfile: @ 80C091C push {r4,r5,lr} - ldr r0, _080C0948 @ =gUnknown_0202E8CC + ldr r0, _080C0948 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -6450,7 +6450,7 @@ _080C093C: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C0948: .4byte gUnknown_0202E8CC +_080C0948: .4byte gSpecialVar_0x8004 _080C094C: .4byte gSaveBlock1 + 0x2738 _080C0950: .4byte gScriptResult _080C0954: .4byte gUnknown_020387E8 @@ -6704,7 +6704,7 @@ _080C0B98: .4byte gUnknown_083D1524 thumb_func_start DoTVShowBravoTrainerBattleTowerProfile DoTVShowBravoTrainerBattleTowerProfile: @ 80C0B9C push {r4,r5,lr} - ldr r0, _080C0BC8 @ =gUnknown_0202E8CC + ldr r0, _080C0BC8 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -6727,7 +6727,7 @@ _080C0BBE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C0BC8: .4byte gUnknown_0202E8CC +_080C0BC8: .4byte gSpecialVar_0x8004 _080C0BCC: .4byte gSaveBlock1 + 0x2738 _080C0BD0: .4byte gScriptResult _080C0BD4: .4byte gUnknown_020387E8 @@ -6977,7 +6977,7 @@ _080C0DFC: .4byte gUnknown_083D1548 thumb_func_start DoTVShowTodaysSmartShopper DoTVShowTodaysSmartShopper: @ 80C0E00 push {r4-r6,lr} - ldr r0, _080C0E2C @ =gUnknown_0202E8CC + ldr r0, _080C0E2C @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -7000,7 +7000,7 @@ _080C0E22: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C0E2C: .4byte gUnknown_0202E8CC +_080C0E2C: .4byte gSpecialVar_0x8004 _080C0E30: .4byte gSaveBlock1 + 0x2738 _080C0E34: .4byte gScriptResult _080C0E38: .4byte gUnknown_020387E8 @@ -7231,7 +7231,7 @@ _080C102C: .4byte gUnknown_083D14F0 DoTVShowTheNameRaterShow: @ 80C1030 push {r4-r7,lr} sub sp, 0x8 - ldr r0, _080C1060 @ =gUnknown_0202E8CC + ldr r0, _080C1060 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -7254,7 +7254,7 @@ _080C1054: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C1060: .4byte gUnknown_0202E8CC +_080C1060: .4byte gSpecialVar_0x8004 _080C1064: .4byte gSaveBlock1 + 0x2738 _080C1068: .4byte gScriptResult _080C106C: .4byte gUnknown_020387E8 @@ -7616,7 +7616,7 @@ _080C13A8: .4byte gUnknown_083D1584 thumb_func_start DoTVShowPokemonTodaySuccessfulCapture DoTVShowPokemonTodaySuccessfulCapture: @ 80C13AC push {r4-r6,lr} - ldr r0, _080C13D8 @ =gUnknown_0202E8CC + ldr r0, _080C13D8 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -7639,7 +7639,7 @@ _080C13CE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C13D8: .4byte gUnknown_0202E8CC +_080C13D8: .4byte gSpecialVar_0x8004 _080C13DC: .4byte gSaveBlock1 + 0x2738 _080C13E0: .4byte gScriptResult _080C13E4: .4byte gUnknown_020387E8 @@ -7869,7 +7869,7 @@ _080C15F0: .4byte gUnknown_083D14C0 thumb_func_start DoTVShowPokemonTodayFailedCapture DoTVShowPokemonTodayFailedCapture: @ 80C15F4 push {r4,r5,lr} - ldr r0, _080C1620 @ =gUnknown_0202E8CC + ldr r0, _080C1620 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -7891,7 +7891,7 @@ _080C1614: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C1620: .4byte gUnknown_0202E8CC +_080C1620: .4byte gSpecialVar_0x8004 _080C1624: .4byte gSaveBlock1 + 0x2738 _080C1628: .4byte gScriptResult _080C162C: .4byte gUnknown_020387E8 @@ -8026,7 +8026,7 @@ _080C1750: .4byte gUnknown_083D15D0 thumb_func_start DoTVShowPokemonFanClubLetter DoTVShowPokemonFanClubLetter: @ 80C1754 push {r4-r7,lr} - ldr r0, _080C1780 @ =gUnknown_0202E8CC + ldr r0, _080C1780 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -8049,7 +8049,7 @@ _080C1776: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C1780: .4byte gUnknown_0202E8CC +_080C1780: .4byte gSpecialVar_0x8004 _080C1784: .4byte gSaveBlock1 + 0x2738 _080C1788: .4byte gScriptResult _080C178C: .4byte gUnknown_020387E8 @@ -8239,7 +8239,7 @@ _080C1974: .4byte gUnknown_083D1470 thumb_func_start DoTVShowRecentHappenings DoTVShowRecentHappenings: @ 80C1978 push {r4-r7,lr} - ldr r0, _080C19A4 @ =gUnknown_0202E8CC + ldr r0, _080C19A4 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -8262,7 +8262,7 @@ _080C199A: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C19A4: .4byte gUnknown_0202E8CC +_080C19A4: .4byte gSpecialVar_0x8004 _080C19A8: .4byte gSaveBlock1 + 0x2738 _080C19AC: .4byte gScriptResult _080C19B0: .4byte gUnknown_020387E8 @@ -8386,7 +8386,7 @@ _080C1B04: .4byte gUnknown_083D1490 thumb_func_start DoTVShowPokemonFanClubOpinions DoTVShowPokemonFanClubOpinions: @ 80C1B08 push {r4-r6,lr} - ldr r0, _080C1B30 @ =gUnknown_0202E8CC + ldr r0, _080C1B30 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -8406,7 +8406,7 @@ DoTVShowPokemonFanClubOpinions: @ 80C1B08 beq _080C1B46 b _080C1BD6 .align 2, 0 -_080C1B30: .4byte gUnknown_0202E8CC +_080C1B30: .4byte gSpecialVar_0x8004 _080C1B34: .4byte gSaveBlock1 + 0x2738 _080C1B38: .4byte gScriptResult _080C1B3C: .4byte gUnknown_020387E8 @@ -8496,7 +8496,7 @@ nullsub_22: @ 80C1BF4 thumb_func_start DoTVShowPokemonNewsMassOutbreak DoTVShowPokemonNewsMassOutbreak: @ 80C1BF8 push {r4,lr} - ldr r0, _080C1C40 @ =gUnknown_0202E8CC + ldr r0, _080C1C40 @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r4, r0, 3 adds r4, r0 @@ -8527,7 +8527,7 @@ DoTVShowPokemonNewsMassOutbreak: @ 80C1BF8 pop {r0} bx r0 .align 2, 0 -_080C1C40: .4byte gUnknown_0202E8CC +_080C1C40: .4byte gSpecialVar_0x8004 _080C1C44: .4byte gSaveBlock1 + 0x2738 _080C1C48: .4byte gStringVar1 _080C1C4C: .4byte gStringVar2 @@ -8748,7 +8748,7 @@ _080C1E34: .4byte gUnknown_083D1600 thumb_func_start DoTVShowPokemonAngler DoTVShowPokemonAngler: @ 80C1E38 push {r4,r5,lr} - ldr r0, _080C1E5C @ =gUnknown_0202E8CC + ldr r0, _080C1E5C @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -8766,7 +8766,7 @@ DoTVShowPokemonAngler: @ 80C1E38 strb r1, [r0] b _080C1E74 .align 2, 0 -_080C1E5C: .4byte gUnknown_0202E8CC +_080C1E5C: .4byte gSpecialVar_0x8004 _080C1E60: .4byte gSaveBlock1 + 0x2738 _080C1E64: .4byte gScriptResult _080C1E68: .4byte gUnknown_020387E8 @@ -8842,7 +8842,7 @@ _080C1F04: .4byte gUnknown_083D15EC thumb_func_start DoTVShowTheWorldOfMasters DoTVShowTheWorldOfMasters: @ 80C1F08 push {r4-r6,lr} - ldr r0, _080C1F30 @ =gUnknown_0202E8CC + ldr r0, _080C1F30 @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -8862,7 +8862,7 @@ DoTVShowTheWorldOfMasters: @ 80C1F08 beq _080C1F46 b _080C1FB6 .align 2, 0 -_080C1F30: .4byte gUnknown_0202E8CC +_080C1F30: .4byte gSpecialVar_0x8004 _080C1F34: .4byte gSaveBlock1 + 0x2738 _080C1F38: .4byte gScriptResult _080C1F3C: .4byte gUnknown_020387E8 @@ -8945,7 +8945,7 @@ TVShowDone: @ 80C1FDC movs r0, 0 strb r0, [r1] ldr r2, _080C2008 @ =gSaveBlock1 - ldr r0, _080C200C @ =gUnknown_0202E8CC + ldr r0, _080C200C @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -8960,7 +8960,7 @@ TVShowDone: @ 80C1FDC _080C2000: .4byte gScriptResult _080C2004: .4byte gUnknown_020387E8 _080C2008: .4byte gSaveBlock1 -_080C200C: .4byte gUnknown_0202E8CC +_080C200C: .4byte gSpecialVar_0x8004 _080C2010: .4byte 0x00002739 thumb_func_end TVShowDone diff --git a/constants/constants.inc b/constants/constants.inc index de281bd93..81d3b72fe 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -17,7 +17,6 @@ .include "constants/battle_tower_constants.inc" .include "constants/opponent_constants.inc" .include "constants/decorations.inc" - .include "constants/variables.inc" .include "constants/songs.inc" .include "constants/version.inc" .include "constants/region_map_sections.inc" diff --git a/constants/variables.inc b/constants/variables.inc index b92ca5975..a9be34463 100644 --- a/constants/variables.inc +++ b/constants/variables.inc @@ -1,3 +1,4 @@ - .equiv FACING, 0x800c - .equiv RESULT, 0x800d - .equiv LAST_TALKED, 0x800f + .equiv FACING, 0x800C + .equiv RESULT, 0x800D + .equiv ITEM_ID, 0x800E + .equiv LAST_TALKED, 0x800F diff --git a/data/event_scripts.s b/data/event_scripts.s index 4289b6e8c..382d7c880 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,6 +1,7 @@ .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" + .include "constants/variables.inc" .section script_data, "aw", %progbits @@ -9,24 +10,24 @@ .align 2 gSpecialVars:: - .4byte 0x202e8c4 - .4byte 0x202e8c6 - .4byte 0x202e8c8 - .4byte 0x202e8ca - .4byte 0x202e8cc - .4byte 0x202e8ce - .4byte 0x202e8d0 - .4byte 0x202e8d2 - .4byte 0x202e8d4 - .4byte 0x202e8d6 - .4byte 0x202e8d8 - .4byte 0x202e8da - .4byte 0x202e8e0 + .4byte gSpecialVar_0x8000 + .4byte gSpecialVar_0x8001 + .4byte gSpecialVar_0x8002 + .4byte gSpecialVar_0x8003 + .4byte gSpecialVar_0x8004 + .4byte gSpecialVar_0x8005 + .4byte gSpecialVar_0x8006 + .4byte gSpecialVar_0x8007 + .4byte gSpecialVar_0x8008 + .4byte gSpecialVar_0x8009 + .4byte gSpecialVar_0x800A + .4byte gSpecialVar_0x800B + .4byte gScriptFacing .4byte gScriptResult - .4byte 0x203855e - .4byte 0x202e8de - .4byte 0x203869e - .4byte 0x203869c + .4byte gScriptItemId + .4byte gScriptLastTalked + .4byte gSpecialVar_0x8010 + .4byte gSpecialVar_0x8011 .include "data/specials.inc" diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index f6d98689e..fcf32d15d 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -43,9 +43,9 @@ Route102_EventScript_1A1577:: @ 81A1577 closebutton special 44 waitstate - compare 0x800e, 0 + compare ITEM_ID, 0 jumpeq Route102_EventScript_1A1593 - removeitem 0x800e, 1 + removeitem ITEM_ID, 1 call Route102_EventScript_1A16A9 Route102_EventScript_1A1593:: @ 81A1593 diff --git a/src/battle_setup.c b/src/battle_setup.c index 9a28b2d35..dc8564a99 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -150,7 +150,7 @@ extern struct TrainerEyeTrainer gTrainerEyeTrainers[]; extern u8 gOtherText_CancelWithTerminator[]; extern u16 gUnknown_020239F8; -extern u16 gUnknown_0202E8DE; +extern u16 gScriptLastTalked; extern u8 gUnknown_02024D26; extern u16 gBadgeFlags[]; @@ -696,7 +696,7 @@ void battle_80801F0(void) { if (gTrainerMapObjectLocalId) { - gUnknown_0202E8DE = gTrainerMapObjectLocalId; + gScriptLastTalked = gTrainerMapObjectLocalId; gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(gTrainerMapObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } } @@ -745,7 +745,7 @@ u8 *TrainerBattleConfigure(u8 *data) void TrainerWantsBattle(u8 trainerMapObjId, u8 *trainerScript) { gSelectedMapObject = trainerMapObjId; - gUnknown_0202E8DE = gMapObjects[trainerMapObjId].localId; + gScriptLastTalked = gMapObjects[trainerMapObjId].localId; TrainerBattleConfigure(trainerScript + 1); ScriptContext1_SetupScript(gUnknown_0819F80B); ScriptContext2_Enable(); diff --git a/src/berry.c b/src/berry.c index 410f5950e..79e716480 100644 --- a/src/berry.c +++ b/src/berry.c @@ -19,10 +19,11 @@ extern u8 *GetFieldObjectScriptPointerForComparison(); extern struct Berry gBerries[]; extern u8 BerryTreeScript; extern struct BerryTree gUnknown_083CD780; -extern u16 gUnknown_0202E8DE; -extern u16 gUnknown_0202E8CC; -extern u16 gUnknown_0202E8CE; -extern u16 gUnknown_0202E8D0; +extern u16 gScriptItemId; +extern u16 gScriptLastTalked; +extern u16 gSpecialVar_0x8004; +extern u16 gSpecialVar_0x8005; +extern u16 gSpecialVar_0x8006; u8 CalcBerryYield(struct BerryTree *tree); @@ -388,17 +389,17 @@ void FieldObjectInteractionGetBerryTreeData(void) id = FieldObjectGetBerryTreeId(gSelectedMapObject); berry = GetBerryTypeByBerryTreeId(id); ResetBerryTreeSparkleFlag(id); - unk = gUnknown_0202E8DE; + unk = gScriptLastTalked; num = gSaveBlock1.location.mapNum; group = gSaveBlock1.location.mapGroup; if (sub_8060234(unk, num, group)) - gUnknown_0202E8CC = 0xff; + gSpecialVar_0x8004 = 0xff; else - gUnknown_0202E8CC = (u8)GetStageByBerryTreeId(id); + gSpecialVar_0x8004 = (u8)GetStageByBerryTreeId(id); - gUnknown_0202E8CE = (u8)GetNumStagesWateredByBerryTreeId(id); - gUnknown_0202E8D0 = (u8)GetBerryCountByBerryTreeId(id); + gSpecialVar_0x8005 = (u8)GetNumStagesWateredByBerryTreeId(id); + gSpecialVar_0x8006 = (u8)GetBerryCountByBerryTreeId(id); GetBerryNameByBerryType(berry, gStringVar1); } @@ -409,8 +410,7 @@ void sub_80B4EE4(void) void FieldObjectInteractionPlantBerryTree(void) { - extern u16 word_203855E; - u8 berry = ItemIdToBerryType(word_203855E); + u8 berry = ItemIdToBerryType(gScriptItemId); PlantBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject), berry, 1, 1); FieldObjectInteractionGetBerryTreeData(); } @@ -421,7 +421,7 @@ void FieldObjectInteractionPickBerryTree(void) u8 berry; id = FieldObjectGetBerryTreeId(gSelectedMapObject); berry = GetBerryTypeByBerryTreeId(id); - gUnknown_0202E8CC = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); + gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); } void FieldObjectInteractionRemoveBerryTree(void) @@ -431,7 +431,7 @@ void FieldObjectInteractionRemoveBerryTree(void) u8 group, num; id = FieldObjectGetBerryTreeId(gSelectedMapObject); RemoveBerryTree(id); - unk = gUnknown_0202E8DE; + unk = gScriptLastTalked; num = gSaveBlock1.location.mapNum; group = gSaveBlock1.location.mapGroup; sub_8060288(unk, num, group); diff --git a/src/dewford_trend.c b/src/dewford_trend.c index 6ae7a6ae7..8d683e072 100644 --- a/src/dewford_trend.c +++ b/src/dewford_trend.c @@ -10,7 +10,7 @@ extern u8 ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); extern struct EasyChatPair unk_2007800[5]; extern struct EasyChatPair unk_2007900[5]; extern u16 gScriptResult; -extern u16 gUnknown_0202E8CC; +extern u16 gSpecialVar_0x8004; void sub_80FA740(struct EasyChatPair *); void sub_80FA46C(struct EasyChatPair *, u16, u8); @@ -514,7 +514,7 @@ _080FA5B8: .4byte gSaveBlock1 + 0x2DD4\n\ void sub_80FA5BC(void) { - struct EasyChatPair *s = &gSaveBlock1.easyChatPairs[gUnknown_0202E8CC]; + struct EasyChatPair *s = &gSaveBlock1.easyChatPairs[gSpecialVar_0x8004]; ConvertEasyChatWordsToString(gStringVar1, s->words, 2, 1); } diff --git a/src/link.c b/src/link.c index 2a412ee35..47820185c 100644 --- a/src/link.c +++ b/src/link.c @@ -34,7 +34,7 @@ extern void sub_80516C4(u8, u16); extern u8 unk_2000000[]; extern u8 unk_2004000[]; extern u16 gUnknown_020239F8; -extern u16 word_203855E; +extern u16 gScriptItemId; extern u16 word_3004858; @@ -619,7 +619,7 @@ static void BuildSendCmd(u16 code) break; case 0xAAAB: gSendCmd[0] = 0xAAAB; - gSendCmd[1] = word_203855E; + gSendCmd[1] = gScriptItemId; break; case 0xCCCC: gSendCmd[0] = 0xCCCC; diff --git a/src/lottery_corner.c b/src/lottery_corner.c index 7b0ca6153..c807237af 100644 --- a/src/lottery_corner.c +++ b/src/lottery_corner.c @@ -5,12 +5,12 @@ #include "var.h" extern u16 gScriptResult; -extern u16 gUnknown_0202E8CC; +extern u16 gSpecialVar_0x8004; extern struct Pokemon gPlayerParty[6]; extern struct PokemonStorage gPokemonStorage; -extern u16 gUnknown_0202E8CE; +extern u16 gSpecialVar_0x8005; extern u16 gUnknown_0840CB04[]; -extern u16 gUnknown_0202E8D0; +extern u16 gSpecialVar_0x8006; static EWRAM_DATA u16 sWinNumberDigit = 0; static EWRAM_DATA u16 sOtIdDigit = 0; @@ -51,7 +51,7 @@ void PickLotteryCornerTicket(void) u32 box; u32 slot; - gUnknown_0202E8CC = 0; + gSpecialVar_0x8004 = 0; slot = 0; box = 0; for(i = 0; i < 6; i++) @@ -66,9 +66,9 @@ void PickLotteryCornerTicket(void) u32 otId = GetMonData(pkmn, MON_DATA_OT_ID); u8 a = GetMatchingDigits(gScriptResult, otId); - if(a > gUnknown_0202E8CC && a > 1) + if(a > gSpecialVar_0x8004 && a > 1) { - gUnknown_0202E8CC = a - 1; + gSpecialVar_0x8004 = a - 1; box = 14; slot = i; } @@ -91,9 +91,9 @@ void PickLotteryCornerTicket(void) u32 otId = GetBoxMonData(pkmn, MON_DATA_OT_ID); u8 a = GetMatchingDigits(gScriptResult, otId); - if(a > gUnknown_0202E8CC && a > 1) + if(a > gSpecialVar_0x8004 && a > 1) { - gUnknown_0202E8CC = a - 1; + gSpecialVar_0x8004 = a - 1; box = i; slot = j; } @@ -101,18 +101,18 @@ void PickLotteryCornerTicket(void) } } - if(gUnknown_0202E8CC != 0) + if(gSpecialVar_0x8004 != 0) { - gUnknown_0202E8CE = gUnknown_0840CB04[gUnknown_0202E8CC - 1]; + gSpecialVar_0x8005 = gUnknown_0840CB04[gSpecialVar_0x8004 - 1]; if(box == 14) { - gUnknown_0202E8D0 = 0; + gSpecialVar_0x8006 = 0; GetMonData(&gPlayerParty[slot], MON_DATA_NICKNAME, gStringVar1); } else { - gUnknown_0202E8D0 = 1; + gSpecialVar_0x8006 = 1; GetBoxMonData(&gPokemonStorage.boxes[box][slot], MON_DATA_NICKNAME, gStringVar1); } StringGetEnd10(gStringVar1); diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c index d4115418b..422903a97 100644 --- a/src/map_obj_lock.c +++ b/src/map_obj_lock.c @@ -13,7 +13,7 @@ extern void sub_80A2178(void); extern void sub_806451C(void); extern u8 FieldObjectFaceOppositeDirection(void *, u8); -extern u16 gUnknown_0202E8E0; +extern u16 gScriptFacing; bool8 walkrun_is_standing_still(void) { @@ -116,7 +116,7 @@ void unref_sub_8064E5C(void) void sub_8064EAC(void) { - FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gUnknown_0202E8E0); + FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gScriptFacing); } void sub_8064ED4(void) diff --git a/src/record_mixing.c b/src/record_mixing.c index a7955f76a..4996dc01f 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -23,7 +23,7 @@ extern u8 gUnknown_083D028A[2][3]; extern u8 gUnknown_083D0290[9][4]; extern u8 gUnknown_02038738[]; //Don't know what type this points to -extern u16 gUnknown_0202E8CE; +extern u16 gSpecialVar_0x8005; extern u32 gUnknown_03005D2C; extern u8 gUnknown_03000718; extern u8 gUnknown_0300071C[]; @@ -247,7 +247,7 @@ void sub_80B9484(u8 taskId) switch(taskData[TD_STATE]) { case 0: - sub_8007270(gUnknown_0202E8CE); + sub_8007270(gSpecialVar_0x8005); VarSet(0x4000, 1); gUnknown_03000718 = 0; sub_80B92AC(); diff --git a/src/scrcmd.c b/src/scrcmd.c index dbdbc6674..f3eb96ba0 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -152,16 +152,16 @@ extern u16 gUnknown_0202E8B6; extern u16 gUnknown_0202E8B8; extern u16 gUnknown_0202E8BA; extern u16 gUnknown_0202E8BC; -extern u16 gUnknown_0202E8C4; -extern u16 gUnknown_0202E8C6; -extern u16 gUnknown_0202E8C8; -extern u16 gUnknown_0202E8CC; +extern u16 gSpecialVar_0x8000; +extern u16 gSpecialVar_0x8001; +extern u16 gSpecialVar_0x8002; +extern u16 gSpecialVar_0x8004; extern u16 gScriptResult; extern u32 gUnknown_0202FF84[]; -extern u16 gUnknown_0203869C; +extern u16 gSpecialVar_0x8011; extern SpecialFunc gSpecials[]; extern u8 *gStdScripts[]; @@ -714,9 +714,9 @@ bool8 ScrCmd_checkdailyflags(struct ScriptContext *ctx) bool8 ScrCmd_resetvars(struct ScriptContext *ctx) { RtcCalcLocalTime(); - gUnknown_0202E8C4 = gLocalTime.hours; - gUnknown_0202E8C6 = gLocalTime.minutes; - gUnknown_0202E8C8 = gLocalTime.seconds; + gSpecialVar_0x8000 = gLocalTime.hours; + gSpecialVar_0x8001 = gLocalTime.minutes; + gSpecialVar_0x8002 = gLocalTime.seconds; return FALSE; } @@ -1571,7 +1571,7 @@ bool8 ScrCmd_checkattack(struct ScriptContext *ctx) if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) && pokemon_has_move(&gPlayerParty[i], moveId) == TRUE) { gScriptResult = i; - gUnknown_0202E8CC = species; + gSpecialVar_0x8004 = species; break; } } @@ -1792,7 +1792,7 @@ bool8 ScrCmd_showcontestresults(struct ScriptContext *ctx) bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx) { - sub_80C4980(gUnknown_0203869C); + sub_80C4980(gSpecialVar_0x8011); ScriptContext1_Stop(); return TRUE; } diff --git a/src/wallclock.c b/src/wallclock.c index 8706649d6..05e30a8cb 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -14,7 +14,7 @@ void remove_some_task(void); void LoadCompressedObjectPic(void *); -extern u16 gUnknown_0202E8CC; +extern u16 gSpecialVar_0x8004; extern u16 gMiscClockMale_Pal[]; extern u16 gMiscClockFemale_Pal[]; extern u8 gMiscClock_Gfx[]; @@ -118,7 +118,7 @@ static void LoadWallClockGraphics(void) DmaClear16(3, PLTT, PLTT_SIZE); LZ77UnCompVram(gMiscClock_Gfx, (void *)VRAM); - if(gUnknown_0202E8CC == MALE) + if(gSpecialVar_0x8004 == MALE) LoadPalette(gMiscClockMale_Pal, 0, 32); else LoadPalette(gMiscClockFemale_Pal, 0, 32); diff --git a/sym_ewram.txt b/sym_ewram.txt index 924ee969f..93a4ca670 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -418,34 +418,49 @@ gUnknown_0202E8C0: @ 202E8C0 gUnknown_0202E8C2: @ 202E8C2 .space 0x2 -gUnknown_0202E8C4: @ 202E8C4 +gSpecialVar_0x8000: @ 202E8C4 .space 0x2 -gUnknown_0202E8C6: @ 202E8C6 +gSpecialVar_0x8001: @ 202E8C6 .space 0x2 -gUnknown_0202E8C8: @ 202E8C8 - .space 0x4 +gSpecialVar_0x8002: @ 202E8C8 + .space 0x2 -gUnknown_0202E8CC: @ 202E8CC +gSpecialVar_0x8003: @ 202E8CA .space 0x2 -gUnknown_0202E8CE: @ 202E8CE +gSpecialVar_0x8004: @ 202E8CC .space 0x2 -gUnknown_0202E8D0: @ 202E8D0 +gSpecialVar_0x8005: @ 202E8CE .space 0x2 -gUnknown_0202E8D2: @ 202E8D2 - .space 0xA +gSpecialVar_0x8006: @ 202E8D0 + .space 0x2 + +gSpecialVar_0x8007: @ 202E8D2 + .space 0x2 + +gSpecialVar_0x8008: @ 202E8D4 + .space 0x2 + +gSpecialVar_0x8009: @ 202E8D6 + .space 0x2 + +gSpecialVar_0x800A: @ 202E8D8 + .space 0x2 + +gSpecialVar_0x800B: @ 202E8DA + .space 0x2 gScriptResult: @ 202E8DC .space 0x2 -gUnknown_0202E8DE: @ 202E8DE +gScriptLastTalked: @ 202E8DE .space 0x2 -gUnknown_0202E8E0: @ 202E8E0 +gScriptFacing: @ 202E8E0 .space 0x2 gUnknown_0202E8E2: @ 202E8E2 @@ -743,7 +758,7 @@ gUnknown_0203855B: @ 203855B gUnknown_0203855C: @ 203855C .space 0x2 -word_203855E: @ 203855E +gScriptItemId: @ 203855E .space 0x2 gUnknown_02038560: @ 2038560 @@ -812,10 +827,10 @@ gUnknown_0203869A: @ 203869A gUnknown_0203869B: @ 203869B .space 0x1 -gUnknown_0203869C: @ 203869C +gSpecialVar_0x8011: @ 203869C .space 0x2 -gUnknown_0203869E: @ 203869E +gSpecialVar_0x8010: @ 203869E .space 0x2 gUnknown_020386A0: @ 20386A0 |