summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/itemfinder.s11
-rw-r--r--data/itemfinder/spr_tiles.pngbin0 -> 279 bytes
-rw-r--r--data/map_event_scripts.inc147
-rw-r--r--data/maps/CeladonCity_GameCorner/scripts.inc10
-rw-r--r--data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc6
-rw-r--r--data/maps/CeladonCity_Restaurant/scripts.inc4
-rw-r--r--data/specials.inc4
-rw-r--r--data/strings.s6
8 files changed, 140 insertions, 48 deletions
diff --git a/data/itemfinder.s b/data/itemfinder.s
deleted file mode 100644
index 88e9910f4..000000000
--- a/data/itemfinder.s
+++ /dev/null
@@ -1,11 +0,0 @@
- .section .rodata
- .align 2
-
-gUnknown_84644D0:: @ 84644D0
- .incbin "baserom.gba", 0x4644D0, 0x314
-
-gUnknown_84647E4:: @ 84647E4
- .incbin "baserom.gba", 0x4647E4, 0x18
-
-gUnknown_84647FC:: @ 84647FC
- .incbin "baserom.gba", 0x4647FC, 0x8
diff --git a/data/itemfinder/spr_tiles.png b/data/itemfinder/spr_tiles.png
new file mode 100644
index 000000000..4171f37b4
--- /dev/null
+++ b/data/itemfinder/spr_tiles.png
Binary files differ
diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc
index 899ed20e6..233b73349 100644
--- a/data/map_event_scripts.inc
+++ b/data/map_event_scripts.inc
@@ -1576,27 +1576,23 @@ EventScript_1A661D:: @ 81A661D
waitmessage
applymovement VAR_LAST_TALKED, Movement_1A666C
waitmovement 0
- loadword 0, Text_1A5511
- callstd 4
+ msgbox Text_1A5511
return
EventScript_1A6636:: @ 81A6636
checkflag 2114
goto_if_eq EventScript_1A661D
- loadword 0, Text_1A552B
- callstd 4
+ msgbox Text_1A552B
setflag 2114
message Text_1BCCCA
waitmessage
applymovement VAR_LAST_TALKED, Movement_1A666C
waitmovement 0
- loadword 0, Text_1A5511
- callstd 4
+ msgbox Text_1A5511
return
EventScript_1A6663:: @ 81A6663
- loadword 0, Text_1A5511
- callstd 4
+ msgbox Text_1A5511
return
Movement_1A666C:: @ 81A666C
@@ -1681,8 +1677,7 @@ EventScript_1A6749:: @ 81A6749
message Text_1A51F6
waitfanfare
waitmessage
- loadword 0, gUnknown_81A5218
- callstd 4
+ msgbox gUnknown_81A5218
setvar VAR_RESULT, 1
return
@@ -1717,8 +1712,7 @@ EventScript_1A6795:: @ 81A6795
message Text_1A52F0
waitfanfare
waitmessage
- loadword 0, gUnknown_81A532F
- callstd 4
+ msgbox gUnknown_81A532F
setvar VAR_RESULT, 1
return
@@ -1755,8 +1749,7 @@ EventScript_1A67EE:: @ 81A67EE
call_if 1, EventScript_1A6827
waitfanfare
waitmessage
- loadword 0, gUnknown_81A5218
- callstd 4
+ msgbox gUnknown_81A5218
return
EventScript_1A6821:: @ 81A6821
@@ -1768,15 +1761,100 @@ EventScript_1A6827:: @ 81A6827
return
EventScript_1A682D:: @ 81A682D
- loadword 0, Text_1A51F6
- callstd 4
- loadword 0, gUnknown_81A5242
- callstd 4
+ msgbox Text_1A51F6
+ msgbox gUnknown_81A5242
setvar VAR_RESULT, 0
return
-gUnknown_81A6843:: @ 81A6843
- .incbin "baserom.gba", 0x1A6843, 0x112
+EventScript_PickUpHiddenItem:: @ 81A6843
+ lockall
+ textcolor 3
+ waitse
+ compare_var_to_value VAR_0x8005, 0
+ goto_if_eq EventScript_PickUpHiddenCoins
+ call EventScript_GiveItem
+ compare_var_to_value VAR_0x8007, 1
+ goto_if_eq EventScript_ItemInPocketMessage
+ compare_var_to_value VAR_0x8007, 0
+ goto_if_eq EventScript_BagIsFullMessage
+ end
+
+EventScript_GiveItem::
+ additem VAR_0x8005, VAR_0x8006
+ copyvar VAR_0x8007, VAR_RESULT
+ getitemname 1, VAR_0x8005
+ checkitemtype VAR_0x8005
+ call EventScript_1A66BC
+ return
+
+EventScript_ItemInPocketMessage::
+ compare_var_to_value VAR_0x8006, 1
+ call_if 1, EventScript_FoundSingleItemMessage
+ compare_var_to_value VAR_0x8006, 1
+ call_if 5, EventScript_FoundMultipleItemsMessage
+ waitfanfare
+ waitmessage
+ msgbox gUnknown_81A5218
+ special Special_SetHiddenItemFlag
+ releaseall
+ end
+
+EventScript_FoundSingleItemMessage::
+ message Text_1A5231
+ return
+
+EventScript_FoundCoinsMessage::
+ getnumberstring 0, VAR_0x8006
+ message Text_1A525C
+ return
+
+EventScript_FoundMultipleItemsMessage::
+ getnumberstring 0, VAR_0x8006
+ message Text_1A52DD
+ return
+
+EventScript_BagIsFullMessage::
+ msgbox Text_1A5231
+ msgbox gUnknown_81A5242
+ setvar VAR_RESULT, 0
+ releaseall
+ end
+
+EventScript_PickUpHiddenCoins::
+ checkflag FLAG_GOT_COIN_CASE
+ goto_if 0, EventScript_HiddenCoinsButNoCoinCase
+ checkcoins VAR_RESULT
+ specialvar VAR_RESULT, Special_CheckAddCoins
+ compare_var_to_value VAR_RESULT, 0
+ goto_if_eq EventScript_HiddenCoinsButTheCoinCaseIsFull
+ givecoins VAR_0x8006
+ getstdstring 1, 0x17
+ call EventScript_1A6764
+ call EventScript_FoundCoinsMessage
+ waitfanfare
+ waitmessage
+ msgbox Text_1A526C
+ special Special_SetHiddenItemFlag
+ releaseall
+ end
+
+EventScript_HiddenCoinsButTheCoinCaseIsFull::
+ getnumberstring 0, VAR_0x8006
+ getstdstring 1, 0x17
+ msgbox Text_1A525C
+ msgbox Text_1A5294
+ setvar VAR_RESULT, 0
+ releaseall
+ end
+
+EventScript_HiddenCoinsButNoCoinCase::
+ getnumberstring 0, VAR_0x8006
+ getstdstring 1, 0x17
+ msgbox Text_1A525C
+ msgbox Text_1A52B4
+ setvar VAR_RESULT, 0
+ releaseall
+ end
gUnknown_81A6955:: @ 81A6955
.incbin "baserom.gba", 0x1A6955, 0x173
@@ -2275,8 +2353,33 @@ ViridianCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08
.incbin "baserom.gba", 0x1A8D08, 0x41
-gUnknown_81A8D49:: @ 81A8D49
- .incbin "baserom.gba", 0x1A8D49, 0x4E
+EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49
+ 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/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc
index dca647299..9115b2812 100644
--- a/data/maps/CeladonCity_GameCorner/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner/scripts.inc
@@ -39,7 +39,7 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
end
EventScript_16C6E6:: @ 816C6E6
- checkflag FLAG_0x243
+ checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16C790
compare_var_to_value VAR_0x8009, 0
goto_if_eq EventScript_16C734
@@ -134,7 +134,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
checkflag FLAG_0x26E
goto_if_eq EventScript_16C849
msgbox gUnknown_8196AF3
- checkflag FLAG_0x243
+ checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9990
@@ -198,7 +198,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
checkflag FLAG_0x26F
goto_if_eq EventScript_16C8F0
msgbox gUnknown_8196D2B
- checkflag FLAG_0x243
+ checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9980
@@ -228,7 +228,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
checkflag FLAG_0x270
goto_if_eq EventScript_16C950
msgbox gUnknown_8196DB7
- checkflag FLAG_0x243
+ checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9980
@@ -263,7 +263,7 @@ EventScript_16C96A:: @ 816C96A
end
EventScript_16C96C:: @ 816C96C
- checkflag FLAG_0x243
+ checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16CAA0
msgbox gUnknown_8196F46, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
index 911847541..4a60c9814 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
@@ -12,7 +12,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F
CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
lock
faceplayer
- checkflag FLAG_0x243
+ checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16CD99
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
@@ -191,7 +191,7 @@ EventScript_16CE12:: @ 816CE12
CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
lock
faceplayer
- checkflag FLAG_0x243
+ checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16CD99
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
@@ -289,7 +289,7 @@ EventScript_16CF79:: @ 816CF79
CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
lock
faceplayer
- checkflag FLAG_0x243
+ checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16CD99
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc
index e52d88636..379d07271 100644
--- a/data/maps/CeladonCity_Restaurant/scripts.inc
+++ b/data/maps/CeladonCity_Restaurant/scripts.inc
@@ -12,7 +12,7 @@ CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4
CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
lock
faceplayer
- checkflag FLAG_0x243
+ checkflag FLAG_GOT_COIN_CASE
goto_if_eq EventScript_16D24B
msgbox gUnknown_81979C1
checkitemspace ITEM_COIN_CASE, 1
@@ -20,7 +20,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
goto_if_eq EventScript_16D241
additem ITEM_COIN_CASE, 1
giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE
- setflag FLAG_0x243
+ setflag FLAG_GOT_COIN_CASE
release
end
diff --git a/data/specials.inc b/data/specials.inc
index 5905d825f..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
@@ -359,7 +359,7 @@ gSpecials:: @ 815FD60
def_special sub_80CADEC
def_special sub_805D1A8
def_special sub_80CB0A8
- def_special sub_80CB1D8
+ def_special Special_CheckAddCoins
def_special GetDaycarePokemonCount
def_special sub_80CB63C
def_special sub_80CBD80
diff --git a/data/strings.s b/data/strings.s
index 05bd47c88..98b137425 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -582,13 +582,13 @@ gUnknown_8416425:: @ 8416425
gUnknown_8416451:: @ 8416451
.string "You can't dismount your BIKE here.{PAUSE_UNTIL_PRESS}$"
-gUnknown_8416476:: @ 8416476
+gText_ItemfinderResponding:: @ 8416476
.string "Huh?\nThe ITEMFINDER's responding!\pThere's an item buried around here!{PAUSE_UNTIL_PRESS}$"
-gUnknown_84164BE:: @ 84164BE
+gText_ItemfinderShakingWildly:: @ 84164BE
.string "Oh!\nThe ITEMFINDER's shaking wildly!\pThere's an item buried underfoot!\p‥ ‥ ‥ ‥ ‥ ‥{PAUSE_UNTIL_PRESS}$"
-gUnknown_8416513:: @ 8416513
+gText_NopeTheresNoResponse:: @ 8416513
.string "‥ ‥ ‥ ‥Nope!\nThere's no response.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416537:: @ 8416537
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-08 14:02:09 +0000