diff options
| -rw-r--r-- | data/berries.inc | 689 | ||||
| -rw-r--r-- | data/field_player_avatar.s | 82 | ||||
| -rw-r--r-- | src/field_player_avatar.c | 190 |
3 files changed, 183 insertions, 778 deletions
diff --git a/data/berries.inc b/data/berries.inc deleted file mode 100644 index f06c32a1a..000000000 --- a/data/berries.inc +++ /dev/null @@ -1,689 +0,0 @@ - .align 2 -gBerries:: @ 858A670 - .string "CHERI$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 20 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Cheri - .4byte gBerryDescriptionPart2_Cheri - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "CHESTO$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 80 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Chesto - .4byte gBerryDescriptionPart2_Chesto - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "PECHA$", 7 - .byte BERRY_FIRMNESS_VERY_SOFT - .2byte 40 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Pecha - .4byte gBerryDescriptionPart2_Pecha - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "RAWST$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 32 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Rawst - .4byte gBerryDescriptionPart2_Rawst - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "ASPEAR$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 50 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Aspear - .4byte gBerryDescriptionPart2_Aspear - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "LEPPA$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 28 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Leppa - .4byte gBerryDescriptionPart2_Leppa - .byte 4 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "ORAN$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 35 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Oran - .4byte gBerryDescriptionPart2_Oran - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "PERSIM$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 47 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Persim - .4byte gBerryDescriptionPart2_Persim - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "LUM$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 34 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Lum - .4byte gBerryDescriptionPart2_Lum - .byte 12 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "SITRUS$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 95 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Sitrus - .4byte gBerryDescriptionPart2_Sitrus - .byte 6 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "FIGY$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 100 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Figy - .4byte gBerryDescriptionPart2_Figy - .byte 6 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "WIKI$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 115 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Wiki - .4byte gBerryDescriptionPart2_Wiki - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "MAGO$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 126 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Mago - .4byte gBerryDescriptionPart2_Mago - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "AGUAV$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 64 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Aguav - .4byte gBerryDescriptionPart2_Aguav - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "IAPAPA$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 223 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Iapapa - .4byte gBerryDescriptionPart2_Iapapa - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "RAZZ$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 120 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Razz - .4byte gBerryDescriptionPart2_Razz - .byte 1 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "BLUK$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 108 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Bluk - .4byte gBerryDescriptionPart2_Bluk - .byte 1 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "NANAB$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 77 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Nanab - .4byte gBerryDescriptionPart2_Nanab - .byte 1 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "WEPEAR$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 74 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Wepear - .4byte gBerryDescriptionPart2_Wepear - .byte 1 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "PINAP$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 80 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Pinap - .4byte gBerryDescriptionPart2_Pinap - .byte 1 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "POMEG$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 135 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Pomeg - .4byte gBerryDescriptionPart2_Pomeg - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "KELPSY$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 150 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Kelpsy - .4byte gBerryDescriptionPart2_Kelpsy - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "QUALOT$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 110 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Qualot - .4byte gBerryDescriptionPart2_Qualot - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "HONDEW$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 162 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Hondew - .4byte gBerryDescriptionPart2_Hondew - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "GREPA$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 149 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Grepa - .4byte gBerryDescriptionPart2_Grepa - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "TAMATO$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 200 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Tamato - .4byte gBerryDescriptionPart2_Tamato - .byte 6 @ stage duration (in hours) - .byte 20 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "CORNN$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 75 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Cornn - .4byte gBerryDescriptionPart2_Cornn - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 20 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "MAGOST$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 140 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Magost - .4byte gBerryDescriptionPart2_Magost - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 20 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "RABUTA$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 226 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Rabuta - .4byte gBerryDescriptionPart2_Rabuta - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 20 @ bitter - .byte 10 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "NOMEL$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 285 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Nomel - .4byte gBerryDescriptionPart2_Nomel - .byte 6 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 20 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "SPELON$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 133 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Spelon - .4byte gBerryDescriptionPart2_Spelon - .byte 18 @ stage duration (in hours) - .byte 40 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "PAMTRE$", 7 - .byte BERRY_FIRMNESS_VERY_SOFT - .2byte 244 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Pamtre - .4byte gBerryDescriptionPart2_Pamtre - .byte 18 @ stage duration (in hours) - .byte 0 @ spicy - .byte 40 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "WATMEL$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 250 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Watmel - .4byte gBerryDescriptionPart2_Watmel - .byte 18 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 40 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "DURIN$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 280 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Durin - .4byte gBerryDescriptionPart2_Durin - .byte 18 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 40 @ bitter - .byte 10 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "BELUE$", 7 - .byte BERRY_FIRMNESS_VERY_SOFT - .2byte 300 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Belue - .4byte gBerryDescriptionPart2_Belue - .byte 18 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 40 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "LIECHI$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 111 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Liechi - .4byte gBerryDescriptionPart2_Liechi - .byte 24 @ stage duration (in hours) - .byte 40 @ spicy - .byte 0 @ dry - .byte 40 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "GANLON$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 33 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Ganlon - .4byte gBerryDescriptionPart2_Ganlon - .byte 24 @ stage duration (in hours) - .byte 0 @ spicy - .byte 40 @ dry - .byte 0 @ sweet - .byte 40 @ bitter - .byte 0 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "SALAC$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 95 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Salac - .4byte gBerryDescriptionPart2_Salac - .byte 24 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 40 @ sweet - .byte 0 @ bitter - .byte 40 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "PETAYA$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 237 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Petaya - .4byte gBerryDescriptionPart2_Petaya - .byte 24 @ stage duration (in hours) - .byte 40 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 40 @ bitter - .byte 0 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "APICOT$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 75 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Apicot - .4byte gBerryDescriptionPart2_Apicot - .byte 24 @ stage duration (in hours) - .byte 0 @ spicy - .byte 40 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 40 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "LANSAT$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 97 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Lansat - .4byte gBerryDescriptionPart2_Lansat - .byte 24 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "STARF$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 153 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Starf - .4byte gBerryDescriptionPart2_Starf - .byte 24 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "ENIGMA$", 7 - .byte BERRY_FIRMNESS_UNKNOWN - .2byte 0 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Enigma - .4byte gBerryDescriptionPart2_Enigma - .byte 24 @ stage duration (in hours) - .byte 40 @ spicy - .byte 40 @ dry - .byte 40 @ sweet - .byte 40 @ bitter - .byte 40 @ sour - .byte 40 @ smoothness - .byte 0 @ padding diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index cc3ff2447..fa36390df 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -6,88 +6,6 @@ .section .rodata .align 2, 0 -gUnknown_084974B8:: @ 84974B8 - .4byte PlayerAvatarTransition_Normal - .4byte PlayerAvatarTransition_MachBike - .4byte PlayerAvatarTransition_AcroBike - .4byte PlayerAvatarTransition_Surfing - .4byte PlayerAvatarTransition_Underwater - .4byte PlayerAvatarTransition_ReturnToField - .4byte PlayerAvatarTransition_Dummy - .4byte PlayerAvatarTransition_Dummy - -gUnknown_084974D8:: @ 84974D8 - .4byte MetatileBehavior_IsSouthArrowWarp - .4byte MetatileBehavior_IsNorthArrowWarp - .4byte MetatileBehavior_IsWestArrowWarp - .4byte MetatileBehavior_IsEastArrowWarp - -gUnknown_084974E8:: @ 84974E8 - .byte 0x64, 0x69, 0x65, 0x6a, 0x66, 0x6b, 0x67, 0x6c, 0x6f, 0x70, 0x68, 0x6d, 0x89, 0x8a, 0xbf, 0xc0 - -gUnknown_084974F8:: @ 84974F8 - .byte 0x00, 0x59, 0x01, 0x5a, 0x3f, 0x5b, 0x02, 0x5c, 0x6f, 0x70, 0x03, 0x5d, 0x89, 0x8a, 0xbf, 0xc0 - -gUnknown_08497508:: @ 8497508 - .byte 0xe6, 0xe7 - -gUnknown_0849750A:: @ 849750A - .byte 0xeb, 0xec - -gUnknown_0849750C:: @ 849750C - .byte 0x00, 0x01, 0x01, 0x02, 0x3f, 0x04, 0x02, 0x08, 0x6f, 0x10, 0x59, 0x01, 0x5a, 0x02, 0x5b, 0x04, 0x5c, 0x08, 0x70, 0x10 - -gUnknown_08497520:: @ 8497520 - .4byte MetatileBehavior_IsSouthArrowWarp - .4byte MetatileBehavior_IsNorthArrowWarp - .4byte MetatileBehavior_IsWestArrowWarp - .4byte MetatileBehavior_IsEastArrowWarp - -gUnknown_08497530:: @ 8497530 - .4byte sub_808C3A4 - .4byte do_boulder_dust - .4byte sub_808C484 - -gUnknown_0849753C:: @ 849753C - .4byte sub_808C544 - -gUnknown_08497540:: @ 8497540 - .4byte sub_808C61C - .4byte sub_808C644 - .4byte sub_808C6BC - .4byte sub_808C6FC - -gUnknown_08497550:: @ 8497550 - .byte 3, 4, 2, 1 - -gUnknown_08497554:: @ 8497554 - .byte 16, 16, 17, 18, 19 - - .align 2 -gUnknown_0849755C:: @ 849755C - .4byte fish0 - .4byte fish1 - .4byte fish2 - .4byte fish3 - .4byte fish4 - .4byte fish5 - .4byte fish6 - .4byte fish7 - .4byte fish8 - .4byte fish9 - .4byte fishA_wait_for_a_pressed - .4byte fishB - .4byte fishC - .4byte fishD - .4byte fishE - .4byte fishF - -gUnknown_0849759C:: @ 849759C - .2byte 1, 1, 1 - -gUnknown_084975A2:: @ 84975A2 - .2byte 1, 3, 6 - gUnknown_084975A8:: @ 84975A8 .string "·$" diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 6ab721643..d32aabb81 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1,17 +1,19 @@ #include "global.h" -#include "global.fieldmap.h" -#include "sprite.h" -#include "event_object_movement.h" #include "bike.h" -#include "metatile_behavior.h" -#include "metatile_behaviors.h" -#include "constants/flags.h" #include "event_data.h" +#include "event_object_movement.h" +#include "field_player_avatar.h" #include "fieldmap.h" +#include "global.fieldmap.h" +#include "metatile_behavior.h" +#include "metatile_behaviors.h" #include "overworld.h" #include "rotating_gate.h" +#include "sprite.h" +#include "task.h" +#include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" -#include "field_player_avatar.h" +#include "constants/flags.h" extern void task_add_bump_boulder(u8, u8); static bool8 ShouldJumpLedge(s16, s16, u8); @@ -42,6 +44,42 @@ static void PlayerNotOnBikeTurningInPlace(u8, u16); static void PlayerNotOnBikeMoving(u8, u16); extern void sub_808C750(u8); +extern void PlayerAvatarTransition_Normal(struct EventObject *a); +extern void PlayerAvatarTransition_MachBike(struct EventObject *a); +extern void PlayerAvatarTransition_AcroBike(struct EventObject *a); +extern void PlayerAvatarTransition_Surfing(struct EventObject *a); +extern void PlayerAvatarTransition_Underwater(struct EventObject *a); +extern void PlayerAvatarTransition_ReturnToField(struct EventObject *a); +extern void PlayerAvatarTransition_Dummy(struct EventObject *a); + +extern u8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); +extern u8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); +extern u8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); + +extern u8 sub_808C544(struct Task *task, struct EventObject *eventObject); + +extern u8 sub_808C61C(struct Task *task, struct EventObject *eventObject); +extern u8 sub_808C644(struct Task *task, struct EventObject *eventObject); +extern u8 sub_808C6BC(struct Task *task, struct EventObject *eventObject); +extern u8 sub_808C6FC(struct Task *task, struct EventObject *eventObject); + +extern u8 fish0(struct Task *task); +extern u8 fish1(struct Task *task); +extern u8 fish2(struct Task *task); +extern u8 fish3(struct Task *task); +extern u8 fish4(struct Task *task); +extern u8 fish5(struct Task *task); +extern u8 fish6(struct Task *task); +extern u8 fish7(struct Task *task); +extern u8 fish8(struct Task *task); +extern u8 fish9(struct Task *task); +extern u8 fishA_wait_for_a_pressed(struct Task *task); +extern u8 fishB(struct Task *task); +extern u8 fishC(struct Task *task); +extern u8 fishD(struct Task *task); +extern u8 fishE(struct Task *task); +extern u8 fishF(struct Task *task); + static bool8 (*const gUnknown_084973FC[])(u8) = { MetatileBehavior_IsTrickHouseSlipperyFloor, @@ -105,6 +143,144 @@ static bool8 (*const gUnknown_0849749C[])(u8) = static const u8 gUnknown_084974B0[] = {9, 10, 11, 12, 13, 0, 0, 0}; +void (*const gUnknown_084974B8[])(struct EventObject *) = +{ + PlayerAvatarTransition_Normal, + PlayerAvatarTransition_MachBike, + PlayerAvatarTransition_AcroBike, + PlayerAvatarTransition_Surfing, + PlayerAvatarTransition_Underwater, + PlayerAvatarTransition_ReturnToField, + PlayerAvatarTransition_Dummy, + PlayerAvatarTransition_Dummy, +}; + +bool8 (*const gUnknown_084974D8[])(u8) = +{ + MetatileBehavior_IsSouthArrowWarp, + MetatileBehavior_IsNorthArrowWarp, + MetatileBehavior_IsWestArrowWarp, + MetatileBehavior_IsEastArrowWarp, +}; + +const u8 gUnknown_084974E8[][2] = +{ + {EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL}, + {EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE}, + {EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE, EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE}, + {EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING, EVENT_OBJ_GFX_RIVAL_MAY_SURFING}, + {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, EVENT_OBJ_GFX_MAY_UNDERWATER}, + {EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE, EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE}, + {EVENT_OBJ_GFX_BRENDAN_FISHING, EVENT_OBJ_GFX_MAY_FISHING}, + {EVENT_OBJ_GFX_BRENDAN_WATERING, EVENT_OBJ_GFX_MAY_WATERING} +}; + +const u8 gUnknown_084974F8[][2] = +{ + {EVENT_OBJ_GFX_BRENDAN_NORMAL, EVENT_OBJ_GFX_MAY_NORMAL}, + {EVENT_OBJ_GFX_BRENDAN_MACH_BIKE, EVENT_OBJ_GFX_MAY_MACH_BIKE}, + {EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE, EVENT_OBJ_GFX_MAY_ACRO_BIKE}, + {EVENT_OBJ_GFX_BRENDAN_SURFING, EVENT_OBJ_GFX_MAY_SURFING}, + {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, EVENT_OBJ_GFX_MAY_UNDERWATER}, + {EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE, EVENT_OBJ_GFX_MAY_FIELD_MOVE}, + {EVENT_OBJ_GFX_BRENDAN_FISHING, EVENT_OBJ_GFX_MAY_FISHING}, + {EVENT_OBJ_GFX_BRENDAN_WATERING, EVENT_OBJ_GFX_MAY_WATERING}, +}; + +const u8 gUnknown_08497508[] = {EVENT_OBJ_GFX_RED, EVENT_OBJ_GFX_LEAF}; + +const u8 gUnknown_0849750A[] = {EVENT_OBJ_GFX_LINK_RS_BRENDAN, EVENT_OBJ_GFX_LINK_RS_MAY}; + +const u8 gUnknown_0849750C[2][5][2] = +{ + //male + { + {EVENT_OBJ_GFX_BRENDAN_NORMAL, 1}, + {EVENT_OBJ_GFX_BRENDAN_MACH_BIKE, 2}, + {EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE, 4}, + {EVENT_OBJ_GFX_BRENDAN_SURFING, 8}, + {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, 16}, + }, + //female + { + {EVENT_OBJ_GFX_MAY_NORMAL, 1}, + {EVENT_OBJ_GFX_MAY_MACH_BIKE, 2}, + {EVENT_OBJ_GFX_MAY_ACRO_BIKE, 4}, + {EVENT_OBJ_GFX_MAY_SURFING, 8}, + {EVENT_OBJ_GFX_MAY_UNDERWATER, 16}, + } +}; + +bool8 (*const gUnknown_08497520[])(u8) = //Duplicate of sArrowWarpMetatileBehaviorChecks +{ + MetatileBehavior_IsSouthArrowWarp, + MetatileBehavior_IsNorthArrowWarp, + MetatileBehavior_IsWestArrowWarp, + MetatileBehavior_IsEastArrowWarp, +}; + +u8 (*const gUnknown_08497530[])(struct Task *, struct EventObject *, struct EventObject *) = +{ + sub_808C3A4, + do_boulder_dust, + sub_808C484, +}; + +u8 (*const gUnknown_0849753C[])(struct Task *, struct EventObject *) = +{ + sub_808C544, +}; + +u8 (*const gUnknown_08497540[])(struct Task *, struct EventObject *) = +{ + sub_808C61C, + sub_808C644, + sub_808C6BC, + sub_808C6FC, +}; + +const u8 gUnknown_08497550[] = {3, 4, 2, 1}; + +const u8 gUnknown_08497554[] = {16, 16, 17, 18, 19}; + +u8 (*const gUnknown_0849755C[])(struct Task *) = +{ + fish0, + fish1, + fish2, + fish3, + fish4, + fish5, + fish6, + fish7, + fish8, + fish9, + fishA_wait_for_a_pressed, + fishB, + fishC, + fishD, + fishE, + fishF, +}; + +const u16 gUnknown_0849759C[] = {1, 1, 1}; + +const u16 gUnknown_084975A2[] = {1, 3, 6}; +/* +const u8 gUnknown_084975A8[] = _("·$"); + +const u16 gUnknown_084975AA[] = {36, 33, 30}; + +const u16 gUnknown_084975B0[] = +{ + 0, 0, + 0x28, 10, + 0x46, 30, +}; + +const u8 gUnknown_084975BC[] = {0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00}; +*/ +// .text void MovementType_Player(struct Sprite *sprite) { UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_NoMovement2); |