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

Add slippi logo to waiting for game #86

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Add slippi logo to waiting for game #86

Show file tree
Hide file tree
Changes from 24 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
6 changes: 6 additions & 0 deletions Common/Common.s
View file
Open in desktop
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 @@ -210,6 +215,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
Loading