Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-24 15:07:47 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into Pokedex_Menu_Text

Browse Source
This commit is contained in:
h2o-DS 2025-02-25 06:24:57 -05:00
commit 8f0da81c9d
1382 changed files with 24933 additions and 23784 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

259
asm/macros/scrcmd.inc
View File

@ -1,6 +1,8 @@
#include "generated/badges.h"
#include "generated/catching_show_points_category.h"
#include "generated/days_of_week.h"
#include "generated/game_records.h"
#include "generated/genders.h"
#include "generated/items.h"
#include "generated/journal_location_events.h"
#include "generated/journal_online_events.h"
@ -8,14 +10,22 @@
#include "generated/moves.h"
#include "generated/npc_trades.h"
#include "generated/poketch_apps.h"
#include "generated/roaming_slots.h"
#include "generated/save_types.h"
#include "generated/sdat.h"
#include "generated/species.h"
#include "generated/trainers.h"
#include "constants/honey_tree.h"
#include "constants/items.h"
#include "constants/map_object.h"
#include "constants/savedata/vars_flags.h"
#include "constants/scrcmd.h"
#include "macros/movement.inc"
.set FALSE, 0
.set TRUE, 1
.macro Noop
.short 0
.endm
@ -195,10 +205,10 @@
.short \flagID
.endm
.macro ScrCmd_021 arg0, arg1
.macro CheckFlagFromVar flagID, destVarID
.short 33
.short \arg0
.short \arg1
.short \flagID
.short \destVarID
.endm
.macro SetFlagFromVar varID
@ -349,9 +359,9 @@
.byte \directionY
.endm
.macro ScrCmd_03E arg0
.macro ShowYesNoMenu destVarID
.short 62
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_03F
@ -436,10 +446,10 @@
.short \sdatID
.endm
.macro ScrCmd_04C arg0, arg1
.macro PlayCry species, unused=0
.short 76
.short \arg0
.short \arg1
.short \species
.short \unused
.endm
.macro ScrCmd_04D
@ -553,7 +563,7 @@
.short \arg0
.endm
.macro ScrCmd_064 arg0
.macro AddObject arg0
.short 100
.short \arg0
.endm
@ -672,20 +682,20 @@
.short \arg0
.endm
// If the player has no space left in the bag, resultVar will be set to FALSE
.macro AddItem item, count, resultVar
// If the player has no space left in the bag, destVarID will be set to FALSE
.macro AddItem item, count, destVarID
.short 123
.short \item
.short \count
.short \resultVar
.short \destVarID
.endm
// resultVar will be set to TRUE if the player had at least 'count' items of the specified type in their bag
.macro RemoveItem item, count, resultVar
// destVarID will be set to TRUE if the player had at least 'count' items of the specified type in their bag
.macro RemoveItem item, count, destVarID
.short 124
.short \item
.short \count
.short \resultVar
.short \destVarID
.endm
.macro ScrCmd_07D arg0, arg1, arg2
@ -695,12 +705,12 @@
.short \arg2
.endm
// resultVar will be set to TRUE if the player has at least 'count' items of the specified type in their bag
.macro CheckItem item, count, resultVar
// destVarID will be set to TRUE if the player has at least 'count' items of the specified type in their bag
.macro CheckItem item, count, destVarID
.short 126
.short \item
.short \count
.short \resultVar
.short \destVarID
.endm
.macro ScrCmd_07F arg0, arg1
@ -1216,9 +1226,9 @@
.byte \unused2
.endm
.macro ScrCmd_0DB arg0
.macro BufferPlayerStarterSpeciesName templateArg
.short 219
.byte \arg0
.byte \templateArg
.endm
.macro BufferRivalStarterSpeciesName templateArg
@ -1226,9 +1236,9 @@
.byte \templateArg
.endm
.macro ScrCmd_0DD arg0
.macro BufferPlayerCounterpartStarterSpeciesName templateArg
.short 221
.byte \arg0
.byte \templateArg
.endm
.macro GetPlayerStarterSpecies destVar
@ -1307,7 +1317,7 @@
.short \arg0
.endm
.macro ScrCmd_0EB
.macro BlackOutFromBattle
.short 235
.endm
@ -1321,9 +1331,9 @@
.short \destVarID
.endm
.macro ScrCmd_0EE arg0
.macro CheckHasTwoAliveMons destVarID
.short 238
.short \arg0
.short \destVarID
.endm
.macro StartDummyTrainerBattle
@ -1682,10 +1692,10 @@
.short \appID
.endm
.macro ScrCmd_134 arg0, arg1
.macro CheckPoketchAppRegistered appID, destVarID
.short 308
.short \arg0
.short \arg1
.short \appID
.short \destVarID
.endm
.macro ScrCmd_135 arg0
@ -2077,11 +2087,11 @@
.short 389
.endm
.macro ScrCmd_186 arg0, arg1, arg2
.macro SetObjectEventPos localID, x, z
.short 390
.short \arg0
.short \arg1
.short \arg2
.short \localID
.short \x
.short \z
.endm
.macro ScrCmd_187 arg0, arg1, arg2, arg3, arg4
@ -2105,11 +2115,11 @@
.short \arg1
.endm
.macro ScrCmd_18A arg0, arg1, arg2
.macro SetWarpEventPos index, x, z
.short 394
.short \arg0
.short \arg1
.short \arg2
.short \index
.short \x
.short \z
.endm
.macro ScrCmd_18B arg0, arg1, arg2
@ -2380,9 +2390,9 @@
.short \arg3
.endm
.macro ScrCmd_1BD arg0
.macro GetPlayerDir destVarID
.short 445
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_1BE arg0
@ -2395,10 +2405,10 @@
.short \arg0
.endm
.macro ScrCmd_1C0 arg0, arg1
.macro ScrCmd_1C0 destVarID, species
.short 448
.short \arg0
.short \arg1
.short \destVarID
.short \species
.endm
.macro ScrCmd_1C1 arg0, arg1
@ -2426,18 +2436,18 @@
.short \arg2
.endm
.macro ScrCmd_1C5
.macro InitSizeContestRecord
.short 453
.endm
.macro ScrCmd_1C6 arg0
.macro SelectPartyMonMove partySlot
.short 454
.short \arg0
.short \partySlot
.endm
.macro ScrCmd_1C7 arg0
.macro GetSelectedPartyMonMove destVarID
.short 455
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_1C8 arg0, arg1
@ -2769,14 +2779,14 @@
.byte \arg3
.endm
.macro ScrCmd_200 arg0
.macro GetPreviousMapID destVarID
.short 512
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_201 arg0
.macro GetCurrentMapID destVarID
.short 513
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_202 arg0
@ -2810,10 +2820,10 @@
.short \arg0
.endm
.macro ScrCmd_208 arg0, arg1
.macro DrawPokemonPreview species, gender
.short 520
.short \arg0
.short \arg1
.short \species
.short \gender
.endm
.macro ScrCmd_209
@ -2872,18 +2882,18 @@
.short \arg1
.endm
.macro ScrCmd_214 arg0
.macro GetSpiritombCounter destVarID
.short 532
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_215
.macro ClearAmitySquareStepCount
.short 533
.endm
.macro ScrCmd_216 arg0
.macro GetAmitySquareStepCount destVarID
.short 534
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_217 arg0, arg1
@ -2897,23 +2907,23 @@
.short \arg0
.endm
.macro ScrCmd_219 arg0
.macro SetNewsPressDeadline deadlineInDays
.short 537
.short \arg0
.short \deadlineInDays
.endm
.macro ScrCmd_21A arg0
.macro GetNewsPressDeadline destVarID
.short 538
.short \arg0
.short \destVarID
.endm
.macro EnableSwarms
.short 539
.endm
.macro ScrCmd_21C arg0
.macro ActivateRoamingPokemon slot
.short 540
.byte \arg0
.byte \slot
.endm
.macro ScrCmd_21D arg0, arg1=0, arg2=0
@ -2929,7 +2939,7 @@
.endif
.endm
.macro ScrCmd_21E
.macro ScrCmd_Dummy21E
.short 542
.endm
@ -3042,9 +3052,9 @@
.short \arg1
.endm
.macro ScrCmd_234 arg0
.macro GetDayOfWeek destVarID
.short 564
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_235 arg0, arg1=0, arg2=0, arg3=0
@ -3213,20 +3223,20 @@
.byte \arg0
.endm
.macro ScrCmd_24E arg0
.macro GetJubilifeLotteryTrainerID destVarID
.short 590
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_24F arg0, arg1, arg2, arg3
.macro CheckForJubilifeLotteryWinner winningPokemonIndex, highestMatchedDigits, isResultInBox, winningLotteryId
.short 591
.short \arg0
.short \arg1
.short \arg2
.short \arg3
.short \winningPokemonIndex
.short \highestMatchedDigits
.short \isResultInBox
.short \winningLotteryId
.endm
.macro ScrCmd_250
.macro RandomizeJubilifeLottery
.short 592
.endm
@ -3380,14 +3390,22 @@
.short \destVarID
.endm
.macro ScrCmd_26F
.macro ClearSpiritombCounter
.short 623
.endm
.macro ScrCmd_270 arg0, arg1
.short 624
.short \arg0
.byte \arg1
/* Enable a given hidden location */
.macro EnableHiddenLocation hiddenLocation
.short 624 /* SetHiddenLocation */
.short \hiddenLocation /* Refer to generated/hidden_locations.txt */
.byte TRUE /* Enable */
.endm
/* Disable a given hidden location */
.macro DisableHiddenLocation hiddenLocation
.short 624 /* SetHiddenLocation */
.short \hiddenLocation /* Refer to generated/hidden_locations.txt */
.byte FALSE /* Disable */
.endm
.macro ScrCmd_271 arg0
@ -3412,9 +3430,10 @@
.long \arg1
.endm
.macro ScrCmd_275 arg0
/* Returns TRUE in destVarID if the player has won at least 10 consecutive bonus rounds */
.macro CheckBonusRoundStreak destVarID
.short 629
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_276 arg0, arg1
@ -3423,9 +3442,9 @@
.short \arg1
.endm
.macro ScrCmd_277 arg0
.macro GetDailyRandomLevel destVarID
.short 631
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_278 arg0, arg1
@ -3444,7 +3463,7 @@
.short 634
.endm
.macro ScrCmd_27B
.macro InitDailyRandomLevel
.short 635
.endm
@ -3460,9 +3479,10 @@
.short \arg1
.endm
.macro ScrCmd_27E arg0
/* Returns TRUE in destVarID if the player has bought at least 5 items at the Veilstone Department Store */
.macro CheckIsDepartmentStoreRegular destVarID
.short 638
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_27F arg0
@ -3507,19 +3527,19 @@
.short \arg1
.endm
.macro ScrCmd_286 arg0
.macro GetUndergroundItemsGivenAway destVarID
.short 646
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_287 arg0
.macro GetUndergroundFossilsUnearthed destVarID
.short 647
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_288 arg0
.macro GetUndergroundTrapsSet destVarID
.short 648
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_289 arg0, arg1, arg2, arg3, arg4, arg5, arg6
@ -3538,15 +3558,16 @@
.short \arg0
.endm
.macro ScrCmd_28B arg0, arg1
/* Check if a given distribution event has been enabled and return the boolean-state in destVarID. */
.macro CheckDistributionEvent eventID, destVarID
.short 651
.byte \arg0
.short \arg1
.byte \eventID /* Refer to generated/distrubtion_events.txt */
.short \destVarID
.endm
.macro ScrCmd_28C arg0
.macro DrawPokemonPreviewFromPartySlot partySlot
.short 652
.short \arg0
.short \partySlot
.endm
.macro ScrCmd_28D
@ -3580,9 +3601,9 @@
.short \arg1
.endm
.macro ScrCmd_293 arg0
.macro GetUndergroundTalkCounter destVarID
.short 659
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_294 arg0, arg1
@ -4026,12 +4047,12 @@
.short \arg2
.endm
// resultVar will be set to TRUE if the pokemon has at least one move it can learn at the given location and doesn't know yet
.macro CheckHasLearnableTutorMoves partySlot, location, resultVar
// destVarID will be set to TRUE if the pokemon has at least one move it can learn at the given location and doesn't know yet
.macro CheckHasLearnableTutorMoves partySlot, location, destVarID
.short 741
.short \partySlot
.short \location
.short \resultVar
.short \destVarID
.endm
.macro ShowMoveTutorMoveSelectionMenu partySlot, location, outSelectedOption
@ -4059,11 +4080,11 @@
.short \moveSlot
.endm
// resultVar will be set to TRUE if the move is available at a shards move tutor and the player can afford it
.macro CheckCanAffordMove moveID, resultVar
// destVarID will be set to TRUE if the move is available at a shards move tutor and the player can afford it
.macro CheckCanAffordMove moveID, destVarID
.short 746
.short \moveID
.short \resultVar
.short \destVarID
.endm
.macro PayShardsCost moveID
@ -4328,9 +4349,9 @@
.short \level
.endm
.macro ScrCmd_31A arg0
.macro SetSpeciesSeen species
.short 794
.short \arg0
.short \species
.endm
.macro ScrCmd_31B arg0
@ -4543,9 +4564,9 @@
.byte \arg3
.endm
.macro ScrCmd_342 arg0
.macro BufferPlayerCounterpartStarterSpeciesNameWithArticle templateArg
.short 834
.byte \arg0
.byte \templateArg
.endm
.macro ScrCmd_343 arg0, arg1
@ -4669,6 +4690,22 @@
CallIf 1, \offset
.endm
/*
* This flag is used by ScriptEntry and ScriptEntryEnd to control where
* a user can add ScriptEntry commands (i.e., only at the start of the
* input file). It is NOT meant for direct usage.
*/
.set F_ACCEPT_SCRIPT_ENTRIES, TRUE
.macro ScriptEntry name
.long \name-.-4
.if F_ACCEPT_SCRIPT_ENTRIES == TRUE
.long \name-.-4
.else
.error "cannot specify ScriptEntry after ScriptEntryEnd"
.endif
.endm
.macro ScriptEntryEnd
.set F_ACCEPT_SCRIPT_ENTRIES, FALSE
.short 0xFD13
.endm

7
generated/bg_event_dirs.txt Normal file
View File

@ -0,0 +1,7 @@
BG_EVENT_DIR_NORTH
BG_EVENT_DIR_EAST
BG_EVENT_DIR_WEST
BG_EVENT_DIR_SOUTH
BG_EVENT_DIR_ALL
BG_EVENT_DIR_WEST_EAST
BG_EVENT_DIR_NORTH_SOUTH

7
generated/days_of_week.txt Normal file
View File

@ -0,0 +1,7 @@
DAY_OF_WEEK_SUNDAY
DAY_OF_WEEK_MONDAY
DAY_OF_WEEK_TUESDAY
DAY_OF_WEEK_WEDNESDAY
DAY_OF_WEEK_THURSDAY
DAY_OF_WEEK_FRIDAY
DAY_OF_WEEK_SATURDAY

5
generated/distribution_events.txt Normal file
View File

@ -0,0 +1,5 @@
DISTRIBUTION_EVENT_DARKRAI
DISTRIBUTION_EVENT_SHAYMIN
DISTRIBUTION_EVENT_ARCEUS
DISTRIBUTION_EVENT_ROTOM
DISTRIBUTION_EVENT_MAX

5
generated/hidden_locations.txt Normal file
View File

@ -0,0 +1,5 @@
HIDDEN_LOCATION_FULLMOON_ISLAND
HIDDEN_LOCATION_NEWMOON_ISLAND
HIDDEN_LOCATION_SPRING_PATH
HIDDEN_LOCATION_SEABREAK_PATH
HIDDEN_LOCATION_MAX

1
generated/map_headers.txt
View File

@ -591,3 +591,4 @@ MAP_HEADER_MT_CORONET_ICEBERG_RUINS
MAP_HEADER_ICEBERG_RUINS
MAP_HEADER_ROUTE_228_ROCK_PEAK_RUINS
MAP_HEADER_ROCK_PEAK_RUINS
MAP_HEADER_DYNAMIC = 4095

8
generated/meson.build
View File

