diff options
| author | YamaArashi <shadow962@live.com> | 2016-04-22 20:44:21 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-04-22 20:44:21 -0700 |
| commit | 000e34c6f29655aa20034e390e4e2a6c1f7a1258 (patch) | |
| tree | 692b7fe5bde75980955b7d1489c9f22e8c04be13 | |
| parent | 0df6676bfccb1d68aa741997702d2a558110d322 (diff) | |
use standard GNU binutils
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | constants/easy_chat_constants.s | 36 | ||||
| -rw-r--r-- | constants/gba_constants.s | 8 | ||||
| -rw-r--r-- | constants/map_constants.s | 920 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.s | 30 | ||||
| -rw-r--r-- | constants/trainer_constants.s | 18 | ||||
| -rw-r--r-- | src/task.c | 4 |
8 files changed, 512 insertions, 512 deletions
diff --git a/.gitignore b/.gitignore index 809a717c0..f144a1aba 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,4 @@ pokeas pokeld pokeobjcopy -genasm/* +src/*.s @@ -1,4 +1,4 @@ -AS := pokeas +AS := arm-none-eabi-as ASFLAGS := -mcpu=arm7tdmi CC := gbacc @@ -88,5 +88,5 @@ $(DATA_ASM_OBJS): %.o: %.s $$(dep) # Link objects to produce the ROM. $(ROM): $(OBJS) - ./pokeld -T ld_script.txt -T iwram_syms.txt -T ewram_syms.txt -o $(ELF) $(OBJS) - ./pokeobjcopy -O binary $(ELF) $(ROM) + arm-none-eabi-ld -T ld_script.txt -T iwram_syms.txt -T ewram_syms.txt -o $(ELF) $(OBJS) + arm-none-eabi-objcopy -O binary $(ELF) $(ROM) diff --git a/constants/easy_chat_constants.s b/constants/easy_chat_constants.s index dd42fc5fa..69639769d 100644 --- a/constants/easy_chat_constants.s +++ b/constants/easy_chat_constants.s @@ -20,7 +20,7 @@ .set EC_GROUP_MOVE_2, 0x13 .set EC_GROUP_TRENDY_SAYING, 0x14 .set EC_GROUP_POKEMON_2, 0x15 -; TRAINER +@ TRAINER .set EC_WORD_I_CHOOSE_YOU, (EC_GROUP_TRAINER << 9) | 0x0 .set EC_WORD_GOTCHA, (EC_GROUP_TRAINER << 9) | 0x1 .set EC_WORD_TRADE, (EC_GROUP_TRAINER << 9) | 0x2 @@ -41,7 +41,7 @@ .set EC_WORD_RUBY, (EC_GROUP_TRAINER << 9) | 0x11 .set EC_WORD_LEVEL, (EC_GROUP_TRAINER << 9) | 0x12 -; STATUS +@ STATUS .set EC_WORD_DARK, (EC_GROUP_STATUS << 9) | 0x0 .set EC_WORD_STENCH, (EC_GROUP_STATUS << 9) | 0x1 .set EC_WORD_THICK_FAT, (EC_GROUP_STATUS << 9) | 0x2 @@ -152,7 +152,7 @@ .set EC_WORD_PURE_POWER, (EC_GROUP_STATUS << 9) | 0x6b .set EC_WORD_SHIELD_DUST, (EC_GROUP_STATUS << 9) | 0x6c -; BATTLE +@ BATTLE .set EC_WORD_MATCH_UP, (EC_GROUP_BATTLE << 9) | 0x0 .set EC_WORD_GO, (EC_GROUP_BATTLE << 9) | 0x1 .set EC_WORD_NO_1, (EC_GROUP_BATTLE << 9) | 0x2 @@ -217,7 +217,7 @@ .set EC_WORD_RULE, (EC_GROUP_BATTLE << 9) | 0x3d .set EC_WORD_MOVE, (EC_GROUP_BATTLE << 9) | 0x3e -; GREETINGS +@ GREETINGS .set EC_WORD_THANKS, (EC_GROUP_GREETINGS << 9) | 0x0 .set EC_WORD_YES, (EC_GROUP_GREETINGS << 9) | 0x1 .set EC_WORD_HERE_GOES, (EC_GROUP_GREETINGS << 9) | 0x2 @@ -261,7 +261,7 @@ .set EC_WORD_COME_OVER, (EC_GROUP_GREETINGS << 9) | 0x28 .set EC_WORD_COUNT_ON, (EC_GROUP_GREETINGS << 9) | 0x29 -; PEOPLE +@ PEOPLE .set EC_WORD_OPPONENT, (EC_GROUP_PEOPLE << 9) | 0x0 .set EC_WORD_I, (EC_GROUP_PEOPLE << 9) | 0x1 .set EC_WORD_YOU, (EC_GROUP_PEOPLE << 9) | 0x2 @@ -338,7 +338,7 @@ .set EC_WORD_SHE_IS, (EC_GROUP_PEOPLE << 9) | 0x49 .set EC_WORD_SOME, (EC_GROUP_PEOPLE << 9) | 0x4a -; VOICES +@ VOICES .set EC_WORD_EXCL, (EC_GROUP_VOICES << 9) | 0x0 .set EC_WORD_EXCL_EXCL, (EC_GROUP_VOICES << 9) | 0x1 .set EC_WORD_QUES_EXCL, (EC_GROUP_VOICES << 9) | 0x2 @@ -403,7 +403,7 @@ .set EC_WORD_GWAH, (EC_GROUP_VOICES << 9) | 0x3d .set EC_WORD_WAHAHAHA, (EC_GROUP_VOICES << 9) | 0x3e -; SPEECH +@ SPEECH .set EC_WORD_LISTEN, (EC_GROUP_SPEECH << 9) | 0x0 .set EC_WORD_NOT_VERY, (EC_GROUP_SPEECH << 9) | 0x1 .set EC_WORD_MEAN, (EC_GROUP_SPEECH << 9) | 0x2 @@ -465,7 +465,7 @@ .set EC_WORD_INSTEAD, (EC_GROUP_SPEECH << 9) | 0x3a .set EC_WORD_FANTASTIC, (EC_GROUP_SPEECH << 9) | 0x3b -; ENDINGS +@ ENDINGS .set EC_WORD_WILL, (EC_GROUP_ENDINGS << 9) | 0x0 .set EC_WORD_WILL_BE_HERE, (EC_GROUP_ENDINGS << 9) | 0x1 .set EC_WORD_OR, (EC_GROUP_ENDINGS << 9) | 0x2 @@ -536,7 +536,7 @@ .set EC_WORD_ONCE, (EC_GROUP_ENDINGS << 9) | 0x43 .set EC_WORD_ANYWHERE, (EC_GROUP_ENDINGS << 9) | 0x44 -; FEELINGS +@ FEELINGS .set EC_WORD_MEET, (EC_GROUP_FEELINGS << 9) | 0x0 .set EC_WORD_PLAY, (EC_GROUP_FEELINGS << 9) | 0x1 .set EC_WORD_HURRIED, (EC_GROUP_FEELINGS << 9) | 0x2 @@ -607,7 +607,7 @@ .set EC_WORD_UNDERSTAND, (EC_GROUP_FEELINGS << 9) | 0x43 .set EC_WORD_UNDERSTANDS, (EC_GROUP_FEELINGS << 9) | 0x44 -; CONDITIONS +@ CONDITIONS .set EC_WORD_HOT, (EC_GROUP_CONDITIONS << 9) | 0x0 .set EC_WORD_EXISTS, (EC_GROUP_CONDITIONS << 9) | 0x1 .set EC_WORD_EXCESS, (EC_GROUP_CONDITIONS << 9) | 0x2 @@ -678,7 +678,7 @@ .set EC_WORD_SEEMS, (EC_GROUP_CONDITIONS << 9) | 0x43 .set EC_WORD_BADLY, (EC_GROUP_CONDITIONS << 9) | 0x44 -; ACTIONS +@ ACTIONS .set EC_WORD_MEETS, (EC_GROUP_ACTIONS << 9) | 0x0 .set EC_WORD_CONCEDE, (EC_GROUP_ACTIONS << 9) | 0x1 .set EC_WORD_GIVE, (EC_GROUP_ACTIONS << 9) | 0x2 @@ -758,7 +758,7 @@ .set EC_WORD_FAINT, (EC_GROUP_ACTIONS << 9) | 0x4c .set EC_WORD_FAINTED, (EC_GROUP_ACTIONS << 9) | 0x4d -; LIFESTYLE +@ LIFESTYLE .set EC_WORD_CHORES, (EC_GROUP_LIFESTYLE << 9) | 0x0 .set EC_WORD_HOME, (EC_GROUP_LIFESTYLE << 9) | 0x1 .set EC_WORD_MONEY, (EC_GROUP_LIFESTYLE << 9) | 0x2 @@ -805,7 +805,7 @@ .set EC_WORD_RENTAL, (EC_GROUP_LIFESTYLE << 9) | 0x2b .set EC_WORD_WORLD, (EC_GROUP_LIFESTYLE << 9) | 0x2c -; HOBBIES +@ HOBBIES .set EC_WORD_IDOL, (EC_GROUP_HOBBIES << 9) | 0x0 .set EC_WORD_ANIME, (EC_GROUP_HOBBIES << 9) | 0x1 .set EC_WORD_SONG, (EC_GROUP_HOBBIES << 9) | 0x2 @@ -861,7 +861,7 @@ .set EC_WORD_VACATION, (EC_GROUP_HOBBIES << 9) | 0x34 .set EC_WORD_LOOK, (EC_GROUP_HOBBIES << 9) | 0x35 -; TIME +@ TIME .set EC_WORD_FALL, (EC_GROUP_TIME << 9) | 0x0 .set EC_WORD_MORNING, (EC_GROUP_TIME << 9) | 0x1 .set EC_WORD_TOMORROW, (EC_GROUP_TIME << 9) | 0x2 @@ -908,7 +908,7 @@ .set EC_WORD_NIGHT, (EC_GROUP_TIME << 9) | 0x2b .set EC_WORD_WEEK, (EC_GROUP_TIME << 9) | 0x2c -; MISC +@ MISC .set EC_WORD_HIGHS, (EC_GROUP_MISC << 9) | 0x0 .set EC_WORD_LOWS, (EC_GROUP_MISC << 9) | 0x1 .set EC_WORD_UM, (EC_GROUP_MISC << 9) | 0x2 @@ -952,7 +952,7 @@ .set EC_WORD_LEFT, (EC_GROUP_MISC << 9) | 0x28 .set EC_WORD_RIGHT, (EC_GROUP_MISC << 9) | 0x29 -; ADJECTIVES +@ ADJECTIVES .set EC_WORD_WANDERING, (EC_GROUP_ADJECTIVES << 9) | 0x0 .set EC_WORD_RICKETY, (EC_GROUP_ADJECTIVES << 9) | 0x1 .set EC_WORD_ROCK_SOLID, (EC_GROUP_ADJECTIVES << 9) | 0x2 @@ -990,7 +990,7 @@ .set EC_WORD_HAPPILY, (EC_GROUP_ADJECTIVES << 9) | 0x22 .set EC_WORD_ANTICIPATION, (EC_GROUP_ADJECTIVES << 9) | 0x23 -; EVENTS +@ EVENTS .set EC_WORD_APPEAL, (EC_GROUP_EVENTS << 9) | 0x0 .set EC_WORD_EVENTS, (EC_GROUP_EVENTS << 9) | 0x1 .set EC_WORD_STAY_AT_HOME, (EC_GROUP_EVENTS << 9) | 0x2 @@ -1014,7 +1014,7 @@ .set EC_WORD_RANK, (EC_GROUP_EVENTS << 9) | 0x14 .set EC_WORD_RIBBON, (EC_GROUP_EVENTS << 9) | 0x15 -; TRENDY_SAYING +@ TRENDY_SAYING .set EC_WORD_KTHX_BYE, (EC_GROUP_TRENDY_SAYING << 9) | 0x0 .set EC_WORD_YES_SIR_EXCL, (EC_GROUP_TRENDY_SAYING << 9) | 0x1 .set EC_WORD_AVANT_GARDE, (EC_GROUP_TRENDY_SAYING << 9) | 0x2 diff --git a/constants/gba_constants.s b/constants/gba_constants.s index 2a128faa6..46dfdcc2f 100644 --- a/constants/gba_constants.s +++ b/constants/gba_constants.s @@ -32,9 +32,9 @@ .set INTR_FLAG_KEYPAD, 1 << 12 .set INTR_FLAG_GAMEPAK, 1 << 13 - .set REG_BASE, 0x4000000 ; I/O register base address + .set REG_BASE, 0x4000000 @ I/O register base address -; I/O register offsets +@ I/O register offsets .set OFFSET_REG_DISPCNT, 0x0 .set OFFSET_REG_DISPSTAT, 0x4 .set OFFSET_REG_VCOUNT, 0x6 @@ -201,7 +201,7 @@ .set OFFSET_REG_WAITCNT, 0x204 -; I/O register addresses +@ I/O register addresses .set REG_DISPCNT, REG_BASE + OFFSET_REG_DISPCNT .set REG_DISPSTAT, REG_BASE + OFFSET_REG_DISPSTAT .set REG_VCOUNT, REG_BASE + OFFSET_REG_VCOUNT @@ -368,7 +368,7 @@ .set REG_WAITCNT, REG_BASE + OFFSET_REG_WAITCNT -; OAM attribute constants +@ OAM attribute constants .set OAM_OBJ_NORMAL, 0x00000000 .set OAM_OBJ_BLEND, 0x00000400 diff --git a/constants/map_constants.s b/constants/map_constants.s index 963c3d22b..018bf67a0 100644 --- a/constants/map_constants.s +++ b/constants/map_constants.s @@ -1,463 +1,463 @@ .set cur_map_group, -1 new_map_group - map_group PETALBURG_CITY ; 0.0 - map_group SLATEPORT_CITY ; 0.1 - map_group MAUVILLE_CITY ; 0.2 - map_group RUSTBORO_CITY ; 0.3 - map_group FORTREE_CITY ; 0.4 - map_group LILYCOVE_CITY ; 0.5 - map_group MOSSDEEP_CITY ; 0.6 - map_group SOOTOPOLIS_CITY ; 0.7 - map_group EVER_GRANDE_CITY ; 0.8 - map_group LITTLEROOT_TOWN ; 0.9 - map_group OLDALE_TOWN ; 0.10 - map_group DEWFORD_TOWN ; 0.11 - map_group LAVARIDGE_TOWN ; 0.12 - map_group FALLARBOR_TOWN ; 0.13 - map_group VERDANTURF_TOWN ; 0.14 - map_group PACIFIDLOG_TOWN ; 0.15 - map_group ROUTE_101 ; 0.16 - map_group ROUTE_102 ; 0.17 - map_group ROUTE_103 ; 0.18 - map_group ROUTE_104 ; 0.19 - map_group ROUTE_105 ; 0.20 - map_group ROUTE_106 ; 0.21 - map_group ROUTE_107 ; 0.22 - map_group ROUTE_108 ; 0.23 - map_group ROUTE_109 ; 0.24 - map_group ROUTE_110 ; 0.25 - map_group ROUTE_111 ; 0.26 - map_group ROUTE_112 ; 0.27 - map_group ROUTE_113 ; 0.28 - map_group ROUTE_114 ; 0.29 - map_group ROUTE_115 ; 0.30 - map_group ROUTE_116 ; 0.31 - map_group ROUTE_117 ; 0.32 - map_group ROUTE_118 ; 0.33 - map_group ROUTE_119 ; 0.34 - map_group ROUTE_120 ; 0.35 - map_group ROUTE_121 ; 0.36 - map_group ROUTE_122 ; 0.37 - map_group ROUTE_123 ; 0.38 - map_group ROUTE_124 ; 0.39 - map_group ROUTE_125 ; 0.40 - map_group ROUTE_126 ; 0.41 - map_group ROUTE_127 ; 0.42 - map_group ROUTE_128 ; 0.43 - map_group ROUTE_129 ; 0.44 - map_group ROUTE_130 ; 0.45 - map_group ROUTE_131 ; 0.46 - map_group ROUTE_132 ; 0.47 - map_group ROUTE_133 ; 0.48 - map_group ROUTE_134 ; 0.49 - map_group UNDERWATER_1 ; 0.50 - map_group UNDERWATER_2 ; 0.51 - map_group UNDERWATER_3 ; 0.52 - map_group UNDERWATER_4 ; 0.53 - - new_map_group - map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_1F ; 1.0 - map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_2F ; 1.1 - map_group LITTLEROOT_TOWN_MAYS_HOUSE_1F ; 1.2 - map_group LITTLEROOT_TOWN_MAYS_HOUSE_2F ; 1.3 - map_group LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB ; 1.4 - - new_map_group - map_group OLDALE_TOWN_HOUSE_1 ; 2.0 - map_group OLDALE_TOWN_HOUSE_2 ; 2.1 - map_group OLDALE_TOWN_POKEMON_CENTER_1F ; 2.2 - map_group OLDALE_TOWN_POKEMON_CENTER_2F ; 2.3 - map_group OLDALE_TOWN_MART ; 2.4 - - new_map_group - map_group DEWFORD_TOWN_HOUSE_1 ; 3.0 - map_group DEWFORD_TOWN_POKEMON_CENTER_1F ; 3.1 - map_group DEWFORD_TOWN_POKEMON_CENTER_2F ; 3.2 - map_group DEWFORD_TOWN_GYM ; 3.3 - map_group DEWFORD_TOWN_HALL ; 3.4 - map_group DEWFORD_TOWN_HOUSE_2 ; 3.5 - - new_map_group - map_group LAVARIDGE_TOWN_HERB_SHOP ; 4.0 - map_group LAVARIDGE_TOWN_GYM_1F ; 4.1 - map_group LAVARIDGE_TOWN_GYM_B1F ; 4.2 - map_group LAVARIDGE_TOWN_HOUSE ; 4.3 - map_group LAVARIDGE_TOWN_MART ; 4.4 - map_group LAVARIDGE_TOWN_POKEMON_CENTER_1F ; 4.5 - map_group LAVARIDGE_TOWN_POKEMON_CENTER_2F ; 4.6 - - new_map_group - map_group FALLARBOR_TOWN_MART ; 5.0 - map_group FALLARBOR_TOWN_CONTEST_LOBBY ; 5.1 - map_group FALLARBOR_TOWN_CONTEST_HALL ; 5.2 - map_group FALLARBOR_TOWN_POKEMON_CENTER_1F ; 5.3 - map_group FALLARBOR_TOWN_POKEMON_CENTER_2F ; 5.4 - map_group FALLARBOR_TOWN_HOUSE_1 ; 5.5 - map_group FALLARBOR_TOWN_HOUSE_2 ; 5.6 - - new_map_group - map_group VERDANTURF_TOWN_CONTEST_LOBBY ; 6.0 - map_group VERDANTURF_TOWN_CONTEST_HALL ; 6.1 - map_group VERDANTURF_TOWN_MART ; 6.2 - map_group VERDANTURF_TOWN_POKEMON_CENTER_1F ; 6.3 - map_group VERDANTURF_TOWN_POKEMON_CENTER_2F ; 6.4 - map_group VERDANTURF_TOWN_WANDAS_HOUSE ; 6.5 - map_group VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE ; 6.6 - map_group VERDANTURF_TOWN_HOUSE ; 6.7 - - new_map_group - map_group PACIFIDLOG_TOWN_POKEMON_CENTER_1F ; 7.0 - map_group PACIFIDLOG_TOWN_POKEMON_CENTER_2F ; 7.1 - map_group PACIFIDLOG_TOWN_HOUSE_1 ; 7.2 - map_group PACIFIDLOG_TOWN_HOUSE_2 ; 7.3 - map_group PACIFIDLOG_TOWN_HOUSE_3 ; 7.4 - map_group PACIFIDLOG_TOWN_HOUSE_4 ; 7.5 - map_group PACIFIDLOG_TOWN_HOUSE_5 ; 7.6 - - new_map_group - map_group PETALBURG_CITY_WALLYS_HOUSE ; 8.0 - map_group PETALBURG_CITY_GYM ; 8.1 - map_group PETALBURG_CITY_HOUSE_1 ; 8.2 - map_group PETALBURG_CITY_HOUSE_2 ; 8.3 - map_group PETALBURG_CITY_POKEMON_CENTER_1F ; 8.4 - map_group PETALBURG_CITY_POKEMON_CENTER_2F ; 8.5 - map_group PETALBURG_CITY_MART ; 8.6 - - new_map_group - map_group SLATEPORT_CITY_STERNS_SHIPYARD_1F ; 9.0 - map_group SLATEPORT_CITY_STERNS_SHIPYARD_2F ; 9.1 - map_group SLATEPORT_CITY_CONTEST_LOBBY ; 9.2 - map_group SLATEPORT_CITY_CONTEST_HALL ; 9.3 - map_group SLATEPORT_CITY_HOUSE_1 ; 9.4 - map_group SLATEPORT_CITY_POKEMON_FAN_CLUB ; 9.5 - map_group SLATEPORT_CITY_OCEANIC_MUSEUM_1F ; 9.6 - map_group SLATEPORT_CITY_OCEANIC_MUSEUM_2F ; 9.7 - map_group SLATEPORT_CITY_HARBOR ; 9.8 - map_group SLATEPORT_CITY_HOUSE_2 ; 9.9 - map_group SLATEPORT_CITY_POKEMON_CENTER_1F ; 9.10 - map_group SLATEPORT_CITY_POKEMON_CENTER_2F ; 9.11 - map_group SLATEPORT_CITY_MART ; 9.12 - - new_map_group - map_group MAUVILLE_CITY_GYM ; 10.0 - map_group MAUVILLE_CITY_BIKE_SHOP ; 10.1 - map_group MAUVILLE_CITY_HOUSE_1 ; 10.2 - map_group MAUVILLE_CITY_GAME_CORNER ; 10.3 - map_group MAUVILLE_CITY_HOUSE_2 ; 10.4 - map_group MAUVILLE_CITY_POKEMON_CENTER_1F ; 10.5 - map_group MAUVILLE_CITY_POKEMON_CENTER_2F ; 10.6 - map_group MAUVILLE_CITY_MART ; 10.7 - - new_map_group - map_group RUSTBORO_CITY_DEVON_CORP_1F ; 11.0 - map_group RUSTBORO_CITY_DEVON_CORP_2F ; 11.1 - map_group RUSTBORO_CITY_DEVON_CORP_3F ; 11.2 - map_group RUSTBORO_CITY_GYM ; 11.3 - map_group RUSTBORO_CITY_POKEMON_SCHOOL ; 11.4 - map_group RUSTBORO_CITY_POKEMON_CENTER_1F ; 11.5 - map_group RUSTBORO_CITY_POKEMON_CENTER_2F ; 11.6 - map_group RUSTBORO_CITY_MART ; 11.7 - map_group RUSTBORO_CITY_FLAT_1_1F ; 11.8 - map_group RUSTBORO_CITY_FLAT_1_2F ; 11.9 - map_group RUSTBORO_CITY_HOUSE_1 ; 11.10 - map_group RUSTBORO_CITY_CUTTERS_HOUSE ; 11.11 - map_group RUSTBORO_CITY_HOUSE_2 ; 11.12 - map_group RUSTBORO_CITY_FLAT_2_1F ; 11.13 - map_group RUSTBORO_CITY_FLAT_2_2F ; 11.14 - map_group RUSTBORO_CITY_FLAT_2_3F ; 11.15 - map_group RUSTBORO_CITY_HOUSE_3 ; 11.16 - - new_map_group - map_group FORTREE_CITY_HOUSE_1 ; 12.0 - map_group FORTREE_CITY_GYM ; 12.1 - map_group FORTREE_CITY_POKEMON_CENTER_1F ; 12.2 - map_group FORTREE_CITY_POKEMON_CENTER_2F ; 12.3 - map_group FORTREE_CITY_MART ; 12.4 - map_group FORTREE_CITY_HOUSE_2 ; 12.5 - map_group FORTREE_CITY_HOUSE_3 ; 12.6 - map_group FORTREE_CITY_HOUSE_4 ; 12.7 - map_group FORTREE_CITY_HOUSE_5 ; 12.8 - map_group FORTREE_CITY_DECORATION_SHOP ; 12.9 - - new_map_group - map_group LILYCOVE_CITY_COVE_LILY_MOTEL_1F ; 13.0 - map_group LILYCOVE_CITY_COVE_LILY_MOTEL_2F ; 13.1 - map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_1F ; 13.2 - map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_2F ; 13.3 - map_group LILYCOVE_CITY_CONTEST_LOBBY ; 13.4 - map_group LILYCOVE_CITY_CONTEST_HALL ; 13.5 - map_group LILYCOVE_CITY_POKEMON_CENTER_1F ; 13.6 - map_group LILYCOVE_CITY_POKEMON_CENTER_2F ; 13.7 - map_group LILYCOVE_CITY_UNUSED_MART ; 13.8 - map_group LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB ; 13.9 - map_group LILYCOVE_CITY_HARBOR ; 13.10 - map_group LILYCOVE_CITY_EMPTY_MAP ; 13.11 - map_group LILYCOVE_CITY_MOVE_DELETERS_HOUSE ; 13.12 - map_group LILYCOVE_CITY_HOUSE_1 ; 13.13 - map_group LILYCOVE_CITY_HOUSE_2 ; 13.14 - map_group LILYCOVE_CITY_HOUSE_3 ; 13.15 - map_group LILYCOVE_CITY_HOUSE_4 ; 13.16 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_1F ; 13.17 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_2F ; 13.18 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_3F ; 13.19 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_4F ; 13.20 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_5F ; 13.21 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP ; 13.22 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR ; 13.23 - - new_map_group - map_group MOSSDEEP_CITY_GYM ; 14.0 - map_group MOSSDEEP_CITY_HOUSE_1 ; 14.1 - map_group MOSSDEEP_CITY_HOUSE_2 ; 14.2 - map_group MOSSDEEP_CITY_POKEMON_CENTER_1F ; 14.3 - map_group MOSSDEEP_CITY_POKEMON_CENTER_2F ; 14.4 - map_group MOSSDEEP_CITY_MART ; 14.5 - map_group MOSSDEEP_CITY_HOUSE_3 ; 14.6 - map_group MOSSDEEP_CITY_STEVENS_HOUSE ; 14.7 - map_group MOSSDEEP_CITY_HOUSE_4 ; 14.8 - map_group MOSSDEEP_CITY_SPACE_CENTER_1F ; 14.9 - map_group MOSSDEEP_CITY_SPACE_CENTER_2F ; 14.10 - map_group MOSSDEEP_CITY_GAME_CORNER_1F ; 14.11 - map_group MOSSDEEP_CITY_GAME_CORNER_B1F ; 14.12 - - new_map_group - map_group SOOTOPOLIS_CITY_GYM_1F ; 15.0 - map_group SOOTOPOLIS_CITY_GYM_B1F ; 15.1 - map_group SOOTOPOLIS_CITY_POKEMON_CENTER_1F ; 15.2 - map_group SOOTOPOLIS_CITY_POKEMON_CENTER_2F ; 15.3 - map_group SOOTOPOLIS_CITY_MART ; 15.4 - map_group SOOTOPOLIS_CITY_HOUSE_1 ; 15.5 - map_group SOOTOPOLIS_CITY_HOUSE_2 ; 15.6 - map_group SOOTOPOLIS_CITY_HOUSE_3 ; 15.7 - map_group SOOTOPOLIS_CITY_HOUSE_4 ; 15.8 - map_group SOOTOPOLIS_CITY_HOUSE_5 ; 15.9 - map_group SOOTOPOLIS_CITY_HOUSE_6 ; 15.10 - map_group SOOTOPOLIS_CITY_HOUSE_7 ; 15.11 - map_group SOOTOPOLIS_CITY_HOUSE_8 ; 15.12 - - new_map_group - map_group EVER_GRANDE_CITY_SIDNEYS_ROOM ; 16.0 - map_group EVER_GRANDE_CITY_PHOEBES_ROOM ; 16.1 - map_group EVER_GRANDE_CITY_GLACIAS_ROOM ; 16.2 - map_group EVER_GRANDE_CITY_DRAKES_ROOM ; 16.3 - map_group EVER_GRANDE_CITY_CHAMPIONS_ROOM ; 16.4 - map_group EVER_GRANDE_CITY_CORRIDOR_1 ; 16.5 - map_group EVER_GRANDE_CITY_CORRIDOR_2 ; 16.6 - map_group EVER_GRANDE_CITY_CORRIDOR_3 ; 16.7 - map_group EVER_GRANDE_CITY_CORRIDOR_4 ; 16.8 - map_group EVER_GRANDE_CITY_CORRIDOR_5 ; 16.9 - map_group EVER_GRANDE_CITY_POKEMON_LEAGUE ; 16.10 - map_group EVER_GRANDE_CITY_HALL_OF_FAME ; 16.11 - map_group EVER_GRANDE_CITY_POKEMON_CENTER_1F ; 16.12 - map_group EVER_GRANDE_CITY_POKEMON_CENTER_2F ; 16.13 - - new_map_group - map_group ROUTE_104_MR_BRINEYS_HOUSE ; 17.0 - map_group ROUTE_104_PRETTY_PETAL_FLOWER_SHOP ; 17.1 - - new_map_group - map_group ROUTE_111_WINSTRATE_FAMILYS_HOUSE ; 18.0 - map_group ROUTE_111_OLD_LADYS_REST_STOP ; 18.1 - - new_map_group - map_group ROUTE_112_CABLE_CAR_STATION ; 19.0 - map_group MT_CHIMNEY_CABLE_CAR_STATION ; 19.1 - - new_map_group - map_group ROUTE_114_FOSSIL_MANIACS_HOUSE ; 20.0 - map_group ROUTE_114_FOSSIL_MANIACS_TUNNEL ; 20.1 - map_group ROUTE_114_LANETTES_HOUSE ; 20.2 - - new_map_group - map_group ROUTE_116_TUNNELERS_REST_HOUSE ; 21.0 - - new_map_group - map_group ROUTE_117_POKEMON_DAY_CARE ; 22.0 - - new_map_group - map_group ROUTE_121_SAFARI_ZONE_ENTRANCE ; 23.0 - - new_map_group - map_group METEOR_FALLS_1F_1R ; 24.0 - map_group METEOR_FALLS_1F_2R ; 24.1 - map_group METEOR_FALLS_B1F_1R ; 24.2 - map_group METEOR_FALLS_B1F_2R ; 24.3 - map_group RUSTURF_TUNNEL ; 24.4 - map_group UNDERWATER_SOOTOPOLIS_CITY ; 24.5 - map_group DESERT_RUINS ; 24.6 - map_group GRANITE_CAVE_1F ; 24.7 - map_group GRANITE_CAVE_B1F ; 24.8 - map_group GRANITE_CAVE_B2F ; 24.9 - map_group GRANITE_CAVE_STEVENS_ROOM ; 24.10 - map_group PETALBURG_WOODS ; 24.11 - map_group MT_CHIMNEY ; 24.12 - map_group JAGGED_PASS ; 24.13 - map_group FIERY_PATH ; 24.14 - map_group MT_PYRE_1F ; 24.15 - map_group MT_PYRE_2F ; 24.16 - map_group MT_PYRE_3F ; 24.17 - map_group MT_PYRE_4F ; 24.18 - map_group MT_PYRE_5F ; 24.19 - map_group MT_PYRE_6F ; 24.20 - map_group MT_PYRE_EXTERIOR ; 24.21 - map_group MT_PYRE_SUMMIT ; 24.22 - map_group AQUA_HIDEOUT_1F ; 24.23 - map_group AQUA_HIDEOUT_B1F ; 24.24 - map_group AQUA_HIDEOUT_B2F ; 24.25 - map_group UNDERWATER_SEAFLOOR_CAVERN ; 24.26 - map_group SEAFLOOR_CAVERN_ENTRANCE ; 24.27 - map_group SEAFLOOR_CAVERN_ROOM_1 ; 24.28 - map_group SEAFLOOR_CAVERN_ROOM_2 ; 24.29 - map_group SEAFLOOR_CAVERN_ROOM_3 ; 24.30 - map_group SEAFLOOR_CAVERN_ROOM_4 ; 24.31 - map_group SEAFLOOR_CAVERN_ROOM_5 ; 24.32 - map_group SEAFLOOR_CAVERN_ROOM_6 ; 24.33 - map_group SEAFLOOR_CAVERN_ROOM_7 ; 24.34 - map_group SEAFLOOR_CAVERN_ROOM_8 ; 24.35 - map_group SEAFLOOR_CAVERN_ROOM_9 ; 24.36 - map_group CAVE_OF_ORIGIN_ENTRANCE ; 24.37 - map_group CAVE_OF_ORIGIN_1F ; 24.38 - map_group CAVE_OF_ORIGIN_B1F ; 24.39 - map_group CAVE_OF_ORIGIN_B2F ; 24.40 - map_group CAVE_OF_ORIGIN_B3F ; 24.41 - map_group CAVE_OF_ORIGIN_B4F ; 24.42 - map_group VICTORY_ROAD_1F ; 24.43 - map_group VICTORY_ROAD_B1F ; 24.44 - map_group VICTORY_ROAD_B2F ; 24.45 - map_group SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM ; 24.46 - map_group SHOAL_CAVE_LOW_TIDE_INNER_ROOM ; 24.47 - map_group SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM ; 24.48 - map_group SHOAL_CAVE_LOW_TIDE_LOWER_ROOM ; 24.49 - map_group SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM ; 24.50 - map_group SHOAL_CAVE_HIGH_TIDE_INNER_ROOM ; 24.51 - map_group NEW_MAUVILLE_ENTRANCE ; 24.52 - map_group NEW_MAUVILLE_INSIDE ; 24.53 - map_group ABANDONED_SHIP_DECK ; 24.54 - map_group ABANDONED_SHIP_CORRIDORS_1F ; 24.55 - map_group ABANDONED_SHIP_ROOMS_1F ; 24.56 - map_group ABANDONED_SHIP_CORRIDORS_B1F ; 24.57 - map_group ABANDONED_SHIP_ROOMS_B1F ; 24.58 - map_group ABANDONED_SHIP_ROOMS_2_B1F ; 24.59 - map_group ABANDONED_SHIP_UNDERWATER_1 ; 24.60 - map_group ABANDONED_SHIP_ROOM_B1F ; 24.61 - map_group ABANDONED_SHIP_ROOMS_2_1F ; 24.62 - map_group ABANDONED_SHIP_CAPTAINS_OFFICE ; 24.63 - map_group ABANDONED_SHIP_UNDERWATER_2 ; 24.64 - map_group ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS ; 24.65 - map_group ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS ; 24.66 - map_group ISLAND_CAVE ; 24.67 - map_group ANCIENT_TOMB ; 24.68 - map_group UNDERWATER_ROUTE_134 ; 24.69 - map_group UNDERWATER_SEALED_CHAMBER ; 24.70 - map_group SEALED_CHAMBER_OUTER_ROOM ; 24.71 - map_group SEALED_CHAMBER_INNER_ROOM ; 24.72 - map_group SCORCHED_SLAB ; 24.73 - map_group MAGMA_HIDEOUT_1F ; 24.74 - map_group MAGMA_HIDEOUT_B1F ; 24.75 - map_group MAGMA_HIDEOUT_B2F ; 24.76 - map_group SKY_PILLAR_ENTRANCE ; 24.77 - map_group SKY_PILLAR_OUTSIDE ; 24.78 - map_group SKY_PILLAR_1F ; 24.79 - map_group SKY_PILLAR_2F ; 24.80 - map_group SKY_PILLAR_3F ; 24.81 - map_group SKY_PILLAR_4F ; 24.82 - map_group SHOAL_CAVE_LOW_TIDE_ICE_ROOM ; 24.83 - map_group SKY_PILLAR_5F ; 24.84 - map_group SKY_PILLAR_TOP ; 24.85 - - new_map_group - map_group SECRET_BASE_RED_CAVE_1 ; 25.0 - map_group SECRET_BASE_BROWN_CAVE_1 ; 25.1 - map_group SECRET_BASE_BLUE_CAVE_1 ; 25.2 - map_group SECRET_BASE_YELLOW_CAVE_1 ; 25.3 - map_group SECRET_BASE_TREE_1 ; 25.4 - map_group SECRET_BASE_SHRUB_1 ; 25.5 - map_group SECRET_BASE_RED_CAVE_2 ; 25.6 - map_group SECRET_BASE_BROWN_CAVE_2 ; 25.7 - map_group SECRET_BASE_BLUE_CAVE_2 ; 25.8 - map_group SECRET_BASE_YELLOW_CAVE_2 ; 25.9 - map_group SECRET_BASE_TREE_2 ; 25.10 - map_group SECRET_BASE_SHRUB_2 ; 25.11 - map_group SECRET_BASE_RED_CAVE_3 ; 25.12 - map_group SECRET_BASE_BROWN_CAVE_3 ; 25.13 - map_group SECRET_BASE_BLUE_CAVE_3 ; 25.14 - map_group SECRET_BASE_YELLOW_CAVE_3 ; 25.15 - map_group SECRET_BASE_TREE_3 ; 25.16 - map_group SECRET_BASE_SHRUB_3 ; 25.17 - map_group SECRET_BASE_RED_CAVE_4 ; 25.18 - map_group SECRET_BASE_BROWN_CAVE_4 ; 25.19 - map_group SECRET_BASE_BLUE_CAVE_4 ; 25.20 - map_group SECRET_BASE_YELLOW_CAVE_4 ; 25.21 - map_group SECRET_BASE_TREE_4 ; 25.22 - map_group SECRET_BASE_SHRUB_4 ; 25.23 - map_group SINGLE_BATTLE_COLOSSEUM ; 25.24 - map_group TRADE_CENTER ; 25.25 - map_group RECORD_CORNER ; 25.26 - map_group DOUBLE_BATTLE_COLOSSEUM ; 25.27 - map_group LINK_CONTEST_ROOM_1 ; 25.28 - map_group UNKNOWN_MAP_25_29 ; 25.29 - map_group UNKNOWN_MAP_25_30 ; 25.30 - map_group UNKNOWN_MAP_25_31 ; 25.31 - map_group UNKNOWN_MAP_25_32 ; 25.32 - map_group UNKNOWN_MAP_25_33 ; 25.33 - map_group UNKNOWN_MAP_25_34 ; 25.34 - map_group LINK_CONTEST_ROOM_2 ; 25.35 - map_group LINK_CONTEST_ROOM_3 ; 25.36 - map_group LINK_CONTEST_ROOM_4 ; 25.37 - map_group LINK_CONTEST_ROOM_5 ; 25.38 - map_group LINK_CONTEST_ROOM_6 ; 25.39 - map_group INSIDE_OF_TRUCK ; 25.40 - map_group SS_TIDAL_CORRIDOR ; 25.41 - map_group SS_TIDAL_LOWER_DECK ; 25.42 - map_group SS_TIDAL_ROOMS ; 25.43 - - new_map_group - map_group SAFARI_ZONE_NORTHWEST ; 26.0 - map_group SAFARI_ZONE_NORTHEAST ; 26.1 - map_group SAFARI_ZONE_SOUTHWEST ; 26.2 - map_group SAFARI_ZONE_SOUTHEAST ; 26.3 - map_group BATTLE_TOWER_OUTSIDE ; 26.4 - map_group BATTLE_TOWER_LOBBY ; 26.5 - map_group BATTLE_TOWER_ELEVATOR ; 26.6 - map_group BATTLE_TOWER_CORRIDOR ; 26.7 - map_group BATTLE_TOWER_BATTLE_ROOM ; 26.8 - map_group SOUTHERN_ISLAND_EXTERIOR ; 26.9 - map_group SOUTHERN_ISLAND_INTERIOR ; 26.10 - map_group SAFARI_ZONE_REST_HOUSE ; 26.11 - - new_map_group - map_group ROUTE_104_PROTOTYPE ; 27.0 - map_group ROUTE_104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP ; 27.1 - - new_map_group - map_group ROUTE_109_SEASHORE_HOUSE ; 28.0 - - new_map_group - map_group ROUTE_110_TRICK_HOUSE_ENTRANCE ; 29.0 - map_group ROUTE_110_TRICK_HOUSE_END ; 29.1 - map_group ROUTE_110_TRICK_HOUSE_CORRIDOR ; 29.2 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_1 ; 29.3 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_2 ; 29.4 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_3 ; 29.5 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_4 ; 29.6 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_5 ; 29.7 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_6 ; 29.8 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_7 ; 29.9 - map_group ROUTE_110_TRICK_HOUSE_PUZZLE_8 ; 29.10 - map_group ROUTE_110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE ; 29.11 - map_group ROUTE_110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE ; 29.12 - - new_map_group - map_group ROUTE_113_GLASS_WORKSHOP ; 30.0 - - new_map_group - map_group ROUTE_123_BERRY_MASTERS_HOUSE ; 31.0 - - new_map_group - map_group ROUTE_119_WEATHER_INSTITUTE_1F ; 32.0 - map_group ROUTE_119_WEATHER_INSTITUTE_2F ; 32.1 - map_group ROUTE_119_HOUSE ; 32.2 - - new_map_group - map_group ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE ; 33.0 + map_group PETALBURG_CITY @ 0.0 + map_group SLATEPORT_CITY @ 0.1 + map_group MAUVILLE_CITY @ 0.2 + map_group RUSTBORO_CITY @ 0.3 + map_group FORTREE_CITY @ 0.4 + map_group LILYCOVE_CITY @ 0.5 + map_group MOSSDEEP_CITY @ 0.6 + map_group SOOTOPOLIS_CITY @ 0.7 + map_group EVER_GRANDE_CITY @ 0.8 + map_group LITTLEROOT_TOWN @ 0.9 + map_group OLDALE_TOWN @ 0.10 + map_group DEWFORD_TOWN @ 0.11 + map_group LAVARIDGE_TOWN @ 0.12 + map_group FALLARBOR_TOWN @ 0.13 + map_group VERDANTURF_TOWN @ 0.14 + map_group PACIFIDLOG_TOWN @ 0.15 + map_group ROUTE_101 @ 0.16 + map_group ROUTE_102 @ 0.17 + map_group ROUTE_103 @ 0.18 + map_group ROUTE_104 @ 0.19 + map_group ROUTE_105 @ 0.20 + map_group ROUTE_106 @ 0.21 + map_group ROUTE_107 @ 0.22 + map_group ROUTE_108 @ 0.23 + map_group ROUTE_109 @ 0.24 + map_group ROUTE_110 @ 0.25 + map_group ROUTE_111 @ 0.26 + map_group ROUTE_112 @ 0.27 + map_group ROUTE_113 @ 0.28 + map_group ROUTE_114 @ 0.29 + map_group ROUTE_115 @ 0.30 + map_group ROUTE_116 @ 0.31 + map_group ROUTE_117 @ 0.32 + map_group ROUTE_118 @ 0.33 + map_group ROUTE_119 @ 0.34 + map_group ROUTE_120 @ 0.35 + map_group ROUTE_121 @ 0.36 + map_group ROUTE_122 @ 0.37 + map_group ROUTE_123 @ 0.38 + map_group ROUTE_124 @ 0.39 + map_group ROUTE_125 @ 0.40 + map_group ROUTE_126 @ 0.41 + map_group ROUTE_127 @ 0.42 + map_group ROUTE_128 @ 0.43 + map_group ROUTE_129 @ 0.44 + map_group ROUTE_130 @ 0.45 + map_group ROUTE_131 @ 0.46 + map_group ROUTE_132 @ 0.47 + map_group ROUTE_133 @ 0.48 + map_group ROUTE_134 @ 0.49 + map_group UNDERWATER_1 @ 0.50 + map_group UNDERWATER_2 @ 0.51 + map_group UNDERWATER_3 @ 0.52 + map_group UNDERWATER_4 @ 0.53 + + new_map_group + map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_1F @ 1.0 + map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_2F @ 1.1 + map_group LITTLEROOT_TOWN_MAYS_HOUSE_1F @ 1.2 + map_group LITTLEROOT_TOWN_MAYS_HOUSE_2F @ 1.3 + map_group LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB @ 1.4 + + new_map_group + map_group OLDALE_TOWN_HOUSE_1 @ 2.0 + map_group OLDALE_TOWN_HOUSE_2 @ 2.1 + map_group OLDALE_TOWN_POKEMON_CENTER_1F @ 2.2 + map_group OLDALE_TOWN_POKEMON_CENTER_2F @ 2.3 + map_group OLDALE_TOWN_MART @ 2.4 + + new_map_group + map_group DEWFORD_TOWN_HOUSE_1 @ 3.0 + map_group DEWFORD_TOWN_POKEMON_CENTER_1F @ 3.1 + map_group DEWFORD_TOWN_POKEMON_CENTER_2F @ 3.2 + map_group DEWFORD_TOWN_GYM @ 3.3 + map_group DEWFORD_TOWN_HALL @ 3.4 + map_group DEWFORD_TOWN_HOUSE_2 @ 3.5 + + new_map_group + map_group LAVARIDGE_TOWN_HERB_SHOP @ 4.0 + map_group LAVARIDGE_TOWN_GYM_1F @ 4.1 + map_group LAVARIDGE_TOWN_GYM_B1F @ 4.2 + map_group LAVARIDGE_TOWN_HOUSE @ 4.3 + map_group LAVARIDGE_TOWN_MART @ 4.4 + map_group LAVARIDGE_TOWN_POKEMON_CENTER_1F @ 4.5 + map_group LAVARIDGE_TOWN_POKEMON_CENTER_2F @ 4.6 + + new_map_group + map_group FALLARBOR_TOWN_MART @ 5.0 + map_group FALLARBOR_TOWN_CONTEST_LOBBY @ 5.1 + map_group FALLARBOR_TOWN_CONTEST_HALL @ 5.2 + map_group FALLARBOR_TOWN_POKEMON_CENTER_1F @ 5.3 + map_group FALLARBOR_TOWN_POKEMON_CENTER_2F @ 5.4 + map_group FALLARBOR_TOWN_HOUSE_1 @ 5.5 + map_group FALLARBOR_TOWN_HOUSE_2 @ 5.6 + + new_map_group + map_group VERDANTURF_TOWN_CONTEST_LOBBY @ 6.0 + map_group VERDANTURF_TOWN_CONTEST_HALL @ 6.1 + map_group VERDANTURF_TOWN_MART @ 6.2 + map_group VERDANTURF_TOWN_POKEMON_CENTER_1F @ 6.3 + map_group VERDANTURF_TOWN_POKEMON_CENTER_2F @ 6.4 + map_group VERDANTURF_TOWN_WANDAS_HOUSE @ 6.5 + map_group VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE @ 6.6 + map_group VERDANTURF_TOWN_HOUSE @ 6.7 + + new_map_group + map_group PACIFIDLOG_TOWN_POKEMON_CENTER_1F @ 7.0 + map_group PACIFIDLOG_TOWN_POKEMON_CENTER_2F @ 7.1 + map_group PACIFIDLOG_TOWN_HOUSE_1 @ 7.2 + map_group PACIFIDLOG_TOWN_HOUSE_2 @ 7.3 + map_group PACIFIDLOG_TOWN_HOUSE_3 @ 7.4 + map_group PACIFIDLOG_TOWN_HOUSE_4 @ 7.5 + map_group PACIFIDLOG_TOWN_HOUSE_5 @ 7.6 + + new_map_group + map_group PETALBURG_CITY_WALLYS_HOUSE @ 8.0 + map_group PETALBURG_CITY_GYM @ 8.1 + map_group PETALBURG_CITY_HOUSE_1 @ 8.2 + map_group PETALBURG_CITY_HOUSE_2 @ 8.3 + map_group PETALBURG_CITY_POKEMON_CENTER_1F @ 8.4 + map_group PETALBURG_CITY_POKEMON_CENTER_2F @ 8.5 + map_group PETALBURG_CITY_MART @ 8.6 + + new_map_group + map_group SLATEPORT_CITY_STERNS_SHIPYARD_1F @ 9.0 + map_group SLATEPORT_CITY_STERNS_SHIPYARD_2F @ 9.1 + map_group SLATEPORT_CITY_CONTEST_LOBBY @ 9.2 + map_group SLATEPORT_CITY_CONTEST_HALL @ 9.3 + map_group SLATEPORT_CITY_HOUSE_1 @ 9.4 + map_group SLATEPORT_CITY_POKEMON_FAN_CLUB @ 9.5 + map_group SLATEPORT_CITY_OCEANIC_MUSEUM_1F @ 9.6 + map_group SLATEPORT_CITY_OCEANIC_MUSEUM_2F @ 9.7 + map_group SLATEPORT_CITY_HARBOR @ 9.8 + map_group SLATEPORT_CITY_HOUSE_2 @ 9.9 + map_group SLATEPORT_CITY_POKEMON_CENTER_1F @ 9.10 + map_group SLATEPORT_CITY_POKEMON_CENTER_2F @ 9.11 + map_group SLATEPORT_CITY_MART @ 9.12 + + new_map_group + map_group MAUVILLE_CITY_GYM @ 10.0 + map_group MAUVILLE_CITY_BIKE_SHOP @ 10.1 + map_group MAUVILLE_CITY_HOUSE_1 @ 10.2 + map_group MAUVILLE_CITY_GAME_CORNER @ 10.3 + map_group MAUVILLE_CITY_HOUSE_2 @ 10.4 + map_group MAUVILLE_CITY_POKEMON_CENTER_1F @ 10.5 + map_group MAUVILLE_CITY_POKEMON_CENTER_2F @ 10.6 + map_group MAUVILLE_CITY_MART @ 10.7 + + new_map_group + map_group RUSTBORO_CITY_DEVON_CORP_1F @ 11.0 + map_group RUSTBORO_CITY_DEVON_CORP_2F @ 11.1 + map_group RUSTBORO_CITY_DEVON_CORP_3F @ 11.2 + map_group RUSTBORO_CITY_GYM @ 11.3 + map_group RUSTBORO_CITY_POKEMON_SCHOOL @ 11.4 + map_group RUSTBORO_CITY_POKEMON_CENTER_1F @ 11.5 + map_group RUSTBORO_CITY_POKEMON_CENTER_2F @ 11.6 + map_group RUSTBORO_CITY_MART @ 11.7 + map_group RUSTBORO_CITY_FLAT_1_1F @ 11.8 + map_group RUSTBORO_CITY_FLAT_1_2F @ 11.9 + map_group RUSTBORO_CITY_HOUSE_1 @ 11.10 + map_group RUSTBORO_CITY_CUTTERS_HOUSE @ 11.11 + map_group RUSTBORO_CITY_HOUSE_2 @ 11.12 + map_group RUSTBORO_CITY_FLAT_2_1F @ 11.13 + map_group RUSTBORO_CITY_FLAT_2_2F @ 11.14 + map_group RUSTBORO_CITY_FLAT_2_3F @ 11.15 + map_group RUSTBORO_CITY_HOUSE_3 @ 11.16 + + new_map_group + map_group FORTREE_CITY_HOUSE_1 @ 12.0 + map_group FORTREE_CITY_GYM @ 12.1 + map_group FORTREE_CITY_POKEMON_CENTER_1F @ 12.2 + map_group FORTREE_CITY_POKEMON_CENTER_2F @ 12.3 + map_group FORTREE_CITY_MART @ 12.4 + map_group FORTREE_CITY_HOUSE_2 @ 12.5 + map_group FORTREE_CITY_HOUSE_3 @ 12.6 + map_group FORTREE_CITY_HOUSE_4 @ 12.7 + map_group FORTREE_CITY_HOUSE_5 @ 12.8 + map_group FORTREE_CITY_DECORATION_SHOP @ 12.9 + + new_map_group + map_group LILYCOVE_CITY_COVE_LILY_MOTEL_1F @ 13.0 + map_group LILYCOVE_CITY_COVE_LILY_MOTEL_2F @ 13.1 + map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_1F @ 13.2 + map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_2F @ 13.3 + map_group LILYCOVE_CITY_CONTEST_LOBBY @ 13.4 + map_group LILYCOVE_CITY_CONTEST_HALL @ 13.5 + map_group LILYCOVE_CITY_POKEMON_CENTER_1F @ 13.6 + map_group LILYCOVE_CITY_POKEMON_CENTER_2F @ 13.7 + map_group LILYCOVE_CITY_UNUSED_MART @ 13.8 + map_group LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB @ 13.9 + map_group LILYCOVE_CITY_HARBOR @ 13.10 + map_group LILYCOVE_CITY_EMPTY_MAP @ 13.11 + map_group LILYCOVE_CITY_MOVE_DELETERS_HOUSE @ 13.12 + map_group LILYCOVE_CITY_HOUSE_1 @ 13.13 + map_group LILYCOVE_CITY_HOUSE_2 @ 13.14 + map_group LILYCOVE_CITY_HOUSE_3 @ 13.15 + map_group LILYCOVE_CITY_HOUSE_4 @ 13.16 + map_group LILYCOVE_CITY_DEPARTMENT_STORE_1F @ 13.17 + map_group LILYCOVE_CITY_DEPARTMENT_STORE_2F @ 13.18 + map_group LILYCOVE_CITY_DEPARTMENT_STORE_3F @ 13.19 + map_group LILYCOVE_CITY_DEPARTMENT_STORE_4F @ 13.20 + map_group LILYCOVE_CITY_DEPARTMENT_STORE_5F @ 13.21 + map_group LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP @ 13.22 + map_group LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR @ 13.23 + + new_map_group + map_group MOSSDEEP_CITY_GYM @ 14.0 + map_group MOSSDEEP_CITY_HOUSE_1 @ 14.1 + map_group MOSSDEEP_CITY_HOUSE_2 @ 14.2 + map_group MOSSDEEP_CITY_POKEMON_CENTER_1F @ 14.3 + map_group MOSSDEEP_CITY_POKEMON_CENTER_2F @ 14.4 + map_group MOSSDEEP_CITY_MART @ 14.5 + map_group MOSSDEEP_CITY_HOUSE_3 @ 14.6 + map_group MOSSDEEP_CITY_STEVENS_HOUSE @ 14.7 + map_group MOSSDEEP_CITY_HOUSE_4 @ 14.8 + map_group MOSSDEEP_CITY_SPACE_CENTER_1F @ 14.9 + map_group MOSSDEEP_CITY_SPACE_CENTER_2F @ 14.10 + map_group MOSSDEEP_CITY_GAME_CORNER_1F @ 14.11 + map_group MOSSDEEP_CITY_GAME_CORNER_B1F @ 14.12 + + new_map_group + map_group SOOTOPOLIS_CITY_GYM_1F @ 15.0 + map_group SOOTOPOLIS_CITY_GYM_B1F @ 15.1 + map_group SOOTOPOLIS_CITY_POKEMON_CENTER_1F @ 15.2 + map_group SOOTOPOLIS_CITY_POKEMON_CENTER_2F @ 15.3 + map_group SOOTOPOLIS_CITY_MART @ 15.4 + map_group SOOTOPOLIS_CITY_HOUSE_1 @ 15.5 + map_group SOOTOPOLIS_CITY_HOUSE_2 @ 15.6 + map_group SOOTOPOLIS_CITY_HOUSE_3 @ 15.7 + map_group SOOTOPOLIS_CITY_HOUSE_4 @ 15.8 + map_group SOOTOPOLIS_CITY_HOUSE_5 @ 15.9 + map_group SOOTOPOLIS_CITY_HOUSE_6 @ 15.10 + map_group SOOTOPOLIS_CITY_HOUSE_7 @ 15.11 + map_group SOOTOPOLIS_CITY_HOUSE_8 @ 15.12 + + new_map_group + map_group EVER_GRANDE_CITY_SIDNEYS_ROOM @ 16.0 + map_group EVER_GRANDE_CITY_PHOEBES_ROOM @ 16.1 + map_group EVER_GRANDE_CITY_GLACIAS_ROOM @ 16.2 + map_group EVER_GRANDE_CITY_DRAKES_ROOM @ 16.3 + map_group EVER_GRANDE_CITY_CHAMPIONS_ROOM @ 16.4 + map_group EVER_GRANDE_CITY_CORRIDOR_1 @ 16.5 + map_group EVER_GRANDE_CITY_CORRIDOR_2 @ 16.6 + map_group EVER_GRANDE_CITY_CORRIDOR_3 @ 16.7 + map_group EVER_GRANDE_CITY_CORRIDOR_4 @ 16.8 + map_group EVER_GRANDE_CITY_CORRIDOR_5 @ 16.9 + map_group EVER_GRANDE_CITY_POKEMON_LEAGUE @ 16.10 + map_group EVER_GRANDE_CITY_HALL_OF_FAME @ 16.11 + map_group EVER_GRANDE_CITY_POKEMON_CENTER_1F @ 16.12 + map_group EVER_GRANDE_CITY_POKEMON_CENTER_2F @ 16.13 + + new_map_group + map_group ROUTE_104_MR_BRINEYS_HOUSE @ 17.0 + map_group ROUTE_104_PRETTY_PETAL_FLOWER_SHOP @ 17.1 + + new_map_group + map_group ROUTE_111_WINSTRATE_FAMILYS_HOUSE @ 18.0 + map_group ROUTE_111_OLD_LADYS_REST_STOP @ 18.1 + + new_map_group + map_group ROUTE_112_CABLE_CAR_STATION @ 19.0 + map_group MT_CHIMNEY_CABLE_CAR_STATION @ 19.1 + + new_map_group + map_group ROUTE_114_FOSSIL_MANIACS_HOUSE @ 20.0 + map_group ROUTE_114_FOSSIL_MANIACS_TUNNEL @ 20.1 + map_group ROUTE_114_LANETTES_HOUSE @ 20.2 + + new_map_group + map_group ROUTE_116_TUNNELERS_REST_HOUSE @ 21.0 + + new_map_group + map_group ROUTE_117_POKEMON_DAY_CARE @ 22.0 + + new_map_group + map_group ROUTE_121_SAFARI_ZONE_ENTRANCE @ 23.0 + + new_map_group + map_group METEOR_FALLS_1F_1R @ 24.0 + map_group METEOR_FALLS_1F_2R @ 24.1 + map_group METEOR_FALLS_B1F_1R @ 24.2 + map_group METEOR_FALLS_B1F_2R @ 24.3 + map_group RUSTURF_TUNNEL @ 24.4 + map_group UNDERWATER_SOOTOPOLIS_CITY @ 24.5 + map_group DESERT_RUINS @ 24.6 + map_group GRANITE_CAVE_1F @ 24.7 + map_group GRANITE_CAVE_B1F @ 24.8 + map_group GRANITE_CAVE_B2F @ 24.9 + map_group GRANITE_CAVE_STEVENS_ROOM @ 24.10 + map_group PETALBURG_WOODS @ 24.11 + map_group MT_CHIMNEY @ 24.12 + map_group JAGGED_PASS @ 24.13 + map_group FIERY_PATH @ 24.14 + map_group MT_PYRE_1F @ 24.15 + map_group MT_PYRE_2F @ 24.16 + map_group MT_PYRE_3F @ 24.17 + map_group MT_PYRE_4F @ 24.18 + map_group MT_PYRE_5F @ 24.19 + map_group MT_PYRE_6F @ 24.20 + map_group MT_PYRE_EXTERIOR @ 24.21 + map_group MT_PYRE_SUMMIT @ 24.22 + map_group AQUA_HIDEOUT_1F @ 24.23 + map_group AQUA_HIDEOUT_B1F @ 24.24 + map_group AQUA_HIDEOUT_B2F @ 24.25 + map_group UNDERWATER_SEAFLOOR_CAVERN @ 24.26 + map_group SEAFLOOR_CAVERN_ENTRANCE @ 24.27 + map_group SEAFLOOR_CAVERN_ROOM_1 @ 24.28 + map_group SEAFLOOR_CAVERN_ROOM_2 @ 24.29 + map_group SEAFLOOR_CAVERN_ROOM_3 @ 24.30 + map_group SEAFLOOR_CAVERN_ROOM_4 @ 24.31 + map_group SEAFLOOR_CAVERN_ROOM_5 @ 24.32 + map_group SEAFLOOR_CAVERN_ROOM_6 @ 24.33 + map_group SEAFLOOR_CAVERN_ROOM_7 @ 24.34 + map_group SEAFLOOR_CAVERN_ROOM_8 @ 24.35 + map_group SEAFLOOR_CAVERN_ROOM_9 @ 24.36 + map_group CAVE_OF_ORIGIN_ENTRANCE @ 24.37 + map_group CAVE_OF_ORIGIN_1F @ 24.38 + map_group CAVE_OF_ORIGIN_B1F @ 24.39 + map_group CAVE_OF_ORIGIN_B2F @ 24.40 + map_group CAVE_OF_ORIGIN_B3F @ 24.41 + map_group CAVE_OF_ORIGIN_B4F @ 24.42 + map_group VICTORY_ROAD_1F @ 24.43 + map_group VICTORY_ROAD_B1F @ 24.44 + map_group VICTORY_ROAD_B2F @ 24.45 + map_group SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM @ 24.46 + map_group SHOAL_CAVE_LOW_TIDE_INNER_ROOM @ 24.47 + map_group SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM @ 24.48 + map_group SHOAL_CAVE_LOW_TIDE_LOWER_ROOM @ 24.49 + map_group SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM @ 24.50 + map_group SHOAL_CAVE_HIGH_TIDE_INNER_ROOM @ 24.51 + map_group NEW_MAUVILLE_ENTRANCE @ 24.52 + map_group NEW_MAUVILLE_INSIDE @ 24.53 + map_group ABANDONED_SHIP_DECK @ 24.54 + map_group ABANDONED_SHIP_CORRIDORS_1F @ 24.55 + map_group ABANDONED_SHIP_ROOMS_1F @ 24.56 + map_group ABANDONED_SHIP_CORRIDORS_B1F @ 24.57 + map_group ABANDONED_SHIP_ROOMS_B1F @ 24.58 + map_group ABANDONED_SHIP_ROOMS_2_B1F @ 24.59 + map_group ABANDONED_SHIP_UNDERWATER_1 @ 24.60 + map_group ABANDONED_SHIP_ROOM_B1F @ 24.61 + map_group ABANDONED_SHIP_ROOMS_2_1F @ 24.62 + map_group ABANDONED_SHIP_CAPTAINS_OFFICE @ 24.63 + map_group ABANDONED_SHIP_UNDERWATER_2 @ 24.64 + map_group ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @ 24.65 + map_group ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS @ 24.66 + map_group ISLAND_CAVE @ 24.67 + map_group ANCIENT_TOMB @ 24.68 + map_group UNDERWATER_ROUTE_134 @ 24.69 + map_group UNDERWATER_SEALED_CHAMBER @ 24.70 + map_group SEALED_CHAMBER_OUTER_ROOM @ 24.71 + map_group SEALED_CHAMBER_INNER_ROOM @ 24.72 + map_group SCORCHED_SLAB @ 24.73 + map_group MAGMA_HIDEOUT_1F @ 24.74 + map_group MAGMA_HIDEOUT_B1F @ 24.75 + map_group MAGMA_HIDEOUT_B2F @ 24.76 + map_group SKY_PILLAR_ENTRANCE @ 24.77 + map_group SKY_PILLAR_OUTSIDE @ 24.78 + map_group SKY_PILLAR_1F @ 24.79 + map_group SKY_PILLAR_2F @ 24.80 + map_group SKY_PILLAR_3F @ 24.81 + map_group SKY_PILLAR_4F @ 24.82 + map_group SHOAL_CAVE_LOW_TIDE_ICE_ROOM @ 24.83 + map_group SKY_PILLAR_5F @ 24.84 + map_group SKY_PILLAR_TOP @ 24.85 + + new_map_group + map_group SECRET_BASE_RED_CAVE_1 @ 25.0 + map_group SECRET_BASE_BROWN_CAVE_1 @ 25.1 + map_group SECRET_BASE_BLUE_CAVE_1 @ 25.2 + map_group SECRET_BASE_YELLOW_CAVE_1 @ 25.3 + map_group SECRET_BASE_TREE_1 @ 25.4 + map_group SECRET_BASE_SHRUB_1 @ 25.5 + map_group SECRET_BASE_RED_CAVE_2 @ 25.6 + map_group SECRET_BASE_BROWN_CAVE_2 @ 25.7 + map_group SECRET_BASE_BLUE_CAVE_2 @ 25.8 + map_group SECRET_BASE_YELLOW_CAVE_2 @ 25.9 + map_group SECRET_BASE_TREE_2 @ 25.10 + map_group SECRET_BASE_SHRUB_2 @ 25.11 + map_group SECRET_BASE_RED_CAVE_3 @ 25.12 + map_group SECRET_BASE_BROWN_CAVE_3 @ 25.13 + map_group SECRET_BASE_BLUE_CAVE_3 @ 25.14 + map_group SECRET_BASE_YELLOW_CAVE_3 @ 25.15 + map_group SECRET_BASE_TREE_3 @ 25.16 + map_group SECRET_BASE_SHRUB_3 @ 25.17 + map_group SECRET_BASE_RED_CAVE_4 @ 25.18 + map_group SECRET_BASE_BROWN_CAVE_4 @ 25.19 + map_group SECRET_BASE_BLUE_CAVE_4 @ 25.20 + map_group SECRET_BASE_YELLOW_CAVE_4 @ 25.21 + map_group SECRET_BASE_TREE_4 @ 25.22 + map_group SECRET_BASE_SHRUB_4 @ 25.23 + map_group SINGLE_BATTLE_COLOSSEUM @ 25.24 + map_group TRADE_CENTER @ 25.25 + map_group RECORD_CORNER @ 25.26 + map_group DOUBLE_BATTLE_COLOSSEUM @ 25.27 + map_group LINK_CONTEST_ROOM_1 @ 25.28 + map_group UNKNOWN_MAP_25_29 @ 25.29 + map_group UNKNOWN_MAP_25_30 @ 25.30 + map_group UNKNOWN_MAP_25_31 @ 25.31 + map_group UNKNOWN_MAP_25_32 @ 25.32 + map_group UNKNOWN_MAP_25_33 @ 25.33 + map_group UNKNOWN_MAP_25_34 @ 25.34 + map_group LINK_CONTEST_ROOM_2 @ 25.35 + map_group LINK_CONTEST_ROOM_3 @ 25.36 + map_group LINK_CONTEST_ROOM_4 @ 25.37 + map_group LINK_CONTEST_ROOM_5 @ 25.38 + map_group LINK_CONTEST_ROOM_6 @ 25.39 + map_group INSIDE_OF_TRUCK @ 25.40 + map_group SS_TIDAL_CORRIDOR @ 25.41 + map_group SS_TIDAL_LOWER_DECK @ 25.42 + map_group SS_TIDAL_ROOMS @ 25.43 + + new_map_group + map_group SAFARI_ZONE_NORTHWEST @ 26.0 + map_group SAFARI_ZONE_NORTHEAST @ 26.1 + map_group SAFARI_ZONE_SOUTHWEST @ 26.2 + map_group SAFARI_ZONE_SOUTHEAST @ 26.3 + map_group BATTLE_TOWER_OUTSIDE @ 26.4 + map_group BATTLE_TOWER_LOBBY @ 26.5 + map_group BATTLE_TOWER_ELEVATOR @ 26.6 + map_group BATTLE_TOWER_CORRIDOR @ 26.7 + map_group BATTLE_TOWER_BATTLE_ROOM @ 26.8 + map_group SOUTHERN_ISLAND_EXTERIOR @ 26.9 + map_group SOUTHERN_ISLAND_INTERIOR @ 26.10 + map_group SAFARI_ZONE_REST_HOUSE @ 26.11 + + new_map_group + map_group ROUTE_104_PROTOTYPE @ 27.0 + map_group ROUTE_104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP @ 27.1 + + new_map_group + map_group ROUTE_109_SEASHORE_HOUSE @ 28.0 + + new_map_group + map_group ROUTE_110_TRICK_HOUSE_ENTRANCE @ 29.0 + map_group ROUTE_110_TRICK_HOUSE_END @ 29.1 + map_group ROUTE_110_TRICK_HOUSE_CORRIDOR @ 29.2 + map_group ROUTE_110_TRICK_HOUSE_PUZZLE_1 @ 29.3 + map_group ROUTE_110_TRICK_HOUSE_PUZZLE_2 @ 29.4 + map_group ROUTE_110_TRICK_HOUSE_PUZZLE_3 @ 29.5 + map_group ROUTE_110_TRICK_HOUSE_PUZZLE_4 @ 29.6 + map_group ROUTE_110_TRICK_HOUSE_PUZZLE_5 @ 29.7 + map_group ROUTE_110_TRICK_HOUSE_PUZZLE_6 @ 29.8 + map_group ROUTE_110_TRICK_HOUSE_PUZZLE_7 @ 29.9 + map_group ROUTE_110_TRICK_HOUSE_PUZZLE_8 @ 29.10 + map_group ROUTE_110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE @ 29.11 + map_group ROUTE_110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE @ 29.12 + + new_map_group + map_group ROUTE_113_GLASS_WORKSHOP @ 30.0 + + new_map_group + map_group ROUTE_123_BERRY_MASTERS_HOUSE @ 31.0 + + new_map_group + map_group ROUTE_119_WEATHER_INSTITUTE_1F @ 32.0 + map_group ROUTE_119_WEATHER_INSTITUTE_2F @ 32.1 + map_group ROUTE_119_HOUSE @ 32.2 + + new_map_group + map_group ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE @ 33.0 diff --git a/constants/pokemon_data_constants.s b/constants/pokemon_data_constants.s index 565eae71e..cf5d4df41 100644 --- a/constants/pokemon_data_constants.s +++ b/constants/pokemon_data_constants.s @@ -61,18 +61,18 @@ .set F_SUMMARY_SCREEN_FLIP_SPRITE, 0x80 - .set EVO_FRIENDSHIP, 0x0001 ; Pokémon levels up with friendship ≥ 220 - .set EVO_FRIENDSHIP_DAY, 0x0002 ; Pokémon levels up during the day with friendship ≥ 220 - .set EVO_FRIENDSHIP_NIGHT, 0x0003 ; Pokémon levels up at night with friendship ≥ 220 - .set EVO_LEVEL, 0x0004 ; Pokémon reaches the specified level - .set EVO_TRADE, 0x0005 ; Pokémon is traded - .set EVO_TRADE_ITEM, 0x0006 ; Pokémon is traded while it's holding the specified item - .set EVO_ITEM, 0x0007 ; specified item is used on Pokémon - .set EVO_LEVEL_ATK_GT_DEF, 0x0008 ; Pokémon reaches the specified level with attack > defense - .set EVO_LEVEL_ATK_EQ_DEF, 0x0009 ; Pokémon reaches the specified level with attack = defense - .set EVO_LEVEL_ATK_LT_DEF, 0x000a ; Pokémon reaches the specified level with attack < defense - .set EVO_LEVEL_SILCOON, 0x000b ; Pokémon reaches the specified level with a Silcoon personality value - .set EVO_LEVEL_CASCOON, 0x000c ; Pokémon reaches the specified level with a Cascoon personality value - .set EVO_LEVEL_NINJASK, 0x000d ; Pokémon reaches the specified level (special value for Ninjask) - .set EVO_LEVEL_SHEDINJA, 0x000e ; Pokémon reaches the specified level (special value for Shedinja) - .set EVO_BEAUTY, 0x000f ; Pokémon levels up with beauty ≥ specified value + .set EVO_FRIENDSHIP, 0x0001 @ Pokémon levels up with friendship ≥ 220 + .set EVO_FRIENDSHIP_DAY, 0x0002 @ Pokémon levels up during the day with friendship ≥ 220 + .set EVO_FRIENDSHIP_NIGHT, 0x0003 @ Pokémon levels up at night with friendship ≥ 220 + .set EVO_LEVEL, 0x0004 @ Pokémon reaches the specified level + .set EVO_TRADE, 0x0005 @ Pokémon is traded + .set EVO_TRADE_ITEM, 0x0006 @ Pokémon is traded while it's holding the specified item + .set EVO_ITEM, 0x0007 @ specified item is used on Pokémon + .set EVO_LEVEL_ATK_GT_DEF, 0x0008 @ Pokémon reaches the specified level with attack > defense + .set EVO_LEVEL_ATK_EQ_DEF, 0x0009 @ Pokémon reaches the specified level with attack = defense + .set EVO_LEVEL_ATK_LT_DEF, 0x000a @ Pokémon reaches the specified level with attack < defense + .set EVO_LEVEL_SILCOON, 0x000b @ Pokémon reaches the specified level with a Silcoon personality value + .set EVO_LEVEL_CASCOON, 0x000c @ Pokémon reaches the specified level with a Cascoon personality value + .set EVO_LEVEL_NINJASK, 0x000d @ Pokémon reaches the specified level (special value for Ninjask) + .set EVO_LEVEL_SHEDINJA, 0x000e @ Pokémon reaches the specified level (special value for Shedinja) + .set EVO_BEAUTY, 0x000f @ Pokémon levels up with beauty ≥ specified value diff --git a/constants/trainer_constants.s b/constants/trainer_constants.s index 59e12db88..48ed3036e 100644 --- a/constants/trainer_constants.s +++ b/constants/trainer_constants.s @@ -219,25 +219,25 @@ .set TRAINER_CLASS_NAME_OLD_COUPLE, 56 .set TRAINER_CLASS_NAME_SIS_AND_BRO, 57 - .set TRAINER_ENCOUNTER_MUSIC_MALE, 0 ; standard male encounter music - .set TRAINER_ENCOUNTER_MUSIC_FEMALE, 1 ; standard female encounter music - .set TRAINER_ENCOUNTER_MUSIC_GIRL, 2 ; used for male Tubers and Young Couples too + .set TRAINER_ENCOUNTER_MUSIC_MALE, 0 @ standard male encounter music + .set TRAINER_ENCOUNTER_MUSIC_FEMALE, 1 @ standard female encounter music + .set TRAINER_ENCOUNTER_MUSIC_GIRL, 2 @ used for male Tubers and Young Couples too .set TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, 3 .set TRAINER_ENCOUNTER_MUSIC_INTENSE, 4 .set TRAINER_ENCOUNTER_MUSIC_COOL, 5 .set TRAINER_ENCOUNTER_MUSIC_AQUA, 6 .set TRAINER_ENCOUNTER_MUSIC_MAGMA, 7 .set TRAINER_ENCOUNTER_MUSIC_SWIMMER, 8 - .set TRAINER_ENCOUNTER_MUSIC_TWINS, 9 ; used for other trainer classes too + .set TRAINER_ENCOUNTER_MUSIC_TWINS, 9 @ used for other trainer classes too .set TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, 10 - .set TRAINER_ENCOUNTER_MUSIC_HIKER, 11 ; used for other trainer classes too + .set TRAINER_ENCOUNTER_MUSIC_HIKER, 11 @ used for other trainer classes too .set TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, 12 - .set TRAINER_ENCOUNTER_MUSIC_RICH, 13 ; Rich Boys and Gentlemen + .set TRAINER_ENCOUNTER_MUSIC_RICH, 13 @ Rich Boys and Gentlemen .set F_TRAINER_FEMALE, 1 << 7 -; All trainer parties specify the IV, level, and species for each Pokémon in the -; party. Some trainer parties also specify held items and custom moves for each -; Pokémon. +@ All trainer parties specify the IV, level, and species for each Pokémon in the +@ party. Some trainer parties also specify held items and custom moves for each +@ Pokémon. .set F_TRAINER_PARTY_CUSTOM_MOVESET, 1 << 0 .set F_TRAINER_PARTY_HELD_ITEM, 1 << 1 diff --git a/src/task.c b/src/task.c index f0f95c997..22d1ed37c 100644 --- a/src/task.c +++ b/src/task.c @@ -113,7 +113,7 @@ static void InsertTask(u8 newTaskId) mov r1, #255\n\ strb r1, [r0, #6]\n\ b .LInsertTask_done\n\ - .align 2\n\ + .align 2, 0\n\ .LInsertTask_gTasks1:\n\ .word gTasks\n\ .LInsertTask_foundActiveTask:\n\ @@ -149,7 +149,7 @@ static void InsertTask(u8 newTaskId) .LInsertTask_insertAtHead:\n\ strb r4, [r3, #5]\n\ b .LInsertTask_done\n\ - .align 2\n\ + .align 2, 0\n\ .LInsertTask_gTasks2:\n\ .word gTasks\n\ .LInsertTask_next:\n\ |