Merge pull request #66 from nanaian/low-hanging-fruit

Match low-hanging fruit
This commit is contained in:
Ethan Roseman 2020-10-14 15:59:42 -04:00 committed by GitHub
commit f58f0daea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
87 changed files with 144 additions and 461 deletions

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_800355C4
/* 109C4 800355C4 03E00008 */ jr $ra
/* 109C8 800355C8 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_800355CC
/* 109CC 800355CC 03E00008 */ jr $ra
/* 109D0 800355D0 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80035D18
/* 11118 80035D18 03E00008 */ jr $ra
/* 1111C 80035D1C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802E6194
/* 107A14 802E6194 03E00008 */ jr $ra
/* 107A18 802E6198 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80037960
/* 12D60 80037960 03E00008 */ jr $ra
/* 12D64 80037964 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80243568
/* 1368A8 80243568 03E00008 */ jr $ra
/* 1368AC 8024356C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel pause_badges_scroll_offset_x
/* 13A5E8 802472A8 03E00008 */ jr $ra
/* 13A5EC 802472AC 0080102D */ daddu $v0, $a0, $zero

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8003B1A8
/* 165A8 8003B1A8 03E00008 */ jr $ra
/* 165AC 8003B1AC 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8003C658
/* 17A58 8003C658 03E00008 */ jr $ra
/* 17A5C 8003C65C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8003C660
/* 17A60 8003C660 03E00008 */ jr $ra
/* 17A64 8003C664 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8003C8AC
/* 17CAC 8003C8AC 03E00008 */ jr $ra
/* 17CB0 8003C8B0 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8003CFA0
/* 183A0 8003CFA0 03E00008 */ jr $ra
/* 183A4 8003CFA4 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8003E50C
/* 1990C 8003E50C 03E00008 */ jr $ra
/* 19910 8003E510 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8003E670
/* 19A70 8003E670 03E00008 */ jr $ra
/* 19A74 8003E674 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80248160
/* 1689C0 80248160 03E00008 */ jr $ra
/* 1689C4 80248164 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80248168
/* 1689C8 80248168 03E00008 */ jr $ra
/* 1689CC 8024816C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80249324
/* 169B84 80249324 03E00008 */ jr $ra
/* 169B88 80249328 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8023E3FC
/* 16CCDC 8023E3FC 03E00008 */ jr $ra
/* 16CCE0 8023E400 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024201C
/* 1708FC 8024201C 03E00008 */ jr $ra
/* 170900 80242020 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80242AC0
/* 1713A0 80242AC0 03E00008 */ jr $ra
/* 1713A4 80242AC4 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80242BA8
/* 171488 80242BA8 03E00008 */ jr $ra
/* 17148C 80242BAC 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80242EF8
/* 1717D8 80242EF8 03E00008 */ jr $ra
/* 1717DC 80242EFC 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80242FD8
/* 1718B8 80242FD8 03E00008 */ jr $ra
/* 1718BC 80242FDC 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80243910
/* 1721F0 80243910 03E00008 */ jr $ra
/* 1721F4 80243914 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802439D0
/* 1722B0 802439D0 03E00008 */ jr $ra
/* 1722B4 802439D4 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80243FD4
/* 1728B4 80243FD4 03E00008 */ jr $ra
/* 1728B8 80243FD8 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80244000
/* 1728E0 80244000 03E00008 */ jr $ra
/* 1728E4 80244004 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80244708
/* 172FE8 80244708 03E00008 */ jr $ra
/* 172FEC 8024470C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80244A48
/* 173328 80244A48 03E00008 */ jr $ra
/* 17332C 80244A4C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80244EF8
/* 1737D8 80244EF8 03E00008 */ jr $ra
/* 1737DC 80244EFC 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80245438
/* 173D18 80245438 03E00008 */ jr $ra
/* 173D1C 8024543C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802456B0
/* 173F90 802456B0 03E00008 */ jr $ra
/* 173F94 802456B4 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80245AC8
/* 1743A8 80245AC8 03E00008 */ jr $ra
/* 1743AC 80245ACC 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80246448
/* 174D28 80246448 03E00008 */ jr $ra
/* 174D2C 8024644C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80246B2C_code
/* 17540C 80246B2C 03E00008 */ jr $ra
/* 175410 80246B30 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80247214
/* 175AF4 80247214 03E00008 */ jr $ra
/* 175AF8 80247218 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802472A4
/* 175B84 802472A4 03E00008 */ jr $ra
/* 175B88 802472A8 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80247568
/* 175E48 80247568 03E00008 */ jr $ra
/* 175E4C 8024756C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80247AFC
/* 1763DC 80247AFC 03E00008 */ jr $ra
/* 1763E0 80247B00 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80255FD8
/* 1848B8 80255FD8 03E00008 */ jr $ra
/* 1848BC 80255FDC 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8025D150
/* 18BA30 8025D150 03E00008 */ jr $ra
/* 18BA34 8025D154 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8025D158
/* 18BA38 8025D158 03E00008 */ jr $ra
/* 18BA3C 8025D15C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8025D3C4
/* 18BCA4 8025D3C4 03E00008 */ jr $ra
/* 18BCA8 8025D3C8 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8025DA60
/* 18C340 8025DA60 03E00008 */ jr $ra
/* 18C344 8025DA64 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8025DBC8
/* 18C4A8 8025DBC8 03E00008 */ jr $ra
/* 18C4AC 8025DBCC 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8004D31C
/* 2871C 8004D31C 03E00008 */ jr $ra
/* 28720 8004D320 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80050560
/* 2B960 80050560 03E00008 */ jr $ra
/* 2B964 80050564 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80059C80
/* 35080 80059C80 03E00008 */ jr $ra
/* 35084 80059C84 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80059D48
/* 35148 80059D48 03E00008 */ jr $ra
/* 3514C 80059D4C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8005AF84
/* 36384 8005AF84 03E00008 */ jr $ra
/* 36388 8005AF88 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8005AF8C
/* 3638C 8005AF8C 03E00008 */ jr $ra
/* 36390 8005AF90 00000000 */ nop

