dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

up to x48 and troubles

Browse Source
This commit is contained in:
DizzyEggg
2017-09-22 21:33:49 +02:00
parent cf26b0e125
commit d5afb0c6e9
22 changed files with 2013 additions and 6095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
asm/battle_2.s
View File

@@ -6513,7 +6513,7 @@ _0803A0AE:
ldr r5, =gPauseCounterBattle
ldr r6, =gBattleMoveDamage
ldr r7, =gUnknown_020243FC
ldr r0, =gUnknown_03005D54
ldr r0, =gLeveledUpInBattle
mov r8, r0
ldr r1, =gAbsentBankFlags
mov r9, r1
@@ -7256,8 +7256,8 @@ _0803A6B4:
.pool
thumb_func_end sub_803A284
thumb_func_start sub_803A75C
sub_803A75C: @ 803A75C
thumb_func_start UndoEffectsAfterFainting
UndoEffectsAfterFainting: @ 803A75C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -7786,7 +7786,7 @@ _0803AB6C:
pop {r0}
bx r0
.pool
thumb_func_end sub_803A75C
thumb_func_end UndoEffectsAfterFainting
thumb_func_start bc_8012FAC
bc_8012FAC: @ 803ABC0
@@ -12891,7 +12891,7 @@ _0803D920:
ands r2, r0
cmp r2, 0
beq _0803D95C
bl sub_805EA60
bl BattleMusicStop
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DAA87
str r0, [r1]
@@ -12912,7 +12912,7 @@ _0803D95C:
beq _0803D968
b _0803DA9E
_0803D968:
bl sub_805EA60
bl BattleMusicStop
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DA92D
str r0, [r1]
@@ -13371,7 +13371,7 @@ sub_803DE40: @ 803DE40
cmp r0, 0
bne _0803DE86
bl ResetSpriteData
ldr r0, =gUnknown_03005D54
ldr r0, =gLeveledUpInBattle
ldrb r0, [r0]
cmp r0, 0
beq _0803DE62
@@ -13409,7 +13409,7 @@ _0803DEA2:
thumb_func_start bc_evolution_cutscene
bc_evolution_cutscene: @ 803DEB4
push {r4-r6,lr}
ldr r0, =gUnknown_03005D54
ldr r0, =gLeveledUpInBattle
ldrb r1, [r0]
adds r3, r0, 0
cmp r1, 0
@@ -13454,7 +13454,7 @@ _0803DEC2:
.pool
_0803DF20:
adds r6, 0x1
ldr r3, =gUnknown_03005D54
ldr r3, =gLeveledUpInBattle
cmp r6, 0x5
ble _0803DEC2
ldrb r0, [r3]
@@ -16323,7 +16323,7 @@ PrepareStringBattle: @ 803F964
sub_803F988: @ 803F988
push {r4-r6,lr}
movs r3, 0
ldr r0, =gUnknown_020243FE
ldr r0, =gSentPokesToOpponent
strb r3, [r0]
strb r3, [r0, 0x1]
movs r1, 0
@@ -16351,7 +16351,7 @@ _0803F9B6:
ldrb r0, [r2]
cmp r1, r0
bge _0803F9D6
ldr r5, =gUnknown_020243FE
ldr r5, =gSentPokesToOpponent
movs r4, 0x2
_0803F9C4:
adds r0, r1, 0
@@ -16389,7 +16389,7 @@ sub_803F9EC: @ 803F9EC
lsls r0, 24
lsrs r0, 25
mov r12, r0
ldr r1, =gUnknown_020243FE
ldr r1, =gSentPokesToOpponent
adds r0, r1
strb r4, [r0]
adds r5, r4, 0
@@ -16453,7 +16453,7 @@ _0803FA8C:
ldrb r0, [r5]
cmp r3, r0
bge _0803FAC2
ldr r0, =gUnknown_020243FE
ldr r0, =gSentPokesToOpponent
mov r12, r0
movs r7, 0x2
ldr r6, =gBitTable

5876
asm/battle_4.s
View File

File diff suppressed because it is too large Load Diff

12
asm/battle_5.s
View File

@@ -183,8 +183,8 @@ _080570D0:
.pool
thumb_func_end sub_8057028
thumb_func_start sub_80570F4
sub_80570F4: @ 80570F4
thumb_func_start AdjustFriendshipOnBattleFaint
AdjustFriendshipOnBattleFaint: @ 80570F4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -285,7 +285,7 @@ _080571CE:
pop {r0}
bx r0
.pool
thumb_func_end sub_80570F4
thumb_func_end AdjustFriendshipOnBattleFaint
thumb_func_start sub_80571DC
sub_80571DC: @ 80571DC
@@ -414,7 +414,7 @@ _0805729A:
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl b_movescr_stack_push_cursor
bl BattleScriptPushCursor
movs r0, 0x1
mov r2, r10
strb r0, [r2, 0x5]
@@ -474,7 +474,7 @@ _08057354:
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl b_movescr_stack_push_cursor
bl BattleScriptPushCursor
ldr r0, =gBattleCommunication
strb r4, [r0, 0x5]
ldr r1, =gBattlescriptCurrInstr
@@ -523,7 +523,7 @@ _080573D4:
negs r1, r1
ands r0, r1
str r0, [r4]
bl b_movescr_stack_push_cursor
bl BattleScriptPushCursor
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedUnfroze
str r0, [r1]

