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 branch 'master' of https://github.com/zeldaret/tp

Browse Source
This commit is contained in:
Pheenoh
2021-01-02 17:49:20 -05:00
parent 458be4d8cb ad62061cfc
commit e375712d23
1240 changed files with 142288 additions and 95730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+17 -5
View File
@@ -1,4 +1,5 @@
WINDOWS := $(shell which wine ; echo $$?)
UNAME_S := $(shell uname -s)
#-------------------------------------------------------------------------------
# Files
@@ -41,13 +42,20 @@ else
WINE := wine
endif
# Hack for OSX
ifeq ($(UNAME_S),Darwin)
CPP := cpp-10 -P
SHA1SUM := shasum -a 1
else
CPP := cpp -P
SHA1SUM := sha1sum
endif
AS := $(DEVKITPPC)/bin/powerpc-eabi-as
OBJCOPY := $(DEVKITPPC)/bin/powerpc-eabi-objcopy
CPP := cpp -P
CC := $(WINE) tools/mwcc_compiler/$(MWCC_VERSION)/mwcceppc.exe
LD := $(WINE) tools/mwcc_compiler/$(MWCC_VERSION)/mwldeppc.exe
ELF2DOL := tools/elf2dol
SHA1SUM := sha1sum
PYTHON := python3
POSTPROC := tools/postprocess.py
@@ -79,14 +87,15 @@ SBSS_PDHR := 10
default: all
all: $(DOL)
all: dirs $(DOL)
ALL_DIRS := build $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS))
# Make sure build directory exists before compiling anything
DUMMY != mkdir -p $(ALL_DIRS)
dirs:
$(shell mkdir -p $(ALL_DIRS))
.PHONY: tools
.PHONY: dirs tools
$(LDSCRIPT): ldscript.lcf
$(CPP) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $<
@@ -111,6 +120,9 @@ $(ELF): $(O_FILES) $(LDSCRIPT)
$(BUILD_DIR)/%.o: %.s
$(AS) $(ASFLAGS) -o $@ $<
$(BUILD_DIR)/%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
$(BUILD_DIR)/%.o: %.cpp
$(CC) $(CFLAGS) -c -o $@ $<
# TODO: See if this is necessary after actually adding some C code
asm/JUtility/JUTException.s
+5 -5
View File
@@ -1353,16 +1353,16 @@ lbl_802E2F88:
/* 802E2FDC 002DFF1C 40 82 03 A4 */ bne lbl_802E3380
/* 802E2FE0 002DFF20 38 61 02 C8 */ addi r3, r1, 0x2c8
/* 802E2FE4 002DFF24 38 80 00 00 */ li r4, 0
/* 802E2FE8 002DFF28 4B FF D6 F5 */ bl __ct__10JUTGamePadFUl
/* 802E2FE8 002DFF28 4B FF D6 F5 */ bl __ct__10JUTGamePadFQ210JUTGamePad8EPadPort
/* 802E2FEC 002DFF2C 38 61 02 18 */ addi r3, r1, 0x218
/* 802E2FF0 002DFF30 38 80 00 01 */ li r4, 1
/* 802E2FF4 002DFF34 4B FF D6 E9 */ bl __ct__10JUTGamePadFUl
/* 802E2FF4 002DFF34 4B FF D6 E9 */ bl __ct__10JUTGamePadFQ210JUTGamePad8EPadPort
/* 802E2FF8 002DFF38 38 61 01 68 */ addi r3, r1, 0x168
/* 802E2FFC 002DFF3C 38 80 00 02 */ li r4, 2
/* 802E3000 002DFF40 4B FF D6 DD */ bl __ct__10JUTGamePadFUl
/* 802E3000 002DFF40 4B FF D6 DD */ bl __ct__10JUTGamePadFQ210JUTGamePad8EPadPort
/* 802E3004 002DFF44 38 61 00 B8 */ addi r3, r1, 0xb8
/* 802E3008 002DFF48 38 80 00 03 */ li r4, 3
/* 802E300C 002DFF4C 4B FF D6 D1 */ bl __ct__10JUTGamePadFUl
/* 802E300C 002DFF4C 4B FF D6 D1 */ bl __ct__10JUTGamePadFQ210JUTGamePad8EPadPort
/* 802E3010 002DFF50 4B FF D8 D5 */ bl read__10JUTGamePadFv
/* 802E3014 002DFF54 38 60 00 00 */ li r3, 0
/* 802E3018 002DFF58 A8 01 03 44 */ lha r0, 0x344(r1)
@@ -1614,7 +1614,7 @@ lbl_802E3380:
/* 802E3384 002E02C4 2C 04 00 00 */ cmpwi r4, 0
/* 802E3388 002E02C8 41 80 00 E4 */ blt lbl_802E346C
/* 802E338C 002E02CC 38 61 00 08 */ addi r3, r1, 8
/* 802E3390 002E02D0 4B FF D3 4D */ bl __ct__10JUTGamePadFUl
/* 802E3390 002E02D0 4B FF D3 4D */ bl __ct__10JUTGamePadFQ210JUTGamePad8EPadPort
/* 802E3394 002E02D4 3C 60 80 3D */ lis r3, lbl_803CC640@ha
/* 802E3398 002E02D8 3B 43 C6 40 */ addi r26, r3, lbl_803CC640@l
/* 802E339C 002E02DC 38 60 00 00 */ li r3, 0
asm/SComponent/c/API/controller/c_API_controller_pad.s
+3 -3
View File
@@ -8,7 +8,7 @@ cAPICPad_recalibrate:
/* 8026328C 002601CC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80263290 002601D0 7C 08 02 A6 */ mflr r0
/* 80263294 002601D4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80263298 002601D8 4B DA 4A DD */ bl mDoCPd_c_NS_recalibrate
/* 80263298 002601D8 4B DA 4A DD */ bl recalibrate__8mDoCPd_cFv
/* 8026329C 002601DC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802632A0 002601E0 7C 08 03 A6 */ mtlr r0
/* 802632A4 002601E4 38 21 00 10 */ addi r1, r1, 0x10
@@ -17,8 +17,8 @@ cAPICPad_recalibrate:
.global cAPICPad_ANY_BUTTON
cAPICPad_ANY_BUTTON:
/* 802632AC 002601EC 54 64 30 32 */ slwi r4, r3, 6
/* 802632B0 002601F0 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 802632B4 002601F4 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 802632B0 002601F0 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 802632B4 002601F4 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 802632B8 002601F8 7C 60 22 14 */ add r3, r0, r4
/* 802632BC 002601FC 80 03 00 34 */ lwz r0, 0x34(r3)
/* 802632C0 00260200 70 03 13 00 */ andi. r3, r0, 0x1300
asm/SComponent/c/c_angle.s
+4 -4
View File
@@ -300,8 +300,8 @@ cSAngle_NS___amu:
/* 802712EC 0026E22C 38 21 00 20 */ addi r1, r1, 0x20
/* 802712F0 0026E230 4E 80 00 20 */ blr
.global __pl
__pl:
.global cSAngle_NS___pl_short
cSAngle_NS___pl_short:
/* 802712F4 0026E234 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802712F8 0026E238 7C 08 02 A6 */ mflr r0
/* 802712FC 0026E23C 90 01 00 14 */ stw r0, 0x14(r1)
@@ -314,8 +314,8 @@ __pl:
/* 80271318 0026E258 38 21 00 10 */ addi r1, r1, 0x10
/* 8027131C 0026E25C 4E 80 00 20 */ blr
.global __mi
__mi:
.global cSAngle_NS___mi_short
cSAngle_NS___mi_short:
/* 80271320 0026E260 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80271324 0026E264 7C 08 02 A6 */ mflr r0
/* 80271328 0026E268 90 01 00 14 */ stw r0, 0x14(r1)
asm/SComponent/c/c_lib.s
+2 -2
View File
@@ -14,8 +14,8 @@ cLib_memCpy:
/* 8026F954 0026C894 38 21 00 10 */ addi r1, r1, 0x10
/* 8026F958 0026C898 4E 80 00 20 */ blr
.global cLib_memSet
cLib_memSet:
.global cLib_memSet__FPviUl
cLib_memSet__FPviUl:
/* 8026F95C 0026C89C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8026F960 0026C8A0 7C 08 02 A6 */ mflr r0
/* 8026F964 0026C8A4 90 01 00 14 */ stw r0, 0x14(r1)
asm/bss.s
+6 -6
View File
@@ -17,11 +17,11 @@ lbl_803DBF40:
.global lbl_803DBF4C
lbl_803DBF4C:
.skip 0x138C
.global lbl_803DD2D8
lbl_803DD2D8:
.global m_gamePad
m_gamePad:
.skip 0x10
.global lbl_803DD2E8
lbl_803DD2E8:
.global m_cpadInfo
m_cpadInfo:
.skip 0x100
.global lbl_803DD3E8
lbl_803DD3E8:
@@ -86,8 +86,8 @@ lbl_803F0F50:
.global lbl_803F1BB0
lbl_803F1BB0:
.skip 0xC
.global lbl_803F1BBC
lbl_803F1BBC:
.global g_HIO
g_HIO:
.skip 0x44
.global lbl_803F1C00
lbl_803F1C00:
asm/d/bright/d_bright_check.s
+2 -2
View File
@@ -412,8 +412,8 @@ dBrightCheck_c_NS__move:
/* 80193514 00190454 90 01 00 24 */ stw r0, 0x24(r1)
/* 80193518 00190458 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 8019351C 0019045C 7C 7F 1B 78 */ mr r31, r3
/* 80193520 00190460 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80193524 00190464 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80193520 00190460 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80193524 00190464 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80193528 00190468 80 63 00 34 */ lwz r3, 0x34(r3)
/* 8019352C 0019046C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 80193530 00190470 40 82 00 0C */ bne lbl_8019353C
asm/d/com/inf/d_com_inf_game.s
+2 -2
View File
@@ -4032,8 +4032,8 @@ dComIfGs_gameStart:
/* 8002E9CC 0002B90C 38 21 00 10 */ addi r1, r1, 0x10
/* 8002E9D0 0002B910 4E 80 00 20 */ blr
/* 8002E9D4 0002B914 54 64 30 32 */ slwi r4, r3, 6
/* 8002E9D8 0002B918 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 8002E9DC 0002B91C 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 8002E9D8 0002B918 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 8002E9DC 0002B91C 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 8002E9E0 0002B920 7C 60 22 14 */ add r3, r0, r4
/* 8002E9E4 0002B924 80 03 00 34 */ lwz r0, 0x34(r3)
/* 8002E9E8 0002B928 54 03 05 EE */ rlwinm r3, r0, 0, 0x17, 0x17
asm/d/d_camera.s
+34 -34
View File
@@ -1872,8 +1872,8 @@ dCamera_c_NS_initPad:
lbl_80161570:
/* 80161570 0015E4B0 80 03 01 7C */ lwz r0, 0x17c(r3)
/* 80161574 0015E4B4 54 00 30 32 */ slwi r0, r0, 6
/* 80161578 0015E4B8 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 8016157C 0015E4BC 38 A4 D2 E8 */ addi r5, r4, lbl_803DD2E8@l
/* 80161578 0015E4B8 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 8016157C 0015E4BC 38 A4 D2 E8 */ addi r5, r4, m_cpadInfo@l
/* 80161580 0015E4C0 7C 05 04 2E */ lfsx f0, r5, r0
/* 80161584 0015E4C4 D0 03 01 BC */ stfs f0, 0x1bc(r3)
/* 80161588 0015E4C8 80 03 01 7C */ lwz r0, 0x17c(r3)
@@ -1903,8 +1903,8 @@ lbl_801615B0:
lbl_801615E4:
/* 801615E4 0015E524 80 03 01 7C */ lwz r0, 0x17c(r3)
/* 801615E8 0015E528 54 00 30 32 */ slwi r0, r0, 6
/* 801615EC 0015E52C 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 801615F0 0015E530 38 A4 D2 E8 */ addi r5, r4, lbl_803DD2E8@l
/* 801615EC 0015E52C 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 801615F0 0015E530 38 A4 D2 E8 */ addi r5, r4, m_cpadInfo@l
/* 801615F4 0015E534 7C 85 02 14 */ add r4, r5, r0
/* 801615F8 0015E538 C0 04 00 10 */ lfs f0, 0x10(r4)
/* 801615FC 0015E53C D0 03 01 D8 */ stfs f0, 0x1d8(r3)
@@ -1931,8 +1931,8 @@ lbl_80161628:
/* 8016164C 0015E58C 90 83 01 F4 */ stw r4, 0x1f4(r3)
/* 80161650 0015E590 80 03 01 7C */ lwz r0, 0x17c(r3)
/* 80161654 0015E594 54 06 30 32 */ slwi r6, r0, 6
/* 80161658 0015E598 3C A0 80 3E */ lis r5, lbl_803DD2E8@ha
/* 8016165C 0015E59C 38 05 D2 E8 */ addi r0, r5, lbl_803DD2E8@l
/* 80161658 0015E598 3C A0 80 3E */ lis r5, m_cpadInfo@ha
/* 8016165C 0015E59C 38 05 D2 E8 */ addi r0, r5, m_cpadInfo@l
/* 80161660 0015E5A0 7C A0 32 14 */ add r5, r0, r6
/* 80161664 0015E5A4 C0 25 00 28 */ lfs f1, 0x28(r5)
/* 80161668 0015E5A8 D0 23 02 00 */ stfs f1, 0x200(r3)
@@ -2041,8 +2041,8 @@ dCamera_c_NS_updatePad:
lbl_801617F8:
/* 801617F8 0015E738 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 801617FC 0015E73C 54 04 30 32 */ slwi r4, r0, 6
/* 80161800 0015E740 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161804 0015E744 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 80161800 0015E740 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161804 0015E744 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80161808 0015E748 7C 60 22 14 */ add r3, r0, r4
/* 8016180C 0015E74C C0 23 00 00 */ lfs f1, 0(r3)
/* 80161810 0015E750 C0 43 00 04 */ lfs f2, 4(r3)
@@ -2062,8 +2062,8 @@ lbl_80161818:
/* 80161844 0015E784 D0 7E 01 C4 */ stfs f3, 0x1c4(r30)
/* 80161848 0015E788 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 8016184C 0015E78C 54 04 30 32 */ slwi r4, r0, 6
/* 80161850 0015E790 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161854 0015E794 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 80161850 0015E790 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161854 0015E794 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80161858 0015E798 7C 60 22 14 */ add r3, r0, r4
/* 8016185C 0015E79C A8 83 00 0C */ lha r4, 0xc(r3)
/* 80161860 0015E7A0 38 7E 01 D4 */ addi r3, r30, 0x1d4
@@ -2078,8 +2078,8 @@ lbl_80161818:
lbl_80161884:
/* 80161884 0015E7C4 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 80161888 0015E7C8 54 04 30 32 */ slwi r4, r0, 6
/* 8016188C 0015E7CC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161890 0015E7D0 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 8016188C 0015E7CC 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161890 0015E7D0 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80161894 0015E7D4 7C 60 22 14 */ add r3, r0, r4
/* 80161898 0015E7D8 C0 23 00 10 */ lfs f1, 0x10(r3)
/* 8016189C 0015E7DC C0 43 00 14 */ lfs f2, 0x14(r3)
@@ -2099,16 +2099,16 @@ lbl_801618A4:
/* 801618D0 0015E810 D0 7E 01 E0 */ stfs f3, 0x1e0(r30)
/* 801618D4 0015E814 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 801618D8 0015E818 54 04 30 32 */ slwi r4, r0, 6
/* 801618DC 0015E81C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801618E0 0015E820 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 801618DC 0015E81C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801618E0 0015E820 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 801618E4 0015E824 7C 60 22 14 */ add r3, r0, r4
/* 801618E8 0015E828 A8 83 00 1C */ lha r4, 0x1c(r3)
/* 801618EC 0015E82C 38 7E 01 F0 */ addi r3, r30, 0x1f0
/* 801618F0 0015E830 48 10 F7 15 */ bl cSAngle_NS_Val_X2_
/* 801618F4 0015E834 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 801618F8 0015E838 54 00 30 32 */ slwi r0, r0, 6
/* 801618FC 0015E83C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161900 0015E840 38 83 D2 E8 */ addi r4, r3, lbl_803DD2E8@l
/* 801618FC 0015E83C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161900 0015E840 38 83 D2 E8 */ addi r4, r3, m_cpadInfo@l
/* 80161904 0015E844 7C 64 02 14 */ add r3, r4, r0
/* 80161908 0015E848 C0 23 00 28 */ lfs f1, 0x28(r3)
/* 8016190C 0015E84C C0 1E 02 00 */ lfs f0, 0x200(r30)
@@ -2153,8 +2153,8 @@ lbl_80161990:
lbl_8016199C:
/* 8016199C 0015E8DC 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 801619A0 0015E8E0 54 00 30 32 */ slwi r0, r0, 6
/* 801619A4 0015E8E4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801619A8 0015E8E8 38 83 D2 E8 */ addi r4, r3, lbl_803DD2E8@l
/* 801619A4 0015E8E4 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801619A8 0015E8E8 38 83 D2 E8 */ addi r4, r3, m_cpadInfo@l
/* 801619AC 0015E8EC 7C 64 02 14 */ add r3, r4, r0
/* 801619B0 0015E8F0 C0 23 00 2C */ lfs f1, 0x2c(r3)
/* 801619B4 0015E8F4 C0 1E 02 0C */ lfs f0, 0x20c(r30)
@@ -2199,8 +2199,8 @@ lbl_80161A38:
lbl_80161A44:
/* 80161A44 0015E984 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 80161A48 0015E988 54 04 30 32 */ slwi r4, r0, 6
/* 80161A4C 0015E98C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161A50 0015E990 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 80161A4C 0015E98C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161A50 0015E990 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80161A54 0015E994 7C 60 22 14 */ add r3, r0, r4
/* 80161A58 0015E998 80 63 00 30 */ lwz r3, 0x30(r3)
/* 80161A5C 0015E99C 54 63 B7 FE */ rlwinm r3, r3, 0x16, 0x1f, 0x1f
@@ -2400,8 +2400,8 @@ lbl_80161D1C:
/* 80161D24 0015EC64 98 1E 02 24 */ stb r0, 0x224(r30)
/* 80161D28 0015EC68 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 80161D2C 0015EC6C 54 04 30 32 */ slwi r4, r0, 6
/* 80161D30 0015EC70 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161D34 0015EC74 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 80161D30 0015EC70 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161D34 0015EC74 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80161D38 0015EC78 7C 60 22 14 */ add r3, r0, r4
/* 80161D3C 0015EC7C C0 23 00 08 */ lfs f1, 8(r3)
/* 80161D40 0015EC80 C0 02 9C C0 */ lfs f0, lbl_804536C0-_SDA2_BASE_(r2)
@@ -13915,8 +13915,8 @@ _unnamed_d_camera_cpp__NS_sAngleX:
.global mDoCPd_c_NS_getHoldA
mDoCPd_c_NS_getHoldA:
/* 8016C314 00169254 54 64 30 32 */ slwi r4, r3, 6
/* 8016C318 00169258 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 8016C31C 0016925C 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 8016C318 00169258 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 8016C31C 0016925C 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 8016C320 00169260 7C 60 22 14 */ add r3, r0, r4
/* 8016C324 00169264 80 03 00 30 */ lwz r0, 0x30(r3)
/* 8016C328 00169268 54 03 05 EE */ rlwinm r3, r0, 0, 0x17, 0x17
@@ -14738,7 +14738,7 @@ lbl_8016CF04:
/* 8016CF10 00169E50 7C 64 1B 78 */ mr r4, r3
/* 8016CF14 00169E54 38 61 00 DC */ addi r3, r1, 0xdc
/* 8016CF18 00169E58 38 A1 01 40 */ addi r5, r1, 0x140
/* 8016CF1C 00169E5C 48 10 44 05 */ bl __mi
/* 8016CF1C 00169E5C 48 10 44 05 */ bl cSAngle_NS___mi_short
/* 8016CF20 00169E60 38 61 01 38 */ addi r3, r1, 0x138
/* 8016CF24 00169E64 38 81 00 DC */ addi r4, r1, 0xdc
/* 8016CF28 00169E68 48 10 40 41 */ bl cSAngle_X1_
@@ -15510,7 +15510,7 @@ lbl_8016DA68:
/* 8016DA70 0016A9B0 7C 64 1B 78 */ mr r4, r3
/* 8016DA74 0016A9B4 38 61 00 68 */ addi r3, r1, 0x68
/* 8016DA78 0016A9B8 38 A1 01 10 */ addi r5, r1, 0x110
/* 8016DA7C 0016A9BC 48 10 38 79 */ bl __pl
/* 8016DA7C 0016A9BC 48 10 38 79 */ bl cSAngle_NS___pl_short
/* 8016DA80 0016A9C0 38 61 00 64 */ addi r3, r1, 0x64
/* 8016DA84 0016A9C4 38 81 00 68 */ addi r4, r1, 0x68
/* 8016DA88 0016A9C8 38 A1 01 24 */ addi r5, r1, 0x124
@@ -15698,7 +15698,7 @@ lbl_8016DD38:
/* 8016DD40 0016AC80 7C 64 1B 78 */ mr r4, r3
/* 8016DD44 0016AC84 38 61 00 48 */ addi r3, r1, 0x48
/* 8016DD48 0016AC88 7E E5 BB 78 */ mr r5, r23
/* 8016DD4C 0016AC8C 48 10 35 D5 */ bl __mi
/* 8016DD4C 0016AC8C 48 10 35 D5 */ bl cSAngle_NS___mi_short
/* 8016DD50 0016AC90 38 61 01 1C */ addi r3, r1, 0x11c
/* 8016DD54 0016AC94 38 81 00 48 */ addi r4, r1, 0x48
/* 8016DD58 0016AC98 48 01 4F 51 */ bl cSAngle_NS___as
@@ -16836,7 +16836,7 @@ lbl_8016EC84:
/* 8016EE24 0016BD64 7C 64 1B 78 */ mr r4, r3
/* 8016EE28 0016BD68 38 61 01 DC */ addi r3, r1, 0x1dc
/* 8016EE2C 0016BD6C 38 A1 01 E0 */ addi r5, r1, 0x1e0
/* 8016EE30 0016BD70 48 10 24 F1 */ bl __mi
/* 8016EE30 0016BD70 48 10 24 F1 */ bl cSAngle_NS___mi_short
/* 8016EE34 0016BD74 38 61 02 34 */ addi r3, r1, 0x234
/* 8016EE38 0016BD78 38 81 01 DC */ addi r4, r1, 0x1dc
/* 8016EE3C 0016BD7C 48 10 21 BD */ bl cSAngle_NS_Val_X1_
@@ -24703,7 +24703,7 @@ lbl_80176490:
/* 8017649C 001733DC 38 61 00 34 */ addi r3, r1, 0x34
/* 801764A0 001733E0 3B E1 00 66 */ addi r31, r1, 0x66
/* 801764A4 001733E4 7F E5 FB 78 */ mr r5, r31
/* 801764A8 001733E8 48 0F AE 79 */ bl __mi
/* 801764A8 001733E8 48 0F AE 79 */ bl cSAngle_NS___mi_short
/* 801764AC 001733EC 38 61 00 54 */ addi r3, r1, 0x54
/* 801764B0 001733F0 38 81 00 34 */ addi r4, r1, 0x34
/* 801764B4 001733F4 48 0F AA B5 */ bl cSAngle_X1_
@@ -26802,7 +26802,7 @@ lbl_801783D8:
/* 80178440 00175380 7C 64 1B 78 */ mr r4, r3
/* 80178444 00175384 38 61 00 80 */ addi r3, r1, 0x80
/* 80178448 00175388 38 A1 00 84 */ addi r5, r1, 0x84
/* 8017844C 0017538C 48 0F 8E D5 */ bl __mi
/* 8017844C 0017538C 48 0F 8E D5 */ bl cSAngle_NS___mi_short
/* 80178450 00175390 38 78 04 10 */ addi r3, r24, 0x410
/* 80178454 00175394 38 81 00 80 */ addi r4, r1, 0x80
/* 80178458 00175398 48 00 A8 51 */ bl cSAngle_NS___as
@@ -31802,7 +31802,7 @@ lbl_8017CECC:
/* 8017CEF0 00179E30 7C 64 1B 78 */ mr r4, r3
/* 8017CEF4 00179E34 38 61 00 A4 */ addi r3, r1, 0xa4
/* 8017CEF8 00179E38 38 BF 00 62 */ addi r5, r31, 0x62
/* 8017CEFC 00179E3C 48 0F 44 25 */ bl __mi
/* 8017CEFC 00179E3C 48 0F 44 25 */ bl cSAngle_NS___mi_short
/* 8017CF00 00179E40 38 61 01 4C */ addi r3, r1, 0x14c
/* 8017CF04 00179E44 38 81 00 A4 */ addi r4, r1, 0xa4
/* 8017CF08 00179E48 48 0F 40 61 */ bl cSAngle_X1_
@@ -31840,7 +31840,7 @@ lbl_8017CF68:
/* 8017CF80 00179EC0 7C 64 1B 78 */ mr r4, r3
/* 8017CF84 00179EC4 38 61 00 9C */ addi r3, r1, 0x9c
/* 8017CF88 00179EC8 38 BF 00 62 */ addi r5, r31, 0x62
/* 8017CF8C 00179ECC 48 0F 43 95 */ bl __mi
/* 8017CF8C 00179ECC 48 0F 43 95 */ bl cSAngle_NS___mi_short
/* 8017CF90 00179ED0 38 61 01 48 */ addi r3, r1, 0x148
/* 8017CF94 00179ED4 38 81 00 9C */ addi r4, r1, 0x9c
/* 8017CF98 00179ED8 48 0F 3F D1 */ bl cSAngle_X1_
@@ -38326,8 +38326,8 @@ dCamSetup_c_NS_WaitRollTimer:
.global mDoCPd_c_NS_getTrigA
mDoCPd_c_NS_getTrigA:
/* 80182BF8 0017FB38 54 64 30 32 */ slwi r4, r3, 6
/* 80182BFC 0017FB3C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80182C00 0017FB40 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 80182BFC 0017FB3C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80182C00 0017FB40 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80182C04 0017FB44 7C 60 22 14 */ add r3, r0, r4
/* 80182C08 0017FB48 80 03 00 34 */ lwz r0, 0x34(r3)
/* 80182C0C 0017FB4C 54 03 05 EE */ rlwinm r3, r0, 0, 0x17, 0x17
asm/d/d_event.s
+2 -2
View File
@@ -1591,8 +1591,8 @@ dEvt_control_c_NS_skipper:
/* 80042A14 0003F954 41 82 00 08 */ beq lbl_80042A1C
/* 80042A18 0003F958 3B C0 00 01 */ li r30, 1
lbl_80042A1C:
/* 80042A1C 0003F95C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80042A20 0003F960 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80042A1C 0003F95C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80042A20 0003F960 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80042A24 0003F964 80 03 00 34 */ lwz r0, 0x34(r3)
/* 80042A28 0003F968 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 80042A2C 0003F96C 41 82 00 44 */ beq lbl_80042A70
asm/d/d_kankyo.s
-19747
View File
File diff suppressed because it is too large Load Diff
asm/d/d_meter2.s
-8015
View File
File diff suppressed because it is too large Load Diff
asm/d/d_name.s
+6 -6
View File
@@ -424,8 +424,8 @@ dName_c_NS__move:
/* 8024E9D0 0024B910 7D 80 2A 14 */ add r12, r0, r5
/* 8024E9D4 0024B914 48 11 36 B1 */ bl func_80362084
/* 8024E9D8 0024B918 60 00 00 00 */ nop
/* 8024E9DC 0024B91C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 8024E9E0 0024B920 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8024E9DC 0024B91C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 8024E9E0 0024B920 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 8024E9E4 0024B924 80 63 00 34 */ lwz r3, 0x34(r3)
/* 8024E9E8 0024B928 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e
/* 8024E9EC 0024B92C 41 82 00 64 */ beq lbl_8024EA50
@@ -673,8 +673,8 @@ lbl_8024ED08:
/* 8024ED54 0024BC94 90 01 00 34 */ stw r0, 0x34(r1)
/* 8024ED58 0024BC98 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 8024ED5C 0024BC9C 7C 7F 1B 78 */ mr r31, r3
/* 8024ED60 0024BCA0 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 8024ED64 0024BCA4 38 84 D2 E8 */ addi r4, r4, lbl_803DD2E8@l
/* 8024ED60 0024BCA0 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 8024ED64 0024BCA4 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l
/* 8024ED68 0024BCA8 80 04 00 34 */ lwz r0, 0x34(r4)
/* 8024ED6C 0024BCAC 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 8024ED70 0024BCB0 41 82 00 0C */ beq lbl_8024ED7C
@@ -1696,8 +1696,8 @@ lbl_8024FBA8:
/* 8024FC0C 0024CB4C 98 1F 02 AB */ stb r0, 0x2ab(r31)
/* 8024FC10 0024CB50 48 00 01 7C */ b lbl_8024FD8C
lbl_8024FC14:
/* 8024FC14 0024CB54 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 8024FC18 0024CB58 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8024FC14 0024CB54 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 8024FC18 0024CB58 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 8024FC1C 0024CB5C 80 63 00 34 */ lwz r3, 0x34(r3)
/* 8024FC20 0024CB60 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 8024FC24 0024CB64 41 82 00 D0 */ beq lbl_8024FCF4
asm/d/d_vibration.s
+22 -22
View File
@@ -445,8 +445,8 @@ lbl_8006F750:
/* 8006F774 0006C6B4 7F C5 F3 78 */ mr r5, r30
/* 8006F778 0006C6B8 4B FF F9 F1 */ bl _unnamed_d_vibration_cpp__NS_makedata
/* 8006F77C 0006C6BC 7C 64 1B 78 */ mr r4, r3
/* 8006F780 0006C6C0 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F784 0006C6C4 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F780 0006C6C0 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F784 0006C6C4 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F788 0006C6C8 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F78C 0006C6CC 38 63 00 68 */ addi r3, r3, 0x68
/* 8006F790 0006C6D0 38 A0 00 00 */ li r5, 0
@@ -471,8 +471,8 @@ lbl_8006F7A0:
/* 8006F7D8 0006C718 7F A5 EB 78 */ mr r5, r29
/* 8006F7DC 0006C71C 4B FF F9 8D */ bl _unnamed_d_vibration_cpp__NS_makedata
/* 8006F7E0 0006C720 7C 64 1B 78 */ mr r4, r3
/* 8006F7E4 0006C724 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F7E8 0006C728 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F7E4 0006C724 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F7E8 0006C728 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F7EC 0006C72C 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F7F0 0006C730 38 63 00 68 */ addi r3, r3, 0x68
/* 8006F7F4 0006C734 38 A0 00 01 */ li r5, 1
@@ -512,8 +512,8 @@ lbl_8006F84C:
/* 8006F874 0006C7B4 7F A5 EB 78 */ mr r5, r29
/* 8006F878 0006C7B8 4B FF F8 F1 */ bl _unnamed_d_vibration_cpp__NS_makedata
/* 8006F87C 0006C7BC 7C 64 1B 78 */ mr r4, r3
/* 8006F880 0006C7C0 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F884 0006C7C4 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F880 0006C7C0 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F884 0006C7C4 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F888 0006C7C8 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F88C 0006C7CC 38 63 00 68 */ addi r3, r3, 0x68
/* 8006F890 0006C7D0 38 A0 00 00 */ li r5, 0
@@ -521,13 +521,13 @@ lbl_8006F84C:
/* 8006F898 0006C7D8 48 27 20 35 */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvlUl
/* 8006F89C 0006C7DC 48 00 00 3C */ b lbl_8006F8D8
lbl_8006F8A0:
/* 8006F8A0 0006C7E0 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F8A4 0006C7E4 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F8A0 0006C7E0 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F8A4 0006C7E4 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F8A8 0006C7E8 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F8AC 0006C7EC 38 63 00 68 */ addi r3, r3, 0x68
/* 8006F8B0 0006C7F0 48 27 20 C9 */ bl stopPatternedRumbleAtThePeriod__Q210JUTGamePad7CRumbleFv
/* 8006F8B4 0006C7F4 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F8B8 0006C7F8 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F8B4 0006C7F4 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F8B8 0006C7F8 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F8BC 0006C7FC 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F8C0 0006C800 A8 63 00 7C */ lha r3, 0x7c(r3)
/* 8006F8C4 0006C804 38 80 00 00 */ li r4, 0
@@ -588,13 +588,13 @@ lbl_8006F978:
lbl_8006F990:
/* 8006F990 0006C8D0 2C 03 03 84 */ cmpwi r3, 0x384
/* 8006F994 0006C8D4 41 80 00 40 */ blt lbl_8006F9D4
/* 8006F998 0006C8D8 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F99C 0006C8DC 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F998 0006C8D8 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F99C 0006C8DC 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F9A0 0006C8E0 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F9A4 0006C8E4 38 63 00 68 */ addi r3, r3, 0x68
/* 8006F9A8 0006C8E8 48 27 1F D1 */ bl stopPatternedRumbleAtThePeriod__Q210JUTGamePad7CRumbleFv
/* 8006F9AC 0006C8EC 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F9B0 0006C8F0 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F9AC 0006C8EC 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F9B0 0006C8F0 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F9B4 0006C8F4 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F9B8 0006C8F8 A8 63 00 7C */ lha r3, 0x7c(r3)
/* 8006F9BC 0006C8FC 38 80 00 00 */ li r4, 0
@@ -901,13 +901,13 @@ dVibration_c_NS_Kill:
/* 8006FE08 0006CD48 90 01 00 14 */ stw r0, 0x14(r1)
/* 8006FE0C 0006CD4C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8006FE10 0006CD50 7C 7F 1B 78 */ mr r31, r3
/* 8006FE14 0006CD54 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006FE18 0006CD58 80 83 D2 D8 */ lwz r4, lbl_803DD2D8@l(r3)
/* 8006FE14 0006CD54 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006FE18 0006CD58 80 83 D2 D8 */ lwz r4, m_gamePad@l(r3)
/* 8006FE1C 0006CD5C 38 64 00 68 */ addi r3, r4, 0x68
/* 8006FE20 0006CD60 A8 84 00 7C */ lha r4, 0x7c(r4)
/* 8006FE24 0006CD64 48 27 1B 25 */ bl stopPatternedRumble__Q210JUTGamePad7CRumbleFs
/* 8006FE28 0006CD68 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006FE2C 0006CD6C 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006FE28 0006CD68 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006FE2C 0006CD6C 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006FE30 0006CD70 80 63 00 00 */ lwz r3, 0(r3)
/* 8006FE34 0006CD74 A8 63 00 7C */ lha r3, 0x7c(r3)
/* 8006FE38 0006CD78 38 80 00 01 */ li r4, 1
@@ -1000,13 +1000,13 @@ dVibration_c_NS_Pause:
/* 8006FF68 0006CEA8 2C 00 FF FF */ cmpwi r0, -1
/* 8006FF6C 0006CEAC 41 82 00 30 */ beq lbl_8006FF9C
lbl_8006FF70:
/* 8006FF70 0006CEB0 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006FF74 0006CEB4 80 83 D2 D8 */ lwz r4, lbl_803DD2D8@l(r3)
/* 8006FF70 0006CEB0 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006FF74 0006CEB4 80 83 D2 D8 */ lwz r4, m_gamePad@l(r3)
/* 8006FF78 0006CEB8 38 64 00 68 */ addi r3, r4, 0x68
/* 8006FF7C 0006CEBC A8 84 00 7C */ lha r4, 0x7c(r4)
/* 8006FF80 0006CEC0 48 27 19 C9 */ bl stopPatternedRumble__Q210JUTGamePad7CRumbleFs
/* 8006FF84 0006CEC4 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006FF88 0006CEC8 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006FF84 0006CEC4 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006FF88 0006CEC8 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006FF8C 0006CECC 80 63 00 00 */ lwz r3, 0(r3)
/* 8006FF90 0006CED0 A8 63 00 7C */ lha r3, 0x7c(r3)
/* 8006FF94 0006CED4 38 80 00 01 */ li r4, 1
asm/d/error/d_error_msg.s
+2 -2
View File
@@ -871,13 +871,13 @@ lbl_8009D814:
/* 8009D844 0009A784 38 60 00 01 */ li r3, 1
/* 8009D848 0009A788 3C 80 80 00 */ lis r4, 0x8000
/* 8009D84C 0009A78C 38 A0 00 00 */ li r5, 0
/* 8009D850 0009A790 4B F7 7D C5 */ bl reset__6mDoRstFlUll
/* 8009D850 0009A790 4B F7 7D C5 */ bl mDoRst_reset__FiUli
/* 8009D854 0009A794 48 00 00 14 */ b lbl_8009D868
lbl_8009D858:
/* 8009D858 0009A798 38 60 00 01 */ li r3, 1
/* 8009D85C 0009A79C 38 80 00 01 */ li r4, 1
/* 8009D860 0009A7A0 38 A0 00 01 */ li r5, 1
/* 8009D864 0009A7A4 4B F7 7D B1 */ bl reset__6mDoRstFlUll
/* 8009D864 0009A7A4 4B F7 7D B1 */ bl mDoRst_reset__FiUli
lbl_8009D868:
/* 8009D868 0009A7A8 38 60 00 01 */ li r3, 1
lbl_8009D86C:
asm/d/ev/d_ev_camera.s
+3 -3
View File
@@ -8383,8 +8383,8 @@ lbl_800903FC:
/* 80090420 0008D360 38 60 00 01 */ li r3, 1
/* 80090424 0008D364 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 80090428 0008D368 54 05 30 32 */ slwi r5, r0, 6
/* 8009042C 0008D36C 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 80090430 0008D370 38 04 D2 E8 */ addi r0, r4, lbl_803DD2E8@l
/* 8009042C 0008D36C 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 80090430 0008D370 38 04 D2 E8 */ addi r0, r4, m_cpadInfo@l
/* 80090434 0008D374 7C 80 2A 14 */ add r4, r0, r5
/* 80090438 0008D378 80 84 00 30 */ lwz r4, 0x30(r4)
/* 8009043C 0008D37C 54 80 05 EF */ rlwinm. r0, r4, 0, 0x17, 0x17
@@ -14607,7 +14607,7 @@ lbl_80096138:
/* 80096144 00093084 7C 64 1B 78 */ mr r4, r3
/* 80096148 00093088 38 61 00 1C */ addi r3, r1, 0x1c
/* 8009614C 0009308C 38 A1 00 20 */ addi r5, r1, 0x20
/* 80096150 00093090 48 1D B1 A5 */ bl __pl
/* 80096150 00093090 48 1D B1 A5 */ bl cSAngle_NS___pl_short
/* 80096154 00093094 38 61 00 0C */ addi r3, r1, 0xc
/* 80096158 00093098 A8 81 00 1C */ lha r4, 0x1c(r1)
/* 8009615C 0009309C 48 1D AE 3D */ bl cSAngle_X2_
asm/d/file/d_file_select.s
+10 -10
View File
@@ -2101,8 +2101,8 @@ lbl_801853AC:
/* 801853D4 00182314 7C 7F 1B 78 */ mr r31, r3
/* 801853D8 00182318 80 63 02 54 */ lwz r3, 0x254(r3)
/* 801853DC 0018231C 4B EA CD C1 */ bl checkTrigger__9STControlFv
/* 801853E0 00182320 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801853E4 00182324 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801853E0 00182320 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801853E4 00182324 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801853E8 00182328 80 63 00 34 */ lwz r3, 0x34(r3)
/* 801853EC 0018232C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801853F0 00182330 40 82 00 0C */ bne lbl_801853FC
@@ -3428,8 +3428,8 @@ lbl_8018675C:
/* 80186784 001836C4 7C 7F 1B 78 */ mr r31, r3
/* 80186788 001836C8 80 63 02 54 */ lwz r3, 0x254(r3)
/* 8018678C 001836CC 4B EA BA 11 */ bl checkTrigger__9STControlFv
/* 80186790 001836D0 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80186794 001836D4 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80186790 001836D0 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80186794 001836D4 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80186798 001836D8 80 63 00 34 */ lwz r3, 0x34(r3)
/* 8018679C 001836DC 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801867A0 001836E0 41 82 00 10 */ beq lbl_801867B0
@@ -5002,8 +5002,8 @@ lbl_80187EAC:
/* 80187EE4 00184E24 7C 7F 1B 78 */ mr r31, r3
/* 80187EE8 00184E28 80 63 02 54 */ lwz r3, 0x254(r3)
/* 80187EEC 00184E2C 4B EA A2 B1 */ bl checkTrigger__9STControlFv
/* 80187EF0 00184E30 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80187EF4 00184E34 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80187EF0 00184E30 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80187EF4 00184E34 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80187EF8 00184E38 80 63 00 34 */ lwz r3, 0x34(r3)
/* 80187EFC 00184E3C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 80187F00 00184E40 41 82 00 10 */ beq lbl_80187F10
@@ -6343,8 +6343,8 @@ lbl_80189288:
/* 801892AC 001861EC 7C 7F 1B 78 */ mr r31, r3
/* 801892B0 001861F0 80 63 02 54 */ lwz r3, 0x254(r3)
/* 801892B4 001861F4 4B EA 8E E9 */ bl checkTrigger__9STControlFv
/* 801892B8 001861F8 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801892BC 001861FC 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801892B8 001861F8 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801892BC 001861FC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801892C0 00186200 80 63 00 34 */ lwz r3, 0x34(r3)
/* 801892C4 00186204 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801892C8 00186208 41 82 00 10 */ beq lbl_801892D8
@@ -13347,8 +13347,8 @@ dFile_select_c_NS_errYesNoSelect:
/* 8018FA44 0018C984 3B E0 00 00 */ li r31, 0
/* 8018FA48 0018C988 80 63 02 54 */ lwz r3, 0x254(r3)
/* 8018FA4C 0018C98C 4B EA 27 51 */ bl checkTrigger__9STControlFv
/* 8018FA50 0018C990 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 8018FA54 0018C994 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8018FA50 0018C990 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 8018FA54 0018C994 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 8018FA58 0018C998 80 03 00 34 */ lwz r0, 0x34(r3)
/* 8018FA5C 0018C99C 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 8018FA60 0018C9A0 41 82 00 90 */ beq lbl_8018FAF0
asm/d/kankyo/d_kankyo_data.s
-93
View File
@@ -1,93 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 800569dc
.global dKyd_dmpalet_getp
dKyd_dmpalet_getp:
/* 800569DC 0005391C 3C 60 80 3B */ lis r3, lbl_803A953C@ha
/* 800569E0 00053920 38 63 95 3C */ addi r3, r3, lbl_803A953C@l
/* 800569E4 00053924 4E 80 00 20 */ blr
.global dKyd_dmpselect_getp
dKyd_dmpselect_getp:
/* 800569E8 00053928 3C 60 80 3B */ lis r3, lbl_803A987C@ha
/* 800569EC 0005392C 38 63 98 7C */ addi r3, r3, lbl_803A987C@l
/* 800569F0 00053930 4E 80 00 20 */ blr
.global dKyd_dmenvr_getp
dKyd_dmenvr_getp:
/* 800569F4 00053934 3C 60 80 3B */ lis r3, lbl_803A9894@ha
/* 800569F8 00053938 38 63 98 94 */ addi r3, r3, lbl_803A9894@l
/* 800569FC 0005393C 4E 80 00 20 */ blr
.global dKyd_dmvrbox_getp
dKyd_dmvrbox_getp:
/* 80056A00 00053940 3C 60 80 3B */ lis r3, lbl_803A9918@ha
/* 80056A04 00053944 38 63 99 18 */ addi r3, r3, lbl_803A9918@l
/* 80056A08 00053948 4E 80 00 20 */ blr
.global dKyd_schejule_getp
dKyd_schejule_getp:
/* 80056A0C 0005394C 3C 60 80 3B */ lis r3, lbl_803A9434@ha
/* 80056A10 00053950 38 63 94 34 */ addi r3, r3, lbl_803A9434@l
/* 80056A14 00053954 4E 80 00 20 */ blr
.global dKyd_schejule_boss_getp
dKyd_schejule_boss_getp:
/* 80056A18 00053958 3C 60 80 3B */ lis r3, lbl_803A94B8@ha
/* 80056A1C 0005395C 38 63 94 B8 */ addi r3, r3, lbl_803A94B8@l
/* 80056A20 00053960 4E 80 00 20 */ blr
.global dKyd_xfog_table_set
dKyd_xfog_table_set:
/* 80056A24 00053964 38 80 00 00 */ li r4, 0
/* 80056A28 00053968 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80056A2C 0005396C 1C A0 00 14 */ mulli r5, r0, 0x14
/* 80056A30 00053970 3C 60 80 3B */ lis r3, lbl_803A9A94@ha
/* 80056A34 00053974 38 03 9A 94 */ addi r0, r3, lbl_803A9A94@l
/* 80056A38 00053978 7C C0 2A 14 */ add r6, r0, r5
/* 80056A3C 0005397C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha
/* 80056A40 00053980 38 A3 CA 54 */ addi r5, r3, lbl_8042CA54@l
/* 80056A44 00053984 38 00 00 0A */ li r0, 0xa
/* 80056A48 00053988 7C 09 03 A6 */ mtctr r0
lbl_80056A4C:
/* 80056A4C 0005398C 7C 06 22 2E */ lhzx r0, r6, r4
/* 80056A50 00053990 7C 65 22 14 */ add r3, r5, r4
/* 80056A54 00053994 B0 03 10 AC */ sth r0, 0x10ac(r3)
/* 80056A58 00053998 38 84 00 02 */ addi r4, r4, 2
/* 80056A5C 0005399C 42 00 FF F0 */ bdnz lbl_80056A4C
/* 80056A60 000539A0 4E 80 00 20 */ blr
.global dKyd_maple_col_getp
dKyd_maple_col_getp:
/* 80056A64 000539A4 3C 60 80 3B */ lis r3, lbl_803A9410@ha
/* 80056A68 000539A8 38 63 94 10 */ addi r3, r3, lbl_803A9410@l
/* 80056A6C 000539AC 4E 80 00 20 */ blr
.global dKyd_darkworld_tbl_getp
dKyd_darkworld_tbl_getp:
/* 80056A70 000539B0 3C 60 80 3B */ lis r3, lbl_803A9198@ha
/* 80056A74 000539B4 38 63 91 98 */ addi r3, r3, lbl_803A9198@l
/* 80056A78 000539B8 4E 80 00 20 */ blr
.global dKyd_light_size_tbl_getp
dKyd_light_size_tbl_getp:
/* 80056A7C 000539BC 3C 60 80 3B */ lis r3, lbl_803A92A8@ha
/* 80056A80 000539C0 38 63 92 A8 */ addi r3, r3, lbl_803A92A8@l
/* 80056A84 000539C4 4E 80 00 20 */ blr
.global dKyd_light_tw_size_tbl_getp
dKyd_light_tw_size_tbl_getp:
/* 80056A88 000539C8 3C 60 80 3B */ lis r3, lbl_803A93C8@ha
/* 80056A8C 000539CC 38 63 93 C8 */ addi r3, r3, lbl_803A93C8@l
/* 80056A90 000539D0 4E 80 00 20 */ blr
.global dKyd_BloomInf_tbl_getp
dKyd_BloomInf_tbl_getp:
/* 80056A94 000539D4 1C 83 00 0C */ mulli r4, r3, 0xc
/* 80056A98 000539D8 3C 60 80 3B */ lis r3, lbl_803A8E98@ha
/* 80056A9C 000539DC 38 03 8E 98 */ addi r0, r3, lbl_803A8E98@l
/* 80056AA0 000539E0 7C 60 22 14 */ add r3, r0, r4
/* 80056AA4 000539E4 4E 80 00 20 */ blr
asm/d/kankyo/d_kankyo_rain.s
-21524
View File
File diff suppressed because it is too large Load Diff
asm/d/kankyo/d_kankyo_wether.s
-5426
View File
File diff suppressed because it is too large Load Diff

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