diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-11-02 18:07:22 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-11-02 18:07:22 -0400 |
| commit | 94a4aab58089ab97ef9e1a88323e4c2db06a1cf6 (patch) | |
| tree | 057698d86c8a0ec168c76cd4913d39ce2024474e /asm | |
| parent | ae97c32f7d4b55ae83a65ce934b974937e0e93bd (diff) | |
Document mon_markings
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/pokemon_storage_system.s | 12 | ||||
| -rw-r--r-- | asm/pokemon_summary_screen.s | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index df7c4fbce..5c95eb22a 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -3112,8 +3112,8 @@ _0808D178: adds r2, r1 ldr r1, _0808D1B0 @ =0x0000dace strh r1, [r2] - bl sub_80BE46C - bl sub_80BE5F0 + bl SetMonMarkingsMenuPointer + bl LoadMonMarkingsFrameGfx b _0808D20C .align 2, 0 _0808D1A8: .4byte gUnknown_20397B0 @@ -4913,7 +4913,7 @@ _0808E0D4: ldrb r0, [r0] movs r1, 0xB0 movs r2, 0x10 - bl sub_80BE604 + bl DrawMonMarkingsMenu ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 @@ -4923,11 +4923,11 @@ _0808E0D4: _0808E100: .4byte 0x00000ce7 _0808E104: .4byte 0x00000da4 _0808E108: - bl sub_80BE6F0 + bl MonMarkingsHandleInput lsls r0, 24 cmp r0, 0 bne _0808E130 - bl sub_80BE658 + bl TeardownMonMarkingsMenu bl sub_808FD20 ldr r0, [r4] ldr r1, _0808E138 @ =0x00000da4 @@ -6839,7 +6839,7 @@ sub_808F0F4: @ 808F0F4 ldr r1, _0808F154 @ =0x0000dac8 movs r0, 0x10 movs r2, 0 - bl sub_80BEB00 + bl CreateMonMarkingSprite_AllOff ldr r4, _0808F158 @ =gUnknown_20397B0 ldr r1, [r4] movs r3, 0xD9 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index ceca3ed12..66bcec37c 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -13051,7 +13051,7 @@ sub_813AFFC: @ 813AFFC ldr r2, _0813B064 @ =gUnknown_84636E0 movs r0, 0x8C movs r1, 0x8C - bl sub_80BEAE0 + bl CreateMonMarkingSprite_SelectCombo adds r2, r0, 0 ldr r0, [r5] adds r0, r4 |