diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-23 11:10:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-23 11:10:02 -0400 |
| commit | d461cbcaa18e282f0a1ac5954298f2185a69b7c5 (patch) | |
| tree | 99ce725ce6b91e9d340fad0b07ad2deae08327cf /data | |
| parent | 6e9821ca07a64ee09129038286aaba3eb1825946 (diff) | |
Sync more function names from Emerald
Diffstat (limited to 'data')
| -rw-r--r-- | data/contest.s | 8 | ||||
| -rw-r--r-- | data/mon_attrs.s | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/contest.s b/data/contest.s index 69a2f142d..d12044af9 100644 --- a/data/contest.s +++ b/data/contest.s @@ -40,7 +40,7 @@ gUnknown_083CA330:: @ 83CA330 .byte 224, 104 .byte 224, 144 -gUnknown_083CA338:: @ 83CA338 +sSliderHeartYPositions:: @ 83CA338 .byte 36, 76, 116, 156 gUnknown_083CA33C:: @ 83CA33C @@ -53,7 +53,7 @@ gUnknown_083CA340:: @ 83CA340 .byte 0, 37, 9, 39 .align 2 -gUnknown_083CA350:: @ 83CA350 +sSpriteSheet_SliderHeart:: @ 83CA350 obj_tiles gTiles_8D1975C, 0x20, 20004 .align 2 @@ -86,7 +86,7 @@ gSpriteAffineAnimTable_83CA3A0:: @ 83CA3A0 .4byte gSpriteAffineAnim_83CA388 .align 2 -gSpriteTemplate_83CA3AC:: @ 83CA3AC +sSpriteTemplate_SliderHeart:: @ 83CA3AC spr_template 20004, 44000, gOamData_83CA358, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83CA3A0, SpriteCallbackDummy .align 2 @@ -358,7 +358,7 @@ gUnknown_083CC5A4:: @ 83CC5A4 .include "data/contest_excitement_table.inc" .align 2 -gUnknown_083CC5D0:: @ 83CC5D0 +gDefaultContestWinners:: @ 83CC5D0 .4byte 0 .4byte 0xFFFF .2byte SPECIES_TAILLOW diff --git a/data/mon_attrs.s b/data/mon_attrs.s index ea47c8de6..76459ad44 100644 --- a/data/mon_attrs.s +++ b/data/mon_attrs.s @@ -138,7 +138,7 @@ gSpriteAffineAnim_81E7BDC:: @ 81E7BDC obj_rot_scal_anim_end .align 2 -gSpriteAffineAnimTable_81E7BEC:: @ 81E7BEC +gAffineAnims_BattleSpriteOpponentSide:: @ 81E7BEC .4byte gSpriteAffineAnim_81E7AA0 .4byte gSpriteAffineAnim_81E7AC0 .4byte gSpriteAffineAnim_81E7AD8 @@ -152,7 +152,7 @@ gSpriteAffineAnimTable_81E7BEC:: @ 81E7BEC .4byte gSpriteAffineAnim_81E7BDC .align 2 -gSpriteAffineAnimTable_81E7C18:: @ 81E7C18 +gAffineAnims_BattleSpriteContest:: @ 81E7C18 .4byte gSpriteAffineAnim_81E7AB0 .4byte gSpriteAffineAnim_81E7AC0 .4byte gSpriteAffineAnim_81E7AD8 |