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

Boss 8 #145

Merged
merged 68 commits into from
Jun 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
f1916f9
Unify adding entries to GFX queue
JaceCear May 29, 2024
917ce0e
Remove faulty nonmatching code
JaceCear May 29, 2024
a4733f8
Start CreateSuperEggRoboZ
JaceCear May 29, 2024
d53951f
Match CreateSuperEggRoboZ
JaceCear May 30, 2024
f3b6d2b
Formatter...
JaceCear May 30, 2024
f33ef4e
Some screen shake doc
JaceCear May 30, 2024
9a78da3
Remove old hack
JaceCear May 30, 2024
7ab1e2b
Replace constant with macro defs
JaceCear May 30, 2024
85fceac
Progress on Boss 8
JaceCear May 30, 2024
5b8c16e
Fix error
JaceCear May 30, 2024
ec38cb7
Move Task_804AB24 into non-matching
JaceCear May 30, 2024
13f1caa
Match sub_804AD68
JaceCear May 30, 2024
77bd247
Progress on sub_804AE40
JaceCear May 31, 2024
35011ff
Move sub_804AE40 into non-matching
JaceCear May 31, 2024
00db676
move sub_804B2EC into non-match
JaceCear May 31, 2024
68647e4
Match sub_804B43C
JaceCear Jun 1, 2024
48347b9
Add SWITCH_ARM_VARIANT macro
JaceCear Jun 1, 2024
0eec9eb
Match sub_804B594
JaceCear Jun 1, 2024
103fd8e
Match sub_804B734
JaceCear Jun 1, 2024
2ad56f2
Some cleanup
JaceCear Jun 1, 2024
adfa60b
Match sub_804B984
JaceCear Jun 2, 2024
2525387
Match sub_804BAC0
JaceCear Jun 2, 2024
3720cbf
Progress on Boss 8
JaceCear Jun 3, 2024
abb1b2f
Remove empty C file
JaceCear Jun 3, 2024
087e835
Match sub_804C5B8
JaceCear Jun 3, 2024
ab45c2d
Match sub_804C3AC, progress on sub_804C240
JaceCear Jun 3, 2024
3e6801e
Move sub_804C240 to non-matching
JaceCear Jun 4, 2024
40ea56c
Match sub_804C080
JaceCear Jun 4, 2024
93bc88b
Add missing palettes
JaceCear Jun 4, 2024
1aa3d14
Match sub_804BE6C
JaceCear Jun 4, 2024
3e92319
Minor cleanup
JaceCear Jun 4, 2024
b02cf3a
Move sub_804BC44 into non-matching. Remove boss_8_2.c
JaceCear Jun 4, 2024
555b132
Fix compiler error
JaceCear Jun 4, 2024
7eba040
Cleanup in asub_804B594
JaceCear Jun 4, 2024
10e7fa3
Remove boss_8.s, boss_8_2.c
JaceCear Jun 4, 2024
6c4207f
Fix boss_8 rodata in ldscript
JaceCear Jun 4, 2024
8673ab2
Add stub
JaceCear Jun 4, 2024
8bfaeb5
Remove stub
JaceCear Jun 4, 2024
b8950cd
Formatter...
JaceCear Jun 4, 2024
c0d9873
Minor cleanup
JaceCear Jun 5, 2024
79743c6
Some cleanup
JaceCear Jun 5, 2024
822e19b
Some match progress on sub_8031138
JaceCear Jun 5, 2024
df6abf5
Match sub_8031138 by making the generated code less efficient. Yay.
JaceCear Jun 5, 2024
1d128cf
Cleanup of sub_8031138
JaceCear Jun 5, 2024
7db78b7
Remove old asm file
JaceCear Jun 5, 2024
7022d89
Add SPRITE_ANIM_SPEED
JaceCear Jun 5, 2024
4c1e192
Do a pass on sub_8004E14 and move it into non-matching
JaceCear Jun 6, 2024
de26655
Remove sub_8004E14 from stub.c
JaceCear Jun 6, 2024
24a2b52
Merge sprite_2.c and sprite_3.c into sprite.c
JaceCear Jun 6, 2024
50cb127
Match sub_8023B5C
JaceCear Jun 6, 2024
5d1c748
Small documentation
JaceCear Jun 6, 2024
b3a171a
Document some Player funcs
JaceCear Jun 7, 2024
19b4d72
Rename mpp.unk50/unk52 -> mpp.pos
JaceCear Jun 7, 2024
d3f659c
Address some review comments
JaceCear Jun 7, 2024
e25d30a
Progress on sub_804AE40 by Ollie
JaceCear Jun 7, 2024
c822e54
Fix build
JaceCear Jun 7, 2024
75e1064
More improvements to sub_804AE40
JaceCear Jun 7, 2024
28f49a9
Formatter
JaceCear Jun 7, 2024
5760a2a
Add braces to ternary op
JaceCear Jun 7, 2024
9513ff2
Merge animation_commands.c into sprite.c
JaceCear Jun 7, 2024
ddef088
gUnknown_03002794 -> gRefSpriteTables
JaceCear Jun 7, 2024
3c2da13
Replace UB_FIX -> BUG_FIX; General cleanup
JaceCear Jun 7, 2024
6833e6c
sub_8004518 -> Base10DigitsToHexNibbles
JaceCear Jun 7, 2024
6344da3
Move animation_commands_bg.c into background.c
JaceCear Jun 7, 2024
261cb29
Fix build
JaceCear Jun 7, 2024
9a281bd
Minor ldscript adjustment
JaceCear Jun 8, 2024
7e70fed
Minor additions to Boss 9
JaceCear Jun 9, 2024
6ec886c
Fix filler size
JaceCear Jun 9, 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
4,885 changes: 0 additions & 4,885 deletions asm/boss_8.s

