diff --git a/asm/nonmatchings/code_1AC760/dispatch_event_partner.s b/asm/nonmatchings/code_1AC760/dispatch_event_partner.s deleted file mode 100644 index fa615b6e72..0000000000 --- a/asm/nonmatchings/code_1AC760/dispatch_event_partner.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel dispatch_event_partner -/* 1AC760 8027DE80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 1AC764 8027DE84 2405000A */ addiu $a1, $zero, 0xa -/* 1AC768 8027DE88 AFB00010 */ sw $s0, 0x10($sp) -/* 1AC76C 8027DE8C 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) -/* 1AC770 8027DE90 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) -/* 1AC774 8027DE94 AFBF001C */ sw $ra, 0x1c($sp) -/* 1AC778 8027DE98 AFB20018 */ sw $s2, 0x18($sp) -/* 1AC77C 8027DE9C AFB10014 */ sw $s1, 0x14($sp) -/* 1AC780 8027DEA0 A20401F0 */ sb $a0, 0x1f0($s0) -/* 1AC784 8027DEA4 8E0401C8 */ lw $a0, 0x1c8($s0) -/* 1AC788 8027DEA8 8E1101D8 */ lw $s1, 0x1d8($s0) -/* 1AC78C 8027DEAC 8E1201E8 */ lw $s2, 0x1e8($s0) -/* 1AC790 8027DEB0 0C0B0CF8 */ jal start_script -/* 1AC794 8027DEB4 24060020 */ addiu $a2, $zero, 0x20 -/* 1AC798 8027DEB8 AE0201D8 */ sw $v0, 0x1d8($s0) -/* 1AC79C 8027DEBC 8C430144 */ lw $v1, 0x144($v0) -/* 1AC7A0 8027DEC0 AE0301E8 */ sw $v1, 0x1e8($s0) -/* 1AC7A4 8027DEC4 24030100 */ addiu $v1, $zero, 0x100 -/* 1AC7A8 8027DEC8 AC430148 */ sw $v1, 0x148($v0) -/* 1AC7AC 8027DECC 8E0201D4 */ lw $v0, 0x1d4($s0) -/* 1AC7B0 8027DED0 10400004 */ beqz $v0, .L8027DEE4 -/* 1AC7B4 8027DED4 00000000 */ nop -/* 1AC7B8 8027DED8 0C0B102B */ jal kill_script_by_ID -/* 1AC7BC 8027DEDC 8E0401E4 */ lw $a0, 0x1e4($s0) -/* 1AC7C0 8027DEE0 AE0001D4 */ sw $zero, 0x1d4($s0) -.L8027DEE4: -/* 1AC7C4 8027DEE4 12200003 */ beqz $s1, .L8027DEF4 -/* 1AC7C8 8027DEE8 00000000 */ nop -/* 1AC7CC 8027DEEC 0C0B102B */ jal kill_script_by_ID -/* 1AC7D0 8027DEF0 0240202D */ daddu $a0, $s2, $zero -.L8027DEF4: -/* 1AC7D4 8027DEF4 8FBF001C */ lw $ra, 0x1c($sp) -/* 1AC7D8 8027DEF8 8FB20018 */ lw $s2, 0x18($sp) -/* 1AC7DC 8027DEFC 8FB10014 */ lw $s1, 0x14($sp) -/* 1AC7E0 8027DF00 8FB00010 */ lw $s0, 0x10($sp) -/* 1AC7E4 8027DF04 03E00008 */ jr $ra -/* 1AC7E8 8027DF08 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_1AC760/dispatch_event_partner_continue_turn.s b/asm/nonmatchings/code_1AC760/dispatch_event_partner_continue_turn.s deleted file mode 100644 index 43e9b4a0cb..0000000000 --- a/asm/nonmatchings/code_1AC760/dispatch_event_partner_continue_turn.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel dispatch_event_partner_continue_turn -/* 1AC7EC 8027DF0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 1AC7F0 8027DF10 2405000A */ addiu $a1, $zero, 0xa -/* 1AC7F4 8027DF14 AFB00010 */ sw $s0, 0x10($sp) -/* 1AC7F8 8027DF18 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) -/* 1AC7FC 8027DF1C 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) -/* 1AC800 8027DF20 AFBF001C */ sw $ra, 0x1c($sp) -/* 1AC804 8027DF24 AFB20018 */ sw $s2, 0x18($sp) -/* 1AC808 8027DF28 AFB10014 */ sw $s1, 0x14($sp) -/* 1AC80C 8027DF2C A20401F0 */ sb $a0, 0x1f0($s0) -/* 1AC810 8027DF30 8E0401C8 */ lw $a0, 0x1c8($s0) -/* 1AC814 8027DF34 8E1101D8 */ lw $s1, 0x1d8($s0) -/* 1AC818 8027DF38 8E1201E8 */ lw $s2, 0x1e8($s0) -/* 1AC81C 8027DF3C 0C0B0CF8 */ jal start_script -/* 1AC820 8027DF40 24060020 */ addiu $a2, $zero, 0x20 -/* 1AC824 8027DF44 AE0201D8 */ sw $v0, 0x1d8($s0) -/* 1AC828 8027DF48 8C430144 */ lw $v1, 0x144($v0) -/* 1AC82C 8027DF4C AE0301E8 */ sw $v1, 0x1e8($s0) -/* 1AC830 8027DF50 24030100 */ addiu $v1, $zero, 0x100 -/* 1AC834 8027DF54 12200003 */ beqz $s1, .L8027DF64 -/* 1AC838 8027DF58 AC430148 */ sw $v1, 0x148($v0) -/* 1AC83C 8027DF5C 0C0B102B */ jal kill_script_by_ID -/* 1AC840 8027DF60 0240202D */ daddu $a0, $s2, $zero -.L8027DF64: -/* 1AC844 8027DF64 8FBF001C */ lw $ra, 0x1c($sp) -/* 1AC848 8027DF68 8FB20018 */ lw $s2, 0x18($sp) -/* 1AC84C 8027DF6C 8FB10014 */ lw $s1, 0x14($sp) -/* 1AC850 8027DF70 8FB00010 */ lw $s0, 0x10($sp) -/* 1AC854 8027DF74 03E00008 */ jr $ra -/* 1AC858 8027DF78 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_1AC760/func_8028070C.s b/asm/nonmatchings/code_1AC760/func_8028070C.s deleted file mode 100644 index d650a74a78..0000000000 --- a/asm/nonmatchings/code_1AC760/func_8028070C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8028070C -/* 1AEFEC 8028070C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 1AEFF0 80280710 AFB20018 */ sw $s2, 0x18($sp) -/* 1AEFF4 80280714 0080902D */ daddu $s2, $a0, $zero -/* 1AEFF8 80280718 AFBF001C */ sw $ra, 0x1c($sp) -/* 1AEFFC 8028071C AFB10014 */ sw $s1, 0x14($sp) -/* 1AF000 80280720 AFB00010 */ sw $s0, 0x10($sp) -/* 1AF004 80280724 8E440148 */ lw $a0, 0x148($s2) -/* 1AF008 80280728 0C09A75B */ jal get_actor -/* 1AF00C 8028072C 8E50000C */ lw $s0, 0xc($s2) -/* 1AF010 80280730 8E050000 */ lw $a1, ($s0) -/* 1AF014 80280734 26100004 */ addiu $s0, $s0, 4 -/* 1AF018 80280738 0240202D */ daddu $a0, $s2, $zero -/* 1AF01C 8028073C 0C0B1EAF */ jal get_variable -/* 1AF020 80280740 0040882D */ daddu $s1, $v0, $zero -/* 1AF024 80280744 0240202D */ daddu $a0, $s2, $zero -/* 1AF028 80280748 8E050000 */ lw $a1, ($s0) -/* 1AF02C 8028074C 0C0B1EAF */ jal get_variable -/* 1AF030 80280750 0040802D */ daddu $s0, $v0, $zero -/* 1AF034 80280754 0200202D */ daddu $a0, $s0, $zero -/* 1AF038 80280758 96230428 */ lhu $v1, 0x428($s1) -/* 1AF03C 8028075C 3C06800E */ lui $a2, %hi(gBattleStatus) -/* 1AF040 80280760 24C6C070 */ addiu $a2, $a2, %lo(gBattleStatus) -/* 1AF044 80280764 A4C301A0 */ sh $v1, 0x1a0($a2) -/* 1AF048 80280768 92230426 */ lbu $v1, 0x426($s1) -/* 1AF04C 8028076C 0040282D */ daddu $a1, $v0, $zero -/* 1AF050 80280770 0C09FEE0 */ jal dispatch_damage_event_partner_0 -/* 1AF054 80280774 A0C301A2 */ sb $v1, 0x1a2($a2) -/* 1AF058 80280778 04420005 */ bltzl $v0, .L80280790 -/* 1AF05C 8028077C 0000102D */ daddu $v0, $zero, $zero -/* 1AF060 80280780 0C0B1069 */ jal does_script_exist_by_ref -/* 1AF064 80280784 0240202D */ daddu $a0, $s2, $zero -/* 1AF068 80280788 0002102B */ sltu $v0, $zero, $v0 -/* 1AF06C 8028078C 00021040 */ sll $v0, $v0, 1 -.L80280790: -/* 1AF070 80280790 8FBF001C */ lw $ra, 0x1c($sp) -/* 1AF074 80280794 8FB20018 */ lw $s2, 0x18($sp) -/* 1AF078 80280798 8FB10014 */ lw $s1, 0x14($sp) -/* 1AF07C 8028079C 8FB00010 */ lw $s0, 0x10($sp) -/* 1AF080 802807A0 03E00008 */ jr $ra -/* 1AF084 802807A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/src/code_190B20.c b/src/code_190B20.c index 1d43f155c3..be0a49829a 100644 --- a/src/code_190B20.c +++ b/src/code_190B20.c @@ -678,7 +678,7 @@ s32 get_defense(Actor* actor, s32* defenseTable, s32 elementFlags) { INCLUDE_ASM(s32, "code_190B20", func_802664DC); -INCLUDE_ASM(s32, "code_190B20", show_damage_popup); +INCLUDE_ASM(void, "code_190B20", show_damage_popup, f32 x, f32 y, f32 z, s32 damageAmount); INCLUDE_ASM(s32, "code_190B20", func_80266684); diff --git a/src/code_1AC760.c b/src/code_1AC760.c index 7be08adb0d..a9b1288344 100644 --- a/src/code_1AC760.c +++ b/src/code_1AC760.c @@ -1,7 +1,6 @@ #include "common.h" #include "battle/battle.h" -//INCLUDE_ASM(s32, "code_1AC760", dispatch_event_partner); void dispatch_event_partner(s8 lastEventType) { BattleStatus* battleStatus = &gBattleStatus; s32 temp_ret; @@ -26,7 +25,6 @@ void dispatch_event_partner(s8 lastEventType) { } } - void dispatch_event_partner_continue_turn(s8 lastEventType) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor;