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 pull request #216 from Pheenoh/rebase

Browse Source 
d_a_npc work + tp.py fixes
This commit is contained in:
TakaRikka
2022-12-21 13:03:02 -08:00
committed by GitHub
parent ca71275bbe c1bddb4a3b
commit 6637a124d1
91 changed files with 4883 additions and 3591 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+13 -13
View File
@@ -19,13 +19,13 @@ Project Setup
1. Clone down project
```bash
$ git clone https://github.com/zeldaret/tp
git clone https://github.com/zeldaret/tp
```
2. Setup compiler directory
```bash
$ mkdir -p tools/mwcc_compiler/
mkdir -p tools/mwcc_compiler/
```
3. Download `GC_COMPILERS.zip` from the [Discord](https://discord.gg/Nshw5pHS4h) server. See the pins in the `#tp-decomp` channel under the Twilight Princess group.
@@ -33,7 +33,7 @@ $ mkdir -p tools/mwcc_compiler/
4. Extract `GC_COMPILERS.zip` into the previously created `mwcc_compiler` directory
```bash
$ unzip GC_COMPILERS.zip -d tools/mwcc_compiler/
unzip GC_COMPILERS.zip -d tools/mwcc_compiler/
```
5. Place a copy of NTSC-U GCN Twilight Princess in the root directory and call it `gz2e01.iso` (find this on your own)
@@ -41,7 +41,7 @@ $ unzip GC_COMPILERS.zip -d tools/mwcc_compiler/
6. Setup the project
```bash
$ ./tp setup
./tp setup
```
Building The Game
@@ -50,7 +50,7 @@ Building The Game
1. To build a playable game, complete the [Project Setup](#project-setup) steps, then run
```bash
$ make game
make game
```
The completed build is under `build/dolzel2/game/sys/main.dol`
@@ -58,7 +58,7 @@ The completed build is under `build/dolzel2/game/sys/main.dol`
Build DOL
```bash
$ make
make
```
(Note that any time you run make you can add the -j# argument where # is the amount of threads your system has in order to greatly speed up build times)
@@ -66,7 +66,7 @@ $ make
Build RELs
```bash
$ make rels
make rels
```
The completed RELs will be under `build/dolzel2/rel`
@@ -74,7 +74,7 @@ The completed RELs will be under `build/dolzel2/rel`
Extract Game Assets
```bash
$ make assets
make assets
```
Create Expected Directory
@@ -83,7 +83,7 @@ Create Expected Directory
2. Run:
```bash
$ ./tp expected
./tp expected
```
@@ -93,25 +93,25 @@ Clean Directories
Clean RELs
```bash
$ make clean_rels
make clean_rels
```
Clean Game Directory
```bash
$ make clean_game
make clean_game
```
Clean Build Directory
```bash
$ make clean_all
make clean_all
```
Clean Dol
```bash
$ make clean
make clean
```
asm/d/a/d_a_npc/CheckCreateHeap__FP10fopAc_ac_c.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8014F4F8:
/* 8014F4F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8014F4FC 7C 08 02 A6 */ mflr r0
/* 8014F500 90 01 00 14 */ stw r0, 0x14(r1)
/* 8014F504 48 00 00 15 */ bl MoveBGCreateHeap__23daBaseNpc_moveBgActor_cFv
/* 8014F508 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8014F50C 7C 08 03 A6 */ mtlr r0
/* 8014F510 38 21 00 10 */ addi r1, r1, 0x10
/* 8014F514 4E 80 00 20 */ blr
asm/d/a/d_a_npc/__ct__23daBaseNpc_moveBgActor_cFv.s
-18
View File
@@ -1,18 +0,0 @@
lbl_8014F4B4:
/* 8014F4B4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8014F4B8 7C 08 02 A6 */ mflr r0
/* 8014F4BC 90 01 00 14 */ stw r0, 0x14(r1)
/* 8014F4C0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8014F4C4 7C 7F 1B 78 */ mr r31, r3
/* 8014F4C8 4B FF F2 01 */ bl __ct__11daBaseNpc_cFv
/* 8014F4CC 3C 60 80 3B */ lis r3, __vt__23daBaseNpc_moveBgActor_c@ha /* 0x803B3948@ha */
/* 8014F4D0 38 03 39 48 */ addi r0, r3, __vt__23daBaseNpc_moveBgActor_c@l /* 0x803B3948@l */
/* 8014F4D4 90 1F 05 68 */ stw r0, 0x568(r31)
/* 8014F4D8 38 00 00 00 */ li r0, 0
/* 8014F4DC 90 1F 0A 14 */ stw r0, 0xa14(r31)
/* 8014F4E0 7F E3 FB 78 */ mr r3, r31
/* 8014F4E4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8014F4E8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8014F4EC 7C 08 03 A6 */ mtlr r0
/* 8014F4F0 38 21 00 10 */ addi r1, r1, 0x10
/* 8014F4F4 4E 80 00 20 */ blr
asm/d/a/d_a_npc/attnSttsOn__11daBaseNpc_cFii.s
-24
View File
@@ -1,24 +0,0 @@
lbl_8014EFA4:
/* 8014EFA4 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8014EFA8 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8014EFAC 80 C6 5D B4 */ lwz r6, 0x5db4(r6)
/* 8014EFB0 80 06 05 74 */ lwz r0, 0x574(r6)
/* 8014EFB4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
/* 8014EFB8 41 82 00 1C */ beq lbl_8014EFD4
/* 8014EFBC 2C 05 00 00 */ cmpwi r5, 0
/* 8014EFC0 41 82 00 0C */ beq lbl_8014EFCC
/* 8014EFC4 38 00 00 0A */ li r0, 0xa
/* 8014EFC8 48 00 00 20 */ b lbl_8014EFE8
lbl_8014EFCC:
/* 8014EFCC 38 00 00 01 */ li r0, 1
/* 8014EFD0 48 00 00 18 */ b lbl_8014EFE8
lbl_8014EFD4:
/* 8014EFD4 2C 04 00 00 */ cmpwi r4, 0
/* 8014EFD8 41 82 00 0C */ beq lbl_8014EFE4
/* 8014EFDC 38 00 00 0A */ li r0, 0xa
/* 8014EFE0 48 00 00 08 */ b lbl_8014EFE8
lbl_8014EFE4:
/* 8014EFE4 38 00 00 01 */ li r0, 1
lbl_8014EFE8:
/* 8014EFE8 90 03 05 5C */ stw r0, 0x55c(r3)
/* 8014EFEC 4E 80 00 20 */ blr
asm/d/a/d_a_npc/chkPassed__13daNpcF_Path_cF4cXyz.s
-23
View File
@@ -1,23 +0,0 @@
lbl_80150A24:
/* 80150A24 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80150A28 7C 08 02 A6 */ mflr r0
/* 80150A2C 90 01 00 24 */ stw r0, 0x24(r1)
/* 80150A30 7C 68 1B 78 */ mr r8, r3
/* 80150A34 C0 04 00 00 */ lfs f0, 0(r4)
/* 80150A38 D0 01 00 08 */ stfs f0, 8(r1)
/* 80150A3C C0 04 00 04 */ lfs f0, 4(r4)
/* 80150A40 D0 01 00 0C */ stfs f0, 0xc(r1)
/* 80150A44 C0 04 00 08 */ lfs f0, 8(r4)
/* 80150A48 D0 01 00 10 */ stfs f0, 0x10(r1)
/* 80150A4C 80 C3 00 04 */ lwz r6, 4(r3)
/* 80150A50 38 61 00 08 */ addi r3, r1, 8
/* 80150A54 80 86 00 08 */ lwz r4, 8(r6)
/* 80150A58 A0 A8 00 00 */ lhz r5, 0(r8)
/* 80150A5C A0 C6 00 00 */ lhz r6, 0(r6)
/* 80150A60 88 E8 00 03 */ lbz r7, 3(r8)
/* 80150A64 89 08 00 02 */ lbz r8, 2(r8)
/* 80150A68 48 00 43 F5 */ bl daNpcF_chkPassed__F4cXyzP4dPntUsUsii
/* 80150A6C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80150A70 7C 08 03 A6 */ mtlr r0
/* 80150A74 38 21 00 20 */ addi r1, r1, 0x20
/* 80150A78 4E 80 00 20 */ blr
asm/d/a/d_a_npc/chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs.s
-31
View File
@@ -1,31 +0,0 @@
lbl_801548F4:
/* 801548F4 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 801548F8 7C 08 02 A6 */ mflr r0
/* 801548FC 90 01 00 34 */ stw r0, 0x34(r1)
/* 80154900 C0 04 00 00 */ lfs f0, 0(r4)
/* 80154904 D0 01 00 20 */ stfs f0, 0x20(r1)
/* 80154908 C0 04 00 04 */ lfs f0, 4(r4)
/* 8015490C D0 01 00 24 */ stfs f0, 0x24(r1)
/* 80154910 C0 04 00 08 */ lfs f0, 8(r4)
/* 80154914 D0 01 00 28 */ stfs f0, 0x28(r1)
/* 80154918 C0 05 00 00 */ lfs f0, 0(r5)
/* 8015491C D0 01 00 14 */ stfs f0, 0x14(r1)
/* 80154920 C0 05 00 04 */ lfs f0, 4(r5)
/* 80154924 D0 01 00 18 */ stfs f0, 0x18(r1)
/* 80154928 C0 05 00 08 */ lfs f0, 8(r5)
/* 8015492C D0 01 00 1C */ stfs f0, 0x1c(r1)
/* 80154930 C0 06 00 00 */ lfs f0, 0(r6)
/* 80154934 D0 01 00 08 */ stfs f0, 8(r1)
/* 80154938 C0 06 00 04 */ lfs f0, 4(r6)
/* 8015493C D0 01 00 0C */ stfs f0, 0xc(r1)
/* 80154940 C0 06 00 08 */ lfs f0, 8(r6)
/* 80154944 D0 01 00 10 */ stfs f0, 0x10(r1)
/* 80154948 38 61 00 20 */ addi r3, r1, 0x20
/* 8015494C 38 81 00 14 */ addi r4, r1, 0x14
/* 80154950 38 A1 00 08 */ addi r5, r1, 8
/* 80154954 7C E6 3B 78 */ mr r6, r7
/* 80154958 48 00 10 11 */ bl daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs
/* 8015495C 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80154960 7C 08 03 A6 */ mtlr r0
/* 80154964 38 21 00 30 */ addi r1, r1, 0x30
/* 80154968 4E 80 00 20 */ blr
asm/d/a/d_a_npc/ctrlFaceMotion__8daNpcT_cFv.s
-48
View File
@@ -1,48 +0,0 @@
lbl_8014924C:
/* 8014924C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80149250 7C 08 02 A6 */ mflr r0
/* 80149254 90 01 00 24 */ stw r0, 0x24(r1)
/* 80149258 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 8014925C 7C 7F 1B 78 */ mr r31, r3
/* 80149260 38 7F 0B 50 */ addi r3, r31, 0xb50
/* 80149264 A0 9F 0E 20 */ lhz r4, 0xe20(r31)
/* 80149268 38 A1 00 0C */ addi r5, r1, 0xc
/* 8014926C 38 C1 00 08 */ addi r6, r1, 8
/* 80149270 4B FF C6 51 */ bl play__22daNpcT_MotionSeqMngr_cFUsPiPf
/* 80149274 2C 03 00 00 */ cmpwi r3, 0
/* 80149278 41 82 00 74 */ beq lbl_801492EC
/* 8014927C 7F E3 FB 78 */ mr r3, r31
/* 80149280 80 81 00 0C */ lwz r4, 0xc(r1)
/* 80149284 38 A0 00 01 */ li r5, 1
/* 80149288 48 00 11 01 */ bl setFaceMotionAnm__8daNpcT_cFib
/* 8014928C C0 21 00 08 */ lfs f1, 8(r1)
/* 80149290 C0 02 99 D8 */ lfs f0, lit_4116(r2)
/* 80149294 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 80149298 40 80 00 30 */ bge lbl_801492C8
/* 8014929C 80 7F 05 78 */ lwz r3, 0x578(r31)
/* 801492A0 C0 3F 0A 80 */ lfs f1, 0xa80(r31)
/* 801492A4 4B EC 68 D9 */ bl setMorf__13mDoExt_morf_cFf
/* 801492A8 C0 1F 0A 80 */ lfs f0, 0xa80(r31)
/* 801492AC D0 1F 0D FC */ stfs f0, 0xdfc(r31)
/* 801492B0 80 7F 05 7C */ lwz r3, 0x57c(r31)
/* 801492B4 28 03 00 00 */ cmplwi r3, 0
/* 801492B8 41 82 00 34 */ beq lbl_801492EC
/* 801492BC C0 3F 0A 80 */ lfs f1, 0xa80(r31)
/* 801492C0 4B EC 68 BD */ bl setMorf__13mDoExt_morf_cFf
/* 801492C4 48 00 00 28 */ b lbl_801492EC
lbl_801492C8:
/* 801492C8 80 7F 05 78 */ lwz r3, 0x578(r31)
/* 801492CC 4B EC 68 B1 */ bl setMorf__13mDoExt_morf_cFf
/* 801492D0 C0 01 00 08 */ lfs f0, 8(r1)
/* 801492D4 D0 1F 0D FC */ stfs f0, 0xdfc(r31)
/* 801492D8 80 7F 05 7C */ lwz r3, 0x57c(r31)
/* 801492DC 28 03 00 00 */ cmplwi r3, 0
/* 801492E0 41 82 00 0C */ beq lbl_801492EC
/* 801492E4 C0 21 00 08 */ lfs f1, 8(r1)
/* 801492E8 4B EC 68 95 */ bl setMorf__13mDoExt_morf_cFf
lbl_801492EC:
/* 801492EC 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 801492F0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801492F4 7C 08 03 A6 */ mtlr r0
/* 801492F8 38 21 00 20 */ addi r1, r1, 0x20
/* 801492FC 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daBaseNpc_decIdx__FiPUsii.s
-26
View File
@@ -1,26 +0,0 @@
lbl_8014D620:
/* 8014D620 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8014D624 7C 08 02 A6 */ mflr r0
/* 8014D628 90 01 00 14 */ stw r0, 0x14(r1)
/* 8014D62C 7C 68 1B 78 */ mr r8, r3
/* 8014D630 7C 87 23 78 */ mr r7, r4
/* 8014D634 7C A0 2B 78 */ mr r0, r5
/* 8014D638 2C 06 00 00 */ cmpwi r6, 0
/* 8014D63C 40 80 00 1C */ bge lbl_8014D658
/* 8014D640 38 60 00 01 */ li r3, 1
/* 8014D644 7D 04 43 78 */ mr r4, r8
/* 8014D648 7C E5 3B 78 */ mr r5, r7
/* 8014D64C 7C 06 03 78 */ mr r6, r0
/* 8014D650 4B FF FE E9 */ bl daBaseNpc_addIdx__FiiPUsi
/* 8014D654 48 00 00 18 */ b lbl_8014D66C
lbl_8014D658:
/* 8014D658 38 60 00 01 */ li r3, 1
/* 8014D65C 7D 04 43 78 */ mr r4, r8
/* 8014D660 7C E5 3B 78 */ mr r5, r7
/* 8014D664 7C 06 03 78 */ mr r6, r0
/* 8014D668 4B FF FF 1D */ bl daBaseNpc_subIdx__FiiPUsi
lbl_8014D66C:
/* 8014D66C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8014D670 7C 08 03 A6 */ mtlr r0
/* 8014D674 38 21 00 10 */ addi r1, r1, 0x10
/* 8014D678 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daBaseNpc_incIdx__FiPUsii.s
-26
View File
@@ -1,26 +0,0 @@
lbl_8014D5C4:
/* 8014D5C4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8014D5C8 7C 08 02 A6 */ mflr r0
/* 8014D5CC 90 01 00 14 */ stw r0, 0x14(r1)
/* 8014D5D0 7C 68 1B 78 */ mr r8, r3
/* 8014D5D4 7C 87 23 78 */ mr r7, r4
/* 8014D5D8 7C A0 2B 78 */ mr r0, r5
/* 8014D5DC 2C 06 00 00 */ cmpwi r6, 0
/* 8014D5E0 40 80 00 1C */ bge lbl_8014D5FC
/* 8014D5E4 38 60 00 01 */ li r3, 1
/* 8014D5E8 7D 04 43 78 */ mr r4, r8
/* 8014D5EC 7C E5 3B 78 */ mr r5, r7
/* 8014D5F0 7C 06 03 78 */ mr r6, r0
/* 8014D5F4 4B FF FF 91 */ bl daBaseNpc_subIdx__FiiPUsi
/* 8014D5F8 48 00 00 18 */ b lbl_8014D610
lbl_8014D5FC:
/* 8014D5FC 38 60 00 01 */ li r3, 1
/* 8014D600 7D 04 43 78 */ mr r4, r8
/* 8014D604 7C E5 3B 78 */ mr r5, r7
/* 8014D608 7C 06 03 78 */ mr r6, r0
/* 8014D60C 4B FF FF 2D */ bl daBaseNpc_addIdx__FiiPUsi
lbl_8014D610:
/* 8014D610 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8014D614 7C 08 03 A6 */ mtlr r0
/* 8014D618 38 21 00 10 */ addi r1, r1, 0x10
/* 8014D61C 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daNpcF_addIdx__FiiRUsi.s
-19
View File
@@ -1,19 +0,0 @@
lbl_8015056C:
/* 8015056C 38 E0 00 00 */ li r7, 0
/* 80150570 A1 05 00 00 */ lhz r8, 0(r5)
/* 80150574 7D 08 1A 14 */ add r8, r8, r3
/* 80150578 7C 04 40 00 */ cmpw r4, r8
/* 8015057C 41 81 00 24 */ bgt lbl_801505A0
/* 80150580 2C 06 00 00 */ cmpwi r6, 0
/* 80150584 41 82 00 14 */ beq lbl_80150598
/* 80150588 7C 08 23 D6 */ divw r0, r8, r4
/* 8015058C 7C 00 21 D6 */ mullw r0, r0, r4
/* 80150590 7D 00 40 50 */ subf r8, r0, r8
/* 80150594 48 00 00 0C */ b lbl_801505A0
lbl_80150598:
/* 80150598 39 04 FF FF */ addi r8, r4, -1
/* 8015059C 38 E0 00 01 */ li r7, 1
lbl_801505A0:
/* 801505A0 B1 05 00 00 */ sth r8, 0(r5)
/* 801505A4 7C E3 3B 78 */ mr r3, r7
/* 801505A8 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daNpcF_chkDoBtnEqSpeak__FP10fopAc_ac_c.s
-77
View File
@@ -1,77 +0,0 @@
lbl_80155854:
/* 80155854 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80155858 7C 08 02 A6 */ mflr r0
/* 8015585C 90 01 00 24 */ stw r0, 0x24(r1)
/* 80155860 39 61 00 20 */ addi r11, r1, 0x20
/* 80155864 48 20 C9 75 */ bl _savegpr_28
/* 80155868 7C 7C 1B 78 */ mr r28, r3
/* 8015586C 3B C0 00 00 */ li r30, 0
/* 80155870 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80155874 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80155878 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 8015587C 7F 84 E3 78 */ mr r4, r28
/* 80155880 81 83 06 28 */ lwz r12, 0x628(r3)
/* 80155884 81 8C 01 D8 */ lwz r12, 0x1d8(r12)
/* 80155888 7D 89 03 A6 */ mtctr r12
/* 8015588C 4E 80 04 21 */ bctrl
/* 80155890 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80155894 41 82 00 B8 */ beq lbl_8015594C
/* 80155898 3B A0 00 00 */ li r29, 0
/* 8015589C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801558A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801558A4 3B E3 56 B8 */ addi r31, r3, 0x56b8
/* 801558A8 48 00 00 44 */ b lbl_801558EC
lbl_801558AC:
/* 801558AC 7F E3 FB 78 */ mr r3, r31
/* 801558B0 7F A4 EB 78 */ mr r4, r29
/* 801558B4 4B F1 DE 81 */ bl ActionTarget__12dAttention_cFl
/* 801558B8 7C 03 E0 40 */ cmplw r3, r28
/* 801558BC 40 82 00 2C */ bne lbl_801558E8
/* 801558C0 7F E3 FB 78 */ mr r3, r31
/* 801558C4 4B F1 AF BD */ bl getActionBtnB__12dAttention_cFv
/* 801558C8 28 03 00 00 */ cmplwi r3, 0
/* 801558CC 41 82 00 1C */ beq lbl_801558E8
/* 801558D0 7F E3 FB 78 */ mr r3, r31
/* 801558D4 4B F1 AF AD */ bl getActionBtnB__12dAttention_cFv
/* 801558D8 80 03 00 0C */ lwz r0, 0xc(r3)
/* 801558DC 28 00 00 03 */ cmplwi r0, 3
/* 801558E0 40 82 00 08 */ bne lbl_801558E8
/* 801558E4 3B C0 00 01 */ li r30, 1
lbl_801558E8:
/* 801558E8 3B BD 00 01 */ addi r29, r29, 1
lbl_801558EC:
/* 801558EC 80 1F 04 30 */ lwz r0, 0x430(r31)
/* 801558F0 7C 1D 00 00 */ cmpw r29, r0
/* 801558F4 41 80 FF B8 */ blt lbl_801558AC
/* 801558F8 3B A0 00 00 */ li r29, 0
/* 801558FC 48 00 00 44 */ b lbl_80155940
lbl_80155900:
/* 80155900 7F E3 FB 78 */ mr r3, r31
/* 80155904 7F A4 EB 78 */ mr r4, r29
/* 80155908 4B F1 DC 35 */ bl LockonTarget__12dAttention_cFl
/* 8015590C 7C 03 E0 40 */ cmplw r3, r28
/* 80155910 40 82 00 2C */ bne lbl_8015593C
/* 80155914 7F E3 FB 78 */ mr r3, r31
/* 80155918 4B F1 AF 69 */ bl getActionBtnB__12dAttention_cFv
/* 8015591C 28 03 00 00 */ cmplwi r3, 0
/* 80155920 41 82 00 1C */ beq lbl_8015593C
/* 80155924 7F E3 FB 78 */ mr r3, r31
/* 80155928 4B F1 AF 59 */ bl getActionBtnB__12dAttention_cFv
/* 8015592C 80 03 00 0C */ lwz r0, 0xc(r3)
/* 80155930 28 00 00 01 */ cmplwi r0, 1
/* 80155934 40 82 00 08 */ bne lbl_8015593C
/* 80155938 3B C0 00 01 */ li r30, 1
lbl_8015593C:
/* 8015593C 3B BD 00 01 */ addi r29, r29, 1
lbl_80155940:
/* 80155940 80 1F 03 D8 */ lwz r0, 0x3d8(r31)
/* 80155944 7C 1D 00 00 */ cmpw r29, r0
/* 80155948 41 80 FF B8 */ blt lbl_80155900
lbl_8015594C:
/* 8015594C 7F C3 F3 78 */ mr r3, r30
/* 80155950 39 61 00 20 */ addi r11, r1, 0x20
/* 80155954 48 20 C8 D1 */ bl _restgpr_28
/* 80155958 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8015595C 7C 08 03 A6 */ mtlr r0
/* 80155960 38 21 00 20 */ addi r1, r1, 0x20
/* 80155964 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daNpcF_chkEvtBit__FUl.s
-17
View File
@@ -1,17 +0,0 @@
lbl_80155634:
/* 80155634 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80155638 7C 08 02 A6 */ mflr r0
/* 8015563C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80155640 7C 60 1B 78 */ mr r0, r3
/* 80155644 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80155648 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8015564C 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 80155650 54 00 08 3C */ slwi r0, r0, 1
/* 80155654 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80155658 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 8015565C 7C 84 02 2E */ lhzx r4, r4, r0
/* 80155660 4B ED F3 5D */ bl isEventBit__11dSv_event_cCFUs
/* 80155664 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80155668 7C 08 03 A6 */ mtlr r0
/* 8015566C 38 21 00 10 */ addi r1, r1, 0x10
/* 80155670 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs.s
-95
View File
@@ -1,95 +0,0 @@
lbl_80155968:
/* 80155968 94 21 FF 80 */ stwu r1, -0x80(r1)
/* 8015596C 7C 08 02 A6 */ mflr r0
/* 80155970 90 01 00 84 */ stw r0, 0x84(r1)
/* 80155974 DB E1 00 70 */ stfd f31, 0x70(r1)
/* 80155978 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */
/* 8015597C DB C1 00 60 */ stfd f30, 0x60(r1)
/* 80155980 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */
/* 80155984 DB A1 00 50 */ stfd f29, 0x50(r1)
/* 80155988 F3 A1 00 58 */ psq_st f29, 88(r1), 0, 0 /* qr0 */
/* 8015598C DB 81 00 40 */ stfd f28, 0x40(r1)
/* 80155990 F3 81 00 48 */ psq_st f28, 72(r1), 0, 0 /* qr0 */
/* 80155994 39 61 00 40 */ addi r11, r1, 0x40
/* 80155998 48 20 C8 45 */ bl _savegpr_29
/* 8015599C 7C 7D 1B 78 */ mr r29, r3
/* 801559A0 7C 9E 23 78 */ mr r30, r4
/* 801559A4 7C BF 2B 78 */ mr r31, r5
/* 801559A8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 801559AC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 801559B0 7C 06 00 D0 */ neg r0, r6
/* 801559B4 7C 04 07 34 */ extsh r4, r0
/* 801559B8 4B EB 6A 25 */ bl mDoMtx_YrotS__FPA4_fs
/* 801559BC C0 1E 00 00 */ lfs f0, 0(r30)
/* 801559C0 FC 20 00 50 */ fneg f1, f0
/* 801559C4 C0 1E 00 04 */ lfs f0, 4(r30)
/* 801559C8 FC 40 00 50 */ fneg f2, f0
/* 801559CC C0 1E 00 08 */ lfs f0, 8(r30)
/* 801559D0 FC 60 00 50 */ fneg f3, f0
/* 801559D4 4B EB 73 C9 */ bl transM__14mDoMtx_stack_cFfff
/* 801559D8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 801559DC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 801559E0 7F A4 EB 78 */ mr r4, r29
/* 801559E4 38 A1 00 20 */ addi r5, r1, 0x20
/* 801559E8 48 1F 13 85 */ bl PSMTXMultVec
/* 801559EC C0 1F 00 00 */ lfs f0, 0(r31)
/* 801559F0 FC 00 02 10 */ fabs f0, f0
/* 801559F4 FF E0 00 18 */ frsp f31, f0
/* 801559F8 C0 1F 00 08 */ lfs f0, 8(r31)
/* 801559FC FC 00 02 10 */ fabs f0, f0
/* 80155A00 FF C0 00 18 */ frsp f30, f0
/* 80155A04 C0 01 00 20 */ lfs f0, 0x20(r1)
/* 80155A08 FC 00 02 10 */ fabs f0, f0
/* 80155A0C FF A0 00 18 */ frsp f29, f0
/* 80155A10 C0 01 00 28 */ lfs f0, 0x28(r1)
/* 80155A14 FC 00 02 10 */ fabs f0, f0
/* 80155A18 FF 80 00 18 */ frsp f28, f0
/* 80155A1C 38 61 00 08 */ addi r3, r1, 8
/* 80155A20 7F C4 F3 78 */ mr r4, r30
/* 80155A24 7F A5 EB 78 */ mr r5, r29
/* 80155A28 48 11 11 0D */ bl __mi__4cXyzCFRC3Vec
/* 80155A2C C0 01 00 08 */ lfs f0, 8(r1)
/* 80155A30 D0 01 00 14 */ stfs f0, 0x14(r1)
/* 80155A34 C0 21 00 0C */ lfs f1, 0xc(r1)
/* 80155A38 D0 21 00 18 */ stfs f1, 0x18(r1)
/* 80155A3C C0 01 00 10 */ lfs f0, 0x10(r1)
/* 80155A40 D0 01 00 1C */ stfs f0, 0x1c(r1)
/* 80155A44 C0 5F 00 04 */ lfs f2, 4(r31)
/* 80155A48 FC 00 10 50 */ fneg f0, f2
/* 80155A4C FC 01 00 40 */ fcmpo cr0, f1, f0
/* 80155A50 4C 40 13 82 */ cror 2, 0, 2
/* 80155A54 41 82 00 10 */ beq lbl_80155A64
/* 80155A58 FC 02 08 40 */ fcmpo cr0, f2, f1
/* 80155A5C 4C 40 13 82 */ cror 2, 0, 2
/* 80155A60 40 82 00 0C */ bne lbl_80155A6C
lbl_80155A64:
/* 80155A64 38 60 00 00 */ li r3, 0
/* 80155A68 48 00 00 34 */ b lbl_80155A9C
lbl_80155A6C:
/* 80155A6C EC 3D 07 72 */ fmuls f1, f29, f29
/* 80155A70 EC 1F 07 F2 */ fmuls f0, f31, f31
/* 80155A74 EC 41 00 24 */ fdivs f2, f1, f0
/* 80155A78 EC 3C 07 32 */ fmuls f1, f28, f28
/* 80155A7C EC 1E 07 B2 */ fmuls f0, f30, f30
/* 80155A80 EC 01 00 24 */ fdivs f0, f1, f0
/* 80155A84 EC 22 00 2A */ fadds f1, f2, f0
/* 80155A88 C0 02 99 DC */ lfs f0, lit_4140(r2)
/* 80155A8C FC 01 00 40 */ fcmpo cr0, f1, f0
/* 80155A90 4C 40 13 82 */ cror 2, 0, 2
/* 80155A94 7C 00 00 26 */ mfcr r0
/* 80155A98 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f
lbl_80155A9C:
/* 80155A9C E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */
/* 80155AA0 CB E1 00 70 */ lfd f31, 0x70(r1)
/* 80155AA4 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */
/* 80155AA8 CB C1 00 60 */ lfd f30, 0x60(r1)
/* 80155AAC E3 A1 00 58 */ psq_l f29, 88(r1), 0, 0 /* qr0 */
/* 80155AB0 CB A1 00 50 */ lfd f29, 0x50(r1)
/* 80155AB4 E3 81 00 48 */ psq_l f28, 72(r1), 0, 0 /* qr0 */
/* 80155AB8 CB 81 00 40 */ lfd f28, 0x40(r1)
/* 80155ABC 39 61 00 40 */ addi r11, r1, 0x40
/* 80155AC0 48 20 C7 69 */ bl _restgpr_29
/* 80155AC4 80 01 00 84 */ lwz r0, 0x84(r1)
/* 80155AC8 7C 08 03 A6 */ mtlr r0
/* 80155ACC 38 21 00 80 */ addi r1, r1, 0x80
/* 80155AD0 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daNpcF_chkTmpBit__FUl.s
-17
View File
@@ -1,17 +0,0 @@
lbl_801556B4:
/* 801556B4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801556B8 7C 08 02 A6 */ mflr r0
/* 801556BC 90 01 00 14 */ stw r0, 0x14(r1)
/* 801556C0 7C 60 1B 78 */ mr r0, r3
/* 801556C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801556C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801556CC 38 63 0D D8 */ addi r3, r3, 0xdd8
/* 801556D0 54 00 08 3C */ slwi r0, r0, 1
/* 801556D4 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */
/* 801556D8 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */
/* 801556DC 7C 84 02 2E */ lhzx r4, r4, r0
/* 801556E0 4B ED F2 DD */ bl isEventBit__11dSv_event_cCFUs
/* 801556E4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801556E8 7C 08 03 A6 */ mtlr r0
/* 801556EC 38 21 00 10 */ addi r1, r1, 0x10
/* 801556F0 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daNpcF_clearMessageTmpBit__Fv.s
-28
View File
@@ -1,28 +0,0 @@
lbl_80155AE8:
/* 80155AE8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80155AEC 7C 08 02 A6 */ mflr r0
/* 80155AF0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80155AF4 38 60 00 0B */ li r3, 0xb
/* 80155AF8 4B FF FC 3D */ bl daNpcF_offTmpBit__FUl
/* 80155AFC 38 60 00 0C */ li r3, 0xc
/* 80155B00 4B FF FC 35 */ bl daNpcF_offTmpBit__FUl
/* 80155B04 38 60 00 0D */ li r3, 0xd
/* 80155B08 4B FF FC 2D */ bl daNpcF_offTmpBit__FUl
/* 80155B0C 38 60 00 0E */ li r3, 0xe
/* 80155B10 4B FF FC 25 */ bl daNpcF_offTmpBit__FUl
/* 80155B14 38 60 00 0F */ li r3, 0xf
/* 80155B18 4B FF FC 1D */ bl daNpcF_offTmpBit__FUl
/* 80155B1C 38 60 00 33 */ li r3, 0x33
/* 80155B20 4B FF FC 15 */ bl daNpcF_offTmpBit__FUl
/* 80155B24 38 60 00 34 */ li r3, 0x34
/* 80155B28 4B FF FC 0D */ bl daNpcF_offTmpBit__FUl
/* 80155B2C 38 60 00 35 */ li r3, 0x35
/* 80155B30 4B FF FC 05 */ bl daNpcF_offTmpBit__FUl
/* 80155B34 38 60 00 36 */ li r3, 0x36
/* 80155B38 4B FF FB FD */ bl daNpcF_offTmpBit__FUl
/* 80155B3C 38 60 00 37 */ li r3, 0x37
/* 80155B40 4B FF FB F5 */ bl daNpcF_offTmpBit__FUl
/* 80155B44 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80155B48 7C 08 03 A6 */ mtlr r0
/* 80155B4C 38 21 00 10 */ addi r1, r1, 0x10
/* 80155B50 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daNpcF_decIdx__FiRUsii.s
-26
View File
@@ -1,26 +0,0 @@
lbl_80150654:
/* 80150654 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80150658 7C 08 02 A6 */ mflr r0
/* 8015065C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80150660 7C 68 1B 78 */ mr r8, r3
/* 80150664 7C 87 23 78 */ mr r7, r4
/* 80150668 7C A0 2B 78 */ mr r0, r5
/* 8015066C 2C 06 00 00 */ cmpwi r6, 0
/* 80150670 41 82 00 1C */ beq lbl_8015068C
/* 80150674 38 60 00 01 */ li r3, 1
/* 80150678 7D 04 43 78 */ mr r4, r8
/* 8015067C 7C E5 3B 78 */ mr r5, r7
/* 80150680 7C 06 03 78 */ mr r6, r0
/* 80150684 4B FF FE E9 */ bl daNpcF_addIdx__FiiRUsi
/* 80150688 48 00 00 18 */ b lbl_801506A0
lbl_8015068C:
/* 8015068C 38 60 00 01 */ li r3, 1
/* 80150690 7D 04 43 78 */ mr r4, r8
/* 80150694 7C E5 3B 78 */ mr r5, r7
/* 80150698 7C 06 03 78 */ mr r6, r0
/* 8015069C 4B FF FF 11 */ bl daNpcF_subIdx__FiiRUsi
lbl_801506A0:
/* 801506A0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801506A4 7C 08 03 A6 */ mtlr r0
/* 801506A8 38 21 00 10 */ addi r1, r1, 0x10
/* 801506AC 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daNpcF_getDistTableIdx__Fii.s
-6
View File
@@ -1,6 +0,0 @@
lbl_80155AD4:
/* 80155AD4 1C 84 00 14 */ mulli r4, r4, 0x14
/* 80155AD8 38 04 00 5E */ addi r0, r4, 0x5e
/* 80155ADC 7C 03 02 14 */ add r0, r3, r0
/* 80155AE0 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 80155AE4 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daNpcF_incIdx__FiRUsii.s
-26
View File
@@ -1,26 +0,0 @@
lbl_801505F8:
/* 801505F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801505FC 7C 08 02 A6 */ mflr r0
/* 80150600 90 01 00 14 */ stw r0, 0x14(r1)
/* 80150604 7C 68 1B 78 */ mr r8, r3
/* 80150608 7C 87 23 78 */ mr r7, r4
/* 8015060C 7C A0 2B 78 */ mr r0, r5
/* 80150610 2C 06 00 00 */ cmpwi r6, 0
/* 80150614 41 82 00 1C */ beq lbl_80150630
/* 80150618 38 60 00 01 */ li r3, 1
/* 8015061C 7D 04 43 78 */ mr r4, r8
/* 80150620 7C E5 3B 78 */ mr r5, r7
/* 80150624 7C 06 03 78 */ mr r6, r0
/* 80150628 4B FF FF 85 */ bl daNpcF_subIdx__FiiRUsi
/* 8015062C 48 00 00 18 */ b lbl_80150644
lbl_80150630:
/* 80150630 38 60 00 01 */ li r3, 1
/* 80150634 7D 04 43 78 */ mr r4, r8
/* 80150638 7C E5 3B 78 */ mr r5, r7
/* 8015063C 7C 06 03 78 */ mr r6, r0
/* 80150640 4B FF FF 2D */ bl daNpcF_addIdx__FiiRUsi
lbl_80150644:
/* 80150644 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80150648 7C 08 03 A6 */ mtlr r0
/* 8015064C 38 21 00 10 */ addi r1, r1, 0x10
/* 80150650 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daNpcF_offTmpBit__FUl.s
-17
View File
@@ -1,17 +0,0 @@
lbl_80155734:
/* 80155734 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80155738 7C 08 02 A6 */ mflr r0
/* 8015573C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80155740 7C 60 1B 78 */ mr r0, r3
/* 80155744 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80155748 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8015574C 38 63 0D D8 */ addi r3, r3, 0xdd8
/* 80155750 54 00 08 3C */ slwi r0, r0, 1
/* 80155754 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */
/* 80155758 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */
/* 8015575C 7C 84 02 2E */ lhzx r4, r4, r0
/* 80155760 4B ED F2 45 */ bl offEventBit__11dSv_event_cFUs
/* 80155764 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80155768 7C 08 03 A6 */ mtlr r0
/* 8015576C 38 21 00 10 */ addi r1, r1, 0x10
/* 80155770 4E 80 00 20 */ blr
asm/d/a/d_a_npc/daNpcF_onEvtBit__FUl.s
-17
View File
@@ -1,17 +0,0 @@
lbl_80155674:
/* 80155674 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80155678 7C 08 02 A6 */ mflr r0
/* 8015567C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80155680 7C 60 1B 78 */ mr r0, r3
/* 80155684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80155688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8015568C 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 80155690 54 00 08 3C */ slwi r0, r0, 1
/* 80155694 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80155698 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 8015569C 7C 84 02 2E */ lhzx r4, r4, r0
/* 801556A0 4B ED F2 ED */ bl onEventBit__11dSv_event_cFUs
/* 801556A4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801556A8 7C 08 03 A6 */ mtlr r0
/* 801556AC 38 21 00 10 */ addi r1, r1, 0x10
/* 801556B0 4E 80 00 20 */ blr

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