View File

@ -1,19 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80028838
/* 3C38 80028838 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 3C3C 8002883C AFBF0010 */ sw $ra, 0x10($sp)
/* 3C40 80028840 0C00A1FC */ jal func_800287F0
/* 3C44 80028844 00000000 */ nop
/* 3C48 80028848 8FBF0010 */ lw $ra, 0x10($sp)
/* 3C4C 8002884C 3C01800A */ lui $at, 0x800a
/* 3C50 80028850 A420A6A0 */ sh $zero, -0x5960($at)
/* 3C54 80028854 3C01800A */ lui $at, 0x800a
/* 3C58 80028858 A420A6A2 */ sh $zero, -0x595e($at)
/* 3C5C 8002885C 3C01800A */ lui $at, 0x800a
/* 3C60 80028860 A420A6A4 */ sh $zero, -0x595c($at)
/* 3C64 80028864 3C01800A */ lui $at, 0x800a
/* 3C68 80028868 A420A6A6 */ sh $zero, -0x595a($at)
/* 3C6C 8002886C 03E00008 */ jr $ra
/* 3C70 80028870 27BD0018 */ addiu $sp, $sp, 0x18

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_800EA524
/* 839D4 800EA524 03E00008 */ jr $ra
/* 839D8 800EA528 24020001 */ addiu $v0, $zero, 1

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_800EFD00
/* 891B0 800EFD00 03E00008 */ jr $ra
/* 891B4 800EFD04 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel NOP_state
/* A9290 80112B90 03E00008 */ jr $ra
/* A9294 80112B94 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80030450
/* B850 80030450 03E00008 */ jr $ra
/* B854 80030454 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_801356C4
/* CBDC4 801356C4 03E00008 */ jr $ra
/* CBDC8 801356C8 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_801356CC
/* CBDCC 801356CC 03E00008 */ jr $ra
/* CBDD0 801356D0 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_801356D4
/* CBDD4 801356D4 03E00008 */ jr $ra
/* CBDD8 801356D8 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel stub_dynamic_entity_delegate
/* B97B0 801230B0 03E00008 */ jr $ra
/* B97B4 801230B4 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80138198
/* CE898 80138198 03E00008 */ jr $ra
/* CE89C 8013819C 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_800334E8
/* E8E8 800334E8 03E00008 */ jr $ra
/* E8EC 800334EC 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80034BF4
/* FFF4 80034BF4 03E00008 */ jr $ra
/* FFF8 80034BF8 00000000 */ nop

View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802DDA84
/* 100B74 802DDA84 03E00008 */ jr $ra
/* 100B78 802DDA88 0000102D */ daddu $v0, $zero, $zero

View File

@ -96,6 +96,10 @@ extern s16 D_800A0944;
extern s32 gGameState;
extern s32 D_8009A650[1];
extern u16 D_8009A6A0;
extern u16 D_8009A6A2;
extern u16 D_8009A6A4;
extern u16 D_8009A6A6;
// curtains
extern f32 D_8009BA90;

View File

