diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom.s | 158 |
1 files changed, 79 insertions, 79 deletions
@@ -348124,7 +348124,7 @@ itemid_get_item: ; 80A98D4 pop {r1} bx r1 .align 2 -_080A98F0: .4byte gUnknown_083C5564 +_080A98F0: .4byte gItems thumb_func_end itemid_get_item thumb_func_start itemid_get_number @@ -348144,7 +348144,7 @@ itemid_get_number: ; 80A98F4 pop {r1} bx r1 .align 2 -_080A9914: .4byte gUnknown_083C5564 +_080A9914: .4byte gItems thumb_func_end itemid_get_number thumb_func_start itemid_get_market_price @@ -348164,7 +348164,7 @@ itemid_get_market_price: ; 80A9918 pop {r1} bx r1 .align 2 -_080A9938: .4byte gUnknown_083C5564 +_080A9938: .4byte gItems thumb_func_end itemid_get_market_price thumb_func_start itemid_get_x12 @@ -348184,7 +348184,7 @@ itemid_get_x12: ; 80A993C pop {r1} bx r1 .align 2 -_080A995C: .4byte gUnknown_083C5564 +_080A995C: .4byte gItems thumb_func_end itemid_get_x12 thumb_func_start itemid_get_quality @@ -348204,7 +348204,7 @@ itemid_get_quality: ; 80A9960 pop {r1} bx r1 .align 2 -_080A9980: .4byte gUnknown_083C5564 +_080A9980: .4byte gItems thumb_func_end itemid_get_quality thumb_func_start itemid_get_description @@ -348225,7 +348225,7 @@ itemid_get_description: ; 80A9984 pop {r1} bx r1 .align 2 -_080A99A4: .4byte gUnknown_083C5564 +_080A99A4: .4byte gItems thumb_func_end itemid_get_description thumb_func_start sub_80A99A8 @@ -348261,7 +348261,7 @@ _080A99CA: movs r0, 0x1 b _080A9A02 .align 2 -_080A99E4: .4byte gUnknown_083C5564 +_080A99E4: .4byte gItems _080A99E8: lsls r0, r1, 24 lsrs r0, 24 @@ -348301,7 +348301,7 @@ itemid_is_unique: ; 80A9A08 pop {r1} bx r1 .align 2 -_080A9A28: .4byte gUnknown_083C5564 +_080A9A28: .4byte gItems thumb_func_end itemid_is_unique thumb_func_start itemid_get_x19 @@ -348321,7 +348321,7 @@ itemid_get_x19: ; 80A9A2C pop {r1} bx r1 .align 2 -_080A9A4C: .4byte gUnknown_083C5564 +_080A9A4C: .4byte gItems thumb_func_end itemid_get_x19 thumb_func_start itemid_get_pocket_number @@ -348341,7 +348341,7 @@ itemid_get_pocket_number: ; 80A9A50 pop {r1} bx r1 .align 2 -_080A9A70: .4byte gUnknown_083C5564 +_080A9A70: .4byte gItems thumb_func_end itemid_get_pocket_number thumb_func_start itemid_get_type @@ -348361,7 +348361,7 @@ itemid_get_type: ; 80A9A74 pop {r1} bx r1 .align 2 -_080A9A94: .4byte gUnknown_083C5564 +_080A9A94: .4byte gItems thumb_func_end itemid_get_type thumb_func_start itemid_get_overworld_function @@ -348382,7 +348382,7 @@ itemid_get_overworld_function: ; 80A9A98 pop {r1} bx r1 .align 2 -_080A9AB8: .4byte gUnknown_083C5564 +_080A9AB8: .4byte gItems thumb_func_end itemid_get_overworld_function thumb_func_start itemid_get_usage @@ -348403,7 +348403,7 @@ itemid_get_usage: ; 80A9ABC pop {r1} bx r1 .align 2 -_080A9ADC: .4byte gUnknown_083C5564 +_080A9ADC: .4byte gItems thumb_func_end itemid_get_usage thumb_func_start itemid_get_battle_function @@ -348424,7 +348424,7 @@ itemid_get_battle_function: ; 80A9AE0 pop {r1} bx r1 .align 2 -_080A9B00: .4byte gUnknown_083C5564 +_080A9B00: .4byte gItems thumb_func_end itemid_get_battle_function thumb_func_start itemid_get_x28 @@ -348445,7 +348445,7 @@ itemid_get_x28: ; 80A9B04 pop {r1} bx r1 .align 2 -_080A9B24: .4byte gUnknown_083C5564 +_080A9B24: .4byte gItems thumb_func_end itemid_get_x28 thumb_func_start sub_80A9B28 @@ -412775,7 +412775,7 @@ CheckIfItemIsTMHMOrEvolutionStone: ; 80C911C movs r0, 0x1 b _080C914E .align 2 -_080C9134: .4byte sub_80C9E90 +_080C9134: .4byte ItemUseOutOfBattle_TMHM _080C9138: adds r0, r4, 0 bl itemid_get_overworld_function @@ -412785,7 +412785,7 @@ _080C9138: movs r0, 0 b _080C914E .align 2 -_080C9148: .4byte sub_80CA228 +_080C9148: .4byte ItemUseOutOfBattle_EvolutionStone _080C914C: movs r0, 0x2 _080C914E: @@ -412827,8 +412827,8 @@ _080C918C: .4byte 0x0203855e _080C9190: .4byte sub_80A5D04 thumb_func_end sub_80C9154 - thumb_func_start sub_80C9194 -sub_80C9194: ; 80C9194 + thumb_func_start ItemUseOutOfBattle_Mail +ItemUseOutOfBattle_Mail: ; 80C9194 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 @@ -412855,7 +412855,7 @@ sub_80C9194: ; 80C9194 .align 2 _080C91C4: .4byte 0x03004b20 _080C91C8: .4byte sub_80C9154 - thumb_func_end sub_80C9194 + thumb_func_end ItemUseOutOfBattle_Mail thumb_func_start ItemUseOutOfBattle_Bike ItemUseOutOfBattle_Bike: ; 80C91CC @@ -414112,8 +414112,8 @@ _080C9B30: .4byte 0x0300485c _080C9B34: .4byte sub_8080E28 thumb_func_end ItemUseOutOfBattle_PokeblockCase - thumb_func_start sub_80C9B38 -sub_80C9B38: ; 80C9B38 + thumb_func_start ItemUseOutOfBattle_CoinCase +ItemUseOutOfBattle_CoinCase: ; 80C9B38 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -414168,7 +414168,7 @@ _080C9BAC: bx r0 .align 2 _080C9BB4: .4byte sub_80A5C9C - thumb_func_end sub_80C9B38 + thumb_func_end ItemUseOutOfBattle_CoinCase thumb_func_start sub_80C9BB8 sub_80C9BB8: ; 80C9BB8 @@ -414354,8 +414354,8 @@ _080C9D28: .4byte 0x0203855e _080C9D2C: .4byte gUnknown_081A1654 thumb_func_end sub_80C9D00 - thumb_func_start sub_80C9D30 -sub_80C9D30: ; 80C9D30 + thumb_func_start ItemUseOutOfBattle_WailmerPail +ItemUseOutOfBattle_WailmerPail: ; 80C9D30 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -414388,7 +414388,7 @@ _080C9D6A: bx r0 .align 2 _080C9D70: .4byte 0x03004b20 - thumb_func_end sub_80C9D30 + thumb_func_end ItemUseOutOfBattle_WailmerPail thumb_func_start sub_80C9D74 sub_80C9D74: ; 80C9D74 @@ -414423,8 +414423,8 @@ sub_80C9D98: ; 80C9D98 _080C9DAC: .4byte 0x02038561 thumb_func_end sub_80C9D98 - thumb_func_start sub_80C9DB0 -sub_80C9DB0: ; 80C9DB0 + thumb_func_start ItemUseOutOfBattle_Medicine +ItemUseOutOfBattle_Medicine: ; 80C9DB0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -414437,10 +414437,10 @@ sub_80C9DB0: ; 80C9DB0 .align 2 _080C9DC4: .4byte 0x03004ae4 _080C9DC8: .4byte sub_806FE2C - thumb_func_end sub_80C9DB0 + thumb_func_end ItemUseOutOfBattle_Medicine - thumb_func_start CopyString_LimitN_Multibyte -CopyString_LimitN_Multibyte: ; 80C9DCC + thumb_func_start ItemUseOutOfBattle_SacredAsh +ItemUseOutOfBattle_SacredAsh: ; 80C9DCC push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -414493,10 +414493,10 @@ _080C9E2C: .4byte 0x03005ce0 _080C9E30: .4byte 0x03004ae4 _080C9E34: .4byte sub_8070048 _080C9E38: .4byte 0x02038561 - thumb_func_end CopyString_LimitN_Multibyte + thumb_func_end ItemUseOutOfBattle_SacredAsh - thumb_func_start sub_80C9E3C -sub_80C9E3C: ; 80C9E3C + thumb_func_start ItemUseOutOfBattle_PPRecovery +ItemUseOutOfBattle_PPRecovery: ; 80C9E3C push {lr} lsls r0, 24 lsrs r0, 24 @@ -414509,10 +414509,10 @@ sub_80C9E3C: ; 80C9E3C .align 2 _080C9E50: .4byte 0x03004ae4 _080C9E54: .4byte dp05_ether - thumb_func_end sub_80C9E3C + thumb_func_end ItemUseOutOfBattle_PPRecovery - thumb_func_start sub_80C9E58 -sub_80C9E58: ; 80C9E58 + thumb_func_start ItemUseOutOfBattle_PPUp +ItemUseOutOfBattle_PPUp: ; 80C9E58 push {lr} lsls r0, 24 lsrs r0, 24 @@ -414525,10 +414525,10 @@ sub_80C9E58: ; 80C9E58 .align 2 _080C9E6C: .4byte 0x03004ae4 _080C9E70: .4byte dp05_pp_up - thumb_func_end sub_80C9E58 + thumb_func_end ItemUseOutOfBattle_PPUp - thumb_func_start sub_80C9E74 -sub_80C9E74: ; 80C9E74 + thumb_func_start ItemUseOutOfBattle_RareCandy +ItemUseOutOfBattle_RareCandy: ; 80C9E74 push {lr} lsls r0, 24 lsrs r0, 24 @@ -414541,10 +414541,10 @@ sub_80C9E74: ; 80C9E74 .align 2 _080C9E88: .4byte 0x03004ae4 _080C9E8C: .4byte sub_8070680 - thumb_func_end sub_80C9E74 + thumb_func_end ItemUseOutOfBattle_RareCandy - thumb_func_start sub_80C9E90 -sub_80C9E90: ; 80C9E90 + thumb_func_start ItemUseOutOfBattle_TMHM +ItemUseOutOfBattle_TMHM: ; 80C9E90 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -414582,7 +414582,7 @@ _080C9ED4: .align 2 _080C9EDC: .4byte gUnknown_0840EA06 _080C9EE0: .4byte sub_80C9EE4 - thumb_func_end sub_80C9E90 + thumb_func_end ItemUseOutOfBattle_TMHM thumb_func_start sub_80C9EE4 sub_80C9EE4: ; 80C9EE4 @@ -414730,8 +414730,8 @@ _080CA00C: .4byte 0x020234cc _080CA010: .4byte gUnknown_0840EA4F thumb_func_end sub_80C9FDC - thumb_func_start sub_80CA014 -sub_80CA014: ; 80CA014 + thumb_func_start ItemUseOutOfBattle_Repel +ItemUseOutOfBattle_Repel: ; 80CA014 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -414774,7 +414774,7 @@ _080CA06C: .align 2 _080CA074: .4byte gUnknown_0840EA61 _080CA078: .4byte sub_80A5C48 - thumb_func_end sub_80CA014 + thumb_func_end ItemUseOutOfBattle_Repel thumb_func_start sub_80CA07C sub_80CA07C: ; 80CA07C @@ -414825,8 +414825,8 @@ _080CA0D4: .4byte 0x020234cc _080CA0D8: .4byte sub_80A5C48 thumb_func_end sub_80CA098 - thumb_func_start sub_80CA0DC -sub_80CA0DC: ; 80CA0DC + thumb_func_start ItemUseOutOfBattle_BlackWhiteFlute +ItemUseOutOfBattle_BlackWhiteFlute: ; 80CA0DC push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -414886,7 +414886,7 @@ _080CA160: .4byte 0x020234cc _080CA164: .4byte gUnknown_0840EAC3 _080CA168: .4byte 0x03004b20 _080CA16C: .4byte sub_80CA098 - thumb_func_end sub_80CA0DC + thumb_func_end ItemUseOutOfBattle_BlackWhiteFlute thumb_func_start task08_080A1C44 task08_080A1C44: ; 80CA170 @@ -414950,8 +414950,8 @@ _080CA1DE: bx r1 thumb_func_end sub_80CA1C8 - thumb_func_start sub_80CA1E4 -sub_80CA1E4: ; 80CA1E4 + thumb_func_start ItemUseOutOfBattle_EscapeRope +ItemUseOutOfBattle_EscapeRope: ; 80CA1E4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -414984,10 +414984,10 @@ _080CA21E: bx r0 .align 2 _080CA224: .4byte 0x03004b20 - thumb_func_end sub_80CA1E4 + thumb_func_end ItemUseOutOfBattle_EscapeRope - thumb_func_start sub_80CA228 -sub_80CA228: ; 80CA228 + thumb_func_start ItemUseOutOfBattle_EvolutionStone +ItemUseOutOfBattle_EvolutionStone: ; 80CA228 push {lr} lsls r0, 24 lsrs r0, 24 @@ -415000,10 +415000,10 @@ sub_80CA228: ; 80CA228 .align 2 _080CA23C: .4byte 0x03004ae4 _080CA240: .4byte sub_8070DBC - thumb_func_end sub_80CA228 + thumb_func_end ItemUseOutOfBattle_EvolutionStone - thumb_func_start sub_80CA244 -sub_80CA244: ; 80CA244 + thumb_func_start ItemUseInBattle_PokeBall +ItemUseInBattle_PokeBall: ; 80CA244 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -415038,7 +415038,7 @@ _080CA284: .align 2 _080CA28C: .4byte gUnknown_0840EAF4 _080CA290: .4byte sub_80A5C48 - thumb_func_end sub_80CA244 + thumb_func_end ItemUseInBattle_PokeBall thumb_func_start sub_80CA294 sub_80CA294: ; 80CA294 @@ -415105,8 +415105,8 @@ _080CA308: .4byte 0x0203855e _080CA30C: .4byte sub_80CA294 thumb_func_end sub_80CA2BC - thumb_func_start sub_80CA310 -sub_80CA310: ; 80CA310 + thumb_func_start ItemUseInBattle_StatIncrease +ItemUseInBattle_StatIncrease: ; 80CA310 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -415165,7 +415165,7 @@ _080CA384: .align 2 _080CA38C: .4byte 0x03004b20 _080CA390: .4byte sub_80CA2BC - thumb_func_end sub_80CA310 + thumb_func_end ItemUseInBattle_StatIncrease thumb_func_start sub_80CA394 sub_80CA394: ; 80CA394 @@ -415218,8 +415218,8 @@ _080CA3EC: .4byte 0x03004b20 _080CA3F0: .4byte sub_80CA394 thumb_func_end sub_80CA3C0 - thumb_func_start sub_80CA3F4 -sub_80CA3F4: ; 80CA3F4 + thumb_func_start ItemUseInBattle_Medicine +ItemUseInBattle_Medicine: ; 80CA3F4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -415232,7 +415232,7 @@ sub_80CA3F4: ; 80CA3F4 .align 2 _080CA408: .4byte 0x03004ae4 _080CA40C: .4byte sub_806FE2C - thumb_func_end sub_80CA3F4 + thumb_func_end ItemUseInBattle_Medicine thumb_func_start sub_80CA410 sub_80CA410: ; 80CA410 @@ -415250,8 +415250,8 @@ _080CA424: .4byte 0x03004ae4 _080CA428: .4byte sub_8070048 thumb_func_end sub_80CA410 - thumb_func_start sub_80CA42C -sub_80CA42C: ; 80CA42C + thumb_func_start ItemUseInBattle_PPRecovery +ItemUseInBattle_PPRecovery: ; 80CA42C push {lr} lsls r0, 24 lsrs r0, 24 @@ -415264,7 +415264,7 @@ sub_80CA42C: ; 80CA42C .align 2 _080CA440: .4byte 0x03004ae4 _080CA444: .4byte dp05_ether - thumb_func_end sub_80CA42C + thumb_func_end ItemUseInBattle_PPRecovery thumb_func_start sub_80CA448 sub_80CA448: ; 80CA448 @@ -415322,8 +415322,8 @@ _080CA4C0: .4byte gUnknown_0840EF85 _080CA4C4: .4byte sub_80A5C48 thumb_func_end sub_80CA448 - thumb_func_start ItemUseOutOfBattle_EscapeRope -ItemUseOutOfBattle_EscapeRope: ; 80CA4C8 + thumb_func_start ItemUseInBattle_Escape +ItemUseInBattle_Escape: ; 80CA4C8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -415364,7 +415364,7 @@ _080CA516: bx r0 .align 2 _080CA51C: .4byte 0x03004b20 - thumb_func_end ItemUseOutOfBattle_EscapeRope + thumb_func_end ItemUseInBattle_Escape thumb_func_start ItemUseOutOfBattle_EnigmaBerry ItemUseOutOfBattle_EnigmaBerry: ; 80CA520 @@ -415421,7 +415421,7 @@ _080CA5A0: movs r0, 0x1 strh r0, [r1, 0x26] adds r0, r4, 0 - bl sub_80C9DB0 + bl ItemUseOutOfBattle_Medicine b _080CA640 .align 2 _080CA5B8: .4byte 0x03004b20 @@ -415434,7 +415434,7 @@ _080CA5BC: movs r0, 0x1 strh r0, [r1, 0x26] adds r0, r4, 0 - bl CopyString_LimitN_Multibyte + bl ItemUseOutOfBattle_SacredAsh b _080CA640 .align 2 _080CA5D4: .4byte 0x03004b20 @@ -415447,7 +415447,7 @@ _080CA5D8: movs r0, 0x1 strh r0, [r1, 0x26] adds r0, r4, 0 - bl sub_80C9E74 + bl ItemUseOutOfBattle_RareCandy b _080CA640 .align 2 _080CA5F0: .4byte 0x03004b20 @@ -415460,7 +415460,7 @@ _080CA5F4: movs r0, 0x1 strh r0, [r1, 0x26] adds r0, r4, 0 - bl sub_80C9E58 + bl ItemUseOutOfBattle_PPUp b _080CA640 .align 2 _080CA60C: .4byte 0x03004b20 @@ -415473,7 +415473,7 @@ _080CA610: movs r0, 0x1 strh r0, [r1, 0x26] adds r0, r4, 0 - bl sub_80C9E3C + bl ItemUseOutOfBattle_PPRecovery b _080CA640 .align 2 _080CA628: .4byte 0x03004b20 @@ -415541,15 +415541,15 @@ _080CA674: .4byte _080CA6DC _080CA6CC: adds r0, r4, 0 - bl sub_80CA310 + bl ItemUseInBattle_StatIncrease b _080CA6EA _080CA6D4: adds r0, r4, 0 - bl sub_80CA3F4 + bl ItemUseInBattle_Medicine b _080CA6EA _080CA6DC: adds r0, r4, 0 - bl sub_80CA42C + bl ItemUseInBattle_PPRecovery b _080CA6EA _080CA6E4: adds r0, r4, 0 |