mirror of
https://github.com/pret/pokeplatinum.git
synced 2026-03-21 17:55:13 -05:00
Merge remote-tracking branch 'upstream/main'
This commit is contained in:
commit
8ff4bfa4c2
12
include/battle/move_display_info.h
Normal file
12
include/battle/move_display_info.h
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
#ifndef POKEPLATINUM_MOVE_DISPLAY_INFO
|
||||
#define POKEPLATINUM_MOVE_DISPLAY_INFO
|
||||
|
||||
#include "constants/moves.h"
|
||||
|
||||
typedef struct MoveDisplayInfo {
|
||||
u16 move[LEARNED_MOVES_MAX];
|
||||
u16 curPP[LEARNED_MOVES_MAX];
|
||||
u16 maxPP[LEARNED_MOVES_MAX];
|
||||
} MoveDisplayInfo;
|
||||
|
||||
#endif // POKEPLATINUM_MOVE_DISPLAY_INFO
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
#include "struct_decls/battle_system.h"
|
||||
|
||||
#include "battle/move_display_info.h"
|
||||
#include "battle/struct_ov16_02268A14_decl.h"
|
||||
#include "battle/struct_ov16_0226AC98.h"
|
||||
|
||||
#include "bg_window.h"
|
||||
#include "narc.h"
|
||||
|
|
@ -26,7 +26,7 @@ BOOL ov16_02269348(UnkStruct_ov16_02268A14 *param0);
|
|||
int ov16_02269368(int param0, int param1);
|
||||
void ov16_0226940C(UnkStruct_ov16_02268A14 *param0);
|
||||
void ov16_0226947C(UnkStruct_ov16_02268A14 *param0, int param1, int param2);
|
||||
void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_ov16_0226AC98 *param2);
|
||||
void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const MoveDisplayInfo *param2);
|
||||
void ov16_0226BCCC(UnkStruct_ov16_02268A14 *param0, int param1);
|
||||
BOOL ov16_0226BCD0(UnkStruct_ov16_02268A14 *param0);
|
||||
int ov16_0226CD08(UnkStruct_ov16_02268A14 *param0);
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
#ifndef POKEPLATINUM_STRUCT_OV16_0226AC98_H
|
||||
#define POKEPLATINUM_STRUCT_OV16_0226AC98_H
|
||||
|
||||
typedef struct {
|
||||
u16 unk_00[4];
|
||||
u16 unk_08[4];
|
||||
u16 unk_10[4];
|
||||
} UnkStruct_ov16_0226AC98;
|
||||
|
||||
#endif // POKEPLATINUM_STRUCT_OV16_0226AC98_H
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
#include "consts/map.h"
|
||||
|
||||
#include "field/events/zone_event.naix"
|
||||
#include "field/scripts/scr_seq.naix"
|
||||
#include "text/pl_msg.naix"
|
||||
|
||||
|
|
@ -14,7 +15,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -36,7 +37,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -58,7 +59,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x424,
|
||||
.nightMusicID = 0x424,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x1,
|
||||
.eventsArchiveID = events_underground,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -80,7 +81,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3F2,
|
||||
.nightMusicID = 0x40F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x2,
|
||||
.eventsArchiveID = events_jubilife_city,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x1,
|
||||
.weather = 0x0,
|
||||
|
|
@ -102,7 +103,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x442,
|
||||
.nightMusicID = 0x442,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x3,
|
||||
.eventsArchiveID = events_jubilife_city_mart,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -124,7 +125,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x43F,
|
||||
.nightMusicID = 0x43F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x4,
|
||||
.eventsArchiveID = events_jubilife_city_unknown_house_1,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -146,7 +147,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x43D,
|
||||
.nightMusicID = 0x43E,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x5,
|
||||
.eventsArchiveID = events_jubilife_city_pokecenter_1f,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -168,7 +169,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x43D,
|
||||
.nightMusicID = 0x43E,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x6,
|
||||
.eventsArchiveID = events_jubilife_city_pokecenter_2f,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -190,7 +191,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3F2,
|
||||
.nightMusicID = 0x40F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x7,
|
||||
.eventsArchiveID = events_poketch_co_1f,
|
||||
.mapLabelTextID = 0x5B,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -212,7 +213,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3F2,
|
||||
.nightMusicID = 0x40F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x8,
|
||||
.eventsArchiveID = events_poketch_co_2f,
|
||||
.mapLabelTextID = 0x5B,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -234,7 +235,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3F2,
|
||||
.nightMusicID = 0x40F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x9,
|
||||
.eventsArchiveID = events_poketch_co_3f,
|
||||
.mapLabelTextID = 0x5B,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -388,7 +389,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1093,
|
||||
.nightMusicID = 1093,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x10,
|
||||
.eventsArchiveID = events_jubilife_tv_3f_group_ranking_room,
|
||||
.mapLabelTextID = 0x5A,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -410,7 +411,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1093,
|
||||
.nightMusicID = 1093,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x11,
|
||||
.eventsArchiveID = events_jubilife_tv_elevator,
|
||||
.mapLabelTextID = 0x5A,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -432,7 +433,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3F2,
|
||||
.nightMusicID = 0x40F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x12,
|
||||
.eventsArchiveID = events_jubilife_city_south_house_1f,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -454,7 +455,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3F2,
|
||||
.nightMusicID = 0x40F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x13,
|
||||
.eventsArchiveID = events_jubilife_city_south_house_2f,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -476,7 +477,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3F2,
|
||||
.nightMusicID = 0x40F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x14,
|
||||
.eventsArchiveID = events_jubilife_city_south_house_3f,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -498,7 +499,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3F2,
|
||||
.nightMusicID = 0x40F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x15,
|
||||
.eventsArchiveID = events_jubilife_city_south_house_4f,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -520,7 +521,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x16,
|
||||
.eventsArchiveID = events_jubilife_city_unknown_house_2,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -542,7 +543,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3F2,
|
||||
.nightMusicID = 0x40F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x17,
|
||||
.eventsArchiveID = events_jubilife_city_condominiums_1f,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -564,7 +565,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3F2,
|
||||
.nightMusicID = 0x40F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x18,
|
||||
.eventsArchiveID = events_jubilife_city_condominiums_2f,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -586,7 +587,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3F2,
|
||||
.nightMusicID = 0x40F,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x19,
|
||||
.eventsArchiveID = events_jubilife_city_condominiums_3f,
|
||||
.mapLabelTextID = 0x6,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -1290,7 +1291,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1012,
|
||||
.nightMusicID = 1041,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x39,
|
||||
.eventsArchiveID = events_oreburgh_city_middle_house,
|
||||
.mapLabelTextID = 0x8,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -1554,7 +1555,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x43D,
|
||||
.nightMusicID = 0x43E,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x45,
|
||||
.eventsArchiveID = events_eterna_city_pokecenter_2f,
|
||||
.mapLabelTextID = 0x9,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -1620,7 +1621,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1068,
|
||||
.nightMusicID = 1068,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x48,
|
||||
.eventsArchiveID = events_team_galactic_eterna_building_2f,
|
||||
.mapLabelTextID = 122,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -2588,7 +2589,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1089,
|
||||
.nightMusicID = 1089,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x74,
|
||||
.eventsArchiveID = events_contest_hall_lobby,
|
||||
.mapLabelTextID = 97,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -2610,7 +2611,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1089,
|
||||
.nightMusicID = 1089,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x75,
|
||||
.eventsArchiveID = events_contest_hall_stage_ongoing_contest,
|
||||
.mapLabelTextID = 97,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -4326,7 +4327,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1020,
|
||||
.nightMusicID = 1049,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -4546,7 +4547,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -4898,7 +4899,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -4942,7 +4943,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -5360,7 +5361,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -5558,7 +5559,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1062,
|
||||
.nightMusicID = 1062,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -5866,7 +5867,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -6064,7 +6065,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -6086,7 +6087,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1062,
|
||||
.nightMusicID = 1062,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -6108,7 +6109,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1062,
|
||||
.nightMusicID = 1062,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -6328,7 +6329,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1025,
|
||||
.nightMusicID = 1054,
|
||||
.wildEncountersArchiveID = 117,
|
||||
.eventsArchiveID = 0x114,
|
||||
.eventsArchiveID = events_trophy_garden,
|
||||
.mapLabelTextID = 68,
|
||||
.mapLabelWindowID = 0x7,
|
||||
.weather = 0x0,
|
||||
|
|
@ -6350,7 +6351,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1022,
|
||||
.nightMusicID = 1051,
|
||||
.wildEncountersArchiveID = 118,
|
||||
.eventsArchiveID = 0x115,
|
||||
.eventsArchiveID = events_iron_island,
|
||||
.mapLabelTextID = 0x45,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x8,
|
||||
|
|
@ -6372,7 +6373,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x433,
|
||||
.nightMusicID = 0x433,
|
||||
.wildEncountersArchiveID = 119,
|
||||
.eventsArchiveID = 0x116,
|
||||
.eventsArchiveID = events_iron_island_1f,
|
||||
.mapLabelTextID = 0x45,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -6394,7 +6395,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x433,
|
||||
.nightMusicID = 0x433,
|
||||
.wildEncountersArchiveID = 120,
|
||||
.eventsArchiveID = 0x117,
|
||||
.eventsArchiveID = events_iron_island_b1f_left_room,
|
||||
.mapLabelTextID = 0x45,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -6416,7 +6417,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x433,
|
||||
.nightMusicID = 0x433,
|
||||
.wildEncountersArchiveID = 121,
|
||||
.eventsArchiveID = 0x118,
|
||||
.eventsArchiveID = events_iron_island_b1f_right_room,
|
||||
.mapLabelTextID = 0x45,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -6438,7 +6439,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x433,
|
||||
.nightMusicID = 0x433,
|
||||
.wildEncountersArchiveID = 122,
|
||||
.eventsArchiveID = 0x119,
|
||||
.eventsArchiveID = events_iron_island_b2f_right_room,
|
||||
.mapLabelTextID = 0x45,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -6702,7 +6703,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -7142,7 +7143,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -7164,7 +7165,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -7362,7 +7363,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1021,
|
||||
.nightMusicID = 1050,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x140,
|
||||
.eventsArchiveID = events_verity_lakefront,
|
||||
.mapLabelTextID = 0x48,
|
||||
.mapLabelWindowID = 0x3,
|
||||
.weather = 0x0,
|
||||
|
|
@ -7384,7 +7385,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1021,
|
||||
.nightMusicID = 1050,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x141,
|
||||
.eventsArchiveID = events_verity_lakefront_unknown_house,
|
||||
.mapLabelTextID = 0x48,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -7406,7 +7407,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1009,
|
||||
.nightMusicID = 1038,
|
||||
.wildEncountersArchiveID = 138,
|
||||
.eventsArchiveID = 0x142,
|
||||
.eventsArchiveID = events_valor_lakefront,
|
||||
.mapLabelTextID = 73,
|
||||
.mapLabelWindowID = 0x3,
|
||||
.weather = 0x0,
|
||||
|
|
@ -7428,7 +7429,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1009,
|
||||
.nightMusicID = 1038,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x143,
|
||||
.eventsArchiveID = events_restaurant,
|
||||
.mapLabelTextID = 110,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -7450,7 +7451,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1009,
|
||||
.nightMusicID = 1038,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x144,
|
||||
.eventsArchiveID = events_grand_lake_valor_lakefront_east_house,
|
||||
.mapLabelTextID = 109,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -8836,7 +8837,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1024,
|
||||
.nightMusicID = 1053,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -8858,7 +8859,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1024,
|
||||
.nightMusicID = 1053,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -8880,7 +8881,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1008,
|
||||
.nightMusicID = 1037,
|
||||
.wildEncountersArchiveID = 173,
|
||||
.eventsArchiveID = 0x183,
|
||||
.eventsArchiveID = events_route_227,
|
||||
.mapLabelTextID = 42,
|
||||
.mapLabelWindowID = 0x3,
|
||||
.weather = 0x9,
|
||||
|
|
@ -8902,7 +8903,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1024,
|
||||
.nightMusicID = 1053,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -8924,7 +8925,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1024,
|
||||
.nightMusicID = 1053,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -8946,7 +8947,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x404,
|
||||
.nightMusicID = 0x421,
|
||||
.wildEncountersArchiveID = 174,
|
||||
.eventsArchiveID = 0x184,
|
||||
.eventsArchiveID = events_route_228,
|
||||
.mapLabelTextID = 0x2B,
|
||||
.mapLabelWindowID = 0x3,
|
||||
.weather = 0xA,
|
||||
|
|
@ -8968,7 +8969,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x404,
|
||||
.nightMusicID = 0x421,
|
||||
.wildEncountersArchiveID = 175,
|
||||
.eventsArchiveID = 0x185,
|
||||
.eventsArchiveID = events_route_229,
|
||||
.mapLabelTextID = 44,
|
||||
.mapLabelWindowID = 0x3,
|
||||
.weather = 0x0,
|
||||
|
|
@ -8990,7 +8991,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -9012,7 +9013,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1024,
|
||||
.nightMusicID = 1053,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -9034,7 +9035,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x43D,
|
||||
.nightMusicID = 0x43E,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -9056,7 +9057,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1004,
|
||||
.nightMusicID = 1033,
|
||||
.wildEncountersArchiveID = 176,
|
||||
.eventsArchiveID = 0x186,
|
||||
.eventsArchiveID = events_twinleaf_town,
|
||||
.mapLabelTextID = 0x1,
|
||||
.mapLabelWindowID = 0x2,
|
||||
.weather = 0x0,
|
||||
|
|
@ -9100,7 +9101,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1004,
|
||||
.nightMusicID = 1033,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x188,
|
||||
.eventsArchiveID = events_twinleaf_town_rival_house_2f,
|
||||
.mapLabelTextID = 0x1,
|
||||
.mapLabelWindowID = 0x2,
|
||||
.weather = 0x0,
|
||||
|
|
@ -9298,7 +9299,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1088,
|
||||
.nightMusicID = 1088,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x191,
|
||||
.eventsArchiveID = events_sandgem_town_pokemon_research_lab,
|
||||
.mapLabelTextID = 0x2,
|
||||
.mapLabelWindowID = 0x2,
|
||||
.weather = 0x0,
|
||||
|
|
@ -10354,7 +10355,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -10420,7 +10421,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x3E8,
|
||||
.nightMusicID = 0x3E8,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x0,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -11256,7 +11257,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x430,
|
||||
.nightMusicID = 0x430,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 86,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0xD,
|
||||
|
|
@ -11740,7 +11741,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -11762,7 +11763,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -11806,7 +11807,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -11828,7 +11829,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -11850,7 +11851,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -11872,7 +11873,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -11916,7 +11917,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -11938,7 +11939,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -11960,7 +11961,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -11982,7 +11983,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12004,7 +12005,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12048,7 +12049,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12070,7 +12071,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12092,7 +12093,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12114,7 +12115,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12136,7 +12137,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12158,7 +12159,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12180,7 +12181,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12202,7 +12203,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12224,7 +12225,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12246,7 +12247,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12268,7 +12269,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1064,
|
||||
.nightMusicID = 1064,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 62,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = (0xE),
|
||||
|
|
@ -12356,7 +12357,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1092,
|
||||
.nightMusicID = 1092,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 80,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12554,7 +12555,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x4A6,
|
||||
.nightMusicID = 0x4A6,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x75,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12598,7 +12599,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 1013,
|
||||
.nightMusicID = 1042,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 122,
|
||||
.mapLabelWindowID = 0x6,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12642,7 +12643,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x4A6,
|
||||
.nightMusicID = 0x4A6,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x75,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12664,7 +12665,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x4A6,
|
||||
.nightMusicID = 0x4A6,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x75,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12686,7 +12687,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x4A6,
|
||||
.nightMusicID = 0x4A6,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x75,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12708,7 +12709,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x4A6,
|
||||
.nightMusicID = 0x4A6,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x75,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12730,7 +12731,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x4A6,
|
||||
.nightMusicID = 0x4A6,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x75,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12752,7 +12753,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x4A6,
|
||||
.nightMusicID = 0x4A6,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x75,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12774,7 +12775,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x4A6,
|
||||
.nightMusicID = 0x4A6,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x75,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12796,7 +12797,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x4A6,
|
||||
.nightMusicID = 0x4A6,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x75,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12818,7 +12819,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x4A6,
|
||||
.nightMusicID = 0x4A6,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x75,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12840,7 +12841,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x4A6,
|
||||
.nightMusicID = 0x4A6,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x0,
|
||||
.eventsArchiveID = events_empty,
|
||||
.mapLabelTextID = 0x75,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12928,7 +12929,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x433,
|
||||
.nightMusicID = 0x433,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x210,
|
||||
.eventsArchiveID = events_iron_island_iron_ruins,
|
||||
.mapLabelTextID = 0x45,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12950,7 +12951,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x427,
|
||||
.nightMusicID = 0x427,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x211,
|
||||
.eventsArchiveID = events_iron_ruins,
|
||||
.mapLabelTextID = 0x7B,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -12994,7 +12995,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x427,
|
||||
.nightMusicID = 0x427,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x213,
|
||||
.eventsArchiveID = events_iceberg_ruins,
|
||||
.mapLabelTextID = 0x7C,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x1D,
|
||||
|
|
@ -13016,7 +13017,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x404,
|
||||
.nightMusicID = 0x421,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x214,
|
||||
.eventsArchiveID = events_route_228_rock_peak_ruins,
|
||||
.mapLabelTextID = 0x2B,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
@ -13038,7 +13039,7 @@ static const MapHeader sMapHeaders[] = {
|
|||
.dayMusicID = 0x427,
|
||||
.nightMusicID = 0x427,
|
||||
.wildEncountersArchiveID = 0xFFFF,
|
||||
.eventsArchiveID = 0x215,
|
||||
.eventsArchiveID = events_rock_peak_ruins,
|
||||
.mapLabelTextID = 0x7D,
|
||||
.mapLabelWindowID = 0x4,
|
||||
.weather = 0x0,
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ e22f0296444ce01e0b7619f73a8cf2016b2307b4 *res/prebuilt/graphic/oekaki.narc
|
|||
dd0663e46347230d1d1b9eb8b583cee9acc10f31 *res/prebuilt/graphic/pl_bag_gra.narc
|
||||
0929061d78710595aa53796ecffe3545f8406d82 *res/fonts/pl_font.narc
|
||||
d397dbd087737151aa8bea242016c626afb55fa5 *res/prebuilt/graphic/pl_plist_gra.narc
|
||||
883e6afb310f0ab02c26f2026cba1c76210bb3ac *res/prebuilt/graphic/pl_pst_gra.narc
|
||||
883e6afb310f0ab02c26f2026cba1c76210bb3ac *res/graphics/pokemon_summary_screen/pl_pst_gra.narc
|
||||
c16faeeeee494830c720d1f795a141cacfe49121 *res/prebuilt/graphic/pl_wifinote.narc
|
||||
298fd1d0ab31efd35cb00b977f69eacbfb8a8da8 *res/graphics/windows/pl_winframe.narc
|
||||
b9f77b38cc07a6754fc00a7c1830d86c88d45aa6 *res/prebuilt/graphic/plist_gra.narc
|
||||
|
|
|
|||
|
|
@ -329,7 +329,13 @@ RomSpec
|
|||
Root /
|
||||
HostRoot res/prebuilt
|
||||
File graphic/pl_plist_gra.narc
|
||||
File graphic/pl_pst_gra.narc
|
||||
|
||||
Root /graphic/
|
||||
HostRoot res/graphics/pokemon_summary_screen
|
||||
File pl_pst_gra.narc
|
||||
|
||||
Root /
|
||||
HostRoot res/prebuilt
|
||||
File graphic/pl_wifinote.narc
|
||||
|
||||
Root /graphic
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
enc_bin_gen = generator(
|
||||
encounters_new_py,
|
||||
encounter_py,
|
||||
arguments: [ '@INPUT@', '@OUTPUT@', ],
|
||||
output: '@BASENAME@.bin'
|
||||
)
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user