diff options
| -rw-r--r-- | data/data1.s | 179 |
1 files changed, 173 insertions, 6 deletions
diff --git a/data/data1.s b/data/data1.s index ea64d5fd3..ebe89d31e 100644 --- a/data/data1.s +++ b/data/data1.s @@ -2938,11 +2938,171 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 step_12 step_end - .incbin "baserom.gba", 0x19fdf7, 0x184 +Std_ObtainItem: @ 819FDF7 + additem 0x8000, 0x8001 + copyvar 0x8007, RESULT + call Std_ObtainItem_ + return + +Std_ObtainItem_: @ 819FE07 + bufferitem 1, 0x8000 + checkitemtype 0x8000 + call GetItem_HandlePocket + compare 0x8007, 0x1 + callif 1, Std_ObtainItem_Success + compare 0x8007, 0x0 + callif 1, Std_ObtainItem_Fail + return + +GetItem_HandlePocket: + switch RESULT + case POCKET_ITEMS, GetItem_HandlePocket_Items + case POCKET_KEY_ITEMS, GetItem_HandlePocket_KeyItems + case POCKET_POKE_BALLS, GetItem_HandlePocket_PokeBalls + case POCKET_TM_HM, GetItem_HandlePocket_TMsHMs + case POCKET_BERRIES, GetItem_HandlePocket_Berries + end + +GetItem_HandlePocket_Items: + bufferstd 2, 0xE + compare 0x8007, 1 + callif 1, PlayGetItemFanfare + return + +GetItem_HandlePocket_KeyItems: + bufferstd 2, 0xF + compare 0x8007, 1 + callif 1, PlayGetItemFanfare + return + +GetItem_HandlePocket_PokeBalls: + bufferstd 2, 0x10 + compare 0x8007, 1 + callif 1, PlayGetItemFanfare + return + +GetItem_HandlePocket_TMsHMs: + bufferstd 2, 0x11 + compare 0x8007, 1 + callif 1, PlayGetTMHMFanfare + return + +GetItem_HandlePocket_Berries: + bufferstd 2, 0x12 + compare 0x8007, 1 + callif 1, PlayGetItemFanfare + return + +Std_ObtainItem_Success: @ 819FEB7 + message Message_ObtainedItem + waitfanfare + waittext + msgbox Message_PutAwayItem + setvar RESULT, 1 + return + +Std_ObtainItem_Fail: @ 819FECC + setvar RESULT, 0 + return + +PlayGetItemFanfare: + fanfare 0x172 + return + +PlayGetTMHMFanfare: + fanfare 0x174 + return + +Std_ObtainDecoration: @ 819FEDA + adddecor 0x8000 + copyvar 0x8007, RESULT + call Std_ObtainDecoration_ + return + +Std_ObtainDecoration_: @ 819FEE8 + bufferdecor 1, 0x8000 + compare 0x8007, 1 + callif 1, Std_ObtainDecoration_Success + compare 0x8007, 0 + callif 1, Std_ObtainDecoration_Fail + return + +Std_ObtainDecoration_Success: @ 819FF03 + fanfare 0x172 + message Message_ObtainedDecoration + waitfanfare + waittext + msgbox Message_TransferredToPC + setvar RESULT, 1 + return + +Std_ObtainDecoration_Fail: @ 819FF1B + setvar RESULT, 0 + return + +Std_FindItem: @ 819FF21 + lock + faceplayer + checksound + additem 0x8000, 0x8001 + copyvar 0x8007, RESULT + bufferitem 1, 0x8000 + checkitemtype 0x8000 + call GetItem_HandlePocket + compare 0x8007, 1 + callif 1, Std_FindItem_Success + compare 0x8007, 0 + callif 1, Std_FindItem_Fail + release + return + +Std_FindItem_Success: @ 819FF52 + disappear LAST_TALKED + message Message_FoundOneItem + waitfanfare + waittext + msgbox Message_PutAwayItem + return + +Std_FindItem_Fail: @ 819FF65 + msgbox Message_ObtainedItem + msgbox Message_BagFull + setvar RESULT, 0 + return .global gUnknown_0819FF7B gUnknown_0819FF7B: @ 819FF7B - .incbin "baserom.gba", 0x0019ff7b, 0x8e +HiddenItemScript:: @ 819FF7B + lockall + checksound + additem 0x8005, 1 + copyvar 0x8007, RESULT + bufferitem 0x1, 0x8005 + checkitemtype 0x8005 + call GetItem_HandlePocket + compare 0x8007, 1 + jumpeq HiddenItemScript_Success + compare 0x8007, 0 + jumpeq HiddenItemScript_Fail + end + +HiddenItemScript_Success: + message Message_FoundOneItem + waitfanfare + waittext + msgbox Message_PutAwayItem + special 0x96 + releaseall + end + +HiddenItemScript_Fail: + msgbox Message_FoundOneItem + msgbox Message_BagFull + setvar RESULT, 0 + releaseall + end + + .incbin "baserom.gba", 0x19FFD5, 0x34 .global gUnknown_081A0009 gUnknown_081A0009: @ 81A0009 @@ -4161,26 +4321,31 @@ Route104_PrettyPetalFlowerShop_Text_1A0C42:: @ 81A0C42 .string "{PLAYER}{KUN}, welcome!\p" .string "What can I do for you?$" - .incbin "baserom.gba", 0x1a0c68, 0x11 +Message_ObtainedItem: @ 81A0C68 + .string "Obtained the {STR_VAR_2}.$" LilycoveCity_DepartmentStoreRooftop_Text_1A0C79:: @ 81A0C79 .string "The BAG is full...$" LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C:: @ 81A0C8C +Message_PutAwayItem: .string "{PLAYER} put away the {STR_VAR_2}\n" .string "in the {STR_VAR_3} POCKET.$" - .incbin "baserom.gba", 0x1a0cb1, 0x11 +Message_FoundOneItem: + .string "{PLAYER} found one {STR_VAR_2}!$" MauvilleCity_GameCorner_Text_1A0CC2:: @ 81A0CC2 MauvilleCity_Text_1A0CC2:: @ 81A0CC2 MtChimney_Text_1A0CC2:: @ 81A0CC2 OldaleTown_Text_1A0CC2:: @ 81A0CC2 Route109_SeashoreHouse_Text_1A0CC2:: @ 81A0CC2 +Message_BagFull: .string "Too bad!\n" .string "The BAG is full...$" - .incbin "baserom.gba", 0x1a0cde, 0x11 +Message_ObtainedDecoration: @ 81A0CDE + .string "Obtained the {STR_VAR_2}.$" BattleTower_Lobby_Text_1A0CEF:: @ 81A0CEF MauvilleCity_GameCorner_Text_1A0CEF:: @ 81A0CEF @@ -4189,7 +4354,9 @@ SootopolisCity_House6_Text_1A0CEF:: @ 81A0CEF .string "Too bad! There’s no room left for\n" .string "another {STR_VAR_2}...$" - .incbin "baserom.gba", 0x1a0d1f, 0x22 +Message_TransferredToPC: @ 81A0D1F + .string "The {STR_VAR_2} was transferred\n" + .string "to the PC.$" PetalburgCity_Text_1A0D41:: @ 81A0D41 .string "“Selected items for your convenience!”\n" |