@ -8,9 +8,11 @@ INCLUDE_ASM(s32, "code_10400_len_d30", func_800351C8);
INCLUDE_ASM(s32, "code_10400_len_d30", func_800354EC);
INCLUDE_ASM(s32, "code_10400_len_d30", func_800355C4);
void func_800355C4(void) {
}
INCLUDE_ASM(s32, "code_10400_len_d30", func_800355CC);
void func_800355CC(void) {
}
INCLUDE_ASM(s32, "code_10400_len_d30", func_800355D4);
@ -20,6 +22,7 @@ INCLUDE_ASM(s32, "code_10400_len_d30", func_80035704);
INCLUDE_ASM(s32, "code_10400_len_d30", func_80035B40);
INCLUDE_ASM(s32, "code_10400_len_d30", func_80035D18);
void func_80035D18(void) {
}
INCLUDE_ASM(s32, "code_10400_len_d30", func_80035D20);

View File

@ -8,7 +8,8 @@ INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6118);
INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6178);
INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6194);
void func_802E6194(void) {
}
INCLUDE_ASM(s32, "code_107830_len_e70", func_802E619C);

View File

@ -8,7 +8,8 @@ INCLUDE_ASM(s32, "code_121f0_len_1290", func_800375A4);
INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037638);
INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037960);
void func_80037960(void) {
}
INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037968);

View File

@ -34,7 +34,8 @@ INCLUDE_ASM(s32, "code_135EE0", pause_interp_vertical_scroll);
INCLUDE_ASM(s32, "code_135EE0", pause_update_cursor);
INCLUDE_ASM(s32, "code_135EE0", func_80243568);
void func_80243568(void) {
}
INCLUDE_ASM(s32, "code_135EE0", pause_textbox_draw_contents);
@ -103,7 +104,9 @@ INCLUDE_ASM(s32, "code_135EE0", pause_badges_is_visible);
INCLUDE_ASM(s32, "code_135EE0", pause_badges_scroll_offset_y);
INCLUDE_ASM(s32, "code_135EE0", pause_badges_scroll_offset_x);
s32 pause_badges_scroll_offset_x(s32 x) {
return x;
}
INCLUDE_ASM(s32, "code_135EE0", pause_badges_try_remove);

View File

@ -95,7 +95,8 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B184);
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B198);
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B1A8);
void func_8003B1A8(void) {
}
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B1B0);
@ -133,9 +134,11 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C53C);
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C61C);
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C658);
void func_8003C658(void) {
}
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C660);
void func_8003C660(void) {
}
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C668);
@ -143,7 +146,8 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C78C);
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C7A8);
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C8AC);
void func_8003C8AC(void) {
}
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C8B4);
@ -159,7 +163,8 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CC8C);
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CCB0);
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CFA0);
void func_8003CFA0(void) {
}
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CFA8);
@ -195,7 +200,8 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E338);
INCLUDE_ASM(s32, "code_13870_len_6980", clear_encounter_status);
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E50C);
void func_8003E50C(void) {
}
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E514);
@ -205,7 +211,8 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E5B0);
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E63C);
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E670);
void func_8003E670(void) {
}
INCLUDE_ASM(s32, "code_13870_len_6980", make_npcs);

View File

@ -6,9 +6,11 @@ INCLUDE_ASM(s32, "code_168590", func_80247FD0);
INCLUDE_ASM(s32, "code_168590", func_80248024);
INCLUDE_ASM(s32, "code_168590", func_80248160);
void func_80248160(void) {
}
INCLUDE_ASM(s32, "code_168590", func_80248168);
void func_80248168(void) {
}
INCLUDE_ASM(s32, "code_168590", func_80248170);
@ -20,6 +22,7 @@ INCLUDE_ASM(s32, "code_168590", func_80248A80);
INCLUDE_ASM(s32, "code_168590", func_80248BF4);
INCLUDE_ASM(s32, "code_168590", func_80249324);
void func_80249324(void) {
}
INCLUDE_ASM(s32, "code_168590", func_8024932C);

View File

