clean up some patches

This commit is contained in:
Martin Michelsen
2025-10-20 22:28:02 -07:00
parent 09b96a4a86
commit 790363adb5
15 changed files with 245 additions and 219 deletions
@@ -4,7 +4,7 @@
# https://www.gc-forever.com/forums/viewtopic.php?t=2050
# https://www.gc-forever.com/forums/viewtopic.php?t=2049
.versions 3OE0 3OE1 3OE2 3OJ2 3OJ3 3OJ4 3OJ5 3OP0
.versions 3OJ2 3OJ3 3OJ4 3OJ5 3OE0 3OE1 3OE2 3OP0
# This code will let you have up to four different palettes of action buttons.
# Battle Screen Control Keys
@@ -31,15 +31,15 @@ start:
.label memcpy, 0x8000E41C
.label memset, 0x8000E334
.label get_main_phase, <VERS 0x8000F948 0x8000F948 0x8000F8FC 0x8000F948 0x8000F94C 0x8000F94C 0x8000F8FC 0x8000F970>
.label get_main_phase, <VERS 0x8000F948 0x8000F94C 0x8000F94C 0x8000F8FC 0x8000F948 0x8000F948 0x8000F8FC 0x8000F970>
.data 0x8000B958 # Save Extra Palettes To Memory Card (Temp Slot 3)
.deltaof save_to_memcard_hook1, save_to_memcard_end
.address 0x8000B958
save_to_memcard_hook1:
stw [r13 - <VERS 0x46AC 0x46AC 0x468C 0x46C4 0x46BC 0x469C 0x469C 0x464C>], r3
stw [r13 - <VERS 0x46C4 0x46BC 0x469C 0x469C 0x46AC 0x46AC 0x468C 0x464C>], r3
mulli r3, r3, 60
lwz r4, [r13 - <VERS 0x46C8 0x46C8 0x46A8 0x46E0 0x46D8 0x46B8 0x46B8 0x4668>]
lwz r4, [r13 - <VERS 0x46E0 0x46D8 0x46B8 0x46B8 0x46C8 0x46C8 0x46A8 0x4668>]
addis r4, r4, 0x0001
addi r4, r4, 0x0B80
add r4, r4, r3
@@ -49,9 +49,9 @@ save_to_memcard_hook1:
b memcpy
save_to_memcard_hook2:
stw [r4], r3
lwz r3, [r13 - <VERS 0x46AC 0x46AC 0x468C 0x46C4 0x46BC 0x469C 0x469C 0x464C>]
lwz r3, [r13 - <VERS 0x46C4 0x46BC 0x469C 0x469C 0x46AC 0x46AC 0x468C 0x464C>]
mulli r3, r3, 60
lwz r4, [r13 - <VERS 0x46C8 0x46C8 0x46A8 0x46E0 0x46D8 0x46B8 0x46B8 0x4668>]
lwz r4, [r13 - <VERS 0x46E0 0x46D8 0x46B8 0x46B8 0x46C8 0x46C8 0x46A8 0x4668>]
addis r4, r4, 0x0001
addi r4, r4, 0x0B80
add r3, r4, r3
@@ -60,9 +60,9 @@ save_to_memcard_hook2:
li r5, 0x003C
b memcpy
save_to_memcard_hook3:
lwz r3, [r13 - <VERS 0x46AC 0x46AC 0x468C 0x46C4 0x46BC 0x469C 0x469C 0x464C>]
lwz r3, [r13 - <VERS 0x46C4 0x46BC 0x469C 0x469C 0x46AC 0x46AC 0x468C 0x464C>]
mulli r3, r3, 60
lwz r4, [r13 - <VERS 0x46C8 0x46C8 0x46A8 0x46E0 0x46D8 0x46B8 0x46B8 0x4668>]
lwz r4, [r13 - <VERS 0x46E0 0x46D8 0x46B8 0x46B8 0x46C8 0x46C8 0x46A8 0x4668>]
addis r4, r4, 0x0001
addi r4, r4, 0x0B80
add r3, r4, r3
@@ -70,7 +70,7 @@ save_to_memcard_hook3:
li r5, 0x003C
bl memset
bl get_main_phase
b [<VERS 801FF034 801FF034 801FF97C 801FE838 801FF0AC 80200044 801FF648 801FF918>]
b [<VERS 801FE838 801FF0AC 80200044 801FF648 801FF034 801FF034 801FF97C 801FF918>]
save_to_memcard_end:
.data 0x8000CA40 # Full Action List (Incl. Photon Blasts & Traps)
@@ -111,9 +111,9 @@ four_palettes_hook1:
beqlr
sth [r4 + 0x003A], r31
lis r3, 0x8051
# D-pad version: lhz r0, [r3 - <VERS 0x6C4A 0x676A 0x1D8A 0x752A 0x3A6A 0x142A 0x168A 0x0D6A>]
lhz r0, [r3 - <VERS 0x6C4C 0x676C 0x1D8C 0x752C 0x3A6C 0x142C 0x168C 0x0D6C>]
lhz r5, [r3 - <VERS 0x6C50 0x6770 0x1D90 0x7530 0x3A70 0x1430 0x1690 0x0D70>]
# D-pad version: lhz r0, [r3 - <VERS 0x752A 0x3A6A 0x142A 0x168A 0x6C4A 0x676A 0x1D8A 0x0D6A>]
lhz r0, [r3 - <VERS 0x752C 0x3A6C 0x142C 0x168C 0x6C4C 0x676C 0x1D8C 0x0D6C>]
lhz r5, [r3 - <VERS 0x7530 0x3A70 0x1430 0x1690 0x6C50 0x6770 0x1D90 0x0D70>]
and r5, r5, r6
andi. r0, r0, 0x3C00 # D-pad version: andi. r0, r0, 0x00F0
beqlr
@@ -152,7 +152,7 @@ four_palettes_hook2:
blr
four_palettes_hook3:
lis r12, 0x8044
ori r12, r12, <VERS 0xA858 0xACD8 0xE5D0 0x9AB8 0xC8D8 0xE940 0xE708 0xE3D0>
ori r12, r12, <VERS 0x9AB8 0xC8D8 0xE940 0xE708 0xA858 0xACD8 0xE5D0 0xE3D0>
lwz r4, [r3]
cmp r4, r12
rlwinm r3, r0, 0, 29, 29 # Original opcode
@@ -176,69 +176,69 @@ four_palettes_hook4_again:
four_palettes_end:
# Disable Photon Blast Palette Switching
.data <VERS 0x801B59E4 0x801B59E4 0x801B5B7C 0x801B55F8 0x801B5A4C 0x801B7BB8 0x801B5B18 0x801B6038>
.data <VERS 0x801B55F8 0x801B5A4C 0x801B7BB8 0x801B5B18 0x801B59E4 0x801B59E4 0x801B5B7C 0x801B6038>
.data 0x00000004
.address <VERS 0x801B59E4 0x801B59E4 0x801B5B7C 0x801B55F8 0x801B5A4C 0x801B7BB8 0x801B5B18 0x801B6038>
.address <VERS 0x801B55F8 0x801B5A4C 0x801B7BB8 0x801B5B18 0x801B59E4 0x801B59E4 0x801B5B7C 0x801B6038>
li r3, 0x0000
# Full Action List (Incl. Photon Blasts & Traps)
.data <VERS 0x801D8230 0x801D8230 0x801D8430 0x801D7DF8 0x801D8300 0x801D84BC 0x801D83CC 0x801D88EC>
.data <VERS 0x801D7DF8 0x801D8300 0x801D84BC 0x801D83CC 0x801D8230 0x801D8230 0x801D8430 0x801D88EC>
.data 0x00000004
.address <VERS 0x801D8230 0x801D8230 0x801D8430 0x801D7DF8 0x801D8300 0x801D84BC 0x801D83CC 0x801D88EC>
.address <VERS 0x801D7DF8 0x801D8300 0x801D84BC 0x801D83CC 0x801D8230 0x801D8230 0x801D8430 0x801D88EC>
bl full_action_list_hook1
.data <VERS 0x801CC038 0x801CC038 0x801CC238 0x801CBC1C 0x801CC108 0x801CD5FC 0x801CC1D4 0x801CC6F4>
.data <VERS 0x801CBC1C 0x801CC108 0x801CD5FC 0x801CC1D4 0x801CC038 0x801CC038 0x801CC238 0x801CC6F4>
.data 0x00000004
.address <VERS 0x801CC038 0x801CC038 0x801CC238 0x801CBC1C 0x801CC108 0x801CD5FC 0x801CC1D4 0x801CC6F4>
.address <VERS 0x801CBC1C 0x801CC108 0x801CD5FC 0x801CC1D4 0x801CC038 0x801CC038 0x801CC238 0x801CC6F4>
bl full_action_list_hook2
# Save Extra Palettes To Memory Card (Temp Slot 3)
.data <VERS 0x801FC2D8 0x801FC2D8 0x801FCB58 0x801FBC74 0x801FC380 0x801FD268 0x801FC8EC 0x801FCA54>
.data <VERS 0x801FBC74 0x801FC380 0x801FD268 0x801FC8EC 0x801FC2D8 0x801FC2D8 0x801FCB58 0x801FCA54>
.data 0x00000004
.address <VERS 0x801FC2D8 0x801FC2D8 0x801FCB58 0x801FBC74 0x801FC380 0x801FD268 0x801FC8EC 0x801FCA54>
.address <VERS 0x801FBC74 0x801FC380 0x801FD268 0x801FC8EC 0x801FC2D8 0x801FC2D8 0x801FCB58 0x801FCA54>
bl save_to_memcard_hook1
.data <VERS 0x801FFB14 0x801FFB14 0x8020048C 0x801FF318 0x801FFB8C 0x80200B88 0x80200158 0x802003F8>
.data <VERS 0x801FF318 0x801FFB8C 0x80200B88 0x80200158 0x801FFB14 0x801FFB14 0x8020048C 0x802003F8>
.data 0x00000004
.address <VERS 0x801FFB14 0x801FFB14 0x8020048C 0x801FF318 0x801FFB8C 0x80200B88 0x80200158 0x802003F8>
.address <VERS 0x801FF318 0x801FFB8C 0x80200B88 0x80200158 0x801FFB14 0x801FFB14 0x8020048C 0x802003F8>
bl save_to_memcard_hook2
.data <VERS 0x801FF030 0x801FF030 0x801FF978 0x801FE834 0x801FF0A8 0x80200040 0x801FF644 0x801FF914>
.data <VERS 0x801FE834 0x801FF0A8 0x80200040 0x801FF644 0x801FF030 0x801FF030 0x801FF978 0x801FF914>
.data 0x00000004
.address <VERS 0x801FF030 0x801FF030 0x801FF978 0x801FE834 0x801FF0A8 0x80200040 0x801FF644 0x801FF914>
.address <VERS 0x801FE834 0x801FF0A8 0x80200040 0x801FF644 0x801FF030 0x801FF030 0x801FF978 0x801FF914>
b save_to_memcard_hook3
# Have Four Action Button Palettes
.data <VERS 0x801D7A78 0x801D7A78 0x801D7C78 0x801D7640 0x801D7B48 0x801D7CC4 0x801D7C14 0x801D8134>
.data <VERS 0x801D7640 0x801D7B48 0x801D7CC4 0x801D7C14 0x801D7A78 0x801D7A78 0x801D7C78 0x801D8134>
.data 0x00000004
.address <VERS 0x801D7A78 0x801D7A78 0x801D7C78 0x801D7640 0x801D7B48 0x801D7CC4 0x801D7C14 0x801D8134>
.address <VERS 0x801D7640 0x801D7B48 0x801D7CC4 0x801D7C14 0x801D7A78 0x801D7A78 0x801D7C78 0x801D8134>
bl four_palettes_hook1
.data <VERS 0x802758C8 0x8027590C 0x80276D44 0x80275034 0x80275D70 0x80276DDC 0x80276B90 0x8027658C>
.data <VERS 0x80275034 0x80275D70 0x80276DDC 0x80276B90 0x802758C8 0x8027590C 0x80276D44 0x8027658C>
.data 0x00000004
.address <VERS 0x802758C8 0x8027590C 0x80276D44 0x80275034 0x80275D70 0x80276DDC 0x80276B90 0x8027658C>
.address <VERS 0x80275034 0x80275D70 0x80276DDC 0x80276B90 0x802758C8 0x8027590C 0x80276D44 0x8027658C>
bl four_palettes_hook2
.data <VERS 0x8024B440 0x8024B440 0x8024C59C 0x8024ABB8 0x8024B5E4 0x8024C1B0 0x8024C2D8 0x8024BDE4>
.data <VERS 0x8024ABB8 0x8024B5E4 0x8024C1B0 0x8024C2D8 0x8024B440 0x8024B440 0x8024C59C 0x8024BDE4>
.data 0x00000004
.address <VERS 0x8024B440 0x8024B440 0x8024C59C 0x8024ABB8 0x8024B5E4 0x8024C1B0 0x8024C2D8 0x8024BDE4>
.address <VERS 0x8024ABB8 0x8024B5E4 0x8024C1B0 0x8024C2D8 0x8024B440 0x8024B440 0x8024C59C 0x8024BDE4>
b four_palettes_hook3
.data <VERS 0x80334C3C 0x80334C80 0x8033675C 0x8033424C 0x803352B8 0x803367E0 0x80336588 0x80335BA0>
.data <VERS 0x8033424C 0x803352B8 0x803367E0 0x80336588 0x80334C3C 0x80334C80 0x8033675C 0x80335BA0>
.data 0x00000004
.address <VERS 0x80334C3C 0x80334C80 0x8033675C 0x8033424C 0x803352B8 0x803367E0 0x80336588 0x80335BA0>
.address <VERS 0x8033424C 0x803352B8 0x803367E0 0x80336588 0x80334C3C 0x80334C80 0x8033675C 0x80335BA0>
bl four_palettes_hook4
.data <VERS 0x802462C8 0x802462C8 0x802473F4 0x80245A7C 0x8024643C 0x80247510 0x80247130 0x80246C3C>
.data <VERS 0x80245A7C 0x8024643C 0x80247510 0x80247130 0x802462C8 0x802462C8 0x802473F4 0x80246C3C>
.data 0x00000008
.address <VERS 0x802462C8 0x802462C8 0x802473F4 0x80245A7C 0x8024643C 0x80247510 0x80247130 0x80246C3C>
.address <VERS 0x80245A7C 0x8024643C 0x80247510 0x80247130 0x802462C8 0x802462C8 0x802473F4 0x80246C3C>
lhz r0, [r31 + 0x004A] # D-pad version: lhz r0, [r31 + 0x0048]
rlwinm. r3, r0, 0, 24, 27 # D-pad version: rlwinm. r3, r0, 0, 18, 21
.data <VERS 0x80275928 0x8027596C 0x80276DA4 0x80275094 0x80275DD0 0x80276E3C 0x80276BF0 0x802765EC>
.data <VERS 0x80275094 0x80275DD0 0x80276E3C 0x80276BF0 0x80275928 0x8027596C 0x80276DA4 0x802765EC>
.data 0x00000008
.address <VERS 0x80275928 0x8027596C 0x80276DA4 0x80275094 0x80275DD0 0x80276E3C 0x80276BF0 0x802765EC>
.address <VERS 0x80275094 0x80275DD0 0x80276E3C 0x80276BF0 0x80275928 0x8027596C 0x80276DA4 0x802765EC>
lhz r0, [r31 + 0x004A] # D-pad version: lhz r0, [r31 + 0x0048]
rlwinm. r3, r0, 0, 24, 27 # D-pad version: rlwinm. r3, r0, 0, 18, 21
# Full Action List (Incl. Photon Blasts & Traps)
.data <VERS 0x802766F8 0x8027673C 0x80277B74 0x80275E64 0x80276BA0 0x80277C0C 0x802779C0 0x802773BC>
.data <VERS 0x80275E64 0x80276BA0 0x80277C0C 0x802779C0 0x802766F8 0x8027673C 0x80277B74 0x802773BC>
.data 0x00000004
.address <VERS 0x802766F8 0x8027673C 0x80277B74 0x80275E64 0x80276BA0 0x80277C0C 0x802779C0 0x802773BC>
.address <VERS 0x80275E64 0x80276BA0 0x80277C0C 0x802779C0 0x802766F8 0x8027673C 0x80277B74 0x802773BC>
subi r0, r3, 0x07E8
.data <VERS 0x8044BB3C 0x8044BFBC 0x8044F8B4 0x8044ADAC 0x8044DBCC 0x8044FC34 0x8044F9FC 0x8044F6B4>
.data <VERS 0x8044ADAC 0x8044DBCC 0x8044FC34 0x8044F9FC 0x8044BB3C 0x8044BFBC 0x8044F8B4 0x8044F6B4>
.data 0x00000034
.data 0x0004000D
.data 0x0004000E
@@ -255,7 +255,7 @@ four_palettes_end:
.data 0x00080000
# Save Extra Palettes To Memory Card (Temp Slot 3)
.data <VERS 0x8046DC5C 0x8046E0DC 0x80471ACC 0x8046CECC 0x8046FCEC 0x80471E4C 0x80471C14 0x80471804>
.data <VERS 0x8046CECC 0x8046FCEC 0x80471E4C 0x80471C14 0x8046DC5C 0x8046E0DC 0x80471ACC 0x80471804>
.data 0x00000004
.data 0xFFFFFFFF