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.

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

Kermalis sprite #151

Merged
merged 27 commits into from
Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7f4732f
Match ResetSprites
Kermalis Aug 11, 2023
b162b80
Match sub_8004E8C
Kermalis Aug 11, 2023
520bcb3
Skipped 2 got 1 lol [sub_8005180]
Kermalis Aug 11, 2023
c16193e
Forgor the declaration
Kermalis Aug 11, 2023
c61c7df
Match CopySpritesToOam AND DISCOVER
Kermalis Aug 11, 2023
02b6c6b
Match SetSavingIconCoords and BlinkSavingIcon
Kermalis Aug 11, 2023
7bcc6e0
Match sub_80A62F0 and GroundSprite_Reset
Kermalis Aug 12, 2023
088162e
Fakematch sub_80052BC, Match sub_8005304
Kermalis Aug 15, 2023
932d094
Match sub_800533C
Kermalis Aug 16, 2023
cf4f529
Match sub_80A6460
Kermalis Aug 16, 2023
254f034
Match sub_80A64A4
Kermalis Aug 16, 2023
d719c71
Match sub_80A658C through sub_80A65E0
Kermalis Aug 18, 2023
79b3ea4
Match sub_80053AC and make structs AF
Kermalis Aug 18, 2023
ad5ec24
Match sub_80053D0
Kermalis Aug 18, 2023
710638a
Match sub_800543C and sub_800545C
Kermalis Aug 18, 2023
6a633ba
99.95% matching for sub_80054BC
Kermalis Aug 19, 2023
0225356
99.09% matching for sub_807CB3C
Kermalis Aug 19, 2023
1d49c48
Rename and doc SpriteOAM with defines
Kermalis Aug 26, 2023
06aeba8
Fakematch AddMenuCursorSprite_ too
Kermalis Aug 26, 2023
afbe730
Fakematch sub_801332C and sub_8013470
Kermalis Aug 26, 2023
0a19222
Merge menu_input files
Kermalis Aug 26, 2023
01d6fe2
Clean menu_input
Kermalis Aug 26, 2023
4dd3668
Entity_Sub28 -> EntitySpriteInfo
Kermalis Aug 28, 2023
5923df1
atrib -> attrib
Kermalis Aug 28, 2023
34d1d0b
Dungeon_Sub17B44 -> Dungeon_ax
Kermalis Aug 28, 2023
4784ab6
That's an OpenedFile lol
Kermalis Aug 28, 2023
6cfbc9d
Add NONMATCHING for register asm stuff
Kermalis Aug 28, 2023
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
6 changes: 3 additions & 3 deletions asm/code_800558C.s
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

.text

thumb_func_start sub_800558C
sub_800558C:
thumb_func_start DoAxFrame_800558C
DoAxFrame_800558C:
push {r4-r7,lr}
sub sp, 0x4
adds r5, r0, 0
Expand Down Expand Up @@ -72,7 +72,7 @@ _08005602:
bx r0
.align 2, 0
_0800560C: .4byte 0x0000f7ff
thumb_func_end sub_800558C
thumb_func_end DoAxFrame_800558C

thumb_func_start sub_8005610
sub_8005610:
Expand Down
12 changes: 6 additions & 6 deletions asm/code_800DAC0.s
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ _0800DDCA:
str r0, [sp, 0x4]
mov r0, r8
adds r1, r4, 0
bl sub_800558C
bl DoAxFrame_800558C
_0800DE26:
movs r0, 0x1
_0800DE28:
Expand Down Expand Up @@ -6081,7 +6081,7 @@ sub_8010A88:
add r3, sp, 0x8
str r3, [sp, 0x4]
movs r3, 0x3
bl sub_800558C
bl DoAxFrame_800558C
_08010AF6:
lsls r0, r5, 16
asrs r0, 16
Expand Down Expand Up @@ -6118,7 +6118,7 @@ _08010B04:
str r3, [sp, 0x4]
adds r0, r5, 0
movs r3, 0x1
bl sub_800558C
bl DoAxFrame_800558C
_08010B40:
adds r7, 0x44
subs r6, 0x1
Expand Down Expand Up @@ -6632,7 +6632,7 @@ sub_8010F28:
str r3, [sp, 0x4]
adds r0, r4, 0
movs r3, 0x3
bl sub_800558C
bl DoAxFrame_800558C
movs r7, 0
mov r10, r6
ldr r6, _0801109C
Expand Down Expand Up @@ -6667,7 +6667,7 @@ _08010F98:
str r0, [sp, 0x4]
adds r0, r4, 0
movs r3, 0x1
bl sub_800558C
bl DoAxFrame_800558C
_08010FD8:
adds r6, 0x50
adds r7, 0x1
Expand Down Expand Up @@ -6737,7 +6737,7 @@ _0801101E:
add r3, sp, 0x8
str r3, [sp, 0x4]
movs r3, 0x2
bl sub_800558C
bl DoAxFrame_800558C
_08011062:
adds r6, 0x3C
ldr r4, [sp, 0x14]
Expand Down
4 changes: 2 additions & 2 deletions asm/code_8069E0C.s
Original file line number Diff line number Diff line change
Expand Up @@ -5208,7 +5208,7 @@ _0806CAD2:
ldr r1, [sp, 0x2C]
ldr r2, [sp, 0x30]
mov r3, r9
bl sub_800558C
bl DoAxFrame_800558C
b _0806CB16
_0806CAF8:
cmp r1, 0x1
Expand All @@ -5224,7 +5224,7 @@ _0806CAF8:
ldr r1, [sp, 0x2C]
ldr r2, [sp, 0x30]
mov r3, r9
bl sub_800558C
bl DoAxFrame_800558C
_0806CB16:
ldr r0, [r6, 0xC]
cmp r0, 0
Expand Down
266 changes: 0 additions & 266 deletions asm/code_807CABC.s

This file was deleted.

Loading