pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Splat update with symbol fixes

Browse Source
This commit is contained in:
Ethan Roseman 2021-02-08 19:45:19 +09:00
parent aae3b1a085
commit e578b7d90a
17 changed files with 37 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/nonmatchings/code_10400_len_d30/func_80035704.s generated
View File

@ -116,9 +116,9 @@ glabel L80035814_10C14
/* 10CA0 800358A0 8E040000 */ lw $a0, ($s0) /* 10CA0 800358A0 8E040000 */ lw $a0, ($s0)
/* 10CA4 800358A4 84830086 */ lh $v1, 0x86($a0) /* 10CA4 800358A4 84830086 */ lh $v1, 0x86($a0)
/* 10CA8 800358A8 00031900 */ sll $v1, $v1, 4 /* 10CA8 800358A8 00031900 */ sll $v1, $v1, 4
/* 10CAC 800358AC 3C058009 */ lui $a1, %hi(D_800934F4) /* 10CAC 800358AC 3C058009 */ lui $a1, %hi(gAreas+0x4)
/* 10CB0 800358B0 00A32821 */ addu $a1, $a1, $v1 /* 10CB0 800358B0 00A32821 */ addu $a1, $a1, $v1
/* 10CB4 800358B4 8CA534F4 */ lw $a1, %lo(D_800934F4)($a1) /* 10CB4 800358B4 8CA534F4 */ lw $a1, %lo(gAreas+0x4)($a1)
/* 10CB8 800358B8 8483008C */ lh $v1, 0x8c($a0) /* 10CB8 800358B8 8483008C */ lh $v1, 0x8c($a0)
/* 10CBC 800358BC 0040902D */ daddu $s2, $v0, $zero /* 10CBC 800358BC 0040902D */ daddu $s2, $v0, $zero
/* 10CC0 800358C0 A0800070 */ sb $zero, 0x70($a0) /* 10CC0 800358C0 A0800070 */ sb $zero, 0x70($a0)

4
asm/nonmatchings/code_181810/LoadBattleDmaData.s generated
View File

@ -12,9 +12,9 @@ glabel LoadBattleDmaData
/* 181F20 80253640 9084C4EA */ lbu $a0, %lo(gBattleStatus+0x47A)($a0) /* 181F20 80253640 9084C4EA */ lbu $a0, %lo(gBattleStatus+0x47A)($a0)
/* 181F24 80253644 00621821 */ addu $v1, $v1, $v0 /* 181F24 80253644 00621821 */ addu $v1, $v1, $v0
/* 181F28 80253648 00042140 */ sll $a0, $a0, 5 /* 181F28 80253648 00042140 */ sll $a0, $a0, 5
/* 181F2C 8025364C 3C028009 */ lui $v0, %hi(D_80095A4C) /* 181F2C 8025364C 3C028009 */ lui $v0, %hi(gBattleAreas+0x1C)
/* 181F30 80253650 00441021 */ addu $v0, $v0, $a0 /* 181F30 80253650 00441021 */ addu $v0, $v0, $a0
/* 181F34 80253654 8C425A4C */ lw $v0, %lo(D_80095A4C)($v0) /* 181F34 80253654 8C425A4C */ lw $v0, %lo(gBattleAreas+0x1C)($v0)
/* 181F38 80253658 00031880 */ sll $v1, $v1, 2 /* 181F38 80253658 00031880 */ sll $v1, $v1, 2
/* 181F3C 8025365C 00431021 */ addu $v0, $v0, $v1 /* 181F3C 8025365C 00431021 */ addu $v0, $v0, $v1
/* 181F40 80253660 5040000E */ beql $v0, $zero, .L8025369C /* 181F40 80253660 5040000E */ beql $v0, $zero, .L8025369C

4
asm/nonmatchings/code_197F40/LoadBattleSection.s generated
View File

@ -7,8 +7,8 @@ glabel LoadBattleSection
/* 1986CC 80269DEC 8C82000C */ lw $v0, 0xc($a0) /* 1986CC 80269DEC 8C82000C */ lw $v0, 0xc($a0)
/* 1986D0 80269DF0 0C0B1EAF */ jal get_variable /* 1986D0 80269DF0 0C0B1EAF */ jal get_variable
/* 1986D4 80269DF4 8C450000 */ lw $a1, ($v0) /* 1986D4 80269DF4 8C450000 */ lw $a1, ($v0)
/* 1986D8 80269DF8 3C038009 */ lui $v1, %hi(D_80095A30) /* 1986D8 80269DF8 3C038009 */ lui $v1, %hi(gBattleAreas)
/* 1986DC 80269DFC 24635A30 */ addiu $v1, $v1, %lo(D_80095A30) /* 1986DC 80269DFC 24635A30 */ addiu $v1, $v1, %lo(gBattleAreas)
/* 1986E0 80269E00 00021140 */ sll $v0, $v0, 5 /* 1986E0 80269E00 00021140 */ sll $v0, $v0, 5
/* 1986E4 80269E04 00431021 */ addu $v0, $v0, $v1 /* 1986E4 80269E04 00431021 */ addu $v0, $v0, $v1
/* 1986E8 80269E08 8C440004 */ lw $a0, 4($v0) /* 1986E8 80269E08 8C440004 */ lw $a0, 4($v0)

4
asm/nonmatchings/code_7B440/func_800E205C.s generated
View File

