diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_setup.s | 9 | ||||
| -rw-r--r-- | asm/field_specials.s | 7 | ||||
| -rw-r--r-- | asm/macros/event.inc | 3 |
3 files changed, 11 insertions, 8 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index ce7600ab3..54f374c78 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -2033,8 +2033,8 @@ sub_8080618: @ 8080618 bx r0 thumb_func_end sub_8080618 - thumb_func_start sub_8080628 -sub_8080628: @ 8080628 + thumb_func_start PlayTrainerEncounterMusic +PlayTrainerEncounterMusic: @ 8080628 push {lr} ldr r0, _08080660 @ =gUnknown_203ADFA ldrb r0, [r0] @@ -2083,15 +2083,18 @@ _08080670: .4byte _080806AE .4byte _080806AE _080806A8: + @ MUS_SHOUJO movs r0, 0x8E lsls r0, 1 b _080806BA _080806AE: + @ MUS_SHOUNEN ldr r0, _080806B4 @ =0x0000011d b _080806BA .align 2, 0 _080806B4: .4byte 0x0000011d _080806B8: + @ MUS_ROCKET ldr r0, _080806C4 @ =0x0000011b _080806BA: bl PlayNewMapMusic @@ -2100,7 +2103,7 @@ _080806BE: bx r0 .align 2, 0 _080806C4: .4byte 0x0000011b - thumb_func_end sub_8080628 + thumb_func_end PlayTrainerEncounterMusic thumb_func_start sub_80806C8 sub_80806C8: @ 80806C8 diff --git a/asm/field_specials.s b/asm/field_specials.s index c0294fcac..a4df8b6ea 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -4329,8 +4329,8 @@ _080CC728: .4byte 0x00000808 _080CC72C: .4byte 0x0000404d thumb_func_end sub_80CC59C - thumb_func_start sub_80CC730 -sub_80CC730: @ 80CC730 + thumb_func_start Special_BattleCardAction +Special_BattleCardAction: @ 80CC730 push {lr} ldr r0, _080CC744 @ =gSpecialVar_Result ldrh r0, [r0] @@ -4371,6 +4371,7 @@ _080CC772: lsrs r0, 16 b _080CC78A _080CC77C: + @ AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c", 3873) ldr r0, _080CC790 @ =gUnknown_83F5EF0 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c" ldr r1, _080CC794 @ =0x00000f21 ldr r2, _080CC798 @ =gUnknown_83F5F24 "0" @@ -4384,7 +4385,7 @@ _080CC78A: _080CC790: .4byte gUnknown_83F5EF0 _080CC794: .4byte 0x00000f21 _080CC798: .4byte gUnknown_83F5F24 - thumb_func_end sub_80CC730 + thumb_func_end Special_BattleCardAction thumb_func_start set_unknown_box_id set_unknown_box_id: @ 80CC79C diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 7ce50a5e1..83ae4f493 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1225,10 +1225,9 @@ .byte 0xb7 .endm - .macro setvaddress long, word + .macro setvaddress long .byte 0xb8 .4byte \long - .2byte \word .endm .macro vgoto pointer |