From f648a4388ef12e9d2ffe56df3b5619cc2111f26b Mon Sep 17 00:00:00 2001 From: Nick Condron Date: Fri, 22 Sep 2023 15:59:30 -0400 Subject: [PATCH 01/11] Record FoD platform heights in new event --- Recording/Recording.s | 8 +++-- Recording/SendGameInfo.asm | 5 +++ Recording/Stages/SendFountainInfo.asm | 50 +++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 Recording/Stages/SendFountainInfo.asm diff --git a/Recording/Recording.s b/Recording/Recording.s index 494aa713..857f9781 100644 --- a/Recording/Recording.s +++ b/Recording/Recording.s @@ -22,7 +22,8 @@ .set CMD_ITEM, 0x3B .set CMD_FRAME_BOOKEND, 0x3C .set CMD_GAME_END, 0x39 -.set COMMAND_COUNT, 10 # number of possible commands +.set CMD_FOD_INFO, 0x3E +.set COMMAND_COUNT, 11 # number of possible commands ################################################################################ # Payload lengths @@ -35,6 +36,7 @@ .set GAME_ITEM_INFO_PAYLOAD_LENGTH, 44 # byte count .set GAME_FRAME_BOOKEND_PAYLOAD_LENGTH, 8 # byte count .set GAME_END_PAYLOAD_LENGTH, GAME_END_TXB_SIZE - 1 # byte count +.set FOD_INFO_PAYLOAD_LENGTH, 5 # byte count .set SPLIT_MESSAGE_PAYLOAD_LENGTH, 516 # byte count .set SPLIT_MESSAGE_INTERNAL_DATA_LEN, 512 @@ -65,8 +67,8 @@ # build version number. Each byte is one digit # any change in command data should result in a minor version change -# current version: 3.16.0 -.set CURRENT_VERSION,0x03100000 +# current version: 3.17.0 +.set CURRENT_VERSION,0x03110000 ################################################################################ # Static Function Locations diff --git a/Recording/SendGameInfo.asm b/Recording/SendGameInfo.asm index 7e645817..32bb7a52 100644 --- a/Recording/SendGameInfo.asm +++ b/Recording/SendGameInfo.asm @@ -122,6 +122,11 @@ backup li r3, SPLIT_MESSAGE_PAYLOAD_LENGTH sth r3, CommandSizesStart+0x1B(REG_Buffer) + li r3, CMD_FOD_INFO + stb r3, CommandSizesStart+0x1D(REG_Buffer) + li r3, FOD_INFO_PAYLOAD_LENGTH + sth r3, CommandSizesStart+0x1E(REG_Buffer) + #------------- BEGIN GAME INFO COMMAND ------------- # game information message type .set GameInfoCommandStart, (CommandSizesStart + CommandSizesLength) diff --git a/Recording/Stages/SendFountainInfo.asm b/Recording/Stages/SendFountainInfo.asm new file mode 100644 index 00000000..ff652db5 --- /dev/null +++ b/Recording/Stages/SendFountainInfo.asm @@ -0,0 +1,50 @@ +################################################################################ +# Address: 801cc998 +################################################################################ +.include "Common/Common.s" +.include "Recording/Recording.s" + +################################################################################ +# Routine: SendFountainInfo +# ------------------------------------------------------------------------------ +# Sends Fount of Dreams platform heights when they change. +################################################################################ + +.set REG_Buffer,29 +.set REG_BufferOffset,28 + +backup + +# Check if VS Mode + branchl r12,FN_ShouldRecord + cmpwi r3,0x0 + beq Injection_Exit + +#------------- INITIALIZE ------------- +# here we want to initalize some variables we plan on using throughout +# get current offset in buffer + lwz r3, primaryDataBuffer(r13) + lwz REG_Buffer, RDB_TXB_ADDRESS(r3) + lwz REG_BufferOffset,bufferOffset(r13) + add REG_Buffer,REG_Buffer,REG_BufferOffset + +# send stage info event code + li r3, CMD_FOD_INFO + stb r3,0x0(REG_Buffer) + +# send left/right + lwz r3,0x38(r27) + srwi r3, r3, 0x1f + stb r3,0x1(REG_Buffer) + +# send height + stfs f31, 0x2(REG_Buffer) + +#------------- Increment Buffer Offset ------------ + lwz REG_BufferOffset,bufferOffset(r13) + addi REG_BufferOffset,REG_BufferOffset,6 + stw REG_BufferOffset,bufferOffset(r13) + +Injection_Exit: + restore + stfs f31, 0x3c(r27) #execute replaced code line From 89c0d816f8587b633dda3b40a2d540a60daef59f Mon Sep 17 00:00:00 2001 From: Nick Condron Date: Sat, 23 Sep 2023 00:48:24 -0400 Subject: [PATCH 02/11] Record frame number --- Recording/Recording.s | 2 +- Recording/Stages/SendFountainInfo.asm | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Recording/Recording.s b/Recording/Recording.s index 857f9781..3a8c1504 100644 --- a/Recording/Recording.s +++ b/Recording/Recording.s @@ -36,7 +36,7 @@ .set GAME_ITEM_INFO_PAYLOAD_LENGTH, 44 # byte count .set GAME_FRAME_BOOKEND_PAYLOAD_LENGTH, 8 # byte count .set GAME_END_PAYLOAD_LENGTH, GAME_END_TXB_SIZE - 1 # byte count -.set FOD_INFO_PAYLOAD_LENGTH, 5 # byte count +.set FOD_INFO_PAYLOAD_LENGTH, 9 # byte count .set SPLIT_MESSAGE_PAYLOAD_LENGTH, 516 # byte count .set SPLIT_MESSAGE_INTERNAL_DATA_LEN, 512 diff --git a/Recording/Stages/SendFountainInfo.asm b/Recording/Stages/SendFountainInfo.asm index ff652db5..a6724331 100644 --- a/Recording/Stages/SendFountainInfo.asm +++ b/Recording/Stages/SendFountainInfo.asm @@ -32,17 +32,21 @@ backup li r3, CMD_FOD_INFO stb r3,0x0(REG_Buffer) +# send frame index + lwz r3,frameIndex(r13) + stw r3,0x1(REG_Buffer) + # send left/right lwz r3,0x38(r27) srwi r3, r3, 0x1f - stb r3,0x1(REG_Buffer) + stb r3,0x5(REG_Buffer) # send height - stfs f31, 0x2(REG_Buffer) + stfs f31, 0x6(REG_Buffer) #------------- Increment Buffer Offset ------------ lwz REG_BufferOffset,bufferOffset(r13) - addi REG_BufferOffset,REG_BufferOffset,6 + addi REG_BufferOffset,REG_BufferOffset,FOD_INFO_PAYLOAD_LENGTH+1 stw REG_BufferOffset,bufferOffset(r13) Injection_Exit: From cc38f30702ba065a6eab6f85b4462cc54fedb586 Mon Sep 17 00:00:00 2001 From: Nick Condron Date: Sat, 23 Sep 2023 15:55:05 -0400 Subject: [PATCH 03/11] Avoid FoD plat initialization --- Recording/Stages/SendFountainInfo.asm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Recording/Stages/SendFountainInfo.asm b/Recording/Stages/SendFountainInfo.asm index a6724331..6bd6255c 100644 --- a/Recording/Stages/SendFountainInfo.asm +++ b/Recording/Stages/SendFountainInfo.asm @@ -13,6 +13,12 @@ .set REG_Buffer,29 .set REG_BufferOffset,28 +# We skip to avoid the two initialization calls at game start +mflr r0 +load r3, 0x801cc908 +xor. r0, r0, r3 +beq Skip + backup # Check if VS Mode @@ -51,4 +57,5 @@ backup Injection_Exit: restore +Skip: stfs f31, 0x3c(r27) #execute replaced code line From 45a8d65167c2438dd3f3c1a9cdce63c05ed9f9fd Mon Sep 17 00:00:00 2001 From: Nick Condron Date: Sat, 23 Sep 2023 16:12:51 -0400 Subject: [PATCH 04/11] Simplify and avoid backup/restore --- Recording/Stages/SendFountainInfo.asm | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/Recording/Stages/SendFountainInfo.asm b/Recording/Stages/SendFountainInfo.asm index 6bd6255c..ffc9d485 100644 --- a/Recording/Stages/SendFountainInfo.asm +++ b/Recording/Stages/SendFountainInfo.asm @@ -10,21 +10,14 @@ # Sends Fount of Dreams platform heights when they change. ################################################################################ -.set REG_Buffer,29 -.set REG_BufferOffset,28 +.set REG_Buffer,4 +.set REG_BufferOffset,5 # We skip to avoid the two initialization calls at game start -mflr r0 -load r3, 0x801cc908 -xor. r0, r0, r3 -beq Skip - -backup - -# Check if VS Mode - branchl r12,FN_ShouldRecord - cmpwi r3,0x0 - beq Injection_Exit + mflr r0 + load r3, 0x801cc908 + xor. r0, r0, r3 + beq Skip #------------- INITIALIZE ------------- # here we want to initalize some variables we plan on using throughout @@ -55,7 +48,5 @@ backup addi REG_BufferOffset,REG_BufferOffset,FOD_INFO_PAYLOAD_LENGTH+1 stw REG_BufferOffset,bufferOffset(r13) -Injection_Exit: - restore Skip: stfs f31, 0x3c(r27) #execute replaced code line From 93cb2cd21ee297a624dc35b0c9bd0071deb180d8 Mon Sep 17 00:00:00 2001 From: Nick Condron Date: Mon, 25 Sep 2023 00:57:39 -0400 Subject: [PATCH 05/11] Add whispy event --- Recording/Recording.s | 4 +- Recording/SendGameInfo.asm | 5 +++ Recording/Stages/SendDreamlandInfo.asm | 59 ++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 Recording/Stages/SendDreamlandInfo.asm diff --git a/Recording/Recording.s b/Recording/Recording.s index 3a8c1504..554ab012 100644 --- a/Recording/Recording.s +++ b/Recording/Recording.s @@ -23,7 +23,8 @@ .set CMD_FRAME_BOOKEND, 0x3C .set CMD_GAME_END, 0x39 .set CMD_FOD_INFO, 0x3E -.set COMMAND_COUNT, 11 # number of possible commands +.set CMD_DL_INFO, 0x3F +.set COMMAND_COUNT, 12 # number of possible commands ################################################################################ # Payload lengths @@ -37,6 +38,7 @@ .set GAME_FRAME_BOOKEND_PAYLOAD_LENGTH, 8 # byte count .set GAME_END_PAYLOAD_LENGTH, GAME_END_TXB_SIZE - 1 # byte count .set FOD_INFO_PAYLOAD_LENGTH, 9 # byte count +.set DL_INFO_PAYLOAD_LENGTH, 5 # byte count .set SPLIT_MESSAGE_PAYLOAD_LENGTH, 516 # byte count .set SPLIT_MESSAGE_INTERNAL_DATA_LEN, 512 diff --git a/Recording/SendGameInfo.asm b/Recording/SendGameInfo.asm index 32bb7a52..af30ca57 100644 --- a/Recording/SendGameInfo.asm +++ b/Recording/SendGameInfo.asm @@ -127,6 +127,11 @@ backup li r3, FOD_INFO_PAYLOAD_LENGTH sth r3, CommandSizesStart+0x1E(REG_Buffer) + li r3, CMD_DL_INFO + stb r3, CommandSizesStart+0x20(REG_Buffer) + li r3, DL_INFO_PAYLOAD_LENGTH + sth r3, CommandSizesStart+0x21(REG_Buffer) + #------------- BEGIN GAME INFO COMMAND ------------- # game information message type .set GameInfoCommandStart, (CommandSizesStart + CommandSizesLength) diff --git a/Recording/Stages/SendDreamlandInfo.asm b/Recording/Stages/SendDreamlandInfo.asm new file mode 100644 index 00000000..b6c37b7d --- /dev/null +++ b/Recording/Stages/SendDreamlandInfo.asm @@ -0,0 +1,59 @@ +################################################################################ +# Address: 80211bf8 +################################################################################ +.include "Common/Common.s" +.include "Recording/Recording.s" + +################################################################################ +# Routine: SendDreamlandInfo +# ------------------------------------------------------------------------------ +# Sends whispy wind direction when it changes. +################################################################################ + +.set REG_LR,6 +.set REG_Buffer,7 +.set REG_BufferOffset,8 + +b Start +STATIC_PREVIOUS_VALUE: + blrl + .long 0x00000000 + +Start: + mtlr REG_LR + bl STATIC_PREVIOUS_VALUE + mflr r3 + lwz r4, 0(r3) + lwz r5,0xdc(r31) + cmpw r4, r5 + beq Skip + stw r5, 0(r3) + +#------------- INITIALIZE ------------- +# here we want to initalize some variables we plan on using throughout +# get current offset in buffer + lwz r3, primaryDataBuffer(r13) + lwz REG_Buffer, RDB_TXB_ADDRESS(r3) + lwz REG_BufferOffset,bufferOffset(r13) + add REG_Buffer,REG_Buffer,REG_BufferOffset + +# send stage info event code + li r3, CMD_DL_INFO + stb r3,0x0(REG_Buffer) + +# send frame index + lwz r3,frameIndex(r13) + stw r3,0x1(REG_Buffer) + +# send wind direction (0 = none, 1 = left, 2 = right) + stb r5,0x5(REG_Buffer) + +#------------- Increment Buffer Offset ------------ + lwz REG_BufferOffset,bufferOffset(r13) + addi REG_BufferOffset,REG_BufferOffset,DL_INFO_PAYLOAD_LENGTH+1 + stw REG_BufferOffset,bufferOffset(r13) + +Skip: + mtlr REG_LR + lmw r26, 0xe8(r1) #execute replaced code line + From a69344c2c8a9af95d998a240bab131c1cc1ebbe7 Mon Sep 17 00:00:00 2001 From: Nick Condron Date: Mon, 25 Sep 2023 01:12:14 -0400 Subject: [PATCH 06/11] Remove unnecessary lr register backup --- Recording/Stages/SendDreamlandInfo.asm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Recording/Stages/SendDreamlandInfo.asm b/Recording/Stages/SendDreamlandInfo.asm index b6c37b7d..5d6ac748 100644 --- a/Recording/Stages/SendDreamlandInfo.asm +++ b/Recording/Stages/SendDreamlandInfo.asm @@ -10,9 +10,8 @@ # Sends whispy wind direction when it changes. ################################################################################ -.set REG_LR,6 -.set REG_Buffer,7 -.set REG_BufferOffset,8 +.set REG_Buffer,6 +.set REG_BufferOffset,7 b Start STATIC_PREVIOUS_VALUE: @@ -20,7 +19,6 @@ STATIC_PREVIOUS_VALUE: .long 0x00000000 Start: - mtlr REG_LR bl STATIC_PREVIOUS_VALUE mflr r3 lwz r4, 0(r3) @@ -54,6 +52,5 @@ Start: stw REG_BufferOffset,bufferOffset(r13) Skip: - mtlr REG_LR lmw r26, 0xe8(r1) #execute replaced code line From 2069e847be2a0bc5cd6736ecbb7135bbb9431381 Mon Sep 17 00:00:00 2001 From: Nick Condron Date: Mon, 25 Sep 2023 14:56:09 -0400 Subject: [PATCH 07/11] Use more sensible registers --- Recording/Stages/SendDreamlandInfo.asm | 4 ++-- Recording/Stages/SendFountainInfo.asm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Recording/Stages/SendDreamlandInfo.asm b/Recording/Stages/SendDreamlandInfo.asm index 5d6ac748..7ec2525a 100644 --- a/Recording/Stages/SendDreamlandInfo.asm +++ b/Recording/Stages/SendDreamlandInfo.asm @@ -10,8 +10,8 @@ # Sends whispy wind direction when it changes. ################################################################################ -.set REG_Buffer,6 -.set REG_BufferOffset,7 +.set REG_Buffer,11 +.set REG_BufferOffset,12 b Start STATIC_PREVIOUS_VALUE: diff --git a/Recording/Stages/SendFountainInfo.asm b/Recording/Stages/SendFountainInfo.asm index ffc9d485..f5efd692 100644 --- a/Recording/Stages/SendFountainInfo.asm +++ b/Recording/Stages/SendFountainInfo.asm @@ -10,8 +10,8 @@ # Sends Fount of Dreams platform heights when they change. ################################################################################ -.set REG_Buffer,4 -.set REG_BufferOffset,5 +.set REG_Buffer,11 +.set REG_BufferOffset,12 # We skip to avoid the two initialization calls at game start mflr r0 From d95aec7434b7e11011f4735e697e6f531022a184 Mon Sep 17 00:00:00 2001 From: Nick Condron Date: Tue, 26 Sep 2023 23:50:34 -0400 Subject: [PATCH 08/11] Send stadium transformation info --- Recording/Recording.s | 4 +- Recording/SendGameInfo.asm | 5 +++ Recording/Stages/SendStadiumInfo.asm | 55 ++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 Recording/Stages/SendStadiumInfo.asm diff --git a/Recording/Recording.s b/Recording/Recording.s index 554ab012..03d99ff9 100644 --- a/Recording/Recording.s +++ b/Recording/Recording.s @@ -24,7 +24,8 @@ .set CMD_GAME_END, 0x39 .set CMD_FOD_INFO, 0x3E .set CMD_DL_INFO, 0x3F -.set COMMAND_COUNT, 12 # number of possible commands +.set CMD_PS_INFO, 0x40 +.set COMMAND_COUNT, 13 # number of possible commands ################################################################################ # Payload lengths @@ -39,6 +40,7 @@ .set GAME_END_PAYLOAD_LENGTH, GAME_END_TXB_SIZE - 1 # byte count .set FOD_INFO_PAYLOAD_LENGTH, 9 # byte count .set DL_INFO_PAYLOAD_LENGTH, 5 # byte count +.set PS_INFO_PAYLOAD_LENGTH, 8 # byte count .set SPLIT_MESSAGE_PAYLOAD_LENGTH, 516 # byte count .set SPLIT_MESSAGE_INTERNAL_DATA_LEN, 512 diff --git a/Recording/SendGameInfo.asm b/Recording/SendGameInfo.asm index af30ca57..07084e97 100644 --- a/Recording/SendGameInfo.asm +++ b/Recording/SendGameInfo.asm @@ -132,6 +132,11 @@ backup li r3, DL_INFO_PAYLOAD_LENGTH sth r3, CommandSizesStart+0x21(REG_Buffer) + li r3, CMD_PS_INFO + stb r3, CommandSizesStart+0x23(REG_Buffer) + li r3, PS_INFO_PAYLOAD_LENGTH + sth r3, CommandSizesStart+0x24(REG_Buffer) + #------------- BEGIN GAME INFO COMMAND ------------- # game information message type .set GameInfoCommandStart, (CommandSizesStart + CommandSizesLength) diff --git a/Recording/Stages/SendStadiumInfo.asm b/Recording/Stages/SendStadiumInfo.asm new file mode 100644 index 00000000..1683d46e --- /dev/null +++ b/Recording/Stages/SendStadiumInfo.asm @@ -0,0 +1,55 @@ +################################################################################ +# Address: 801d4fd8 +################################################################################ +.include "Common/Common.s" +.include "Recording/Recording.s" + +################################################################################ +# Routine: SendStadiumInfo +# ------------------------------------------------------------------------------ +# Sends Pokemon Stadium transformation IDs +################################################################################ + +.set REG_Buffer,11 +.set REG_BufferOffset,12 + +b Start +STATIC_PREVIOUS_VALUE: + blrl + .long 0x00000005 + +Start: + bl STATIC_PREVIOUS_VALUE + mflr r3 + lwz r4, 0(r3) + lwz r5,0xdc(r31) + cmpw r4, r5 + beq Skip + stw r5, 0(r3) + +#------------- INITIALIZE ------------- +# here we want to initalize some variables we plan on using throughout +# get current offset in buffer + lwz r3, primaryDataBuffer(r13) + lwz REG_Buffer, RDB_TXB_ADDRESS(r3) + lwz REG_BufferOffset,bufferOffset(r13) + add REG_Buffer,REG_Buffer,REG_BufferOffset + +# send stage info event code + li r3, CMD_PS_INFO + stb r3,0x0(REG_Buffer) + +# send frame index + lwz r3,frameIndex(r13) + stw r3,0x1(REG_Buffer) + +# send transform IDs (two 16 bit IDs) + stw r5,0x5(REG_Buffer) + +#------------- Increment Buffer Offset ------------ + lwz REG_BufferOffset,bufferOffset(r13) + addi REG_BufferOffset,REG_BufferOffset,PS_INFO_PAYLOAD_LENGTH+1 + stw REG_BufferOffset,bufferOffset(r13) + +Skip: + lmw r27, 0x84(r1) #execute replaced code line From 1f96bbafd670f4f573bf9844bb3621f3e0bf85ca Mon Sep 17 00:00:00 2001 From: Nick Condron Date: Wed, 27 Sep 2023 03:09:32 -0400 Subject: [PATCH 09/11] Update maximum buffer length --- Recording/Recording.s | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Recording/Recording.s b/Recording/Recording.s index 03d99ff9..6b3e078a 100644 --- a/Recording/Recording.s +++ b/Recording/Recording.s @@ -65,9 +65,10 @@ .set TOTAL_FRAME_START_LEN, GAME_FRAME_START_PAYLOAD_LENGTH + 1 .set TOTAL_CHAR_FRAME_LEN, MAX_CHARACTERS * (GAME_PRE_FRAME_PAYLOAD_LENGTH + 1) + MAX_CHARACTERS * (GAME_POST_FRAME_PAYLOAD_LENGTH + 1) .set TOTAL_ITEM_LEN, MAX_ITEMS * (GAME_ITEM_INFO_PAYLOAD_LENGTH + 1) +.set TOTAL_MAX_STAGE_LEN, (FOD_INFO_PAYLOAD_LENGTH + 1) * 2 # 2 platforms .set TOTAL_FRAME_BOOKEND_LEN, GAME_FRAME_BOOKEND_PAYLOAD_LENGTH + 1 .set TOTAL_GAME_END_LEN, GAME_END_PAYLOAD_LENGTH + 1 -.set FULL_FRAME_DATA_BUF_LENGTH, TOTAL_FRAME_START_LEN + TOTAL_CHAR_FRAME_LEN + TOTAL_ITEM_LEN + TOTAL_FRAME_BOOKEND_LEN + TOTAL_GAME_END_LEN +.set FULL_FRAME_DATA_BUF_LENGTH, TOTAL_FRAME_START_LEN + TOTAL_CHAR_FRAME_LEN + TOTAL_ITEM_LEN + TOTAL_MAX_STAGE_LEN + TOTAL_FRAME_BOOKEND_LEN + TOTAL_GAME_END_LEN # build version number. Each byte is one digit # any change in command data should result in a minor version change From d0bb00a4cbba7a273f200c4767b7529620b889d4 Mon Sep 17 00:00:00 2001 From: Nick Condron Date: Wed, 4 Oct 2023 18:22:49 -0400 Subject: [PATCH 10/11] Avoid conflict with menu frame command code --- Recording/Recording.s | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Recording/Recording.s b/Recording/Recording.s index 6b3e078a..4ebfe7f9 100644 --- a/Recording/Recording.s +++ b/Recording/Recording.s @@ -22,10 +22,11 @@ .set CMD_ITEM, 0x3B .set CMD_FRAME_BOOKEND, 0x3C .set CMD_GAME_END, 0x39 -.set CMD_FOD_INFO, 0x3E -.set CMD_DL_INFO, 0x3F -.set CMD_PS_INFO, 0x40 +.set CMD_FOD_INFO, 0x3F +.set CMD_DL_INFO, 0x40 +.set CMD_PS_INFO, 0x41 .set COMMAND_COUNT, 13 # number of possible commands +# .set CMD_MENU_FRAME, 0x3E # not written for recorded game ################################################################################ # Payload lengths From 078a31fff0002cf247324ad9dadc39bf7d3c83dc Mon Sep 17 00:00:00 2001 From: Nick Condron Date: Sat, 17 Feb 2024 16:47:10 -0500 Subject: [PATCH 11/11] Generate codes --- Output/Console/GALE01r2.ini | 96 +++++++++++++++++++++++--------- Output/Console/g_core.bin | Bin 5528 -> 5880 bytes Output/Console/g_core_porta.bin | Bin 5528 -> 5880 bytes Output/Netplay/GALE01r2.ini | 96 +++++++++++++++++++++++--------- Output/Netplay/GALJ01r2.ini | 96 +++++++++++++++++++++++--------- Output/Playback/GALE01r2.ini | 96 +++++++++++++++++++++++--------- Output/Playback/GALJ01r2.ini | 96 +++++++++++++++++++++++--------- 7 files changed, 350 insertions(+), 130 deletions(-) diff --git a/Output/Console/GALE01r2.ini b/Output/Console/GALE01r2.ini index 56e4c8d6..eaa1e628 100644 --- a/Output/Console/GALE01r2.ini +++ b/Output/Console/GALE01r2.ini @@ -132,19 +132,19 @@ C216D884 00000030 #Recording/SendGameEnd.asm BA8100B0 800100E4 382100E0 7C0803A6 819F2514 00000000 -C216E74C 0000010A #Recording/SendGameInfo.asm +C216E74C 00000110 #Recording/SendGameInfo.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820814 +2C030000 41820844 38600005 3D808037 618CF1E4 7D8903A6 4E800421 7C7B1B78 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600770 3D808037 +38600784 3D808037 618CF1E4 7D8903A6 4E800421 7C7E1B78 93DB0000 38600000 @@ -154,7 +154,7 @@ C216E74C 0000010A #Recording/SendGameInfo.asm 3D808000 618C55FC 7D8903A6 4E800421 7C7C1B78 38600035 -987E0000 3860001C +987E0000 38600025 987E0001 38600036 987E0002 386002F8 B07E0003 38600037 @@ -173,16 +173,22 @@ B07E0015 3860003D 987E0017 B39E0018 38600010 987E001A 38600204 B07E001B -38600036 987E001D -3C600310 60630000 -907E001E 387E0022 +3860003F 987E001D +38600009 B07E001E +38600040 987E0020 +38600005 B07E0021 +38600041 987E0023 +38600008 B07E0024 +38600036 987E0026 +3C600311 60630000 +907E0027 387E002B 7FE4FB78 38A00138 3D808000 618C31F4 7D8903A6 4E800421 -387E0062 3880001C +387E006B 3880001C 3D808000 618CC160 7D8903A6 4E800421 -387E0022 3AA30060 +387E002B 3AA30060 3A800000 1ED40024 7ED6AA14 88760001 2C030000 40820034 @@ -193,7 +199,7 @@ B07E0015 3860003D 546005EF 4182000C 38600013 98760000 3A940001 2C140004 -4180FFB4 387E0022 +4180FFB4 387E002B 3AA30060 3A800000 1ED40024 7ED6AA14 88760001 2C030000 @@ -205,14 +211,14 @@ B07E0015 3860003D 98760003 3A940001 2C140004 4180FFBC 3C60804D 80635F90 -907E015A 3A82F228 -3AA00000 3ADE015E +907E0163 3A82F228 +3AA00000 3ADE0167 1EF50008 38600001 7C76B92E 3AF70004 7C76B92E 3AB50001 2C150004 4180FFE4 3A800000 3ABF0060 -3AFE017E 1F140010 +3AFE0187 1F140010 7F18BA14 1ED40024 7ED6AA14 88760001 2C030000 40820040 @@ -228,10 +234,10 @@ B07E0015 3860003D 618CC160 7D8903A6 4E800421 3A940001 2C140004 4180FF88 -8862F234 987E01BE -8862F23C 987E01BF +8862F234 987E01C7 +8862F23C 987E01C8 3C608048 80639D30 -5463443E B07E01C0 +5463443E B07E01C9 3B200000 3C608048 80639D30 5463443E 2C030208 4082017C @@ -239,7 +245,7 @@ B07E0015 3860003D 618C5610 7D8903A6 4E800421 7C791B78 3A800000 3ABF0060 -3AFE01C2 3B590034 +3AFE01CB 3B590034 1C74001F 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 @@ -253,7 +259,7 @@ B07E0015 3860003D 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 3A800000 -3ABF0060 3AFE023E +3ABF0060 3AFE0247 3B5900CF 1C74000A 7F03BA14 1ED40024 7ED6AA14 88760001 @@ -268,7 +274,7 @@ B07E0015 3860003D 4E800421 3A940001 2C140004 4180FFA0 3A800000 3ABF0060 -3AFE0266 3B5900F7 +3AFE026F 3B5900F7 1C74001D 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 @@ -282,28 +288,28 @@ B07E0015 3860003D 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 4800001C -387E01C2 38800118 +387E01CB 38800118 3D808000 618CC160 7D8903A6 4E800421 3D808000 618CADF4 7D8903A6 4E800421 -987E02DA 2C190000 -41820044 387E02DB +987E02E3 2C190000 +41820044 387E02E4 38990394 38A00033 3D808000 618C31F4 7D8903A6 4E800421 3C60803D 6063AD40 80630000 81830088 -A06C0001 907E030E -886C0006 907E0312 -4800001C 387E02DB +A06C0001 907E0317 +886C0006 907E031B +4800001C 387E02E4 3880003B 3D808000 618CC160 7D8903A6 4E800421 2C190000 41820018 7F23CB78 3D808037 618CF1B0 7D8903A6 4E800421 -7FC3F378 38800316 +7FC3F378 3880031F 38A00001 3D808000 618C55F0 7D8903A6 4E800421 38600205 @@ -522,6 +528,44 @@ C208D698 00000005 #Recording/GetLCancelStatus/GetLCancelStatus.asm C206C324 00000002 #Recording/GetLCancelStatus/ResetLCancelStatus.asm 38600000 987E25FF 807E00B0 00000000 +C2211BF8 0000000C #Recording/Stages/SendDreamlandInfo.asm +4800000C 4E800021 +00000000 4BFFFFF9 +7C6802A6 80830000 +80BF00DC 7C042800 +41820038 90A30000 +806DB64C 81630000 +818DB650 7D6B6214 +38600040 986B0000 +806DB654 906B0001 +98AB0005 818DB650 +398C0006 918DB650 +BB4100E8 00000000 +C21CC998 0000000B #Recording/Stages/SendFountainInfo.asm +7C0802A6 3C60801C +6063C908 7C001A79 +41820040 806DB64C +81630000 818DB650 +7D6B6214 3860003F +986B0000 806DB654 +906B0001 807B0038 +54630FFE 986B0005 +D3EB0006 818DB650 +398C000A 918DB650 +D3FB003C 00000000 +C21D4FD8 0000000C #Recording/Stages/SendStadiumInfo.asm +4800000C 4E800021 +00000005 4BFFFFF9 +7C6802A6 80830000 +80BF00DC 7C042800 +41820038 90A30000 +806DB64C 81630000 +818DB650 7D6B6214 +38600041 986B0000 +806DB654 906B0001 +90AB0005 818DB650 +398C0009 918DB650 +BB610084 00000000 C21A4CB4 00000004 #Common/AllocBuffer.asm 38600080 3D808037 618CF1E4 7D8903A6 diff --git a/Output/Console/g_core.bin b/Output/Console/g_core.bin index 009f9852812d57ea5725665b558aa74e96e9f983..97172051844c17588ec4b599c4202c78c4c499eb 100644 GIT binary patch delta 616 zcmbQC{X=)ddS*s}$s3r}8C@pdU^ZrKnasly%&0m!fn{>N{fs&WS&IY)&JA@8azNSv z$X5W;tU$gZkah&}m4P$|kgo!y&47G0n*?UTgk%PW33UwW7Ih5T^-q3RSS(<)ux)5y zNbE8EQrpSA%&&n(5h#~!(ZC=B5kHuKB(80>m?6QcVX_lzD5Lgd8&>Jbn^_%rldYOQ zX;>{_V6eK!m_CV3o3VYe4qLP2@s6ZVHZ$rNPuL_hcr+x>H3&&|vD;9`cyjUyHfzq) z){zV*G9?W1lN;EjC#$muFuG5!U@vCOpZtbBpYinM7!Gyb$2yV>4313` z&=(Z%$YEfcP{%Co!N4E`7QMh>&M3c`gYzO=y`uCF1_lNmpcIc^1A`)v&EWn2|IeBX zrezJy3=9qX8Sd1uXn+i~n6Mbg&)w$J2n>(L-faQ3*-0Y6aB`TD4HgfXkj=n2V>JUS zNY1i{fo&p?-tEZn0%YbPnUgbs6n6~=(=wpfWD=53a?~(LRn`LycEDn&J+h$<)eIIP z$^8F-Vyu^6Gq6D|-~w52`8R_N*aBJq8$cS_BdkPtL>Jj7j>wiyK=_0c?2|->md#iA HkFWv&pkBm= delta 260 zcmeyNJ41WJdS*th$s3r}8AT@FU^Zqfn9Rcx%qTNCfn~C%*^D{{S(^lAfrMlRh6!~H zau#(AO7%~ES6D1yw6JYxU`XsS{8HP=yv(nGMG+{MWYNGN0}(%%fF!OoIfpfx5kyK) ze$48?8)en>NyBOZ1B2B)#<rN&f3R6|9x00SN{fs&WS&IY)&JA@8azNSv z$X5W;tU$gZkah&}m4P$|kgo!y&47G0n*?UTgk%PW33UwW7Ih5T^-q3RSS(<)ux)5y zNbE8EQrpSA%&&n(5h#~!(ZC=B5kHuKB(80>m?6QcVX_lzD5Lgd8&>Jbn^_%rldYOQ zX;>{_V6eK!m_CV3o3VYe4qLP2@s6ZVHZ$rNPuL_hcr+x>H3&&|vD;9`cyjUyHfzq) z){zV*G9?W1lN;EjC#$muFuG5!U@vCOpZtbBpYinM7!Gyb$2yV>4313` z&=(Z%$YEfcP{%Co!N4E`7QMh>&M3c`gYzO=y`uCF1_lNmpcIc^1A`)v&EWn2|IeBX zrezJy3=9qX8Sd1uXn+i~n6Mbg&)w$J2n>(L-faQ3*-0Y6aB`TD4HgfXkj=n2V>JUS zNY1i{fo&p?-tEZn0%YbPnUgbs6n6~=(=wpfWD=53a?~(LRn`LycEDn&J+h$<)eIIP z$^8F-Vyu^6Gq6D|-~w52`8R_N*aBJq8$cS_BdkPtL>Jj7j>wiyK=_0c?2|->md#iA HkFWv&pkBm= delta 260 zcmeyNJ41WJdS*th$s3r}8AT@FU^Zqfn9Rcx%qTNCfn~C%*^D{{S(^lAfrMlRh6!~H zau#(AO7%~ES6D1yw6JYxU`XsS{8HP=yv(nGMG+{MWYNGN0}(%%fF!OoIfpfx5kyK) ze$48?8)en>NyBOZ1B2B)#<rN&f3R6|9x00S