6
asm/battle_7.s
View File

@@ -2937,8 +2937,8 @@ _0805EA5A:
bx r0
thumb_func_end sub_805E990
thumb_func_start sub_805EA60
sub_805EA60: @ 805EA60
thumb_func_start BattleMusicStop
BattleMusicStop: @ 805EA60
push {r4-r6,lr}
movs r0, 0
bl GetBankByPlayerAI
@@ -2977,7 +2977,7 @@ _0805EAA2:
pop {r0}
bx r0
.pool
thumb_func_end sub_805EA60
thumb_func_end BattleMusicStop
thumb_func_start sub_805EAB4
sub_805EAB4: @ 805EAB4

2
asm/battle_controller_linkopponent.s
View File

@@ -5565,7 +5565,7 @@ sub_806743C: @ 806743C
ldrb r0, [r0]
cmp r0, 0
beq _08067478
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1

2
asm/battle_controller_linkpartner.s
View File

@@ -4874,7 +4874,7 @@ sub_814D9D8: @ 814D9D8
ldrb r0, [r0]
cmp r0, 0
beq _0814DA14
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1

2
asm/battle_controller_opponent.s
View File

@@ -6015,7 +6015,7 @@ sub_8062630: @ 8062630
ldrb r0, [r0]
cmp r0, 0
beq _0806266C
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1

4
asm/battle_controller_player.s
View File

@@ -8913,7 +8913,7 @@ _0805C3BC:
sub_805C3EC: @ 805C3EC
push {lr}
sub sp, 0x4
bl sub_805EA60
bl BattleMusicStop
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -9595,7 +9595,7 @@ sub_805C9B0: @ 805C9B0
ldrb r0, [r0]
cmp r0, 0
beq _0805C9EC
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1

2
asm/battle_controller_player_partner.s
View File

@@ -5661,7 +5661,7 @@ sub_81BE03C: @ 81BE03C
ldrb r0, [r0]
cmp r0, 0
beq _081BE078
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1

2
asm/battle_controller_recorded_opponent.s
View File

@@ -5304,7 +5304,7 @@ sub_818936C: @ 818936C
ldrb r0, [r0]
cmp r0, 0
beq _081893A8
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1

2
asm/battle_controller_recorded_player.s
View File

@@ -5455,7 +5455,7 @@ sub_818C994: @ 818C994
ldrb r0, [r0]
cmp r0, 0
beq _0818C9D0
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1

2
asm/battle_controller_safari.s
View File

@@ -1161,7 +1161,7 @@ dp01t_34_6_move_anim_start_t3: @ 8159CC4
ldrb r0, [r0]
cmp r0, 0
beq _08159D00
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1

2
asm/battle_controller_wally.s
View File

@@ -4150,7 +4150,7 @@ sub_816A840: @ 816A840
ldrb r0, [r0]
cmp r0, 0
beq _0816A87C
bl sub_805EA60
bl BattleMusicStop
ldrb r1, [r5]
lsls r1, 9
adds r0, r4, 0x1

18
asm/rom3.s
View File

@@ -2355,8 +2355,8 @@ dp01_build_cmdbuf_x09_9_9_9: @ 8033A24
.pool
thumb_func_end dp01_build_cmdbuf_x09_9_9_9
thumb_func_start dp01_build_cmdbuf_x0A_A_A_A
dp01_build_cmdbuf_x0A_A_A_A: @ 8033A44
thumb_func_start EmitFaintAnimation
EmitFaintAnimation: @ 8033A44
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2371,7 +2371,7 @@ dp01_build_cmdbuf_x0A_A_A_A: @ 8033A44
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x0A_A_A_A
thumb_func_end EmitFaintAnimation
thumb_func_start dp01_build_cmdbuf_x0B_B_B_B
dp01_build_cmdbuf_x0B_B_B_B: @ 8033A64
@@ -2967,8 +2967,8 @@ EmitHealthBarUpdate: @ 8033EFC
.pool
thumb_func_end EmitHealthBarUpdate
thumb_func_start dp01_build_cmdbuf_x19_a_bb
dp01_build_cmdbuf_x19_a_bb: @ 8033F34
thumb_func_start EmitExpUpdate
EmitExpUpdate: @ 8033F34
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2993,7 +2993,7 @@ dp01_build_cmdbuf_x19_a_bb: @ 8033F34
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x19_a_bb
thumb_func_end EmitExpUpdate
thumb_func_start dp01_build_cmdbuf_x1A_aaaa_bbbb
dp01_build_cmdbuf_x1A_aaaa_bbbb: @ 8033F68
@@ -3661,8 +3661,8 @@ dp01_build_cmdbuf_x33_a_33_33: @ 8034414
.pool
thumb_func_end dp01_build_cmdbuf_x33_a_33_33
thumb_func_start dp01_build_cmdbuf_x34_a_bb_aka_battle_anim
dp01_build_cmdbuf_x34_a_bb_aka_battle_anim: @ 8034438
thumb_func_start EmitBattleAnimation
EmitBattleAnimation: @ 8034438
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -3682,7 +3682,7 @@ dp01_build_cmdbuf_x34_a_bb_aka_battle_anim: @ 8034438
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x34_a_bb_aka_battle_anim
thumb_func_end EmitBattleAnimation
thumb_func_start sub_8034464
sub_8034464: @ 8034464