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

Add slippi logo to waiting for game #86

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
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
5f84873
Merge pull request #1 from project-slippi/master
jordan-zilch Apr 12, 2021
23ad6e0
Merge branch 'project-slippi:master' into master
jordan-zilch May 22, 2021
db3b5ad
Draft 1
jordan-zilch May 23, 2021
8a89987
WIP
jordan-zilch May 24, 2021
3f65313
Includes file transfer APIs in playback codeset
jordan-zilch Dec 21, 2021
fc379cb
Fixed alloc timing for secondbuf, highest priority for gx_pri for the…
jordan-zilch Dec 22, 2021
b01e77d
Remove unnecessary buffer and commented out instrs
jordan-zilch Dec 22, 2021
28cb1b2
Create a new camera for the scene
jordan-zilch Dec 24, 2021
c65e96e
Fixed a pointer arithmetic issue with indexing into the symbol, and f…
jordan-zilch Dec 25, 2021
62d5ef6
Realized a gobj can only have one hsd_obj (jobj or cobj attached) so …
jordan-zilch Dec 25, 2021
ad17f21
Fixed the crash. It was because I was using r26, I guess something el…
jordan-zilch Dec 26, 2021
8dc8873
i changed the GObj_AddObject calls to reference r13 (the value they p…
jordan-zilch Dec 26, 2021
fd8174d
Fixed the offsets/derefs for getting the Jobjdesc/camdesc pointers. L…
jordan-zilch Dec 26, 2021
81c5e3f
Remove unnecessary destructors
jordan-zilch Dec 27, 2021
21efd84
In InitializeInGameDelay.asm, the COBJLinks offset was 0x24, not 0x20…
jordan-zilch Dec 27, 2021
c0f4819
Low key the light has gone from my life –😪
jordan-zilch Dec 27, 2021
01b0015
Fixed COBJ_LINKS, I got confused
jordan-zilch Dec 27, 2021
64f5661
it's working. Krey
jordan-zilch Dec 28, 2021
452db3f
Cleanup
jordan-zilch Dec 28, 2021
a2c31ff
codes
jordan-zilch Dec 28, 2021
2a7f474
whitespace
jordan-zilch Dec 28, 2021
18d006b
change dat name
jordan-zilch Dec 28, 2021
e4ef36a
Merge into main repo
jordan-zilch Dec 28, 2021
0fda988
Merge branch 'project-slippi-master' into logo
jordan-zilch Dec 28, 2021
8b31062
Fix automatic merge error
jordan-zilch Dec 28, 2021
a551fc0
Widescreen fixes for the logo jobj
jordan-zilch Dec 29, 2021
b6ff6ab
Merge branch 'project-slippi:master' into logo
jordan-zilch Mar 23, 2022
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
11 changes: 6 additions & 5 deletions Common/Common.s
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
################################################################################
# Macros
################################################################################
.macro loadGlobalFrame reg
lis \reg, 0x8048
lwz \reg, -0x62A0(\reg)
.endm

.macro branchl reg, address
lis \reg, \address @h
ori \reg,\reg,\address @l
Expand Down Expand Up @@ -155,11 +160,6 @@ lis \reg, 0x8048 # load address to offset from for scene controller
lbz \reg, -0x62D0(\reg) # Load byte from 0x80479D30 (major ID)
.endm

.macro loadGlobalFrame reg
lis \reg, 0x8048
lwz \reg, -0x62A0(\reg)
.endm

# This macro takes in an address that is expected to have a branch instruction. It will set
# r3 to the address being branched to. This will overwrite r3 and r4
.macro computeBranchTargetAddress reg address
Expand Down Expand Up @@ -236,6 +236,7 @@ add \reg, r3, r4
.set GObj_RemoveProc,0x8038fed4
.set GObj_AddToObj,0x80390A70 #(gboj,obj_kind,obj_ptr)
.set GObj_SetupGXLink, 0x8039069c #(gobj,function,gx_link,priority)
.set GObj_RunGXLinkMaxCallbacks, 0x80390fc0 #void GObj_RunGXLinkMaxCallbacks(void)

## AObj Functions
.set AObj_SetEndFrame, 0x8036532C #(aobj, frame)
Expand Down
186 changes: 175 additions & 11 deletions Output/Playback/GALE01r2.ini
Original file line number Diff line number Diff line change
Expand Up @@ -489,20 +489,107 @@ C21A45A0 00000007 #Playback/Core/Scene/Boot to Playback Scene.asm
3C808047 60849D30
98640003 4E800020
3800000E 00000000
C21A6348 000000AB #Playback/Core/Scene/SceneThink_Playback.asm
C21A6348 00000104 #Playback/Core/Scene/SceneThink_Playback.asm
7C7E1B78 7C0802A6
90010004 9421FF50
BE810008 83EDAFC4
2C1F0000 41820110
386000D1 987F0000
387F0001 7FC4F378
3D808032 618C5A50
7D8903A6 4E800421
7FC3F378 3D808032
618C5B04 7D8903A6
4E800421 38830002
7FE3FB78 38A00001
3D808000 618C55F0
7D8903A6 4E800421
7FE3FB78 38800004
38A00000 3D808000
618C55F0 7D8903A6
4E800421 83BF0000
2C1D0000 40810098
93BC0000 386000D2
987F0000 387F0001
7FC4F378 3D808032
618C5A50 7D8903A6
4E800421 7FC3F378
3D808032 618C5B04
7D8903A6 4E800421
38830002 7FE3FB78
38A00001 3D808000
618C55F0 7D8903A6
4E800421 7F63DB78
7FA4EB78 38A00000
3D808000 618C55F0
7D8903A6 4E800421
BA810008 800100B4
382100B0 7C0803A6
38600001 3D808001
618C674C 7D8903A6
4E800420 BA810008
800100B4 382100B0
7C0803A6 7FC3F378
4800000D 7F2802A6
48000030 4E800021
736C704C 6F676F2E
64617400 736C706C
6F676F5F 7363656E
655F6461 7461003F
BDF705BF D9999A00
3C608047 60639D30
88630000 2C03000E
4082053C 3860000D
3880000E 38A00000
4082068C 38600013
38800014 38A00000
3D808039 618C01F0
7D8903A6 4E800421
7C761B78 38600004
38800005 38A00080
3D808039 618C01F0
7D8903A6 4E800421
48000021 7C8802A6
7C721B78 38790000
3D808001 618C6BE0
7D8903A6 4E800421
3899000C 3D808038
618C0358 7D8903A6
4E800421 7C731B78
80730004 80630000
3D808036 618CA590
7D8903A6 4E800421
7C651B78 888DC1AB
7EC3B378 3D808039
618C0A70 7D8903A6
4E800421 7EC3B378
3C808039 608410D8
38A00001 3D808039
618C075C 7D8903A6
4E800421 3C800000
60840200 90960024
80730000 80630000
80630000 3D808037
618C0E44 7D8903A6
4E800421 7C751B78
886DAFE0 2C030000
41820024 C035002C
C059001F EC6100B2
D075002C C0350038
C0590023 EC61102A
D0750038 7E439378
38800003 7EA5AB78
3D808039 618C0A70
7D8903A6 4E800421
7E439378 3C808039
60841070 38A00009
38C00011 3D808039
618C069C 7D8903A6
4E800421 48000025
7E439378 7C8802A6
38A00000 3D808038
618CFD54 7D8903A6
4E800421 480004F0
4E800421 48000500
4E800021 7C0802A6
90010004 9421FF50
BE810008 48000461
BE810008 48000471
7FC802A6 38600000
3880FFFF 3D80803A
618C6754 7D8903A6
Expand All @@ -513,16 +600,16 @@ C03E0008 D03C0008
C03E0010 D03C0024
D03C0028 C03E0000
C05E0004 7F83E378
48000435 7C8802A6
48000445 7CA802A6
48000445 7C8802A6
48000455 7CA802A6
3D80803A 618C6B98
7D8903A6 4E800421
7C641B78 7F83E378
C03E000C C05E000C
3D80803A 618C7548
7D8903A6 4E800421
C03E0014 C05E0018
7F83E378 48000415
7F83E378 48000425
7C8802A6 3D80803A
618C6B98 7D8903A6
4E800421 7C641B78
Expand All @@ -545,10 +632,12 @@ C05E000C 3D80803A
38600000 3D808037
618C5538 7D8903A6
4E800421 8062F240
2C030000 4082001C
2C030000 4082002C
38600000 7F84E378
3D80803A 618C84BC
7D8903A6 4E800421
3D808039 618C0FC0
7D8903A6 4E800421
38600000 3D808037
618C61C0 7D8903A6
4E800421 3D808034
Expand All @@ -572,7 +661,7 @@ C05E000C 3D80803A
3D808000 618C55F0
7D8903A6 4E800421
887D0000 2C030001
4082FEF0 7F83E378
4082FEE0 7F83E378
3D80803A 618C5CC4
7D8903A6 4E800421
38600075 987D0000
Expand Down Expand Up @@ -895,6 +984,81 @@ C209E090 00000011 #Common/FastForward/DynamicsFix.asm
8001001C 38210018
7C0803A6 4E800020
BB010028 00000000
C21A4CB4 00000004 #Online/Core/EXIFileLoad/AllocBuffer.asm
38600080 3D808037
618CF1E4 7D8903A6
4E800421 906DAFC4
38000000 00000000
C20163FC 0000001B #Online/Core/EXIFileLoad/GetFileSize.asm
7C7E1B78 7C0802A6
90010004 9421FF50
BE810008 83EDAFC4
2C1F0000 40820018
BA810008 800100B4
382100B0 7C0803A6
480000A0 386000D1
987F0000 387F0001
7FC4F378 3D808032
618C5A50 7D8903A6
4E800421 7FC3F378
3D808032 618C5B04
7D8903A6 4E800421
38830002 7FE3FB78
38A00001 3D808000
618C55F0 7D8903A6
4E800421 7FE3FB78
38800004 38A00000
3D808000 618C55F0
7D8903A6 4E800421
7FE3FB78 BA810008
800100B4 382100B0
7C0803A6 80630000
2C030000 40810014
3D808001 618C6488
7D8903A6 4E800420
7FC3F378 00000000
C20166B8 00000029 #Online/Core/EXIFileLoad/TransferFile.asm
7C7E1B78 7C0802A6
90010004 9421FF50
BE810008 83EDAFC4
2C1F0000 41820110
386000D1 987F0000
387F0001 7FC4F378
3D808032 618C5A50
7D8903A6 4E800421
7FC3F378 3D808032
618C5B04 7D8903A6
4E800421 38830002
7FE3FB78 38A00001
3D808000 618C55F0
7D8903A6 4E800421
7FE3FB78 38800004
38A00000 3D808000
618C55F0 7D8903A6
4E800421 83BF0000
2C1D0000 40810098
93BC0000 386000D2
987F0000 387F0001
7FC4F378 3D808032
618C5A50 7D8903A6
4E800421 7FC3F378
3D808032 618C5B04
7D8903A6 4E800421
38830002 7FE3FB78
38A00001 3D808000
618C55F0 7D8903A6
4E800421 7F63DB78
7FA4EB78 38A00000
3D808000 618C55F0
7D8903A6 4E800421
BA810008 800100B4
382100B0 7C0803A6
38600001 3D808001
618C674C 7D8903A6
4E800420 BA810008
800100B4 382100B0
7C0803A6 7FC3F378
60000000 00000000
C200569C 00000002 #Common/CompatibilityHooks/GetFighterNum.asm
38600021 4E800020
60000000 00000000
Expand Down
Loading