@ -36,7 +36,10 @@ metang_generators = {
'battle_sub_animations': { 'type': 'enum', 'tag': 'BattleSubAnimation' },
'battle_subscripts': { 'type': 'enum', 'tag': 'BattleSubscript' }, # functionally pre-generating the NARC index
'battle_terrains': { 'type': 'enum', 'tag': 'BattleTerrain' },
'bg_event_dirs': { 'type': 'enum', 'tag': 'BgEventDir' },
'catching_show_points_category': { 'type': 'enum', 'tag': 'CatchingShowPointsCategory' },
'days_of_week': { 'type': 'enum', 'tag': 'DayOfWeek' },
'distribution_events': { 'type': 'enum', 'tag': 'DistributionEvent' },
'egg_groups': { 'type': 'enum', 'tag': 'EggGroup' },
'evolution_methods': { 'type': 'enum', 'tag': 'EvolutionMethod' },
'exp_rates': { 'type': 'enum', 'tag': 'ExpRate' },
@ -46,6 +49,7 @@ metang_generators = {
'gender_ratios': { 'type': 'enum', 'tag': 'GenderRatio' },
'genders': { 'type': 'enum', 'tag': 'Gender' },
'giratina_shadow_animations': {'type': 'enum', 'tag': 'GiratinaShadowAnimation'},
'hidden_locations': { 'type': 'enum', 'tag': 'HiddenLocation' },
'item_ai_categories': { 'type': 'enum', 'tag': 'ItemAICategory' },
'item_battle_categories': { 'type': 'enum', 'tag': 'ItemBattleCategory' },
'item_hold_effects': { 'type': 'enum', 'tag': 'ItemHoldEffect' },
@ -58,8 +62,10 @@ metang_generators = {
'move_flags': { 'type': 'mask', 'tag': 'MoveFlag' },
'move_ranges': { 'type': 'mask', 'tag': 'MoveRange', 'extra': ['--no-auto'] },
'movement_actions': { 'type': 'enum', 'tag': 'MovementAction' },
'movement_types': { 'type': 'enum', 'tag': 'MovementType' },
'moves': { 'type': 'enum', 'tag': 'Move' },
'npc_trades': { 'type': 'enum', 'tag': 'NpcTradeID' },
'object_events': { 'type': 'enum', 'tag': 'ObjectEventGfx' },
'pal_park_land_area': { 'type': 'enum', 'tag': 'PalParkLandArea' },
'pal_park_water_area': { 'type': 'enum', 'tag': 'PalParkWaterArea' },
'pokemon_body_shapes': { 'type': 'enum', 'tag': 'PokemonBodyShape' },
@ -67,6 +73,7 @@ metang_generators = {
'pokemon_contest_types': { 'type': 'enum', 'tag': 'PokemonContestType' },
'pokemon_types': { 'type': 'enum', 'tag': 'PokemonType' },
'poketch_apps': { 'type': 'enum', 'tag': 'PoketchAppID' },
'roaming_slots': { 'type': 'enum', 'tag': 'RoamingSlot' },
'save_types': { 'type': 'enum', 'tag': 'SaveType' },
'sdat': { 'type': 'enum', 'tag': 'SDATID' },
'shadow_sizes': { 'type': 'enum', 'tag': 'ShadowSize' },
@ -76,6 +83,7 @@ metang_generators = {
'trainers': { 'type': 'enum', 'tag': 'Trainer' },
'trainer_classes': { 'type': 'enum', 'tag': 'TrainerClass' },
'trainer_score_events': { 'type': 'enum', 'tag': 'TrainerScoreEvent' },
'trainer_types': { 'type': 'enum', 'tag': 'TrainerType' },
'tutor_locations': {'type': 'enum', 'tag': 'TutorLocation'},
'villa_furnitures': {'type': 'enum', 'tag': 'VillaFurniture'}
}

69
generated/movement_types.txt Normal file
View File

@ -0,0 +1,69 @@
MOVEMENT_TYPE_NONE
MOVEMENT_TYPE_DUMMY
MOVEMENT_TYPE_LOOK_AROUND
MOVEMENT_TYPE_WANDER_AROUND
MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH
MOVEMENT_TYPE_WANDER_WEST_AND_EAST
MOVEMENT_TYPE_LOOK_NORTH_AND_WEST
MOVEMENT_TYPE_LOOK_NORTH_AND_EAST
MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST
MOVEMENT_TYPE_LOOK_SOUTH_AND_EAST
MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST
MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_EAST
MOVEMENT_TYPE_LOOK_NORTH_WEST_AND_EAST
MOVEMENT_TYPE_LOOK_SOUTH_WEST_AND_EAST
MOVEMENT_TYPE_LOOK_NORTH
MOVEMENT_TYPE_LOOK_SOUTH
MOVEMENT_TYPE_LOOK_LEFT
MOVEMENT_TYPE_LOOK_RIGHT
MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
MOVEMENT_TYPE_ROTATE_CLOCKWISE
MOVEMENT_TYPE_WALK_BACK_AND_FORTH
MOVEMENT_TYPE_WALK_NORTH_EAST_WEST_SOUTH
MOVEMENT_TYPE_WALK_EAST_WEST_SOUTH_NORTH
MOVEMENT_TYPE_WALK_SOUTH_NORTH_EAST_WEST
MOVEMENT_TYPE_WALK_WEST_SOUTH_NORTH_EAST
MOVEMENT_TYPE_WALK_WEST_EAST_SOUTH_NORTH
MOVEMENT_TYPE_WALK_NORTH_WEST_EAST_SOUTH
MOVEMENT_TYPE_WALK_SOUTH_NORTH_WEST_EAST
MOVEMENT_TYPE_WALK_EAST_SOUTH_NORTH_WEST
MOVEMENT_TYPE_WALK_WEST_NORTH_SOUTH_EAST
MOVEMENT_TYPE_WALK_NORTH_SOUTH_EAST_WEST
MOVEMENT_TYPE_WALK_EAST_WEST_NORTH_SOUTH
MOVEMENT_TYPE_WALK_SOUTH_EAST_WEST_NORTH
MOVEMENT_TYPE_WALK_EAST_NORTH_SOUTH_WEST
MOVEMENT_TYPE_WALK_NORTH_SOUTH_WEST_EAST
MOVEMENT_TYPE_WALK_WEST_EAST_NORTH_SOUTH
MOVEMENT_TYPE_WALK_SOUTH_WEST_EAST_NORTH
MOVEMENT_TYPE_WALK_NORTH_WEST_SOUTH_EAST
MOVEMENT_TYPE_WALK_SOUTH_EAST_NORTH_WEST
MOVEMENT_TYPE_WALK_WEST_SOUTH_EAST_NORTH
MOVEMENT_TYPE_WALK_EAST_NORTH_WEST_SOUTH
MOVEMENT_TYPE_WALK_NORTH_EAST_SOUTH_WEST
MOVEMENT_TYPE_WALK_SOUTH_WEST_NORTH_EAST
MOVEMENT_TYPE_WALK_WEST_NORTH_EAST_SOUTH
MOVEMENT_TYPE_WALK_EAST_SOUTH_WEST_NORTH
MOVEMENT_TYPE_LOOK_NORTH_AND_SOUTH
MOVEMENT_TYPE_LOOK_WEST_AND_EAST
MOVEMENT_TYPE_BERRY_SOIL
MOVEMENT_TYPE_048
MOVEMENT_TYPE_049
MOVEMENT_TYPE_FOLLOW_PARTNER_TRAINER
MOVEMENT_TYPE_DISGUISE_SNOW
MOVEMENT_TYPE_DISGUISE_SAND
MOVEMENT_TYPE_DISGUISE_ROCK
MOVEMENT_TYPE_DISGUISE_GRASS
MOVEMENT_TYPE_055
MOVEMENT_TYPE_056
MOVEMENT_TYPE_057
MOVEMENT_TYPE_058
MOVEMENT_TYPE_059
MOVEMENT_TYPE_060
MOVEMENT_TYPE_061
MOVEMENT_TYPE_062
MOVEMENT_TYPE_063
MOVEMENT_TYPE_064
MOVEMENT_TYPE_065
MOVEMENT_TYPE_066
MOVEMENT_TYPE_067
MAX_MOVEMENT_TYPE

263
generated/object_events.txt Normal file
View File

@ -0,0 +1,263 @@
OBJ_EVENT_GFX_UNK_000
OBJ_EVENT_GFX_NINJA_BOY
OBJ_EVENT_GFX_TWIN
OBJ_EVENT_GFX_SCHOOL_KID_M
OBJ_EVENT_GFX_YOUNGSTER
OBJ_EVENT_GFX_BUG_CATCHER
OBJ_EVENT_GFX_LASS
OBJ_EVENT_GFX_BATTLE_GIRL
OBJ_EVENT_GFX_SCHOOL_KID_F
OBJ_EVENT_GFX_POKEMON_BREEDER_M
OBJ_EVENT_GFX_GUITARIST
OBJ_EVENT_GFX_ACE_TRAINER_M
OBJ_EVENT_GFX_POKEMON_BREEDER_F
OBJ_EVENT_GFX_BEAUTY
OBJ_EVENT_GFX_ACE_TRAINER_F
OBJ_EVENT_GFX_POKEFAN_M
OBJ_EVENT_GFX_POKEFAN_F
OBJ_EVENT_GFX_EXPERT_M
OBJ_EVENT_GFX_EXPERT_F
OBJ_EVENT_GFX_COLLECTOR
OBJ_EVENT_GFX_HIKER
OBJ_EVENT_GFX_UNK_021
OBJ_EVENT_GFX_REPORTER
OBJ_EVENT_GFX_CAMERAMAN
OBJ_EVENT_GFX_CASHIER_M
OBJ_EVENT_GFX_CASHIER_F
OBJ_EVENT_GFX_NURSE_JOY
OBJ_EVENT_GFX_TEALA
OBJ_EVENT_GFX_UNK_028
OBJ_EVENT_GFX_SCIENTIST_M
OBJ_EVENT_GFX_SCIENTIST_F
OBJ_EVENT_GFX_ROUGHNECK
OBJ_EVENT_GFX_SKIER_M
OBJ_EVENT_GFX_SKIER_F
OBJ_EVENT_GFX_POLICEMAN
OBJ_EVENT_GFX_IDOL
OBJ_EVENT_GFX_GENTLEMAN
OBJ_EVENT_GFX_SOCIALITE
OBJ_EVENT_GFX_CYCLIST_M
OBJ_EVENT_GFX_CYCLIST_F
OBJ_EVENT_GFX_WORKER
OBJ_EVENT_GFX_RANCHER
OBJ_EVENT_GFX_COWGIRL
OBJ_EVENT_GFX_CLOWN
OBJ_EVENT_GFX_ARTIST
OBJ_EVENT_GFX_JOGGER
OBJ_EVENT_GFX_SWIMMER_M
OBJ_EVENT_GFX_SWIMMER_F
OBJ_EVENT_GFX_TUBER_F
OBJ_EVENT_GFX_TUBER_M
OBJ_EVENT_GFX_RUIN_MANIAC
OBJ_EVENT_GFX_BLACK_BELT
OBJ_EVENT_GFX_CAMPER
OBJ_EVENT_GFX_PICNICKER
OBJ_EVENT_GFX_FISHERMAN
OBJ_EVENT_GFX_PARASOL_LADY
OBJ_EVENT_GFX_SAILOR
OBJ_EVENT_GFX_UNK_057
OBJ_EVENT_GFX_UNK_058
OBJ_EVENT_GFX_WAITER
OBJ_EVENT_GFX_WAITRESS
OBJ_EVENT_GFX_UNK_061
OBJ_EVENT_GFX_RICH_BOY
OBJ_EVENT_GFX_LADY
OBJ_EVENT_GFX_UNK_064
OBJ_EVENT_GFX_UNK_065
OBJ_EVENT_GFX_UNK_066
OBJ_EVENT_GFX_UNK_067
OBJ_EVENT_GFX_ACE_TRAINER_SNOW_M
OBJ_EVENT_GFX_ACE_TRAINER_SNOW_F
OBJ_EVENT_GFX_PSYCHIC
OBJ_EVENT_GFX_PIKACHU
OBJ_EVENT_GFX_CLEFAIRY
OBJ_EVENT_GFX_JIGGLYPUFF
OBJ_EVENT_GFX_PSYDUCK
OBJ_EVENT_GFX_UNK_075
OBJ_EVENT_GFX_UNK_076
OBJ_EVENT_GFX_UNK_077
OBJ_EVENT_GFX_TORCHIC
OBJ_EVENT_GFX_SKITTY
OBJ_EVENT_GFX_UNK_080
OBJ_EVENT_GFX_BABY_IN_PRAM
OBJ_EVENT_GFX_MIDDLE_AGED_MAN
OBJ_EVENT_GFX_MIDDLE_AGED_WOMAN
OBJ_EVENT_GFX_STRENGTH_BOULDER
OBJ_EVENT_GFX_ROCK_SMASH
OBJ_EVENT_GFX_CUT_TREE
OBJ_EVENT_GFX_POKEBALL
OBJ_EVENT_GFX_UNK_088
OBJ_EVENT_GFX_UNK_089
OBJ_EVENT_GFX_UNK_090
OBJ_EVENT_GFX_MAP_SIGNPOST
OBJ_EVENT_GFX_MAILBOX
OBJ_EVENT_GFX_SIGNBOARD
OBJ_EVENT_GFX_ARROW_SIGNPOST
OBJ_EVENT_GFX_GYM_SIGNPOST
OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST
OBJ_EVENT_GFX_UNK_097
OBJ_EVENT_GFX_UNK_098
OBJ_EVENT_GFX_PROF_ROWAN
OBJ_EVENT_GFX_UNK_100
OBJ_EVENT_GFX_UNK_101
OBJ_EVENT_GFX_UNK_102
OBJ_EVENT_GFX_UNK_103
OBJ_EVENT_GFX_UNK_104
OBJ_EVENT_GFX_UNK_105
OBJ_EVENT_GFX_UNK_106
OBJ_EVENT_GFX_UNK_107
OBJ_EVENT_GFX_UNK_108
OBJ_EVENT_GFX_UNK_109
OBJ_EVENT_GFX_UNK_110
OBJ_EVENT_GFX_UNK_111
OBJ_EVENT_GFX_UNK_112
OBJ_EVENT_GFX_UNK_113
OBJ_EVENT_GFX_UNK_114
OBJ_EVENT_GFX_UNK_115
OBJ_EVENT_GFX_UNK_116
OBJ_EVENT_GFX_UNK_117
OBJ_EVENT_GFX_UNK_118
OBJ_EVENT_GFX_UNK_119
OBJ_EVENT_GFX_CYRUS
OBJ_EVENT_GFX_MARS
OBJ_EVENT_GFX_SATURN
OBJ_EVENT_GFX_JUPITER
OBJ_EVENT_GFX_GRUNT_M
OBJ_EVENT_GFX_GRUNT_F
OBJ_EVENT_GFX_ROARK
OBJ_EVENT_GFX_GARDENIA
OBJ_EVENT_GFX_CRASHER_WAKE
OBJ_EVENT_GFX_MAYLENE
OBJ_EVENT_GFX_FANTINA
OBJ_EVENT_GFX_CANDICE
OBJ_EVENT_GFX_BRYON
OBJ_EVENT_GFX_VOLKNER
OBJ_EVENT_GFX_AARON
OBJ_EVENT_GFX_BERTHA
OBJ_EVENT_GFX_FLINT
OBJ_EVENT_GFX_LUCIAN
OBJ_EVENT_GFX_CYNTHIA
OBJ_EVENT_GFX_UNK_139
OBJ_EVENT_GFX_MOM
OBJ_EVENT_GFX_CHERYL
OBJ_EVENT_GFX_RILEY
OBJ_EVENT_GFX_MARLEY
OBJ_EVENT_GFX_BUCK
OBJ_EVENT_GFX_MIRA
OBJ_EVENT_GFX_UNK_146
OBJ_EVENT_GFX_UNK_147
OBJ_EVENT_GFX_BARRY
OBJ_EVENT_GFX_UNK_149
OBJ_EVENT_GFX_UNK_150
OBJ_EVENT_GFX_UXIE
OBJ_EVENT_GFX_MESPRIT
OBJ_EVENT_GFX_AZELF
OBJ_EVENT_GFX_DIALGA
OBJ_EVENT_GFX_PALKIA
OBJ_EVENT_GFX_ARCEUS
OBJ_EVENT_GFX_DARKRAI
OBJ_EVENT_GFX_SHAYMIN
OBJ_EVENT_GFX_CRESSELIA
OBJ_EVENT_GFX_GIRATINA_ALTERED
OBJ_EVENT_GFX_HEATRAN
OBJ_EVENT_GFX_UNK_162
OBJ_EVENT_GFX_RECEPTIONIST
OBJ_EVENT_GFX_OLD_MAN
OBJ_EVENT_GFX_OLD_WOMAN
OBJ_EVENT_GFX_PROF_OAK
OBJ_EVENT_GFX_JASMINE
OBJ_EVENT_GFX_GYM_GUIDE
OBJ_EVENT_GFX_PALMER
OBJ_EVENT_GFX_UNK_170
OBJ_EVENT_GFX_UNK_171
OBJ_EVENT_GFX_UNK_172
OBJ_EVENT_GFX_STARLY
OBJ_EVENT_GFX_BRIEFCASE
OBJ_EVENT_GFX_MAID
OBJ_EVENT_GFX_UNK_176
OBJ_EVENT_GFX_UNK_177
OBJ_EVENT_GFX_UNK_178
OBJ_EVENT_GFX_UNK_179
OBJ_EVENT_GFX_UNK_180
OBJ_EVENT_GFX_UNK_181
OBJ_EVENT_GFX_VENT
OBJ_EVENT_GFX_BOOK
OBJ_EVENT_GFX_REGIGIGAS
OBJ_EVENT_GFX_DRIFLOON
OBJ_EVENT_GFX_UNK_186
OBJ_EVENT_GFX_UNK_187
OBJ_EVENT_GFX_UNK_188
OBJ_EVENT_GFX_UNK_189
OBJ_EVENT_GFX_MOSS_ROCK
OBJ_EVENT_GFX_ICE_ROCK
OBJ_EVENT_GFX_BOLLARD
OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN
OBJ_EVENT_GFX_KID_WITH_NDS
OBJ_EVENT_GFX_MAGIKARP
OBJ_EVENT_GFX_UNK_196
OBJ_EVENT_GFX_UNK_197
OBJ_EVENT_GFX_UNK_198
OBJ_EVENT_GFX_UNK_199
OBJ_EVENT_GFX_UNK_200
OBJ_EVENT_GFX_UNK_201
OBJ_EVENT_GFX_GALACTIC_HQ_DOOR
OBJ_EVENT_GFX_CAVE_PAINTING
OBJ_EVENT_GFX_PACHIRISU
OBJ_EVENT_GFX_SHROOMISH
OBJ_EVENT_GFX_BUNEARY
OBJ_EVENT_GFX_HAPPINY
OBJ_EVENT_GFX_MACHOP
OBJ_EVENT_GFX_ELITE_FOUR_ROOM_DOOR
OBJ_EVENT_GFX_UNK_210
OBJ_EVENT_GFX_UNK_211
OBJ_EVENT_GFX_UNK_212
OBJ_EVENT_GFX_LOOKER
OBJ_EVENT_GFX_CHARON
OBJ_EVENT_GFX_THORTON
OBJ_EVENT_GFX_ARGENTA
OBJ_EVENT_GFX_DARACH
OBJ_EVENT_GFX_DAHLIA
OBJ_EVENT_GFX_CAITLIN
OBJ_EVENT_GFX_TURTWIG
OBJ_EVENT_GFX_GROTLE
OBJ_EVENT_GFX_TORTERRA
OBJ_EVENT_GFX_CHIMCHAR
OBJ_EVENT_GFX_MONFERNO
OBJ_EVENT_GFX_INFERNAPE
OBJ_EVENT_GFX_PIPLUP
OBJ_EVENT_GFX_PRINPLUP
OBJ_EVENT_GFX_EMPOLEON
OBJ_EVENT_GFX_CROAGUNK
OBJ_EVENT_GFX_GIRATINA_ORIGIN
OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT
OBJ_EVENT_GFX_FRONTIER_MULTI_ATTENDANT
OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT
OBJ_EVENT_GFX_UNK_234
OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT
OBJ_EVENT_GFX_UNK_236
OBJ_EVENT_GFX_ROTOM_HEAT
OBJ_EVENT_GFX_ROTOM_FAN
OBJ_EVENT_GFX_ROTOM_FROST
OBJ_EVENT_GFX_ROTOM_WASH
OBJ_EVENT_GFX_ROTOM_MOW
OBJ_EVENT_GFX_GAME_DIRECTOR
OBJ_EVENT_GFX_UNK_243
OBJ_EVENT_GFX_UNK_244
OBJ_EVENT_GFX_UNK_245
OBJ_EVENT_GFX_UNK_246
OBJ_EVENT_GFX_UNK_247
OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4
OBJ_EVENT_GFX_GRUNTS_GROUP_OF_3
OBJ_EVENT_GFX_CAVE_PAINTING_SHARDS_LEFT
OBJ_EVENT_GFX_CAVE_PAINTING_SHARDS_RIGHT
OBJ_EVENT_GFX_UNK_252
OBJ_EVENT_GFX_UNK_253
OBJ_EVENT_GFX_UNK_254
OBJ_EVENT_GFX_UNK_255
OBJ_EVENT_GFX_UNK_256
OBJ_EVENT_GFX_UNK_257
OBJ_EVENT_GFX_UNK_258
OBJ_EVENT_GFX_UNK_259
OBJ_EVENT_GFX_UNK_260
OBJ_EVENT_GFX_UNK_261
OBJ_EVENT_GFX_WALL_BLOCKING_ROTOMS_ROOM

7
generated/roaming_slots.txt Normal file
View File

@ -0,0 +1,7 @@
ROAMING_SLOT_MESPRIT
ROAMING_SLOT_CRESSELIA
ROAMING_SLOT_DARKRAI
ROAMING_SLOT_MOLTRES
ROAMING_SLOT_ZAPDOS
ROAMING_SLOT_ARTICUNO
ROAMING_SLOT_MAX

2
generated/text_banks.txt
View File

@ -201,7 +201,7 @@ TEXT_BANK_UNK_0199
TEXT_BANK_UNK_0200
TEXT_BANK_UNK_0201
TEXT_BANK_NATURE_NAMES
TEXT_BANK_UNK_0203
TEXT_BANK_POKEMON_CENTER_DAILY_TRAINERS
TEXT_BANK_CONTEST_TEXT
TEXT_BANK_UNK_0205
TEXT_BANK_UNK_0206

2
generated/trainer_classes.txt
View File

@ -82,7 +82,7 @@ TRAINER_CLASS_PARASOL_LADY
TRAINER_CLASS_WAITER
TRAINER_CLASS_INTERVIEWERS
TRAINER_CLASS_CAMERAMAN
TRAINER_CLASS_REPORTERS
TRAINER_CLASS_REPORTER
TRAINER_CLASS_IDOL
TRAINER_CLASS_GALACTIC_BOSS
TRAINER_CLASS_COMMANDER_JUPITER

12
generated/trainer_types.txt Normal file
View File

@ -0,0 +1,12 @@
TRAINER_TYPE_NONE
TRAINER_TYPE_NORMAL
TRAINER_TYPE_VIEW_ALL_DIRECTIONS
TRAINER_TYPE_UNK_003
TRAINER_TYPE_FACE_SIDES
TRAINER_TYPE_FACE_COUNTERCLOCKWISE
TRAINER_TYPE_FACE_CLOCKWISE
TRAINER_TYPE_SPIN_COUNTERCLOCKWISE
TRAINER_TYPE_SPIN_CLOCKWISE
TRAINER_TYPE_UNK_009
TRAINER_TYPE_UNK_010
TRAINER_TYPE_UNK_011

26
generated/trainers.txt
View File

@ -366,10 +366,10 @@ TRAINER_UNKNOWN_364
TRAINER_UNKNOWN_365
TRAINER_WAITRESS_KATI
TRAINER_WORKER_GERARDO
TRAINER_UNKNOWN_368
TRAINER_UNKNOWN_369
TRAINER_UNKNOWN_370
TRAINER_UNKNOWN_371
TRAINER_INTERVIEWERS_ROXY_AND_OLI_UNUSED
TRAINER_CAMERAMAN_TEVIN_UNUSED
TRAINER_REPORTER_KINSEY_UNUSED
TRAINER_IDOL_GRACE_UNUSED
TRAINER_BATTLE_GIRL_TYLER
TRAINER_BIRD_KEEPER_AUTUMN
TRAINER_UNKNOWN_374
@ -429,7 +429,7 @@ TRAINER_GALACTIC_GRUNT_LAKE_VERITY_4
TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_1F
TRAINER_UNKNOWN_429
TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_2F_3
TRAINER_UNKNOWN_431
TRAINER_GUITARIST_ARTURO_UNUSED
TRAINER_UNKNOWN_432
TRAINER_UNKNOWN_433
TRAINER_UNKNOWN_434
@ -458,12 +458,12 @@ TRAINER_PICNICKER_KARINA
TRAINER_PICNICKER_SUMMER
TRAINER_PICNICKER_TORI
TRAINER_PICNICKER_ANA
TRAINER_UNKNOWN_460
TRAINER_CLOWN_LEE_UNUSED
TRAINER_UNKNOWN_461
TRAINER_UNKNOWN_462
TRAINER_UNKNOWN_463
TRAINER_UNKNOWN_464
TRAINER_UNKNOWN_465
TRAINER_POKE_KID_ARIEL_UNUSED
TRAINER_UNKNOWN_466
TRAINER_UNKNOWN_467
TRAINER_UNKNOWN_468
@ -545,7 +545,7 @@ TRAINER_SOCIALITE_REBECCA
TRAINER_LASS_BLYTHE
TRAINER_RICH_BOY_ROMAN
TRAINER_LADY_KYLIE
TRAINER_REPORTERS_VALERIE
TRAINER_REPORTER_VALERIE
TRAINER_SCHOOL_KID_ESTEBAN
TRAINER_SCIENTIST_EMILIO
TRAINER_BEAUTY_GABRIELLA
@ -892,9 +892,9 @@ TRAINER_POKE_KID_ARIEL_REMATCH_1
TRAINER_POKE_KID_ARIEL_REMATCH_2
TRAINER_RICH_BOY_LIAM
TRAINER_LADY_CELESTE
TRAINER_REPORTERS_KINSEY
TRAINER_REPORTERS_KINSEY_REMATCH_1
TRAINER_REPORTERS_KINSEY_REMATCH_2
TRAINER_REPORTER_KINSEY
TRAINER_REPORTER_KINSEY_REMATCH_1
TRAINER_REPORTER_KINSEY_REMATCH_2
TRAINER_MAID_BELINDA
TRAINER_MAID_SOPHIE
TRAINER_MAID_EMILY
@ -910,7 +910,7 @@ TRAINER_IDOL_GRACE_REMATCH_3
TRAINER_INTERVIEWERS_ROXY_AND_OLI_REMATCH_3
TRAINER_CLOWN_LEE_REMATCH_3
TRAINER_POKE_KID_ARIEL_REMATCH_3
TRAINER_REPORTERS_KINSEY_REMATCH_3
TRAINER_REPORTER_KINSEY_REMATCH_3
TRAINER_GALACTIC_BOSS_CYRUS_CELESTIC_TOWN_RUINS
TRAINER_CAMERAMAN_TEVIN_REMATCH_4
TRAINER_GUITARIST_ARTURO_REMATCH_4
@ -918,7 +918,7 @@ TRAINER_IDOL_GRACE_REMATCH_4
TRAINER_INTERVIEWERS_ROXY_AND_OLI_REMATCH_4
TRAINER_CLOWN_LEE_REMATCH_4
TRAINER_POKE_KID_ARIEL_REMATCH_4
TRAINER_REPORTERS_KINSEY_REMATCH_4
TRAINER_REPORTER_KINSEY_REMATCH_4
TRAINER_LEADER_VOLKNER_FIGHT_AREA
TRAINER_ELITE_FOUR_FLINT_FIGHT_AREA
TRAINER_RIVAL_FIGHT_AREA_PIPLUP

23
include/applications/pokemon_summary_screen/main.h
View File

@ -30,8 +30,8 @@ enum SummaryMode {
SUMMARY_MODE_NORMAL = 0,
SUMMARY_MODE_LOCK_MOVES,
SUMMARY_MODE_SELECT_MOVE,
SUMMARY_MODE_POFFIN,
SUMMARY_MODE_CONDITION,
SUMMARY_MODE_FEED_POFFIN,
SUMMARY_MODE_SHOW_CONDITION_CHANGE,
};
enum SummaryPage {
@ -285,6 +285,17 @@ enum SummarySprite {
SUMMARY_SPRITE_MAX = 77,
};
enum SummaryStatus {
SUMMARY_CONDITION_POKERUS = 0,
SUMMARY_CONDITION_PARALYSIS,
SUMMARY_CONDITION_FREEZE,
SUMMARY_CONDITION_SLEEP,
SUMMARY_CONDITION_POISON,
SUMMARY_CONDITION_BURN,
SUMMARY_CONDITION_FAINTED,
SUMMARY_CONDITION_NONE,
};
enum SummaryPokerusState {
SUMMARY_POKERUS_NONE = 0,
SUMMARY_POKERUS_INFECTED,
@ -326,10 +337,10 @@ typedef struct PokemonSummary {
u8 OTGender;
u8 dataType;
u8 mode;
u8 max;
u8 pos;
u8 monMax;
u8 monIndex;
u8 pageFlags;
u8 selectedSlot;
u8 selectedMoveSlot;
u8 returnMode;
u16 move;
@ -447,7 +458,7 @@ typedef struct PokemonSummaryScreen {
u8 sheenPos;
u8 sheenCount;
u8 buttonCount;
u8 buttonAnimFrame;
u8 buttonState;
u8 buttonCurrent;

2
include/applications/pokemon_summary_screen/sprites.h
View File

@ -23,7 +23,7 @@ void PokemonSummaryScreen_SetMoveSelector2Pos(PokemonSummaryScreen *summaryScree
void PokemonSummaryScreen_InitSheenSprites(PokemonSummaryScreen *summaryScreen);
void PokemonSummaryScreen_DrawSheenSprites(PokemonSummaryScreen *summaryScreen);
void PokemonSummaryScreen_UpdateMiscMonDataSprites(PokemonSummaryScreen *summaryScreen);
void PokemonSummaryScreen_ButtonTapAnim(PokemonSummaryScreen *summaryScreen);
void PokemonSummaryScreen_InitButtonTapAnim(PokemonSummaryScreen *summaryScreen);
void PokemonSummaryScreen_HideButtonTapCircle(PokemonSummaryScreen *summaryScreen);
void PokemonSummaryScreen_UpdateConditionArrowSprites(PokemonSummaryScreen *summaryScreen);
void PokemonSummaryScreen_UpdateAButtonSprite(PokemonSummaryScreen *summaryScreen, Window *window);

6
include/applications/pokemon_summary_screen/subscreen.h
View File

@ -3,6 +3,12 @@
#include "applications/pokemon_summary_screen/main.h"
enum SummaryButtonState {
SUMMARY_BUTTON_STATE_INIT_ANIM = 0,
SUMMARY_BUTTON_STATE_SETUP_PAGE,
SUMMARY_BUTTON_STATE_RUN_ANIM,
};
void PokemonSummaryScreen_SetSubscreenType(PokemonSummaryScreen *summaryScreen);
void PokemonSummaryScreen_UpdateSubscreenButtonGfx(PokemonSummaryScreen *summaryScreen);
u8 PokemonSummaryScreen_CheckSubscreenButtonPress(PokemonSummaryScreen *summaryScreen);

8
include/constants/gx_colors.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef POKEPLATINUM_CONSTANTS_GX_COLORS_H
#define POKEPLATINUM_CONSTANTS_GX_COLORS_H
#define COLOR_BLACK GX_RGB(0, 0, 0)
#define COLOR_DARK_GRAY GX_RGB(4, 4, 4)
#define COLOR_TRANSPARENT GX_RGB(31, 31, 16)
#endif // POKEPLATINUM_CONSTANTS_GX_COLORS_H

80
include/constants/map_prop.h
View File

@ -1,11 +1,81 @@
#ifndef POKEPLATINUM_CONSTANTS_MAP_PROP_H
#define POKEPLATINUM_CONSTANTS_MAP_PROP_H
enum MapPropId {
MAP_PROP_ID_HONEY_TREE = 26,
MAP_PROP_ID_UNK_242 = 242,
MAP_PROP_ID_UNK_258 = 258,
MAP_PROP_ID_UNK_475 = 475,
enum MapPropModelId {
// Model name: treeeff
MAP_PROP_MODEL_HONEY_TREE = 26,
// Model name: c2_s03a
MAP_PROP_MODEL_CANALAVE_BRIDGE_LEFT = 31,
// Model name: c2_s03b
MAP_PROP_MODEL_CANALAVE_BRIDGE_RIGHT = 32,
// Model name: door01
MAP_PROP_MODEL_DOOR01 = 66,
// Model name: t1_door1
MAP_PROP_MODEL_BROWN_WOODEN_DOOR = 67,
// Model name: t2_door1
MAP_PROP_MODEL_GREEN_WOODEN_DOOR = 68,
// Model name: t2_door2
MAP_PROP_MODEL_IRON_DOOR = 69,
// Model name: p_door
MAP_PROP_MODEL_POKECENTER_DOOR = 70,
// Model name: ele_door1
MAP_PROP_MODEL_ELEVATOR_DOOR = 75,
// Model name: table_l01
MAP_PROP_MODEL_DESK_DRAWER_LAPTOP = 112,
// Model name: table_l02
MAP_PROP_MODEL_DESK_DRAWER_LAPTOP_FACING_RIGHT = 115,
// Model name: pc01
MAP_PROP_MODEL_POKECENTER_PC = 119,
// Model name: machine_pc03
MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_TV = 124,
// Model name: counter_pc04
MAP_PROP_MODEL_POKECENTER_INSIDE_COUNTER_DOOR = 128,
// Model name: stair_pc_u01
MAP_PROP_MODEL_POKECENTER_STAIR_UP_LEFT = 130,
// Model name: stair_pc_d01
MAP_PROP_MODEL_POKECENTER_STAIR_DOWN_LEFT = 131,
// Model name: r04_w
MAP_PROP_MODEL_PASTORIA_GYM_WATER_FLOOR = 242,
// Model name: c1_door1
MAP_PROP_MODEL_JUBILIFE_CITY_BUILDING_DOOR = 246,
// Model name: table_l03
MAP_PROP_MODEL_DESK_DRAWER_LAPTOP_FACING_LEFT = 248,
// Model name: lift_base01
MAP_PROP_MODEL_IRON_ISLAND_LIFT_PLATFORM = 258,
// Model name: gym_door01
MAP_PROP_MODEL_HEARTHOME_GYM_INSIDE_DOOR = 260,
// Model name: gym_door00
MAP_PROP_MODEL_GYM_DOOR = 298,
// Model name: c3_door1
MAP_PROP_MODEL_BLUE_DOOR = 312,
// Model name: c3_door2
MAP_PROP_MODEL_IRON_DOOR_2 = 313,
// Model name: stair_pc_u02
MAP_PROP_MODEL_POKECENTER_STAIR_UP_RIGHT = 425,
// Model name: stair_pc_d02
MAP_PROP_MODEL_POKECENTER_STAIR_DOWN_RIGHT = 426,
// Model name: door_pc01
MAP_PROP_MODEL_POKECENTER_INSIDE_DOOR = 427,
// Model name: t3_door1
MAP_PROP_MODEL_YELLOW_WOODEN_DOOR = 438,
// Model name: d3_door1
MAP_PROP_MODEL_MANSION_DOOR = 441,
// Model name: c5_door_s
MAP_PROP_MODEL_VEILSTONE_DPT_STORE_DOOR = 442,
// Model name: c4_door1
MAP_PROP_MODEL_BLUE_WOODEN_DOOR = 444,
// Model name: door_wi01
MAP_PROP_MODEL_GTS_INSIDE_DOOR = 456,
// Model name: d6_train
MAP_PROP_MODEL_GREAT_MARSH_TRAIN = 475,
// Model name: card_door01
MAP_PROP_MODEL_CARD_DOOR = 484,
// Model name: ev_o01
MAP_PROP_MODEL_ELEVATOR_LIGHTS = 498,
// Model name: pc_mb
MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_MINI_POKEBALL = 517,
// Model name: l2_door1
MAP_PROP_MODEL_HOTEL_GRAND_LAKE_DOOR = 527,
};
#endif // POKEPLATINUM_CONSTANTS_MAP_PROP_H

1
include/constants/moves.h
View File

@ -6,6 +6,7 @@
#include "generated/moves.h"
#define LEARNED_MOVES_MAX 4
#define MOVE_NOT_SELECTED 0xFF
#define NUM_MOVES MOVE_SHADOW_FORCE

91
include/constants/savedata/vars_flags.h
View File

@ -5,6 +5,89 @@
#include "generated/giratina_shadow_animations.h"
#include "generated/villa_furnitures.h"
#define FLAG_MESPRIT_CAUGHT 0x0125
#define FLAG_AZELF_CAUGHT 0x0126
#define FLAG_UXIE_CAUGHT 0x0127
#define FLAG_DEFEATED_COMMANDER_SATURN_VALOR_CAVERN 0x013E
#define FLAG_GALACTIC_LEFT_LAKE_VALOR 0x015E
#define FLAG_MESPRIT_DISAPPEARED 0x01DF
#define FLAG_AZELF_DISAPPEARED 0x01E0
#define FLAG_UXIE_DISAPPEARED 0x01E1
#define VARS_START 0x4000
#define SYSTEM_VARS_START (VARS_START + 0x0030)
#define NUM_SYSTEM_VARS 64
#define VAR_PLAYER_STARTER (SYSTEM_VARS_START + 0)
#define VAR_UNUSED_0x4031 (SYSTEM_VARS_START + 1)
#define VAR_UNK_0x4032 (SYSTEM_VARS_START + 2)
#define VAR_VS_SEEKER_BATTERY_LEVEL (SYSTEM_VARS_START + 3)
#define VAR_VS_SEEKER_STEP_COUNT (SYSTEM_VARS_START + 4)
#define VAR_SIZE_CONTEST_RECORD (SYSTEM_VARS_START + 5)
#define VAR_HIDDEN_LOCATION_FULL_MOON_ISLAND (SYSTEM_VARS_START + 6)
#define VAR_HIDDEN_LOCATION_NEW_MOON_ISLAND (SYSTEM_VARS_START + 7)
#define VAR_HIDDEN_LOCATION_SPRING_PATH (SYSTEM_VARS_START + 8)
#define VAR_HIDDEN_LOCATION_SEABREAK_PATH (SYSTEM_VARS_START + 9)
#define VAR_AMITY_SQUARE_STEP_COUNT (SYSTEM_VARS_START + 10)
#define VAR_NEWS_PRESS_DEADLINE (SYSTEM_VARS_START + 11)
#define VAR_LOTTERY_TRAINER_ID_LOW_HALF (SYSTEM_VARS_START + 12)
#define VAR_LOTTERY_TRAINER_ID_HIGH_HALF (SYSTEM_VARS_START + 13)
#define VAR_SPIRITOMB_COUNTER (SYSTEM_VARS_START + 14)
#define VAR_PARTNER_TRAINER_ID (SYSTEM_VARS_START + 15)
#define VAR_CONSECUTIVE_BONUS_ROUND_WINS (SYSTEM_VARS_START + 16)
#define VAR_DAILY_RANDOM_LEVEL (SYSTEM_VARS_START + 17)
#define VAR_DEPARTMENT_STORE_REGULAR_COUNTER (SYSTEM_VARS_START + 18)
#define VAR_DISTRIBUTION_EVENT_DARKRAI (SYSTEM_VARS_START + 19)
#define VAR_DISTRIBUTION_EVENT_SHAYMIN (SYSTEM_VARS_START + 20)
#define VAR_DISTRIBUTION_EVENT_ARCEUS (SYSTEM_VARS_START + 21)
#define VAR_DISTRIBUTION_EVENT_ROTOM (SYSTEM_VARS_START + 22)
#define VAR_UNDERGROUND_FOSSILS_UNEARTHED (SYSTEM_VARS_START + 23)
#define VAR_UNDERGROUND_TRAPS_SET (SYSTEM_VARS_START + 24)
#define VAR_UNDERGROUND_TALK_COUNTER (SYSTEM_VARS_START + 25)
#define VAR_FRIENDSHIP_INCREMENT_STEP_COUNTER (SYSTEM_VARS_START + 26)
#define VAR_ETERNA_GYM_FLOWER_CLOCK_STATE (SYSTEM_VARS_START + 27)
#define VAR_UNK_0x404C (SYSTEM_VARS_START + 28)
#define VAR_TOTAL_TURNS_LAST_BATTLE (SYSTEM_VARS_START + 29)
#define VAR_RESORT_VILLA_VISITOR (SYSTEM_VARS_START + 30)
#define VAR_BATTLE_TOWER_PRINT_STATE (SYSTEM_VARS_START + 31)
#define VAR_BATTLE_FACTORY_PRINT_STATE (SYSTEM_VARS_START + 32)
#define VAR_BATTLE_HALL_PRINT_STATE (SYSTEM_VARS_START + 33)
#define VAR_BATTLE_CASTLE_PRINT_STATE (SYSTEM_VARS_START + 34)
#define VAR_BATTLE_ARCADE_PRINT_STATE (SYSTEM_VARS_START + 35)
#define VAR_UNDERGROUND_ITEMS_GIVEN_AWAY (SYSTEM_VARS_START + 36)
#define VAR_DISTORTION_WORLD_PROGRESS (SYSTEM_VARS_START + 37)
#define VAR_ARCEUS_EVENT_STATE (SYSTEM_VARS_START + 38)
#define VAR_SHAYMIN_EVENT_STATE (SYSTEM_VARS_START + 39)
#define VAR_ROAMING_CRESSELIA_STATE (SYSTEM_VARS_START + 40)
#define VAR_ROAMING_MESPRIT_STATE (SYSTEM_VARS_START + 41)
#define VAR_RESORT_VILLA_VISITOR_MESSAGE_NUM (SYSTEM_VARS_START + 42)
#define VAR_DISTORTION_WORLD_CYRUS_APPEARANCE (SYSTEM_VARS_START + 43)
#define VAR_UNK_0x405C (SYSTEM_VARS_START + 44)
#define VAR_UNK_0x405D (SYSTEM_VARS_START + 45)
#define VAR_ROAMING_MOLTRES_STATE (SYSTEM_VARS_START + 46)
#define VAR_ROAMING_ZAPDOS_STATE (SYSTEM_VARS_START + 47)
#define VAR_ROAMING_ARTICUNO_STATE (SYSTEM_VARS_START + 48)
#define VAR_UNK_0x4061 (SYSTEM_VARS_START + 49)
#define VAR_UNK_0x4062 (SYSTEM_VARS_START + 50)
#define VAR_UNK_0x4063 (SYSTEM_VARS_START + 51)
#define VAR_WIFI_FRONTIER_CLEARED (SYSTEM_VARS_START + 52)
#define VAR_UNK_0x4065 (SYSTEM_VARS_START + 53)
#define VAR_UNK_0x4066 (SYSTEM_VARS_START + 54)
#define VAR_UNK_0x4067 (SYSTEM_VARS_START + 55)
#define VAR_UNK_0x4068 (SYSTEM_VARS_START + 56)
#define VAR_UNK_0x4069 (SYSTEM_VARS_START + 57)
#define VAR_UNK_0x406A (SYSTEM_VARS_START + 58)
#define VAR_UNK_0x406B (SYSTEM_VARS_START + 59)
#define VAR_UNUSED_0x406C (SYSTEM_VARS_START + 60)
#define VAR_UNUSED_0x406D (SYSTEM_VARS_START + 61)
#define VAR_UNUSED_0x406E (SYSTEM_VARS_START + 62)
#define VAR_UNUSED_0x406F (SYSTEM_VARS_START + 63)
#define SPECIAL_VARS_START 0x8000
#define SYSTEM_FLAGS_START 2400
#define FLAG_BAG_ACQUIRED (SYSTEM_FLAGS_START + 0)
#define FLAG_HAS_PARTNER (SYSTEM_FLAGS_START + 1)
@ -73,4 +156,12 @@
#define SYSTEM_FLAGS_FIRST_ARRIVAL_TO_ZONE (SYSTEM_FLAGS_GIRATINA_ANIM_START + GIRATINA_SHADOW_ANIM_MAX)
#define FLAG_DEFEATED_IDOL_GRACE 0x0ABC
#define FLAG_DEFEATED_REPORTER_KINSEY 0x0ABD
#define FLAG_DEFEATED_CAMERAMAN_TEVIN 0x0ABE
#define FLAG_DEFEATED_CLOWN_LEE 0x0ABF
#define FLAG_DEFEATED_INTERVIEWERS_ROXY_AND_OLI 0x0AC0
#define FLAG_DEFEATED_POKE_KID_ARIEL 0x0AC1
#define FLAG_DEFEATED_GUITARIST_ARTURO 0x0AC2
#endif // POKEPLATINUM_CONSTANTS_VARS_AND_FLAGS_H

9
include/constants/scrcmd.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef POKEPLATINUM_CONSTANTS_SCRCMD_H
#define POKEPLATINUM_CONSTANTS_SCRCMD_H
#define MENU_YES 0
#define MENU_NO 1
#define LOCALID_PLAYER 0xFF
#endif // POKEPLATINUM_CONSTANTS_SCRCMD_H

2
include/constants/trainer.h
View File

@ -90,7 +90,7 @@ enum TrainerClass {
TRAINER_CLASS_WAITER,
TRAINER_CLASS_INTERVIEWERS,
TRAINER_CLASS_CAMERAMAN,
TRAINER_CLASS_REPORTERS,
TRAINER_CLASS_REPORTER,
TRAINER_CLASS_IDOL,
TRAINER_CLASS_GALACTIC_BOSS,
TRAINER_CLASS_COMMANDER_JUPITER,

1186
include/data/map_headers.h
View File

File diff suppressed because it is too large Load Diff

2
include/data/trainer_class_genders.h
View File

@ -87,7 +87,7 @@ static const u8 sTrainerClassGender[] = {
[TRAINER_CLASS_WAITER] = GENDER_MALE,
[TRAINER_CLASS_INTERVIEWERS] = GENDER_NONE,
[TRAINER_CLASS_CAMERAMAN] = GENDER_MALE,
[TRAINER_CLASS_REPORTERS] = GENDER_FEMALE,
[TRAINER_CLASS_REPORTER] = GENDER_FEMALE,
[TRAINER_CLASS_IDOL] = GENDER_FEMALE,
[TRAINER_CLASS_GALACTIC_BOSS] = GENDER_MALE,
[TRAINER_CLASS_COMMANDER_JUPITER] = GENDER_FEMALE,

2
include/data/trainer_class_prize_mul.h
View File

@ -86,7 +86,7 @@ static u8 sTrainerClassPrizeMul[] = {
[TRAINER_CLASS_WAITER] = 8,
[TRAINER_CLASS_INTERVIEWERS] = 18,
[TRAINER_CLASS_CAMERAMAN] = 8,
[TRAINER_CLASS_REPORTERS] = 10,
[TRAINER_CLASS_REPORTER] = 10,
[TRAINER_CLASS_IDOL] = 18,
[TRAINER_CLASS_GALACTIC_BOSS] = 45,
[TRAINER_CLASS_COMMANDER_JUPITER] = 20,

11
include/field/field_system.h
View File

@ -13,10 +13,10 @@
#include "struct_defs/struct_0204AFC4.h"
#include "field/field_system_sub2_decl.h"
#include "overlay005/area_data.h"
#include "overlay005/map_prop.h"
#include "overlay005/map_prop_animation.h"
#include "overlay005/struct_ov5_021D1A68_decl.h"
#include "overlay005/struct_ov5_021D3CAC_decl.h"
#include "overlay005/struct_ov5_021D41B4_decl.h"
#include "overlay005/struct_ov5_021D538C_decl.h"
#include "overlay005/struct_ov5_021D57D8_decl.h"
#include "overlay005/struct_ov5_021D5894.h"
@ -25,7 +25,6 @@
#include "overlay005/struct_ov5_021E8F60_decl.h"
#include "overlay005/struct_ov5_021EB0E0_decl.h"
#include "overlay005/struct_ov5_021EF300_decl.h"
#include "overlay005/struct_ov5_021EF76C_decl.h"
#include "overlay023/struct_ov23_0224942C_decl.h"
#include "overlay056/struct_ov56_02256468_decl.h"
#include "overlay066/struct_ov66_0222DCE0_sub1.h"
@ -80,7 +79,7 @@ typedef struct FieldSystem_t {
Camera *camera;
UnkStruct_ov5_021E8F60 *unk_28;
MapMatrix *mapMatrix;
UnkStruct_ov5_021EF76C *unk_30;
AreaDataManager *areaDataManager;
UnkStruct_ov5_021D1A68 *unk_34;
MapObjectManager *mapObjMan;
PlayerAvatar *playerAvatar;
@ -88,8 +87,8 @@ typedef struct FieldSystem_t {
UnkStruct_ov5_021D5894 *unk_44;
UnkStruct_ov5_021D57D8 *unk_48;
UnkStruct_ov5_021D538C *unk_4C;
UnkStruct_ov5_021D3CAC *unk_50;
UnkStruct_ov5_021D41B4 *unk_54;
MapPropAnimationManager *mapPropAnimMan;
MapPropOneShotAnimationManager *mapPropOneShotAnimMan;
UnkStruct_02054C18 *unk_58;
const TerrainCollisionManager *terrainCollisionMan;
int unk_60;

4
include/map_header.h
View File

@ -4,7 +4,7 @@
#include "generated/evolution_methods.h"
typedef struct {
u8 unk_00;
u8 areaDataArchiveID;
u8 unk_01;
u16 mapMatrixID;
u16 scriptsArchiveID;
@ -27,7 +27,7 @@ typedef struct {
} MapHeader;
u32 MapHeader_IDBoundsCheck(u32 headerID);
const u16 sub_0203A038(u32 headerID);
const u16 MapHeader_GetAreaDataArchiveID(u32 headerID);
const u16 sub_0203A04C(u32 headerID);
const u16 MapHeader_GetMapMatrixID(u32 headerID);
u32 MapHeader_GetMsgArchiveID(u32 headerID);

2
include/map_object.h
View File

@ -58,7 +58,7 @@ void MapObjectMan_Delete(MapObjectManager *mapObjMan);
void sub_0206184C(MapObjectManager *mapObjMan, int mapID, int param2, int objEventCount, const ObjectEvent *objectEvent);
MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int mapID);
MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, int z, int initialDir, int graphicsID, int movementType, int mapID);
MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int objEventCount, int mapID, const ObjectEvent *objectEvent);
MapObject *MapObjectMan_AddMapObjectFromLocalID(const MapObjectManager *mapObjMan, int param1, int objEventCount, int mapID, const ObjectEvent *objectEvent);
void sub_02061AB4(MapObject *mapObj, int graphicsID);
void sub_02061AD4(MapObject *mapObj, int param1);
void MapObject_Delete(MapObject *mapObj);

2
include/math.h
View File

@ -5,6 +5,8 @@
#include "constants/heap.h"
#define LCRNG_MULTIPLIER 1103515245L
enum AffineTransformationMatrixMode {
AFFINE_MODE_NORMAL = 0,
AFFINE_MODE_MAX_256,

52
include/overlay005/area_data.h Normal file
View File

@ -0,0 +1,52 @@
#ifndef POKEPLATINUM_OV5_AREA_DATA_H
#define POKEPLATINUM_OV5_AREA_DATA_H
#include <nnsys.h>
#include "overlay005/map_prop_animation.h"
#include "overlay005/map_prop_material_shape.h"
#define MAX_MAP_PROP_MODEL_FILES 768
typedef struct AreaDataManagerLoadData {
int areaDataArchiveID;
MapPropAnimationManager *mapPropAnimMan;
u16 mapPropModelIDsCount;
int dummy0C;
} AreaDataManagerLoadData;
typedef struct AreaDataFile {
u16 mapPropArchivesID;
u16 mapTextureArchiveID;
// The value of this changes in the NARC, but is unused in the code
u16 dummy04;
u16 areaLightArchiveID;
} AreaDataFile;
typedef struct AreaDataManager {
int dummy00;
NNSG3dResFileHeader *mapPropModelFiles[MAX_MAP_PROP_MODEL_FILES];
void *mapTextureFile;
void *mapPropTextureFile;
NNSG3dResTex *mapTexture;
NNSG3dResTex *mapPropTexture;
MapPropMaterialShape *mapPropMatShp;
AreaDataFile areaData;
AreaDataManagerLoadData *loadData;
// Note: the first element is the size of this array
u16 *mapPropModelIDs;
} AreaDataManager;
AreaDataManager *AreaDataManager_Alloc(int areaDataArchiveID, MapPropAnimationManager *mapPropAnimMan);
void AreaDataManager_Load(AreaDataManager *areaDataManager);
NNSG3dResFileHeader **AreaDataManager_GetMapPropModelFile(const int mapPropModelID, AreaDataManager *const areaDataManager);
void AreaDataManager_Free(AreaDataManager **areaDataManager);
NNSG3dResTex *AreaDataManager_GetMapTexture(const AreaDataManager *areaDataManager);
NNSG3dResTex *AreaDataManager_GetMapPropTexture(const AreaDataManager *areaDataManager);
const MapPropMaterialShape *AreaDataManager_GetMapPropMaterialShape(const AreaDataManager *areaDataManager);
BOOL AreaDataManager_IsOutdoorsLighting(const AreaDataManager *areaDataManager);
u8 AreaDataManager_GetAreaLightArchiveID(const AreaDataManager *areaDataManager);
int AreaDataManager_GetMapPropModelID(const AreaDataManager *areaDataManager, const int index);
BOOL AreaDataManager_HasMapPropModelFile(const AreaDataManager *areaDataManager, const int mapPropModelID);
#endif // POKEPLATINUM_OV5_AREA_DATA_H

18
include/overlay005/map_prop.h
View File

@ -4,16 +4,16 @@
#include <nitro/fx/fx.h>
#include <nnsys.h>
#include "overlay005/struct_ov5_021D3CAC_decl.h"
#include "overlay005/area_data.h"
#include "overlay005/map_prop_animation.h"
#include "overlay005/struct_ov5_021D5894.h"
#include "overlay005/struct_ov5_021EF76C_decl.h"
#include "narc.h"
#define MAX_LOADED_MAP_PROPS 32
typedef struct MapProp {
int id;
int modelID;
BOOL loaded;
BOOL hidden;
BOOL applyRotation;
@ -32,19 +32,19 @@ MapPropManager *MapPropManager_New(const u8 heapId);
void MapPropManager_Free(MapPropManager *mapPropManager);
void MapPropManager_Init(MapPropManager *mapPropManager);
void MapPropManager_InitOne(const int index, MapPropManager *mapPropManager);
void MapPropManager_Load(NARC *landDataNARC, const int mapPropFilesSize, UnkStruct_ov5_021EF76C *const param2, MapPropManager *mapPropManager, UnkStruct_ov5_021D3CAC *param4);
void MapPropManager_Render(const VecFx32 *positionOffset, const UnkStruct_ov5_021EF76C *param1, const BOOL param2, UnkStruct_ov5_021D5894 *const param3, MapPropManager *mapPropManager);
void MapPropManager_Load(NARC *landDataNARC, const int mapPropFilesSize, AreaDataManager *const areaDataManager, MapPropManager *mapPropManager, MapPropAnimationManager *mapPropAnimMan);
void MapPropManager_Render(const VecFx32 *positionOffset, const AreaDataManager *areaDataManager, const BOOL param2, UnkStruct_ov5_021D5894 *const param3, MapPropManager *mapPropManager);
VecFx32 *MapProp_GetRotation(MapProp *mapProp);
VecFx32 MapProp_GetPosition(const MapProp *mapProp);
void MapProp_SetPosition(MapProp *mapProp, const VecFx32 *position);
void MapProp_SetHidden(MapProp *mapProp, const BOOL hidden);
int MapProp_GetId(const MapProp *mapProp);
int MapProp_GetModelID(const MapProp *mapProp);
NNSG3dRenderObj *MapProp_GetRenderObj(const MapProp *mapProp);
NNSG3dResMdl *MapProp_GetModel(const MapProp *mapProp);
MapProp *MapPropManager_GetLoadedProp(MapPropManager *mapPropManager, const u8 index);
MapProp *MapPropManager_FindLoadedPropById(MapPropManager *mapPropManager, const int id);
MapProp *MapPropManager_FindLoadedPropByModelID(MapPropManager *mapPropManager, const int modelID);
MapProp *MapPropManager_GetLoadedPropSafely(MapPropManager *mapPropManager, const int index);
u8 MapPropManager_LoadOne(MapPropManager *mapPropManager, UnkStruct_ov5_021EF76C *const param1, const int id, const VecFx32 *position, const VecFx32 *rotation, UnkStruct_ov5_021D3CAC *param5);
void MapPropManager_Render2(MapPropManager *mapPropManager, UnkStruct_ov5_021EF76C *const param1);
u8 MapPropManager_LoadOne(MapPropManager *mapPropManager, AreaDataManager *const areaDataManager, const int modelID, const VecFx32 *position, const VecFx32 *rotation, MapPropAnimationManager *mapPropAnimMan);
void MapPropManager_Render2(MapPropManager *mapPropManager, AreaDataManager *const areaDataManager);
#endif // POKEPLATINUM_OV5_MAP_PROP_H

109
include/overlay005/map_prop_animation.h Normal file
View File

@ -0,0 +1,109 @@
#ifndef POKEPLATINUM_OV5_MAP_PROP_ANIMATION_H
#define POKEPLATINUM_OV5_MAP_PROP_ANIMATION_H
#include <nnsys.h>
#include "narc.h"
#define MAP_PROP_ANIME_LIST_FILE_ARCHIVE_IDS_COUNT 4
#define MAP_PROP_ANIMATION_MANAGER_MAX_ANIMATIONS 16
#define MAP_PROP_ANIMATION_MANAGER_MAX_BICYCLE_SLOPE_ANIMATIONS 2
#define MAP_PROP_ONE_SHOT_ANIMATION_MAX_ANIMATIONS 4
#define MAP_PROP_ONE_SHOT_ANIMATION_MAX_RENDER_OBJS 6
#define MAP_PROP_ONE_SHOT_ANIMATION_MANAGER_MAX_ITEMS 16
typedef struct MapPropAnimation {
NNSG3dAnmObj *animationObj;
BOOL loaded;
int currentLoop;
int animeArchiveID;
BOOL paused;
void *animationFile;
int loopCount;
BOOL looping;
BOOL reversed;
int pastoriaGymButtonGroup;
} MapPropAnimation;
typedef struct BicycleSlopeAnimation {
BOOL loaded;
NNSG3dRenderObj *renderObj;
MapPropAnimation *animation;
int animeArchiveID;
} BicycleSlopeAnimation;
typedef struct MapPropAnimeListFile {
u8 hasAnimations;
u8 flags;
u8 isBicycleSlope;
u8 dummy03;
int animeArchiveIDs[MAP_PROP_ANIME_LIST_FILE_ARCHIVE_IDS_COUNT];
} MapPropAnimeListFile;
typedef struct MapPropAnimationManager {
NNSFndAllocator allocator;
MapPropAnimation animations[MAP_PROP_ANIMATION_MANAGER_MAX_ANIMATIONS];
BicycleSlopeAnimation bicycleSlopeAnimations[MAP_PROP_ANIMATION_MANAGER_MAX_BICYCLE_SLOPE_ANIMATIONS];
NARC *animeNARC;
NARC *animeListNARC;
} MapPropAnimationManager;
typedef struct MapPropOneShotAnimationList {
MapPropAnimation *list[MAP_PROP_ONE_SHOT_ANIMATION_MAX_ANIMATIONS];
int count;
} MapPropOneShotAnimationList;
typedef struct MapPropOneShotAnimation {
MapPropOneShotAnimationList animations;
NNSG3dRenderObj *mapPropRenderObjs[MAP_PROP_ONE_SHOT_ANIMATION_MAX_RENDER_OBJS];
MapPropAnimation *currentAnimation;
int mapPropModelID;
u8 tag;
} MapPropOneShotAnimation;
typedef struct MapPropOneShotAnimationManager {
MapPropOneShotAnimation items[MAP_PROP_ONE_SHOT_ANIMATION_MANAGER_MAX_ITEMS];
} MapPropOneShotAnimationManager;
MapPropAnimationManager *MapPropAnimationManager_New(void);
MapPropAnimation *MapPropAnimationManager_LoadPropAnimationForOneShot(const int mapPropModelID, const int mapPropAnimIndex, const int animationLoopCount, const int pastoriaGymButtonGroup, const BOOL animationReversed, const BOOL animationPaused, const BOOL isDeferredLoading, NNSG3dResMdl *mapPropModel, NNSG3dResTex *mapPropTexture, MapPropAnimationManager *manager);
void MapPropAnimationManager_LoadPropAnimations(const int mapPropModelID, NNSG3dResMdl *mapPropModel, NNSG3dResTex *mapPropTexture, MapPropAnimationManager *manager);
BOOL MapPropAnimationManager_AddAnimationToRenderObj(const int mapPropModelID, const int mapPropAnimIndex, const BOOL isDeferredAddToRenderObj, NNSG3dRenderObj *mapPropRenderObj, MapPropAnimationManager *manager);
BOOL MapPropAnimationManager_AddAllAnimationsToRenderObj(const int mapPropModelID, NNSG3dRenderObj *mapPropRenderObj, MapPropAnimationManager *manager);
void MapPropAnimationManager_UnloadAllAnimations(MapPropAnimationManager *manager);
void MapPropAnimationManager_UnloadAnimation(MapPropAnimation *animation, MapPropAnimationManager *manager);
void MapPropAnimationManager_RemoveAnimationFromRenderObj(MapPropAnimationManager *manager, NNSG3dRenderObj *mapPropRenderObj, const int mapPropModelID, const int mapPropAnimIndex);
void MapPropAnimationManager_Free(MapPropAnimationManager *manager);
MapPropAnimation *MapPropAnimationManager_GetAnimationByPastoriaGymButtonGroup(const int pastoriaGymButtonGroup, MapPropAnimationManager *manager);
MapPropAnimation *MapPropAnimationManager_GetAnimation(const int mapPropModelID, const int mapPropAnimIndex, MapPropAnimationManager *manager);
void MapPropAnimationManager_AdvanceAnimations(MapPropAnimationManager *manager);
u16 MapPropAnimationManager_GetAnimeListNARCFileCount(MapPropAnimationManager *manager);
const u8 MapPropAnimationManager_GetPropAnimationCount(MapPropAnimationManager *manager, const int mapPropModelID);
void MapPropAnimation_SetAnimationPaused(MapPropAnimation *animation, const BOOL paused);
void MapPropAnimation_StartLoop(MapPropAnimation *animation);
BOOL MapPropAnimation_IsOnLastFrame(MapPropAnimation *animation);
void MapPropAnimation_GoToFirstFrame(MapPropAnimation *animation);
void MapPropAnimation_GoToLastFrame(MapPropAnimation *animation);
void MapPropAnimation_AdvanceFrame(MapPropAnimation *animation);
void MapPropAnimation_SetReversed(MapPropAnimation *animation, const BOOL reversed);
void MapPropAnimation_SetLoopCount(MapPropAnimation *animation, const int loopCount);
void MapPropAnimation_SetPastoriaGymButtonGroup(MapPropAnimation *animation, const int pastoriaGymButtonGroup);
BOOL MapPropAnimation_IsLoopFinished(const MapPropAnimation *animation);
MapPropOneShotAnimationManager *MapPropOneShotAnimationManager_New(void);
void MapPropOneShotAnimationManager_Free(MapPropOneShotAnimationManager **oneShotAnimMan);
void MapPropOneShotAnimationManager_LoadPropAnimations(MapPropAnimationManager *animMan, MapPropOneShotAnimationManager *const oneShotAnimMan, const int tag, const int mapPropModelID, NNSG3dRenderObj *mapPropRenderObj, NNSG3dResMdl *mapPropModel, NNSG3dResTex *mapPropTexture, const int animationCount, const u8 animationLoopCount, const BOOL animationReversed);
void MapPropOneShotAnimationManager_SetAnimationRenderObj(MapPropOneShotAnimationManager *const oneShotAnimMan, const int tag, const u8 renderObjIndex, NNSG3dRenderObj *renderObj);
void MapPropOneShotAnimationManager_PlayAnimation(MapPropOneShotAnimationManager *const oneShotAnimMan, const int tag, const int mapPropAnimIndex);
void MapPropOneShotAnimationManager_PlayAnimationWithSoundEffect(MapPropOneShotAnimationManager *const oneShotAnimMan, const int tag, const int mapPropAnimIndex, const int soundEffectID);
void MapPropOneShotAnimationManager_UnloadAnimation(MapPropAnimationManager *animMan, MapPropOneShotAnimationManager *oneShotAnimMan, const int tag);
MapPropAnimation *MapPropOneShotAnimationManager_GetCurrentAnimation(MapPropOneShotAnimationManager *const oneShotAnimMan, const int tag);
const BOOL MapPropOneShotAnimationManager_IsAnimationLoopFinished(MapPropOneShotAnimationManager *const oneShotAnimMan, const int tag);
const int MapPropOneShotAnimationManager_GetAnimationMapPropModelID(MapPropOneShotAnimationManager *const oneShotAnimMan, const int tag);
#endif // POKEPLATINUM_OV5_MAP_PROP_ANIMATION_H

28
include/overlay005/map_prop_material_shape.h Normal file
View File

@ -0,0 +1,28 @@
#ifndef POKEPLATINUM_OV5_MAP_PROP_MATERIAL_SHAPE_H
#define POKEPLATINUM_OV5_MAP_PROP_MATERIAL_SHAPE_H
#include <nitro/types.h>
typedef struct MapPropMaterialShapeIDsLocator {
u16 idsCount;
u16 idsIndex;
} MapPropMaterialShapeIDsLocator;
typedef struct MapPropMaterialShapeIDs {
u16 materialID;
u16 shapeID;
} MapPropMaterialShapeIDs;
typedef struct MapPropMaterialShape {
MapPropMaterialShapeIDsLocator *idsLocators;
MapPropMaterialShapeIDs *ids;
} MapPropMaterialShape;
MapPropMaterialShape *MapPropMaterialShape_Alloc(void);
void MapPropMaterialShape_Load(const char *path, MapPropMaterialShape *propMatShp);
void MapPropMaterialShape_Free(MapPropMaterialShape *propMatShp);
void MapProp_GetMaterialShapeIDsCount(const int mapPropModelID, const MapPropMaterialShape *propMatShp, u16 *idsCount);
void MapProp_GetMaterialShapeIDsLocator(const int mapPropModelID, const MapPropMaterialShape *propMatShp, u16 *idsCount, u16 *idsIndex);
MapPropMaterialShapeIDs const *MapPropMaterialShape_GetMaterialShapeIDsAt(const u16 index, const MapPropMaterialShape *propMatShp);
#endif // POKEPLATINUM_OV5_MAP_PROP_MATERIAL_SHAPE_H

45
include/overlay005/ov5_021D37AC.h
View File

@ -1,45 +0,0 @@
#ifndef POKEPLATINUM_OV5_021D37AC_H
#define POKEPLATINUM_OV5_021D37AC_H
#include <nnsys.h>
#include "overlay005/struct_ov5_021D3CAC_decl.h"
#include "overlay005/struct_ov5_021D3CE4_decl.h"
#include "overlay005/struct_ov5_021D41B4_decl.h"
UnkStruct_ov5_021D3CAC *ov5_021D38B8(void);
UnkStruct_ov5_021D3CE4 *ov5_021D3978(const int param0, const int param1, const int param2, const int param3, const BOOL param4, const BOOL param5, const BOOL param6, NNSG3dResMdl *param7, NNSG3dResTex *param8, UnkStruct_ov5_021D3CAC *param9);
void ov5_021D3A50(const int param0, NNSG3dResMdl *param1, NNSG3dResTex *param2, UnkStruct_ov5_021D3CAC *param3);
BOOL ov5_021D3B24(const int param0, const int param1, const BOOL param2, NNSG3dRenderObj *param3, UnkStruct_ov5_021D3CAC *param4);
BOOL ov5_021D3BE4(const int param0, NNSG3dRenderObj *param1, UnkStruct_ov5_021D3CAC *param2);
void ov5_021D3CAC(UnkStruct_ov5_021D3CAC *param0);
void ov5_021D3CE4(UnkStruct_ov5_021D3CE4 *param0, UnkStruct_ov5_021D3CAC *param1);
void ov5_021D3D18(UnkStruct_ov5_021D3CAC *param0, NNSG3dRenderObj *param1, const int param2, const int param3);
void ov5_021D3D7C(UnkStruct_ov5_021D3CAC *param0);
UnkStruct_ov5_021D3CE4 *ov5_021D3DA0(const int param0, UnkStruct_ov5_021D3CAC *param1);
UnkStruct_ov5_021D3CE4 *ov5_021D3DE4(const int param0, const int param1, UnkStruct_ov5_021D3CAC *param2);
void ov5_021D3E40(UnkStruct_ov5_021D3CE4 *param0, const BOOL param1);
void ov5_021D3E44(UnkStruct_ov5_021D3CE4 *param0);
BOOL ov5_021D3E4C(UnkStruct_ov5_021D3CE4 *param0);
void ov5_021D3E7C(UnkStruct_ov5_021D3CE4 *param0);
void ov5_021D3E9C(UnkStruct_ov5_021D3CE4 *param0);
void ov5_021D3EBC(UnkStruct_ov5_021D3CE4 *param0);
void ov5_021D3F04(UnkStruct_ov5_021D3CE4 *param0, const BOOL param1);
void ov5_021D3F08(UnkStruct_ov5_021D3CE4 *param0, const int param1);
void ov5_021D3F0C(UnkStruct_ov5_021D3CE4 *param0, const int param1);
void ov5_021D3F10(UnkStruct_ov5_021D3CAC *param0);
BOOL ov5_021D3F70(const UnkStruct_ov5_021D3CE4 *param0);
u16 ov5_021D3F84(UnkStruct_ov5_021D3CAC *param0);
const u8 ov5_021D3F94(UnkStruct_ov5_021D3CAC *param0, const int param1);
UnkStruct_ov5_021D41B4 *ov5_021D4194(void);
void ov5_021D41B4(UnkStruct_ov5_021D41B4 **param0);
void ov5_021D41C8(UnkStruct_ov5_021D3CAC *param0, UnkStruct_ov5_021D41B4 *const param1, const int param2, const int param3, NNSG3dRenderObj *param4, NNSG3dResMdl *param5, NNSG3dResTex *param6, const int param7, const u8 param8, const BOOL param9);
void ov5_021D4220(UnkStruct_ov5_021D41B4 *const param0, const int param1, const u8 param2, NNSG3dRenderObj *param3);
void ov5_021D4250(UnkStruct_ov5_021D41B4 *const param0, const int param1, const int param2);
void ov5_021D4278(UnkStruct_ov5_021D41B4 *const param0, const int param1, const int param2, const int param3);
void ov5_021D42B0(UnkStruct_ov5_021D3CAC *param0, UnkStruct_ov5_021D41B4 *param1, const int param2);
UnkStruct_ov5_021D3CE4 *ov5_021D42D8(UnkStruct_ov5_021D41B4 *const param0, const int param1);
const BOOL ov5_021D42F0(UnkStruct_ov5_021D41B4 *const param0, const int param1);
const int ov5_021D4310(UnkStruct_ov5_021D41B4 *const param0, const int param1);
#endif // POKEPLATINUM_OV5_021D37AC_H

14
include/overlay005/ov5_021D56BC.h
View File

@ -1,14 +0,0 @@
#ifndef POKEPLATINUM_OV5_021D56BC_H
#define POKEPLATINUM_OV5_021D56BC_H
#include "overlay005/struct_ov5_021D5778_decl.h"
#include "overlay005/struct_ov5_021D57B4.h"
UnkStruct_ov5_021D5778 *ov5_021D56BC(void);
void ov5_021D56D4(const char *param0, UnkStruct_ov5_021D5778 *param1);
void ov5_021D5778(UnkStruct_ov5_021D5778 *param0);
void ov5_021D5790(const int param0, const UnkStruct_ov5_021D5778 *param1, u16 *param2);
void ov5_021D579C(const int param0, const UnkStruct_ov5_021D5778 *param1, u16 *param2, u16 *param3);
UnkStruct_ov5_021D57B4 const *ov5_021D57B4(const u16 param0, const UnkStruct_ov5_021D5778 *param1);
#endif // POKEPLATINUM_OV5_021D56BC_H

14
include/overlay005/ov5_021E779C.h
View File

@ -4,20 +4,20 @@
#include <nitro/fx/fx.h>
#include "field/field_system_decl.h"
#include "overlay005/area_data.h"
#include "overlay005/bdhc.h"
#include "overlay005/funcptr_ov5_021E9630.h"
#include "overlay005/map_prop.h"
#include "overlay005/struct_ov5_021D3CAC_decl.h"
#include "overlay005/map_prop_animation.h"
#include "overlay005/struct_ov5_021D5894.h"
#include "overlay005/struct_ov5_021E8F60_decl.h"
#include "overlay005/struct_ov5_021EF76C_decl.h"
#include "map_matrix.h"
#include "narc.h"
void ov5_021E7A54(UnkStruct_ov5_021E8F60 *param0);
void ov5_021E8188(FieldSystem *fieldSystem, UnkStruct_ov5_021E8F60 *param1);
UnkStruct_ov5_021E8F60 *ov5_021E9084(MapMatrix *param0, UnkStruct_ov5_021EF76C *param1, UnkStruct_ov5_021D3CAC *param2, const int param3);
UnkStruct_ov5_021E8F60 *ov5_021E9084(MapMatrix *param0, AreaDataManager *param1, MapPropAnimationManager *param2, const int param3);
void ov5_021E9150(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2);
void ov5_021E9190(const u8 param0, UnkStruct_ov5_021E8F60 *param1);
void ov5_021E91FC(const UnkStruct_ov5_021E8F60 *param0, UnkStruct_ov5_021D5894 *const param1);
@ -37,8 +37,8 @@ const BDHC *ov5_021E9610(const UnkStruct_ov5_021E8F60 *param0, const u8 param1);
u16 const *ov5_021E9624(const UnkStruct_ov5_021E8F60 *param0, const u8 param1);
void ov5_021E9630(UnkStruct_ov5_021E8F60 *param0, UnkFuncPtr_ov5_021E9630 param1, void *param2);
NARC *ov5_021E9828(UnkStruct_ov5_021E8F60 *param0);
UnkStruct_ov5_021E8F60 *ov5_021E9830(MapMatrix *param0, UnkStruct_ov5_021EF76C *param1, NARC *param2);
void ov5_021E98C8(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, UnkStruct_ov5_021EF76C *param2, NARC *param3);
UnkStruct_ov5_021E8F60 *ov5_021E9830(MapMatrix *param0, AreaDataManager *param1, NARC *param2);
void ov5_021E98C8(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, AreaDataManager *param2, NARC *param3);
void ov5_021E9938(UnkStruct_ov5_021E8F60 *param0);
void ov5_021E9998(UnkStruct_ov5_021E8F60 *param0);
void ov5_021E99C4(UnkStruct_ov5_021E8F60 *param0);
@ -47,10 +47,10 @@ void ov5_021E9AAC(UnkStruct_ov5_021E8F60 *param0, const int param1, const int pa
void ov5_021E9B10(UnkStruct_ov5_021E8F60 *param0, int param1, int param2);
void ov5_021E9C0C(const UnkStruct_ov5_021E8F60 *param0, const UnkStruct_ov5_021D5894 *param1);
void ov5_021E9CD8(UnkStruct_ov5_021E8F60 *param0);
void ov5_021E9D3C(MapMatrix *param0, UnkStruct_ov5_021EF76C *param1, UnkStruct_ov5_021E8F60 *param2, UnkStruct_ov5_021E8F60 *param3, const int param4, const int param5);
void ov5_021E9D3C(MapMatrix *param0, AreaDataManager *param1, UnkStruct_ov5_021E8F60 *param2, UnkStruct_ov5_021E8F60 *param3, const int param4, const int param5);
void ov5_021E9F98(UnkStruct_ov5_021E8F60 *param0, UnkStruct_ov5_021E8F60 *param1);
void ov5_021EA174(FieldSystem *fieldSystem, UnkStruct_ov5_021E8F60 *param1);
void ov5_021EA540(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, UnkStruct_ov5_021EF76C *param2);
void ov5_021EA540(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, AreaDataManager *param2);
void ov5_021EA58C(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, int *param3);
void ov5_021EA5E0(UnkStruct_ov5_021E8F60 *param0, int param1, int param2);
void ov5_021EA678(UnkStruct_ov5_021E8F60 *param0, int param1, int param2, int param3);

22
include/overlay005/ov5_021EF75C.h
View File

@ -1,22 +0,0 @@
#ifndef POKEPLATINUM_OV5_021EF75C_H
#define POKEPLATINUM_OV5_021EF75C_H
#include <nnsys.h>
#include "overlay005/struct_ov5_021D3CAC_decl.h"
#include "overlay005/struct_ov5_021D5778_decl.h"
#include "overlay005/struct_ov5_021EF76C_decl.h"
UnkStruct_ov5_021EF76C *ov5_021EF76C(int param0, UnkStruct_ov5_021D3CAC *param1);
void ov5_021EF7A0(UnkStruct_ov5_021EF76C *param0);
NNSG3dResFileHeader **ov5_021EF9E8(const int param0, UnkStruct_ov5_021EF76C *const param1);
void ov5_021EFA10(UnkStruct_ov5_021EF76C **param0);
NNSG3dResTex *ov5_021EFA8C(const UnkStruct_ov5_021EF76C *param0);
NNSG3dResTex *ov5_021EFAA0(const UnkStruct_ov5_021EF76C *param0);
const UnkStruct_ov5_021D5778 *ov5_021EFAB4(const UnkStruct_ov5_021EF76C *param0);
BOOL ov5_021EFAC0(const UnkStruct_ov5_021EF76C *param0);
u8 ov5_021EFAD8(const UnkStruct_ov5_021EF76C *param0);
int ov5_021EFAE8(const UnkStruct_ov5_021EF76C *param0, const int param1);
BOOL ov5_021EFAF8(const UnkStruct_ov5_021EF76C *param0, const int param1);
#endif // POKEPLATINUM_OV5_021EF75C_H

6
include/overlay005/struct_ov5_021D3CAC_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV5_021D3CAC_DECL_H
#define POKEPLATINUM_STRUCT_OV5_021D3CAC_DECL_H
typedef struct UnkStruct_ov5_021D3CAC_t UnkStruct_ov5_021D3CAC;
#endif // POKEPLATINUM_STRUCT_OV5_021D3CAC_DECL_H

6
include/overlay005/struct_ov5_021D3CE4_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV5_021D3CE4_DECL_H
#define POKEPLATINUM_STRUCT_OV5_021D3CE4_DECL_H
typedef struct UnkStruct_ov5_021D3CE4_t UnkStruct_ov5_021D3CE4;
#endif // POKEPLATINUM_STRUCT_OV5_021D3CE4_DECL_H

6
include/overlay005/struct_ov5_021D3FD0_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV5_021D3FD0_DECL_H
#define POKEPLATINUM_STRUCT_OV5_021D3FD0_DECL_H
typedef struct UnkStruct_ov5_021D3FD0_t UnkStruct_ov5_021D3FD0;
#endif // POKEPLATINUM_STRUCT_OV5_021D3FD0_DECL_H

6
include/overlay005/struct_ov5_021D41B4_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV5_021D41B4_DECL_H
#define POKEPLATINUM_STRUCT_OV5_021D41B4_DECL_H
typedef struct UnkStruct_ov5_021D41B4_t UnkStruct_ov5_021D41B4;
#endif // POKEPLATINUM_STRUCT_OV5_021D41B4_DECL_H

6
include/overlay005/struct_ov5_021D5778_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV5_021D5778_DECL_H
#define POKEPLATINUM_STRUCT_OV5_021D5778_DECL_H
typedef struct UnkStruct_ov5_021D5778_t UnkStruct_ov5_021D5778;
#endif // POKEPLATINUM_STRUCT_OV5_021D5778_DECL_H

9
include/overlay005/struct_ov5_021D57B4.h
View File

@ -1,9 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV5_021D57B4_H
#define POKEPLATINUM_STRUCT_OV5_021D57B4_H
typedef struct {
u16 unk_00;
u16 unk_02;
} UnkStruct_ov5_021D57B4;
#endif // POKEPLATINUM_STRUCT_OV5_021D57B4_H

6
include/overlay005/struct_ov5_021EF76C_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV5_021EF76C_DECL_H
#define POKEPLATINUM_STRUCT_OV5_021EF76C_DECL_H
typedef struct UnkStruct_ov5_021EF76C_t UnkStruct_ov5_021EF76C;
#endif // POKEPLATINUM_STRUCT_OV5_021EF76C_DECL_H

8
include/overlay025/ov25_02254560.h
View File

@ -12,10 +12,10 @@
BOOL ov25_02254560(UnkStruct_ov25_02254560 **param0, const UnkStruct_ov25_02254560_1 *param1, NNSG2dOamManagerInstance *param2, PoketchSystem *poketchSys);
UnkStruct_ov25_022555E8 *ov25_02254664(void);
BgConfig *ov25_02254674(void);
void ov25_022546B8(u32 param0, u32 param1);
void ov25_022546F0(u32 param0, u32 param1);
void ov25_02254728(u16 *param0);
BgConfig *Poketch_GetBgConfig(void);
void Poketch_LoadActivePalette(u32 bgOffset, u32 objOffset);
void Poketch_LoadActiveBacklightPalette(u32 unused_1, u32 unused_2);
void Poketch_CopyActivePalette(u16 *dest);
void ov25_02254754(UnkStruct_ov25_02254560 *param0);
void ov25_022547D0(UnkStruct_ov25_02254560 *param0, u32 param1);
BOOL ov25_022547F4(UnkStruct_ov25_02254560 *param0, u32 param1);

40
include/overlay025/ov25_02255090.h
View File

@ -1,22 +1,36 @@
#ifndef POKEPLATINUM_OV25_02255090_H
#define POKEPLATINUM_OV25_02255090_H
#include "overlay025/struct_ov25_0225517C.h"
#include "overlay025/struct_ov25_02255224_decl.h"
#include "sys_task_manager.h"
typedef struct PoketchTask {
u32 taskId;
SysTaskFunc taskFunc;
u32 extraDataSize;
} PoketchTask;
typedef struct PoketchTaskManager {
u32 taskId;
u32 poketchTaskState;
void *taskData;
void *extraData; // only used by ov25, ov27, ov34
const void *constTaskData;
SysTask *task;
} PoketchTaskManager;
#include "bg_window.h"
void ov25_02255090(u32 *param0, u32 param1);
BOOL ov25_02255130(u32 *param0, u32 param1);
BOOL ov25_02255154(u32 *param0);
void ov25_0225517C(const UnkStruct_ov25_0225517C *param0, u32 param1, void *param2, const void *param3, u32 *param4, u32 param5, u32 param6);
void ov25_02255224(u32 *param0, UnkStruct_ov25_02255224 *param1);
void *ov25_0225523C(UnkStruct_ov25_02255224 *param0);
const void *ov25_02255240(UnkStruct_ov25_02255224 *param0);
void *ov25_02255244(UnkStruct_ov25_02255224 *param0);
u32 ov25_02255248(UnkStruct_ov25_02255224 *param0);
void ov25_0225524C(UnkStruct_ov25_02255224 *param0);
void ov25_02255254(UnkStruct_ov25_02255224 *param0, u32 param1);
void PoketchTask_InitActiveTaskList(u32 *activeList, u32 numTaskSlots);
BOOL PoketchTask_TaskIsNotActive(u32 *activeList, u32 taskId);
BOOL PoketchTask_NoActiveTasks(u32 *activeList);
void PoketchTask_Start(const PoketchTask *appTasks, u32 taskId, void *taskData, const void *constTaskData, u32 *activeList, u32 taskPriority, u32 heapId);
void PoketchTask_EndTask(u32 *activeList, PoketchTaskManager *task);
void *PoketchTask_GetTaskData(PoketchTaskManager *taskMan);
const void *PoketchTask_GetConstTaskData(PoketchTaskManager *taskMan);
void *PoketchTask_GetExtraData(PoketchTaskManager *taskMan);
u32 PoketchTask_GetState(PoketchTaskManager *taskMan);
void PoketchTask_IncrementState(PoketchTaskManager *taskMan);
void PoketchTask_SetState(PoketchTaskManager *taskMan, u32 state);
void ov25_02255258(u16 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6);
void ov25_02255290(u16 *param0, u32 param1);
void ov25_02255308(u32 param0, u32 param1);

4
include/overlay025/ov25_02255540.h
View File

@ -3,6 +3,8 @@
#include <nnsys.h>
#include "constants/heap.h"
#include "overlay025/struct_ov25_022555E8_decl.h"
#include "overlay025/struct_ov25_02255810.h"
#include "overlay025/struct_ov25_022558C4_decl.h"
@ -24,7 +26,7 @@ void ov25_02255938(UnkStruct_ov25_022558C4 *param0, u32 param1);
void ov25_02255940(UnkStruct_ov25_022558C4 *param0, u32 param1);
void ov25_02255948(UnkStruct_ov25_022558C4 *param0, BOOL param1);
void ov25_02255950(UnkStruct_ov25_022558C4 *param0, u16 param1);
BOOL ov25_02255958(UnkStruct_ov25_02255958 *param0, u32 param1, u32 param2, u32 param3, int param4);
BOOL ov25_02255958(UnkStruct_ov25_02255958 *param0, u32 param1, u32 param2, u32 param3, enum HeapId param4);
void ov25_022559B0(UnkStruct_ov25_02255958 *param0);
#endif // POKEPLATINUM_OV25_02255540_H

6
include/overlay025/poketch_system.h
View File

@ -127,11 +127,11 @@ void PoketchSystem_NotifyAppUnloaded(PoketchSystem *poketchSys);
void PoketchSystem_SetSaveFunction(PoketchAppSaveFunction saveFunction, void *saveData);
UnkStruct_ov25_02254560 *ov25_02254418(void);
void PoketchSystem_PlaySoundEffect(u32 soundID);
void ov25_02254444(u32 param0, u32 param1);
void PoketchSystem_PlayCry(u32 species, u32 form);
BOOL PoketchSystem_GetDisplayHeldCoords(u32 *x, u32 *y);
BOOL PoketchSystem_GetDisplayTappedCoords(u32 *x, u32 *y);
BOOL ov25_0225450C(const PoketchSystem *poketchSys);
void ov25_02254518(const PoketchSystem *poketchSys, PoketchButtonManager *buttonManager);
BOOL PoketechSystem_IsRunningTask(const PoketchSystem *poketchSys);
void PoketechSystem_UpdateButtonManager(const PoketchSystem *poketchSys, PoketchButtonManager *buttonManager);
BOOL PoketchSystem_IsPlayerMoving(const PoketchSystem *poketchSys);
BOOL PoketchSystem_PedometerUpdated(const PoketchSystem *poketchSys);
FieldSystem *PoketchSystem_GetFieldSystem(const PoketchSystem *poketchSys);

12
include/overlay025/struct_ov25_0225517C.h
View File

@ -1,12 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV25_0225517C_H
#define POKEPLATINUM_STRUCT_OV25_0225517C_H
#include "sys_task_manager.h"
typedef struct {
u32 unk_00;
SysTaskFunc unk_04;
u32 unk_08;
} UnkStruct_ov25_0225517C;
#endif // POKEPLATINUM_STRUCT_OV25_0225517C_H

6
include/overlay025/struct_ov25_02255224_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV25_02255224_DECL_H
#define POKEPLATINUM_STRUCT_OV25_02255224_DECL_H
typedef struct UnkStruct_ov25_02255224_t UnkStruct_ov25_02255224;
#endif // POKEPLATINUM_STRUCT_OV25_02255224_DECL_H

15
include/overlay026/ov26_02256404.h
View File

@ -1,15 +0,0 @@
#ifndef POKEPLATINUM_OV26_02256404_H
#define POKEPLATINUM_OV26_02256404_H
#include "overlay026/struct_ov26_02256404_1.h"
#include "overlay026/struct_ov26_02256404_decl.h"
#include "bg_window.h"
BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_02256404_1 *param1, BgConfig *param2);
void ov26_0225649C(UnkStruct_ov26_02256404 *param0);
void ov26_022564A8(UnkStruct_ov26_02256404 *param0, u32 param1);
BOOL ov26_022564CC(UnkStruct_ov26_02256404 *param0, u32 param1);
BOOL ov26_022564D8(UnkStruct_ov26_02256404 *param0);
#endif // POKEPLATINUM_OV26_02256404_H

11
include/overlay026/struct_ov26_02256404_1.h
View File

@ -1,11 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV26_02256404_1_H
#define POKEPLATINUM_STRUCT_OV26_02256404_1_H
#include <nitro/rtc.h>
typedef struct {
RTCTime unk_00;
u32 unk_0C;
} UnkStruct_ov26_02256404_1;
#endif // POKEPLATINUM_STRUCT_OV26_02256404_1_H

6
include/overlay026/struct_ov26_02256404_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV26_02256404_DECL_H
#define POKEPLATINUM_STRUCT_OV26_02256404_DECL_H
typedef struct UnkStruct_ov26_02256404_t UnkStruct_ov26_02256404;
#endif // POKEPLATINUM_STRUCT_OV26_02256404_DECL_H

78
include/overlay032/ov32_02256470.h
View File

@ -1,16 +1,78 @@
#ifndef POKEPLATINUM_OV32_02256470_H
#define POKEPLATINUM_OV32_02256470_H
#include "overlay032/struct_ov32_02256470_1.h"
#include "overlay032/struct_ov32_02256470_decl.h"
#include "constants/pokemon.h"
#include "overlay025/struct_ov25_022555E8_decl.h"
#include "overlay025/struct_ov25_02255810.h"
#include "overlay025/struct_ov25_022558C4_decl.h"
#include "overlay025/struct_ov25_02255958.h"
#include "bg_window.h"
#include "sys_task.h"
typedef struct PlayerPartyStatus {
int partyCount;
struct {
u32 iconSpriteIndex;
u16 species;
u16 currentHp;
u16 maxHp;
u16 heldItem;
u16 status;
u8 isEgg;
u8 form;
} mons[MAX_PARTY_SIZE];
u16 isTouchingPoketch;
u16 screenTapped;
u32 touchX;
u32 touchY;
} PlayerPartyStatus;
typedef struct PoketchPartyStatusGraphics PoketchPartyStatusGraphics;
typedef struct MonIconBounceAnim {
PoketchPartyStatusGraphics *graphicsDataPtr;
const PlayerPartyStatus *partyDataPtr;
u8 taskState;
u8 bounceWaitTimer;
u8 partySlot;
u8 bouncesDone;
u8 bounceWait;
u8 numBounces;
int spriteOffset;
} MonIconBounceAnim;
struct PoketchPartyStatusGraphics {
const PlayerPartyStatus *playerParty;
BgConfig *bgConfig;
UnkStruct_ov25_022555E8 *unk_08;
u32 activeTaskIds[10];
u32 hpBarBaseTile;
u32 partyCount;
Window hpBarWindows[MAX_PARTY_SIZE];
UnkStruct_ov25_022558C4 *unk_9C[MAX_PARTY_SIZE]; // mon icons?
UnkStruct_ov25_022558C4 *unk_B4[MAX_PARTY_SIZE]; // held item icons?
UnkStruct_ov25_02255958 unk_CC;
UnkStruct_ov25_02255958 unk_E0;
SysTask *bounceAnimTask;
MonIconBounceAnim bounceAnimData;
u8 iconSpriteBuffer[640];
};
enum PartyStatusTask {
TASK_DRAW_SCREEN = 0,
TASK_UNLOAD_AND_FREE,
TASK_REDRAW_ON_TAP,
};
#include "bg_window.h"
BOOL ov32_02256470(UnkStruct_ov32_02256470 **param0, const UnkStruct_ov32_02256470_1 *param1, BgConfig *param2);
void ov32_02256508(UnkStruct_ov32_02256470 *param0);
void ov32_02256538(UnkStruct_ov32_02256470 *param0, u32 param1);
BOOL ov32_0225655C(UnkStruct_ov32_02256470 *param0, u32 param1);
BOOL ov32_02256568(UnkStruct_ov32_02256470 *param0);
u32 ov32_02256B78(u32 param0, u32 param1, u32 param2);
BOOL PartyStatusGraphics_New(PoketchPartyStatusGraphics **dest, const PlayerPartyStatus *playerParty, BgConfig *bgConfig);
void PartyStatusGraphics_UnloadAndFree(PoketchPartyStatusGraphics *param0);
void PartyStatus_StartTaskById(PoketchPartyStatusGraphics *appData, enum PartyStatusTask taskId);
BOOL PartyStatus_TaskIsNotActive(PoketchPartyStatusGraphics *appData, u32 taskId);
BOOL PartyStatus_AllTasksDone(PoketchPartyStatusGraphics *appData);
u32 PoketchPartyStatus_CheckTouchingPartySlot(u32 touchX, u32 touchY, u32 partyCount);
#endif // POKEPLATINUM_OV32_02256470_H

22
include/overlay032/struct_ov32_02256470_1.h
View File

@ -1,22 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV32_02256470_1_H
#define POKEPLATINUM_STRUCT_OV32_02256470_1_H
typedef struct {
int unk_00;
struct {
u32 unk_00;
u16 unk_04;
u16 unk_06;
u16 unk_08;
u16 unk_0A;
u16 unk_0C;
u8 unk_0E;
u8 unk_0F;
} unk_04[6];
u16 unk_64;
u16 unk_66;
u32 unk_68;
u32 unk_6C;
} UnkStruct_ov32_02256470_1;
#endif // POKEPLATINUM_STRUCT_OV32_02256470_1_H

6
include/overlay032/struct_ov32_02256470_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV32_02256470_DECL_H
#define POKEPLATINUM_STRUCT_OV32_02256470_DECL_H
typedef struct UnkStruct_ov32_02256470_t UnkStruct_ov32_02256470;
#endif // POKEPLATINUM_STRUCT_OV32_02256470_DECL_H

3
include/pch/global_pch.h
View File

@ -13,6 +13,9 @@
#define NELEMS(a) (sizeof(a) / sizeof(*(a)))
#define XtOffset(pointer_type, field) ((unsigned int)&(((pointer_type)NULL)->field))
#define HI_HALF(i) (((i) >> 16) & 0xFFFF)
#define LO_HALF(i) ((i) & 0xFFFF)
#define HI_AND_LO(h, l) (((h) << 16) | l)
#define ALIGN_4 __attribute__((aligned(4)))

50
include/poketch_digital_watch/display.h Normal file
View File

@ -0,0 +1,50 @@
#ifndef POKEPLATINUM_POKETCH_DIGITAL_WATCH_DISPLAY_H
#define POKEPLATINUM_POKETCH_DIGITAL_WATCH_DISPLAY_H
#include "bg_window.h"
// Display Tasks
#define NUM_TASK_SLOTS 8
#define DISPLAY_TASK_SETUP_BACKGROUND 0
#define DISPLAY_TASK_UPDATE_WATCH_DIGITS 1
#define DISPLAY_TASK_TOGGLE_BACKLIGHT 2
#define DISPLAY_TASK_FREE_BACKGROUND 3
// Graphics
#define POKETCH_DIGITAL_WATCH_NARC_TILES_IDX 23
#define POKETCH_DIGITAL_WATCH_NARC_TILEMAP_IDX 24
#define POKETCH_CLOCK_DIGITS_TILEMAP_IDX 25
#define POKETCH_NUM_CLOCK_DIGITS 10
#define POKETCH_CLOCK_DIGIT_WIDTH 4
#define POKETCH_CLOCK_DIGIT_HEIGHT 9
#define POKETCH_CLOCK_DIGIT_GAP 1
#define POKETCH_CLOCK_HOURS_DIGIT_X 3
#define POKETCH_CLOCK_HOURS_DIGIT_Y 7
#define POKETCH_CLOCK_MINUTES_DIGIT_X 15
#define POKETCH_CLOCK_MINUTES_DIGIT_Y 7
#define POKETCH_DIGIT_TILEMAP_WIDTH (POKETCH_CLOCK_DIGIT_WIDTH * POKETCH_NUM_CLOCK_DIGITS)
#define POKETCH_DIGIT_TILEMAP_HEIGHT (POKETCH_CLOCK_DIGIT_HEIGHT)
#define POKETCH_DIGIT_TILEMAP_SIZE_BYTES (POKETCH_DIGIT_TILEMAP_WIDTH * POKETCH_DIGIT_TILEMAP_HEIGHT)
typedef struct {
RTCTime time;
u32 backlightActive;
} WatchData;
typedef struct DisplayManager {
const WatchData *watchData;
BgConfig *bgConfig;
u32 taskList[2 + NUM_TASK_SLOTS];
u16 digitsTilemap[POKETCH_DIGIT_TILEMAP_SIZE_BYTES];
} DisplayManager;
BOOL PoketchDigitalWatch_SetupDisplayManager(DisplayManager **displayManager, const WatchData *watchData, BgConfig *bgConfig);
void PoketchDigitalWatch_FreeDisplayManager(DisplayManager *displayManager);
void PoketchDigitalWatch_StartDisplayTask(DisplayManager *displayManager, u32 taskID);
BOOL PoketchDigitalWatch_DisplayTaskIsNotActive(DisplayManager *displayManager, u32 taskID);
BOOL PoketchDigitalWatch_NoActiveDisplayTasks(DisplayManager *displayManager);
#endif // POKEPLATINUM_POKETCH_DIGITAL_WATCH_DISPLAY_H

10
include/scrcmd_jubilife_lottery.h Normal file
View File

@ -0,0 +1,10 @@
#ifndef POKEPLATINUM_SCRCMD_JUBILIFE_LOTTERY_H
#define POKEPLATINUM_JubilifeLottery_H
#include "field_script_context.h"
BOOL ScrCmd_GetJubilifeLotteryTrainerID(ScriptContext *ctx);
BOOL ScrCmd_CheckForJubilifeLotteryWinner(ScriptContext *ctx);
BOOL ScrCmd_RandomizeJubilifeLottery(ScriptContext *ctx);
#endif // POKEPLATINUM_JubilifeLottery_H

11
include/script_manager.h
View File

@ -83,10 +83,13 @@ enum ScriptContextType {
NUM_SCRIPT_CONTEXTS
};
#define SCRIPT_ID_OFFSET_SINGLE_BATTLES 3000
#define SCRIPT_ID_OFFSET_DOUBLE_BATTLES 5000
#define SCRIPT_ID_OFFSET_HIDDEN_ITEMS 8000
#define SCRIPT_ID_OFFSET_SAFARI_ZONE 8800
#define SCRIPT_ID(chunk, id) ((SCRIPT_ID_OFFSET_##chunk) + id)
#define SCRIPT_ID_OFFSET_SINGLE_BATTLES 3000
#define SCRIPT_ID_OFFSET_DOUBLE_BATTLES 5000
#define SCRIPT_ID_OFFSET_HIDDEN_ITEMS 8000
#define SCRIPT_ID_OFFSET_SAFARI_ZONE 8800
#define SCRIPT_ID_OFFSET_INIT_NEW_GAME 9600
#define SCRIPT_ID_POKEMON_CENTER_DAILY_TRAINERS 10400
#define FLAG_OFFSET_HIDDEN_ITEMS 730
#define FLAG_OFFSET_TRAINER_DEFEATED 1360

4
include/field_menu.h → include/start_menu.h
View File

@ -8,11 +8,11 @@
#include "field_task.h"
BOOL sub_0203A9C8(FieldSystem *fieldSystem);
void FieldMenu_Init(struct FieldSystem_t *fieldSystem);
void StartMenu_Init(struct FieldSystem_t *fieldSystem);
void sub_0203AA78(struct FieldSystem_t *fieldSystem);
void sub_0203AABC(FieldSystem *fieldSystem);
void sub_0203AB00(FieldSystem *fieldSystem);
void sub_0203B674(FieldMenu *param0, void *param1);
void sub_0203B674(StartMenu *param0, void *param1);
BOOL sub_0203B7C0(FieldTask *param0);
BOOL sub_0203C3F4(FieldTask *param0);
BOOL sub_0203C434(FieldTask *param0);

12
include/struct_defs/special_encounter.h
View File

@ -1,6 +1,8 @@
#ifndef POKEPLATINUM_STRUCT_SPECIAL_ENCOUNTER_H
#define POKEPLATINUM_STRUCT_SPECIAL_ENCOUNTER_H
#include "generated/roaming_slots.h"
#include "struct_defs/radar_chain_records.h"
#include "field/field_system.h"
@ -9,16 +11,6 @@
#define FLUTE_FACTOR_USED_BLACK 1 // decreases encounter rate by 50%
#define FLUTE_FACTOR_USED_WHITE 2 // increases encounter rate by 50%
enum RoamingSlot {
ROAMING_SLOT_MESPRIT = 0,
ROAMING_SLOT_CRESSELIA,
ROAMING_SLOT_DARKRAI, // Unused in-game, see: https://tcrf.net/Pok%C3%A9mon_Platinum#Unused_Roaming_Darkrai
ROAMING_SLOT_MOLTRES,
ROAMING_SLOT_ZAPDOS,
ROAMING_SLOT_ARTICUNO,
ROAMING_SLOT_MAX
};
typedef struct TrophyGardenMons {
BOOL unused;
u16 slot1;

36
include/struct_defs/struct_020708E0.h
View File

@ -31,25 +31,25 @@ typedef struct {
UnkStruct_02070950 unk_24C;
void *unk_25C;
void *unk_260;
} FieldMenu;
} StartMenu;
enum FieldMenuState {
FIELD_MENU_STATE_INIT,
FIELD_MENU_STATE_SELECT,
FIELD_MENU_STATE_APP_START,
FIELD_MENU_STATE_APP_RUN,
FIELD_MENU_STATE_SAVE,
FIELD_MENU_STATE_SAVE_WAIT,
FIELD_MENU_STATE_EVOLVE_INIT,
FIELD_MENU_STATE_EVOLVE,
FIELD_MENU_STATE_8,
FIELD_MENU_STATE_9,
FIELD_MENU_STATE_10,
FIELD_MENU_STATE_11,
FIELD_MENU_STATE_12,
FIELD_MENU_STATE_END,
FIELD_MENU_STATE_14,
FIELD_MENU_STATE_15
enum StartMenuState {
START_MENU_STATE_INIT,
START_MENU_STATE_SELECT,
START_MENU_STATE_APP_START,
START_MENU_STATE_APP_RUN,
START_MENU_STATE_SAVE,
START_MENU_STATE_SAVE_WAIT,
START_MENU_STATE_EVOLVE_INIT,
START_MENU_STATE_EVOLVE,
START_MENU_STATE_8,
START_MENU_STATE_9,
START_MENU_STATE_10,
START_MENU_STATE_11,
START_MENU_STATE_12,
START_MENU_STATE_END,
START_MENU_STATE_14,
START_MENU_STATE_15
};
#endif // POKEPLATINUM_STRUCT_020708E0_H

74
include/system_vars.h Normal file
View File

@ -0,0 +1,74 @@
#ifndef POKEPLATINUM_SYSTEM_VARS_H
#define POKEPLATINUM_SYSTEM_VARS_H
#include "generated/distribution_events.h"
#include "generated/hidden_locations.h"
#include "savedata.h"
#include "vars_flags.h"
BOOL SystemVars_SetPartnerTrainerID(VarsFlags *varsFlags, u16 trainerID);
u16 SystemVars_GetPartnerTrainerID(VarsFlags *varsFlags);
BOOL SystemVars_SetPlayerStarter(VarsFlags *varsFlags, u16 species);
u16 SystemVars_GetPlayerStarter(VarsFlags *varsFlags);
u16 SystemVars_GetRivalStarter(VarsFlags *varsFlags);
u16 SystemVars_GetPlayerCounterpartStarter(VarsFlags *varsFlags);
u16 SystemVars_GetSizeContestRecord(VarsFlags *varsFlags);
BOOL SystemVars_SetSizeContestRecord(VarsFlags *varsFlags, u16 size);
void SystemVars_ResetVsSeeker(VarsFlags *varsFlags);
u16 SystemVars_GetVsSeekerBattery(VarsFlags *varsFlags);
BOOL SystemVars_SetVsSeekerBattery(VarsFlags *varsFlags, u16 battery);
u16 SystemVars_GetVsSeekerStepCount(VarsFlags *varsFlags);
BOOL SystemVars_SetVsSeekerStepCount(VarsFlags *varsFlags, u16 count);
void SystemVars_SetDistributionEventMagic(VarsFlags *varsFlags, enum DistributionEvent eventID);
BOOL SystemVars_CheckDistributionEvent(VarsFlags *varsFlags, enum DistributionEvent eventID);
void SystemVars_SetHiddenLocationMagic(VarsFlags *varsFlags, enum HiddenLocation hiddenLocation);
void SystemVars_ClearHiddenLocation(VarsFlags *varsFlags, enum HiddenLocation hiddenLocation);
BOOL SystemVars_CheckHiddenLocation(VarsFlags *varsFlags, enum HiddenLocation hiddenLocation);
BOOL SystemVars_ClearAmitySquareStepCount(VarsFlags *varsFlags);
u16 SystemVars_GetAmitySquareStepCount(VarsFlags *varsFlags);
BOOL SystemVars_IncrementAmitySquareStepCount(VarsFlags *varsFlags);
u16 SystemVars_GetNewsPressDeadline(VarsFlags *varsFlags);
BOOL SystemVars_SetNewsPressDeadline(VarsFlags *varsFlags, u16 deadlineInDays);
u32 SystemVars_GetJubilifeLotteryTrainerID(VarsFlags *varsFlags);
void SystemVars_RandomizeJubilifeLotteryTrainerID(VarsFlags *varsFlags);
void SystemVars_SynchronizeJubilifeLotteryTrainerID(SaveData *saveData, u16 trainerID);
u16 SystemVars_GetDailyRandomLevel(VarsFlags *varsFlags);
void SystemVars_InitDailyRandomLevel(SaveData *saveData);
u16 SystemVars_GetSpiritombCounter(VarsFlags *varsFlags);
BOOL SystemVars_SetSpiritombCounter(VarsFlags *varsFlags, u16 value);
u16 SystemVars_GetUndergroundTalkCounter(VarsFlags *varsFlags);
BOOL SystemVars_SetUndergroundTalkCounter(VarsFlags *varsFlags, u16 value);
u16 SystemVars_GetConsecutiveBonusRoundWins(VarsFlags *varsFlags);
BOOL SystemVars_SetConsecutiveBonusRoundWins(VarsFlags *varsFlags, u16 wins);
BOOL SystemVars_IncrementDepartmentStoreBuyCount(VarsFlags *varsFlags);
u16 SystemVars_GetDepartmentStoreBuyCount(VarsFlags *varsFlags);
u16 SystemVars_GetUndergroundItemsGivenAway(VarsFlags *varsFlags);
BOOL SystemVars_SetUndergroundItemsGivenAway(VarsFlags *varsFlags, u16 value);
u16 SystemVars_GetUndergroundFossilsUnearthed(VarsFlags *varsFlags);
BOOL SystemVars_SetUndergroundFossilsUnearthed(VarsFlags *varsFlags, u16 value);
u16 SystemVars_GetUndergroundTrapsSet(VarsFlags *varsFlags);
BOOL SystemVars_SetUndergroundTrapsSet(VarsFlags *varsFlags, u16 value);
u16 SystemVars_GetFriendshipStepCount(VarsFlags *varsFlags);
void SystemVars_SetFriendshipStepCount(VarsFlags *varsFlags, u16 value);
void SystemVars_SetEternaGymFlowerClockState(VarsFlags *varsFlags, u16 state);
u16 SystemVars_GetEternaGymFlowerClockState(VarsFlags *varsFlags);
void SystemVars_SetTotalTurnsForLastBattle(VarsFlags *varsFlags, u16 turns);
void SystemVars_UpdateVillaVisitor(SaveData *varsFlags);
u16 SystemVars_GetBattleFactoryPrintState(VarsFlags *varsFlags);
u16 SystemVars_GetBattleHallPrintState(VarsFlags *varsFlags);
u16 SystemVars_GetBattleCastlePrintState(VarsFlags *varsFlags);
u16 SystemVars_GetBattleArcadePrintState(VarsFlags *varsFlags);
u16 SystemVars_GetBattleTowerPrintState(VarsFlags *varsFlags);
u16 SystemVars_GetDistortionWorldProgress(VarsFlags *varsFlags);
void SystemVars_SetDistortionWorldProgress(VarsFlags *varsFlags, u16 state);
u16 SystemVars_GetArceusEventState(VarsFlags *varsFlags);
void SystemVars_SetArceusEventState(VarsFlags *varsFlags, u16 state);
u16 SystemVars_GetShayminEventState(VarsFlags *varsFlags);
void SystemVars_SetShayminEventState(VarsFlags *varsFlags, u16 state);
void SystemVars_SetRoamingSpeciesState(VarsFlags *varsFlags, u16 species, u16 state);
u16 SystemVars_GetDistortionWorldCyrusApperanceState(VarsFlags *varsFlags);
void SystemVars_SetDistortionWorldCyrusApperanceState(VarsFlags *varsFlags, u16 state);
u16 SystemVars_GetWiFiFrontierCleared(VarsFlags *varsFlags);
#endif // POKEPLATINUM_SYSTEM_VARS_H

4
include/touch_screen.h
View File

@ -26,8 +26,8 @@ typedef union {
} circle;
} TouchScreenRect, TouchScreenHitTable;
int sub_02022644(const TouchScreenRect *rect);
int sub_02022664(const TouchScreenRect *rect);
int TouchScreen_CheckRectangleHeld(const TouchScreenRect *rect);
int TouchScreen_CheckRectanglePressed(const TouchScreenRect *rect);
int sub_02022684(const TouchScreenHitTable *hitTable);
int sub_020226DC(const TouchScreenHitTable *hitTable);
BOOL TouchScreen_LocationHeld(const TouchScreenHitTable *hitTable);

6
include/unk_0203D1B8.h
View File

@ -32,7 +32,7 @@ void *sub_0203D264(FieldSystem *fieldSystem, int param1);
u16 sub_0203D2C4(void *param0);
void sub_0203D2E4(FieldSystem *fieldSystem, void *param1);
void sub_0203D30C(FieldSystem *fieldSystem, void *param1);
void sub_0203D334(FieldSystem *fieldSystem, void *param1);
void FieldSystem_OpenSummaryScreen(FieldSystem *fieldSystem, void *overlayArgs);
void *sub_0203D390(FieldSystem *fieldSystem, UnkStruct_02070950 *param1, u8 param2);
void *sub_0203D3C0(int param0, FieldSystem *fieldSystem);
void *sub_0203D3E4(int param0, FieldSystem *fieldSystem);
@ -45,8 +45,8 @@ void *sub_0203D578(int param0, FieldSystem *fieldSystem, int param2, int param3,
void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2);
void *sub_0203D644(FieldSystem *fieldSystem, int param1);
PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, int param1, int param2);
void *sub_0203D6E4(int param0, FieldSystem *fieldSystem, u8 param2);
int sub_0203D750(void *param0);
void *FieldSystem_OpenSummaryScreenSelectMove(enum HeapId heapID, FieldSystem *fieldSystem, u8 partyIndex);
int PokemonSummary_GetSelectedMoveSlot(void *summary);
void sub_0203D754(FieldSystem *fieldSystem, UnkStruct_02042434 *param1);
void sub_0203D80C(FieldTask *param0, u16 *param1, u16 *param2, u16 *param3);
void sub_0203D874(FieldSystem *fieldSystem, UnkStruct_0209747C *param1);

6
include/unk_020474B8.h
View File

@ -22,9 +22,9 @@ BOOL ScrCmd_BufferPoketchAppName(ScriptContext *ctx);
BOOL ScrCmd_0D8(ScriptContext *param0);
BOOL ScrCmd_0D9(ScriptContext *param0);
BOOL ScrCmd_BufferSpeciesNameFromVar(ScriptContext *ctx);
BOOL ScrCmd_0DB(ScriptContext *param0);
BOOL ScrCmd_BufferPlayerStarterSpeciesName(ScriptContext *ctx);
BOOL ScrCmd_BufferRivalStarterSpeciesName(ScriptContext *ctx);
BOOL ScrCmd_0DD(ScriptContext *param0);
BOOL ScrCmd_BufferPlayerCounterpartStarterSpeciesName(ScriptContext *ctx);
BOOL ScrCmd_BufferUndergroundGoodsName(ScriptContext *ctx);
BOOL ScrCmd_BufferUndergroundTrapName(ScriptContext *ctx);
BOOL ScrCmd_BufferUndergroundItemName(ScriptContext *ctx);
@ -43,7 +43,7 @@ BOOL ScrCmd_33E(ScriptContext *param0);
BOOL ScrCmd_33F(ScriptContext *param0);
BOOL ScrCmd_340(ScriptContext *param0);
BOOL ScrCmd_341(ScriptContext *param0);
BOOL ScrCmd_342(ScriptContext *param0);
BOOL ScrCmd_BufferPlayerCounterpartStarterSpeciesNameWithArticle(ScriptContext *ctx);
BOOL ScrCmd_343(ScriptContext *param0);
BOOL ScrCmd_344(ScriptContext *param0);
BOOL ScrCmd_345(ScriptContext *param0);

10
include/unk_020480A8.h
View File

@ -1,10 +0,0 @@
#ifndef POKEPLATINUM_UNK_020480A8_H
#define POKEPLATINUM_UNK_020480A8_H
#include "field_script_context.h"
BOOL ScrCmd_24E(ScriptContext *param0);
BOOL ScrCmd_24F(ScriptContext *param0);
BOOL ScrCmd_250(ScriptContext *param0);
#endif // POKEPLATINUM_UNK_020480A8_H

2
include/unk_020482D4.h
View File

@ -16,7 +16,7 @@ BOOL ScrCmd_058(ScriptContext *param0);
BOOL ScrCmd_PlayFanfare(ScriptContext *ctx);
BOOL ScrCmd_04A(ScriptContext *param0);
BOOL ScrCmd_WaitFanfare(ScriptContext *ctx);
BOOL ScrCmd_04C(ScriptContext *param0);
BOOL ScrCmd_PlayCry(ScriptContext *param0);
BOOL ScrCmd_04D(ScriptContext *param0);
BOOL ScrCmd_PlaySound(ScriptContext *ctx);
BOOL ScrCmd_WaitSound(ScriptContext *ctx);

4
include/unk_02048614.h
View File

@ -14,11 +14,11 @@ BOOL ScrCmd_0E7(ScriptContext *param0);
BOOL ScrCmd_0E8(ScriptContext *param0);
BOOL ScrCmd_0E9(ScriptContext *param0);
BOOL ScrCmd_0EA(ScriptContext *param0);
BOOL ScrCmd_0EB(ScriptContext *param0);
BOOL ScrCmd_BlackOutFromBattle(ScriptContext *param0);
BOOL ScrCmd_CheckWonBattle(ScriptContext *ctx);
BOOL ScrCmd_CheckLostBattle(ScriptContext *ctx);
BOOL ScrCmd_CheckDidNotCapture(ScriptContext *ctx);
BOOL ScrCmd_0EE(ScriptContext *param0);
BOOL ScrCmd_CheckHasTwoAliveMons(ScriptContext *param0);
BOOL ScrCmd_StartDummyTrainerBattle(ScriptContext *ctx);
BOOL ScrCmd_0F0(ScriptContext *param0);
BOOL ScrCmd_0F1(ScriptContext *param0);

4
include/unk_0204CDDC.h
View File

@ -3,8 +3,8 @@
#include "field_script_context.h"
BOOL ScrCmd_215(ScriptContext *param0);
BOOL ScrCmd_216(ScriptContext *param0);
BOOL ScrCmd_ClearAmitySquareStepCount(ScriptContext *ctx);
BOOL ScrCmd_GetAmitySquareStepCount(ScriptContext *ctx);
BOOL ScrCmd_217(ScriptContext *param0);
BOOL ScrCmd_2DF(ScriptContext *param0);
BOOL ScrCmd_2E0(ScriptContext *param0);

6
include/unk_0204EDA4.h
View File

@ -3,9 +3,9 @@
#include "field_script_context.h"
BOOL ScrCmd_1C6(ScriptContext *param0);
BOOL ScrCmd_1C7(ScriptContext *param0);
BOOL ScrCmd_21E(ScriptContext *param0);
BOOL ScrCmd_SelectPartyMonMove(ScriptContext *ctx);
BOOL ScrCmd_GetSelectedPartyMonMove(ScriptContext *ctx);
BOOL ScrCmd_Dummy21E(ScriptContext *ctx);
BOOL ScrCmd_21F(ScriptContext *param0);
BOOL ScrCmd_220(ScriptContext *param0);
BOOL ScrCmd_221(ScriptContext *param0);

86
include/unk_0206AFE0.h
View File

@ -1,86 +0,0 @@
#ifndef POKEPLATINUM_UNK_0206AFE0_H
#define POKEPLATINUM_UNK_0206AFE0_H
#include "savedata.h"
#include "vars_flags.h"
enum HiddenLocations {
HL_FULLMOONISLAND = 0,
HL_NEWMOONISLAND = 1,
HL_SPRINGPATH = 2,
HL_SEABREAKPATH = 3,
};
BOOL sub_0206B024(VarsFlags *varsFlags, u16 param1);
u16 sub_0206B034(VarsFlags *varsFlags);
BOOL VarsFlags_SetPlayerStarterSpecies(VarsFlags *varsFlags, u16 param1);
u16 VarsFlags_GetPlayerStarterSpecies(VarsFlags *varsFlags);
u16 VarsFlags_GetRivalStarterSpecies(VarsFlags *varsFlags);
u16 VarsFlags_GetPlayerCounterpartStarterSpecies(VarsFlags *varsFlags);
u16 sub_0206B0B4(VarsFlags *varsFlags);
BOOL sub_0206B0C4(VarsFlags *varsFlags, u16 param1);
void VsSeeker_Reset(VarsFlags *varsFlags);
u16 VsSeeker_GetBattery(VarsFlags *varsFlags);
BOOL VsSeeker_SetBattery(VarsFlags *varsFlags, u16 param1);
u16 VsSeeker_GetActiveStepCount(VarsFlags *varsFlags);
BOOL VsSeeker_SetActiveStepCount(VarsFlags *varsFlags, u16 param1);
void sub_0206B144(VarsFlags *varsFlags, int param1);
BOOL sub_0206B16C(VarsFlags *varsFlags, int param1);
void sub_0206B1B0(VarsFlags *varsFlags, int param1);
void sub_0206B1D8(VarsFlags *varsFlags, int param1);
BOOL VarFlags_HiddenLocationsUnlocked(VarsFlags *varsFlags, int hiddenLocation);
BOOL sub_0206B218(VarsFlags *varsFlags);
u16 sub_0206B228(VarsFlags *varsFlags);
BOOL sub_0206B238(VarsFlags *varsFlags);
u16 sub_0206B260(VarsFlags *varsFlags);
BOOL sub_0206B270(VarsFlags *varsFlags, u16 param1);
void sub_0206B280(VarsFlags *varsFlags, u32 param1);
u32 sub_0206B2A4(VarsFlags *varsFlags);
void sub_0206B2C8(VarsFlags *varsFlags);
void sub_0206B2E4(SaveData *param0, u16 param1);
u16 sub_0206B314(VarsFlags *varsFlags);
BOOL sub_0206B324(VarsFlags *varsFlags, u16 param1);
void sub_0206B334(SaveData *varsFlags);
u16 sub_0206B354(VarsFlags *varsFlags);
BOOL sub_0206B364(VarsFlags *varsFlags, u16 param1);
u16 sub_0206B374(VarsFlags *varsFlags);
BOOL sub_0206B384(VarsFlags *varsFlags, u16 param1);
u16 sub_0206B394(VarsFlags *varsFlags);
BOOL sub_0206B3A4(VarsFlags *varsFlags, u16 param1);
BOOL sub_0206B3B4(VarsFlags *varsFlags);
u16 sub_0206B3DC(VarsFlags *varsFlags);
u16 sub_0206B3EC(VarsFlags *varsFlags);
BOOL sub_0206B3FC(VarsFlags *varsFlags, u16 param1);
u16 sub_0206B40C(VarsFlags *varsFlags);
BOOL sub_0206B41C(VarsFlags *varsFlags, u16 param1);
u16 sub_0206B42C(VarsFlags *varsFlags);
BOOL sub_0206B43C(VarsFlags *varsFlags, u16 param1);
u16 sub_0206B44C(VarsFlags *varsFlags);
void sub_0206B45C(VarsFlags *varsFlags, u16 param1);
void sub_0206B46C(VarsFlags *varsFlags, u16 param1);
u16 sub_0206B47C(VarsFlags *varsFlags);
void sub_0206B48C(VarsFlags *varsFlags, u16 param1);
void sub_0206B514(SaveData *varsFlags);
void sub_0206B558(VarsFlags *varsFlags, u16 param1);
u16 sub_0206B588(VarsFlags *varsFlags);
u16 sub_0206B598(VarsFlags *varsFlags);
u16 sub_0206B5A8(VarsFlags *varsFlags);
u16 sub_0206B5B8(VarsFlags *varsFlags);
u16 sub_0206B5C8(VarsFlags *varsFlags);
u16 sub_0206B5D8(VarsFlags *varsFlags);
void sub_0206B5E8(VarsFlags *varsFlags, u16 param1);
u16 sub_0206B5F8(VarsFlags *varsFlags);
void sub_0206B608(VarsFlags *varsFlags, u16 param1);
u16 sub_0206B618(VarsFlags *varsFlags);
void sub_0206B628(VarsFlags *varsFlags, u16 param1);
void sub_0206B638(VarsFlags *varsFlags, u16 param1);
void sub_0206B648(VarsFlags *varsFlags, u16 param1);
void sub_0206B658(VarsFlags *varsFlags, u16 param1);
void sub_0206B668(VarsFlags *varsFlags, u16 param1);
void sub_0206B678(VarsFlags *varsFlags, u16 param1);
void sub_0206B688(VarsFlags *varsFlags, u16 param1, u16 param2);
u16 sub_0206B6DC(VarsFlags *varsFlags);
void sub_0206B6EC(VarsFlags *varsFlags, u16 param1);
u16 sub_0206B6FC(VarsFlags *varsFlags);
#endif // POKEPLATINUM_UNK_0206AFE0_H

2
include/unk_02070428.h
View File

@ -9,7 +9,7 @@ void FieldSystem_InitFlagsWarp(FieldSystem *fieldSystem);
void sub_0207056C(FieldSystem *fieldSystem);
void FieldSystem_SetTeleportFlags(FieldSystem *fieldSystem);
void FieldSystem_SetEscapeFlags(FieldSystem *fieldSystem);
void sub_020705B4(FieldSystem *fieldSystem);
void FieldSystem_ClearPartnerTrainer(FieldSystem *fieldSystem);
void sub_020705CC(FieldSystem *fieldSystem);
#endif // POKEPLATINUM_UNK_02070428_H

7
include/unk_020797C8.h
View File

@ -6,7 +6,10 @@
#include "pokemon.h"
#include "strbuf.h"
#define MAX_PC_BOXES 18
#define MAX_PC_BOXES 18
#define MAX_PC_ROWS 5
#define MAX_PC_COLS 6
#define MAX_MONS_PER_BOX (MAX_PC_ROWS * MAX_PC_COLS)
void PCBoxes_Init(PCBoxes *param0);
u32 PCBoxes_SaveSize(void);
@ -28,7 +31,7 @@ u32 sub_02079B98(const PCBoxes *param0, u32 param1);
u32 sub_02079BEC(const PCBoxes *param0);
u32 sub_02079C08(const PCBoxes *param0, u32 param1, u32 param2, int param3, void *param4);
void sub_02079C50(PCBoxes *param0, u32 param1, u32 param2, int param3, void *param4);
BoxPokemon *sub_02079C9C(const PCBoxes *param0, u32 param1, u32 param2);
BoxPokemon *GetBoxedPokemonFrom(const PCBoxes *pcBoxes, u32 boxIndex, u32 pokemonBoxLocationIndex);
void sub_02079CD8(PCBoxes *param0, u32 param1);
BOOL sub_02079CFC(const PCBoxes *param0, u32 param1);
u32 sub_02079D20(const PCBoxes *param0);

7
include/vars_flags.h
View File

@ -1,11 +1,12 @@
#ifndef POKEPLATINUM_VARS_FLAGS_H
#define POKEPLATINUM_VARS_FLAGS_H
#include "constants/savedata/vars_flags.h"
#include "savedata.h"
#define VARS_START 0x4000
#define NUM_VARS 288
#define NUM_FLAGS 2912
#define NUM_VARS 288
#define NUM_FLAGS 2912
#define SPECIAL_VARS_START 0x8000

18
platinum.us/main.lsf
View File

@ -175,7 +175,7 @@ Static main
Object main.nef.p/src_field_overworld_state.c.o
Object main.nef.p/src_unk_0203A7D8.c.o
Object main.nef.p/src_unk_0203A944.c.o
Object main.nef.p/src_field_menu.c.o
Object main.nef.p/src_start_menu.c.o
Object main.nef.p/src_unk_0203C954.c.o
Object main.nef.p/src_field_system.c.o
Object main.nef.p/src_location.c.o
@ -186,7 +186,7 @@ Static main
Object main.nef.p/src_unk_02046AD4.c.o
Object main.nef.p/src_unk_02046C7C.c.o
Object main.nef.p/src_unk_020474B8.c.o
Object main.nef.p/src_unk_020480A8.c.o
Object main.nef.p/src_scrcmd_jubilife_lottery.c.o
Object main.nef.p/src_unk_020482D4.c.o
Object main.nef.p/src_unk_02048614.c.o
Object main.nef.p/src_unk_02048BD0.c.o
@ -264,7 +264,7 @@ Static main
Object main.nef.p/src_unk_02069BE0.c.o
Object main.nef.p/src_unk_0206A780.c.o
Object main.nef.p/src_system_flags.c.o
Object main.nef.p/src_unk_0206AFE0.c.o
Object main.nef.p/src_system_vars.c.o
Object main.nef.p/src_unk_0206B70C.c.o
Object main.nef.p/src_unk_0206B9D8.c.o
Object main.nef.p/src_great_marsh_lookout.c.o
@ -469,10 +469,10 @@ Overlay overlay5
Object main.nef.p/src_overlay005_ov5_021D1A94.c.o
Object main.nef.p/src_overlay005_field_control.c.o
Object main.nef.p/src_overlay005_ov5_021D2F14.c.o
Object main.nef.p/src_overlay005_ov5_021D37AC.c.o
Object main.nef.p/src_overlay005_map_prop_animation.c.o
Object main.nef.p/src_overlay005_ov5_021D431C.c.o
Object main.nef.p/src_overlay005_ov5_021D521C.c.o
Object main.nef.p/src_overlay005_ov5_021D56BC.c.o
Object main.nef.p/src_overlay005_map_prop_material_shape.c.o
Object main.nef.p/src_overlay005_ov5_021D57BC.c.o
Object main.nef.p/src_overlay005_ov5_021D5878.c.o
Object main.nef.p/src_overlay005_ov5_021D5B40.c.o
@ -512,7 +512,7 @@ Overlay overlay5
Object main.nef.p/src_overlay005_ov5_021EF250.c.o
Object main.nef.p/src_overlay005_hblank_system.c.o
Object main.nef.p/src_overlay005_ov5_021EF4BC.c.o
Object main.nef.p/src_overlay005_ov5_021EF75C.c.o
Object main.nef.p/src_overlay005_area_data.c.o
Object main.nef.p/src_overlay005_honey_tree.c.o
Object main.nef.p/src_overlay005_ov5_021F007C.c.o
Object main.nef.p/src_overlay005_ov5_021FF6B8.c.o
@ -878,11 +878,11 @@ Overlay overlay25
Object main.nef.p/src_overlay025_ov25_02255DBC.c.o
}
Overlay overlay26
Overlay poketch_digital_watch
{
After overlay25
Object main.nef.p/src_overlay026_ov26_022561C0.c.o
Object main.nef.p/src_overlay026_ov26_02256404.c.o
Object main.nef.p/src_poketch_digital_watch_main.c.o
Object main.nef.p/src_poketch_digital_watch_display.c.o
}
Overlay overlay27

2
platinum.us/sbins.sha1
View File

@ -25,7 +25,7 @@ d414d37a9b80f1d346666ad9ef5ba635d5ebb552 *overlay19.sbin
2e8fcd133e2736d90dae6e23ac9a669cefc1a7c8 *overlay23.sbin
cc4bb361071632627532c48af9a0b37c1751670a *pre_poketch_subscreen.sbin
0fbd0432432d42462b9c02f07e30634987708dc6 *overlay25.sbin
44e45c2b6ec6aa74142550f25f770954b8e0d555 *overlay26.sbin
44e45c2b6ec6aa74142550f25f770954b8e0d555 *poketch_digital_watch.sbin
3301af166bc328d4df4412dbf6c740635151867c *overlay27.sbin
98a048c770a311a3fd756ad725997964fdd14aa8 *overlay28.sbin
ca63341e12e782896fc58d5ce6fefa2170b5e921 *overlay29.sbin

8
res/field/events/events_acuity_cavern.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 151,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UXIE",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 481,
"script": 3,
"initial_dir": 1,
@ -20,7 +20,7 @@
{
"x": 14,
"z": 29,
"dest_header_id": 318,
"dest_header_id": "MAP_HEADER_LAKE_ACUITY",
"dest_warp_id": 1
}
],

32
res/field/events/events_acuity_lakefront.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 87,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEBALL",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 1177,
"script": 7163,
"initial_dir": 0,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 94,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 3,
"initial_dir": 0,
@ -32,9 +32,9 @@
"y": 0
},
{
"graphics_id": 148,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BARRY",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 426,
"script": 0,
"initial_dir": 1,
@ -46,9 +46,9 @@
"y": 0
},
{
"graphics_id": 87,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEBALL",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 1324,
"script": 7309,
"initial_dir": 0,
@ -64,25 +64,25 @@
{
"x": 308,
"z": 229,
"dest_header_id": 317,
"dest_header_id": "MAP_HEADER_LAKE_ACUITY_LOW_WATER",
"dest_warp_id": 0
},
{
"x": 309,
"z": 229,
"dest_header_id": 317,
"dest_header_id": "MAP_HEADER_LAKE_ACUITY_LOW_WATER",
"dest_warp_id": 1
},
{
"x": 308,
"z": 229,
"dest_header_id": 318,
"dest_header_id": "MAP_HEADER_LAKE_ACUITY",
"dest_warp_id": 3
},
{
"x": 309,
"z": 229,
"dest_header_id": 318,
"dest_header_id": "MAP_HEADER_LAKE_ACUITY",
"dest_warp_id": 4
}
],

104
res/field/events/events_amity_square.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 163,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 7,
"initial_dir": 3,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 163,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 8,
"initial_dir": 2,
@ -30,9 +30,9 @@
"y": 0
},
{
"graphics_id": 87,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEBALL",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 1065,
"script": 7051,
"initial_dir": 0,
@ -44,9 +44,9 @@
"y": 0
},
{
"graphics_id": 87,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEBALL",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 1066,
"script": 7052,
"initial_dir": 0,
@ -58,9 +58,9 @@
"y": 0
},
{
"graphics_id": 87,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEBALL",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 1067,
"script": 7053,
"initial_dir": 0,
@ -72,9 +72,9 @@
"y": 0
},
{
"graphics_id": 101,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_101",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 673,
"script": 6,
"initial_dir": 0,
@ -86,9 +86,9 @@
"y": 0
},
{
"graphics_id": 9,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 9,
"initial_dir": 0,
@ -100,9 +100,9 @@
"y": 0
},
{
"graphics_id": 185,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_DRIFLOON",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 10,
"initial_dir": 1,
@ -114,9 +114,9 @@
"y": 0
},
{
"graphics_id": 207,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_HAPPINY",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 12,
"initial_dir": 1,
@ -128,9 +128,9 @@
"y": 0
},
{
"graphics_id": 12,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 11,
"initial_dir": 3,
@ -142,9 +142,9 @@
"y": 0
},
{
"graphics_id": 19,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 13,
"initial_dir": 2,
@ -156,9 +156,9 @@
"y": 0
},
{
"graphics_id": 71,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_PIKACHU",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 14,
"initial_dir": 2,
@ -170,9 +170,9 @@
"y": 0
},
{
"graphics_id": 2,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 15,
"initial_dir": 3,
@ -184,9 +184,9 @@
"y": 0
},
{
"graphics_id": 72,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_CLEFAIRY",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 16,
"initial_dir": 2,
@ -198,9 +198,9 @@
"y": 0
},
{
"graphics_id": 87,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEBALL",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 1264,
"script": 7250,
"initial_dir": 0,
@ -212,9 +212,9 @@
"y": 0
},
{
"graphics_id": 19,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 17,
"initial_dir": 1,
@ -230,25 +230,25 @@
{
"x": 10,
"z": 51,
"dest_header_id": 107,
"dest_header_id": "MAP_HEADER_HEARTHOME_CITY_WEST_GATE_TO_AMITY_SQUARE",
"dest_warp_id": 1
},
{
"x": 11,
"z": 51,
"dest_header_id": 107,
"dest_header_id": "MAP_HEADER_HEARTHOME_CITY_WEST_GATE_TO_AMITY_SQUARE",
"dest_warp_id": 1
},
{
"x": 52,
"z": 51,
"dest_header_id": 108,
"dest_header_id": "MAP_HEADER_HEARTHOME_CITY_EAST_GATE_TO_AMITY_SQUARE",
"dest_warp_id": 1
},
{
"x": 53,
"z": 51,
"dest_header_id": 108,
"dest_header_id": "MAP_HEADER_HEARTHOME_CITY_EAST_GATE_TO_AMITY_SQUARE",
"dest_warp_id": 1
}
],

80
res/field/events/events_battle_arcade.json
View File

@ -6,14 +6,14 @@
"x": 16,
"z": 5,
"y": 0,
"player_facing_dir": 0
"player_facing_dir": "BG_EVENT_DIR_NORTH"
}
],
"object_events": [
{
"graphics_id": 231,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 1,
"initial_dir": 1,
@ -25,9 +25,9 @@
"y": 0
},
{
"graphics_id": 232,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_MULTI_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 6,
"initial_dir": 1,
@ -39,9 +39,9 @@
"y": 0
},
{
"graphics_id": 70,
"movement_type": 6,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_PSYCHIC",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 9,
"initial_dir": 3,
@ -53,9 +53,9 @@
"y": 0
},
{
"graphics_id": 60,
"movement_type": 9,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_WAITRESS",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 11,
"initial_dir": 1,
@ -67,9 +67,9 @@
"y": 0
},
{
"graphics_id": 52,
"movement_type": 7,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 12,
"initial_dir": 3,
@ -81,9 +81,9 @@
"y": 0
},
{
"graphics_id": 13,
"movement_type": 6,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 13,
"initial_dir": 3,
@ -95,9 +95,9 @@
"y": 0
},
{
"graphics_id": 40,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_WORKER",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 7,
"initial_dir": 2,
@ -109,9 +109,9 @@
"y": 0
},
{
"graphics_id": 5,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 10,
"initial_dir": 2,
@ -123,9 +123,9 @@
"y": 0
},
{
"graphics_id": 48,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TUBER_F",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 14,
"initial_dir": 3,
@ -137,9 +137,9 @@
"y": 0
},
{
"graphics_id": 55,
"movement_type": 7,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_PARASOL_LADY",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 8,
"initial_dir": 3,
@ -151,9 +151,9 @@
"y": 0
},
{
"graphics_id": 20,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_HIKER",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 16,
"initial_dir": 1,
@ -165,9 +165,9 @@
"y": 0
},
{
"graphics_id": 20,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_HIKER",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 17,
"initial_dir": 0,
@ -183,19 +183,19 @@
{
"x": 1,
"z": 6,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 14
},
{
"x": 1,
"z": 5,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 14
},
{
"x": 1,
"z": 7,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 14
}
],

62
res/field/events/events_battle_castle.json
View File

@ -6,14 +6,14 @@
"x": 6,
"z": 8,
"y": 0,
"player_facing_dir": 0
"player_facing_dir": "BG_EVENT_DIR_NORTH"
}
],
"object_events": [
{
"graphics_id": 231,
"movement_type": 17,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_LOOK_RIGHT",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 1,
"initial_dir": 3,
@ -25,9 +25,9 @@
"y": 0
},
{
"graphics_id": 232,
"movement_type": 17,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_MULTI_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_LOOK_RIGHT",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 6,
"initial_dir": 3,
@ -39,9 +39,9 @@
"y": 0
},
{
"graphics_id": 31,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_ROUGHNECK",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 11,
"initial_dir": 3,
@ -53,9 +53,9 @@
"y": 0
},
{
"graphics_id": 51,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 13,
"initial_dir": 2,
@ -67,9 +67,9 @@
"y": 0
},
{
"graphics_id": 36,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 12,
"initial_dir": 0,
@ -81,9 +81,9 @@
"y": 0
},
{
"graphics_id": 19,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 9,
"initial_dir": 1,
@ -95,9 +95,9 @@
"y": 0
},
{
"graphics_id": 44,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_ARTIST",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 7,
"initial_dir": 2,
@ -109,9 +109,9 @@
"y": 0
},
{
"graphics_id": 37,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_SOCIALITE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 8,
"initial_dir": 3,
@ -123,9 +123,9 @@
"y": 0
},
{
"graphics_id": 60,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_WAITRESS",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 10,
"initial_dir": 1,
@ -141,19 +141,19 @@
{
"x": 21,
"z": 9,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 15
},
{
"x": 21,
"z": 8,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 15
},
{
"x": 21,
"z": 10,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 15
}
],

62
res/field/events/events_battle_factory.json
View File

@ -6,14 +6,14 @@
"x": 22,
"z": 6,
"y": 0,
"player_facing_dir": 0
"player_facing_dir": "BG_EVENT_DIR_NORTH"
}
],
"object_events": [
{
"graphics_id": 231,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 1,
"initial_dir": 1,
@ -25,9 +25,9 @@
"y": 0
},
{
"graphics_id": 232,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_MULTI_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 6,
"initial_dir": 1,
@ -39,9 +39,9 @@
"y": 0
},
{
"graphics_id": 4,
"movement_type": 7,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 10,
"initial_dir": 3,
@ -53,9 +53,9 @@
"y": 0
},
{
"graphics_id": 13,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 9,
"initial_dir": 2,
@ -67,9 +67,9 @@
"y": 0
},
{
"graphics_id": 34,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 13,
"initial_dir": 0,
@ -81,9 +81,9 @@
"y": 0
},
{
"graphics_id": 56,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_SAILOR",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 8,
"initial_dir": 0,
@ -95,9 +95,9 @@
"y": 0
},
{
"graphics_id": 12,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 7,
"initial_dir": 1,
@ -109,9 +109,9 @@
"y": 0
},
{
"graphics_id": 43,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_CLOWN",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 11,
"initial_dir": 2,
@ -123,9 +123,9 @@
"y": 0
},
{
"graphics_id": 63,
"movement_type": 7,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_LADY",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 12,
"initial_dir": 2,
@ -141,19 +141,19 @@
{
"x": 1,
"z": 7,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 12
},
{
"x": 1,
"z": 6,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 12
},
{
"x": 1,
"z": 8,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 12
}
],

252
res/field/events/events_battle_frontier.json
View File

@ -6,7 +6,7 @@
"x": 46,
"z": 49,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
},
{
"script": 32,
@ -14,7 +14,7 @@
"x": 50,
"z": 49,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
},
{
"script": 31,
@ -22,7 +22,7 @@
"x": 46,
"z": 48,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
},
{
"script": 31,
@ -30,7 +30,7 @@
"x": 47,
"z": 48,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
},
{
"script": 31,
@ -38,7 +38,7 @@
"x": 47,
"z": 49,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
},
{
"script": 32,
@ -46,7 +46,7 @@
"x": 50,
"z": 48,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
},
{
"script": 32,
@ -54,7 +54,7 @@
"x": 51,
"z": 49,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
},
{
"script": 32,
@ -62,7 +62,7 @@
"x": 51,
"z": 48,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
},
{
"script": 33,
@ -70,7 +70,7 @@
"x": 50,
"z": 39,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
},
{
"script": 33,
@ -78,7 +78,7 @@
"x": 51,
"z": 39,
"y": 0,
"player_facing_dir": 0
"player_facing_dir": "BG_EVENT_DIR_NORTH"
},
{
"script": 33,
@ -86,7 +86,7 @@
"x": 50,
"z": 38,
"y": 0,
"player_facing_dir": 1
"player_facing_dir": "BG_EVENT_DIR_EAST"
},
{
"script": 33,
@ -94,7 +94,7 @@
"x": 50,
"z": 37,
"y": 0,
"player_facing_dir": 1
"player_facing_dir": "BG_EVENT_DIR_EAST"
},
{
"script": 33,
@ -102,7 +102,7 @@
"x": 50,
"z": 36,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
},
{
"script": 33,
@ -110,7 +110,7 @@
"x": 51,
"z": 36,
"y": 0,
"player_facing_dir": 3
"player_facing_dir": "BG_EVENT_DIR_SOUTH"
},
{
"script": 33,
@ -118,7 +118,7 @@
"x": 52,
"z": 39,
"y": 0,
"player_facing_dir": 0
"player_facing_dir": "BG_EVENT_DIR_NORTH"
},
{
"script": 33,
@ -126,7 +126,7 @@
"x": 52,
"z": 36,
"y": 0,
"player_facing_dir": 3
"player_facing_dir": "BG_EVENT_DIR_SOUTH"
},
{
"script": 33,
@ -134,7 +134,7 @@
"x": 53,
"z": 36,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
},
{
"script": 33,
@ -142,7 +142,7 @@
"x": 53,
"z": 37,
"y": 0,
"player_facing_dir": 2
"player_facing_dir": "BG_EVENT_DIR_WEST"
},
{
"script": 33,
@ -150,7 +150,7 @@
"x": 53,
"z": 38,
"y": 0,
"player_facing_dir": 2
"player_facing_dir": "BG_EVENT_DIR_WEST"
},
{
"script": 33,
@ -158,14 +158,14 @@
"x": 53,
"z": 39,
"y": 0,
"player_facing_dir": 4
"player_facing_dir": "BG_EVENT_DIR_ALL"
}
],
"object_events": [
{
"graphics_id": 96,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 27,
"initial_dir": 0,
@ -177,9 +177,9 @@
"y": 0
},
{
"graphics_id": 96,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 26,
"initial_dir": 0,
@ -191,9 +191,9 @@
"y": 0
},
{
"graphics_id": 12,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 18,
"initial_dir": 1,
@ -205,9 +205,9 @@
"y": 0
},
{
"graphics_id": 18,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 9,
"initial_dir": 1,
@ -219,9 +219,9 @@
"y": 0
},
{
"graphics_id": 17,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 8,
"initial_dir": 1,
@ -233,9 +233,9 @@
"y": 0
},
{
"graphics_id": 2,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 6,
"initial_dir": 1,
@ -247,9 +247,9 @@
"y": 0
},
{
"graphics_id": 3,
"movement_type": 6,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 20,
"initial_dir": 2,
@ -261,9 +261,9 @@
"y": 0
},
{
"graphics_id": 1,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 2,
"initial_dir": 0,
@ -275,9 +275,9 @@
"y": 0
},
{
"graphics_id": 35,
"movement_type": 10,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_IDOL",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 4,
"initial_dir": 0,
@ -289,9 +289,9 @@
"y": 0
},
{
"graphics_id": 31,
"movement_type": 2,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_ROUGHNECK",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 12,
"initial_dir": 3,
@ -303,9 +303,9 @@
"y": 0
},
{
"graphics_id": 51,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 3,
"initial_dir": 1,
@ -317,9 +317,9 @@
"y": 0
},
{
"graphics_id": 233,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 23,
"initial_dir": 3,
@ -331,9 +331,9 @@
"y": 0
},
{
"graphics_id": 233,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 10490,
"initial_dir": 3,
@ -345,9 +345,9 @@
"y": 0
},
{
"graphics_id": 233,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 25,
"initial_dir": 2,
@ -359,9 +359,9 @@
"y": 0
},
{
"graphics_id": 15,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 13,
"initial_dir": 0,
@ -373,9 +373,9 @@
"y": 0
},
{
"graphics_id": 19,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 14,
"initial_dir": 1,
@ -387,9 +387,9 @@
"y": 0
},
{
"graphics_id": 36,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 15,
"initial_dir": 1,
@ -401,9 +401,9 @@
"y": 0
},
{
"graphics_id": 49,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TUBER_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 22,
"initial_dir": 3,
@ -415,9 +415,9 @@
"y": 0
},
{
"graphics_id": 11,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 19,
"initial_dir": 1,
@ -429,9 +429,9 @@
"y": 0
},
{
"graphics_id": 42,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_COWGIRL",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 11,
"initial_dir": 3,
@ -443,9 +443,9 @@
"y": 0
},
{
"graphics_id": 54,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FISHERMAN",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 21,
"initial_dir": 3,
@ -457,9 +457,9 @@
"y": 0
},
{
"graphics_id": 53,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 17,
"initial_dir": 3,
@ -471,9 +471,9 @@
"y": 0
},
{
"graphics_id": 55,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_PARASOL_LADY",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 7,
"initial_dir": 0,
@ -485,9 +485,9 @@
"y": 0
},
{
"graphics_id": 60,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_WAITRESS",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 10,
"initial_dir": 0,
@ -499,9 +499,9 @@
"y": 0
},
{
"graphics_id": 96,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 28,
"initial_dir": 0,
@ -513,9 +513,9 @@
"y": 0
},
{
"graphics_id": 96,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 29,
"initial_dir": 0,
@ -527,9 +527,9 @@
"y": 0
},
{
"graphics_id": 96,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 30,
"initial_dir": 0,
@ -541,9 +541,9 @@
"y": 0
},
{
"graphics_id": 11,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 16,
"initial_dir": 1,
@ -555,9 +555,9 @@
"y": 0
},
{
"graphics_id": 69,
"movement_type": 10,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_SNOW_F",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 5,
"initial_dir": 1,
@ -569,9 +569,9 @@
"y": 0
},
{
"graphics_id": 22,
"movement_type": 14,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_REPORTER",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 707,
"script": 10168,
"initial_dir": 0,
@ -587,97 +587,97 @@
{
"x": 48,
"z": 17,
"dest_header_id": 326,
"dest_header_id": "MAP_HEADER_BATTLE_TOWER",
"dest_warp_id": 0
},
{
"x": 49,
"z": 17,
"dest_header_id": 326,
"dest_header_id": "MAP_HEADER_BATTLE_TOWER",
"dest_warp_id": 0
},
{
"x": 77,
"z": 34,
"dest_header_id": 562,
"dest_header_id": "MAP_HEADER_BATTLE_FACTORY",
"dest_warp_id": 0
},
{
"x": 77,
"z": 35,
"dest_header_id": 562,
"dest_header_id": "MAP_HEADER_BATTLE_FACTORY",
"dest_warp_id": 0
},
{
"x": 19,
"z": 34,
"dest_header_id": 563,
"dest_header_id": "MAP_HEADER_BATTLE_HALL",
"dest_warp_id": 0
},
{
"x": 19,
"z": 35,
"dest_header_id": 563,
"dest_header_id": "MAP_HEADER_BATTLE_HALL",
"dest_warp_id": 0
},
{
"x": 33,
"z": 62,
"dest_header_id": 564,
"dest_header_id": "MAP_HEADER_BATTLE_CASTLE",
"dest_warp_id": 0
},
{
"x": 33,
"z": 63,
"dest_header_id": 564,
"dest_header_id": "MAP_HEADER_BATTLE_CASTLE",
"dest_warp_id": 0
},
{
"x": 64,
"z": 62,
"dest_header_id": 565,
"dest_header_id": "MAP_HEADER_BATTLE_ARCADE",
"dest_warp_id": 0
},
{
"x": 64,
"z": 63,
"dest_header_id": 565,
"dest_header_id": "MAP_HEADER_BATTLE_ARCADE",
"dest_warp_id": 0
},
{
"x": 48,
"z": 52,
"dest_header_id": 560,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER_GATE_TO_FIGHT_AREA",
"dest_warp_id": 0
},
{
"x": 49,
"z": 52,
"dest_header_id": 560,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER_GATE_TO_FIGHT_AREA",
"dest_warp_id": 0
},
{
"x": 73,
"z": 34,
"dest_header_id": 562,
"dest_header_id": "MAP_HEADER_BATTLE_FACTORY",
"dest_warp_id": 0
},
{
"x": 23,
"z": 34,
"dest_header_id": 563,
"dest_header_id": "MAP_HEADER_BATTLE_HALL",
"dest_warp_id": 0
},
{
"x": 60,
"z": 62,
"dest_header_id": 565,
"dest_header_id": "MAP_HEADER_BATTLE_ARCADE",
"dest_warp_id": 0
},
{
"x": 36,
"z": 62,
"dest_header_id": 564,
"dest_header_id": "MAP_HEADER_BATTLE_CASTLE",
"dest_warp_id": 0
}
],

72
res/field/events/events_battle_frontier_gate_to_fight_area.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 9,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_M",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 10,
"initial_dir": 0,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 17,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 9,
"initial_dir": 2,
@ -30,9 +30,9 @@
"y": 0
},
{
"graphics_id": 50,
"movement_type": 8,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_RUIN_MANIAC",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 8,
"initial_dir": 2,
@ -44,9 +44,9 @@
"y": 0
},
{
"graphics_id": 233,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 6,
"initial_dir": 3,
@ -58,9 +58,9 @@
"y": 0
},
{
"graphics_id": 233,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 4,
"initial_dir": 3,
@ -72,9 +72,9 @@
"y": 0
},
{
"graphics_id": 233,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 2,
"initial_dir": 3,
@ -86,9 +86,9 @@
"y": 0
},
{
"graphics_id": 233,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 7,
"initial_dir": 2,
@ -100,9 +100,9 @@
"y": 0
},
{
"graphics_id": 233,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 5,
"initial_dir": 2,
@ -114,9 +114,9 @@
"y": 0
},
{
"graphics_id": 233,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 3,
"initial_dir": 2,
@ -128,9 +128,9 @@
"y": 0
},
{
"graphics_id": 13,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 11,
"initial_dir": 2,
@ -146,37 +146,37 @@
{
"x": 7,
"z": 2,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 10
},
{
"x": 6,
"z": 2,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 10
},
{
"x": 8,
"z": 2,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 10
},
{
"x": 7,
"z": 20,
"dest_header_id": 188,
"dest_header_id": "MAP_HEADER_FIGHT_AREA",
"dest_warp_id": 2
},
{
"x": 6,
"z": 20,
"dest_header_id": 188,
"dest_header_id": "MAP_HEADER_FIGHT_AREA",
"dest_warp_id": 2
},
{
"x": 8,
"z": 20,
"dest_header_id": 188,
"dest_header_id": "MAP_HEADER_FIGHT_AREA",
"dest_warp_id": 2
}
],

98
res/field/events/events_battle_hall.json
View File

@ -6,14 +6,14 @@
"x": 7,
"z": 8,
"y": 0,
"player_facing_dir": 0
"player_facing_dir": "BG_EVENT_DIR_NORTH"
}
],
"object_events": [
{
"graphics_id": 231,
"movement_type": 17,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_LOOK_RIGHT",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 1,
"initial_dir": 3,
@ -25,9 +25,9 @@
"y": 0
},
{
"graphics_id": 232,
"movement_type": 17,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_MULTI_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_LOOK_RIGHT",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 6,
"initial_dir": 3,
@ -39,9 +39,9 @@
"y": 0
},
{
"graphics_id": 175,
"movement_type": 7,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_MAID",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 14,
"initial_dir": 2,
@ -53,9 +53,9 @@
"y": 0
},
{
"graphics_id": 16,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 13,
"initial_dir": 3,
@ -67,9 +67,9 @@
"y": 0
},
{
"graphics_id": 2,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 9,
"initial_dir": 1,
@ -81,9 +81,9 @@
"y": 0
},
{
"graphics_id": 204,
"movement_type": 7,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_PACHIRISU",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 10,
"initial_dir": 0,
@ -95,9 +95,9 @@
"y": 0
},
{
"graphics_id": 65,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_065",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 8,
"initial_dir": 2,
@ -109,9 +109,9 @@
"y": 0
},
{
"graphics_id": 20,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_HIKER",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 7,
"initial_dir": 0,
@ -123,9 +123,9 @@
"y": 0
},
{
"graphics_id": 17,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 11,
"initial_dir": 1,
@ -137,9 +137,9 @@
"y": 0
},
{
"graphics_id": 35,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_IDOL",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 12,
"initial_dir": 0,
@ -151,9 +151,9 @@
"y": 0
},
{
"graphics_id": 22,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_REPORTER",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 705,
"script": 10163,
"initial_dir": 1,
@ -165,9 +165,9 @@
"y": 0
},
{
"graphics_id": 5,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 15,
"initial_dir": 2,
@ -179,9 +179,9 @@
"y": 0
},
{
"graphics_id": 104,
"movement_type": 16,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_104",
"movement_type": "MOVEMENT_TYPE_LOOK_LEFT",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 18,
"initial_dir": 2,
@ -193,9 +193,9 @@
"y": 0
},
{
"graphics_id": 102,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_102",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 715,
"script": 20,
"initial_dir": 1,
@ -207,9 +207,9 @@
"y": 0
},
{
"graphics_id": 231,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 17,
"initial_dir": 1,
@ -225,19 +225,19 @@
{
"x": 25,
"z": 9,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 13
},
{
"x": 25,
"z": 8,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 13
},
{
"x": 25,
"z": 10,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 13
}
],

92
res/field/events/events_battle_park.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 15,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 9,
"initial_dir": 1,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 93,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_SIGNBOARD",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 3,
"initial_dir": 0,
@ -30,9 +30,9 @@
"y": 0
},
{
"graphics_id": 81,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BABY_IN_PRAM",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 8,
"initial_dir": 2,
@ -44,9 +44,9 @@
"y": 0
},
{
"graphics_id": 93,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_SIGNBOARD",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 4,
"initial_dir": 0,
@ -58,9 +58,9 @@
"y": 0
},
{
"graphics_id": 13,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 5,
"initial_dir": 2,
@ -72,9 +72,9 @@
"y": 0
},
{
"graphics_id": 18,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 7,
"initial_dir": 2,
@ -86,9 +86,9 @@
"y": 0
},
{
"graphics_id": 3,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 6,
"initial_dir": 3,
@ -100,9 +100,9 @@
"y": 0
},
{
"graphics_id": 82,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 10,
"initial_dir": 2,
@ -114,9 +114,9 @@
"y": 0
},
{
"graphics_id": 51,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 12,
"initial_dir": 0,
@ -128,9 +128,9 @@
"y": 0
},
{
"graphics_id": 11,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 11,
"initial_dir": 0,
@ -142,9 +142,9 @@
"y": 0
},
{
"graphics_id": 87,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_POKEBALL",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 1259,
"script": 7245,
"initial_dir": 0,
@ -156,9 +156,9 @@
"y": 0
},
{
"graphics_id": 169,
"movement_type": 14,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_PALMER",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 630,
"script": 0,
"initial_dir": 0,
@ -170,9 +170,9 @@
"y": 0
},
{
"graphics_id": 148,
"movement_type": 14,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BARRY",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 631,
"script": 0,
"initial_dir": 0,
@ -184,9 +184,9 @@
"y": 0
},
{
"graphics_id": 93,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_SIGNBOARD",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 3,
"initial_dir": 0,
@ -202,25 +202,25 @@
{
"x": 20,
"z": 33,
"dest_header_id": 323,
"dest_header_id": "MAP_HEADER_BATTLE_PARK_EXCHANGE_SERVICE_CORNER",
"dest_warp_id": 0
},
{
"x": 29,
"z": 33,
"dest_header_id": 323,
"dest_header_id": "MAP_HEADER_BATTLE_PARK_EXCHANGE_SERVICE_CORNER",
"dest_warp_id": 1
},
{
"x": 24,
"z": 53,
"dest_header_id": 192,
"dest_header_id": "MAP_HEADER_BATTLE_PARK_GATE_TO_FIGHT_AREA",
"dest_warp_id": 0
},
{
"x": 25,
"z": 53,
"dest_header_id": 192,
"dest_header_id": "MAP_HEADER_BATTLE_PARK_GATE_TO_FIGHT_AREA",
"dest_warp_id": 0
}
],

58
res/field/events/events_battle_park_exchange_service_corner.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 175,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_MAID",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 1,
"initial_dir": 1,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 175,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_MAID",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 2,
"initial_dir": 1,
@ -30,9 +30,9 @@
"y": 0
},
{
"graphics_id": 2,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 8,
"initial_dir": 3,
@ -44,9 +44,9 @@
"y": 0
},
{
"graphics_id": 18,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 9,
"initial_dir": 2,
@ -58,9 +58,9 @@
"y": 0
},
{
"graphics_id": 36,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 3,
"initial_dir": 2,
@ -72,9 +72,9 @@
"y": 0
},
{
"graphics_id": 37,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_SOCIALITE",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 4,
"initial_dir": 2,
@ -86,9 +86,9 @@
"y": 0
},
{
"graphics_id": 43,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_CLOWN",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 7,
"initial_dir": 1,
@ -100,9 +100,9 @@
"y": 0
},
{
"graphics_id": 42,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_COWGIRL",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 6,
"initial_dir": 0,
@ -114,9 +114,9 @@
"y": 0
},
{
"graphics_id": 31,
"movement_type": 10,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_ROUGHNECK",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 5,
"initial_dir": 1,
@ -132,13 +132,13 @@
{
"x": 5,
"z": 17,
"dest_header_id": 322,
"dest_header_id": "MAP_HEADER_BATTLE_PARK",
"dest_warp_id": 0
},
{
"x": 21,
"z": 17,
"dest_header_id": 322,
"dest_header_id": "MAP_HEADER_BATTLE_PARK",
"dest_warp_id": 1
}
],

38
res/field/events/events_battle_park_gate_to_fight_area.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 175,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_MAID",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 3,
"initial_dir": 3,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 175,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_MAID",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 2,
"initial_dir": 3,
@ -30,9 +30,9 @@
"y": 0
},
{
"graphics_id": 175,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_MAID",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 5,
"initial_dir": 3,
@ -44,9 +44,9 @@
"y": 0
},
{
"graphics_id": 175,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_MAID",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 5,
"initial_dir": 2,
@ -58,9 +58,9 @@
"y": 0
},
{
"graphics_id": 19,
"movement_type": 6,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 6,
"initial_dir": 0,
@ -72,9 +72,9 @@
"y": 0
},
{
"graphics_id": 175,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_MAID",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 4,
"initial_dir": 2,
@ -90,7 +90,7 @@
{
"x": 5,
"z": 2,
"dest_header_id": 322,
"dest_header_id": "MAP_HEADER_BATTLE_PARK",
"dest_warp_id": 2
}
],

102
res/field/events/events_battle_tower.json
View File

@ -6,7 +6,7 @@
"x": 13,
"z": 5,
"y": 0,
"player_facing_dir": 0
"player_facing_dir": "BG_EVENT_DIR_NORTH"
},
{
"script": 12,
@ -14,7 +14,7 @@
"x": 17,
"z": 5,
"y": 0,
"player_facing_dir": 0
"player_facing_dir": "BG_EVENT_DIR_NORTH"
},
{
"script": 13,
@ -22,14 +22,14 @@
"x": 21,
"z": 5,
"y": 0,
"player_facing_dir": 0
"player_facing_dir": "BG_EVENT_DIR_NORTH"
}
],
"object_events": [
{
"graphics_id": 231,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 1,
"initial_dir": 1,
@ -41,9 +41,9 @@
"y": 0
},
{
"graphics_id": 232,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_FRONTIER_MULTI_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 2,
"initial_dir": 1,
@ -55,9 +55,9 @@
"y": 0
},
{
"graphics_id": 235,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 3,
"initial_dir": 1,
@ -69,9 +69,9 @@
"y": 0
},
{
"graphics_id": 27,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 489,
"script": 7,
"initial_dir": 1,
@ -83,9 +83,9 @@
"y": 0
},
{
"graphics_id": 44,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_ARTIST",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 19,
"initial_dir": 1,
@ -97,9 +97,9 @@
"y": 0
},
{
"graphics_id": 45,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_JOGGER",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 15,
"initial_dir": 2,
@ -111,9 +111,9 @@
"y": 0
},
{
"graphics_id": 35,
"movement_type": 7,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_IDOL",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 16,
"initial_dir": 0,
@ -125,9 +125,9 @@
"y": 0
},
{
"graphics_id": 62,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 17,
"initial_dir": 1,
@ -139,9 +139,9 @@
"y": 0
},
{
"graphics_id": 71,
"movement_type": 13,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_PIKACHU",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_WEST_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 18,
"initial_dir": 2,
@ -153,9 +153,9 @@
"y": 0
},
{
"graphics_id": 71,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_PIKACHU",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 21,
"initial_dir": 3,
@ -167,9 +167,9 @@
"y": 0
},
{
"graphics_id": 3,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 20,
"initial_dir": 2,
@ -181,9 +181,9 @@
"y": 0
},
{
"graphics_id": 55,
"movement_type": 3,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_PARASOL_LADY",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 14,
"initial_dir": 1,
@ -195,9 +195,9 @@
"y": 0
},
{
"graphics_id": 22,
"movement_type": 6,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_REPORTER",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 526,
"script": 10151,
"initial_dir": 0,
@ -209,9 +209,9 @@
"y": 0
},
{
"graphics_id": 3,
"movement_type": 8,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 2033,
"initial_dir": 2,
@ -223,9 +223,9 @@
"y": 0
},
{
"graphics_id": 29,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 24,
"initial_dir": 1,
@ -241,19 +241,19 @@
{
"x": 15,
"z": 19,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 0
},
{
"x": 14,
"z": 19,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 0
},
{
"x": 16,
"z": 19,
"dest_header_id": 559,
"dest_header_id": "MAP_HEADER_BATTLE_FRONTIER",
"dest_warp_id": 0
}
],

18
res/field/events/events_battle_tower_battle_room.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 27,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 3,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 102,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_102",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 459,
"script": 0,
"initial_dir": 1,
@ -30,9 +30,9 @@
"y": 0
},
{
"graphics_id": 101,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_101",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 0,

36
res/field/events/events_battle_tower_battle_salon.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 27,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 1,
"initial_dir": 3,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 141,
"movement_type": 2,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_CHERYL",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 492,
"script": 2,
"initial_dir": 2,
@ -30,9 +30,9 @@
"y": 0
},
{
"graphics_id": 145,
"movement_type": 2,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_MIRA",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 493,
"script": 3,
"initial_dir": 3,
@ -44,9 +44,9 @@
"y": 0
},
{
"graphics_id": 142,
"movement_type": 2,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_RILEY",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 494,
"script": 4,
"initial_dir": 1,
@ -58,9 +58,9 @@
"y": 0
},
{
"graphics_id": 143,
"movement_type": 2,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_MARLEY",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 495,
"script": 5,
"initial_dir": 3,
@ -72,9 +72,9 @@
"y": 0
},
{
"graphics_id": 144,
"movement_type": 2,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BUCK",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 496,
"script": 6,
"initial_dir": 0,

6
res/field/events/events_battle_tower_corridor.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 27,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 0,

24
res/field/events/events_battle_tower_corridor_multi.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 27,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 1,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 27,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 1,
@ -30,9 +30,9 @@
"y": 0
},
{
"graphics_id": 101,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_101",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 1,
@ -44,9 +44,9 @@
"y": 0
},
{
"graphics_id": 102,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_102",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 1,

6
res/field/events/events_battle_tower_elevator.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 111,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_111",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 1,

36
res/field/events/events_battle_tower_multi_battle_room.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 27,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 3,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 27,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 3,
@ -30,9 +30,9 @@
"y": 0
},
{
"graphics_id": 101,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_101",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 0,
@ -44,9 +44,9 @@
"y": 0
},
{
"graphics_id": 102,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_102",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 0,
"initial_dir": 0,
@ -58,9 +58,9 @@
"y": 0
},
{
"graphics_id": 104,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_104",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 491,
"script": 0,
"initial_dir": 1,
@ -72,9 +72,9 @@
"y": 0
},
{
"graphics_id": 103,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_103",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 490,
"script": 0,
"initial_dir": 1,

38
res/field/events/events_battleground.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 17,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 1,
"initial_dir": 2,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 144,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_BUCK",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 470,
"script": 2,
"initial_dir": 1,
@ -30,9 +30,9 @@
"y": 0
},
{
"graphics_id": 102,
"movement_type": 17,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_102",
"movement_type": "MOVEMENT_TYPE_LOOK_RIGHT",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 674,
"script": 5,
"initial_dir": 3,
@ -44,9 +44,9 @@
"y": 0
},
{
"graphics_id": 103,
"movement_type": 15,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_103",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 675,
"script": 6,
"initial_dir": 1,
@ -58,9 +58,9 @@
"y": 0
},
{
"graphics_id": 104,
"movement_type": 16,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_104",
"movement_type": "MOVEMENT_TYPE_LOOK_LEFT",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 676,
"script": 7,
"initial_dir": 2,
@ -72,9 +72,9 @@
"y": 0
},
{
"graphics_id": 105,
"movement_type": 14,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_UNK_105",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 677,
"script": 8,
"initial_dir": 0,
@ -90,7 +90,7 @@
{
"x": 7,
"z": 11,
"dest_header_id": 450,
"dest_header_id": "MAP_HEADER_SURVIVAL_AREA",
"dest_warp_id": 0
}
],

