pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-18 23:42:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixing peach dash

Browse Source
This commit is contained in:
Ethan Roseman 2021-02-03 21:50:11 +09:00
parent 7cf7b16795
commit 56cd871a00
16 changed files with 261 additions and 695 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

638
asm/data/battle/star/peach_dash_79DE50.data.s
View File

File diff suppressed because one or more lines are too long

2
asm/data/code_1422A0.data.s
View File

@ -99,7 +99,7 @@ glabel D_8024F114
.word 0x1600000C, 0x00140128, 0x00C80000, func_80243568, 0x00000000, 0xFF000000, 0x00000001, 0x40000000, 0x8026F900, 0x18000000, 0x008A0128, 0x003F0000, pause_tutorial_draw_contents, 0x00000000, 0x16000000, 0x00000002, 0x00000000, 0x8026F970, 0x17000014, 0x00A40100, 0x00200000, pause_textbox_draw_contents, 0x00000000, 0x16000000, D_80147474, 0x00000000, 0x8026F938, 0x2C000000, 0x00000140, 0x00F00000, func_802434DC, 0x00000000, 0xFF000000, 0x00000001, 0x00000000, 0x8026F900, 0x00000000, 0x00000000, 0x00000000
glabel D_8024F1B0
.word func_80241FE8_D3C5B8, func_80242014_8B2084, 0x80242040, func_8024206C_83386C, 0x80242098, 0x802420C4, 0x00010203, 0x04050000
.word func_80241FE8_D3C5B8, func_80242014_8B2084, func_80242040_8B20B0, func_8024206C_83386C, 0x80242098, 0x802420C4, 0x00010203, 0x04050000
glabel D_8024F1D0
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00

23
asm/data/code_3239B0.data.s
View File

@ -6,10 +6,25 @@ glabel D_802BFE60_3239B0
.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x01, 0x80, 0x2B, 0xD2, 0x9C, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
glabel D_802BFE7C_3239CC
.word 0x802BFF30, 0x00000043, 0x00000001, func_802BD2D4_320E24, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BE724_322274, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BF4F0_323040, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BFBA0_3236F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x802BFF30, 0x00000043, 0x00000001, func_802BD2D4_320E24, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BE724_322274, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BF4F0_323040, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BFBA0_3236F0
glabel D_802BFEF0_323A40
.double 0.8
glabel D_802BFEE0
.word 0x00000002
glabel D_802BFEF8_323A48
glabel D_802BFEE4
.word 0x00000000
glabel D_802BFEE8
.word 0x00000001
glabel D_802BFEEC
.word 0x00000000
glabel D_802BFEF0
.byte 0x3F, 0xE9, 0x99, 0x99
glabel D_802BFEF4
.word 0x9999999A
glabel D_802BFEF8
.double 1.8

8
asm/data/si.data.s
View File

@ -18,4 +18,10 @@ glabel D_802D9D34
.word 0x00000043, 0x00000001, func_802D5B10, 0x00000002, 0x00000000, 0x00000001, 0x00000000
glabel D_802D9D50
.word 0x00000043, 0x00000001, func_802D7BA4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0xFEFE00FF, 0x00000000, 0x00000000, 0x00000000
.word 0x00000043, 0x00000001, func_802D7BA4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
glabel D_802D9D70
.byte 0xFE
glabel D_802D9D71
.byte 0xFE, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

6
asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1000_79D8A0.s generated
View File

