dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #882 from GriffinRichards/doc-mauville

Browse Source 
Document Mauville and New Mauville scripts
This commit is contained in:
huderlem
2019-11-07 20:22:56 -06:00
committed by GitHub
parent 1ceee6ef70 702ef745d9
commit 030784dece
24 changed files with 641 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/event.inc
View File

@@ -1080,9 +1080,11 @@
.byte \check
.endm
@ Hides the secondary box spawned by showmoney.
@ Hides the secondary box spawned by showmoney. Consumption of the x and y arguments was dummied out.
.macro hidemoneybox
.byte 0x94
.byte 0 @ \x
.byte 0 @ \y
.endm
@ Updates the secondary box spawned by showmoney. Consumes but does not use arguments.

1
data/event_scripts.s
View File

@@ -6,6 +6,7 @@
#include "constants/battle_setup.h"
#include "constants/berry.h"
#include "constants/cable_club.h"
#include "constants/coins.h"
#include "constants/contest.h"
#include "constants/daycare.h"
#include "constants/decorations.h"

2
data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
View File

@@ -196,8 +196,6 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink:: @ 8220450
LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine:: @ 822045E
hidemoneybox
nop
nop
releaseall
end

24
data/maps/MauvilleCity/map.json
View File

@@ -45,7 +45,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_1DF3B3",
"script": "MauvilleCity_EventScript_Boy",
"flag": "0"
},
{
@@ -58,7 +58,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_1DF3CE",
"script": "MauvilleCity_EventScript_RichBoy",
"flag": "0"
},
{
@@ -71,7 +71,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_1DF3BC",
"script": "MauvilleCity_EventScript_Maniac",
"flag": "0"
},
{
@@ -84,7 +84,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_1DF3C5",
"script": "MauvilleCity_EventScript_Woman",
"flag": "0"
},
{
@@ -97,7 +97,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_1DF3FB",
"script": "MauvilleCity_EventScript_SchoolKidM",
"flag": "0"
},
{
@@ -110,7 +110,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_1DF452",
"script": "MauvilleCity_EventScript_Wally",
"flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY"
},
{
@@ -123,7 +123,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_1DF41D",
"script": "MauvilleCity_EventScript_WallysUncle",
"flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE"
},
{
@@ -136,7 +136,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_1DF73A",
"script": "MauvilleCity_EventScript_Wattson",
"flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON"
},
{
@@ -246,7 +246,7 @@
"y": 6,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "MauvilleCity_EventScript_1DF3E0"
"script": "MauvilleCity_EventScript_GymSign"
},
{
"type": "sign",
@@ -278,7 +278,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "MauvilleCity_EventScript_1DF3D7"
"script": "MauvilleCity_EventScript_CitySign"
},
{
"type": "sign",
@@ -286,7 +286,7 @@
"y": 6,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "MauvilleCity_EventScript_1DF3E9"
"script": "MauvilleCity_EventScript_BikeShopSign"
},
{
"type": "sign",
@@ -294,7 +294,7 @@
"y": 15,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "MauvilleCity_EventScript_1DF3F2"
"script": "MauvilleCity_EventScript_GameCornerSign"
}
]
}

314
data/maps/MauvilleCity/scripts.inc
View File