@ -114,9 +114,9 @@ glabel func_800E205C
/* 7B6B8 800E2208 84C30086 */ lh $v1, 0x86($a2) /* 7B6B8 800E2208 84C30086 */ lh $v1, 0x86($a2)
/* 7B6BC 800E220C 84C2008C */ lh $v0, 0x8c($a2) /* 7B6BC 800E220C 84C2008C */ lh $v0, 0x8c($a2)
/* 7B6C0 800E2210 00031900 */ sll $v1, $v1, 4 /* 7B6C0 800E2210 00031900 */ sll $v1, $v1, 4
/* 7B6C4 800E2214 3C018009 */ lui $at, %hi(D_800934F4) /* 7B6C4 800E2214 3C018009 */ lui $at, %hi(gAreas+0x4)
/* 7B6C8 800E2218 00230821 */ addu $at, $at, $v1 /* 7B6C8 800E2218 00230821 */ addu $at, $at, $v1
/* 7B6CC 800E221C 8C2334F4 */ lw $v1, %lo(D_800934F4)($at) /* 7B6CC 800E221C 8C2334F4 */ lw $v1, %lo(gAreas+0x4)($at)
/* 7B6D0 800E2220 00021140 */ sll $v0, $v0, 5 /* 7B6D0 800E2220 00021140 */ sll $v0, $v0, 5
/* 7B6D4 800E2224 00431021 */ addu $v0, $v0, $v1 /* 7B6D4 800E2224 00431021 */ addu $v0, $v0, $v1
/* 7B6D8 800E2228 8C440004 */ lw $a0, 4($v0) /* 7B6D8 800E2228 8C440004 */ lw $a0, 4($v0)

4
asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s generated
View File

@ -43,9 +43,9 @@ glabel func_80033BC0
/* F058 80033C58 84830086 */ lh $v1, 0x86($a0) /* F058 80033C58 84830086 */ lh $v1, 0x86($a0)
/* F05C 80033C5C 8482008C */ lh $v0, 0x8c($a0) /* F05C 80033C5C 8482008C */ lh $v0, 0x8c($a0)
/* F060 80033C60 00031900 */ sll $v1, $v1, 4 /* F060 80033C60 00031900 */ sll $v1, $v1, 4
/* F064 80033C64 3C018009 */ lui $at, %hi(D_800934F4) /* F064 80033C64 3C018009 */ lui $at, %hi(gAreas+0x4)
/* F068 80033C68 00230821 */ addu $at, $at, $v1 /* F068 80033C68 00230821 */ addu $at, $at, $v1
/* F06C 80033C6C 8C2334F4 */ lw $v1, %lo(D_800934F4)($at) /* F06C 80033C6C 8C2334F4 */ lw $v1, %lo(gAreas+0x4)($at)
/* F070 80033C70 00021140 */ sll $v0, $v0, 5 /* F070 80033C70 00021140 */ sll $v0, $v0, 5
/* F074 80033C74 0C0902AA */ jal func_80240AA8_B5ED58 /* F074 80033C74 0C0902AA */ jal func_80240AA8_B5ED58
/* F078 80033C78 00628821 */ addu $s1, $v1, $v0 /* F078 80033C78 00628821 */ addu $s1, $v1, $v0

4
asm/nonmatchings/code_f270_len_1190/func_80034C3C.s generated
View File

@ -66,9 +66,9 @@ glabel func_80034C3C
/* 10124 80034D24 8E040000 */ lw $a0, ($s0) /* 10124 80034D24 8E040000 */ lw $a0, ($s0)
/* 10128 80034D28 84830086 */ lh $v1, 0x86($a0) /* 10128 80034D28 84830086 */ lh $v1, 0x86($a0)
/* 1012C 80034D2C 00031900 */ sll $v1, $v1, 4 /* 1012C 80034D2C 00031900 */ sll $v1, $v1, 4
/* 10130 80034D30 3C068009 */ lui $a2, %hi(D_800934F4) /* 10130 80034D30 3C068009 */ lui $a2, %hi(gAreas+0x4)
/* 10134 80034D34 00C33021 */ addu $a2, $a2, $v1 /* 10134 80034D34 00C33021 */ addu $a2, $a2, $v1
/* 10138 80034D38 8CC634F4 */ lw $a2, %lo(D_800934F4)($a2) /* 10138 80034D38 8CC634F4 */ lw $a2, %lo(gAreas+0x4)($a2)
/* 1013C 80034D3C 0040902D */ daddu $s2, $v0, $zero /* 1013C 80034D3C 0040902D */ daddu $s2, $v0, $zero
/* 10140 80034D40 A0800070 */ sb $zero, 0x70($a0) /* 10140 80034D40 A0800070 */ sb $zero, 0x70($a0)
/* 10144 80034D44 8484008C */ lh $a0, 0x8c($a0) /* 10144 80034D44 8484008C */ lh $a0, 0x8c($a0)

4
asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s generated
View File

@ -5,8 +5,8 @@ glabel func_80072BDC
/* 4DFDC 80072BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 4DFDC 80072BDC 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 4DFE0 80072BE0 3C02800E */ lui $v0, %hi(gBattleStatus+0x47A) /* 4DFE0 80072BE0 3C02800E */ lui $v0, %hi(gBattleStatus+0x47A)
/* 4DFE4 80072BE4 9042C4EA */ lbu $v0, %lo(gBattleStatus+0x47A)($v0) /* 4DFE4 80072BE4 9042C4EA */ lbu $v0, %lo(gBattleStatus+0x47A)($v0)
/* 4DFE8 80072BE8 3C038009 */ lui $v1, %hi(D_80095A30) /* 4DFE8 80072BE8 3C038009 */ lui $v1, %hi(gBattleAreas)
/* 4DFEC 80072BEC 24635A30 */ addiu $v1, $v1, %lo(D_80095A30) /* 4DFEC 80072BEC 24635A30 */ addiu $v1, $v1, %lo(gBattleAreas)
/* 4DFF0 80072BF0 AFBF0018 */ sw $ra, 0x18($sp) /* 4DFF0 80072BF0 AFBF0018 */ sw $ra, 0x18($sp)
/* 4DFF4 80072BF4 AFB10014 */ sw $s1, 0x14($sp) /* 4DFF4 80072BF4 AFB10014 */ sw $s1, 0x14($sp)
/* 4DFF8 80072BF8 AFB00010 */ sw $s0, 0x10($sp) /* 4DFF8 80072BF8 AFB00010 */ sw $s0, 0x10($sp)

