mirror of https://github.com/zeldaret/tp.git
Match all funcs in d_menu_ring (#2113)
* d_menu_ring OK but something is not matchin * at least matching without NONMATCHING again * add note * some docs about items * fix i_nameID and i_expID * revert my setBlackWhite change * remove unused asm * update progress * m_Do_graphic functions match but I'm not able to remove data
This commit is contained in:
Trueffel
GitHub
parent
99facf7c94
commit
9f46b4bea2
|
|
@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
|
|||
.init | 97.972973% | 9280 | 9472
|
||||
.extab | 100.000000% | 96 | 96
|
||||
.extabindex | 100.000000% | 96 | 96
|
||||
.text | 47.495929% | 1708212 | 3596544
|
||||
.text | 47.553652% | 1710288 | 3596544
|
||||
.ctors | 100.000000% | 448 | 448
|
||||
.dtors | 100.000000% | 32 | 32
|
||||
.rodata | 100.000000% | 193856 | 193856
|
||||
.data | 100.000000% | 197632 | 197632
|
||||
.sdata | 100.000000% | 1408 | 1408
|
||||
.sdata2 | 100.000000% | 20832 | 20832
|
||||
Total | 53.029643% | 2132148 | 4020672
|
||||
Total | 53.081276% | 2134224 | 4020672
|
||||
|
||||
## Total
|
||||
|
||||
Section | Percentage | Decompiled (bytes) | Total (bytes)
|
||||
---|---|---|---
|
||||
main.dol | 53.029643% | 2132148 | 4020672
|
||||
main.dol | 53.081276% | 2134224 | 4020672
|
||||
RELs | 37.015931% | 4256952 | 11500324
|
||||
Total | 41.164240% | 6389100 | 15520996
|
||||
Total | 41.177615% | 6391176 | 15520996
|
||||
|
||||
## RELs
|
||||
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
lbl_80339878:
|
||||
/* 80339878 3C E0 80 44 */ lis r7, sincosTable___5JMath@ha /* 0x80439A20@ha */
|
||||
/* 8033987C 38 E7 9A 20 */ addi r7, r7, sincosTable___5JMath@l /* 0x80439A20@l */
|
||||
/* 80339880 39 07 00 04 */ addi r8, r7, 4
|
||||
/* 80339884 7C 60 07 34 */ extsh r0, r3
|
||||
/* 80339888 7C 00 0E 70 */ srawi r0, r0, 1
|
||||
/* 8033988C 7C 00 01 94 */ addze r0, r0
|
||||
/* 80339890 54 00 04 3E */ clrlwi r0, r0, 0x10
|
||||
/* 80339894 7C 00 1E 70 */ srawi r0, r0, 3
|
||||
/* 80339898 54 03 18 38 */ slwi r3, r0, 3
|
||||
/* 8033989C 7C 48 1C 2E */ lfsx f2, r8, r3
|
||||
/* 803398A0 7C 80 07 34 */ extsh r0, r4
|
||||
/* 803398A4 7C 00 0E 70 */ srawi r0, r0, 1
|
||||
/* 803398A8 7C 00 01 94 */ addze r0, r0
|
||||
/* 803398AC 54 00 04 3E */ clrlwi r0, r0, 0x10
|
||||
/* 803398B0 7C 00 1E 70 */ srawi r0, r0, 3
|
||||
/* 803398B4 54 04 18 38 */ slwi r4, r0, 3
|
||||
/* 803398B8 7C 68 24 2E */ lfsx f3, r8, r4
|
||||
/* 803398BC 7C A0 07 34 */ extsh r0, r5
|
||||
/* 803398C0 7C 00 0E 70 */ srawi r0, r0, 1
|
||||
/* 803398C4 7C 00 01 94 */ addze r0, r0
|
||||
/* 803398C8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c
|
||||
/* 803398CC 7C 88 04 2E */ lfsx f4, r8, r0
|
||||
/* 803398D0 7C A7 1C 2E */ lfsx f5, r7, r3
|
||||
/* 803398D4 7C C7 24 2E */ lfsx f6, r7, r4
|
||||
/* 803398D8 7C E7 04 2E */ lfsx f7, r7, r0
|
||||
/* 803398DC ED 03 01 32 */ fmuls f8, f3, f4
|
||||
/* 803398E0 ED 26 01 F2 */ fmuls f9, f6, f7
|
||||
/* 803398E4 EC 22 02 32 */ fmuls f1, f2, f8
|
||||
/* 803398E8 EC 05 02 72 */ fmuls f0, f5, f9
|
||||
/* 803398EC EC 01 00 2A */ fadds f0, f1, f0
|
||||
/* 803398F0 D0 06 00 0C */ stfs f0, 0xc(r6)
|
||||
/* 803398F4 EC 25 02 32 */ fmuls f1, f5, f8
|
||||
/* 803398F8 EC 02 02 72 */ fmuls f0, f2, f9
|
||||
/* 803398FC EC 01 00 28 */ fsubs f0, f1, f0
|
||||
/* 80339900 D0 06 00 00 */ stfs f0, 0(r6)
|
||||
/* 80339904 EC 02 01 B2 */ fmuls f0, f2, f6
|
||||
/* 80339908 EC 24 00 32 */ fmuls f1, f4, f0
|
||||
/* 8033990C EC 05 00 F2 */ fmuls f0, f5, f3
|
||||
/* 80339910 EC 07 00 32 */ fmuls f0, f7, f0
|
||||
/* 80339914 EC 01 00 2A */ fadds f0, f1, f0
|
||||
/* 80339918 D0 06 00 04 */ stfs f0, 4(r6)
|
||||
/* 8033991C EC 02 00 F2 */ fmuls f0, f2, f3
|
||||
/* 80339920 EC 27 00 32 */ fmuls f1, f7, f0
|
||||
/* 80339924 EC 05 01 B2 */ fmuls f0, f5, f6
|
||||
/* 80339928 EC 04 00 32 */ fmuls f0, f4, f0
|
||||
/* 8033992C EC 01 00 28 */ fsubs f0, f1, f0
|
||||
/* 80339930 D0 06 00 08 */ stfs f0, 8(r6)
|
||||
/* 80339934 4E 80 00 20 */ blr
|
||||
|
|
@ -1,292 +0,0 @@
|
|||
lbl_801EE228:
|
||||
/* 801EE228 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 801EE22C 7C 08 02 A6 */ mflr r0
|
||||
/* 801EE230 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 801EE234 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 801EE238 48 17 3F A1 */ bl _savegpr_28
|
||||
/* 801EE23C 7C 7D 1B 78 */ mr r29, r3
|
||||
/* 801EE240 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE244 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE248 38 80 00 00 */ li r4, 0
|
||||
/* 801EE24C 4B E4 48 11 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
|
||||
/* 801EE250 7C 60 1B 78 */ mr r0, r3
|
||||
/* 801EE254 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE258 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE25C 3B 83 00 9C */ addi r28, r3, 0x9c
|
||||
/* 801EE260 7F 83 E3 78 */ mr r3, r28
|
||||
/* 801EE264 54 04 06 3E */ clrlwi r4, r0, 0x18
|
||||
/* 801EE268 38 A0 00 00 */ li r5, 0
|
||||
/* 801EE26C 4B E4 4D C5 */ bl getItem__17dSv_player_item_cCFib
|
||||
/* 801EE270 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 801EE274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE27C 38 80 00 01 */ li r4, 1
|
||||
/* 801EE280 4B E4 47 DD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
|
||||
/* 801EE284 7C 60 1B 78 */ mr r0, r3
|
||||
/* 801EE288 7F 83 E3 78 */ mr r3, r28
|
||||
/* 801EE28C 54 04 06 3E */ clrlwi r4, r0, 0x18
|
||||
/* 801EE290 38 A0 00 00 */ li r5, 0
|
||||
/* 801EE294 4B E4 4D 9D */ bl getItem__17dSv_player_item_cCFib
|
||||
/* 801EE298 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 801EE29C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE2A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE2A4 38 80 00 02 */ li r4, 2
|
||||
/* 801EE2A8 4B E4 47 B5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
|
||||
/* 801EE2AC 7C 60 1B 78 */ mr r0, r3
|
||||
/* 801EE2B0 7F 83 E3 78 */ mr r3, r28
|
||||
/* 801EE2B4 54 04 06 3E */ clrlwi r4, r0, 0x18
|
||||
/* 801EE2B8 38 A0 00 00 */ li r5, 0
|
||||
/* 801EE2BC 4B E4 4D 75 */ bl getItem__17dSv_player_item_cCFib
|
||||
/* 801EE2C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE2C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE2C8 38 80 00 03 */ li r4, 3
|
||||
/* 801EE2CC 4B E4 47 91 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
|
||||
/* 801EE2D0 7C 60 1B 78 */ mr r0, r3
|
||||
/* 801EE2D4 7F 83 E3 78 */ mr r3, r28
|
||||
/* 801EE2D8 54 04 06 3E */ clrlwi r4, r0, 0x18
|
||||
/* 801EE2DC 38 A0 00 00 */ li r5, 0
|
||||
/* 801EE2E0 4B E4 4D 51 */ bl getItem__17dSv_player_item_cCFib
|
||||
/* 801EE2E4 7F 83 E3 78 */ mr r3, r28
|
||||
/* 801EE2E8 88 1D 06 A8 */ lbz r0, 0x6a8(r29)
|
||||
/* 801EE2EC 7C 9D 02 14 */ add r4, r29, r0
|
||||
/* 801EE2F0 88 84 06 90 */ lbz r4, 0x690(r4)
|
||||
/* 801EE2F4 38 A0 00 01 */ li r5, 1
|
||||
/* 801EE2F8 4B E4 4D 39 */ bl getItem__17dSv_player_item_cCFib
|
||||
/* 801EE2FC 38 A0 00 FF */ li r5, 0xff
|
||||
/* 801EE300 38 81 00 08 */ addi r4, r1, 8
|
||||
/* 801EE304 38 00 00 04 */ li r0, 4
|
||||
/* 801EE308 7C 09 03 A6 */ mtctr r0
|
||||
lbl_801EE30C:
|
||||
/* 801EE30C 98 A4 00 00 */ stb r5, 0(r4)
|
||||
/* 801EE310 38 84 00 01 */ addi r4, r4, 1
|
||||
/* 801EE314 42 00 FF F8 */ bdnz lbl_801EE30C
|
||||
/* 801EE318 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 801EE31C 2C 00 00 4A */ cmpwi r0, 0x4a
|
||||
/* 801EE320 41 82 01 B4 */ beq lbl_801EE4D4
|
||||
/* 801EE324 40 80 00 28 */ bge lbl_801EE34C
|
||||
/* 801EE328 2C 00 00 3E */ cmpwi r0, 0x3e
|
||||
/* 801EE32C 41 82 00 E8 */ beq lbl_801EE414
|
||||
/* 801EE330 40 80 00 10 */ bge lbl_801EE340
|
||||
/* 801EE334 2C 00 00 3D */ cmpwi r0, 0x3d
|
||||
/* 801EE338 40 80 01 6C */ bge lbl_801EE4A4
|
||||
/* 801EE33C 48 00 02 14 */ b lbl_801EE550
|
||||
lbl_801EE340:
|
||||
/* 801EE340 2C 00 00 43 */ cmpwi r0, 0x43
|
||||
/* 801EE344 41 82 00 34 */ beq lbl_801EE378
|
||||
/* 801EE348 48 00 02 08 */ b lbl_801EE550
|
||||
lbl_801EE34C:
|
||||
/* 801EE34C 2C 00 00 74 */ cmpwi r0, 0x74
|
||||
/* 801EE350 41 82 01 24 */ beq lbl_801EE474
|
||||
/* 801EE354 40 80 00 18 */ bge lbl_801EE36C
|
||||
/* 801EE358 2C 00 00 73 */ cmpwi r0, 0x73
|
||||
/* 801EE35C 40 80 01 F4 */ bge lbl_801EE550
|
||||
/* 801EE360 2C 00 00 70 */ cmpwi r0, 0x70
|
||||
/* 801EE364 40 80 00 80 */ bge lbl_801EE3E4
|
||||
/* 801EE368 48 00 01 E8 */ b lbl_801EE550
|
||||
lbl_801EE36C:
|
||||
/* 801EE36C 2C 00 00 76 */ cmpwi r0, 0x76
|
||||
/* 801EE370 41 82 00 D4 */ beq lbl_801EE444
|
||||
/* 801EE374 48 00 01 DC */ b lbl_801EE550
|
||||
lbl_801EE378:
|
||||
/* 801EE378 57 C0 06 3E */ clrlwi r0, r30, 0x18
|
||||
/* 801EE37C 2C 00 00 70 */ cmpwi r0, 0x70
|
||||
/* 801EE380 40 80 00 10 */ bge lbl_801EE390
|
||||
/* 801EE384 2C 00 00 3E */ cmpwi r0, 0x3e
|
||||
/* 801EE388 41 82 00 1C */ beq lbl_801EE3A4
|
||||
/* 801EE38C 48 00 00 20 */ b lbl_801EE3AC
|
||||
lbl_801EE390:
|
||||
/* 801EE390 2C 00 00 73 */ cmpwi r0, 0x73
|
||||
/* 801EE394 40 80 00 18 */ bge lbl_801EE3AC
|
||||
/* 801EE398 38 00 00 59 */ li r0, 0x59
|
||||
/* 801EE39C 98 01 00 08 */ stb r0, 8(r1)
|
||||
/* 801EE3A0 48 00 00 0C */ b lbl_801EE3AC
|
||||
lbl_801EE3A4:
|
||||
/* 801EE3A4 38 00 00 5A */ li r0, 0x5a
|
||||
/* 801EE3A8 98 01 00 08 */ stb r0, 8(r1)
|
||||
lbl_801EE3AC:
|
||||
/* 801EE3AC 57 E0 06 3E */ clrlwi r0, r31, 0x18
|
||||
/* 801EE3B0 2C 00 00 70 */ cmpwi r0, 0x70
|
||||
/* 801EE3B4 40 80 00 10 */ bge lbl_801EE3C4
|
||||
/* 801EE3B8 2C 00 00 3E */ cmpwi r0, 0x3e
|
||||
/* 801EE3BC 41 82 00 1C */ beq lbl_801EE3D8
|
||||
/* 801EE3C0 48 00 01 90 */ b lbl_801EE550
|
||||
lbl_801EE3C4:
|
||||
/* 801EE3C4 2C 00 00 73 */ cmpwi r0, 0x73
|
||||
/* 801EE3C8 40 80 01 88 */ bge lbl_801EE550
|
||||
/* 801EE3CC 38 00 00 59 */ li r0, 0x59
|
||||
/* 801EE3D0 98 01 00 09 */ stb r0, 9(r1)
|
||||
/* 801EE3D4 48 00 01 7C */ b lbl_801EE550
|
||||
lbl_801EE3D8:
|
||||
/* 801EE3D8 38 00 00 5A */ li r0, 0x5a
|
||||
/* 801EE3DC 98 01 00 09 */ stb r0, 9(r1)
|
||||
/* 801EE3E0 48 00 01 70 */ b lbl_801EE550
|
||||
lbl_801EE3E4:
|
||||
/* 801EE3E4 57 C0 06 3E */ clrlwi r0, r30, 0x18
|
||||
/* 801EE3E8 28 00 00 43 */ cmplwi r0, 0x43
|
||||
/* 801EE3EC 40 82 00 10 */ bne lbl_801EE3FC
|
||||
/* 801EE3F0 38 00 00 59 */ li r0, 0x59
|
||||
/* 801EE3F4 98 01 00 08 */ stb r0, 8(r1)
|
||||
/* 801EE3F8 48 00 01 58 */ b lbl_801EE550
|
||||
lbl_801EE3FC:
|
||||
/* 801EE3FC 57 E0 06 3E */ clrlwi r0, r31, 0x18
|
||||
/* 801EE400 28 00 00 43 */ cmplwi r0, 0x43
|
||||
/* 801EE404 40 82 01 4C */ bne lbl_801EE550
|
||||
/* 801EE408 38 00 00 59 */ li r0, 0x59
|
||||
/* 801EE40C 98 01 00 09 */ stb r0, 9(r1)
|
||||
/* 801EE410 48 00 01 40 */ b lbl_801EE550
|
||||
lbl_801EE414:
|
||||
/* 801EE414 57 C0 06 3E */ clrlwi r0, r30, 0x18
|
||||
/* 801EE418 28 00 00 43 */ cmplwi r0, 0x43
|
||||
/* 801EE41C 40 82 00 10 */ bne lbl_801EE42C
|
||||
/* 801EE420 38 00 00 5A */ li r0, 0x5a
|
||||
/* 801EE424 98 01 00 08 */ stb r0, 8(r1)
|
||||
/* 801EE428 48 00 01 28 */ b lbl_801EE550
|
||||
lbl_801EE42C:
|
||||
/* 801EE42C 57 E0 06 3E */ clrlwi r0, r31, 0x18
|
||||
/* 801EE430 28 00 00 43 */ cmplwi r0, 0x43
|
||||
/* 801EE434 40 82 01 1C */ bne lbl_801EE550
|
||||
/* 801EE438 38 00 00 5A */ li r0, 0x5a
|
||||
/* 801EE43C 98 01 00 09 */ stb r0, 9(r1)
|
||||
/* 801EE440 48 00 01 10 */ b lbl_801EE550
|
||||
lbl_801EE444:
|
||||
/* 801EE444 57 C0 06 3E */ clrlwi r0, r30, 0x18
|
||||
/* 801EE448 28 00 00 4A */ cmplwi r0, 0x4a
|
||||
/* 801EE44C 40 82 00 10 */ bne lbl_801EE45C
|
||||
/* 801EE450 38 00 00 5B */ li r0, 0x5b
|
||||
/* 801EE454 98 01 00 08 */ stb r0, 8(r1)
|
||||
/* 801EE458 48 00 00 F8 */ b lbl_801EE550
|
||||
lbl_801EE45C:
|
||||
/* 801EE45C 57 E0 06 3E */ clrlwi r0, r31, 0x18
|
||||
/* 801EE460 28 00 00 4A */ cmplwi r0, 0x4a
|
||||
/* 801EE464 40 82 00 EC */ bne lbl_801EE550
|
||||
/* 801EE468 38 00 00 5B */ li r0, 0x5b
|
||||
/* 801EE46C 98 01 00 09 */ stb r0, 9(r1)
|
||||
/* 801EE470 48 00 00 E0 */ b lbl_801EE550
|
||||
lbl_801EE474:
|
||||
/* 801EE474 57 C0 06 3E */ clrlwi r0, r30, 0x18
|
||||
/* 801EE478 28 00 00 4A */ cmplwi r0, 0x4a
|
||||
/* 801EE47C 40 82 00 10 */ bne lbl_801EE48C
|
||||
/* 801EE480 38 00 00 5D */ li r0, 0x5d
|
||||
/* 801EE484 98 01 00 08 */ stb r0, 8(r1)
|
||||
/* 801EE488 48 00 00 C8 */ b lbl_801EE550
|
||||
lbl_801EE48C:
|
||||
/* 801EE48C 57 E0 06 3E */ clrlwi r0, r31, 0x18
|
||||
/* 801EE490 28 00 00 4A */ cmplwi r0, 0x4a
|
||||
/* 801EE494 40 82 00 BC */ bne lbl_801EE550
|
||||
/* 801EE498 38 00 00 5D */ li r0, 0x5d
|
||||
/* 801EE49C 98 01 00 09 */ stb r0, 9(r1)
|
||||
/* 801EE4A0 48 00 00 B0 */ b lbl_801EE550
|
||||
lbl_801EE4A4:
|
||||
/* 801EE4A4 57 C0 06 3E */ clrlwi r0, r30, 0x18
|
||||
/* 801EE4A8 28 00 00 4A */ cmplwi r0, 0x4a
|
||||
/* 801EE4AC 40 82 00 10 */ bne lbl_801EE4BC
|
||||
/* 801EE4B0 38 00 00 5C */ li r0, 0x5c
|
||||
/* 801EE4B4 98 01 00 08 */ stb r0, 8(r1)
|
||||
/* 801EE4B8 48 00 00 98 */ b lbl_801EE550
|
||||
lbl_801EE4BC:
|
||||
/* 801EE4BC 57 E0 06 3E */ clrlwi r0, r31, 0x18
|
||||
/* 801EE4C0 28 00 00 4A */ cmplwi r0, 0x4a
|
||||
/* 801EE4C4 40 82 00 8C */ bne lbl_801EE550
|
||||
/* 801EE4C8 38 00 00 5C */ li r0, 0x5c
|
||||
/* 801EE4CC 98 01 00 09 */ stb r0, 9(r1)
|
||||
/* 801EE4D0 48 00 00 80 */ b lbl_801EE550
|
||||
lbl_801EE4D4:
|
||||
/* 801EE4D4 57 C3 06 3E */ clrlwi r3, r30, 0x18
|
||||
/* 801EE4D8 28 03 00 76 */ cmplwi r3, 0x76
|
||||
/* 801EE4DC 40 82 00 10 */ bne lbl_801EE4EC
|
||||
/* 801EE4E0 38 00 00 5B */ li r0, 0x5b
|
||||
/* 801EE4E4 98 01 00 08 */ stb r0, 8(r1)
|
||||
/* 801EE4E8 48 00 00 68 */ b lbl_801EE550
|
||||
lbl_801EE4EC:
|
||||
/* 801EE4EC 57 E0 06 3E */ clrlwi r0, r31, 0x18
|
||||
/* 801EE4F0 28 00 00 76 */ cmplwi r0, 0x76
|
||||
/* 801EE4F4 40 82 00 10 */ bne lbl_801EE504
|
||||
/* 801EE4F8 38 00 00 5B */ li r0, 0x5b
|
||||
/* 801EE4FC 98 01 00 09 */ stb r0, 9(r1)
|
||||
/* 801EE500 48 00 00 50 */ b lbl_801EE550
|
||||
lbl_801EE504:
|
||||
/* 801EE504 28 03 00 3D */ cmplwi r3, 0x3d
|
||||
/* 801EE508 40 82 00 10 */ bne lbl_801EE518
|
||||
/* 801EE50C 38 00 00 5C */ li r0, 0x5c
|
||||
/* 801EE510 98 01 00 08 */ stb r0, 8(r1)
|
||||
/* 801EE514 48 00 00 3C */ b lbl_801EE550
|
||||
lbl_801EE518:
|
||||
/* 801EE518 28 00 00 3D */ cmplwi r0, 0x3d
|
||||
/* 801EE51C 40 82 00 10 */ bne lbl_801EE52C
|
||||
/* 801EE520 38 00 00 5C */ li r0, 0x5c
|
||||
/* 801EE524 98 01 00 09 */ stb r0, 9(r1)
|
||||
/* 801EE528 48 00 00 28 */ b lbl_801EE550
|
||||
lbl_801EE52C:
|
||||
/* 801EE52C 28 03 00 74 */ cmplwi r3, 0x74
|
||||
/* 801EE530 40 82 00 10 */ bne lbl_801EE540
|
||||
/* 801EE534 38 00 00 5D */ li r0, 0x5d
|
||||
/* 801EE538 98 01 00 08 */ stb r0, 8(r1)
|
||||
/* 801EE53C 48 00 00 14 */ b lbl_801EE550
|
||||
lbl_801EE540:
|
||||
/* 801EE540 28 00 00 74 */ cmplwi r0, 0x74
|
||||
/* 801EE544 40 82 00 0C */ bne lbl_801EE550
|
||||
/* 801EE548 38 00 00 5D */ li r0, 0x5d
|
||||
/* 801EE54C 98 01 00 09 */ stb r0, 9(r1)
|
||||
lbl_801EE550:
|
||||
/* 801EE550 88 01 00 08 */ lbz r0, 8(r1)
|
||||
/* 801EE554 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EE558 41 82 00 58 */ beq lbl_801EE5B0
|
||||
/* 801EE55C 88 01 00 09 */ lbz r0, 9(r1)
|
||||
/* 801EE560 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EE564 40 82 00 4C */ bne lbl_801EE5B0
|
||||
/* 801EE568 88 01 00 0A */ lbz r0, 0xa(r1)
|
||||
/* 801EE56C 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EE570 40 82 00 40 */ bne lbl_801EE5B0
|
||||
/* 801EE574 88 01 00 0B */ lbz r0, 0xb(r1)
|
||||
/* 801EE578 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EE57C 40 82 00 34 */ bne lbl_801EE5B0
|
||||
/* 801EE580 38 60 00 00 */ li r3, 0
|
||||
/* 801EE584 4B E3 F8 45 */ bl dComIfGs_getMixItemIndex__Fi
|
||||
/* 801EE588 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 801EE58C 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EE590 40 82 00 20 */ bne lbl_801EE5B0
|
||||
/* 801EE594 88 01 00 08 */ lbz r0, 8(r1)
|
||||
/* 801EE598 98 1D 06 C7 */ stb r0, 0x6c7(r29)
|
||||
/* 801EE59C 38 00 00 FF */ li r0, 0xff
|
||||
/* 801EE5A0 98 1D 06 C8 */ stb r0, 0x6c8(r29)
|
||||
/* 801EE5A4 98 1D 06 C9 */ stb r0, 0x6c9(r29)
|
||||
/* 801EE5A8 98 1D 06 CA */ stb r0, 0x6ca(r29)
|
||||
/* 801EE5AC 48 00 00 74 */ b lbl_801EE620
|
||||
lbl_801EE5B0:
|
||||
/* 801EE5B0 88 01 00 08 */ lbz r0, 8(r1)
|
||||
/* 801EE5B4 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EE5B8 40 82 00 54 */ bne lbl_801EE60C
|
||||
/* 801EE5BC 8B 81 00 09 */ lbz r28, 9(r1)
|
||||
/* 801EE5C0 28 1C 00 FF */ cmplwi r28, 0xff
|
||||
/* 801EE5C4 41 82 00 48 */ beq lbl_801EE60C
|
||||
/* 801EE5C8 88 01 00 0A */ lbz r0, 0xa(r1)
|
||||
/* 801EE5CC 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EE5D0 40 82 00 3C */ bne lbl_801EE60C
|
||||
/* 801EE5D4 88 01 00 0B */ lbz r0, 0xb(r1)
|
||||
/* 801EE5D8 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EE5DC 40 82 00 30 */ bne lbl_801EE60C
|
||||
/* 801EE5E0 38 60 00 01 */ li r3, 1
|
||||
/* 801EE5E4 4B E3 F7 E5 */ bl dComIfGs_getMixItemIndex__Fi
|
||||
/* 801EE5E8 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 801EE5EC 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EE5F0 40 82 00 1C */ bne lbl_801EE60C
|
||||
/* 801EE5F4 38 00 00 FF */ li r0, 0xff
|
||||
/* 801EE5F8 98 1D 06 C7 */ stb r0, 0x6c7(r29)
|
||||
/* 801EE5FC 9B 9D 06 C8 */ stb r28, 0x6c8(r29)
|
||||
/* 801EE600 98 1D 06 C9 */ stb r0, 0x6c9(r29)
|
||||
/* 801EE604 98 1D 06 CA */ stb r0, 0x6ca(r29)
|
||||
/* 801EE608 48 00 00 18 */ b lbl_801EE620
|
||||
lbl_801EE60C:
|
||||
/* 801EE60C 38 00 00 FF */ li r0, 0xff
|
||||
/* 801EE610 98 1D 06 C7 */ stb r0, 0x6c7(r29)
|
||||
/* 801EE614 98 1D 06 C8 */ stb r0, 0x6c8(r29)
|
||||
/* 801EE618 98 1D 06 C9 */ stb r0, 0x6c9(r29)
|
||||
/* 801EE61C 98 1D 06 CA */ stb r0, 0x6ca(r29)
|
||||
lbl_801EE620:
|
||||
/* 801EE620 38 60 00 00 */ li r3, 0
|
||||
/* 801EE624 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 801EE628 48 17 3B FD */ bl _restgpr_28
|
||||
/* 801EE62C 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 801EE630 7C 08 03 A6 */ mtlr r0
|
||||
/* 801EE634 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 801EE638 4E 80 00 20 */ blr
|
||||
|
|
@ -1,234 +0,0 @@
|
|||
lbl_801EBB10:
|
||||
/* 801EBB10 94 21 FF D0 */ stwu r1, -0x30(r1)
|
||||
/* 801EBB14 7C 08 02 A6 */ mflr r0
|
||||
/* 801EBB18 90 01 00 34 */ stw r0, 0x34(r1)
|
||||
/* 801EBB1C 39 61 00 30 */ addi r11, r1, 0x30
|
||||
/* 801EBB20 48 17 66 A9 */ bl _savegpr_24
|
||||
/* 801EBB24 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 801EBB28 88 03 06 AA */ lbz r0, 0x6aa(r3)
|
||||
/* 801EBB2C 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EBB30 41 82 00 10 */ beq lbl_801EBB40
|
||||
/* 801EBB34 7C 7E 02 14 */ add r3, r30, r0
|
||||
/* 801EBB38 8B 83 06 90 */ lbz r28, 0x690(r3)
|
||||
/* 801EBB3C 48 00 00 08 */ b lbl_801EBB44
|
||||
lbl_801EBB40:
|
||||
/* 801EBB40 3B 80 00 FF */ li r28, 0xff
|
||||
lbl_801EBB44:
|
||||
/* 801EBB44 88 1E 06 AB */ lbz r0, 0x6ab(r30)
|
||||
/* 801EBB48 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EBB4C 41 82 00 10 */ beq lbl_801EBB5C
|
||||
/* 801EBB50 7C 7E 02 14 */ add r3, r30, r0
|
||||
/* 801EBB54 8B 63 06 90 */ lbz r27, 0x690(r3)
|
||||
/* 801EBB58 48 00 00 08 */ b lbl_801EBB60
|
||||
lbl_801EBB5C:
|
||||
/* 801EBB5C 3B 60 00 FF */ li r27, 0xff
|
||||
lbl_801EBB60:
|
||||
/* 801EBB60 88 1E 06 AC */ lbz r0, 0x6ac(r30)
|
||||
/* 801EBB64 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EBB68 41 82 00 10 */ beq lbl_801EBB78
|
||||
/* 801EBB6C 7C 7E 02 14 */ add r3, r30, r0
|
||||
/* 801EBB70 8B A3 06 90 */ lbz r29, 0x690(r3)
|
||||
/* 801EBB74 48 00 00 08 */ b lbl_801EBB7C
|
||||
lbl_801EBB78:
|
||||
/* 801EBB78 3B A0 00 FF */ li r29, 0xff
|
||||
lbl_801EBB7C:
|
||||
/* 801EBB7C 88 1E 06 AD */ lbz r0, 0x6ad(r30)
|
||||
/* 801EBB80 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EBB84 41 82 00 10 */ beq lbl_801EBB94
|
||||
/* 801EBB88 7C 7E 02 14 */ add r3, r30, r0
|
||||
/* 801EBB8C 8B E3 06 90 */ lbz r31, 0x690(r3)
|
||||
/* 801EBB90 48 00 00 08 */ b lbl_801EBB98
|
||||
lbl_801EBB94:
|
||||
/* 801EBB94 3B E0 00 FF */ li r31, 0xff
|
||||
lbl_801EBB98:
|
||||
/* 801EBB98 38 60 00 00 */ li r3, 0
|
||||
/* 801EBB9C 4B E4 22 2D */ bl dComIfGs_getMixItemIndex__Fi
|
||||
/* 801EBBA0 7C 7A 1B 78 */ mr r26, r3
|
||||
/* 801EBBA4 38 60 00 01 */ li r3, 1
|
||||
/* 801EBBA8 4B E4 22 21 */ bl dComIfGs_getMixItemIndex__Fi
|
||||
/* 801EBBAC 7C 79 1B 78 */ mr r25, r3
|
||||
/* 801EBBB0 3B 00 00 00 */ li r24, 0
|
||||
lbl_801EBBB4:
|
||||
/* 801EBBB4 7F C3 F3 78 */ mr r3, r30
|
||||
/* 801EBBB8 7F 04 C3 78 */ mr r4, r24
|
||||
/* 801EBBBC 48 00 23 71 */ bl setSelectItemForce__12dMenu_Ring_cFi
|
||||
/* 801EBBC0 3B 18 00 01 */ addi r24, r24, 1
|
||||
/* 801EBBC4 2C 18 00 04 */ cmpwi r24, 4
|
||||
/* 801EBBC8 41 80 FF EC */ blt lbl_801EBBB4
|
||||
/* 801EBBCC 7F C3 F3 78 */ mr r3, r30
|
||||
/* 801EBBD0 48 00 26 59 */ bl checkExplainForce__12dMenu_Ring_cFv
|
||||
/* 801EBBD4 88 1E 06 B3 */ lbz r0, 0x6b3(r30)
|
||||
/* 801EBBD8 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 801EBBDC 40 82 01 18 */ bne lbl_801EBCF4
|
||||
/* 801EBBE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EBBE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EBBE8 38 80 00 01 */ li r4, 1
|
||||
/* 801EBBEC 4B E4 6E 71 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
|
||||
/* 801EBBF0 88 1E 06 A8 */ lbz r0, 0x6a8(r30)
|
||||
/* 801EBBF4 7C 9E 02 14 */ add r4, r30, r0
|
||||
/* 801EBBF8 88 84 06 90 */ lbz r4, 0x690(r4)
|
||||
/* 801EBBFC 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 801EBC00 7C 04 00 40 */ cmplw r4, r0
|
||||
/* 801EBC04 40 82 00 64 */ bne lbl_801EBC68
|
||||
/* 801EBC08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EBC0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EBC10 38 80 00 00 */ li r4, 0
|
||||
/* 801EBC14 4B E4 6E 49 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
|
||||
/* 801EBC18 7C 7A 1B 78 */ mr r26, r3
|
||||
/* 801EBC1C 7F 5B D3 78 */ mr r27, r26
|
||||
/* 801EBC20 38 60 00 00 */ li r3, 0
|
||||
/* 801EBC24 4B E4 21 A5 */ bl dComIfGs_getMixItemIndex__Fi
|
||||
/* 801EBC28 7C 79 1B 78 */ mr r25, r3
|
||||
/* 801EBC2C 57 40 06 3E */ clrlwi r0, r26, 0x18
|
||||
/* 801EBC30 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EBC34 40 82 00 10 */ bne lbl_801EBC44
|
||||
/* 801EBC38 38 00 00 FF */ li r0, 0xff
|
||||
/* 801EBC3C 98 1E 06 AB */ stb r0, 0x6ab(r30)
|
||||
/* 801EBC40 48 00 00 0C */ b lbl_801EBC4C
|
||||
lbl_801EBC44:
|
||||
/* 801EBC44 88 1E 06 AA */ lbz r0, 0x6aa(r30)
|
||||
/* 801EBC48 98 1E 06 AB */ stb r0, 0x6ab(r30)
|
||||
lbl_801EBC4C:
|
||||
/* 801EBC4C 88 1E 06 A8 */ lbz r0, 0x6a8(r30)
|
||||
/* 801EBC50 98 1E 06 AA */ stb r0, 0x6aa(r30)
|
||||
/* 801EBC54 88 1E 06 AA */ lbz r0, 0x6aa(r30)
|
||||
/* 801EBC58 7C 7E 02 14 */ add r3, r30, r0
|
||||
/* 801EBC5C 8B 83 06 90 */ lbz r28, 0x690(r3)
|
||||
/* 801EBC60 3B 40 00 FF */ li r26, 0xff
|
||||
/* 801EBC64 48 00 01 A8 */ b lbl_801EBE0C
|
||||
lbl_801EBC68:
|
||||
/* 801EBC68 38 60 00 01 */ li r3, 1
|
||||
/* 801EBC6C 4B E4 21 5D */ bl dComIfGs_getMixItemIndex__Fi
|
||||
/* 801EBC70 54 64 06 3E */ clrlwi r4, r3, 0x18
|
||||
/* 801EBC74 88 BE 06 A8 */ lbz r5, 0x6a8(r30)
|
||||
/* 801EBC78 7C 7E 2A 14 */ add r3, r30, r5
|
||||
/* 801EBC7C 88 03 06 90 */ lbz r0, 0x690(r3)
|
||||
/* 801EBC80 7C 00 20 40 */ cmplw r0, r4
|
||||
/* 801EBC84 40 82 00 58 */ bne lbl_801EBCDC
|
||||
/* 801EBC88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EBC8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EBC90 38 80 00 00 */ li r4, 0
|
||||
/* 801EBC94 4B E4 6D C9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
|
||||
/* 801EBC98 7C 7B 1B 78 */ mr r27, r3
|
||||
/* 801EBC9C 3B 20 00 FF */ li r25, 0xff
|
||||
/* 801EBCA0 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 801EBCA4 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EBCA8 40 82 00 10 */ bne lbl_801EBCB8
|
||||
/* 801EBCAC 38 00 00 FF */ li r0, 0xff
|
||||
/* 801EBCB0 98 1E 06 AB */ stb r0, 0x6ab(r30)
|
||||
/* 801EBCB4 48 00 00 0C */ b lbl_801EBCC0
|
||||
lbl_801EBCB8:
|
||||
/* 801EBCB8 88 1E 06 AA */ lbz r0, 0x6aa(r30)
|
||||
/* 801EBCBC 98 1E 06 AB */ stb r0, 0x6ab(r30)
|
||||
lbl_801EBCC0:
|
||||
/* 801EBCC0 88 1E 06 A8 */ lbz r0, 0x6a8(r30)
|
||||
/* 801EBCC4 98 1E 06 AA */ stb r0, 0x6aa(r30)
|
||||
/* 801EBCC8 88 1E 06 AA */ lbz r0, 0x6aa(r30)
|
||||
/* 801EBCCC 7C 7E 02 14 */ add r3, r30, r0
|
||||
/* 801EBCD0 8B 83 06 90 */ lbz r28, 0x690(r3)
|
||||
/* 801EBCD4 3B 40 00 FF */ li r26, 0xff
|
||||
/* 801EBCD8 48 00 01 34 */ b lbl_801EBE0C
|
||||
lbl_801EBCDC:
|
||||
/* 801EBCDC 98 BE 06 AA */ stb r5, 0x6aa(r30)
|
||||
/* 801EBCE0 88 1E 06 AA */ lbz r0, 0x6aa(r30)
|
||||
/* 801EBCE4 7C 7E 02 14 */ add r3, r30, r0
|
||||
/* 801EBCE8 8B 83 06 90 */ lbz r28, 0x690(r3)
|
||||
/* 801EBCEC 3B 40 00 FF */ li r26, 0xff
|
||||
/* 801EBCF0 48 00 01 1C */ b lbl_801EBE0C
|
||||
lbl_801EBCF4:
|
||||
/* 801EBCF4 28 00 00 01 */ cmplwi r0, 1
|
||||
/* 801EBCF8 40 82 01 14 */ bne lbl_801EBE0C
|
||||
/* 801EBCFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EBD00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EBD04 38 80 00 00 */ li r4, 0
|
||||
/* 801EBD08 4B E4 6D 55 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
|
||||
/* 801EBD0C 88 1E 06 A8 */ lbz r0, 0x6a8(r30)
|
||||
/* 801EBD10 7C 9E 02 14 */ add r4, r30, r0
|
||||
/* 801EBD14 88 84 06 90 */ lbz r4, 0x690(r4)
|
||||
/* 801EBD18 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 801EBD1C 7C 04 00 40 */ cmplw r4, r0
|
||||
/* 801EBD20 40 82 00 64 */ bne lbl_801EBD84
|
||||
/* 801EBD24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EBD28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EBD2C 38 80 00 01 */ li r4, 1
|
||||
/* 801EBD30 4B E4 6D 2D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
|
||||
/* 801EBD34 7C 79 1B 78 */ mr r25, r3
|
||||
/* 801EBD38 7F 3C CB 78 */ mr r28, r25
|
||||
/* 801EBD3C 38 60 00 01 */ li r3, 1
|
||||
/* 801EBD40 4B E4 20 89 */ bl dComIfGs_getMixItemIndex__Fi
|
||||
/* 801EBD44 7C 7A 1B 78 */ mr r26, r3
|
||||
/* 801EBD48 57 20 06 3E */ clrlwi r0, r25, 0x18
|
||||
/* 801EBD4C 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EBD50 40 82 00 10 */ bne lbl_801EBD60
|
||||
/* 801EBD54 38 00 00 FF */ li r0, 0xff
|
||||
/* 801EBD58 98 1E 06 AA */ stb r0, 0x6aa(r30)
|
||||
/* 801EBD5C 48 00 00 0C */ b lbl_801EBD68
|
||||
lbl_801EBD60:
|
||||
/* 801EBD60 88 1E 06 AB */ lbz r0, 0x6ab(r30)
|
||||
/* 801EBD64 98 1E 06 AA */ stb r0, 0x6aa(r30)
|
||||
lbl_801EBD68:
|
||||
/* 801EBD68 88 1E 06 A8 */ lbz r0, 0x6a8(r30)
|
||||
/* 801EBD6C 98 1E 06 AB */ stb r0, 0x6ab(r30)
|
||||
/* 801EBD70 88 1E 06 AB */ lbz r0, 0x6ab(r30)
|
||||
/* 801EBD74 7C 7E 02 14 */ add r3, r30, r0
|
||||
/* 801EBD78 8B 63 06 90 */ lbz r27, 0x690(r3)
|
||||
/* 801EBD7C 3B 20 00 FF */ li r25, 0xff
|
||||
/* 801EBD80 48 00 00 8C */ b lbl_801EBE0C
|
||||
lbl_801EBD84:
|
||||
/* 801EBD84 38 60 00 00 */ li r3, 0
|
||||
/* 801EBD88 4B E4 20 41 */ bl dComIfGs_getMixItemIndex__Fi
|
||||
/* 801EBD8C 54 64 06 3E */ clrlwi r4, r3, 0x18
|
||||
/* 801EBD90 88 BE 06 A8 */ lbz r5, 0x6a8(r30)
|
||||
/* 801EBD94 7C 7E 2A 14 */ add r3, r30, r5
|
||||
/* 801EBD98 88 03 06 90 */ lbz r0, 0x690(r3)
|
||||
/* 801EBD9C 7C 00 20 40 */ cmplw r0, r4
|
||||
/* 801EBDA0 40 82 00 58 */ bne lbl_801EBDF8
|
||||
/* 801EBDA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EBDA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EBDAC 38 80 00 01 */ li r4, 1
|
||||
/* 801EBDB0 4B E4 6C AD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
|
||||
/* 801EBDB4 7C 7C 1B 78 */ mr r28, r3
|
||||
/* 801EBDB8 3B 40 00 FF */ li r26, 0xff
|
||||
/* 801EBDBC 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 801EBDC0 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EBDC4 40 82 00 10 */ bne lbl_801EBDD4
|
||||
/* 801EBDC8 38 00 00 FF */ li r0, 0xff
|
||||
/* 801EBDCC 98 1E 06 AA */ stb r0, 0x6aa(r30)
|
||||
/* 801EBDD0 48 00 00 0C */ b lbl_801EBDDC
|
||||
lbl_801EBDD4:
|
||||
/* 801EBDD4 88 1E 06 AB */ lbz r0, 0x6ab(r30)
|
||||
/* 801EBDD8 98 1E 06 AA */ stb r0, 0x6aa(r30)
|
||||
lbl_801EBDDC:
|
||||
/* 801EBDDC 88 1E 06 A8 */ lbz r0, 0x6a8(r30)
|
||||
/* 801EBDE0 98 1E 06 AB */ stb r0, 0x6ab(r30)
|
||||
/* 801EBDE4 88 1E 06 AB */ lbz r0, 0x6ab(r30)
|
||||
/* 801EBDE8 7C 7E 02 14 */ add r3, r30, r0
|
||||
/* 801EBDEC 8B 63 06 90 */ lbz r27, 0x690(r3)
|
||||
/* 801EBDF0 3B 20 00 FF */ li r25, 0xff
|
||||
/* 801EBDF4 48 00 00 18 */ b lbl_801EBE0C
|
||||
lbl_801EBDF8:
|
||||
/* 801EBDF8 98 BE 06 AB */ stb r5, 0x6ab(r30)
|
||||
/* 801EBDFC 88 1E 06 AB */ lbz r0, 0x6ab(r30)
|
||||
/* 801EBE00 7C 7E 02 14 */ add r3, r30, r0
|
||||
/* 801EBE04 8B 63 06 90 */ lbz r27, 0x690(r3)
|
||||
/* 801EBE08 3B 20 00 FF */ li r25, 0xff
|
||||
lbl_801EBE0C:
|
||||
/* 801EBE0C 9B 9E 06 B4 */ stb r28, 0x6b4(r30)
|
||||
/* 801EBE10 9B 7E 06 B5 */ stb r27, 0x6b5(r30)
|
||||
/* 801EBE14 9B BE 06 B6 */ stb r29, 0x6b6(r30)
|
||||
/* 801EBE18 9B FE 06 B7 */ stb r31, 0x6b7(r30)
|
||||
/* 801EBE1C 9B 5E 06 B8 */ stb r26, 0x6b8(r30)
|
||||
/* 801EBE20 9B 3E 06 B9 */ stb r25, 0x6b9(r30)
|
||||
/* 801EBE24 38 00 00 FF */ li r0, 0xff
|
||||
/* 801EBE28 98 1E 06 BA */ stb r0, 0x6ba(r30)
|
||||
/* 801EBE2C 98 1E 06 BB */ stb r0, 0x6bb(r30)
|
||||
/* 801EBE30 98 1E 06 CD */ stb r0, 0x6cd(r30)
|
||||
/* 801EBE34 7F C3 F3 78 */ mr r3, r30
|
||||
/* 801EBE38 38 80 00 01 */ li r4, 1
|
||||
/* 801EBE3C 48 00 00 1D */ bl setJumpItem__12dMenu_Ring_cFb
|
||||
/* 801EBE40 39 61 00 30 */ addi r11, r1, 0x30
|
||||
/* 801EBE44 48 17 63 D1 */ bl _restgpr_24
|
||||
/* 801EBE48 80 01 00 34 */ lwz r0, 0x34(r1)
|
||||
/* 801EBE4C 7C 08 03 A6 */ mtlr r0
|
||||
/* 801EBE50 38 21 00 30 */ addi r1, r1, 0x30
|
||||
/* 801EBE54 4E 80 00 20 */ blr
|
||||
|
|
@ -97,11 +97,7 @@ public:
|
|||
/* 802FF634 */ virtual u8 getTextureCount() const;
|
||||
/* 80053C6C */ virtual bool setBlack(JUtility::TColor);
|
||||
/* 80053C44 */ virtual bool setWhite(JUtility::TColor);
|
||||
/* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white) {
|
||||
mBlack = i_black;
|
||||
mWhite = i_white;
|
||||
return 1;
|
||||
}
|
||||
/* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white);
|
||||
/* 801DFA4C */ virtual JUtility::TColor getBlack() const;
|
||||
/* 801DFA40 */ virtual JUtility::TColor getWhite() const;
|
||||
/* 8025603C */ virtual bool getMaterial() const;
|
||||
|
|
|
|||
|
|
@ -386,6 +386,7 @@ public:
|
|||
s16 getItemPachinkoNumCount() { return mItemPachinkoNumCount; }
|
||||
void clearItemPachinkoNumCount() { mItemPachinkoNumCount = 0; }
|
||||
u8 getNeedLightDropNum() { return mNeedLightDropNum; }
|
||||
u8 getWolfAbility(int i_idx) { return mWolfAbility[i_idx]; }
|
||||
|
||||
const char* getStartStageName() { return mStartStage.getName(); }
|
||||
s8 getStartStageRoomNo() { return mStartStage.getRoomNo(); }
|
||||
|
|
@ -731,8 +732,7 @@ public:
|
|||
/* 0x04F58 */ u8 mSubHeapLockFlag[2];
|
||||
/* 0x04F5A */ u8 mNowVibration;
|
||||
/* 0x04F5B */ u8 field_0x4f5b[2];
|
||||
/* 0x04F5D */ u8 mWolfAbility;
|
||||
/* 0x04F5E */ u8 field_0x4f5e[11];
|
||||
/* 0x04F5D */ u8 mWolfAbility[12];
|
||||
/* 0x04F69 */ u8 mNeedLightDropNum;
|
||||
/* 0x04F6A */ u8 field_0x4f6a[18];
|
||||
/* 0x04F7C */ u8 mMesgBgm;
|
||||
|
|
@ -1081,6 +1081,10 @@ inline u8 dComIfGs_getPachinkoMax() {
|
|||
return 50;
|
||||
}
|
||||
|
||||
inline u8 dComIfGs_getWolfAbility(int i_idx) {
|
||||
return g_dComIfG_gameInfo.play.getWolfAbility(i_idx);
|
||||
}
|
||||
|
||||
inline void dComIfGs_setEmptyBombBag() {
|
||||
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public:
|
|||
/* 801ED2BC */ void stick_wait_init();
|
||||
/* 801ED31C */ void stick_wait_proc();
|
||||
/* 801ED490 */ void stick_move_init();
|
||||
/* 801ED53C */ f32 stick_move_proc();
|
||||
/* 801ED53C */ void stick_move_proc();
|
||||
/* 801ED934 */ void stick_explain_init();
|
||||
/* 801ED938 */ void stick_explain_force_init();
|
||||
/* 801ED93C */ void stick_explain_proc();
|
||||
|
|
@ -69,7 +69,11 @@ public:
|
|||
/* 801EF484 */ bool dpdMove();
|
||||
/* 801EF48C */ u8 openExplain(u8);
|
||||
|
||||
#ifdef NONMATCHING
|
||||
virtual void draw() { _draw(); }
|
||||
#else
|
||||
/* 801EF560 */ virtual void draw();
|
||||
#endif
|
||||
/* 801EA708 */ virtual ~dMenu_Ring_c();
|
||||
|
||||
void drawFlag0() { mDrawFlag = 0; }
|
||||
|
|
@ -133,9 +137,9 @@ private:
|
|||
/* 0x620 */ f32 field_0x620;
|
||||
/* 0x624 */ f32 field_0x624;
|
||||
/* 0x628 */ u32 field_0x628;
|
||||
/* 0x62C */ u32 field_0x62c;
|
||||
/* 0x630 */ u32 field_0x630;
|
||||
/* 0x634 */ u32 field_0x634;
|
||||
/* 0x62C */ u32 mPlayerIsWolf;
|
||||
/* 0x630 */ u32 mNameStringID;
|
||||
/* 0x634 */ s32 field_0x634;
|
||||
/* 0x638 */ s16 field_0x638;
|
||||
/* 0x63A */ s16 field_0x63a;
|
||||
/* 0x63C */ s16 field_0x63c;
|
||||
|
|
@ -152,7 +156,7 @@ private:
|
|||
/* 0x686 */ s16 field_0x686[4];
|
||||
/* 0x68E */ s16 field_0x68e;
|
||||
/* 0x690 */ u8 field_0x690[MAX_ITEM_SLOTS];
|
||||
/* 0x6A8 */ u8 mStatus;
|
||||
/* 0x6A8 */ u8 field_0x6a8;
|
||||
/* 0x6A9 */ u8 field_0x6a9;
|
||||
/* 0x6AA */ u8 field_0x6aa;
|
||||
/* 0x6AB */ u8 field_0x6ab;
|
||||
|
|
@ -160,7 +164,7 @@ private:
|
|||
/* 0x6AD */ u8 field_0x6ad;
|
||||
/* 0x6AE */ u8 field_0x6ae;
|
||||
/* 0x6AF */ u8 field_0x6af;
|
||||
/* 0x6B0 */ u8 field_0x6b0;
|
||||
/* 0x6B0 */ u8 mStatus;
|
||||
/* 0x6B1 */ u8 field_0x6b1;
|
||||
/* 0x6B2 */ u8 field_0x6b2;
|
||||
/* 0x6B3 */ u8 field_0x6b3;
|
||||
|
|
|
|||
|
|
@ -4,31 +4,11 @@
|
|||
//
|
||||
|
||||
#include "JSystem/JMath/JMath.h"
|
||||
#include "JSystem/JMath/JMATrigonometric.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void JMAEulerToQuat__FsssP10Quaternion();
|
||||
extern "C" void JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion();
|
||||
extern "C" void JMAFastVECNormalize__FPC3VecP3Vec();
|
||||
extern "C" void JMAVECScaleAdd__FPC3VecPC3VecP3Vecf();
|
||||
extern "C" void JMAMTXApplyScale__FPA4_CfPA4_ffff();
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" u8 sincosTable___5JMath[65536];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* 80339878-80339938 3341B8 00C0+00 0/0 11/11 2/2 .text JMAEulerToQuat__FsssP10Quaternion
|
||||
*/
|
||||
#ifdef NONMATCHING
|
||||
void JMAEulerToQuat(s16 x, s16 y, s16 z, Quaternion* quat) {
|
||||
f32 cosX = JMASCos(x / 2);
|
||||
f32 cosY = JMASCos(y / 2);
|
||||
|
|
@ -44,16 +24,6 @@ void JMAEulerToQuat(s16 x, s16 y, s16 z, Quaternion* quat) {
|
|||
quat->y = cosZ * (cosX * sinY) + sinZ * (sinX * cosY);
|
||||
quat->z = sinZ * (cosX * cosY) - cosZ * (sinX * sinY);
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3) {
|
||||
nofralloc
|
||||
#include "asm/JSystem/JMath/JMath/JMAEulerToQuat__FsssP10Quaternion.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 80339938-80339A30 334278 00F8+00 0/0 5/5 0/0 .text
|
||||
* JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion */
|
||||
|
|
|
|||
|
|
@ -4990,7 +4990,7 @@ asm void dFile_select_c::screenSet() {
|
|||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
// J2DPicture::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1)
|
||||
extern "C" asm bool setBlackWhite__10J2DPictureFQ28JUtility6TColorQ28JUtility6TColor() {
|
||||
asm bool J2DPicture::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
|
||||
nofralloc
|
||||
#include "asm/d/file/d_file_select/setBlackWhite__10J2DPictureFQ28JUtility6TColorQ28JUtility6TColor.s"
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -19,6 +19,11 @@
|
|||
#include "m_Do/m_Do_machine.h"
|
||||
#include "m_Do/m_Do_main.h"
|
||||
#include "m_Do/m_Do_mtx.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
|
||||
#include "JSystem/JParticle/JPADrawInfo.h"
|
||||
#include "JSystem/JUtility/JUTConsole.h"
|
||||
#include "JSystem/JFramework/JFWSystem.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
|
|
@ -591,19 +596,19 @@ SECTION_SDATA2 static f32 lit_4442 = -0.0025f;
|
|||
|
||||
/* 80008630-80009184 002F70 0B54+00 1/1 0/0 0/0 .text
|
||||
* drawDepth2__FP10view_classP15view_port_classi */
|
||||
// regalloc
|
||||
// Matches with literals
|
||||
#ifdef NONMATCHING
|
||||
static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_2) {
|
||||
s16 x_orig;
|
||||
s16 y_orig;
|
||||
s16 y_orig_pos;
|
||||
s16 width;
|
||||
s16 height;
|
||||
s16 y_orig;
|
||||
void* zBufferTex;
|
||||
s16 width;
|
||||
void* frameBufferTex;
|
||||
|
||||
u16 halfWidth;
|
||||
u16 halfHeight;
|
||||
s16 height;
|
||||
|
||||
|
||||
f32* temp_r20;
|
||||
|
||||
|
|
@ -664,9 +669,8 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_
|
|||
}
|
||||
}
|
||||
|
||||
temp_r20 = &g_env_light.field_0x1264;
|
||||
cLib_addCalc(temp_r20, var_f30, 0.1f, 100.0f, 0.0001f);
|
||||
l_tevColor0.a = *temp_r20;
|
||||
cLib_addCalc(&g_env_light.field_0x1264, var_f30, 0.1f, 100.0f, 0.0001f);
|
||||
l_tevColor0.a = g_env_light.field_0x1264;
|
||||
if (l_tevColor0.a <= -254) {
|
||||
l_tevColor0.a = -255;
|
||||
}
|
||||
|
|
@ -789,9 +793,9 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_
|
|||
|
||||
if (l_tevColor0.a > -255) {
|
||||
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
|
||||
GXPosition3s16(x_orig, y_orig, -5);
|
||||
GXPosition3s16(x_orig, y_orig_pos, -5);
|
||||
GXTexCoord2s8(0, 0);
|
||||
GXPosition3s16(width, y_orig, -5);
|
||||
GXPosition3s16(width, y_orig_pos, -5);
|
||||
GXTexCoord2s8(1, 0);
|
||||
GXPosition3s16(width, height, -5);
|
||||
GXTexCoord2s8(1, 1);
|
||||
|
|
@ -874,12 +878,12 @@ static void trimming(view_class* param_0, view_port_class* param_1) {
|
|||
GXBegin(GX_QUADS, GX_VTXFMT0, 8);
|
||||
GXPosition3s16(0, 0, -5);
|
||||
GXPosition3s16(0x260, 0, -5);
|
||||
GXPosition3s16(0x280, sc_top, -5);
|
||||
GXPosition3s16(0x260, sc_top, -5);
|
||||
GXPosition3s16(0, sc_top, -5);
|
||||
GXPosition3s16(0, sc_bottom, -5);
|
||||
GXPosition3s16(0x280, sc_bottom, -5);
|
||||
GXPosition3s16(0x280, 0x1c0, -5);
|
||||
GXPosition3s16(0, 0x1c8, -5);
|
||||
GXPosition3s16(0x260, sc_bottom, -5);
|
||||
GXPosition3s16(0x260, 0x1c0, -5);
|
||||
GXPosition3s16(0, 0x1c0, -5);
|
||||
GXEnd();
|
||||
}
|
||||
GXSetScissor(param_1->mScissor.mXOrig, param_1->mScissor.mYOrig, param_1->mScissor.mWidth,
|
||||
|
|
|
|||
Loading…
Reference in New Issue