diff options
37 files changed, 378 insertions, 376 deletions
diff --git a/asm/battle_3.s b/asm/battle_3.s index 668e6c36d..db55726d9 100644 --- a/asm/battle_3.s +++ b/asm/battle_3.s @@ -336,7 +336,7 @@ _0803FDCE: beq _0803FE58 ldr r0, =gCurrentMove strh r1, [r0] - ldr r2, =gUnknown_02024208 + ldr r2, =gLastUsedItem ldrb r1, [r7] movs r0, 0x58 muls r0, r1 @@ -8200,7 +8200,7 @@ berry_effects_maybe: @ 80444DC str r1, [sp, 0xC] add r0, sp, 0x4 strb r1, [r0] - ldr r4, =gUnknown_02024208 + ldr r4, =gLastUsedItem ldr r1, =gBattleMons movs r0, 0x58 muls r0, r7 @@ -9749,7 +9749,7 @@ _08045280: bcc _0804528C b _0804582A _0804528C: - ldr r4, =gUnknown_02024208 + ldr r4, =gLastUsedItem ldr r1, =gBattleMons movs r0, 0x58 muls r0, r7 @@ -10301,7 +10301,7 @@ _08045794: beq _0804582A cmp r1, 0 beq _0804582A - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem mov r1, sp ldrh r1, [r1, 0x14] strh r1, [r0] diff --git a/asm/battle_4.s b/asm/battle_4.s index a45dde1c7..ea8b469e5 100644 --- a/asm/battle_4.s +++ b/asm/battle_4.s @@ -3094,7 +3094,7 @@ _08047A5C: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024208 + ldr r1, =gLastUsedItem adds r0, r3, 0 muls r0, r4 adds r0, r5 @@ -3267,7 +3267,7 @@ _08047BE8: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024208 + ldr r1, =gLastUsedItem adds r0, r3, 0 muls r0, r7 adds r0, r4 @@ -4221,7 +4221,7 @@ _08048474: movs r3, 0x99 b _0804856E _08048478: - ldr r4, =gUnknown_02024208 + ldr r4, =gLastUsedItem ldr r2, =gBattleMons ldr r3, =gBankTarget ldrb r1, [r3] @@ -4286,7 +4286,7 @@ _08048510: ands r0, r5 cmp r0, 0 beq _08048558 - ldr r4, =gUnknown_02024208 + ldr r4, =gLastUsedItem ldr r2, =gBattleMons ldr r3, =gBankTarget ldrb r1, [r3] @@ -6223,7 +6223,7 @@ _0804967C: adds r0, 0xD0 ldr r1, [r5] adds r1, r0 - ldr r2, =gUnknown_02024208 + ldr r2, =gLastUsedItem strh r3, [r1] strh r3, [r2] ldrb r0, [r7] @@ -6487,7 +6487,7 @@ _08049900: bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 - ldr r1, =gUnknown_02024208 + ldr r1, =gLastUsedItem mov r3, r9 ldrb r0, [r3] muls r0, r5 @@ -8148,7 +8148,7 @@ _0804A78E: movs r0, 0x1 negs r0, r0 strb r0, [r1, 0x4] - ldr r1, =gUnknown_02022F78 + ldr r1, =gBattleTextBuff3 strb r3, [r1] movs r0, 0x1 strb r0, [r1, 0x1] @@ -16338,7 +16338,7 @@ _0804EE10: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024208 + ldr r1, =gLastUsedItem adds r0, r3, 0 muls r0, r4 adds r0, r5 @@ -17420,7 +17420,7 @@ atk75_8026A58: @ 804F754 muls r0, r2 ldr r1, =gEnemyParty adds r0, r1 - ldr r1, =gUnknown_02024208 + ldr r1, =gLastUsedItem ldrh r1, [r1] lsls r2, 24 lsrs r2, 24 @@ -21341,7 +21341,7 @@ _08051990: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024208 + ldr r1, =gLastUsedItem mov r2, r9 ldrb r0, [r2] muls r0, r3 @@ -29511,7 +29511,7 @@ atkEA_recycleitem: @ 8056014 ldrh r0, [r0, 0x2E] cmp r0, 0 bne _08056094 - ldr r1, =gUnknown_02024208 + ldr r1, =gLastUsedItem strh r5, [r1] strh r0, [r6] ldrb r0, [r7] @@ -29862,7 +29862,7 @@ _0805635C: b _08056694 .pool _08056384: - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] cmp r0, 0x5 bne _080563B0 @@ -29894,7 +29894,7 @@ _080563B0: adds r0, r3 ldrb r5, [r0, 0x8] _080563C8: - ldr r2, =gUnknown_02024208 + ldr r2, =gLastUsedItem ldrh r0, [r2] cmp r0, 0x5 bhi _080563D2 @@ -30050,7 +30050,7 @@ _0805650E: bl __udivsi3 adds r6, r0, 0 _08056522: - ldr r1, =gUnknown_02024208 + ldr r1, =gLastUsedItem ldrh r0, [r1] cmp r0, 0x5 beq _08056564 @@ -30096,7 +30096,7 @@ _08056564: muls r0, r1 ldr r1, =gEnemyParty adds r0, r1 - ldr r2, =gUnknown_02024208 + ldr r2, =gLastUsedItem movs r1, 0x26 bl SetMonData bl calc_player_party_count @@ -30137,7 +30137,7 @@ _080565FA: cmp r0, r6 bcc _080565F4 _0805660A: - ldr r5, =gUnknown_02024208 + ldr r5, =gLastUsedItem ldrh r0, [r5] cmp r0, 0x1 bne _08056614 diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s index 6b5c27ea6..1ba9d75ab 100644 --- a/asm/battle_anim_8170478.s +++ b/asm/battle_anim_8170478.s @@ -996,7 +996,7 @@ sub_8170CFC: @ 8170CFC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -1016,7 +1016,7 @@ sub_8170D24: @ 8170D24 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -1136,7 +1136,7 @@ sub_8170E04: @ 8170E04 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index adds r1, r0, 0 @@ -1276,7 +1276,7 @@ _08170F50: movs r6, 0x17 movs r5, 0x5 _08170F54: - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index adds r4, r0, 0 @@ -1530,7 +1530,7 @@ _08171188: strh r0, [r4, 0x38] ldr r0, =sub_81711E8 str r0, [r4, 0x1C] - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -2695,7 +2695,7 @@ sub_8171AE4: @ 8171AE4 bl StartSpriteAffineAnim ldr r0, =sub_8171BAC str r0, [r4, 0x1C] - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s index 76a8c3c56..fc795d476 100644 --- a/asm/battle_controller_linkopponent.s +++ b/asm/battle_controller_linkopponent.s @@ -5042,7 +5042,7 @@ sub_8066FF4: @ 8066FF4 ldr r0, =gUnknown_02023066 adds r4, r0 ldrh r0, [r4] - bl battle_pick_message + bl BufferStringBattle ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe diff --git a/asm/battle_controller_linkpartner.s b/asm/battle_controller_linkpartner.s index 74b006483..5916c47f4 100644 --- a/asm/battle_controller_linkpartner.s +++ b/asm/battle_controller_linkpartner.s @@ -4351,7 +4351,7 @@ sub_814D590: @ 814D590 ldr r0, =gUnknown_02023066 adds r4, r0 ldrh r0, [r4] - bl battle_pick_message + bl BufferStringBattle ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s index 8ad871934..c49bbe830 100644 --- a/asm/battle_controller_opponent.s +++ b/asm/battle_controller_opponent.s @@ -5182,7 +5182,7 @@ sub_8061F34: @ 8061F34 ldr r0, =gUnknown_02023066 adds r4, r0 ldrh r0, [r4] - bl battle_pick_message + bl BufferStringBattle ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 687b401b3..0e387692d 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -3399,7 +3399,7 @@ _080591FE: mov r2, sp bl SetMonData adds r0, r6, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats ldr r2, [sp] add r0, sp, 0x4 ldrh r0, [r0] @@ -3673,7 +3673,7 @@ _08059430: mov r2, sp bl SetMonData adds r0, r5, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats ldr r2, [sp] add r0, sp, 0x4 ldrh r0, [r0] @@ -8455,7 +8455,7 @@ sub_805BF80: @ 805BF80 ldr r0, =gUnknown_02023066 adds r4, r0 ldrh r0, [r4] - bl battle_pick_message + bl BufferStringBattle ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe diff --git a/asm/battle_controller_player_partner.s b/asm/battle_controller_player_partner.s index 9c262071d..ef8ffd8fb 100644 --- a/asm/battle_controller_player_partner.s +++ b/asm/battle_controller_player_partner.s @@ -631,7 +631,7 @@ _081BB2E2: mov r2, sp bl SetMonData adds r0, r6, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats ldr r2, [sp] add r0, sp, 0x4 ldrh r0, [r0] @@ -905,7 +905,7 @@ _081BB514: mov r2, sp bl SetMonData adds r0, r5, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats ldr r2, [sp] add r0, sp, 0x4 ldrh r0, [r0] @@ -4963,7 +4963,7 @@ sub_81BDA4C: @ 81BDA4C ldr r1, =gUnknown_02023066 adds r0, r1 ldrh r0, [r0] - bl battle_pick_message + bl BufferStringBattle ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe diff --git a/asm/battle_controller_recorded_opponent.s b/asm/battle_controller_recorded_opponent.s index 2c1c37eb7..c8fc24c00 100644 --- a/asm/battle_controller_recorded_opponent.s +++ b/asm/battle_controller_recorded_opponent.s @@ -4719,7 +4719,7 @@ sub_8188E90: @ 8188E90 ldr r1, =gUnknown_02023066 adds r0, r1 ldrh r0, [r0] - bl battle_pick_message + bl BufferStringBattle ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe diff --git a/asm/battle_controller_recorded_player.s b/asm/battle_controller_recorded_player.s index 273a6b3ad..ff0bf98c6 100644 --- a/asm/battle_controller_recorded_player.s +++ b/asm/battle_controller_recorded_player.s @@ -4819,7 +4819,7 @@ sub_818C43C: @ 818C43C ldr r1, =gUnknown_02023066 adds r0, r1 ldrh r0, [r0] - bl battle_pick_message + bl BufferStringBattle ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index dbd0cd1f1..cf916434d 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -789,7 +789,7 @@ dp01t_10_6_message: @ 81599DC ldr r1, =gUnknown_02023066 adds r0, r1 ldrh r0, [r0] - bl battle_pick_message + bl BufferStringBattle ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index d5ae21cc5..e91f7d858 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -3603,7 +3603,7 @@ sub_816A3B8: @ 816A3B8 ldr r1, =gUnknown_02023066 adds r0, r1 ldrh r0, [r0] - bl battle_pick_message + bl BufferStringBattle ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe diff --git a/asm/battle_message.s b/asm/battle_message.s index 961a1a5db..ef8849b82 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -5,8 +5,8 @@ .text - thumb_func_start battle_pick_message -battle_pick_message: @ 814E0C4 + thumb_func_start BufferStringBattle +BufferStringBattle: @ 814E0C4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -15,7 +15,7 @@ battle_pick_message: @ 814E0C4 lsls r0, 16 lsrs r6, r0, 16 movs r7, 0 - ldr r4, =gUnknown_0203ABA8 + ldr r4, =gStringInfo ldr r0, =gActiveBank mov r8, r0 ldrb r1, [r0] @@ -23,7 +23,7 @@ battle_pick_message: @ 814E0C4 ldr r0, =gUnknown_02023068 adds r1, r0 str r1, [r4] - ldr r2, =gUnknown_02024208 + ldr r2, =gLastUsedItem ldrh r0, [r1, 0x4] strh r0, [r2] ldr r2, =gLastUsedAbility @@ -55,7 +55,7 @@ battle_pick_message: @ 814E0C4 mov r9, r5 ldr r1, =gBattleTextBuff1 mov r10, r1 - ldr r3, =gUnknown_0203ABA4 + ldr r3, =gAbilitiesPerBank _0814E126: adds r0, r2, r3 ldr r1, [r4] @@ -69,9 +69,9 @@ _0814E126: movs r2, 0 ldr r0, =gBattleTextBuff1 mov r8, r0 - ldr r3, =gUnknown_0203ABA8 + ldr r3, =gStringInfo ldr r5, =gBattleTextBuff2 - ldr r4, =gUnknown_02022F78 + ldr r4, =gBattleTextBuff3 _0814E144: mov r0, r8 adds r1, r2, r0 @@ -475,7 +475,7 @@ _0814E4F2: _0814E4F8: mov r0, r10 bl sub_814F8F8 - ldr r0, =gUnknown_0203ABA8 + ldr r0, =gStringInfo ldr r2, [r0] ldrh r1, [r2] movs r0, 0xB1 @@ -697,7 +697,7 @@ _0814E6DE: pop {r0} bx r0 .pool - thumb_func_end battle_pick_message + thumb_func_end BufferStringBattle thumb_func_start get_battle_strings_ get_battle_strings_: @ 814E6F0 @@ -895,7 +895,7 @@ _0814E8CE: b _0814E8EE .pool _0814E8E4: - ldr r1, =gUnknown_02022F78 + ldr r1, =gBattleTextBuff3 ldrb r0, [r1] cmp r0, 0xFD bne _0814E904 @@ -1544,7 +1544,7 @@ _0814EF32: b _0814F5BE .pool _0814EF44: - ldr r0, =gUnknown_0203ABA8 + ldr r0, =gStringInfo ldr r2, [r0] ldrh r1, [r2] movs r0, 0xB1 @@ -1555,7 +1555,7 @@ _0814EF44: b _0814EF8A .pool _0814EF5C: - ldr r0, =gUnknown_0203ABA8 + ldr r0, =gStringInfo ldr r2, [r0] ldrh r1, [r2, 0x2] movs r0, 0xB1 @@ -1589,7 +1589,7 @@ _0814EF98: ands r0, r1 cmp r0, 0 beq _0814F06E - ldr r2, =gUnknown_02024208 + ldr r2, =gLastUsedItem ldrh r0, [r2] cmp r0, 0xAF bne _0814F064 @@ -1667,7 +1667,7 @@ _0814F064: bl CopyItemName b _0814F5BE _0814F06E: - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] mov r1, sp bl CopyItemName @@ -1678,23 +1678,23 @@ _0814F080: b _0814F0C0 .pool _0814F088: - ldr r1, =gUnknown_0203ABA4 + ldr r1, =gAbilitiesPerBank ldr r0, =gBankAttacker b _0814F0BC .pool _0814F098: - ldr r1, =gUnknown_0203ABA4 + ldr r1, =gAbilitiesPerBank ldr r0, =gBankTarget b _0814F0BC .pool _0814F0A8: - ldr r1, =gUnknown_0203ABA4 + ldr r1, =gAbilitiesPerBank ldr r0, =gBattleScripting ldrb r0, [r0, 0x17] b _0814F0BE .pool _0814F0B8: - ldr r1, =gUnknown_0203ABA4 + ldr r1, =gAbilitiesPerBank ldr r0, =gUnknown_0202420E _0814F0BC: ldrb r0, [r0] @@ -2659,7 +2659,7 @@ sub_814F8F8: @ 814F8F8 push {r4,r5,lr} adds r4, r0, 0 movs r2, 0 - ldr r5, =gUnknown_0203ABA8 + ldr r5, =gStringInfo ldr r3, =gUnknown_085CD336 _0814F902: cmp r2, 0x4 @@ -2710,7 +2710,7 @@ _0814F95A: cmp r0, 0xFF bne _0814F958 ldr r1, =gUnknown_085CD336 - ldr r5, =gUnknown_0203ABA8 + ldr r5, =gStringInfo movs r0, 0 lsls r0, 1 adds r2, r0, r1 diff --git a/asm/battle_setup.s b/asm/battle_setup.s index c86f198c7..36f706a0f 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -282,7 +282,7 @@ sub_80B086C: @ 80B086C movs r1, 0xC4 lsls r1, 1 movs r2, 0x5 - bl sub_8067FF8 + bl CreateMaleMon bl script_env_2_enable ldr r1, =gMain ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music @@ -2134,18 +2134,18 @@ _080B1800: bl sub_816306C ldr r4, =gUnknown_020247A8 adds r0, r4, 0 - bl zero_pokemon_struct + bl ZeroMonData adds r0, r4, 0 adds r0, 0x64 - bl zero_pokemon_struct + bl ZeroMonData movs r1, 0x96 lsls r1, 1 adds r0, r4, r1 - bl zero_pokemon_struct + bl ZeroMonData movs r1, 0xC8 lsls r1, 1 adds r0, r4, r1 - bl zero_pokemon_struct + bl ZeroMonData b _080B187A .pool _080B1864: @@ -2153,10 +2153,10 @@ _080B1864: bl sub_8163048 ldr r4, =gUnknown_020247A8 adds r0, r4, 0 - bl zero_pokemon_struct + bl ZeroMonData adds r4, 0x64 adds r0, r4, 0 - bl zero_pokemon_struct + bl ZeroMonData _080B187A: bl sub_81A9B04 b _080B18B8 diff --git a/asm/daycare.s b/asm/daycare.s index f5d423102..0f67d0200 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -29,7 +29,7 @@ pokemon_get_nick_: @ 806FA4C adds r4, r1, 0 movs r1, 0x2 mov r2, sp - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r0, r4, 0 mov r1, sp bl StringCopy10 @@ -50,7 +50,7 @@ _0806FA74: muls r0, r4 adds r0, r6, r0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _0806FA8A adds r0, r5, 0x1 @@ -90,7 +90,7 @@ _0806FAB6: adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _0806FAE4 adds r0, r7, 0x1 @@ -98,7 +98,7 @@ _0806FAB6: lsrs r7, r0, 24 adds r0, r4, 0 movs r1, 0xC - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r1, r0, 0 cmp r1, 0 bne _0806FAE4 @@ -138,7 +138,7 @@ _0806FB0E: muls r0, r4 adds r0, r5, r0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _0806FB24 lsls r0, r4, 24 @@ -232,7 +232,7 @@ _0806FBBC: movs r0, 0 str r0, [r1] adds r0, r6, 0 - bl zero_pokemon_struct + bl ZeroMonData bl party_compaction bl calc_player_party_count pop {r4-r6} @@ -290,12 +290,12 @@ sub_806FC48: @ 806FC48 adds r4, 0x8C adds r0, r4, 0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _0806FC9E adds r0, r5, 0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r6, r0, 0 cmp r6, 0 bne _0806FC9E @@ -304,7 +304,7 @@ sub_806FC48: @ 806FC48 movs r2, 0x50 bl memcpy adds r0, r4, 0 - bl zero_pokemon_boxed_data + bl ZeroBoxMonData adds r4, 0x50 adds r0, r5, 0 adds r0, 0x50 @@ -350,7 +350,7 @@ _0806FCC4: ldr r0, =gUnknown_020244E2 ldrh r1, [r0] adds r0, r4, 0 - bl sub_8069424 + bl DeleteFirstMoveAndGiveMoveToMon _0806FCD4: adds r0, r4, 0 adds r1, r6, 0 @@ -363,7 +363,7 @@ _0806FCD4: ble _0806FCAC _0806FCE8: adds r0, r4, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats pop {r4-r7} pop {r0} bx r0 @@ -379,7 +379,7 @@ sub_806FCF8: @ 806FCF8 bl pokemon_get_nick_ adds r0, r5, 0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData lsls r0, 16 lsrs r7, r0, 16 adds r0, r5, 0 @@ -427,7 +427,7 @@ _0806FD46: bl sub_806FF80 _0806FD74: adds r0, r5, 0 - bl zero_pokemon_boxed_data + bl ZeroBoxMonData adds r1, r5, 0 adds r1, 0x88 movs r0, 0 @@ -492,15 +492,15 @@ sub_806FDEC: @ 806FDEC bl memcpy adds r0, r4, 0 movs r1, 0x19 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r0, r5 str r0, [sp, 0x50] add r2, sp, 0x50 mov r0, sp movs r1, 0x19 - bl SetMonData_encrypted + bl SetBoxMonData mov r0, sp - bl sub_80690C0 + bl GetLevelFromBoxMonExp lsls r0, 24 lsrs r0, 24 add sp, 0x54 @@ -513,7 +513,7 @@ sub_806FDEC: @ 806FDEC sub_806FE28: @ 806FE28 push {r4,r5,lr} adds r5, r0, 0 - bl sub_80690C0 + bl GetLevelFromBoxMonExp adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -647,7 +647,7 @@ sub_806FF30: @ 806FF30 ldr r0, [r6] adds r0, r1 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _0806FF60 movs r0, 0 @@ -703,7 +703,7 @@ _0806FF9E: sub_806FFB0: @ 806FFB0 push {r4,lr} adds r4, r0, 0 - bl zero_pokemon_boxed_data + bl ZeroBoxMonData adds r1, r4, 0 adds r1, 0x88 movs r0, 0 @@ -846,7 +846,7 @@ _080700AE: muls r0, r4 adds r0, r6, r0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData lsls r1, r4, 2 add r1, sp str r0, [r1] @@ -872,7 +872,7 @@ _080700E2: muls r0, r7 adds r0, r6, r0 movs r1, 0xC - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0xC3 bne _080700FE bl Random @@ -931,7 +931,7 @@ _08070160: adds r0, r5, r0 movs r1, 0 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData bl GetNatureFromPersonality lsls r0, 24 lsrs r7, r0, 24 @@ -1145,7 +1145,7 @@ _08070304: muls r0, r1 add r0, r8 movs r1, 0x27 - bl pokemon_getattr_encrypted + bl GetBoxMonData add r2, sp, 0x10 strb r0, [r2] mov r0, r9 @@ -1160,7 +1160,7 @@ _08070322: muls r0, r1 add r0, r8 movs r1, 0x28 - bl pokemon_getattr_encrypted + bl GetBoxMonData strb r0, [r4] mov r0, r9 movs r1, 0x28 @@ -1173,7 +1173,7 @@ _0807033C: muls r0, r1 add r0, r8 movs r1, 0x29 - bl pokemon_getattr_encrypted + bl GetBoxMonData strb r0, [r4] mov r0, r9 movs r1, 0x29 @@ -1186,7 +1186,7 @@ _08070356: muls r0, r1 add r0, r8 movs r1, 0x2A - bl pokemon_getattr_encrypted + bl GetBoxMonData strb r0, [r4] mov r0, r9 movs r1, 0x2A @@ -1199,7 +1199,7 @@ _08070370: muls r0, r1 add r0, r8 movs r1, 0x2B - bl pokemon_getattr_encrypted + bl GetBoxMonData strb r0, [r4] mov r0, r9 movs r1, 0x2B @@ -1215,7 +1215,7 @@ _08070390: muls r0, r1 add r0, r8 movs r1, 0x2C - bl pokemon_getattr_encrypted + bl GetBoxMonData strb r0, [r4] mov r0, r9 movs r1, 0x2C @@ -1392,14 +1392,14 @@ _080704F2: adds r5, 0xD mov r0, r10 adds r1, r5, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData lsls r4, r6, 1 mov r2, r8 adds r1, r4, r2 strh r0, [r1] mov r0, r9 adds r1, r5, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData ldr r1, =gUnknown_02024A4C adds r4, r1 strh r0, [r4] @@ -1439,7 +1439,7 @@ _08070546: adds r1, r0, 0 adds r0, r7, 0 str r2, [sp, 0x8] - bl pokemon_moveset_pad_ + bl GiveMoveToBoxMon_ lsls r0, 16 lsrs r0, 16 ldr r2, [sp, 0x8] @@ -1447,7 +1447,7 @@ _08070546: bne _08070596 ldrh r1, [r4] adds r0, r7, 0 - bl sub_8069424 + bl DeleteFirstMoveAndGiveMoveToMon b _08070596 .pool _0807058C: @@ -1500,14 +1500,14 @@ _080705C2: beq _080705FE ldrh r1, [r4] adds r0, r7, 0 - bl pokemon_moveset_pad_ + bl GiveMoveToBoxMon_ lsls r0, 16 lsrs r0, 16 cmp r0, r6 bne _080705FE ldrh r1, [r4] adds r0, r7, 0 - bl sub_8069424 + bl DeleteFirstMoveAndGiveMoveToMon _080705FE: adds r0, r5, 0x1 lsls r0, 16 @@ -1601,7 +1601,7 @@ _0807068A: adds r1, r0, 0 adds r0, r7, 0 str r2, [sp, 0x8] - bl pokemon_moveset_pad_ + bl GiveMoveToBoxMon_ lsls r0, 16 lsrs r0, 16 ldr r2, [sp, 0x8] @@ -1609,7 +1609,7 @@ _0807068A: bne _080706E4 ldrh r1, [r4] adds r0, r7, 0 - bl sub_8069424 + bl DeleteFirstMoveAndGiveMoveToMon b _080706E4 .pool _080706D8: @@ -1689,13 +1689,13 @@ incense_effects: @ 8070744 _0807075C: adds r0, r5, 0 movs r1, 0xC - bl pokemon_getattr_encrypted + bl GetBoxMonData lsls r0, 16 lsrs r6, r0, 16 adds r0, r5, 0 adds r0, 0x8C movs r1, 0xC - bl pokemon_getattr_encrypted + bl GetBoxMonData lsls r0, 16 lsrs r2, r0, 16 ldrh r0, [r4] @@ -1732,12 +1732,12 @@ sub_80707A4: @ 80707A4 adds r4, r1, 0 adds r0, r4, 0 movs r1, 0xC - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r5, r0, 0 adds r4, 0x8C adds r0, r4, 0 movs r1, 0xC - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r5, 0xCA beq _080707C6 cmp r0, 0xCA @@ -1747,14 +1747,14 @@ _080707C6: lsls r4, 1 adds r0, r6, 0 adds r1, r4, 0 - bl pokemon_moveset_pad_ + bl GiveMoveToBoxMon_ lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 bne _080707E2 adds r0, r6, 0 adds r1, r4, 0 - bl sub_8069424 + bl DeleteFirstMoveAndGiveMoveToMon _080707E2: pop {r4-r6} pop {r0} @@ -1779,7 +1779,7 @@ _080707FE: adds r5, r7, r0 adds r0, r5, 0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData lsls r1, r4, 1 add r1, sp strh r0, [r1] @@ -2122,7 +2122,7 @@ _08070ACE: muls r4, r0 adds r0, r6, r4 movs r1, 0x5 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _08070AEE adds r1, r6, 0 @@ -2275,7 +2275,7 @@ sub_8070C04: @ 8070C04 sub sp, 0xC adds r4, r0, 0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _08070C2E ldr r1, =gStringVar1 @@ -2284,7 +2284,7 @@ sub_8070C04: @ 8070C04 adds r0, r4, 0 movs r1, 0x7 mov r2, sp - bl pokemon_getattr_encrypted + bl GetBoxMonData ldr r0, =gStringVar3 mov r1, sp bl StringCopy @@ -2292,7 +2292,7 @@ _08070C2E: adds r4, 0x8C adds r0, r4, 0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _08070C44 ldr r1, =gStringVar2 @@ -2324,7 +2324,7 @@ sub_8070C58: @ 8070C58 muls r0, r5 adds r0, r4 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData lsls r0, 16 lsrs r0, 16 pop {r4,r5} @@ -2468,17 +2468,17 @@ _08070D7E: adds r4, r0, r4 adds r0, r4, 0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData strh r0, [r5] adds r0, r4, 0 movs r1, 0x1 - bl pokemon_getattr_encrypted + bl GetBoxMonData ldr r1, [sp, 0x2C] stm r1!, {r0} str r1, [sp, 0x2C] adds r0, r4, 0 movs r1, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r1, r0, 0 ldrh r0, [r5] bl GetGenderFromSpeciesAndPersonality diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index e88a73a60..db900298e 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -248,7 +248,7 @@ sub_80714B8: @ 80714B8 adds r0, r5, 0 bl sub_806E924 adds r0, r5, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x14 pop {r4,r5} pop {r0} diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 45ca5f0aa..84bacd78b 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -1130,7 +1130,7 @@ _0813E4A0: ldrb r0, [r4] muls r0, r6 adds r0, r5 - bl pokemon_calc_effective_stats + bl CalculateMonStats bl calc_player_party_count ldr r0, =gEvolutionTable mov r4, r8 @@ -1643,7 +1643,7 @@ _0813E99E: movs r1, 0xB bl SetMonData mov r0, r9 - bl pokemon_calc_effective_stats + bl CalculateMonStats ldrh r1, [r4, 0xA] ldrh r2, [r4, 0xC] mov r0, r9 @@ -2827,7 +2827,7 @@ _0813F4F2: movs r1, 0xB bl SetMonData mov r0, r9 - bl pokemon_calc_effective_stats + bl CalculateMonStats ldrh r1, [r4, 0xA] ldrh r2, [r4, 0xC] mov r0, r9 diff --git a/asm/link.s b/asm/link.s index 80835667f..2c66dae74 100644 --- a/asm/link.s +++ b/asm/link.s @@ -33391,7 +33391,7 @@ _0801AAE4: adds r5, r4, r0 _0801AB0A: adds r0, r4, 0 - bl zero_pokemon_struct + bl ZeroMonData adds r4, 0x64 cmp r4, r5 ble _0801AB0A diff --git a/asm/lottery_corner.s b/asm/lottery_corner.s index 05f248771..c80e780c8 100644 --- a/asm/lottery_corner.s +++ b/asm/lottery_corner.s @@ -156,7 +156,7 @@ _0817766A: lsls r4, r1, 4 adds r0, r4 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _081776D2 mov r1, r9 @@ -164,7 +164,7 @@ _0817766A: adds r0, r5 adds r0, r4 movs r1, 0x2D - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _081776D2 mov r2, r9 @@ -172,7 +172,7 @@ _0817766A: adds r0, r5 adds r0, r4 movs r1, 0x1 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r1, r0, 0 ldr r0, =gScriptResult ldrh r0, [r0] @@ -250,7 +250,7 @@ _0817773C: adds r0, r1 ldr r2, =gStringVar1 movs r1, 0x2 - bl pokemon_getattr_encrypted + bl GetBoxMonData _08177768: ldr r0, =gStringVar1 bl StringGetEnd10 diff --git a/asm/pokemon_1.s b/asm/pokemon_1.s index 54b82c444..003150afe 100644 --- a/asm/pokemon_1.s +++ b/asm/pokemon_1.s @@ -5,9 +5,9 @@ .text - thumb_func_start zero_pokemon_boxed_data -@ void zero_pokemon_boxed_data(pokemon *mon) -zero_pokemon_boxed_data: @ 8067A74 + thumb_func_start ZeroBoxMonData +@ void ZeroBoxMonData(pokemon *mon) +ZeroBoxMonData: @ 8067A74 push {lr} adds r2, r0, 0 movs r1, 0 @@ -20,15 +20,15 @@ _08067A7C: bls _08067A7C pop {r0} bx r0 - thumb_func_end zero_pokemon_boxed_data + thumb_func_end ZeroBoxMonData - thumb_func_start zero_pokemon_struct -@ void zero_pokemon_struct(pokemon *mon) -zero_pokemon_struct: @ 8067A8C + thumb_func_start ZeroMonData +@ void ZeroMonData(pokemon *mon) +ZeroMonData: @ 8067A8C push {r4,lr} sub sp, 0x4 adds r4, r0, 0 - bl zero_pokemon_boxed_data + bl ZeroBoxMonData movs r0, 0 str r0, [sp] adds r0, r4, 0 @@ -77,7 +77,7 @@ zero_pokemon_struct: @ 8067A8C pop {r4} pop {r0} bx r0 - thumb_func_end zero_pokemon_struct + thumb_func_end ZeroMonData thumb_func_start ZeroPlayerPartyMons @ void ZeroPlayerPartyMons() @@ -89,7 +89,7 @@ ZeroPlayerPartyMons: @ 8067B0C adds r5, r4, r0 _08067B16: adds r0, r4, 0 - bl zero_pokemon_struct + bl ZeroMonData adds r4, 0x64 cmp r4, r5 ble _08067B16 @@ -108,7 +108,7 @@ ZeroEnemyPartyMons: @ 8067B2C adds r5, r4, r0 _08067B36: adds r0, r4, 0 - bl zero_pokemon_struct + bl ZeroMonData adds r4, 0x64 cmp r4, r5 ble _08067B36 @@ -142,7 +142,7 @@ CreateMon: @ 8067B4C lsrs r5, 24 mov r0, r8 str r3, [sp, 0x18] - bl zero_pokemon_struct + bl ZeroMonData str r4, [sp] str r7, [sp, 0x4] str r5, [sp, 0x8] @@ -153,7 +153,7 @@ CreateMon: @ 8067B4C add r2, sp, 0x10 ldrb r2, [r2] ldr r3, [sp, 0x18] - bl create_pokemon + bl CreateBoxMon mov r0, r8 movs r1, 0x38 add r2, sp, 0x10 @@ -165,7 +165,7 @@ CreateMon: @ 8067B4C movs r1, 0x40 bl SetMonData mov r0, r8 - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x1C pop {r3} mov r8, r3 @@ -174,9 +174,9 @@ CreateMon: @ 8067B4C bx r0 thumb_func_end CreateMon - thumb_func_start create_pokemon -@ void create_pokemon(pokemon *mon, s16 species_num, u8 level, u8 forced_iv, char pokemon_id_is_nonrandom, int pokemon_id, u8 trainer_id_mode, int trainer_id) -create_pokemon: @ 8067BBC + thumb_func_start CreateBoxMon +@ void CreateBoxMon(pokemon *mon, s16 species_num, u8 level, u8 forced_iv, char pokemon_id_is_nonrandom, int pokemon_id, u8 trainer_id_mode, int trainer_id) +CreateBoxMon: @ 8067BBC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -200,7 +200,7 @@ create_pokemon: @ 8067BBC lsrs r0, 24 mov r10, r0 adds r0, r7, 0 - bl zero_pokemon_boxed_data + bl ZeroBoxMonData cmp r4, 0 beq _08067BF8 ldr r0, [sp, 0x44] @@ -219,7 +219,7 @@ _08067C0C: add r2, sp, 0x14 adds r0, r7, 0 movs r1, 0 - bl SetMonData_encrypted + bl SetBoxMonData add r0, sp, 0x18 mov r9, r0 add r5, sp, 0xC @@ -280,37 +280,37 @@ _08067C8A: adds r0, r7, 0 movs r1, 0x1 mov r2, r9 - bl SetMonData_encrypted + bl SetBoxMonData adds r0, r7, 0 - bl pokemon_calc_checksum + bl CalculateBoxMonChecksum strh r0, [r5] adds r0, r7, 0 movs r1, 0x9 adds r2, r5, 0 - bl SetMonData_encrypted + bl SetBoxMonData adds r0, r7, 0 - bl pokemon_encrypt + bl EncryptBoxMon mov r0, sp ldrh r1, [r0, 0xE] bl GetSpeciesName adds r0, r7, 0 movs r1, 0x2 mov r2, sp - bl SetMonData_encrypted + bl SetBoxMonData ldr r2, =gGameLanguage adds r0, r7, 0 movs r1, 0x3 - bl SetMonData_encrypted + bl SetBoxMonData ldr r5, =gSaveBlock2Ptr ldr r2, [r5] adds r0, r7, 0 movs r1, 0x7 - bl SetMonData_encrypted + bl SetBoxMonData adds r0, r7, 0 movs r1, 0xB mov r2, sp adds r2, 0xE - bl SetMonData_encrypted + bl SetBoxMonData ldr r4, =gBaseStats mov r2, sp ldrh r1, [r2, 0xE] @@ -331,7 +331,7 @@ _08067C8A: adds r2, r0 adds r0, r7, 0 movs r1, 0x19 - bl SetMonData_encrypted + bl SetBoxMonData mov r1, sp ldrh r0, [r1, 0xE] lsls r2, r0, 3 @@ -341,7 +341,7 @@ _08067C8A: adds r2, r4 adds r0, r7, 0 movs r1, 0x20 - bl SetMonData_encrypted + bl SetBoxMonData bl sav1_map_get_name lsls r0, 24 lsrs r0, 24 @@ -349,26 +349,26 @@ _08067C8A: adds r0, r7, 0 movs r1, 0x23 mov r2, r9 - bl SetMonData_encrypted + bl SetBoxMonData adds r0, r7, 0 movs r1, 0x24 add r2, sp, 0x10 - bl SetMonData_encrypted + bl SetBoxMonData ldr r2, =gGameVersion adds r0, r7, 0 movs r1, 0x25 - bl SetMonData_encrypted + bl SetBoxMonData movs r0, 0x4 str r0, [sp, 0x18] adds r0, r7, 0 movs r1, 0x26 mov r2, r9 - bl SetMonData_encrypted + bl SetBoxMonData ldr r2, [r5] adds r2, 0x8 adds r0, r7, 0 movs r1, 0x31 - bl SetMonData_encrypted + bl SetBoxMonData mov r2, sp ldrb r0, [r2, 0x11] cmp r0, 0x1F @@ -376,32 +376,32 @@ _08067C8A: adds r0, r7, 0 movs r1, 0x27 adds r2, 0x11 - bl SetMonData_encrypted + bl SetBoxMonData adds r0, r7, 0 movs r1, 0x28 mov r2, sp adds r2, 0x11 - bl SetMonData_encrypted + bl SetBoxMonData adds r0, r7, 0 movs r1, 0x29 mov r2, sp adds r2, 0x11 - bl SetMonData_encrypted + bl SetBoxMonData adds r0, r7, 0 movs r1, 0x2A mov r2, sp adds r2, 0x11 - bl SetMonData_encrypted + bl SetBoxMonData adds r0, r7, 0 movs r1, 0x2B mov r2, sp adds r2, 0x11 - bl SetMonData_encrypted + bl SetBoxMonData adds r0, r7, 0 movs r1, 0x2C mov r2, sp adds r2, 0x11 - bl SetMonData_encrypted + bl SetBoxMonData b _08067E50 .pool _08067DC8: @@ -417,7 +417,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x27 adds r2, r4, 0 - bl SetMonData_encrypted + bl SetBoxMonData ldr r0, [sp, 0x18] movs r6, 0xF8 lsls r6, 2 @@ -427,7 +427,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x28 adds r2, r4, 0 - bl SetMonData_encrypted + bl SetBoxMonData ldr r0, [sp, 0x18] movs r5, 0xF8 lsls r5, 7 @@ -437,7 +437,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x29 adds r2, r4, 0 - bl SetMonData_encrypted + bl SetBoxMonData bl Random lsls r0, 16 lsrs r0, 16 @@ -448,7 +448,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x2A adds r2, r4, 0 - bl SetMonData_encrypted + bl SetBoxMonData ldr r0, [sp, 0x18] ands r0, r6 lsrs r0, 5 @@ -456,7 +456,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x2B adds r2, r4, 0 - bl SetMonData_encrypted + bl SetBoxMonData ldr r0, [sp, 0x18] ands r0, r5 lsrs r0, 10 @@ -464,7 +464,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x2C adds r2, r4, 0 - bl SetMonData_encrypted + bl SetBoxMonData _08067E50: ldr r2, =gBaseStats mov r3, sp @@ -483,10 +483,10 @@ _08067E50: adds r0, r7, 0 movs r1, 0x2E mov r2, r9 - bl SetMonData_encrypted + bl SetBoxMonData _08067E76: adds r0, r7, 0 - bl sub_8069270 + bl GiveBoxMonInitialMoveset add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -496,10 +496,10 @@ _08067E76: pop {r0} bx r0 .pool - thumb_func_end create_pokemon + thumb_func_end CreateBoxMon - thumb_func_start pokemon_make_with_nature -pokemon_make_with_nature: @ 8067E90 + thumb_func_start CreateMonWithNature +CreateMonWithNature: @ 8067E90 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -548,10 +548,10 @@ _08067EB0: pop {r4-r7} pop {r0} bx r0 - thumb_func_end pokemon_make_with_nature + thumb_func_end CreateMonWithNature - thumb_func_start sub_8067EF8 -sub_8067EF8: @ 8067EF8 + thumb_func_start CreateMonWithGenderNatureLetter +CreateMonWithGenderNatureLetter: @ 8067EF8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -672,10 +672,10 @@ _08067FCE: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8067EF8 + thumb_func_end CreateMonWithGenderNatureLetter - thumb_func_start sub_8067FF8 -sub_8067FF8: @ 8067FF8 + thumb_func_start CreateMaleMon +CreateMaleMon: @ 8067FF8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -722,7 +722,7 @@ _0806800A: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8067FF8 + thumb_func_end CreateMaleMon thumb_func_start CreateMonWithIVsPersonality CreateMonWithIVsPersonality: @ 8068060 @@ -749,15 +749,15 @@ CreateMonWithIVsPersonality: @ 8068060 add r2, sp, 0x10 bl SetMonData adds r0, r4, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x14 pop {r4} pop {r0} bx r0 thumb_func_end CreateMonWithIVsPersonality - thumb_func_start sub_80680A0 -sub_80680A0: @ 80680A0 + thumb_func_start CreateMonWithIVsOTID +CreateMonWithIVsOTID: @ 80680A0 push {r4,r5,lr} sub sp, 0x10 adds r5, r0, 0 @@ -802,15 +802,15 @@ sub_80680A0: @ 80680A0 adds r2, r4, 0 bl SetMonData adds r0, r5, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x10 pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80680A0 + thumb_func_end CreateMonWithIVsOTID - thumb_func_start pokemon_make_ev_something -pokemon_make_ev_something: @ 8068114 + thumb_func_start CreateMonWithEVSpread +CreateMonWithEVSpread: @ 8068114 push {r4-r7,lr} mov r7, r8 push {r7} @@ -872,14 +872,14 @@ _08068180: cmp r5, 0x5 ble _0806816C adds r0, r7, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x14 pop {r3} mov r8, r3 pop {r4-r7} pop {r0} bx r0 - thumb_func_end pokemon_make_ev_something + thumb_func_end CreateMonWithEVSpread thumb_func_start sub_806819C sub_806819C: @ 806819C @@ -1059,7 +1059,7 @@ _08068236: adds r0, r7, 0 bl sub_806E924 adds r0, r7, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x34 pop {r3,r4} mov r8, r3 @@ -1286,7 +1286,7 @@ _08068430: adds r0, r7, 0 bl sub_806E924 adds r0, r7, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x58 pop {r3-r5} mov r8, r3 @@ -1416,7 +1416,7 @@ _080685E0: movs r1, 0x7 bl SetMonData adds r0, r7, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -1517,7 +1517,7 @@ _080686DA: cmp r4, 0x5 ble _080686C6 adds r0, r7, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -2172,9 +2172,9 @@ _08068C60: .pool thumb_func_end DoScriptedWildBattle - thumb_func_start pokemon_calc_checksum -@ int pokemon_calc_checksum(pokemon *mon) -pokemon_calc_checksum: @ 8068C78 + thumb_func_start CalculateBoxMonChecksum +@ int CalculateBoxMonChecksum(pokemon *mon) +CalculateBoxMonChecksum: @ 8068C78 push {r4-r7,lr} mov r7, r8 push {r7} @@ -2248,10 +2248,10 @@ _08068CEE: pop {r4-r7} pop {r1} bx r1 - thumb_func_end pokemon_calc_checksum + thumb_func_end CalculateBoxMonChecksum - thumb_func_start pokemon_calc_effective_stats -pokemon_calc_effective_stats: @ 8068D0C + thumb_func_start CalculateMonStats +CalculateMonStats: @ 8068D0C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2598,7 +2598,7 @@ _08068FF4: pop {r4-r7} pop {r0} bx r0 - thumb_func_end pokemon_calc_effective_stats + thumb_func_end CalculateMonStats thumb_func_start sub_8069004 sub_8069004: @ 8069004 @@ -2631,7 +2631,7 @@ sub_8069004: @ 8069004 mov r2, sp bl SetMonData adds r0, r4, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x4 pop {r4} pop {r0} @@ -2692,20 +2692,20 @@ _080690AA: .pool thumb_func_end level_by_exp - thumb_func_start sub_80690C0 -sub_80690C0: @ 80690C0 + thumb_func_start GetLevelFromBoxMonExp +GetLevelFromBoxMonExp: @ 80690C0 push {r4-r6,lr} adds r5, r0, 0 movs r1, 0xB movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 adds r0, r5, 0 movs r1, 0x19 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r3, r0, 0 movs r2, 0x1 ldr r6, =gExperienceTables @@ -2744,22 +2744,22 @@ _08069116: pop {r1} bx r1 .pool - thumb_func_end sub_80690C0 + thumb_func_end GetLevelFromBoxMonExp - thumb_func_start pokemon_moveset_pad_ -pokemon_moveset_pad_: @ 806912C + thumb_func_start GiveMoveToBoxMon_ +GiveMoveToBoxMon_: @ 806912C push {lr} lsls r1, 16 lsrs r1, 16 - bl pokemon_moveset_pad + bl GiveMoveToBoxMon lsls r0, 16 lsrs r0, 16 pop {r1} bx r1 - thumb_func_end pokemon_moveset_pad_ + thumb_func_end GiveMoveToBoxMon_ - thumb_func_start pokemon_moveset_pad -pokemon_moveset_pad: @ 8069140 + thumb_func_start GiveMoveToBoxMon +GiveMoveToBoxMon: @ 8069140 push {r4-r7,lr} sub sp, 0x4 adds r7, r0, 0 @@ -2773,7 +2773,7 @@ _0806914E: adds r0, r7, 0 adds r1, r4, 0 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData lsls r0, 16 lsrs r0, 16 cmp r0, 0 @@ -2781,7 +2781,7 @@ _0806914E: adds r0, r7, 0 adds r1, r4, 0 mov r2, sp - bl SetMonData_encrypted + bl SetBoxMonData adds r1, r5, 0 adds r1, 0x11 ldrh r0, [r6] @@ -2791,7 +2791,7 @@ _0806914E: ldr r0, =gBattleMoves + 0x4 @ PP offset adds r2, r0 adds r0, r7, 0 - bl SetMonData_encrypted + bl SetBoxMonData ldrh r0, [r6] b _080691A4 .pool @@ -2813,7 +2813,7 @@ _080691A4: pop {r1} bx r1 .pool - thumb_func_end pokemon_moveset_pad + thumb_func_end GiveMoveToBoxMon thumb_func_start sub_80691B0 sub_80691B0: @ 80691B0 @@ -2914,16 +2914,16 @@ sub_8069234: @ 8069234 .pool thumb_func_end sub_8069234 - thumb_func_start sub_8069264 -sub_8069264: @ 8069264 + thumb_func_start GiveMonInitialMoveset +GiveMonInitialMoveset: @ 8069264 push {lr} - bl sub_8069270 + bl GiveBoxMonInitialMoveset pop {r0} bx r0 - thumb_func_end sub_8069264 + thumb_func_end GiveMonInitialMoveset - thumb_func_start sub_8069270 -sub_8069270: @ 8069270 + thumb_func_start GiveBoxMonInitialMoveset +GiveBoxMonInitialMoveset: @ 8069270 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2933,12 +2933,12 @@ sub_8069270: @ 8069270 mov r8, r0 movs r1, 0xB movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 mov r0, r8 - bl sub_80690C0 + bl GetLevelFromBoxMonExp lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -2974,7 +2974,7 @@ _080692AE: mov r0, r8 adds r1, r4, 0 str r3, [sp] - bl pokemon_moveset_pad + bl GiveMoveToBoxMon lsls r0, 16 mov r1, r9 lsrs r5, r1, 16 @@ -2983,7 +2983,7 @@ _080692AE: bne _080692F0 mov r0, r8 adds r1, r4, 0 - bl sub_80694D0 + bl DeleteFirstMoveAndGiveMoveToBoxMon ldr r3, [sp] _080692F0: adds r3, 0x2 @@ -3002,7 +3002,7 @@ _080692FC: pop {r0} bx r0 .pool - thumb_func_end sub_8069270 + thumb_func_end GiveBoxMonInitialMoveset thumb_func_start sub_8069318 sub_8069318: @ 8069318 @@ -3115,7 +3115,7 @@ _080693D8: strb r0, [r6] ldrh r1, [r2] mov r0, r8 - bl pokemon_moveset_pad_ + bl GiveMoveToBoxMon_ lsls r0, 16 lsrs r0, 16 str r0, [sp] @@ -3133,8 +3133,8 @@ _08069404: .pool thumb_func_end sub_8069318 - thumb_func_start sub_8069424 -sub_8069424: @ 8069424 + thumb_func_start DeleteFirstMoveAndGiveMoveToMon +DeleteFirstMoveAndGiveMoveToMon: @ 8069424 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -3216,10 +3216,10 @@ _08069494: pop {r0} bx r0 .pool - thumb_func_end sub_8069424 + thumb_func_end DeleteFirstMoveAndGiveMoveToMon - thumb_func_start sub_80694D0 -sub_80694D0: @ 80694D0 + thumb_func_start DeleteFirstMoveAndGiveMoveToBoxMon +DeleteFirstMoveAndGiveMoveToBoxMon: @ 80694D0 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -3239,13 +3239,13 @@ _080694EC: adds r1, 0xE adds r0, r6, 0 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData strh r0, [r5] adds r1, r4, 0 adds r1, 0x12 adds r0, r6, 0 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r1, r7, r4 strb r0, [r1] adds r5, 0x2 @@ -3255,7 +3255,7 @@ _080694EC: adds r0, r6, 0 movs r1, 0x15 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData mov r1, r9 strb r0, [r1] ldrb r0, [r1] @@ -3279,12 +3279,12 @@ _08069540: adds r1, 0xD adds r0, r6, 0 adds r2, r5, 0 - bl SetMonData_encrypted + bl SetBoxMonData adds r1, r4, 0 adds r1, 0x11 adds r2, r7, r4 adds r0, r6, 0 - bl SetMonData_encrypted + bl SetBoxMonData adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 @@ -3292,7 +3292,7 @@ _08069540: adds r0, r6, 0 movs r1, 0x15 mov r2, r9 - bl SetMonData_encrypted + bl SetBoxMonData add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -3301,6 +3301,6 @@ _08069540: pop {r0} bx r0 .pool - thumb_func_end sub_80694D0 + thumb_func_end DeleteFirstMoveAndGiveMoveToBoxMon .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokemon_2.s b/asm/pokemon_2.s index d16f6f1b5..96da3e639 100644 --- a/asm/pokemon_2.s +++ b/asm/pokemon_2.s @@ -244,13 +244,13 @@ pokemon_roll_gender: @ 8069FC4 adds r4, r0, 0 movs r1, 0xB movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData lsls r0, 16 lsrs r5, r0, 16 adds r0, r4, 0 movs r1, 0 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r2, r0, 0 ldr r1, =gBaseStats lsls r0, r5, 3 @@ -544,9 +544,9 @@ _0806A20A: .pool thumb_func_end sub_806A1C0 - thumb_func_start pokemon_encrypt -@ void pokemon_encrypt(pokemon *mon) -pokemon_encrypt: @ 806A228 + thumb_func_start EncryptBoxMon +@ void EncryptBoxMon(pokemon *mon) +EncryptBoxMon: @ 806A228 push {r4,lr} adds r3, r0, 0 movs r4, 0 @@ -566,7 +566,7 @@ _0806A232: pop {r4} pop {r0} bx r0 - thumb_func_end pokemon_encrypt + thumb_func_end EncryptBoxMon thumb_func_start pokemon_decrypt @ void pokemon_decrypt(pokemon *mon) @@ -1132,16 +1132,16 @@ _0806A65E: _0806A666: adds r0, r4, 0 adds r1, r3, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData _0806A66E: pop {r4} pop {r1} bx r1 thumb_func_end GetMonData - thumb_func_start pokemon_getattr_encrypted -@ int pokemon_getattr_encrypted(pokemon *mon, enum pokemon_data_request req, void *data) -pokemon_getattr_encrypted: @ 806A674 + thumb_func_start GetBoxMonData +@ int GetBoxMonData(pokemon *mon, enum pokemon_data_request req, void *data) +GetBoxMonData: @ 806A674 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1181,7 +1181,7 @@ pokemon_getattr_encrypted: @ 806A674 mov r0, r8 bl pokemon_decrypt mov r0, r8 - bl pokemon_calc_checksum + bl CalculateBoxMonChecksum lsls r0, 16 lsrs r0, 16 mov r1, r8 @@ -1925,7 +1925,7 @@ _0806AC8C: cmp r6, 0xA ble _0806AC98 mov r0, r8 - bl pokemon_encrypt + bl EncryptBoxMon _0806AC98: adds r0, r4, 0 add sp, 0x4 @@ -1936,7 +1936,7 @@ _0806AC98: pop {r4-r7} pop {r1} bx r1 - thumb_func_end pokemon_getattr_encrypted + thumb_func_end GetBoxMonData thumb_func_start SetMonData @ int SetMonData(pokemon *mon, enum pokemon_data_request req, void *data) @@ -2056,15 +2056,15 @@ _0806AD86: b _0806AD96 _0806AD90: adds r0, r3, 0 - bl SetMonData_encrypted + bl SetBoxMonData _0806AD96: pop {r0} bx r0 thumb_func_end SetMonData - thumb_func_start SetMonData_encrypted -@ int SetMonData_encrypted(pokemon *mon, enum pokemon_data_request req, void *data) -SetMonData_encrypted: @ 806AD9C + thumb_func_start SetBoxMonData +@ int SetBoxMonData(pokemon *mon, enum pokemon_data_request req, void *data) +SetBoxMonData: @ 806AD9C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2103,7 +2103,7 @@ SetMonData_encrypted: @ 806AD9C adds r0, r7, 0 bl pokemon_decrypt adds r0, r7, 0 - bl pokemon_calc_checksum + bl CalculateBoxMonChecksum lsls r0, 16 lsrs r0, 16 ldrh r1, [r7, 0x1C] @@ -2120,7 +2120,7 @@ SetMonData_encrypted: @ 806AD9C orrs r0, r1 strb r0, [r5, 0x7] adds r0, r7, 0 - bl pokemon_encrypt + bl EncryptBoxMon b _0806B3EC _0806AE1C: mov r0, r10 @@ -2850,10 +2850,10 @@ _0806B3D8: cmp r0, 0xA ble _0806B3EC adds r0, r7, 0 - bl pokemon_calc_checksum + bl CalculateBoxMonChecksum strh r0, [r7, 0x1C] adds r0, r7, 0 - bl pokemon_encrypt + bl EncryptBoxMon _0806B3EC: pop {r3-r5} mov r8, r3 @@ -2863,7 +2863,7 @@ _0806B3EC: pop {r0} bx r0 .pool - thumb_func_end SetMonData_encrypted + thumb_func_end SetBoxMonData thumb_func_start memcpy_pokemon @ void *memcpy_pokemon(void *dest, void *src, unsigned int size) @@ -2959,7 +2959,7 @@ _0806B4B2: adds r4, r0, 0 movs r1, 0xB movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _0806B514 mov r0, r8 diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index e2b75248e..6465575f9 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -571,7 +571,7 @@ _0806C168: mov r2, sp bl SetMonData mov r0, r8 - bl pokemon_calc_effective_stats + bl CalculateMonStats movs r0, 0 str r0, [sp, 0x20] _0806C1CA: @@ -927,7 +927,7 @@ _0806C4B4: mov r0, r8 bl SetMonData mov r0, r8 - bl pokemon_calc_effective_stats + bl CalculateMonStats ldr r0, [sp, 0x28] adds r0, 0x1 lsls r0, 24 @@ -1615,7 +1615,7 @@ _0806CA9A: mov r0, r8 bl SetMonData mov r0, r8 - bl pokemon_calc_effective_stats + bl CalculateMonStats movs r3, 0 str r3, [sp, 0x20] b _0806CD30 @@ -5553,20 +5553,20 @@ _0806E938: adds r0, r5, 0 adds r1, r4, 0 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _0806E984 adds r0, r5, 0 adds r1, r4, 0 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 adds r0, r5, 0 movs r1, 0x15 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -5580,7 +5580,7 @@ _0806E938: adds r1, 0x11 adds r0, r5, 0 mov r2, sp - bl SetMonData_encrypted + bl SetBoxMonData _0806E984: adds r6, 0x1 cmp r6, 0x3 diff --git a/asm/rom3.s b/asm/rom3.s index 7162e65cd..bce623188 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -2600,7 +2600,7 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4 ldrh r0, [r0] mov r1, r12 strh r0, [r1, 0x2] - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] strh r0, [r1, 0x4] ldr r0, =gLastUsedAbility @@ -2633,7 +2633,7 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4 strb r0, [r7, 0xB] movs r3, 0 mov r9, r2 - ldr r0, =gUnknown_02022F78 + ldr r0, =gBattleTextBuff3 mov r8, r0 adds r2, 0x10 ldr r0, =gBattleMons @@ -2715,7 +2715,7 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC ldrh r0, [r0] mov r1, r12 strh r0, [r1, 0x2] - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem ldrh r0, [r0] strh r0, [r1, 0x4] ldr r0, =gLastUsedAbility @@ -2731,7 +2731,7 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC strb r0, [r1, 0x8] movs r3, 0 mov r9, r2 - ldr r7, =gUnknown_02022F78 + ldr r7, =gBattleTextBuff3 mov r8, r7 mov r4, r9 adds r4, 0x10 diff --git a/asm/rom6.s b/asm/rom6.s index a116782e9..e7bbf649b 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -11229,7 +11229,7 @@ _0813B27E: bl get_pokemon_by_box_and_pos movs r1, 0xB movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _0813B2C0 bl get_unknown_box_id diff --git a/asm/rom_8034C54.s b/asm/rom_8034C54.s index 14156d56e..d89cecbff 100644 --- a/asm/rom_8034C54.s +++ b/asm/rom_8034C54.s @@ -14183,7 +14183,7 @@ _0803C99C: bne _0803C9BA b _0803CC1C _0803C9BA: - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem strh r3, [r0] ldr r0, =gBattleCommunication ldrb r1, [r5] @@ -17584,7 +17584,7 @@ sub_803E90C: @ 803E90C strh r1, [r0] ldrb r0, [r4] bl sub_8045868 - ldr r5, =gUnknown_02024208 + ldr r5, =gLastUsedItem ldr r2, =gBattleBufferB ldrb r1, [r4] lsls r1, 9 @@ -17914,7 +17914,7 @@ _0803EC5E: strb r5, [r0] cmp r1, 0x25 bne _0803EC9C - ldr r2, =gUnknown_02024208 + ldr r2, =gLastUsedItem ldr r1, =gBattleMons movs r0, 0x58 muls r0, r5 @@ -18309,7 +18309,7 @@ bs5_8016AC0: @ 803EFF0 ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] - ldr r1, =gUnknown_02024208 + ldr r1, =gLastUsedItem movs r0, 0x5 strh r0, [r1] ldr r1, =gBattlescriptCurrInstr @@ -18347,7 +18347,7 @@ sub_803F050: @ 803F050 ldrb r0, [r0] subs r0, 0x1 strb r0, [r6, 0x5] - ldr r1, =gUnknown_02024208 + ldr r1, =gLastUsedItem ldrb r0, [r3] lsls r0, 9 adds r2, 0x2 diff --git a/asm/rom_80C6FA0.s b/asm/rom_80C6FA0.s index b821dccdc..db3ca5ac9 100644 --- a/asm/rom_80C6FA0.s +++ b/asm/rom_80C6FA0.s @@ -922,7 +922,7 @@ _080C76E2: lsls r0, 4 add r0, r8 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _080C770C asrs r0, r6, 16 @@ -963,12 +963,12 @@ _080C772C: adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080C7750 adds r0, r4, 0 movs r1, 0x2D - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080C7710 _080C7750: @@ -13310,7 +13310,7 @@ sub_80CE0E8: @ 80CE0E8 muls r0, r1 ldr r1, =gPlayerParty adds r0, r1 - bl zero_pokemon_struct + bl ZeroMonData b _080CE10C .pool _080CE108: @@ -14255,7 +14255,7 @@ _080CE97E: adds r0, r5, 0 muls r0, r6 adds r0, r4 - bl zero_pokemon_struct + bl ZeroMonData adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -14683,7 +14683,7 @@ _080CED1E: adds r7, r4, 0 adds r0, r7, 0 movs r1, 0x41 - bl pokemon_getattr_encrypted + bl GetBoxMonData mov r2, r8 ldr r1, [r2] ldr r3, =0x00000ce4 @@ -14696,11 +14696,11 @@ _080CED1E: _080CED3A: adds r0, r7, 0 movs r1, 0x1 - bl pokemon_getattr_encrypted + bl GetBoxMonData mov r9, r0 adds r0, r7, 0 movs r1, 0x4 - bl pokemon_getattr_encrypted + bl GetBoxMonData lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -14716,7 +14716,7 @@ _080CED3A: _080CED6C: adds r0, r7, 0 movs r1, 0x2D - bl pokemon_getattr_encrypted + bl GetBoxMonData mov r3, r8 ldr r1, [r3] ldr r2, =0x00000ced @@ -14729,26 +14729,26 @@ _080CED7E: adds r2, r4 adds r0, r7, 0 movs r1, 0x2 - bl pokemon_getattr_encrypted + bl GetBoxMonData ldr r0, [r5] adds r0, r4 bl StringGetEnd10 adds r0, r7, 0 - bl sub_80690C0 + bl GetLevelFromBoxMonExp ldr r1, [r5] ldr r3, =0x00000cec adds r1, r3 strb r0, [r1] adds r0, r7, 0 movs r1, 0x8 - bl pokemon_getattr_encrypted + bl GetBoxMonData ldr r1, [r5] ldr r2, =0x00000ceb adds r1, r2 strb r0, [r1] adds r0, r7, 0 movs r1, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r2, r0, 0 ldr r1, [r5] movs r6, 0xCE @@ -14774,7 +14774,7 @@ _080CED7E: mov r9, r0 adds r0, r7, 0 movs r1, 0xC - bl pokemon_getattr_encrypted + bl GetBoxMonData ldr r1, [r5] ldr r2, =0x00000ce6 adds r1, r2 @@ -18257,7 +18257,7 @@ _080D0A62: ldr r0, [r2] adds r0, r1 movs r1, 0x5 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080D0A80 adds r0, r5, 0 @@ -18343,7 +18343,7 @@ _080D0B04: ldr r0, [r1] adds r0, r4 movs r1, 0x5 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080D0B2C mov r0, r8 @@ -18475,7 +18475,7 @@ _080D0C04: ldr r0, [r2] adds r0, r1 movs r1, 0x5 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080D0C30 adds r0, r5, 0 @@ -20611,7 +20611,7 @@ get_pokemon_data_from_any_box: @ 80D1D30 lsls r1, 4 adds r0, r1 adds r1, r5, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData b _080D1D6E .pool _080D1D6C: @@ -20650,7 +20650,7 @@ set_pokemon_data_from_any_box: @ 80D1D74 adds r0, r1 adds r1, r5, 0 adds r2, r6, 0 - bl SetMonData_encrypted + bl SetBoxMonData _080D1DAC: pop {r4-r6} pop {r0} @@ -20722,7 +20722,7 @@ sub_80D1DFC: @ 80D1DFC adds r0, r1 movs r1, 0x2 adds r2, r5, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData b _080D1E3C .pool _080D1E38: @@ -20759,13 +20759,13 @@ sub_80D1E44: @ 80D1E44 lsls r4, r1, 4 adds r0, r4 movs r1, 0x5 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080D1E84 ldr r0, [r6] adds r0, r5 adds r0, r4 - bl sub_80690C0 + bl GetLevelFromBoxMonExp _080D1E84: movs r0, 0 pop {r4-r6} @@ -20801,7 +20801,7 @@ sub_80D1E90: @ 80D1E90 adds r0, r1 movs r1, 0x2 adds r2, r5, 0 - bl SetMonData_encrypted + bl SetBoxMonData _080D1EC6: pop {r4,r5} pop {r0} @@ -20837,7 +20837,7 @@ sub_80D1ED0: @ 80D1ED0 adds r0, r1 adds r1, r5, 0 adds r2, r6, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData b _080D1F12 .pool _080D1F10: @@ -20972,7 +20972,7 @@ sub_80D1F98: @ 80D1F98 mov r1, r9 mov r2, r8 adds r3, r4, 0 - bl create_pokemon + bl CreateBoxMon _080D2004: add sp, 0x14 pop {r3,r4} @@ -21008,7 +21008,7 @@ sub_80D2018: @ 80D2018 adds r1, r4 lsls r1, 4 adds r0, r1 - bl zero_pokemon_boxed_data + bl ZeroBoxMonData _080D2048: pop {r4} pop {r0} @@ -21195,7 +21195,7 @@ _080D218A: lsls r0, 4 add r0, r8 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _080D21B4 asrs r0, r6, 16 @@ -21236,12 +21236,12 @@ _080D21D4: adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080D21F8 adds r0, r4, 0 movs r1, 0x2D - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080D21B8 _080D21F8: @@ -21285,7 +21285,7 @@ _080D222E: adds r0, r4 movs r1, 0x5 str r2, [sp] - bl pokemon_getattr_encrypted + bl GetBoxMonData ldr r2, [sp] cmp r0, 0 bne _080D224C @@ -21335,21 +21335,21 @@ sub_80D2270: @ 80D2270 lsls r4, r1, 4 adds r0, r4 movs r1, 0x5 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080D22C8 ldr r0, [r6] adds r0, r5 adds r0, r4 movs r1, 0x6 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _080D22C8 ldr r0, [r6] adds r0, r5 adds r0, r4 movs r1, 0x4 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _080D22C8 movs r0, 0x1 @@ -21390,7 +21390,7 @@ _080D22F4: adds r0, r4 adds r0, r5 movs r1, 0x5 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080D231A mov r2, r9 @@ -21398,7 +21398,7 @@ _080D22F4: adds r0, r4 adds r0, r5 movs r1, 0x6 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _080D231A adds r7, 0x1 @@ -21447,7 +21447,7 @@ _080D2360: adds r0, r4 adds r0, r5 movs r1, 0x5 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _080D2384 mov r2, r9 @@ -21455,7 +21455,7 @@ _080D2360: adds r0, r4 adds r0, r5 movs r1, 0x6 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080D2386 _080D2384: @@ -21500,14 +21500,14 @@ _080D23C4: adds r0, r5 adds r0, r4 movs r1, 0x5 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080D2404 ldr r0, [r7] adds r0, r5 adds r0, r4 movs r1, 0x6 - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 bne _080D2404 ldr r0, [r7] @@ -21515,7 +21515,7 @@ _080D23C4: adds r0, r4 movs r1, 0x51 mov r2, sp - bl pokemon_getattr_encrypted + bl GetBoxMonData cmp r0, 0 beq _080D2404 movs r0, 0x1 @@ -25781,13 +25781,13 @@ _080D4500: bls _080D4500 mov r0, r8 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 mov r0, r8 movs r1, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r1, r0, 0 adds r0, r4, 0 bl sub_80D45C8 diff --git a/asm/rom_815A0D4.s b/asm/rom_815A0D4.s index 2b9fb31e2..fa6cbd285 100644 --- a/asm/rom_815A0D4.s +++ b/asm/rom_815A0D4.s @@ -12852,7 +12852,7 @@ _081609A8: lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 - bl pokemon_moveset_pad_ + bl GiveMoveToBoxMon_ lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 diff --git a/asm/rom_8161F74.s b/asm/rom_8161F74.s index b3ab9ef9f..32922aa54 100644 --- a/asm/rom_8161F74.s +++ b/asm/rom_8161F74.s @@ -2494,7 +2494,7 @@ _08163494: str r2, [sp] ldr r2, [sp, 0xC] ldr r3, [sp, 0x10] - bl pokemon_make_ev_something + bl CreateMonWithEVSpread movs r0, 0xFF mov r1, r9 strb r0, [r1] @@ -6202,7 +6202,7 @@ _081654DE: ldr r2, [sp, 0x64] bl SetMonData adds r0, r4, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats ldr r2, [sp, 0x60] mov r10, r2 cmp r2, 0x2 @@ -7790,7 +7790,7 @@ _081661A6: movs r1, 0x19 bl SetMonData adds r0, r4, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats _081661E2: adds r5, 0x1 cmp r5, 0x5 diff --git a/asm/rom_817C95C.s b/asm/rom_817C95C.s index 1cb9a92d7..a1cbcb164 100644 --- a/asm/rom_817C95C.s +++ b/asm/rom_817C95C.s @@ -50,7 +50,7 @@ _0817C988: lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, =gUnknown_0203ABA8 + ldr r0, =gStringInfo ldr r0, [r0] ldrb r0, [r0, 0x7] bl GetBankSide @@ -107,7 +107,7 @@ _0817CA4C: str r1, [sp, 0xC] ldr r0, =gBankAttacker ldrb r0, [r0] - ldr r1, =gUnknown_0203ABA8 + ldr r1, =gStringInfo ldr r1, [r1] ldrh r1, [r1] bl sub_817F33C @@ -1766,7 +1766,7 @@ _0817DACC: bne _0817DAF0 b _0817E0A6 _0817DAF0: - ldr r0, =gUnknown_0203ABA8 + ldr r0, =gStringInfo ldr r0, [r0] ldrh r0, [r0] cmp r0, 0xAD diff --git a/asm/rom_818CFC8.s b/asm/rom_818CFC8.s index 4b4c1f426..13e89f2ba 100644 --- a/asm/rom_818CFC8.s +++ b/asm/rom_818CFC8.s @@ -28036,7 +28036,7 @@ _0819B77E: adds r0, r5, 0 movs r1, 0x2E movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData mov r2, r8 ldr r1, [r2] adds r1, r4 @@ -28046,7 +28046,7 @@ _0819B77E: adds r0, r5, 0 movs r1, 0x28 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData mov r2, r8 ldr r1, [r2] adds r1, r4 @@ -30058,7 +30058,7 @@ sub_819C810: @ 819C810 add r0, r9 movs r1, 0x2E movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData mov r1, r8 ldr r2, [r1] ldr r1, [r5] @@ -46041,7 +46041,7 @@ _081A4F9C: add r2, sp, 0x10 bl SetMonData adds r0, r4, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats ldr r2, [sp, 0x2C] str r2, [sp, 0x18] _081A4FC4: @@ -48412,7 +48412,7 @@ _081A6408: adds r0, r5, 0 movs r1, 0x28 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData mov r2, r8 ldr r1, [r2] adds r1, r4 @@ -48432,7 +48432,7 @@ _081A6408: adds r0, r5, 0 movs r1, 0x2E movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData mov r2, r8 ldr r1, [r2] adds r1, r4 @@ -48616,7 +48616,7 @@ _081A65E2: muls r4, r2 ldr r5, =gPlayerParty adds r0, r4, r5 - bl pokemon_calc_effective_stats + bl CalculateMonStats movs r0, 0 ldr r1, [sp, 0x1C] strb r0, [r1] @@ -48785,7 +48785,7 @@ _081A6734: muls r4, r2 ldr r5, =gEnemyParty adds r0, r4, r5 - bl pokemon_calc_effective_stats + bl CalculateMonStats movs r6, 0 _081A674E: mov r1, r9 @@ -51451,7 +51451,7 @@ _081A7CBA: cmp r4, 0x3 ble _081A7CBA ldr r0, =gEnemyParty - bl pokemon_calc_effective_stats + bl CalculateMonStats movs r0, 0x1 _081A7CE2: add sp, 0x8 @@ -55488,7 +55488,7 @@ _081A9DF6: ble _081A9DF6 _081A9E0C: ldr r0, =gEnemyParty - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x14 pop {r4-r6} pop {r0} @@ -80216,7 +80216,7 @@ sub_81B6DC4: @ 81B6DC4 beq _081B6E78 ldrh r1, [r7, 0xE] adds r0, r5, 0 - bl pokemon_moveset_pad_ + bl GiveMoveToBoxMon_ lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 @@ -82059,7 +82059,7 @@ sub_81B7E4C: @ 81B7E4C beq _081B7EF8 ldrh r1, [r7, 0xE] adds r0, r5, 0 - bl pokemon_moveset_pad_ + bl GiveMoveToBoxMon_ lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 diff --git a/asm/rom_81BE66C.s b/asm/rom_81BE66C.s index c5fb35403..a444df913 100644 --- a/asm/rom_81BE66C.s +++ b/asm/rom_81BE66C.s @@ -5475,26 +5475,26 @@ sub_81C15EC: @ 81C15EC adds r1, 0xD adds r0, r7, 0 mov r2, sp - bl SetMonData_encrypted + bl SetBoxMonData adds r1, r6, 0 adds r1, 0xD adds r0, r7, 0 ldr r2, [sp, 0x1C] - bl SetMonData_encrypted + bl SetBoxMonData adds r4, 0x11 adds r0, r7, 0 adds r1, r4, 0 ldr r2, [sp, 0x20] - bl SetMonData_encrypted + bl SetBoxMonData adds r6, 0x11 adds r0, r7, 0 adds r1, r6, 0 ldr r2, [sp, 0x24] - bl SetMonData_encrypted + bl SetBoxMonData adds r0, r7, 0 movs r1, 0x15 adds r2, r5, 0 - bl SetMonData_encrypted + bl SetBoxMonData mov r0, sp ldrh r0, [r0] ldr r1, [sp, 0x8] @@ -28952,7 +28952,7 @@ _081CD6E0: lsls r0, 24 lsrs r6, r0, 24 adds r0, r4, 0 - bl sub_80690C0 + bl GetLevelFromBoxMonExp lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -33134,13 +33134,13 @@ _081CF924: lsls r0, 24 lsrs r5, r0, 24 adds r0, r4, 0 - bl sub_80690C0 + bl GetLevelFromBoxMonExp lsls r0, 24 lsrs r7, r0, 24 ldr r2, =gStringVar3 adds r0, r4, 0 movs r1, 0x2 - bl pokemon_getattr_encrypted + bl GetBoxMonData _081CF94A: ldr r4, =gStringVar3 adds r0, r4, 0 @@ -34511,14 +34511,14 @@ _081D03A4: lsls r0, 24 lsrs r5, r0, 24 adds r0, r4, 0 - bl sub_80690C0 + bl GetLevelFromBoxMonExp lsls r0, 24 lsrs r0, 24 mov r8, r0 ldr r2, =gStringVar3 adds r0, r4, 0 movs r1, 0x2 - bl pokemon_getattr_encrypted + bl GetBoxMonData _081D03CC: ldr r4, =gStringVar3 adds r0, r4, 0 @@ -34997,12 +34997,12 @@ _081D0730: bl pokemon_roll_gender strb r0, [r6] adds r0, r4, 0 - bl sub_80690C0 + bl GetLevelFromBoxMonExp strb r0, [r7] adds r0, r4, 0 movs r1, 0x2 adds r2, r5, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData _081D0752: adds r0, r5, 0 bl StringGetEnd10 @@ -35052,15 +35052,15 @@ _081D07AC: bl get_pokemon_by_box_and_pos adds r4, r0, 0 movs r1, 0xB - bl pokemon_getattr_encrypted + bl GetBoxMonData strh r0, [r5] adds r0, r4, 0 movs r1, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData str r0, [r6] adds r0, r4, 0 movs r1, 0x1 - bl pokemon_getattr_encrypted + bl GetBoxMonData _081D07D0: str r0, [r7] pop {r4-r7} @@ -39996,7 +39996,7 @@ _081D2D70: lsls r0, 24 lsrs r6, r0, 24 adds r0, r4, 0 - bl sub_80690C0 + bl GetLevelFromBoxMonExp lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -46777,7 +46777,7 @@ sub_81D642C: @ 81D642C mov r2, sp bl SetMonData adds r0, r4, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x8 pop {r4,r5} pop {r0} diff --git a/asm/trade.s b/asm/trade.s index 95560c91a..85ace12c4 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -13401,7 +13401,7 @@ _0807E954: bl SetMonData _0807E960: ldr r0, =gEnemyParty - bl pokemon_calc_effective_stats + bl CalculateMonStats add sp, 0x38 pop {r4-r7} pop {r0} @@ -1133,7 +1133,7 @@ _080EC7CA: .pool _080EC81C: movs r2, 0 - ldr r0, =gUnknown_02024208 + ldr r0, =gLastUsedItem mov r12, r0 adds r3, r6, 0 adds r3, 0x13 @@ -7574,17 +7574,17 @@ sub_80EFEC4: @ 80EFEC4 adds r6, r0, 0 ldr r2, =gStringVar3 movs r1, 0x2 - bl pokemon_getattr_encrypted + bl GetBoxMonData ldr r0, =gStringVar2 mov r8, r0 adds r0, r6, 0 movs r1, 0x2 mov r2, r8 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r0, r6, 0 movs r1, 0xB movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 @@ -7596,7 +7596,7 @@ sub_80EFEC4: @ 80EFEC4 adds r0, r6, 0 movs r1, 0 movs r2, 0 - bl pokemon_getattr_encrypted + bl GetBoxMonData str r0, [sp] ldr r0, =sub_80EFF48 str r0, [sp, 0x4] diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index a7bb479b1..df6196372 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -858,7 +858,7 @@ _080B4F02: adds r1, r6, 0 adds r2, r7, 0 movs r3, 0x20 - bl sub_8067EF8 + bl CreateMonWithGenderNatureLetter b _080B4F40 .pool _080B4F28: @@ -871,7 +871,7 @@ _080B4F28: adds r1, r6, 0 adds r2, r7, 0 movs r3, 0x20 - bl pokemon_make_with_nature + bl CreateMonWithNature _080B4F40: add sp, 0xC pop {r4-r7} diff --git a/data/data2c.s b/data/data2c.s index a3395365c..ddfa2e9be 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -11,7 +11,8 @@ @ 831C898 .include "data/battle_moves.inc" - .incbin "baserom.gba", 0x31d93c, 0x10 + @ 0x31d93c unreferenced unknown data +.byte 0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 @ 831D94C .include "data/pokedex_order.inc" diff --git a/src/main.c b/src/main.c index 7da51c65a..15f1ec3eb 100644 --- a/src/main.c +++ b/src/main.c @@ -5,6 +5,7 @@ #include "rng.h" #include "dma3.h" #include "gba/flash_internal.h" +#include "battle.h" extern u16 GetGpuReg(u8); extern void SetGpuReg(u8, u16); @@ -359,7 +360,7 @@ static void VBlankIntr(void) m4aSoundMain(); sub_8033648(); - if (!gMain.inBattle || (gBattleTypeFlags & 0x013F0102) == 0) + if (!gMain.inBattle || !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_RECORDED))) Random(); sub_800E174(); diff --git a/sym_ewram.txt b/sym_ewram.txt index 10bb28feb..a4bfea346 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -262,7 +262,7 @@ gBattleTextBuff2: @ 2022F68 gUnknown_02022F6A: @ 2022F6A .space 0xE -gUnknown_02022F78: @ 2022F78 +gBattleTextBuff3: @ 2022F78 .space 0x10 gUnknown_02022F88: @ 2022F88 @@ -388,7 +388,7 @@ gUnknown_020241F4: @ 20241F4 gUnknown_020241F8: @ 20241F8 .space 0x10 -gUnknown_02024208: @ 2024208 +gLastUsedItem: @ 2024208 .space 0x2 gLastUsedAbility: @ 202420A @@ -1598,10 +1598,10 @@ gUnknown_0203AB9C: @ 203AB9C sTransitionStructPtr: @ 203ABA0 .space 0x4 -gUnknown_0203ABA4: @ 203ABA4 +gAbilitiesPerBank: @ 203ABA4 .space 0x4 -gUnknown_0203ABA8: @ 203ABA8 +gStringInfo: @ 203ABA8 .space 0x4 gUnknown_0203ABAC: @ 203ABAC |