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

Jump to bottom

Dec 2023 - Jan 2024 #171

Merged
merged 18 commits into from
Jan 30, 2024
Merged

Dec 2023 - Jan 2024 #171

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
973cad1
more documentation and decomp function
SethBarberee Dec 28, 2023
f2a2f68
decomp sub_8083568 thanks to @jiangzhengwenjz
SethBarberee Dec 28, 2023
f405238
split asm file and decomp a few tile stuff
SethBarberee Dec 30, 2023
70db368
nonmatch sub_804FD30
SethBarberee Dec 31, 2023
cac5877
Decomp sub_804FED0
SethBarberee Dec 31, 2023
367bfdb
slight cleanup of struct and documentation
SethBarberee Jan 2, 2024
5b9a0c7
Create struct for Traps and clean up code with it
SethBarberee Jan 6, 2024
3635d87
decomp few more trap funcs and fix some names
SethBarberee Jan 6, 2024
4051053
More work on trap funcs
SethBarberee Jan 7, 2024
197574e
more trap stuff and sub_808B1CC
SethBarberee Jan 7, 2024
e7e4522
more decomp and some code cleanup
SethBarberee Jan 13, 2024
9cae659
more trap decomp
SethBarberee Jan 13, 2024
baf0403
split out some more stuff and decomp
SethBarberee Jan 29, 2024
287b7e6
More splitting and decomping
SethBarberee Jan 29, 2024
86a9f61
More decomping
SethBarberee Jan 29, 2024
3b3a718
small cleanup
SethBarberee Jan 29, 2024
11c5c75
address review comment
SethBarberee Jan 29, 2024
a372938
address more review comments
SethBarberee Jan 29, 2024
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
25 changes: 0 additions & 25 deletions asm/code_80130A8.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,29 +299,4 @@ _080140AC: .4byte 0x00003fff
_080140B0: .4byte 0x00000fff
thumb_func_end sub_8013F84

thumb_func_start sub_80140B4
sub_80140B4:
push {r4-r7,lr}
ldr r4, _080140D8
adds r2, r0, 0
movs r3, 0x3
_080140BC:
adds r1, r2, 0
adds r0, r4, 0
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
adds r4, 0x18
adds r2, 0x18
subs r3, 0x1
cmp r3, 0
bge _080140BC
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080140D8: .4byte gUnknown_80D47C8
thumb_func_end sub_80140B4

.align 2,0
29 changes: 0 additions & 29 deletions asm/code_80140DC.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,6 @@

.text

thumb_func_start sub_8014214
sub_8014214:
push {r4-r6,lr}
sub sp, 0x14
lsls r6, r2, 16
movs r2, 0x1
negs r2, r2
ldr r3, _08014244
movs r5, 0
str r5, [sp]
movs r4, 0x3
str r4, [sp, 0x4]
str r5, [sp, 0x8]
str r1, [sp, 0xC]
movs r1, 0xC0
lsls r1, 18
orrs r1, r6
lsrs r1, 16
str r1, [sp, 0x10]
movs r1, 0
bl sub_8014248
add sp, 0x14
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08014244: .4byte gUnknown_80D4880
thumb_func_end sub_8014214

thumb_func_start sub_8014248
sub_8014248:
push {r4-r7,lr}
Expand Down
Loading