ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 22:03:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

recorded player controller is done

Browse Source
This commit is contained in:
DizzyEggg 2017-10-23 13:32:11 +02:00
parent aa7e97945b
commit 918625196e
8 changed files with 1726 additions and 6165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/battle_controller_recorded_opponent.s
View File

@ -4748,7 +4748,7 @@ sub_8188EF0: @ 8188EF0
push {lr} push {lr}
ldr r0, =gActiveBank ldr r0, =gActiveBank
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8185054 bl RecordedBattle_ReadBankAction
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -4791,12 +4791,12 @@ sub_8188F20: @ 8188F20
_08188F48: _08188F48:
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r0, [r5] ldrb r0, [r5]
bl sub_8185054 bl RecordedBattle_ReadBankAction
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldrb r0, [r5] ldrb r0, [r5]
bl sub_8185054 bl RecordedBattle_ReadBankAction
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 24 lsls r2, 24
lsrs r2, 16 lsrs r2, 16
@ -4825,7 +4825,7 @@ sub_8188F88: @ 8188F88
push {r4,lr} push {r4,lr}
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]
bl sub_8185054 bl RecordedBattle_ReadBankAction
ldrb r1, [r4] ldrb r1, [r4]
ldr r3, =gBattleStruct ldr r3, =gBattleStruct
ldr r2, [r3] ldr r2, [r3]

6090
asm/battle_controller_recorded_player.s
View File

File diff suppressed because it is too large Load Diff

10
asm/recorded_battle.s
View File

@ -312,8 +312,8 @@ _08185046:
.pool .pool
thumb_func_end RecordedBattle_ClearBankAction thumb_func_end RecordedBattle_ClearBankAction
thumb_func_start sub_8185054 thumb_func_start RecordedBattle_ReadBankAction
sub_8185054: @ 8185054 RecordedBattle_ReadBankAction: @ 8185054
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@ -364,7 +364,7 @@ _081850C6:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8185054 thumb_func_end RecordedBattle_ReadBankAction
thumb_func_start sub_81850D0 thumb_func_start sub_81850D0
sub_81850D0: @ 81850D0 sub_81850D0: @ 81850D0
@ -2274,7 +2274,7 @@ _0818611E:
b _081863EE b _081863EE
_08186142: _08186142:
adds r0, r5, 0 adds r0, r5, 0
bl sub_8185054 bl RecordedBattle_ReadBankAction
movs r5, 0 movs r5, 0
mov r0, sp mov r0, sp
adds r0, 0x4 adds r0, 0x4
@ -2326,7 +2326,7 @@ _0818617E:
_081861A6: _081861A6:
ldr r3, [sp, 0x4C] ldr r3, [sp, 0x4C]
lsrs r0, r3, 24 lsrs r0, r3, 24
bl sub_8185054 bl RecordedBattle_ReadBankAction
strb r0, [r4] strb r0, [r4]
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1

2
include/recorded_battle.h
View File

@ -6,6 +6,7 @@ extern u32 gRecordedBattleRngSeed;
void sub_8184DA4(u8 arg0); void sub_8184DA4(u8 arg0);
void sub_8185F84(void); void sub_8185F84(void);
void sub_8184E58(void); void sub_8184E58(void);
u8 RecordedBattle_ReadBankAction(u8 bank);
void RecordedBattle_SetBankAction(u8 bank, u8 action); void RecordedBattle_SetBankAction(u8 bank, u8 action);
void RecordedBattle_ClearBankAction(u8 bank, u8 bytesToClear); void RecordedBattle_ClearBankAction(u8 bank, u8 bytesToClear);
void sub_8185F90(u16 arg0); void sub_8185F90(u16 arg0);
@ -18,5 +19,6 @@ void sub_8185FD0(void);
void sub_8186444(void); void sub_8186444(void);
void sub_8185EB8(void); void sub_8185EB8(void);
u8 sub_81850DC(u8 *arg0); u8 sub_81850DC(u8 *arg0);
u8 sub_8185F40(void);
#endif // GUARD_RECORDED_BATTLE_H #endif // GUARD_RECORDED_BATTLE_H

1
ld_script.txt
View File

@ -236,7 +236,6 @@ SECTIONS {
asm/recorded_battle.o(.text); asm/recorded_battle.o(.text);
asm/battle_controller_recorded_opponent.o(.text); asm/battle_controller_recorded_opponent.o(.text);
src/battle_controller_recorded_player.o(.text); src/battle_controller_recorded_player.o(.text);
asm/battle_controller_recorded_player.o(.text);
src/battle_dome_cards.o(.text); src/battle_dome_cards.o(.text);
src/lilycove_lady.o(.text); src/lilycove_lady.o(.text);
asm/battle_frontier_1.o(.text); asm/battle_frontier_1.o(.text);

2
src/battle_controller_player.c
View File

@ -2510,7 +2510,7 @@ static void PlayerHandleMoveAnimation(void)
gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16]; gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality; gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always return FALSE if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE
{ {
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }

2
src/battle_controller_player_partner.c
View File

@ -1456,7 +1456,7 @@ static void PlayerPartnerHandleMoveAnimation(void)
gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8); gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16]; gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality; gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always return FALSE if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE
{ {
PlayerPartnerBufferExecCompleted(); PlayerPartnerBufferExecCompleted();
} }

1776
src/battle_controller_recorded_player.c
View File

File diff suppressed because it is too large Load Diff