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

fix comflict between Ep3-Editors patch and widescreen AR code

Browse Source
This commit is contained in:
Martin Michelsen
2023-03-17 10:47:18 -07:00
parent 032f0bb2c5
commit 618d9180cd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/ppc/Ep3-Editors.patch.s
+3 -3
View File
@@ -53,7 +53,7 @@ start:
bl copy_code bl copy_code
lis r29, 0x8000 lis r29, 0x8000
ori r29, r29, 0xBD44 ori r29, r29, 0x17C4
construct_editors: construct_editors:
# Call the constructors for all the editors and save the object pointers. If # Call the constructors for all the editors and save the object pointers. If
@@ -94,7 +94,7 @@ activate_chosen_editor:
li r4, 0 li r4, 0
lis r29, 0x8000 lis r29, 0x8000
ori r29, r29, 0xBD44 ori r29, r29, 0x17C4
# lwz r4, [r29 + 0x00] # TGroupSetEditor # lwz r4, [r29 + 0x00] # TGroupSetEditor
# This editor is very similar to TGroupEnemySetEditor (see below). # This editor is very similar to TGroupEnemySetEditor (see below).
@@ -170,7 +170,7 @@ activate_chosen_editor:
# the update/render phase. Further research is needed here. # the update/render phase. Further research is needed here.
# lwz r4, [r29 + 0x38] # TCCScenarioDebug (movie/cutscene tests) # lwz r4, [r29 + 0x38] # TCCScenarioDebug (movie/cutscene tests)
# This editor exists only in Episode 3 - it is not in PSOPC nor PSOX. # This editor exists only in Episode 3 - it is neither in PSOPC nor PSOX.
# Nothing appears immediately after activating this debugger because the # Nothing appears immediately after activating this debugger because the
# default page is blank. Use C-left and C-right to change major pages; use # default page is blank. Use C-left and C-right to change major pages; use
# L/R to change minor pages (sets of 50 flags within each major page). Use # L/R to change minor pages (sets of 50 flags within each major page). Use