diff --git a/src/game/game_1165d0.c b/src/game/game_1165d0.c index 63fa7d516..cdbd983f2 100644 --- a/src/game/game_1165d0.c +++ b/src/game/game_1165d0.c @@ -8523,39 +8523,16 @@ glabel func0f11d540 /* f11d5ac: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f11d5b0 -/* f11d5b0: 00047600 */ sll $t6,$a0,0x18 -/* f11d5b4: 000e7e03 */ sra $t7,$t6,0x18 -/* f11d5b8: 000fc080 */ sll $t8,$t7,0x2 -/* f11d5bc: 030fc023 */ subu $t8,$t8,$t7 -/* f11d5c0: 0018c080 */ sll $t8,$t8,0x2 -/* f11d5c4: 030fc023 */ subu $t8,$t8,$t7 -/* f11d5c8: 0018c080 */ sll $t8,$t8,0x2 -/* f11d5cc: 030fc021 */ addu $t8,$t8,$t7 -/* f11d5d0: 0018c080 */ sll $t8,$t8,0x2 -/* f11d5d4: 030fc023 */ subu $t8,$t8,$t7 -/* f11d5d8: 3c19800a */ lui $t9,%hi(var800a2380) -/* f11d5dc: 27392380 */ addiu $t9,$t9,%lo(var800a2380) -/* f11d5e0: 0018c080 */ sll $t8,$t8,0x2 -/* f11d5e4: 03191821 */ addu $v1,$t8,$t9 -/* f11d5e8: 8c620008 */ lw $v0,0x8($v1) -/* f11d5ec: 24050001 */ addiu $a1,$zero,0x1 -/* f11d5f0: afa40000 */ sw $a0,0x0($sp) -/* f11d5f4: 10a20003 */ beq $a1,$v0,.L0f11d604 -/* f11d5f8: 24080004 */ addiu $t0,$zero,0x4 -/* f11d5fc: 54400006 */ bnezl $v0,.L0f11d618 -/* f11d600: 00001025 */ or $v0,$zero,$zero -.L0f11d604: -/* f11d604: ac680008 */ sw $t0,0x8($v1) -/* f11d608: ac650270 */ sw $a1,0x270($v1) -/* f11d60c: 03e00008 */ jr $ra -/* f11d610: 24020001 */ addiu $v0,$zero,0x1 -/* f11d614: 00001025 */ or $v0,$zero,$zero -.L0f11d618: -/* f11d618: 03e00008 */ jr $ra -/* f11d61c: 00000000 */ sll $zero,$zero,0x0 -); +s32 func0f11d5b0(s8 index) +{ + if (var800a2380[index].unk008 == 1 || var800a2380[index].unk008 == 0) { + var800a2380[index].unk008 = 4; + var800a2380[index].unk270 = 1; + return true; + } + + return false; +} GLOBAL_ASM( glabel func0f11d620 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index bce19c918..719030439 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -20300,722 +20300,7 @@ u32 var800a2370 = 0; u32 var800a2374 = 0; u32 var800a2378 = 0; u32 var800a237c = 0; -u32 var800a2380 = 0; -u32 var800a2384 = 0; -u32 var800a2388 = 0; -u32 var800a238c = 0; -u32 var800a2390 = 0; -u32 var800a2394 = 0; -u32 var800a2398 = 0; -u32 var800a239c = 0; -u32 var800a23a0 = 0; -u32 var800a23a4 = 0; -u32 var800a23a8 = 0; -u32 var800a23ac = 0; -u32 var800a23b0 = 0; -u32 var800a23b4 = 0; -u32 var800a23b8 = 0; -u32 var800a23bc = 0; -u32 var800a23c0 = 0; -u32 var800a23c4 = 0; -u32 var800a23c8 = 0; -u32 var800a23cc = 0; -u32 var800a23d0 = 0; -u32 var800a23d4 = 0; -u32 var800a23d8 = 0; -u32 var800a23dc = 0; -u32 var800a23e0 = 0; -u32 var800a23e4 = 0; -u32 var800a23e8 = 0; -u32 var800a23ec = 0; -u32 var800a23f0 = 0; -u32 var800a23f4 = 0; -u32 var800a23f8 = 0; -u32 var800a23fc = 0; -u32 var800a2400 = 0; -u32 var800a2404 = 0; -u32 var800a2408 = 0; -u32 var800a240c = 0; -u32 var800a2410 = 0; -u32 var800a2414 = 0; -u32 var800a2418 = 0; -u32 var800a241c = 0; -u32 var800a2420 = 0; -u32 var800a2424 = 0; -u32 var800a2428 = 0; -u32 var800a242c = 0; -u32 var800a2430 = 0; -u32 var800a2434 = 0; -u32 var800a2438 = 0; -u32 var800a243c = 0; -u32 var800a2440 = 0; -u32 var800a2444 = 0; -u32 var800a2448 = 0; -u32 var800a244c = 0; -u32 var800a2450 = 0; -u32 var800a2454 = 0; -u32 var800a2458 = 0; -u32 var800a245c = 0; -u32 var800a2460 = 0; -u32 var800a2464 = 0; -u32 var800a2468 = 0; -u32 var800a246c = 0; -u32 var800a2470 = 0; -u32 var800a2474 = 0; -u32 var800a2478 = 0; -u32 var800a247c = 0; -u32 var800a2480 = 0; -u32 var800a2484 = 0; -u32 var800a2488 = 0; -u32 var800a248c = 0; -u32 var800a2490 = 0; -u32 var800a2494 = 0; -u32 var800a2498 = 0; -u32 var800a249c = 0; -u32 var800a24a0 = 0; -u32 var800a24a4 = 0; -u32 var800a24a8 = 0; -u32 var800a24ac = 0; -u32 var800a24b0 = 0; -u32 var800a24b4 = 0; -u32 var800a24b8 = 0; -u32 var800a24bc = 0; -u32 var800a24c0 = 0; -u32 var800a24c4 = 0; -u32 var800a24c8 = 0; -u32 var800a24cc = 0; -u32 var800a24d0 = 0; -u32 var800a24d4 = 0; -u32 var800a24d8 = 0; -u32 var800a24dc = 0; -u32 var800a24e0 = 0; -u32 var800a24e4 = 0; -u32 var800a24e8 = 0; -u32 var800a24ec = 0; -u32 var800a24f0 = 0; -u32 var800a24f4 = 0; -u32 var800a24f8 = 0; -u32 var800a24fc = 0; -u32 var800a2500 = 0; -u32 var800a2504 = 0; -u32 var800a2508 = 0; -u32 var800a250c = 0; -u32 var800a2510 = 0; -u32 var800a2514 = 0; -u32 var800a2518 = 0; -u32 var800a251c = 0; -u32 var800a2520 = 0; -u32 var800a2524 = 0; -u32 var800a2528 = 0; -u32 var800a252c = 0; -u32 var800a2530 = 0; -u32 var800a2534 = 0; -u32 var800a2538 = 0; -u32 var800a253c = 0; -u32 var800a2540 = 0; -u32 var800a2544 = 0; -u32 var800a2548 = 0; -u32 var800a254c = 0; -u32 var800a2550 = 0; -u32 var800a2554 = 0; -u32 var800a2558 = 0; -u32 var800a255c = 0; -u32 var800a2560 = 0; -u32 var800a2564 = 0; -u32 var800a2568 = 0; -u32 var800a256c = 0; -u32 var800a2570 = 0; -u32 var800a2574 = 0; -u32 var800a2578 = 0; -u32 var800a257c = 0; -u32 var800a2580 = 0; -u32 var800a2584 = 0; -u32 var800a2588 = 0; -u32 var800a258c = 0; -u32 var800a2590 = 0; -u32 var800a2594 = 0; -u32 var800a2598 = 0; -u32 var800a259c = 0; -u32 var800a25a0 = 0; -u32 var800a25a4 = 0; -u32 var800a25a8 = 0; -u32 var800a25ac = 0; -u32 var800a25b0 = 0; -u32 var800a25b4 = 0; -u32 var800a25b8 = 0; -u32 var800a25bc = 0; -u32 var800a25c0 = 0; -u32 var800a25c4 = 0; -u32 var800a25c8 = 0; -u32 var800a25cc = 0; -u32 var800a25d0 = 0; -u32 var800a25d4 = 0; -u32 var800a25d8 = 0; -u32 var800a25dc = 0; -u32 var800a25e0 = 0; -u32 var800a25e4 = 0; -u32 var800a25e8 = 0; -u32 var800a25ec = 0; -u32 var800a25f0 = 0; -u32 var800a25f4 = 0; -u32 var800a25f8 = 0; -u32 var800a25fc = 0; -u32 var800a2600 = 0; -u32 var800a2604 = 0; -u32 var800a2608 = 0; -u32 var800a260c = 0; -u32 var800a2610 = 0; -u32 var800a2614 = 0; -u32 var800a2618 = 0; -u32 var800a261c = 0; -u32 var800a2620 = 0; -u32 var800a2624 = 0; -u32 var800a2628 = 0; -u32 var800a262c = 0; -u32 var800a2630 = 0; -u32 var800a2634 = 0; -u32 var800a2638 = 0; -u32 var800a263c = 0; -u32 var800a2640 = 0; -u32 var800a2644 = 0; -u32 var800a2648 = 0; -u32 var800a264c = 0; -u32 var800a2650 = 0; -u32 var800a2654 = 0; -u32 var800a2658 = 0; -u32 var800a265c = 0; -u32 var800a2660 = 0; -u32 var800a2664 = 0; -u32 var800a2668 = 0; -u32 var800a266c = 0; -u32 var800a2670 = 0; -u32 var800a2674 = 0; -u32 var800a2678 = 0; -u32 var800a267c = 0; -u32 var800a2680 = 0; -u32 var800a2684 = 0; -u32 var800a2688 = 0; -u32 var800a268c = 0; -u32 var800a2690 = 0; -u32 var800a2694 = 0; -u32 var800a2698 = 0; -u32 var800a269c = 0; -u32 var800a26a0 = 0; -u32 var800a26a4 = 0; -u32 var800a26a8 = 0; -u32 var800a26ac = 0; -u32 var800a26b0 = 0; -u32 var800a26b4 = 0; -u32 var800a26b8 = 0; -u32 var800a26bc = 0; -u32 var800a26c0 = 0; -u32 var800a26c4 = 0; -u32 var800a26c8 = 0; -u32 var800a26cc = 0; -u32 var800a26d0 = 0; -u32 var800a26d4 = 0; -u32 var800a26d8 = 0; -u32 var800a26dc = 0; -u32 var800a26e0 = 0; -u32 var800a26e4 = 0; -u32 var800a26e8 = 0; -u32 var800a26ec = 0; -u32 var800a26f0 = 0; -u32 var800a26f4 = 0; -u32 var800a26f8 = 0; -u32 var800a26fc = 0; -u32 var800a2700 = 0; -u32 var800a2704 = 0; -u32 var800a2708 = 0; -u32 var800a270c = 0; -u32 var800a2710 = 0; -u32 var800a2714 = 0; -u32 var800a2718 = 0; -u32 var800a271c = 0; -u32 var800a2720 = 0; -u32 var800a2724 = 0; -u32 var800a2728 = 0; -u32 var800a272c = 0; -u32 var800a2730 = 0; -u32 var800a2734 = 0; -u32 var800a2738 = 0; -u32 var800a273c = 0; -u32 var800a2740 = 0; -u32 var800a2744 = 0; -u32 var800a2748 = 0; -u32 var800a274c = 0; -u32 var800a2750 = 0; -u32 var800a2754 = 0; -u32 var800a2758 = 0; -u32 var800a275c = 0; -u32 var800a2760 = 0; -u32 var800a2764 = 0; -u32 var800a2768 = 0; -u32 var800a276c = 0; -u32 var800a2770 = 0; -u32 var800a2774 = 0; -u32 var800a2778 = 0; -u32 var800a277c = 0; -u32 var800a2780 = 0; -u32 var800a2784 = 0; -u32 var800a2788 = 0; -u32 var800a278c = 0; -u32 var800a2790 = 0; -u32 var800a2794 = 0; -u32 var800a2798 = 0; -u32 var800a279c = 0; -u32 var800a27a0 = 0; -u32 var800a27a4 = 0; -u32 var800a27a8 = 0; -u32 var800a27ac = 0; -u32 var800a27b0 = 0; -u32 var800a27b4 = 0; -u32 var800a27b8 = 0; -u32 var800a27bc = 0; -u32 var800a27c0 = 0; -u32 var800a27c4 = 0; -u32 var800a27c8 = 0; -u32 var800a27cc = 0; -u32 var800a27d0 = 0; -u32 var800a27d4 = 0; -u32 var800a27d8 = 0; -u32 var800a27dc = 0; -u32 var800a27e0 = 0; -u32 var800a27e4 = 0; -u32 var800a27e8 = 0; -u32 var800a27ec = 0; -u32 var800a27f0 = 0; -u32 var800a27f4 = 0; -u32 var800a27f8 = 0; -u32 var800a27fc = 0; -u32 var800a2800 = 0; -u32 var800a2804 = 0; -u32 var800a2808 = 0; -u32 var800a280c = 0; -u32 var800a2810 = 0; -u32 var800a2814 = 0; -u32 var800a2818 = 0; -u32 var800a281c = 0; -u32 var800a2820 = 0; -u32 var800a2824 = 0; -u32 var800a2828 = 0; -u32 var800a282c = 0; -u32 var800a2830 = 0; -u32 var800a2834 = 0; -u32 var800a2838 = 0; -u32 var800a283c = 0; -u32 var800a2840 = 0; -u32 var800a2844 = 0; -u32 var800a2848 = 0; -u32 var800a284c = 0; -u32 var800a2850 = 0; -u32 var800a2854 = 0; -u32 var800a2858 = 0; -u32 var800a285c = 0; -u32 var800a2860 = 0; -u32 var800a2864 = 0; -u32 var800a2868 = 0; -u32 var800a286c = 0; -u32 var800a2870 = 0; -u32 var800a2874 = 0; -u32 var800a2878 = 0; -u32 var800a287c = 0; -u32 var800a2880 = 0; -u32 var800a2884 = 0; -u32 var800a2888 = 0; -u32 var800a288c = 0; -u32 var800a2890 = 0; -u32 var800a2894 = 0; -u32 var800a2898 = 0; -u32 var800a289c = 0; -u32 var800a28a0 = 0; -u32 var800a28a4 = 0; -u32 var800a28a8 = 0; -u32 var800a28ac = 0; -u32 var800a28b0 = 0; -u32 var800a28b4 = 0; -u32 var800a28b8 = 0; -u32 var800a28bc = 0; -u32 var800a28c0 = 0; -u32 var800a28c4 = 0; -u32 var800a28c8 = 0; -u32 var800a28cc = 0; -u32 var800a28d0 = 0; -u32 var800a28d4 = 0; -u32 var800a28d8 = 0; -u32 var800a28dc = 0; -u32 var800a28e0 = 0; -u32 var800a28e4 = 0; -u32 var800a28e8 = 0; -u32 var800a28ec = 0; -u32 var800a28f0 = 0; -u32 var800a28f4 = 0; -u32 var800a28f8 = 0; -u32 var800a28fc = 0; -u32 var800a2900 = 0; -u32 var800a2904 = 0; -u32 var800a2908 = 0; -u32 var800a290c = 0; -u32 var800a2910 = 0; -u32 var800a2914 = 0; -u32 var800a2918 = 0; -u32 var800a291c = 0; -u32 var800a2920 = 0; -u32 var800a2924 = 0; -u32 var800a2928 = 0; -u32 var800a292c = 0; -u32 var800a2930 = 0; -u32 var800a2934 = 0; -u32 var800a2938 = 0; -u32 var800a293c = 0; -u32 var800a2940 = 0; -u32 var800a2944 = 0; -u32 var800a2948 = 0; -u32 var800a294c = 0; -u32 var800a2950 = 0; -u32 var800a2954 = 0; -u32 var800a2958 = 0; -u32 var800a295c = 0; -u32 var800a2960 = 0; -u32 var800a2964 = 0; -u32 var800a2968 = 0; -u32 var800a296c = 0; -u32 var800a2970 = 0; -u32 var800a2974 = 0; -u32 var800a2978 = 0; -u32 var800a297c = 0; -u32 var800a2980 = 0; -u32 var800a2984 = 0; -u32 var800a2988 = 0; -u32 var800a298c = 0; -u32 var800a2990 = 0; -u32 var800a2994 = 0; -u32 var800a2998 = 0; -u32 var800a299c = 0; -u32 var800a29a0 = 0; -u32 var800a29a4 = 0; -u32 var800a29a8 = 0; -u32 var800a29ac = 0; -u32 var800a29b0 = 0; -u32 var800a29b4 = 0; -u32 var800a29b8 = 0; -u32 var800a29bc = 0; -u32 var800a29c0 = 0; -u32 var800a29c4 = 0; -u32 var800a29c8 = 0; -u32 var800a29cc = 0; -u32 var800a29d0 = 0; -u32 var800a29d4 = 0; -u32 var800a29d8 = 0; -u32 var800a29dc = 0; -u32 var800a29e0 = 0; -u32 var800a29e4 = 0; -u32 var800a29e8 = 0; -u32 var800a29ec = 0; -u32 var800a29f0 = 0; -u32 var800a29f4 = 0; -u32 var800a29f8 = 0; -u32 var800a29fc = 0; -u32 var800a2a00 = 0; -u32 var800a2a04 = 0; -u32 var800a2a08 = 0; -u32 var800a2a0c = 0; -u32 var800a2a10 = 0; -u32 var800a2a14 = 0; -u32 var800a2a18 = 0; -u32 var800a2a1c = 0; -u32 var800a2a20 = 0; -u32 var800a2a24 = 0; -u32 var800a2a28 = 0; -u32 var800a2a2c = 0; -u32 var800a2a30 = 0; -u32 var800a2a34 = 0; -u32 var800a2a38 = 0; -u32 var800a2a3c = 0; -u32 var800a2a40 = 0; -u32 var800a2a44 = 0; -u32 var800a2a48 = 0; -u32 var800a2a4c = 0; -u32 var800a2a50 = 0; -u32 var800a2a54 = 0; -u32 var800a2a58 = 0; -u32 var800a2a5c = 0; -u32 var800a2a60 = 0; -u32 var800a2a64 = 0; -u32 var800a2a68 = 0; -u32 var800a2a6c = 0; -u32 var800a2a70 = 0; -u32 var800a2a74 = 0; -u32 var800a2a78 = 0; -u32 var800a2a7c = 0; -u32 var800a2a80 = 0; -u32 var800a2a84 = 0; -u32 var800a2a88 = 0; -u32 var800a2a8c = 0; -u32 var800a2a90 = 0; -u32 var800a2a94 = 0; -u32 var800a2a98 = 0; -u32 var800a2a9c = 0; -u32 var800a2aa0 = 0; -u32 var800a2aa4 = 0; -u32 var800a2aa8 = 0; -u32 var800a2aac = 0; -u32 var800a2ab0 = 0; -u32 var800a2ab4 = 0; -u32 var800a2ab8 = 0; -u32 var800a2abc = 0; -u32 var800a2ac0 = 0; -u32 var800a2ac4 = 0; -u32 var800a2ac8 = 0; -u32 var800a2acc = 0; -u32 var800a2ad0 = 0; -u32 var800a2ad4 = 0; -u32 var800a2ad8 = 0; -u32 var800a2adc = 0; -u32 var800a2ae0 = 0; -u32 var800a2ae4 = 0; -u32 var800a2ae8 = 0; -u32 var800a2aec = 0; -u32 var800a2af0 = 0; -u32 var800a2af4 = 0; -u32 var800a2af8 = 0; -u32 var800a2afc = 0; -u32 var800a2b00 = 0; -u32 var800a2b04 = 0; -u32 var800a2b08 = 0; -u32 var800a2b0c = 0; -u32 var800a2b10 = 0; -u32 var800a2b14 = 0; -u32 var800a2b18 = 0; -u32 var800a2b1c = 0; -u32 var800a2b20 = 0; -u32 var800a2b24 = 0; -u32 var800a2b28 = 0; -u32 var800a2b2c = 0; -u32 var800a2b30 = 0; -u32 var800a2b34 = 0; -u32 var800a2b38 = 0; -u32 var800a2b3c = 0; -u32 var800a2b40 = 0; -u32 var800a2b44 = 0; -u32 var800a2b48 = 0; -u32 var800a2b4c = 0; -u32 var800a2b50 = 0; -u32 var800a2b54 = 0; -u32 var800a2b58 = 0; -u32 var800a2b5c = 0; -u32 var800a2b60 = 0; -u32 var800a2b64 = 0; -u32 var800a2b68 = 0; -u32 var800a2b6c = 0; -u32 var800a2b70 = 0; -u32 var800a2b74 = 0; -u32 var800a2b78 = 0; -u32 var800a2b7c = 0; -u32 var800a2b80 = 0; -u32 var800a2b84 = 0; -u32 var800a2b88 = 0; -u32 var800a2b8c = 0; -u32 var800a2b90 = 0; -u32 var800a2b94 = 0; -u32 var800a2b98 = 0; -u32 var800a2b9c = 0; -u32 var800a2ba0 = 0; -u32 var800a2ba4 = 0; -u32 var800a2ba8 = 0; -u32 var800a2bac = 0; -u32 var800a2bb0 = 0; -u32 var800a2bb4 = 0; -u32 var800a2bb8 = 0; -u32 var800a2bbc = 0; -u32 var800a2bc0 = 0; -u32 var800a2bc4 = 0; -u32 var800a2bc8 = 0; -u32 var800a2bcc = 0; -u32 var800a2bd0 = 0; -u32 var800a2bd4 = 0; -u32 var800a2bd8 = 0; -u32 var800a2bdc = 0; -u32 var800a2be0 = 0; -u32 var800a2be4 = 0; -u32 var800a2be8 = 0; -u32 var800a2bec = 0; -u32 var800a2bf0 = 0; -u32 var800a2bf4 = 0; -u32 var800a2bf8 = 0; -u32 var800a2bfc = 0; -u32 var800a2c00 = 0; -u32 var800a2c04 = 0; -u32 var800a2c08 = 0; -u32 var800a2c0c = 0; -u32 var800a2c10 = 0; -u32 var800a2c14 = 0; -u32 var800a2c18 = 0; -u32 var800a2c1c = 0; -u32 var800a2c20 = 0; -u32 var800a2c24 = 0; -u32 var800a2c28 = 0; -u32 var800a2c2c = 0; -u32 var800a2c30 = 0; -u32 var800a2c34 = 0; -u32 var800a2c38 = 0; -u32 var800a2c3c = 0; -u32 var800a2c40 = 0; -u32 var800a2c44 = 0; -u32 var800a2c48 = 0; -u32 var800a2c4c = 0; -u32 var800a2c50 = 0; -u32 var800a2c54 = 0; -u32 var800a2c58 = 0; -u32 var800a2c5c = 0; -u32 var800a2c60 = 0; -u32 var800a2c64 = 0; -u32 var800a2c68 = 0; -u32 var800a2c6c = 0; -u32 var800a2c70 = 0; -u32 var800a2c74 = 0; -u32 var800a2c78 = 0; -u32 var800a2c7c = 0; -u32 var800a2c80 = 0; -u32 var800a2c84 = 0; -u32 var800a2c88 = 0; -u32 var800a2c8c = 0; -u32 var800a2c90 = 0; -u32 var800a2c94 = 0; -u32 var800a2c98 = 0; -u32 var800a2c9c = 0; -u32 var800a2ca0 = 0; -u32 var800a2ca4 = 0; -u32 var800a2ca8 = 0; -u32 var800a2cac = 0; -u32 var800a2cb0 = 0; -u32 var800a2cb4 = 0; -u32 var800a2cb8 = 0; -u32 var800a2cbc = 0; -u32 var800a2cc0 = 0; -u32 var800a2cc4 = 0; -u32 var800a2cc8 = 0; -u32 var800a2ccc = 0; -u32 var800a2cd0 = 0; -u32 var800a2cd4 = 0; -u32 var800a2cd8 = 0; -u32 var800a2cdc = 0; -u32 var800a2ce0 = 0; -u32 var800a2ce4 = 0; -u32 var800a2ce8 = 0; -u32 var800a2cec = 0; -u32 var800a2cf0 = 0; -u32 var800a2cf4 = 0; -u32 var800a2cf8 = 0; -u32 var800a2cfc = 0; -u32 var800a2d00 = 0; -u32 var800a2d04 = 0; -u32 var800a2d08 = 0; -u32 var800a2d0c = 0; -u32 var800a2d10 = 0; -u32 var800a2d14 = 0; -u32 var800a2d18 = 0; -u32 var800a2d1c = 0; -u32 var800a2d20 = 0; -u32 var800a2d24 = 0; -u32 var800a2d28 = 0; -u32 var800a2d2c = 0; -u32 var800a2d30 = 0; -u32 var800a2d34 = 0; -u32 var800a2d38 = 0; -u32 var800a2d3c = 0; -u32 var800a2d40 = 0; -u32 var800a2d44 = 0; -u32 var800a2d48 = 0; -u32 var800a2d4c = 0; -u32 var800a2d50 = 0; -u32 var800a2d54 = 0; -u32 var800a2d58 = 0; -u32 var800a2d5c = 0; -u32 var800a2d60 = 0; -u32 var800a2d64 = 0; -u32 var800a2d68 = 0; -u32 var800a2d6c = 0; -u32 var800a2d70 = 0; -u32 var800a2d74 = 0; -u32 var800a2d78 = 0; -u32 var800a2d7c = 0; -u32 var800a2d80 = 0; -u32 var800a2d84 = 0; -u32 var800a2d88 = 0; -u32 var800a2d8c = 0; -u32 var800a2d90 = 0; -u32 var800a2d94 = 0; -u32 var800a2d98 = 0; -u32 var800a2d9c = 0; -u32 var800a2da0 = 0; -u32 var800a2da4 = 0; -u32 var800a2da8 = 0; -u32 var800a2dac = 0; -u32 var800a2db0 = 0; -u32 var800a2db4 = 0; -u32 var800a2db8 = 0; -u32 var800a2dbc = 0; -u32 var800a2dc0 = 0; -u32 var800a2dc4 = 0; -u32 var800a2dc8 = 0; -u32 var800a2dcc = 0; -u32 var800a2dd0 = 0; -u32 var800a2dd4 = 0; -u32 var800a2dd8 = 0; -u32 var800a2ddc = 0; -u32 var800a2de0 = 0; -u32 var800a2de4 = 0; -u32 var800a2de8 = 0; -u32 var800a2dec = 0; -u32 var800a2df0 = 0; -u32 var800a2df4 = 0; -u32 var800a2df8 = 0; -u32 var800a2dfc = 0; -u32 var800a2e00 = 0; -u32 var800a2e04 = 0; -u32 var800a2e08 = 0; -u32 var800a2e0c = 0; -u32 var800a2e10 = 0; -u32 var800a2e14 = 0; -u32 var800a2e18 = 0; -u32 var800a2e1c = 0; -u32 var800a2e20 = 0; -u32 var800a2e24 = 0; -u32 var800a2e28 = 0; -u32 var800a2e2c = 0; -u32 var800a2e30 = 0; -u32 var800a2e34 = 0; -u32 var800a2e38 = 0; -u32 var800a2e3c = 0; -u32 var800a2e40 = 0; -u32 var800a2e44 = 0; -u32 var800a2e48 = 0; -u32 var800a2e4c = 0; -u32 var800a2e50 = 0; -u32 var800a2e54 = 0; -u32 var800a2e58 = 0; -u32 var800a2e5c = 0; -u32 var800a2e60 = 0; -u32 var800a2e64 = 0; -u32 var800a2e68 = 0; -u32 var800a2e6c = 0; -u32 var800a2e70 = 0; -u32 var800a2e74 = 0; -u32 var800a2e78 = 0; -u32 var800a2e7c = 0; -u32 var800a2e80 = 0; -u32 var800a2e84 = 0; -u32 var800a2e88 = 0; -u32 var800a2e8c = 0; -u32 var800a2e90 = 0; -u32 var800a2e94 = 0; -u32 var800a2e98 = 0; -u32 var800a2e9c = 0; -u32 var800a2ea0 = 0; -u32 var800a2ea4 = 0; -u32 var800a2ea8 = 0; -u32 var800a2eac = 0; +struct var800a2380 var800a2380[4] = {0}; u32 var800a2eb0 = 0; u32 var800a2eb4 = 0; u32 var800a2eb8 = 0; diff --git a/src/include/game/game_1165d0.h b/src/include/game/game_1165d0.h index 71597d972..99e1f1187 100644 --- a/src/include/game/game_1165d0.h +++ b/src/include/game/game_1165d0.h @@ -107,7 +107,7 @@ u32 func0f11d3f8(void); u32 func0f11d478(void); u32 func0f11d4dc(void); u32 func0f11d540(void); -u32 func0f11d5b0(void); +s32 func0f11d5b0(s8 index); u32 func0f11d620(void); u32 func0f11d8b4(void); u32 func0f11d9c4(void); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 1b347c4af..ad1627437 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -707,7 +707,7 @@ extern u32 var800a2364; extern u32 var800a2368; extern u32 var800a236c; extern u32 var800a2370; -extern u32 var800a2380; +extern struct var800a2380 var800a2380[4]; extern u32 var800a2eb0; extern u32 var800a3180; extern u32 var800a33a4; diff --git a/src/include/types.h b/src/include/types.h index afe1c6953..cf3ba16fe 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -4758,4 +4758,186 @@ struct textoverride { /*0x24*/ struct defaultobj *obj; }; +struct var800a2380 { + /*0x000*/ u32 unk000; + /*0x004*/ u32 unk004; + /*0x008*/ u32 unk008; + /*0x00c*/ u32 unk00c; + /*0x010*/ u32 unk010; + /*0x014*/ u32 unk014; + /*0x018*/ u32 unk018; + /*0x01c*/ u32 unk01c; + /*0x020*/ u32 unk020; + /*0x024*/ u32 unk024; + /*0x028*/ u32 unk028; + /*0x02c*/ u32 unk02c; + /*0x030*/ u32 unk030; + /*0x034*/ u32 unk034; + /*0x038*/ u32 unk038; + /*0x03c*/ u32 unk03c; + /*0x040*/ u32 unk040; + /*0x044*/ u32 unk044; + /*0x048*/ u32 unk048; + /*0x04c*/ u32 unk04c; + /*0x050*/ u32 unk050; + /*0x054*/ u32 unk054; + /*0x058*/ u32 unk058; + /*0x05c*/ u32 unk05c; + /*0x060*/ u32 unk060; + /*0x064*/ u32 unk064; + /*0x068*/ u32 unk068; + /*0x06c*/ u32 unk06c; + /*0x070*/ u32 unk070; + /*0x074*/ u32 unk074; + /*0x078*/ u32 unk078; + /*0x07c*/ u32 unk07c; + /*0x080*/ u32 unk080; + /*0x084*/ u32 unk084; + /*0x088*/ u32 unk088; + /*0x08c*/ u32 unk08c; + /*0x090*/ u32 unk090; + /*0x094*/ u32 unk094; + /*0x098*/ u32 unk098; + /*0x09c*/ u32 unk09c; + /*0x0a0*/ u32 unk0a0; + /*0x0a4*/ u32 unk0a4; + /*0x0a8*/ u32 unk0a8; + /*0x0ac*/ u32 unk0ac; + /*0x0b0*/ u32 unk0b0; + /*0x0b4*/ u32 unk0b4; + /*0x0b8*/ u32 unk0b8; + /*0x0bc*/ u32 unk0bc; + /*0x0c0*/ u32 unk0c0; + /*0x0c4*/ u32 unk0c4; + /*0x0c8*/ u32 unk0c8; + /*0x0cc*/ u32 unk0cc; + /*0x0d0*/ u32 unk0d0; + /*0x0d4*/ u32 unk0d4; + /*0x0d8*/ u32 unk0d8; + /*0x0dc*/ u32 unk0dc; + /*0x0e0*/ u32 unk0e0; + /*0x0e4*/ u32 unk0e4; + /*0x0e8*/ u32 unk0e8; + /*0x0ec*/ u32 unk0ec; + /*0x0f0*/ u32 unk0f0; + /*0x0f4*/ u32 unk0f4; + /*0x0f8*/ u32 unk0f8; + /*0x0fc*/ u32 unk0fc; + /*0x100*/ u32 unk100; + /*0x104*/ u32 unk104; + /*0x108*/ u32 unk108; + /*0x10c*/ u32 unk10c; + /*0x110*/ u32 unk110; + /*0x114*/ u32 unk114; + /*0x118*/ u32 unk118; + /*0x11c*/ u32 unk11c; + /*0x120*/ u32 unk120; + /*0x124*/ u32 unk124; + /*0x128*/ u32 unk128; + /*0x12c*/ u32 unk12c; + /*0x130*/ u32 unk130; + /*0x134*/ u32 unk134; + /*0x138*/ u32 unk138; + /*0x13c*/ u32 unk13c; + /*0x140*/ u32 unk140; + /*0x144*/ u32 unk144; + /*0x148*/ u32 unk148; + /*0x14c*/ u32 unk14c; + /*0x150*/ u32 unk150; + /*0x154*/ u32 unk154; + /*0x158*/ u32 unk158; + /*0x15c*/ u32 unk15c; + /*0x160*/ u32 unk160; + /*0x164*/ u32 unk164; + /*0x168*/ u32 unk168; + /*0x16c*/ u32 unk16c; + /*0x170*/ u32 unk170; + /*0x174*/ u32 unk174; + /*0x178*/ u32 unk178; + /*0x17c*/ u32 unk17c; + /*0x180*/ u32 unk180; + /*0x184*/ u32 unk184; + /*0x188*/ u32 unk188; + /*0x18c*/ u32 unk18c; + /*0x190*/ u32 unk190; + /*0x194*/ u32 unk194; + /*0x198*/ u32 unk198; + /*0x19c*/ u32 unk19c; + /*0x1a0*/ u32 unk1a0; + /*0x1a4*/ u32 unk1a4; + /*0x1a8*/ u32 unk1a8; + /*0x1ac*/ u32 unk1ac; + /*0x1b0*/ u32 unk1b0; + /*0x1b4*/ u32 unk1b4; + /*0x1b8*/ u32 unk1b8; + /*0x1bc*/ u32 unk1bc; + /*0x1c0*/ u32 unk1c0; + /*0x1c4*/ u32 unk1c4; + /*0x1c8*/ u32 unk1c8; + /*0x1cc*/ u32 unk1cc; + /*0x1d0*/ u32 unk1d0; + /*0x1d4*/ u32 unk1d4; + /*0x1d8*/ u32 unk1d8; + /*0x1dc*/ u32 unk1dc; + /*0x1e0*/ u32 unk1e0; + /*0x1e4*/ u32 unk1e4; + /*0x1e8*/ u32 unk1e8; + /*0x1ec*/ u32 unk1ec; + /*0x1f0*/ u32 unk1f0; + /*0x1f4*/ u32 unk1f4; + /*0x1f8*/ u32 unk1f8; + /*0x1fc*/ u32 unk1fc; + /*0x200*/ u32 unk200; + /*0x204*/ u32 unk204; + /*0x208*/ u32 unk208; + /*0x20c*/ u32 unk20c; + /*0x210*/ u32 unk210; + /*0x214*/ u32 unk214; + /*0x218*/ u32 unk218; + /*0x21c*/ u32 unk21c; + /*0x220*/ u32 unk220; + /*0x224*/ u32 unk224; + /*0x228*/ u32 unk228; + /*0x22c*/ u32 unk22c; + /*0x230*/ u32 unk230; + /*0x234*/ u32 unk234; + /*0x238*/ u32 unk238; + /*0x23c*/ u32 unk23c; + /*0x240*/ u32 unk240; + /*0x244*/ u32 unk244; + /*0x248*/ u32 unk248; + /*0x24c*/ u32 unk24c; + /*0x250*/ u32 unk250; + /*0x254*/ u32 unk254; + /*0x258*/ u32 unk258; + /*0x25c*/ u32 unk25c; + /*0x260*/ u32 unk260; + /*0x264*/ u32 unk264; + /*0x268*/ u32 unk268; + /*0x26c*/ u32 unk26c; + /*0x270*/ u32 unk270; + /*0x274*/ u32 unk274; + /*0x278*/ u32 unk278; + /*0x27c*/ u32 unk27c; + /*0x280*/ u32 unk280; + /*0x284*/ u32 unk284; + /*0x288*/ u32 unk288; + /*0x28c*/ u32 unk28c; + /*0x290*/ u32 unk290; + /*0x294*/ u32 unk294; + /*0x298*/ u32 unk298; + /*0x29c*/ u32 unk29c; + /*0x2a0*/ u32 unk2a0; + /*0x2a4*/ u32 unk2a4; + /*0x2a8*/ u32 unk2a8; + /*0x2ac*/ u32 unk2ac; + /*0x2b0*/ u32 unk2b0; + /*0x2b4*/ u32 unk2b4; + /*0x2b8*/ u32 unk2b8; + /*0x2bc*/ u32 unk2bc; + /*0x2c0*/ u32 unk2c0; + /*0x2c4*/ u32 unk2c4; + /*0x2c8*/ u32 unk2c8; +}; + #endif