diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom4.s | 2 | ||||
| -rw-r--r-- | asm/rom5.s | 60 |
2 files changed, 31 insertions, 31 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index b46245343..a6b508ff5 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -45774,7 +45774,7 @@ sub_8067488: @ 8067488 bx r1 .align 2, 0 _080674BC: .4byte gUnknown_083762F0 -_080674C0: .4byte gUnknown_083EB6C5 +_080674C0: .4byte gDecorations + 0x1 thumb_func_end sub_8067488 thumb_func_start s82_load_item_name diff --git a/asm/rom5.s b/asm/rom5.s index 5bff036a2..0ca3b9268 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -115989,7 +115989,7 @@ _080B3986: b _080B39C2 .align 2, 0 _080B39A0: .4byte 0x020231cc -_080B39A4: .4byte gUnknown_083EB6C5 +_080B39A4: .4byte gDecorations + 0x1 _080B39A8: .4byte 0x00002710 _080B39AC: ldrh r1, [r3, 0x14] @@ -116141,7 +116141,7 @@ _080B3ABA: bl sub_8072AB0 b _080B3AE0 .align 2, 0 -_080B3AC8: .4byte gUnknown_083EB6C4 +_080B3AC8: .4byte gDecorations _080B3ACC: ldr r0, _080B3AE8 movs r1, 0x30 @@ -117104,7 +117104,7 @@ _080B42BA: b _080B436C .align 2, 0 _080B42C8: .4byte 0x020386a0 -_080B42CC: .4byte gUnknown_083EB6C4 +_080B42CC: .4byte gDecorations _080B42D0: .4byte 0x02025734 _080B42D4: .4byte gUnknown_0840EDD2 _080B42D8: .4byte sub_80B3BD0 @@ -133250,7 +133250,7 @@ _080BBD70: .4byte 0x00004054 _080BBD74: .4byte 0x02025734 _080BBD78: .4byte 0x00001a2a _080BBD7C: .4byte 0x00001a1a -_080BBD80: .4byte gUnknown_083EB6C4 +_080BBD80: .4byte gDecorations _080BBD84: .4byte 0x00000e21 _080BBD88: mov r0, r8 @@ -133506,14 +133506,14 @@ _080BBF6C: .align 2, 0 _080BBF7C: .4byte 0x0202714e _080BBF80: .4byte 0x02025734 -_080BBF84: .4byte gUnknown_083EB6C4 +_080BBF84: .4byte gDecorations _080BBF88: .4byte 0x0202e828 _080BBF8C: .4byte 0x0202e8cc _080BBF90: .4byte 0x0202e8d0 _080BBF94: .4byte 0x0202e8d2 _080BBF98: .4byte 0x00003f20 _080BBF9C: .4byte 0x0202e8dc -_080BBFA0: .4byte gUnknown_083EB6E0 +_080BBFA0: .4byte gDecorations + 0x1C thumb_func_end sub_80BBDD0 thumb_func_start sub_80BBFA4 @@ -270873,7 +270873,7 @@ _080FEBC0: .4byte 0x020388d0 _080FEBC4: .4byte 0x0201f000 _080FEBC8: .4byte 0x020388f6 _080FEBCC: .4byte 0x03004b20 -_080FEBD0: .4byte gUnknown_083EB6C5 +_080FEBD0: .4byte gDecorations + 0x1 _080FEBD4: .4byte 0x020231cc _080FEBD8: .4byte gUnknown_083EC65A _080FEBDC: @@ -270895,7 +270895,7 @@ _080FEBF8: adds r5, r4, 0x1 b _080FEC0A .align 2, 0 -_080FEC00: .4byte gUnknown_083EB6C5 +_080FEC00: .4byte gDecorations + 0x1 _080FEC04: adds r0, r1, 0x1 lsls r0, 16 @@ -271039,7 +271039,7 @@ sub_80FECE0: @ 80FECE0 pop {r0} bx r0 .align 2, 0 -_080FED14: .4byte gUnknown_083EB6C4 +_080FED14: .4byte gDecorations _080FED18: .4byte 0x020388d0 thumb_func_end sub_80FECE0 @@ -271792,8 +271792,8 @@ _080FF2AC: mov r8, r4 b _080FF2C0 .align 2, 0 -_080FF2B4: .4byte gUnknown_083EB6E0 -_080FF2B8: .4byte gUnknown_083EB6C4 +_080FF2B4: .4byte gDecorations + 0x1C +_080FF2B8: .4byte gDecorations _080FF2BC: movs r0, 0 mov r8, r0 @@ -271855,7 +271855,7 @@ _080FF2EC: bl MapGridSetMetatileEntryAt b _080FF362 .align 2, 0 -_080FF334: .4byte gUnknown_083EB6C4 +_080FF334: .4byte gDecorations _080FF338: .4byte 0x0000ffff _080FF33C: asrs r0, r7, 16 @@ -271928,7 +271928,7 @@ sub_80FF394: @ 80FF394 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FF3BC: .4byte gUnknown_083EB6C4 +_080FF3BC: .4byte gDecorations _080FF3C0: .4byte _080FF3C4 .align 2, 0 _080FF3C4: @@ -272453,7 +272453,7 @@ AddDecorationIconObjectFromFieldObject: @ 80FF780 str r0, [r4, 0x4] b _080FF87E .align 2, 0 -_080FF810: .4byte gUnknown_083EB6C4 +_080FF810: .4byte gDecorations _080FF814: .4byte 0x00000884 _080FF818: .4byte 0x0202e828 _080FF81C: .4byte gUnknown_083EC954 @@ -272633,7 +272633,7 @@ _080FF980: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FF98C: .4byte gUnknown_083EB6C4 +_080FF98C: .4byte gDecorations _080FF990: .4byte 0x020388f5 _080FF994: .4byte 0x020388d0 _080FF998: .4byte _080FF99C @@ -273529,7 +273529,7 @@ sub_8100038: @ 8100038 .align 2, 0 _0810006C: .4byte 0x020388f5 _08100070: .4byte 0x020388d0 -_08100074: .4byte gUnknown_083EB6C4 +_08100074: .4byte gDecorations _08100078: .4byte gUnknown_0840FABE _0810007C: .4byte sub_81000A0 _08100080: @@ -273604,7 +273604,7 @@ sub_81000C4: @ 81000C4 bl sub_80FF394 b _0810013C .align 2, 0 -_0810010C: .4byte gUnknown_083EB6C4 +_0810010C: .4byte gDecorations _08100110: .4byte 0x020388f5 _08100114: .4byte 0x020388d0 _08100118: .4byte 0x03004b20 @@ -274963,7 +274963,7 @@ _08100B0A: pop {r0} bx r0 .align 2, 0 -_08100B10: .4byte gUnknown_083EB6C4 +_08100B10: .4byte gDecorations _08100B14: .4byte 0x0201f000 _08100B18: .4byte 0x020391b4 _08100B1C: .4byte 0x0202e828 @@ -275074,7 +275074,7 @@ _08100BD0: .align 2, 0 _08100BE0: .4byte 0x020391b4 _08100BE4: .4byte 0x0201f000 -_08100BE8: .4byte gUnknown_083EB6C4 +_08100BE8: .4byte gDecorations _08100BEC: movs r4, 0 adds r0, r2, r1 @@ -275740,7 +275740,7 @@ sub_8101118: @ 8101118 strb r0, [r2, 0x1] b _08101192 .align 2, 0 -_08101130: .4byte gUnknown_083EB6C4 +_08101130: .4byte gDecorations _08101134: cmp r1, 0x1 bne _08101140 @@ -276060,7 +276060,7 @@ _0810134A: movs r0, 0x1 b _081013AC .align 2, 0 -_08101390: .4byte gUnknown_083EB6C4 +_08101390: .4byte gDecorations _08101394: .4byte 0x020391b4 _08101398: .4byte 0x02039234 _0810139C: @@ -276163,7 +276163,7 @@ _0810143E: .align 2, 0 _08101450: .4byte 0x0201f000 _08101454: .4byte 0x02039234 -_08101458: .4byte gUnknown_083EB6C4 +_08101458: .4byte gDecorations _0810145C: .4byte 0x020391b4 thumb_func_end sub_81013B8 @@ -276639,7 +276639,7 @@ sub_81017A0: @ 81017A0 _081017EC: .4byte 0x020231cc _081017F0: .4byte 0x020388f5 _081017F4: .4byte 0x020388d0 -_081017F8: .4byte gUnknown_083EB6C5 +_081017F8: .4byte gDecorations + 0x1 _081017FC: .4byte 0x020234cc _08101800: .4byte gUnknown_0840FC39 _08101804: .4byte sub_8101824 @@ -294217,7 +294217,7 @@ _08109ADE: pop {r0} bx r0 .align 2, 0 -_08109B28: .4byte gUnknown_083EB6C5 +_08109B28: .4byte gDecorations + 0x1 _08109B2C: .4byte gUnknown_0840E645 _08109B30: .4byte 0x03004b20 thumb_func_end sub_8109A48 @@ -294439,7 +294439,7 @@ _08109CD6: bx r0 .align 2, 0 _08109CDC: .4byte 0x0202e8dc -_08109CE0: .4byte gUnknown_083EB6C4 +_08109CE0: .4byte gDecorations _08109CE4: .4byte 0x0202e8cc _08109CE8: .4byte 0x0202e8d0 _08109CEC: .4byte 0x020232cc @@ -294509,7 +294509,7 @@ _08109D74: .4byte 0x020388f5 _08109D78: .4byte 0x020388d0 _08109D7C: .4byte 0x020233cc _08109D80: .4byte 0x0202e8cc -_08109D84: .4byte gUnknown_083EB6C5 +_08109D84: .4byte gDecorations + 0x1 _08109D88: .4byte 0x020232cc _08109D8C: ldr r1, _08109DA4 @@ -380637,7 +380637,7 @@ _08134002: movs r0, 0x1 b _08134024 .align 2, 0 -_08134010: .4byte gUnknown_083EB6C4 +_08134010: .4byte gDecorations _08134014: .4byte gUnknown_08402E40 _08134018: adds r0, r2, 0x1 @@ -380682,7 +380682,7 @@ IsThereStorageSpaceForDecoration: @ 813402C movs r0, 0x1 b _0813406E .align 2, 0 -_08134064: .4byte gUnknown_083EB6C4 +_08134064: .4byte gDecorations _08134068: .4byte gUnknown_08402E40 _0813406C: movs r0, 0 @@ -380713,7 +380713,7 @@ sub_8134074: @ 8134074 movs r0, 0x1 b _081340A2 .align 2, 0 -_0813409C: .4byte gUnknown_083EB6C4 +_0813409C: .4byte gDecorations _081340A0: movs r0, 0 _081340A2: @@ -380770,7 +380770,7 @@ _081340F4: bx r1 .align 2, 0 _081340FC: .4byte gUnknown_08402E40 -_08134100: .4byte gUnknown_083EB6C4 +_08134100: .4byte gDecorations thumb_func_end sub_81340A8 thumb_func_start sub_8134104 |