diff options
| -rw-r--r-- | asm/battle_811DA74.s | 100 | ||||
| -rw-r--r-- | src/battle_811DA74.c | 48 |
2 files changed, 48 insertions, 100 deletions
diff --git a/asm/battle_811DA74.s b/asm/battle_811DA74.s index 3d452712f..7db510f0e 100644 --- a/asm/battle_811DA74.s +++ b/asm/battle_811DA74.s @@ -6,106 +6,6 @@ .text - thumb_func_start sub_8120094 -sub_8120094: @ 8120094 - push {r4,lr} - sub sp, 0x4 - ldr r0, _081200D8 @ =gUnknown_030042A4 - movs r1, 0 - strh r1, [r0] - ldr r0, _081200DC @ =gUnknown_030042A0 - strh r1, [r0] - ldr r4, _081200E0 @ =gUnknown_02024A60 - ldrb r0, [r4] - lsls r0, 9 - ldr r1, _081200E4 @ =gUnknown_02023A62 - adds r0, r1 - ldrh r0, [r0] - bl sub_8120AA8 - ldr r0, _081200E8 @ =gUnknown_03004210 - ldr r1, _081200EC @ =gUnknown_020238CC - movs r2, 0xF - str r2, [sp] - movs r2, 0x90 - movs r3, 0x2 - bl sub_8002EB0 - ldr r1, _081200F0 @ =gUnknown_03004330 - ldrb r0, [r4] - lsls r0, 2 - adds r0, r1 - ldr r1, _081200F4 @ =sub_811DFA0 - str r1, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081200D8: .4byte gUnknown_030042A4 -_081200DC: .4byte gUnknown_030042A0 -_081200E0: .4byte gUnknown_02024A60 -_081200E4: .4byte gUnknown_02023A62 -_081200E8: .4byte gUnknown_03004210 -_081200EC: .4byte gUnknown_020238CC -_081200F0: .4byte gUnknown_03004330 -_081200F4: .4byte sub_811DFA0 - thumb_func_end sub_8120094 - - thumb_func_start sub_81200F8 -sub_81200F8: @ 81200F8 - push {lr} - bl dp01_tbl3_exec_completed - pop {r0} - bx r0 - thumb_func_end sub_81200F8 - - thumb_func_start sub_8120104 -sub_8120104: @ 8120104 - push {lr} - bl dp01_tbl3_exec_completed - pop {r0} - bx r0 - thumb_func_end sub_8120104 - - thumb_func_start sub_8120110 -sub_8120110: @ 8120110 - push {lr} - bl dp01_tbl3_exec_completed - pop {r0} - bx r0 - thumb_func_end sub_8120110 - - thumb_func_start sub_812011C -sub_812011C: @ 812011C - push {lr} - bl dp01_tbl3_exec_completed - pop {r0} - bx r0 - thumb_func_end sub_812011C - - thumb_func_start sub_8120128 -sub_8120128: @ 8120128 - push {lr} - bl dp01_tbl3_exec_completed - pop {r0} - bx r0 - thumb_func_end sub_8120128 - - thumb_func_start sub_8120134 -sub_8120134: @ 8120134 - push {lr} - bl dp01_tbl3_exec_completed - pop {r0} - bx r0 - thumb_func_end sub_8120134 - - thumb_func_start sub_8120140 -sub_8120140: @ 8120140 - push {lr} - bl dp01_tbl3_exec_completed - pop {r0} - bx r0 - thumb_func_end sub_8120140 - thumb_func_start sub_812014C sub_812014C: @ 812014C push {r4-r7,lr} diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c index a1b41d7bb..f4e2cc57d 100644 --- a/src/battle_811DA74.c +++ b/src/battle_811DA74.c @@ -49,6 +49,7 @@ struct UnknownStruct4 extern u32 gBitTable[]; extern u16 gBattleTypeFlags; +extern u8 gUnknown_020238CC[]; extern u8 gUnknown_02023A60[][0x200]; extern u8 gUnknown_02024A60; extern u32 gUnknown_02024A64; @@ -64,6 +65,8 @@ extern u8 gUnknown_0202F7BE; extern u16 gUnknown_0202F7C0; extern u8 gUnknown_0202F7C4; extern struct Window gUnknown_03004210; +extern u16 gUnknown_030042A0; +extern u16 gUnknown_030042A4; extern MainCallback gUnknown_030042D0; extern void (*gUnknown_03004330[])(void); extern u8 gUnknown_03004340[]; @@ -78,6 +81,7 @@ extern u8 ewram[]; #define ewram17800 ((struct UnknownStruct4 *)(ewram + 0x17800)) #define ewram17810 ((struct UnknownStruct2 *)(ewram + 0x17810)) +extern void sub_8120AA8(); extern void sub_8031F24(void); extern void sub_80326EC(); extern void ExecuteMoveAnim(); @@ -1239,3 +1243,47 @@ void sub_811FF30(void) break; } } + +void sub_8120094(void) +{ + gUnknown_030042A4 = 0; + gUnknown_030042A0 = 0; + sub_8120AA8(*(u16 *)&gUnknown_02023A60[gUnknown_02024A60][2]); + sub_8002EB0(&gUnknown_03004210, gUnknown_020238CC, 144, 2, 15); + gUnknown_03004330[gUnknown_02024A60] = sub_811DFA0; +} + +void sub_81200F8(void) +{ + dp01_tbl3_exec_completed(); +} + +void sub_8120104(void) +{ + dp01_tbl3_exec_completed(); +} + +void sub_8120110(void) +{ + dp01_tbl3_exec_completed(); +} + +void sub_812011C(void) +{ + dp01_tbl3_exec_completed(); +} + +void sub_8120128(void) +{ + dp01_tbl3_exec_completed(); +} + +void sub_8120134(void) +{ + dp01_tbl3_exec_completed(); +} + +void sub_8120140(void) +{ + dp01_tbl3_exec_completed(); +} |