diff --git a/data/ereader_screen.s b/data/ereader_screen.s deleted file mode 100755 index 3d6572a49..000000000 --- a/data/ereader_screen.s +++ /dev/null @@ -1,7 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0862609C:: @ 862609C - .incbin "data/unknown_jp_62609C.bin" diff --git a/data/unknown_jp_62609C.bin b/data/unknown_jp_62609C.bin deleted file mode 100644 index 1394e7aa8..000000000 Binary files a/data/unknown_jp_62609C.bin and /dev/null differ diff --git a/include/trainer_hill.h b/include/trainer_hill.h index 3086b2f8d..81d9a5aff 100644 --- a/include/trainer_hill.h +++ b/include/trainer_hill.h @@ -42,6 +42,15 @@ struct TrHillTag struct TrHillFloor floors[4]; }; +struct TrHillTag_Half +{ + u8 unkField_0; + u8 unused1; + u8 unkField_2; + u32 checksum; + struct TrHillFloor floors[2]; +}; + struct TrHillStruct2 { u8 floorId; diff --git a/ld_script.txt b/ld_script.txt index 9c3f23a46..605d8f6be 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -663,7 +663,6 @@ SECTIONS { src/ereader_helpers.o(.rodata); src/faraway_island.o(.rodata); src/ereader_screen.o(.rodata); - data/ereader_screen.o(.rodata); src/trainer_hill.o(.rodata); src/rayquaza_scene.o(.rodata); src/walda_phrase.o(.rodata); diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h index 32cb0f4b1..a4bfd3fbf 100644 --- a/src/data/battle_frontier/trainer_hill.h +++ b/src/data/battle_frontier/trainer_hill.h @@ -1,5 +1,680 @@ #define TRAINER_HILL_OTID 0x10000000 +static const struct TrHillTag_Half gUnknown_0862609C = { + 4, + 1, + 2, + 0x0, + { + { + 0, + 0, + { + { + __("シゲノブ$$$$ "), + FACILITY_CLASS_YOUNGSTER, + 0x1, + { EC_WORD_TRAINER, EC_WORD_MRS, EC_WORD_EXCL, EC_WORD_THEY_WERE, EC_WORD_OPPONENT, EC_WORD_CAN }, + { EC_WORD_TRAINER, EC_WORD_MRS, EC_WORD_WEAK, EC_WORD_OF, EC_WORD_WERE, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS }, + { EC_WORD_TRAINER, EC_WORD_MRS, EC_WORD_STRONG, EC_WORD_HEY_QUES, EC_WORD_EXCL, EC_WORD_EXCL }, + { EC_WORD_FABULOUS, EC_WORD_CAN_T, EC_WORD_TRAINER, EC_WORD_MRS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_EXCITING }, + { + { + SPECIES_ZIGZAGOON, + ITEM_SITRUS_BERRY, + { MOVE_HEADBUTT, MOVE_PIN_MISSILE, MOVE_GROWL, MOVE_TAIL_WHIP }, + 0, + 0x0, + 110, + 100, + 100, + 100, + 0, + 100, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 0, + 0x80, + __("ジグザグマ$$$$$$"), + 255 + }, + { + SPECIES_SHROOMISH, + ITEM_PECHA_BERRY, + { MOVE_MEGA_DRAIN, MOVE_LEECH_SEED, MOVE_POISON_POWDER, MOVE_GROWTH }, + 0, + 0x0, + 120, + 0, + 120, + 0, + 150, + 120, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 0, + 0x0, + __("キノココ$$$$$$$"), + 255 + }, + { + SPECIES_SANDSHREW, + ITEM_QUICK_CLAW, + { MOVE_SCRATCH, MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SWIFT }, + 0, + 0x0, + 110, + 100, + 100, + 0, + 0, + 200, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 0, + 0x80, + __("サンド$$$$$$$$"), + 255 + }, + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + } + }, + { + __("アカリ$$$$$ "), + FACILITY_CLASS_PARASOL_LADY, + 0x1, + { EC_WORD_SHE, EC_WORD_EVERY, EC_WORD_TYPE, EC_WORD_ADORE, EC_WORD_FOR, EC_WORD_EXCL }, + { EC_WORD_SURPRISE, EC_WORD_THESE, EC_WORD_WONDER, EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, EC_WORD_EXCL }, + { EC_WORD_OH_QUES, EC_MOVE(EARTHQUAKE), EC_WORD_EXISTS, EC_WORD_OF, EC_WORD_WITHOUT, EC_WORD_EXCL }, + { EC_WORD_YOU_RE, EC_WORD_PROBABLY, EC_WORD_END, EC_WORD_UNTIL, EC_WORD_GOING, EC_WORD_ANYWHERE }, + { + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + { + SPECIES_WINGULL, + ITEM_CHERI_BERRY, + { MOVE_WATER_GUN, MOVE_WING_ATTACK, MOVE_GROWL, MOVE_SUPERSONIC }, + 0, + 0x0, + 110, + 100, + 100, + 0, + 100, + 100, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 0, + 0x0, + __("キャモメ$$$$$$$"), + 255 + }, + { + SPECIES_NUMEL, + ITEM_FOCUS_BAND, + { MOVE_EMBER, MOVE_DIG, MOVE_TACKLE, MOVE_FOCUS_ENERGY }, + 0, + 0x0, + 110, + 100, + 100, + 0, + 100, + 100, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 0, + 0x96, + __("ドンメル$$$$$$$"), + 255 + }, + { + SPECIES_SURSKIT, + ITEM_PERSIM_BERRY, + { MOVE_BUBBLE_BEAM, MOVE_MUD_SHOT, MOVE_QUICK_ATTACK, MOVE_AGILITY }, + 0, + 0x0, + 100, + 100, + 100, + 0, + 100, + 100, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 0, + 0x0, + __("アメタマ$$$$$$$"), + 255 + }, + } + }, + }, + { 0x31, 0x35, 0x35, 0x3b, 0x26, 0x26, 0x1b, 0x1c, 0x1d, 0x25, 0x39, 0x3a, 0x3b, 0x3b, 0x3b, 0x8, 0x31, 0x2b, 0x2b, 0x3b, 0x34, 0x34, 0x2b, 0x2b, 0x34, 0x33, 0x3f, 0x3f, 0x3f, 0x3f, 0x3b, 0x8, 0x31, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x34, 0x34, 0x3b, 0x33, 0x3f, 0x3f, 0x3f, 0x3b, 0x3b, 0x8, 0x31, 0x2b, 0x2b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x3b, 0x33, 0x3f, 0x3f, 0x3f, 0x3b, 0x3f, 0x8, 0x31, 0x2b, 0x34, 0x34, 0x34, 0x2b, 0x34, 0x34, 0x3b, 0x2c, 0x3f, 0x3f, 0x3f, 0x3b, 0x3b, 0x8, 0x31, 0x2b, 0x3b, 0x35, 0x3b, 0x2b, 0x3b, 0x35, 0x3b, 0x35, 0x3b, 0x3f, 0x3f, 0x3f, 0x3b, 0x8, 0x31, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x3f, 0x3f, 0x3f, 0x3b, 0x8, 0x31, 0x34, 0x3b, 0x2b, 0x3b, 0x34, 0x3b, 0x2b, 0x35, 0x2b, 0x3b, 0x3b, 0x3f, 0x3b, 0x3b, 0x8, 0x31, 0x3b, 0x3b, 0x34, 0x3b, 0x3b, 0x3b, 0x34, 0x34, 0x34, 0x3f, 0x3b, 0x3b, 0x3b, 0x3f, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 }, + { 0x381, 0x6fc1, 0x6341, 0x6041, 0x7f41, 0x4401, 0x5541, 0x5541, 0x11c1, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + { 0x28, 0x78 }, + 0x1, + 0x23 + }, + { + 0, + 0, + { + { + __("シゲゾウ$$$$ "), + FACILITY_CLASS_NINJA_BOY, + 0x1, + { EC_WORD_WIN, EC_WORD_UNTIL, EC_WORD_DAUGHTER, EC_MOVE(CONSTRICT), EC_WORD_OF, EC_WORD_WERE }, + { EC_MOVE(CONSTRICT), EC_WORD_UNTIL, EC_WORD_LESS, EC_WORD_NONE, EC_WORD_HEY_QUES, EC_WORD_EXCL }, + { EC_WORD_YET, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_URGH, EC_WORD_ALMOST, EC_WORD_POWER, EC_WORD_NONE }, + { EC_WORD_HUH_QUES, EC_WORD_TOMORROW, EC_WORD_SMELL, EC_WORD_ABSOLUTELY, EC_WORD_THOSE, EC_WORD_EXCL_EXCL }, + { + { + SPECIES_ELECTRIKE, + ITEM_CHERI_BERRY, + { MOVE_SPARK, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_ROAR }, + 0, + 0x0, + 120, + 120, + 0, + 120, + 150, + 0, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 1, + 0x0, + __("ラクライ$$$$$$$"), + 255 + }, + { + SPECIES_CORPHISH, + ITEM_QUICK_CLAW, + { MOVE_KNOCK_OFF, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_PROTECT }, + 0, + 0x0, + 100, + 110, + 100, + 0, + 100, + 100, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 1, + 0x96, + __("ヘイガニ$$$$$$$"), + 255 + }, + { + SPECIES_BALTOY, + ITEM_PERSIM_BERRY, + { MOVE_PSYBEAM, MOVE_ROCK_TOMB, MOVE_MUD_SLAP, MOVE_HARDEN }, + 0, + 0x0, + 100, + 100, + 100, + 0, + 110, + 100, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 0, + 0x96, + __("ヤジロン$$$$$$$"), + 255 + }, + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + } + }, + { + __("ナミコ$$$$$ "), + FACILITY_CLASS_BEAUTY, + 0x1, + { EC_WORD_SISTER, EC_WORD_ALTHOUGH, EC_WORD_KIND, EC_WORD_MATCH, EC_WORD_PLEASE, EC_WORD_WITHOUT }, + { EC_WORD_KIND, EC_WORD_ELLIPSIS, EC_WORD_INSTEAD, EC_WORD_DEEP, EC_WORD_WEAK, EC_WORD_QUES }, + { EC_WORD_AWFUL, EC_WORD_GWAH, EC_WORD_HOPELESS, EC_WORD_CAN_T_WIN, EC_WORD_IS, EC_WORD_NONE }, + { EC_WORD_AWW, 0xFFFF, 0xFFFF, EC_WORD_ALMOST, EC_WORD_GOOD, EC_WORD_ANYWHERE }, + { + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + { + SPECIES_NONE, + ITEM_NONE, + { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE }, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0x0, + __("$$$$$$$$$$$"), + 0 + }, + { + SPECIES_SPHEAL, + ITEM_FOCUS_BAND, + { MOVE_ICE_BALL, MOVE_BODY_SLAM, MOVE_WATER_GUN, MOVE_ENCORE }, + 0, + 0x0, + 100, + 100, + 100, + 0, + 110, + 100, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 0, + 0x80, + __("タマザラシ$$$$$$"), + 255 + }, + { + SPECIES_SPOINK, + ITEM_PERSIM_BERRY, + { MOVE_PSYWAVE, MOVE_FUTURE_SIGHT, MOVE_CONFUSE_RAY, MOVE_MAGIC_COAT }, + 0, + 0x0, + 100, + 0, + 100, + 100, + 110, + 100, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 1, + 0xf, + __("バネブー$$$$$$$"), + 255 + }, + { + SPECIES_POOCHYENA, + ITEM_PECHA_BERRY, + { MOVE_BITE, MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_SCARY_FACE }, + 0, + 0x0, + 70, + 80, + 80, + 80, + 80, + 80, + 0x10000000, + 5, + 5, + 5, + 5, + 5, + 5, + 0, + 0, + 0x96, + __("ポチエナ$$$$$$$"), + 255 + }, + } + }, + }, + { 0x31, 0x3b, 0x35, 0x3b, 0x39, 0x26, 0x1b, 0x1c, 0x1d, 0x25, 0x39, 0x3a, 0x3b, 0x35, 0x3b, 0x8, 0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x8, 0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3e, 0x3e, 0x3b, 0x2b, 0x3b, 0x8, 0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x8, 0x3f, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3e, 0x3e, 0x2b, 0x3b, 0x8, 0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2c, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x8, 0x31, 0x3f, 0x2b, 0x3b, 0x3b, 0x2c, 0x2c, 0x3b, 0x2c, 0x2c, 0x3e, 0x3e, 0x3b, 0x2b, 0x3b, 0x8, 0x31, 0x3b, 0x2b, 0x35, 0x35, 0x35, 0x35, 0x3b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x2b, 0x3b, 0x8, 0x3f, 0x3b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x3b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x3b, 0x8, 0x31, 0x3b, 0x3f, 0x3f, 0x3b, 0x35, 0x35, 0x3b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x8, 0x31, 0x3f, 0x3f, 0x3f, 0x3b, 0x2b, 0x2b, 0x35, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x8, 0x31, 0x3f, 0x3f, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x8, 0x31, 0x3b, 0x3b, 0x3b, 0x3f, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 }, + { 0x381, 0x27c5, 0x27c5, 0x27c5, 0x27c5, 0x27c5, 0x26c5, 0x2005, 0x3efd, 0x1, 0x6ff, 0x7ff, 0x7ff, 0xffff, 0xffff, 0xffff }, + { 0x67, 0xa7 }, + 0x1, + 0x33 + }, + } +}; + static const struct TrHillTag sDataTagNormal = { .unkField_0 = 8,