Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2025-01-31 18:02:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename rom_803BA2C.s to calculate_base_damage.s

Browse Source
This commit is contained in:
YamaArashi 2016-10-17 18:55:49 -07:00
parent 3d23a0c3cc
commit 8703c1edc9
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -48,7 +48,7 @@ C_OBJS := $(C_SRCS:%.c=%.o)
ASM_OBJS := asm/crt0.o asm/rom3.o asm/rom_8040EB4.o asm/rom4.o asm/rom_8074BAC.o asm/rom5.o asm/rom5_part2.o asm/rom6.o\
asm/libgcnmultiboot.o asm/m4a_1.o asm/m4a_3.o asm/libagbsyscall.o \
asm/tileset.o asm/rom_8065394.o asm/rom_803D1FC.o asm/rom_803BA2C.o \
asm/tileset.o asm/rom_8065394.o asm/rom_803D1FC.o asm/calculate_base_damage.o \
asm/rom_813BA94.o asm/rom_81258BC.o asm/mystery_event_script.o \
asm/field_effect_helpers.o asm/contest_ai.o asm/berry.o asm/rom_80B5054.o \
asm/party_menu.o asm/rom_806D7F8.o

6
asm/rom_803BA2C.s → asm/calculate_base_damage.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_803BA2C
sub_803BA2C: @ 803BA2C
thumb_func_start CalculateBaseDamage
CalculateBaseDamage: @ 803BA2C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@ -1160,6 +1160,6 @@ _0803C330:
bx r1
.align 2, 0
_0803C344: .4byte 0x02017100
thumb_func_end sub_803BA2C
thumb_func_end CalculateBaseDamage
.align 2, 0 @ Don't pad with nop.

12
asm/rom3.s
View File

@ -24358,7 +24358,7 @@ _08017CB8:
adds r0, r1, 0
movs r2, 0x1
movs r3, 0
bl sub_803BA2C
bl CalculateBaseDamage
ldr r1, _08017D10
str r0, [r1]
ldr r0, _08017D14
@ -31846,7 +31846,7 @@ _0801BBE0:
adds r0, r1, 0
movs r2, 0x1
movs r3, 0
bl sub_803BA2C
bl CalculateBaseDamage
ldr r1, _0801BC3C
str r0, [r1]
ldr r1, _0801BC40
@ -33607,7 +33607,7 @@ atk05_cmd5: @ 801C9EC
str r4, [sp, 0x8]
ldrb r4, [r6]
str r4, [sp, 0xC]
bl sub_803BA2C
bl CalculateBaseDamage
ldr r4, _0801CADC
ldr r1, _0801CAE0
ldrb r1, [r1]
@ -33727,7 +33727,7 @@ sub_801CAF8: @ 801CAF8
str r4, [sp, 0x4]
str r7, [sp, 0x8]
str r5, [sp, 0xC]
bl sub_803BA2C
bl CalculateBaseDamage
ldr r4, _0801CBD4
movs r1, 0
mov r2, r8
@ -51767,7 +51767,7 @@ _08025C1C:
str r4, [sp, 0x8]
ldrb r4, [r5]
str r4, [sp, 0xC]
bl sub_803BA2C
bl CalculateBaseDamage
ldrb r2, [r6]
lsls r1, r2, 3
subs r1, r2
@ -59477,7 +59477,7 @@ _08029964:
str r4, [sp, 0x8]
ldrb r4, [r7]
str r4, [sp, 0xC]
bl sub_803BA2C
bl CalculateBaseDamage
ldrb r1, [r7]
lsls r1, 2
mov r2, r8

2
ld_script.txt
View File

@ -48,7 +48,7 @@ SECTIONS {
src/main_menu.o(.text);
asm/rom3.o(.text);
src/pokemon_1.o(.text);
asm/rom_803BA2C.o(.text);
asm/calculate_base_damage.o(.text);
src/pokemon_2.o(.text);
asm/rom_803D1FC.o(.text);
src/trig.o(.text);