ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

player partner controller is done

Browse Source
This commit is contained in:
DizzyEggg 2017-10-23 11:07:36 +02:00
parent 21f4995922
commit a8ea415c81
8 changed files with 1849 additions and 6373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/battle_controller_linkopponent.s
View File

@ -4047,7 +4047,7 @@ _08066794:
ldr r0, =gTrainerBattleOpponent_B ldr r0, =gTrainerBattleOpponent_B
_08066796: _08066796:
ldrh r0, [r0] ldrh r0, [r0]
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
b _0806694C b _0806694C
@ -4379,7 +4379,7 @@ _08066A74:
ldr r0, =gTrainerBattleOpponent_B ldr r0, =gTrainerBattleOpponent_B
_08066A76: _08066A76:
ldrh r0, [r0] ldrh r0, [r0]
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0

12
asm/battle_controller_opponent.s
View File

@ -4238,18 +4238,18 @@ _08061708:
cmp r0, 0x1 cmp r0, 0x1
bne _08061734 bne _08061734
ldrh r0, [r3] ldrh r0, [r3]
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
b _0806175A b _0806175A
.pool .pool
_08061734: _08061734:
ldr r0, =gTrainerBattleOpponent_B ldr r0, =gTrainerBattleOpponent_B
ldrh r0, [r0] ldrh r0, [r0]
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
b _0806175A b _0806175A
.pool .pool
_08061744: _08061744:
ldrh r0, [r3] ldrh r0, [r3]
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
b _0806175A b _0806175A
_0806174C: _0806174C:
movs r0, 0x80 movs r0, 0x80
@ -4485,18 +4485,18 @@ _08061950:
cmp r0, 0x1 cmp r0, 0x1
bne _0806197C bne _0806197C
ldrh r0, [r3] ldrh r0, [r3]
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
b _080619A2 b _080619A2
.pool .pool
_0806197C: _0806197C:
ldr r0, =gTrainerBattleOpponent_B ldr r0, =gTrainerBattleOpponent_B
ldrh r0, [r0] ldrh r0, [r0]
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
b _080619A2 b _080619A2
.pool .pool
_0806198C: _0806198C:
ldrh r0, [r3] ldrh r0, [r3]
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
b _080619A2 b _080619A2
_08061994: _08061994:
movs r0, 0x80 movs r0, 0x80

6295
asm/battle_controller_player_partner.s
View File

File diff suppressed because it is too large Load Diff

2
asm/battle_controller_recorded_opponent.s
View File

@ -4045,7 +4045,7 @@ _081888D8:
ldr r0, =gTrainerBattleOpponent_B ldr r0, =gTrainerBattleOpponent_B
_081888DA: _081888DA:
ldrh r0, [r0] ldrh r0, [r0]
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
b _0818892C b _0818892C

6
asm/battle_frontier_1.s
View File

@ -6971,7 +6971,7 @@ _08192598:
.pool .pool
_081925AC: _081925AC:
ldr r0, [sp, 0x24] ldr r0, [sp, 0x24]
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
_081925B2: _081925B2:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -8554,7 +8554,7 @@ _081932D4:
_081932E4: _081932E4:
lsls r0, r1, 16 lsls r0, r1, 16
lsrs r0, 16 lsrs r0, 16
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
_081932EC: _081932EC:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -8642,7 +8642,7 @@ _08193388:
_081933A4: _081933A4:
lsls r0, r1, 16 lsls r0, r1, 16
lsrs r0, 16 lsrs r0, 16
bl sub_8162AA0 bl GetFrontierTrainerFrontSpriteId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
_081933B0: _081933B0:

6
asm/battle_tower.s
View File

@ -1329,8 +1329,8 @@ _08162A8A:
.pool .pool
thumb_func_end sub_81628A0 thumb_func_end sub_81628A0
thumb_func_start sub_8162AA0 thumb_func_start GetFrontierTrainerFrontSpriteId
sub_8162AA0: @ 8162AA0 GetFrontierTrainerFrontSpriteId: @ 8162AA0
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@ -1454,7 +1454,7 @@ _08162BCA:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_8162AA0 thumb_func_end GetFrontierTrainerFrontSpriteId
thumb_func_start GetFrontierOpponentClass thumb_func_start GetFrontierOpponentClass
GetFrontierOpponentClass: @ 8162BD8 GetFrontierOpponentClass: @ 8162BD8

1
ld_script.txt
View File

@ -254,7 +254,6 @@ SECTIONS {
src/multiboot.o(.text); src/multiboot.o(.text);
asm/unk_81BAD84.o(.text); asm/unk_81BAD84.o(.text);
src/battle_controller_player_partner.o(.text); src/battle_controller_player_partner.o(.text);
asm/battle_controller_player_partner.o(.text);
asm/fldeff_groundshake.o(.text); asm/fldeff_groundshake.o(.text);
asm/fossil_specials.o(.text); asm/fossil_specials.o(.text);
src/berry_fix_program.o(.text); src/berry_fix_program.o(.text);

1896
src/battle_controller_player_partner.c
View File

File diff suppressed because it is too large Load Diff