ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 12:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Last remaining function in secret base

Browse Source
This commit is contained in:
PikalaxALT 2017-10-27 22:46:57 -04:00
parent f601525474
commit 4c274f6030
3 changed files with 18 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
asm/secret_base.s
View File

@ -1,53 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_80EBE7C
sub_80EBE7C: @ 80EBE7C
push {r4,lr}
sub sp, 0x4
mov r4, sp
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl MapGridGetMetatileIdAt
adds r1, r0, 0
ldr r0, =0x0000028e
cmp r1, r0
bgt _080EBECC
subs r0, 0x1
cmp r1, r0
blt _080EBECC
ldr r0, =0x00004054
bl VarGet
lsls r0, 16
cmp r0, 0
beq _080EBECC
ldr r4, =0x000040ef
adds r0, r4, 0
bl VarGet
adds r1, r0, 0
movs r0, 0x4
orrs r1, r0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
bl VarSet
_080EBECC:
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_80EBE7C
.align 2, 0 @ Don't pad with nop.

1
ld_script.txt
View File

@ -148,7 +148,6 @@ SECTIONS {
asm/contest_effect.o(.text);
asm/record_mixing.o(.text);
src/secret_base.o(.text);
asm/secret_base.o(.text);
src/tv.o(.text);
asm/contest_link_80F57C4.o(.text);
asm/script_pokemon_util_80F87D8.o(.text);

18
src/secret_base.c
View File

@ -2194,3 +2194,21 @@ void sub_80EBB28(void)
break;
}
}
void sub_80EBE7C(void)
{
s16 x;
s16 y;
GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
switch ((int)MapGridGetMetatileIdAt(x, y))
{
case 0x28d:
case 0x28e:
if (VarGet(VAR_0x4054) != 0)
{
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x4);
}
break;
}
}