@@ -9,88 +9,88 @@ MauvilleCity_OnTransition: @ 81DF38B
setflag FLAG_SYS_TV_START
clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
setvar VAR_MAUVILLE_GYM_STATE, 0
call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9
call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_MoveWattsonBackToGym
end
MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9
MauvilleCity_EventScript_MoveWattsonBackToGym:: @ 81DF3A9
clearflag FLAG_HIDE_MAUVILLE_GYM_WATTSON
setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON
setflag FLAG_WATTSON_REMATCH_AVAILABLE
return
MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3
msgbox MauvilleCity_Text_1E0301, MSGBOX_NPC
MauvilleCity_EventScript_Boy:: @ 81DF3B3
msgbox MauvilleCity_Text_NurseHurtMonBackToHealth, MSGBOX_NPC
end
MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC
msgbox MauvilleCity_Text_1E037C, MSGBOX_NPC
MauvilleCity_EventScript_Maniac:: @ 81DF3BC
msgbox MauvilleCity_Text_AllSortsOfPeopleComeThrough, MSGBOX_NPC
end
MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5
msgbox MauvilleCity_Text_1E03FB, MSGBOX_NPC
MauvilleCity_EventScript_Woman:: @ 81DF3C5
msgbox MauvilleCity_Text_RydelVeryGenerous, MSGBOX_NPC
end
MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE
msgbox MauvilleCity_Text_1E044A, MSGBOX_NPC
MauvilleCity_EventScript_RichBoy:: @ 81DF3CE
msgbox MauvilleCity_Text_PokemonCanJumpYouOnBike, MSGBOX_NPC
end
MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7
msgbox MauvilleCity_Text_1E0485, MSGBOX_SIGN
MauvilleCity_EventScript_CitySign:: @ 81DF3D7
msgbox MauvilleCity_Text_CitySign, MSGBOX_SIGN
end
MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0
msgbox MauvilleCity_Text_1E04B7, MSGBOX_SIGN
MauvilleCity_EventScript_GymSign:: @ 81DF3E0
msgbox MauvilleCity_Text_GymSign, MSGBOX_SIGN
end
MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9
msgbox MauvilleCity_Text_1E0504, MSGBOX_SIGN
MauvilleCity_EventScript_BikeShopSign:: @ 81DF3E9
msgbox MauvilleCity_Text_BikeShopSign, MSGBOX_SIGN
end
MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2
msgbox MauvilleCity_Text_1E053C, MSGBOX_SIGN
MauvilleCity_EventScript_GameCornerSign:: @ 81DF3F2
msgbox MauvilleCity_Text_GameCornerSign, MSGBOX_SIGN
end
MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB
MauvilleCity_EventScript_SchoolKidM:: @ 81DF3FB
lock
faceplayer
goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_1DF413
msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT
goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_TVExplained
msgbox MauvilleCity_Text_ExplainTV, MSGBOX_DEFAULT
setflag FLAG_TV_EXPLAINED
release
end
MauvilleCity_EventScript_1DF413:: @ 81DF413
msgbox MauvilleCity_Text_1E0699, MSGBOX_DEFAULT
MauvilleCity_EventScript_TVExplained:: @ 81DF413
msgbox MauvilleCity_Text_BeenCheckingOutTV, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_1DF41D:: @ 81DF41D
MauvilleCity_EventScript_WallysUncle:: @ 81DF41D
lock
faceplayer
goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D
msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT
goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_UncleAskPlayerToBattleWally
msgbox MauvilleCity_Text_UncleHesTooPeppy, MSGBOX_DEFAULT
closemessage
applymovement 7, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
MauvilleCity_EventScript_1DF43D:: @ 81DF43D
msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT
MauvilleCity_EventScript_UncleAskPlayerToBattleWally:: @ 81DF43D
msgbox MauvilleCity_Text_UncleCanYouBattleWally, MSGBOX_DEFAULT
closemessage
applymovement 7, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
MauvilleCity_EventScript_1DF452:: @ 81DF452
MauvilleCity_EventScript_Wally:: @ 81DF452
lockall
goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690
goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_WallyRequestBattleAgain
applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_WallyWantToChallengeGym, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_UncleYourePushingIt, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_WallyWeCanBeatAnyone, MSGBOX_DEFAULT
applymovement 6, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
@@ -98,61 +98,61 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452
waitmovement 0
applymovement 6, Common_Movement_Delay48
waitmovement 0
msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO
goto MauvilleCity_EventScript_1DF4AD
msgbox MauvilleCity_Text_WallyWillYouBattleMe, MSGBOX_YESNO
goto MauvilleCity_EventScript_BattleWallyPrompt
end
MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD
MauvilleCity_EventScript_BattleWallyPrompt:: @ 81DF4AD
compare VAR_RESULT, YES
call_if_eq MauvilleCity_EventScript_1DF63A
call_if_eq MauvilleCity_EventScript_BattleWally
compare VAR_RESULT, NO
goto_if_eq MauvilleCity_EventScript_1DF683
goto_if_eq MauvilleCity_EventScript_DeclineWallyBattle
closemessage
switch VAR_FACING
case DIR_NORTH, MauvilleCity_EventScript_1DF4E0
case DIR_EAST, MauvilleCity_EventScript_1DF53D
case DIR_NORTH, MauvilleCity_EventScript_WallyAndUncleExitNorth
case DIR_EAST, MauvilleCity_EventScript_WallyAndUncleExitEast
end
MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DF
applymovement 6, MauvilleCity_Movement_1DF6A8
applymovement 7, MauvilleCity_Movement_1DF6E2
MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1
applymovement 6, MauvilleCity_Movement_WallyExitNorth1
applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth1
waitmovement 0
applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 30
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE
applymovement 7, MauvilleCity_Movement_1DF6F3
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth
applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerNorth
waitmovement 0
msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6CC
applymovement 7, MauvilleCity_Movement_1DF6FA
applymovement 6, MauvilleCity_Movement_1DF6B4
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2
applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth2
applymovement 6, MauvilleCity_Movement_WallyExitNorth2
waitmovement 0
goto MauvilleCity_EventScript_1DF593
goto MauvilleCity_EventScript_DefeatedWally
end
MauvilleCity_EventScript_1DF53D:: @ 81DF53D
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DC
applymovement 6, MauvilleCity_Movement_1DF6AE
applymovement 7, MauvilleCity_Movement_1DF6E8
MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1
applymovement 6, MauvilleCity_Movement_WallyExitEast1
applymovement 7, MauvilleCity_Movement_WallysUncleExitEast1
waitmovement 0
applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 30
applymovement 7, MauvilleCity_Movement_1DF6F7
applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerEast
waitmovement 0
msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D0
applymovement 7, MauvilleCity_Movement_1DF703
applymovement 6, MauvilleCity_Movement_1DF6C0
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2
applymovement 7, MauvilleCity_Movement_WallysUncleExitEast2
applymovement 6, MauvilleCity_Movement_WallyExitEast2
waitmovement 0
goto MauvilleCity_EventScript_1DF593
goto MauvilleCity_EventScript_DefeatedWally
end
MauvilleCity_EventScript_1DF593:: @ 81DF593
MauvilleCity_EventScript_DefeatedWally:: @ 81DF593
removeobject 6
removeobject 7
clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
@@ -161,75 +161,75 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
setvar VAR_WALLY_CALL_STEP_COUNTER, 0
setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL
compare VAR_FACING, DIR_NORTH
call_if_eq MauvilleCity_EventScript_1DF5F3
call_if_eq MauvilleCity_EventScript_ScottApproachPlayerNorth
compare VAR_FACING, DIR_EAST
call_if_eq MauvilleCity_EventScript_1DF601
call_if_eq MauvilleCity_EventScript_ScottApproachPlayerEast
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_ScottYouDidntHoldBack, MSGBOX_DEFAULT
closemessage
addvar VAR_SCOTT_STATE, 1
compare VAR_FACING, DIR_NORTH
call_if_eq MauvilleCity_EventScript_1DF616
call_if_eq MauvilleCity_EventScript_ScottExitNorth
compare VAR_FACING, DIR_EAST
call_if_eq MauvilleCity_EventScript_1DF628
call_if_eq MauvilleCity_EventScript_ScottExitEast
removeobject 11
releaseall
end
MauvilleCity_EventScript_1DF5F3:: @ 81DF5F3
MauvilleCity_EventScript_ScottApproachPlayerNorth:: @ 81DF5F3
addobject 11
applymovement 11, MauvilleCity_Movement_1DF70D
applymovement 11, MauvilleCity_Movement_ScottApproachPlayerNorth
waitmovement 0
return
MauvilleCity_EventScript_1DF601:: @ 81DF601
MauvilleCity_EventScript_ScottApproachPlayerEast:: @ 81DF601
setobjectxyperm 11, 12, 13
addobject 11
applymovement 11, MauvilleCity_Movement_1DF719
applymovement 11, MauvilleCity_Movement_ScottApproachPlayerEast
waitmovement 0
return
MauvilleCity_EventScript_1DF616:: @ 81DF616
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D5
applymovement 11, MauvilleCity_Movement_1DF725
MauvilleCity_EventScript_ScottExitNorth:: @ 81DF616
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth
applymovement 11, MauvilleCity_Movement_ScottExitNorth
waitmovement 0
return
MauvilleCity_EventScript_1DF628:: @ 81DF628
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D8
applymovement 11, MauvilleCity_Movement_1DF72F
MauvilleCity_EventScript_ScottExitEast:: @ 81DF628
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast
applymovement 11, MauvilleCity_Movement_ScottExitEast
waitmovement 0
return
MauvilleCity_EventScript_1DF63A:: @ 81DF63A
msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96
MauvilleCity_EventScript_BattleWally:: @ 81DF63A
msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_WallyDefeat
applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT
applymovement 6, Common_Movement_FacePlayer
waitmovement 0
msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_ThankYouNotEnoughToBattle, MSGBOX_DEFAULT
applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_UncleNoNeedToBeDown, MSGBOX_DEFAULT
return
MauvilleCity_EventScript_1DF683:: @ 81DF683
MauvilleCity_EventScript_DeclineWallyBattle:: @ 81DF683
setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
msgbox MauvilleCity_Text_1DFA4A, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_WallyMyUncleWontKnowImStrong, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_1DF690:: @ 81DF690
MauvilleCity_EventScript_WallyRequestBattleAgain:: @ 81DF690
applymovement 6, Common_Movement_FacePlayer
waitmovement 0
msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO
goto MauvilleCity_EventScript_1DF4AD
msgbox MauvilleCity_Text_WallyPleaseBattleMe, MSGBOX_YESNO
goto MauvilleCity_EventScript_BattleWallyPrompt
end
MauvilleCity_Movement_1DF6A8: @ 81DF6A8
MauvilleCity_Movement_WallyExitNorth1: @ 81DF6A8
walk_left
walk_left
walk_down
@@ -237,7 +237,7 @@ MauvilleCity_Movement_1DF6A8: @ 81DF6A8
walk_left
step_end
MauvilleCity_Movement_1DF6AE: @ 81DF6AE
MauvilleCity_Movement_WallyExitEast1: @ 81DF6AE
walk_down
walk_down
walk_left
@@ -245,7 +245,7 @@ MauvilleCity_Movement_1DF6AE: @ 81DF6AE
walk_left
step_end
MauvilleCity_Movement_1DF6B4: @ 81DF6B4
MauvilleCity_Movement_WallyExitNorth2: @ 81DF6B4
delay_16
delay_16
walk_left
@@ -259,7 +259,7 @@ MauvilleCity_Movement_1DF6B4: @ 81DF6B4
delay_8
step_end
MauvilleCity_Movement_1DF6C0: @ 81DF6C0
MauvilleCity_Movement_WallyExitEast2: @ 81DF6C0
delay_16
delay_16
walk_left
@@ -273,41 +273,41 @@ MauvilleCity_Movement_1DF6C0: @ 81DF6C0
delay_8
step_end
MauvilleCity_Movement_1DF6CC: @ 81DF6CC
MauvilleCity_Movement_PlayerWatchWallyExitNorth2: @ 81DF6CC
delay_16
delay_8
walk_in_place_fastest_left
step_end
MauvilleCity_Movement_1DF6D0: @ 81DF6D0
MauvilleCity_Movement_PlayerWatchWallyExitEast2: @ 81DF6D0
delay_16
delay_16
delay_16
walk_in_place_fastest_left
step_end
MauvilleCity_Movement_1DF6D5: @ 81DF6D5
MauvilleCity_Movement_PlayerWatchScottExitNorth: @ 81DF6D5
delay_16
walk_in_place_fastest_left
step_end
MauvilleCity_Movement_1DF6D8: @ 81DF6D8
MauvilleCity_Movement_PlayerWatchScottExitEast: @ 81DF6D8
delay_16
delay_16
walk_in_place_fastest_left
step_end
MauvilleCity_Movement_1DF6DC: @ 81DF6DC
MauvilleCity_Movement_PlayerWatchWallyExitEast1: @ 81DF6DC
delay_16
walk_in_place_fastest_down
step_end
MauvilleCity_Movement_1DF6DF: @ 81DF6DF
MauvilleCity_Movement_PlayerWatchWallyExitNorth1: @ 81DF6DF
delay_16
walk_in_place_fastest_left
step_end
MauvilleCity_Movement_1DF6E2: @ 81DF6E2
MauvilleCity_Movement_WallysUncleExitNorth1: @ 81DF6E2
walk_left
walk_left
walk_left
@@ -315,7 +315,7 @@ MauvilleCity_Movement_1DF6E2: @ 81DF6E2
walk_down
step_end
MauvilleCity_Movement_1DF6E8: @ 81DF6E8
MauvilleCity_Movement_WallysUncleExitEast1: @ 81DF6E8
walk_left
walk_down
walk_down
@@ -323,25 +323,25 @@ MauvilleCity_Movement_1DF6E8: @ 81DF6E8
walk_left
step_end
MauvilleCity_Movement_1DF6EE: @ 81DF6EE
MauvilleCity_Movement_PlayerFaceUncleNorth: @ 81DF6EE
delay_16
delay_8
delay_4
walk_in_place_fastest_down
step_end
MauvilleCity_Movement_1DF6F3: @ 81DF6F3
MauvilleCity_Movement_WallysUncleApproachPlayerNorth: @ 81DF6F3
walk_right
walk_right
walk_in_place_fastest_up
step_end
MauvilleCity_Movement_1DF6F7: @ 81DF6F7
MauvilleCity_Movement_WallysUncleApproachPlayerEast: @ 81DF6F7
walk_right
walk_up
step_end
MauvilleCity_Movement_1DF6FA: @ 81DF6FA
MauvilleCity_Movement_WallysUncleExitNorth2: @ 81DF6FA
walk_left
walk_left
walk_left
@@ -352,7 +352,7 @@ MauvilleCity_Movement_1DF6FA: @ 81DF6FA
walk_left
step_end
MauvilleCity_Movement_1DF703: @ 81DF703
MauvilleCity_Movement_WallysUncleExitEast2: @ 81DF703
walk_down
walk_left
walk_left
@@ -364,7 +364,7 @@ MauvilleCity_Movement_1DF703: @ 81DF703
walk_left
step_end
MauvilleCity_Movement_1DF70D: @ 81DF70D
MauvilleCity_Movement_ScottApproachPlayerNorth: @ 81DF70D
walk_up
walk_up
walk_up
@@ -378,7 +378,7 @@ MauvilleCity_Movement_1DF70D: @ 81DF70D
walk_in_place_fastest_up
step_end
MauvilleCity_Movement_1DF719: @ 81DF719
MauvilleCity_Movement_ScottApproachPlayerEast: @ 81DF719
walk_up
walk_up
walk_up
@@ -392,7 +392,7 @@ MauvilleCity_Movement_1DF719: @ 81DF719
walk_up
step_end
MauvilleCity_Movement_1DF725: @ 81DF725
MauvilleCity_Movement_ScottExitNorth: @ 81DF725
walk_left
walk_left
walk_left
@@ -404,7 +404,7 @@ MauvilleCity_Movement_1DF725: @ 81DF725
walk_left
step_end
MauvilleCity_Movement_1DF72F: @ 81DF72F
MauvilleCity_Movement_ScottExitEast: @ 81DF72F
walk_down
walk_left
walk_left
@@ -417,47 +417,47 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F
walk_left
step_end
MauvilleCity_EventScript_1DF73A:: @ 81DF73A
MauvilleCity_EventScript_Wattson:: @ 81DF73A
lock
faceplayer
goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0
goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_ReceivedThunderbolt
compare VAR_NEW_MAUVILLE_STATE, 2
goto_if_eq MauvilleCity_EventScript_1DF784
goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A
msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT
goto_if_eq MauvilleCity_EventScript_CompletedNewMauville
goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_BegunNewMauville
msgbox MauvilleCity_Text_WattsonNeedFavorTakeKey, MSGBOX_DEFAULT
giveitem_std ITEM_BASEMENT_KEY
setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_1DF77A:: @ 81DF77A
msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT
MauvilleCity_EventScript_BegunNewMauville:: @ 81DF77A
msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_1DF784:: @ 81DF784
msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT
MauvilleCity_EventScript_CompletedNewMauville:: @ 81DF784
msgbox MauvilleCity_Text_WattsonThanksTakeTM, MSGBOX_DEFAULT
giveitem_std ITEM_TM24
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_GOT_TM24_FROM_WATTSON
msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0
msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT
MauvilleCity_EventScript_ReceivedThunderbolt:: @ 81DF7B0
msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA
MauvilleCity_EventScript_RegisterWallyCall:: @ 81DF7BA
lockall
pokenavcall MauvilleCity_Text_1DFDFB
pokenavcall MauvilleCity_Text_WallyPokenavCall
waitmessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox MauvilleCity_Text_1DFEB4, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_RegisteredWally, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -466,30 +466,30 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA
releaseall
end
MauvilleCity_Text_1DF7DC: @ 81DF7DC
MauvilleCity_Text_UncleHesTooPeppy: @ 81DF7DC
.string "UNCLE: It's because of POKéMON that\n"
.string "this boy's got more pep, I suppose…\l"
.string "But he's become a bit too peppy…$"
MauvilleCity_Text_1DF845: @ 81DF845
MauvilleCity_Text_WallyWantToChallengeGym: @ 81DF845
.string "WALLY: Aww, UNCLE, please?\p"
.string "I want to challenge this GYM and see\n"
.string "how much better I've become.\p"
.string "Please? May I, please?$"
MauvilleCity_Text_1DF8B9: @ 81DF8B9
MauvilleCity_Text_UncleYourePushingIt: @ 81DF8B9
.string "UNCLE: Now hold on, WALLY.\p"
.string "Since you started living with POKéMON,\n"
.string "you have grown quite a lot stronger.\p"
.string "But don't you think you're pushing it\n"
.string "to suddenly challenge a GYM?$"
MauvilleCity_Text_1DF963: @ 81DF963
MauvilleCity_Text_WallyWeCanBeatAnyone: @ 81DF963
.string "WALLY: I'm not pushing it.\p"
.string "If I combine forces with RALTS,\n"
.string "we can beat anyone!$"
MauvilleCity_Text_1DF9B2: @ 81DF9B2
MauvilleCity_Text_WallyWillYouBattleMe: @ 81DF9B2
.string "WALLY: Oh! Hi, {PLAYER}!\p"
.string "I've gotten a lot stronger since\n"
.string "we met.\p"
@@ -498,43 +498,43 @@ MauvilleCity_Text_1DF9B2: @ 81DF9B2
.string "{PLAYER}, please, will you have\n"
.string "a battle with me?$"
MauvilleCity_Text_1DFA4A: @ 81DFA4A
MauvilleCity_Text_WallyMyUncleWontKnowImStrong: @ 81DFA4A
.string "WALLY: Oh… If you won't battle me,\n"
.string "{PLAYER}, my UNCLE won't know that I've\l"
.string "become really strong.$"
MauvilleCity_Text_1DFAA5: @ 81DFAA5
MauvilleCity_Text_UncleCanYouBattleWally: @ 81DFAA5
.string "UNCLE: {PLAYER}{KUN}, was it?\n"
.string "On WALLY's behalf, can I ask you to\l"
.string "battle with him just this once?\p"
.string "I don't think he's going to listen to\n"
.string "any reason the way he is now.$"
MauvilleCity_Text_1DFB42: @ 81DFB42
MauvilleCity_Text_WallyPleaseBattleMe: @ 81DFB42
.string "WALLY: {PLAYER}, please!\n"
.string "Battle with me, please.$"
MauvilleCity_Text_1DFB6D: @ 81DFB6D
MauvilleCity_Text_WallyHereICome: @ 81DFB6D
.string "WALLY: {PLAYER}, thank you.\p"
.string "Okay… Here I come!$"
MauvilleCity_Text_1DFB96: @ 81DFB96
MauvilleCity_Text_WallyDefeat: @ 81DFB96
.string "WALLY: … … … … … … …\p"
.string "… … … … … … … …\p"
.string "I lost…$"
MauvilleCity_Text_1DFBC3: @ 81DFBC3
MauvilleCity_Text_WallyIllGoBackToVerdanturf: @ 81DFBC3
.string "WALLY: UNCLE…\n"
.string "I'll go back to VERDANTURF…$"
MauvilleCity_Text_1DFBED: @ 81DFBED
MauvilleCity_Text_ThankYouNotEnoughToBattle: @ 81DFBED
.string "{PLAYER}, thank you.\n"
.string "Being a TRAINER is tough, isn't it?\p"
.string "It's not enough just to have POKéMON\n"
.string "and make them battle. That isn't what\l"
.string "being a real TRAINER is about.$"
MauvilleCity_Text_1DFC8A: @ 81DFC8A
MauvilleCity_Text_UncleNoNeedToBeDown: @ 81DFC8A
.string "UNCLE: WALLY, there's no need to be so\n"
.string "down on yourself.\p"
.string "Why, what's keeping you from becoming\n"
@@ -542,7 +542,7 @@ MauvilleCity_Text_1DFC8A: @ 81DFC8A
.string "Come on, let's go home.\n"
.string "Everyone's waiting for you.$"
MauvilleCity_Text_1DFD34: @ 81DFD34
MauvilleCity_Text_UncleVisitUsSometime: @ 81DFD34
.string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n"
.string "that you must be the TRAINER who kept\l"
.string "an eye out for WALLY when he caught\l"
@@ -552,7 +552,7 @@ MauvilleCity_Text_1DFD34: @ 81DFD34
.string "I'm sure WALLY would enjoy it.$"
MauvilleCity_Text_1DFDFB: @ 81DFDFB
MauvilleCity_Text_WallyPokenavCall: @ 81DFDFB
.string "… … … … … …\n"
.string "… … … … … Beep!\p"
.string "WALLY: Oh, hello, {PLAYER}!\p"
@@ -563,11 +563,11 @@ MauvilleCity_Text_1DFDFB: @ 81DFDFB
.string "… … … … … …\n"
.string "… … … … … Click!$"
MauvilleCity_Text_1DFEB4: @ 81DFEB4
MauvilleCity_Text_RegisteredWally: @ 81DFEB4
.string "Registered WALLY\n"
.string "in the POKéNAV.$"
MauvilleCity_Text_1DFED5: @ 81DFED5
MauvilleCity_Text_ScottYouDidntHoldBack: @ 81DFED5
.string "SCOTT: Hehe…\n"
.string "I was watching that match!\p"
.string "You're friends with that boy WALLY,\n"
@@ -580,7 +580,7 @@ MauvilleCity_Text_1DFED5: @ 81DFED5
.string "… … … … … …\n"
.string "I'll be cheering for you!$"
MauvilleCity_Text_1DFFE4: @ 81DFFE4
MauvilleCity_Text_WattsonNeedFavorTakeKey: @ 81DFFE4
.string "WATTSON: Oh, {PLAYER}{KUN}!\n"
.string "You look like you have a lot of zip!\l"
.string "That's a good thing, wahahahaha!\p"
@@ -595,7 +595,7 @@ MauvilleCity_Text_1DFFE4: @ 81DFFE4
.string "Here, this is the KEY to get into\n"
.string "NEW MAUVILLE.$"
MauvilleCity_Text_1E0154: @ 81E0154
MauvilleCity_Text_WattsonWontBeChallenge: @ 81E0154
.string "WATTSON: Don't you worry about it.\n"
.string "It won't be a challenge to you.\p"
.string "The entrance to NEW MAUVILLE is just\n"
@@ -603,7 +603,7 @@ MauvilleCity_Text_1E0154: @ 81E0154
.string "That's it, then, you have my trust!\n"
.string "Wahahahaha!$"
MauvilleCity_Text_1E020E: @ 81E020E
MauvilleCity_Text_WattsonThanksTakeTM: @ 81E020E
.string "WATTSON: Wahahahaha!\p"
.string "I knew it, {PLAYER}{KUN}! I knew I'd made\n"
.string "the right choice asking you!\p"
@@ -611,51 +611,51 @@ MauvilleCity_Text_1E020E: @ 81E020E
.string "THUNDERBOLT!\p"
.string "Go on, you've earned it!$"
MauvilleCity_Text_1E02AA: @ 81E02AA
MauvilleCity_Text_WattsonYoungTakeCharge: @ 81E02AA
.string "WATTSON: Wahahahaha!\p"
.string "It pleases me to no end to see\n"
.string "the young step up and take charge!$"
MauvilleCity_Text_1E0301: @ 81E0301
MauvilleCity_Text_NurseHurtMonBackToHealth: @ 81E0301
.string "You know, it's cool to have POKéMON\n"
.string "battles and stuff…\p"
.string "But if your POKéMON gets hurt,\n"
.string "you have to nurse it back to health.$"
MauvilleCity_Text_1E037C: @ 81E037C
MauvilleCity_Text_AllSortsOfPeopleComeThrough: @ 81E037C
.string "The roads of this town stretch north\n"
.string "and south, and east and west.\p"
.string "Because of that, we get all sorts of\n"
.string "people coming through.$"
MauvilleCity_Text_1E03FB: @ 81E03FB
MauvilleCity_Text_RydelVeryGenerous: @ 81E03FB
.string "Have you been to RYDEL'S CYCLES yet?\p"
.string "RYDEL, the owner, is a very generous\n"
.string "man.$"
MauvilleCity_Text_1E044A: @ 81E044A
MauvilleCity_Text_PokemonCanJumpYouOnBike: @ 81E044A
.string "Even if you're riding a BIKE,\n"
.string "wild POKéMON could jump you.$"
MauvilleCity_Text_1E0485: @ 81E0485
MauvilleCity_Text_CitySign: @ 81E0485
.string "MAUVILLE CITY\n"
.string "“The bright and shiny city of fun!”$"
MauvilleCity_Text_1E04B7: @ 81E04B7
MauvilleCity_Text_GymSign: @ 81E04B7
.string "MAUVILLE CITY POKéMON GYM\n"
.string "LEADER: WATTSON\l"
.string "“The cheerfully electrifying man!”$"
MauvilleCity_Text_1E0504: @ 81E0504
MauvilleCity_Text_BikeShopSign: @ 81E0504
.string "“Ride in gravel and shake up your\n"
.string "soul!”\l"
.string "RYDEL'S CYCLES$"
MauvilleCity_Text_1E053C: @ 81E053C
MauvilleCity_Text_GameCornerSign: @ 81E053C
.string "“The play spot for all!”\n"
.string "MAUVILLE GAME CORNER$"
MauvilleCity_Text_1E056A: @ 81E056A
MauvilleCity_Text_ExplainTV: @ 81E056A
.string "Hi, do you check out TV at all?\p"
.string "They've added a bunch of cool new\n"
.string "shows recently.\p"
@@ -667,5 +667,5 @@ MauvilleCity_Text_1E056A: @ 81E056A
.string "That's why I think you should check\n"
.string "out TVs whenever you can.$"
MauvilleCity_Text_1E0699: @ 81E0699
MauvilleCity_Text_BeenCheckingOutTV: @ 81E0699
.string "Hi, have you been checking out TVs?$"

