diff --git a/src/CommandFormats.hh b/src/CommandFormats.hh index a586dae6..38157da8 100644 --- a/src/CommandFormats.hh +++ b/src/CommandFormats.hh @@ -6369,13 +6369,16 @@ struct G_AddSRankWeaponSpecial_BB_6xD8 { // more (or less!) data than necessary. struct G_MomokaItemExchange_BB_6xD9 { - G_ClientIDHeader header; - ItemData find_item; // Only data1[0]-[2] are used - ItemData replace_item; // Only data1[0]-[2] are used - le_uint32_t token1 = 0; // valueC (from F95B opcode) ^ sender client ID - le_uint32_t token2 = 0; // valueD (from F95B opcode) ^ sender client ID - le_uint16_t success_label = 0; - le_uint16_t failure_label = 0; + /* 00 */ G_ClientIDHeader header; + // Only data1[0-2] are used in find_item and replace_item when this is sent + // by the F95B quest opcode. + /* 04 */ ItemData find_item; + /* 18 */ ItemData replace_item; + /* 2C */ le_uint32_t token1 = 0; // valueC (from F95B opcode) ^ sender client ID + /* 30 */ le_uint32_t token2 = 0; // valueD (from F95B opcode) ^ sender client ID + /* 34 */ le_uint16_t success_label = 0; + /* 36 */ le_uint16_t failure_label = 0; + /* 38 */ } __packed_ws__(G_MomokaItemExchange_BB_6xD9, 0x38); // 6xDA: Upgrade weapon attribute (BB; handled by server) diff --git a/system/client-functions/AccurateKillCount/AccurateKillCount.3___.patch.s b/system/client-functions/AccurateKillCount/AccurateKillCount.3___.patch.s index 25fd1536..5da3450e 100644 --- a/system/client-functions/AccurateKillCount/AccurateKillCount.3___.patch.s +++ b/system/client-functions/AccurateKillCount/AccurateKillCount.3___.patch.s @@ -9,10 +9,11 @@ reloc0: start: .include WriteCodeBlocksGC - .data + .label TItemWeapon_SealedJSword_count_kill_loc, + .data TItemWeapon_SealedJSword_count_kill_loc .deltaof TItemWeapon_SealedJSword_count_kill, TItemWeapon_SealedJSword_count_kill_end - .address -TItemWeapon_SealedJSword_count_kill: # [std] (TItemWeapon_SealedJSword* this @ r3) -> void + .address TItemWeapon_SealedJSword_count_kill_loc +TItemWeapon_SealedJSword_count_kill: # [std](TItemWeapon_SealedJSword* this @ r3) -> void lwz r4, [r3 + 0xF0] # r4 = this->owner_player lha r5, [r4 + 0x11A] # r5 = this->owner_player->num_kills_since_map_load lha r6, [r3 + 0x1F8] # r6 = this->last_owner_player_kill_count diff --git a/system/client-functions/CallProtectedHandler/CallProtectedHandler.3___.patch.s b/system/client-functions/CallProtectedHandler/CallProtectedHandler.3___.patch.s index 230561b8..a7fb3e20 100644 --- a/system/client-functions/CallProtectedHandler/CallProtectedHandler.3___.patch.s +++ b/system/client-functions/CallProtectedHandler/CallProtectedHandler.3___.patch.s @@ -40,7 +40,9 @@ resume: get_data_addr: bl resume + # allow_local_client_commands .data + # RcvPsoData2 .data size: diff --git a/system/client-functions/ChatFeatures/ChatFeatures.3___.patch.s b/system/client-functions/ChatFeatures/ChatFeatures.3___.patch.s index 40dbd6ac..2481148f 100644 --- a/system/client-functions/ChatFeatures/ChatFeatures.3___.patch.s +++ b/system/client-functions/ChatFeatures/ChatFeatures.3___.patch.s @@ -15,26 +15,24 @@ start: # Extended Word Select Menu (PSO PCv2 Style) .data .data 0x00000004 - .address li r3, 0 # Chat Log Window LF/TAB Bug Fix .data .data 0x00000004 - .address nop # Chat Bubble Window TAB Bug Fix .data .data 0x00000004 - .address nop # Chat Log Window: Scroll Lock (Hold L+R) - .data 0x8000D6A0 - .deltaof scroll_lock_hook, scroll_lock_hook_end - .address 0x8000D6A0 -scroll_lock_hook: + .label scroll_lock_hook_loc, 0x8000D6A0 + .data scroll_lock_hook_loc + .deltaof scroll_lock_hook_start, scroll_lock_hook_end + .address scroll_lock_hook_loc +scroll_lock_hook_start: lis r3, lhz r3, [r3 ] andi. r0, r3, 0x0003 @@ -44,11 +42,11 @@ scroll_lock_hook: blr scroll_lock_hook_end: - # Chat Log Window: Scroll Lock (Hold L+R) - .data + .label scroll_lock_hook_call, + .data scroll_lock_hook_call .data 0x00000004 - .address - bl scroll_lock_hook + .address scroll_lock_hook_call + bl scroll_lock_hook_start .data 0x00000000 .data 0x00000000 diff --git a/system/client-functions/CommonBank/CommonBank.3___.patch.s b/system/client-functions/CommonBank/CommonBank.3___.patch.s index 9bd4eead..6057ac03 100644 --- a/system/client-functions/CommonBank/CommonBank.3___.patch.s +++ b/system/client-functions/CommonBank/CommonBank.3___.patch.s @@ -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 entry_ptr: reloc0: @@ -30,17 +30,17 @@ hook1_skip: .binary 434F4D4D4F4E2042414E4B00 hook2: - lwz r0, [r13 - ] + lwz r0, [r13 - ] cmplwi r0, 1 bne hook2_skip lis r4, 0x8051 - lhz r4, [r4 - ] + lhz r4, [r4 - ] andi. r0, r4, 0x0002 beq hook2_default_bank - lwz r0, [r13 - ] + lwz r0, [r13 - ] cmplwi r0, 6 beq hook2_default_bank - lwz r3, [r13 - ] + lwz r3, [r13 - ] cmplwi r3, 0 beq hook2_default_bank li r0, 0x0000 @@ -54,7 +54,7 @@ hook2_skip: blr hook3: - lwz r0, [r13 - ] + lwz r0, [r13 - ] cmplwi r0, 1 bne hook3_skip lis r3, 0x8001 @@ -64,29 +64,29 @@ hook3_skip: blr hooks_end: - .data + .data .data 0x00000004 - .address + .address bl hook3 - .data + .data .data 0x00000004 - .address + .address bl hook2 - .data + .data .data 0x00000004 - .address + .address bl hook1 - .data + .data .data 0x00000004 - .address + .address bl hook1 - .data + .data .data 0x00000004 - .address + .address .data 0xFFFFFFFF .data 0x00000000 diff --git a/system/client-functions/Decoction/Decoction.3___.patch.s b/system/client-functions/Decoction/Decoction.3___.patch.s index 21dc1126..66aacff3 100644 --- a/system/client-functions/Decoction/Decoction.3___.patch.s +++ b/system/client-functions/Decoction/Decoction.3___.patch.s @@ -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 entry_ptr: reloc0: @@ -12,9 +12,9 @@ reloc0: start: .include WriteCodeBlocksGC - .data + .data .data 0x00000098 - .address + .address lbz r0, [r3 + 0xEE] cmplwi r0, 11 bne +0x144 @@ -33,7 +33,7 @@ start: li r5, 0x0D44 bl +0x38 mr r3, r31 - .data + .data lhz r0, [r31 + 0x032C] lhz r3, [r31 + 0x02B8] cmpl r0, r3 diff --git a/system/client-functions/DrawDistance/DrawDistance.3___.patch.s b/system/client-functions/DrawDistance/DrawDistance.3___.patch.s index abe18561..17d31d56 100644 --- a/system/client-functions/DrawDistance/DrawDistance.3___.patch.s +++ b/system/client-functions/DrawDistance/DrawDistance.3___.patch.s @@ -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 entry_ptr: reloc0: @@ -13,78 +13,80 @@ start: .include WriteCodeBlocksGC .data 0x8000DFA0 - .data 0x00000040 + .deltaof hook_start, hook_end .address 0x8000DFA0 +hook_start: hook1: - lfs f30, [r2 - ] + lfs f30, [r2 - ] fmuls f30, f30, f1 blr hook2: - lfs f2, [r2 - ] + lfs f2, [r2 - ] lfs f0, [r30 + 0x001C] fmuls f0, f0, f2 blr hook3: - lfs f28, [r2 - ] + lfs f28, [r2 - ] fmuls f28, f28, f2 blr hook4: - lfs f0, [r2 - ] + lfs f0, [r2 - ] lfs f1, [r3 + 0x000C] fmuls f0, f0, f1 stfs [r3 + 0x000C], f0 - lis r3, + lis r3, blr +hook_end: - .data + .data .data 0x00000004 - .address + .address bl hook1 - .data + .data .data 0x00000004 - .address + .address bl hook2 - .data + .data .data 0x00000004 - .address + .address bl hook3 - .data + .data .data 0x00000004 - .address + .address bl hook1 - .data + .data .data 0x00000004 - .address + .address bl hook4 - .data + .data .data 0x00000004 - .address + .address bl hook4 - .data + .data .data 0x00000004 - .data 0x47AFC800 + .float 90000 - .data + .data .data 0x00000004 - .data 0x47742400 + .float 62500 - .data + .data .data 0x00000004 - .data 0x491C4000 + .float 640000 - .data + .data .data 0x00000004 - .data 0x47AFC800 + .float 90000 - .data + .data .data 0x00000004 - .data 0x44AF0000 + .float 1400 .data 0x00000000 .data 0x00000000 diff --git a/system/client-functions/EnemyHPBars/EnemyHPBars.3___.patch.s b/system/client-functions/EnemyHPBars/EnemyHPBars.3___.patch.s index 005c1583..931d3f89 100644 --- a/system/client-functions/EnemyHPBars/EnemyHPBars.3___.patch.s +++ b/system/client-functions/EnemyHPBars/EnemyHPBars.3___.patch.s @@ -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 entry_ptr: reloc0: @@ -12,92 +12,100 @@ reloc0: start: .include WriteCodeBlocksGC - .data 0x8000B650 - .data 0x0000006C - .address 0x8000B650 + .label hook_addr, 0x8000B650 + .label sprintf, + + .data hook_addr + .deltaof hooks_start, hooks_end + .address hook_addr +hooks_start: hook1: lis r5, 0x8001 lwz r3, [r5 - 0x4944] mr r30, r31 lha r6, [r30 + 0x032C] - b +0x10 + b entry_merge hook2: lha r6, [r30 + 0x02B8] lis r5, 0x8001 stw [r5 - 0x4944], r3 +entry_merge: mflr r0 stw [r5 - 0x4940], r0 mr r5, r3 lha r7, [r30 + 0x02B8] lis r4, 0x8000 - ori r4, r4, 0xB6AC - addi r3, r4, 0x0018 + ori r4, r4, 0xB6AC # r4 = &hp_format_str + addi r3, r4, 0x0018 # r3 = dest buffer crxor crb6, crb6, crb6 - .data + bl sprintf lis r4, 0x8000 ori r4, r4, 0xB6C4 mr r3, r28 lwz r0, [r4 - 0x0004] mtlr r0 blr - .data 0x25730A0A - .data 0x48503A25 - .data 0x642F2564 - .data 0x00000000 +hp_format_str: + .binary "%s\n\nHP:%d/%d"00000000 +hooks_end: - .data + .label hook1_call, + .data hook1_call .data 0x00000004 - .address + .address hook1_call bl hook1 - .data + .label flag_clear_call, + .data flag_clear_call .data 0x00000004 - .data + .address flag_clear_call + bl [] - .data + .label hook2_call, + .data hook2_call .data 0x00000004 - .address + .address hook2_call bl hook2 - .data + .data .data 0x00000004 - .data 0x42960000 + .float 75 - .data + .data .data 0x00000004 - .data 0x42960000 + .float 75 - .data + .data .data 0x00000004 - .data 0x42960000 + .float 75 - .data + .data .data 0x00000004 - .data 0x42960000 + .float 75 - .data + .data .data 0x00000004 - .data 0x42960000 + .float 75 - .data + .data .data 0x00000004 - .data 0x42960000 + .float 75 - .data + .data .data 0x00000004 - .data 0x42960000 + .float 75 - .data + .data .data 0x00000004 - .data 0x42780000 + .float 62 - .data + .data .data 0x00000004 .data 0xFF00FF15 - .data + .data .data 0x00000004 - .data 0x42C00000 + .float 96 .data 0x00000000 .data 0x00000000 diff --git a/system/client-functions/ItemLossPrevention/ItemLossPrevention.3___.patch.s b/system/client-functions/ItemLossPrevention/ItemLossPrevention.3___.patch.s index dc83bc93..1c5b8034 100644 --- a/system/client-functions/ItemLossPrevention/ItemLossPrevention.3___.patch.s +++ b/system/client-functions/ItemLossPrevention/ItemLossPrevention.3___.patch.s @@ -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 entry_ptr: reloc0: @@ -12,27 +12,27 @@ reloc0: start: .include WriteCodeBlocksGC - .data + .data .data 0x00000004 b +0x4C - .data + .data .data 0x00000004 nop - .data + .data .data 0x00000004 nop - .data + .data .data 0x00000004 li r0, 0 - .data + .data .data 0x00000004 b +0x4C - .data + .data .data 0x00000004 b +0x20 diff --git a/system/client-functions/ItemPickup/ItemPickup.3___.patch.s b/system/client-functions/ItemPickup/ItemPickup.3___.patch.s index 5724ba37..073de352 100644 --- a/system/client-functions/ItemPickup/ItemPickup.3___.patch.s +++ b/system/client-functions/ItemPickup/ItemPickup.3___.patch.s @@ -4,28 +4,39 @@ # 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 entry_ptr: reloc0: .offsetof start start: .include WriteCodeBlocksGC - .data 0x8000B938 - .data 0x00000020 - .data 0x387C0550 - .data 0x38800100 - .data - .data 0x2C030000 - .data 0x4182000C - .data 0x7F83E378 - .data - .data - .data + + .label hook_loc, 0x8000B938 + .data hook_loc + .deltaof hook_start, hook_end + .address hook_loc +hook_start: + addi r3, r28, 0x0550 + li r4, 0x0100 + bl [] + cmpwi r3, 0 + beq skip + mr r3, r28 + b [] +skip: + b [] +hook_end: + + .label hook_call, + .data hook_call .data 0x00000004 - .data - .data + .address hook_call + b hook_start + + .data .data 0x00000004 - .data 0x38800008 + li r4, 8 + .data 0x00000000 .data 0x00000000 diff --git a/system/client-functions/Movement/Movement.3___.patch.s b/system/client-functions/Movement/Movement.3___.patch.s index 0db3310e..e890a6cc 100644 --- a/system/client-functions/Movement/Movement.3___.patch.s +++ b/system/client-functions/Movement/Movement.3___.patch.s @@ -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 entry_ptr: reloc0: @@ -12,11 +12,11 @@ reloc0: start: .include WriteCodeBlocksGC - .data + .data .data 0x00000004 b +0x0C - .data + .data .data 0x00000004 b +0x14 diff --git a/system/client-functions/NoRareSelling/NoRareSelling.3___.patch.s b/system/client-functions/NoRareSelling/NoRareSelling.3___.patch.s index 3a017ee4..868a531d 100644 --- a/system/client-functions/NoRareSelling/NoRareSelling.3___.patch.s +++ b/system/client-functions/NoRareSelling/NoRareSelling.3___.patch.s @@ -2,7 +2,7 @@ # https://github.com/Solybum/Blue-Burst-Patch-Project # GC port by fuzziqersoftware -.versions 3OE0 3OE1 3OE2 3OJ2 3OJ3 3OJ4 3OJ5 3OP0 +.versions 3OJ2 3OJ3 3OJ4 3OJ5 3OE0 3OE1 3OE2 3OP0 .meta name="No rare selling" .meta description="Stops you from\naccidentally\nselling rares\nto shops" @@ -15,35 +15,36 @@ start: # See comments in the 59NL version of this patch for details on how it works. - .data + .data .data 0x00000004 li r29, 0 - .data + .data .data 0x00000004 li r29, 0 - .data + .data .data 0x00000004 li r29, 0 - .data 0x800041A0 - .deltaof tool_check_start, tool_check_end - .address 0x800041A0 -tool_check_start: + .label tool_check_hook_loc, 0x800041A0 + .data tool_check_hook_loc + .deltaof tool_check_hook_start, tool_check_hook_end + .address tool_check_hook_loc +tool_check_hook_start: lwz r29, [r3 + 0x10] # Flags xori r29, r29, 0x0080 andi. r29, r29, 0x0080 - beq is_rare_tool + bnelr # Not rare; r29 (returned price) is zero already lwz r29, [r3 + 0x0C] # Cost -is_rare_tool: blr -tool_check_end: +tool_check_hook_end: - .data + .label tool_check_hook_call, + .data tool_check_hook_call .data 0x00000004 - .address - bl tool_check_start + .address tool_check_hook_call + bl tool_check_hook_start .data 0x00000000 .data 0x00000000 diff --git a/system/client-functions/Palette/Palette.3___.patch.s b/system/client-functions/Palette/Palette.3___.patch.s index 386cb587..9d190151 100644 --- a/system/client-functions/Palette/Palette.3___.patch.s +++ b/system/client-functions/Palette/Palette.3___.patch.s @@ -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, + .label get_main_phase, .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 - ], r3 + stw [r13 - ], r3 mulli r3, r3, 60 - lwz r4, [r13 - ] + lwz r4, [r13 - ] 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 - ] + lwz r3, [r13 - ] mulli r3, r3, 60 - lwz r4, [r13 - ] + lwz r4, [r13 - ] 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 - ] + lwz r3, [r13 - ] mulli r3, r3, 60 - lwz r4, [r13 - ] + lwz r4, [r13 - ] 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 [] + b [] 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 - ] - lhz r0, [r3 - ] - lhz r5, [r3 - ] + # D-pad version: lhz r0, [r3 - ] + lhz r0, [r3 - ] + lhz r5, [r3 - ] 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, + ori r12, r12, 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 + .data .data 0x00000004 - .address + .address li r3, 0x0000 # Full Action List (Incl. Photon Blasts & Traps) - .data + .data .data 0x00000004 - .address + .address bl full_action_list_hook1 - .data + .data .data 0x00000004 - .address + .address bl full_action_list_hook2 # Save Extra Palettes To Memory Card (Temp Slot 3) - .data + .data .data 0x00000004 - .address + .address bl save_to_memcard_hook1 - .data + .data .data 0x00000004 - .address + .address bl save_to_memcard_hook2 - .data + .data .data 0x00000004 - .address + .address b save_to_memcard_hook3 # Have Four Action Button Palettes - .data + .data .data 0x00000004 - .address + .address bl four_palettes_hook1 - .data + .data .data 0x00000004 - .address + .address bl four_palettes_hook2 - .data + .data .data 0x00000004 - .address + .address b four_palettes_hook3 - .data + .data .data 0x00000004 - .address + .address bl four_palettes_hook4 - .data + .data .data 0x00000008 - .address + .address 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 + .data .data 0x00000008 - .address + .address 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 + .data .data 0x00000004 - .address + .address subi r0, r3, 0x07E8 - .data + .data .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 + .data .data 0x00000004 .data 0xFFFFFFFF diff --git a/system/client-functions/ReticleColors/DCReticleColors.3___.patch.s b/system/client-functions/ReticleColors/DCReticleColors.3___.patch.s index 3992f43f..145a357c 100644 --- a/system/client-functions/ReticleColors/DCReticleColors.3___.patch.s +++ b/system/client-functions/ReticleColors/DCReticleColors.3___.patch.s @@ -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 entry_ptr: reloc0: @@ -12,47 +12,47 @@ reloc0: start: .include WriteCodeBlocksGC - .data + .data .data 0x00000004 - .data 0x3C8000FF + lis r4, 0x00FF - .data + .data .data 0x00000004 - .data 0x388000FF + li r4, 0x00FF - .data + .data .data 0x00000004 - .data 0x3884FF00 + subi r4, r4, 0x0100 - .data + .data .data 0x00000008 - .data 0x3F800000 - .data 0x00000000 + .float 1 + .float 0 - .data + .data .data 0x00000008 - .data 0x3F800000 - .data 0x00000000 + .float 1 + .float 0 - .data + .data .data 0x0000000C - .data 0x3F800000 - .data 0x3F800000 - .data 0x00000000 + .float 1 + .float 1 + .float 0 - .data + .data .data 0x00000004 - .data 0x00000000 + .float 0 - .data + .data .data 0x00000004 - .data 0x3F800000 + .float 1 - .data + .data .data 0x0000000C - .data 0x3ECCCCCD - .data 0x3DCCCCCD - .data 0x3DCCCCCD + .float 0.4 + .float 0.1 + .float 0.1 .data 0x00000000 .data 0x00000000 diff --git a/system/client-functions/ReticleColors/XBReticleColors.3___.patch.s b/system/client-functions/ReticleColors/XBReticleColors.3___.patch.s index 4b7297de..f72ff092 100644 --- a/system/client-functions/ReticleColors/XBReticleColors.3___.patch.s +++ b/system/client-functions/ReticleColors/XBReticleColors.3___.patch.s @@ -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 entry_ptr: reloc0: @@ -12,15 +12,15 @@ reloc0: start: .include WriteCodeBlocksGC - .data + .data .data 0x00000004 - .data 0x388000FF + li r4, 0xFF00 - .data + .data .data 0x0000000C - .data 0x00000000 - .data 0x00000000 - .data 0x3F800000 + .float 0 + .float 0 + .float 1 .data 0x00000000 .data 0x00000000