mirror of
https://github.com/n64decomp/banjo-kazooie.git
synced 2024-11-26 22:30:22 +00:00
Merge branch 'master' into banjo-kazooie-var_renames
This commit is contained in:
Banjo Kazooie
commit
35a2c13ea9
24
Makefile
24
Makefile
@ -44,7 +44,7 @@ PRINT := printf
|
||||
ASM_PROCESSOR_DIR := tools/asm-processor
|
||||
BK_ROM_COMPRESS := tools/bk_rom_compressor/target/release/bk_rom_compress
|
||||
BK_ROM_DECOMPRESS := tools/bk_rom_compressor/target/release/bk_rom_decompress
|
||||
BK_ASSET_TOOL := tools/bk_asset_tool/bk_asset_tool
|
||||
BK_ASSET_TOOL := tools/bk_asset_tool/target/release/bk_asset_tool
|
||||
ASM_PROCESSOR := $(PYTHON) $(ASM_PROCESSOR_DIR)/asm_processor.py
|
||||
SPLAT_INPUTS := $(PYTHON) tools/splat_inputs.py
|
||||
PROGRESS := $(PYTHON) tools/progress.py
|
||||
@ -166,7 +166,7 @@ OPT_FLAGS := -O2
|
||||
MIPSBIT := -mips2
|
||||
ASFLAGS := -EB -mtune=vr4300 -march=vr4300 -mabi=32 -I include
|
||||
GCC_ASFLAGS := -c -x assembler-with-cpp -mabi=32 -ffreestanding -mtune=vr4300 -march=vr4300 -mfix4300 -G 0 -O -mno-shared -fno-PIC -mno-abicalls
|
||||
LDFLAGS := -T $(LD_SCRIPT) -Map $(ELF:.elf=.map) --no-check-sections --accept-unknown-input-arch -T undefined_syms.libultra.txt
|
||||
LDFLAGS := -T $(LD_SCRIPT) -Map $(ELF:.elf=.map) --no-check-sections --accept-unknown-input-arch -T manual_syms.txt
|
||||
BINOFLAGS := -I binary -O elf32-tradbigmips
|
||||
|
||||
### Rules ###
|
||||
@ -316,7 +316,7 @@ $(DECOMPRESSED_BASEROM): $(BASEROM) $(BK_ROM_DECOMPRESS)
|
||||
# .o -> .elf (dummy symbols)
|
||||
$(PRELIM_ELF): $(ALL_OBJS) $(LD_SCRIPT) $(ASSET_OBJS)
|
||||
$(call print1,Linking elf:,$@)
|
||||
@$(LD) $(LDFLAGS) -T undefined_syms_auto.$(VERSION).txt -T undefined_syms.$(VERSION).txt -T rzip_dummy_addrs.txt -o $@
|
||||
@$(LD) $(LDFLAGS) -T rzip_dummy_addrs.txt -o $@
|
||||
|
||||
# .elf -> .z64 (dummy symbols)
|
||||
$(PRELIM_Z64) : $(PRELIM_ELF)
|
||||
@ -330,7 +330,7 @@ $(COMPRESSED_SYMBOLS): $(PRELIM_ELF) $(PRELIM_Z64) $(BK_ROM_COMPRESS)
|
||||
# .o -> .elf (game)
|
||||
$(ELF): $(ALL_OBJS) $(LD_SCRIPT) $(ASSET_OBJS) $(COMPRESSED_SYMBOLS)
|
||||
$(call print1,Linking elf:,$@)
|
||||
@$(LD) $(LDFLAGS) -T undefined_syms_auto.$(VERSION).txt -T undefined_syms.$(VERSION).txt -T $(COMPRESSED_SYMBOLS) -o $@
|
||||
@$(LD) $(LDFLAGS) -T $(COMPRESSED_SYMBOLS) -o $@
|
||||
|
||||
# .elf -> .z64 (uncompressed)
|
||||
$(UNCOMPRESSED_Z64) : $(ELF)
|
||||
@ -341,15 +341,18 @@ $(UNCOMPRESSED_Z64) : $(ELF)
|
||||
$(FINAL_Z64) : $(UNCOMPRESSED_Z64) $(ELF) $(BK_ROM_COMPRESS)
|
||||
@$(BK_ROM_COMPRESS) $(ELF) $(UNCOMPRESSED_Z64) $@
|
||||
|
||||
# TOOLS
|
||||
# Tool for spliting BK asset sections into and from ROM Bin and transforming certain file types
|
||||
$(BK_ASSET_TOOL):
|
||||
@$(CD) tools/bk_asset_tool && cargo build --release
|
||||
@$(CP) tools/bk_asset_tool/target/release/bk_asset_tool $@
|
||||
@$(CD) tools/bk_asset_tool && cargo build --release 2> /dev/null
|
||||
|
||||
# Tool to compress BK and correct checksums from elf and uncompressed rom
|
||||
$(BK_ROM_COMPRESS):
|
||||
@$(CD) tools/bk_rom_compressor && cargo build --release --bin bk_rom_compress
|
||||
@$(CD) tools/bk_rom_compressor && cargo build --release --bin bk_rom_compress 2> /dev/null
|
||||
|
||||
# Tool to turn compressed BK into uncompressed ROM
|
||||
$(BK_ROM_DECOMPRESS):
|
||||
@$(CD) tools/bk_rom_compressor && cargo build --release --bin bk_rom_decompress
|
||||
@$(CD) tools/bk_rom_compressor && cargo build --release --bin bk_rom_decompress 2> /dev/null
|
||||
|
||||
clean:
|
||||
$(call print0,Cleaning build artifacts)
|
||||
@ -361,7 +364,6 @@ clean:
|
||||
@$(RM) -rf $(addprefix $(ASM_ROOT)/,$(filter-out core1,$(OVERLAYS)))
|
||||
@$(RM) -rf $(ASM_ROOT)/core1/*.s
|
||||
@$(RM) -rf $(ASM_ROOT)/core1/os
|
||||
@$(RM) -f undefined_syms_auto* undefined_funcs_auto*
|
||||
@$(RM) -f *.ld
|
||||
|
||||
# Per-file flag definitions
|
||||
@ -415,7 +417,9 @@ MAKEFLAGS += -r
|
||||
.SUFFIXES:
|
||||
|
||||
# Phony targets
|
||||
.PHONY: all clean verify $(OVERLAYS) progress $(addprefix progress-,$(OVERLAYS))
|
||||
.PHONY: all clean verify $(OVERLAYS) progress $(addprefix progress-,$(OVERLAYS)) \
|
||||
$(BK_ASSET_TOOL) $(BK_ROM_COMPRESS) $(BK_ROM_DECOMPRESS)
|
||||
|
||||
|
||||
# Set up pipefail
|
||||
SHELL = /bin/bash -e -o pipefail
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# banjo (98.6934%)
|
||||
# banjo (100.0000%)
|
||||
|
||||
<img src="./progress/progress_total.svg">
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#include <sys/asm.h>
|
||||
#include <PR/rcp.h>
|
||||
.include "macro.inc"
|
||||
|
||||
/* assembler directives */
|
||||
@ -59,6 +60,8 @@ __osIntTable:
|
||||
|
||||
.section .text, "ax"
|
||||
|
||||
/* Generated by spimdisasm 1.24.3 */
|
||||
|
||||
# Handwritten function
|
||||
glabel func_8026A2E0
|
||||
/* F45B10 8026A2E0 3C1A8027 */ lui $k0, %hi(D_8026A300)
|
||||
@ -141,8 +144,8 @@ D_8026A300:
|
||||
/* F45C40 8026A410 0369D825 */ or $k1, $k1, $t1
|
||||
/* F45C44 8026A414 AF5B0118 */ sw $k1, 0x118($k0)
|
||||
.L8026A418:
|
||||
/* F45C48 8026A418 3C09A430 */ lui $t1, %hi(D_A430000C)
|
||||
/* F45C4C 8026A41C 8D29000C */ lw $t1, %lo(D_A430000C)($t1)
|
||||
/* F45C48 8026A418 3C09A430 */ lui $t1, %hi(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
/* F45C4C 8026A41C 8D29000C */ lw $t1, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($t1)
|
||||
/* F45C50 8026A420 5120000C */ beql $t1, $zero, .L8026A454
|
||||
/* F45C54 8026A424 AF490128 */ sw $t1, 0x128($k0)
|
||||
/* F45C58 8026A428 3C088027 */ lui $t0, %hi(__OSGlobalIntMask)
|
||||
@ -258,21 +261,21 @@ rcp:
|
||||
/* F45DE4 8026A5B4 3C088027 */ lui $t0, %hi(__OSGlobalIntMask)
|
||||
/* F45DE8 8026A5B8 25087130 */ addiu $t0, $t0, %lo(__OSGlobalIntMask)
|
||||
/* F45DEC 8026A5BC 8D080000 */ lw $t0, 0x0($t0)
|
||||
/* F45DF0 8026A5C0 3C11A430 */ lui $s1, %hi(D_A4300008)
|
||||
/* F45DF4 8026A5C4 8E310008 */ lw $s1, %lo(D_A4300008)($s1)
|
||||
/* F45DF0 8026A5C0 3C11A430 */ lui $s1, %hi(PHYS_TO_K1(MI_INTR_REG))
|
||||
/* F45DF4 8026A5C4 8E310008 */ lw $s1, %lo(PHYS_TO_K1(MI_INTR_REG))($s1)
|
||||
/* F45DF8 8026A5C8 00084402 */ srl $t0, $t0, 16
|
||||
/* F45DFC 8026A5CC 02288824 */ and $s1, $s1, $t0
|
||||
/* F45E00 8026A5D0 32290001 */ andi $t1, $s1, 0x1
|
||||
/* F45E04 8026A5D4 51200014 */ beql $t1, $zero, .L8026A628
|
||||
/* F45E08 8026A5D8 32290008 */ andi $t1, $s1, 0x8
|
||||
/* F45E0C 8026A5DC 3C0CA404 */ lui $t4, %hi(D_A4040010)
|
||||
/* F45E10 8026A5E0 8D8C0010 */ lw $t4, %lo(D_A4040010)($t4)
|
||||
/* F45E0C 8026A5DC 3C0CA404 */ lui $t4, %hi(PHYS_TO_K1(SP_STATUS_REG))
|
||||
/* F45E10 8026A5E0 8D8C0010 */ lw $t4, %lo(PHYS_TO_K1(SP_STATUS_REG))($t4)
|
||||
/* F45E14 8026A5E4 24090008 */ addiu $t1, $zero, 0x8
|
||||
/* F45E18 8026A5E8 3C01A404 */ lui $at, %hi(D_A4040010)
|
||||
/* F45E18 8026A5E8 3C01A404 */ lui $at, %hi(PHYS_TO_K1(SP_STATUS_REG))
|
||||
/* F45E1C 8026A5EC 318C0300 */ andi $t4, $t4, 0x300
|
||||
/* F45E20 8026A5F0 3231003E */ andi $s1, $s1, 0x3E
|
||||
/* F45E24 8026A5F4 11800007 */ beqz $t4, .L8026A614
|
||||
/* F45E28 8026A5F8 AC290010 */ sw $t1, %lo(D_A4040010)($at)
|
||||
/* F45E28 8026A5F8 AC290010 */ sw $t1, %lo(PHYS_TO_K1(SP_STATUS_REG))($at)
|
||||
/* F45E2C 8026A5FC 0C09AA09 */ jal func_8026A824
|
||||
/* F45E30 8026A600 24040020 */ addiu $a0, $zero, 0x20
|
||||
/* F45E34 8026A604 52200039 */ beql $s1, $zero, .L8026A6EC
|
||||
@ -287,9 +290,9 @@ rcp:
|
||||
/* F45E54 8026A624 32290008 */ andi $t1, $s1, 0x8
|
||||
.L8026A628:
|
||||
/* F45E58 8026A628 11200007 */ beqz $t1, .L8026A648
|
||||
/* F45E5C 8026A62C 3C01A440 */ lui $at, %hi(D_A4400010)
|
||||
/* F45E5C 8026A62C 3C01A440 */ lui $at, %hi(PHYS_TO_K1(VI_CURRENT_REG))
|
||||
/* F45E60 8026A630 32310037 */ andi $s1, $s1, 0x37
|
||||
/* F45E64 8026A634 AC200010 */ sw $zero, %lo(D_A4400010)($at)
|
||||
/* F45E64 8026A634 AC200010 */ sw $zero, %lo(PHYS_TO_K1(VI_CURRENT_REG))($at)
|
||||
/* F45E68 8026A638 0C09AA09 */ jal func_8026A824
|
||||
/* F45E6C 8026A63C 24040038 */ addiu $a0, $zero, 0x38
|
||||
/* F45E70 8026A640 5220002A */ beql $s1, $zero, .L8026A6EC
|
||||
@ -299,9 +302,9 @@ rcp:
|
||||
/* F45E7C 8026A64C 5120000A */ beql $t1, $zero, .L8026A678
|
||||
/* F45E80 8026A650 32290002 */ andi $t1, $s1, 0x2
|
||||
/* F45E84 8026A654 24090001 */ addiu $t1, $zero, 0x1
|
||||
/* F45E88 8026A658 3C01A450 */ lui $at, %hi(D_A450000C)
|
||||
/* F45E88 8026A658 3C01A450 */ lui $at, %hi(PHYS_TO_K1(AI_STATUS_REG))
|
||||
/* F45E8C 8026A65C 3231003B */ andi $s1, $s1, 0x3B
|
||||
/* F45E90 8026A660 AC29000C */ sw $t1, %lo(D_A450000C)($at)
|
||||
/* F45E90 8026A660 AC29000C */ sw $t1, %lo(PHYS_TO_K1(AI_STATUS_REG))($at)
|
||||
/* F45E94 8026A664 0C09AA09 */ jal func_8026A824
|
||||
/* F45E98 8026A668 24040030 */ addiu $a0, $zero, 0x30
|
||||
/* F45E9C 8026A66C 5220001F */ beql $s1, $zero, .L8026A6EC
|
||||
@ -309,9 +312,9 @@ rcp:
|
||||
/* F45EA4 8026A674 32290002 */ andi $t1, $s1, 0x2
|
||||
.L8026A678:
|
||||
/* F45EA8 8026A678 11200007 */ beqz $t1, .L8026A698
|
||||
/* F45EAC 8026A67C 3C01A480 */ lui $at, %hi(D_A4800018)
|
||||
/* F45EAC 8026A67C 3C01A480 */ lui $at, %hi(PHYS_TO_K1(SI_STATUS_REG))
|
||||
/* F45EB0 8026A680 3231003D */ andi $s1, $s1, 0x3D
|
||||
/* F45EB4 8026A684 AC200018 */ sw $zero, %lo(D_A4800018)($at)
|
||||
/* F45EB4 8026A684 AC200018 */ sw $zero, %lo(PHYS_TO_K1(SI_STATUS_REG))($at)
|
||||
/* F45EB8 8026A688 0C09AA09 */ jal func_8026A824
|
||||
/* F45EBC 8026A68C 24040028 */ addiu $a0, $zero, 0x28
|
||||
/* F45EC0 8026A690 52200016 */ beql $s1, $zero, .L8026A6EC
|
||||
@ -321,9 +324,9 @@ rcp:
|
||||
/* F45ECC 8026A69C 5120000A */ beql $t1, $zero, .L8026A6C8
|
||||
/* F45ED0 8026A6A0 32290020 */ andi $t1, $s1, 0x20
|
||||
/* F45ED4 8026A6A4 24090002 */ addiu $t1, $zero, 0x2
|
||||
/* F45ED8 8026A6A8 3C01A460 */ lui $at, %hi(D_A4600010)
|
||||
/* F45ED8 8026A6A8 3C01A460 */ lui $at, %hi(PHYS_TO_K1(PI_STATUS_REG))
|
||||
/* F45EDC 8026A6AC 3231002F */ andi $s1, $s1, 0x2F
|
||||
/* F45EE0 8026A6B0 AC290010 */ sw $t1, %lo(D_A4600010)($at)
|
||||
/* F45EE0 8026A6B0 AC290010 */ sw $t1, %lo(PHYS_TO_K1(PI_STATUS_REG))($at)
|
||||
/* F45EE4 8026A6B4 0C09AA09 */ jal func_8026A824
|
||||
/* F45EE8 8026A6B8 24040040 */ addiu $a0, $zero, 0x40
|
||||
/* F45EEC 8026A6BC 5220000B */ beql $s1, $zero, .L8026A6EC
|
||||
@ -333,9 +336,9 @@ rcp:
|
||||
/* F45EF8 8026A6C8 51200008 */ beql $t1, $zero, .L8026A6EC
|
||||
/* F45EFC 8026A6CC 2401FBFF */ addiu $at, $zero, -0x401
|
||||
/* F45F00 8026A6D0 24090800 */ addiu $t1, $zero, 0x800
|
||||
/* F45F04 8026A6D4 3C01A430 */ lui $at, %hi(D_A4300000)
|
||||
/* F45F04 8026A6D4 3C01A430 */ lui $at, %hi(PHYS_TO_K1(MI_MODE_REG))
|
||||
/* F45F08 8026A6D8 3231001F */ andi $s1, $s1, 0x1F
|
||||
/* F45F0C 8026A6DC AC290000 */ sw $t1, %lo(D_A4300000)($at)
|
||||
/* F45F0C 8026A6DC AC290000 */ sw $t1, %lo(PHYS_TO_K1(MI_MODE_REG))($at)
|
||||
/* F45F10 8026A6E0 0C09AA09 */ jal func_8026A824
|
||||
/* F45F14 8026A6E4 24040048 */ addiu $a0, $zero, 0x48
|
||||
/* F45F18 8026A6E8 2401FBFF */ addiu $at, $zero, -0x401
|
||||
@ -427,6 +430,7 @@ enqueueRunning:
|
||||
/* F4604C 8026A81C 0809AA99 */ j __osDispatchThread
|
||||
/* F46050 8026A820 00000000 */ nop
|
||||
endlabel func_8026A2E0
|
||||
.size func_8026A2E0, . - func_8026A2E0
|
||||
|
||||
# Handwritten function
|
||||
glabel func_8026A824
|
||||
@ -493,6 +497,7 @@ glabel func_8026A824
|
||||
/* F46134 8026A904 1000FFB5 */ b enqueueRunning
|
||||
/* F46138 8026A908 AF5B0118 */ sw $k1, 0x118($k0)
|
||||
endlabel func_8026A824
|
||||
.size func_8026A824, . - func_8026A824
|
||||
|
||||
# Handwritten function
|
||||
glabel __osEnqueueAndYield
|
||||
@ -528,7 +533,7 @@ glabel __osEnqueueAndYield
|
||||
/* F461AC 8026A97C 8CBB0118 */ lw $k1, 0x118($a1)
|
||||
/* F461B0 8026A980 3369FF00 */ andi $t1, $k1, 0xFF00
|
||||
/* F461B4 8026A984 5120000E */ beql $t1, $zero, .L8026A9C0
|
||||
/* F461B8 8026A988 3C1BA430 */ lui $k1, %hi(D_A430000C)
|
||||
/* F461B8 8026A988 3C1BA430 */ lui $k1, %hi(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
/* F461BC 8026A98C 3C088027 */ lui $t0, %hi(__OSGlobalIntMask)
|
||||
/* F461C0 8026A990 25087130 */ addiu $t0, $t0, %lo(__OSGlobalIntMask)
|
||||
/* F461C4 8026A994 8D080000 */ lw $t0, 0x0($t0)
|
||||
@ -541,9 +546,9 @@ glabel __osEnqueueAndYield
|
||||
/* F461E0 8026A9B0 0361D824 */ and $k1, $k1, $at
|
||||
/* F461E4 8026A9B4 0369D825 */ or $k1, $k1, $t1
|
||||
/* F461E8 8026A9B8 ACBB0118 */ sw $k1, 0x118($a1)
|
||||
/* F461EC 8026A9BC 3C1BA430 */ lui $k1, %hi(D_A430000C)
|
||||
/* F461EC 8026A9BC 3C1BA430 */ lui $k1, %hi(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
.L8026A9C0:
|
||||
/* F461F0 8026A9C0 8F7B000C */ lw $k1, %lo(D_A430000C)($k1)
|
||||
/* F461F0 8026A9C0 8F7B000C */ lw $k1, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($k1)
|
||||
/* F461F4 8026A9C4 1360000B */ beqz $k1, .L8026A9F4
|
||||
/* F461F8 8026A9C8 00000000 */ nop
|
||||
/* F461FC 8026A9CC 3C1A8027 */ lui $k0, %hi(__OSGlobalIntMask)
|
||||
@ -565,6 +570,7 @@ glabel __osEnqueueAndYield
|
||||
/* F46234 8026AA04 0809AA99 */ j __osDispatchThread
|
||||
/* F46238 8026AA08 00000000 */ nop
|
||||
endlabel __osEnqueueAndYield
|
||||
.size __osEnqueueAndYield, . - __osEnqueueAndYield
|
||||
|
||||
glabel __osEnqueueThread
|
||||
/* F4623C 8026AA0C 8C980000 */ lw $t8, 0x0($a0)
|
||||
@ -588,6 +594,7 @@ glabel __osEnqueueThread
|
||||
/* F4627C 8026AA4C 03E00008 */ jr $ra
|
||||
/* F46280 8026AA50 ACA40008 */ sw $a0, 0x8($a1)
|
||||
endlabel __osEnqueueThread
|
||||
.size __osEnqueueThread, . - __osEnqueueThread
|
||||
|
||||
glabel __osPopThread
|
||||
/* F46284 8026AA54 8C820000 */ lw $v0, 0x0($a0)
|
||||
@ -595,6 +602,7 @@ glabel __osPopThread
|
||||
/* F4628C 8026AA5C 03E00008 */ jr $ra
|
||||
/* F46290 8026AA60 AC990000 */ sw $t9, 0x0($a0)
|
||||
endlabel __osPopThread
|
||||
.size __osPopThread, . - __osPopThread
|
||||
|
||||
# Handwritten function
|
||||
glabel __osDispatchThread
|
||||
@ -686,8 +694,8 @@ glabel __osDispatchThread
|
||||
/* F463E4 8026ABB4 275A8C60 */ addiu $k0, $k0, %lo(__osRcpImTable)
|
||||
/* F463E8 8026ABB8 037AD821 */ addu $k1, $k1, $k0
|
||||
/* F463EC 8026ABBC 977B0000 */ lhu $k1, 0x0($k1)
|
||||
/* F463F0 8026ABC0 3C1AA430 */ lui $k0, %hi(D_A430000C)
|
||||
/* F463F4 8026ABC4 275A000C */ addiu $k0, $k0, %lo(D_A430000C)
|
||||
/* F463F0 8026ABC0 3C1AA430 */ lui $k0, %hi(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
/* F463F4 8026ABC4 275A000C */ addiu $k0, $k0, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
/* F463F8 8026ABC8 AF5B0000 */ sw $k1, 0x0($k0)
|
||||
/* F463FC 8026ABCC 00000000 */ nop
|
||||
/* F46400 8026ABD0 00000000 */ nop
|
||||
@ -695,6 +703,7 @@ glabel __osDispatchThread
|
||||
/* F46408 8026ABD8 00000000 */ nop
|
||||
/* F4640C 8026ABDC 42000018 */ eret
|
||||
endlabel __osDispatchThread
|
||||
.size __osDispatchThread, . - __osDispatchThread
|
||||
|
||||
glabel __osCleanupThread
|
||||
/* F46410 8026ABE0 0C09936C */ jal osDestroyThread
|
||||
@ -702,6 +711,7 @@ glabel __osCleanupThread
|
||||
/* F46418 8026ABE8 00000000 */ nop
|
||||
/* F4641C 8026ABEC 00000000 */ nop
|
||||
endlabel __osCleanupThread
|
||||
.size __osCleanupThread, . - __osCleanupThread
|
||||
|
||||
# Handwritten function
|
||||
glabel osMapTLBRdb
|
||||
@ -730,3 +740,4 @@ glabel osMapTLBRdb
|
||||
/* F46478 8026AC48 00000000 */ nop
|
||||
/* F4647C 8026AC4C 00000000 */ nop
|
||||
endlabel osMapTLBRdb
|
||||
.size osMapTLBRdb, . - osMapTLBRdb
|
||||
|
||||
17
asm/core1/ultra/parameters.s
Normal file
17
asm/core1/ultra/parameters.s
Normal file
@ -0,0 +1,17 @@
|
||||
#include "PR/R4300.h"
|
||||
#include "sys/asm.h"
|
||||
#include "sys/regdef.h"
|
||||
|
||||
.text
|
||||
ABS(leoBootID, 0x800001a0)
|
||||
ABS(osTvType, 0x80000300)
|
||||
ABS(osRomType, 0x80000304)
|
||||
ABS(osRomBase, 0x80000308)
|
||||
ABS(osResetType, 0x8000030c)
|
||||
ABS(osCicId, 0x80000310)
|
||||
ABS(osVersion, 0x80000314)
|
||||
ABS(osMemSize, 0x80000318)
|
||||
ABS(osAppNMIBuffer, 0x8000031c)
|
||||
|
||||
.space 0x60
|
||||
/* padded to 0x60 in the object file */
|
||||
@ -1,4 +1,5 @@
|
||||
#include <sys/asm.h>
|
||||
#include <PR/rcp.h>
|
||||
.include "macro.inc"
|
||||
# assembler directives
|
||||
.set noat # allow manual use of $at
|
||||
@ -100,8 +101,8 @@ glabel osSetIntMask
|
||||
xor $t0, $t3, $at
|
||||
andi $t0, $t0, 0xff00
|
||||
or $v0, $v0, $t0
|
||||
lui $t2, %hi(D_A430000C)
|
||||
lw $t2, %lo(D_A430000C)($t2)
|
||||
lui $t2, %hi(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
lw $t2, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($t2)
|
||||
beqz $t2, setintmask_1
|
||||
srl $t1, $t3, 0x10
|
||||
addiu $at, $zero, -1
|
||||
@ -118,8 +119,8 @@ setintmask_1:
|
||||
lui $t2, %hi(__osRcpImTable)
|
||||
addu $t2, $t2, $t0
|
||||
lhu $t2, %lo(__osRcpImTable)($t2)
|
||||
lui $at, %hi(D_A430000C)
|
||||
sw $t2, %lo(D_A430000C)($at)
|
||||
lui $at, %hi(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
sw $t2, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($at)
|
||||
andi $t0, $a0, 0xff01
|
||||
andi $t1, $t3, 0xff00
|
||||
and $t0, $t0, $t1
|
||||
|
||||
@ -1,429 +0,0 @@
|
||||
.include "macro.inc"
|
||||
|
||||
.section .data
|
||||
|
||||
dlabel D_80392100
|
||||
.double -500.0
|
||||
|
||||
dlabel jtbl_80392108
|
||||
.word L80387794_13A4, L803877F8_1408, L803878FC_150C, L803879A0_15B0, L80387A20_1630, L80387A98_16A8
|
||||
|
||||
dlabel D_80392120
|
||||
.float 0.95
|
||||
|
||||
dlabel D_80392124
|
||||
.float 1.05
|
||||
|
||||
dlabel D_80392128
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_8039212C
|
||||
.float 12000.0
|
||||
|
||||
dlabel D_80392130
|
||||
.float 1e8
|
||||
|
||||
dlabel jtbl_80392134
|
||||
.word L80388254_1E64, L80388558_2168, L80388558_2168, L80388268_1E78, L80388314_1F24, L8038837C_1F8C, L80388420_2030, L80388468_2078, L80388484_2094, L80388558_2168, L803884CC_20DC, L803884E0_20F0
|
||||
|
||||
dlabel D_80392164
|
||||
.float 0.95
|
||||
|
||||
dlabel D_80392168
|
||||
.float 1.05
|
||||
|
||||
dlabel D_8039216C
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_80392170
|
||||
.float 12000.0, 0.95
|
||||
|
||||
dlabel D_80392178
|
||||
.float 1.05
|
||||
|
||||
dlabel D_8039217C
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_80392180
|
||||
.float 12000.0
|
||||
|
||||
dlabel D_80392184
|
||||
.float 0.4
|
||||
|
||||
dlabel D_80392188
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_8039218C
|
||||
.float 12000.0, 2700.0
|
||||
|
||||
dlabel D_80392194
|
||||
.float 1150.0
|
||||
|
||||
dlabel D_80392198
|
||||
.float 0.95
|
||||
|
||||
dlabel D_8039219C
|
||||
.float 1.05
|
||||
|
||||
dlabel D_803921A0
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_803921A4
|
||||
.float 12000.0
|
||||
|
||||
dlabel D_803921A8
|
||||
.float 0.95
|
||||
|
||||
dlabel D_803921AC
|
||||
.float 1.05
|
||||
|
||||
dlabel D_803921B0
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_803921B4
|
||||
.float 12000.0
|
||||
|
||||
dlabel jtbl_803921B8
|
||||
.word L803887AC_23BC, L803888A8_24B8, L80388964_2574, L803889EC_25FC, L80388B24_2734, L80388DC4_29D4, L80388E84_2A94, L80388F5C_2B6C, L80388FC4_2BD4, L80389054_2C64, L803890C0_2CD0, L80389158_2D68
|
||||
|
||||
dlabel D_803921E8
|
||||
.double 0.3333333333333333
|
||||
|
||||
dlabel D_803921F0
|
||||
.double 3300.0, 0.7333333333333334
|
||||
|
||||
dlabel D_80392200
|
||||
.double 3300.0
|
||||
|
||||
dlabel D_80392208
|
||||
.double 0.66
|
||||
|
||||
dlabel D_80392210
|
||||
.double 0.65
|
||||
|
||||
dlabel jtbl_80392218
|
||||
.word L803893E8_2FF8, L803894CC_30DC, L803894F0_3100, L80389594_31A4, L803895D8_31E8, L80389638_3248, L80389660_3270
|
||||
|
||||
dlabel jtbl_80392234
|
||||
.word L8038975C_336C, L80389788_3398, L803897B4_33C4, L803897E0_33F0, L8038980C_341C
|
||||
|
||||
dlabel D_80392248
|
||||
.float 1.54
|
||||
|
||||
dlabel jtbl_8039224C
|
||||
.word L80389BD8_37E8, L80389CFC_390C, L80389D48_3958, L80389D80_3990, L80389E14_3A24, L80389E3C_3A4C, L80389F40_3B50
|
||||
|
||||
dlabel D_80392268
|
||||
.word 0x3F99999A, 0x00000000
|
||||
|
||||
dlabel D_80392270
|
||||
.double 0.1
|
||||
|
||||
dlabel D_80392278
|
||||
.double 0.8
|
||||
|
||||
dlabel jtbl_80392280
|
||||
.word L80389FEC_3BFC, L8038A4D4_40E4, L8038A01C_3C2C, L8038A4D4_40E4, L8038A1B4_3DC4, L8038A208_3E18, L8038A3D4_3FE4
|
||||
|
||||
dlabel D_8039229C
|
||||
.float 2.2
|
||||
|
||||
dlabel D_803922A0
|
||||
.float 2.2
|
||||
|
||||
dlabel D_803922A4
|
||||
.float 2.2
|
||||
|
||||
dlabel D_803922A8
|
||||
.float 4.4
|
||||
|
||||
dlabel D_803922AC
|
||||
.float 4.4
|
||||
|
||||
dlabel D_803922B0
|
||||
.float 4.4
|
||||
|
||||
dlabel D_803922B4
|
||||
.float 6.6
|
||||
|
||||
dlabel D_803922B8
|
||||
.float 6.6
|
||||
|
||||
dlabel D_803922BC
|
||||
.float 6.6
|
||||
|
||||
dlabel D_803922C0
|
||||
.float 8.8
|
||||
|
||||
dlabel D_803922C4
|
||||
.float 8.8
|
||||
|
||||
dlabel D_803922C8
|
||||
.float 8.8
|
||||
|
||||
dlabel D_803922CC
|
||||
.float 0.95
|
||||
|
||||
dlabel D_803922D0
|
||||
.float 1.05
|
||||
|
||||
dlabel D_803922D4
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_803922D8
|
||||
.float 12000.0
|
||||
|
||||
dlabel D_803922DC
|
||||
.float 0.6
|
||||
|
||||
dlabel D_803922E0
|
||||
.double 1.7, -1190.0
|
||||
|
||||
dlabel D_803922F0
|
||||
.float 1.7
|
||||
|
||||
dlabel D_803922F4
|
||||
.float 1.7
|
||||
|
||||
dlabel D_803922F8
|
||||
.float 1.7
|
||||
|
||||
dlabel D_803922FC
|
||||
.float 1.7
|
||||
|
||||
dlabel D_80392300
|
||||
.float 0.95
|
||||
|
||||
dlabel D_80392304
|
||||
.float 1.05
|
||||
|
||||
dlabel D_80392308
|
||||
.float 0.95
|
||||
|
||||
dlabel D_8039230C
|
||||
.float 1.05
|
||||
|
||||
dlabel jtbl_80392310
|
||||
.word L8038A778_4388, L8038A7D0_43E0, L8038A818_4428, L8038A8A0_44B0, L8038A8FC_450C, L8038A924_4534, L8038AA3C_464C
|
||||
|
||||
dlabel D_8039232C
|
||||
.float 0.95
|
||||
|
||||
dlabel D_80392330
|
||||
.float 1.05
|
||||
|
||||
dlabel D_80392334
|
||||
.float 0.95
|
||||
|
||||
dlabel D_80392338
|
||||
.float 1.05
|
||||
|
||||
dlabel D_8039233C
|
||||
.float 0.95
|
||||
|
||||
dlabel D_80392340
|
||||
.float 1.05
|
||||
|
||||
dlabel D_80392344
|
||||
.float 0.95
|
||||
|
||||
dlabel D_80392348
|
||||
.float 1.05
|
||||
|
||||
dlabel D_8039234C
|
||||
.float 0.95
|
||||
|
||||
dlabel D_80392350
|
||||
.float 1.05
|
||||
|
||||
dlabel D_80392354
|
||||
.float 0.95
|
||||
|
||||
dlabel D_80392358
|
||||
.float 1.05, 0.0
|
||||
|
||||
dlabel D_80392360
|
||||
.double 0.4
|
||||
|
||||
dlabel D_80392368
|
||||
.double 0.65
|
||||
|
||||
dlabel D_80392370
|
||||
.double 0.005
|
||||
|
||||
dlabel D_80392378
|
||||
.double 1.99
|
||||
|
||||
dlabel D_80392380
|
||||
.float 0.95
|
||||
|
||||
dlabel D_80392384
|
||||
.float 1.05
|
||||
|
||||
dlabel jtbl_80392388
|
||||
.word L8038ACE8_48F8, L8038AD90_49A0, L8038ADA0_49B0, L8038AF14_4B24, L8038AF70_4B80, L8038ADA8_49B8, L8038AE00_4A10, L8038AE5C_4A6C, L8038AF28_4B38
|
||||
|
||||
dlabel D_803923AC
|
||||
.float 0.95
|
||||
|
||||
dlabel D_803923B0
|
||||
.float 1.05
|
||||
|
||||
dlabel D_803923B4
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_803923B8
|
||||
.float 12000.0, 0.95
|
||||
|
||||
dlabel D_803923C0
|
||||
.float 1.05
|
||||
|
||||
dlabel D_803923C4
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_803923C8
|
||||
.float 12000.0
|
||||
|
||||
dlabel D_803923CC
|
||||
.float 0.95
|
||||
|
||||
dlabel D_803923D0
|
||||
.float 1.05
|
||||
|
||||
dlabel D_803923D4
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_803923D8
|
||||
.float 12000.0
|
||||
|
||||
dlabel D_803923DC
|
||||
.float 0.6
|
||||
|
||||
dlabel D_803923E0
|
||||
.float 0.6, 2.4
|
||||
|
||||
dlabel D_803923E8
|
||||
.float 2.4
|
||||
|
||||
dlabel D_803923EC
|
||||
.float 4.4
|
||||
|
||||
dlabel D_803923F0
|
||||
.float 4.4
|
||||
|
||||
dlabel jtbl_803923F4
|
||||
.word L8038B290_4EA0, L8038B2A4_4EB4, L8038B2DC_4EEC, L8038B368_4F78, L8038B3B4_4FC4, L8038B460_5070, L8038B4FC_510C, L8038B564_5174, L8038B58C_519C
|
||||
|
||||
dlabel D_80392418
|
||||
.double 0.56
|
||||
|
||||
dlabel D_80392420
|
||||
.double 0.99
|
||||
|
||||
dlabel D_80392428
|
||||
.float 4.8
|
||||
|
||||
dlabel jtbl_8039242C
|
||||
.word L8038B874_5484, L8038B8D0_54E0, L8038B91C_552C, L8038B93C_554C, L8038B95C_556C
|
||||
|
||||
dlabel D_80392440
|
||||
.float 0.95
|
||||
|
||||
dlabel D_80392444
|
||||
.float 1.05
|
||||
|
||||
dlabel D_80392448
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_8039244C
|
||||
.float 12000.0
|
||||
|
||||
dlabel D_80392450
|
||||
.float 0.6
|
||||
|
||||
dlabel jtbl_80392454
|
||||
.word L8038BF30_5B40, L8038BF40_5B50, L8038BF50_5B60, L8038BF60_5B70, L8038BF70_5B80, L8038BF80_5B90, 0
|
||||
|
||||
dlabel D_80392470
|
||||
.double 0.08
|
||||
|
||||
dlabel D_80392478
|
||||
.float 2.88, 0.0
|
||||
|
||||
dlabel D_80392480
|
||||
.double 0.35
|
||||
|
||||
dlabel D_80392488
|
||||
.double 0.65
|
||||
|
||||
dlabel D_80392490
|
||||
.float 0.3, 0.0
|
||||
|
||||
dlabel D_80392498
|
||||
.double 45.0
|
||||
|
||||
dlabel D_803924A0
|
||||
.double 0.3
|
||||
|
||||
dlabel D_803924A8
|
||||
.double 2.26
|
||||
|
||||
dlabel D_803924B0
|
||||
.double 182.04444
|
||||
|
||||
dlabel jtbl_803924B8
|
||||
.word L8038C92C_653C, L8038C980_6590, L8038CA48_6658, L8038CA48_6658, L8038CE68_6A78
|
||||
|
||||
dlabel D_803924CC
|
||||
.float 0.95
|
||||
|
||||
dlabel D_803924D0
|
||||
.float 1.05
|
||||
|
||||
dlabel D_803924D4
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_803924D8
|
||||
.float 0.95
|
||||
|
||||
dlabel D_803924DC
|
||||
.float 1.05
|
||||
|
||||
dlabel D_803924E0
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_803924E4
|
||||
.float 12000.0
|
||||
|
||||
dlabel D_803924E8
|
||||
.double 0.1
|
||||
|
||||
dlabel D_803924F0
|
||||
.double 0.8
|
||||
|
||||
dlabel D_803924F8
|
||||
.double 0.2
|
||||
|
||||
dlabel D_80392500
|
||||
.float 0.1
|
||||
|
||||
dlabel D_80392504
|
||||
.float 5000.0
|
||||
|
||||
dlabel D_80392508
|
||||
.float 12000.0
|
||||
|
||||
dlabel D_8039250C
|
||||
.float 2500.0
|
||||
|
||||
dlabel D_80392510
|
||||
.double 0.98
|
||||
|
||||
dlabel D_80392518
|
||||
.float 1.15
|
||||
|
||||
dlabel D_8039251C
|
||||
.float 0.1
|
||||
|
||||
dlabel D_80392520
|
||||
.float 2.26, 0.0, 0.0, 0.0
|
||||
@ -1,4 +1,5 @@
|
||||
#include <sys/asm.h>
|
||||
#include <PR/rcp.h>
|
||||
.include "macro.inc"
|
||||
|
||||
# assembler directives
|
||||
@ -146,8 +147,8 @@ glabel __osException
|
||||
/* 2F90 80002390 0369D825 */ or $k1, $k1, $t1
|
||||
/* 2F94 80002394 AF5B0118 */ sw $k1, 0x118($k0)
|
||||
.L80002398:
|
||||
/* 2F98 80002398 3C09A430 */ lui $t1, %hi(D_A430000C)
|
||||
/* 2F9C 8000239C 8D29000C */ lw $t1, %lo(D_A430000C)($t1)
|
||||
/* 2F98 80002398 3C09A430 */ lui $t1, %hi(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
/* 2F9C 8000239C 8D29000C */ lw $t1, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($t1)
|
||||
/* 2FA0 800023A0 5120000C */ beql $t1, $zero, .L800023D4
|
||||
/* 2FA4 800023A4 AF490128 */ sw $t1, 0x128($k0)
|
||||
/* 2FA8 800023A8 3C088000 */ lui $t0, %hi(__OSGlobalIntMask)
|
||||
@ -262,21 +263,21 @@ rcp:
|
||||
/* 3134 80002534 3C088000 */ lui $t0, %hi(__OSGlobalIntMask)
|
||||
/* 3138 80002538 250850F0 */ addiu $t0, $t0, %lo(__OSGlobalIntMask)
|
||||
/* 313C 8000253C 8D080000 */ lw $t0, ($t0)
|
||||
/* 3140 80002540 3C11A430 */ lui $s1, %hi(D_A4300008)
|
||||
/* 3144 80002544 8E310008 */ lw $s1, %lo(D_A4300008)($s1)
|
||||
/* 3140 80002540 3C11A430 */ lui $s1, %hi(PHYS_TO_K1(MI_INTR_REG))
|
||||
/* 3144 80002544 8E310008 */ lw $s1, %lo(PHYS_TO_K1(MI_INTR_REG))($s1)
|
||||
/* 3148 80002548 00084402 */ srl $t0, $t0, 0x10
|
||||
/* 314C 8000254C 02288824 */ and $s1, $s1, $t0
|
||||
/* 3150 80002550 32290001 */ andi $t1, $s1, 1
|
||||
/* 3154 80002554 51200014 */ beql $t1, $zero, .L800025A8
|
||||
/* 3158 80002558 32290008 */ andi $t1, $s1, 8
|
||||
/* 315C 8000255C 3C0CA404 */ lui $t4, %hi(D_A4040010)
|
||||
/* 3160 80002560 8D8C0010 */ lw $t4, %lo(D_A4040010)($t4)
|
||||
/* 315C 8000255C 3C0CA404 */ lui $t4, %hi(PHYS_TO_K1(SP_STATUS_REG))
|
||||
/* 3160 80002560 8D8C0010 */ lw $t4, %lo(PHYS_TO_K1(SP_STATUS_REG))($t4)
|
||||
/* 3164 80002564 24090008 */ addiu $t1, $zero, 8
|
||||
/* 3168 80002568 3C01A404 */ lui $at, %hi(D_A4040010)
|
||||
/* 3168 80002568 3C01A404 */ lui $at, %hi(PHYS_TO_K1(SP_STATUS_REG))
|
||||
/* 316C 8000256C 318C0300 */ andi $t4, $t4, 0x300
|
||||
/* 3170 80002570 3231003E */ andi $s1, $s1, 0x3e
|
||||
/* 3174 80002574 11800007 */ beqz $t4, .L80002594
|
||||
/* 3178 80002578 AC290010 */ sw $t1, %lo(D_A4040010)($at)
|
||||
/* 3178 80002578 AC290010 */ sw $t1, %lo(PHYS_TO_K1(SP_STATUS_REG))($at)
|
||||
/* 317C 8000257C 0C0009E9 */ jal send_mesg
|
||||
/* 3180 80002580 24040020 */ addiu $a0, $zero, 0x20
|
||||
/* 3184 80002584 52200039 */ beql $s1, $zero, .L8000266C
|
||||
@ -291,9 +292,9 @@ rcp:
|
||||
/* 31A4 800025A4 32290008 */ andi $t1, $s1, 8
|
||||
.L800025A8:
|
||||
/* 31A8 800025A8 11200007 */ beqz $t1, .L800025C8
|
||||
/* 31AC 800025AC 3C01A440 */ lui $at, %hi(D_A4400010)
|
||||
/* 31AC 800025AC 3C01A440 */ lui $at, %hi(PHYS_TO_K1(VI_CURRENT_REG))
|
||||
/* 31B0 800025B0 32310037 */ andi $s1, $s1, 0x37
|
||||
/* 31B4 800025B4 AC200010 */ sw $zero, %lo(D_A4400010)($at)
|
||||
/* 31B4 800025B4 AC200010 */ sw $zero, %lo(PHYS_TO_K1(VI_CURRENT_REG))($at)
|
||||
/* 31B8 800025B8 0C0009E9 */ jal send_mesg
|
||||
/* 31BC 800025BC 24040038 */ addiu $a0, $zero, 0x38
|
||||
/* 31C0 800025C0 5220002A */ beql $s1, $zero, .L8000266C
|
||||
@ -303,9 +304,9 @@ rcp:
|
||||
/* 31CC 800025CC 5120000A */ beql $t1, $zero, .L800025F8
|
||||
/* 31D0 800025D0 32290002 */ andi $t1, $s1, 2
|
||||
/* 31D4 800025D4 24090001 */ addiu $t1, $zero, 1
|
||||
/* 31D8 800025D8 3C01A450 */ lui $at, %hi(D_A450000C)
|
||||
/* 31D8 800025D8 3C01A450 */ lui $at, %hi(PHYS_TO_K1(AI_STATUS_REG))
|
||||
/* 31DC 800025DC 3231003B */ andi $s1, $s1, 0x3b
|
||||
/* 31E0 800025E0 AC29000C */ sw $t1, %lo(D_A450000C)($at)
|
||||
/* 31E0 800025E0 AC29000C */ sw $t1, %lo(PHYS_TO_K1(AI_STATUS_REG))($at)
|
||||
/* 31E4 800025E4 0C0009E9 */ jal send_mesg
|
||||
/* 31E8 800025E8 24040030 */ addiu $a0, $zero, 0x30
|
||||
/* 31EC 800025EC 5220001F */ beql $s1, $zero, .L8000266C
|
||||
@ -313,9 +314,9 @@ rcp:
|
||||
/* 31F4 800025F4 32290002 */ andi $t1, $s1, 2
|
||||
.L800025F8:
|
||||
/* 31F8 800025F8 11200007 */ beqz $t1, .L80002618
|
||||
/* 31FC 800025FC 3C01A480 */ lui $at, %hi(D_A4800018)
|
||||
/* 31FC 800025FC 3C01A480 */ lui $at, %hi(PHYS_TO_K1(SI_STATUS_REG))
|
||||
/* 3200 80002600 3231003D */ andi $s1, $s1, 0x3d
|
||||
/* 3204 80002604 AC200018 */ sw $zero, %lo(D_A4800018)($at)
|
||||
/* 3204 80002604 AC200018 */ sw $zero, %lo(PHYS_TO_K1(SI_STATUS_REG))($at)
|
||||
/* 3208 80002608 0C0009E9 */ jal send_mesg
|
||||
/* 320C 8000260C 24040028 */ addiu $a0, $zero, 0x28
|
||||
/* 3210 80002610 52200016 */ beql $s1, $zero, .L8000266C
|
||||
@ -325,9 +326,9 @@ rcp:
|
||||
/* 321C 8000261C 5120000A */ beql $t1, $zero, .L80002648
|
||||
/* 3220 80002620 32290020 */ andi $t1, $s1, 0x20
|
||||
/* 3224 80002624 24090002 */ addiu $t1, $zero, 2
|
||||
/* 3228 80002628 3C01A460 */ lui $at, %hi(D_A4600010)
|
||||
/* 3228 80002628 3C01A460 */ lui $at, %hi(PHYS_TO_K1(PI_STATUS_REG))
|
||||
/* 322C 8000262C 3231002F */ andi $s1, $s1, 0x2f
|
||||
/* 3230 80002630 AC290010 */ sw $t1, %lo(D_A4600010)($at)
|
||||
/* 3230 80002630 AC290010 */ sw $t1, %lo(PHYS_TO_K1(PI_STATUS_REG))($at)
|
||||
/* 3234 80002634 0C0009E9 */ jal send_mesg
|
||||
/* 3238 80002638 24040040 */ addiu $a0, $zero, 0x40
|
||||
/* 323C 8000263C 5220000B */ beql $s1, $zero, .L8000266C
|
||||
@ -545,9 +546,9 @@ glabel __osEnqueueAndYield
|
||||
/* 3530 80002930 0361D824 */ and $k1, $k1, $at
|
||||
/* 3534 80002934 0369D825 */ or $k1, $k1, $t1
|
||||
/* 3538 80002938 ACBB0118 */ sw $k1, 0x118($a1)
|
||||
/* 353C 8000293C 3C1BA430 */ lui $k1, %hi(D_A430000C)
|
||||
/* 353C 8000293C 3C1BA430 */ lui $k1, %hi(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
.L80002940:
|
||||
/* 3540 80002940 8F7B000C */ lw $k1, %lo(D_A430000C)($k1)
|
||||
/* 3540 80002940 8F7B000C */ lw $k1, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($k1)
|
||||
/* 3544 80002944 1360000B */ beqz $k1, .L80002974
|
||||
/* 3548 80002948 00000000 */ nop
|
||||
/* 354C 8000294C 3C1A8000 */ lui $k0, %hi(__OSGlobalIntMask)
|
||||
@ -689,8 +690,8 @@ glabel __osDispatchThread
|
||||
/* 3734 80002B34 275A51D0 */ addiu $k0, $k0, %lo(__osRcpImTable)
|
||||
/* 3738 80002B38 037AD821 */ addu $k1, $k1, $k0
|
||||
/* 373C 80002B3C 977B0000 */ lhu $k1, ($k1)
|
||||
/* 3740 80002B40 3C1AA430 */ lui $k0, %hi(D_A430000C)
|
||||
/* 3744 80002B44 275A000C */ addiu $k0, $k0, %lo(D_A430000C)
|
||||
/* 3740 80002B40 3C1AA430 */ lui $k0, %hi(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
/* 3744 80002B44 275A000C */ addiu $k0, $k0, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
/* 3748 80002B48 AF5B0000 */ sw $k1, ($k0)
|
||||
/* 374C 80002B4C 00000000 */ nop
|
||||
/* 3750 80002B50 00000000 */ nop
|
||||
|
||||
17
asm/ultra/parameters.s
Normal file
17
asm/ultra/parameters.s
Normal file
@ -0,0 +1,17 @@
|
||||
#include "PR/R4300.h"
|
||||
#include "sys/asm.h"
|
||||
#include "sys/regdef.h"
|
||||
|
||||
.text
|
||||
ABS(leoBootID, 0x800001a0)
|
||||
ABS(osTvType, 0x80000300)
|
||||
ABS(osRomType, 0x80000304)
|
||||
ABS(osRomBase, 0x80000308)
|
||||
ABS(osResetType, 0x8000030c)
|
||||
ABS(osCicId, 0x80000310)
|
||||
ABS(osVersion, 0x80000314)
|
||||
ABS(osMemSize, 0x80000318)
|
||||
ABS(osAppNMIBuffer, 0x8000031c)
|
||||
|
||||
.space 0x60
|
||||
/* padded to 0x60 in the object file */
|
||||
@ -1,4 +1,5 @@
|
||||
#include <sys/asm.h>
|
||||
#include <PR/rcp.h>
|
||||
.include "macro.inc"
|
||||
# assembler directives
|
||||
.set noat # allow manual use of $at
|
||||
@ -100,8 +101,8 @@ glabel func_80003A30
|
||||
/* 4648 80003A48 01614026 */ xor $t0, $t3, $at
|
||||
/* 464C 80003A4C 3108FF00 */ andi $t0, $t0, 0xff00
|
||||
/* 4650 80003A50 00481025 */ or $v0, $v0, $t0
|
||||
/* 4654 80003A54 3C0AA430 */ lui $t2, %hi(D_A430000C)
|
||||
/* 4658 80003A58 8D4A000C */ lw $t2, %lo(D_A430000C)($t2)
|
||||
/* 4654 80003A54 3C0AA430 */ lui $t2, %hi(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
/* 4658 80003A58 8D4A000C */ lw $t2, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($t2)
|
||||
/* 465C 80003A5C 11400005 */ beqz $t2, .L80003A74
|
||||
/* 4660 80003A60 000B4C02 */ srl $t1, $t3, 0x10
|
||||
/* 4664 80003A64 2401FFFF */ addiu $at, $zero, -1
|
||||
@ -118,8 +119,8 @@ glabel func_80003A30
|
||||
/* 468C 80003A8C 3C0A8000 */ lui $t2, %hi(__osRcpImTable)
|
||||
/* 4690 80003A90 01485021 */ addu $t2, $t2, $t0
|
||||
/* 4694 80003A94 954A51D0 */ lhu $t2, %lo(__osRcpImTable)($t2)
|
||||
/* 4698 80003A98 3C01A430 */ lui $at, %hi(D_A430000C)
|
||||
/* 469C 80003A9C AC2A000C */ sw $t2, %lo(D_A430000C)($at)
|
||||
/* 4698 80003A98 3C01A430 */ lui $at, %hi(PHYS_TO_K1(MI_INTR_MASK_REG))
|
||||
/* 469C 80003A9C AC2A000C */ sw $t2, %lo(PHYS_TO_K1(MI_INTR_MASK_REG))($at)
|
||||
/* 46A0 80003AA0 3088FF01 */ andi $t0, $a0, 0xff01
|
||||
/* 46A4 80003AA4 3169FF00 */ andi $t1, $t3, 0xff00
|
||||
/* 46A8 80003AA8 01094024 */ and $t0, $t0, $t1
|
||||
|
||||
@ -15,12 +15,14 @@ options:
|
||||
#include "variables.h"
|
||||
undefined_syms_path: undefined_syms.us.v10.txt
|
||||
symbol_addrs_path: symbol_addrs.us.v10.txt
|
||||
undefined_funcs_auto_path: undefined_funcs_auto.us.v10.txt
|
||||
undefined_syms_auto_path: undefined_syms_auto.us.v10.txt
|
||||
create_undefined_funcs_auto: no
|
||||
create_undefined_syms_auto: no
|
||||
base_path: .
|
||||
target_path: decompressed.us.v10.z64
|
||||
asset_path: bin
|
||||
build_path: build/us.v10
|
||||
libultra_symbols: True
|
||||
hardware_regs: True
|
||||
segments:
|
||||
- name: header
|
||||
type: header
|
||||
@ -63,7 +65,7 @@ segments:
|
||||
- [0x3870, hasm, maptlbrdb]
|
||||
- [0x38D0, c, done/pirawread]
|
||||
- [0x3930, c, done/ll]
|
||||
- [0x3BF0, bin, padding3BF0] # Empty space
|
||||
- [0x3BF0, hasm, ultra/parameters]
|
||||
- [0x3C50, c, done/virtualtophysical]
|
||||
- [0x3CD0, c, done/si]
|
||||
- [0x3D00, c, done/thread]
|
||||
@ -123,18 +125,20 @@ segments:
|
||||
start: 0x5E90
|
||||
subsegments:
|
||||
- [0x5E90, bin, assets]
|
||||
- name: soundfont1
|
||||
- name: soundfont1ctl
|
||||
type: bin
|
||||
start: 0xD846C0
|
||||
subsegments:
|
||||
- [0xD846C0, bin, soundfont1.ctl]
|
||||
- [0xD954B0, bin, soundfont1.tbl]
|
||||
- name: soundfont2
|
||||
- name: soundfont1tbl
|
||||
type: bin
|
||||
start: 0xD954B0
|
||||
|
||||
- name: soundfont2ctl
|
||||
type: bin
|
||||
start: 0xEA3EB0
|
||||
subsegments:
|
||||
- [0xEA3EB0, bin, soundfont2.ctl]
|
||||
- [0xEADE60, bin, soundfont2.tbl]
|
||||
- name: soundfont2tbl
|
||||
type: bin
|
||||
start: 0xEADE60
|
||||
|
||||
- name: core1
|
||||
dir: core1
|
||||
type: code
|
||||
@ -233,7 +237,7 @@ segments:
|
||||
- [0xF3F820, c, gu/sinf] #DONE
|
||||
- [0xF3F9E0, c, audio/cents2ratio] #DONE
|
||||
- [0xF3FA30, c, audio/heapinit] #DONE
|
||||
- [0xF3FA70, asm, padding] # 0x60 bytes of zeroes?
|
||||
- [0xF3FA70, hasm, ultra/parameters] #DONE
|
||||
- [0xF3FAD0, c, os/createmesgqueue] #DONE
|
||||
- [0xF3FB00, c, io/aisetfreq] #DONE
|
||||
- [0xF3FC60, c, audio/sl] #DONE
|
||||
@ -501,13 +505,13 @@ segments:
|
||||
follows_vram: core1
|
||||
subsegments:
|
||||
- [0xF55960, c, animctrl] #DONE
|
||||
- [0xF56430, c, code_AD0] #DONE
|
||||
- [0xF56430, c, anim/sprite] #DONE
|
||||
- [0xF56A40, c, animcache] #DONE
|
||||
- [0xF56EB0, c, code_1550] #DONE
|
||||
- [0xF57290, c, code_1930] #DONE
|
||||
- [0xF57BA0, c, code_2240] #DONE
|
||||
- [0xF581F0, c, ba/anim] #DONE
|
||||
- [0xF58DE0, c, code_3480] #DONE
|
||||
- [0xF58DE0, c, snackerctl] #DONE
|
||||
- [0xF59330, c, code_39D0] #DONE
|
||||
- [0xF5A120, c, ba/marker] #DONE
|
||||
- [0xF5C490, c, code_6B30] #DONE
|
||||
@ -522,14 +526,14 @@ segments:
|
||||
- [0xF60040, c, statetimer] #DONE
|
||||
- [0xF602C0, c, code_A960] #DONE
|
||||
- [0xF603C0, c, ba/model] #DONE
|
||||
- [0xF60FB0, c, code_B650] #DONE
|
||||
- [0xF60FB0, c, ba/drone] #DONE
|
||||
- [0xF611B0, c, code_B850] #DONE
|
||||
- [0xF614B0, c, eggshatter] #DONE
|
||||
- [0xF61680, c, code_BD20] #DONE
|
||||
- [0xF61A40, c, code_C0E0] #DONE
|
||||
- [0xF61A40, c, ba/falldamage] #DONE
|
||||
- [0xF61D50, c, code_C3F0] #DONE
|
||||
- [0xF61E10, c, code_C4B0]
|
||||
- [0xF63160, c, code_D800] #DONE
|
||||
- [0xF63160, c, ba/carry] #DONE
|
||||
- [0xF63310, c, code_D9B0] #DONE
|
||||
- [0xF638D0, c, code_DF70] #DONE
|
||||
- [0xF63D70, c, code_E410] #DONE
|
||||
@ -537,7 +541,7 @@ segments:
|
||||
- [0xF64270, c, code_E910] #DONE
|
||||
- [0xF647A0, c, code_EE40] #DONE
|
||||
- [0xF648B0, c, code_EF50] #DONE
|
||||
- [0xF656C0, c, code_FD60] #DONE
|
||||
- [0xF656C0, c, ba/physics] #DONE
|
||||
- [0xF66630, c, code_10CD0] #DONE
|
||||
- [0xF66700, c, pitch] #DONE
|
||||
- [0xF669A0, c, code_11040] #DONE
|
||||
@ -702,7 +706,7 @@ segments:
|
||||
- [0xFAF0E0, c, code_59780] #DONE
|
||||
- [0xFAF340, c, code_599E0] #DONE
|
||||
- [0xFAF3E0, c, code_59A80] #DONE
|
||||
- [0xFAF6A0, c, code_59D40] #DONE
|
||||
- [0xFAF6A0, c, ch/snacker] #DONE
|
||||
- [0xFB0490, c, ch/snowman] #DONE
|
||||
- [0xFB1000, c, ch/snowball] #DONE
|
||||
- [0xFB16F0, c, ch/snowmanhat] #DONE
|
||||
@ -771,7 +775,7 @@ segments:
|
||||
- [0xFDAB30, c, code_851D0] #DONE
|
||||
- [0xFDB110, c, code_857B0] #DONE
|
||||
- [0xFDB160, c, code_85800] #DONE
|
||||
- [0xFDD790, c, code_87E30]
|
||||
- [0xFDD790, c, gc/dialog]
|
||||
- [0xFE0110, c, gc/pauseMenu] #DONE
|
||||
- [0xFE3580, c, code_8DC20] #DONE
|
||||
- [0xFE3BD0, c, gc/zoombox] #DONE
|
||||
@ -897,16 +901,16 @@ segments:
|
||||
- [0x1031F60, bin, data_DC600] #unreferenced
|
||||
- [0x1031F90, .data, code_1550]
|
||||
- [0x1031FB0, .data, ba/anim]
|
||||
- [0x1031FE0, .data, code_3480]
|
||||
- [0x1031FE0, .data, snackerctl]
|
||||
- [0x1032000, .data, ba/marker]
|
||||
- [0x1032060, .data, code_7060]
|
||||
- [0x10320A0, .data, code_90E0]
|
||||
- [0x1032150, .data, ba/model]
|
||||
- [0x1032150, .data, code_B850]
|
||||
- [0x1032170, .data, eggshatter]
|
||||
- [0x10321C0, .data, code_C0E0]
|
||||
- [0x10321C0, .data, ba/falldamage]
|
||||
- [0x10321F0, .data, code_E910]
|
||||
- [0x1032E10, .data, code_FD60]
|
||||
- [0x1032E10, .data, ba/physics]
|
||||
- [0x1032E20, .data, code_117D0]
|
||||
- [0x1032F30, .data, code_126C0]
|
||||
- [0x1032F50, .data, code_12F30]
|
||||
@ -999,7 +1003,7 @@ segments:
|
||||
- [0x1036D80, .data, ch/bottlesbonuscursor]
|
||||
- [0x1036E10, .data, code_59780]
|
||||
- [0x1036F70, .data, code_59A80]
|
||||
- [0x1036FA0, .data, code_59D40]
|
||||
- [0x1036FA0, .data, ch/snacker]
|
||||
- [0x1037020, .data, ch/snowman]
|
||||
- [0x10370E0, .data, ch/snowball]
|
||||
- [0x1037190, .data, ch/snowmanhat]
|
||||
@ -1044,7 +1048,7 @@ segments:
|
||||
- [0x103A710, .data, gc/sky]
|
||||
- [0x103AB20, .data, gc/transition]
|
||||
- [0x103AE20, .data, code_851D0]
|
||||
- [0x103AEA0, .data, code_87E30]
|
||||
- [0x103AEA0, .data, gc/dialog]
|
||||
- [0x103AEB0, .data, gc/pauseMenu]
|
||||
- [0x103B000, .data, code_8DC20]
|
||||
- [0x103B090, .data, gc/zoombox]
|
||||
@ -1116,10 +1120,10 @@ segments:
|
||||
- [0x1041CB0, .data, code_DB010]
|
||||
- [0x1042790, .data, code_DC4B0]
|
||||
- [0x10427C0, ".rodata", animctrl]
|
||||
- [0x10427F0, .rodata, code_AD0]
|
||||
- [0x10427F0, .rodata, anim/sprite]
|
||||
- [0x1042800, .rodata, code_1930]
|
||||
- [0x1042880, .rodata, ba/anim]
|
||||
- [0x1042890, .rodata, code_3480]
|
||||
- [0x1042890, .rodata, snackerctl]
|
||||
- [0x10428A0, .rodata, code_39D0]
|
||||
- [0x1042940, .rodata, ba/marker]
|
||||
- [0x1042D70, .rodata, code_6B30]
|
||||
@ -1128,15 +1132,15 @@ segments:
|
||||
- [0x1042FC0, .rodata, code_9900]
|
||||
- [0x1042FD0, .rodata, code_9BD0]
|
||||
- [0x1043010, .rodata, ba/model]
|
||||
- [0x10430C0, .rodata, code_B650]
|
||||
- [0x10430C0, .rodata, ba/drone]
|
||||
- [0x10430D0, .rodata, code_B850]
|
||||
- [0x10430F0, .rodata, code_BD20]
|
||||
- [0x1043110, .rodata, code_C0E0]
|
||||
- [0x1043110, .rodata, ba/falldamage]
|
||||
- [0x1043130, .rodata, code_C4B0]
|
||||
- [0x1043170, .rodata, code_D9B0]
|
||||
- [0x1043180, .rodata, abilityprogress]
|
||||
- [0x10431B0, .rodata, code_EF50]
|
||||
- [0x1043350, .rodata, code_FD60]
|
||||
- [0x1043350, .rodata, ba/physics]
|
||||
- [0x10433B0, .rodata, code_10CD0]
|
||||
- [0x10433C0, .rodata, pitch]
|
||||
- [0x10433F0, .rodata, code_11040]
|
||||
@ -1255,7 +1259,7 @@ segments:
|
||||
- [0x10459A0, .rodata, ch/bottlesbonuscursor]
|
||||
- [0x1045A00, .rodata, code_599E0]
|
||||
- [0x1045A10, .rodata, code_59A80]
|
||||
- [0x1045A20, .rodata, code_59D40]
|
||||
- [0x1045A20, .rodata, ch/snacker]
|
||||
- [0x1045A70, .rodata, ch/snowman]
|
||||
- [0x1045AA0, .rodata, ch/snowball]
|
||||
- [0x1045AD0, .rodata, code_5C240]
|
||||
@ -1291,7 +1295,7 @@ segments:
|
||||
- [0x1046E10, .rodata, gc/sky]
|
||||
- [0x1046E20, .rodata, gc/transition]
|
||||
- [0x1046E80, .rodata, code_85800]
|
||||
- [0x1046EA0, .rodata, code_87E30]
|
||||
- [0x1046EA0, .rodata, gc/dialog]
|
||||
- [0x1046F10, .rodata, gc/pauseMenu]
|
||||
- [0x1047250, .rodata, gc/zoombox]
|
||||
- [0x1047320, .rodata, code_91E10]
|
||||
@ -1366,12 +1370,12 @@ segments:
|
||||
- [0x1048450, .rodata, code_DA3A0]
|
||||
- [0x1048460, .rodata, code_DA760]
|
||||
- [0x1048480, .rodata, code_DB010]
|
||||
- [0x1048560, .bss, code_AD0]
|
||||
- [0x1048560, .bss, anim/sprite]
|
||||
- [0x1048560, .bss, animcache]
|
||||
- [0x1048560, .bss, code_1550]
|
||||
- [0x1048560, .bss, code_1930]
|
||||
- [0x1048560, .bss, ba/anim]
|
||||
- [0x1048560, .bss, code_3480]
|
||||
- [0x1048560, .bss, snackerctl]
|
||||
- [0x1048560, .bss, code_39D0]
|
||||
- [0x1048560, .bss, ba/marker]
|
||||
- [0x1048560, .bss, code_6B30]
|
||||
@ -1385,13 +1389,13 @@ segments:
|
||||
- [0x1048560, .bss, code_A600]
|
||||
- [0x1048560, .bss, statetimer]
|
||||
- [0x1048560, .bss, ba/model]
|
||||
- [0x1048560, .bss, code_B650]
|
||||
- [0x1048560, .bss, ba/drone]
|
||||
- [0x1048560, .bss, eggshatter]
|
||||
- [0x1048560, .bss, code_BD20]
|
||||
- [0x1048560, .bss, code_C0E0]
|
||||
- [0x1048560, .bss, ba/falldamage]
|
||||
- [0x1048560, .bss, code_C3F0]
|
||||
- [0x1048560, .bss, code_C4B0]
|
||||
- [0x1048560, .bss, code_D800]
|
||||
- [0x1048560, .bss, ba/carry]
|
||||
- [0x1048560, .bss, code_D9B0]
|
||||
- [0x1048560, .bss, code_DF70]
|
||||
- [0x1048560, .bss, code_E410]
|
||||
@ -1399,7 +1403,7 @@ segments:
|
||||
- [0x1048560, .bss, code_E910]
|
||||
- [0x1048560, .bss, code_EE40]
|
||||
- [0x1048560, .bss, code_EF50]
|
||||
- [0x1048560, .bss, code_FD60]
|
||||
- [0x1048560, .bss, ba/physics]
|
||||
- [0x1048560, .bss, code_10CD0]
|
||||
- [0x1048560, .bss, pitch]
|
||||
- [0x1048560, .bss, code_11040]
|
||||
@ -1496,6 +1500,7 @@ segments:
|
||||
- [0x1048560, .bss, code_41FB0]
|
||||
- [0x1048560, .bss, code_42CB0]
|
||||
- [0x1048560, .bss, mapspecificflags]
|
||||
- [0x1048560, .bss, code_47BD0]
|
||||
- [0x1048560, .bss, code_4A6F0]
|
||||
- [0x1048560, .bss, code_4C020]
|
||||
- [0x1048560, .bss, ch/badShad]
|
||||
@ -1511,7 +1516,7 @@ segments:
|
||||
- [0x1048560, .bss, code_581D0]
|
||||
- [0x1048560, .bss, ch/bottlesbonuscursor]
|
||||
- [0x1048560, .bss, code_59A80]
|
||||
- [0x1048560, .bss, code_59D40]
|
||||
- [0x1048560, .bss, ch/snacker]
|
||||
- [0x1048560, .bss, ch/snowball]
|
||||
- [0x1048560, .bss, code_5BEB0]
|
||||
- [0x1048560, .bss, code_5C240]
|
||||
@ -1559,7 +1564,7 @@ segments:
|
||||
- [0x1048560, .bss, code_851D0]
|
||||
- [0x1048560, .bss, code_857B0]
|
||||
- [0x1048560, .bss, code_85800]
|
||||
- [0x1048560, .bss, code_87E30]
|
||||
- [0x1048560, .bss, gc/dialog]
|
||||
- [0x1048560, .bss, gc/pauseMenu]
|
||||
- [0x1048560, .bss, code_8DC20]
|
||||
- [0x1048560, .bss, gc/zoombox]
|
||||
@ -1614,6 +1619,7 @@ segments:
|
||||
- [0x1048560, .bss, code_C5440]
|
||||
- [0x1048560, .bss, code_C89C0]
|
||||
- [0x1048560, .bss, code_C97F0]
|
||||
- [0x1048560, .bss, code_C9E70]
|
||||
- [0x1048560, .bss, code_C9F00]
|
||||
- [0x1048560, .bss, code_CB8A0]
|
||||
- [0x1048560, .bss, code_CBBF0]
|
||||
@ -1882,7 +1888,7 @@ segments:
|
||||
- [0x1068340, .rodata, ch/grublin]
|
||||
- [0x1068350, .rodata, ch/jujuhitbox]
|
||||
- [0x1068360, .rodata, ch/juju]
|
||||
- [0x1068370, .bss, bss_pad]
|
||||
- [0x1068370, .bss, ch/hut]
|
||||
- [0x1068370, .bss, ch/juju]
|
||||
- name: BGS
|
||||
dir: BGS
|
||||
@ -2112,7 +2118,8 @@ segments:
|
||||
- [0x108AB50, .bss, sirslushgame]
|
||||
- [0x108AB50, .bss, snowmanbuttongame]
|
||||
- [0x108AB50, .bss, racectrl]
|
||||
- [0x108AB50, .bss, bss_end_pad]
|
||||
- [0x108AB50, .bss, ch/xmastreestar]
|
||||
- [0x108AB50, .bss, code_B4D0]
|
||||
- name: SM
|
||||
dir: SM
|
||||
type: code
|
||||
@ -2300,8 +2307,8 @@ segments:
|
||||
- [0x10BA9E0, c, code_76C0] #DONE
|
||||
- [0x10BAEE0, c, code_7BC0] #DONE
|
||||
- [0x10BAF10, c, code_7BF0] #DONE
|
||||
- [0x10BB370, c, code_8050] #DONE
|
||||
- [0x10BB990, c, code_8670] #DONE
|
||||
- [0x10BB370, c, ch/grublinhood] #DONE
|
||||
- [0x10BB990, c, ch/vacationtexttrigger] #DONE
|
||||
- [0x10BBA80, .data, code_0]
|
||||
- [0x10BBAD0, .data, code_160]
|
||||
- [0x10BBB00, .data, code_950]
|
||||
@ -2328,8 +2335,8 @@ segments:
|
||||
- [0x10BC650, .data, code_76C0]
|
||||
- [0x10BC7E0, .data, code_7BC0]
|
||||
- [0x10BC820, .data, code_7BF0]
|
||||
- [0x10BC860, .data, code_8050]
|
||||
- [0x10BC930, .data, code_8670]
|
||||
- [0x10BC860, .data, ch/grublinhood]
|
||||
- [0x10BC930, .data, ch/vacationtexttrigger]
|
||||
- [0x10BC960, .rodata, code_160]
|
||||
- [0x10BC980, .rodata, code_950]
|
||||
- [0x10BC9E0, .rodata, code_1B20]
|
||||
@ -2348,7 +2355,7 @@ segments:
|
||||
- [0x10BCC20, .rodata, code_6AC0]
|
||||
- [0x10BCC40, .rodata, code_76C0]
|
||||
- [0x10BCC50, .rodata, code_7BF0]
|
||||
- [0x10BCC60, .rodata, code_8050]
|
||||
- [0x10BCC60, .rodata, ch/grublinhood]
|
||||
- [0x10BCD00, .bss, bss_pad]
|
||||
- [0x10BCD00, .bss, code_3310]
|
||||
- name: emptyLvl
|
||||
|
||||
@ -184,7 +184,7 @@ def hexbytes(bs):
|
||||
found_instr_diff = []
|
||||
map_search_diff = []
|
||||
diffs = 0
|
||||
shift_cap = 1000
|
||||
shift_cap = 100000
|
||||
for i in range(24, len(mybin), 4):
|
||||
# (mybin[i:i+4] != basebin[i:i+4], but that's slightly slower in CPython...)
|
||||
if diffs <= shift_cap and (
|
||||
|
||||
33
include/actor.h
Normal file
33
include/actor.h
Normal file
@ -0,0 +1,33 @@
|
||||
#ifndef ACTOR_H
|
||||
#define ACTOR_H
|
||||
|
||||
#define ACTOR_FLAG_NONE (0)
|
||||
#define ACTOR_FLAG_UNKNOWN_0 (1 << 0) // 0x1
|
||||
#define ACTOR_FLAG_UNKNOWN_1 (1 << 1) // 0x2
|
||||
#define ACTOR_FLAG_UNKNOWN_2 (1 << 2) // 0x4
|
||||
#define ACTOR_FLAG_UNKNOWN_3 (1 << 3) // 0x8
|
||||
#define ACTOR_FLAG_UNKNOWN_4 (1 << 4) // 0x10
|
||||
#define ACTOR_FLAG_UNKNOWN_5 (1 << 5) // 0x20
|
||||
#define ACTOR_FLAG_UNKNOWN_6 (1 << 6) // 0x40
|
||||
#define ACTOR_FLAG_UNKNOWN_7 (1 << 7) // 0x80
|
||||
#define ACTOR_FLAG_UNKNOWN_8 (1 << 8) // 0x100
|
||||
#define ACTOR_FLAG_UNKNOWN_9 (1 << 9) // 0x200
|
||||
#define ACTOR_FLAG_UNKNOWN_10 (1 << 10) // 0x400
|
||||
#define ACTOR_FLAG_UNKNOWN_11 (1 << 11) // 0x800
|
||||
#define ACTOR_FLAG_UNKNOWN_12 (1 << 12) // 0x1000
|
||||
#define ACTOR_FLAG_UNKNOWN_13 (1 << 13) // 0x2000
|
||||
#define ACTOR_FLAG_UNKNOWN_14 (1 << 14) // 0x4000
|
||||
#define ACTOR_FLAG_UNKNOWN_15 (1 << 15) // 0x8000
|
||||
#define ACTOR_FLAG_UNKNOWN_16 (1 << 16) // 0x10000
|
||||
#define ACTOR_FLAG_UNKNOWN_17 (1 << 17) // 0x20000
|
||||
#define ACTOR_FLAG_UNKNOWN_18 (1 << 18) // 0x40000
|
||||
#define ACTOR_FLAG_UNKNOWN_19 (1 << 19) // 0x80000
|
||||
#define ACTOR_FLAG_UNKNOWN_20 (1 << 20) // 0x100000
|
||||
#define ACTOR_FLAG_UNKNOWN_21 (1 << 21) // 0x200000
|
||||
#define ACTOR_FLAG_UNKNOWN_22 (1 << 22) // 0x400000
|
||||
#define ACTOR_FLAG_UNKNOWN_23 (1 << 23) // 0x800000
|
||||
#define ACTOR_FLAG_UNKNOWN_24 (1 << 24) // 0x1000000
|
||||
#define ACTOR_FLAG_UNKNOWN_25 (1 << 25) // 0x2000000
|
||||
#define ACTOR_FLAG_UNKNOWN_26 (1 << 26) // 0x4000000
|
||||
|
||||
#endif // ACTOR_H
|
||||
@ -40,11 +40,6 @@ typedef struct animation_file_s{
|
||||
u8 pad6[2];
|
||||
} AnimationFile;
|
||||
|
||||
typedef struct animation_file_cache_s{
|
||||
AnimationFile *unk0;
|
||||
u16 unk4_15:15;
|
||||
u16 unk4_0:1;
|
||||
u8 pad6[2];
|
||||
}AnimationFileCache;
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@ -16,6 +16,6 @@ typedef struct asset_file_meta_s{
|
||||
} AssetFileMeta;
|
||||
|
||||
|
||||
extern u8 D_5E90; //rom file asset bin;
|
||||
extern u8 assets_ROM_START[]; //rom file asset bin;
|
||||
|
||||
#endif
|
||||
|
||||
@ -696,9 +696,9 @@ void func_802AADBC(void);
|
||||
void func_802AAE08(void);
|
||||
void func_802AAE4C(void);
|
||||
|
||||
void func_802AEDE8(void);
|
||||
void func_802AEE48(void);
|
||||
void func_802AEE9C(void);
|
||||
void bsDroneGoTo_init(void);
|
||||
void bsDroneGoTo_update(void);
|
||||
void bsDroneGoTo_end(void);
|
||||
void bsDroneLook_init(void);
|
||||
void bsDroneLook_update(void);
|
||||
void bsDroneLook_end(void);
|
||||
|
||||
@ -4,8 +4,6 @@
|
||||
#include "core1/mem.h"
|
||||
|
||||
void func_8025235C(f32[3], f32[3]);
|
||||
void func_80252C08(f32[3], f32[3], f32, f32[3]);
|
||||
|
||||
void func_80252C08(f32 arg0[3], f32 arg1[3], f32 scale, f32 arg3[3]);
|
||||
|
||||
#endif
|
||||
|
||||
@ -1,6 +1,19 @@
|
||||
#ifndef __MEM_H__
|
||||
#define __MEM_H__
|
||||
|
||||
/**
|
||||
* copy memory area
|
||||
*/
|
||||
void memcpy(void * dst, void *src, int size);
|
||||
void func_80254630(void * dst, void *src, int size); //memcopy_fast
|
||||
|
||||
/**
|
||||
* copy an array of wide_characters
|
||||
*/
|
||||
void wmemcpy(void * dst, void *src, int size);
|
||||
|
||||
|
||||
/**
|
||||
* copy memory area
|
||||
*/
|
||||
void memmove(u8* dst, u8* src, s32 n);
|
||||
#endif
|
||||
|
||||
51
include/core2/anim/sprite.h
Normal file
51
include/core2/anim/sprite.h
Normal file
@ -0,0 +1,51 @@
|
||||
#ifndef __CORE2_ANIM_SPRITE_H__
|
||||
#define __CORE2_ANIM_SPRITE_H__
|
||||
|
||||
#include <ultra64.h>
|
||||
|
||||
|
||||
typedef struct{
|
||||
u8 index;
|
||||
u8 duration;
|
||||
} AnimSpriteStep;
|
||||
|
||||
typedef enum {
|
||||
ANIM_SPRITE_STATE_NONE,
|
||||
ANIM_SPRITE_STATE_ONCE,
|
||||
ANIM_SPRITE_STATE_LOOP,
|
||||
ANIM_SPRITE_STATE_STOPPED
|
||||
} AnimSpriteState;
|
||||
|
||||
typedef struct{
|
||||
AnimSpriteStep *steps;
|
||||
f32 remaining_time;
|
||||
f32 speed_multiplier;
|
||||
u32 step_count:7; //This is the index in the AnimSpriteStep list
|
||||
u32 current_step:7; //current frame
|
||||
u32 start_step:7;
|
||||
u32 current_frame:7; //This is the actual sprite frame
|
||||
u32 state:2;
|
||||
u32 unknown:1;
|
||||
u32 active:1; //active
|
||||
} AnimSprite;
|
||||
|
||||
void animsprite_init(void);
|
||||
AnimSprite * animsprite_new(void);
|
||||
void animsprite_free(AnimSprite *this);
|
||||
void animsprite_terminate(void);
|
||||
void animsprite_update(AnimSprite *this);
|
||||
void animsprite_default(AnimSprite *this);
|
||||
void animsprite_loop(AnimSprite *this);
|
||||
void animsprite_set_steps(AnimSprite *this, AnimSpriteStep *step_list, s32 size);
|
||||
void animsprite_set_state(AnimSprite *this, AnimSpriteState step);
|
||||
void animsprite_set_unknown(AnimSprite *this, s32 value);
|
||||
void animsprite_set_frame(AnimSprite *this, s32 frame_index);
|
||||
void animsprite_set_speed(AnimSprite *this, f32 speed);
|
||||
void animsprite_set_start_step(AnimSprite *this, s32 step);
|
||||
s32 animsprite_get_frame(AnimSprite *this);
|
||||
AnimSpriteState animsprite_get_current_state(AnimSprite *this);
|
||||
s32 animsprite_get_unknown(AnimSprite *this);
|
||||
f32 animsprite_get_speed(AnimSprite *this);
|
||||
int animsprite_is_stopped(AnimSprite *this);
|
||||
int animsprite_is_at_step(AnimSprite *this, s32 frame);
|
||||
#endif
|
||||
17
include/core2/ba/carry.h
Normal file
17
include/core2/ba/carry.h
Normal file
@ -0,0 +1,17 @@
|
||||
#ifndef __BA_CARRY_H__
|
||||
#define __BA_CARRY_H__
|
||||
|
||||
#include <ultra64.h>
|
||||
#include "prop.h"
|
||||
|
||||
void bacarry_init(void);
|
||||
void bacarry_end(void);
|
||||
void bacarry_update(void);
|
||||
|
||||
void bacarry_reset_marker(void);
|
||||
ActorMarker *bacarry_get_marker(void);
|
||||
void bacarry_set_marker(ActorMarker *arg0);
|
||||
void bacarry_set_offsets(f32 height, f32 rotation);
|
||||
|
||||
|
||||
#endif
|
||||
24
include/core2/ba/drone.h
Normal file
24
include/core2/ba/drone.h
Normal file
@ -0,0 +1,24 @@
|
||||
#ifndef __BA_DRONE_H__
|
||||
#define __BA_DRONE_H__
|
||||
|
||||
#include <ultra64.h>
|
||||
#include "prop.h"
|
||||
|
||||
typedef enum ba_drone_type_e{
|
||||
BA_DRONE_NONE,
|
||||
BA_DRONE_GOTO,
|
||||
BA_DRONE_LOOK,
|
||||
BA_DRONE_UNKNOWN_3,
|
||||
BA_DRONE_TRANSFORM,
|
||||
BA_DRONE_ENTER,
|
||||
BA_DRONE_VANISH
|
||||
} BaDroneType;
|
||||
|
||||
void badrone_set_type(BaDroneType type);
|
||||
BaDroneType badrone_get_type(void);
|
||||
void badrone_get_position_and_duration(f32 position[3], f32 *duration);
|
||||
|
||||
enum bs_e badrone_enter(void);
|
||||
enum bs_e badrone_goto(f32 position[3], f32 duration, void (*arg2)(ActorMarker *), ActorMarker *arg3);
|
||||
|
||||
#endif
|
||||
53
include/core2/ba/physics.h
Normal file
53
include/core2/ba/physics.h
Normal file
@ -0,0 +1,53 @@
|
||||
#ifndef __BA_PHYSICS_H__
|
||||
#define __BA_PHYSICS_H__
|
||||
|
||||
#include <ultra64.h>
|
||||
|
||||
typedef enum ba_physics_type_e{
|
||||
BA_PHYSICS_NONE,
|
||||
BA_PHYSICS_UNK1,
|
||||
BA_PHYSICS_NORMAL,
|
||||
BA_PHYSICS_LOCKED_ROTATION,
|
||||
BA_PHYSICS_UNK4,
|
||||
BA_PHYSICS_INVERTED_YAW,
|
||||
BA_PHYSICS_AIRBORN,
|
||||
BA_PHYSICS_FREEZE,
|
||||
BA_PHYSICS_UNK8,
|
||||
BA_PHYSICS_NO_GRAVITY,
|
||||
BA_PHYSICS_CLIMB,
|
||||
BA_PHYSICS_TRANSFORM,
|
||||
BA_PHYSICS_GOTO,
|
||||
BA_PHYSICS_END
|
||||
}BaPhysicsType;
|
||||
|
||||
void baphysics_get_position_change(f32 dst[3]);
|
||||
void baphysics_init(void);
|
||||
void baphysics_update(void);
|
||||
void baphysics_reset_horizontal_velocity(void);
|
||||
void baphysics_set_type(BaPhysicsType);
|
||||
void baphysics_set_target_velocity(f32 src[3]);
|
||||
void baphysics_set_target_horizontal_velocity(f32);
|
||||
void baphysics_set_target_yaw(f32);
|
||||
void baphysics_set_vertical_velocity(f32);
|
||||
void baphysics_set_horizontal_velocity(f32, f32);
|
||||
void baphysics_set_velocity(f32 src[3]);
|
||||
f32 baphysics_get_gravity(void);
|
||||
BaPhysicsType baphysics_get_type(void);
|
||||
f32 baphysics_get_target_horizontal_velocity(void);
|
||||
f32 baphysics_get_target_vertical_velocity(void);
|
||||
f32 baphysics_get_target_yaw(void);
|
||||
void baphysics_get_velocity(f32 dst[3]);
|
||||
f32 baphysics_get_vertical_velocity(void);
|
||||
f32 baphysics_get_horizontal_velocity(void);
|
||||
f32 baphysics_get_horizontal_velocity_percentage(void);
|
||||
void baphysics_reset(void);
|
||||
void baphysics_set_acceleration(f32);
|
||||
void baphysics_reset_gravity(void);
|
||||
void baphysics_reset_terminal_velocity(void);
|
||||
void baphysics_set_goto_duration(f32);
|
||||
void baphysics_set_goto_position(f32 src[3]);
|
||||
void baphysics_set_gravity(f32);
|
||||
void baphysics_set_terminal_velocity(f32);
|
||||
int baphysics_is_slower_than(f32);
|
||||
int baphysics_goto_done(void);
|
||||
#endif
|
||||
@ -8,4 +8,4 @@ enum camera_type_e{
|
||||
CAMERA_TYPE_4_RANDOM = 4
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -5,7 +5,7 @@ enum yaw_state_e{
|
||||
YAW_STATE_0_NONE,
|
||||
YAW_STATE_1_DEFAULT,
|
||||
YAW_STATE_2_UNBOUNDED,
|
||||
YAW_STATE_3_BOUNDED,
|
||||
YAW_STATE_3_BOUNDED
|
||||
};
|
||||
|
||||
void yaw_init(void);
|
||||
|
||||
@ -235,6 +235,8 @@ enum unkflags_1{
|
||||
UNKFLAGS1_A_HAS_SEEN_TIPTUP_FF_MINIGAME,
|
||||
UNKFLAGS1_B_HAS_SEEN_SANDCASTLE_FF_MINIGAME,
|
||||
|
||||
UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT = 0x13,
|
||||
|
||||
UNKFLAGS1_1F_IN_CHARACTER_PARADE = 0x1F,
|
||||
UNKFLAGS1_20_BEGIN_CHARACTER_PARADE,
|
||||
|
||||
@ -1654,8 +1656,8 @@ enum actor_e
|
||||
ACTOR_65_WADING_BOOTS = 0x65,
|
||||
|
||||
ACTOR_67_SNIPPET = 0x67,
|
||||
|
||||
ACTOR_69_CLAM = 0x69,
|
||||
ACTOR_68_SNACKER,
|
||||
ACTOR_69_CLAM,
|
||||
|
||||
ACTOR_6D_GV_BANJO_DOOR = 0x6D,
|
||||
|
||||
@ -1966,7 +1968,8 @@ enum actor_e
|
||||
ACTOR_TOPPER_B = 0x36F,
|
||||
ACTOR_370_GOLD_FEATHER = 0x370,
|
||||
|
||||
ACTOR_375_GRUBLIN_HOOD = 0x375,
|
||||
ACTOR_374_VACATION_TEXT_TRIGGER = 0x374,
|
||||
ACTOR_375_GRUBLIN_HOOD,
|
||||
ACTOR_376_FF_MINIGAME,
|
||||
|
||||
ACTOR_379_UNKNOWN = 0x379,
|
||||
@ -2378,7 +2381,7 @@ enum asset_e
|
||||
/* [0x74, 0x75] empty */
|
||||
ASSET_76_ANIM_JIGSAWDANCE_HOLD = 0x76,
|
||||
ASSET_77_ANIM_BSTIMEOUT,
|
||||
//ASSET_78 // snacker_swimming
|
||||
ASSET_78_ANIM_SNACKER_SWIMMING,
|
||||
//ASSET_79 // Mumbo Concert Playing Instrument
|
||||
//ASSET_7A // Banjo Concert Angry
|
||||
//ASSET_7B // Banjo Concert Play
|
||||
@ -2556,8 +2559,8 @@ enum asset_e
|
||||
ASSET_14A_ANIM_BSREST_LISTEN,
|
||||
|
||||
ASSET_153_ANIM_BURIED_TREASURE_APPEAR = 0x153,
|
||||
|
||||
ASSET_155_ANIM_CRAB_FLIP_UPRIGHT = 0x155,
|
||||
ASSET_154_ANIM_SNACKER_EATING,
|
||||
ASSET_155_ANIM_CRAB_FLIP_UPRIGHT,
|
||||
ASSET_156_ANIM_MUTANT_CRAB_WALK,
|
||||
ASSET_157_ANIM_MUTANT_CRAB_FLIP_UPSIDEDOWN,
|
||||
ASSET_158_ANIM_MUTANT_CRAB_UPSIDEDOWN,
|
||||
@ -2660,7 +2663,10 @@ enum asset_e
|
||||
ASSET_256_ANIM_TERMITE_OW,
|
||||
|
||||
ASSET_25B_ANIM_ACORN_IDLE = 0x25B,
|
||||
|
||||
|
||||
ASSET_273_ANIM_SNACKER_HURT = 0x273,
|
||||
ASSET_274_ANIM_SNACKER_DIE,
|
||||
|
||||
ASSET_281_ANIM_WISHYWASHY_DOOOH = 0x281,
|
||||
ASSET_282_ANIM_BSJIG_NOTEDOOR,
|
||||
|
||||
@ -2894,7 +2900,7 @@ enum asset_e
|
||||
ASSET_3AD_FIRE_SPARKLE = 0x3AD,
|
||||
ASSET_3AE_MODEL_GRAVE_FLOWER_POT,
|
||||
// 3af (Green Plank?)
|
||||
// 3b0 Snacker
|
||||
ASSET_3B0_SNACKER = 0x3B0,
|
||||
// 3b1 Concert Mumbo
|
||||
// 3b2 (Two Poles?)
|
||||
// 3b3 Mumbo's Hut
|
||||
@ -4197,8 +4203,8 @@ enum marker_e{
|
||||
MARKER_11_WADING_BOOTS = 0x11,
|
||||
|
||||
MARKER_13_SNIPPET = 0x13,
|
||||
|
||||
MARKER_15_CLAM = 0x15,
|
||||
MARKER_14_SNACKER,
|
||||
MARKER_15_CLAM,
|
||||
|
||||
MARKER_28_CLANKER_SAWBLADE = 0x28,
|
||||
|
||||
@ -4420,6 +4426,8 @@ enum marker_e{
|
||||
|
||||
MARKER_1E1_FF_MINIGAME = 0x1E1,
|
||||
MARKER_1E2_GRUBLIN_HOOD,
|
||||
MARKER_1E3_VACATION_TEXT_TRIGGER,
|
||||
|
||||
|
||||
MARKER_1E5_GOLD_FEATHER_COLLECTIBLE = 0x1E5,
|
||||
MARKER_1E6_TOPPER_B,
|
||||
|
||||
@ -15,7 +15,7 @@ extern void func_8033F000(const char *, const char *, int);
|
||||
#else
|
||||
#define FILE(file_name) "file_name"
|
||||
#endif
|
||||
#define matching_assert(EX, F, L) assert(EX)
|
||||
|
||||
#ifdef __ANSI_CPP__
|
||||
#define matching_assert(EX, F, L) ((EX)?((void)0):func_8033F000( # EX , # F, L))
|
||||
#else
|
||||
|
||||
@ -108,10 +108,6 @@ void pitch_setIdeal(f32);
|
||||
f32 pitch_get(void);
|
||||
f32 player_getYPosition(void);
|
||||
|
||||
void func_80297970(f32);
|
||||
|
||||
f32 _get_vertVelocity(void);
|
||||
|
||||
void climbGetBottom(f32 dst[3]);
|
||||
|
||||
void yaw_setIdeal(f32);
|
||||
@ -155,7 +151,7 @@ void actor_collisionOff(Actor *);
|
||||
|
||||
void *assetcache_get(enum asset_e assetId);
|
||||
|
||||
Actor *actor_new(s32 (*position)[3], s32 yaw, ActorInfo *actorInfo, u32 flags);
|
||||
Actor *actor_new(s32 position[3], s32 yaw, ActorInfo *actorInfo, u32 flags);
|
||||
Actor *func_802C8A54(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags);
|
||||
Actor *func_802C8AA8(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags);
|
||||
Actor *func_802C8AF8(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags);
|
||||
@ -166,7 +162,7 @@ Actor *func_802C8C04(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags);
|
||||
Actor *marker_getActor(ActorMarker *);
|
||||
|
||||
f32 time_getDelta(void);
|
||||
void jiggySpawn(enum jiggy_e jiggy_id, f32 pos[3]);
|
||||
void jiggy_spawn(enum jiggy_e jiggy_id, f32 pos[3]);
|
||||
|
||||
struct3s *func_802F8264(s32 arg0);
|
||||
struct6s *func_802F8BE0(s32 arg0);
|
||||
@ -209,7 +205,7 @@ void fxhealthscore_free(enum item_e, struct8s *);
|
||||
struct7s *fxairscore_new(s32);
|
||||
void fxairscore_update(enum item_e, struct7s *);
|
||||
void fxairscore_draw(enum item_e, struct8s *, Gfx**, Mtx**, Vtx **);
|
||||
void fxairscore_free(s32, struct8s *);
|
||||
void fxairscore_free(s32, struct7s *);
|
||||
|
||||
|
||||
|
||||
@ -252,9 +248,9 @@ void particleEmitter_setParticleVelocityRange(ParticleEmitter *, f32, f32, f32,
|
||||
void func_802EFF50(ParticleEmitter *, f32);
|
||||
void particleEmitter_setRGB(ParticleEmitter *this, s32 arg1[3]);
|
||||
void particleEmitter_setSpawnInterval(ParticleEmitter *, f32);
|
||||
|
||||
int func_8024DC04(f32, f32, f32);
|
||||
void func_8024E3A8(f32 [3], f32);
|
||||
OSContPad *func_8024F3F4(void);
|
||||
OSMesgQueue *pfsManager_getFrameReplyQ(void);
|
||||
|
||||
void ml_vec3f_clear(f32 dst[3]);
|
||||
@ -280,13 +276,6 @@ void comusic_8025AB44(enum comusic_e comusic_id, s32 arg1, s32 arg2);
|
||||
|
||||
f32 cosf(f32);
|
||||
|
||||
struct54s * func_80287CA8(void);
|
||||
void func_80287F50(struct54s *, struct53s *, s32);
|
||||
void func_80287FD0(struct54s *, f32);
|
||||
void func_80287F7C(struct54s *arg0, s32 arg1);
|
||||
void func_80287F98(struct54s *arg0, s32 arg1);
|
||||
void func_80287FDC(struct54s *arg0, s32 arg1);
|
||||
|
||||
void baanim_setDurationRange(f32, f32);
|
||||
|
||||
|
||||
@ -313,7 +302,7 @@ void func_80292974(f32, f32, f32);
|
||||
void func_80292900(f32, f32);
|
||||
|
||||
void func_80292E80(s32, f32);
|
||||
void func_80293350(void);
|
||||
void bafalldamage_start(void);
|
||||
void func_80293D48(f32, f32);
|
||||
f32 func_80294438(void);
|
||||
f32 func_80294500(void);
|
||||
@ -322,20 +311,6 @@ void func_80294980(f32 arg0[3]);
|
||||
f32 get_slope_timer(void);
|
||||
f32 get_turbo_duration(void);
|
||||
void func_80295C08(void (* arg0)(void));
|
||||
void func_802978DC(int);
|
||||
void func_80297970(f32);
|
||||
void func_8029797C(f32);
|
||||
void player_setYVelocity(f32);
|
||||
void func_802979AC(f32, f32);
|
||||
f32 func_80297A64(void);
|
||||
f32 func_80297A70(void);
|
||||
f32 func_80297A7C(void);
|
||||
f32 _get_horzVelocity(void);
|
||||
f32 func_80297AF0(void);
|
||||
void gravity_set(f32);
|
||||
void func_80297B64(f32);
|
||||
void func_80297BF8(f32);
|
||||
int func_80297C04(f32);
|
||||
void func_80297CCC(f32);
|
||||
f32 pitch_getIdeal(void);
|
||||
void pitch_setAngVel(f32, f32);
|
||||
@ -406,14 +381,14 @@ extern s32 func_802F9AA8(enum sfx_e);
|
||||
|
||||
|
||||
Actor * func_803055E0(enum actor_e id, s32 pos[3], s32 arg2, s32 arg3, s32 arg4);
|
||||
Actor * func_803056FC(enum actor_e id, s32 pos[3], s32 yaw);
|
||||
Actor * spawn_actor(enum actor_e id, s32 pos[3], s32 yaw);
|
||||
f32 func_80309724(f32[3]);
|
||||
BKModelBin *func_8030A428(s32);
|
||||
u8 func_8030D90C(void);
|
||||
void sfxsource_setSfxId(u8 indx, enum sfx_e uid);
|
||||
void func_8030DBB4(u8, f32);
|
||||
void func_8030DD14(u8, int);
|
||||
void func_8030DF68(u8, f32[3]);
|
||||
void sfxsource_set_position(u8, f32[3]);
|
||||
void func_8030DFF0(u8, s32);
|
||||
void func_8030E04C(u8, f32, f32, f32);
|
||||
void func_8030E0FC(u8, f32, f32, f32);
|
||||
@ -455,11 +430,11 @@ void func_8032728C(f32[3], f32, s32, int(*)(Actor *));
|
||||
Actor *func_8032813C(enum actor_e actor_id, f32 position[3], s32 yaw);
|
||||
int func_8032863C(AnimCtrl *, f32, f32);
|
||||
int func_80328A2C(Actor *, f32, s32, f32);
|
||||
void func_80328A84(Actor *, u32);
|
||||
void subaddie_set_state(Actor *, u32);
|
||||
ActorMarker *func_8032B16C(enum jiggy_e jiggy_id);
|
||||
int func_80328B38(Actor *, s32, f32);
|
||||
void func_80328B8C(Actor * this, s32 myAnimId, f32 arg2, s32 direction);
|
||||
int func_80328BD4(Actor *, s32, f32, s32, f32 );
|
||||
int subaddie_maybe_set_state(Actor *, s32, f32);
|
||||
void subaddie_set_state_with_direction(Actor * this, s32 myAnimId, f32 arg2, s32 direction);
|
||||
int subaddie_maybe_set_state_position_direction(Actor *, s32, f32, s32, f32 );
|
||||
void func_80328CEC(Actor *, s32, s32, s32);
|
||||
void func_80328FB0(Actor *, f32);
|
||||
int func_80329030(Actor *, s32);
|
||||
@ -501,7 +476,6 @@ void func_80352CF4(f32 *, f32 *, f32, f32);
|
||||
|
||||
|
||||
AnimCtrl *baanim_getAnimCtrlPtr(void);
|
||||
void _get_velocity(f32 dst[3]);
|
||||
void player_setYPosition(f32);
|
||||
|
||||
NodeProp *func_80304C38(enum actor_e arg0, Actor *arg1);
|
||||
@ -534,7 +508,7 @@ Actor *actorArray_findActorFromActorId(enum actor_e);
|
||||
f32 func_8038A6B8(ActorMarker *);
|
||||
void *defrag_asset(void *);
|
||||
void ml_interpolate_vec3f(f32 [3], f32 [3], f32 [3], f32);
|
||||
void func_8030DEB4(u8, f32, f32);
|
||||
void sfxsource_set_fade_distances(u8, f32, f32);
|
||||
void func_8030DB04(u8, s32, f32 position[3], f32, f32);
|
||||
void func_80258A4C(f32 [3], f32, f32 [3], f32 *, f32 *, f32 *);
|
||||
|
||||
@ -576,6 +550,6 @@ void ability_unlock(enum ability_e);
|
||||
extern void func_802EE278(Actor *, s32, s32, s32, f32, f32);
|
||||
extern void fxSparkle_chTreasure(s16[3]);
|
||||
extern void actor_collisionOn(Actor *);
|
||||
extern void func_80328AC8(Actor *, s32);
|
||||
extern void subaddie_set_state_forward(Actor *, s32);
|
||||
|
||||
#endif
|
||||
|
||||
@ -3,6 +3,5 @@
|
||||
|
||||
#include "gc/gcbound.h"
|
||||
#include "gc/gctransition.h"
|
||||
#include "gc/gczoombox.h"
|
||||
|
||||
#endif
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
#ifndef __GC_TRANSITION__
|
||||
#define __GC_TRANSITION__
|
||||
|
||||
void gctransition_8030B740(void);
|
||||
void gctransition_defrag(void);
|
||||
void gctransition_draw(Gfx **arg0, Mtx **arg1, Vtx **arg2);
|
||||
void gctransition_8030BD4C(void);
|
||||
f32 gctransition_8030BD88(void);
|
||||
int gctransition_8030BD98(void);
|
||||
int gctransition_8030BDAC(void);
|
||||
int gctransition_done(void);
|
||||
int gctransition_active(void);
|
||||
int gctransition_8030BDC0(void);
|
||||
void gctransition_8030BE3C(void);
|
||||
void gctransition_8030BE60(void);
|
||||
|
||||
@ -1,212 +0,0 @@
|
||||
#ifndef GCZOOMBOX_H
|
||||
#define GCZOOMBOX_H
|
||||
|
||||
#include <ultra64.h>
|
||||
|
||||
#include "structs.h"
|
||||
|
||||
enum talk_pic_e {
|
||||
TALK_PIC_0_GRUNTILDA_1,
|
||||
TALK_PIC_1_VILE_1,
|
||||
TALK_PIC_2_VILE_2,
|
||||
TALK_PIC_3_VILE_3,
|
||||
TALK_PIC_4_BANJO_1,
|
||||
TALK_PIC_5_GRUNTILDA_2,
|
||||
TALK_PIC_6_JIGGY_1,
|
||||
TALK_PIC_7_TOOTY_1,
|
||||
TALK_PIC_8_MUSIC_NOTE_1,
|
||||
TALK_PIC_9_JIGGY_2,
|
||||
TALK_PIC_A_EXTRA_HEALTH_MAX,
|
||||
TALK_PIC_B_CLOCK,
|
||||
TALK_PIC_C_BANJO_2,
|
||||
TALK_PIC_D_KAZOOIE_1,
|
||||
TALK_PIC_E_KAZOOIE_2,
|
||||
TALK_PIC_F_BOTTLES,
|
||||
TALK_PIC_10_MUMBO_1,
|
||||
TALK_PIC_11_CHIMPY,
|
||||
TALK_PIC_12_CONGA,
|
||||
TALK_PIC_13_BLUBBER,
|
||||
TALK_PIC_14_NIPPER,
|
||||
TALK_PIC_15_CLANKER,
|
||||
TALK_PIC_16_SNIPPET,
|
||||
TALK_PIC_17_VILE_4,
|
||||
TALK_PIC_18_TIPTUP,
|
||||
TALK_PIC_19_TANKTUP,
|
||||
TALK_PIC_1A_FLIBBIT,
|
||||
TALK_PIC_1B_TRUNKER,
|
||||
TALK_PIC_1C_RUBEE,
|
||||
TALK_PIC_1D_GOBI,
|
||||
TALK_PIC_1E_GRABBA,
|
||||
TALK_PIC_1F_TEEHEE,
|
||||
TALK_PIC_20_JINJO_YELLOW,
|
||||
TALK_PIC_21_JINJO_GREEN,
|
||||
TALK_PIC_22_JINJO_BLUE,
|
||||
TALK_PIC_23_JINJO_PINK,
|
||||
TALK_PIC_24_JINJO_ORANGE,
|
||||
TALK_PIC_25_MUSIC_NOTE_2,
|
||||
TALK_PIC_26_MUMBO_TOKEN,
|
||||
TALK_PIC_27_BLUE_EGG,
|
||||
TALK_PIC_28_RED_FEATHER,
|
||||
TALK_PIC_29_GOLD_FEATHER,
|
||||
TALK_PIC_2A_ORANGE,
|
||||
TALK_PIC_2B_GOLD_BULLION,
|
||||
TALK_PIC_2C_HONEYCOMB,
|
||||
TALK_PIC_2D_EXTRA_HEALTH_MAX,
|
||||
TALK_PIC_2E_EXTRA_LIFE,
|
||||
TALK_PIC_2F_JIGGY_3,
|
||||
TALK_PIC_30_EXTRA_HONEYCOMB,
|
||||
TALK_PIC_31_CATERPILLAR,
|
||||
TALK_PIC_32_WADING_BOOTS,
|
||||
TALK_PIC_33_PIRANHA,
|
||||
TALK_PIC_34_TERMITE,
|
||||
TALK_PIC_35_JUJU,
|
||||
TALK_PIC_36_YUMYUM,
|
||||
TALK_PIC_37_LITTLE_LOCKUP,
|
||||
TALK_PIC_38_LEAKY,
|
||||
TALK_PIC_39_GLOOP,
|
||||
TALK_PIC_3A_TIPTUP_CHOIR_MEMBER,
|
||||
TALK_PIC_3B_SNACKER,
|
||||
TALK_PIC_3C_ANCIENT_ONE,
|
||||
TALK_PIC_3D_SAND_EEL,
|
||||
TALK_PIC_3E_SNORKEL,
|
||||
TALK_PIC_3F_JINXY,
|
||||
TALK_PIC_40_CROCTUS,
|
||||
TALK_PIC_41_GRUNTILDA_3,
|
||||
TALK_PIC_42_TOOTY_2,
|
||||
TALK_PIC_43_BOGGY,
|
||||
TALK_PIC_44_WOZZA,
|
||||
TALK_PIC_45_MOTZHAND,
|
||||
TALK_PIC_46_TUMBLAR,
|
||||
TALK_PIC_47_MUMMUM,
|
||||
TALK_PIC_48_XMAS_GIFT_BLUE,
|
||||
TALK_PIC_49_WORM,
|
||||
TALK_PIC_4A_FREEZING_WATER,
|
||||
TALK_PIC_4B_TWINKLY,
|
||||
TALK_PIC_4C_TWINKLY_CHOMPER,
|
||||
TALK_PIC_4D_GNAWTY,
|
||||
TALK_PIC_4E_BOSS_BOOM_BOX,
|
||||
TALK_PIC_4F_ZUBBA,
|
||||
TALK_PIC_50_NABNUT,
|
||||
TALK_PIC_51_POLAR_BEAR_CUBS,
|
||||
TALK_PIC_52_YOUNG_EEYRIE_1,
|
||||
TALK_PIC_53_YOUNG_EEYRIE_2,
|
||||
TALK_PIC_54_YOUNG_EEYRIE_3,
|
||||
TALK_PIC_55_ADULT_EEYRIE,
|
||||
TALK_PIC_56_WARP_CAULDRON,
|
||||
TALK_PIC_57_BRENTILDA,
|
||||
TALK_PIC_58_TOOTY_3,
|
||||
TALK_PIC_59_BLACK_SNIPPET,
|
||||
TALK_PIC_5A_LOGGO,
|
||||
TALK_PIC_5B_CHEATO,
|
||||
TALK_PIC_5C_XMAS_GIFT_GREEN,
|
||||
TALK_PIC_5D_KLUNGO,
|
||||
TALK_PIC_5E_SEXY_GRUNTY,
|
||||
TALK_PIC_5F_TOOTY_4,
|
||||
TALK_PIC_60_BANJO_3,
|
||||
TALK_PIC_61_KAZOOIE_3,
|
||||
TALK_PIC_62_TOOTY_5,
|
||||
TALK_PIC_63_DINGPOT,
|
||||
TALK_PIC_64_CROC_BANJO,
|
||||
TALK_PIC_65_GRUNTILDA_4,
|
||||
TALK_PIC_66_LOCKUP,
|
||||
TALK_PIC_67_VILE_5,
|
||||
TALK_PIC_68_VILE_6,
|
||||
TALK_PIC_69_VILE_7
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
u8 unk0[0x30]; //string1
|
||||
u8 unk30[0x30]; //string2
|
||||
u8 unk60[0x30];
|
||||
u8 unk90[0x20];
|
||||
u8 unkB0[0x40];
|
||||
BKModelBin *model;
|
||||
AnimCtrl *anim_ctrl;
|
||||
BKSprite *unkF8;
|
||||
BKSpriteDisplayData *unkFC;
|
||||
BKSprite *unk100;
|
||||
BKSpriteDisplayData *unk104;
|
||||
u8 unk108[5]; //sfx_ids
|
||||
u8 pad10D[3];
|
||||
f32 unk110[5]; //sfx_???
|
||||
s16 unk124[5]; //sfx_???
|
||||
s16 unk12E;
|
||||
void (*unk130)(s32, s32);
|
||||
u8 unk134;
|
||||
u8 state;
|
||||
u8 portrait_id; //0x136
|
||||
u8 unk137; //string_cnt
|
||||
u8 unk138; //current_string
|
||||
u8 unk139;
|
||||
u8 unk13A;
|
||||
u8 sfx_count;
|
||||
char *raw_str[8]; //string_ptrs
|
||||
u8 unk15C;
|
||||
u8 unk15D;
|
||||
u8 unk15E;
|
||||
u8 pad15F[0x1];
|
||||
u8 *unk160;
|
||||
s16 unk164;
|
||||
s16 unk166; //top_transparency???
|
||||
s16 unk168; //rgb???
|
||||
s16 unk16A; //x_pos
|
||||
s16 unk16C; //y1_pos
|
||||
s16 unk16E; //y2_pos
|
||||
s16 unk170;
|
||||
s16 unk172;
|
||||
s16 unk174;
|
||||
s8 unk176;
|
||||
s8 unk177;
|
||||
s8 unk178;
|
||||
s8 unk179;
|
||||
u8 pad17A[0x2];
|
||||
f32 unk17C;
|
||||
s8 unk180;
|
||||
s8 unk181;
|
||||
u8 unk182;
|
||||
u8 unk183;
|
||||
u8 unk184;
|
||||
u8 unk185;
|
||||
s8 unk186;
|
||||
u8 unk187;
|
||||
u8 frame_count; //sprite frame count
|
||||
u8 unk189;
|
||||
u8 unk18A;
|
||||
u8 prev_sfx; //next_sfx
|
||||
f32 unk18C;
|
||||
f32 unk190;
|
||||
f32 unk194;
|
||||
f32 unk198;
|
||||
f32 unk19C;
|
||||
f32 unk1A0;
|
||||
u32 unk1A4_31:1;
|
||||
u32 unk1A4_30:1;
|
||||
u32 unk1A4_29:1;
|
||||
u32 unk1A4_28:1;
|
||||
u32 unk1A4_27:1;
|
||||
u32 unk1A4_26:1;
|
||||
u32 unk1A4_25:1;
|
||||
u32 unk1A4_24:1;
|
||||
u32 unk1A4_23:1;
|
||||
u32 unk1A4_22:1;
|
||||
u32 unk1A4_21:1;
|
||||
u32 unk1A4_20:1;
|
||||
u32 unk1A4_19:1;
|
||||
u32 unk1A4_18:1; //highlighted
|
||||
u32 unk1A4_17:1;
|
||||
u32 unk1A4_16:1;
|
||||
u32 unk1A4_15:1;
|
||||
u32 unk1A4_14:1;
|
||||
u32 unk1A4_13:1;
|
||||
u32 unk1A4_12:1;
|
||||
u32 unk1A4_11:1;
|
||||
u32 unk1A4_10:1;
|
||||
u32 pad1A4_9:10;
|
||||
}gczoombox_t; //size 0x1A8
|
||||
|
||||
|
||||
void gczoombox_draw(gczoombox_t *this, Gfx **gdl, Mtx ** mptr, void *vptr);
|
||||
void gczoombox_free(gczoombox_t* this);
|
||||
gczoombox_t *gczoombox_new(s32 arg0, enum talk_pic_e arg1, s32 arg2, s32 arg3, void (*arg4)(s32, s32));
|
||||
|
||||
#endif
|
||||
@ -16,6 +16,10 @@
|
||||
\label:
|
||||
.endm
|
||||
|
||||
.macro jlabel label
|
||||
\label:
|
||||
.endm
|
||||
|
||||
.macro endlabel label
|
||||
.end \label
|
||||
.endm
|
||||
|
||||
6
include/math.h
Normal file
6
include/math.h
Normal file
@ -0,0 +1,6 @@
|
||||
#ifndef __BANJO_KAZOOIE_MATH_H__
|
||||
#define __BANJO_KAZOOIE_MATH_H__
|
||||
|
||||
#define SQ(x) ((x)*(x))
|
||||
|
||||
#endif // __BANJO_KAZOOIE_MATH_H__
|
||||
@ -11,5 +11,9 @@
|
||||
\label:
|
||||
.endm
|
||||
|
||||
.macro jlabel label
|
||||
\label:
|
||||
.endm
|
||||
|
||||
.macro endlabel label
|
||||
.endm
|
||||
@ -48,18 +48,23 @@ typedef struct model_prop_s{
|
||||
|
||||
|
||||
typedef struct actor_prop_s{
|
||||
struct actorMarker_s* marker;
|
||||
s16 x;
|
||||
s16 y;
|
||||
s16 z;
|
||||
u16 unk8_15:5;
|
||||
u16 unk8_10:5;
|
||||
u16 unk8_5:1;
|
||||
u16 unk8_4:1;
|
||||
u16 unk8_3:1;
|
||||
u16 unk8_2:1;
|
||||
u16 unk8_1:1;
|
||||
u16 unk8_0:1;
|
||||
union {
|
||||
struct {
|
||||
struct actorMarker_s* marker;
|
||||
s16 x;
|
||||
s16 y;
|
||||
s16 z;
|
||||
u16 unk8_15:5;
|
||||
u16 unk8_10:5;
|
||||
u16 unk8_5:1;
|
||||
u16 unk8_4:1;
|
||||
u16 unk8_3:1;
|
||||
u16 unk8_2:1;
|
||||
u16 unk8_1:1;
|
||||
u16 unk8_0:1;
|
||||
};
|
||||
s32 words[3];
|
||||
};
|
||||
} ActorProp;
|
||||
|
||||
typedef void(*MarkerCollisionFunc)(struct actorMarker_s *this, struct actorMarker_s *other);
|
||||
@ -337,7 +342,7 @@ typedef struct {
|
||||
s16 y;
|
||||
s16 z;
|
||||
struct {
|
||||
u16 bit15: 9; //selector_value //volume??? diameter
|
||||
u16 radius: 9; //selector_value //volume??? diameter
|
||||
u16 bit6: 6; //category
|
||||
u16 bit0: 1;
|
||||
}unk6;
|
||||
@ -393,4 +398,9 @@ typedef struct actor_array{
|
||||
Actor data[]; //variable size array
|
||||
}ActorArray;
|
||||
|
||||
typedef struct {
|
||||
u32 cnt;
|
||||
Actor *actor_save_state[];
|
||||
}ActorListSaveState;
|
||||
|
||||
#endif
|
||||
|
||||
@ -246,29 +246,12 @@ typedef struct struct_8_s{
|
||||
f32 unk60;
|
||||
}struct8s;
|
||||
|
||||
typedef struct struct_9_s{
|
||||
u8 uid;
|
||||
u8 unk1;
|
||||
u8 unk2;
|
||||
// u8 pad3[1];
|
||||
f32 unk4; //duration
|
||||
s32 unk8; //asset_indx
|
||||
s32 unkC; //animation_indx
|
||||
f32 unk10;
|
||||
}struct9s;
|
||||
|
||||
typedef struct struct_10_s{
|
||||
u8 map_indx;
|
||||
u8 unk1;
|
||||
u8 unk2;
|
||||
}struct10s;
|
||||
|
||||
typedef struct struct_11_s{
|
||||
f32 unk0;
|
||||
f32 unk4;
|
||||
s32 unk8;
|
||||
s32 unkC;
|
||||
s16 unk10; //trackId
|
||||
s16 track_id; //trackId
|
||||
s16 unk12;
|
||||
u8 unk14;
|
||||
u8 unk15;
|
||||
@ -504,23 +487,7 @@ typedef struct{
|
||||
u8 pad4[8];
|
||||
}struct52s;
|
||||
|
||||
typedef struct{
|
||||
u8 unk0;
|
||||
u8 unk1;
|
||||
} struct53s;
|
||||
|
||||
typedef struct{
|
||||
struct53s *unk0;
|
||||
f32 unk4;
|
||||
f32 unk8;
|
||||
u32 unkC_31:7;
|
||||
u32 unkC_24:7;
|
||||
u32 unkC_17:7;
|
||||
u32 unkC_10:7;
|
||||
u32 unkC_3:2;
|
||||
u32 unkC_1:1;
|
||||
u32 unkC_0:1;
|
||||
} struct54s;
|
||||
|
||||
typedef struct{
|
||||
s32 unk0;
|
||||
|
||||
@ -1,25 +1,4 @@
|
||||
/* lair */
|
||||
FF_QuestionTypeInfoArr = 0x80394340;
|
||||
D_80392EB0 = 0x80392EB0;
|
||||
D_80392E20 = 0x80392E20;
|
||||
lair_D_80392D90 = 0x80392D90;
|
||||
MMM_D_8038C510 = 0x8038C510;
|
||||
func_803863F0 = 0x803863F0;
|
||||
D_8038D6A0 = 0x8038D6A0;
|
||||
D_8038D378 = 0x8038D378;
|
||||
D_8038D4DC = 0x8038D4DC;
|
||||
D_8038D534 = 0x8038D534;
|
||||
D_8038D590 = 0x8038D590;
|
||||
D_8038D6DC = 0x8038D6DC;
|
||||
D_8038D844 = 0x8038D844;
|
||||
fight_D_80391A10 = 0x80391A10;
|
||||
FP_D_80392840 = 0x80392840;
|
||||
core1_D_803727F4 = 0x803727F4;
|
||||
__osBaseTimer = 0x80285D00;
|
||||
FP_D_80392864 = 0x80392864;
|
||||
D_803687F0 = 0x803687F0;
|
||||
D_80276E70 = 0x80276E70;
|
||||
|
||||
/* Microcode renames to match ucode.h names */
|
||||
n_aspMainTextStart = _binary_bin_core1_n_aspMain_text_bin_start;
|
||||
n_aspMainTextEnd = _binary_bin_core1_n_aspMain_text_bin_end;
|
||||
gSPF3DEX_fifoTextStart = _binary_bin_core1_gSPF3DEX_fifo_text_bin_start;
|
||||
@ -32,3 +11,21 @@ gSPF3DEX_fifoDataStart = _binary_bin_core1_gSPF3DEX_fifo_data_bin_start;
|
||||
gSPF3DEX_fifoDataEnd = _binary_bin_core1_gSPF3DEX_fifo_data_bin_end;
|
||||
gSPL3DEX_fifoDataStart = _binary_bin_core1_gSPL3DEX_fifo_data_bin_start;
|
||||
gSPL3DEX_fifoDataEnd = _binary_bin_core1_gSPL3DEX_fifo_data_bin_end;
|
||||
|
||||
/* Fixed-address buffers */
|
||||
D_8000E800 = 0x8000E800;
|
||||
D_8002D500 = 0x8002D500;
|
||||
D_8023DA00 = 0x8023DA00; /* confirm */
|
||||
D_803FBE00 = 0x803FBE00;
|
||||
D_803FFE00 = 0x803FFE00;
|
||||
D_803FFE10 = 0x803FFE10;
|
||||
gOverlayTable = 0x803FFE10;
|
||||
D_803A5D00 = 0x803A5D00; /* framebuffers */
|
||||
|
||||
/* Renames for the boot segment */
|
||||
boot_D_8002D500 = D_8002D500;
|
||||
boot_core1_VRAM = core1_VRAM;
|
||||
boot_D_803FBE00 = D_803FBE00;
|
||||
boot_D_803FFE00 = D_803FFE00;
|
||||
boot_gOverlayTable = gOverlayTable;
|
||||
boot_func_8023DA20 = func_8023DA20;
|
||||
@ -1,23 +1,23 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="111" height="20">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="118" height="20">
|
||||
<linearGradient id="b" x2="0" y2="100%">
|
||||
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
||||
<stop offset="1" stop-opacity=".1"/>
|
||||
</linearGradient>
|
||||
<mask id="anybadge_1">
|
||||
<rect width="111" height="20" rx="3" fill="#fff"/>
|
||||
<rect width="118" height="20" rx="3" fill="#fff"/>
|
||||
</mask>
|
||||
<g mask="url(#anybadge_1)">
|
||||
<path fill="#555" d="M0 0h44v20H0z"/>
|
||||
<path fill="#07e000" d="M44 0h67v20H44z"/>
|
||||
<path fill="url(#b)" d="M0 0h111v20H0z"/>
|
||||
<path fill="#00e000" d="M44 0h74v20H44z"/>
|
||||
<path fill="url(#b)" d="M0 0h118v20H0z"/>
|
||||
</g>
|
||||
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
|
||||
<text x="23.0" y="15" fill="#010101" fill-opacity=".3">core1</text>
|
||||
<text x="22.0" y="14">core1</text>
|
||||
</g>
|
||||
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
|
||||
<text x="78.5" y="15" fill="#010101" fill-opacity=".3">98.4321%</text>
|
||||
<text x="77.5" y="14">98.4321%</text>
|
||||
<text x="82.0" y="15" fill="#010101" fill-opacity=".3">100.0000%</text>
|
||||
<text x="81.0" y="14">100.0000%</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
@ -1,23 +1,23 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="111" height="20">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="118" height="20">
|
||||
<linearGradient id="b" x2="0" y2="100%">
|
||||
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
||||
<stop offset="1" stop-opacity=".1"/>
|
||||
</linearGradient>
|
||||
<mask id="anybadge_1">
|
||||
<rect width="111" height="20" rx="3" fill="#fff"/>
|
||||
<rect width="118" height="20" rx="3" fill="#fff"/>
|
||||
</mask>
|
||||
<g mask="url(#anybadge_1)">
|
||||
<path fill="#555" d="M0 0h44v20H0z"/>
|
||||
<path fill="#08e000" d="M44 0h67v20H44z"/>
|
||||
<path fill="url(#b)" d="M0 0h111v20H0z"/>
|
||||
<path fill="#00e000" d="M44 0h74v20H44z"/>
|
||||
<path fill="url(#b)" d="M0 0h118v20H0z"/>
|
||||
</g>
|
||||
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
|
||||
<text x="23.0" y="15" fill="#010101" fill-opacity=".3">core2</text>
|
||||
<text x="22.0" y="14">core2</text>
|
||||
</g>
|
||||
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
|
||||
<text x="78.5" y="15" fill="#010101" fill-opacity=".3">98.1193%</text>
|
||||
<text x="77.5" y="14">98.1193%</text>
|
||||
<text x="82.0" y="15" fill="#010101" fill-opacity=".3">100.0000%</text>
|
||||
<text x="81.0" y="14">100.0000%</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
@ -1,23 +1,23 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="217" height="20">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="224" height="20">
|
||||
<linearGradient id="b" x2="0" y2="100%">
|
||||
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
||||
<stop offset="1" stop-opacity=".1"/>
|
||||
</linearGradient>
|
||||
<mask id="anybadge_1">
|
||||
<rect width="217" height="20" rx="3" fill="#fff"/>
|
||||
<rect width="224" height="20" rx="3" fill="#fff"/>
|
||||
</mask>
|
||||
<g mask="url(#anybadge_1)">
|
||||
<path fill="#555" d="M0 0h150v20H0z"/>
|
||||
<path fill="#06e000" d="M150 0h67v20H150z"/>
|
||||
<path fill="url(#b)" d="M0 0h217v20H0z"/>
|
||||
<path fill="#00e000" d="M150 0h74v20H150z"/>
|
||||
<path fill="url(#b)" d="M0 0h224v20H0z"/>
|
||||
</g>
|
||||
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
|
||||
<text x="76.0" y="15" fill="#010101" fill-opacity=".3">Banjo-Kazooie (us.v10)</text>
|
||||
<text x="75.0" y="14">Banjo-Kazooie (us.v10)</text>
|
||||
</g>
|
||||
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
|
||||
<text x="184.5" y="15" fill="#010101" fill-opacity=".3">98.6934%</text>
|
||||
<text x="183.5" y="14">98.6934%</text>
|
||||
<text x="188.0" y="15" fill="#010101" fill-opacity=".3">100.0000%</text>
|
||||
<text x="187.0" y="14">100.0000%</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
@ -1,2 +0,0 @@
|
||||
|
||||
./src/FP/code_5CC0.c:#pragma GLOBAL_ASM("asm/nonmatchings/FP/code_5CC0/func_8038C428.s")
|
||||
@ -1 +1 @@
|
||||
char pad_BGS_D_80391230[0x10];
|
||||
char pad_BGS_D_80391230[0x10];
|
||||
|
||||
@ -38,7 +38,7 @@ void BGS_func_80388660(ActorMarker *this){
|
||||
}
|
||||
|
||||
void BGS_func_8038868C(void){
|
||||
jiggySpawn(JIGGY_27_BGS_TIPTUP, D_80390868);
|
||||
jiggy_spawn(JIGGY_27_BGS_TIPTUP, D_80390868);
|
||||
}
|
||||
|
||||
void func_803886B4(ActorMarker *this, s32 arg1){
|
||||
|
||||
@ -25,7 +25,7 @@ void func_8038EE50(void){
|
||||
f32 sp24[3];
|
||||
|
||||
if(nodeProp_findPositionFromActorId(0x14d, sp24)){
|
||||
jiggySpawn(JIGGY_20_BGS_ELEVATED_WALKWAY, sp24);
|
||||
jiggy_spawn(JIGGY_20_BGS_ELEVATED_WALKWAY, sp24);
|
||||
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
|
||||
reinterpret_cast(s32, sp24[0]),
|
||||
reinterpret_cast(s32, sp24[1]),
|
||||
@ -68,7 +68,7 @@ void func_8038F018(void){
|
||||
f32 sp24[3];
|
||||
|
||||
if(nodeProp_findPositionFromActorId(0x1fc, sp24)){
|
||||
jiggySpawn(JIGGY_25_BGS_MAZE, sp24);
|
||||
jiggy_spawn(JIGGY_25_BGS_MAZE, sp24);
|
||||
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
|
||||
reinterpret_cast(s32, sp24[0]),
|
||||
reinterpret_cast(s32, sp24[1]),
|
||||
|
||||
@ -65,7 +65,7 @@ void *func_80387D90(ActorMarker * arg0){
|
||||
spawnPos[2] = this->position_z;
|
||||
marker->propPtr->unk8_3 = 0;
|
||||
func_802BAFE4(0x19);
|
||||
jiggySpawn(JIGGY_22_CROCTUS, spawnPos);
|
||||
jiggy_spawn(JIGGY_22_CROCTUS, spawnPos);
|
||||
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
|
||||
}
|
||||
|
||||
@ -92,7 +92,7 @@ void func_80387E68(ActorMarker *caller, enum asset_e text_id, s32 arg2){
|
||||
timed_playSfx(1.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000);
|
||||
func_80324CFC(0.4f, COMUSIC_43_ENTER_LEVEL_GLITTER, 22000);
|
||||
func_80324D2C(4.5f, COMUSIC_43_ENTER_LEVEL_GLITTER);
|
||||
func_80328B8C(this, 5, 0.79f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.79f, 1);
|
||||
func_80326310(this);
|
||||
bgs_D_803907B8[this->unkF4_8]->propPtr->unk8_4 = TRUE;
|
||||
timedFunc_set_1(1.1f, (GenFunction_1)func_80387E00, reinterpret_cast(s32, bgs_D_803907B8[this->unkF4_8]));
|
||||
@ -144,13 +144,13 @@ void func_80387FD4(Actor *this){
|
||||
if (this->unkF4_8 == 1) {
|
||||
func_8028F94C(2, this->position);
|
||||
func_80311480(0xC86, 0xE, this->position, this->marker, func_80387E68, NULL);
|
||||
func_80328B8C(this, 6, 0.79f, 1);
|
||||
subaddie_set_state_with_direction(this, 6, 0.79f, 1);
|
||||
} else {
|
||||
timed_playSfx(0.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); //0.4f
|
||||
timed_playSfx(1.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); //1.4f
|
||||
func_80324CFC(0.4f, COMUSIC_43_ENTER_LEVEL_GLITTER, 22000);
|
||||
func_80324D2C(4.5f, COMUSIC_43_ENTER_LEVEL_GLITTER);
|
||||
func_80328B8C(this, 5, 0.79f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.79f, 1);
|
||||
if (this->unkF4_8 == 5) {
|
||||
timedFunc_set_1(0.9f, (GenFunction_1) func_80387E40, (s32) this->marker);
|
||||
} else {
|
||||
@ -172,7 +172,7 @@ void func_80387FD4(Actor *this){
|
||||
case 1:// L80388370
|
||||
this->unk60 += time_getDelta();
|
||||
if(0.7 <= this->unk60){
|
||||
func_80328B8C(this, 2, 0.0f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.0f, 1);
|
||||
func_80387C90(this);
|
||||
this->unk60 = 0.0f;
|
||||
func_80324D54(0.1f, SFX_D0_GRIMLET_SQUEAK, 1.0f, 0x7530, this->position, 0.0f, 1800.0f);
|
||||
@ -181,14 +181,14 @@ void func_80387FD4(Actor *this){
|
||||
|
||||
case 2:// L80388400
|
||||
if(actor_animationIsAt(this, 0.62f)){
|
||||
func_80328B8C(this, 3, 0.62f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.62f, 1);
|
||||
}
|
||||
break;
|
||||
|
||||
case 3:// L80388434
|
||||
this->unk60 += time_getDelta();
|
||||
if( this->unk60 >= 0.13 + 0.7/4 * (5 - this->unkF4_8)){
|
||||
func_80328B8C(this, 4, 0.62f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.62f, 1);
|
||||
func_80387C90(this);
|
||||
this->unk60 = 0.0f;
|
||||
func_80324D54(0.3f, 0x406, 1.0f, 0x55f0, this->position, 0.0f, 1800.0f);
|
||||
@ -197,7 +197,7 @@ void func_80387FD4(Actor *this){
|
||||
|
||||
case 4:// L8038850C
|
||||
if(actor_animationIsAt(this, 0.0f)){
|
||||
func_80328B8C(this, 1, 0.0f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.0f, 1);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
@ -266,7 +266,7 @@ void func_80386EB0(ActorMarker *this, ActorMarker *other){
|
||||
Actor *chflibbit_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
Actor *this;
|
||||
ActorLocal_Flibbit *local;
|
||||
s32 temp_a0;
|
||||
BoneTransformList *temp_a0;
|
||||
int i;
|
||||
f32 sp7C[3];
|
||||
f32 phi_f2;
|
||||
|
||||
@ -22,7 +22,7 @@ u8 D_80391240[4];
|
||||
/* .code */
|
||||
static void __chFrogMinigame_spawnJiggy(void){
|
||||
static f32 D_80390AD4[3] = {1985.0f, 200.0f, -1386.0f};
|
||||
jiggySpawn(JIGGY_24_BGS_FLIBBITS, D_80390AD4);
|
||||
jiggy_spawn(JIGGY_24_BGS_FLIBBITS, D_80390AD4);
|
||||
}
|
||||
|
||||
static void __chFrogMinigame_textCallback(ActorMarker *marker, enum asset_e text_id, s32 arg2){
|
||||
|
||||
@ -93,7 +93,7 @@ void func_8038FD9C(Actor *this){
|
||||
this->unk1C[0] = 1.0f;
|
||||
this->alpha_124_19 = 0xff;
|
||||
if(this->unk54 != 0.0f){
|
||||
func_80328A84(this, 2);
|
||||
subaddie_set_state(this, 2);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -104,7 +104,7 @@ void func_8038FD9C(Actor *this){
|
||||
this->marker->propPtr->unk8_3 = 1;
|
||||
this->unk1C[0] = 1.0f;
|
||||
if(15.0f <= this->velocity_x){
|
||||
func_80328A84(this, 3);
|
||||
subaddie_set_state(this, 3);
|
||||
this->velocity_x = 0.0f;
|
||||
}
|
||||
else{
|
||||
@ -124,7 +124,7 @@ void func_8038FD9C(Actor *this){
|
||||
this->unk1C[0] = 0.0f;
|
||||
this->alpha_124_19 = 0;
|
||||
if (this->unk54 == 0.0f) {
|
||||
func_80328A84(this, 4);
|
||||
subaddie_set_state(this, 4);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -132,7 +132,7 @@ void func_8038FD9C(Actor *this){
|
||||
this->marker->propPtr->unk8_3 = 1;
|
||||
this->unk1C[0] = 1.0f;
|
||||
if (this->velocity[0] >= 15.0f) {
|
||||
func_80328A84(this, 1);
|
||||
subaddie_set_state(this, 1);
|
||||
this->velocity[0] = 0.0f;
|
||||
} else {
|
||||
if(tmp[5-(((s32)this->velocity_x)%6)]) {
|
||||
|
||||
@ -9,7 +9,7 @@ extern f32 player_stateTimer_get(enum state_timer_e);
|
||||
|
||||
|
||||
void func_802C4218(u32,f32,f32,f32);
|
||||
void func_80328A84(Actor *, u32);
|
||||
void subaddie_set_state(Actor *, u32);
|
||||
|
||||
/* local declarations */
|
||||
Actor *chmudhut_draw(ActorMarker *this, Gfx** gdl, Mtx** mtx, Vtx **vtx);
|
||||
@ -97,7 +97,7 @@ void chmudhut_update(Actor *this){
|
||||
diffPos[1] += 130.0;
|
||||
|
||||
FUNC_8030E8B4(SFX_5B_HEAVY_STUFF_FALLING, 1.0f, 28000, this->position, 0x12C, 0xBB8);
|
||||
func_80328A84(this, 2);
|
||||
subaddie_set_state(this, 2);
|
||||
this->marker->propPtr->unk8_3 = 0;
|
||||
actor_playAnimationOnce(this);
|
||||
if(tmp == 5){
|
||||
@ -111,7 +111,7 @@ void chmudhut_update(Actor *this){
|
||||
reinterpret_cast(s32, diffPos[2])
|
||||
);
|
||||
} else {
|
||||
jiggySpawn(JIGGY_23_BGS_HUTS, diffPos);
|
||||
jiggy_spawn(JIGGY_23_BGS_HUTS, diffPos);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
@ -85,14 +85,14 @@ void chpinkegg_collision(ActorMarker *this, ActorMarker *other_marker){
|
||||
thisActor = marker_getActor(this);
|
||||
this->propPtr->unk8_3 = 0;
|
||||
func_8030E510(SFX_AA_BGS_EGG_BREAKING_1, 28000);
|
||||
func_80328A84(thisActor, 3);
|
||||
subaddie_set_state(thisActor, 3);
|
||||
actor_playAnimationOnce(thisActor);
|
||||
this->collidable = 0;
|
||||
thisActor->unk124_6 = 0;
|
||||
if(D_803906C4[(tmp = (ActorLocal_PinkEgg *) &thisActor->local)->unk0] != 0){
|
||||
__spawnQueue_add_2(chpinkegg_spawn_next, thisActor->marker, tmp->unk0);
|
||||
} else {
|
||||
jiggySpawn(JIGGY_21_BGS_PINKEGG, thisActor->position);
|
||||
jiggy_spawn(JIGGY_21_BGS_PINKEGG, thisActor->position);
|
||||
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
|
||||
}
|
||||
}
|
||||
@ -108,7 +108,7 @@ void chpinkegg_update(Actor *this){
|
||||
case 1:
|
||||
if(!((ActorLocal_PinkEgg *) &this->local)->unk4){
|
||||
this->marker->collidable = 1;
|
||||
func_80328A84(this,2);
|
||||
subaddie_set_state(this,2);
|
||||
|
||||
}else{
|
||||
((ActorLocal_PinkEgg *) &this->local)->unk4--;
|
||||
|
||||
@ -47,7 +47,7 @@ void func_8038F470(ActorMarker *this, s32 arg1, enum chtanktup_leg_e leg_id){
|
||||
sp18[1] += 50.0f;
|
||||
|
||||
leg = func_8032813C(leg_id + ACTOR_E9_TANKTUP_LEG_FL, sp18, (s32)thisActor->yaw);
|
||||
func_80328B8C(leg, arg1 + 1, 0, -1);
|
||||
subaddie_set_state_with_direction(leg, arg1 + 1, 0, -1);
|
||||
leg->unk10_12 = leg_id;
|
||||
}
|
||||
|
||||
@ -148,7 +148,7 @@ void func_8038F6A4(Actor *this)
|
||||
}
|
||||
if (local->unk10)
|
||||
{
|
||||
func_80328B8C(this, 2, 0.0f, -1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.0f, -1);
|
||||
local->unk10 = 0;
|
||||
sp44 = 0;
|
||||
if(&sp44);
|
||||
@ -182,11 +182,11 @@ void func_8038F6A4(Actor *this)
|
||||
{
|
||||
if (!local->unk14)
|
||||
{
|
||||
func_80328B8C(this, 1, 0.0f, -1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.0f, -1);
|
||||
}
|
||||
else
|
||||
{
|
||||
func_80328B8C(this, 3, 0.0f, -1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.0f, -1);
|
||||
actor_playAnimationOnce(this);
|
||||
}
|
||||
}
|
||||
@ -207,7 +207,7 @@ void func_8038F6A4(Actor *this)
|
||||
func_8034A174(this->marker->unk44, 6, sp34);
|
||||
func_802C8F70(this->yaw);
|
||||
sp34[1] -= 125.0f;
|
||||
jiggySpawn(JIGGY_26_BGS_TANKTUP, sp34);
|
||||
jiggy_spawn(JIGGY_26_BGS_TANKTUP, sp34);
|
||||
}
|
||||
if (actor_animationIsAt(this, 0.9f) != 0)
|
||||
{
|
||||
|
||||
@ -297,7 +297,7 @@ Actor *func_8038DE5C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
|
||||
s32 var_s0;
|
||||
f32 var_f2;
|
||||
f32 sp7C[3];
|
||||
s32 temp_a0_2;
|
||||
BoneTransformList *temp_a0_2;
|
||||
|
||||
this = marker_getActor(marker);
|
||||
local = (ActorLocal_Yellow_Flibbit *)&this->local;
|
||||
|
||||
@ -43,7 +43,7 @@ void func_80389488(Actor *this, s32 next_state) {
|
||||
if (next_state == 3) {
|
||||
func_8030E6A4(SFX_86_TIPTUP_CHORUS_AH, local->unk8, 0x7FFF);
|
||||
skeletalAnim_set(this->unk148, ASSET_12F_ANIM_CHOIR_TURTLE_HURT, 0.1f, 1.75f);
|
||||
skeletalAnim_setCallback_1(this->unk148, 0.9f, func_80389420, this->marker);
|
||||
skeletalAnim_setCallback_1(this->unk148, 0.9f, (GenFunction_1)func_80389420, (s32)this->marker);
|
||||
if (local->tiptup_marker != NULL) {
|
||||
func_80388E94(local->tiptup_marker, local->unk0);
|
||||
}
|
||||
|
||||
@ -74,7 +74,7 @@ void BGS_func_80389850(Actor *this, s32 arg1) {
|
||||
sp94[1] = vile->position[1] + sp7C[1];
|
||||
sp94[2] = vile->position[2] + sp7C[2];
|
||||
func_802C8F70(vile->yaw);
|
||||
jiggySpawn(JIGGY_28_BGS_MR_VILE, sp94);
|
||||
jiggy_spawn(JIGGY_28_BGS_MR_VILE, sp94);
|
||||
} else {
|
||||
sp7C[0] = 0.0f - vile->position[0];
|
||||
sp7C[1] = 0.0f;
|
||||
@ -85,7 +85,7 @@ void BGS_func_80389850(Actor *this, s32 arg1) {
|
||||
sp94[1] = vile->position[1] + sp7C[1];
|
||||
sp94[2] = vile->position[2] + sp7C[2];
|
||||
func_802C8F70(func_8025715C(sp7C[0], sp7C[2]));
|
||||
jiggySpawn(JIGGY_28_BGS_MR_VILE, sp94);
|
||||
jiggy_spawn(JIGGY_28_BGS_MR_VILE, sp94);
|
||||
}
|
||||
}
|
||||
for(var_s0 = 2; var_s0 != 0x3C; var_s0++){
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include "prop.h"
|
||||
#include "actor.h"
|
||||
|
||||
extern ActorInfo D_80390804;
|
||||
extern ActorInfo D_80390690;
|
||||
@ -34,35 +35,35 @@ extern ActorInfo D_80390BD8;
|
||||
extern ActorInfo D_80390BFC;
|
||||
|
||||
void BGS_func_8038F1E0(void){//bgs_updateSpawnableActors
|
||||
spawnableActorList_add(&D_80390804, actor_new, 0x00000088);//croctus
|
||||
spawnableActorList_add(&D_80390690, actor_new, 0x020108A1); //flibbit
|
||||
spawnableActorList_add(&D_803906F8, actor_new, 0x400); //pink_egg_largest
|
||||
spawnableActorList_add(&D_8039071C, actor_new, 0x400); //pink_egg_large
|
||||
spawnableActorList_add(&D_80390740, actor_new, 0x400); //pink_egg_medium
|
||||
spawnableActorList_add(&D_80390764, actor_new, 0x400); //pink_egg_small
|
||||
spawnableActorList_add(&D_80390788, actor_new, 0x400); //pink_egg_smallest
|
||||
spawnableActorList_add(&D_80390B68, actor_new, 0); //mudhut_top
|
||||
spawnableActorList_add(&D_80390C40, actor_new, 0x4000548);//tanktup
|
||||
spawnableActorList_add(&D_80390C88, actor_new, 0x400042c);//tanktup_leg
|
||||
spawnableActorList_add(&D_80390CC8, actor_new, 0x400042c);//tanktup_leg
|
||||
spawnableActorList_add(&D_80390D08, actor_new, 0x400042c);//tanktup_leg
|
||||
spawnableActorList_add(&D_80390D48, actor_new, 0x400042c);//tanktup_leg
|
||||
spawnableActorList_add(&chFrogMinigame, actor_new, 0x81);
|
||||
spawnableActorList_add(&BGS_D_80390AE0, actor_new, 0x20108a1); //yellow_flibbit
|
||||
spawnableActorList_add(&D_80390960, actor_new, 0);
|
||||
spawnableActorList_add(&D_80390A40, actor_new, 0x880); //yumblie
|
||||
spawnableActorList_add(&D_80390A70, actor_new, 0x9a2); //mr. vile
|
||||
spawnableActorList_add(&D_80390830, actor_new, 0x888); //tiptup
|
||||
spawnableActorList_add(&D_80390880, actor_new, 0x9a8); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_803908A4, actor_new, 0x9a8); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_803908C8, actor_new, 0x9a8); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_803908EC, actor_new, 0x9a8); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_80390910, actor_new, 0x9a8); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_80390934, actor_new, 0x9a8); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_80390DA8, actor_new, 0x4000); //leafboat
|
||||
spawnableActorList_add(&D_80390D70, actor_new, 0x580); //bigAlligator
|
||||
spawnableActorList_add(&D_80390BD8, actor_new, 8); //green_jiggy_switch
|
||||
spawnableActorList_add(&D_80390BFC, actor_new, 8); //green_jiggy_switch
|
||||
spawnableActorList_add(&D_80390804, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);//croctus
|
||||
spawnableActorList_add(&D_80390690, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_0); //flibbit
|
||||
spawnableActorList_add(&D_803906F8, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_largest
|
||||
spawnableActorList_add(&D_8039071C, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_large
|
||||
spawnableActorList_add(&D_80390740, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_medium
|
||||
spawnableActorList_add(&D_80390764, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_small
|
||||
spawnableActorList_add(&D_80390788, actor_new, ACTOR_FLAG_UNKNOWN_10); //pink_egg_smallest
|
||||
spawnableActorList_add(&D_80390B68, actor_new, ACTOR_FLAG_NONE); //mudhut_top
|
||||
spawnableActorList_add(&D_80390C40, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_3);//tanktup
|
||||
spawnableActorList_add(&D_80390C88, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
|
||||
spawnableActorList_add(&D_80390CC8, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
|
||||
spawnableActorList_add(&D_80390D08, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
|
||||
spawnableActorList_add(&D_80390D48, actor_new, ACTOR_FLAG_UNKNOWN_26 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_2);//tanktup_leg
|
||||
spawnableActorList_add(&chFrogMinigame, actor_new, ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_0);
|
||||
spawnableActorList_add(&BGS_D_80390AE0, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_0); //yellow_flibbit
|
||||
spawnableActorList_add(&D_80390960, actor_new, ACTOR_FLAG_NONE);
|
||||
spawnableActorList_add(&D_80390A40, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7); //yumblie
|
||||
spawnableActorList_add(&D_80390A70, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_1); //mr. vile
|
||||
spawnableActorList_add(&D_80390830, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup
|
||||
spawnableActorList_add(&D_80390880, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_803908A4, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_803908C8, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_803908EC, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_80390910, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_80390934, actor_new, ACTOR_FLAG_UNKNOWN_11 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_3 ); //tiptup_chiorMember
|
||||
spawnableActorList_add(&D_80390DA8, actor_new, ACTOR_FLAG_UNKNOWN_14); //leafboat
|
||||
spawnableActorList_add(&D_80390D70, actor_new, ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_7); //bigAlligator
|
||||
spawnableActorList_add(&D_80390BD8, actor_new, ACTOR_FLAG_UNKNOWN_3); //green_jiggy_switch
|
||||
spawnableActorList_add(&D_80390BFC, actor_new, ACTOR_FLAG_UNKNOWN_3); //green_jiggy_switch
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -62,7 +62,7 @@ void func_8038FB40(ActorMarker *this, s32 arg1){
|
||||
Actor * thisActor;
|
||||
|
||||
thisActor = marker_getActor(this);
|
||||
func_80328A84(thisActor, 2);
|
||||
subaddie_set_state(thisActor, 2);
|
||||
actor_playAnimationOnce(thisActor);
|
||||
FUNC_8030E624(SFX_A_BANJO_LANDING_05, 0.8f, 32750);
|
||||
}
|
||||
|
||||
@ -84,7 +84,7 @@ extern void chTooth_update(Actor * this){
|
||||
player_getPosition(sp24);
|
||||
if(sp24[0] < 0.0f && 5400.0f < sp24[2]){
|
||||
func_80333334(local->unk0->jiggy_id);
|
||||
jiggySpawn(local->unk0->jiggy_id, local->unk0->jiggy_position);
|
||||
jiggy_spawn(local->unk0->jiggy_id, local->unk0->jiggy_position);
|
||||
}
|
||||
else{//L8038774C
|
||||
sp24[0] = local->unk0->jiggy_position[0];
|
||||
|
||||
@ -149,7 +149,7 @@ void func_80387CC0(void){
|
||||
if(getGameMode() == GAME_MODE_7_ATTRACT_DEMO)
|
||||
return;
|
||||
|
||||
viewport_getRotation(sp1C);
|
||||
viewport_get_rotation_vec3f(sp1C);
|
||||
tmp_v0 = func_8023DB4C(0x7F);
|
||||
if(tmp_v0 >= 0x40){
|
||||
tmp_v0 = 0x7F - tmp_v0;
|
||||
@ -158,7 +158,7 @@ void func_80387CC0(void){
|
||||
if(360.0f <= sp1C[2]){
|
||||
sp1C[2] -= 360.0f;
|
||||
}
|
||||
viewport_setRotation(sp1C);
|
||||
viewport_set_rotation_vec3f(sp1C);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include "actor.h"
|
||||
|
||||
extern ActorInfo D_80389AA0;
|
||||
extern ActorInfo D_80389AD0;
|
||||
@ -27,25 +28,25 @@ extern ActorInfo D_80389E8C;
|
||||
/* .code */
|
||||
void CC_func_80387DA0(void)
|
||||
{
|
||||
spawnableActorList_add(&D_80389AA0, actor_new, 0X4080);
|
||||
spawnableActorList_add(&D_80389E44, actor_new, 0X10080);
|
||||
spawnableActorList_add(&D_80389E68, actor_new, 0X10080);
|
||||
spawnableActorList_add(&D_80389E8C, actor_new, 0X10080);
|
||||
spawnableActorList_add(&D_80389AD0, actor_new, 0X80);
|
||||
spawnableActorList_add(&D_80389B00, actor_new, 0X80);
|
||||
spawnableActorList_add(&D_80389B24, actor_new, 0X80);
|
||||
spawnableActorList_add(&D_80389B90, actor_new, 0X80);
|
||||
spawnableActorList_add(&D_80389BB4, actor_new, 0X80);
|
||||
spawnableActorList_add(&D_80389C90, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389CB4, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389CD8, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389CFC, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389D20, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389D44, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389D68, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389D8C, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389DB0, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389DD4, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389DF8, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389E1C, actor_new, 0X2488);
|
||||
spawnableActorList_add(&D_80389AA0, actor_new, ACTOR_FLAG_UNKNOWN_14 | ACTOR_FLAG_UNKNOWN_7 );
|
||||
spawnableActorList_add(&D_80389E44, actor_new, ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_7 );
|
||||
spawnableActorList_add(&D_80389E68, actor_new, ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_7 );
|
||||
spawnableActorList_add(&D_80389E8C, actor_new, ACTOR_FLAG_UNKNOWN_16 | ACTOR_FLAG_UNKNOWN_7 );
|
||||
spawnableActorList_add(&D_80389AD0, actor_new, ACTOR_FLAG_UNKNOWN_7);
|
||||
spawnableActorList_add(&D_80389B00, actor_new, ACTOR_FLAG_UNKNOWN_7);
|
||||
spawnableActorList_add(&D_80389B24, actor_new, ACTOR_FLAG_UNKNOWN_7);
|
||||
spawnableActorList_add(&D_80389B90, actor_new, ACTOR_FLAG_UNKNOWN_7);
|
||||
spawnableActorList_add(&D_80389BB4, actor_new, ACTOR_FLAG_UNKNOWN_7);
|
||||
spawnableActorList_add(&D_80389C90, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80389CB4, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80389CD8, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80389CFC, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80389D20, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80389D44, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80389D68, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80389D8C, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80389DB0, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80389DD4, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80389DF8, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
spawnableActorList_add(&D_80389E1C, actor_new, ACTOR_FLAG_UNKNOWN_13 | ACTOR_FLAG_UNKNOWN_10 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_3);
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ extern int func_80340020(s32, f32[3], s32, f32, s32, BKVertexList *, f32[3], f32
|
||||
extern void boneTransformList_getBoneScale(s32, s32, f32[3]);
|
||||
extern void boneTransformList_setBoneScale(s32, s32, f32[3]);
|
||||
extern void func_8033A9A8(s32, s32, f32[3]);
|
||||
extern void viewport_getPosition(f32[3]);
|
||||
extern void viewport_get_position_vec3f(f32[3]);
|
||||
extern void ml_vec3f_normalize(f32[3]);
|
||||
extern void func_8033A45C(s32, s32);
|
||||
extern void modelRender_setBoneTransformList(s32);
|
||||
@ -110,7 +110,7 @@ void func_80388518(s32 arg0){
|
||||
}
|
||||
|
||||
void func_80388664(void) {
|
||||
jiggySpawn(JIGGY_17_CC_CLANKER_RAISED, D_80389C00);
|
||||
jiggy_spawn(JIGGY_17_CC_CLANKER_RAISED, D_80389C00);
|
||||
}
|
||||
|
||||
void CC_func_8038868C(void) {
|
||||
@ -146,7 +146,7 @@ void CC_func_80388760(Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
if(D_80389FA0.unk21 == 0)
|
||||
return;
|
||||
|
||||
viewport_getPosition(sp98);
|
||||
viewport_get_position_vec3f(sp98);
|
||||
|
||||
if(sp98[0] < -2600.0f || 11600.0f < sp98[0])
|
||||
return;
|
||||
|
||||
@ -36,11 +36,11 @@ typedef struct {
|
||||
f32 unk3C;
|
||||
} ActorLocal_CCW_8050;
|
||||
|
||||
void func_8038E964(Actor *this);
|
||||
Actor *func_8038E56C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
|
||||
void chgrublinhood_update(Actor *this);
|
||||
Actor *chgrublinhood_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
|
||||
|
||||
/* .data */
|
||||
ActorAnimationInfo D_8038F930[] = {
|
||||
ActorAnimationInfo chGrublinHood_animations[] = {
|
||||
{0x000, 0.0f},
|
||||
{0x243, 4.0f},
|
||||
{0x243, 0.7f},
|
||||
@ -54,15 +54,15 @@ ActorAnimationInfo D_8038F930[] = {
|
||||
{0x243, 1e+06f}
|
||||
};
|
||||
|
||||
ActorInfo D_8038F988 = {
|
||||
ActorInfo chGrublinHood = {
|
||||
MARKER_1E2_GRUBLIN_HOOD, ACTOR_375_GRUBLIN_HOOD, ASSET_52C_MODEL_GRUBLIN_HOOD,
|
||||
0x1, D_8038F930,
|
||||
func_8038E964, func_80326224, func_8038E56C,
|
||||
0x1, chGrublinHood_animations,
|
||||
chgrublinhood_update, func_80326224, chgrublinhood_draw,
|
||||
2500, 0, 1.0f, 0
|
||||
};
|
||||
|
||||
/* .code */
|
||||
void func_8038E440(ParticleEmitter *pCtrl, Actor *actor, enum asset_e model_id){
|
||||
void __chgrublinhood_emitHat(ParticleEmitter *pCtrl, Actor *actor, enum asset_e model_id){
|
||||
static struct43s D_8038F9AC = {
|
||||
{{-200.0f, 200.0f, -200.0f}, {200.0f, 400.0f, 200.0f}},
|
||||
{{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}},
|
||||
@ -78,21 +78,21 @@ void func_8038E440(ParticleEmitter *pCtrl, Actor *actor, enum asset_e model_id){
|
||||
particleEmitter_emitN(pCtrl, 1);
|
||||
}
|
||||
|
||||
void func_8038E4C0(ActorMarker* marker, s32 arg1) {
|
||||
void __chgrublinhood_die(ActorMarker* marker, s32 arg1) {
|
||||
Actor* actor = marker_getActor(marker);
|
||||
ParticleEmitter *pCtrl;
|
||||
|
||||
func_80328B8C(actor, 5, 0.0f, 1);
|
||||
subaddie_set_state_with_direction(actor, 5, 0.0f, 1);
|
||||
actor_playAnimationOnce(actor);
|
||||
FUNC_8030E8B4(SFX_C2_GRUBLIN_EGH, 1.0f, 32000, actor->position, 1250, 2500);
|
||||
pCtrl = partEmitMgr_newEmitter(1);
|
||||
func_8038E440(pCtrl, actor, ASSET_52D_MODEL_GRUBLIN_HOOD_HAT);
|
||||
__chgrublinhood_emitHat(pCtrl, actor, ASSET_52D_MODEL_GRUBLIN_HOOD_HAT);
|
||||
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32,actor->position_x), reinterpret_cast(s32,actor->position_y), reinterpret_cast(s32,actor->position_z));
|
||||
actor_collisionOff(actor);
|
||||
actor->unk138_24 = 1;
|
||||
}
|
||||
|
||||
Actor *func_8038E56C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
Actor *chgrublinhood_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
Actor *this;
|
||||
ActorLocal_CCW_8050 *local;
|
||||
|
||||
@ -113,10 +113,9 @@ Actor *func_8038E56C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
return actor_draw(marker, gfx, mtx, vtx);
|
||||
}
|
||||
|
||||
void func_8038E868(Actor *this){
|
||||
void __chgrublinhood_initialize(Actor *this){
|
||||
ActorLocal_CCW_8050 *local = (ActorLocal_CCW_8050 *)&this->local;
|
||||
|
||||
|
||||
local->unk8 = 6;
|
||||
local->unk9 = 0xC;
|
||||
local->unkA = 0x10;
|
||||
@ -126,14 +125,14 @@ void func_8038E868(Actor *this){
|
||||
local->unk12 = 25000;
|
||||
local->unkC_28 = 1;
|
||||
local->unk30 = func_802DB548;
|
||||
local->unk34 = func_8038E4C0;
|
||||
local->unk34 = __chgrublinhood_die;
|
||||
local->unk0 = 5.0f;
|
||||
local->unk4 = 8.0f;
|
||||
local->unk14 = 1.0f;
|
||||
local->unk3C = 1.5f;
|
||||
}
|
||||
|
||||
enum ccw_season_e func_8038E8FC(Actor *this){
|
||||
enum ccw_season_e __get_current_season(Actor *this){
|
||||
switch(map_get()){
|
||||
case MAP_43_CCW_SPRING: //// 8038E930
|
||||
case MAP_4A_CCW_SPRING_MUMBOS_SKULL:// 8038E930
|
||||
@ -171,15 +170,15 @@ enum ccw_season_e func_8038E8FC(Actor *this){
|
||||
}
|
||||
}
|
||||
|
||||
void func_8038E964(Actor *this) {
|
||||
void chgrublinhood_update(Actor *this) {
|
||||
ActorLocal_CCW_8050 *local;
|
||||
f32 temp_a0;
|
||||
|
||||
local = (ActorLocal_CCW_8050 *)&this->local;
|
||||
|
||||
if (!this->unk16C_4) {
|
||||
func_8038E868(this);
|
||||
local->season = func_8038E8FC(this);
|
||||
__chgrublinhood_initialize(this);
|
||||
local->season = __get_current_season(this);
|
||||
}
|
||||
|
||||
if(local->season < 4){
|
||||
43
src/CCW/ch/vacationtexttrigger.c
Normal file
43
src/CCW/ch/vacationtexttrigger.c
Normal file
@ -0,0 +1,43 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
|
||||
#include "math.h" // for SQ()
|
||||
|
||||
void chVacationTextTrigger_update(Actor* this);
|
||||
|
||||
/* .data */
|
||||
|
||||
ActorInfo gChVacationTextTrigger = {
|
||||
MARKER_1E3_VACATION_TEXT_TRIGGER, ACTOR_374_VACATION_TEXT_TRIGGER, 0x0,
|
||||
0x0, NULL,
|
||||
chVacationTextTrigger_update, func_80326224, func_80325340,
|
||||
0, 0, 0.0f, 0
|
||||
};
|
||||
|
||||
/* .code */
|
||||
|
||||
/**
|
||||
* @brief Returns if player is within a specified horizontal radius of the
|
||||
* supplied x,z positions.
|
||||
*/
|
||||
static bool __playerIsWithinTrigger(s32 x, s32 z, s32 distance) {
|
||||
s32 player_position[3];
|
||||
|
||||
player_getPosition_s32(player_position);
|
||||
return (SQ(x - player_position[0]) + SQ(z - player_position[2])) < SQ(distance);
|
||||
}
|
||||
|
||||
void chVacationTextTrigger_update(Actor* this) {
|
||||
// Despawn if already triggered
|
||||
if (func_803203FC(UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT)) {
|
||||
marker_despawn(this->marker);
|
||||
return;
|
||||
}
|
||||
|
||||
// Start dialog if player is within trigger
|
||||
if (__playerIsWithinTrigger(0, -107, 188) != 0) {
|
||||
func_80311480(0xDA9, 4, NULL, NULL, NULL, NULL);
|
||||
func_803204E4(UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT, 1);
|
||||
}
|
||||
}
|
||||
@ -114,8 +114,8 @@ void CCW_func_80387A40(Actor *this) {
|
||||
if(this->position[0]);
|
||||
|
||||
func_8030DBFC(local->unk0, 0.8f, 0.9f, 0.05f);
|
||||
func_8030DEB4(local->unk0, 500.0f, 1500.0f);
|
||||
func_8030DF68(local->unk0, this->position);
|
||||
sfxsource_set_fade_distances(local->unk0, 500.0f, 1500.0f);
|
||||
sfxsource_set_position(local->unk0, this->position);
|
||||
func_8030E2C4(local->unk0);
|
||||
sfxsource_setSampleRate(local->unk0, 2000.0f + 8000.0f*(gu_sqrtf(local->unk18[0]*local->unk18[0] + local->unk18[1]*local->unk18[1] + local->unk18[2]*local->unk18[2])/ local->unk8));
|
||||
if (!mapSpecificFlags_get(local->unk4->unk2)) {
|
||||
|
||||
@ -162,7 +162,7 @@ void func_8038687C(Actor *this) {
|
||||
|
||||
if (local->unk0 != NULL) {
|
||||
other = marker_getActor(local->unk0);
|
||||
viewport_getPosition(sp78);
|
||||
viewport_get_position_vec3f(sp78);
|
||||
sp6C[0] = this->position[0] - sp78[0];
|
||||
sp6C[1] = this->position[1] - sp78[1];
|
||||
sp6C[2] = this->position[2] - sp78[2];
|
||||
|
||||
@ -33,7 +33,7 @@ f32 D_8038EC94[3] = {200.0f, 2120.0f, -5570.0f};
|
||||
|
||||
/* .code */
|
||||
void func_80387F10() {
|
||||
jiggySpawn(JIGGY_4D_CCW_FLOWER, D_8038EC94);
|
||||
jiggy_spawn(JIGGY_4D_CCW_FLOWER, D_8038EC94);
|
||||
}
|
||||
|
||||
void func_80387F38(ActorMarker* marker, s32 arg1) {
|
||||
|
||||
@ -70,7 +70,7 @@ void func_80388F50(ActorMarker *marker, ActorMarker *other_marker){
|
||||
if ((func_8028ECAC() != 1) && !this->unk38_0) {
|
||||
this->unk38_0 = TRUE;
|
||||
actor_collisionOff(this);
|
||||
func_80328B8C(this, 4, 0.0f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.0f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
func_8030E6D4(SFX_90_SWITCH_PRESS);
|
||||
}
|
||||
@ -87,7 +87,7 @@ void func_80388FD4(Actor *this) {
|
||||
if (!this->unk16C_4) {
|
||||
if (fileProgressFlag_get(this->unk10_12 + FILEPROG_8B_CCW_SPRING_OPEN)) {
|
||||
actor_playAnimationOnce(this);
|
||||
func_80328B8C(this, 4, 0.999f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.999f, 1);
|
||||
actor_collisionOff(this);
|
||||
} else {
|
||||
marker_setCollisionScripts(this->marker, 0, &func_80388F50, 0);
|
||||
@ -143,7 +143,7 @@ void func_80389268(Actor *this) {
|
||||
|
||||
this->unk16C_4 = TRUE;
|
||||
if (fileProgressFlag_get(this->unk10_12 + FILEPROG_8B_CCW_SPRING_OPEN)) {
|
||||
func_80328A84(this, 3);
|
||||
subaddie_set_state(this, 3);
|
||||
}
|
||||
}
|
||||
|
||||
@ -153,14 +153,14 @@ void func_80389268(Actor *this) {
|
||||
if (levelSpecificFlags_get(this->unk10_12 + 7)) {
|
||||
timedFunc_set_1(0.05f, func_803891B0, (s32) this->marker);
|
||||
timedFunc_set_1(4.0f, func_8038921C, (s32) this->marker);
|
||||
func_80328A84(this, 2);
|
||||
subaddie_set_state(this, 2);
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
this->position[1] += 60.0f * time_getDelta();
|
||||
if (this->unk1C[1] <= this->position[1]) {
|
||||
levelSpecificFlags_set(this->unk10_12 + 7, FALSE);
|
||||
func_80328A84(this, 3);
|
||||
subaddie_set_state(this, 3);
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
|
||||
@ -95,7 +95,7 @@ void func_8038AEBC(Actor *this) {
|
||||
func_80326224(this);
|
||||
skeletalAnim_getProgressRange(this->unk148, &sp30, &sp2C);
|
||||
if ((sp30 <= 0.5) && (sp2C >= 0.5)) {
|
||||
jiggySpawn(JIGGY_49_CCW_EYRIE, this->position);
|
||||
jiggy_spawn(JIGGY_49_CCW_EYRIE, this->position);
|
||||
}
|
||||
if (skeletalAnim_getLoopCount(this->unk148) > 0) {
|
||||
func_8038AD50(this, 2);
|
||||
|
||||
@ -56,7 +56,7 @@ void chnabnut_setState(Actor *this, s32 next_state) {
|
||||
skeletalAnim_set(this->unk148, ASSET_22E_ANIM_NABNUT_STAND, 0.2f, 3.53f);
|
||||
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_1_LOOP);
|
||||
func_802C8F70(this->yaw - 40.0f);
|
||||
jiggySpawn(JIGGY_4A_CCW_NABNUT, this->position);
|
||||
jiggy_spawn(JIGGY_4A_CCW_NABNUT, this->position);
|
||||
}
|
||||
|
||||
if (next_state == NABNUT_STATE_5_EXIT) {
|
||||
|
||||
@ -51,8 +51,8 @@ extern ActorInfo D_8038F720;
|
||||
extern ActorInfo D_8038F744;
|
||||
extern ActorInfo D_8038F768;
|
||||
extern ActorInfo D_8038F78C;
|
||||
extern ActorInfo D_8038F988;
|
||||
extern ActorInfo D_8038FA00;
|
||||
extern ActorInfo chGrublinHood;
|
||||
extern ActorInfo gChVacationTextTrigger;
|
||||
extern ActorInfo D_8038F7D4;
|
||||
extern ActorInfo D_8038F7B0;
|
||||
extern ActorInfo D_8038F888;
|
||||
@ -143,8 +143,8 @@ void CCW_func_8038DB6C(void)
|
||||
spawnableActorList_add(&D_8038F744, actor_new, 0);
|
||||
spawnableActorList_add(&D_8038F768, actor_new, 0);
|
||||
spawnableActorList_add(&D_8038F78C, actor_new, 0);
|
||||
spawnableActorList_add(&D_8038F988, actor_new, 0X2010121);
|
||||
spawnableActorList_add(&D_8038FA00, actor_new, 0);
|
||||
spawnableActorList_add(&chGrublinHood, actor_new, 0X2010121);
|
||||
spawnableActorList_add(&gChVacationTextTrigger, actor_new, 0);
|
||||
spawnableActorList_add(&D_8038F7D4, actor_new, 0X400);
|
||||
spawnableActorList_add(&D_8038F7B0, actor_new, 0X400);
|
||||
spawnableActorList_add(&D_8038F888, actor_new, 0X80);
|
||||
|
||||
@ -21,12 +21,12 @@ ActorInfo D_8038F908 = {
|
||||
|
||||
/* .code */
|
||||
void func_8038DFE0(Actor* actor) {
|
||||
func_80328B8C(actor, 1, 0.001f, 1);
|
||||
subaddie_set_state_with_direction(actor, 1, 0.001f, 1);
|
||||
actor->unk38_31 = randi2(0, 0);
|
||||
}
|
||||
|
||||
void CCW_func_8038E034(Actor* actor) {
|
||||
func_80328B8C(actor, 2, 0.001f, 1);
|
||||
subaddie_set_state_with_direction(actor, 2, 0.001f, 1);
|
||||
}
|
||||
|
||||
void func_8038E060(s32 arg0, ActorMarker *marker){
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
|
||||
void func_8038EAD4(Actor *this);
|
||||
|
||||
/* .data */
|
||||
ActorInfo D_8038FA00 = { 0x1E3, 0x374, 0x0, 0x0, NULL, func_8038EAD4, func_80326224, func_80325340, 0, 0, 0.0f, 0};
|
||||
|
||||
/* .code */
|
||||
bool func_8038EA60(s32 arg0, s32 arg1, s32 arg2) {
|
||||
s32 sp24;
|
||||
s32 temp_a0;
|
||||
s32 sp1C;
|
||||
s32 temp_v1;
|
||||
|
||||
player_getPosition_s32(&sp1C);
|
||||
temp_v1 = arg1 - sp24;
|
||||
temp_a0 = arg0 - sp1C;
|
||||
return ((temp_v1 * temp_v1) + (temp_a0 * temp_a0)) < (arg2 * arg2);
|
||||
}
|
||||
void func_8038EAD4(Actor* this) {
|
||||
if (func_803203FC(0x13)) {
|
||||
marker_despawn(this->marker);
|
||||
return;
|
||||
}
|
||||
if (func_8038EA60(0, -0x6B, 0xBC) != 0) {
|
||||
func_80311480(0xDA9, 4, NULL, NULL, NULL, NULL);
|
||||
func_803204E4(0x13, 1);
|
||||
}
|
||||
}
|
||||
@ -208,8 +208,8 @@ void chwasp_update(Actor *this) {
|
||||
} else {
|
||||
func_8030DBFC(local->unk0, 0.8f, 0.9f, 0.05f);
|
||||
}
|
||||
func_8030DEB4(local->unk0, 500.0f, 1500.0f);
|
||||
func_8030DF68(local->unk0, this->position);
|
||||
sfxsource_set_fade_distances(local->unk0, 500.0f, 1500.0f);
|
||||
sfxsource_set_position(local->unk0, this->position);
|
||||
func_8030E2C4(local->unk0);
|
||||
sfxsource_setSampleRate(local->unk0, (s32) ((local->unk18 / local->unk14) * 10000.0f));
|
||||
}
|
||||
|
||||
@ -1 +0,0 @@
|
||||
char pad_FP_803935A8[0x20];
|
||||
@ -1 +1 @@
|
||||
char pad_FP_80392F10[0x10];
|
||||
char pad_FP_80392F10[0x10];
|
||||
|
||||
@ -51,7 +51,7 @@ void func_8038A1F0(Actor **this_ptr, enum marker_e carried_obj_marker_id, enum a
|
||||
func_8028F31C((*this_ptr)->position, 600.0f, actor_id, this_ptr);
|
||||
|
||||
if(!func_80329530(*this_ptr, 400)) return;
|
||||
if(carriedObj_getMarkerId() != carried_obj_marker_id) return;
|
||||
if(bacarry_get_markerId() != carried_obj_marker_id) return;
|
||||
if(!func_8028FC34()) return;
|
||||
|
||||
func_8028FA34(arg3, *this_ptr);
|
||||
@ -72,7 +72,7 @@ void func_8038A274(Actor *this){
|
||||
void func_8038A318(ActorMarker *caller, enum asset_e text_id, s32 arg1){
|
||||
if(text_id == 0xc19){
|
||||
func_802BAFE4(0x25);
|
||||
jiggySpawn(JIGGY_2E_FP_PRESENTS, FP_D_80391E74);
|
||||
jiggy_spawn(JIGGY_2E_FP_PRESENTS, FP_D_80391E74);
|
||||
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
|
||||
func_8025A6EC(COMUSIC_5B_FP_IGLOO_HAPPY, 25000);
|
||||
func_8025A58C(0, 4000);
|
||||
@ -111,7 +111,7 @@ void func_8038A384(Actor *this){
|
||||
if( jiggyscore_isCollected(JIGGY_2E_FP_PRESENTS)
|
||||
|| func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)
|
||||
){
|
||||
func_80328B8C(this, 2, randf2(0.0f, 0.9f), 1);
|
||||
subaddie_set_state_with_direction(this, 2, randf2(0.0f, 0.9f), 1);
|
||||
}
|
||||
}//L8038A4E4
|
||||
|
||||
@ -153,7 +153,7 @@ void func_8038A384(Actor *this){
|
||||
break;
|
||||
}
|
||||
if(levelSpecificFlags_get(D_80391E80[sp3C].unk0)){
|
||||
func_80328B8C(this, 2, 0.001f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
|
||||
if(sp38 == 0xc19){
|
||||
func_80311480(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL);
|
||||
}
|
||||
|
||||
@ -47,14 +47,14 @@ Actor *func_803875E0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
}
|
||||
|
||||
void func_803876A4(Actor *this){
|
||||
func_80328B8C(this, 2, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
FUNC_8030E8B4(SFX_8E_GRUNTLING_DAMAGE, 1.0f, 32000, this->position, 1250, 2500);
|
||||
}
|
||||
|
||||
void func_803876F8(Actor *this){
|
||||
this->marker->propPtr->unk8_3 = FALSE;
|
||||
func_80328B8C(this, 5, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.0001f, 1);
|
||||
this->unk48 = 0.0f;
|
||||
func_80343DEC(this);
|
||||
}
|
||||
@ -73,10 +73,10 @@ void func_803877A8(ActorMarker *caller, enum asset_e text_id, s32 arg2){
|
||||
Actor *this = marker_getActor(caller);
|
||||
|
||||
if(arg2 == 1){
|
||||
jiggySpawn(JIGGY_2A_FP_BOGGY_1, this->velocity);
|
||||
jiggy_spawn(JIGGY_2A_FP_BOGGY_1, this->velocity);
|
||||
}
|
||||
else if(arg2 == 2){
|
||||
func_80328B8C(this, 4, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
|
||||
actor_loopAnimation(this);
|
||||
actor_collisionOff(this);
|
||||
}
|
||||
@ -178,7 +178,7 @@ void func_8038794C(Actor *this){
|
||||
}//L80387CF4
|
||||
|
||||
if(actor_animationIsAt(this, 0.9999f)){
|
||||
func_80328B8C(this, 3, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.0001f, 1);
|
||||
actor_loopAnimation(this);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
#include "variables.h"
|
||||
|
||||
extern void func_8028E668(f32[3], f32, f32, f32);
|
||||
|
||||
extern Actor *func_80328230(enum actor_e id, f32 pos[3], f32 rot[3]);
|
||||
extern NodeProp *cubeList_findNodePropByActorId(enum actor_e, s32[3]);
|
||||
extern f32 func_8038BE20(f32 arg0[3]);
|
||||
|
||||
typedef struct {
|
||||
@ -90,7 +91,7 @@ Actor *func_80388740(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
void FP_func_803888E4(Actor *this){
|
||||
static f32 D_80391D0C[3] = {1842.0f, 658.0f, 5758.0f};
|
||||
static f32 D_80391D18[3] = {1463.0f, 635.0f, 5193.0f};
|
||||
func_80328B8C(this, 0xC, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 0xC, 0.0001f, 1);
|
||||
if(!jiggyscore_isSpawned(JIGGY_30_FP_BOGGY_2)){
|
||||
if(mapSpecificFlags_get(5)){
|
||||
func_80324DBC(0.1f, 0xc06, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
|
||||
@ -115,7 +116,7 @@ void FP_func_803888E4(Actor *this){
|
||||
void func_80388A50(Actor *this){
|
||||
ActorLocal_FP_2350 *local = (ActorLocal_FP_2350 *)&this->local;
|
||||
|
||||
func_80328B8C(this, 2, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
|
||||
timed_setStaticCameraToNode(0.0f, 4);
|
||||
local->unk18 = 0;
|
||||
}
|
||||
@ -206,7 +207,7 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
|
||||
local->unk4 = partEmitMgr_newEmitter(16);
|
||||
func_80388EE8(local->unk0);
|
||||
func_80388EE8(local->unk4);
|
||||
func_80328B8C(this, 4, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
|
||||
local->unk14 = (local->unk19 == 2) ? 1.0f : 0.0f;
|
||||
this->marker->unk40_23 = TRUE;
|
||||
break;
|
||||
@ -217,10 +218,10 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
|
||||
mapSpecificFlags_set(6, TRUE);
|
||||
break;
|
||||
case 0:
|
||||
func_80328B8C(this, 1, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
|
||||
break;
|
||||
default:
|
||||
func_80328B8C(this, 1, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
@ -432,7 +433,7 @@ void func_803896FC(Actor *this){
|
||||
local->unk19 = 1;
|
||||
this->unk38_31 = 2;
|
||||
this->unk4C = 600.0f;
|
||||
func_80328B8C(this, 11, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 11, 0.0001f, 1);
|
||||
}
|
||||
else{
|
||||
local->unk19 = 1;
|
||||
@ -445,10 +446,10 @@ void func_803896FC(Actor *this){
|
||||
if(!func_8038A1A0(this->marker)){
|
||||
switch(this->unk38_31){
|
||||
case 1://L80389920
|
||||
func_80328B8C(this, 9, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 9, 0.0001f, 1);
|
||||
break;
|
||||
case 2://L80389938
|
||||
func_80328B8C(this, 10, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 10, 0.0001f, 1);
|
||||
break;
|
||||
}
|
||||
}//L80389950
|
||||
@ -500,9 +501,9 @@ void func_803896FC(Actor *this){
|
||||
local->unk14 = 0.0f;
|
||||
if( randf() < 0.02 && sp58 < 0.0){
|
||||
if(randf() < 0.5)
|
||||
func_80328B8C(this, 5, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.0001f, 1);
|
||||
else
|
||||
func_80328B8C(this, 6, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 6, 0.0001f, 1);
|
||||
}//L80389C18
|
||||
|
||||
func_803893E4(this, sp58, local->unk19);
|
||||
@ -516,7 +517,7 @@ void func_803896FC(Actor *this){
|
||||
case 5:// L80389C80
|
||||
case 6:// L80389C80
|
||||
if(actor_animationIsAt(this, 0.9999f) || sp58 >= 0.0){
|
||||
func_80328B8C(this, 4, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
|
||||
}//L80389CC8
|
||||
|
||||
func_803893E4(this, sp58, local->unk19);
|
||||
@ -528,7 +529,7 @@ void func_803896FC(Actor *this){
|
||||
|
||||
case 7:// L80389D34
|
||||
if(actor_animationIsAt(this, 0.9999f)){
|
||||
func_80328B8C(this, 4, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
|
||||
}//L80389D60
|
||||
func_803893E4(this, sp58, local->unk19);
|
||||
func_80388F90(this);
|
||||
@ -556,7 +557,7 @@ void func_803896FC(Actor *this){
|
||||
func_80388F90(this);
|
||||
}
|
||||
if(actor_animationIsAt(this, 0.9999f)){
|
||||
func_80328B8C(this, 11, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 11, 0.0001f, 1);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -567,7 +568,7 @@ void func_803896FC(Actor *this){
|
||||
}
|
||||
|
||||
if(actor_animationIsAt(this, 0.9999f)){
|
||||
func_80328B8C(this, 11, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 11, 0.0001f, 1);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -629,10 +630,10 @@ void func_8038A0E4(UNK_TYPE(s32) arg0, ActorMarker *marker){
|
||||
|
||||
if(actor){
|
||||
if(actor->state != 7){
|
||||
func_80328B8C(actor, 7, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(actor, 7, 0.0001f, 1);
|
||||
}
|
||||
else{
|
||||
func_80328B8C(actor, 4, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(actor, 4, 0.0001f, 1);
|
||||
}
|
||||
};
|
||||
}
|
||||
@ -641,7 +642,7 @@ void func_8038A150(UNK_TYPE(s32) arg0, ActorMarker *marker){
|
||||
Actor *actor = marker_getActor(marker);
|
||||
|
||||
if(actor && actor->state != 8){
|
||||
func_80328B8C(actor, 8, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(actor, 8, 0.0001f, 1);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ Actor *chRaceSled_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
|
||||
void __chRaceSled_setState(Actor *this, s32 next_state){
|
||||
if(this->state != 1 || next_state != 1){
|
||||
func_80328A84(this, next_state);
|
||||
subaddie_set_state(this, next_state);
|
||||
switch(next_state){
|
||||
case 1: //L8038697C
|
||||
this->unk10_12 = TRUE;
|
||||
|
||||
@ -21,7 +21,7 @@ ActorInfo chScarfSled = {
|
||||
|
||||
/* .code */
|
||||
void __chScarfSled_setState(Actor *this, s32 next_state){
|
||||
func_80328A84(this, next_state);
|
||||
subaddie_set_state(this, next_state);
|
||||
|
||||
if(next_state == 2){
|
||||
mapSpecificFlags_set(0xB, TRUE);
|
||||
|
||||
@ -50,7 +50,7 @@ void FP_func_80386BEC(Actor *this){
|
||||
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(12);
|
||||
|
||||
player_getPosition(plyr_pos);
|
||||
func_80328B8C(this, 2, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
|
||||
actor_collisionOff(this);
|
||||
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
|
||||
FUNC_8030E624(SFX_90_SWITCH_PRESS, 1.0f, 32000);
|
||||
@ -93,7 +93,7 @@ void FP_func_80386CF8(Actor *this){
|
||||
break;
|
||||
case 2:
|
||||
if(actor_animationIsAt(this, 0.99f)){
|
||||
func_80328B8C(this, 3, 0.99f, 0);
|
||||
subaddie_set_state_with_direction(this, 3, 0.99f, 0);
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
#include "variables.h"
|
||||
|
||||
extern Actor *func_802EBAE0(UNK_TYPE(s32), f32 position[3], f32 rotation[3], f32 scale, UNK_TYPE(s32), UNK_TYPE(s32), UNK_TYPE(s32), f32, UNK_TYPE(s32));
|
||||
extern Struct70s *func_8034C2C4(ActorMarker *marker, s32 arg1);
|
||||
|
||||
Actor *func_8038C0B0(ActorMarker *marker, UNK_TYPE(s32) arg1, f32 arg2, UNK_TYPE(s32) arg3);
|
||||
Actor *func_8038C1F8(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
|
||||
void func_8038C9A0(Actor *this);
|
||||
@ -42,7 +44,7 @@ ActorInfo D_80391FF4 = { MARKER_203_TWINKLY_RED, ACTOR_335_TWINKLY_RED, ASSET_44
|
||||
0, 0, 1.0f, 0
|
||||
};
|
||||
|
||||
s32 FP_D_80392018[4] = {0, 0, 0, func_8038C0B0};
|
||||
Struct6Cs FP_D_80392018 = {NULL, NULL, NULL, (void*)func_8038C0B0};
|
||||
struct43s D_80392028 = {
|
||||
{{-200.0f, 200.0f, -200.0f}, {200.0f, 400.0f, 200.0f}},
|
||||
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}},
|
||||
@ -242,7 +244,7 @@ void func_8038C8F0(ActorMarker *marker){
|
||||
void func_8038C94C(ActorMarker *caller, enum asset_e text_id, s32 arg2){
|
||||
Actor *this = marker_getActor(caller);
|
||||
if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
|
||||
func_80328A84(this, 6);
|
||||
subaddie_set_state(this, 6);
|
||||
__spawnQueue_add_1((GenFunction_1)func_8038C8F0, reinterpret_cast(s32, this->marker));
|
||||
}
|
||||
}
|
||||
@ -261,7 +263,7 @@ void func_8038C9A0(Actor *this){
|
||||
this->marker->unk18 = &FP_D_80392018;
|
||||
this->unk38_31 = 0;
|
||||
if(0.0f != other->velocity[0]){
|
||||
func_80328A84(this, 4);
|
||||
subaddie_set_state(this, 4);
|
||||
this->unk1C[1] = this->position_y + 50.0f;
|
||||
this->unk1C[2] = this->position_y;
|
||||
}
|
||||
@ -286,7 +288,7 @@ void func_8038C9A0(Actor *this){
|
||||
switch(this->state){
|
||||
case 1:// 8038CB2C
|
||||
if(!func_8038C718(this, 0)){
|
||||
func_80328B8C(this, 2, 0.001f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
|
||||
func_8038C428(this, D_80392088, randf2(20.0f, 24.0f));
|
||||
this->unk60 = this->yaw;
|
||||
}
|
||||
@ -311,7 +313,7 @@ void func_8038C9A0(Actor *this){
|
||||
|
||||
if(!func_8038C718(this, 0.0f)){
|
||||
if(func_8038C844(this->position, D_80392088)){
|
||||
func_80328B8C(this, 3, 0.001f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
|
||||
func_8038C428(this, D_80392094, 0.0f);
|
||||
}
|
||||
else{
|
||||
@ -341,7 +343,7 @@ void func_8038C9A0(Actor *this){
|
||||
else{
|
||||
func_80311480(0xc25, 0x2b, this->position, this->marker, func_8038C94C, NULL);
|
||||
}
|
||||
func_80328A84(this, 5);
|
||||
subaddie_set_state(this, 5);
|
||||
this->pitch -= 3.0f;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -268,7 +268,7 @@ void func_8038D5C8(ActorMarker *this_marker, ActorMarker *other_marker){
|
||||
func_8024BD08(0);
|
||||
this->unk1C[2] = 428571.0f;
|
||||
func_8025AEA0(0x68, (s32)this->unk1C[2]);
|
||||
func_80328B8C(this, 3, 0.001f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
this->velocity[0] = 1.0f;
|
||||
}//L8038D6B8
|
||||
@ -303,7 +303,7 @@ void func_8038D6C8(Actor *this){
|
||||
this->unk1C[0] = -1.0f;
|
||||
func_8028F8F8(7, FALSE);
|
||||
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -1){
|
||||
func_80328B8C(this, 3, 0.001f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
this->velocity[0] = 1.0f;
|
||||
}
|
||||
@ -320,9 +320,9 @@ void func_8038D6C8(Actor *this){
|
||||
break;
|
||||
|
||||
if(!(func_8023DB5C() & 1))
|
||||
func_80328B8C(this, 2, 0.001f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
|
||||
else
|
||||
func_80328B8C(this, 2, 0.999f, 0);
|
||||
subaddie_set_state_with_direction(this, 2, 0.999f, 0);
|
||||
|
||||
actor_playAnimationOnce(this);
|
||||
this->velocity[2] = randf2(1.4f, 2.0f);
|
||||
@ -335,7 +335,7 @@ void func_8038D6C8(Actor *this){
|
||||
if( ( sp20 == TRUE && actor_animationIsAt(this, 0.999f) )
|
||||
|| ( sp20 == FALSE && actor_animationIsAt(this, 0.001f) )
|
||||
){
|
||||
func_80328B8C(this, 1, 0.001f, 0);
|
||||
subaddie_set_state_with_direction(this, 1, 0.001f, 0);
|
||||
actor_playAnimationOnce(this);
|
||||
break;
|
||||
}
|
||||
@ -362,7 +362,7 @@ void func_8038D6C8(Actor *this){
|
||||
|
||||
timed_exitStaticCamera(0.0f);
|
||||
func_8028F784(0);
|
||||
func_80328B8C(this, 4, 0.999f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.999f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
item_set(ITEM_0_HOURGLASS_TIMER, 80*60 - 1);
|
||||
item_set(ITEM_6_HOURGLASS, TRUE);
|
||||
@ -381,7 +381,7 @@ void func_8038D6C8(Actor *this){
|
||||
|
||||
func_8025AEA0(COMUSIC_68_TWINKLY_MINIGAME, (s32)this->unk1C[2]);
|
||||
if(item_getCount(ITEM_24_TWINKLY_SCORE) == 0){
|
||||
func_80328B8C(this, 1, 0.001f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.001f, 1);
|
||||
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
|
||||
func_8038D3D8();
|
||||
func_80324E38(0.0f, 3);
|
||||
@ -393,7 +393,7 @@ void func_8038D6C8(Actor *this){
|
||||
}
|
||||
|
||||
if(item_empty(ITEM_6_HOURGLASS)){
|
||||
func_80328B8C(this, 1, 0.001f, 0);
|
||||
subaddie_set_state_with_direction(this, 1, 0.001f, 0);
|
||||
actor_playAnimationOnce(this);
|
||||
this->unk38_31 = 0;
|
||||
item_set(ITEM_6_HOURGLASS, FALSE);
|
||||
|
||||
@ -35,23 +35,23 @@ Actor *func_8038DD70(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
|
||||
void func_8038DDC8(Actor *this){
|
||||
actor_collisionOn(this);
|
||||
func_80328B8C(this, 2, 0.03f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.03f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
}
|
||||
|
||||
void func_8038DE08(Actor *this){
|
||||
func_80328B8C(this, 3, 0.03f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.03f, 1);
|
||||
actor_loopAnimation(this);
|
||||
}
|
||||
|
||||
void func_8038DE40(Actor *this){
|
||||
func_80328B8C(this, 4, 0.03f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.03f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
}
|
||||
|
||||
void func_8038DE78(Actor *this){
|
||||
actor_collisionOff(this);
|
||||
func_80328B8C(this, 5, 0.03f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.03f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
}
|
||||
|
||||
@ -93,7 +93,7 @@ Actor *func_8038DF34(Actor *this){
|
||||
void func_8038E040(ActorMarker *caller, enum asset_e text_id, s32 arg2){
|
||||
Actor *this = marker_getActor(caller);
|
||||
timed_exitStaticCamera(0.5f);
|
||||
func_80328B8C(this, 7, 0.03f, 1);
|
||||
subaddie_set_state_with_direction(this, 7, 0.03f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
}
|
||||
|
||||
@ -129,7 +129,7 @@ void func_8038E094(Actor *this){
|
||||
timed_setStaticCameraToNode(0.5f, 0xd);
|
||||
func_80311480(ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL);
|
||||
this->velocity[0] = 1.0f;
|
||||
func_80328B8C(this, 6, 0.03f, 1);
|
||||
subaddie_set_state_with_direction(this, 6, 0.03f, 1);
|
||||
actor_loopAnimation(this);
|
||||
}
|
||||
}
|
||||
@ -214,7 +214,7 @@ void func_8038E094(Actor *this){
|
||||
case 5: //L8038E644
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
if(actor_animationIsAt(this, 0.97f)){
|
||||
func_80328B8C(this, 1, 0.97f, 0);
|
||||
subaddie_set_state_with_direction(this, 1, 0.97f, 0);
|
||||
actor_playAnimationOnce(this);
|
||||
this->unk60 = 0.0f;
|
||||
}
|
||||
|
||||
@ -49,19 +49,19 @@ Actor *func_8038F210(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
}
|
||||
|
||||
void func_8038F274(void){
|
||||
UNK_TYPE(s32) v0 = func_8034C528(0x191);
|
||||
if(v0){
|
||||
func_8034DE60(v0, 0.0f, -500.0f, 0.2f, 1);
|
||||
Struct70s *v0 = func_8034C528(0x191);
|
||||
if(v0 != NULL){
|
||||
func_8034DE60(&v0->type_6D, 0.0f, -500.0f, 0.2f, 1);
|
||||
}
|
||||
}
|
||||
|
||||
void func_8038F2B8(Actor *this){
|
||||
func_80328B8C(this, 3, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.02f, 1);
|
||||
actor_loopAnimation(this);
|
||||
}
|
||||
|
||||
void func_8038F2F0(Actor *this){
|
||||
func_80328B8C(this, 11, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 11, 0.02f, 1);
|
||||
actor_loopAnimation(this);
|
||||
func_8038F274();
|
||||
}
|
||||
@ -96,14 +96,14 @@ void func_8038F3F4(ActorMarker *marker){
|
||||
}
|
||||
|
||||
void func_8038F41C(Actor *this){
|
||||
func_80328B8C(this, 1, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.02f, 1);
|
||||
actor_loopAnimation(this);
|
||||
}
|
||||
|
||||
void func_8038F454(Actor *this){
|
||||
if(!mapSpecificFlags_get(7) && func_8028ECAC() != BSGROUP_A_FLYING && func_80329530(this, 1000) ){
|
||||
mapSpecificFlags_set(7, TRUE);
|
||||
func_80328A84(this, 2);
|
||||
subaddie_set_state(this, 2);
|
||||
actor_loopAnimation(this);
|
||||
timed_setStaticCameraToNode(0.0f, 0x2e);
|
||||
func_80324DBC(0.0f, 0xc1b, 0x2a, this->position, this->marker, func_8038F330, NULL);
|
||||
@ -115,12 +115,12 @@ void func_8038F454(Actor *this){
|
||||
}
|
||||
|
||||
void func_8038F528(Actor *this){
|
||||
func_80328B8C(this, 4, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.02f, 1);
|
||||
actor_loopAnimation(this);
|
||||
}
|
||||
|
||||
void func_8038F560(Actor *this){
|
||||
func_80328B8C(this, 7, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 7, 0.02f, 1);
|
||||
actor_loopAnimation(this);
|
||||
}
|
||||
|
||||
@ -149,7 +149,7 @@ bool func_8038F5D4(Actor *this, f32 arg1[3], f32 arg2, f32 arg3, s32 arg4){
|
||||
bool FP_func_8038F6C4(Actor *this, f32 arg1[3], f32 arg2){
|
||||
s32 dTheta;
|
||||
|
||||
func_80328C64(this, func_803297C8(this, arg1));
|
||||
subaddie_set_ideal_yaw(this, func_803297C8(this, arg1));
|
||||
func_80328FB0(this, arg2);
|
||||
dTheta = this->yaw - this->yaw_ideal;
|
||||
if(-arg2 <= dTheta && dTheta <= arg2){
|
||||
@ -223,7 +223,7 @@ void FP_func_8038F7AC(Actor *this){
|
||||
}
|
||||
|
||||
if(func_80329530(this, 1300) && player_getTransformation() == TRANSFORM_4_WALRUS){
|
||||
func_80328B8C(this, 8, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 8, 0.02f, 1);
|
||||
actor_loopAnimation(this);
|
||||
break;
|
||||
}
|
||||
@ -252,7 +252,7 @@ void FP_func_8038F7AC(Actor *this){
|
||||
}
|
||||
|
||||
if(func_8038F5D4(this, local->unk0, 30.0f, 12.0f, 0x3C)){
|
||||
func_80328B8C(this, 5, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.02f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
}
|
||||
break;
|
||||
@ -260,7 +260,7 @@ void FP_func_8038F7AC(Actor *this){
|
||||
case 5: //L8038FB50
|
||||
FP_func_8038F6C4(this, local->unk18, 1.0f);
|
||||
if(0.97 < animctrl_getAnimTimer(this->animctrl)){
|
||||
func_80328B8C(this, 6, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 6, 0.02f, 1);
|
||||
actor_loopAnimation(this);
|
||||
}
|
||||
break;
|
||||
@ -309,7 +309,7 @@ void FP_func_8038F7AC(Actor *this){
|
||||
|
||||
if(mapSpecificFlags_get(8)){
|
||||
if(FP_func_8038F6C4(this, D_803925AC, 9.0f)){
|
||||
func_80328B8C(this, 9, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 9, 0.02f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
}
|
||||
break;
|
||||
@ -331,7 +331,7 @@ void FP_func_8038F7AC(Actor *this){
|
||||
case 9: //L8038FE14
|
||||
FP_func_8038F6C4(this, D_803925AC, 9.0f);
|
||||
if(0.97 < animctrl_getAnimTimer(this->animctrl)){
|
||||
func_80328B8C(this, 10, 0.02f, 1);
|
||||
subaddie_set_state_with_direction(this, 10, 0.02f, 1);
|
||||
actor_loopAnimation(this);
|
||||
}
|
||||
break;
|
||||
@ -342,7 +342,7 @@ void FP_func_8038F7AC(Actor *this){
|
||||
|
||||
case 11: //L8038FE84
|
||||
if(func_8038F5D4(this, local->unk24, 30.0f, 12.0f, 0x3C)){
|
||||
func_80328A84(this, 12);
|
||||
subaddie_set_state(this, 12);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
@ -51,7 +51,7 @@ void func_8038FF54(Actor *this){
|
||||
other = marker_getActor(this->unk100);
|
||||
if(this->state != 9){
|
||||
if(other->state == 9){
|
||||
func_80328B8C(this, 9, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 9, 0.01f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
}
|
||||
else{
|
||||
@ -75,7 +75,7 @@ void func_8038FF54(Actor *this){
|
||||
sp40[1] = (f32)(s32)sp40[1];
|
||||
sp40[2] = (f32)(s32)sp40[2];
|
||||
func_802C8F70(this->yaw + 90.0f);
|
||||
jiggySpawn(JIGGY_32_FP_WOZZA, sp40);
|
||||
jiggy_spawn(JIGGY_32_FP_WOZZA, sp40);
|
||||
levelSpecificFlags_set(0x26, TRUE);
|
||||
marker_despawn(this->marker);
|
||||
}
|
||||
|
||||
@ -47,7 +47,7 @@ void __chXmasTree_80386F3C(void){
|
||||
}
|
||||
|
||||
void __chXmasTree_80386F84(Actor * this){
|
||||
func_80328A84(this, 2);
|
||||
subaddie_set_state(this, 2);
|
||||
__chXmasTree_80386EF4(this, 0);
|
||||
}
|
||||
|
||||
@ -123,7 +123,7 @@ void chXmasTree_update(Actor *this){
|
||||
case 2: // L80387294
|
||||
if(!mapSpecificFlags_get(2)) break;
|
||||
|
||||
func_80328A84(this, 3);
|
||||
subaddie_set_state(this, 3);
|
||||
this->unk60 = 2.0f;
|
||||
func_8025A6EC(COMUSIC_61_XMAS_TREE_LIGHTS_UP, 28000);
|
||||
func_802BAFE4(0x1A);
|
||||
@ -148,7 +148,7 @@ void chXmasTree_update(Actor *this){
|
||||
}
|
||||
else{//L803873BC
|
||||
if(func_802BB270()){
|
||||
func_80328A84(this, 4);
|
||||
subaddie_set_state(this, 4);
|
||||
__chXmasTree_80386EF4(this, 1);
|
||||
item_set(ITEM_0_HOURGLASS_TIMER, 3600 - 1);
|
||||
item_set(ITEM_6_HOURGLASS, TRUE);
|
||||
@ -159,7 +159,7 @@ void chXmasTree_update(Actor *this){
|
||||
|
||||
case 4: // L80387400
|
||||
if(mapSpecificFlags_get(3)){
|
||||
func_80328A84(this, 6);
|
||||
subaddie_set_state(this, 6);
|
||||
__chXmasTree_80386EF4(this, 1);
|
||||
item_set(ITEM_6_HOURGLASS, FALSE);
|
||||
tmp_a0 = this->unk44_31;
|
||||
@ -172,7 +172,7 @@ void chXmasTree_update(Actor *this){
|
||||
}
|
||||
else{//L80387470
|
||||
if(item_empty(ITEM_6_HOURGLASS)){
|
||||
func_80328A84(this, 5);
|
||||
subaddie_set_state(this, 5);
|
||||
mapSpecificFlags_set(2, FALSE);
|
||||
this->unk60 = 0.1f;
|
||||
if(!func_8038BFA0()){
|
||||
|
||||
@ -104,14 +104,14 @@ void func_8038ECD8(Actor *this){
|
||||
if(!mapSpecificFlags_get(2)) break;
|
||||
if(mapSpecificFlags_get(3)) break;
|
||||
|
||||
func_80328A84(this, 2);
|
||||
subaddie_set_state(this, 2);
|
||||
this->unk38_31 = 0;
|
||||
break;
|
||||
|
||||
case 2://L8038EF5C
|
||||
if(!local->unk1A) return;
|
||||
if(item_empty(ITEM_6_HOURGLASS)){
|
||||
func_80328A84(this, 1);
|
||||
subaddie_set_state(this, 1);
|
||||
}
|
||||
else{
|
||||
this->marker->collidable = TRUE;
|
||||
@ -136,7 +136,7 @@ void func_8038ECD8(Actor *this){
|
||||
}//L8038F090
|
||||
|
||||
if(!(this->unk38_31 < 3)){
|
||||
func_80328A84(this, 1);
|
||||
subaddie_set_state(this, 1);
|
||||
mapSpecificFlags_set(3, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ Actor *func_8038E720(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
|
||||
|
||||
void func_8038E774(Actor *this){
|
||||
func_80328B8C(this, 2, 0.05f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.05f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
this->marker->collidable = TRUE;
|
||||
this->unk38_31 = 0;
|
||||
@ -70,7 +70,7 @@ void func_8038E940(Actor *this){
|
||||
if(jiggyscore_isCollected(JIGGY_2F_FP_XMAS_TREE) || levelSpecificFlags_get(0x29)){
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
this->marker->collidable = FALSE;
|
||||
func_80328B8C(this, 3, 0.95f, 0);
|
||||
subaddie_set_state_with_direction(this, 3, 0.95f, 0);
|
||||
return;
|
||||
}//L8038E9B8
|
||||
|
||||
@ -79,7 +79,7 @@ void func_8038E940(Actor *this){
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
this->marker->collidable = FALSE;
|
||||
marker_setCollisionScripts(this->marker, NULL, func_8038E7CC, NULL);
|
||||
func_80328B8C(this, 1, 0.05f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.05f, 1);
|
||||
this->unk38_31 = 0;
|
||||
this->unk60 = 0.0f;
|
||||
}//L8038EA3C
|
||||
@ -98,7 +98,7 @@ void func_8038E940(Actor *this){
|
||||
if(this->unk38_31 < 3)
|
||||
break;
|
||||
|
||||
func_80328B8C(this, 3, 0.05f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.05f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
FUNC_8030E624(SFX_416, 0.8f, 32000);
|
||||
this->marker->collidable = FALSE;
|
||||
|
||||
@ -98,7 +98,7 @@ void func_8038811C(ActorMarker *this_marker, ActorMarker *other_marker){
|
||||
if(this->state == 2)
|
||||
return;
|
||||
|
||||
func_80328B8C(this, 2, 0.0001, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.0001, 1);
|
||||
func_8030E878(SFX_6A_FLAGPOLE_WOBBLE, randf2(0.9f, 1.1f), 32000, this->position, 1000.0f, 2000.0f);
|
||||
|
||||
}
|
||||
@ -137,7 +137,7 @@ void func_803881AC(Actor *this){
|
||||
|
||||
if(this->state == 2){
|
||||
if(actor_animationIsAt(this, 0.9999f)){
|
||||
func_80328B8C(this, 1, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ Actor *func_803883E0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
void func_803884F4(ActorMarker *this_marker, ActorMarker *other_marker){
|
||||
Actor *this = marker_getActor(this_marker);
|
||||
if(this->state != 2){
|
||||
func_80328B8C(this, 2, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
|
||||
func_8030E878(SFX_6A_FLAGPOLE_WOBBLE, randf2(0.9f, 1.1f), 32000, this->position, 1000.0f, 2000.0f);
|
||||
}
|
||||
}
|
||||
@ -78,7 +78,7 @@ void func_80388584(Actor *this){
|
||||
func_8028E668(this->position, 200.0f, -10.0f, 30.0f);
|
||||
if(this->state == 2){
|
||||
if(actor_animationIsAt(this, 0.9999f)){
|
||||
func_80328B8C(this, 1, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -225,7 +225,7 @@ void func_80391744(Actor *this, Actor* other){
|
||||
}
|
||||
|
||||
void func_8039180C(Actor *this){
|
||||
ActorMarker *sp24;
|
||||
Actor *sp24;
|
||||
|
||||
if(!this->initialized){
|
||||
sp24 = actorArray_findActorFromActorId(0x254);
|
||||
|
||||
@ -197,10 +197,10 @@ void func_8038B0F8(void){
|
||||
|
||||
void func_8038B130(enum jiggy_e jiggy_id){
|
||||
if(jiggy_id == JIGGY_2C_FP_BOGGY_3 && !jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
|
||||
jiggySpawn(jiggy_id, D_80391F38);
|
||||
jiggy_spawn(jiggy_id, D_80391F38);
|
||||
}
|
||||
else{
|
||||
jiggySpawn(jiggy_id, D_80391F2C);
|
||||
jiggy_spawn(jiggy_id, D_80391F2C);
|
||||
}
|
||||
}
|
||||
|
||||
@ -485,15 +485,15 @@ void FP_func_8038BA88(s32 arg0){
|
||||
|
||||
switch(FP_D_803935A8.unkC - FP_D_803935A8.unk8){
|
||||
case 3:
|
||||
func_8025AEA0(0x3a, 0x411aa);
|
||||
func_8025AEA0(0x3a, 266666);
|
||||
break;
|
||||
case 2:
|
||||
func_8025AEA0(0x3a, 0x493e0);
|
||||
func_8025AEA0(0x3a, 300000);
|
||||
break;
|
||||
case 4:
|
||||
break;
|
||||
default:
|
||||
func_8025AEA0(0x3a, 0x51615);
|
||||
func_8025AEA0(0x3a, 333333);
|
||||
break;
|
||||
|
||||
|
||||
|
||||
@ -53,7 +53,7 @@ void fp_sirslushgame_update(void){
|
||||
|
||||
if(D_80392F30.unk1C){
|
||||
func_802BAFE4(0x12);
|
||||
jiggySpawn(JIGGY_31_FP_SIR_SLUSH, D_80392F30.spawn_pos);
|
||||
jiggy_spawn(JIGGY_31_FP_SIR_SLUSH, D_80392F30.spawn_pos);
|
||||
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
|
||||
reinterpret_cast(s32, D_80392F30.spawn_pos[0]),
|
||||
reinterpret_cast(s32, D_80392F30.spawn_pos[1]),
|
||||
|
||||
@ -51,7 +51,7 @@ void fp_snowmanButtonGame_update(void){
|
||||
|
||||
if(D_80392F50.unk18){
|
||||
func_802BAFE4(0x11);
|
||||
jiggySpawn(JIGGY_2D_FP_SNOWMAN_BUTTONS, D_80392F50.spawn_pos);
|
||||
jiggy_spawn(JIGGY_2D_FP_SNOWMAN_BUTTONS, D_80392F50.spawn_pos);
|
||||
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
|
||||
reinterpret_cast(s32, D_80392F50.spawn_pos[0]),
|
||||
reinterpret_cast(s32, D_80392F50.spawn_pos[1]),
|
||||
|
||||
@ -1 +1 @@
|
||||
char pad_GV_D_80391A20[0x10];
|
||||
char pad_GV_D_80391A20[0x10];
|
||||
|
||||
@ -88,7 +88,7 @@ void func_803867F4(void){
|
||||
f32 sp24[3];
|
||||
func_802BAFE4(4);
|
||||
if(nodeProp_findPositionFromActorId(0x148, sp24)){
|
||||
jiggySpawn(JIGGY_46_GV_ANCIENT_ONES, sp24);
|
||||
jiggy_spawn(JIGGY_46_GV_ANCIENT_ONES, sp24);
|
||||
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x4C, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
|
||||
}
|
||||
}
|
||||
@ -96,7 +96,7 @@ void func_803867F4(void){
|
||||
void func_80386850(ActorMarker *caller_marker, enum asset_e text_id, s32 arg2){
|
||||
Actor *caller = marker_getActor(caller_marker);
|
||||
if(text_id == 0xA80){
|
||||
func_80328B8C(caller, 2, 0.0f, 1);
|
||||
subaddie_set_state_with_direction(caller, 2, 0.0f, 1);
|
||||
actor_playAnimationOnce(caller);
|
||||
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
|
||||
timedFunc_set_0(1.0f, func_803867F4);
|
||||
@ -162,7 +162,7 @@ void chAncientOne_update(Actor *this){
|
||||
}
|
||||
}
|
||||
|
||||
func_80328B8C(this, 2, 0.0f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.0f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
if(this->unkF4_8 < 5){
|
||||
D_80390C28[this->unkF4_8]->propPtr->unk8_4 = TRUE;
|
||||
@ -198,7 +198,7 @@ void chAncientOne_update(Actor *this){
|
||||
break;
|
||||
case 2: //L80386DCC
|
||||
if(actor_animationIsAt(this, 0.999f)){
|
||||
func_80328B8C(this, 3, 0.9999f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.9999f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -34,7 +34,7 @@ void func_80387984(ActorMarker *this){
|
||||
|
||||
void __chGobi2_spawnJIggy(void){
|
||||
static f32 jiggy_position[3] = {1150.0f, 1150.0f, 9200.0f};
|
||||
jiggySpawn(JIGGY_45_GV_GOBI_2, jiggy_position);
|
||||
jiggy_spawn(JIGGY_45_GV_GOBI_2, jiggy_position);
|
||||
}
|
||||
|
||||
void func_803879D4(ActorMarker *this_marker){
|
||||
|
||||
@ -120,7 +120,7 @@ void chGobiRock_update(Actor *this){
|
||||
particleEmitter_update(local->unkC);
|
||||
particleEmitter_update(local->unk10);
|
||||
if(ml_timer_update(&local->unk14, sp24)){
|
||||
jiggySpawn(JIGGY_44_GV_GOBI_1, jiggy_position);
|
||||
jiggy_spawn(JIGGY_44_GV_GOBI_1, jiggy_position);
|
||||
func_802BB3DC(0, 60.0f, 0.65f);
|
||||
}
|
||||
if(this->state == 2){
|
||||
|
||||
@ -29,8 +29,8 @@ ActorInfo D_80391318 = { MARKER_AA_HISTUP, ACTOR_11C_HISTUP, ASSET_3DE_MODEL_HIS
|
||||
extern struct {
|
||||
s32 unk0;
|
||||
s32 unk4;
|
||||
s32 unk8;
|
||||
}GV_D_80391AB0;
|
||||
extern s32 D_80391AB8;
|
||||
|
||||
/* .code */
|
||||
int func_8038D920(Actor *this, f32 arg1){
|
||||
@ -70,7 +70,7 @@ Actor *func_8038DA18(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
|
||||
|
||||
|
||||
void GV_func_8038DB0C(Actor *this){
|
||||
func_80328B8C(this, 1, 0.99f, 0);
|
||||
subaddie_set_state_with_direction(this, 1, 0.99f, 0);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
|
||||
}
|
||||
|
||||
@ -112,15 +112,15 @@ void func_8038DBDC(Actor *this){
|
||||
this->initialized = TRUE;
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
actor_collisionOff(this);
|
||||
func_80328B8C(this, 1, 0.99f, 0);
|
||||
subaddie_set_state_with_direction(this, 1, 0.99f, 0);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
|
||||
D_80391AB8 = 0;
|
||||
GV_D_80391AB0.unk8 = 0;
|
||||
func_8038DB4C(0);
|
||||
this->unk1C[0] = 0.0f;
|
||||
}//L8038DC90
|
||||
if(func_8038E178() != (s32)this->unk1C[0] || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
|
||||
if(15.0f <= this->unk60){
|
||||
func_80328B8C(this, 2, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);
|
||||
animctrl_setDuration(this->animctrl, 2.0f);
|
||||
this->unk1C[0] = (f32)func_8038E178();
|
||||
@ -134,8 +134,8 @@ void func_8038DBDC(Actor *this){
|
||||
case 2: //8038DD3C
|
||||
if(!(func_8038E178() < 5)){
|
||||
func_8038DB88(this);
|
||||
if(D_80391AB8){
|
||||
func_80328B8C(this, 3, 0.99f, 0);
|
||||
if(GV_D_80391AB0.unk8){
|
||||
subaddie_set_state_with_direction(this, 3, 0.99f, 0);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_STOPPED);
|
||||
this->unk1C[0] = 0.0f;
|
||||
}
|
||||
@ -158,7 +158,7 @@ void func_8038DBDC(Actor *this){
|
||||
break;
|
||||
case 3: //8038DE44
|
||||
if(!(this->unk38_31 < 0x21)){
|
||||
func_80328B8C(this, 4, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.01f, 1);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);
|
||||
animctrl_setDuration(this->animctrl, 3.0f);
|
||||
func_803865F8();
|
||||
@ -170,7 +170,7 @@ void func_8038DBDC(Actor *this){
|
||||
break;
|
||||
case 4: //8038DEBC
|
||||
if(actor_animationIsAt(this, 0.99f)){
|
||||
func_80328B8C(this, 5, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_LOOP);
|
||||
animctrl_setDuration(this->animctrl, 2.0f);
|
||||
func_8038DB58(0);
|
||||
@ -191,12 +191,12 @@ void func_8038DBDC(Actor *this){
|
||||
break;
|
||||
case 5: //8038DFC8
|
||||
if(func_8038DB64() == 0x127){
|
||||
func_80328B8C(this, 6, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 6, 0.01f, 1);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_LOOP);
|
||||
animctrl_setDuration(this->animctrl, 1.6f);
|
||||
func_80386608();
|
||||
func_8038DB4C(0);
|
||||
D_80391AB8 = FALSE;
|
||||
GV_D_80391AB0.unk8 = FALSE;
|
||||
func_8025A58C(-1, 0x190);
|
||||
func_8025A7DC(COMUSIC_27_GV_RUBEES_SONG);
|
||||
if(!this->unk44_31){
|
||||
|
||||
@ -27,18 +27,18 @@ ActorInfo chMazeCtrl = { MARKER_1CD_GV_MAZE_CTRL, ACTOR_319_GV_MAZE_CTRL, 0x0,
|
||||
void func_8038F520(f32 arg0){
|
||||
static f32 D_803915E4[3] = {460.0f, 1400.0f, 0.0f};
|
||||
static f32 D_803915F0[3] = {0.0f, 0.0f, 0.0f};
|
||||
Struct6Ds *tmp_v0 = func_8034C528(0x19A);
|
||||
Struct70s *tmp_v0 = func_8034C528(0x19A);
|
||||
if(tmp_v0 != NULL){
|
||||
func_8034DDF0(tmp_v0, D_803915E4, D_803915F0, arg0, 1);
|
||||
func_8034DDF0(&tmp_v0->type_6D, D_803915E4, D_803915F0, arg0, 1);
|
||||
}
|
||||
}
|
||||
|
||||
void func_8038F56C(f32 arg0){
|
||||
static f32 D_803915FC[3] = {0.0f, 0.0f, 0.0f};
|
||||
static f32 D_80391608[3] = {460.0f, 1400.0f, 0.0f};
|
||||
Struct6Ds *tmp_v0 = func_8034C528(0x19A);
|
||||
Struct70s *tmp_v0 = func_8034C528(0x19A);
|
||||
if(tmp_v0 != NULL){
|
||||
func_8034DDF0(tmp_v0, D_803915FC, D_80391608, arg0, 1);
|
||||
func_8034DDF0(&tmp_v0->type_6D, D_803915FC, D_80391608, arg0, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ void __chMazeCtrl_8038F5E4(Actor *this){
|
||||
|
||||
void __chMazeCtrl_setState(Actor *this, s32 next_state){
|
||||
f32 plyr_pos[3];
|
||||
Struct6Ds *tmp_v0;
|
||||
Struct70s *tmp_v0;
|
||||
ActorLocal_GVMazeCtrl *local;
|
||||
f32 sp28[3];
|
||||
|
||||
@ -111,7 +111,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
|
||||
func_8030E6D4(SFX_52_BANJO_YAH_OH);
|
||||
tmp_v0 = func_8034C528(400);
|
||||
if(tmp_v0){
|
||||
func_8034DE60(tmp_v0, 0.0f, -1700.0f, 1.0f, 1);
|
||||
func_8034DE60(&tmp_v0->type_6D, 0.0f, -1700.0f, 1.0f, 1);
|
||||
}
|
||||
}//L8038F8C4
|
||||
|
||||
@ -170,7 +170,7 @@ void chMazeCtrl_update(Actor *this){
|
||||
|
||||
player_getPosition(sp3C);
|
||||
if(this->state == 1){
|
||||
sp38 = func_8034C528(0x191);
|
||||
sp38 = &func_8034C528(0x191)->type_6D;
|
||||
if(sp38 != NULL && func_8034DC80(sp38, sp3C)){
|
||||
__chMazeCtrl_setState(this, 2);
|
||||
}
|
||||
@ -200,7 +200,7 @@ void chMazeCtrl_update(Actor *this){
|
||||
}
|
||||
|
||||
if(this->state == 4){
|
||||
sp30 = func_8034C528(0x190);
|
||||
sp30 = &func_8034C528(0x190)->type_6D;
|
||||
if(sp30 != NULL && func_8034DC78(sp30)){
|
||||
__chMazeCtrl_setState(this, 0);
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ s32 D_80390E88[4] = {0, 0, 0, 0};
|
||||
void GV_func_803894B0(Actor *this){
|
||||
this->marker->propPtr->unk8_3 = TRUE;
|
||||
actor_collisionOff(this);
|
||||
func_80328B8C(this, 1, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
|
||||
this->unk38_31 = 0;
|
||||
this->initialized = TRUE;
|
||||
}
|
||||
@ -72,7 +72,7 @@ void chSarcophagus_update(Actor *this){
|
||||
GV_func_803894B0(this);
|
||||
}
|
||||
if(func_80329530(this, 500) && func_8038957C(this)){
|
||||
func_80328B8C(this, 2, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
|
||||
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
|
||||
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 1.0f, 32000, this->position, 1250, 2500);
|
||||
|
||||
@ -88,13 +88,13 @@ void chSarcophagus_update(Actor *this){
|
||||
this->unk38_31 = 1;
|
||||
}
|
||||
if(actor_animationIsAt(this, 0.5f)){
|
||||
func_80328B8C(this, 3, 0.5f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.5f, 1);
|
||||
}
|
||||
break;
|
||||
|
||||
case 3: //L80389788
|
||||
if(!func_80329530(this, 700)){
|
||||
func_80328B8C(this, 4, 0.5f, 1);
|
||||
subaddie_set_state_with_direction(this, 4, 0.5f, 1);
|
||||
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
|
||||
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 1.0f, 32000, this->position, 1250, 2500);
|
||||
}
|
||||
@ -110,7 +110,7 @@ void chSarcophagus_update(Actor *this){
|
||||
}
|
||||
|
||||
if(actor_animationIsAt(this, 0.99f)){
|
||||
func_80328B8C(this, 1, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
|
||||
}
|
||||
else if(actor_animationIsAt(this, 0.9f)){
|
||||
FUNC_8030E8B4(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 32000, this->position, 1250, 2500);
|
||||
@ -123,7 +123,7 @@ void chSarcophagus_updateSNS(Actor *this){
|
||||
if(!this->initialized){
|
||||
GV_func_803894B0(this);
|
||||
if(fileProgressFlag_get(FILEPROG_A4_GV_SNS_SARCOPHAGUS_OPEN))
|
||||
func_80328B8C(this, 3, 0.5f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.5f, 1);
|
||||
this->unk1C[0] = 0.0f;
|
||||
}
|
||||
|
||||
@ -132,7 +132,7 @@ void chSarcophagus_updateSNS(Actor *this){
|
||||
if(this->unk1C[0] != 0.0f){
|
||||
this->unk1C[0] -= 1.0f;
|
||||
if(this->unk1C[0] == 0.0f){
|
||||
func_80328B8C(this, 5, 0.01f, 1);
|
||||
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
|
||||
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 0.5f, 32000, this->position, 1250, 2500);
|
||||
FUNC_8030E8B4(SFX_3F6_UNKNOWN, 0.5f, 32000, this->position, 1250, 2500);
|
||||
}
|
||||
@ -145,7 +145,7 @@ void chSarcophagus_updateSNS(Actor *this){
|
||||
break;
|
||||
case 5://L803899DC
|
||||
if(actor_animationIsAt(this, 0.5f)){
|
||||
func_80328B8C(this, 3, 0.5f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.5f, 1);
|
||||
FUNC_8030E624(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 25000);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -24,17 +24,17 @@ s32 D_80391A34;
|
||||
|
||||
/* .code */
|
||||
void GV_func_803863F0(Actor *this){
|
||||
func_80328B8C(this, 1, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
|
||||
D_80391A30 = FALSE;
|
||||
}
|
||||
|
||||
void GV_func_80386420(Actor *this){
|
||||
func_80328B8C(this, 2, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
|
||||
this->unk38_31 = 0x23;
|
||||
}
|
||||
|
||||
void func_80386464(Actor *this){
|
||||
func_80328B8C(this, 3, 0.0001f, 1);
|
||||
subaddie_set_state_with_direction(this, 3, 0.0001f, 1);
|
||||
}
|
||||
|
||||
void chtoots_update(Actor *this){
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user