4
asm/nonmatchings/world/world/get_map_IDs_by_name.s generated
View File

@ -47,9 +47,9 @@ glabel get_map_IDs_by_name
/* 36094 8005AC94 26310020 */ addiu $s1, $s1, 0x20 /* 36094 8005AC94 26310020 */ addiu $s1, $s1, 0x20
.L8005AC98: .L8005AC98:
/* 36098 8005AC98 26520010 */ addiu $s2, $s2, 0x10 /* 36098 8005AC98 26520010 */ addiu $s2, $s2, 0x10
/* 3609C 8005AC9C 3C048009 */ lui $a0, %hi(D_800934F4) /* 3609C 8005AC9C 3C048009 */ lui $a0, %hi(gAreas+0x4)
/* 360A0 8005ACA0 00922021 */ addu $a0, $a0, $s2 /* 360A0 8005ACA0 00922021 */ addu $a0, $a0, $s2
/* 360A4 8005ACA4 8C8434F4 */ lw $a0, %lo(D_800934F4)($a0) /* 360A4 8005ACA4 8C8434F4 */ lw $a0, %lo(gAreas+0x4)($a0)
/* 360A8 8005ACA8 3C028009 */ lui $v0, %hi(gAreas) /* 360A8 8005ACA8 3C028009 */ lui $v0, %hi(gAreas)
/* 360AC 8005ACAC 244234F0 */ addiu $v0, $v0, %lo(gAreas) /* 360AC 8005ACAC 244234F0 */ addiu $v0, $v0, %lo(gAreas)
/* 360B0 8005ACB0 1480FFE4 */ bnez $a0, .L8005AC44 /* 360B0 8005ACB0 1480FFE4 */ bnez $a0, .L8005AC44

4
asm/nonmatchings/world/world/load_map_by_IDs.s generated
View File

@ -64,9 +64,9 @@ glabel load_map_by_IDs
/* 35BD4 8005A7D4 AC400144 */ sw $zero, 0x144($v0) /* 35BD4 8005A7D4 AC400144 */ sw $zero, 0x144($v0)
/* 35BD8 8005A7D8 00111400 */ sll $v0, $s1, 0x10 /* 35BD8 8005A7D8 00111400 */ sll $v0, $s1, 0x10
/* 35BDC 8005A7DC 00021303 */ sra $v0, $v0, 0xc /* 35BDC 8005A7DC 00021303 */ sra $v0, $v0, 0xc
/* 35BE0 8005A7E0 3C018009 */ lui $at, %hi(D_800934F4) /* 35BE0 8005A7E0 3C018009 */ lui $at, %hi(gAreas+0x4)
/* 35BE4 8005A7E4 00220821 */ addu $at, $at, $v0 /* 35BE4 8005A7E4 00220821 */ addu $at, $at, $v0
/* 35BE8 8005A7E8 8C2234F4 */ lw $v0, %lo(D_800934F4)($at) /* 35BE8 8005A7E8 8C2234F4 */ lw $v0, %lo(gAreas+0x4)($at)
/* 35BEC 8005A7EC 00031AC3 */ sra $v1, $v1, 0xb /* 35BEC 8005A7EC 00031AC3 */ sra $v1, $v1, 0xb
/* 35BF0 8005A7F0 00439021 */ addu $s2, $v0, $v1 /* 35BF0 8005A7F0 00439021 */ addu $s2, $v0, $v1
/* 35BF4 8005A7F4 8E460000 */ lw $a2, ($s2) /* 35BF4 8005A7F4 8E460000 */ lw $a2, ($s2)

2
src/battle/area_kmr_part_1/goomba.c
View File

