ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 07:03:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

sub_80E8F9C

Browse Source
This commit is contained in:
PikalaxALT 2017-10-24 21:10:58 -04:00
parent eeecca9671
commit 6558af388b
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
asm/secret_base.s
View File

@ -5,31 +5,6 @@
.text
thumb_func_start sub_80E8F9C
sub_80E8F9C: @ 80E8F9C
push {lr}
ldr r0, =sCurSecretBaseId
ldrb r0, [r0]
movs r1, 0xA
bl __udivsi3
ldr r2, =gUnknown_0858CFE8
lsls r0, 26
asrs r0, 24
adds r1, r0, r2
ldrb r1, [r1]
lsls r1, 24
asrs r1, 24
adds r0, 0x1
adds r0, r2
movs r2, 0
ldrsb r2, [r0, r2]
movs r0, 0x19
bl warp1_set_2
pop {r0}
bx r0
.pool
thumb_func_end sub_80E8F9C
thumb_func_start sub_80E8FD0
sub_80E8FD0: @ 80E8FD0
push {r4,lr}

1
include/overworld.h
View File

@ -59,5 +59,6 @@ void c2_exit_to_overworld_2_switch(void);
bool32 sub_8087598(void);
void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
void warp_in(void);
void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpNum);
#endif //GUARD_ROM4_H

12
src/secret_base.c
View File

@ -2,8 +2,10 @@
// Includes
#include "global.h"
#include "list_menu.h"
#include "map_constants.h"
#include "decoration.h"
#include "decoration_inventory.h"
#include "overworld.h"
#include "fieldmap.h"
#include "field_camera.h"
#include "field_player_avatar.h"
@ -33,6 +35,8 @@ extern const struct {
u16 tile2;
} gUnknown_0858CFCC[7];
extern const u8 gUnknown_0858CFE8[];
// .text
void sub_80E8AF0(struct SecretBaseRecord *sbr)
@ -244,3 +248,11 @@ void sub_80E8EE0(struct MapEvents *events)
}
}
}
void sub_80E8F9C(void)
{
s8 idx;
idx = sCurSecretBaseId / 10 * 4;
warp1_set_2(MAP_GROUP_SECRET_BASE_RED_CAVE1, gUnknown_0858CFE8[idx], gUnknown_0858CFE8[idx + 1]);
}