48
data/maps/MauvilleCity_GameCorner/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_210125",
"script": "MauvilleCity_GameCorner_EventScript_Woman2",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_21012E",
"script": "MauvilleCity_GameCorner_EventScript_Gentleman",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_20FBB9",
"script": "MauvilleCity_GameCorner_EventScript_CoinsClerk",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_20FCF1",
"script": "MauvilleCity_GameCorner_EventScript_PrizeCornerDolls",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_210137",
"script": "MauvilleCity_GameCorner_EventScript_Girl",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_21021D",
"script": "MauvilleCity_GameCorner_EventScript_PokefanM",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_210279",
"script": "MauvilleCity_GameCorner_EventScript_OldMan",
"flag": "0"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_210289",
"script": "MauvilleCity_GameCorner_EventScript_Cook",
"flag": "0"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_20FE9F",
"script": "MauvilleCity_GameCorner_EventScript_PrizeCornerTMs",
"flag": "0"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_210299",
"script": "MauvilleCity_GameCorner_EventScript_Man",
"flag": "0"
},
{
@@ -154,7 +154,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_2102B6",
"script": "MauvilleCity_GameCorner_EventScript_Maniac",
"flag": "0"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_GameCorner_EventScript_2102C6",
"script": "MauvilleCity_GameCorner_EventScript_Woman",
"flag": "0"
}
],
@@ -195,7 +195,7 @@
"y": 6,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
"script": "MauvilleCity_GameCorner_EventScript_2102D6"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine0"
},
{
"type": "sign",
@@ -203,7 +203,7 @@
"y": 8,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
"script": "MauvilleCity_GameCorner_EventScript_2102F6"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine1"
},
{
"type": "sign",
@@ -211,7 +211,7 @@
"y": 9,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
"script": "MauvilleCity_GameCorner_EventScript_210316"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine2"
},
{
"type": "sign",
@@ -219,7 +219,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
"script": "MauvilleCity_GameCorner_EventScript_210336"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine3"
},
{
"type": "sign",
@@ -227,7 +227,7 @@
"y": 8,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
"script": "MauvilleCity_GameCorner_EventScript_210356"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine4"
},
{
"type": "sign",
@@ -235,7 +235,7 @@
"y": 9,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
"script": "MauvilleCity_GameCorner_EventScript_210376"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine5"
},
{
"type": "sign",
@@ -243,7 +243,7 @@
"y": 6,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
"script": "MauvilleCity_GameCorner_EventScript_210396"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine6"
},
{
"type": "sign",
@@ -251,7 +251,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
"script": "MauvilleCity_GameCorner_EventScript_2103B6"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine7"
},
{
"type": "sign",
@@ -259,7 +259,7 @@
"y": 9,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST",
"script": "MauvilleCity_GameCorner_EventScript_2103D6"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine8"
},
{
"type": "sign",
@@ -267,7 +267,7 @@
"y": 6,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
"script": "MauvilleCity_GameCorner_EventScript_2103F6"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine9"
},
{
"type": "sign",
@@ -275,7 +275,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
"script": "MauvilleCity_GameCorner_EventScript_210416"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine10"
},
{
"type": "sign",
@@ -283,7 +283,7 @@
"y": 9,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST",
"script": "MauvilleCity_GameCorner_EventScript_210436"
"script": "MauvilleCity_GameCorner_EventScript_SlotMachine11"
},
{
"type": "sign",

630
data/maps/MauvilleCity_GameCorner/scripts.inc
View File

File diff suppressed because it is too large Load Diff

2
data/maps/MauvilleCity_House1/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_House1_EventScript_20F976",
"script": "MauvilleCity_House1_EventScript_RockSmashDude",
"flag": "0"
}
],

