dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document Cerulean City scripts

Browse Source
This commit is contained in:
GriffinR
2020-01-14 14:48:25 -05:00
parent 8c560386ed
commit f544f6e356
58 changed files with 796 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/berry_crush.s
+1 -1
View File
@@ -432,7 +432,7 @@ _0814BA3C:
ldr r1, [r4] ldr r1, [r4]
ldr r0, [r1, 0x68] ldr r0, [r1, 0x68]
str r0, [r1, 0x1C] str r0, [r1, 0x1C]
bl sub_815EEE0 bl GiveBerryPowder
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0814BA5A bne _0814BA5A
asm/berry_crush_3.s
+3 -3
View File
@@ -2526,8 +2526,8 @@ _0814EA6C:
bx r0 bx r0
thumb_func_end sub_814E830 thumb_func_end sub_814E830
thumb_func_start sub_814EA7C thumb_func_start ShowBerryCrushRankings
sub_814EA7C: @ 814EA7C ShowBerryCrushRankings: @ 814EA7C
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
ldr r0, _0814EAC4 @ =sub_814E830 ldr r0, _0814EAC4 @ =sub_814E830
@@ -2566,7 +2566,7 @@ _0814EAC4: .4byte sub_814E830
_0814EAC8: .4byte gTasks _0814EAC8: .4byte gTasks
_0814EACC: .4byte gSaveBlock2Ptr _0814EACC: .4byte gSaveBlock2Ptr
_0814EAD0: .4byte 0x00000af6 _0814EAD0: .4byte 0x00000af6
thumb_func_end sub_814EA7C thumb_func_end ShowBerryCrushRankings
thumb_func_start sub_814EAD4 thumb_func_start sub_814EAD4
sub_814EAD4: @ 814EAD4 sub_814EAD4: @ 814EAD4
asm/macros/event.inc
+1 -1
View File
@@ -461,7 +461,7 @@
.endm .endm
@ Removes quantity of item index from the player's Bag. @ Removes quantity of item index from the player's Bag.
.macro removeitem index:req, quantity:req .macro removeitem index:req, quantity=1
.byte 0x45 .byte 0x45
.2byte \index .2byte \index
.2byte \quantity .2byte \quantity
asm/naming_screen.s
+2 -2
View File
@@ -887,7 +887,7 @@ pokemon_transfer_to_pc_with_message: @ 809E0B4
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x10 sub sp, 0x10
movs r5, 0 movs r5, 0
bl sub_80CC7F8 bl IsDestinationBoxFull
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0809E104 bne _0809E104
@@ -932,7 +932,7 @@ _0809E104:
ldr r1, [r1] ldr r1, [r1]
bl StringCopy bl StringCopy
ldr r4, _0809E1C0 @ =gStringVar3 ldr r4, _0809E1C0 @ =gStringVar3
bl get_unknown_box_id bl GetPCBoxToSendMon
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl GetBoxNamePtr bl GetBoxNamePtr
data/event_scripts.s
+12 -11
View File
@@ -25,6 +25,7 @@
#include "constants/cable_club.h" #include "constants/cable_club.h"
#include "constants/field_weather.h" #include "constants/field_weather.h"
#include "constants/union_room.h" #include "constants/union_room.h"
#include "constants/trade.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "asm/macros/event.inc" .include "asm/macros/event.inc"
.set FALSE, 0 .set FALSE, 0
@@ -1632,45 +1633,45 @@ EventScript_1A8C33:: @ 81A8C33
return return
EventScript_1A8C3C:: @ 81A8C3C EventScript_1A8C3C:: @ 81A8C3C
bufferboxname 0, VAR_0x4037 bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
getspeciesname 1, VAR_TEMP_1 getspeciesname 1, VAR_TEMP_1
call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C57 call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C57
call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C82 call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C82
return return
EventScript_1A8C57:: @ 81A8C57 EventScript_1A8C57:: @ 81A8C57
specialvar VAR_RESULT, sub_80CC7B4 specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A8C70 goto_if_eq EventScript_1A8C70
msgbox Text_1A5CF1 msgbox Text_1A5CF1
return return
EventScript_1A8C70:: @ 81A8C70 EventScript_1A8C70:: @ 81A8C70
specialvar VAR_RESULT, get_unknown_box_id specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT bufferboxname 2, VAR_RESULT
msgbox Text_1A5D6E msgbox Text_1A5D6E
return return
EventScript_1A8C82:: @ 81A8C82 EventScript_1A8C82:: @ 81A8C82
specialvar VAR_RESULT, sub_80CC7B4 specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A8C9B goto_if_eq EventScript_1A8C9B
msgbox Text_1A5D31 msgbox Text_1A5D31
return return
EventScript_1A8C9B:: @ 81A8C9B EventScript_1A8C9B:: @ 81A8C9B
specialvar VAR_RESULT, get_unknown_box_id specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT bufferboxname 2, VAR_RESULT
msgbox Text_1A5DB1 msgbox Text_1A5DB1
return return
EventScript_1A8CAD:: @ 81A8CAD EventScript_GetInGameTradeSpeciesInfo:: @ 81A8CAD
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
return return
EventScript_1A8CBD:: @ 81A8CBD EventScript_ChooseMonForInGameTrade:: @ 81A8CBD
special Special_ChooseMonFromParty special Special_ChooseMonFromParty
waitstate waitstate
lock lock
@@ -1678,13 +1679,13 @@ EventScript_1A8CBD:: @ 81A8CBD
copyvar VAR_0x800A, VAR_0x8004 copyvar VAR_0x800A, VAR_0x8004
return return
EventScript_1A8CC9:: @ 81A8CC9 EventScript_GetInGameTradeSpecies:: @ 81A8CC9
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, GetTradeSpecies specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT copyvar VAR_0x800B, VAR_RESULT
return return
EventScript_1A8CD9:: @ 81A8CD9 EventScript_DoInGameTrade:: @ 81A8CD9
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
special CreateInGameTradePokemon special CreateInGameTradePokemon
data/maps/CeruleanCity/map.json
+21 -21
View File
@@ -44,7 +44,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_1666E7", "script": "CeruleanCity_EventScript_Policeman",
"flag": "0" "flag": "0"
}, },
{ {
@@ -57,7 +57,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_166603", "script": "CeruleanCity_EventScript_Grunt",
"flag": "FLAG_HIDE_CERULEAN_ROCKET" "flag": "FLAG_HIDE_CERULEAN_ROCKET"
}, },
{ {
@@ -70,7 +70,7 @@
"movement_range_y": 3, "movement_range_y": 3,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_1666FE", "script": "CeruleanCity_EventScript_LittleBoy",
"flag": "0" "flag": "0"
}, },
{ {
@@ -83,7 +83,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_16671D", "script": "CeruleanCity_EventScript_BaldingMan",
"flag": "0" "flag": "0"
}, },
{ {
@@ -96,7 +96,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_1667DD", "script": "CeruleanCity_EventScript_Slowbro",
"flag": "0" "flag": "0"
}, },
{ {
@@ -109,7 +109,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_16674F", "script": "CeruleanCity_EventScript_Lass",
"flag": "0" "flag": "0"
}, },
{ {
@@ -122,7 +122,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_166726", "script": "CeruleanCity_EventScript_Youngster",
"flag": "0" "flag": "0"
}, },
{ {
@@ -174,7 +174,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_166738", "script": "CeruleanCity_EventScript_Woman",
"flag": "0" "flag": "0"
}, },
{ {
@@ -187,7 +187,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_16672F", "script": "CeruleanCity_EventScript_CeruleanCaveGuard",
"flag": "FLAG_HIDE_CERULEAN_CAVE_GUARD" "flag": "FLAG_HIDE_CERULEAN_CAVE_GUARD"
} }
], ],
@@ -299,7 +299,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
"var_value": 0, "var_value": 0,
"script": "CeruleanCity_EventScript_16649A" "script": "CeruleanCity_EventScript_RivalTriggerLeft"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -308,7 +308,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
"var_value": 0, "var_value": 0,
"script": "CeruleanCity_EventScript_1664A6" "script": "CeruleanCity_EventScript_RivalTriggerMid"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -317,7 +317,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
"var_value": 0, "var_value": 0,
"script": "CeruleanCity_EventScript_1664B9" "script": "CeruleanCity_EventScript_RivalTriggerRight"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -326,7 +326,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET", "var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET",
"var_value": 0, "var_value": 0,
"script": "CeruleanCity_EventScript_166683" "script": "CeruleanCity_EventScript_GruntTriggerTop"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -335,7 +335,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET", "var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET",
"var_value": 0, "var_value": 0,
"script": "CeruleanCity_EventScript_1666A3" "script": "CeruleanCity_EventScript_GruntTriggerBottom"
} }
], ],
"bg_events": [ "bg_events": [
@@ -344,28 +344,28 @@
"x": 20, "x": 20,
"y": 25, "y": 25,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_EventScript_166838" "script": "CeruleanCity_EventScript_CitySign"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 27, "x": 27,
"y": 21, "y": 21,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_EventScript_166853" "script": "CeruleanCity_EventScript_GymSign"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 11, "x": 11,
"y": 28, "y": 28,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_EventScript_16684A" "script": "CeruleanCity_EventScript_BikeShopSign"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 19, "x": 19,
"y": 32, "y": 32,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_EventScript_166841" "script": "CeruleanCity_EventScript_TrainerTips"
}, },
{ {
"type": "hidden_item", "type": "hidden_item",
@@ -382,21 +382,21 @@
"x": 11, "x": 11,
"y": 25, "y": 25,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_EventScript_16AC94" "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 11, "x": 11,
"y": 27, "y": 27,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_EventScript_16AC94" "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 11, "x": 11,
"y": 26, "y": 26,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_EventScript_16AC94" "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
} }
] ]
} }
data/maps/CeruleanCity/scripts.inc
+134 -128
View File
@@ -1,101 +1,107 @@
.equ LOCALID_POLICEMAN, 1
.equ LOCALID_GRUNT, 2
.equ LOCALID_SLOWBRO, 5
.equ LOCALID_LASS, 6
.equ LOCALID_RIVAL, 8
CeruleanCity_MapScripts:: @ 8166471 CeruleanCity_MapScripts:: @ 8166471
map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition
.byte 0 .byte 0
CeruleanCity_OnTransition:: @ 8166477 CeruleanCity_OnTransition:: @ 8166477
setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY
call_if_unset FLAG_GOT_SS_TICKET, EventScript_166484 call_if_unset FLAG_GOT_SS_TICKET, CeruleanCity_EventScript_BlockExits
end end
EventScript_166484:: @ 8166484 CeruleanCity_EventScript_BlockExits:: @ 8166484
setobjectxyperm 1, 30, 12 setobjectxyperm LOCALID_POLICEMAN, 30, 12
setobjectxyperm 5, 26, 31 setobjectxyperm LOCALID_SLOWBRO, 26, 31
setobjectxyperm 6, 27, 31 setobjectxyperm LOCALID_LASS, 27, 31
return return
CeruleanCity_EventScript_16649A:: @ 816649A CeruleanCity_EventScript_RivalTriggerLeft:: @ 816649A
lockall lockall
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
goto EventScript_1664CC goto CeruleanCity_EventScript_Rival
end end
CeruleanCity_EventScript_1664A6:: @ 81664A6 CeruleanCity_EventScript_RivalTriggerMid:: @ 81664A6
lockall lockall
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
setobjectxyperm 8, 23, 0 setobjectxyperm LOCALID_RIVAL, 23, 0
goto EventScript_1664CC goto CeruleanCity_EventScript_Rival
end end
CeruleanCity_EventScript_1664B9:: @ 81664B9 CeruleanCity_EventScript_RivalTriggerRight:: @ 81664B9
lockall lockall
setvar VAR_TEMP_1, 2 setvar VAR_TEMP_1, 2
setobjectxyperm 8, 24, 0 setobjectxyperm LOCALID_RIVAL, 24, 0
goto EventScript_1664CC goto CeruleanCity_EventScript_Rival
end end
EventScript_1664CC:: @ 81664CC CeruleanCity_EventScript_Rival:: @ 81664CC
textcolor 0 textcolor 0
setvar VAR_MAP_SCENE_ROUTE22, 2 setvar VAR_MAP_SCENE_ROUTE22, 2
playbgm MUS_RIVAL1, 0 playbgm MUS_RIVAL1, 0
addobject 8 addobject LOCALID_RIVAL
applymovement 8, Movement_1665D3 applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalEnter
waitmovement 0 waitmovement 0
msgbox gUnknown_817EAD7 msgbox CeruleanCity_Text_RivalIntro
setvar VAR_LAST_TALKED, 8 setvar VAR_LAST_TALKED, LOCALID_RIVAL
compare VAR_STARTER_MON, 2 compare VAR_STARTER_MON, 2
call_if_eq EventScript_166582 call_if_eq CeruleanCity_EventScript_RivalSquirtle
compare VAR_STARTER_MON, 1 compare VAR_STARTER_MON, 1
call_if_eq EventScript_16658D call_if_eq CeruleanCity_EventScript_RivalBulbasaur
compare VAR_STARTER_MON, 0 compare VAR_STARTER_MON, 0
call_if_eq EventScript_166598 call_if_eq CeruleanCity_EventScript_RivalCharmander
famechecker FAMECHECKER_BILL, 0 famechecker FAMECHECKER_BILL, 0
msgbox gUnknown_817EB95 msgbox CeruleanCity_Text_RivalPostBattle
closemessage closemessage
playbgm MUS_RIVAL2, 0 playbgm MUS_RIVAL2, 0
compare VAR_TEMP_1, 0 compare VAR_TEMP_1, 0
call_if_eq EventScript_1665A3 call_if_eq CeruleanCity_EventScript_RivalStartExit
compare VAR_TEMP_1, 1 compare VAR_TEMP_1, 1
call_if_eq EventScript_1665A3 call_if_eq CeruleanCity_EventScript_RivalStartExit
compare VAR_TEMP_1, 2 compare VAR_TEMP_1, 2
call_if_eq EventScript_1665B5 call_if_eq CeruleanCity_EventScript_RivalStartExitRight
msgbox gUnknown_817ECD4 msgbox CeruleanCity_Text_OhRightLittlePresentAsFavor
setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
setflag FLAG_GOT_FAME_CHECKER setflag FLAG_GOT_FAME_CHECKER
giveitem ITEM_FAME_CHECKER giveitem ITEM_FAME_CHECKER
msgbox gUnknown_817ED5D msgbox CeruleanCity_Text_ExplainFameCheckerSmellYa
closemessage closemessage
applymovement 8, Movement_1665FB applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalExit
waitmovement 0 waitmovement 0
fadedefaultbgm fadedefaultbgm
removeobject 8 removeobject LOCALID_RIVAL
releaseall releaseall
end end
EventScript_166582:: @ 8166582 CeruleanCity_EventScript_RivalSquirtle:: @ 8166582
trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_SQUIRTLE, Text_17EB71 trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_SQUIRTLE, CeruleanCity_Text_RivalDefeat
return return
EventScript_16658D:: @ 816658D CeruleanCity_EventScript_RivalBulbasaur:: @ 816658D
trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_BULBASAUR, Text_17EB71 trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_BULBASAUR, CeruleanCity_Text_RivalDefeat
return return
EventScript_166598:: @ 8166598 CeruleanCity_EventScript_RivalCharmander:: @ 8166598
trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_CHARMANDER, Text_17EB71 trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_CHARMANDER, CeruleanCity_Text_RivalDefeat
return return
EventScript_1665A3:: @ 81665A3 CeruleanCity_EventScript_RivalStartExit:: @ 81665A3
applymovement OBJ_EVENT_ID_PLAYER, Movement_1665C7 applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExit
applymovement 8, Movement_1665D9 applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExit
waitmovement 0 waitmovement 0
return return
EventScript_1665B5:: @ 81665B5 CeruleanCity_EventScript_RivalStartExitRight:: @ 81665B5
applymovement OBJ_EVENT_ID_PLAYER, Movement_1665CD applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExitRight
applymovement 8, Movement_1665EA applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExitRight
waitmovement 0 waitmovement 0
return return
Movement_1665C7:: @ 81665C7 CeruleanCity_Movement_PlayerWatchRivalExit:: @ 81665C7
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_fastest_right
@@ -103,7 +109,7 @@ Movement_1665C7:: @ 81665C7
walk_in_place_fastest_down walk_in_place_fastest_down
step_end step_end
Movement_1665CD:: @ 81665CD CeruleanCity_Movement_PlayerWatchRivalExitRight:: @ 81665CD
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_left walk_in_place_fastest_left
@@ -111,7 +117,7 @@ Movement_1665CD:: @ 81665CD
walk_in_place_fastest_down walk_in_place_fastest_down
step_end step_end
Movement_1665D3:: @ 81665D3 CeruleanCity_Movement_RivalEnter:: @ 81665D3
walk_down walk_down
walk_down walk_down
walk_down walk_down
@@ -119,7 +125,7 @@ Movement_1665D3:: @ 81665D3
walk_down walk_down
step_end step_end
Movement_1665D9:: @ 81665D9 CeruleanCity_Movement_RivalStartExit:: @ 81665D9
walk_right walk_right
walk_down walk_down
walk_down walk_down
@@ -138,7 +144,7 @@ Movement_1665D9:: @ 81665D9
walk_up walk_up
step_end step_end
Movement_1665EA:: @ 81665EA CeruleanCity_Movement_RivalStartExitRight:: @ 81665EA
walk_left walk_left
walk_down walk_down
walk_down walk_down
@@ -157,7 +163,7 @@ Movement_1665EA:: @ 81665EA
walk_up walk_up
step_end step_end
Movement_1665FB:: @ 81665FB CeruleanCity_Movement_RivalExit:: @ 81665FB
walk_down walk_down
walk_down walk_down
walk_down walk_down
@@ -167,209 +173,209 @@ Movement_1665FB:: @ 81665FB
walk_down walk_down
step_end step_end
CeruleanCity_EventScript_166603:: @ 8166603 CeruleanCity_EventScript_Grunt:: @ 8166603
lock lock
faceplayer faceplayer
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, EventScript_16662E goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_EventScript_GruntDefeated
message Text_17EE0E message CeruleanCity_Text_GruntIntro
waitmessage waitmessage
playbgm MUS_ROCKET, 0 playbgm MUS_ROCKET, 0
waitbuttonpress waitbuttonpress
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70 trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat
setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
goto EventScript_16662E goto CeruleanCity_EventScript_GruntDefeated
end end
EventScript_16662E:: @ 816662E CeruleanCity_EventScript_GruntDefeated:: @ 816662E
msgbox gUnknown_817EE9C msgbox CeruleanCity_Text_OkayIllReturnStolenTM
checkitemspace ITEM_TM28, 1 checkitemspace ITEM_TM28, 1
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq EventScript_166677 goto_if_eq CeruleanCity_EventScript_NoRoomForTM28
giveitem_msg gUnknown_817EEBF, ITEM_TM28 giveitem_msg CeruleanCity_Text_RecoveredTM28FromGrunt, ITEM_TM28
msgbox gUnknown_817EEED msgbox CeruleanCity_Text_BetterGetMovingBye
closemessage closemessage
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
removeobject 2 removeobject LOCALID_GRUNT
fadescreen FADE_FROM_BLACK fadescreen FADE_FROM_BLACK
setflag FLAG_GOT_TM28_FROM_ROCKET setflag FLAG_GOT_TM28_FROM_ROCKET
release release
end end
EventScript_166677:: @ 8166677 CeruleanCity_EventScript_NoRoomForTM28:: @ 8166677
textcolor 0 textcolor 0
msgbox gUnknown_817EF07 msgbox CeruleanCity_Text_MakeRoomForThisCantRun
release release
end end
CeruleanCity_EventScript_166683:: @ 8166683 CeruleanCity_EventScript_GruntTriggerTop:: @ 8166683
lockall lockall
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
applymovement 2, Movement_WalkInPlaceFastestUp applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
goto EventScript_1666C3 goto CeruleanCity_EventScript_GruntTrigger
end end
CeruleanCity_EventScript_1666A3:: @ 81666A3 CeruleanCity_EventScript_GruntTriggerBottom:: @ 81666A3
lockall lockall
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
applymovement 2, Movement_WalkInPlaceFastestDown applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
goto EventScript_1666C3 goto CeruleanCity_EventScript_GruntTrigger
end end
EventScript_1666C3:: @ 81666C3 CeruleanCity_EventScript_GruntTrigger:: @ 81666C3
textcolor 0 textcolor 0
msgbox Text_17EE0E msgbox CeruleanCity_Text_GruntIntro
setvar VAR_LAST_TALKED, 2 setvar VAR_LAST_TALKED, LOCALID_GRUNT
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70 trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat
setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
goto EventScript_16662E goto CeruleanCity_EventScript_GruntDefeated
end end
CeruleanCity_EventScript_1666E7:: @ 81666E7 CeruleanCity_EventScript_Policeman:: @ 81666E7
lock lock
faceplayer faceplayer
msgbox gUnknown_817F0F1 msgbox CeruleanCity_Text_PeopleHereWereRobbed
closemessage closemessage
applymovement 1, Movement_FaceOriginalDirection applymovement LOCALID_POLICEMAN, Movement_FaceOriginalDirection
waitmovement 0 waitmovement 0
release release
end end
CeruleanCity_EventScript_1666FE:: @ 81666FE CeruleanCity_EventScript_LittleBoy:: @ 81666FE
lock lock
faceplayer faceplayer
goto_if_set FLAG_GOT_SS_TICKET, EventScript_166713 goto_if_set FLAG_GOT_SS_TICKET, CeruleanCity_EventScript_LittleBoySlowbroMoved
msgbox gUnknown_817F01D msgbox CeruleanCity_Text_IfSlowbroWasntThereCouldCutTree
release release
end end
EventScript_166713:: @ 8166713 CeruleanCity_EventScript_LittleBoySlowbroMoved:: @ 8166713
msgbox gUnknown_817EF89 msgbox CeruleanCity_Text_YouCanCutDownSmallTrees
release release
end end
CeruleanCity_EventScript_16671D:: @ 816671D CeruleanCity_EventScript_BaldingMan:: @ 816671D
msgbox gUnknown_817F0B2, MSGBOX_NPC msgbox CeruleanCity_Text_PokemonEncyclopediaAmusing, MSGBOX_NPC
end end
CeruleanCity_EventScript_166726:: @ 8166726 CeruleanCity_EventScript_Youngster:: @ 8166726
msgbox gUnknown_817EF3F, MSGBOX_NPC msgbox CeruleanCity_Text_TrainerLifeIsToughIsntIt, MSGBOX_NPC
end end
CeruleanCity_EventScript_16672F:: @ 816672F CeruleanCity_EventScript_CeruleanCaveGuard:: @ 816672F
msgbox gUnknown_817F319, MSGBOX_NPC msgbox CeruleanCity_Text_ThisIsCeruleanCave, MSGBOX_NPC
end end
CeruleanCity_EventScript_166738:: @ 8166738 CeruleanCity_EventScript_Woman:: @ 8166738
lock lock
faceplayer faceplayer
msgbox gUnknown_817F2CF msgbox CeruleanCity_Text_WantBrightRedBicycle
closemessage closemessage
applymovement 11, Movement_FaceOriginalDirection applymovement 11, Movement_FaceOriginalDirection
waitmovement 0 waitmovement 0
release release
end end
CeruleanCity_EventScript_16674F:: @ 816674F CeruleanCity_EventScript_Lass:: @ 816674F
lock lock
random 3 random 3
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if_eq EventScript_1667B0 call_if_eq CeruleanCity_EventScript_SlowbroCommand1
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if_eq EventScript_1667B6 call_if_eq CeruleanCity_EventScript_SlowbroCommand2
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if_eq EventScript_1667BC call_if_eq CeruleanCity_EventScript_SlowbroCommand3
waitmessage waitmessage
delay 40 delay 40
playse SE_PIN playse SE_PIN
applymovement 5, Movement_QuestionMark applymovement LOCALID_SLOWBRO, Movement_QuestionMark
waitmovement 0 waitmovement 0
delay 30 delay 30
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if_eq EventScript_1667C2 call_if_eq CeruleanCity_EventScript_SlowbroFailed1
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if_eq EventScript_1667CB call_if_eq CeruleanCity_EventScript_SlowbroFailed2
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if_eq EventScript_1667D4 call_if_eq CeruleanCity_EventScript_SlowbroFailed3
release release
end end
EventScript_1667B0:: @ 81667B0 CeruleanCity_EventScript_SlowbroCommand1:: @ 81667B0
message Text_17F183 message CeruleanCity_Text_SlowbroUseSonicboom
return return
EventScript_1667B6:: @ 81667B6 CeruleanCity_EventScript_SlowbroCommand2:: @ 81667B6
message Text_17F1C2 message CeruleanCity_Text_SlowbroPunch
return return
EventScript_1667BC:: @ 81667BC CeruleanCity_EventScript_SlowbroCommand3:: @ 81667BC
message Text_17F1E9 message CeruleanCity_Text_SlowbroWithdraw
return return
EventScript_1667C2:: @ 81667C2 CeruleanCity_EventScript_SlowbroFailed1:: @ 81667C2
msgbox gUnknown_817F1A1 msgbox CeruleanCity_Text_SlowbroPayAttention
return return
EventScript_1667CB:: @ 81667CB CeruleanCity_EventScript_SlowbroFailed2:: @ 81667CB
msgbox gUnknown_817F1D2 msgbox CeruleanCity_Text_NoYouBlewItAgain
return return
EventScript_1667D4:: @ 81667D4 CeruleanCity_EventScript_SlowbroFailed3:: @ 81667D4
msgbox gUnknown_817F1FC msgbox CeruleanCity_Text_HardToControlMonsObedience
return return
CeruleanCity_EventScript_1667DD:: @ 81667DD CeruleanCity_EventScript_Slowbro:: @ 81667DD
lock lock
random 4 random 4
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if_eq EventScript_166814 call_if_eq CeruleanCity_EventScript_SlowbroText1
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if_eq EventScript_16681D call_if_eq CeruleanCity_EventScript_SlowbroText2
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if_eq EventScript_166826 call_if_eq CeruleanCity_EventScript_SlowbroText3
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if_eq EventScript_16682F call_if_eq CeruleanCity_EventScript_SlowbroText4
release release
end end
EventScript_166814:: @ 8166814 CeruleanCity_EventScript_SlowbroText1:: @ 8166814
msgbox gUnknown_817F270 msgbox CeruleanCity_Text_SlowbroTookSnooze
return return
EventScript_16681D:: @ 816681D CeruleanCity_EventScript_SlowbroText2:: @ 816681D
msgbox gUnknown_817F287 msgbox CeruleanCity_Text_SlowbroLoafingAround
return return
EventScript_166826:: @ 8166826 CeruleanCity_EventScript_SlowbroText3:: @ 8166826
msgbox gUnknown_817F2A2 msgbox CeruleanCity_Text_SlowbroTurnedAway
return return
EventScript_16682F:: @ 816682F CeruleanCity_EventScript_SlowbroText4:: @ 816682F
msgbox gUnknown_817F2B7 msgbox CeruleanCity_Text_SlowbroIgnoredOrders
return return
CeruleanCity_EventScript_166838:: @ 8166838 CeruleanCity_EventScript_CitySign:: @ 8166838
msgbox gUnknown_817F420, MSGBOX_SIGN msgbox CeruleanCity_Text_CitySign, MSGBOX_SIGN
end end
CeruleanCity_EventScript_166841:: @ 8166841 CeruleanCity_EventScript_TrainerTips:: @ 8166841
msgbox gUnknown_817F453, MSGBOX_SIGN msgbox CeruleanCity_Text_TrainerTipsHeldItems, MSGBOX_SIGN
end end
CeruleanCity_EventScript_16684A:: @ 816684A CeruleanCity_EventScript_BikeShopSign:: @ 816684A
msgbox gUnknown_817F4C5, MSGBOX_SIGN msgbox CeruleanCity_Text_BikeShopSign, MSGBOX_SIGN
end end
CeruleanCity_EventScript_166853:: @ 8166853 CeruleanCity_EventScript_GymSign:: @ 8166853
lockall lockall
famechecker FAMECHECKER_MISTY, 0 famechecker FAMECHECKER_MISTY, 0
msgbox gUnknown_817F4EF msgbox CeruleanCity_Text_GymSign
releaseall releaseall
end end
data/maps/CeruleanCity/text.inc
+33 -33
View File
@@ -1,4 +1,4 @@
gUnknown_817EAD7:: @ 817EAD7 CeruleanCity_Text_RivalIntro:: @ 817EAD7
.string "{RIVAL}: Yo! {PLAYER}!\p" .string "{RIVAL}: Yo! {PLAYER}!\p"
.string "You're still struggling along back\n" .string "You're still struggling along back\n"
.string "here?\p" .string "here?\p"
@@ -7,12 +7,12 @@ gUnknown_817EAD7:: @ 817EAD7
.string "Here, let me see what you caught,\n" .string "Here, let me see what you caught,\n"
.string "{PLAYER}!$" .string "{PLAYER}!$"
Text_17EB71:: @ 817EB71 CeruleanCity_Text_RivalDefeat:: @ 817EB71
.string "Hey!\n" .string "Hey!\n"
.string "Take it easy!\l" .string "Take it easy!\l"
.string "You won already!$" .string "You won already!$"
gUnknown_817EB95:: @ 817EB95 CeruleanCity_Text_RivalPostBattle:: @ 817EB95
.string "{RIVAL}: Hey, guess what?\p" .string "{RIVAL}: Hey, guess what?\p"
.string "I went to BILL's and got him to\n" .string "I went to BILL's and got him to\n"
.string "show me his rare POKéMON.\p" .string "show me his rare POKéMON.\p"
@@ -27,14 +27,14 @@ gUnknown_817EB95:: @ 817EB95
.string "Well, I better get rolling!\n" .string "Well, I better get rolling!\n"
.string "Smell ya later!$" .string "Smell ya later!$"
gUnknown_817ECD4:: @ 817ECD4 CeruleanCity_Text_OhRightLittlePresentAsFavor:: @ 817ECD4
.string "Oh, yeah, right.\p" .string "Oh, yeah, right.\p"
.string "I feel sorry for you. No, really.\n" .string "I feel sorry for you. No, really.\n"
.string "You're always plodding behind me.\p" .string "You're always plodding behind me.\p"
.string "So here, I'll give you a little\n" .string "So here, I'll give you a little\n"
.string "present as a favor.$" .string "present as a favor.$"
gUnknown_817ED5D:: @ 817ED5D CeruleanCity_Text_ExplainFameCheckerSmellYa:: @ 817ED5D
.string "A chatty gossip like you…\n" .string "A chatty gossip like you…\n"
.string "That thing's perfect.\p" .string "That thing's perfect.\p"
.string "I don't need it because I don't\n" .string "I don't need it because I don't\n"
@@ -42,11 +42,11 @@ gUnknown_817ED5D:: @ 817ED5D
.string "All right, this time I really am\n" .string "All right, this time I really am\n"
.string "gone. Smell ya!$" .string "gone. Smell ya!$"
Text_17EDF8:: @ 817EDF8 CeruleanCity_Text_17EDF8:: @ 817EDF8
.string "なんたって！\n" .string "なんたって！\n"
.string "おれは　てんさい　だからよ！$" .string "おれは　てんさい　だからよ！$"
Text_17EE0E:: @ 817EE0E CeruleanCity_Text_GruntIntro:: @ 817EE0E
.string "Hey! Stay out!\n" .string "Hey! Stay out!\n"
.string "It's not your yard!\p" .string "It's not your yard!\p"
.string "…Huh?\n" .string "…Huh?\n"
@@ -54,32 +54,32 @@ Text_17EE0E:: @ 817EE0E
.string "I'm an innocent bystander!\n" .string "I'm an innocent bystander!\n"
.string "Don't you believe me?{PLAY_BGM}{MUS_ROCKET}$" .string "Don't you believe me?{PLAY_BGM}{MUS_ROCKET}$"
Text_17EE70:: @ 817EE70 CeruleanCity_Text_GruntDefeat:: @ 817EE70
.string "GRUNT: Stop! I give up!\n" .string "GRUNT: Stop! I give up!\n"
.string "I'll leave quietly!$" .string "I'll leave quietly!$"
gUnknown_817EE9C:: @ 817EE9C CeruleanCity_Text_OkayIllReturnStolenTM:: @ 817EE9C
.string "…Okay.\n" .string "…Okay.\n"
.string "I'll return the TM I stole.$" .string "I'll return the TM I stole.$"
gUnknown_817EEBF:: @ 817EEBF CeruleanCity_Text_RecoveredTM28FromGrunt:: @ 817EEBF
.string "{PLAYER} recovered TM28 from\n" .string "{PLAYER} recovered TM28 from\n"
.string "the TEAM ROCKET GRUNT.$" .string "the TEAM ROCKET GRUNT.$"
gUnknown_817EEED:: @ 817EEED CeruleanCity_Text_BetterGetMovingBye:: @ 817EEED
.string "I better get moving!\n" .string "I better get moving!\n"
.string "Bye!$" .string "Bye!$"
gUnknown_817EF07:: @ 817EF07 CeruleanCity_Text_MakeRoomForThisCantRun:: @ 817EF07
.string "Make room for this!\n" .string "Make room for this!\n"
.string "I can't run until I give it to you!$" .string "I can't run until I give it to you!$"
gUnknown_817EF3F:: @ 817EF3F CeruleanCity_Text_TrainerLifeIsToughIsntIt:: @ 817EF3F
.string "You're a TRAINER, too?\p" .string "You're a TRAINER, too?\p"
.string "Collecting, battling…\n" .string "Collecting, battling…\n"
.string "It's a tough life, isn't it?$" .string "It's a tough life, isn't it?$"
gUnknown_817EF89:: @ 817EF89 CeruleanCity_Text_YouCanCutDownSmallTrees:: @ 817EF89
.string "Did you know that you can CUT down\n" .string "Did you know that you can CUT down\n"
.string "small trees?\p" .string "small trees?\p"
.string "Even that small tree in front of\n" .string "Even that small tree in front of\n"
@@ -87,7 +87,7 @@ gUnknown_817EF89:: @ 817EF89
.string "I think there's a way around it,\n" .string "I think there's a way around it,\n"
.string "though.$" .string "though.$"
gUnknown_817F01D:: @ 817F01D CeruleanCity_Text_IfSlowbroWasntThereCouldCutTree:: @ 817F01D
.string "If that SLOWBRO wasn't there, you\n" .string "If that SLOWBRO wasn't there, you\n"
.string "could CUT down the small tree.\p" .string "could CUT down the small tree.\p"
.string "That way, you could get to the\n" .string "That way, you could get to the\n"
@@ -95,58 +95,58 @@ gUnknown_817F01D:: @ 817F01D
.string "I think there's a way around it,\n" .string "I think there's a way around it,\n"
.string "though.$" .string "though.$"
gUnknown_817F0B2:: @ 817F0B2 CeruleanCity_Text_PokemonEncyclopediaAmusing:: @ 817F0B2
.string "You're making an encyclopedia on\n" .string "You're making an encyclopedia on\n"
.string "POKéMON? That sounds amusing.$" .string "POKéMON? That sounds amusing.$"
gUnknown_817F0F1:: @ 817F0F1 CeruleanCity_Text_PeopleHereWereRobbed:: @ 817F0F1
.string "The people here were robbed.\p" .string "The people here were robbed.\p"
.string "It's obvious that TEAM ROCKET is\n" .string "It's obvious that TEAM ROCKET is\n"
.string "behind this most heinous crime!\p" .string "behind this most heinous crime!\p"
.string "Even our POLICE FORCE has\n" .string "Even our POLICE FORCE has\n"
.string "trouble with the ROCKETS!$" .string "trouble with the ROCKETS!$"
Text_17F183:: @ 817F183 CeruleanCity_Text_SlowbroUseSonicboom:: @ 817F183
.string "Okay! SLOWBRO!\n" .string "Okay! SLOWBRO!\n"
.string "Use SONICBOOM!$" .string "Use SONICBOOM!$"
gUnknown_817F1A1:: @ 817F1A1 CeruleanCity_Text_SlowbroPayAttention:: @ 817F1A1
.string "Come on, SLOWBRO, pay attention!$" .string "Come on, SLOWBRO, pay attention!$"
Text_17F1C2:: @ 817F1C2 CeruleanCity_Text_SlowbroPunch:: @ 817F1C2
.string "SLOWBRO, punch!$" .string "SLOWBRO, punch!$"
gUnknown_817F1D2:: @ 817F1D2 CeruleanCity_Text_NoYouBlewItAgain:: @ 817F1D2
.string "No!\n" .string "No!\n"
.string "You blew it again!$" .string "You blew it again!$"
Text_17F1E9:: @ 817F1E9 CeruleanCity_Text_SlowbroWithdraw:: @ 817F1E9
.string "SLOWBRO, WITHDRAW!$" .string "SLOWBRO, WITHDRAW!$"
gUnknown_817F1FC:: @ 817F1FC CeruleanCity_Text_HardToControlMonsObedience:: @ 817F1FC
.string "No! That's wrong!\n" .string "No! That's wrong!\n"
.string "It's so hard to control POKéMON!\p" .string "It's so hard to control POKéMON!\p"
.string "Your POKéMON's obedience depends\n" .string "Your POKéMON's obedience depends\n"
.string "on your abilities as a TRAINER.$" .string "on your abilities as a TRAINER.$"
gUnknown_817F270:: @ 817F270 CeruleanCity_Text_SlowbroTookSnooze:: @ 817F270
.string "SLOWBRO took a snooze…$" .string "SLOWBRO took a snooze…$"
gUnknown_817F287:: @ 817F287 CeruleanCity_Text_SlowbroLoafingAround:: @ 817F287
.string "SLOWBRO is loafing around…$" .string "SLOWBRO is loafing around…$"
gUnknown_817F2A2:: @ 817F2A2 CeruleanCity_Text_SlowbroTurnedAway:: @ 817F2A2
.string "SLOWBRO turned away…$" .string "SLOWBRO turned away…$"
gUnknown_817F2B7:: @ 817F2B7 CeruleanCity_Text_SlowbroIgnoredOrders:: @ 817F2B7
.string "SLOWBRO ignored orders…$" .string "SLOWBRO ignored orders…$"
gUnknown_817F2CF:: @ 817F2CF CeruleanCity_Text_WantBrightRedBicycle:: @ 817F2CF
.string "I want a bright red bicycle.\p" .string "I want a bright red bicycle.\p"
.string "I'll keep it at home, so it won't\n" .string "I'll keep it at home, so it won't\n"
.string "get dirty.$" .string "get dirty.$"
gUnknown_817F319:: @ 817F319 CeruleanCity_Text_ThisIsCeruleanCave:: @ 817F319
.string "This is CERULEAN CAVE.\p" .string "This is CERULEAN CAVE.\p"
.string "Horribly strong POKéMON live inside\n" .string "Horribly strong POKéMON live inside\n"
.string "there.\p" .string "there.\p"
@@ -158,23 +158,23 @@ gUnknown_817F319:: @ 817F319
.string "And, you would have to have\n" .string "And, you would have to have\n"
.string "made a great achievement.$" .string "made a great achievement.$"
gUnknown_817F420:: @ 817F420 CeruleanCity_Text_CitySign:: @ 817F420
.string "CERULEAN CITY\n" .string "CERULEAN CITY\n"
.string "A Mysterious, Blue Aura Surrounds\l" .string "A Mysterious, Blue Aura Surrounds\l"
.string "It$" .string "It$"
gUnknown_817F453:: @ 817F453 CeruleanCity_Text_TrainerTipsHeldItems:: @ 817F453
.string "TRAINER TIPS\p" .string "TRAINER TIPS\p"
.string "A POKéMON can be made to hold\n" .string "A POKéMON can be made to hold\n"
.string "an item.\p" .string "an item.\p"
.string "Some items can even be used by\n" .string "Some items can even be used by\n"
.string "the holding POKéMON in battle.$" .string "the holding POKéMON in battle.$"
gUnknown_817F4C5:: @ 817F4C5 CeruleanCity_Text_BikeShopSign:: @ 817F4C5
.string "Grass and caves handled easily!\n" .string "Grass and caves handled easily!\n"
.string "BIKE SHOP$" .string "BIKE SHOP$"
gUnknown_817F4EF:: @ 817F4EF CeruleanCity_Text_GymSign:: @ 817F4EF
.string "CERULEAN CITY POKéMON GYM\n" .string "CERULEAN CITY POKéMON GYM\n"
.string "LEADER: MISTY\l" .string "LEADER: MISTY\l"
.string "The Tomboyish Mermaid!$" .string "The Tomboyish Mermaid!$"
data/maps/CeruleanCity_BikeShop/map.json
+11 -11
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_BikeShop_EventScript_16ABBD", "script": "CeruleanCity_BikeShop_EventScript_Clerk",
"flag": "0" "flag": "0"
}, },
{ {
@@ -36,7 +36,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_BikeShop_EventScript_16AC75", "script": "CeruleanCity_BikeShop_EventScript_Youngster",
"flag": "0" "flag": "0"
}, },
{ {
@@ -49,7 +49,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_BikeShop_EventScript_16AC6C", "script": "CeruleanCity_BikeShop_EventScript_Woman",
"flag": "0" "flag": "0"
} }
], ],
@@ -83,56 +83,56 @@
"x": 4, "x": 4,
"y": 3, "y": 3,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_BikeShop_EventScript_16AC94" "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 4, "x": 4,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_BikeShop_EventScript_16AC94" "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 4, "x": 4,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_BikeShop_EventScript_16AC94" "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 2, "x": 2,
"y": 3, "y": 3,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_BikeShop_EventScript_16AC94" "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 1, "x": 1,
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_BikeShop_EventScript_16AC94" "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 2, "x": 2,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_BikeShop_EventScript_16AC94" "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 2, "x": 2,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_BikeShop_EventScript_16AC94" "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 2, "x": 2,
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_BikeShop_EventScript_16AC94" "script": "CeruleanCity_BikeShop_EventScript_Bicycle"
} }
] ]
} }
data/maps/CeruleanCity_BikeShop/scripts.inc
+32 -31
View File
@@ -1,70 +1,71 @@
CeruleanCity_BikeShop_MapScripts:: @ 816ABBC CeruleanCity_BikeShop_MapScripts:: @ 816ABBC
.byte 0 .byte 0
CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD CeruleanCity_BikeShop_EventScript_Clerk:: @ 816ABBD
lock lock
faceplayer faceplayer
goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC58 goto_if_set FLAG_GOT_BICYCLE, CeruleanCity_BikeShop_EventScript_AlreadyGotBicycle
goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16AC22 goto_if_set FLAG_GOT_BIKE_VOUCHER, CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher
showmoneybox 0, 0, 0 showmoneybox 0, 0, 0
message Text_192755 message CeruleanCity_BikeShop_Text_WelcomeToBikeShop
waitmessage waitmessage
multichoice 11, 0, MULTICHOICE_BIKE_SHOP, FALSE multichoice 11, 0, MULTICHOICE_BIKE_SHOP, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16AC07 case 0, CeruleanCity_BikeShop_EventScript_TryPurchaseBicycle
case 1, EventScript_16AC15 case 1, CeruleanCity_BikeShop_EventScript_ClerkGoodbye
case 127, EventScript_16AC15 case 127, CeruleanCity_BikeShop_EventScript_ClerkGoodbye
end end
EventScript_16AC07:: @ 816AC07 @ The Bicycle price / players money is never actually checked
msgbox gUnknown_8192796 CeruleanCity_BikeShop_EventScript_TryPurchaseBicycle:: @ 816AC07
goto EventScript_16AC15 msgbox CeruleanCity_BikeShop_Text_SorryYouCantAffordIt
goto CeruleanCity_BikeShop_EventScript_ClerkGoodbye
end end
EventScript_16AC15:: @ 816AC15 CeruleanCity_BikeShop_EventScript_ClerkGoodbye:: @ 816AC15
msgbox gUnknown_819280E msgbox CeruleanCity_BikeShop_Text_ThankYouComeAgain
hidemoneybox 0, 0 hidemoneybox 0, 0
release release
end end
EventScript_16AC22:: @ 816AC22 CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher:: @ 816AC22
msgbox gUnknown_81927B2 msgbox CeruleanCity_BikeShop_Text_OhBikeVoucherHereYouGo
msgreceiveditem gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5 msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_FAN5
setflag FLAG_GOT_BICYCLE setflag FLAG_GOT_BICYCLE
additem ITEM_BICYCLE additem ITEM_BICYCLE
removeitem ITEM_BIKE_VOUCHER, 1 removeitem ITEM_BIKE_VOUCHER
msgbox gUnknown_819280E msgbox CeruleanCity_BikeShop_Text_ThankYouComeAgain
release release
end end
EventScript_16AC58:: @ 816AC58 CeruleanCity_BikeShop_EventScript_AlreadyGotBicycle:: @ 816AC58
msgbox gUnknown_8192833 msgbox CeruleanCity_BikeShop_Text_HowDoYouLikeNewBicycle
release release
end end
EventScript_16AC62:: @ 816AC62 @ Unused
msgbox gUnknown_81928A8 CeruleanCity_BikeShop_EventScript_NoRoomForBicycle:: @ 816AC62
msgbox CeruleanCity_BikeShop_Text_MakeRoomForBicycle
release release
end end
CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C CeruleanCity_BikeShop_EventScript_Woman:: @ 816AC6C
msgbox gUnknown_81928CF, MSGBOX_NPC msgbox CeruleanCity_BikeShop_Text_CityBikeGoodEnoughForMe, MSGBOX_NPC
end end
CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 CeruleanCity_BikeShop_EventScript_Youngster:: @ 816AC75
lock lock
faceplayer faceplayer
goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC8A goto_if_set FLAG_GOT_BICYCLE, CeruleanCity_BikeShop_EventScript_YoungsterHaveBike
msgbox gUnknown_8192937 msgbox CeruleanCity_BikeShop_Text_BikesCoolButExpensive
release release
end end
EventScript_16AC8A:: @ 816AC8A CeruleanCity_BikeShop_EventScript_YoungsterHaveBike:: @ 816AC8A
msgbox gUnknown_8192968 msgbox CeruleanCity_BikeShop_Text_WowYourBikeIsCool
release release
end end
CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94 CeruleanCity_BikeShop_EventScript_Bicycle:: @ 816AC94
CeruleanCity_EventScript_16AC94:: @ 816AC94 msgbox CeruleanCity_BikeShop_Text_ShinyNewBicycle, MSGBOX_SIGN
msgbox gUnknown_81929AD, MSGBOX_SIGN
end end
data/maps/CeruleanCity_BikeShop/text.inc
+13 -12
View File
@@ -1,56 +1,57 @@
Text_192755:: @ 8192755 CeruleanCity_BikeShop_Text_WelcomeToBikeShop:: @ 8192755
.string "Hi!\n" .string "Hi!\n"
.string "Welcome to our BIKE SHOP.\p" .string "Welcome to our BIKE SHOP.\p"
.string "Have we got just the BIKE for\n" .string "Have we got just the BIKE for\n"
.string "you!$" .string "you!$"
gUnknown_8192796:: @ 8192796 CeruleanCity_BikeShop_Text_SorryYouCantAffordIt:: @ 8192796
.string "Sorry!\n" .string "Sorry!\n"
.string "You can't afford it!$" .string "You can't afford it!$"
gUnknown_81927B2:: @ 81927B2 CeruleanCity_BikeShop_Text_OhBikeVoucherHereYouGo:: @ 81927B2
.string "Oh, that's…\p" .string "Oh, that's…\p"
.string "A BIKE VOUCHER!\p" .string "A BIKE VOUCHER!\p"
.string "Okay!\n" .string "Okay!\n"
.string "Here you go!$" .string "Here you go!$"
gUnknown_81927E1:: @ 81927E1 CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle:: @ 81927E1
.string "{PLAYER} exchanged the\n" .string "{PLAYER} exchanged the\n"
.string "BIKE VOUCHER for a BICYCLE.$" .string "BIKE VOUCHER for a BICYCLE.$"
gUnknown_819280E:: @ 819280E CeruleanCity_BikeShop_Text_ThankYouComeAgain:: @ 819280E
.string "Thank you!\n" .string "Thank you!\n"
.string "Come back again sometime!$" .string "Come back again sometime!$"
gUnknown_8192833:: @ 8192833 CeruleanCity_BikeShop_Text_HowDoYouLikeNewBicycle:: @ 8192833
.string "How do you like your new BICYCLE?\n" .string "How do you like your new BICYCLE?\n"
.string "Do you like how it rides?\p" .string "Do you like how it rides?\p"
.string "You can take it out on CYCLING\n" .string "You can take it out on CYCLING\n"
.string "ROAD and even into caves!$" .string "ROAD and even into caves!$"
gUnknown_81928A8:: @ 81928A8 CeruleanCity_BikeShop_Text_MakeRoomForBicycle:: @ 81928A8
.string "You better make room for your\n" .string "You better make room for your\n"
.string "BICYCLE!$" .string "BICYCLE!$"
gUnknown_81928CF:: @ 81928CF CeruleanCity_BikeShop_Text_CityBikeGoodEnoughForMe:: @ 81928CF
.string "A plain city bike is good enough\n" .string "A plain city bike is good enough\n"
.string "for me.\p" .string "for me.\p"
.string "After all, you can't put a shopping\n" .string "After all, you can't put a shopping\n"
.string "basket on a mountain bike.$" .string "basket on a mountain bike.$"
gUnknown_8192937:: @ 8192937 CeruleanCity_BikeShop_Text_BikesCoolButExpensive:: @ 8192937
.string "These bikes are cool, but they're\n" .string "These bikes are cool, but they're\n"
.string "way expensive!$" .string "way expensive!$"
gUnknown_8192968:: @ 8192968 CeruleanCity_BikeShop_Text_WowYourBikeIsCool:: @ 8192968
.string "Wow.\n" .string "Wow.\n"
.string "Your BIKE is really cool!$" .string "Your BIKE is really cool!$"
Text_192987:: @ 8192987 @ Unused
CeruleanCity_BikeShop_Text_GermanFoldableBicyleFinallyOnMarket:: @ 8192987
.string "ついに　はつばい！\p" .string "ついに　はつばい！\p"
.string "ドイツ　せい　さいこうきゅう\n" .string "ドイツ　せい　さいこうきゅう\n"
.string "おりたたみ　じてんしゃ！$" .string "おりたたみ　じてんしゃ！$"
gUnknown_81929AD:: @ 81929AD CeruleanCity_BikeShop_Text_ShinyNewBicycle:: @ 81929AD
.string "A shiny new BICYCLE!$" .string "A shiny new BICYCLE!$"
data/maps/CeruleanCity_Gym/map.json
+6 -6
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 1, "trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1, "trainer_sight_or_berry_tree_id": 1,
"script": "CeruleanCity_Gym_EventScript_16AB5B", "script": "CeruleanCity_Gym_EventScript_Luis",
"flag": "0" "flag": "0"
}, },
{ {
@@ -36,7 +36,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 1, "trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4, "trainer_sight_or_berry_tree_id": 4,
"script": "CeruleanCity_Gym_EventScript_16AB44", "script": "CeruleanCity_Gym_EventScript_Diana",
"flag": "0" "flag": "0"
}, },
{ {
@@ -49,7 +49,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_Gym_EventScript_16AAA1", "script": "CeruleanCity_Gym_EventScript_Misty",
"flag": "0" "flag": "0"
}, },
{ {
@@ -62,7 +62,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_Gym_EventScript_16AB7F", "script": "CeruleanCity_Gym_EventScript_GymGuy",
"flag": "0" "flag": "0"
} }
], ],
@@ -96,14 +96,14 @@
"x": 6, "x": 6,
"y": 17, "y": 17,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_Gym_EventScript_16AB9E" "script": "CeruleanCity_Gym_EventScript_GymStatue"
}, },
{ {
"type": "bg_event_type_0", "type": "bg_event_type_0",
"x": 10, "x": 10,
"y": 17, "y": 17,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_Gym_EventScript_16AB9E" "script": "CeruleanCity_Gym_EventScript_GymStatue"
} }
] ]
} }
data/maps/CeruleanCity_Gym/scripts.inc
+29 -29
View File
@@ -1,71 +1,71 @@
CeruleanCity_Gym_MapScripts:: @ 816AAA0 CeruleanCity_Gym_MapScripts:: @ 816AAA0
.byte 0 .byte 0
CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 CeruleanCity_Gym_EventScript_Misty:: @ 816AAA1
famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle_single TRAINER_LEADER_MISTY, Text_1921EF, Text_19242D, EventScript_16AAD3, NO_MUSIC trainerbattle_single TRAINER_LEADER_MISTY, CeruleanCity_Gym_Text_MistyIntro, CeruleanCity_Gym_Text_MistyDefeat, CeruleanCity_Gym_EventScript_MistyDefeated, NO_MUSIC
goto_if_unset FLAG_GOT_TM03_FROM_MISTY, EventScript_16AAF9 goto_if_unset FLAG_GOT_TM03_FROM_MISTY, CeruleanCity_Gym_EventScript_GiveTM03
msgbox gUnknown_81922BF msgbox CeruleanCity_Gym_Text_ExplainTM03
release release
end end
EventScript_16AAD3:: @ 816AAD3 CeruleanCity_Gym_EventScript_MistyDefeated:: @ 816AAD3
famechecker FAMECHECKER_MISTY, 1 famechecker FAMECHECKER_MISTY, 1
setflag FLAG_DEFEATED_MISTY setflag FLAG_DEFEATED_MISTY
setflag FLAG_BADGE02_GET setflag FLAG_BADGE02_GET
setrespawn SPAWN_CERULEAN_CITY setrespawn SPAWN_CERULEAN_CITY
set_gym_trainers 2 set_gym_trainers 2
goto EventScript_16AAF9 goto CeruleanCity_Gym_EventScript_GiveTM03
end end
EventScript_16AAF9:: @ 816AAF9 CeruleanCity_Gym_EventScript_GiveTM03:: @ 816AAF9
msgbox gUnknown_81922F7 msgbox CeruleanCity_Gym_Text_ExplainCascadeBadge
checkitemspace ITEM_TM03, 1 checkitemspace ITEM_TM03, 1
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq EventScript_16AB3A goto_if_eq CeruleanCity_Gym_EventScript_NoRoomForTM03
giveitem_msg gUnknown_81923F1, ITEM_TM03 giveitem_msg CeruleanCity_Gym_Text_ReceivedTM03FromMisty, ITEM_TM03
setflag FLAG_GOT_TM03_FROM_MISTY setflag FLAG_GOT_TM03_FROM_MISTY
msgbox gUnknown_81922BF msgbox CeruleanCity_Gym_Text_ExplainTM03
release release
end end
EventScript_16AB3A:: @ 816AB3A CeruleanCity_Gym_EventScript_NoRoomForTM03:: @ 816AB3A
msgbox gUnknown_819240E msgbox CeruleanCity_Gym_Text_BetterMakeRoomForThis
release release
end end
CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 CeruleanCity_Gym_EventScript_Diana:: @ 816AB44
trainerbattle_single TRAINER_PICNICKER_DIANA, Text_192481, Text_1924D0 trainerbattle_single TRAINER_PICNICKER_DIANA, CeruleanCity_Gym_Text_DianaIntro, CeruleanCity_Gym_Text_DianaDefeat
msgbox gUnknown_81924E4, MSGBOX_AUTOCLOSE msgbox CeruleanCity_Gym_Text_DianaPostBattle, MSGBOX_AUTOCLOSE
end end
CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B CeruleanCity_Gym_EventScript_Luis:: @ 816AB5B
trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, Text_192524, Text_192547 trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, CeruleanCity_Gym_Text_LuisIntro, CeruleanCity_Gym_Text_LuisDefeat
famechecker FAMECHECKER_MISTY, 2 famechecker FAMECHECKER_MISTY, 2
msgbox gUnknown_8192556, MSGBOX_AUTOCLOSE msgbox CeruleanCity_Gym_Text_LuisPostBattle, MSGBOX_AUTOCLOSE
end end
CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F CeruleanCity_Gym_EventScript_GymGuy:: @ 816AB7F
lock lock
faceplayer faceplayer
goto_if_set FLAG_DEFEATED_MISTY, EventScript_16AB94 goto_if_set FLAG_DEFEATED_MISTY, CeruleanCity_Gym_EventScript_GymGuyPostVictory
msgbox gUnknown_81925AC msgbox CeruleanCity_Gym_Text_GymGuyAdvice
release release
end end
EventScript_16AB94:: @ 816AB94 CeruleanCity_Gym_EventScript_GymGuyPostVictory:: @ 816AB94
msgbox gUnknown_8192688 msgbox CeruleanCity_Gym_Text_WeMakePrettyGoodTeam
release release
end end
CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E CeruleanCity_Gym_EventScript_GymStatue:: @ 816AB9E
lockall lockall
goto_if_set FLAG_BADGE02_GET, EventScript_16ABB2 goto_if_set FLAG_BADGE02_GET, CeruleanCity_Gym_EventScript_GymStatuePostVictory
msgbox gUnknown_81926E1 msgbox CeruleanCity_Gym_Text_GymStatue
releaseall releaseall
end end
EventScript_16ABB2:: @ 816ABB2 CeruleanCity_Gym_EventScript_GymStatuePostVictory:: @ 816ABB2
msgbox gUnknown_8192719 msgbox CeruleanCity_Gym_Text_GymStatuePlayerWon
releaseall releaseall
end end
data/maps/CeruleanCity_Gym/text.inc
+16 -16
View File
@@ -1,4 +1,4 @@
Text_1921EF:: @ 81921EF CeruleanCity_Gym_Text_MistyIntro:: @ 81921EF
.string "Hi, you're a new face!\p" .string "Hi, you're a new face!\p"
.string "Only those TRAINERS who have a\n" .string "Only those TRAINERS who have a\n"
.string "policy about POKéMON can turn pro.\p" .string "policy about POKéMON can turn pro.\p"
@@ -7,11 +7,11 @@ Text_1921EF:: @ 81921EF
.string "My policy is an all-out offensive\n" .string "My policy is an all-out offensive\n"
.string "with WATER-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$" .string "with WATER-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$"
gUnknown_81922BF:: @ 81922BF CeruleanCity_Gym_Text_ExplainTM03:: @ 81922BF
.string "TM03 teaches WATER PULSE.\p" .string "TM03 teaches WATER PULSE.\p"
.string "Use it on an aquatic POKéMON!$" .string "Use it on an aquatic POKéMON!$"
gUnknown_81922F7:: @ 81922F7 CeruleanCity_Gym_Text_ExplainCascadeBadge:: @ 81922F7
.string "The CASCADEBADGE makes all\n" .string "The CASCADEBADGE makes all\n"
.string "POKéMON up to Lv. 30 obey.\p" .string "POKéMON up to Lv. 30 obey.\p"
.string "That includes even outsiders you\n" .string "That includes even outsiders you\n"
@@ -22,46 +22,46 @@ gUnknown_81922F7:: @ 81922F7
.string "open new pathways.\p" .string "open new pathways.\p"
.string "You can also have my favorite TM.$" .string "You can also have my favorite TM.$"
gUnknown_81923F1:: @ 81923F1 CeruleanCity_Gym_Text_ReceivedTM03FromMisty:: @ 81923F1
.string "{PLAYER} received TM03\n" .string "{PLAYER} received TM03\n"
.string "from MISTY.$" .string "from MISTY.$"
gUnknown_819240E:: @ 819240E CeruleanCity_Gym_Text_BetterMakeRoomForThis:: @ 819240E
.string "You better make room for this!$" .string "You better make room for this!$"
Text_19242D:: @ 819242D CeruleanCity_Gym_Text_MistyDefeat:: @ 819242D
.string "Wow!\n" .string "Wow!\n"
.string "You're too much!\p" .string "You're too much!\p"
.string "All right!\p" .string "All right!\p"
.string "You can have the CASCADEBADGE to\n" .string "You can have the CASCADEBADGE to\n"
.string "show you beat me.$" .string "show you beat me.$"
Text_192481:: @ 8192481 CeruleanCity_Gym_Text_DianaIntro:: @ 8192481
.string "What? You?\n" .string "What? You?\n"
.string "I'm more than good enough for you!\p" .string "I'm more than good enough for you!\p"
.string "MISTY won't have to be bothered.$" .string "MISTY won't have to be bothered.$"
Text_1924D0:: @ 81924D0 CeruleanCity_Gym_Text_DianaDefeat:: @ 81924D0
.string "You overwhelmed me!$" .string "You overwhelmed me!$"
gUnknown_81924E4:: @ 81924E4 CeruleanCity_Gym_Text_DianaPostBattle:: @ 81924E4
.string "You have to face other TRAINERS\n" .string "You have to face other TRAINERS\n"
.string "to see how good you really are.$" .string "to see how good you really are.$"
Text_192524:: @ 8192524 CeruleanCity_Gym_Text_LuisIntro:: @ 8192524
.string "Splash!\p" .string "Splash!\p"
.string "I'm first up!\n" .string "I'm first up!\n"
.string "Let's do it!$" .string "Let's do it!$"
Text_192547:: @ 8192547 CeruleanCity_Gym_Text_LuisDefeat:: @ 8192547
.string "That can't be!$" .string "That can't be!$"
gUnknown_8192556:: @ 8192556 CeruleanCity_Gym_Text_LuisPostBattle:: @ 8192556
.string "MISTY is a TRAINER who's going to\n" .string "MISTY is a TRAINER who's going to\n"
.string "keep improving.\p" .string "keep improving.\p"
.string "She won't lose to someone like you!$" .string "She won't lose to someone like you!$"
gUnknown_81925AC:: @ 81925AC CeruleanCity_Gym_Text_GymGuyAdvice:: @ 81925AC
.string "Yo!\n" .string "Yo!\n"
.string "Champ in the making!\p" .string "Champ in the making!\p"
.string "Let me give you some advice!\p" .string "Let me give you some advice!\p"
@@ -72,19 +72,19 @@ gUnknown_81925AC:: @ 81925AC
.string "Or, you might use ELECTRIC-type\n" .string "Or, you might use ELECTRIC-type\n"
.string "POKéMON and zap them!$" .string "POKéMON and zap them!$"
gUnknown_8192688:: @ 8192688 CeruleanCity_Gym_Text_WeMakePrettyGoodTeam:: @ 8192688
.string "You beat MISTY!\n" .string "You beat MISTY!\n"
.string "See, what'd I tell ya?\p" .string "See, what'd I tell ya?\p"
.string "You and me, kid, we make a pretty\n" .string "You and me, kid, we make a pretty\n"
.string "darn-good team!$" .string "darn-good team!$"
gUnknown_81926E1:: @ 81926E1 CeruleanCity_Gym_Text_GymStatue:: @ 81926E1
.string "CERULEAN POKéMON GYM\n" .string "CERULEAN POKéMON GYM\n"
.string "LEADER: MISTY\p" .string "LEADER: MISTY\p"
.string "WINNING TRAINERS:\n" .string "WINNING TRAINERS:\n"
.string "{RIVAL}$" .string "{RIVAL}$"
gUnknown_8192719:: @ 8192719 CeruleanCity_Gym_Text_GymStatuePlayerWon:: @ 8192719
.string "CERULEAN POKéMON GYM\n" .string "CERULEAN POKéMON GYM\n"
.string "LEADER: MISTY\p" .string "LEADER: MISTY\p"
.string "WINNING TRAINERS:\n" .string "WINNING TRAINERS:\n"
data/maps/CeruleanCity_House1/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_House1_EventScript_16A7F0", "script": "CeruleanCity_House1_EventScript_BadgeGuy",
"flag": "0" "flag": "0"
} }
], ],
data/maps/CeruleanCity_House1/scripts.inc
+52 -56
View File
@@ -1,91 +1,87 @@
CeruleanCity_House1_MapScripts:: @ 816A7EF CeruleanCity_House1_MapScripts:: @ 816A7EF
.byte 0 .byte 0
CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0 CeruleanCity_House1_EventScript_BadgeGuy:: @ 816A7F0
lock lock
faceplayer faceplayer
msgbox gUnknown_81918E7 msgbox CeruleanCity_House1_Text_BadgesHaveAmazingSecrets
message Text_191967 message CeruleanCity_House1_Text_DescribeWhichBadge
waitmessage waitmessage
setvar VAR_0x8004, 0 setvar VAR_0x8004, LISTMENU_BADGES
special Special_ListMenu special Special_ListMenu
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16A8FB case 0, CeruleanCity_House1_EventScript_DescribeBoulderBadge
case 1, EventScript_16A909 case 1, CeruleanCity_House1_EventScript_DescribeCascadeBadge
case 2, EventScript_16A917 case 2, CeruleanCity_House1_EventScript_DescribeThunderBadge
case 3, EventScript_16A925 case 3, CeruleanCity_House1_EventScript_DescribeRainbowBadge
case 4, EventScript_16A933 case 4, CeruleanCity_House1_EventScript_DescribeSoulBadge
case 5, EventScript_16A941 case 5, CeruleanCity_House1_EventScript_DescribeMarshBadge
case 6, EventScript_16A94F case 6, CeruleanCity_House1_EventScript_DescribeVolcanoBadge
case 7, EventScript_16A95D case 7, CeruleanCity_House1_EventScript_DescribeEarthBadge
case 8, EventScript_16A96B case 8, CeruleanCity_House1_EventScript_StopDescribingBadges
case 127, EventScript_16A96B case 127, CeruleanCity_House1_EventScript_StopDescribingBadges
end end
EventScript_16A87D:: @ 816A87D CeruleanCity_House1_EventScript_DescribeAnotherBadge:: @ 816A87D
message Text_191967 message CeruleanCity_House1_Text_DescribeWhichBadge
waitmessage waitmessage
special Special_ReturnToListMenu special Special_ReturnToListMenu
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16A8FB case 0, CeruleanCity_House1_EventScript_DescribeBoulderBadge
case 1, EventScript_16A909 case 1, CeruleanCity_House1_EventScript_DescribeCascadeBadge
case 2, EventScript_16A917 case 2, CeruleanCity_House1_EventScript_DescribeThunderBadge
case 3, EventScript_16A925 case 3, CeruleanCity_House1_EventScript_DescribeRainbowBadge
case 4, EventScript_16A933 case 4, CeruleanCity_House1_EventScript_DescribeSoulBadge
case 5, EventScript_16A941 case 5, CeruleanCity_House1_EventScript_DescribeMarshBadge
case 6, EventScript_16A94F case 6, CeruleanCity_House1_EventScript_DescribeVolcanoBadge
case 7, EventScript_16A95D case 7, CeruleanCity_House1_EventScript_DescribeEarthBadge
case 8, EventScript_16A96B case 8, CeruleanCity_House1_EventScript_StopDescribingBadges
case 127, EventScript_16A96B case 127, CeruleanCity_House1_EventScript_StopDescribingBadges
end end
EventScript_16A8FB:: @ 816A8FB CeruleanCity_House1_EventScript_DescribeBoulderBadge:: @ 816A8FB
msgbox gUnknown_81919BE msgbox CeruleanCity_House1_Text_AttackStatFlash
goto EventScript_16A87D goto CeruleanCity_House1_EventScript_DescribeAnotherBadge
end end
EventScript_16A909:: @ 816A909 CeruleanCity_House1_EventScript_DescribeCascadeBadge:: @ 816A909
msgbox gUnknown_8191A31 msgbox CeruleanCity_House1_Text_ObeyLv30Cut
goto EventScript_16A87D goto CeruleanCity_House1_EventScript_DescribeAnotherBadge
end end
EventScript_16A917:: @ 816A917 CeruleanCity_House1_EventScript_DescribeThunderBadge:: @ 816A917
msgbox gUnknown_8191AF9 msgbox CeruleanCity_House1_Text_SpeedStatFly
goto EventScript_16A87D goto CeruleanCity_House1_EventScript_DescribeAnotherBadge
end end
EventScript_16A925:: @ 816A925 CeruleanCity_House1_EventScript_DescribeRainbowBadge:: @ 816A925
msgbox gUnknown_8191B69 msgbox CeruleanCity_House1_Text_ObeyLv50Strength
goto EventScript_16A87D goto CeruleanCity_House1_EventScript_DescribeAnotherBadge
end end
EventScript_16A933:: @ 816A933 CeruleanCity_House1_EventScript_DescribeSoulBadge:: @ 816A933
msgbox gUnknown_8191C36 msgbox CeruleanCity_House1_Text_DefenseStatSurf
goto EventScript_16A87D goto CeruleanCity_House1_EventScript_DescribeAnotherBadge
end end
EventScript_16A941:: @ 816A941 CeruleanCity_House1_EventScript_DescribeMarshBadge:: @ 816A941
msgbox gUnknown_8191CA9 msgbox CeruleanCity_House1_Text_ObeyLv70RockSmash
goto EventScript_16A87D goto CeruleanCity_House1_EventScript_DescribeAnotherBadge
end end
EventScript_16A94F:: @ 816A94F CeruleanCity_House1_EventScript_DescribeVolcanoBadge:: @ 816A94F
msgbox gUnknown_8191D78 msgbox CeruleanCity_House1_Text_SpStatsWaterfall
goto EventScript_16A87D goto CeruleanCity_House1_EventScript_DescribeAnotherBadge
EventScript_16A95C:: @ 816A95C
end end
EventScript_16A95D:: @ 816A95D CeruleanCity_House1_EventScript_DescribeEarthBadge:: @ 816A95D
msgbox gUnknown_8191DF8 msgbox CeruleanCity_House1_Text_AllMonsWillObeyYou
goto EventScript_16A87D goto CeruleanCity_House1_EventScript_DescribeAnotherBadge
EventScript_16A96A:: @ 816A96A
end end
EventScript_16A96B:: @ 816A96B CeruleanCity_House1_EventScript_StopDescribingBadges:: @ 816A96B
msgbox gUnknown_819199E msgbox CeruleanCity_House1_Text_ComeVisitAnytime
release release
end end
data/maps/CeruleanCity_House1/text.inc
+11 -11
View File
@@ -1,25 +1,25 @@
gUnknown_81918E7:: @ 81918E7 CeruleanCity_House1_Text_BadgesHaveAmazingSecrets:: @ 81918E7
.string "Only skilled TRAINERS can collect\n" .string "Only skilled TRAINERS can collect\n"
.string "POKéMON BADGES.\p" .string "POKéMON BADGES.\p"
.string "I see you have at least one.\p" .string "I see you have at least one.\p"
.string "Those BADGES have amazing secrets,\n" .string "Those BADGES have amazing secrets,\n"
.string "did you know?$" .string "did you know?$"
Text_191967:: @ 8191967 CeruleanCity_House1_Text_DescribeWhichBadge:: @ 8191967
.string "Now then…\p" .string "Now then…\p"
.string "Which of the eight BADGES should\n" .string "Which of the eight BADGES should\n"
.string "I describe?$" .string "I describe?$"
gUnknown_819199E:: @ 819199E CeruleanCity_House1_Text_ComeVisitAnytime:: @ 819199E
.string "Come visit me anytime you wish.$" .string "Come visit me anytime you wish.$"
gUnknown_81919BE:: @ 81919BE CeruleanCity_House1_Text_AttackStatFlash:: @ 81919BE
.string "The ATTACK stat of all your\n" .string "The ATTACK stat of all your\n"
.string "POKéMON increases a little bit.\p" .string "POKéMON increases a little bit.\p"
.string "It also lets you use the move\n" .string "It also lets you use the move\n"
.string "FLASH outside of battle.$" .string "FLASH outside of battle.$"
gUnknown_8191A31:: @ 8191A31 CeruleanCity_House1_Text_ObeyLv30Cut:: @ 8191A31
.string "POKéMON up to Lv. 30 will obey\n" .string "POKéMON up to Lv. 30 will obey\n"
.string "you.\p" .string "you.\p"
.string "That includes even outsiders you\n" .string "That includes even outsiders you\n"
@@ -29,13 +29,13 @@ gUnknown_8191A31:: @ 8191A31
.string "It also lets you use the move\n" .string "It also lets you use the move\n"
.string "CUT outside of battle.$" .string "CUT outside of battle.$"
gUnknown_8191AF9:: @ 8191AF9 CeruleanCity_House1_Text_SpeedStatFly:: @ 8191AF9
.string "The SPEED stat of all your\n" .string "The SPEED stat of all your\n"
.string "POKéMON increases a little bit.\p" .string "POKéMON increases a little bit.\p"
.string "It also lets you use the move\n" .string "It also lets you use the move\n"
.string "FLY outside of battle.$" .string "FLY outside of battle.$"
gUnknown_8191B69:: @ 8191B69 CeruleanCity_House1_Text_ObeyLv50Strength:: @ 8191B69
.string "POKéMON up to Lv. 50 will obey\n" .string "POKéMON up to Lv. 50 will obey\n"
.string "you.\p" .string "you.\p"
.string "That includes even outsiders you\n" .string "That includes even outsiders you\n"
@@ -45,13 +45,13 @@ gUnknown_8191B69:: @ 8191B69
.string "It also lets you use the move\n" .string "It also lets you use the move\n"
.string "STRENGTH outside of battle.$" .string "STRENGTH outside of battle.$"
gUnknown_8191C36:: @ 8191C36 CeruleanCity_House1_Text_DefenseStatSurf:: @ 8191C36
.string "The DEFENSE stat of all your\n" .string "The DEFENSE stat of all your\n"
.string "POKéMON increases a little bit.\p" .string "POKéMON increases a little bit.\p"
.string "It also lets you use the move\n" .string "It also lets you use the move\n"
.string "SURF outside of battle.$" .string "SURF outside of battle.$"
gUnknown_8191CA9:: @ 8191CA9 CeruleanCity_House1_Text_ObeyLv70RockSmash:: @ 8191CA9
.string "POKéMON up to Lv. 70 will obey\n" .string "POKéMON up to Lv. 70 will obey\n"
.string "you.\p" .string "you.\p"
.string "That includes even outsiders you\n" .string "That includes even outsiders you\n"
@@ -61,12 +61,12 @@ gUnknown_8191CA9:: @ 8191CA9
.string "It also lets you use the move\n" .string "It also lets you use the move\n"
.string "ROCK SMASH outside of battle.$" .string "ROCK SMASH outside of battle.$"
gUnknown_8191D78:: @ 8191D78 CeruleanCity_House1_Text_SpStatsWaterfall:: @ 8191D78
.string "The SP. ATK and SP. DEF stats of\n" .string "The SP. ATK and SP. DEF stats of\n"
.string "all your POKéMON rise a little bit.\p" .string "all your POKéMON rise a little bit.\p"
.string "It also lets you use the move\n" .string "It also lets you use the move\n"
.string "WATERFALL outside of battle.$" .string "WATERFALL outside of battle.$"
gUnknown_8191DF8:: @ 8191DF8 CeruleanCity_House1_Text_AllMonsWillObeyYou:: @ 8191DF8
.string "All POKéMON will obey you!$" .string "All POKéMON will obey you!$"
data/maps/CeruleanCity_House2/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_House2_EventScript_16A976", "script": "CeruleanCity_House2_EventScript_Hiker",
"flag": "0" "flag": "0"
}, },
{ {
@@ -36,7 +36,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_House2_EventScript_16A995", "script": "CeruleanCity_House2_EventScript_Lass",
"flag": "0" "flag": "0"
} }
], ],
@@ -77,7 +77,7 @@
"x": 4, "x": 4,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_House2_EventScript_16A99E" "script": "CeruleanCity_House2_EventScript_WallHole"
} }
] ]
} }
data/maps/CeruleanCity_House2/scripts.inc
+9 -9
View File
@@ -1,23 +1,23 @@
CeruleanCity_House2_MapScripts:: @ 816A975 CeruleanCity_House2_MapScripts:: @ 816A975
.byte 0 .byte 0
CeruleanCity_House2_EventScript_16A976:: @ 816A976 CeruleanCity_House2_EventScript_Hiker:: @ 816A976
lock lock
faceplayer faceplayer
goto_if_set FLAG_GOT_TM28_FROM_ROCKET, EventScript_16A98B goto_if_set FLAG_GOT_TM28_FROM_ROCKET, CeruleanCity_House2_EventScript_HikerGotTM28
msgbox gUnknown_8191E13 msgbox CeruleanCity_House2_Text_RocketsStoleTMForDig
release release
end end
EventScript_16A98B:: @ 816A98B CeruleanCity_House2_EventScript_HikerGotTM28:: @ 816A98B
msgbox gUnknown_8191ED8 msgbox CeruleanCity_House2_Text_TeachDiglettDigWithoutTM
release release
end end
CeruleanCity_House2_EventScript_16A995:: @ 816A995 CeruleanCity_House2_EventScript_Lass:: @ 816A995
msgbox gUnknown_8191F2A, MSGBOX_NPC msgbox CeruleanCity_House2_Text_TeamRocketTryingToDigIntoNoGood, MSGBOX_NPC
end end
CeruleanCity_House2_EventScript_16A99E:: @ 816A99E CeruleanCity_House2_EventScript_WallHole:: @ 816A99E
msgbox gUnknown_8191F64, MSGBOX_SIGN msgbox CeruleanCity_House2_Text_TeamRocketLeftWayOut, MSGBOX_SIGN
end end
data/maps/CeruleanCity_House2/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
gUnknown_8191E13:: @ 8191E13 CeruleanCity_House2_Text_RocketsStoleTMForDig:: @ 8191E13
.string "Those miserable ROCKETS!\p" .string "Those miserable ROCKETS!\p"
.string "Look what they've done to my\n" .string "Look what they've done to my\n"
.string "house!\p" .string "house!\p"
@@ -8,15 +8,15 @@ gUnknown_8191E13:: @ 8191E13
.string "MANKEY or a SANDSHREW…\p" .string "MANKEY or a SANDSHREW…\p"
.string "That cost me a bundle, it did!$" .string "That cost me a bundle, it did!$"
gUnknown_8191ED8:: @ 8191ED8 CeruleanCity_House2_Text_TeachDiglettDigWithoutTM:: @ 8191ED8
.string "I figure what's lost is lost.\p" .string "I figure what's lost is lost.\p"
.string "I decided to teach DIGLETT how to\n" .string "I decided to teach DIGLETT how to\n"
.string "DIG without a TM.$" .string "DIG without a TM.$"
gUnknown_8191F2A:: @ 8191F2A CeruleanCity_House2_Text_TeamRocketTryingToDigIntoNoGood:: @ 8191F2A
.string "TEAM ROCKET must be trying to DIG\n" .string "TEAM ROCKET must be trying to DIG\n"
.string "their way into no good!$" .string "their way into no good!$"
gUnknown_8191F64:: @ 8191F64 CeruleanCity_House2_Text_TeamRocketLeftWayOut:: @ 8191F64
.string "TEAM ROCKET left a way out!$" .string "TEAM ROCKET left a way out!$"
data/maps/CeruleanCity_House3/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_House3_EventScript_16A9B1", "script": "CeruleanCity_House3_EventScript_Dontae",
"flag": "0" "flag": "0"
}, },
{ {
@@ -36,7 +36,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_House3_EventScript_16A9A8", "script": "CeruleanCity_House3_EventScript_OldWoman",
"flag": "0" "flag": "0"
} }
], ],
data/maps/CeruleanCity_House3/scripts.inc
+21 -21
View File
@@ -1,43 +1,43 @@
CeruleanCity_House3_MapScripts:: @ 816A9A7 CeruleanCity_House3_MapScripts:: @ 816A9A7
.byte 0 .byte 0
CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8 CeruleanCity_House3_EventScript_OldWoman:: @ 816A9A8
msgbox gUnknown_8191F80, MSGBOX_NPC msgbox CeruleanCity_House3_Text_PleaseTradeWithMyHusband, MSGBOX_NPC
end end
CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 CeruleanCity_House3_EventScript_Dontae:: @ 816A9B1
lock lock
faceplayer faceplayer
setvar VAR_0x8008, 1 setvar VAR_0x8008, INGAME_TRADE_JYNX
call EventScript_1A8CAD call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_ZYNX_TRADE, EventScript_16AA23 goto_if_set FLAG_DID_ZYNX_TRADE, CeruleanCity_House3_EventScript_AlreadyTraded
msgbox gUnknown_81A59FE, MSGBOX_YESNO msgbox Trade_Text_DoYouHaveMonWouldYouTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq EventScript_16AA0B goto_if_eq CeruleanCity_House3_EventScript_DeclineTrade
call EventScript_1A8CBD call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, 6 compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16AA0B goto_if_ge CeruleanCity_House3_EventScript_DeclineTrade
call EventScript_1A8CC9 call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16AA15 goto_if_ne CeruleanCity_House3_EventScript_NotRequestedMon
call EventScript_1A8CD9 call EventScript_DoInGameTrade
msgbox gUnknown_81A5A9D msgbox Trade_Text_Thanks
setflag FLAG_DID_ZYNX_TRADE setflag FLAG_DID_ZYNX_TRADE
release release
end end
EventScript_16AA0B:: @ 816AA0B CeruleanCity_House3_EventScript_DeclineTrade:: @ 816AA0B
msgbox gUnknown_81A5A4E msgbox Trade_Text_WellIfYouDontWantTo
release release
end end
EventScript_16AA15:: @ 816AA15 CeruleanCity_House3_EventScript_NotRequestedMon:: @ 816AA15
getspeciesname 0, VAR_0x8009 getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A5A6A msgbox Trade_Text_ThisIsntMon
release release
end end
EventScript_16AA23:: @ 816AA23 CeruleanCity_House3_EventScript_AlreadyTraded:: @ 816AA23
msgbox gUnknown_81A5AA5 msgbox Trade_Text_HasTradedMonGrownStronger
release release
end end
data/maps/CeruleanCity_House3/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_8191F80:: @ 8191F80 CeruleanCity_House3_Text_PleaseTradeWithMyHusband:: @ 8191F80
.string "My husband likes trading POKéMON.\p" .string "My husband likes trading POKéMON.\p"
.string "You're collecting POKéMON for your\n" .string "You're collecting POKéMON for your\n"
.string "POKéDEX, aren't you?\p" .string "POKéDEX, aren't you?\p"
data/maps/CeruleanCity_House4/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_House4_EventScript_16ACEF", "script": "CeruleanCity_House4_EventScript_WonderNewsBerryMan",
"flag": "0" "flag": "0"
} }
], ],
data/maps/CeruleanCity_House4/scripts.inc
+37 -37
View File
@@ -1,7 +1,7 @@
CeruleanCity_House4_MapScripts:: @ 816ACEE CeruleanCity_House4_MapScripts:: @ 816ACEE
.byte 0 .byte 0
CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF
special sub_8110AB4 special sub_8110AB4
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0 goto_if_eq EventScript_1A7AE0
@@ -10,77 +10,77 @@ CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF
specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8004, 0 compare VAR_0x8004, 0
goto_if_eq EventScript_CeruleanCity_House4_NoNews goto_if_eq CeruleanCity_House4_EventScript_NoNews
compare VAR_0x8004, 1 compare VAR_0x8004, 1
goto_if_eq EventScript_CeruleanCity_House4_News1 goto_if_eq CeruleanCity_House4_EventScript_News1
compare VAR_0x8004, 2 compare VAR_0x8004, 2
goto_if_eq EventScript_CeruleanCity_House4_News2 goto_if_eq CeruleanCity_House4_EventScript_News2
compare VAR_0x8004, 3 compare VAR_0x8004, 3
goto_if_eq EventScript_CeruleanCity_House4_NewsNotSpread goto_if_eq CeruleanCity_House4_EventScript_NewsNotSpread
compare VAR_0x8004, 4 compare VAR_0x8004, 4
goto_if_eq EventScript_CeruleanCity_House4_NewsSpread1 goto_if_eq CeruleanCity_House4_EventScript_NewsSpread1
compare VAR_0x8004, 5 compare VAR_0x8004, 5
goto_if_eq EventScript_CeruleanCity_House4_NewsSpread2 goto_if_eq CeruleanCity_House4_EventScript_NewsSpread2
compare VAR_0x8004, 6 compare VAR_0x8004, 6
goto_if_eq EventScript_CeruleanCity_House4_NewsDone goto_if_eq CeruleanCity_House4_EventScript_NewsDone
end end
EventScript_CeruleanCity_House4_NoNews:: @ 816AD59 CeruleanCity_House4_EventScript_NoNews:: @ 816AD59
msgbox gUnknown_8192AF0 msgbox CeruleanCity_House4_Text_NothingEntertaining
release release
end end
EventScript_CeruleanCity_House4_News1:: @ 816AD63 CeruleanCity_House4_EventScript_News1:: @ 816AD63
call EventScript_CeruleanCity_House4_MovementReactionToNews call CeruleanCity_House4_EventScript_MovementReactionToNews
msgbox gUnknown_8192B43 msgbox CeruleanCity_House4_Text_NewNewsInformativeHaveThis
giveitem VAR_0x8008 giveitem VAR_0x8008
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq EventScript_16AE45 goto_if_eq CeruleanCity_House4_EventScript_NoRoomForBerries
release release
end end
EventScript_CeruleanCity_House4_News2:: @ 816AD89 CeruleanCity_House4_EventScript_News2:: @ 816AD89
call EventScript_CeruleanCity_House4_MovementReactionToNews call CeruleanCity_House4_EventScript_MovementReactionToNews
msgbox gUnknown_8192C07 msgbox CeruleanCity_House4_Text_IncredibleNewsHaveBerries
giveitem VAR_0x8008, 4 giveitem VAR_0x8008, 4
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq EventScript_16AE45 goto_if_eq CeruleanCity_House4_EventScript_NoRoomForBerries
release release
end end
EventScript_CeruleanCity_House4_NewsNotSpread:: @ 816ADAF CeruleanCity_House4_EventScript_NewsNotSpread:: @ 816ADAF
applymovement 1, Movement_FacePlayer applymovement 1, Movement_FacePlayer
waitmovement 0 waitmovement 0
msgbox gUnknown_8192CD5 msgbox CeruleanCity_House4_Text_WishCouldShareNewsWithOthers
release release
end end
EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3 CeruleanCity_House4_EventScript_NewsSpread1:: @ 816ADC3
call EventScript_CeruleanCity_House4_MovementReactionToNews call CeruleanCity_House4_EventScript_MovementReactionToNews
msgbox gUnknown_8192D4B msgbox CeruleanCity_House4_Text_ThanksForSpreadingNewsTakeThis
giveitem VAR_0x8008 giveitem VAR_0x8008
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq EventScript_16AE45 goto_if_eq CeruleanCity_House4_EventScript_NoRoomForBerries
release release
end end
EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9 CeruleanCity_House4_EventScript_NewsSpread2:: @ 816ADE9
call EventScript_CeruleanCity_House4_MovementReactionToNews call CeruleanCity_House4_EventScript_MovementReactionToNews
msgbox gUnknown_8192DE3 msgbox CeruleanCity_House4_Text_MagnificentNewsSpreadHaveBerries
giveitem VAR_0x8008, 4 giveitem VAR_0x8008, 4
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq EventScript_16AE45 goto_if_eq CeruleanCity_House4_EventScript_NoRoomForBerries
release release
end end
EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F CeruleanCity_House4_EventScript_NewsDone:: @ 816AE0F
applymovement 1, Movement_FacePlayer applymovement 1, Movement_FacePlayer
waitmovement 0 waitmovement 0
msgbox gUnknown_8192EC5 msgbox CeruleanCity_House4_Text_EnjoyingMyselfWithAllSortsOfNews
release release
end end
EventScript_CeruleanCity_House4_MovementReactionToNews:: @ 816AE23 CeruleanCity_House4_EventScript_MovementReactionToNews:: @ 816AE23
playse SE_PIN playse SE_PIN
applymovement 1, Movement_ExclamationMark applymovement 1, Movement_ExclamationMark
waitmovement 0 waitmovement 0
@@ -90,7 +90,7 @@ EventScript_CeruleanCity_House4_MovementReactionToNews:: @ 816AE23
waitmovement 0 waitmovement 0
return return
EventScript_16AE45:: @ 816AE45 CeruleanCity_House4_EventScript_NoRoomForBerries:: @ 816AE45
msgbox gUnknown_8192F2A msgbox CeruleanCity_House4_Text_YourBerryPouchIsFull
release release
end end
data/maps/CeruleanCity_House4/text.inc
+8 -8
View File
@@ -1,10 +1,10 @@
gUnknown_8192AF0:: @ 8192AF0 CeruleanCity_House4_Text_NothingEntertaining:: @ 8192AF0
.string "Sigh…\n" .string "Sigh…\n"
.string "Too much time, too little to do…\p" .string "Too much time, too little to do…\p"
.string "Is nothing entertaining happening\n" .string "Is nothing entertaining happening\n"
.string "anywhere?$" .string "anywhere?$"
gUnknown_8192B43:: @ 8192B43 CeruleanCity_House4_Text_NewNewsInformativeHaveThis:: @ 8192B43
.string "Ah!\n" .string "Ah!\n"
.string "A new news report!\p" .string "A new news report!\p"
.string "Hmm…\p" .string "Hmm…\p"
@@ -15,7 +15,7 @@ gUnknown_8192B43:: @ 8192B43
.string "As my thanks for sharing the news\n" .string "As my thanks for sharing the news\n"
.string "with me, I want you to have this.$" .string "with me, I want you to have this.$"
gUnknown_8192C07:: @ 8192C07 CeruleanCity_House4_Text_IncredibleNewsHaveBerries:: @ 8192C07
.string "Oh, oh!\n" .string "Oh, oh!\n"
.string "Th-this news report!\p" .string "Th-this news report!\p"
.string "Hmm…\p" .string "Hmm…\p"
@@ -26,20 +26,20 @@ gUnknown_8192C07:: @ 8192C07
.string "Thanks for sharing this fantastic\n" .string "Thanks for sharing this fantastic\n"
.string "news. Have a bunch of BERRIES!$" .string "news. Have a bunch of BERRIES!$"
gUnknown_8192CD5:: @ 8192CD5 CeruleanCity_House4_Text_WishCouldShareNewsWithOthers:: @ 8192CD5
.string "It seems such a shame to not share\n" .string "It seems such a shame to not share\n"
.string "this news with other folks…\p" .string "this news with other folks…\p"
.string "I wish I could tell someone…\n" .string "I wish I could tell someone…\n"
.string "Let others know the news…$" .string "Let others know the news…$"
gUnknown_8192D4B:: @ 8192D4B CeruleanCity_House4_Text_ThanksForSpreadingNewsTakeThis:: @ 8192D4B
.string "Ah, you've spread the news for me?\p" .string "Ah, you've spread the news for me?\p"
.string "Good news becomes worthwhile when\n" .string "Good news becomes worthwhile when\n"
.string "all sorts of people share it.\p" .string "all sorts of people share it.\p"
.string "As my thanks for your spreading\n" .string "As my thanks for your spreading\n"
.string "the news, take this!$" .string "the news, take this!$"
gUnknown_8192DE3:: @ 8192DE3 CeruleanCity_House4_Text_MagnificentNewsSpreadHaveBerries:: @ 8192DE3
.string "You've spread the news some more?\n" .string "You've spread the news some more?\n"
.string "Magnificent!\p" .string "Magnificent!\p"
.string "That piece of news must be\n" .string "That piece of news must be\n"
@@ -50,13 +50,13 @@ gUnknown_8192DE3:: @ 8192DE3
.string "I'll give you more BERRIES than\n" .string "I'll give you more BERRIES than\n"
.string "I usually do.$" .string "I usually do.$"
gUnknown_8192EC5:: @ 8192EC5 CeruleanCity_House4_Text_EnjoyingMyselfWithAllSortsOfNews:: @ 8192EC5
.string "I'm quite enjoying myself with all\n" .string "I'm quite enjoying myself with all\n"
.string "sorts of news.\p" .string "sorts of news.\p"
.string "Yes, I am satisfied!\n" .string "Yes, I am satisfied!\n"
.string "I won't be bored for a while.$" .string "I won't be bored for a while.$"
gUnknown_8192F2A:: @ 8192F2A CeruleanCity_House4_Text_YourBerryPouchIsFull:: @ 8192F2A
.string "Hm? Your BERRY POUCH is full.\n" .string "Hm? Your BERRY POUCH is full.\n"
.string "My gift remains ungiven, then.$" .string "My gift remains ungiven, then.$"
data/maps/CeruleanCity_House5/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_House5_EventScript_16AE50", "script": "CeruleanCity_House5_EventScript_BerryPowderMan",
"flag": "0" "flag": "0"
} }
], ],
@@ -43,7 +43,7 @@
"x": 3, "x": 3,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"script": "CeruleanCity_House5_EventScript_16B0DA" "script": "CeruleanCity_House5_EventScript_BerryCrushRankings"
} }
] ]
} }
data/maps/CeruleanCity_House5/scripts.inc
+77 -77
View File
@@ -1,183 +1,183 @@
CeruleanCity_House5_MapScripts:: @ 816AE4F CeruleanCity_House5_MapScripts:: @ 816AE4F
.byte 0 .byte 0
CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 CeruleanCity_House5_EventScript_BerryPowderMan:: @ 816AE50
lock lock
faceplayer faceplayer
goto_if_set FLAG_GOT_POWDER_JAR, EventScript_16AEB7 goto_if_set FLAG_GOT_POWDER_JAR, CeruleanCity_House5_EventScript_AskToExchangePowder
msgbox gUnknown_8192F67, MSGBOX_YESNO msgbox CeruleanCity_House1_Text_AnyInterestInBerries, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq EventScript_16AEAD goto_if_eq CeruleanCity_House5_EventScript_NoInterestInBerries
goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, EventScript_16AEA3 goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, CeruleanCity_House5_EventScript_NoBerries
msgbox gUnknown_8193003 msgbox CeruleanCity_House1_Text_HaveJustTheThing
setflag FLAG_GOT_POWDER_JAR setflag FLAG_GOT_POWDER_JAR
giveitem ITEM_POWDER_JAR giveitem ITEM_POWDER_JAR
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq EventScript_BagIsFull goto_if_eq EventScript_BagIsFull
msgbox gUnknown_8193033 msgbox CeruleanCity_House1_Text_GoCrushBerriesAtDirectCorner
release release
end end
EventScript_16AEA3:: @ 816AEA3 CeruleanCity_House5_EventScript_NoBerries:: @ 816AEA3
msgbox gUnknown_819321D msgbox CeruleanCity_House1_Text_WhyMustYouLieNoBerries
release release
end end
EventScript_16AEAD:: @ 816AEAD CeruleanCity_House5_EventScript_NoInterestInBerries:: @ 816AEAD
msgbox gUnknown_819325E msgbox CeruleanCity_House1_Text_TakeInterestInAllSortsOfThings
release release
end end
EventScript_16AEB7:: @ 816AEB7 CeruleanCity_House5_EventScript_AskToExchangePowder:: @ 816AEB7
special sub_815F094 special DisplayBerryPowderVendorMenu
msgbox gUnknown_81932C5 msgbox CeruleanCity_House1_Text_HaveYouBroughtBerryPowder
goto EventScript_16AEC8 goto CeruleanCity_House5_EventScript_ChooseExchangeItem
end end
EventScript_16AEC8:: @ 816AEC8 CeruleanCity_House5_EventScript_ChooseExchangeItem:: @ 816AEC8
message Text_1932F4 message CeruleanCity_House5_Text_ExchangeWithWhat
waitmessage waitmessage
setvar VAR_0x8004, 5 setvar VAR_0x8004, LISTMENU_BERRY_POWDER
special Special_ListMenu special Special_ListMenu
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16AF6C case 0, CeruleanCity_House5_EventScript_EnergyPowder
case 1, EventScript_16AF80 case 1, CeruleanCity_House5_EventScript_EnergyRoot
case 2, EventScript_16AF94 case 2, CeruleanCity_House5_EventScript_HealPowder
case 3, EventScript_16AFA8 case 3, CeruleanCity_House5_EventScript_RevivalHerb
case 4, EventScript_16AFBC case 4, CeruleanCity_House5_EventScript_Protein
case 5, EventScript_16AFD0 case 5, CeruleanCity_House5_EventScript_Iron
case 6, EventScript_16AFE4 case 6, CeruleanCity_House5_EventScript_Carbos
case 7, EventScript_16AFF8 case 7, CeruleanCity_House5_EventScript_Calcium
case 8, EventScript_16B00C case 8, CeruleanCity_House5_EventScript_Zinc
case 9, EventScript_16B020 case 9, CeruleanCity_House5_EventScript_HPUp
case 10, EventScript_16B034 case 10, CeruleanCity_House5_EventScript_PPUp
case 11, EventScript_16B048 case 11, CeruleanCity_House5_EventScript_ExitMenu
case 127, EventScript_16B048 case 127, CeruleanCity_House5_EventScript_ExitMenu
end end
EventScript_16AF6C:: @ 816AF6C CeruleanCity_House5_EventScript_EnergyPowder:: @ 816AF6C
getitemname 0, ITEM_ENERGY_POWDER getitemname 0, ITEM_ENERGY_POWDER
setvar VAR_0x8008, ITEM_ENERGY_POWDER setvar VAR_0x8008, ITEM_ENERGY_POWDER
setvar VAR_0x8009, 50 setvar VAR_0x8009, 50
goto EventScript_16B055 goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end end
EventScript_16AF80:: @ 816AF80 CeruleanCity_House5_EventScript_EnergyRoot:: @ 816AF80
getitemname 0, ITEM_ENERGY_ROOT getitemname 0, ITEM_ENERGY_ROOT
setvar VAR_0x8008, ITEM_ENERGY_ROOT setvar VAR_0x8008, ITEM_ENERGY_ROOT
setvar VAR_0x8009, 80 setvar VAR_0x8009, 80
goto EventScript_16B055 goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end end
EventScript_16AF94:: @ 816AF94 CeruleanCity_House5_EventScript_HealPowder:: @ 816AF94
getitemname 0, ITEM_HEAL_POWDER getitemname 0, ITEM_HEAL_POWDER
setvar VAR_0x8008, ITEM_HEAL_POWDER setvar VAR_0x8008, ITEM_HEAL_POWDER
setvar VAR_0x8009, 50 setvar VAR_0x8009, 50
goto EventScript_16B055 goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end end
EventScript_16AFA8:: @ 816AFA8 CeruleanCity_House5_EventScript_RevivalHerb:: @ 816AFA8
getitemname 0, ITEM_REVIVAL_HERB getitemname 0, ITEM_REVIVAL_HERB
setvar VAR_0x8008, ITEM_REVIVAL_HERB setvar VAR_0x8008, ITEM_REVIVAL_HERB
setvar VAR_0x8009, 300 setvar VAR_0x8009, 300
goto EventScript_16B055 goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end end
EventScript_16AFBC:: @ 816AFBC CeruleanCity_House5_EventScript_Protein:: @ 816AFBC
getitemname 0, ITEM_PROTEIN getitemname 0, ITEM_PROTEIN
setvar VAR_0x8008, ITEM_PROTEIN setvar VAR_0x8008, ITEM_PROTEIN
setvar VAR_0x8009, 1000 setvar VAR_0x8009, 1000
goto EventScript_16B055 goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end end
EventScript_16AFD0:: @ 816AFD0 CeruleanCity_House5_EventScript_Iron:: @ 816AFD0
getitemname 0, ITEM_IRON getitemname 0, ITEM_IRON
setvar VAR_0x8008, ITEM_IRON setvar VAR_0x8008, ITEM_IRON
setvar VAR_0x8009, 1000 setvar VAR_0x8009, 1000
goto EventScript_16B055 goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end end
EventScript_16AFE4:: @ 816AFE4 CeruleanCity_House5_EventScript_Carbos:: @ 816AFE4
getitemname 0, ITEM_CARBOS getitemname 0, ITEM_CARBOS
setvar VAR_0x8008, ITEM_CARBOS setvar VAR_0x8008, ITEM_CARBOS
setvar VAR_0x8009, 1000 setvar VAR_0x8009, 1000
goto EventScript_16B055 goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end end
EventScript_16AFF8:: @ 816AFF8 CeruleanCity_House5_EventScript_Calcium:: @ 816AFF8
getitemname 0, ITEM_CALCIUM getitemname 0, ITEM_CALCIUM
setvar VAR_0x8008, ITEM_CALCIUM setvar VAR_0x8008, ITEM_CALCIUM
setvar VAR_0x8009, 1000 setvar VAR_0x8009, 1000
goto EventScript_16B055 goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end end
EventScript_16B00C:: @ 816B00C CeruleanCity_House5_EventScript_Zinc:: @ 816B00C
getitemname 0, ITEM_ZINC getitemname 0, ITEM_ZINC
setvar VAR_0x8008, ITEM_ZINC setvar VAR_0x8008, ITEM_ZINC
setvar VAR_0x8009, 1000 setvar VAR_0x8009, 1000
goto EventScript_16B055 goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end end
EventScript_16B020:: @ 816B020 CeruleanCity_House5_EventScript_HPUp:: @ 816B020
getitemname 0, ITEM_HP_UP getitemname 0, ITEM_HP_UP
setvar VAR_0x8008, ITEM_HP_UP setvar VAR_0x8008, ITEM_HP_UP
setvar VAR_0x8009, 1000 setvar VAR_0x8009, 1000
goto EventScript_16B055 goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end end
EventScript_16B034:: @ 816B034 CeruleanCity_House5_EventScript_PPUp:: @ 816B034
getitemname 0, ITEM_PP_UP getitemname 0, ITEM_PP_UP
setvar VAR_0x8008, ITEM_PP_UP setvar VAR_0x8008, ITEM_PP_UP
setvar VAR_0x8009, 3000 setvar VAR_0x8009, 3000
goto EventScript_16B055 goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end end
EventScript_16B048:: @ 816B048 CeruleanCity_House5_EventScript_ExitMenu:: @ 816B048
msgbox gUnknown_819342F msgbox CeruleanCity_House1_Text_SeeMeIfYoudLikeToTradePowder
special sub_815F114 special RemoveBerryPowderVendorMenu
release release
end end
EventScript_16B055:: @ 816B055 CeruleanCity_House5_EventScript_ExchangePowderForItem:: @ 816B055
msgbox gUnknown_819331E, MSGBOX_YESNO msgbox CeruleanCity_House1_Text_YoullExchangeBerryPowderForItem, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq EventScript_16AEC8 goto_if_eq CeruleanCity_House5_EventScript_ChooseExchangeItem
copyvar VAR_0x8004, VAR_0x8009 copyvar VAR_0x8004, VAR_0x8009
specialvar VAR_RESULT, sub_815EEB0 specialvar VAR_RESULT, Special_HasEnoughBerryPowder
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq EventScript_16B0CC goto_if_eq CeruleanCity_House5_EventScript_NotEnoughBerryPowder
giveitem VAR_0x8008 giveitem VAR_0x8008
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq EventScript_16B0BF goto_if_eq CeruleanCity_House5_EventScript_BagIsFull
copyvar VAR_0x8004, VAR_0x8009 copyvar VAR_0x8004, VAR_0x8009
special sub_815EF5C special Special_TakeBerryPowder
special sub_815F070 special PrintPlayerBerryPowderAmount
msgbox gUnknown_819337A, MSGBOX_YESNO msgbox CeruleanCity_House1_Text_TradeMoreBerryPowder, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq EventScript_16AEC8 goto_if_eq CeruleanCity_House5_EventScript_ChooseExchangeItem
msgbox gUnknown_81933FB msgbox CeruleanCity_House1_Text_HopeToSeeYouAgain
special sub_815F114 special RemoveBerryPowderVendorMenu
release release
end end
EventScript_16B0BF:: @ 816B0BF CeruleanCity_House5_EventScript_BagIsFull:: @ 816B0BF
msgbox Text_BagIsFull msgbox Text_BagIsFull
special sub_815F114 special RemoveBerryPowderVendorMenu
release release
end end
EventScript_16B0CC:: @ 816B0CC CeruleanCity_House5_EventScript_NotEnoughBerryPowder:: @ 816B0CC
msgbox gUnknown_8193352 msgbox CeruleanCity_House1_Text_DontHaveEnoughBerryPowder
goto EventScript_16AEC8 goto CeruleanCity_House5_EventScript_ChooseExchangeItem
end end
CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA CeruleanCity_House5_EventScript_BerryCrushRankings:: @ 816B0DA
lockall lockall
special sub_8110AB4 special sub_8110AB4
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0 goto_if_eq EventScript_1A7AE0
special sub_814EA7C special ShowBerryCrushRankings
waitstate waitstate
releaseall releaseall
end end
data/maps/CeruleanCity_House5/text.inc
+12 -12
View File
@@ -1,4 +1,4 @@
gUnknown_8192F67:: @ 8192F67 CeruleanCity_House1_Text_AnyInterestInBerries:: @ 8192F67
.string "I concoct a variety of medicine\n" .string "I concoct a variety of medicine\n"
.string "from BERRY POWDER.\p" .string "from BERRY POWDER.\p"
.string "Using good BERRY POWDER, I can\n" .string "Using good BERRY POWDER, I can\n"
@@ -6,11 +6,11 @@ gUnknown_8192F67:: @ 8192F67
.string "Now tell me, have you any interest\n" .string "Now tell me, have you any interest\n"
.string "in BERRIES?$" .string "in BERRIES?$"
gUnknown_8193003:: @ 8193003 CeruleanCity_House1_Text_HaveJustTheThing:: @ 8193003
.string "Ah, good! For you, then, I have\n" .string "Ah, good! For you, then, I have\n"
.string "just the thing.$" .string "just the thing.$"
gUnknown_8193033:: @ 8193033 CeruleanCity_House1_Text_GoCrushBerriesAtDirectCorner:: @ 8193033
.string "There's something new on the second\n" .string "There's something new on the second\n"
.string "floor of POKéMON CENTERS, at the\l" .string "floor of POKéMON CENTERS, at the\l"
.string "DIRECT CORNER.\p" .string "DIRECT CORNER.\p"
@@ -28,43 +28,43 @@ gUnknown_8193033:: @ 8193033
.string "Don't forget, crush BERRIES into\n" .string "Don't forget, crush BERRIES into\n"
.string "BERRY POWDER and bring it to me.$" .string "BERRY POWDER and bring it to me.$"
gUnknown_819321D:: @ 819321D CeruleanCity_House1_Text_WhyMustYouLieNoBerries:: @ 819321D
.string "Why must you lie to me?\p" .string "Why must you lie to me?\p"
.string "How many BERRIES do you have?\n" .string "How many BERRIES do you have?\n"
.string "Not a one!$" .string "Not a one!$"
gUnknown_819325E:: @ 819325E CeruleanCity_House1_Text_TakeInterestInAllSortsOfThings:: @ 819325E
.string "You have no interest in BERRIES?\p" .string "You have no interest in BERRIES?\p"
.string "Young one, it's important to take an\n" .string "Young one, it's important to take an\n"
.string "interest in all sorts of things.$" .string "interest in all sorts of things.$"
gUnknown_81932C5:: @ 81932C5 CeruleanCity_House1_Text_HaveYouBroughtBerryPowder:: @ 81932C5
.string "Er-hem! Have you brought me some\n" .string "Er-hem! Have you brought me some\n"
.string "BERRY POWDER?$" .string "BERRY POWDER?$"
Text_1932F4:: @ 81932F4 CeruleanCity_House5_Text_ExchangeWithWhat:: @ 81932F4
.string "With what would you like to \n" .string "With what would you like to \n"
.string "exchange it?$" .string "exchange it?$"
gUnknown_819331E:: @ 819331E CeruleanCity_House1_Text_YoullExchangeBerryPowderForItem:: @ 819331E
.string "Fine, you'll exchange your BERRY\n" .string "Fine, you'll exchange your BERRY\n"
.string "POWDER for one {STR_VAR_1}?$" .string "POWDER for one {STR_VAR_1}?$"
gUnknown_8193352:: @ 8193352 CeruleanCity_House1_Text_DontHaveEnoughBerryPowder:: @ 8193352
.string "Hm? You don't have enough\n" .string "Hm? You don't have enough\n"
.string "BERRY POWDER.$" .string "BERRY POWDER.$"
gUnknown_819337A:: @ 819337A CeruleanCity_House1_Text_TradeMoreBerryPowder:: @ 819337A
.string "This is fine BERRY POWDER indeed.\n" .string "This is fine BERRY POWDER indeed.\n"
.string "It will make excellent medicine.\p" .string "It will make excellent medicine.\p"
.string "Would you like to trade more BERRY\n" .string "Would you like to trade more BERRY\n"
.string "POWDER for something else?$" .string "POWDER for something else?$"
gUnknown_81933FB:: @ 81933FB CeruleanCity_House1_Text_HopeToSeeYouAgain:: @ 81933FB
.string "That's fine, then.\n" .string "That's fine, then.\n"
.string "I'll hope to see you back again.$" .string "I'll hope to see you back again.$"
gUnknown_819342F:: @ 819342F CeruleanCity_House1_Text_SeeMeIfYoudLikeToTradePowder:: @ 819342F
.string "Come see me if you'd like to trade\n" .string "Come see me if you'd like to trade\n"
.string "your BERRY POWDER.$" .string "your BERRY POWDER.$"
data/maps/CeruleanCity_Mart/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_Mart_EventScript_16ACB0", "script": "CeruleanCity_Mart_EventScript_Clerk",
"flag": "0" "flag": "0"
}, },
{ {
@@ -36,7 +36,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_Mart_EventScript_16ACA7", "script": "CeruleanCity_Mart_EventScript_Woman",
"flag": "0" "flag": "0"
}, },
{ {
@@ -49,7 +49,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_Mart_EventScript_16AC9E", "script": "CeruleanCity_Mart_EventScript_Youngster",
"flag": "0" "flag": "0"
} }
], ],
data/maps/CeruleanCity_Mart/scripts.inc
+7 -7
View File
@@ -1,15 +1,15 @@
CeruleanCity_Mart_MapScripts:: @ 816AC9D CeruleanCity_Mart_MapScripts:: @ 816AC9D
.byte 0 .byte 0
CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E CeruleanCity_Mart_EventScript_Youngster:: @ 816AC9E
msgbox gUnknown_81929C2, MSGBOX_NPC msgbox CeruleanCity_Mart_Text_RepelWorksOnWeakMons, MSGBOX_NPC
end end
CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 CeruleanCity_Mart_EventScript_Woman:: @ 816ACA7
msgbox gUnknown_8192A79, MSGBOX_NPC msgbox CeruleanCity_Mart_Text_DoYouKnowAboutRareCandy, MSGBOX_NPC
end end
CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 CeruleanCity_Mart_EventScript_Clerk:: @ 816ACB0
special sub_8110AB4 special sub_8110AB4
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0 goto_if_eq EventScript_1A7AE0
@@ -17,13 +17,13 @@ CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0
faceplayer faceplayer
message Text_MayIHelpYou message Text_MayIHelpYou
waitmessage waitmessage
pokemart Items_16ACD8 pokemart CeruleanCity_Mart_Items
msgbox Text_PleaseComeAgain msgbox Text_PleaseComeAgain
release release
end end
.align 2 .align 2
Items_16ACD8:: @ 816ACD8 CeruleanCity_Mart_Items:: @ 816ACD8
.2byte ITEM_POKE_BALL .2byte ITEM_POKE_BALL
.2byte ITEM_SUPER_POTION .2byte ITEM_SUPER_POTION
.2byte ITEM_POTION .2byte ITEM_POTION
data/maps/CeruleanCity_Mart/text.inc
+2 -2
View File
@@ -1,4 +1,4 @@
gUnknown_81929C2:: @ 81929C2 CeruleanCity_Mart_Text_RepelWorksOnWeakMons:: @ 81929C2
.string "REPEL not only keeps bugs away,\n" .string "REPEL not only keeps bugs away,\n"
.string "it also works on weak POKéMON.\p" .string "it also works on weak POKéMON.\p"
.string "Put your strongest POKéMON at the\n" .string "Put your strongest POKéMON at the\n"
@@ -6,7 +6,7 @@ gUnknown_81929C2:: @ 81929C2
.string "If your first POKéMON is strong,\n" .string "If your first POKéMON is strong,\n"
.string "REPEL's effect is boosted.$" .string "REPEL's effect is boosted.$"
gUnknown_8192A79:: @ 8192A79 CeruleanCity_Mart_Text_DoYouKnowAboutRareCandy:: @ 8192A79
.string "Do you know about RARE CANDY?\n" .string "Do you know about RARE CANDY?\n"
.string "They don't sell it in shops.\p" .string "They don't sell it in shops.\p"
.string "I think it makes POKéMON grow\n" .string "I think it makes POKéMON grow\n"
data/maps/CeruleanCity_PokemonCenter_1F/map.json
+7 -7
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA3C", "script": "CeruleanCity_PokemonCenter_1F_EventScript_Nurse",
"flag": "0" "flag": "0"
}, },
{ {
@@ -36,7 +36,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA45", "script": "CeruleanCity_PokemonCenter_1F_EventScript_Gentleman",
"flag": "0" "flag": "0"
}, },
{ {
@@ -49,7 +49,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA4E", "script": "CeruleanCity_PokemonCenter_1F_EventScript_Rocker",
"flag": "0" "flag": "0"
}, },
{ {
@@ -62,7 +62,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA57", "script": "CeruleanCity_PokemonCenter_1F_EventScript_Youngster",
"flag": "0" "flag": "0"
}, },
{ {
@@ -75,7 +75,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA70", "script": "CeruleanCity_PokemonCenter_1F_EventScript_Lass",
"flag": "0" "flag": "0"
}, },
{ {
@@ -88,7 +88,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68", "script": "CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}, },
{ {
@@ -101,7 +101,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68", "script": "CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
} }
], ],
data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
+9 -9
View File
@@ -7,29 +7,29 @@ CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38
setrespawn SPAWN_CERULEAN_CITY setrespawn SPAWN_CERULEAN_CITY
end end
CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C CeruleanCity_PokemonCenter_1F_EventScript_Nurse:: @ 816AA3C
lock lock
faceplayer faceplayer
call EventScript_PkmnCenterNurse call EventScript_PkmnCenterNurse
release release
end end
CeruleanCity_PokemonCenter_1F_EventScript_16AA45:: @ 816AA45 CeruleanCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816AA45
msgbox gUnknown_8192079, MSGBOX_NPC msgbox CeruleanCity_PokemonCenter_1F_Text_EveryoneCallsBillPokemaniac, MSGBOX_NPC
end end
CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E CeruleanCity_PokemonCenter_1F_EventScript_Rocker:: @ 816AA4E
msgbox gUnknown_8191FFB, MSGBOX_NPC msgbox CeruleanCity_PokemonCenter_1F_Text_BillDoesWhateverForRareMons, MSGBOX_NPC
end end
CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 CeruleanCity_PokemonCenter_1F_EventScript_Youngster:: @ 816AA57
lock lock
faceplayer faceplayer
famechecker FAMECHECKER_BILL, 1 famechecker FAMECHECKER_BILL, 1
msgbox gUnknown_8192116 msgbox CeruleanCity_PokemonCenter_1F_Text_BillCollectsRareMons
release release
end end
CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70 CeruleanCity_PokemonCenter_1F_EventScript_Lass:: @ 816AA70
msgbox gUnknown_819214C, MSGBOX_NPC msgbox CeruleanCity_PokemonCenter_1F_Text_TryTradingUpstairs, MSGBOX_NPC
end end
data/maps/CeruleanCity_PokemonCenter_1F/text.inc
+4 -4
View File
@@ -1,11 +1,11 @@
gUnknown_8191FFB:: @ 8191FFB CeruleanCity_PokemonCenter_1F_Text_BillDoesWhateverForRareMons:: @ 8191FFB
.string "That BILL!\p" .string "That BILL!\p"
.string "I heard that he'll do whatever it\n" .string "I heard that he'll do whatever it\n"
.string "takes to get rare POKéMON.\p" .string "takes to get rare POKéMON.\p"
.string "He's not above doing all sorts\n" .string "He's not above doing all sorts\n"
.string "of things, I've heard.$" .string "of things, I've heard.$"
gUnknown_8192079:: @ 8192079 CeruleanCity_PokemonCenter_1F_Text_EveryoneCallsBillPokemaniac:: @ 8192079
.string "Have you heard about BILL?\p" .string "Have you heard about BILL?\p"
.string "Everyone calls him a POKéMANIAC!\p" .string "Everyone calls him a POKéMANIAC!\p"
.string "I think people are just jealous of\n" .string "I think people are just jealous of\n"
@@ -13,11 +13,11 @@ gUnknown_8192079:: @ 8192079
.string "Who wouldn't want to boast about\n" .string "Who wouldn't want to boast about\n"
.string "their POKéMON?$" .string "their POKéMON?$"
gUnknown_8192116:: @ 8192116 CeruleanCity_PokemonCenter_1F_Text_BillCollectsRareMons:: @ 8192116
.string "BILL has lots of POKéMON!\n" .string "BILL has lots of POKéMON!\n"
.string "He collects rare ones, too!$" .string "He collects rare ones, too!$"
gUnknown_819214C:: @ 819214C CeruleanCity_PokemonCenter_1F_Text_TryTradingUpstairs:: @ 819214C
.string "Why don't you go upstairs and try\n" .string "Why don't you go upstairs and try\n"
.string "trading POKéMON with your friends?\p" .string "trading POKéMON with your friends?\p"
.string "You could get a lot more variety\n" .string "You could get a lot more variety\n"
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+6 -6
View File
@@ -4,19 +4,19 @@ CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts:: @ 816E400
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
lock lock
faceplayer faceplayer
setvar VAR_0x8008, 8 setvar VAR_0x8008, INGAME_TRADE_SEEL
call EventScript_1A8CAD call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473 goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473
msgbox gUnknown_81A597B, MSGBOX_YESNO msgbox gUnknown_81A597B, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq EventScript_16E45B goto_if_eq EventScript_16E45B
call EventScript_1A8CBD call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, 6 compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16E45B goto_if_ge EventScript_16E45B
call EventScript_1A8CC9 call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16E465 goto_if_ne EventScript_16E465
call EventScript_1A8CD9 call EventScript_DoInGameTrade
msgbox gUnknown_81A59DA msgbox gUnknown_81A59DA
setflag FLAG_DID_SEELOR_TRADE setflag FLAG_DID_SEELOR_TRADE
release release
data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
+13 -13
View File
@@ -8,44 +8,44 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9
CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
lock lock
faceplayer faceplayer
setvar VAR_0x8008, 6 setvar VAR_0x8008, INGAME_TRADE_ELECTRODE
call EventScript_1A8CAD call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334 goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334
msgbox gUnknown_81A59FE, MSGBOX_YESNO msgbox Trade_Text_DoYouHaveMonWouldYouTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq EventScript_16E31C goto_if_eq EventScript_16E31C
call EventScript_1A8CBD call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, 6 compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16E31C goto_if_ge EventScript_16E31C
call EventScript_1A8CC9 call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16E326 goto_if_ne EventScript_16E326
call EventScript_1A8CD9 call EventScript_DoInGameTrade
msgbox gUnknown_81A5A9D msgbox Trade_Text_Thanks
setflag FLAG_DID_ESPHERE_TRADE setflag FLAG_DID_ESPHERE_TRADE
release release
end end
EventScript_16E31C:: @ 816E31C EventScript_16E31C:: @ 816E31C
msgbox gUnknown_81A5A4E msgbox Trade_Text_WellIfYouDontWantTo
release release
end end
EventScript_16E326:: @ 816E326 EventScript_16E326:: @ 816E326
getspeciesname 0, VAR_0x8009 getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A5A6A msgbox Trade_Text_ThisIsntMon
release release
end end
EventScript_16E334:: @ 816E334 EventScript_16E334:: @ 816E334
msgbox gUnknown_81A5AA5 msgbox Trade_Text_HasTradedMonGrownStronger
release release
end end
CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
lock lock
faceplayer faceplayer
setvar VAR_0x8008, 7 setvar VAR_0x8008, INGAME_TRADE_TANGELA
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
@@ -56,7 +56,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
special Special_ChooseMonFromParty special Special_ChooseMonFromParty
waitstate waitstate
copyvar VAR_0x800A, VAR_0x8004 copyvar VAR_0x800A, VAR_0x8004
compare VAR_0x8004, 6 compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16E3BC goto_if_ge EventScript_16E3BC
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, GetTradeSpecies specialvar VAR_RESULT, GetTradeSpecies
data/maps/Route11_EastEntrance_2F/scripts.inc
+6 -6
View File
@@ -20,19 +20,19 @@ Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53
Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C
lock lock
faceplayer faceplayer
setvar VAR_0x8008, 4 setvar VAR_0x8008, INGAME_TRADE_NIDORINOA
call EventScript_1A8CAD call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE
msgbox gUnknown_81A597B, MSGBOX_YESNO msgbox gUnknown_81A597B, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq EventScript_16FDB6 goto_if_eq EventScript_16FDB6
call EventScript_1A8CBD call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, 6 compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16FDB6 goto_if_ge EventScript_16FDB6
call EventScript_1A8CC9 call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16FDC0 goto_if_ne EventScript_16FDC0
call EventScript_1A8CD9 call EventScript_DoInGameTrade
msgbox gUnknown_81A59DA msgbox gUnknown_81A59DA
setflag FLAG_DID_NINA_TRADE setflag FLAG_DID_NINA_TRADE
release release
data/maps/Route18_EastEntrance_2F/scripts.inc
+6 -6
View File
@@ -12,19 +12,19 @@ Route18_EastEntrance_2F_EventScript_170475:: @ 8170475
Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
lock lock
faceplayer faceplayer
setvar VAR_0x8008, 5 setvar VAR_0x8008, INGAME_TRADE_LICKITUNG
call EventScript_1A8CAD call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0 goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0
msgbox gUnknown_81A597B, MSGBOX_YESNO msgbox gUnknown_81A597B, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq EventScript_1704D8 goto_if_eq EventScript_1704D8
call EventScript_1A8CBD call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, 6 compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_1704D8 goto_if_ge EventScript_1704D8
call EventScript_1A8CC9 call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_1704E2 goto_if_ne EventScript_1704E2
call EventScript_1A8CD9 call EventScript_DoInGameTrade
msgbox gUnknown_81A59DA msgbox gUnknown_81A59DA
setflag FLAG_DID_MARC_TRADE setflag FLAG_DID_MARC_TRADE
release release
data/maps/Route2_House/scripts.inc
+6 -6
View File
@@ -8,19 +8,19 @@ Route2_House_EventScript_16F5F9:: @ 816F5F9
Route2_House_EventScript_16F602:: @ 816F602 Route2_House_EventScript_16F602:: @ 816F602
lock lock
faceplayer faceplayer
setvar VAR_0x8008, 0 setvar VAR_0x8008, INGAME_TRADE_MR_MIME
call EventScript_1A8CAD call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674 goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674
msgbox gUnknown_81A597B, MSGBOX_YESNO msgbox gUnknown_81A597B, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq EventScript_16F65C goto_if_eq EventScript_16F65C
call EventScript_1A8CBD call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, 6 compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16F65C goto_if_ge EventScript_16F65C
call EventScript_1A8CC9 call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16F666 goto_if_ne EventScript_16F666
call EventScript_1A8CD9 call EventScript_DoInGameTrade
msgbox gUnknown_81A59DA msgbox gUnknown_81A59DA
setflag FLAG_DID_MIMIEN_TRADE setflag FLAG_DID_MIMIEN_TRADE
release release
data/maps/SilphCo_Elevator/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
special Special_DrawElevatorCurrentFloorWindow special Special_DrawElevatorCurrentFloorWindow
message Text_WantWhichFloor message Text_WantWhichFloor
waitmessage waitmessage
setvar VAR_0x8004, 1 setvar VAR_0x8004, LISTMENU_SILPHCO_FLOORS
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
special Special_ListMenu special Special_ListMenu
waitstate waitstate
data/maps/UndergroundPath_NorthEntrance/scripts.inc
+6 -6
View File
@@ -4,19 +4,19 @@ UndergroundPath_NorthEntrance_MapScripts:: @ 8160E38
UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39
lock lock
faceplayer faceplayer
setvar VAR_0x8008, 2 setvar VAR_0x8008, INGAME_TRADE_NIDORAN
call EventScript_1A8CAD call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MS_NIDO_TRADE, EventScript_160EAB goto_if_set FLAG_DID_MS_NIDO_TRADE, EventScript_160EAB
msgbox gUnknown_81A5AD6, MSGBOX_YESNO msgbox gUnknown_81A5AD6, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq EventScript_160E93 goto_if_eq EventScript_160E93
call EventScript_1A8CBD call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, 6 compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_160E93 goto_if_ge EventScript_160E93
call EventScript_1A8CC9 call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_160E9D goto_if_ne EventScript_160E9D
call EventScript_1A8CD9 call EventScript_DoInGameTrade
msgbox gUnknown_81A5B4A msgbox gUnknown_81A5B4A
setflag FLAG_DID_MS_NIDO_TRADE setflag FLAG_DID_MS_NIDO_TRADE
release release
data/maps/VermilionCity_House2/scripts.inc
+6 -6
View File
@@ -4,19 +4,19 @@ VermilionCity_House2_MapScripts:: @ 816B5D6
VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7
lock lock
faceplayer faceplayer
setvar VAR_0x8008, 3 setvar VAR_0x8008, INGAME_TRADE_FARFETCHD
call EventScript_1A8CAD call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_CH_DING_TRADE, EventScript_16B649 goto_if_set FLAG_DID_CH_DING_TRADE, EventScript_16B649
msgbox gUnknown_81949CB, MSGBOX_YESNO msgbox gUnknown_81949CB, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq EventScript_16B631 goto_if_eq EventScript_16B631
call EventScript_1A8CBD call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, 6 compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16B631 goto_if_ge EventScript_16B631
call EventScript_1A8CC9 call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16B63B goto_if_ne EventScript_16B63B
call EventScript_1A8CD9 call EventScript_DoInGameTrade
msgbox gUnknown_8194A44 msgbox gUnknown_8194A44
setflag FLAG_DID_CH_DING_TRADE setflag FLAG_DID_CH_DING_TRADE
release release
data/scripts/fame_checker.inc
+2 -2
View File
@@ -75,12 +75,12 @@ Route25_EventScript_1ACE4F:: @ 81ACE4F
release release
end end
CeruleanCity_PokemonCenter_1F_EventScript_1ACE68:: @ 81ACE68 CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty:: @ 81ACE68
lock lock
faceplayer faceplayer
famechecker FAMECHECKER_MISTY, 5 famechecker FAMECHECKER_MISTY, 5
textcolor 3 textcolor 3
msgbox gUnknown_81B14E8 msgbox PokemonJournal_Text_SpecialFeatureMisty
release release
end end
data/specials.inc
+8 -8
View File
@@ -365,7 +365,7 @@ gSpecials:: @ 815FD60
def_special ScrSpecial_GetStarter def_special ScrSpecial_GetStarter
def_special Special_SetSeenMon def_special Special_SetSeenMon
def_special sub_810C444 def_special sub_810C444
def_special sub_80CC7B4 def_special ShouldShowBoxWasFullMessage
def_special ChangeBoxPokemonNickname def_special ChangeBoxPokemonNickname
def_special Special_UpdateTrainerCardPhotoIcons def_special Special_UpdateTrainerCardPhotoIcons
def_special Special_StickerLadyGetBragFlags def_special Special_StickerLadyGetBragFlags
@@ -402,7 +402,7 @@ gSpecials:: @ 815FD60
def_special sub_8110AB4 def_special sub_8110AB4
def_special sub_8112364 def_special sub_8112364
def_special Special_GetMENewsJisanItemAndState def_special Special_GetMENewsJisanItemAndState
def_special get_unknown_box_id def_special GetPCBoxToSendMon
def_special Special_OpenMuseumFossilPic def_special Special_OpenMuseumFossilPic
def_special Special_CloseMuseumFossilPic def_special Special_CloseMuseumFossilPic
def_special ChooseMonForMoveTutor def_special ChooseMonForMoveTutor
@@ -420,13 +420,13 @@ gSpecials:: @ 815FD60
def_special HelpSystem_Enable def_special HelpSystem_Enable
def_special sub_810B82C def_special sub_810B82C
def_special CheckHasAtLeastOneBerry def_special CheckHasAtLeastOneBerry
def_special sub_815F094 def_special DisplayBerryPowderVendorMenu
def_special sub_815F114 def_special RemoveBerryPowderVendorMenu
def_special sub_815EEB0 def_special Special_HasEnoughBerryPowder
def_special sub_815EF5C def_special Special_TakeBerryPowder
def_special sub_815F070 def_special PrintPlayerBerryPowderAmount
def_special Special_PokemonLeagueLightingEffect def_special Special_PokemonLeagueLightingEffect
def_special sub_814EA7C def_special ShowBerryCrushRankings
def_special Special_CapeBrinkGetMoveToTeachLeadPokemon def_special Special_CapeBrinkGetMoveToTeachLeadPokemon
def_special Special_HasLearnedAllMovesFromCapeBrinkTutor def_special Special_HasLearnedAllMovesFromCapeBrinkTutor
def_special Special_Credits def_special Special_Credits
data/text/fame_checker.inc
+1 -1
View File
@@ -1380,7 +1380,7 @@ gUnknown_81B146A:: @ 81B146A
.string "BROCK rarely laughs, but is said to\n" .string "BROCK rarely laughs, but is said to\n"
.string "be unable to stop if he starts.$" .string "be unable to stop if he starts.$"
gUnknown_81B14E8:: @ 81B14E8 PokemonJournal_Text_SpecialFeatureMisty:: @ 81B14E8
.string "POKéMON JOURNAL\p" .string "POKéMON JOURNAL\p"
.string "Special Feature: CERULEAN GYM\n" .string "Special Feature: CERULEAN GYM\n"
.string "LEADER MISTY!\p" .string "LEADER MISTY!\p"
data/text/ingame_trade.inc
+5 -5
View File
@@ -18,24 +18,24 @@ gUnknown_81A59DA:: @ 81A59DA
gUnknown_81A59E7:: @ 81A59E7 gUnknown_81A59E7:: @ 81A59E7
.string "Isn't my old {STR_VAR_2} great?$" .string "Isn't my old {STR_VAR_2} great?$"
gUnknown_81A59FE:: @ 81A59FE Trade_Text_DoYouHaveMonWouldYouTradeForMon:: @ 81A59FE
.string "Hello, there! Do you happen to\n" .string "Hello, there! Do you happen to\n"
.string "have a {STR_VAR_1}?\p" .string "have a {STR_VAR_1}?\p"
.string "Would you agree to a trade for\n" .string "Would you agree to a trade for\n"
.string "my {STR_VAR_2}?$" .string "my {STR_VAR_2}?$"
gUnknown_81A5A4E:: @ 81A5A4E Trade_Text_WellIfYouDontWantTo:: @ 81A5A4E
.string "Well, if you don't want to…$" .string "Well, if you don't want to…$"
gUnknown_81A5A6A:: @ 81A5A6A Trade_Text_ThisIsntMon:: @ 81A5A6A
.string "Hmmm?\n" .string "Hmmm?\n"
.string "This isn't a {STR_VAR_1}.\p" .string "This isn't a {STR_VAR_1}.\p"
.string "Think of me if you get one.$" .string "Think of me if you get one.$"
gUnknown_81A5A9D:: @ 81A5A9D Trade_Text_Thanks:: @ 81A5A9D
.string "Thanks!$" .string "Thanks!$"
gUnknown_81A5AA5:: @ 81A5AA5 Trade_Text_HasTradedMonGrownStronger:: @ 81A5AA5
.string "The {STR_VAR_2} that I traded you,\n" .string "The {STR_VAR_2} that I traded you,\n"
.string "has it grown stronger?$" .string "has it grown stronger?$"
include/berry_powder.h
+2 -1
View File
@@ -3,6 +3,7 @@
u32 GetBerryPowder(void); u32 GetBerryPowder(void);
void SetBerryPowder(u32 *powder, u32 amount); void SetBerryPowder(u32 *powder, u32 amount);
void sub_815EE6C(u32 newKey); void ApplyNewEncryptionKeyToBerryPowder(u32 newKey);
bool8 GiveBerryPowder(u32 amountToAdd);
#endif //GUARD_BERRY_POWDER_H #endif //GUARD_BERRY_POWDER_H
include/constants/menu.h
+13 -5
View File
@@ -61,13 +61,21 @@
#define MULTICHOICE_SEVII_NAVEL 54 #define MULTICHOICE_SEVII_NAVEL 54
#define MULTICHOICE_SEVII_BIRTH 55 #define MULTICHOICE_SEVII_BIRTH 55
#define MULTICHOICE_SEVII_NAVEL_BIRTH 56 #define MULTICHOICE_SEVII_NAVEL_BIRTH 56
#define MULTICHOICE_SEAGALLOP_123 57 #define MULTICHOICE_SEAGALLOP_123 57
#define MULTICHOICE_SEAGALLOP_V23 58 #define MULTICHOICE_SEAGALLOP_V23 58
#define MULTICHOICE_SEAGALLOP_V13 59 #define MULTICHOICE_SEAGALLOP_V13 59
#define MULTICHOICE_SEAGALLOP_V12 60 #define MULTICHOICE_SEAGALLOP_V12 60
#define MULTICHOICE_SEAGALLOP_VERMILION 61 #define MULTICHOICE_SEAGALLOP_VERMILION 61
#define MULTICHOICE_62 62 #define MULTICHOICE_62 62
#define MULTICHOICE_JOIN_OR_LEAD 63 #define MULTICHOICE_JOIN_OR_LEAD 63
#define MULTICHOICE_TRAINER_TOWER_MODE 64 #define MULTICHOICE_TRAINER_TOWER_MODE 64
#define LISTMENU_BADGES 0
#define LISTMENU_SILPHCO_FLOORS 1
#define LISTMENU_ROCKET_HIDEOUT_FLOORS 2
#define LISTMENU_DEPT_STORE_FLOORS 3
#define LISTMENU_WIRELESS_LECTURE_HEADERS 4
#define LISTMENU_BERRY_POWDER 5
#define LISTMENU_TRAINER_TOWER_FLOORS 6
#endif //GUARD_CONSTANTS_MENU_H #endif //GUARD_CONSTANTS_MENU_H
include/constants/trade.h
+9 -4
View File
@@ -10,10 +10,15 @@
#define LINK_TRADE_TIMEOUT 300 #define LINK_TRADE_TIMEOUT 300
// In-game Trade IDs // In-game Trade IDs
#define INGAME_TRADE_SEEDOT 0 #define INGAME_TRADE_MR_MIME 0
#define INGAME_TRADE_PLUSLE 1 #define INGAME_TRADE_JYNX 1
#define INGAME_TRADE_HORSEA 2 #define INGAME_TRADE_NIDORAN 2 // M or F depending on version
#define INGAME_TRADE_MEOWTH 3 #define INGAME_TRADE_FARFETCHD 3
#define INGAME_TRADE_NIDORINOA 4 // Nidorino or Nidorina depending on version
#define INGAME_TRADE_LICKITUNG 5
#define INGAME_TRADE_ELECTRODE 6
#define INGAME_TRADE_TANGELA 7
#define INGAME_TRADE_SEEL 8
// Flag IDs for sending link data // Flag IDs for sending link data
#define INITIATE_TRADE 1 #define INITIATE_TRADE 1
include/constants/vars.h
+1 -1
View File
@@ -97,7 +97,7 @@
#define VAR_0x4034 0x4034 #define VAR_0x4034 0x4034
#define VAR_RESORT_GOREGEOUS_STEP_COUNTER 0x4035 #define VAR_RESORT_GOREGEOUS_STEP_COUNTER 0x4035
#define VAR_RESORT_GORGEOUS_REQUESTED_MON 0x4036 #define VAR_RESORT_GORGEOUS_REQUESTED_MON 0x4036
#define VAR_0x4037 0x4037 #define VAR_PC_BOX_TO_SEND_MON 0x4037
#define VAR_0x4038 0x4038 #define VAR_0x4038 0x4038
#define VAR_0x4039 0x4039 #define VAR_0x4039 0x4039
#define VAR_ELEVATOR_FLOOR 0x403A #define VAR_ELEVATOR_FLOOR 0x403A
include/field_specials.h
+3 -3
View File
@@ -19,9 +19,9 @@ void StopPokemonLeagueLightingEffectTask(void);
void nullsub_60(void); void nullsub_60(void);
void nullsub_61(void); void nullsub_61(void);
u8 ContextNpcGetTextColor(void); u8 ContextNpcGetTextColor(void);
void set_unknown_box_id(u8); void SetPCBoxToSendMon(u8);
u16 get_unknown_box_id(void); u16 GetPCBoxToSendMon(void);
bool8 sub_80CC7B4(void); bool8 ShouldShowBoxWasFullMessage(void);
u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr); u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr);
u8 GetUnlockedSeviiAreas(void); u8 GetUnlockedSeviiAreas(void);
u32 GetPlayerTrainerId(void); u32 GetPlayerTrainerId(void);
src/battle_script_commands.c
+4 -4
View File
@@ -9563,17 +9563,17 @@ static void atkF0_givecaughtmon(void)
{ {
if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY) if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY)
{ {
if (!sub_80CC7B4()) if (!ShouldShowBoxWasFullMessage())
{ {
gBattleCommunication[MULTISTRING_CHOOSER] = 0; gBattleCommunication[MULTISTRING_CHOOSER] = 0;
StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_0x4037))); StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON)));
GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2); GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
} }
else else
{ {
StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_0x4037))); StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON))); // box the mon was sent to
GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2); GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
StringCopy(gStringVar3, GetBoxNamePtr(get_unknown_box_id())); StringCopy(gStringVar3, GetBoxNamePtr(GetPCBoxToSendMon())); //box the mon was going to be sent to
gBattleCommunication[MULTISTRING_CHOOSER] = 2; gBattleCommunication[MULTISTRING_CHOOSER] = 2;
} }
if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC)) if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC))
src/berry_powder.c
+44 -42
View File
@@ -9,32 +9,34 @@
#include "text.h" #include "text.h"
#include "text_window.h" #include "text_window.h"
EWRAM_DATA u8 gUnknown_203F464 = 0; #define MAX_BERRY_POWDER 99999
u32 DecryptBerryPowder(u32 * a0) static EWRAM_DATA u8 sBerryPowderVendorWindowId = 0;
u32 DecryptBerryPowder(u32 *powder)
{ {
return *a0 ^ gSaveBlock2Ptr->encryptionKey; return *powder ^ gSaveBlock2Ptr->encryptionKey;
} }
void SetBerryPowder(u32 * a0, u32 a1) void SetBerryPowder(u32 *powder, u32 amount)
{ {
*a0 = gSaveBlock2Ptr->encryptionKey ^ a1; *powder = amount ^ gSaveBlock2Ptr->encryptionKey;
} }
void sub_815EE6C(u32 a0) void ApplyNewEncryptionKeyToBerryPowder(u32 encryptionKey)
{ {
ApplyNewEncryptionKeyToWord(&gSaveBlock2Ptr->berryCrush.berryPowderAmount, a0); ApplyNewEncryptionKeyToWord(&gSaveBlock2Ptr->berryCrush.berryPowderAmount, encryptionKey);
} }
bool8 sub_815EE88(u32 a0) static bool8 HasEnoughBerryPowder(u32 cost)
{ {
if (DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount) < a0) if (DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount) < cost)
return FALSE; return FALSE;
else else
return TRUE; return TRUE;
} }
bool8 sub_815EEB0(void) bool8 Special_HasEnoughBerryPowder(void)
{ {
if (DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount) < gSpecialVar_0x8004) if (DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount) < gSpecialVar_0x8004)
return FALSE; return FALSE;
@@ -42,44 +44,44 @@ bool8 sub_815EEB0(void)
return TRUE; return TRUE;
} }
bool8 sub_815EEE0(u32 a0) bool8 GiveBerryPowder(u32 amountToAdd)
{ {
u32 * ptr = &gSaveBlock2Ptr->berryCrush.berryPowderAmount; u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount;
u32 amount = DecryptBerryPowder(ptr) + a0; u32 amount = DecryptBerryPowder(powder) + amountToAdd;
if (amount > 99999) if (amount > MAX_BERRY_POWDER)
{ {
SetBerryPowder(ptr, 99999); SetBerryPowder(powder, MAX_BERRY_POWDER);
return FALSE; return FALSE;
} }
else else
{ {
SetBerryPowder(ptr, amount); SetBerryPowder(powder, amount);
return TRUE; return TRUE;
} }
} }
bool8 sub_815EF20(u32 a0) static bool8 TakeBerryPowder(u32 cost)
{ {
u32 * ptr = &gSaveBlock2Ptr->berryCrush.berryPowderAmount; u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount;
if (!sub_815EE88(a0)) if (!HasEnoughBerryPowder(cost))
return FALSE; return FALSE;
else else
{ {
u32 amount = DecryptBerryPowder(ptr); u32 amount = DecryptBerryPowder(powder);
SetBerryPowder(ptr, amount - a0); SetBerryPowder(powder, amount - cost);
return TRUE; return TRUE;
} }
} }
bool8 sub_815EF5C(void) bool8 Special_TakeBerryPowder(void)
{ {
u32 * ptr = &gSaveBlock2Ptr->berryCrush.berryPowderAmount; u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount;
if (!sub_815EE88(gSpecialVar_0x8004)) if (!HasEnoughBerryPowder(gSpecialVar_0x8004))
return FALSE; return FALSE;
else else
{ {
u32 amount = DecryptBerryPowder(ptr); u32 amount = DecryptBerryPowder(powder);
SetBerryPowder(ptr, amount - gSpecialVar_0x8004); SetBerryPowder(powder, amount - gSpecialVar_0x8004);
return TRUE; return TRUE;
} }
} }
@@ -89,42 +91,42 @@ u32 GetBerryPowder(void)
return DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount); return DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount);
} }
void sub_815EFBC(u8 windowId, u32 powder, u8 x, u8 y, u8 speed) static void PrintBerryPowderAmount(u8 windowId, u32 amount, u8 x, u8 y, u8 speed)
{ {
ConvertIntToDecimalStringN(gStringVar1, powder, STR_CONV_MODE_RIGHT_ALIGN, 5); ConvertIntToDecimalStringN(gStringVar1, amount, STR_CONV_MODE_RIGHT_ALIGN, 5);
AddTextPrinterParameterized(windowId, 0, gStringVar1, x, y, speed, NULL); AddTextPrinterParameterized(windowId, 0, gStringVar1, x, y, speed, NULL);
} }
void sub_815F014(u8 windowId, u16 baseBlock, u8 palette, u32 powder) static void DrawPlayerPowderAmount(u8 windowId, u16 baseBlock, u8 palette, u32 amount)
{ {
DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, baseBlock, palette); DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, baseBlock, palette);
AddTextPrinterParameterized(windowId, 0, gOtherText_Powder, 0, 0, -1, NULL); AddTextPrinterParameterized(windowId, 0, gOtherText_Powder, 0, 0, -1, NULL);
sub_815EFBC(windowId, powder, 39, 12, 0); PrintBerryPowderAmount(windowId, amount, 39, 12, 0);
} }
void sub_815F070(void) void PrintPlayerBerryPowderAmount(void)
{ {
sub_815EFBC(gUnknown_203F464, GetBerryPowder(), 39, 12, 0); PrintBerryPowderAmount(sBerryPowderVendorWindowId, GetBerryPowder(), 39, 12, 0);
} }
void sub_815F094(void) void DisplayBerryPowderVendorMenu(void)
{ {
struct WindowTemplate template; struct WindowTemplate template;
if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE) if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE)
{ {
template = SetWindowTemplateFields(0, 1, 1, 8, 3, 15, 32); template = SetWindowTemplateFields(0, 1, 1, 8, 3, 15, 32);
gUnknown_203F464 = AddWindow(&template); sBerryPowderVendorWindowId = AddWindow(&template);
FillWindowPixelBuffer(gUnknown_203F464, 0); FillWindowPixelBuffer(sBerryPowderVendorWindowId, 0);
PutWindowTilemap(gUnknown_203F464); PutWindowTilemap(sBerryPowderVendorWindowId);
TextWindow_SetStdFrame0_WithPal(gUnknown_203F464, 0x21D, 0xD0); TextWindow_SetStdFrame0_WithPal(sBerryPowderVendorWindowId, 0x21D, 0xD0);
sub_815F014(gUnknown_203F464, 0x21D, 0xD, GetBerryPowder()); DrawPlayerPowderAmount(sBerryPowderVendorWindowId, 0x21D, 0xD, GetBerryPowder());
} }
} }
void sub_815F114(void) void RemoveBerryPowderVendorMenu(void)
{ {
ClearWindowTilemap(gUnknown_203F464); ClearWindowTilemap(sBerryPowderVendorWindowId);
ClearStdWindowAndFrameToTransparent(gUnknown_203F464, 1); ClearStdWindowAndFrameToTransparent(sBerryPowderVendorWindowId, 1);
RemoveWindow(gUnknown_203F464); RemoveWindow(sBerryPowderVendorWindowId);
} }
src/data/ingame_trades.h
+23 -7
View File
@@ -1,4 +1,5 @@
static const struct InGameTrade sInGameTrades[] = { static const struct InGameTrade sInGameTrades[] = {
[INGAME_TRADE_MR_MIME] =
{ {
.nickname = _("MIMIEN"), .nickname = _("MIMIEN"),
.species = SPECIES_MR_MIME, .species = SPECIES_MR_MIME,
@@ -13,7 +14,9 @@ static const struct InGameTrade sInGameTrades[] = {
.otGender = MALE, .otGender = MALE,
.sheen = 10, .sheen = 10,
.requestedSpecies = SPECIES_ABRA .requestedSpecies = SPECIES_ABRA
}, { },
[INGAME_TRADE_JYNX] =
{
.nickname = _("ZYNX"), .nickname = _("ZYNX"),
.species = SPECIES_JYNX, .species = SPECIES_JYNX,
.ivs = {18, 17, 18, 22, 25, 21}, .ivs = {18, 17, 18, 22, 25, 21},
@@ -27,7 +30,9 @@ static const struct InGameTrade sInGameTrades[] = {
.otGender = MALE, .otGender = MALE,
.sheen = 10, .sheen = 10,
.requestedSpecies = SPECIES_POLIWHIRL .requestedSpecies = SPECIES_POLIWHIRL
}, { },
[INGAME_TRADE_NIDORAN] =
{
#if defined(FIRERED) #if defined(FIRERED)
.nickname = _("MS. NIDO"), .nickname = _("MS. NIDO"),
.species = SPECIES_NIDORAN_F, .species = SPECIES_NIDORAN_F,
@@ -57,7 +62,9 @@ static const struct InGameTrade sInGameTrades[] = {
.sheen = 10, .sheen = 10,
.requestedSpecies = SPECIES_NIDORAN_F .requestedSpecies = SPECIES_NIDORAN_F
#endif #endif
}, { },
[INGAME_TRADE_FARFETCHD] =
{
.nickname = _("CH'DING"), .nickname = _("CH'DING"),
.species = SPECIES_FARFETCHD, .species = SPECIES_FARFETCHD,
.ivs = {20, 25, 21, 24, 15, 20}, .ivs = {20, 25, 21, 24, 15, 20},
@@ -71,7 +78,9 @@ static const struct InGameTrade sInGameTrades[] = {
.otGender = MALE, .otGender = MALE,
.sheen = 10, .sheen = 10,
.requestedSpecies = SPECIES_SPEAROW .requestedSpecies = SPECIES_SPEAROW
}, { },
[INGAME_TRADE_NIDORINOA] =
{
#if defined(FIRERED) #if defined(FIRERED)
.nickname = _("NINA"), .nickname = _("NINA"),
.species = SPECIES_NIDORINA, .species = SPECIES_NIDORINA,
@@ -101,7 +110,9 @@ static const struct InGameTrade sInGameTrades[] = {
.sheen = 10, .sheen = 10,
.requestedSpecies = SPECIES_NIDORINA .requestedSpecies = SPECIES_NIDORINA
#endif #endif
}, { },
[INGAME_TRADE_LICKITUNG] =
{
.nickname = _("MARC"), .nickname = _("MARC"),
.species = SPECIES_LICKITUNG, .species = SPECIES_LICKITUNG,
.ivs = {24, 19, 21, 15, 23, 21}, .ivs = {24, 19, 21, 15, 23, 21},
@@ -119,7 +130,9 @@ static const struct InGameTrade sInGameTrades[] = {
#elif defined(LEAFGREEN) #elif defined(LEAFGREEN)
.requestedSpecies = SPECIES_SLOWBRO .requestedSpecies = SPECIES_SLOWBRO
#endif #endif
}, { },
[INGAME_TRADE_ELECTRODE] =
{
.nickname = _("ESPHERE"), .nickname = _("ESPHERE"),
.species = SPECIES_ELECTRODE, .species = SPECIES_ELECTRODE,
.ivs = {19, 16, 18, 25, 25, 19}, .ivs = {19, 16, 18, 25, 25, 19},
@@ -133,7 +146,9 @@ static const struct InGameTrade sInGameTrades[] = {
.otGender = MALE, .otGender = MALE,
.sheen = 10, .sheen = 10,
.requestedSpecies = SPECIES_RAICHU .requestedSpecies = SPECIES_RAICHU
}, { },
[INGAME_TRADE_TANGELA] =
{
.nickname = _("TANGENY"), .nickname = _("TANGENY"),
.species = SPECIES_TANGELA, .species = SPECIES_TANGELA,
.ivs = {22, 17, 25, 16, 23, 20}, .ivs = {22, 17, 25, 16, 23, 20},
@@ -148,6 +163,7 @@ static const struct InGameTrade sInGameTrades[] = {
.sheen = 10, .sheen = 10,
.requestedSpecies = SPECIES_VENONAT .requestedSpecies = SPECIES_VENONAT
}, },
[INGAME_TRADE_SEEL] =
{ {
.nickname = _("SEELOR"), .nickname = _("SEELOR"),
.species = SPECIES_SEEL, .species = SPECIES_SEEL,
src/field_specials.c
+40 -26
View File
@@ -45,13 +45,14 @@
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/region_map.h" #include "constants/region_map.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/menu.h"
static EWRAM_DATA u8 sElevatorCurrentFloorWindowId = 0; static EWRAM_DATA u8 sElevatorCurrentFloorWindowId = 0;
static EWRAM_DATA u16 sElevatorScroll = 0; static EWRAM_DATA u16 sElevatorScroll = 0;
static EWRAM_DATA u16 sElevatorCursorPos = 0; static EWRAM_DATA u16 sElevatorCursorPos = 0;
static EWRAM_DATA struct ListMenuItem * sListMenuItems = NULL; static EWRAM_DATA struct ListMenuItem * sListMenuItems = NULL;
static EWRAM_DATA u16 sListMenuLastScrollPosition = 0; static EWRAM_DATA u16 sListMenuLastScrollPosition = 0;
static EWRAM_DATA u8 sUnknownBoxId = 0; static EWRAM_DATA u8 sPCBoxToSendMon = 0;
static EWRAM_DATA u8 sBrailleTextCursorSpriteID = 0; static EWRAM_DATA u8 sBrailleTextCursorSpriteID = 0;
struct ListMenuTemplate sFieldSpecialsListMenuTemplate; struct ListMenuTemplate sFieldSpecialsListMenuTemplate;
@@ -1143,7 +1144,7 @@ void Special_ListMenu(void)
task = &gTasks[taskId]; task = &gTasks[taskId];
switch (gSpecialVar_0x8004) switch (gSpecialVar_0x8004)
{ {
case 0: case LISTMENU_BADGES:
task->data[0] = 4; task->data[0] = 4;
task->data[1] = 9; task->data[1] = 9;
task->data[2] = 1; task->data[2] = 1;
@@ -1153,7 +1154,7 @@ void Special_ListMenu(void)
task->data[6] = 1; task->data[6] = 1;
task->data[15] = taskId; task->data[15] = taskId;
break; break;
case 1: case LISTMENU_SILPHCO_FLOORS:
task->data[0] = 7; task->data[0] = 7;
task->data[1] = 12; task->data[1] = 12;
task->data[2] = 1; task->data[2] = 1;
@@ -1165,7 +1166,7 @@ void Special_ListMenu(void)
task->data[7] = sElevatorScroll; task->data[7] = sElevatorScroll;
task->data[8] = sElevatorCursorPos; task->data[8] = sElevatorCursorPos;
break; break;
case 2: case LISTMENU_ROCKET_HIDEOUT_FLOORS: // Multichoice used instead
task->data[0] = 4; task->data[0] = 4;
task->data[1] = 4; task->data[1] = 4;
task->data[2] = 1; task->data[2] = 1;
@@ -1175,7 +1176,7 @@ void Special_ListMenu(void)
task->data[6] = 0; task->data[6] = 0;
task->data[15] = taskId; task->data[15] = taskId;
break; break;
case 3: case LISTMENU_DEPT_STORE_FLOORS: // Multichoice used instead
task->data[0] = 4; task->data[0] = 4;
task->data[1] = 6; task->data[1] = 6;
task->data[2] = 1; task->data[2] = 1;
@@ -1185,7 +1186,7 @@ void Special_ListMenu(void)
task->data[6] = 0; task->data[6] = 0;
task->data[15] = taskId; task->data[15] = taskId;
break; break;
case 4: case LISTMENU_WIRELESS_LECTURE_HEADERS: // Multichoice used instead
task->data[0] = 4; task->data[0] = 4;
task->data[1] = 4; task->data[1] = 4;
task->data[2] = 1; task->data[2] = 1;
@@ -1195,7 +1196,7 @@ void Special_ListMenu(void)
task->data[6] = 1; task->data[6] = 1;
task->data[15] = taskId; task->data[15] = taskId;
break; break;
case 5: case LISTMENU_BERRY_POWDER:
task->data[0] = 7; task->data[0] = 7;
task->data[1] = 12; task->data[1] = 12;
task->data[2] = 16; task->data[2] = 16;
@@ -1205,7 +1206,7 @@ void Special_ListMenu(void)
task->data[6] = 0; task->data[6] = 0;
task->data[15] = taskId; task->data[15] = taskId;
break; break;
case 6: case LISTMENU_TRAINER_TOWER_FLOORS: // Mulitchoice used instead
task->data[0] = 3; task->data[0] = 3;
task->data[1] = 3; task->data[1] = 3;
task->data[2] = 1; task->data[2] = 1;
@@ -1226,6 +1227,7 @@ void Special_ListMenu(void)
} }
static const u8 *const sListMenuLabels[][12] = { static const u8 *const sListMenuLabels[][12] = {
[LISTMENU_BADGES] =
{ {
gText_BoulderBadge, gText_BoulderBadge,
gText_CascadeBadge, gText_CascadeBadge,
@@ -1236,7 +1238,9 @@ static const u8 *const sListMenuLabels[][12] = {
gText_VolcanoBadge, gText_VolcanoBadge,
gText_EarthBadge, gText_EarthBadge,
gOtherText_Exit, gOtherText_Exit,
}, { },
[LISTMENU_SILPHCO_FLOORS] =
{
gText_11F, gText_11F,
gText_10F, gText_10F,
gText_9F, gText_9F,
@@ -1249,24 +1253,32 @@ static const u8 *const sListMenuLabels[][12] = {
gText_2F, gText_2F,
gText_1F, gText_1F,
gOtherText_Exit, gOtherText_Exit,
}, { },
[LISTMENU_ROCKET_HIDEOUT_FLOORS] = // Unncessary, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR is used instead
{
gText_B1F, gText_B1F,
gText_B2F, gText_B2F,
gText_B4F, gText_B4F,
gOtherText_Exit, gOtherText_Exit,
}, { },
[LISTMENU_DEPT_STORE_FLOORS] = // Unncessary, MULTICHOICE_DEPT_STORE_ELEVATOR is used instead
{
gText_5F, gText_5F,
gText_4F, gText_4F,
gText_3F, gText_3F,
gText_2F, gText_2F,
gText_1F, gText_1F,
gOtherText_Exit, gOtherText_Exit,
}, { },
[LISTMENU_WIRELESS_LECTURE_HEADERS] = // Unnecessary, MULTICHOICE_LINKED_DIRECT_UNION is used instead
{
gText_LinkedGamePlay, gText_LinkedGamePlay,
gText_DirectCorner, gText_DirectCorner,
gText_UnionRoom, gText_UnionRoom,
gOtherText_Quit, gOtherText_Quit,
}, { },
[LISTMENU_BERRY_POWDER] =
{
gText_Energypowder_50, gText_Energypowder_50,
gText_EnergyRoot_80, gText_EnergyRoot_80,
gText_HealPowder_50, gText_HealPowder_50,
@@ -1279,7 +1291,9 @@ static const u8 *const sListMenuLabels[][12] = {
gText_HpUp_1000, gText_HpUp_1000,
gText_PpUp_3000, gText_PpUp_3000,
gOtherText_Exit, gOtherText_Exit,
}, { },
[LISTMENU_TRAINER_TOWER_FLOORS] = // Unnecessary, MULTICHOICE_ROOFTOP_B1F is used instead
{
gText_Rooftop, gText_Rooftop,
gText_B1F, gText_B1F,
gOtherText_Exit, gOtherText_Exit,
@@ -1295,7 +1309,7 @@ static void Task_CreateScriptListMenu(u8 taskId)
struct Task * task = &gTasks[taskId]; struct Task * task = &gTasks[taskId];
u8 windowId; u8 windowId;
ScriptContext2_Enable(); ScriptContext2_Enable();
if (gSpecialVar_0x8004 == 1) if (gSpecialVar_0x8004 == LISTMENU_SILPHCO_FLOORS)
sListMenuLastScrollPosition = sElevatorScroll; sListMenuLastScrollPosition = sElevatorScroll;
else else
sListMenuLastScrollPosition = 0; sListMenuLastScrollPosition = 0;
@@ -1920,31 +1934,31 @@ u16 Special_BattleCardAction(void)
} }
} }
void set_unknown_box_id(u8 boxId) void SetPCBoxToSendMon(u8 boxId)
{ {
sUnknownBoxId = boxId; sPCBoxToSendMon = boxId;
} }
u16 get_unknown_box_id(void) u16 GetPCBoxToSendMon(void)
{ {
return sUnknownBoxId; return sPCBoxToSendMon;
} }
bool8 sub_80CC7B4(void) bool8 ShouldShowBoxWasFullMessage(void)
{ {
if (FlagGet(FLAG_SYS_CHANGED_BOX_TO_STORE_MON)) if (FlagGet(FLAG_SYS_CHANGED_BOX_TO_STORE_MON))
return FALSE; return FALSE;
if (StorageGetCurrentBox() == VarGet(VAR_0x4037)) if (StorageGetCurrentBox() == VarGet(VAR_PC_BOX_TO_SEND_MON))
return FALSE; return FALSE;
FlagSet(FLAG_SYS_CHANGED_BOX_TO_STORE_MON); FlagSet(FLAG_SYS_CHANGED_BOX_TO_STORE_MON);
return TRUE; return TRUE;
} }
bool8 sub_80CC7F8(void) bool8 IsDestinationBoxFull(void)
{ {
s32 i; s32 i;
s32 j; s32 j;
set_unknown_box_id(VarGet(VAR_0x4037)); SetPCBoxToSendMon(VarGet(VAR_PC_BOX_TO_SEND_MON));
i = StorageGetCurrentBox(); i = StorageGetCurrentBox();
do do
{ {
@@ -1952,10 +1966,10 @@ bool8 sub_80CC7F8(void)
{ {
if (GetBoxMonData(GetBoxedMonPtr(i, j), MON_DATA_SPECIES, NULL) == SPECIES_NONE) if (GetBoxMonData(GetBoxedMonPtr(i, j), MON_DATA_SPECIES, NULL) == SPECIES_NONE)
{ {
if (get_unknown_box_id() != i) if (GetPCBoxToSendMon() != i)
FlagClear(FLAG_SYS_CHANGED_BOX_TO_STORE_MON); FlagClear(FLAG_SYS_CHANGED_BOX_TO_STORE_MON);
VarSet(VAR_0x4037, i); VarSet(VAR_PC_BOX_TO_SEND_MON, i);
return sub_80CC7B4(); return ShouldShowBoxWasFullMessage();
} }
} }
i++; i++;
src/load_save.c
+1 -1
View File
@@ -289,7 +289,7 @@ void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey)
sub_8054F38(encryptionKey); sub_8054F38(encryptionKey);
ApplyNewEncryptionKeyToBagItems_(encryptionKey); ApplyNewEncryptionKeyToBagItems_(encryptionKey);
sub_815EE6C(encryptionKey); ApplyNewEncryptionKeyToBerryPowder(encryptionKey);
ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->money, encryptionKey); ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->money, encryptionKey);
ApplyNewEncryptionKeyToHword(&gSaveBlock1Ptr->coins, encryptionKey); ApplyNewEncryptionKeyToHword(&gSaveBlock1Ptr->coins, encryptionKey);
} }
src/pokemon.c
+3 -3
View File
@@ -3632,7 +3632,7 @@ static u8 SendMonToPC(struct Pokemon* mon)
{ {
s32 boxNo, boxPos; s32 boxNo, boxPos;
set_unknown_box_id(VarGet(VAR_0x4037)); SetPCBoxToSendMon(VarGet(VAR_PC_BOX_TO_SEND_MON));
boxNo = StorageGetCurrentBox(); boxNo = StorageGetCurrentBox();
@@ -3647,9 +3647,9 @@ static u8 SendMonToPC(struct Pokemon* mon)
CopyMon(checkingMon, &mon->box, sizeof(mon->box)); CopyMon(checkingMon, &mon->box, sizeof(mon->box));
gSpecialVar_MonBoxId = boxNo; gSpecialVar_MonBoxId = boxNo;
gSpecialVar_MonBoxPos = boxPos; gSpecialVar_MonBoxPos = boxPos;
if (get_unknown_box_id() != boxNo) if (GetPCBoxToSendMon() != boxNo)
FlagClear(FLAG_SYS_CHANGED_BOX_TO_STORE_MON); FlagClear(FLAG_SYS_CHANGED_BOX_TO_STORE_MON);
VarSet(VAR_0x4037, boxNo); VarSet(VAR_PC_BOX_TO_SEND_MON, boxNo);
return MON_GIVEN_TO_PC; return MON_GIVEN_TO_PC;
} }
} }