@ -10,16 +10,16 @@ glabel func_802A1000_79D8A0
/* 79D8B4 802A1014 AFB00018 */ sw $s0, 0x18($sp)
/* 79D8B8 802A1018 8E30000C */ lw $s0, 0xc($s1)
/* 79D8BC 802A101C 8E050000 */ lw $a1, ($s0)
/* 79D8C0 802A1020 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79D8C0 802A1020 0C0B1EAF */ jal get_variable
/* 79D8C4 802A1024 26100004 */ addiu $s0, $s0, 4
/* 79D8C8 802A1028 8E050000 */ lw $a1, ($s0)
/* 79D8CC 802A102C 26100004 */ addiu $s0, $s0, 4
/* 79D8D0 802A1030 0220202D */ daddu $a0, $s1, $zero
/* 79D8D4 802A1034 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79D8D4 802A1034 0C0B1EAF */ jal get_variable
/* 79D8D8 802A1038 0040902D */ daddu $s2, $v0, $zero
/* 79D8DC 802A103C 0220202D */ daddu $a0, $s1, $zero
/* 79D8E0 802A1040 8E050000 */ lw $a1, ($s0)
/* 79D8E4 802A1044 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79D8E4 802A1044 0C0B1EAF */ jal get_variable
/* 79D8E8 802A1048 0040802D */ daddu $s0, $v0, $zero
/* 79D8EC 802A104C 44921000 */ mtc1 $s2, $f2
/* 79D8F0 802A1050 00000000 */ nop

6
asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A10AC_79D94C.s generated
View File

@ -10,16 +10,16 @@ glabel func_802A10AC_79D94C
/* 79D960 802A10C0 AFB00020 */ sw $s0, 0x20($sp)
/* 79D964 802A10C4 8E30000C */ lw $s0, 0xc($s1)
/* 79D968 802A10C8 8E050000 */ lw $a1, ($s0)
/* 79D96C 802A10CC 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79D96C 802A10CC 0C0B1EAF */ jal get_variable
/* 79D970 802A10D0 26100004 */ addiu $s0, $s0, 4
/* 79D974 802A10D4 8E050000 */ lw $a1, ($s0)
/* 79D978 802A10D8 26100004 */ addiu $s0, $s0, 4
/* 79D97C 802A10DC 0220202D */ daddu $a0, $s1, $zero
/* 79D980 802A10E0 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79D980 802A10E0 0C0B1EAF */ jal get_variable
/* 79D984 802A10E4 0040902D */ daddu $s2, $v0, $zero
/* 79D988 802A10E8 0220202D */ daddu $a0, $s1, $zero
/* 79D98C 802A10EC 8E050000 */ lw $a1, ($s0)
/* 79D990 802A10F0 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79D990 802A10F0 0C0B1EAF */ jal get_variable
/* 79D994 802A10F4 0040802D */ daddu $s0, $v0, $zero
/* 79D998 802A10F8 24040005 */ addiu $a0, $zero, 5
/* 79D99C 802A10FC 44921000 */ mtc1 $s2, $f2

6
asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A116C_79DA0C.s generated
View File

@ -10,16 +10,16 @@ glabel func_802A116C_79DA0C
/* 79DA20 802A1180 AFB00018 */ sw $s0, 0x18($sp)
/* 79DA24 802A1184 8E30000C */ lw $s0, 0xc($s1)
/* 79DA28 802A1188 8E050000 */ lw $a1, ($s0)
/* 79DA2C 802A118C 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79DA2C 802A118C 0C0B1EAF */ jal get_variable
/* 79DA30 802A1190 26100004 */ addiu $s0, $s0, 4
/* 79DA34 802A1194 8E050000 */ lw $a1, ($s0)
/* 79DA38 802A1198 26100004 */ addiu $s0, $s0, 4
/* 79DA3C 802A119C 0220202D */ daddu $a0, $s1, $zero
/* 79DA40 802A11A0 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79DA40 802A11A0 0C0B1EAF */ jal get_variable
/* 79DA44 802A11A4 0040902D */ daddu $s2, $v0, $zero
/* 79DA48 802A11A8 0220202D */ daddu $a0, $s1, $zero
/* 79DA4C 802A11AC 8E050000 */ lw $a1, ($s0)
/* 79DA50 802A11B0 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79DA50 802A11B0 0C0B1EAF */ jal get_variable
/* 79DA54 802A11B4 0040802D */ daddu $s0, $v0, $zero
/* 79DA58 802A11B8 44921000 */ mtc1 $s2, $f2
/* 79DA5C 802A11BC 00000000 */ nop

6
asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1218_79DAB8.s generated
View File