18
data/maps/MauvilleCity_House1/scripts.inc
View File

@@ -1,24 +1,24 @@
MauvilleCity_House1_MapScripts:: @ 820F975
.byte 0
MauvilleCity_House1_EventScript_20F976:: @ 820F976
MauvilleCity_House1_EventScript_RockSmashDude:: @ 820F976
lock
faceplayer
goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_20F9A5
msgbox MauvilleCity_House1_Text_20F9AF, MSGBOX_DEFAULT
goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_ReceivedRockSmash
msgbox MauvilleCity_House1_Text_ImRockSmashDudeTakeThis, MSGBOX_DEFAULT
giveitem_std ITEM_HM06
setflag FLAG_RECEIVED_HM06
setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY
msgbox MauvilleCity_House1_Text_20FAA9, MSGBOX_DEFAULT
msgbox MauvilleCity_House1_Text_ExplainRockSmash, MSGBOX_DEFAULT
release
end
MauvilleCity_House1_EventScript_20F9A5:: @ 820F9A5
msgbox MauvilleCity_House1_Text_20FB67, MSGBOX_DEFAULT
MauvilleCity_House1_EventScript_ReceivedRockSmash:: @ 820F9A5
msgbox MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock, MSGBOX_DEFAULT
release
end
MauvilleCity_House1_Text_20F9AF: @ 820F9AF
MauvilleCity_House1_Text_ImRockSmashDudeTakeThis: @ 820F9AF
.string "Woohoo!\p"
.string "I hear people call me the ROCK SMASH\n"
.string "GUY, but I find that sort of degrading.\p"
@@ -30,7 +30,7 @@ MauvilleCity_House1_Text_20F9AF: @ 820F9AF
.string "I like that!\n"
.string "Here, take this HIDDEN MACHINE!$"
MauvilleCity_House1_Text_20FAA9: @ 820FAA9
MauvilleCity_House1_Text_ExplainRockSmash: @ 820FAA9
.string "That HM contains ROCK SMASH.\p"
.string "If you come across large boulders\n"
.string "that block your path…\p"
@@ -39,7 +39,7 @@ MauvilleCity_House1_Text_20FAA9: @ 820FAA9
.string "Yes, sir! Smash rocks aside, I say!\n"
.string "Woohoo!$"
MauvilleCity_House1_Text_20FB67: @ 820FB67
MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock: @ 820FB67
.string "Oh, yes, if you smash a rock, a POKéMON\n"
.string "could come flying out of hiding.\p"
.string "Woohoo!$"

