fixes assembler warnings

new batched mode allowed me to see them
This commit is contained in:
Jas Laferriere
2022-11-21 15:59:25 -05:00
parent a6785d630b
commit e12c276fef
18 changed files with 158 additions and 161 deletions

View File

@@ -616,4 +616,4 @@ add \reg, r3, r4
.set LOG_LEVEL_NOTICE, 1
.endif
.set HEADER_COMMON, 1
.set HEADER_COMMON, 1

View File

@@ -21,4 +21,4 @@
.set IGDB_SIZE, IGDB_PAD_BUFFER + PADS_REPORT_SIZE * OFFLINE_MAX_DELAY_FRAMES
.endif
.set HEADER_IN_GAME_DELAY, 1
.set HEADER_IN_GAME_DELAY, 1

View File

@@ -19,4 +19,4 @@
.endm
.endif
.set HEADER_ADDITIONAL_CRASH_INFO_STATIC, 1
.set HEADER_ADDITIONAL_CRASH_INFO_STATIC, 1

View File

@@ -13,4 +13,4 @@
.set xGetPlayerGObjID, 0x10
.endif
.set HEADER_LEDGE_GRAB, 1
.set HEADER_LEDGE_GRAB, 1

View File

@@ -30,7 +30,7 @@ stb r3, ODB_IS_FRAME_ADVANCE(r5)
# function for the RenewInputs_Prefunction call and setting that as the
# VI callback, but then I'd need to use non-standard lag reduction code
load r3, 0x80375e00
cmpwi r0, r3
cmpw r0, r3
bne EXIT
# Check if a rollback is active, if a rollback is active, do not renew inputs

View File

@@ -106,7 +106,7 @@ PENDING_LOOP_CONTINUE:
addi r7, r7, 1
PENDING_LOOP_CONDITION:
lbz r3, SFXS_LOG_INDEX(r6)
cmpwi r7, r3
cmpw r7, r3
blt PENDING_LOOP_START
# If we exit loop normally, let's stop sound

View File

@@ -537,7 +537,7 @@ bne FIND_CHECKSUM_LOOP_CONTINUE
cmpwi REG_DESYNC_ENTRY_ADDRESS, 0
beq CONFIRMED_SYNC_SET
lwz r3, DDLE_FRAME(REG_LOCAL_DESYNC_ENTRY)
cmpwi REG_DESYNC_ENTRY_FRAME, r3 # If the current frame is later than the stored one, don't switch
cmpw REG_DESYNC_ENTRY_FRAME, r3 # If the current frame is later than the stored one, don't switch
bge SKIP_CONFIRMED_SYNC_SET
CONFIRMED_SYNC_SET:
mr REG_DESYNC_ENTRY_ADDRESS, REG_LOCAL_DESYNC_ENTRY

View File

@@ -85,7 +85,7 @@ PROCESS_NOT_ROLLBACK:
lbz r3, ODB_DELAY_FRAMES(REG_ODB_ADDRESS)
li r4, UNFREEZE_INPUTS_FRAME
sub r3, r4, r3
cmpwi REG_FRAME_INDEX, r3 # Frame 84 +/- 1 (not sure) is first unfrozen frame
cmpw REG_FRAME_INDEX, r3 # Frame 84 +/- 1 (not sure) is first unfrozen frame
bge SKIP_FROZEN_INPUT_CLEAR
addi r3, REG_PARENT_STACK_FRAME, P1_PAD_OFFSET

View File

@@ -1,5 +1,10 @@
.ifndef HEADER_TEAMS
# The CheckAutoFill injection contains static data related to auto-fill
.set INJ_InitTeamToggleButton, 0x802652f4
# Injection Data Offsets
.set IDO_TEAM_IDX, 0x8 # u8
.set IDO_TEAM_IDX, 0x8 # u8
.endif
.set HEADER_TEAMS, 1

View File

@@ -13,7 +13,7 @@ b CODE_START
STATIC_MEMORY_TABLE_BLRL:
blrl
b FN_FetchSuggestion # IDO_FN_FetchSuggestion
.long 0x0, # IDO_ACB_ADDR, address to buffer
.long 0x0 # IDO_ACB_ADDR, address to buffer
CODE_START:
# Original line - checks for an L or R press.

View File

@@ -518,4 +518,4 @@
.set RESP_ADVANCE, 4
.endif
.set HEADER_ONLINE, 1
.set HEADER_ONLINE, 1

