atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

through RegionMapPlayerIconSpriteCallback

Browse source
This commit is contained in:
PikalaxALT 2017-10-31 21:32:25 -04:00
parent 968ff8c3c8
commit 2f1325416b
2 changed files with 52 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
asm/region_map.s
View file

@ -5,138 +5,6 @@
.text
thumb_func_start sub_812445C
sub_812445C: @ 812445C
push {r4,lr}
adds r3, r0, 0
ldr r0, =gRegionMap
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0x5C
movs r4, 0
ldrsh r2, [r0, r4]
lsls r2, 1
negs r2, r2
strh r2, [r3, 0x24]
adds r1, 0x5E
movs r4, 0
ldrsh r0, [r1, r4]
lsls r0, 1
negs r0, r0
strh r0, [r3, 0x26]
ldrh r1, [r3, 0x22]
adds r1, r0
adds r0, r3, 0
adds r0, 0x29
ldrb r0, [r0]
lsls r0, 24
asrs r0, 24
adds r0, r1
strh r0, [r3, 0x2E]
ldrh r1, [r3, 0x20]
adds r1, r2
adds r2, r3, 0
adds r2, 0x28
ldrb r2, [r2]
lsls r2, 24
asrs r2, 24
adds r2, r1
strh r2, [r3, 0x30]
adds r0, 0x8
lsls r0, 16
lsrs r0, 16
cmp r0, 0xB0
bhi _081244BC
lsls r0, r2, 16
asrs r2, r0, 16
movs r0, 0x8
negs r0, r0
cmp r2, r0
blt _081244BC
cmp r2, 0xF8
ble _081244C4
_081244BC:
movs r0, 0
b _081244C6
.pool
_081244C4:
movs r0, 0x1
_081244C6:
strh r0, [r3, 0x32]
movs r1, 0x32
ldrsh r0, [r3, r1]
cmp r0, 0x1
bne _081244D8
adds r0, r3, 0
bl sub_81244F8
b _081244E4
_081244D8:
adds r0, r3, 0
adds r0, 0x3E
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
strb r1, [r0]
_081244E4:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_812445C
thumb_func_start sub_81244EC
sub_81244EC: @ 81244EC
push {lr}
bl sub_81244F8
pop {r0}
bx r0
thumb_func_end sub_81244EC
thumb_func_start sub_81244F8
sub_81244F8: @ 81244F8
push {lr}
adds r2, r0, 0
ldr r0, =gRegionMap
ldr r0, [r0]
adds r0, 0x7E
ldrb r0, [r0]
cmp r0, 0
beq _0812453C
ldrh r0, [r2, 0x3C]
adds r0, 0x1
strh r0, [r2, 0x3C]
lsls r0, 16
asrs r0, 16
cmp r0, 0x10
ble _08124548
movs r0, 0
strh r0, [r2, 0x3C]
adds r3, r2, 0
adds r3, 0x3E
ldrb r2, [r3]
lsrs r1, r2, 2
movs r0, 0x1
eors r1, r0
ands r1, r0
lsls r1, 2
movs r0, 0x5
negs r0, r0
ands r0, r2
orrs r0, r1
strb r0, [r3]
b _08124548
.pool
_0812453C:
adds r2, 0x3E
ldrb r1, [r2]
movs r0, 0x5
negs r0, r0
ands r0, r1
strb r0, [r2]
_08124548:
pop {r0}
bx r0
thumb_func_end sub_81244F8
thumb_func_start sub_812454C
sub_812454C: @ 812454C
push {lr}

58
src/region_map.c
View file

@ -59,8 +59,9 @@ static bool8 RegionMap_IsMapSecIdInNextRow(u16 y);
static void FreeRegionMapCursorSprite(void);
static void HideRegionMapPlayerIcon(void);
static void UnhideRegionMapPlayerIcon(void);
void sub_812445C(struct Sprite *sprite);
void sub_81244EC(struct Sprite *sprite);
static void RegionMapPlayerIconSpriteCallback_Zoomed(struct Sprite *sprite);
static void RegionMapPlayerIconSpriteCallback_Full(struct Sprite *sprite);
static void RegionMapPlayerIconSpriteCallback(struct Sprite *sprite);
// .rodata
@ -1078,13 +1079,13 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
{
gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 8 + 4;
gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 8 + 4;
gRegionMap->playerIconSprite->callback = sub_81244EC;
gRegionMap->playerIconSprite->callback = RegionMapPlayerIconSpriteCallback_Full;
}
else
{
gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 16 - 0x30;
gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 16 - 0x42;
gRegionMap->playerIconSprite->callback = sub_812445C;
gRegionMap->playerIconSprite->callback = RegionMapPlayerIconSpriteCallback_Zoomed;
}
}
@ -1105,7 +1106,7 @@ static void UnhideRegionMapPlayerIcon(void)
{
gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 16 - 0x30;
gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 16 - 0x42;
gRegionMap->playerIconSprite->callback = sub_812445C;
gRegionMap->playerIconSprite->callback = RegionMapPlayerIconSpriteCallback_Zoomed;
gRegionMap->playerIconSprite->invisible = FALSE;
}
else
@ -1114,8 +1115,53 @@ static void UnhideRegionMapPlayerIcon(void)
gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 8 + 4;
gRegionMap->playerIconSprite->pos2.x = 0;
gRegionMap->playerIconSprite->pos2.y = 0;
gRegionMap->playerIconSprite->callback = sub_81244EC;
gRegionMap->playerIconSprite->callback = RegionMapPlayerIconSpriteCallback_Full;
gRegionMap->playerIconSprite->invisible = FALSE;
}
}
}
static void RegionMapPlayerIconSpriteCallback_Zoomed(struct Sprite *sprite)
{
sprite->pos2.x = -2 * gRegionMap->scrollX;
sprite->pos2.y = -2 * gRegionMap->scrollY;
sprite->data0 = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
sprite->data1 = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
if (sprite->data0 < -8 || sprite->data0 > 0xa8 || sprite->data1 < -8 || sprite->data1 > 0xf8)
{
sprite->data2 = FALSE;
}
else
{
sprite->data2 = TRUE;
}
if (sprite->data2 == TRUE)
{
RegionMapPlayerIconSpriteCallback(sprite);
}
else
{
sprite->invisible = TRUE;
}
}
static void RegionMapPlayerIconSpriteCallback_Full(struct Sprite *sprite)
{
RegionMapPlayerIconSpriteCallback(sprite);
}
static void RegionMapPlayerIconSpriteCallback(struct Sprite *sprite)
{
if (gRegionMap->blinkPlayerIcon)
{
if (++ sprite->data7 > 16)
{
sprite->data7 = 0;
sprite->invisible = sprite->invisible ? FALSE : TRUE;
}
}
else
{
sprite->invisible = FALSE;
}
}