2
data/maps/MauvilleCity_House2/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_House2_EventScript_210C5D",
"script": "MauvilleCity_House2_EventScript_Woman",
"flag": "0"
}
],

42
data/maps/MauvilleCity_House2/scripts.inc
View File

@@ -1,67 +1,67 @@
MauvilleCity_House2_MapScripts:: @ 8210C5C
.byte 0
MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D
MauvilleCity_House2_EventScript_Woman:: @ 8210C5D
lock
faceplayer
goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_210CDA
msgbox MauvilleCity_House2_Text_210CEE, MSGBOX_DEFAULT
goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_ReceivedCoinCase
msgbox MauvilleCity_House2_Text_BuyHarborMailAtSlateport, MSGBOX_DEFAULT
checkitem ITEM_HARBOR_MAIL, 1
compare VAR_RESULT, 1
goto_if_eq MauvilleCity_House2_EventScript_210C82
compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_House2_EventScript_AskToTradeForHarborMail
release
end
MauvilleCity_House2_EventScript_210C82:: @ 8210C82
MauvilleCity_House2_EventScript_AskToTradeForHarborMail:: @ 8210C82
playse SE_PIN
applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
waitmovement 0
applymovement VAR_LAST_TALKED, Common_Movement_Delay48
waitmovement 0
msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO
msgbox MauvilleCity_House2_Text_TradeHarborMailForCoinCase, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq MauvilleCity_House2_EventScript_210CB8
goto_if_eq MauvilleCity_House2_EventScript_AcceptTrade
compare VAR_RESULT, NO
goto_if_eq MauvilleCity_House2_EventScript_210CE4
goto_if_eq MauvilleCity_House2_EventScript_DeclineTrade
end
MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8
msgbox MauvilleCity_House2_Text_210DB3, MSGBOX_DEFAULT
MauvilleCity_House2_EventScript_AcceptTrade:: @ 8210CB8
msgbox MauvilleCity_House2_Text_IllTradeYouCoinCase, MSGBOX_DEFAULT
takeitem ITEM_HARBOR_MAIL, 1
giveitem_std ITEM_COIN_CASE
setflag FLAG_RECEIVED_COIN_CASE
goto MauvilleCity_House2_EventScript_210CDA
goto MauvilleCity_House2_EventScript_ReceivedCoinCase
end
MauvilleCity_House2_EventScript_210CDA:: @ 8210CDA
msgbox MauvilleCity_House2_Text_210DE7, MSGBOX_DEFAULT
MauvilleCity_House2_EventScript_ReceivedCoinCase:: @ 8210CDA
msgbox MauvilleCity_House2_Text_UseCoinCaseAtGameCorner, MSGBOX_DEFAULT
release
end
MauvilleCity_House2_EventScript_210CE4:: @ 8210CE4
msgbox MauvilleCity_House2_Text_210E16, MSGBOX_DEFAULT
MauvilleCity_House2_EventScript_DeclineTrade:: @ 8210CE4
msgbox MauvilleCity_House2_Text_ThatsDisappointing, MSGBOX_DEFAULT
release
end
MauvilleCity_House2_Text_210CEE: @ 8210CEE
MauvilleCity_House2_Text_BuyHarborMailAtSlateport: @ 8210CEE
.string "If I had a BIKE, it'd be easy to cycle to\n"
.string "SLATEPORT for some shopping.\p"
.string "I'd be able to buy HARBOR MAIL at the\n"
.string "POKéMON MART in SLATEPORT…$"
MauvilleCity_House2_Text_210D76: @ 8210D76
MauvilleCity_House2_Text_TradeHarborMailForCoinCase: @ 8210D76
.string "Oh! You have HARBOR MAIL?\n"
.string "Will you trade it for a COIN CASE?$"
MauvilleCity_House2_Text_210DB3: @ 8210DB3
MauvilleCity_House2_Text_IllTradeYouCoinCase: @ 8210DB3
.string "Oh, I'm so happy!\n"
.string "Okay, I'll trade you a COIN CASE!$"
MauvilleCity_House2_Text_210DE7: @ 8210DE7
MauvilleCity_House2_Text_UseCoinCaseAtGameCorner: @ 8210DE7
.string "That COIN CASE can be used\n"
.string "at the GAME CORNER.$"
MauvilleCity_House2_Text_210E16: @ 8210E16
MauvilleCity_House2_Text_ThatsDisappointing: @ 8210E16
.string "Oh, that's disappointing.\p"
.string "A COIN CASE is needed for the\n"
.string "GAME CORNER.$"

