Merge pull request #99 from Bassoonian/master

Three small functions
This commit is contained in:
Seth Barberee
2022-03-22 11:44:43 -07:00
committed by GitHub
9 changed files with 7293 additions and 7292 deletions

File diff suppressed because it is too large Load Diff

4223
asm/code_80A26CC_1.s Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -5,19 +5,6 @@
.text
thumb_func_start sub_80AD8A0
sub_80AD8A0:
lsls r0, 16
ldr r1, _080AD8B0
asrs r0, 13
ldr r1, [r1]
adds r1, r0
adds r0, r1, 0
bx lr
.align 2, 0
_080AD8B0: .4byte gUnknown_203B4B8
thumb_func_end sub_80AD8A0
thumb_func_start sub_80AD8B4
sub_80AD8B4:
push {r4,lr}

File diff suppressed because it is too large Load Diff

3043
asm/ground_map_1.s Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -319,8 +319,12 @@ SECTIONS {
asm/ground_script.o(.text);
src/code_80A26CC.o(.text);
asm/code_80A26CC.o(.text);
src/code_80A26CC_1.o(.text);
asm/code_80A26CC_1.o(.text);
src/ground_map.o(.text);
asm/ground_map.o(.text);
src/ground_map_1.o(.text);
asm/ground_map_1.o(.text);
asm/ground_sprite.o(.text);
src/code_80A7714.o(.text);
asm/ground_lives.o(.text);

9
src/code_80A26CC_1.c Normal file
View File

@@ -0,0 +1,9 @@
#include "global.h"
extern u32 sub_8001658(u32, u32);
extern const char *sub_80A2B18(s16);
const char *sub_80A2B28(u16 r0)
{
return sub_80A2B18(sub_8001658(0, 17));
}

View File

@@ -31,3 +31,9 @@ void GroundLink_Select(s16 r0)
{
gUnknown_203B4B8.unk0 = sub_80A77D0(r0, &gUnknown_8118798)->unk8;
}
u32 sub_80AD8A0(s16 r0)
{
u32 a = r0;
return gUnknown_203B4B8.unk0 + a * 8;
}

8
src/ground_map_1.c Normal file
View File

@@ -0,0 +1,8 @@
#include "global.h"
extern void GroundMap_GetStationScript(u32, s16, u32, u32);
void sub_80A4BE8(u32 r0, s16 r1)
{
GroundMap_GetStationScript(r0, r1, 0, 0);
}