Skip to content

Commit

Permalink
start cheese
Browse files Browse the repository at this point in the history
  • Loading branch information
@freshollie
freshollie committed Nov 26, 2023
1 parent c51b252 commit ad05d5c
Show file tree
Hide file tree
Showing 22 changed files with 194 additions and 285 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
"player_controls.h": "c",
"stage.h": "c",
"screen_fade.h": "c",
"player_actor.h": "c",
"cheese.h": "c",
"amy_attack_heart_effect.h": "c",
"zone_3.h": "c",
"zone_5.h": "c",
Expand Down
4 changes: 2 additions & 2 deletions asm/boss_2.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2475,7 +2475,7 @@ _0803E034:
movs r0, #0x1e
strb r0, [r1]
_0803E042:
ldr r0, _0803E09C @ =gPlayerActor
ldr r0, _0803E09C @ =gCheese
ldr r2, [r0]
cmp r2, #0
beq _0803E0C2
Expand Down Expand Up @@ -2519,7 +2519,7 @@ _0803E080:
b _0803E0AA
.align 2, 0
_0803E098: .4byte gPlayer
_0803E09C: .4byte gPlayerActor
_0803E09C: .4byte gCheese
_0803E0A0: .4byte 0x00000383
_0803E0A4:
movs r0, #0xeb
Expand Down
12 changes: 6 additions & 6 deletions asm/boss_7.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3981,7 +3981,7 @@ sub_80498CC: @ 0x080498CC
subs r0, #0x78
adds r0, r0, r4
str r0, [r1, #0x14]
ldr r0, _080499D4 @ =gPlayerActor
ldr r0, _080499D4 @ =gCheese
ldr r1, [r0]
cmp r1, #0
beq _080499A6
Expand Down Expand Up @@ -4009,7 +4009,7 @@ _080499C4: .4byte gUnknown_030054BC
_080499C8: .4byte gPlayer
_080499CC: .4byte gUnknown_080D87E6
_080499D0: .4byte gCamera
_080499D4: .4byte gPlayerActor
_080499D4: .4byte gCheese

thumb_func_start sub_80499D8
sub_80499D8: @ 0x080499D8
Expand Down Expand Up @@ -4221,7 +4221,7 @@ _08049B4E:
ldr r0, [r1, #0x10]
adds r0, r0, r4
str r0, [r1, #0x10]
ldr r0, _08049BA8 @ =gPlayerActor
ldr r0, _08049BA8 @ =gCheese
ldr r1, [r0]
cmp r1, #0
beq _08049C4C
Expand All @@ -4235,7 +4235,7 @@ _08049B98: .4byte gUnknown_080D8808
_08049B9C: .4byte gUnknown_030054FC
_08049BA0: .4byte gBossRingsShallRespawn
_08049BA4: .4byte gCamera
_08049BA8: .4byte gPlayerActor
_08049BA8: .4byte gCheese
_08049BAC:
cmp r0, #5
bhi _08049C4C
Expand Down Expand Up @@ -4309,7 +4309,7 @@ _08049BEE:
ldr r0, [r6, #0x10]
adds r0, r0, r4
str r0, [r6, #0x10]
ldr r0, _08049CB0 @ =gPlayerActor
ldr r0, _08049CB0 @ =gCheese
ldr r1, [r0]
cmp r1, #0
beq _08049C4C
Expand Down Expand Up @@ -4359,7 +4359,7 @@ _08049CA0: .4byte 0x0000FFFD
_08049CA4: .4byte gUnknown_080D8808
_08049CA8: .4byte gActiveBossTask
_08049CAC: .4byte gUnknown_030054FC
_08049CB0: .4byte gPlayerActor
_08049CB0: .4byte gCheese
_08049CB4: .4byte 0xFFFFFDA8
_08049CB8: .4byte gUnknown_030054B0
_08049CBC:
Expand Down
8 changes: 4 additions & 4 deletions asm/boss_8.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ _0804B21E:
_0804B280: .4byte gSelectedCharacter
_0804B284: .4byte 0x00000177
_0804B288:
ldr r0, _0804B2E0 @ =gPlayerActor
ldr r0, _0804B2E0 @ =gCheese
ldr r2, [r0]
cmp r2, #0
beq _0804B2CC
Expand Down Expand Up @@ -1500,7 +1500,7 @@ _0804B2CE:
pop {r1}
bx r1
.align 2, 0
_0804B2E0: .4byte gPlayerActor
_0804B2E0: .4byte gCheese
_0804B2E4: .4byte 0x00000177
_0804B2E8: .4byte gUnknown_03005498

Expand Down Expand Up @@ -1622,7 +1622,7 @@ _0804B3CC: .4byte gUnknown_080D8888
_0804B3D0: .4byte gSelectedCharacter
_0804B3D4: .4byte 0x00000177
_0804B3D8:
ldr r0, _0804B430 @ =gPlayerActor
ldr r0, _0804B430 @ =gCheese
ldr r2, [r0]
cmp r2, #0
beq _0804B41C
Expand Down Expand Up @@ -1667,7 +1667,7 @@ _0804B41E:
pop {r1}
bx r1
.align 2, 0
_0804B430: .4byte gPlayerActor
_0804B430: .4byte gCheese
_0804B434: .4byte 0x00000177
_0804B438: .4byte gUnknown_03005498

Expand Down
187 changes: 0 additions & 187 deletions asm/player_actor.s → asm/cheese.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,193 +36,6 @@ gUnknown_080D5628:
.syntax unified
.arm

thumb_func_start CreatePlayerActor
CreatePlayerActor: @ 0x08013FAC
push {r4, r5, r6, r7, lr}
sub sp, #4
adds r1, r0, #0
ldr r0, _08013FD0 @ =gGameMode
ldrb r0, [r0]
cmp r0, #2
bhi _08014060
ldr r0, _08013FD4 @ =gCurrentLevel
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0x1d
bne _08013FDC
ldr r1, _08013FD8 @ =gPlayerActor
movs r0, #0
str r0, [r1]
b _08014112
.align 2, 0
_08013FD0: .4byte gGameMode
_08013FD4: .4byte gCurrentLevel
_08013FD8: .4byte gPlayerActor
_08013FDC:
adds r0, r1, #0
adds r0, #0x85
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #1
beq _08013FEC
b _08014112
_08013FEC:
ldr r0, _08014018 @ =sub_801420C
ldr r2, _0801401C @ =0x00005010
ldr r1, _08014020 @ =sub_8015360
str r1, [sp]
movs r1, #0x70
movs r3, #0
bl TaskCreate
ldrh r1, [r0, #6]
movs r0, #0xc0
lsls r0, r0, #0x12
adds r6, r1, r0
adds r0, #0x1c
adds r7, r1, r0
ldr r0, _08014024 @ =gPlayerActor
str r6, [r0]
ldr r1, _08014028 @ =gPlayer
ldr r0, [r1, #8]
str r0, [r6]
ldr r0, [r1, #0xc]
b _080140B0
.align 2, 0
_08014018: .4byte sub_801420C
_0801401C: .4byte 0x00005010
_08014020: .4byte sub_8015360
_08014024: .4byte gPlayerActor
_08014028: .4byte gPlayer
_0801402C:
lsls r0, r1, #2
adds r0, r0, r4
ldr r0, [r0]
ldrh r0, [r0, #6]
movs r4, #0xc0
lsls r4, r4, #0x12
adds r5, r0, r4
ldr r0, _08014054 @ =sub_801420C
ldr r2, _08014058 @ =0x00005010
ldr r1, _0801405C @ =sub_8015360
str r1, [sp]
movs r1, #0x70
movs r3, #0
bl TaskCreate
ldrh r0, [r0, #6]
adds r6, r0, r4
str r5, [r6, #0x6c]
b _080140A0
.align 2, 0
_08014054: .4byte sub_801420C
_08014058: .4byte 0x00005010
_0801405C: .4byte sub_8015360
_08014060:
movs r5, #0
movs r6, #0
movs r2, #0
ldr r0, _0801411C @ =gMultiplayerPlayerTasks
ldr r1, [r0]
adds r4, r0, #0
cmp r1, #0
beq _08014086
adds r1, r4, #0
_08014072:
adds r0, r2, #1
lsls r0, r0, #0x18
lsrs r2, r0, #0x18
cmp r2, #3
bhi _08014086
lsls r0, r2, #2
adds r0, r0, r1
ldr r0, [r0]
cmp r0, #0
bne _08014072
_08014086:
movs r1, #0
cmp r1, r2
bhs _080140A0
ldr r3, _08014120 @ =gMultiplayerCharacters
_0801408E:
adds r0, r1, r3
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #1
beq _0801402C
adds r1, #1
cmp r1, r2
blo _0801408E
_080140A0:
cmp r5, #0
beq _08014112
adds r7, r6, #0
adds r7, #0x1c
ldr r0, _08014124 @ =gPlayerActor
str r6, [r0]
movs r0, #0
str r0, [r6]
_080140B0:
str r0, [r6, #4]
movs r4, #0
movs r0, #2
strb r0, [r6, #8]
strb r0, [r6, #9]
movs r5, #0
strh r0, [r6, #0xc]
strh r4, [r6, #0xe]
strh r4, [r6, #0x10]
movs r0, #9
bl VramMalloc
str r0, [r7, #4]
ldr r1, _08014128 @ =gUnknown_080D5548
ldrh r0, [r6, #0x10]
lsls r0, r0, #2
adds r0, r0, r1
ldrh r0, [r0]
strh r0, [r7, #0xa]
ldrh r0, [r6, #0x10]
lsls r0, r0, #2
adds r1, #2
adds r0, r0, r1
ldrh r1, [r0]
adds r0, r7, #0
adds r0, #0x20
strb r1, [r0]
strh r4, [r7, #8]
adds r1, r7, #0
adds r1, #0x21
movs r0, #0xff
strb r0, [r1]
movs r0, #0x88
lsls r0, r0, #3
strh r0, [r7, #0x1a]
movs r0, #0x80
lsls r0, r0, #6
str r0, [r7, #0x10]
strh r4, [r7, #0x1c]
adds r1, #1
movs r0, #0x10
strb r0, [r1]
adds r0, r7, #0
adds r0, #0x25
strb r5, [r0]
movs r0, #1
rsbs r0, r0, #0
str r0, [r7, #0x28]
str r0, [r7, #0x30]
_08014112:
add sp, #4
pop {r4, r5, r6, r7}
pop {r0}
bx r0
.align 2, 0
_0801411C: .4byte gMultiplayerPlayerTasks
_08014120: .4byte gMultiplayerCharacters
_08014124: .4byte gPlayerActor
_08014128: .4byte gUnknown_080D5548

thumb_func_start sub_801412C
sub_801412C: @ 0x0801412C
push {r4, r5, r6, lr}
Expand Down
8 changes: 4 additions & 4 deletions asm/entities_0.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ sub_800C418: @ 0x0800C418
mov ip, r0
cmp r1, r5
beq _0800C4F0
ldr r0, _0800C4EC @ =gPlayerActor
ldr r0, _0800C4EC @ =gCheese
ldr r0, [r0]
cmp r0, #0
beq _0800C4F0
Expand Down Expand Up @@ -799,7 +799,7 @@ _0800C4E8:
movs r0, #1
b _0800C4F2
.align 2, 0
_0800C4EC: .4byte gPlayerActor
_0800C4EC: .4byte gCheese
_0800C4F0:
movs r0, #0
_0800C4F2:
Expand Down Expand Up @@ -1108,7 +1108,7 @@ _0800C734:
ldr r0, _0800C82C @ =gPlayer
bl sub_800CBA4
_0800C73A:
ldr r0, _0800C830 @ =gPlayerActor
ldr r0, _0800C830 @ =gCheese
ldr r0, [r0]
cmp r0, #0
bne _0800C744
Expand Down Expand Up @@ -1233,7 +1233,7 @@ _0800C802:
b _0800C83A
.align 2, 0
_0800C82C: .4byte gPlayer
_0800C830: .4byte gPlayerActor
_0800C830: .4byte gCheese
_0800C834: .4byte gGameMode
_0800C838:
movs r0, #0
Expand Down
8 changes: 4 additions & 4 deletions asm/non_matching/game/stage/intro/Task_802F9F8.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ _0802FA66:
orrs r0, r1
orrs r0, r4
strh r0, [r3]
ldr r3, _0802FB24 @ =gPlayerActor
ldr r3, _0802FB24 @ =gCheese
ldr r0, [r3]
cmp r0, #0
beq _0802FAF8
Expand Down Expand Up @@ -150,7 +150,7 @@ _0802FB14: .4byte gGameMode
_0802FB18: .4byte gUnknown_080D6FF5
_0802FB1C: .4byte gObjPalette
_0802FB20: .4byte gSelectedCharacter
_0802FB24: .4byte gPlayerActor
_0802FB24: .4byte gCheese
_0802FB28:
movs r2, #0
_0802FB2A:
Expand Down Expand Up @@ -224,7 +224,7 @@ _0802FBA8:
lsrs r2, r0, #0x18
cmp r2, #3
bls _0802FB2A
ldr r3, _0802FC48 @ =gPlayerActor
ldr r3, _0802FC48 @ =gCheese
ldr r0, [r3]
cmp r0, #0
beq _0802FC12
Expand Down Expand Up @@ -296,7 +296,7 @@ _0802FC38: .4byte gUnknown_080D6FF5
_0802FC3C: .4byte gMultiplayerCharacters
_0802FC40: .4byte gObjPalette
_0802FC44: .4byte gUnknown_080D6FF5+2
_0802FC48: .4byte gPlayerActor
_0802FC48: .4byte gCheese
_0802FC4C: .4byte gFlags
_0802FC50: .4byte 0x00003FCF
_0802FC54: .4byte gWinRegs
Expand Down
Loading

0 comments on commit ad05d5c

Please sign in to comment.