8
data/maps/MtChimney/scripts.inc
View File

@@ -115,16 +115,12 @@ MtChimney_EventScript_LavaCookieLady:: @ 822EEF3
compare VAR_RESULT, FALSE
goto_if_eq MtChimney_EventScript_BagIsFull
hidemoneybox
nop
nop
release
end
MtChimney_EventScript_BagIsFull:: @ 822EF51
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
@@ -136,16 +132,12 @@ MtChimney_EventScript_TakeMoney:: @ 822EF5E
MtChimney_EventScript_DeclineLavaCookie:: @ 822EF69
msgbox MtChimney_Text_OhFineThen, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
MtChimney_EventScript_NotEnoughMoney:: @ 822EF76
msgbox MtChimney_Text_YouveNotGotTheMoney, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end

2
data/maps/NewMauville_Entrance/map.json
View File

@@ -38,7 +38,7 @@
"elevation": 3,
"var": "VAR_NEW_MAUVILLE_STATE",
"var_value": "0",
"script": "NewMauville_Entrance_EventScript_2372FF"
"script": "NewMauville_Entrance_EventScript_Door"
}
],
"bg_events": []

30
data/maps/NewMauville_Entrance/scripts.inc
View File

@@ -1,14 +1,14 @@
NewMauville_Entrance_MapScripts:: @ 82372AD
map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8
map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_OnTransition
.byte 0
NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
NewMauville_Entrance_OnLoad: @ 82372B8
compare VAR_NEW_MAUVILLE_STATE, 0
call_if_eq NewMauville_Entrance_EventScript_2372C4
call_if_eq NewMauville_Entrance_EventScript_CloseDoor
end
NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
NewMauville_Entrance_EventScript_CloseDoor:: @ 82372C4
setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile0, 1
setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile1, 1
setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile2, 1
@@ -21,18 +21,18 @@ NewMauville_Entrance_OnTransition: @ 82372FB
setflag FLAG_LANDMARK_NEW_MAUVILLE
end
NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
NewMauville_Entrance_EventScript_Door:: @ 82372FF
lockall
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT
msgbox NewMauville_Entrance_Text_DoorIsLocked, MSGBOX_DEFAULT
checkitem ITEM_BASEMENT_KEY, 1
compare VAR_RESULT, 0
goto_if_eq NewMauville_Entrance_EventScript_237380
msgbox NewMauville_Entrance_Text_237396, MSGBOX_YESNO
compare VAR_RESULT, FALSE
goto_if_eq NewMauville_Entrance_EventScript_DontOpenDoor
msgbox NewMauville_Entrance_Text_UseBasementKey, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq NewMauville_Entrance_EventScript_237380
msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT
goto_if_eq NewMauville_Entrance_EventScript_DontOpenDoor
msgbox NewMauville_Entrance_Text_UsedBasementKey, MSGBOX_DEFAULT
setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile0, 0
setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile1, 0
setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile2, 0
@@ -45,17 +45,17 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
releaseall
end
NewMauville_Entrance_EventScript_237380:: @ 8237380
NewMauville_Entrance_EventScript_DontOpenDoor:: @ 8237380
releaseall
end
NewMauville_Entrance_Text_237382: @ 8237382
NewMauville_Entrance_Text_DoorIsLocked: @ 8237382
.string "The door is locked.$"
NewMauville_Entrance_Text_237396: @ 8237396
NewMauville_Entrance_Text_UseBasementKey: @ 8237396
.string "Use the BASEMENT KEY?$"
NewMauville_Entrance_Text_2373AC: @ 82373AC
NewMauville_Entrance_Text_UsedBasementKey: @ 82373AC
.string "{PLAYER} used the BASEMENT KEY.\p"
.string "The door opened!$"

42
data/maps/NewMauville_Inside/map.json
View File

