Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Yea #199

Merged
merged 1 commit into from
Jul 21, 2024
Merged

Yea #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions asm/code_803D110.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2514,6 +2514,7 @@ _0803E464: .4byte gUnknown_202EDC8
_0803E468: .4byte gUnknown_202D058
thumb_func_end sub_803E250

@ https://decomp.me/scratch/5arGc (kermalis 100%) `void sub_803E46C(u32)`
thumb_func_start sub_803E46C
sub_803E46C:
push {lr}
Expand Down Expand Up @@ -2725,6 +2726,7 @@ _0803E660: .4byte 0x00018213
_0803E664: .4byte gUnknown_202EDD4
thumb_func_end sub_803E490

@ https://decomp.me/scratch/biQXr (kermalis 100%) `void sub_803E668(u32)`
thumb_func_start sub_803E668
sub_803E668:
push {r4,lr}
Expand Down Expand Up @@ -2785,6 +2787,7 @@ _0803E700: .4byte gDungeon
_0803E704: .4byte 0x00018213
thumb_func_end sub_803E668

@ https://decomp.me/scratch/bDSdY (kermalis 100%) `void sub_803E708(s32, u32)`
thumb_func_start sub_803E708
sub_803E708:
push {r4,r5,lr}
Expand Down
1 change: 1 addition & 0 deletions asm/code_808417C.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,7 @@ _08084768:
_08084774: .4byte gUnknown_80FA3B8
thumb_func_end sub_80845E0

@ https://decomp.me/scratch/vELLj (kermalis 100%) `void sub_8084778(void)`
thumb_func_start sub_8084778
sub_8084778:
push {r4,lr}
Expand Down
4 changes: 4 additions & 0 deletions asm/code_8085B0C.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

.text

@ https://decomp.me/scratch/GE070 (kermalis 100%) `void sub_8085B4C(struct_8085B80 *, s16 **, Entity **, s32)` idk the structs
thumb_func_start sub_8085B4C
sub_8085B4C:
push {r4-r6,lr}
Expand Down Expand Up @@ -37,6 +38,7 @@ _08085B76:
_08085B7C: .4byte gUnknown_202F3D8
thumb_func_end sub_8085B4C

@ https://decomp.me/scratch/lb4jF (kermalis 87.53%) `bool8 sub_8085B80(struct_8085B80 *)`
thumb_func_start sub_8085B80
sub_8085B80:
push {r4-r7,lr}
Expand Down Expand Up @@ -450,6 +452,7 @@ _08085E90: .4byte gUnknown_202ECA4
_08085E94: .4byte 0x000181e4
thumb_func_end SetDungeonBGColorRGB

@ gDungeon->field_0x18215 = 0;
AnonymousRandomPerson marked this conversation as resolved.
Show resolved Hide resolved
thumb_func_start sub_8085E98
sub_8085E98:
ldr r0, _08085EA8
Expand Down Expand Up @@ -789,6 +792,7 @@ _080861A0: .4byte gUnknown_81066F0
_080861A4: .4byte gUnknown_810671C
thumb_func_end sub_8086130

@ `sub_806CDD4(a0, 0, 8);`
thumb_func_start sub_80861A8
sub_80861A8:
push {lr}
Expand Down
1 change: 1 addition & 0 deletions include/structs/str_dungeon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ typedef struct DungeonLocation
} DungeonLocation;

// size: 0x4
// This might be "RGB"... see `SetDungeonBGColorRGB()`
typedef struct Dungeon_sub
{
u8 unk0;
Expand Down
2 changes: 1 addition & 1 deletion src/ground_sprite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ void sub_80A658C(void)
{
sub_800DB7C();
ResetSprites(FALSE);
nullsub_10(0);
nullsub_10(FALSE);
sub_8005180();
nullsub_12();
CopySpritesToOam();
Expand Down