@ -10,16 +10,16 @@ glabel func_802A1218_79DAB8
/* 79DACC 802A122C AFB00028 */ sw $s0, 0x28($sp)
/* 79DAD0 802A1230 8E30000C */ lw $s0, 0xc($s1)
/* 79DAD4 802A1234 8E050000 */ lw $a1, ($s0)
/* 79DAD8 802A1238 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79DAD8 802A1238 0C0B1EAF */ jal get_variable
/* 79DADC 802A123C 26100004 */ addiu $s0, $s0, 4
/* 79DAE0 802A1240 8E050000 */ lw $a1, ($s0)
/* 79DAE4 802A1244 26100004 */ addiu $s0, $s0, 4
/* 79DAE8 802A1248 0220202D */ daddu $a0, $s1, $zero
/* 79DAEC 802A124C 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79DAEC 802A124C 0C0B1EAF */ jal get_variable
/* 79DAF0 802A1250 0040902D */ daddu $s2, $v0, $zero
/* 79DAF4 802A1254 0220202D */ daddu $a0, $s1, $zero
/* 79DAF8 802A1258 8E050000 */ lw $a1, ($s0)
/* 79DAFC 802A125C 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79DAFC 802A125C 0C0B1EAF */ jal get_variable
/* 79DB00 802A1260 0040802D */ daddu $s0, $v0, $zero
/* 79DB04 802A1264 24040004 */ addiu $a0, $zero, 4
/* 79DB08 802A1268 44922000 */ mtc1 $s2, $f4

2
asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1494_79DD34.s generated
View File

@ -5,7 +5,7 @@ glabel func_802A1494_79DD34
/* 79DD34 802A1494 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 79DD38 802A1498 AFBF0010 */ sw $ra, 0x10($sp)
/* 79DD3C 802A149C 8C82000C */ lw $v0, 0xc($a0)
/* 79DD40 802A14A0 0C0B1EAF */ jal func_802C7ABC_7C435C
/* 79DD40 802A14A0 0C0B1EAF */ jal get_variable
/* 79DD44 802A14A4 8C450000 */ lw $a1, ($v0)
/* 79DD48 802A14A8 3C058011 */ lui $a1, %hi(gPlayerData+0x12)
/* 79DD4C 802A14AC 80A5F2A2 */ lb $a1, %lo(gPlayerData+0x12)($a1)

4
asm/nonmatchings/code_16F740/switch_order.s generated
View File

@ -11,8 +11,8 @@ glabel switch_order
/* 172210 80243930 2402FFFF */ addiu $v0, $zero, -1
/* 172214 80243934 3C050042 */ lui $a1, 0x42
/* 172218 80243938 24A519F0 */ addiu $a1, $a1, 0x19f0
/* 17221C 8024393C 3C06802A */ lui $a2, %hi(func_802A1000)
/* 172220 80243940 24C61000 */ addiu $a2, $a2, %lo(func_802A1000)
/* 17221C 8024393C 3C06802A */ lui $a2, %hi(func_802A1000_752450)
/* 172220 80243940 24C61000 */ addiu $a2, $a2, %lo(func_802A1000_752450)
/* 172224 80243944 AFBF0018 */ sw $ra, 0x18($sp)
/* 172228 80243948 AFB10014 */ sw $s1, 0x14($sp)
/* 17222C 8024394C A202004D */ sb $v0, 0x4d($s0)

4
asm/nonmatchings/world/partner/lakilester/func_802BD2D4_320E24.s generated
View File

@ -195,8 +195,8 @@ glabel func_802BD2D4_320E24
/* 3210F8 802BD5A8 8E020000 */ lw $v0, ($s0)
/* 3210FC 802BD5AC E6200034 */ swc1 $f0, 0x34($s1)
/* 321100 802BD5B0 C4400014 */ lwc1 $f0, 0x14($v0)
/* 321104 802BD5B4 3C01802C */ lui $at, %hi(D_802BFEF0_323A40)
/* 321108 802BD5B8 D422FEF0 */ ldc1 $f2, %lo(D_802BFEF0_323A40)($at)
/* 321104 802BD5B4 3C01802C */ lui $at, %hi(D_802BFEF0)
/* 321108 802BD5B8 D422FEF0 */ ldc1 $f2, %lo(D_802BFEF0)($at)
/* 32110C 802BD5BC 46000021 */ cvt.d.s $f0, $f0
/* 321110 802BD5C0 46220000 */ add.d $f0, $f0, $f2
/* 321114 802BD5C4 3C014220 */ lui $at, 0x4220