@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_2377AF",
"script": "NewMauville_Inside_EventScript_Voltorb1",
"flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_2377FC",
"script": "NewMauville_Inside_EventScript_Voltorb2",
"flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_237849",
"script": "NewMauville_Inside_EventScript_Voltorb3",
"flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3"
}
],
@@ -136,7 +136,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "NewMauville_Inside_EventScript_237459"
"script": "NewMauville_Inside_EventScript_BlueButton"
},
{
"type": "trigger",
@@ -145,7 +145,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
"script": "NewMauville_Inside_EventScript_237471"
"script": "NewMauville_Inside_EventScript_GreenButton"
},
{
"type": "trigger",
@@ -154,7 +154,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "NewMauville_Inside_EventScript_237459"
"script": "NewMauville_Inside_EventScript_BlueButton"
},
{
"type": "trigger",
@@ -163,7 +163,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "NewMauville_Inside_EventScript_237459"
"script": "NewMauville_Inside_EventScript_BlueButton"
},
{
"type": "trigger",
@@ -172,7 +172,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
"script": "NewMauville_Inside_EventScript_237471"
"script": "NewMauville_Inside_EventScript_GreenButton"
},
{
"type": "trigger",
@@ -181,7 +181,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
"script": "NewMauville_Inside_EventScript_237471"
"script": "NewMauville_Inside_EventScript_GreenButton"
},
{
"type": "trigger",
@@ -190,7 +190,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "NewMauville_Inside_EventScript_237459"
"script": "NewMauville_Inside_EventScript_BlueButton"
},
{
"type": "trigger",
@@ -199,7 +199,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": "0",
"script": "NewMauville_Inside_EventScript_237459"
"script": "NewMauville_Inside_EventScript_BlueButton"
},
{
"type": "trigger",
@@ -208,7 +208,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
"script": "NewMauville_Inside_EventScript_237471"
"script": "NewMauville_Inside_EventScript_GreenButton"
},
{
"type": "trigger",
@@ -217,7 +217,7 @@
"elevation": 3,
"var": "VAR_NEW_MAUVILLE_STATE",
"var_value": "1",
"script": "NewMauville_Inside_EventScript_237725"
"script": "NewMauville_Inside_EventScript_RedButton"
}
],
"bg_events": [
@@ -227,7 +227,7 @@
"y": 4,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "NewMauville_Inside_EventScript_23778F"
"script": "NewMauville_Inside_EventScript_Generator"
},
{
"type": "sign",
@@ -235,7 +235,7 @@
"y": 3,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "NewMauville_Inside_EventScript_23778F"
"script": "NewMauville_Inside_EventScript_Generator"
},
{
"type": "sign",
@@ -243,7 +243,7 @@
"y": 2,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "NewMauville_Inside_EventScript_23778F"
"script": "NewMauville_Inside_EventScript_Generator"
},
{
"type": "sign",
@@ -251,7 +251,7 @@
"y": 4,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "NewMauville_Inside_EventScript_23778F"
"script": "NewMauville_Inside_EventScript_Generator"
},
{
"type": "sign",
@@ -259,7 +259,7 @@
"y": 4,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "NewMauville_Inside_EventScript_23778F"
"script": "NewMauville_Inside_EventScript_Generator"
},
{
"type": "sign",
@@ -267,7 +267,7 @@
"y": 4,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "NewMauville_Inside_EventScript_23778F"
"script": "NewMauville_Inside_EventScript_Generator"
},
{
"type": "sign",
@@ -275,7 +275,7 @@
"y": 3,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "NewMauville_Inside_EventScript_23778F"
"script": "NewMauville_Inside_EventScript_Generator"
},
{
"type": "sign",
@@ -283,7 +283,7 @@
"y": 2,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "NewMauville_Inside_EventScript_23778F"
"script": "NewMauville_Inside_EventScript_Generator"
}
]
}

96
data/maps/NewMauville_Inside/scripts.inc
View File

@@ -1,18 +1,18 @@
NewMauville_Inside_MapScripts:: @ 82373D7
map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7
map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_OnTransition
map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D
map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_OnLoad
.byte 0
NewMauville_Inside_MapScript1_2373E7: @ 82373E7
NewMauville_Inside_OnResume: @ 82373E7
compare VAR_TEMP_1, 1
call_if_eq NewMauville_Inside_EventScript_237489
call_if_eq NewMauville_Inside_EventScript_SetBarrierStateBlueButton
compare VAR_TEMP_2, 1
call_if_eq NewMauville_Inside_EventScript_2375D7
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_237407
call_if_eq NewMauville_Inside_EventScript_SetBarrierStateGreenButton
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_TryRemoveVoltorb
end
NewMauville_Inside_EventScript_237407:: @ 8237407
NewMauville_Inside_EventScript_TryRemoveVoltorb:: @ 8237407
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn
@@ -22,49 +22,49 @@ NewMauville_Inside_EventScript_237407:: @ 8237407
NewMauville_Inside_OnTransition: @ 823741B
setvar VAR_TEMP_1, 0
setvar VAR_TEMP_2, 0
call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_237441
call_if_unset FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE, NewMauville_Inside_EventScript_237445
call_if_unset FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE, NewMauville_Inside_EventScript_237449
call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb1
call_if_unset FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb2
call_if_unset FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb3
end
NewMauville_Inside_EventScript_237441:: @ 8237441
NewMauville_Inside_EventScript_ShowVoltorb1:: @ 8237441
clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1
return
NewMauville_Inside_EventScript_237445:: @ 8237445
NewMauville_Inside_EventScript_ShowVoltorb2:: @ 8237445
clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2
return
NewMauville_Inside_EventScript_237449:: @ 8237449
NewMauville_Inside_EventScript_ShowVoltorb3:: @ 8237449
clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3
return
NewMauville_Inside_MapScript1_23744D: @ 823744D
NewMauville_Inside_OnLoad: @ 823744D
compare VAR_NEW_MAUVILLE_STATE, 2
call_if_eq NewMauville_Inside_EventScript_23773A
call_if_eq NewMauville_Inside_EventScript_SetGeneratorOffMetatiles
end
NewMauville_Inside_EventScript_237459:: @ 8237459
NewMauville_Inside_EventScript_BlueButton:: @ 8237459
lockall
setvar VAR_TEMP_1, 1
setvar VAR_TEMP_2, 0
playse SE_PIN
call NewMauville_Inside_EventScript_237489
call NewMauville_Inside_EventScript_SetBarrierStateBlueButton
special DrawWholeMapView
releaseall
end
NewMauville_Inside_EventScript_237471:: @ 8237471
NewMauville_Inside_EventScript_GreenButton:: @ 8237471
lockall
setvar VAR_TEMP_1, 0
setvar VAR_TEMP_2, 1
playse SE_PIN
call NewMauville_Inside_EventScript_2375D7
call NewMauville_Inside_EventScript_SetBarrierStateGreenButton
special DrawWholeMapView
releaseall
end
NewMauville_Inside_EventScript_237489:: @ 8237489
NewMauville_Inside_EventScript_SetBarrierStateBlueButton:: @ 8237489
setmetatile 23, 34, METATILE_BikeShop_Barrier_Hidden_Top, 1
setmetatile 23, 35, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
setmetatile 23, 36, METATILE_BikeShop_Floor_Shadow_Top, 0
@@ -104,7 +104,7 @@ NewMauville_Inside_EventScript_237489:: @ 8237489
setmetatile 18, 36, METATILE_BikeShop_Button_Green, 0
return
NewMauville_Inside_EventScript_2375D7:: @ 82375D7
NewMauville_Inside_EventScript_SetBarrierStateGreenButton:: @ 82375D7
setmetatile 23, 34, METATILE_BikeShop_Barrier_Blue_Top, 1
setmetatile 23, 35, METATILE_BikeShop_Barrier_Blue_TopMid, 1
setmetatile 23, 36, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
@@ -144,15 +144,15 @@ NewMauville_Inside_EventScript_2375D7:: @ 82375D7
setmetatile 30, 38, METATILE_BikeShop_Button_Blue, 0
return
NewMauville_Inside_EventScript_237725:: @ 8237725
NewMauville_Inside_EventScript_RedButton:: @ 8237725
lockall
msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT
call NewMauville_Inside_EventScript_23773A
msgbox NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped, MSGBOX_DEFAULT
call NewMauville_Inside_EventScript_SetGeneratorOffMetatiles
setvar VAR_NEW_MAUVILLE_STATE, 2
releaseall
end
NewMauville_Inside_EventScript_23773A:: @ 823773A
NewMauville_Inside_EventScript_SetGeneratorOffMetatiles:: @ 823773A
setmetatile 33, 6, METATILE_BikeShop_Button_Pressed, 0
setmetatile 32, 2, METATILE_BikeShop_Generator_Off_Tile0, 1
setmetatile 33, 2, METATILE_BikeShop_Generator_Off_Tile1, 1
@@ -165,20 +165,20 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A
special DrawWholeMapView
return
NewMauville_Inside_EventScript_23778F:: @ 823778F
NewMauville_Inside_EventScript_Generator:: @ 823778F
lockall
compare VAR_NEW_MAUVILLE_STATE, 2
goto_if_eq NewMauville_Inside_EventScript_2377A5
msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT
goto_if_eq NewMauville_Inside_EventScript_GeneratorOff
msgbox NewMauville_Inside_Text_GeneratorRadiatingHeat, MSGBOX_DEFAULT
releaseall
end
NewMauville_Inside_EventScript_2377A5:: @ 82377A5
msgbox NewMauville_Inside_Text_237916, MSGBOX_DEFAULT
NewMauville_Inside_EventScript_GeneratorOff:: @ 82377A5
msgbox NewMauville_Inside_Text_GeneratorQuietedDown, MSGBOX_DEFAULT
releaseall
end
NewMauville_Inside_EventScript_2377AF:: @ 82377AF
NewMauville_Inside_EventScript_Voltorb1:: @ 82377AF
lock
faceplayer
setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -191,21 +191,21 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NewMauville_Inside_EventScript_2377F3
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq NewMauville_Inside_EventScript_2377F3
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq NewMauville_Inside_EventScript_2377F3
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb1
setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE
release
end
NewMauville_Inside_EventScript_2377F3:: @ 82377F3
NewMauville_Inside_EventScript_DefeatedVoltorb1:: @ 82377F3
setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE
goto Common_EventScript_RemoveStaticPokemon
end
NewMauville_Inside_EventScript_2377FC:: @ 82377FC
NewMauville_Inside_EventScript_Voltorb2:: @ 82377FC
lock
faceplayer
setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -218,21 +218,21 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NewMauville_Inside_EventScript_237840
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq NewMauville_Inside_EventScript_237840
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq NewMauville_Inside_EventScript_237840
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb2
setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE
release
end
NewMauville_Inside_EventScript_237840:: @ 8237840
NewMauville_Inside_EventScript_DefeatedVoltorb2:: @ 8237840
setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE
goto Common_EventScript_RemoveStaticPokemon
end
NewMauville_Inside_EventScript_237849:: @ 8237849
NewMauville_Inside_EventScript_Voltorb3:: @ 8237849
lock
faceplayer
setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -245,30 +245,30 @@ NewMauville_Inside_EventScript_237849:: @ 8237849
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NewMauville_Inside_EventScript_23788D
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq NewMauville_Inside_EventScript_23788D
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq NewMauville_Inside_EventScript_23788D
goto_if_eq NewMauville_Inside_EventScript_DefeatedVoltorb3
setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE
release
end
NewMauville_Inside_EventScript_23788D:: @ 823788D
NewMauville_Inside_EventScript_DefeatedVoltorb3:: @ 823788D
setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE
goto Common_EventScript_RemoveStaticPokemon
end
NewMauville_Inside_Text_237896: @ 8237896
NewMauville_Inside_Text_GeneratorRadiatingHeat: @ 8237896
.string "The generator is radiating heat that\n"
.string "can be felt even at a distance.\p"
.string "It looks like it should be turned off\n"
.string "as soon as possible.$"
NewMauville_Inside_Text_237916: @ 8237916
NewMauville_Inside_Text_GeneratorQuietedDown: @ 8237916
.string "The generator quieted down.$"
NewMauville_Inside_Text_237932: @ 8237932
NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped: @ 8237932
.string "{PLAYER} stepped on the switch.\p"
.string "Click…\p"
.string "… … … … … … … …\n"

