diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/berry_crush.s | 2 | ||||
| -rw-r--r-- | asm/berry_crush_3.s | 6 | ||||
| -rw-r--r-- | asm/macros/event.inc | 16 | ||||
| -rw-r--r-- | asm/naming_screen.s | 4 | ||||
| -rw-r--r-- | asm/overworld.s | 24 |
5 files changed, 26 insertions, 26 deletions
diff --git a/asm/berry_crush.s b/asm/berry_crush.s index 8b4351826..6502fc916 100644 --- a/asm/berry_crush.s +++ b/asm/berry_crush.s @@ -432,7 +432,7 @@ _0814BA3C: ldr r1, [r4] ldr r0, [r1, 0x68] str r0, [r1, 0x1C] - bl sub_815EEE0 + bl GiveBerryPowder lsls r0, 24 cmp r0, 0 bne _0814BA5A diff --git a/asm/berry_crush_3.s b/asm/berry_crush_3.s index 71070a96e..9e3334a7f 100644 --- a/asm/berry_crush_3.s +++ b/asm/berry_crush_3.s @@ -2526,8 +2526,8 @@ _0814EA6C: bx r0 thumb_func_end sub_814E830 - thumb_func_start sub_814EA7C -sub_814EA7C: @ 814EA7C + thumb_func_start ShowBerryCrushRankings +ShowBerryCrushRankings: @ 814EA7C push {lr} bl ScriptContext2_Enable ldr r0, _0814EAC4 @ =sub_814E830 @@ -2566,7 +2566,7 @@ _0814EAC4: .4byte sub_814E830 _0814EAC8: .4byte gTasks _0814EACC: .4byte gSaveBlock2Ptr _0814EAD0: .4byte 0x00000af6 - thumb_func_end sub_814EA7C + thumb_func_end ShowBerryCrushRankings thumb_func_start sub_814EAD4 sub_814EAD4: @ 814EAD4 diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 5526b1e50..ab7b06932 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -461,7 +461,7 @@ .endm @ Removes quantity of item index from the player's Bag. - .macro removeitem index:req, quantity:req + .macro removeitem index:req, quantity=1 .byte 0x45 .2byte \index .2byte \quantity @@ -488,7 +488,7 @@ .endm @ Adds a quantity amount of item index to the player's PC. Both arguments can be variables. - .macro givepcitem index:req, quantity:req + .macro addpcitem index:req, quantity:req .byte 0x49 .2byte \index .2byte \quantity @@ -1018,14 +1018,14 @@ .endm @ If check is 0x00, this command adds value to the player's money. - .macro givemoney value:req, check:req + .macro addmoney value:req, check:req .byte 0x90 .4byte \value .byte \check .endm @ If check is 0x00, this command subtracts value from the player's money. - .macro takemoney value:req, check:req + .macro removemoney value:req, check:req .byte 0x91 .4byte \value .byte \check @@ -1246,12 +1246,12 @@ .2byte \out .endm - .macro givecoins count:req + .macro addcoins count:req .byte 0xb4 .2byte \count .endm - .macro takecoins word:req + .macro removecoins word:req .byte 0xb5 .2byte \word .endm @@ -1539,7 +1539,7 @@ goto_if TRUE, \dest .endm - .macro goto_if_undefeated trainer:req, dest:req + .macro goto_if_not_defeated trainer:req, dest:req checktrainerflag \trainer goto_if FALSE, \dest .endm @@ -1549,7 +1549,7 @@ call_if TRUE, \dest .endm - .macro call_if_undefeated trainer:req, dest:req + .macro call_if_not_defeated trainer:req, dest:req checktrainerflag \trainer call_if FALSE, \dest .endm diff --git a/asm/naming_screen.s b/asm/naming_screen.s index 527c715d7..233c71d6d 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -887,7 +887,7 @@ pokemon_transfer_to_pc_with_message: @ 809E0B4 push {r4,r5,lr} sub sp, 0x10 movs r5, 0 - bl sub_80CC7F8 + bl IsDestinationBoxFull lsls r0, 24 cmp r0, 0 bne _0809E104 @@ -932,7 +932,7 @@ _0809E104: ldr r1, [r1] bl StringCopy ldr r4, _0809E1C0 @ =gStringVar3 - bl get_unknown_box_id + bl GetPCBoxToSendMon lsls r0, 24 lsrs r0, 24 bl GetBoxNamePtr diff --git a/asm/overworld.s b/asm/overworld.s index 5b3c1a495..2316f77b1 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -6837,16 +6837,16 @@ _08058122: sub_805812C: @ 805812C push {lr} adds r1, r0, 0 - ldr r0, _08058178 @ =BattleColosseum4P_EventScript_PlayerSpot0 + ldr r0, _08058178 @ =BattleColosseum_4P_EventScript_PlayerSpot0 cmp r1, r0 beq _08058172 - ldr r0, _0805817C @ =BattleColosseum4P_EventScript_PlayerSpot1 + ldr r0, _0805817C @ =BattleColosseum_4P_EventScript_PlayerSpot1 cmp r1, r0 beq _080581B4 - ldr r0, _08058180 @ =BattleColosseum4P_EventScript_PlayerSpot2 + ldr r0, _08058180 @ =BattleColosseum_4P_EventScript_PlayerSpot2 cmp r1, r0 beq _08058172 - ldr r0, _08058184 @ =BattleColosseum4P_EventScript_PlayerSpot3 + ldr r0, _08058184 @ =BattleColosseum_4P_EventScript_PlayerSpot3 cmp r1, r0 beq _080581B4 ldr r0, _08058188 @ =RecordCenter_EventScript_Spot @@ -6861,10 +6861,10 @@ sub_805812C: @ 805812C ldr r0, _08058194 @ =RecordCenter_EventScript_Spot cmp r1, r0 beq _080581B4 - ldr r0, _08058198 @ =BattleColosseum2P_EventScript_PlayerSpot0 + ldr r0, _08058198 @ =BattleColosseum_2P_EventScript_PlayerSpot0 cmp r1, r0 beq _08058172 - ldr r0, _0805819C @ =BattleColosseum2P_EventScript_PlayerSpot1 + ldr r0, _0805819C @ =BattleColosseum_2P_EventScript_PlayerSpot1 cmp r1, r0 beq _080581B4 ldr r0, _080581A0 @ =TradeCenter_EventScript_Chair0 @@ -6874,16 +6874,16 @@ _08058172: movs r0, 0xA b _080581B6 .align 2, 0 -_08058178: .4byte BattleColosseum4P_EventScript_PlayerSpot0 -_0805817C: .4byte BattleColosseum4P_EventScript_PlayerSpot1 -_08058180: .4byte BattleColosseum4P_EventScript_PlayerSpot2 -_08058184: .4byte BattleColosseum4P_EventScript_PlayerSpot3 +_08058178: .4byte BattleColosseum_4P_EventScript_PlayerSpot0 +_0805817C: .4byte BattleColosseum_4P_EventScript_PlayerSpot1 +_08058180: .4byte BattleColosseum_4P_EventScript_PlayerSpot2 +_08058184: .4byte BattleColosseum_4P_EventScript_PlayerSpot3 _08058188: .4byte RecordCenter_EventScript_Spot _0805818C: .4byte RecordCenter_EventScript_Spot _08058190: .4byte RecordCenter_EventScript_Spot _08058194: .4byte RecordCenter_EventScript_Spot -_08058198: .4byte BattleColosseum2P_EventScript_PlayerSpot0 -_0805819C: .4byte BattleColosseum2P_EventScript_PlayerSpot1 +_08058198: .4byte BattleColosseum_2P_EventScript_PlayerSpot0 +_0805819C: .4byte BattleColosseum_2P_EventScript_PlayerSpot1 _080581A0: .4byte TradeCenter_EventScript_Chair0 _080581A4: ldr r0, _080581B0 @ =TradeCenter_EventScript_Chair1 |