4
asm/nonmatchings/world/partner/lakilester/func_802BDDD8_321928.s generated
View File

@ -562,8 +562,8 @@ glabel func_802BDDD8_321928
/* 322188 802BE638 24420001 */ addiu $v0, $v0, 1
/* 32218C 802BE63C A68200C0 */ sh $v0, 0xc0($s4)
/* 322190 802BE640 C6400014 */ lwc1 $f0, 0x14($s2)
/* 322194 802BE644 3C01802C */ lui $at, %hi(D_802BFEF8_323A48)
/* 322198 802BE648 D422FEF8 */ ldc1 $f2, %lo(D_802BFEF8_323A48)($at)
/* 322194 802BE644 3C01802C */ lui $at, %hi(D_802BFEF8)
/* 322198 802BE648 D422FEF8 */ ldc1 $f2, %lo(D_802BFEF8)($at)
/* 32219C 802BE64C 46000021 */ cvt.d.s $f0, $f0
/* 3221A0 802BE650 46220000 */ add.d $f0, $f0, $f2
/* 3221A4 802BE654 A6430084 */ sh $v1, 0x84($s2)

2
src/os/code_3b750_len_20.c
View File

@ -1,5 +1,7 @@
#include "nu/nusys.h"
// TODO make this better if we ever update our nusys header
// This should take NUScTask*, not void*
void nuGfxSwapCfb(void* task) {
osViSwapBuffer(((NUScTask*)task)->framebuffer);
}

1
tools/splat.yaml
View File

@ -2730,6 +2730,7 @@ segments:
files:
- [0x79D8A0, c]
- [0x79DE50, data]
- [0x79EF40, bin] # todo identify
- name: world/script_api/
ld_name: world_script_api
type: code

24
undefined_funcs_auto.txt
View File

@ -1,39 +1,15 @@
pause_set_cursor_opacity = 0x80242BA0;
pause_cleanup = 0x80244708;
ForceCloseMessageBox = 0x802513F0;
func_802AB330 = 0x802AB330;
func_802AB338 = 0x802AB338;
create_shadow_callback = 0x802E0D90;
func_802B2000 = 0x802B2000;
func_802B203C = 0x802B203C;
func_802DDA60 = 0x802DDA60;
func_802C3EE4 = 0x802C3EE4;
func_802DD8F8 = 0x802DD8F8;
func_802B20B4 = 0x802B20B4;
func_802409F4 = 0x802409F4;
func_802448E0 = 0x802448E0;
func_802431A0 = 0x802431A0;
func_80244BC4 = 0x80244BC4;
func_80244B00 = 0x80244B00;
func_802DE0EC = 0x802DE0EC;
func_802DE5E8 = 0x802DE5E8;
func_802DE2AC = 0x802DE2AC;
func_802DDA8C = 0x802DDA8C;
func_802DE5C8 = 0x802DE5C8;
func_802DDEC4 = 0x802DDEC4;
func_802DE3D8 = 0x802DE3D8;
func_802DE894 = 0x802DE894;
func_802DEA40 = 0x802DEA40;
func_802DEA6C = 0x802DEA6C;
func_802B2078 = 0x802B2078;
func_80241190 = 0x80241190;
func_802B71C8 = 0x802B71C8;
func_802DDEE4 = 0x802DDEE4;
func_802DDFF8 = 0x802DDFF8;
func_802DE9D8 = 0x802DE9D8;
func_802AA0B8 = 0x802AA0B8;
func_802A9B44 = 0x802A9B44;
func_802A8180 = 0x802A8180;
func_802A9AE8 = 0x802A9AE8;
func_802AA640 = 0x802AA640;
func_802AA05C = 0x802AA05C;

220
undefined_syms_auto.txt
View File

