diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-03 15:43:05 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-03 15:43:05 -0400 |
| commit | aa0ac46b7145951f1d6f65e7af005a3fe561ff63 (patch) | |
| tree | b88f7cf114f3f0c79ba6816255f27cda21f335d7 | |
| parent | 38d2b717173e9d6b24766fc3d6e46002db684cf5 (diff) | |
Disassemble dig up item script
| -rw-r--r-- | asm/field_specials.s | 6 | ||||
| -rw-r--r-- | data/map_event_scripts.inc | 31 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 32 insertions, 7 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s index 83608fccf..8d91064e8 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -185,8 +185,8 @@ sub_80CA74C: @ 80CA74C _080CA754: .4byte gBattleOutcome thumb_func_end sub_80CA74C - thumb_func_start sub_80CA758 -sub_80CA758: @ 80CA758 + thumb_func_start Special_SetHiddenItemFlag +Special_SetHiddenItemFlag: @ 80CA758 push {lr} ldr r0, _080CA768 @ =gSpecialVar_0x8004 ldrh r0, [r0] @@ -195,7 +195,7 @@ sub_80CA758: @ 80CA758 bx r0 .align 2, 0 _080CA768: .4byte gSpecialVar_0x8004 - thumb_func_end sub_80CA758 + thumb_func_end Special_SetHiddenItemFlag thumb_func_start sub_80CA76C sub_80CA76C: @ 80CA76C diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 0695499a9..233b73349 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -1795,7 +1795,7 @@ EventScript_ItemInPocketMessage:: waitfanfare waitmessage msgbox gUnknown_81A5218 - special sub_80CA758 + special Special_SetHiddenItemFlag releaseall end @@ -1834,7 +1834,7 @@ EventScript_PickUpHiddenCoins:: waitfanfare waitmessage msgbox Text_1A526C - special sub_80CA758 + special Special_SetHiddenItemFlag releaseall end @@ -2354,7 +2354,32 @@ VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 .incbin "baserom.gba", 0x1A8D08, 0x41 EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 - .incbin "baserom.gba", 0x1A8D49, 0x4E + lockall + textcolor 3 + waitse + call EventScript_GiveItem + compare_var_to_value VAR_0x8007, 1 + goto_if_eq EventScript_DigUpItemPutInPocket + compare_var_to_value VAR_0x8007, 0 + goto_if_eq EventScript_DigUpItemBagIsFull + end + +EventScript_DigUpItemPutInPocket:: + message Text_1A5700 + waitfanfare + waitmessage + delay 60 + msgbox gUnknown_81A5218 + special Special_SetHiddenItemFlag + releaseall + end + +EventScript_DigUpItemBagIsFull:: + msgbox Text_1A5700 + msgbox gUnknown_81A5242 + setvar VAR_RESULT, 0 + releaseall + end gUnknown_81A8D97:: @ 81A8D97 .incbin "baserom.gba", 0x1A8D97, 0x41 diff --git a/data/specials.inc b/data/specials.inc index 13809e274..c99d484d4 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -159,7 +159,7 @@ gSpecials:: @ 815FD60 def_special sub_80CA6BC def_special sub_80CA6DC def_special sub_80CA714 - def_special sub_80CA758 + def_special Special_SetHiddenItemFlag def_special nullsub_75 def_special nullsub_75 def_special Overworld_PlaySpecialMapMusic |