diff options
| -rw-r--r-- | asm/heal_location.s | 12 | ||||
| -rw-r--r-- | asm/region_map.s | 16 | ||||
| -rw-r--r-- | data/data2.s | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/asm/heal_location.s b/asm/heal_location.s index 72d741024..6e8181b45 100644 --- a/asm/heal_location.s +++ b/asm/heal_location.s @@ -14,7 +14,7 @@ GetHealLocationIndexByMap: @ 80FA86C lsls r1, 16 lsrs r1, 16 movs r3, 0 - ldr r2, _080FA890 @ =gUnknown_083E5A20 + ldr r2, _080FA890 @ =gHealLocations _080FA87A: movs r0, 0 ldrsb r0, [r2, r0] @@ -27,7 +27,7 @@ _080FA87A: adds r0, r3, 0x1 b _080FA89E .align 2, 0 -_080FA890: .4byte gUnknown_083E5A20 +_080FA890: .4byte gHealLocations _080FA894: adds r2, 0x8 adds r3, 0x1 @@ -51,11 +51,11 @@ GetHealLocationByMap: @ 80FA8A4 cmp r0, 0 beq _080FA8C4 lsls r0, 3 - ldr r1, _080FA8C0 @ =gUnknown_083E5A18 + ldr r1, _080FA8C0 @ =gHealLocations - 0x8 adds r0, r1 b _080FA8C6 .align 2, 0 -_080FA8C0: .4byte gUnknown_083E5A18 +_080FA8C0: .4byte gHealLocations - 0x8 _080FA8C4: movs r0, 0 _080FA8C6: @@ -71,11 +71,11 @@ GetHealLocation: @ 80FA8CC cmp r0, 0x16 bhi _080FA8E4 lsls r0, 3 - ldr r1, _080FA8E0 @ =gUnknown_083E5A18 + ldr r1, _080FA8E0 @ =gHealLocations - 0x8 adds r0, r1 b _080FA8E6 .align 2, 0 -_080FA8E0: .4byte gUnknown_083E5A18 +_080FA8E0: .4byte gHealLocations - 0x8 _080FA8E4: movs r0, 0 _080FA8E6: diff --git a/asm/region_map.s b/asm/region_map.s index 8f57f1b42..373b20d97 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -2604,14 +2604,14 @@ sub_80FBCF0: @ 80FBCF0 lsls r0, 16 lsls r1, 16 lsrs r1, 16 - ldr r2, _080FBD98 @ =gUnknown_083E5C40 + ldr r2, _080FBD98 @ =gRegionMapBrendanIconTiles str r2, [sp, 0x18] movs r2, 0x80 add r5, sp, 0x18 lsrs r3, r0, 16 orrs r0, r2 str r0, [r5, 0x4] - ldr r0, _080FBD9C @ =gUnknown_083E5C20 + ldr r0, _080FBD9C @ =gRegionMapBrendanIconPalette str r0, [sp, 0x20] ldr r2, _080FBDA0 @ =0xffff0000 add r4, sp, 0x20 @@ -2636,9 +2636,9 @@ sub_80FBCF0: @ 80FBCF0 ldrb r0, [r0, 0x8] cmp r0, 0x1 bne _080FBD42 - ldr r0, _080FBDB8 @ =gUnknown_083E5CE0 + ldr r0, _080FBDB8 @ =gRegionMapMayIconTiles str r0, [sp, 0x18] - ldr r0, _080FBDBC @ =gUnknown_083E5CC0 + ldr r0, _080FBDBC @ =gRegionMapMayIconPalette str r0, [sp, 0x20] _080FBD42: adds r0, r5, 0 @@ -2682,16 +2682,16 @@ _080FBD42: ldr r0, _080FBDC8 @ =sub_80FBF34 b _080FBDEA .align 2, 0 -_080FBD98: .4byte gUnknown_083E5C40 -_080FBD9C: .4byte gUnknown_083E5C20 +_080FBD98: .4byte gRegionMapBrendanIconTiles +_080FBD9C: .4byte gRegionMapBrendanIconPalette _080FBDA0: .4byte 0xffff0000 _080FBDA4: .4byte gUnknown_083E7708 _080FBDA8: .4byte gUnknown_083E7718 _080FBDAC: .4byte gDummySpriteAffineAnimTable _080FBDB0: .4byte SpriteCallbackDummy _080FBDB4: .4byte gSaveBlock2 -_080FBDB8: .4byte gUnknown_083E5CE0 -_080FBDBC: .4byte gUnknown_083E5CC0 +_080FBDB8: .4byte gRegionMapMayIconTiles +_080FBDBC: .4byte gRegionMapMayIconPalette _080FBDC0: .4byte gUnknown_020388CC _080FBDC4: .4byte gSprites _080FBDC8: .4byte sub_80FBF34 diff --git a/data/data2.s b/data/data2.s index a544b22d3..54baa2f77 100644 --- a/data/data2.s +++ b/data/data2.s @@ -22150,7 +22150,7 @@ gUnknown_083E5A1C:: @ 83E5A1C .string "▶$" .align 2 -gUnknown_083E5A20:: @ 83E5A20 +gHealLocations:: @ 83E5A20 heal_location LittlerootTown_BrendansHouse_2F, 4, 2 heal_location LittlerootTown_MaysHouse_2F, 4, 2 heal_location PetalburgCity, 20, 17 @@ -22187,19 +22187,19 @@ gUnknown_083E5B34:: @ 83E5B34 .incbin "graphics/pokenav/cursor_large.4bpp.lz" .align 2 -gUnknown_083E5C20:: @ 83E5C20 +gRegionMapBrendanIconPalette:: @ 83E5C20 .incbin "graphics/pokenav/brendan_icon.gbapal" .align 2 -gUnknown_083E5C40:: @ 83E5C40 +gRegionMapBrendanIconTiles:: @ 83E5C40 .incbin "graphics/pokenav/brendan_icon.4bpp" .align 2 -gUnknown_083E5CC0:: @ 83E5CC0 +gRegionMapMayIconPalette:: @ 83E5CC0 .incbin "graphics/pokenav/may_icon.gbapal" .align 2 -gUnknown_083E5CE0:: @ 83E5CE0 +gRegionMapMayIconTiles:: @ 83E5CE0 .incbin "graphics/pokenav/may_icon.4bpp" .align 2 |