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 ECB state to character post frame update #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified Output/Console/g_core.bin
Binary file not shown.
Binary file modified Output/Console/g_core_porta.bin
Binary file not shown.
20 changes: 14 additions & 6 deletions Output/Netplay/GALE01r2.ini
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ C216E74C 000000BE #Recording/SendGameInfo.asm
932DB64C 38800005
3D808000 618CC160
7D8903A6 4E800421
386006E2 3D808037
386007E2 3D808037
618CF1E4 7D8903A6
4E800421 7C7E1B78
93D90000 38600000
Expand All @@ -670,7 +670,7 @@ C216E74C 000000BE #Recording/SendGameInfo.asm
B07E0003 38600037
987E0005 3860003F
B07E0006 38600038
987E0008 38600048
987E0008 38600068
B07E0009 38600039
987E000B 38600002
B07E000C 3860003A
Expand Down Expand Up @@ -834,14 +834,14 @@ BE810008 806DB64C
BA810008 800100B4
382100B0 7C0803A6
3C608017 00000000
C206DA34 00000034 #Recording/SendGamePostFrame.asm
C206DA34 0000003C #Recording/SendGamePostFrame.asm
7C0802A6 90010004
9421FF50 BE810008
3D808000 618C5604
7D8903A6 4E800421
2C030000 41820160
2C030000 418201A0
887F221F 546306F7
40820154 8B7F000C
40820194 8B7F000C
806DB64C 83A30000
838DB650 7FBDE214
38600038 987D0000
Expand Down Expand Up @@ -882,7 +882,15 @@ B07D0030 887F1968
807F008C 907D003D
807F0090 907D0041
807F00EC 907D0045
838DB650 3B9C0049
807F0774 907D0049
807F0778 907D004D
807F077C 907D0051
807F0780 907D0055
807F0784 907D0059
807F0788 907D005D
807F078C 907D0061
807F0790 907D0065
838DB650 3B9C0069
938DB650 BA810008
800100B4 382100B0
7C0803A6 8001001C
Expand Down
20 changes: 14 additions & 6 deletions Output/Netplay/GALJ01r2.ini
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ C216E74C 000000BE #Recording/SendGameInfo.asm
932DB64C 38800005
3D808000 618CC160
7D8903A6 4E800421
386006E2 3D808037
386007E2 3D808037
618CF1E4 7D8903A6
4E800421 7C7E1B78
93D90000 38600000
Expand All @@ -670,7 +670,7 @@ C216E74C 000000BE #Recording/SendGameInfo.asm
B07E0003 38600037
987E0005 3860003F
B07E0006 38600038
987E0008 38600048
987E0008 38600068
B07E0009 38600039
987E000B 38600002
B07E000C 3860003A
Expand Down Expand Up @@ -834,14 +834,14 @@ BE810008 806DB64C
BA810008 800100B4
382100B0 7C0803A6
3C608017 00000000
C206DA34 00000034 #Recording/SendGamePostFrame.asm
C206DA34 0000003C #Recording/SendGamePostFrame.asm
7C0802A6 90010004
9421FF50 BE810008
3D808000 618C5604
7D8903A6 4E800421
2C030000 41820160
2C030000 418201A0
887F221F 546306F7
40820154 8B7F000C
40820194 8B7F000C
806DB64C 83A30000
838DB650 7FBDE214
38600038 987D0000
Expand Down Expand Up @@ -882,7 +882,15 @@ B07D0030 887F1968
807F008C 907D003D
807F0090 907D0041
807F00EC 907D0045
838DB650 3B9C0049
807F0774 907D0049
807F0778 907D004D
807F077C 907D0051
807F0780 907D0055
807F0784 907D0059
807F0788 907D005D
807F078C 907D0061
807F0790 907D0065
838DB650 3B9C0069
938DB650 BA810008
800100B4 382100B0
7C0803A6 8001001C
Expand Down
2 changes: 1 addition & 1 deletion Recording/Recording.s
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.set GAME_INFO_PAYLOAD_LENGTH, 420 # byte count
.set GAME_INITIAL_RNG_PAYLOAD_LENGTH, 8 #byte count
.set GAME_PRE_FRAME_PAYLOAD_LENGTH, 63 # byte count
.set GAME_POST_FRAME_PAYLOAD_LENGTH, 72 # byte count
.set GAME_POST_FRAME_PAYLOAD_LENGTH, 104 # byte count
.set GAME_ITEM_INFO_PAYLOAD_LENGTH, 42 # byte count
.set GAME_FRAME_BOOKEND_PAYLOAD_LENGTH, 8 # byte count
.set GAME_END_PAYLOAD_LENGTH, 2 # byte count
Expand Down
35 changes: 35 additions & 0 deletions Recording/SendGamePostFrame.asm
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,41 @@ backup
lwz r3,0xec(REG_PlayerData)
stw r3,0x45(REG_Buffer)

# Note: All ECB Coords are offsets from the character's center
# Not absolute positions

# ECB top edge, x coord
lwz r3,0x774(REG_PlayerData)
stw r3,0x49(REG_Buffer)

# ECB top edge, y coord
lwz r3,0x0778(REG_PlayerData)
stw r3,0x4D(REG_Buffer)

# ECB bottom edge, x coord
lwz r3,0x77C(REG_PlayerData)
stw r3,0x51(REG_Buffer)

# ECB bottom edge, y coord
lwz r3,0x780(REG_PlayerData)
stw r3,0x55(REG_Buffer)

# ECB right edge, x coord
lwz r3,0x784(REG_PlayerData)
stw r3,0x59(REG_Buffer)

# ECB right edge, y coord
lwz r3,0x788(REG_PlayerData)
stw r3,0x5D(REG_Buffer)

# ECB left edge, x coord
lwz r3,0x78C(REG_PlayerData)
stw r3,0x61(REG_Buffer)

# ECB left edge, y coord
lwz r3,0x790(REG_PlayerData)
stw r3,0x65(REG_Buffer)

#------------- Increment Buffer Offset ------------
lwz REG_BufferOffset,bufferOffset(r13)
addi REG_BufferOffset,REG_BufferOffset,(GAME_POST_FRAME_PAYLOAD_LENGTH+1)
Expand Down