38
res/field/events/events_cafe.json
View File

@ -2,9 +2,9 @@
"bg_events": [],
"object_events": [
{
"graphics_id": 41,
"movement_type": 17,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_RANCHER",
"movement_type": "MOVEMENT_TYPE_LOOK_RIGHT",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 2,
"initial_dir": 3,
@ -16,9 +16,9 @@
"y": 0
},
{
"graphics_id": 60,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_WAITRESS",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 3,
"initial_dir": 2,
@ -30,9 +30,9 @@
"y": 0
},
{
"graphics_id": 19,
"movement_type": 17,
"trainer_type": 1,
"graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
"movement_type": "MOVEMENT_TYPE_LOOK_RIGHT",
"trainer_type": "TRAINER_TYPE_NORMAL",
"flag": 0,
"script": 3274,
"initial_dir": 3,
@ -44,9 +44,9 @@
"y": 0
},
{
"graphics_id": 19,
"movement_type": 16,
"trainer_type": 1,
"graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
"movement_type": "MOVEMENT_TYPE_LOOK_LEFT",
"trainer_type": "TRAINER_TYPE_NORMAL",
"flag": 0,
"script": 3275,
"initial_dir": 2,
@ -58,9 +58,9 @@
"y": 0
},
{
"graphics_id": 60,
"movement_type": 15,
"trainer_type": 1,
"graphics_id": "OBJ_EVENT_GFX_WAITRESS",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NORMAL",
"flag": 0,
"script": 3365,
"initial_dir": 1,
@ -72,9 +72,9 @@
"y": 0
},
{
"graphics_id": 164,
"movement_type": 0,
"trainer_type": 0,
"graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
"flag": 0,
"script": 4,
"initial_dir": 2,
@ -90,7 +90,7 @@
{
"x": 5,
"z": 8,
"dest_header_id": 362,
"dest_header_id": "MAP_HEADER_ROUTE_210_SOUTH",
"dest_warp_id": 0
}
],

Some files were not shown because too many files have changed in this diff Show More