8
data/maps/Route109_SeashoreHouse/scripts.inc
View File

@@ -43,8 +43,6 @@ Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop:: @ 8269460
goto_if_eq Route109_SeashoreHouse_EventScript_BuySodaPop
msgbox Route109_SeashoreHouse_Text_ThatsTooBad, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
@@ -60,24 +58,18 @@ Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484
updatemoneybox 0, 0
giveitem_std ITEM_SODA_POP
hidemoneybox
nop
nop
release
end
Route109_SeashoreHouse_EventScript_NotEnoughMoney:: @ 82694C8
msgbox Route109_SeashoreHouse_Text_NotEnoughMoney, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
Route109_SeashoreHouse_EventScript_NotEnoughSpace:: @ 82694D5
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end

4
data/maps/Route121_SafariZoneEntrance/scripts.inc
View File

@@ -75,8 +75,6 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48
msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT
closemessage
hidemoneybox
nop
nop
applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone
waitmovement 0
special EnterSafariMode
@@ -113,8 +111,6 @@ Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8
Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06
closemessage
hidemoneybox
nop
nop
applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter
waitmovement 0
releaseall

8
data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
View File

@@ -26,8 +26,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee
closemessage
hidemoneybox
nop
nop
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter
waitmovement 0
releaseall
@@ -43,8 +41,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8
msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT
setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
hidemoneybox
nop
nop
releaseall
end
@@ -53,8 +49,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 820AE18
msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT
closemessage
hidemoneybox
nop
nop
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter
waitmovement 0
releaseall
@@ -64,8 +58,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway:: @ 820AE39
msgbox SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup, MSGBOX_DEFAULT
setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
hidemoneybox
nop
nop
releaseall
end

6
include/constants/coins.h Normal file
View File

@@ -0,0 +1,6 @@
#ifndef GUARD_CONSTANTS_COINS_H
#define GUARD_CONSTANTS_COINS_H
#define MAX_COINS 9999
#endif // GUARD_CONSTANTS_COINS_H

2
include/constants/metatile_labels.h
View File

@@ -381,7 +381,7 @@
#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C
#define METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right 0x298
// gTileset_BikeShop
// gTileset_BikeShop (also used by New Mauville)
#define METATILE_BikeShop_Barrier_Hidden_Top 0x269
#define METATILE_BikeShop_Barrier_Hidden_Bottom 0x271
#define METATILE_BikeShop_Floor_Shadow_Top 0x26D

2
include/event_scripts.h
View File

@@ -552,7 +552,7 @@ extern const u8 EventScript_FieldPoison[];
extern const u8 EventScript_EggHatch[];
extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[];
extern const u8 IslandCave_EventScript_OpenRegiEntrance[];
extern const u8 MauvilleCity_EventScript_1DF7BA[];
extern const u8 MauvilleCity_EventScript_RegisterWallyCall[];
extern const u8 Route119_EventScript_1F49EC[];
extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[];
extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[];

3
src/coins.c
View File

@@ -6,8 +6,7 @@
#include "string_util.h"
#include "menu.h"
#include "international_string_util.h"
#define MAX_COINS 9999
#include "constants/coins.h"
EWRAM_DATA u8 sCoinsWindowId = 0;

2
src/field_control_avatar.c
View File

@@ -568,7 +568,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
}
if (ShouldDoWallyCall() == TRUE)
{
ScriptContext1_SetupScript(MauvilleCity_EventScript_1DF7BA);
ScriptContext1_SetupScript(MauvilleCity_EventScript_RegisterWallyCall);
return TRUE;
}
if (ShouldDoWinonaCall() == TRUE)