@ -292,7 +292,7 @@ Script goomba_dispatch = SCRIPT({
UseIdleAnimation(ActorID_SELF, 1); UseIdleAnimation(ActorID_SELF, 1);
}); });
f32 D_8021A194[] = { f32 D_8021A194_432B34[] = {
0.000000f, 0.017452f, 0.034899f, 0.052336f, 0.069756f, 0.087156f, 0.104528f, 0.121869f, 0.000000f, 0.017452f, 0.034899f, 0.052336f, 0.069756f, 0.087156f, 0.104528f, 0.121869f,
0.139173f, 0.156434f, 0.173648f, 0.190809f, 0.207912f, 0.224951f, 0.241922f, 0.258819f, 0.139173f, 0.156434f, 0.173648f, 0.190809f, 0.207912f, 0.224951f, 0.241922f, 0.258819f,
0.275637f, 0.292372f, 0.309017f, 0.325568f, 0.342020f, 0.358368f, 0.374607f, 0.390731f, 0.275637f, 0.292372f, 0.309017f, 0.325568f, 0.342020f, 0.358368f, 0.374607f, 0.390731f,

4
src/battle/battle.c
View File

@ -368,11 +368,11 @@ BattleArea gBattleAreas[0x30] = {
}; };
// possibly a jump table // possibly a jump table
const s32 jtbl_8009A578_75978[] = { const s32 jtbl_8009A578[] = {
0x80072F38, 0x80072F4C, 0x80072F64, 0x80072F90, 0x80072FA8, 0x00000000, 0x80072F38, 0x80072F4C, 0x80072F64, 0x80072F90, 0x80072FA8, 0x00000000,
}; };
// possibly a jump table // possibly a jump table
const s32 jtbl_8009A590_75990[] = { const s32 jtbl_8009A590[] = {
0x8007301C, 0x80073070, 0x80073094, 0x800730CC, 0x800730F8, 0x8007301C, 0x80073070, 0x80073094, 0x800730CC, 0x800730F8,
}; };

4
src/world/partner/goombario.c
View File

@ -77,7 +77,7 @@ void world_goombario_pre_battle(s32 arg0) {
INCLUDE_ASM(void, "world/partner/goombario", world_goombario_pre_battle, s32 arg0); INCLUDE_ASM(void, "world/partner/goombario", world_goombario_pre_battle, s32 arg0);
#endif #endif
s32 D_802BDC40[] = { s32 D_802BDC40_317B60[] = {
0x00000015, 0x001B0000, 0x00000018, 0x001B0000, 0x00000016, 0x001B0001, 0x00000019, 0x001B0001, 0x00000015, 0x001B0000, 0x00000018, 0x001B0000, 0x00000016, 0x001B0001, 0x00000019, 0x001B0001,
0x00000017, 0x001B0003, 0x0000001A, 0x001B0003, 0x0000000D, 0x001B0005, 0x0000000E, 0x001B0005, 0x00000017, 0x001B0003, 0x0000001A, 0x001B0003, 0x0000000D, 0x001B0005, 0x0000000E, 0x001B0005,
0x0000000F, 0x001B0006, 0x00000010, 0x001B0006, 0x0000000B, 0x001B0007, 0x0000000C, 0x001B0008, 0x0000000F, 0x001B0006, 0x00000010, 0x001B0006, 0x0000000B, 0x001B0007, 0x0000000C, 0x001B0008,
@ -94,7 +94,7 @@ Script world_goombario_take_out = SCRIPT({
func_802BD188_3170A8(); func_802BD188_3170A8();
}); });
s32 D_802BDD88 = 0x802BDF40; s32 D_802BDD88_317CA8 = 0x802BDF40;
Script world_goombario_update = SCRIPT({ Script world_goombario_update = SCRIPT({
func_802BD1D0_3170F0(); func_802BD1D0_3170F0();

2
src/world/partner/goompa.c
View File

@ -36,7 +36,7 @@ Script world_goompa_take_out = SCRIPT({
GoompaTakeOut(); GoompaTakeOut();
}); });
s32 D_802BD58C = 0x802BD600; s32 D_802BD58C_324E9C = 0x802BD600;
Script world_goompa_update = SCRIPT({ Script world_goompa_update = SCRIPT({
func_802BD14C_324A5C(); func_802BD14C_324A5C();

2
tools/splat.yaml
View File

@ -9,6 +9,8 @@ options:
extensions: splat_ext extensions: splat_ext
symbol_addrs_path: tools/symbol_addrs.txt symbol_addrs_path: tools/symbol_addrs.txt
platform: n64 platform: n64
out_dir: ../
target_path: baserom.z64
assets_dir: assets assets_dir: assets
segments: segments:
- name: header - name: header

6
tools/symbol_addrs.txt
View File

@ -576,12 +576,13 @@ D_80078DB0 = 0x80078DB0; // rom:0x541B0
D_80078DB4 = 0x80078DB4; // rom:0x541B4 D_80078DB4 = 0x80078DB4; // rom:0x541B4
gEffectTable = 0x8007F214; gEffectTable = 0x8007F214;
gItemTable = 0x800878E0; // size:0x2D80 gItemTable = 0x800878E0; // size:0x2D80
gAreas = 0x800934F0; gAreas = 0x800934F0; // type:data size:0x1D0
nuAuDmaState = 0x800A3BD0; nuAuDmaState = 0x800A3BD0;
nuAuDmaBuf = 0x800A3BE0; nuAuDmaBuf = 0x800A3BE0;
gCurrentEncounter = 0x800B0F10; // size:0xB0 gCurrentEncounter = 0x800B0F10; // size:0xB0
gBattleState = 0x800DC068; gBattleState = 0x800DC068;
gBattleStatus = 0x800DC070; // size:0x490 gBattleStatus = 0x800DC070; // size:0x490
gBattleAreas = 0x80095A30; // type:data size:0x600
test_below_player = 0x800DDFD0; // type:func rom:0x77480 test_below_player = 0x800DDFD0; // type:func rom:0x77480
trace_below_player = 0x800DE54C; // type:func rom:0x779FC trace_below_player = 0x800DE54C; // type:func rom:0x779FC
collision_check_above = 0x800DE7E4; // type:func rom:0x77C94 collision_check_above = 0x800DE7E4; // type:func rom:0x77C94
@ -5911,6 +5912,7 @@ func_802A2468_798428 = 0x802A2468; // type:func rom:0x798428
func_802BD754_31D2C4 = 0x802BD754; // type:func rom:0x31D2C4 func_802BD754_31D2C4 = 0x802BD754; // type:func rom:0x31D2C4
func_80245D6C_8065EC = 0x80245D6C; // type:func rom:0x8065EC func_80245D6C_8065EC = 0x80245D6C; // type:func rom:0x8065EC
func_80241FE8_D3C5B8 = 0x80241FE8; // type:func rom:0xD3C5B8 func_80241FE8_D3C5B8 = 0x80241FE8; // type:func rom:0xD3C5B8
func_80242040_8B20B0 = 0x80242040; // type:func rom:0x8B20B0
func_802BCC80_E2D3B0 = 0x802BCC80; // type:func rom:0xE2D3B0 func_802BCC80_E2D3B0 = 0x802BCC80; // type:func rom:0xE2D3B0
func_80240520_C9C820 = 0x80240520; // type:func rom:0xC9C820 func_80240520_C9C820 = 0x80240520; // type:func rom:0xC9C820
func_80240A7C_8B0AEC = 0x80240A7C; // type:func rom:0x8B0AEC func_80240A7C_8B0AEC = 0x80240A7C; // type:func rom:0x8B0AEC
@ -8878,3 +8880,5 @@ func_802D3840 = 0x802D3840; // type:func rom:0xF81F0
func_802D39FC = 0x802D39FC; // type:func rom:0xF83AC func_802D39FC = 0x802D39FC; // type:func rom:0xF83AC
func_802D3C58 = 0x802D3C58; // type:func rom:0xF8608 func_802D3C58 = 0x802D3C58; // type:func rom:0xF8608
gBattleItemTable = 0x80293C04; // type:data gBattleItemTable = 0x80293C04; // type:data
func_8006A9F0 = 0x8006A9F0; // type:func rom:0x45B74
rdpstateinit_dl = 0x80093BB8; // type:data

4
undefined_syms.txt
View File

@ -50,8 +50,12 @@ spiked_goomba = 0x8021B0AC;
paragoomba = 0x8021CD00; paragoomba = 0x8021CD00;
StartRumbleWithParams = 0x80267D9C; StartRumbleWithParams = 0x80267D9C;
rdpstateinit_dl = 0x80093bb8; rdpstateinit_dl = 0x80093bb8;
D_802BFEFC = 0x802BFEFC;
D_802E9170 = 0x802E9170; D_802E9170 = 0x802E9170;
D_802E91F0 = 0x802E91F0; D_802E91F0 = 0x802E91F0;
D_802E9270 = 0x802E9270; D_802E9270 = 0x802E9270;
D_802E92B0 = 0x802E92B0; D_802E92B0 = 0x802E92B0;
D_802E98E0 = 0x802E98E0;
D_802E9904 = 0x802E9904;
D_802E99DC = 0x802E99DC;
nusched = 0x800DA440; nusched = 0x800DA440;

105
undefined_syms_auto.txt
View File

@ -1,11 +1,5 @@
osTvType = 0x80000300; osTvType = 0x80000300;
osExceptionPreamble = 0x8006AA00; osExceptionPreamble = 0x8006AA00;
nuAuPreNMIFunc = 0x80078174;
nuAuDmaNext = 0x80078178;
nuAuFrameCounter = 0x8007817C;
D_80078DB0 = 0x80078DB0;
D_80078DB4 = 0x80078DB4;
gAreas = 0x800934F0;
nuAuDmaState = 0x800A3BD0; nuAuDmaState = 0x800A3BD0;
nuAuDmaBuf = 0x800A3BE0; nuAuDmaBuf = 0x800A3BE0;
gCurrentEncounter = 0x800B0F10; gCurrentEncounter = 0x800B0F10;
@ -26,6 +20,8 @@ gMusicPlayers = 0x80159AF0;
gCollisionStatus = 0x8015A550; gCollisionStatus = 0x8015A550;
MultiplyVec3ByActorScale = 0x802540DC; MultiplyVec3ByActorScale = 0x802540DC;
gPauseMenuStrings = 0x8026F778; gPauseMenuStrings = 0x8026F778;
EnterWalk = 0x80285960;
ExitWalk = 0x80285CF4;
gSpeakingActorPrintCtx = 0x8029FA60; gSpeakingActorPrintCtx = 0x8029FA60;
D_8029FA64 = 0x8029FA64; D_8029FA64 = 0x8029FA64;
gSpeakingActorPrintIsDone = 0x8029FA68; gSpeakingActorPrintIsDone = 0x8029FA68;
@ -94,9 +90,6 @@ func_802AA014 = 0x802AA014;
func_802AA0D8 = 0x802AA0D8; func_802AA0D8 = 0x802AA0D8;
func_802B71E8 = 0x802B71E8; func_802B71E8 = 0x802B71E8;
func_802BE070 = 0x802BE070; func_802BE070 = 0x802BE070;
gStaticScriptCounter = 0x802D9CA0;
gIsUpdatingScripts = 0x802D9CA4;
gGlobalTimeSpace = 0x802D9CA8;
gBattleMeshAnimationList = 0x802DADB0; gBattleMeshAnimationList = 0x802DADB0;
gWorldMeshAnimationList = 0x802DADF0; gWorldMeshAnimationList = 0x802DADF0;
gCurrentMeshAnimationListPtr = 0x802DAE30; gCurrentMeshAnimationListPtr = 0x802DAE30;
@ -199,12 +192,7 @@ gScriptIndexList = 0x802DA898;
gScriptIdList = 0x802DAA98; gScriptIdList = 0x802DAA98;
gScriptListCount = 0x802DAC98; gScriptListCount = 0x802DAC98;
gCurrentPrintContext = 0x802DB260; gCurrentPrintContext = 0x802DB260;
gRandSeed = 0x80074410;
gSpriteHeapPtr = 0x8034F800; gSpriteHeapPtr = 0x8034F800;
func_80243880_95EA80 = 0x80243880;
func_80246500_806D80 = 0x80246500;
func_80242040_8B20B0 = 0x80242040;
func_802440E8_804968 = 0x802440E8;
D_A4700000 = 0xA4700000; D_A4700000 = 0xA4700000;
D_A4300000 = 0xA4300000; D_A4300000 = 0xA4300000;
D_A4300004 = 0xA4300004; D_A4300004 = 0xA4300004;
@ -242,26 +230,6 @@ D_8009A6A2 = 0x8009A6A2;
D_8009A6A4 = 0x8009A6A4; D_8009A6A4 = 0x8009A6A4;
D_8009A6A6 = 0x8009A6A6; D_8009A6A6 = 0x8009A6A6;
D_8009A5B8 = 0x8009A5B8; D_8009A5B8 = 0x8009A5B8;
D_80074260 = 0x80074260;
D_80074264 = 0x80074264;
D_80074270 = 0x80074270;
D_80074274 = 0x80074274;
D_800743E0 = 0x800743E0;
D_80074414 = 0x80074414;
D_80097D60 = 0x80097D60;
D_80097D68 = 0x80097D68;
D_80097D70 = 0x80097D70;
D_80097D78 = 0x80097D78;
D_80097D80 = 0x80097D80;
D_80097D88 = 0x80097D88;
jtbl_80097D90 = 0x80097D90;
D_80097DC8 = 0x80097DC8;
D_80097DD0 = 0x80097DD0;
D_80097DD8 = 0x80097DD8;
D_80097DE0 = 0x80097DE0;
D_80097DE8 = 0x80097DE8;
D_80097DF0 = 0x80097DF0;
D_80074580 = 0x80074580;
D_802FB800 = 0x802FB800; D_802FB800 = 0x802FB800;
D_803DA800 = 0x803DA800; D_803DA800 = 0x803DA800;
D_80268000 = 0x80268000; D_80268000 = 0x80268000;
@ -311,7 +279,6 @@ D_800D9620 = 0x800D9620;
D_800A0900 = 0x800A0900; D_800A0900 = 0x800A0900;
D_800A0904 = 0x800A0904; D_800A0904 = 0x800A0904;
D_800A0908 = 0x800A0908; D_800A0908 = 0x800A0908;
D_800934F4 = 0x800934F4;
D_800D9230 = 0x800D9230; D_800D9230 = 0x800D9230;
D_80210000 = 0x80210000; D_80210000 = 0x80210000;
D_800B0CF0 = 0x800B0CF0; D_800B0CF0 = 0x800B0CF0;
@ -407,8 +374,6 @@ D_801089C4 = 0x801089C4;
D_80108A14 = 0x80108A14; D_80108A14 = 0x80108A14;
D_800D9248 = 0x800D9248; D_800D9248 = 0x800D9248;
D_801AA000 = 0x801AA000; D_801AA000 = 0x801AA000;
D_80078180 = 0x80078180;
D_80078170 = 0x80078170;
D_800DAAB8 = 0x800DAAB8; D_800DAAB8 = 0x800DAAB8;
D_800A3510 = 0x800A3510; D_800A3510 = 0x800A3510;
D_800A3634 = 0x800A3634; D_800A3634 = 0x800A3634;
@ -430,31 +395,15 @@ D_8009A5FC = 0x8009A5FC;
D_800A3FD0 = 0x800A3FD0; D_800A3FD0 = 0x800A3FD0;
D_8009A628 = 0x8009A628; D_8009A628 = 0x8009A628;
D_8009A5C0 = 0x8009A5C0; D_8009A5C0 = 0x8009A5C0;
D_80078E54 = 0x80078E54;
D_8009A5CC = 0x8009A5CC; D_8009A5CC = 0x8009A5CC;
D_8009A640 = 0x8009A640; D_8009A640 = 0x8009A640;
D_8009A5E8 = 0x8009A5E8; D_8009A5E8 = 0x8009A5E8;
D_80078DB6 = 0x80078DB6;
D_80078DB8 = 0x80078DB8;
D_80078DC4 = 0x80078DC4;
D_80078DCC = 0x80078DCC;
D_80078DD0 = 0x80078DD0;
D_80078DDC = 0x80078DDC;
D_80078DF8 = 0x80078DF8;
D_80078E14 = 0x80078E14;
D_80078E30 = 0x80078E30;
D_80078E50 = 0x80078E50;
D_80078E58 = 0x80078E58;
D_80078E5A = 0x80078E5A;
D_80078E5C = 0x80078E5C;
D_800A3FEC = 0x800A3FEC; D_800A3FEC = 0x800A3FEC;
D_800A3FEE = 0x800A3FEE; D_800A3FEE = 0x800A3FEE;
D_800A3FF0 = 0x800A3FF0; D_800A3FF0 = 0x800A3FF0;
D_800A3FE0 = 0x800A3FE0; D_800A3FE0 = 0x800A3FE0;
D_800A3FE4 = 0x800A3FE4; D_800A3FE4 = 0x800A3FE4;
D_800A3FE8 = 0x800A3FE8; D_800A3FE8 = 0x800A3FE8;
D_80078181 = 0x80078181;
D_80078E60 = 0x80078E60;
D_800A41C0 = 0x800A41C0; D_800A41C0 = 0x800A41C0;
D_800B4514 = 0x800B4514; D_800B4514 = 0x800B4514;
D_E0200000 = 0xE0200000; D_E0200000 = 0xE0200000;
@ -463,10 +412,7 @@ D_800A4000 = 0x800A4000;
D_800B4398 = 0x800B4398; D_800B4398 = 0x800B4398;
D_80197000 = 0x80197000; D_80197000 = 0x80197000;
D_80280000 = 0x80280000; D_80280000 = 0x80280000;
D_80098A10 = 0x80098A10;
D_800D91E0 = 0x800D91E0; D_800D91E0 = 0x800D91E0;
D_80098A1C = 0x80098A1C;
D_80098A24 = 0x80098A24;
D_800A41E0 = 0x800A41E0; D_800A41E0 = 0x800A41E0;
D_800D9668 = 0x800D9668; D_800D9668 = 0x800D9668;
D_800A41E8 = 0x800A41E8; D_800A41E8 = 0x800A41E8;
@ -583,17 +529,12 @@ D_800B1B10 = 0x800B1B10;
D_800B1B0E = 0x800B1B0E; D_800B1B0E = 0x800B1B0E;
D_800B1B0F = 0x800B1B0F; D_800B1B0F = 0x800B1B0F;
D_8009A660 = 0x8009A660; D_8009A660 = 0x8009A660;
D_8006A9F0 = 0x8006A9F0;
D_8000030C = 0x8000030C; D_8000030C = 0x8000030C;
D_8000031C = 0x8000031C; D_8000031C = 0x8000031C;
D_800B0D08 = 0x800B0D08; D_800B0D08 = 0x800B0D08;
D_A4300008 = 0xA4300008; D_A4300008 = 0xA4300008;
D_A4400010 = 0xA4400010; D_A4400010 = 0xA4400010;
D_80000308 = 0x80000308; D_80000308 = 0x80000308;
D_80099E40 = 0x80099E40;
D_80099F40 = 0x80099F40;
D_8009A040 = 0x8009A040;
D_8009A140 = 0x8009A140;
D_800B0C7C = 0x800B0C7C; D_800B0C7C = 0x800B0C7C;
D_800B0C74 = 0x800B0C74; D_800B0C74 = 0x800B0C74;
D_800B0C75 = 0x800B0C75; D_800B0C75 = 0x800B0C75;
@ -615,9 +556,6 @@ D_800B0C50 = 0x800B0C50;
D_800B0C40 = 0x800B0C40; D_800B0C40 = 0x800B0C40;
D_800DC064 = 0x800DC064; D_800DC064 = 0x800DC064;
D_800DC060 = 0x800DC060; D_800DC060 = 0x800DC060;
D_80095A30 = 0x80095A30;
jtbl_8009A578 = 0x8009A578;
jtbl_8009A590 = 0x8009A590;
D_8010C970 = 0x8010C970; D_8010C970 = 0x8010C970;
D_8010C94C = 0x8010C94C; D_8010C94C = 0x8010C94C;
D_8010C974 = 0x8010C974; D_8010C974 = 0x8010C974;
@ -859,9 +797,6 @@ D_80151668 = 0x80151668;
D_801516E8 = 0x801516E8; D_801516E8 = 0x801516E8;
D_8015C7D8 = 0x8015C7D8; D_8015C7D8 = 0x8015C7D8;
D_8015C7D0 = 0x8015C7D0; D_8015C7D0 = 0x8015C7D0;
D_802E98BC = 0x802E98BC;
D_802E9904 = 0x802E9904;
D_802E98E0 = 0x802E98E0;
D_8015A590 = 0x8015A590; D_8015A590 = 0x8015A590;
D_80153264 = 0x80153264; D_80153264 = 0x80153264;
D_80153268 = 0x80153268; D_80153268 = 0x80153268;
@ -1039,25 +974,14 @@ D_8015690B = 0x8015690B;
D_8015C790 = 0x8015C790; D_8015C790 = 0x8015C790;
D_8015C7A4 = 0x8015C7A4; D_8015C7A4 = 0x8015C7A4;
D_8015C7A8 = 0x8015C7A8; D_8015C7A8 = 0x8015C7A8;
D_8014EE60 = 0x8014EE60;
D_80156948 = 0x80156948; D_80156948 = 0x80156948;
D_80156958 = 0x80156958; D_80156958 = 0x80156958;
D_80156970 = 0x80156970; D_80156970 = 0x80156970;
D_80156968 = 0x80156968; D_80156968 = 0x80156968;
D_80156960 = 0x80156960; D_80156960 = 0x80156960;
D_80156F20 = 0x80156F20; D_80156F20 = 0x80156F20;
D_8014EE14 = 0x8014EE14;
D_80156950 = 0x80156950; D_80156950 = 0x80156950;
D_8014EE10 = 0x8014EE10;
D_8014EE68 = 0x8014EE68;
D_8014EE98 = 0x8014EE98;
D_8014EE18 = 0x8014EE18;
D_8014EF64 = 0x8014EF64;
D_80156980 = 0x80156980; D_80156980 = 0x80156980;
D_8014EE50 = 0x8014EE50;
D_8014EE40 = 0x8014EE40;
D_8014EFCC = 0x8014EFCC;
D_8014EFC4 = 0x8014EFC4;
D_F1FFFFFF = 0xF1FFFFFF; D_F1FFFFFF = 0xF1FFFFFF;
D_E1000010 = 0xE1000010; D_E1000010 = 0xE1000010;
D_80156F60 = 0x80156F60; D_80156F60 = 0x80156F60;
@ -1070,21 +994,14 @@ D_80158574 = 0x80158574;
D_80158580 = 0x80158580; D_80158580 = 0x80158580;
D_80158B80 = 0x80158B80; D_80158B80 = 0x80158B80;
D_80157964 = 0x80157964; D_80157964 = 0x80157964;
D_8014EFC0 = 0x8014EFC0;
D_80158570 = 0x80158570; D_80158570 = 0x80158570;
D_801512B4 = 0x801512B4; D_801512B4 = 0x801512B4;
D_80159180 = 0x80159180; D_80159180 = 0x80159180;
D_8014EFC8 = 0x8014EFC8;
D_8014F0C8 = 0x8014F0C8;
D_8014F110 = 0x8014F110;
D_800DBC70 = 0x800DBC70; D_800DBC70 = 0x800DBC70;
D_800DBD70 = 0x800DBD70; D_800DBD70 = 0x800DBD70;
D_800DBF70 = 0x800DBF70; D_800DBF70 = 0x800DBF70;
D_800DBF90 = 0x800DBF90; D_800DBF90 = 0x800DBF90;
D_8014F120 = 0x8014F120;
D_8014F128 = 0x8014F128;
D_801595A0 = 0x801595A0; D_801595A0 = 0x801595A0;
D_8014F12F = 0x8014F12F;
D_8015959E = 0x8015959E; D_8015959E = 0x8015959E;
D_801593A0 = 0x801593A0; D_801593A0 = 0x801593A0;
D_8015C7C0 = 0x8015C7C0; D_8015C7C0 = 0x8015C7C0;
@ -1099,7 +1016,6 @@ D_801598A0 = 0x801598A0;
D_801599B8 = 0x801599B8; D_801599B8 = 0x801599B8;
D_80159AD0 = 0x80159AD0; D_80159AD0 = 0x80159AD0;
D_80159AD4 = 0x80159AD4; D_80159AD4 = 0x80159AD4;
D_802D9D80 = 0x802D9D80;
D_802DACA0 = 0x802DACA0; D_802DACA0 = 0x802DACA0;
D_802DADA0 = 0x802DADA0; D_802DADA0 = 0x802DADA0;
D_802DADA4 = 0x802DADA4; D_802DADA4 = 0x802DADA4;
@ -1161,17 +1077,7 @@ D_802EB390 = 0x802EB390;
D_802EB394 = 0x802EB394; D_802EB394 = 0x802EB394;
D_802EB39C = 0x802EB39C; D_802EB39C = 0x802EB39C;
D_802EB398 = 0x802EB398; D_802EB398 = 0x802EB398;
D_802E99DC = 0x802E99DC;
D_802EB3A0 = 0x802EB3A0; D_802EB3A0 = 0x802EB3A0;
jtbl_802EB160 = 0x802EB160;
jtbl_802EB198 = 0x802EB198;
D_802E9C8C = 0x802E9C8C;
D_802E9CF8 = 0x802E9CF8;
D_802E9CB0 = 0x802E9CB0;
D_802E9D1C = 0x802E9D1C;
D_802E9CD4 = 0x802E9CD4;
D_802E9D40 = 0x802E9D40;
D_802E9D64 = 0x802E9D64;
D_802EA07C = 0x802EA07C; D_802EA07C = 0x802EA07C;
D_802E9E54 = 0x802E9E54; D_802E9E54 = 0x802E9E54;
D_802E9E80 = 0x802E9E80; D_802E9E80 = 0x802E9E80;
@ -1427,7 +1333,6 @@ D_80080730 = 0x80080730;
D_80080760 = 0x80080760; D_80080760 = 0x80080760;
D_80080790 = 0x80080790; D_80080790 = 0x80080790;
D_800807C0 = 0x800807C0; D_800807C0 = 0x800807C0;
D_80095A4C = 0x80095A4C;
D_8029FB78 = 0x8029FB78; D_8029FB78 = 0x8029FB78;
D_8029FB74 = 0x8029FB74; D_8029FB74 = 0x8029FB74;
D_8029FB50 = 0x8029FB50; D_8029FB50 = 0x8029FB50;
@ -1482,12 +1387,10 @@ D_8029FBD4 = 0x8029FBD4;
D_8029FBD0 = 0x8029FBD0; D_8029FBD0 = 0x8029FBD0;
D_8004AA85 = 0x8004AA85; D_8004AA85 = 0x8004AA85;
D_80026AC7 = 0x80026AC7; D_80026AC7 = 0x80026AC7;
D_802BDD88_317CA8 = 0x802BDD88;
D_802BDF30 = 0x802BDF30; D_802BDF30 = 0x802BDF30;
D_802BDF34 = 0x802BDF34; D_802BDF34 = 0x802BDF34;
D_802B79A8 = 0x802B79A8; D_802B79A8 = 0x802B79A8;
D_802BDF38 = 0x802BDF38; D_802BDF38 = 0x802BDF38;
D_802BDC40_317B60 = 0x802BDC40;
D_802BE928 = 0x802BE928; D_802BE928 = 0x802BE928;
D_802BE924 = 0x802BE924; D_802BE924 = 0x802BE924;
D_802BE934 = 0x802BE934; D_802BE934 = 0x802BE934;
@ -1518,7 +1421,6 @@ D_802BE300 = 0x802BE300;
D_802BE30C = 0x802BE30C; D_802BE30C = 0x802BE30C;
D_802BE304 = 0x802BE304; D_802BE304 = 0x802BE304;
D_8010EBB1 = 0x8010EBB1; D_8010EBB1 = 0x8010EBB1;
D_802BFEFC = 0x802BFEFC;
D_802BFF00 = 0x802BFF00; D_802BFF00 = 0x802BFF00;
D_802BFF04 = 0x802BFF04; D_802BFF04 = 0x802BFF04;
D_802BFF08 = 0x802BFF08; D_802BFF08 = 0x802BFF08;
@ -1535,7 +1437,6 @@ D_802BE0C0 = 0x802BE0C0;
D_802BE0E4 = 0x802BE0E4; D_802BE0E4 = 0x802BE0E4;
D_802BE0E8 = 0x802BE0E8; D_802BE0E8 = 0x802BE0E8;
D_802BE0EC = 0x802BE0EC; D_802BE0EC = 0x802BE0EC;
D_802BD58C_324E9C = 0x802BD58C;
D_E0200690 = 0xE0200690; D_E0200690 = 0xE0200690;
D_E0200734 = 0xE0200734; D_E0200734 = 0xE0200734;
D_E0200694 = 0xE0200694; D_E0200694 = 0xE0200694;
@ -2608,7 +2509,6 @@ D_802A98E2_42FFC2 = 0x802A98E2;
D_80294440 = 0x80294440; D_80294440 = 0x80294440;
jtbl_802A9940_430960 = 0x802A9940; jtbl_802A9940_430960 = 0x802A9940;
D_802A9922_430942 = 0x802A9922; D_802A9922_430942 = 0x802A9922;
D_8021A194_432B34 = 0x8021A194;
D_8021BC70_434610 = 0x8021BC70; D_8021BC70_434610 = 0x8021BC70;
D_8021EF6C_43790C = 0x8021EF6C; D_8021EF6C_43790C = 0x8021EF6C;
D_8021A434_43BEC4 = 0x8021A434; D_8021A434_43BEC4 = 0x8021A434;
@ -2988,7 +2888,6 @@ D_80286528 = 0x80286528;
D_8028652C = 0x8028652C; D_8028652C = 0x8028652C;
D_80286538 = 0x80286538; D_80286538 = 0x80286538;
D_80080868 = 0x80080868; D_80080868 = 0x80080868;
jtbl_80286500 = 0x80286500;
D_80286540 = 0x80286540; D_80286540 = 0x80286540;
D_802DBC88 = 0x802DBC88; D_802DBC88 = 0x802DBC88;
D_802EA2BC = 0x802EA2BC; D_802EA2BC = 0x802EA2BC;