@ -8,7 +8,8 @@ INCLUDE_ASM(s32, "code_16c8e0", func_8023E11C);
INCLUDE_ASM(s32, "code_16c8e0", initialize_battle);
INCLUDE_ASM(s32, "code_16c8e0", func_8023E3FC);
void func_8023E3FC(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", update_actor_shadows);
@ -48,47 +49,58 @@ INCLUDE_ASM(s32, "code_16c8e0", func_80241AB8);
INCLUDE_ASM(s32, "code_16c8e0", func_80241B14);
INCLUDE_ASM(s32, "code_16c8e0", func_8024201C);
void func_8024201C(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", update_heroes_start_turn);
INCLUDE_ASM(s32, "code_16c8e0", func_80242AC0);
void func_80242AC0(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", switch_to_player);
INCLUDE_ASM(s32, "code_16c8e0", func_80242BA8);
void func_80242BA8(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", update_end_player_turn);
INCLUDE_ASM(s32, "code_16c8e0", func_80242EF8);
void func_80242EF8(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", switch_to_partner);
INCLUDE_ASM(s32, "code_16c8e0", func_80242FD8);
void func_80242FD8(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_80242FE0);
INCLUDE_ASM(s32, "code_16c8e0", func_80243910);
void func_80243910(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", switch_order);
INCLUDE_ASM(s32, "code_16c8e0", func_802439D0);
void func_802439D0(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_802439D8);
INCLUDE_ASM(s32, "code_16c8e0", func_80243FD4);
void func_80243FD4(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_80243FDC);
INCLUDE_ASM(s32, "code_16c8e0", func_80244000);
void func_80244000(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_80244008);
INCLUDE_ASM(s32, "code_16c8e0", func_80244708);
void func_80244708(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_80244710);
INCLUDE_ASM(s32, "code_16c8e0", func_80244A48);
void func_80244A48(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", end_battle);
@ -96,15 +108,18 @@ INCLUDE_ASM(s32, "code_16c8e0", func_80244D90);
INCLUDE_ASM(s32, "code_16c8e0", func_80244E38);
INCLUDE_ASM(s32, "code_16c8e0", func_80244EF8);
void func_80244EF8(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", update_run_away);
INCLUDE_ASM(s32, "code_16c8e0", func_80245438);
void func_80245438(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_80245440);
INCLUDE_ASM(s32, "code_16c8e0", func_802456B0);
void func_802456B0(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", EnablePartnerBlur);
@ -112,31 +127,38 @@ INCLUDE_ASM(s32, "code_16c8e0", DisablePartnerBlur);
INCLUDE_ASM(s32, "code_16c8e0", update_swap_partner);
INCLUDE_ASM(s32, "code_16c8e0", func_80245AC8);
void func_80245AC8(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", update_player_action);
INCLUDE_ASM(s32, "code_16c8e0", func_80246448);
void func_80246448(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", update_player_change_turn);
INCLUDE_ASM(s32, "code_16c8e0", func_80246B2C_code);
void func_80246B2C_code(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", update_partner_action);
INCLUDE_ASM(s32, "code_16c8e0", func_80247214);
void func_80247214(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_8024721C);
INCLUDE_ASM(s32, "code_16c8e0", func_802472A4);
void func_802472A4(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", update_enemy_change_turn);
INCLUDE_ASM(s32, "code_16c8e0", func_80247568);
void func_80247568(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", update_enemy_action);
INCLUDE_ASM(s32, "code_16c8e0", func_80247AFC);
void func_80247AFC(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_80247B04);
@ -432,7 +454,8 @@ INCLUDE_ASM(s32, "code_16c8e0", update_enemy_shadows);
INCLUDE_ASM(s32, "code_16c8e0", update_hero_shadows);
INCLUDE_ASM(s32, "code_16c8e0", func_80255FD8);
void func_80255FD8(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_80255FE0);
@ -504,9 +527,11 @@ INCLUDE_ASM(s32, "code_16c8e0", func_8025CEC8);
INCLUDE_ASM(s32, "code_16c8e0", _remove_part_decoration);
INCLUDE_ASM(s32, "code_16c8e0", func_8025D150);
void func_8025D150(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_8025D158);
void func_8025D158(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_8025D160);
@ -514,7 +539,8 @@ INCLUDE_ASM(s32, "code_16c8e0", func_8025D290);
INCLUDE_ASM(s32, "code_16c8e0", func_8025D2B0);
INCLUDE_ASM(s32, "code_16c8e0", func_8025D3C4);
void func_8025D3C4(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_8025D3CC);
@ -538,11 +564,13 @@ INCLUDE_ASM(s32, "code_16c8e0", func_8025D8EC);
INCLUDE_ASM(s32, "code_16c8e0", func_8025D90C);
INCLUDE_ASM(s32, "code_16c8e0", func_8025DA60);
void func_8025DA60(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_8025DA68);
INCLUDE_ASM(s32, "code_16c8e0", func_8025DBC8);
void func_8025DBC8(void) {
}
INCLUDE_ASM(s32, "code_16c8e0", func_8025DBD0);

View File

@ -76,7 +76,8 @@ INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D2E4);
INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D310);
INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D31C);
void func_8004D31C(void) {
}
INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D324);

View File

@ -110,7 +110,8 @@ INCLUDE_ASM(s32, "code_28910_len_5090", func_800501A8);
INCLUDE_ASM(s32, "code_28910_len_5090", func_800502F0);
INCLUDE_ASM(s32, "code_28910_len_5090", func_80050560);
void func_80050560(void) {
}
INCLUDE_ASM(s32, "code_28910_len_5090", func_80050568);

View File

@ -18,13 +18,15 @@ INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059AB8);
INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059BD4);
INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C80);
void func_80059C80(void) {
}
INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C88);
INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C9C);
INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059D48);
void func_80059D48(void) {
}
INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059D50);

View File

@ -2,9 +2,11 @@
INCLUDE_ASM(s32, "code_362a0_len_2f70", allocate_hit_tables);
INCLUDE_ASM(s32, "code_362a0_len_2f70", func_8005AF84);
void func_8005AF84(void) {
}
INCLUDE_ASM(s32, "code_362a0_len_2f70", func_8005AF8C);
void func_8005AF8C(void) {
}
INCLUDE_ASM(s32, "code_362a0_len_2f70", initialize_collision);

View File

@ -24,6 +24,12 @@ void func_800287F0(void) {
}
}
INCLUDE_ASM(s32, "code_3bf0_len_6f0", func_80028838);
void func_80028838(void) {
func_800287F0();
D_8009A6A0 = 0;
D_8009A6A2 = 0;
D_8009A6A4 = 0;
D_8009A6A6 = 0;
}
INCLUDE_ASM(s32, "code_3bf0_len_6f0", update_input);

View File

@ -11,7 +11,9 @@ INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA4B0);
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA514);
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA524);
s32 func_800EA524(void) {
return 1;
}
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA52C);