View File

@@ -4,4 +4,4 @@
.set InitialSelection,0
.endif
.set HEADER_ONLINE_SCENE, 1
.set HEADER_ONLINE_SCENE, 1

View File

@@ -1478,7 +1478,7 @@ BE8100B0 3D808034
1C870006 7C862214
A0840001 7C032000
41820030 38E70001
88660000 2C070003
88660000 7C071800
4180FFD4 1C790006
7C651A14 80630003
3D808002 618C36B8
@@ -1744,7 +1744,7 @@ BE8100B0 3C608048
80740000 7C161800
408200A8 2C1D0000
41820010 80740000
2C160003 40800008
7C161800 40800008
7E9DA378 A0740006
A0970006 7C630734
7C840734 7C641850
@@ -1813,7 +1813,7 @@ C2376A28 000000F2 #Online/Core/TriggerSendInput.asm
41820010 887B00E0
2C030000 4182067C
887B0021 38800054
7C632050 2C1A0003
7C632050 7C1A1800
4080001C 387E002C
38800030 3D808000
618CC160 7D8903A6
@@ -2186,7 +2186,7 @@ C2019608 0000000F #Online/Core/Hacks/PreventPadAlarmDuringRollback.asm
40820044 80ADB61C
38600000 98650014
3C608037 60635E00
2C000003 40820028
7C001800 40820028
886500DF 2C030000
4182001C 38600001
9865090D 3D808001
@@ -3774,75 +3774,75 @@ C223E290 00000006 #Online/Menus/CSS/TextEntryScreen/AlwaysUseEnglishWhenDirect3.
618CAE90 7D8903A6
4E800421 00000000
C223CCA4 00000045 #Online/Menus/CSS/TextEntryScreen/CheckTriggersAndZ.asm
48000014 4E800021
48000100 00000000
00000000 57400633
41820014 3D808023
618CCCAC 7D8903A6
4E800420 7C0802A6
90010004 9421FF20
BE8100B0 7C9A2378
4BFFFFC5 7C6802A6
83E30004 83DF0006
886DB56C 5463063E
3D80801A 618C36A0
7D8903A6 4E800421
548006F7 41820194
7F44D378 889C0058
1C840003 7C64F22E
2C030000 4082001C
38600003 3D808002
618C4030 7D8903A6
4E800421 48000048
38600001 3D808002
618C4030 7D8903A6
4E800421 887E0019
987F0004 2C030007
40810008 38600007
987C0058 38600039
B07A0002 3D808023
618CCE4C 7D8903A6
4E800421 7F44D378
BA8100B0 800100E4
382100E0 7C0803A6
3D808023 618CCCFC
48000010 4E800021
480000FC 00000000
57400633 41820014
3D808023 618CCCAC
7D8903A6 4E800420
7C0802A6 90010004
9421FF20 BE8100B0
7C7D1B78 886DAFA3
2C030000 418200C8
4BFFFEDD 7C6802A6
83E30004 83DF0006
386000BE 987E0000
387E0001 3C80804A
60840740 38A00018
3D808000 618C31F4
7C9A2378 4BFFFFC9
7C6802A6 83E30004
83DF0006 886DB56C
5463063E 3D80801A
618C36A0 7D8903A6
4E800421 548006F7
41820194 7F44D378
889C0058 1C840003
7C64F22E 2C030000
4082001C 38600003
3D808002 618C4030
7D8903A6 4E800421
887F0004 987E0019
807F0000 907E001A
9BBE001E 886DAFA0
987E001F 7FC3F378
38800020 38A00001
3D808000 618C55F0
48000048 38600001
3D808002 618C4030
7D8903A6 4E800421
887E0019 987F0004
2C030007 40810008
38600007 987C0058
38600039 B07A0002
3D808023 618CCE4C
7D8903A6 4E800421
7FC3F378 3880001E
38A00000 3D808000
618C55F0 7D8903A6
4E800421 3C60804A
60630740 389E0001
38A00018 3D808000
618C31F4 7D8903A6
4E800421 807E001A
907F0000 3D808023
618CCE4C 7D8903A6
4E800421 BA8100B0
800100E4 382100E0
7C0803A6 4E800020
7F44D378 BA8100B0
800100E4 382100E0
7C0803A6 3D808023
618CCD34 7D8903A6
4E800420 00000000
618CCCFC 7D8903A6
4E800420 7C0802A6
90010004 9421FF20
BE8100B0 7C7D1B78
886DAFA3 2C030000
418200C8 4BFFFEE1
7C6802A6 83E30004
83DF0006 386000BE
987E0000 387E0001
3C80804A 60840740
38A00018 3D808000
618C31F4 7D8903A6
4E800421 887F0004
987E0019 807F0000
907E001A 9BBE001E
886DAFA0 987E001F
7FC3F378 38800020
38A00001 3D808000
618C55F0 7D8903A6
4E800421 7FC3F378
3880001E 38A00000
3D808000 618C55F0
7D8903A6 4E800421
3C60804A 60630740
389E0001 38A00018
3D808000 618C31F4
7D8903A6 4E800421
807E001A 907F0000
3D808023 618CCE4C
7D8903A6 4E800421
BA8100B0 800100E4
382100E0 7C0803A6
4E800020 7F44D378
BA8100B0 800100E4
382100E0 7C0803A6
3D808023 618CCD34
7D8903A6 4E800420
60000000 00000000
0423CF9C 2C1B0008 #Online/Menus/CSS/TextEntryScreen/Display8Characters.asm
C223CF80 0000000E #Online/Menus/CSS/TextEntryScreen/HandleAutocompleteText.asm
48000010 4E800021

