incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add player check in HungryMagSound

Browse Source
This commit is contained in:
Martin Michelsen
2025-08-19 23:00:52 -07:00
parent 45131dabc0
commit 4166149841
3 changed files with 72 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/client-functions/HungryMagSound/HungryMagSound.3___.patch.s
+6 -1
View File
@@ -17,7 +17,12 @@ start:
.data 0x8000BF30
.deltaof code_start, code_end
.address 0x8000BF30
code_start:
code_start: # [std] (TItemMag* this @ r3) -> void
lwz r4, [r3 + 0xF0]
lhz r4, [r4 + 0x1C] # r4 = this->owner_player->entity_id
lwz r5, [r13 - <VERS 0x5298 0x5290 0x5270 0x5270 0x5280 0x5280 0x5260 0x5220>] # local_client_id
cmpl r4, r5
bnelr
lis r3, 0x0002
ori r3, r3, 0x2825
li r4, 0
system/client-functions/HungryMagSound/HungryMagSound.4___.patch.s
+60 -6
View File
@@ -14,16 +14,70 @@ start:
.include WriteCodeBlocksXB
.data <VERS 0x00180EF5 0x00181075 0x00181125 0x00181065 0x00181095 0x00181085 0x00181055>
.data 0x0000000A
.binary E998010000CCCC83C410
.data 0x0A
.address <VERS 0x00180EF5 0x00181075 0x00181125 0x00181065 0x00181095 0x00181085 0x00181055>
hook_call:
jmp hook1
int 3
int 3
hook_ret_sound:
add esp, 0x10
hook_ret_no_sound:
.data <VERS 0x00181024 0x001811A4 0x00181254 0x00181194 0x001811C4 0x001811B4 0x00181184>
.deltaof hook1, hook1_end
.address <VERS 0x00181024 0x001811A4 0x00181254 0x00181194 0x001811C4 0x001811B4 0x00181184>
hook1:
xor eax, eax
mov dword [esi + 0x00000194], eax
jmp hook2
hook1_end:
.data <VERS 0x00181092 0x00181212 0x001812C2 0x00181202 0x00181232 0x00181222 0x001811F2>
.data 0x0000000D
.binary 31C0898694010000505050EB52
.deltaof hook2, hook2_end
.address <VERS 0x00181092 0x00181212 0x001812C2 0x00181202 0x00181232 0x00181222 0x001811F2>
hook2:
mov edx, dword [esi + 0x000000F0]
movzx edx, word [edx + 0x0000001C] # edx = this->owner_player->entity_id
jmp hook3
hook2_end:
.data <VERS 0x001810F1 0x00181271 0x00181321 0x00181261 0x00181291 0x00181281 0x00181251>
.data 0x0000000F
.binary <VERS 048D50BA30922E00FFD2E9FCFDFFFF 048D50BAB09D2E00FFD2E9FCFDFFFF 048D50BA90B32E00FFD2E9FCFDFFFF 048D50BA90B12E00FFD2E9FCFDFFFF 048D50BAB0B32E00FFD2E9FCFDFFFF 048D50BAC0B12E00FFD2E9FCFDFFFF 048D50BAE0B32E00FFD2E9FCFDFFFF>
.deltaof hook3, hook3_end
.address <VERS 0x001810F1 0x00181271 0x00181321 0x00181261 0x00181291 0x00181281 0x00181251>
hook3:
cmp [<VERS 0x0071EFC0 0x0071F620 0x00727164 0x00724660 0x00723EE4 0x00724660 0x007249E4>], edx # local_client_id
jmp hook4
hook3_end:
.data <VERS 0x001811D7 0x00181357 0x00181407 0x00181347 0x00181377 0x00181367 0x00181337>
.deltaof hook4, hook4_end
.address <VERS 0x001811D7 0x00181357 0x00181407 0x00181347 0x00181377 0x00181367 0x00181337>
hook4:
jne hook_ret_no_sound
jmp hook5
hook4_end:
.data <VERS 0x001811F3 0x00181373 0x00181423 0x00181363 0x00181393 0x00181383 0x00181353>
.deltaof hook5, hook5_end
.address <VERS 0x001811F3 0x00181373 0x00181423 0x00181363 0x00181393 0x00181383 0x00181353>
hook5:
push eax
push eax
push eax
add al, 0x8D
push eax
mov edx, <VERS 0x002E9230 0x002E9DB0 0x002EB390 0x002EB190 0x002EB3B0 0x002EB1C0 0x002EB3E0> # play_sound
jmp hook6
hook5_end:
.data <VERS 0x00181211 0x00181391 0x00181441 0x00181381 0x001813B1 0x001813A1 0x00181371>
.deltaof hook6, hook6_end
.address <VERS 0x00181211 0x00181391 0x00181441 0x00181381 0x001813B1 0x001813A1 0x00181371>
hook6:
call edx
jmp hook_ret_sound
hook6_end:
.data 0x00000000
.data 0x00000000
system/client-functions/HungryMagSound/HungryMagSound.59NL.patch.s
+6 -1
View File
@@ -14,8 +14,12 @@ get_code_size:
pop eax
push dword [eax]
call patch_code_end
patch_code:
patch_code: # [eax] (TItemMag* this @ ecx) -> void
mov dword [ecx + 0x01B8], eax
mov eax, [ecx + 0x00F8]
movzx eax, word [eax + 0x001C] # eax = this->owner_player->entity_id
cmp [0x00A9C4F4], eax
jne patch_code_skip_sound
push 0
push 0
push 0
@@ -23,6 +27,7 @@ patch_code:
mov eax, 0x00814298
call eax
add esp, 0x10
patch_code_skip_sound:
ret
patch_code_end:
push ecx