summaryrefslogtreecommitdiff
path: root/asm/rom5.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-09-10 01:59:10 -0700
committerYamaArashi <shadow962@live.com>2016-09-10 01:59:10 -0700
commit19bffecc4deb401aa51add3b95163b72686f40ee (patch)
treebe5ff81cfaeb53b8c386147877fef8ceeb2ec283 /asm/rom5.s
parent69ca60ca91e3cf0d3dc323bf30bb7d79c77464d8 (diff)
decompile more pokemon functions
Diffstat (limited to 'asm/rom5.s')
-rw-r--r--asm/rom5.s66
1 files changed, 33 insertions, 33 deletions
diff --git a/asm/rom5.s b/asm/rom5.s
index d7cca7b02..3792b1948 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -571,7 +571,7 @@ _0807B1FE:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r5, _0807B2C4
adds r0, r7, 0
movs r1, 0x2
@@ -666,7 +666,7 @@ _0807B2D8:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r6, _0807B330
ldr r1, _0807B334
ldrb r0, [r5, 0x8]
@@ -707,7 +707,7 @@ _0807B338:
lsls r1, 24
lsrs r1, 24
movs r0, 0x2
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r5, _0807B3BC
ldr r0, _0807B3C0
ldrb r0, [r0, 0x8]
@@ -795,7 +795,7 @@ _0807B3D0:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r5, _0807B4F0
adds r0, r7, 0
movs r1, 0x2
@@ -22601,7 +22601,7 @@ sub_8085AD4: @ 8085AD4
bl LoadCompressedObjectPalette
adds r0, r4, 0
movs r1, 0x3
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r4, _08085B84
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2]
@@ -22690,7 +22690,7 @@ sub_8085B88: @ 8085B88
bl LoadCompressedObjectPalette
adds r0, r5, 0
movs r1, 0x3
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r5, _08085C40
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x2]
@@ -67762,7 +67762,7 @@ _0809C08C:
adds r1, r6, r2
str r0, [r1]
adds r0, r7, 0
- bl pokemon_get_gender
+ bl GetMonGender
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -67836,7 +67836,7 @@ _0809C120:
str r0, [r1]
ldrh r0, [r5]
ldr r1, [r4]
- bl pokemon_species_get_gender_info
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -74661,7 +74661,7 @@ _0809F718:
bl LoadCompressedObjectPalette
ldrh r0, [r4, 0x4]
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
_0809F74E:
ldrb r0, [r7]
adds r0, 0x1
@@ -77000,7 +77000,7 @@ sub_80A0A2C: @ 80A0A2C
cmp r0, 0x1D
beq _080A0A84
adds r0, r6, 0
- bl pokemon_get_gender
+ bl GetMonGender
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -105501,7 +105501,7 @@ unref_sub_80AE908: @ 80AE908
add r0, r9
ldrh r0, [r0]
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _080AE9EC
mov r2, r8
ldrb r1, [r2]
@@ -105608,7 +105608,7 @@ sub_80AE9FC: @ 80AE9FC
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r4, _080AEAD8
movs r0, 0x2
adds r1, r5, 0
@@ -141196,7 +141196,7 @@ sub_80BF9F8: @ 80BF9F8
muls r1, r0
adds r0, r1, 0
adds r0, r6
- bl pokemon_get_gender
+ bl GetMonGender
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -146987,7 +146987,7 @@ _080C2B14:
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _080C2BE8
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
@@ -151855,7 +151855,7 @@ sub_80C5050: @ 80C5050
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _080C5158
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
@@ -253387,7 +253387,7 @@ _080F655E:
lsrs r0, 16
str r0, [sp, 0x8]
adds r0, r4, 0
- bl pokemon_get_gender
+ bl GetMonGender
b _080F65EA
.align 2, 0
_080F65A4: .4byte gUnknown_083DFEC4
@@ -253418,7 +253418,7 @@ _080F65B4:
bl sub_80F44B0
adds r1, r0, 0
mov r0, r9
- bl pokemon_species_get_gender_info
+ bl GetGenderFromSpeciesAndPersonality
_080F65EA:
lsls r0, 24
lsrs r4, r0, 24
@@ -293346,7 +293346,7 @@ _081094D2:
adds r2, 0x48
adds r1, r2
ldr r1, [r1]
- bl pokemon_species_get_gender_info
+ bl GetGenderFromSpeciesAndPersonality
ldr r1, _08109504
lsls r0, 24
lsrs r0, 24
@@ -295504,7 +295504,7 @@ sub_810A580: @ 810A580
bl LoadCompressedObjectPalette
adds r0, r5, 0
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _0810A620
mov r1, r8
mov r2, r9
@@ -310573,7 +310573,7 @@ evolution_cutscene: @ 8111984
bl LoadCompressedPalette
adds r0, r6, 0
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08111C60
mov r9, r0
ldr r1, _08111C64
@@ -310639,7 +310639,7 @@ evolution_cutscene: @ 8111984
bl LoadCompressedPalette
mov r0, r10
movs r1, 0x3
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08111C64
mov r1, r9
str r0, [r1, 0x10]
@@ -310881,7 +310881,7 @@ sub_8111C90: @ 8111C90
bl LoadCompressedPalette
adds r0, r6, 0
movs r1, 0x3
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08111E64
ldr r1, _08111E68
str r1, [r0, 0x10]
@@ -311156,7 +311156,7 @@ _08112044: .4byte 0x0000043c
_08112048:
adds r0, r7, 0
movs r1, 0x3
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08112098
ldr r1, _0811209C
str r1, [r0, 0x10]
@@ -311307,7 +311307,7 @@ sub_81120E4: @ 81120E4
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08112254
ldr r1, _08112258
str r1, [r0, 0x10]
@@ -338019,7 +338019,7 @@ sub_811F6D8: @ 811F6D8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _0811F7D8
mov r8, r0
ldrb r0, [r6]
@@ -338211,7 +338211,7 @@ sub_811F864: @ 811F864
lsls r1, 24
lsrs r1, 24
mov r0, r8
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _0811F9BC
mov r10, r0
adds r0, r6, 0
@@ -338520,7 +338520,7 @@ _0811FB34:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r0, _0811FC10
mov r8, r0
lsls r5, 16
@@ -363295,7 +363295,7 @@ sub_812B8B8: @ 812B8B8
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r0, _0812B974
ldr r2, _0812B978
ldrb r1, [r4, 0x8]
@@ -390330,7 +390330,7 @@ sub_8138D38: @ 8138D38
lsls r1, 24
lsrs r1, 24
movs r0, 0x2
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r0, _08138DE4
ldr r1, _08138DE8
ldrb r1, [r1, 0x8]
@@ -390424,7 +390424,7 @@ sub_8138E04: @ 8138E04
lsls r1, 24
lsrs r1, 24
movs r0, 0x2
- bl sub_803C5A0
+ bl GetMonSpriteTemplate_803C5A0
ldr r0, _08138EB0
ldr r1, _08138EB4
ldrb r1, [r1, 0x8]
@@ -391804,7 +391804,7 @@ sub_81398BC: @ 81398BC
lsls r1, 24
lsrs r1, 24
mov r0, r8
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
ldr r0, _08139A18
mov r10, r0
adds r0, r6, 0
@@ -411180,7 +411180,7 @@ _08143204:
lsrs r0, 23
mov r2, r9
ldr r1, [r2, 0x4]
- bl pokemon_species_get_gender_info
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -420273,7 +420273,7 @@ _08147BB8:
bl LoadCompressedObjectPalette
ldrh r0, [r4, 0x4]
movs r1, 0x1
- bl gpu_pal_obj_decompress_and_apply
+ bl GetMonSpriteTemplate_803C56C
b _08147C40
_08147BF0:
ldr r0, _08147BF8