View File

@@ -1477,7 +1477,7 @@ BE8100B0 3D808034
1C870006 7C862214
A0840001 7C032000
41820030 38E70001
88660000 2C070003
88660000 7C071800
4180FFD4 1C790006
7C651A14 80630003
3D808002 618C36B8
@@ -1743,7 +1743,7 @@ BE8100B0 3C608048
80740000 7C161800
408200A8 2C1D0000
41820010 80740000
2C160003 40800008
7C161800 40800008
7E9DA378 A0740006
A0970006 7C630734
7C840734 7C641850
@@ -1812,7 +1812,7 @@ C2376A28 000000F2 #Online/Core/TriggerSendInput.asm
41820010 887B00E0
2C030000 4182067C
887B0021 38800054
7C632050 2C1A0003
7C632050 7C1A1800
4080001C 387E002C
38800030 3D808000
618CC160 7D8903A6
@@ -2185,7 +2185,7 @@ C2019608 0000000F #Online/Core/Hacks/PreventPadAlarmDuringRollback.asm
40820044 80ADB61C
38600000 98650014
3C608037 60635E00
2C000003 40820028
7C001800 40820028
886500DF 2C030000
4182001C 38600001
9865090D 3D808001
@@ -3773,75 +3773,75 @@ C223E290 00000006 #Online/Menus/CSS/TextEntryScreen/AlwaysUseEnglishWhenDirect3.
618CAE90 7D8903A6
4E800421 00000000
C223CCA4 00000045 #Online/Menus/CSS/TextEntryScreen/CheckTriggersAndZ.asm
48000014 4E800021
48000100 00000000
00000000 57400633
41820014 3D808023
618CCCAC 7D8903A6
4E800420 7C0802A6
90010004 9421FF20
BE8100B0 7C9A2378
4BFFFFC5 7C6802A6
83E30004 83DF0006
886DB56C 5463063E
3D80801A 618C36A0
7D8903A6 4E800421
548006F7 41820194
7F44D378 889C0058
1C840003 7C64F22E
2C030000 4082001C
38600003 3D808002
618C4030 7D8903A6
4E800421 48000048
38600001 3D808002
618C4030 7D8903A6
4E800421 887E0019
987F0004 2C030007
40810008 38600007
987C0058 38600039
B07A0002 3D808023
618CCE4C 7D8903A6
4E800421 7F44D378
BA8100B0 800100E4
382100E0 7C0803A6
3D808023 618CCCFC
48000010 4E800021
480000FC 00000000
57400633 41820014
3D808023 618CCCAC
7D8903A6 4E800420
7C0802A6 90010004
9421FF20 BE8100B0
7C7D1B78 886DAFA3
2C030000 418200C8
4BFFFEDD 7C6802A6
83E30004 83DF0006
386000BE 987E0000
387E0001 3C80804A
60840740 38A00018
3D808000 618C31F4
7C9A2378 4BFFFFC9
7C6802A6 83E30004
83DF0006 886DB56C
5463063E 3D80801A
618C36A0 7D8903A6
4E800421 548006F7
41820194 7F44D378
889C0058 1C840003
7C64F22E 2C030000
4082001C 38600003
3D808002 618C4030
7D8903A6 4E800421
887F0004 987E0019
807F0000 907E001A
9BBE001E 886DAFA0
987E001F 7FC3F378
38800020 38A00001
3D808000 618C55F0
48000048 38600001
3D808002 618C4030
7D8903A6 4E800421
887E0019 987F0004
2C030007 40810008
38600007 987C0058
38600039 B07A0002
3D808023 618CCE4C
7D8903A6 4E800421
7FC3F378 3880001E
38A00000 3D808000
618C55F0 7D8903A6
4E800421 3C60804A
60630740 389E0001
38A00018 3D808000
618C31F4 7D8903A6
4E800421 807E001A
907F0000 3D808023
618CCE4C 7D8903A6
4E800421 BA8100B0
800100E4 382100E0
7C0803A6 4E800020
7F44D378 BA8100B0
800100E4 382100E0
7C0803A6 3D808023
618CCD34 7D8903A6
4E800420 00000000
618CCCFC 7D8903A6
4E800420 7C0802A6
90010004 9421FF20
BE8100B0 7C7D1B78
886DAFA3 2C030000
418200C8 4BFFFEE1
7C6802A6 83E30004
83DF0006 386000BE
987E0000 387E0001
3C80804A 60840740
38A00018 3D808000
618C31F4 7D8903A6
4E800421 887F0004
987E0019 807F0000
907E001A 9BBE001E
886DAFA0 987E001F
7FC3F378 38800020
38A00001 3D808000
618C55F0 7D8903A6
4E800421 7FC3F378
3880001E 38A00000
3D808000 618C55F0
7D8903A6 4E800421
3C60804A 60630740
389E0001 38A00018
3D808000 618C31F4
7D8903A6 4E800421
807E001A 907F0000
3D808023 618CCE4C
7D8903A6 4E800421
BA8100B0 800100E4
382100E0 7C0803A6
4E800020 7F44D378
BA8100B0 800100E4
382100E0 7C0803A6
3D808023 618CCD34
7D8903A6 4E800420
60000000 00000000
0423CF9C 2C1B0008 #Online/Menus/CSS/TextEntryScreen/Display8Characters.asm
C223CF80 0000000E #Online/Menus/CSS/TextEntryScreen/HandleAutocompleteText.asm
48000010 4E800021

