diff options
| author | scnorton <scnorton@biociphers.org> | 2019-03-24 20:08:49 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2019-03-24 20:08:49 -0400 |
| commit | 708f128568816f2c1efc14c5565a32240f83f171 (patch) | |
| tree | 62e58d7344f8c1ac83a21a86dc3c27d5867edbc0 /data | |
| parent | 2136187c113be3c1bc0627c23915f88e0c8a6fc7 (diff) | |
| parent | d7a9fcb9755cd06e4e0245b848e44f4ff75e22cb (diff) | |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'data')
| -rwxr-xr-x | data/berry_powder.s (renamed from data/berry_powder_vendor.s) | 3 | ||||
| -rw-r--r-- | data/maps/SlateportCity/scripts.inc | 16 | ||||
| -rwxr-xr-x | data/mevent_801BAAC.s (renamed from data/mevent2.s) | 6 | ||||
| -rw-r--r-- | data/specials.inc | 10 |
4 files changed, 15 insertions, 20 deletions
diff --git a/data/berry_powder_vendor.s b/data/berry_powder.s index 22e40771f..2e8002bdd 100755 --- a/data/berry_powder_vendor.s +++ b/data/berry_powder.s @@ -3,8 +3,9 @@ .section .rodata + .align 2 -gUnknown_082F7BA4_UnrefDupe:: @ 82F444C struct BgTemplate +gUnknown_082F7BA4_UnrefDupe:: @ 82F444C struct BgTemplate(???) .4byte 0x000001e0 .4byte 0x000012c9 .4byte 0x000012ea diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 1830c3f00..88bcb2e6c 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -732,11 +732,11 @@ SlateportCity_EventScript_1DD36E:: @ 81DD36E SlateportCity_EventScript_1DD39A:: @ 81DD39A setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_80246D4 + specialvar VAR_RESULT, HasEnoughBerryPowder compare VAR_RESULT, 0 goto_if_eq SlateportCity_EventScript_1DD3C0 msgbox SlateportCity_Text_1DEE40, MSGBOX_DEFAULT - special sub_80248B0 + special DisplayBerryPowderVendorMenu goto SlateportCity_EventScript_1DD3CA end @@ -846,7 +846,7 @@ SlateportCity_EventScript_1DD536:: @ 81DD536 SlateportCity_EventScript_1DD54A:: @ 81DD54A msgbox SlateportCity_Text_1DEFBC, MSGBOX_DEFAULT - special sub_8024918 + special RemoveBerryPowderVendorMenu release end @@ -855,26 +855,26 @@ SlateportCity_EventScript_1DD557:: @ 81DD557 compare VAR_RESULT, 0 goto_if_eq SlateportCity_EventScript_1DD3CA copyvar VAR_0x8004, VAR_0x8009 - specialvar VAR_RESULT, sub_80246D4 + specialvar VAR_RESULT, HasEnoughBerryPowder compare VAR_RESULT, 0 goto_if_eq SlateportCity_EventScript_1DD5CE giveitem_std VAR_0x8008 compare VAR_RESULT, 0 goto_if_eq SlateportCity_EventScript_1DD5C1 copyvar VAR_0x8004, VAR_0x8009 - special sub_802477C - special sub_802488C + special TakeBerryPowder + special PrintPlayerBerryPowderAmount msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq SlateportCity_EventScript_1DD3CA msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT - special sub_8024918 + special RemoveBerryPowderVendorMenu release end SlateportCity_EventScript_1DD5C1:: @ 81DD5C1 msgbox gUnknown_08272A89, MSGBOX_DEFAULT - special sub_8024918 + special RemoveBerryPowderVendorMenu release end diff --git a/data/mevent2.s b/data/mevent_801BAAC.s index cc2b69afe..37c1ae46f 100755 --- a/data/mevent2.s +++ b/data/mevent_801BAAC.s @@ -4,12 +4,6 @@ .section .rodata .align 2 -gUnknown_082F0DE8:: @ 82F0DE8 - .2byte 0x013a, 0x013b, 0x013c, 0x013d, 0x013e, 0x013f, 0x0140, 0x0141 - .2byte 0x0142, 0x0143, 0x0144, 0x0145, 0x0146, 0x0147, 0x0148, 0x0149 - .2byte 0x014a, 0x014b, 0x014c, 0x014d - - .align 2 gUnknown_082F0E10:: @ 82F0E10 .byte 0x00, 0x02, 0x03 .byte 0x00, 0x01, 0x02 diff --git a/data/specials.inc b/data/specials.inc index 9364dcc46..5a812cffa 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -471,11 +471,11 @@ gSpecials:: @ 81DBA64 def_special sub_813AA04 def_special sub_813AA18 def_special sub_813AA44 - def_special sub_80248B0 - def_special sub_8024918 - def_special sub_80246D4 - def_special sub_802477C - def_special sub_802488C + def_special DisplayBerryPowderVendorMenu + def_special RemoveBerryPowderVendorMenu + def_special HasEnoughBerryPowder + def_special TakeBerryPowder + def_special PrintPlayerBerryPowderAmount def_special sub_813A820 def_special sub_813A854 def_special sub_813B7D8 |