encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into m_Do_audio2

Browse Source
This commit is contained in:
jdflyer
2021-01-21 21:58:53 -07:00
parent ff7ac962f1 a072e71c33
commit 64bb8562fa
798 changed files with 7656 additions and 12286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/doxygen.yml
+23
View File
@@ -0,0 +1,23 @@
name: run Doxygen to generate docs
on:
push:
branches:
- main
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: generate docs
uses: mattnotmitt/doxygen-action@v1
with:
doxyfile-path: 'Doxyfile'
enable-latex: true
- name: deploy docs to github pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/doxygen
.github/workflows/ok-check.yml
+5
View File
@@ -14,6 +14,11 @@ jobs:
uses: actions/checkout@v1
with:
token: ${{secrets.MY_REPO_PAT}}
- name: setup python
uses: actions/setup-python@v2
with:
python-version: '3.x'
architecture: 'x64'
- name: Copy in dol and compilers
run: cp /tmp/baserom.dol ./baserom.dol && cp -r /tmp/mwcc_compiler/ tools/mwcc_compiler && chown root /github/home/
- name: Run Make (OK)
.gitignore
+3
View File
@@ -9,6 +9,9 @@ build/
*.dol
vtable.lcf
# Generated documentation
docs/doxygen/
# Temporary files
*.swp
*.dump
Doxyfile
+2577
View File
File diff suppressed because it is too large Load Diff
Makefile
+19 -8
View File
@@ -1,6 +1,16 @@
WINDOWS := $(shell which wine ; echo $$?)
UNAME_S := $(shell uname -s)
#-------------------------------------------------------------------------------
# Options
#-------------------------------------------------------------------------------
DEBUG ?= 0
ifeq ($(DEBUG), 1)
CFLAGS += -g
else
CFLAGS +=
endif
#-------------------------------------------------------------------------------
# Files
#-------------------------------------------------------------------------------
@@ -53,10 +63,12 @@ endif
AS := $(DEVKITPPC)/bin/powerpc-eabi-as
OBJCOPY := $(DEVKITPPC)/bin/powerpc-eabi-objcopy
STRIP := $(DEVKITPPC)/bin/powerpc-eabi-strip
CC := $(WINE) tools/mwcc_compiler/$(MWCC_VERSION)/mwcceppc.exe
LD := $(WINE) tools/mwcc_compiler/$(MWCC_VERSION)/mwldeppc.exe
ELF2DOL := tools/elf2dol
PYTHON := python3
DOXYGEN := doxygen
POSTPROC := tools/postprocess.py
@@ -70,10 +82,7 @@ ASFLAGS := -mgekko -I include
LDFLAGS := -map $(MAP) -fp hard -nodefaults -w off
# Compiler flags
CFLAGS := -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -msgstyle gcc -enum int $(INCLUDES)
# for postprocess.py
PROCFLAGS := -fprologue-fixup=old_stack
CFLAGS += -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -msgstyle gcc -enum int $(INCLUDES)
# elf2dol needs to know these in order to calculate sbss correctly.
SDATA_PDHR := 9
@@ -95,8 +104,6 @@ ALL_DIRS := build $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS)
dirs:
$(shell mkdir -p $(ALL_DIRS))
.PHONY: dirs tools
$(LDSCRIPT): ldscript.lcf
$(CPP) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $<
@@ -111,6 +118,9 @@ clean:
tools:
$(MAKE) -C tools
docs:
$(DOXYGEN) Doxyfile
$(ELF): $(O_FILES) $(LDSCRIPT)
echo $(O_FILES) > build/o_files
$(LD) $(LDFLAGS) -o $@ -lcf $(LDSCRIPT) @build/o_files
@@ -125,9 +135,10 @@ $(BUILD_DIR)/%.o: %.c
$(BUILD_DIR)/%.o: %.cpp
$(CC) $(CFLAGS) -c -o $@ $<
# TODO: See if this is necessary after actually adding some C code
# $(PYTHON) $(POSTPROC) $(PROCFLAGS) $@
$(PYTHON) $(POSTPROC) -fsymbol-fixup $@
### Debug Print ###
print-% : ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true
.PHONY: default all dirs clean tools docs print-%
README.md
+1 -1
View File
@@ -6,7 +6,7 @@ It builds the following DOL:
main.dol - `sha1: 4997D93B9692620C40E90374A0F1DBF0E4889395`
And will eventually build all the [RELs](./rels_sha1.md).
And will eventually build all the [RELs](./docs/rels_sha1.md).
## Windows Prerequisites
asm/JAudio2/JAISeMgr.s
+5 -5
View File
@@ -72,7 +72,7 @@ lbl_8029F97C:
/* 8029F97C 0029C8BC 54 00 06 3F */ clrlwi. r0, r0, 0x18
/* 8029F980 0029C8C0 41 82 00 10 */ beq lbl_8029F990
/* 8029F984 0029C8C4 38 64 00 10 */ addi r3, r4, 0x10
/* 8029F988 0029C8C8 48 00 2C 11 */ bl JAISound_NS_stop_X1_
/* 8029F988 0029C8C8 48 00 2C 11 */ bl stop__8JAISoundFv
/* 8029F98C 0029C8CC 38 A0 00 01 */ li r5, 1
lbl_8029F990:
/* 8029F990 0029C8D0 83 BD 00 0C */ lwz r29, 0xc(r29)
@@ -417,7 +417,7 @@ lbl_8029FE00:
/* 8029FE00 0029CD40 80 7F 00 00 */ lwz r3, 0(r31)
/* 8029FE04 0029CD44 38 63 00 10 */ addi r3, r3, 0x10
/* 8029FE08 0029CD48 7F C4 F3 78 */ mr r4, r30
/* 8029FE0C 0029CD4C 48 00 26 D1 */ bl JAISound_NS_stop
/* 8029FE0C 0029CD4C 48 00 26 D1 */ bl stop__8JAISoundFUl
/* 8029FE10 0029CD50 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_8029FE14:
/* 8029FE14 0029CD54 28 1F 00 00 */ cmplwi r31, 0
@@ -440,7 +440,7 @@ JAISeCategoryMgr_NS_stop_X1_:
lbl_8029FE4C:
/* 8029FE4C 0029CD8C 80 7F 00 00 */ lwz r3, 0(r31)
/* 8029FE50 0029CD90 38 63 00 10 */ addi r3, r3, 0x10
/* 8029FE54 0029CD94 48 00 27 45 */ bl JAISound_NS_stop_X1_
/* 8029FE54 0029CD94 48 00 27 45 */ bl stop__8JAISoundFv
/* 8029FE58 0029CD98 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_8029FE5C:
/* 8029FE5C 0029CD9C 28 1F 00 00 */ cmplwi r31, 0
@@ -473,7 +473,7 @@ lbl_8029FEA8:
/* 8029FEB8 0029CDF8 7C 03 00 40 */ cmplw r3, r0
/* 8029FEBC 0029CDFC 40 82 00 0C */ bne lbl_8029FEC8
/* 8029FEC0 0029CE00 38 64 00 10 */ addi r3, r4, 0x10
/* 8029FEC4 0029CE04 48 00 26 D5 */ bl JAISound_NS_stop_X1_
/* 8029FEC4 0029CE04 48 00 26 D5 */ bl stop__8JAISoundFv
lbl_8029FEC8:
/* 8029FEC8 0029CE08 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_8029FECC:
@@ -1134,7 +1134,7 @@ JAISeMgr_NS_startSound:
/* 802A0790 0029D6D0 80 7E 00 00 */ lwz r3, 0(r30)
/* 802A0794 0029D6D4 28 03 00 00 */ cmplwi r3, 0
/* 802A0798 0029D6D8 41 82 00 08 */ beq lbl_802A07A0
/* 802A079C 0029D6DC 48 00 1D FD */ bl JAISound_NS_stop_X1_
/* 802A079C 0029D6DC 48 00 1D FD */ bl stop__8JAISoundFv
lbl_802A07A0:
/* 802A07A0 0029D6E0 83 6D 85 DC */ lwz r27, lbl_80450B5C-_SDA_BASE_(r13)
/* 802A07A4 0029D6E4 28 1B 00 00 */ cmplwi r27, 0
asm/JAudio2/JAISeqMgr.s
+5 -5
View File
@@ -66,7 +66,7 @@ lbl_802A18CC:
lbl_802A18D0:
/* 802A18D0 0029E810 54 00 06 3F */ clrlwi. r0, r0, 0x18
/* 802A18D4 0029E814 41 82 00 0C */ beq lbl_802A18E0
/* 802A18D8 0029E818 48 00 0C C1 */ bl JAISound_NS_stop_X1_
/* 802A18D8 0029E818 48 00 0C C1 */ bl stop__8JAISoundFv
/* 802A18DC 0029E81C 38 A0 00 01 */ li r5, 1
lbl_802A18E0:
/* 802A18E0 0029E820 83 BD 00 0C */ lwz r29, 0xc(r29)
@@ -259,7 +259,7 @@ JAISeqMgr_NS_startSound:
/* 802A1B70 0029EAB0 80 7B 00 00 */ lwz r3, 0(r27)
/* 802A1B74 0029EAB4 28 03 00 00 */ cmplwi r3, 0
/* 802A1B78 0029EAB8 41 82 00 08 */ beq lbl_802A1B80
/* 802A1B7C 0029EABC 48 00 0A 1D */ bl JAISound_NS_stop_X1_
/* 802A1B7C 0029EABC 48 00 0A 1D */ bl stop__8JAISoundFv
lbl_802A1B80:
/* 802A1B80 0029EAC0 83 CD 85 DC */ lwz r30, lbl_80450B5C-_SDA_BASE_(r13)
/* 802A1B84 0029EAC4 28 1E 00 00 */ cmplwi r30, 0
@@ -452,7 +452,7 @@ JAISeqMgr_NS_stop:
/* 802A1E10 0029ED50 48 00 00 10 */ b lbl_802A1E20
lbl_802A1E14:
/* 802A1E14 0029ED54 80 7F 00 00 */ lwz r3, 0(r31)
/* 802A1E18 0029ED58 48 00 07 81 */ bl JAISound_NS_stop_X1_
/* 802A1E18 0029ED58 48 00 07 81 */ bl stop__8JAISoundFv
/* 802A1E1C 0029ED5C 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A1E20:
/* 802A1E20 0029ED60 28 1F 00 00 */ cmplwi r31, 0
@@ -476,7 +476,7 @@ JAISeqMgr_NS_stop_X1_:
lbl_802A1E5C:
/* 802A1E5C 0029ED9C 80 7F 00 00 */ lwz r3, 0(r31)
/* 802A1E60 0029EDA0 7F C4 F3 78 */ mr r4, r30
/* 802A1E64 0029EDA4 48 00 06 79 */ bl JAISound_NS_stop
/* 802A1E64 0029EDA4 48 00 06 79 */ bl stop__8JAISoundFUl
/* 802A1E68 0029EDA8 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A1E6C:
/* 802A1E6C 0029EDAC 28 1F 00 00 */ cmplwi r31, 0
@@ -509,7 +509,7 @@ lbl_802A1EBC:
/* 802A1EC8 0029EE08 80 1E 00 00 */ lwz r0, 0(r30)
/* 802A1ECC 0029EE0C 7C 04 00 40 */ cmplw r4, r0
/* 802A1ED0 0029EE10 40 82 00 08 */ bne lbl_802A1ED8
/* 802A1ED4 0029EE14 48 00 06 C5 */ bl JAISound_NS_stop_X1_
/* 802A1ED4 0029EE14 48 00 06 C5 */ bl stop__8JAISoundFv
lbl_802A1ED8:
/* 802A1ED8 0029EE18 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A1EDC:
asm/JAudio2/JAISound.s
+8 -8
View File
@@ -3,8 +3,8 @@
.section .text, "ax" # 802a2184
.global JAISoundHandle_NS_releaseSound
JAISoundHandle_NS_releaseSound:
.global releaseSound__14JAISoundHandleFv
releaseSound__14JAISoundHandleFv:
/* 802A2184 0029F0C4 80 83 00 00 */ lwz r4, 0(r3)
/* 802A2188 0029F0C8 28 04 00 00 */ cmplwi r4, 0
/* 802A218C 0029F0CC 4D 82 00 20 */ beqlr
@@ -35,7 +35,7 @@ JAISound_NS_attachHandle:
/* 802A21D8 0029F118 80 64 00 00 */ lwz r3, 0(r4)
/* 802A21DC 0029F11C 28 03 00 00 */ cmplwi r3, 0
/* 802A21E0 0029F120 41 82 00 08 */ beq lbl_802A21E8
/* 802A21E4 0029F124 48 00 03 B5 */ bl JAISound_NS_stop_X1_
/* 802A21E4 0029F124 48 00 03 B5 */ bl stop__8JAISoundFv
lbl_802A21E8:
/* 802A21E8 0029F128 80 1E 00 04 */ lwz r0, 4(r30)
/* 802A21EC 0029F12C 28 00 00 00 */ cmplwi r0, 0
@@ -256,14 +256,14 @@ lbl_802A249C:
/* 802A24D4 0029F414 38 21 00 20 */ addi r1, r1, 0x20
/* 802A24D8 0029F418 4E 80 00 20 */ blr
.global JAISound_NS_stop
JAISound_NS_stop:
.global stop__8JAISoundFUl
stop__8JAISoundFUl:
/* 802A24DC 0029F41C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802A24E0 0029F420 7C 08 02 A6 */ mflr r0
/* 802A24E4 0029F424 90 01 00 14 */ stw r0, 0x14(r1)
/* 802A24E8 0029F428 28 04 00 00 */ cmplwi r4, 0
/* 802A24EC 0029F42C 40 82 00 0C */ bne lbl_802A24F8
/* 802A24F0 0029F430 48 00 00 A9 */ bl JAISound_NS_stop_X1_
/* 802A24F0 0029F430 48 00 00 A9 */ bl stop__8JAISoundFv
/* 802A24F4 0029F434 48 00 00 94 */ b lbl_802A2588
lbl_802A24F8:
/* 802A24F8 0029F438 41 82 00 40 */ beq lbl_802A2538
@@ -310,8 +310,8 @@ lbl_802A2588:
/* 802A2590 0029F4D0 38 21 00 10 */ addi r1, r1, 0x10
/* 802A2594 0029F4D4 4E 80 00 20 */ blr
.global JAISound_NS_stop_X1_
JAISound_NS_stop_X1_:
.global stop__8JAISoundFv
stop__8JAISoundFv:
/* 802A2598 0029F4D8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802A259C 0029F4DC 7C 08 02 A6 */ mflr r0
/* 802A25A0 0029F4E0 90 01 00 14 */ stw r0, 0x14(r1)
asm/JAudio2/JAIStreamMgr.s
+4 -4
View File
@@ -75,7 +75,7 @@ JAIStreamMgr_NS_startSound:
/* 802A3C64 002A0BA4 80 7B 00 00 */ lwz r3, 0(r27)
/* 802A3C68 002A0BA8 28 03 00 00 */ cmplwi r3, 0
/* 802A3C6C 002A0BAC 41 82 00 08 */ beq lbl_802A3C74
/* 802A3C70 002A0BB0 4B FF E9 29 */ bl JAISound_NS_stop_X1_
/* 802A3C70 002A0BB0 4B FF E9 29 */ bl stop__8JAISoundFv
lbl_802A3C74:
/* 802A3C74 002A0BB4 80 1A 00 00 */ lwz r0, 0(r26)
/* 802A3C78 002A0BB8 90 01 00 14 */ stw r0, 0x14(r1)
@@ -360,7 +360,7 @@ JAIStreamMgr_NS_stop:
/* 802A403C 002A0F7C 48 00 00 10 */ b lbl_802A404C
lbl_802A4040:
/* 802A4040 002A0F80 80 7F 00 00 */ lwz r3, 0(r31)
/* 802A4044 002A0F84 4B FF E5 55 */ bl JAISound_NS_stop_X1_
/* 802A4044 002A0F84 4B FF E5 55 */ bl stop__8JAISoundFv
/* 802A4048 002A0F88 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A404C:
/* 802A404C 002A0F8C 28 1F 00 00 */ cmplwi r31, 0
@@ -384,7 +384,7 @@ JAIStreamMgr_NS_stop_X1_:
lbl_802A4088:
/* 802A4088 002A0FC8 80 7F 00 00 */ lwz r3, 0(r31)
/* 802A408C 002A0FCC 7F C4 F3 78 */ mr r4, r30
/* 802A4090 002A0FD0 4B FF E4 4D */ bl JAISound_NS_stop
/* 802A4090 002A0FD0 4B FF E4 4D */ bl stop__8JAISoundFUl
/* 802A4094 002A0FD4 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A4098:
/* 802A4098 002A0FD8 28 1F 00 00 */ cmplwi r31, 0
@@ -413,7 +413,7 @@ lbl_802A40D8:
/* 802A40E4 002A1024 80 1E 00 00 */ lwz r0, 0(r30)
/* 802A40E8 002A1028 7C 04 00 40 */ cmplw r4, r0
/* 802A40EC 002A102C 40 82 00 08 */ bne lbl_802A40F4
/* 802A40F0 002A1030 4B FF E4 A9 */ bl JAISound_NS_stop_X1_
/* 802A40F0 002A1030 4B FF E4 A9 */ bl stop__8JAISoundFv
lbl_802A40F4:
/* 802A40F4 002A1034 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A40F8:
asm/JGadget/std-vector.s
+4 -12
View File
@@ -2,12 +2,6 @@
.section .text, "ax" # 802dccc8
.global JGadget_NS_vector_NS_extend_default
JGadget_NS_vector_NS_extend_default:
/* 802DCCC8 002D9C08 54 83 08 3C */ slwi r3, r4, 1
/* 802DCCCC 002D9C0C 4E 80 00 20 */ blr
.global JGadget_NS_TVector_pointer_void
JGadget_NS_TVector_pointer_void:
/* 802DCCD0 002D9C10 88 04 00 00 */ lbz r0, 0(r4)
@@ -17,10 +11,8 @@ JGadget_NS_TVector_pointer_void:
/* 802DCCE0 002D9C20 80 03 00 04 */ lwz r0, 4(r3)
/* 802DCCE4 002D9C24 90 03 00 08 */ stw r0, 8(r3)
/* 802DCCE8 002D9C28 90 83 00 0C */ stw r4, 0xc(r3)
.global JGadget_NS_vector_NS_extend_default
/* 802DCCEC 002D9C2C 3C 80 80 2E */ lis r4, JGadget_NS_vector_NS_extend_default@ha
.global JGadget_NS_vector_NS_extend_default
/* 802DCCF0 002D9C30 38 04 CC C8 */ addi r0, r4, JGadget_NS_vector_NS_extend_default@l
/* 802DCCEC 002D9C2C 3C 80 80 2E */ lis r4, extend_default__Q27JGadget6vectorFUlUlUl@ha
/* 802DCCF0 002D9C30 38 04 CC C8 */ addi r0, r4, extend_default__Q27JGadget6vectorFUlUlUl@l
/* 802DCCF4 002D9C34 90 03 00 10 */ stw r0, 0x10(r3)
/* 802DCCF8 002D9C38 4E 80 00 20 */ blr
@@ -86,8 +78,8 @@ JGadget_NS_TVector_pointer_void_NS_insert:
/* 802DCDBC 002D9CFC 38 21 00 10 */ addi r1, r1, 0x10
/* 802DCDC0 002D9D00 4E 80 00 20 */ blr
.global JGadget_NS_TVector_pointer_void_NS_erase
JGadget_NS_TVector_pointer_void_NS_erase:
.global erase__Q27JGadget20TVector_pointer_voidFPPvPPv
erase__Q27JGadget20TVector_pointer_voidFPPvPPv:
/* 802DCDC4 002D9D04 80 C3 00 08 */ lwz r6, 8(r3)
/* 802DCDC8 002D9D08 7C 87 23 78 */ mr r7, r4
/* 802DCDCC 002D9D0C 38 06 00 03 */ addi r0, r6, 3
asm/JStudio/functionvalue.s
+6 -2267
View File
File diff suppressed because it is too large Load Diff
asm/JStudio/fvb.s
+51 -573
View File
File diff suppressed because it is too large Load Diff
asm/JStudio/jstudio-control.s
+6 -6
View File
@@ -15,7 +15,7 @@ JStudio_NS_TControl:
/* 80285130 00282070 38 03 4A F4 */ addi r0, r3, lbl_803C4AF4@l
/* 80285134 00282074 90 1F 00 00 */ stw r0, 0(r31)
/* 80285138 00282078 38 7F 00 60 */ addi r3, r31, 0x60
/* 8028513C 0028207C 4B FF F5 2D */ bl JStudio_NS_fvb_NS_TControl
/* 8028513C 0028207C 4B FF F5 2D */ bl __ct__Q37JStudio3fvb8TControlFv
/* 80285140 00282080 38 7F 00 74 */ addi r3, r31, 0x74
/* 80285144 00282084 4B FF BE 81 */ bl JStudio_NS_ctb_NS_TControl
/* 80285148 00282088 38 00 00 00 */ li r0, 0
@@ -59,7 +59,7 @@ JStudio_NS_TControl:
/* 802851E0 00282120 4B FF BE 15 */ bl JStudio_NS_ctb_NS_TControl_NS_dtor
/* 802851E4 00282124 38 7E 00 60 */ addi r3, r30, 0x60
/* 802851E8 00282128 38 80 FF FF */ li r4, -1
/* 802851EC 0028212C 4B FF F4 AD */ bl JStudio_NS_fvb_NS_TControl_NS_dtor
/* 802851EC 0028212C 4B FF F4 AD */ bl __dt__Q37JStudio3fvb8TControlFv
/* 802851F0 00282130 7F C3 F3 78 */ mr r3, r30
/* 802851F4 00282134 38 80 00 00 */ li r4, 0
/* 802851F8 00282138 48 00 3F 9D */ bl __dt__Q37JStudio3stb8TControlFv
@@ -287,7 +287,7 @@ lbl_802854B8:
/* 80285504 00282444 4B FF BD 71 */ bl JStudio_NS_ctb_NS_TFactory_NS_dtor
/* 80285508 00282448 38 7E 00 10 */ addi r3, r30, 0x10
/* 8028550C 0028244C 38 80 FF FF */ li r4, -1
/* 80285510 00282450 4B FF F4 09 */ bl JStudio_NS_fvb_NS_TFactory_NS_dtor
/* 80285510 00282450 4B FF F4 09 */ bl __dt__Q37JStudio3fvb8TFactoryFv
/* 80285514 00282454 34 1E 00 04 */ addic. r0, r30, 4
/* 80285518 00282458 41 82 00 10 */ beq lbl_80285528
/* 8028551C 0028245C 38 7E 00 04 */ addi r3, r30, 4
@@ -542,7 +542,7 @@ lbl_80285880:
lbl_8028588C:
/* 8028588C 002827CC 38 61 00 0C */ addi r3, r1, 0xc
/* 80285890 002827D0 38 86 00 60 */ addi r4, r6, 0x60
/* 80285894 002827D4 4B FF F2 49 */ bl JStudio_NS_fvb_NS_TParse
/* 80285894 002827D4 4B FF F2 49 */ bl __ct__Q37JStudio3fvb6TParseFPQ37JStudio3fvb8TControl
/* 80285898 002827D8 93 E1 00 08 */ stw r31, 8(r1)
/* 8028589C 002827DC 38 61 00 0C */ addi r3, r1, 0xc
/* 802858A0 002827E0 38 81 00 08 */ addi r4, r1, 8
@@ -552,13 +552,13 @@ lbl_8028588C:
/* 802858B0 002827F0 40 82 00 18 */ bne lbl_802858C8
/* 802858B4 002827F4 38 61 00 0C */ addi r3, r1, 0xc
/* 802858B8 002827F8 38 80 FF FF */ li r4, -1
/* 802858BC 002827FC 4B FF F2 41 */ bl JStudio_NS_fvb_NS_TParse_NS_dtor
/* 802858BC 002827FC 4B FF F2 41 */ bl __dt__Q37JStudio3fvb6TParseFv
/* 802858C0 00282800 38 60 00 00 */ li r3, 0
/* 802858C4 00282804 48 00 00 14 */ b lbl_802858D8
lbl_802858C8:
/* 802858C8 00282808 38 61 00 0C */ addi r3, r1, 0xc
/* 802858CC 0028280C 38 80 FF FF */ li r4, -1
/* 802858D0 00282810 4B FF F2 2D */ bl JStudio_NS_fvb_NS_TParse_NS_dtor
/* 802858D0 00282810 4B FF F2 2D */ bl __dt__Q37JStudio3fvb6TParseFv
/* 802858D4 00282814 38 60 00 01 */ li r3, 1
lbl_802858D8:
/* 802858D8 00282818 83 E1 00 1C */ lwz r31, 0x1c(r1)
asm/JStudio/jstudio-object.s
+2 -2
View File
@@ -622,7 +622,7 @@ JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_NAME_:
/* 802865F8 00283538 38 64 00 60 */ addi r3, r4, 0x60
/* 802865FC 0028353C 7C C4 33 78 */ mr r4, r6
/* 80286600 00283540 7C E5 3B 78 */ mr r5, r7
/* 80286604 00283544 4B FF E2 31 */ bl JStudio_NS_fvb_NS_TControl_NS_getObject
/* 80286604 00283544 4B FF E2 31 */ bl getObject__Q37JStudio3fvb8TControlFPCvUl
/* 80286608 00283548 28 03 00 00 */ cmplwi r3, 0
/* 8028660C 0028354C 40 82 00 0C */ bne lbl_80286618
/* 80286610 00283550 38 80 00 00 */ li r4, 0
@@ -654,7 +654,7 @@ JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_:
/* 80286660 002835A0 7F E3 02 14 */ add r31, r3, r0
/* 80286664 002835A4 38 64 00 60 */ addi r3, r4, 0x60
/* 80286668 002835A8 80 86 00 00 */ lwz r4, 0(r6)
/* 8028666C 002835AC 4B FF E2 69 */ bl JStudio_NS_fvb_NS_TControl_NS_getObject_index
/* 8028666C 002835AC 4B FF E2 69 */ bl getObject_index__Q37JStudio3fvb8TControlFUl
/* 80286670 002835B0 28 03 00 00 */ cmplwi r3, 0
/* 80286674 002835B4 40 82 00 0C */ bne lbl_80286680
/* 80286678 002835B8 38 80 00 00 */ li r4, 0
asm/JStudio_JAudio2/object-sound.s
+6 -6
View File
@@ -151,22 +151,22 @@ JStudio_JAudio2_NS_TAdaptor_sound:
/* 8028D92C 0028A86C 88 1E 01 1F */ lbz r0, 0x11f(r30)
/* 8028D930 0028A870 28 00 00 00 */ cmplwi r0, 0
/* 8028D934 0028A874 40 82 00 0C */ bne lbl_8028D940
/* 8028D938 0028A878 48 01 4C 61 */ bl JAISound_NS_stop_X1_
/* 8028D938 0028A878 48 01 4C 61 */ bl stop__8JAISoundFv
/* 8028D93C 0028A87C 48 00 00 20 */ b lbl_8028D95C
lbl_8028D940:
/* 8028D940 0028A880 88 1E 01 1C */ lbz r0, 0x11c(r30)
/* 8028D944 0028A884 28 00 00 00 */ cmplwi r0, 0
/* 8028D948 0028A888 41 82 00 10 */ beq lbl_8028D958
/* 8028D94C 0028A88C 38 7E 01 18 */ addi r3, r30, 0x118
/* 8028D950 0028A890 48 01 48 35 */ bl JAISoundHandle_NS_releaseSound
/* 8028D950 0028A890 48 01 48 35 */ bl releaseSound__14JAISoundHandleFv
/* 8028D954 0028A894 48 00 00 08 */ b lbl_8028D95C
lbl_8028D958:
/* 8028D958 0028A898 48 01 4C 41 */ bl JAISound_NS_stop_X1_
/* 8028D958 0028A898 48 01 4C 41 */ bl stop__8JAISoundFv
lbl_8028D95C:
/* 8028D95C 0028A89C 34 1E 01 18 */ addic. r0, r30, 0x118
/* 8028D960 0028A8A0 41 82 00 0C */ beq lbl_8028D96C
/* 8028D964 0028A8A4 38 7E 01 18 */ addi r3, r30, 0x118
/* 8028D968 0028A8A8 48 01 48 1D */ bl JAISoundHandle_NS_releaseSound
/* 8028D968 0028A8A8 48 01 48 1D */ bl releaseSound__14JAISoundHandleFv
lbl_8028D96C:
/* 8028D96C 0028A8AC 7F C3 F3 78 */ mr r3, r30
/* 8028D970 0028A8B0 38 80 00 00 */ li r4, 0
@@ -570,7 +570,7 @@ JStudio_JAudio2_NS_TAdaptor_sound_NS_prepareSound_:
/* 8028DF18 0028AE58 80 63 01 18 */ lwz r3, 0x118(r3)
/* 8028DF1C 0028AE5C 28 03 00 00 */ cmplwi r3, 0
/* 8028DF20 0028AE60 41 82 00 08 */ beq lbl_8028DF28
/* 8028DF24 0028AE64 48 01 46 75 */ bl JAISound_NS_stop_X1_
/* 8028DF24 0028AE64 48 01 46 75 */ bl stop__8JAISoundFv
lbl_8028DF28:
/* 8028DF28 0028AE68 80 7F 01 14 */ lwz r3, 0x114(r31)
/* 8028DF2C 0028AE6C 80 63 00 0C */ lwz r3, 0xc(r3)
@@ -667,7 +667,7 @@ JStudio_JAudio2_NS_TAdaptor_sound_NS_endSound_fadeOut_:
/* 8028E068 0028AFA8 80 63 01 18 */ lwz r3, 0x118(r3)
/* 8028E06C 0028AFAC 28 03 00 00 */ cmplwi r3, 0
/* 8028E070 0028AFB0 41 82 00 10 */ beq lbl_8028E080
/* 8028E074 0028AFB4 48 01 44 69 */ bl JAISound_NS_stop
/* 8028E074 0028AFB4 48 01 44 69 */ bl stop__8JAISoundFUl
/* 8028E078 0028AFB8 38 00 00 00 */ li r0, 0
/* 8028E07C 0028AFBC 98 1F 01 20 */ stb r0, 0x120(r31)
lbl_8028E080:
asm/JStudio_JStage/object-actor.s
+1 -1
View File
@@ -769,7 +769,7 @@ lbl_8028B0D0:
/* 8028B0D4 00288014 FC 1F 00 40 */ fcmpo cr0, f31, f0
/* 8028B0D8 00288018 40 81 00 24 */ ble lbl_8028B0FC
/* 8028B0DC 0028801C 7F A3 EB 78 */ mr r3, r29
/* 8028B0E0 00288020 4B FF 65 69 */ bl JStudio_NS_TFunctionValue_NS_toFunction_outside
/* 8028B0E0 00288020 4B FF 65 69 */ bl toFunction_outside__Q27JStudio14TFunctionValueFi
/* 8028B0E4 00288024 FC 20 F0 90 */ fmr f1, f30
/* 8028B0E8 00288028 FC 40 F8 90 */ fmr f2, f31
/* 8028B0EC 0028802C 7C 6C 1B 78 */ mr r12, r3
asm/clib.s
+3 -3
View File
@@ -16481,7 +16481,7 @@ lbl_8036F930:
/* 8036F934 0036C874 60 42 32 44 */ ori r2, r2, lbl_803D3244@l
/* 8036F938 0036C878 38 60 00 00 */ li r3, 0
/* 8036F93C 0036C87C 98 62 00 0C */ stb r3, 0xc(r2)
/* 8036F940 0036C880 48 00 1A 69 */ bl func_803713A8
/* 8036F940 0036C880 48 00 1A 69 */ bl TRKRestoreExtended1Block
/* 8036F944 0036C884 3C 40 80 44 */ lis r2, lbl_8044F338@h
/* 8036F948 0036C888 60 42 F3 38 */ ori r2, r2, lbl_8044F338@l
/* 8036F94C 0036C88C BB 62 00 80 */ lmw r27, 0x80(r2)
@@ -18352,8 +18352,8 @@ lbl_80371340:
/* 803713A0 0036E2E0 93 E2 02 78 */ stw r31, 0x278(r2)
/* 803713A4 0036E2E4 4E 80 00 20 */ blr
.global func_803713A8
func_803713A8:
.global TRKRestoreExtended1Block
TRKRestoreExtended1Block:
/* 803713A8 0036E2E8 3C 40 80 44 */ lis r2, lbl_8044F338@h
/* 803713AC 0036E2EC 60 42 F3 38 */ ori r2, r2, lbl_8044F338@l
/* 803713B0 0036E2F0 3C A0 80 3D */ lis r5, lbl_803D3238@h
asm/d/a/d_a_npc.s
+1 -1
View File
@@ -9966,7 +9966,7 @@ daBaseNpc_c:
/* 8014E718 0014B658 38 7E 00 14 */ addi r3, r30, 0x14
/* 8014E71C 0014B65C 4B F2 A7 4D */ bl dBgS_PolyPassChk_NS_SetObj
/* 8014E720 0014B660 38 7F 07 58 */ addi r3, r31, 0x758
/* 8014E724 0014B664 48 17 1C A5 */ bl Z2Creature
/* 8014E724 0014B664 48 17 1C A5 */ bl __ct__10Z2CreatureFv
/* 8014E728 0014B668 3B DF 07 EC */ addi r30, r31, 0x7ec
/* 8014E72C 0014B66C 3C 60 80 3A */ lis r3, lbl_803A3354@ha
/* 8014E730 0014B670 38 03 33 54 */ addi r0, r3, lbl_803A3354@l
asm/d/a/obj/d_a_obj_item.s
+2 -2
View File
@@ -902,7 +902,7 @@ Z2SoundObjSimple_NS_dtor:
/* 8015BA60 001589A0 38 04 AD 10 */ addi r0, r4, lbl_803CAD10@l
/* 8015BA64 001589A4 90 1E 00 10 */ stw r0, 0x10(r30)
/* 8015BA68 001589A8 38 80 00 00 */ li r4, 0
/* 8015BA6C 001589AC 48 16 24 DD */ bl Z2SoundObjBase_NS_dtor
/* 8015BA6C 001589AC 48 16 24 DD */ bl __dt__14Z2SoundObjBaseFv
/* 8015BA70 001589B0 7F E0 07 35 */ extsh. r0, r31
/* 8015BA74 001589B4 40 81 00 0C */ ble lbl_8015BA80
/* 8015BA78 001589B8 7F C3 F3 78 */ mr r3, r30
@@ -1153,7 +1153,7 @@ daItem_c_NS__daItem_delete:
/* 8015BDF4 00158D34 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8015BDF8 00158D38 7C 7F 1B 78 */ mr r31, r3
/* 8015BDFC 00158D3C 38 7F 09 78 */ addi r3, r31, 0x978
/* 8015BE00 00158D40 48 16 21 F9 */ bl Z2SoundObjBase_NS_deleteObject
/* 8015BE00 00158D40 48 16 21 F9 */ bl deleteObject__14Z2SoundObjBaseFv
/* 8015BE04 00158D44 88 1F 09 2A */ lbz r0, 0x92a(r31)
/* 8015BE08 00158D48 28 00 00 06 */ cmplwi r0, 6
/* 8015BE0C 00158D4C 41 82 00 0C */ beq lbl_8015BE18

Some files were not shown because too many files have changed in this diff Show More