mirror of https://github.com/zeldaret/tp.git
d_a_tag_river_back OK (#1921)
This commit is contained in:
hatal175
GitHub
parent
189c40f58c
commit
0f4eac4420
|
|
@ -1,104 +0,0 @@
|
|||
lbl_80D5F710:
|
||||
/* 80D5F710 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 80D5F714 7C 08 02 A6 */ mflr r0
|
||||
/* 80D5F718 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 80D5F71C 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 80D5F720 4B 60 2A B9 */ bl _savegpr_28
|
||||
/* 80D5F724 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80D5F728 3C 60 80 D6 */ lis r3, lit_3813@ha /* 0x80D5F944@ha */
|
||||
/* 80D5F72C 3B A3 F9 44 */ addi r29, r3, lit_3813@l /* 0x80D5F944@l */
|
||||
/* 80D5F730 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80D5F734 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80D5F738 3B 83 4F F8 */ addi r28, r3, 0x4ff8
|
||||
/* 80D5F73C 7F 83 E3 78 */ mr r3, r28
|
||||
/* 80D5F740 80 9F 05 78 */ lwz r4, 0x578(r31)
|
||||
/* 80D5F744 3C A0 80 D6 */ lis r5, action_table@ha /* 0x80D5FA0C@ha */
|
||||
/* 80D5F748 38 A5 FA 0C */ addi r5, r5, action_table@l /* 0x80D5FA0C@l */
|
||||
/* 80D5F74C 38 C0 00 02 */ li r6, 2
|
||||
/* 80D5F750 38 E0 00 00 */ li r7, 0
|
||||
/* 80D5F754 39 00 00 00 */ li r8, 0
|
||||
/* 80D5F758 4B 2E 86 B9 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii
|
||||
/* 80D5F75C 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 80D5F760 7F 83 E3 78 */ mr r3, r28
|
||||
/* 80D5F764 80 9F 05 78 */ lwz r4, 0x578(r31)
|
||||
/* 80D5F768 4B 2E 85 E5 */ bl getIsAddvance__16dEvent_manager_cFi
|
||||
/* 80D5F76C 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80D5F770 41 82 00 94 */ beq lbl_80D5F804
|
||||
/* 80D5F774 2C 1E 00 01 */ cmpwi r30, 1
|
||||
/* 80D5F778 41 82 00 50 */ beq lbl_80D5F7C8
|
||||
/* 80D5F77C 40 80 00 88 */ bge lbl_80D5F804
|
||||
/* 80D5F780 2C 1E 00 00 */ cmpwi r30, 0
|
||||
/* 80D5F784 40 80 00 08 */ bge lbl_80D5F78C
|
||||
/* 80D5F788 48 00 00 7C */ b lbl_80D5F804
|
||||
lbl_80D5F78C:
|
||||
/* 80D5F78C 7F 83 E3 78 */ mr r3, r28
|
||||
/* 80D5F790 80 9F 05 78 */ lwz r4, 0x578(r31)
|
||||
/* 80D5F794 3C A0 80 D6 */ lis r5, d_a_tag_river_back__stringBase0@ha /* 0x80D5F950@ha */
|
||||
/* 80D5F798 38 A5 F9 50 */ addi r5, r5, d_a_tag_river_back__stringBase0@l /* 0x80D5F950@l */
|
||||
/* 80D5F79C 38 A5 00 28 */ addi r5, r5, 0x28
|
||||
/* 80D5F7A0 38 C0 00 03 */ li r6, 3
|
||||
/* 80D5F7A4 4B 2E 89 49 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
|
||||
/* 80D5F7A8 28 03 00 00 */ cmplwi r3, 0
|
||||
/* 80D5F7AC 40 82 00 10 */ bne lbl_80D5F7BC
|
||||
/* 80D5F7B0 38 00 00 01 */ li r0, 1
|
||||
/* 80D5F7B4 98 1F 05 70 */ stb r0, 0x570(r31)
|
||||
/* 80D5F7B8 48 00 00 4C */ b lbl_80D5F804
|
||||
lbl_80D5F7BC:
|
||||
/* 80D5F7BC 80 03 00 00 */ lwz r0, 0(r3)
|
||||
/* 80D5F7C0 98 1F 05 70 */ stb r0, 0x570(r31)
|
||||
/* 80D5F7C4 48 00 00 40 */ b lbl_80D5F804
|
||||
lbl_80D5F7C8:
|
||||
/* 80D5F7C8 38 00 00 33 */ li r0, 0x33
|
||||
/* 80D5F7CC 90 01 00 08 */ stw r0, 8(r1)
|
||||
/* 80D5F7D0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */
|
||||
/* 80D5F7D4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */
|
||||
/* 80D5F7D8 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80D5F7DC 38 81 00 08 */ addi r4, r1, 8
|
||||
/* 80D5F7E0 38 A0 00 00 */ li r5, 0
|
||||
/* 80D5F7E4 38 C0 00 00 */ li r6, 0
|
||||
/* 80D5F7E8 38 E0 00 00 */ li r7, 0
|
||||
/* 80D5F7EC C0 3D 00 00 */ lfs f1, 0(r29)
|
||||
/* 80D5F7F0 FC 40 08 90 */ fmr f2, f1
|
||||
/* 80D5F7F4 C0 7D 00 04 */ lfs f3, 4(r29)
|
||||
/* 80D5F7F8 FC 80 18 90 */ fmr f4, f3
|
||||
/* 80D5F7FC 39 00 00 00 */ li r8, 0
|
||||
/* 80D5F800 4B 54 C1 85 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
|
||||
lbl_80D5F804:
|
||||
/* 80D5F804 2C 1E 00 01 */ cmpwi r30, 1
|
||||
/* 80D5F808 41 82 00 34 */ beq lbl_80D5F83C
|
||||
/* 80D5F80C 40 80 00 58 */ bge lbl_80D5F864
|
||||
/* 80D5F810 2C 1E 00 00 */ cmpwi r30, 0
|
||||
/* 80D5F814 40 80 00 08 */ bge lbl_80D5F81C
|
||||
/* 80D5F818 48 00 00 4C */ b lbl_80D5F864
|
||||
lbl_80D5F81C:
|
||||
/* 80D5F81C 38 7F 05 70 */ addi r3, r31, 0x570
|
||||
/* 80D5F820 48 00 01 01 */ bl func_80D5F920
|
||||
/* 80D5F824 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 80D5F828 40 82 00 48 */ bne lbl_80D5F870
|
||||
/* 80D5F82C 7F 83 E3 78 */ mr r3, r28
|
||||
/* 80D5F830 80 9F 05 78 */ lwz r4, 0x578(r31)
|
||||
/* 80D5F834 4B 2E 89 49 */ bl cutEnd__16dEvent_manager_cFi
|
||||
/* 80D5F838 48 00 00 38 */ b lbl_80D5F870
|
||||
lbl_80D5F83C:
|
||||
/* 80D5F83C 80 1F 00 B0 */ lwz r0, 0xb0(r31)
|
||||
/* 80D5F840 54 03 06 3E */ clrlwi r3, r0, 0x18
|
||||
/* 80D5F844 C0 3D 00 08 */ lfs f1, 8(r29)
|
||||
/* 80D5F848 38 80 00 00 */ li r4, 0
|
||||
/* 80D5F84C 88 1F 04 E2 */ lbz r0, 0x4e2(r31)
|
||||
/* 80D5F850 7C 05 07 74 */ extsb r5, r0
|
||||
/* 80D5F854 38 C0 00 00 */ li r6, 0
|
||||
/* 80D5F858 38 E0 FF FF */ li r7, -1
|
||||
/* 80D5F85C 4B 2C 79 15 */ bl dStage_changeScene__FifUlScsi
|
||||
/* 80D5F860 48 00 00 10 */ b lbl_80D5F870
|
||||
lbl_80D5F864:
|
||||
/* 80D5F864 7F 83 E3 78 */ mr r3, r28
|
||||
/* 80D5F868 80 9F 05 78 */ lwz r4, 0x578(r31)
|
||||
/* 80D5F86C 4B 2E 89 11 */ bl cutEnd__16dEvent_manager_cFi
|
||||
lbl_80D5F870:
|
||||
/* 80D5F870 38 60 00 00 */ li r3, 0
|
||||
/* 80D5F874 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 80D5F878 4B 60 29 AD */ bl _restgpr_28
|
||||
/* 80D5F87C 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 80D5F880 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D5F884 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 80D5F888 4E 80 00 20 */ blr
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
lbl_80D5F48C:
|
||||
/* 80D5F48C 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D5F490 7C 08 02 A6 */ mflr r0
|
||||
/* 80D5F494 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D5F498 3C 80 80 D6 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80D5F980@ha */
|
||||
/* 80D5F49C 38 E4 F9 80 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80D5F980@l */
|
||||
/* 80D5F4A0 3C 80 80 D6 */ lis r4, data_80D5FA68@ha /* 0x80D5FA68@ha */
|
||||
/* 80D5F4A4 38 C4 FA 68 */ addi r6, r4, data_80D5FA68@l /* 0x80D5FA68@l */
|
||||
/* 80D5F4A8 88 06 00 00 */ lbz r0, 0(r6)
|
||||
/* 80D5F4AC 7C 00 07 75 */ extsb. r0, r0
|
||||
/* 80D5F4B0 40 82 00 70 */ bne lbl_80D5F520
|
||||
/* 80D5F4B4 80 87 00 2C */ lwz r4, 0x2c(r7)
|
||||
/* 80D5F4B8 80 07 00 30 */ lwz r0, 0x30(r7)
|
||||
/* 80D5F4BC 90 87 00 5C */ stw r4, 0x5c(r7)
|
||||
/* 80D5F4C0 90 07 00 60 */ stw r0, 0x60(r7)
|
||||
/* 80D5F4C4 80 07 00 34 */ lwz r0, 0x34(r7)
|
||||
/* 80D5F4C8 90 07 00 64 */ stw r0, 0x64(r7)
|
||||
/* 80D5F4CC 38 A7 00 5C */ addi r5, r7, 0x5c
|
||||
/* 80D5F4D0 80 87 00 38 */ lwz r4, 0x38(r7)
|
||||
/* 80D5F4D4 80 07 00 3C */ lwz r0, 0x3c(r7)
|
||||
/* 80D5F4D8 90 85 00 0C */ stw r4, 0xc(r5)
|
||||
/* 80D5F4DC 90 05 00 10 */ stw r0, 0x10(r5)
|
||||
/* 80D5F4E0 80 07 00 40 */ lwz r0, 0x40(r7)
|
||||
/* 80D5F4E4 90 05 00 14 */ stw r0, 0x14(r5)
|
||||
/* 80D5F4E8 80 87 00 44 */ lwz r4, 0x44(r7)
|
||||
/* 80D5F4EC 80 07 00 48 */ lwz r0, 0x48(r7)
|
||||
/* 80D5F4F0 90 85 00 18 */ stw r4, 0x18(r5)
|
||||
/* 80D5F4F4 90 05 00 1C */ stw r0, 0x1c(r5)
|
||||
/* 80D5F4F8 80 07 00 4C */ lwz r0, 0x4c(r7)
|
||||
/* 80D5F4FC 90 05 00 20 */ stw r0, 0x20(r5)
|
||||
/* 80D5F500 80 87 00 50 */ lwz r4, 0x50(r7)
|
||||
/* 80D5F504 80 07 00 54 */ lwz r0, 0x54(r7)
|
||||
/* 80D5F508 90 85 00 24 */ stw r4, 0x24(r5)
|
||||
/* 80D5F50C 90 05 00 28 */ stw r0, 0x28(r5)
|
||||
/* 80D5F510 80 07 00 58 */ lwz r0, 0x58(r7)
|
||||
/* 80D5F514 90 05 00 2C */ stw r0, 0x2c(r5)
|
||||
/* 80D5F518 38 00 00 01 */ li r0, 1
|
||||
/* 80D5F51C 98 06 00 00 */ stb r0, 0(r6)
|
||||
lbl_80D5F520:
|
||||
/* 80D5F520 88 03 05 71 */ lbz r0, 0x571(r3)
|
||||
/* 80D5F524 1C 00 00 0C */ mulli r0, r0, 0xc
|
||||
/* 80D5F528 39 87 00 5C */ addi r12, r7, 0x5c
|
||||
/* 80D5F52C 7D 8C 02 14 */ add r12, r12, r0
|
||||
/* 80D5F530 4B 60 2B 55 */ bl __ptmf_scall
|
||||
/* 80D5F534 60 00 00 00 */ nop
|
||||
/* 80D5F538 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D5F53C 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D5F540 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D5F544 4E 80 00 20 */ blr
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
lbl_80D5F360:
|
||||
/* 80D5F360 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D5F364 7C 08 02 A6 */ mflr r0
|
||||
/* 80D5F368 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D5F36C 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80D5F370 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 80D5F374 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 80D5F378 80 03 04 A0 */ lwz r0, 0x4a0(r3)
|
||||
/* 80D5F37C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
|
||||
/* 80D5F380 40 82 00 1C */ bne lbl_80D5F39C
|
||||
/* 80D5F384 28 1E 00 00 */ cmplwi r30, 0
|
||||
/* 80D5F388 41 82 00 08 */ beq lbl_80D5F390
|
||||
/* 80D5F38C 4B 2B 97 D9 */ bl __ct__10fopAc_ac_cFv
|
||||
lbl_80D5F390:
|
||||
/* 80D5F390 80 1E 04 A0 */ lwz r0, 0x4a0(r30)
|
||||
/* 80D5F394 60 00 00 08 */ ori r0, r0, 8
|
||||
/* 80D5F398 90 1E 04 A0 */ stw r0, 0x4a0(r30)
|
||||
lbl_80D5F39C:
|
||||
/* 80D5F39C 38 7E 05 68 */ addi r3, r30, 0x568
|
||||
/* 80D5F3A0 3C 80 80 D6 */ lis r4, l_arcName@ha /* 0x80D5F9A0@ha */
|
||||
/* 80D5F3A4 38 84 F9 A0 */ addi r4, r4, l_arcName@l /* 0x80D5F9A0@l */
|
||||
/* 80D5F3A8 80 84 00 00 */ lwz r4, 0(r4)
|
||||
/* 80D5F3AC 4B 2C DB 11 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc
|
||||
/* 80D5F3B0 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80D5F3B4 2C 1F 00 04 */ cmpwi r31, 4
|
||||
/* 80D5F3B8 40 82 00 1C */ bne lbl_80D5F3D4
|
||||
/* 80D5F3BC 7F C3 F3 78 */ mr r3, r30
|
||||
/* 80D5F3C0 4B FF FF 39 */ bl Create__16daTagRiverBack_cFv
|
||||
/* 80D5F3C4 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80D5F3C8 40 82 00 0C */ bne lbl_80D5F3D4
|
||||
/* 80D5F3CC 38 60 00 05 */ li r3, 5
|
||||
/* 80D5F3D0 48 00 00 08 */ b lbl_80D5F3D8
|
||||
lbl_80D5F3D4:
|
||||
/* 80D5F3D4 7F E3 FB 78 */ mr r3, r31
|
||||
lbl_80D5F3D8:
|
||||
/* 80D5F3D8 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80D5F3DC 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 80D5F3E0 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D5F3E4 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D5F3E8 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D5F3EC 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_80D5F920:
|
||||
/* 80D5F920 88 83 00 00 */ lbz r4, 0(r3)
|
||||
/* 80D5F924 28 04 00 00 */ cmplwi r4, 0
|
||||
/* 80D5F928 41 82 00 0C */ beq lbl_80D5F934
|
||||
/* 80D5F92C 38 04 FF FF */ addi r0, r4, -1
|
||||
/* 80D5F930 98 03 00 00 */ stb r0, 0(r3)
|
||||
lbl_80D5F934:
|
||||
/* 80D5F934 88 63 00 00 */ lbz r3, 0(r3)
|
||||
/* 80D5F938 4E 80 00 20 */ blr
|
||||
|
|
@ -8,12 +8,10 @@ M736_MAP := $(BUILD_DIR)/rel/d/a/tag/d_a_tag_river_back.map
|
|||
|
||||
M736_CPP_FILES := \
|
||||
rel/executor.cpp \
|
||||
rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_bss.cpp \
|
||||
rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp \
|
||||
|
||||
M736_O_FILES := \
|
||||
$(BUILD_DIR)/rel/executor.o \
|
||||
$(BUILD_DIR)/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_bss.o \
|
||||
$(BUILD_DIR)/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.o \
|
||||
|
||||
M736_LIBS := \
|
||||
|
|
|
|||
|
|
@ -6,39 +6,15 @@
|
|||
#include "rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void Create__16daTagRiverBack_cFv();
|
||||
extern "C" void actionWait__16daTagRiverBack_cFv();
|
||||
extern "C" void actionOrderEvent__16daTagRiverBack_cFv();
|
||||
extern "C" void actionEvent__16daTagRiverBack_cFv();
|
||||
extern "C" void actionDead__16daTagRiverBack_cFv();
|
||||
// clib_calcTimer
|
||||
extern "C" u8 func_80D5F920(u8*);
|
||||
extern "C" extern char const* const d_a_tag_river_back__stringBase0;
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void __ct__10fopAc_ac_cFv();
|
||||
extern "C" void dStage_changeScene__FifUlScsi();
|
||||
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
|
||||
extern "C" void getIsAddvance__16dEvent_manager_cFi();
|
||||
extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii();
|
||||
extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci();
|
||||
extern "C" void cutEnd__16dEvent_manager_cFi();
|
||||
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void __ptmf_scall();
|
||||
extern "C" void _savegpr_28();
|
||||
extern "C" void _restgpr_28();
|
||||
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
extern "C" extern u8 data_80D5FA68[4];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
|
@ -77,27 +53,17 @@ int daTagRiverBack_c::Create() {
|
|||
}
|
||||
|
||||
/* 80D5F360-80D5F3F0 0000E0 0090+00 1/1 0/0 0/0 .text create__16daTagRiverBack_cFv */
|
||||
#ifdef NONMATCHING
|
||||
// The diff shows this function as matching, but hash is different
|
||||
int daTagRiverBack_c::create() {
|
||||
fopAcM_SetupActor(this, daTagRiverBack_c);
|
||||
int phase = dComIfG_resLoad(&mPhase, "RvBack");
|
||||
int result = Create();
|
||||
if (phase == cPhs_COMPLEATE_e && !result) {
|
||||
phase = cPhs_ERROR_e;
|
||||
int phase = dComIfG_resLoad(&mPhase, l_arcName);
|
||||
if (phase == cPhs_COMPLEATE_e) {
|
||||
int result = Create();
|
||||
if (!result) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
}
|
||||
return phase;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm int daTagRiverBack_c::create() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back/func_80D5F360.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 80D5F3F0-80D5F48C 000170 009C+00 1/1 0/0 0/0 .text execute__16daTagRiverBack_cFv */
|
||||
int daTagRiverBack_c::execute() {
|
||||
|
|
@ -120,7 +86,6 @@ int daTagRiverBack_c::execute() {
|
|||
/* 80D5F9A8-80D5F9AC -00001 0004+00 1/1 0/0 0/0 .data l_staffName */
|
||||
static char* l_staffName = "rvback";
|
||||
|
||||
#ifdef NONMATCHING
|
||||
/* 80D5F48C-80D5F548 00020C 00BC+00 1/1 0/0 0/0 .text event_proc_call__16daTagRiverBack_cFv */
|
||||
void daTagRiverBack_c::event_proc_call() {
|
||||
typedef void (daTagRiverBack_c::*actionFunc)();
|
||||
|
|
@ -131,67 +96,6 @@ void daTagRiverBack_c::event_proc_call() {
|
|||
|
||||
(this->*l_func[mAction])();
|
||||
}
|
||||
#else
|
||||
/* 80D5F9AC-80D5F9B8 -00001 000C+00 0/1 0/0 0/0 .data @3712 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static void* lit_3712[3] = {
|
||||
(void*)NULL,
|
||||
(void*)0xFFFFFFFF,
|
||||
(void*)actionWait__16daTagRiverBack_cFv,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 80D5F9B8-80D5F9C4 -00001 000C+00 0/1 0/0 0/0 .data @3713 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static void* lit_3713[3] = {
|
||||
(void*)NULL,
|
||||
(void*)0xFFFFFFFF,
|
||||
(void*)actionOrderEvent__16daTagRiverBack_cFv,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 80D5F9C4-80D5F9D0 -00001 000C+00 0/1 0/0 0/0 .data @3714 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static void* lit_3714[3] = {
|
||||
(void*)NULL,
|
||||
(void*)0xFFFFFFFF,
|
||||
(void*)actionEvent__16daTagRiverBack_cFv,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 80D5F9D0-80D5F9DC -00001 000C+00 0/1 0/0 0/0 .data @3715 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static void* lit_3715[3] = {
|
||||
(void*)NULL,
|
||||
(void*)0xFFFFFFFF,
|
||||
(void*)actionDead__16daTagRiverBack_cFv,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 80D5F9DC-80D5FA0C 00005C 0030+00 0/1 0/0 0/0 .data l_func$3711 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 l_func[48] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 80D5F48C-80D5F548 00020C 00BC+00 1/1 0/0 0/0 .text event_proc_call__16daTagRiverBack_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTagRiverBack_c::event_proc_call() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back/event_proc_call__16daTagRiverBack_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 80D5F548-80D5F5BC 0002C8 0074+00 1/0 0/0 0/0 .text actionWait__16daTagRiverBack_cFv */
|
||||
void daTagRiverBack_c::actionWait() {
|
||||
|
|
@ -236,10 +140,6 @@ void daTagRiverBack_c::actionEvent() {
|
|||
/* 80D5F70C-80D5F710 00048C 0004+00 1/0 0/0 0/0 .text actionDead__16daTagRiverBack_cFv */
|
||||
void daTagRiverBack_c::actionDead() {}
|
||||
|
||||
/* ############################################################################################## */
|
||||
#ifdef NONMATCHING
|
||||
// Does not match due to cLib_calcTimer, also "Timer" string
|
||||
|
||||
/* 80D5FA0C-80D5FA14 -00001 0008+00 1/1 0/0 0/0 .data action_table$3769 */
|
||||
static char* action_table[] = {"WAIT", "SCENE_CHG"};
|
||||
|
||||
|
|
@ -263,8 +163,7 @@ int daTagRiverBack_c::demoProc() {
|
|||
}
|
||||
switch (act_id) {
|
||||
case WAIT_e:
|
||||
// Function is cLib_calcTimer
|
||||
if ((func_80D5F920(&mTimer) & 0xFF) == 0) {
|
||||
if ((cLib_calcTimer(&mTimer) & 0xFF) == 0) {
|
||||
dComIfGp_evmng_cutEnd(mStaffID);
|
||||
}
|
||||
break;
|
||||
|
|
@ -278,54 +177,6 @@ int daTagRiverBack_c::demoProc() {
|
|||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
/* 80D5F944-80D5F948 000000 0004+00 1/1 0/0 0/0 .rodata @3813 */
|
||||
SECTION_RODATA static f32 const lit_3813 = 1.0f;
|
||||
COMPILER_STRIP_GATE(0x80D5F944, &lit_3813);
|
||||
|
||||
/* 80D5F948-80D5F94C 000004 0004+00 0/1 0/0 0/0 .rodata @3814 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3814 = -1.0f;
|
||||
COMPILER_STRIP_GATE(0x80D5F948, &lit_3814);
|
||||
#pragma pop
|
||||
|
||||
/* 80D5F94C-80D5F950 000008 0004+00 0/1 0/0 0/0 .rodata @3815 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3815[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80D5F94C, &lit_3815);
|
||||
#pragma pop
|
||||
|
||||
/* 80D5F950-80D5F950 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80D5F969 = "WAIT";
|
||||
SECTION_DEAD static char const* const stringBase_80D5F96E = "SCENE_CHG";
|
||||
SECTION_DEAD static char const* const stringBase_80D5F978 = "Timer";
|
||||
#pragma pop
|
||||
|
||||
/* 80D5FA0C-80D5FA14 -00001 0008+00 1/1 0/0 0/0 .data action_table$3769 */
|
||||
SECTION_DATA static void* action_table[2] = {
|
||||
(void*)(((char*)&d_a_tag_river_back__stringBase0) + 0x19),
|
||||
(void*)(((char*)&d_a_tag_river_back__stringBase0) + 0x1E),
|
||||
};
|
||||
|
||||
/* 80D5F710-80D5F88C 000490 017C+00 2/2 0/0 0/0 .text demoProc__16daTagRiverBack_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm int daTagRiverBack_c::demoProc() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back/demoProc__16daTagRiverBack_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 80D5F88C-80D5F8C0 00060C 0034+00 1/1 0/0 0/0 .text _delete__16daTagRiverBack_cFv */
|
||||
int daTagRiverBack_c::_delete() {
|
||||
|
|
@ -351,16 +202,6 @@ static int daTagRiverBack_Create(daTagRiverBack_c* i_this) {
|
|||
return i_this->create();
|
||||
}
|
||||
|
||||
/* 80D5F920-80D5F93C 0006A0 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<Uc>__FPUc */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
extern "C" asm u8 func_80D5F920(u8* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back/func_80D5F920.s"
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80D5FA14-80D5FA34 -00001 0020+00 1/0 0/0 0/0 .data l_daTagRiverBack_Method */
|
||||
static actor_method_class l_daTagRiverBack_Method = {(process_method_func)daTagRiverBack_Create,
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: unknown_translation_unit_bss
|
||||
//
|
||||
|
||||
#include "rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_bss.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" extern u8 data_80D5FA68[4];
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80D5FA68-80D5FA6C 000000 0004+00 0/0 1/1 0/0 .bss None */
|
||||
extern u8 data_80D5FA68[4];
|
||||
u8 data_80D5FA68[4];
|
||||
Loading…
Reference in New Issue