View File

@ -1,6 +1,7 @@
#include "common.h"
INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800EFD00);
void func_800EFD00(void) {
}
INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800EFD08);

View File

@ -151,7 +151,8 @@ INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_peach_shadow_scale);
INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112B20);
INCLUDE_ASM(s32, "code_a5dd0_len_114e0", NOP_state);
void NOP_state(void) {
}
INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112B98);

View File

@ -10,7 +10,8 @@ INCLUDE_ASM(s32, "code_ad90_len_2880", func_80030210);
INCLUDE_ASM(s32, "code_ad90_len_2880", func_8003034C);
INCLUDE_ASM(s32, "code_ad90_len_2880", func_80030450);
void func_80030450(void) {
}
INCLUDE_ASM(s32, "code_ad90_len_2880", test_ray_zone_aabb);

View File

@ -58,7 +58,8 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_entity_fog_distance);
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_entity_fog_color);
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", stub_dynamic_entity_delegate);
void stub_dynamic_entity_delegate(void) {
}
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_dynamic_entity_list);
@ -250,11 +251,14 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8013559C);
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entity_static);
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801356C4);
void func_801356C4(void) {
}
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801356CC);
void func_801356CC(void) {
}
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801356D4);
void func_801356D4(void) {
}
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entity_temp);

View File

@ -20,7 +20,8 @@ INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138108);
INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138188);
INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138198);
void func_80138198(void) {
}
INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801381A0);

View File

@ -14,7 +14,8 @@ INCLUDE_ASM(s32, "code_d610_len_1330", func_80032C64);
INCLUDE_ASM(s32, "code_d610_len_1330", func_80033394);
INCLUDE_ASM(s32, "code_d610_len_1330", func_800334E8);
void func_800334E8(void) {
}
INCLUDE_ASM(s32, "code_d610_len_1330", set_game_mode);

View File

@ -12,7 +12,8 @@ INCLUDE_ASM(s32, "code_f270_len_1190", begin_state_pause_menu);
INCLUDE_ASM(s32, "code_f270_len_1190", step_pause_menu);
INCLUDE_ASM(s32, "code_f270_len_1190", func_80034BF4);
void func_80034BF4(void) {
}
INCLUDE_ASM(s32, "code_f270_len_1190", func_80034BFC);

View File

@ -56,7 +56,9 @@ INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD8F8);
INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDA60);
INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDA84);
s32 func_802DDA84(void) {
return 0;
}
INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDA8C);

View File

@ -62,6 +62,10 @@ D_800959D4 = 0x800959D4;
D_8009A5D8 = 0x8009A5D8;
gGameState = 0x8009A600;
D_8009A650 = 0x8009A650;
D_8009A6A0 = 0x8009A6A0;
D_8009A6A2 = 0x8009A6A2;
D_8009A6A4 = 0x8009A6A4;
D_8009A6A6 = 0x8009A6A6;
D_8009BA90 = 0x8009BA90;
D_8009BA94 = 0x8009BA94;