@ -96,6 +96,13 @@ func_802BE070 = 0x802BE070;
gStaticScriptCounter = 0x802D9CA0;
D_802D9CA4 = 0x802D9CA4;
gGlobalTimeSpace = 0x802D9CA8;
gBattleMeshAnimationList = 0x802DADB0;
gWorldMeshAnimationList = 0x802DADF0;
gCurrentMeshAnimationListPtr = 0x802DAE30;
gWorldMapFlags = 0x802DBC70;
gWorldMapVars = 0x802DBCA8;
gBattleMapVars = 0x802DBCE8;
gBattleMapFlags = 0x802DBD34;
nuGfxZBuffer = 0x8009A5DC;
nuGfxDisplay = 0x8009A5F8;
gGameState = 0x8009A600;
@ -181,6 +188,16 @@ gItemMenuCurrentScrollPos = 0x802705D4;
gItemMenuTargetScrollPos = 0x802705D8;
gItemMenuLevel = 0x802705E0;
gItemMenuCurrentTab = 0x802705E4;
gMapFlags = 0x802DA480;
gMapVars = 0x802DA484;
gNumScripts = 0x802DA488;
gWorldScriptList = 0x802DA490;
gBattleScriptList = 0x802DA690;
gCurrentScriptListPtr = 0x802DA890;
gScriptIndexList = 0x802DA898;
gScriptIdList = 0x802DAA98;
gScriptListCount = 0x802DAC98;
gCurrentPrintContext = 0x802DB260;
gRandSeed = 0x80074410;
D_800A095D = 0x800A095D;
D_A4000768 = 0xA4000768;
@ -307,8 +324,6 @@ D_800A0921 = 0x800A0921;
D_800A0922 = 0x800A0922;
D_800A0920 = 0x800A0920;
D_800A0924 = 0x800A0924;
D_802D9D70 = 0x802D9D70;
D_802D9D71 = 0x802D9D71;
D_800A0932 = 0x800A0932;
D_800A0931 = 0x800A0931;
D_800A0930 = 0x800A0930;
@ -688,6 +703,7 @@ D_8010EF9C = 0x8010EF9C;
D_8010EF9E = 0x8010EF9E;
D_8010EF92 = 0x8010EF92;
D_8010BF60 = 0x8010BF60;
D_802C0000 = 0x802C0000;
D_8010CD20 = 0x8010CD20;
D_8010C040 = 0x8010C040;
D_8010CFEC = 0x8010CFEC;
@ -889,6 +905,7 @@ D_80153370 = 0x80153370;
D_8015336E = 0x8015336E;
D_80153380 = 0x80153380;
D_801533A8 = 0x801533A8;
D_802B9E00 = 0x802B9E00;
D_801533AC = 0x801533AC;
D_801533B0 = 0x801533B0;
D_801533A0 = 0x801533A0;
@ -1084,9 +1101,63 @@ D_801599B8 = 0x801599B8;
D_80159AD0 = 0x80159AD0;
D_80159AD4 = 0x80159AD4;
D_802D9D80 = 0x802D9D80;
D_802DACA0 = 0x802DACA0;
D_802DADA0 = 0x802DADA0;
D_802DADA4 = 0x802DADA4;
D_800B22A0 = 0x800B22A0;
D_800B2210 = 0x800B2210;
D_800B225C = 0x800B225C;
D_802DAE40 = 0x802DAE40;
D_802DAE44 = 0x802DAE44;
D_802DB264 = 0x802DB264;
D_802DAE54 = 0x802DAE54;
D_802DAE50 = 0x802DAE50;
D_802DB268 = 0x802DB268;
D_802DB5B0 = 0x802DB5B0;
D_802DB7C0 = 0x802DB7C0;
D_802DB6C0 = 0x802DB6C0;
D_802DB5C0 = 0x802DB5C0;
D_802DB7D8 = 0x802DB7D8;
D_802DB800 = 0x802DB800;
D_802DB7D0 = 0x802DB7D0;
D_802DB830 = 0x802DB830;
D_802DBB60 = 0x802DBB60;
D_802DBB68 = 0x802DBB68;
D_802DFE44 = 0x802DFE44;
D_802DFE9C = 0x802DFE9C;
D_802DFE48 = 0x802DFE48;
D_802DF540 = 0x802DF540;
D_802DFEA0 = 0x802DFEA0;
D_802DF57C = 0x802DF57C;
D_802DFEAC = 0x802DFEAC;
D_802DF580 = 0x802DF580;
D_802DF548 = 0x802DF548;
D_802DF524 = 0x802DF524;
D_802DF578 = 0x802DF578;
D_802DF588 = 0x802DF588;
D_802DF958 = 0x802DF958;
D_802DF5B0 = 0x802DF5B0;
D_802DFA48 = 0x802DFA48;
D_802DF58C = 0x802DF58C;
D_802DF590 = 0x802DF590;
D_802DF530 = 0x802DF530;
D_802DFA4C = 0x802DFA4C;
D_802DFA58 = 0x802DFA58;
D_802E0C64 = 0x802E0C64;
D_802E0C68 = 0x802E0C68;
D_802DFEB0 = 0x802DFEB0;
D_802DFEB8 = 0x802DFEB8;
D_802E004C = 0x802E004C;
D_802E0C20 = 0x802E0C20;
D_802E0050 = 0x802E0050;
D_802E0C60 = 0x802E0C60;
D_802E0C14 = 0x802E0C14;
D_802E0090 = 0x802E0090;
D_802E0C58 = 0x802E0C58;
D_802E0C5C = 0x802E0C5C;
D_802E0C70 = 0x802E0C70;
D_802E0080 = 0x802E0080;
D_802E0C10 = 0x802E0C10;
D_802EB390 = 0x802EB390;
D_802EB394 = 0x802EB394;
D_802EB39C = 0x802EB39C;
@ -1447,14 +1518,18 @@ D_802BE300 = 0x802BE300;
D_802BE30C = 0x802BE30C;
D_802BE304 = 0x802BE304;
D_8010EBB1 = 0x8010EBB1;
D_802BFEE4 = 0x802BFEE4;
D_802BFEE0 = 0x802BFEE0;
D_802BFEF8 = 0x802BFEF8;
D_802BFEFC = 0x802BFEFC;
D_802BFEF0 = 0x802BFEF0;
D_802BFEE8 = 0x802BFEE8;
D_802BFEF4 = 0x802BFEF4;
D_802BFEEC = 0x802BFEEC;
D_802BFF00 = 0x802BFF00;
D_802BFF04 = 0x802BFF04;
D_802BFF08 = 0x802BFF08;
D_802BFF18 = 0x802BFF18;
D_802BFF0C = 0x802BFF0C;
D_802BFF10 = 0x802BFF10;
D_802BFF1C = 0x802BFF1C;
D_802BFF20 = 0x802BFF20;
D_802BFF24 = 0x802BFF24;
D_802BFF28 = 0x802BFF28;
D_802BFF14 = 0x802BFF14;
D_802BE0C4 = 0x802BE0C4;
D_802BE0C0 = 0x802BE0C0;
D_802BE0E4 = 0x802BE0E4;
@ -2225,36 +2300,139 @@ D_E0126C38 = 0xE0126C38;
D_E0126BC0 = 0xE0126BC0;
D_E01284B0 = 0xE01284B0;
D_E0128480 = 0xE0128480;
D_802AD006 = 0x802AD006;
D_802AD008 = 0x802AD008;
D_802AD000 = 0x802AD000;
D_802AD068 = 0x802AD068;
D_802AD001 = 0x802AD001;
D_802AD0AC = 0x802AD0AC;
D_802AD028 = 0x802AD028;
D_802AD010 = 0x802AD010;
D_802AD040 = 0x802AD040;
D_802AD044 = 0x802AD044;
D_802AD048 = 0x802AD048;
D_802AD04C = 0x802AD04C;
D_802AD05C = 0x802AD05C;
D_802AD050 = 0x802AD050;
D_802AD054 = 0x802AD054;
D_802AD058 = 0x802AD058;
D_802AD060 = 0x802AD060;
D_802AD0B3 = 0x802AD0B3;
D_802AD064 = 0x802AD064;
D_802AD004 = 0x802AD004;
D_802AD070 = 0x802AD070;
D_802AD06B = 0x802AD06B;
D_802AD069 = 0x802AD069;
D_802AD06A = 0x802AD06A;
D_802AD078 = 0x802AD078;
D_80292C00 = 0x80292C00;
D_80292BD8 = 0x80292BD8;
D_80292CF4 = 0x80292CF4;
D_80292C50 = 0x80292C50;
D_80292C7C = 0x80292C7C;
D_80292CB8 = 0x80292CB8;
D_802AD100 = 0x802AD100;
D_802AD00A = 0x802AD00A;
D_802AD06C = 0x802AD06C;
D_802AD002 = 0x802AD002;
D_802AD003 = 0x802AD003;
D_802AD0D0 = 0x802AD0D0;
D_802AD0EB = 0x802AD0EB;
jtbl_802AB770 = 0x802AB770;
D_802AB7F0 = 0x802AB7F0;
D_802AB7F8 = 0x802AB7F8;
D_802AB800 = 0x802AB800;
D_802AD090 = 0x802AD090;
D_802AD104 = 0x802AD104;
D_802AD4A8 = 0x802AD4A8;
D_802AD4A4 = 0x802AD4A4;
D_802AD108 = 0x802AD108;
D_802AD10C = 0x802AD10C;
D_802AD109 = 0x802AD109;
D_802AD10A = 0x802AD10A;
D_802AD10E = 0x802AD10E;
D_802AD10D = 0x802AD10D;
D_802AD116 = 0x802AD116;
D_802AD10F = 0x802AD10F;
D_802AD110 = 0x802AD110;
D_802AD112 = 0x802AD112;
D_802AD600 = 0x802AD600;
D_802AD4A0 = 0x802AD4A0;
D_802AD128 = 0x802AD128;
D_802AD118 = 0x802AD118;
D_802AD11C = 0x802AD11C;
D_802AD120 = 0x802AD120;
D_802AD188 = 0x802AD188;
D_802AD190 = 0x802AD190;
D_802AD114 = 0x802AD114;
jtbl_802AB808 = 0x802AB808;
D_802AD1F0 = 0x802AD1F0;
D_802AD1F2 = 0x802AD1F2;
D_802AD1F8 = 0x802AD1F8;
D_802AD5D0 = 0x802AD5D0;
D_802AD320 = 0x802AD320;
D_802AD440 = 0x802AD440;
D_802AD260 = 0x802AD260;
D_80108974 = 0x80108974;
D_802AD3E0 = 0x802AD3E0;
D_80107638 = 0x80107638;
D_80107664 = 0x80107664;
D_80107690 = 0x80107690;
D_801076E8 = 0x801076E8;
D_80107714 = 0x80107714;
D_80107740 = 0x80107740;
D_802AD4A7 = 0x802AD4A7;
D_802AD510 = 0x802AD510;
D_802AD258 = 0x802AD258;
D_802AD5E8 = 0x802AD5E8;
D_802AB340 = 0x802AB340;
D_802AD10B = 0x802AD10B;
jtbl_802AB8C0 = 0x802AB8C0;
D_802AD2C0 = 0x802AD2C0;
D_802AD380 = 0x802AD380;
D_801076BC = 0x801076BC;
D_8010776C = 0x8010776C;
jtbl_802AB970 = 0x802AB970;
D_802AD570 = 0x802AD570;
D_802AB344 = 0x802AB344;
D_802AD608 = 0x802AD608;
D_802AD673 = 0x802AD673;
D_802AD66C = 0x802AD66C;
D_802AD604 = 0x802AD604;
D_802AD605 = 0x802AD605;
D_802AD606 = 0x802AD606;
D_802AD60A = 0x802AD60A;
D_802AD609 = 0x802AD609;
D_802AD624 = 0x802AD624;
D_802AD60B = 0x802AD60B;
D_802AD60C = 0x802AD60C;
D_802AD60E = 0x802AD60E;
D_802AD607 = 0x802AD607;
D_802AD6D4 = 0x802AD6D4;
D_802AD628 = 0x802AD628;
D_802AD618 = 0x802AD618;
D_802AD61C = 0x802AD61C;
D_802AD620 = 0x802AD620;
D_802AD614 = 0x802AD614;
jtbl_802AB9F0 = 0x802AB9F0;
D_802AD63C = 0x802AD63C;
D_802AD63E = 0x802AD63E;
D_802AD640 = 0x802AD640;
D_802AD66F = 0x802AD66F;
D_802AD690 = 0x802AD690;
D_802AD6AA = 0x802AD6AA;
D_802AD610 = 0x802AD610;
D_802AD612 = 0x802AD612;
jtbl_802ABAA8 = 0x802ABAA8;
D_802AD678 = 0x802AD678;
D_802AD658 = 0x802AD658;
jtbl_802ABB58 = 0x802ABB58;
D_802AD6C0 = 0x802AD6C0;
jtbl_802ABBD8 = 0x802ABBD8;
D_802AB478 = 0x802AB478;
D_802AD0B8 = 0x802AD0B8;
D_802AB4DC = 0x802AB4DC;
D_802AD0E8 = 0x802AD0E8;
D_802AB47C = 0x802AB47C;
D_802AB388 = 0x802AB388;
D_802AB4C8 = 0x802AB4C8;
@ -2263,26 +2441,47 @@ D_802AB348 = 0x802AB348;
D_802AB368 = 0x802AB368;
D_802AB390 = 0x802AB390;
D_802AB4E0 = 0x802AB4E0;
D_802AD0A8 = 0x802AD0A8;
D_802AD0B0 = 0x802AD0B0;
D_802ACC60 = 0x802ACC60;
D_802ACC6C = 0x802ACC6C;
D_802AD0BB = 0x802AD0BB;
D_802AB513 = 0x802AB513;
D_802AB4F0 = 0x802AB4F0;
D_8008F9C0 = 0x8008F9C0;
D_8008FA4C = 0x8008FA4C;
D_8008FA60 = 0x8008FA60;
D_802AD4B0 = 0x802AD4B0;
D_802AD4B3 = 0x802AD4B3;
D_802AD603 = 0x802AD603;
D_802ACCD0 = 0x802ACCD0;
D_802ACFEC = 0x802ACFEC;
D_802ACFF0 = 0x802ACFF0;
D_802ACFFC = 0x802ACFFC;
D_802ACFFD = 0x802ACFFD;
D_802AB398 = 0x802AB398;
D_802ACFE8 = 0x802ACFE8;
D_8008F2BC = 0x8008F2BC;
D_8008F0F0 = 0x8008F0F0;
D_802AB4A4 = 0x802AB4A4;
D_802AB3F8 = 0x802AB3F8;
D_802AB438 = 0x802AB438;
D_802AD6A8 = 0x802AD6A8;
D_802AB480 = 0x802AB480;
D_802AB490 = 0x802AB490;
D_802AB488 = 0x802AB488;
D_802AD670 = 0x802AD670;
D_802AD67B = 0x802AD67B;
D_802ACFF4 = 0x802ACFF4;
D_802AC090 = 0x802AC090;
jtbl_802AC3C8 = 0x802AC3C8;
D_802AB590 = 0x802AB590;
D_802AD0BC = 0x802AD0BC;
D_802AD0C0 = 0x802AD0C0;
D_802AB520 = 0x802AB520;
D_802AB558 = 0x802AB558;
D_8008F9B0 = 0x8008F9B0;
D_802AD4B2 = 0x802AD4B2;
D_802AB4B4 = 0x802AB4B4;
D_802AC880 = 0x802AC880;
jtbl_802ACBB0 = 0x802ACBB0;
@ -2295,6 +2494,9 @@ D_802AB72C = 0x802AB72C;
D_802AB734 = 0x802AB734;
D_8008FA8C = 0x8008FA8C;
D_802ACC38 = 0x802ACC38;
D_802ACC64 = 0x802ACC64;
D_802ACC68 = 0x802ACC68;
D_802ACC70 = 0x802ACC70;
D_8007FF20 = 0x8007FF20;
D_80080208 = 0x80080208;
D_802AB738 = 0x802AB738;