View File

@@ -715,7 +715,7 @@ A0630001 1C870006
7C862214 A0840001
7C032000 41820030
38E70001 88660000
2C070003 4180FFD4
7C071800 4180FFD4
1C790006 7C651A14
80630003 3D808002
618C36B8 7D8903A6

View File

@@ -714,7 +714,7 @@ A0630001 1C870006
7C862214 A0840001
7C032000 41820030
38E70001 88660000
2C070003 4180FFD4
7C071800 4180FFD4
1C790006 7C651A14
80630003 3D808002
618C36B8 7D8903A6

View File

@@ -379,50 +379,42 @@ blrl
FrameText:
blrl
.string "P%d Frame: %d // Original // Restored
"
.string "P%d Frame: %d // Original // Restored\n"
.align 2
RNGText:
blrl
.string "RNG Seed: 0x%X // 0x%X
"
.string "RNG Seed: 0x%X // 0x%X\n"
.align 2
XPosText:
blrl
.string "X Position: %f // %f
"
.string "X Position: %f // %f\n"
.align 2
YPosText:
blrl
.string "Y Position: %f // %f
"
.string "Y Position: %f // %f\n"
.align 2
FacingText:
blrl
.string "Facing Direction: %1.0f // %1.0f
"
.string "Facing Direction: %1.0f // %1.0f\n"
.align 2
ASText:
blrl
.string "Action State: 0x%X %s // 0x%X %s
"
.string "Action State: 0x%X %s // 0x%X %s\n"
.align 2
PercentText:
blrl
.string "Percent: %1.2f // %1.2f
"
.string "Percent: %1.2f // %1.2f\n"
.align 2
DividerText:
blrl
.string "------Desync Detected--------
"
.string "------Desync Detected--------\n"
.align 2
.endif

View File

@@ -92,7 +92,7 @@ PENDING_LOOP_CONTINUE:
addi r7, r7, 1
PENDING_LOOP_CONDITION:
lbz r3, SFXS_LOG_INDEX(r6)
cmpwi r7, r3
cmpw r7, r3
blt PENDING_LOOP_START
# If we exit loop normally, let's stop sound