This file was deleted.

11 changes: 5 additions & 6 deletions asm/boss_9.s
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,7 @@ gUnknown_080D8F10:
.syntax unified
.arm

.if 0
.endif

.if 01
thumb_func_start CreateTrueArea53Boss
CreateTrueArea53Boss: @ 0x0804CEC4
push {r4, r5, r6, r7, lr}
Expand Down Expand Up @@ -182,7 +180,7 @@ _0804CEF8:
movs r0, #0xc0
lsls r0, r0, #0x12
adds r0, r4, r0
str r0, [sp, #4]
str r0, [sp, #4] @ sp04 = boss
ldr r0, _0804D2B8 @ =IWRAM_START + 0x1C
adds r2, r4, r0 @ r2 = &boss->unk1C
ldr r1, _0804D2BC @ =IWRAM_START + 0x48
Expand All @@ -200,12 +198,12 @@ _0804CEF8:
str r1, [sp, #0xc]
movs r3, #0
movs r0, #0xc
ldr r5, [sp, #4]
ldr r5, [sp, #4] @ r5 = boss
strb r0, [r5, #0xc]
strb r3, [r5, #0xd]
movs r1, #0
movs r0, #1
mov sb, r0
mov sb, r0 @ sb = 1
mov r0, sb
strh r0, [r5, #0x10]
movs r0, #0x50
Expand Down Expand Up @@ -981,6 +979,7 @@ _0804D584: .4byte 0x000002CE
_0804D588: .4byte 0x00000467
_0804D58C: .4byte 0x000002CD
_0804D590: .4byte 0x000002CF
.endif

thumb_func_start sub_804D594
sub_804D594: @ 0x0804D594
Expand Down
12 changes: 6 additions & 6 deletions asm/non_matching/engine/sub_80039E4.inc
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ _08003A84:
lsls r0, r1
lsrs r0, r0, #0x10
str r0, [sp, #0x10] @ sp10 = bg_affine_pixelcount
ldr r0, _08003BB4 @ =gUnknown_03002794
ldr r0, _08003BB4 @ =gRefSpriteTables
ldr r1, [r0]
ldr r2, [sp, #0xc]
ldrh r0, [r2, #0xa]
Expand Down Expand Up @@ -242,7 +242,7 @@ _08003BA4: .4byte gUnknown_03005390
_08003BA8: .4byte gUnknown_03004D10
_08003BAC: .4byte gBgCntRegs
_08003BB0: .4byte gDispCnt
_08003BB4: .4byte gUnknown_03002794
_08003BB4: .4byte gRefSpriteTables
_08003BB8: .4byte 0x040000D4
_08003BBC: .4byte 0x80000003
_08003BC0: .4byte gOamShapesSizes
Expand Down Expand Up @@ -316,15 +316,15 @@ _08003C2C:
movs r7, #0x40
str r7, [sp, #0x10]
_08003C46:
ldr r0, _08003D14 @ =gUnknown_03002794
ldr r0, _08003D14 @ =gRefSpriteTables
ldr r1, [r0]
ldr r2, [sp, #0xc]
ldrh r0, [r2, #0xa]
ldr r1, [r1, #8] @ r1 = gUnknown_03002794->oamData
ldr r1, [r1, #8] @ r1 = gRefSpriteTables->oamData
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
str r0, [sp, #0x1c] @ sp1C = gUnknown_03002794->oamData[s->graphics.anim];
str r0, [sp, #0x1c] @ sp1C = gRefSpriteTables->oamData[s->graphics.anim];
mov r3, sl @ r3 = dims
ldrb r1, [r3, #1] @ r1 = dims->oamIndex
lsls r0, r1, #1
Expand Down Expand Up @@ -424,7 +424,7 @@ __08003D04:
ldrsh r1, [r7, r2]
b _08003D3C
.align 2, 0
_08003D14: .4byte gUnknown_03002794
_08003D14: .4byte gRefSpriteTables
_08003D18: .4byte 0x040000D4
_08003D1C: .4byte 0x80000003
_08003D20: .4byte gOamShapesSizes
Expand Down
Loading