ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean up aligns

Browse Source
This commit is contained in:
YamaArashi 2016-09-03 14:31:43 -07:00
parent 5af8ba570c
commit f5879e72d9
108 changed files with 7867 additions and 15733 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1248
data/anim_mon_front_pics.s
View File

File diff suppressed because it is too large Load Diff

3
data/base_stats.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gBaseStats:: @ 83203CC
@ ??????????
.fill 28, 1, 0

3
data/battle_frontier/battle_arena_move_mind_ratings.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gBattleArenaMoveMindRatings:: @ 8611DC0
.byte 0 @ -
.byte 1 @ Pound

9
data/battle_frontier/battle_factory_style_move_lists.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gBattleFactoryStyleRequiredMoveCounts:: @ 8611FC0
.byte 3
.byte 3
@ -9,8 +8,7 @@ gBattleFactoryStyleRequiredMoveCounts:: @ 8611FC0
.byte 2
.byte 2
.align 2, 0
.align 2
gBattleFactoryStyleMoveList_TotalPreparation:: @ 8611FC8
.2byte MOVE_SWORDS_DANCE
.2byte MOVE_GROWTH
@ -182,8 +180,7 @@ gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow:: @ 86120F6
.2byte MOVE_WEATHER_BALL
.2byte 0
.align 2, 0
.align 2
gBattleFactoryStyleMoveListPointers:: @ 8612104
.4byte gBattleFactoryStyleMoveList_TotalPreparation
.4byte gBattleFactoryStyleMoveList_SlowAndSteady

3
data/battle_frontier/battle_frontier_held_items.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gBattleFrontierHeldItems:: @ 85CECB0
.2byte ITEM_NONE
.2byte ITEM_KINGS_ROCK

3
data/battle_frontier/battle_frontier_mons.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gBattleFrontierMons:: @ 85D97BC
@ 0
.2byte SPECIES_SUNKERN

3
data/battle_frontier/battle_frontier_trainer_mons.s
View File

@ -1,5 +1,4 @@
.align 1, 0
.align 1
gBattleFrontierTrainerMons_Brady:: @ 85CED2E
.2byte 0
.2byte 1

3
data/battle_frontier/battle_frontier_trainers.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gBattleFrontierTrainers:: @ 85D5ACC
@ 0
.4byte TRAINER_CLASS_YOUNGSTER

6
data/battle_frontier/battle_pyramid_level_50_wild_mons.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gBattlePyramidLevel50WildMons_Round1:: @ 86126B0
@ 0
.2byte SPECIES_PLUSLE
@ -980,8 +979,7 @@ gBattlePyramidLevel50WildMons_Round20:: @ 8612DD0
.byte 2 @ unknown
.2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM
.align 2, 0
.align 2
gBattlePyramidLevel50WildMonPointers:: @ 8612E30
.4byte gBattlePyramidLevel50WildMons_Round1
.4byte gBattlePyramidLevel50WildMons_Round2

6
data/battle_frontier/battle_pyramid_open_level_wild_mons.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gBattlePyramidOpenLevelWildMons_Round1:: @ 8612E80
@ 0
.2byte SPECIES_PLUSLE
@ -980,8 +979,7 @@ gBattlePyramidOpenLevelWildMons_Round20:: @ 86135A0
.byte 2 @ unknown
.2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM
.align 2, 0
.align 2
gBattlePyramidOpenLevelWildMonPointers:: @ 8613600
.4byte gBattlePyramidOpenLevelWildMons_Round1
.4byte gBattlePyramidOpenLevelWildMons_Round2

3
data/battle_frontier/fallarbor_battle_tent_mons.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gFallarborBattleTentMons:: @ 85DF69C
@ 0
.2byte SPECIES_NUMEL

3
data/battle_frontier/fallarbor_battle_tent_trainer_mons.s
View File

@ -1,5 +1,4 @@
.align 1, 0
.align 1
gFallarborBattleTentTrainerMons_Amber:: @ 85DEEF8
.2byte 39
.2byte 40

3
data/battle_frontier/fallarbor_battle_tent_trainers.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gFallarborBattleTentTrainers:: @ 85DF084
@ 0
.4byte TRAINER_CLASS_AROMA_LADY

3
data/battle_frontier/slateport_battle_tent_mons.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gSlateportBattleTentMons:: @ 85DE02C
@ 0
.2byte SPECIES_ZIGZAGOON

3
data/battle_frontier/slateport_battle_tent_trainer_mons.s
View File

@ -1,5 +1,4 @@
.align 1, 0
.align 1
gSlateportBattleTentTrainerMons_Jolie:: @ 85DD70C
.2byte 9
.2byte 10

3
data/battle_frontier/slateport_battle_tent_trainers.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gSlateportBattleTentTrainers:: @ 85DDA14
@ 0
.4byte TRAINER_CLASS_AROMA_LADY

3
data/battle_frontier/verdanturf_battle_tent_mons.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gVerdanturfBattleTentMons:: @ 85DEC28
@ 0
.2byte SPECIES_POOCHYENA

3
data/battle_frontier/verdanturf_battle_tent_trainer_mons.s
View File

@ -1,5 +1,4 @@
.align 1, 0
.align 1
gVerdanturfBattleTentTrainerMons_Brenna:: @ 85DE48C
.2byte 4
.2byte 11

3
data/battle_frontier/verdanturf_battle_tent_trainers.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gVerdanturfBattleTentTrainers:: @ 85DE610
@ 0
.4byte TRAINER_CLASS_AROMA_LADY

3
data/battle_moves.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gBattleMoves:: @ 831C898
@ -
.byte 0x00 @ effect

3
data/berries.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gBerries:: @ 858A670
.string "CHERI$", 7
.byte BERRY_FIRMNESS_SOFT

3
data/contest_effect_function_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gContestEffectFunctionTable:: @ 858CECC
.4byte ContestEffectFunc_080E547C
.4byte ContestEffectFunc_080E5480

3
data/contest_effects.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gContestEffects:: @ 858CDCC
@ 0x00
.byte 0 @ effect type

3
data/contest_moves.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gContestMoves:: @ 858C2B4
@ -
.byte 0x00 @ effect ID

141
data/data2.s
View File

@ -11,13 +11,11 @@ gUnknown_82E9530:: @ 82E9530
gUnknown_82E9531:: @ 82E9531
.byte 2
.align 2, 0
.align 2
@ compile time
.asciz "2005 02 21 11:10"
.align 2, 0
.align 2
gRomInterruptTable:: @ 82E9548
.4byte VCountIntr
.4byte SerialIntr
@ -126,8 +124,7 @@ gMenuCursorDimensions:: @ 82EA608
.byte 8, 8
.byte 0, 0
.align 2, 0
.align 2
gFont9JapaneseGlyphs:: @ 82EA61C
.incbin "data/graphics/fonts/font9.hwjpnfont"
@ -147,23 +144,19 @@ gDefaultOamAttributes:: @ 82EC690
.2byte 304 @ X
.2byte 3 << 10 @ priority
.align 2, 0
.align 2
gDummyObjectImageAnim:: @ 82EC698
obj_image_anim_end
.align 2, 0
.align 2
gDummyObjectImageAnimTable:: @ 82EC69C
.4byte gDummyObjectImageAnim
.align 2, 0
.align 2
gDummyObjectRotScalAnim:: @ 82EC6A0
obj_rot_scal_anim_end
.align 2, 0
.align 2
gDummyObjectRotScalAnimTable:: @ 82EC6A8
.4byte gDummyObjectRotScalAnim
@ -203,8 +196,7 @@ gUnknown_82EC7CC:: @ 82EC7CC
@ 82EC7D4
.include "data/string_util.s"
.align 2, 0
.align 2
gUnknown_082EC86C:: @ 82EC86C
.incbin "base_emerald.gba", 0x2ec86c, 0x20
@ -1488,8 +1480,7 @@ gUnknown_0831ACE8:: @ 831ACE8
@ 831AE38
.include "data/text/type_names.s"
.align 2, 0
.align 2
gUnknown_0831AEB8:: @ 831AEB8
.incbin "base_emerald.gba", 0x31aeb8, 0xe0
@ -1750,8 +1741,7 @@ gUnknown_0832A3D8:: @ 832A3D8
@ 832ADD8
.include "data/egg_moves.s"
.align 2, 0
.align 2
gUnknown_0832B6C0:: @ 832B6C0
.incbin "base_emerald.gba", 0x32b6c0, 0x20
@ -3197,16 +3187,14 @@ gUnknown_0853EF60:: @ 853EF60
gTitleScreenRayquazaTiles:: @ 853F058
.incbin "graphics/title_screen/rayquaza.4bpp.lz"
.align 2, 0
.align 2
gUnknown_0853F83C:: @ 853F83C
.incbin "base_emerald.gba", 0x53f83c, 0x450
gTitleScreenCloudsTiles:: @ 853FC8C
.incbin "graphics/title_screen/clouds.4bpp.lz"
.align 2, 0
.align 2
gUnknown_0853FF70:: @ 853FF70
.incbin "base_emerald.gba", 0x53ff70, 0xa8
@ -3422,31 +3410,26 @@ gUnknown_08553A78:: @ 8553A78
gUnknown_08553A7C:: @ 8553A7C
.incbin "base_emerald.gba", 0x553a7c, 0x14
.align 2, 0
.align 2
gNewGameBirchPic:: @ 8553A90
.incbin "graphics/birch_speech/birch.4bpp"
.incbin "base_emerald.gba", 0x554290, 0x66c0
.align 2, 0
.align 2
gNewGameBirchPalette:: @ 855A950
.incbin "graphics/birch_speech/birch.gbapal"
.align 2, 0
.align 2
.incbin "base_emerald.gba", 0x55a970, 0x20
.align 2, 0
.align 2
gFieldEffectObjectPalette4:: @ 855A990
.incbin "graphics/map_objects/palettes/field_effect_object_palette_04.gbapal"
.incbin "base_emerald.gba", 0x55a9b0, 0x480
.align 2, 0
.align 2
gFieldEffectObjectPalette5:: @ 855AE30
.incbin "graphics/map_objects/palettes/field_effect_object_palette_05.gbapal"
@ -3477,40 +3460,33 @@ gUnknown_0855B630:: @ 855B630
gUnknown_0855C1F0:: @ 855C1F0
.incbin "base_emerald.gba", 0x55c1f0, 0x20
.align 2, 0
.align 2
@ TODO: something else uses these too
gNewGameBirchOamAttributes:: @ 855C210
.4byte OAM_SIZE_64x64
.2byte 0
.align 2, 0
.align 2
.incbin "base_emerald.gba", 0x55c218, 0x10
.align 2, 0
.align 2
gNewGameBirchPicTable:: @ 855C228
obj_tiles gNewGameBirchPic, 0x800
.align 2, 0
.align 2
gNewGameBirchObjectPaletteInfo:: @ 855C230
obj_pal gNewGameBirchPalette, 0x1006
.align 2, 0
.align 2
gNewGameBirchImageAnim:: @ 855C238
obj_image_anim_frame 0, 1
obj_image_anim_end
.align 2, 0
.align 2
gNewGameBirchImageAnimTable:: @ 855C240
.4byte gNewGameBirchImageAnim
.align 2, 0
.align 2
gNewGameBirchObjectTemplate:: @ 855C244
.2byte 0xFFFF @ tiles tag
.2byte 0x1006 @ palette tag
@ -3520,13 +3496,11 @@ gNewGameBirchObjectTemplate:: @ 855C244
.4byte gDummyObjectRotScalAnimTable
.4byte DummyObjectCallback
.align 2, 0
.align 2
gFieldEffectObjectPaletteInfo4:: @ 855C25C
obj_pal gFieldEffectObjectPalette4, 0x1007
.align 2, 0
.align 2
gFieldEffectObjectPaletteInfo5:: @ 855C264
obj_pal gFieldEffectObjectPalette5, 0x1010
@ -4135,8 +4109,7 @@ gUnknown_0857C608:: @ 857C608
gUnknown_0857C60A:: @ 857C60A
.incbin "base_emerald.gba", 0x57c60a, 0x5a
.align 2, 0
.align 2
gFieldEffectObjectPaletteInfo6:: @ 857C664
obj_pal gFieldEffectObjectPalette6, 0x1000
@ -4577,8 +4550,7 @@ gComboStarterLookupTable:: @ 858CE8C
.byte 1
.endr
.align 2, 0
.align 2
@ 858CECC
.include "data/contest_effect_function_table.s"
@ -4789,15 +4761,13 @@ gUnknown_0858D8F0:: @ 858D8F0
gUnknown_0858D970:: @ 858D970
.incbin "base_emerald.gba", 0x58d970, 0x2a8
.align 2, 0
.align 2
gFieldEffectObjectPalette7:: @ 858DC18
.incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal"
.incbin "base_emerald.gba", 0x58dc38, 0x580
.align 2, 0
.align 2
gFieldEffectObjectPalette8:: @ 858E1B8
.incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal"
@ -4812,13 +4782,11 @@ gUnknown_0858E618:: @ 858E618
gUnknown_0858E630:: @ 858E630
.incbin "base_emerald.gba", 0x58e630, 0x18
.align 2, 0
.align 2
gFieldEffectObjectPaletteInfo7:: @ 858E648
obj_pal gFieldEffectObjectPalette7, 0x1003
.align 2, 0
.align 2
gFieldEffectObjectPaletteInfo8:: @ 858E650
obj_pal gFieldEffectObjectPalette8, 0x1008
@ -4827,8 +4795,7 @@ gFieldEffectObjectPaletteInfo8:: @ 858E650
gUnknown_0858E68C:: @ 858E68C
.incbin "base_emerald.gba", 0x58e68c, 0x18
.align 2, 0
.align 2
@ This uses one of the secret base palettes, so there is no
@ "field_effect_object_palette_09.pal" file.
gFieldEffectObjectPaletteInfo9:: @ 858E6A4
@ -6663,13 +6630,11 @@ gUnknown_085C8E24:: @ 85C8E24
gUnknown_085C8E68:: @ 85C8E68
.incbin "base_emerald.gba", 0x5c8e68, 0x6c
.align 2, 0
.align 2
gFieldEffectObjectPalette10:: @ 85C8ED4
.incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal"
.align 2, 0
.align 2
gFieldEffectObjectPaletteInfo10:: @ 85C8EF4
obj_pal gFieldEffectObjectPalette10, 0x1009
@ -10687,8 +10652,7 @@ gUnknown_08611DB8:: @ 8611DB8
@ 8611DC0
.include "data/battle_frontier/battle_arena_move_mind_ratings.s"
.align 2, 0
.align 2
@ 8611F24
.incbin "base_emerald.gba", 0x611f24, 0x38
@ -11211,8 +11175,7 @@ gUnknown_08616120:: @ 8616120
gUnknown_08616124:: @ 8616124
.incbin "base_emerald.gba", 0x616124, 0x4
.align 2, 0
.align 2
gFont6BrailleGlyphs:: @ 8616128
.incbin "data/graphics/fonts/font6.fwjpnfont"
@ -12152,74 +12115,64 @@ gUnknown_0862B7E8:: @ 862B7E8
gUnknown_0862B7FC:: @ 862B7FC
.incbin "base_emerald.gba", 0x62b7fc, 0x2e8
.align 2, 0
.align 2
gFont8LatinGlyphs:: @ 862BAE4
.incbin "data/graphics/fonts/font8.latfont"
gFont8LatinGlyphWidths:: @ 8633AE4
.include "data/graphics/fonts/font8_latin_widths.s"
.align 2, 0
.align 2
gFont0LatinGlyphs:: @ 8633CE4
.incbin "data/graphics/fonts/font0.latfont"
gFont0LatinGlyphWidths:: @ 863BCE4
.include "data/graphics/fonts/font0_latin_widths.s"
.align 2, 0
.align 2
gFont7LatinGlyphs:: @ 863BEE4
.incbin "data/graphics/fonts/font7.latfont"
gFont7LatinGlyphWidths:: @ 8643EE4
.include "data/graphics/fonts/font7_latin_widths.s"
.align 2, 0
.align 2
gFont2LatinGlyphs:: @ 86440E4
.incbin "data/graphics/fonts/font2.latfont"
gFont2LatinGlyphWidths:: @ 864C0E4
.include "data/graphics/fonts/font2_latin_widths.s"
.align 2, 0
.align 2
gFont1LatinGlyphs:: @ 864C2E4
.incbin "data/graphics/fonts/font1.latfont"
gFont1LatinGlyphWidths:: @ 86542E4
.include "data/graphics/fonts/font1_latin_widths.s"
.align 2, 0
.align 2
gFont0JapaneseGlyphs:: @ 86544E4
.incbin "data/graphics/fonts/font0.hwjpnfont"
.align 2, 0
.align 2
gFont1JapaneseGlyphs:: @ 86584E4
.incbin "data/graphics/fonts/font1.hwjpnfont"
.align 2, 0
.align 2
gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs:: @ 865C4E4
.incbin "data/graphics/fonts/unused_frlg_male.fwjpnfont"
gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths:: @ 86644E4
.include "data/graphics/fonts/unused_japanese_frlg_male_font_widths.s"
.align 2, 0
.align 2
gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs:: @ 86646E4
.incbin "data/graphics/fonts/unused_frlg_female.fwjpnfont"
gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths:: @ 866C6E4
.include "data/graphics/fonts/unused_japanese_frlg_female_font_widths.s"
.align 2, 0
.align 2
gFont2JapaneseGlyphs:: @ 866C8E4
.incbin "data/graphics/fonts/font2.fwjpnfont"

3
data/egg_moves.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gEggMoves:: @ 832ADD8
egg_moves_begin SPECIES_BULBASAUR
.2byte MOVE_LIGHT_SCREEN

3
data/event_script_command_function_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gEventScriptCommandFunctionTable:: @ 81DB67C
.4byte s00_nop
.4byte s01_nop

3
data/evolution_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gEvolutionTable:: @ 832531C
@ ??????????
empty_evo_entries 5

3
data/experience_tables.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gExperienceTables:: @ 831F72C
.include "data/experience_tables/medium_fast_growth_rate.s"
.include "data/experience_tables/erratic_growth_rate.s"

3
data/field_effect_scripts.s
View File

@ -3,8 +3,7 @@
.section script_data, "aw", %progbits
.align 2, 0
.align 2
gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_ExclamationMarkIcon1
.4byte gFieldEffectScript_UseCutOnTallGrass

27
data/graphics.s
View File

@ -165,13 +165,11 @@ gUnknown_08C2EA9C:: @ 8C2EA9C
@ 8D51DC8
.include "data/graphics/trainers/trainer_graphics.s"
.align 2, 0
.align 2
gMonIcon_QuestionMark:: @ 8D774D0
.incbin "graphics/pokemon/icons/question_mark_icon.4bpp"
.align 2, 0
.align 2
gMonFootprint_QuestionMark:: @ 8D778D0
.incbin "graphics/pokemon/footprints/question_mark_footprint.1bpp"
@ -412,8 +410,7 @@ gUnknown_08D8EC24:: @ 8D8EC24
gUnknown_08D8FB9C:: @ 8D8FB9C
.incbin "base_emerald.gba", 0xd8fb9c, 0xd8
.align 2, 0
.align 2
gMonIcon_Egg:: @ 8D8FC74
.incbin "graphics/pokemon/icons/egg_icon.4bpp"
@ -950,8 +947,7 @@ gUnknown_08DD4BF0:: @ 8DD4BF0
gUnknown_08DD4C4C:: @ 8DD4C4C
.incbin "base_emerald.gba", 0xdd4c4c, 0x1c4
.align 2, 0
.align 2
gTilesetPalettes_General:: @ 8DD4E10
.incbin "data/tilesets/primary/general/palettes/00.gbapal"
.incbin "data/tilesets/primary/general/palettes/01.gbapal"
@ -970,8 +966,7 @@ gTilesetPalettes_General:: @ 8DD4E10
.incbin "data/tilesets/primary/general/palettes/14.gbapal"
.incbin "data/tilesets/primary/general/palettes/15.gbapal"
.align 2, 0
.align 2
gTilesetTiles_General:: @ 8DD5010
.incbin "data/tilesets/primary/general/tiles.4bpp.lz"
@ -1011,21 +1006,18 @@ gUnknown_08DDE030:: @ 8DDE030
gUnknown_08DDE12C:: @ 8DDE12C
.incbin "base_emerald.gba", 0xdde12c, 0xcc
.align 2, 0
.align 2
gMonIconPalettes:: @ 8DDE1F8
.incbin "graphics/pokemon/icon_palettes/icon_palette_0.gbapal"
.incbin "graphics/pokemon/icon_palettes/icon_palette_1.gbapal"
.incbin "graphics/pokemon/icon_palettes/icon_palette_2.gbapal"
.align 2, 0
.align 2
gTitleScreenBgPalettes:: @ 8DDE258
.incbin "graphics/title_screen/pokemon_logo.gbapal"
.incbin "graphics/title_screen/rayquaza_and_clouds.gbapal"
.align 2, 0
.align 2
gUnknown_08DDE438:: @ 8DDE438
.incbin "base_emerald.gba", 0xdde438, 0x20
@ -1035,8 +1027,7 @@ gUnknown_08DDE458:: @ 8DDE458
gTitleScreenPokemonLogoTiles:: @ 8DDE690
.incbin "graphics/title_screen/pokemon_logo.8bpp.lz"
.align 2, 0
.align 2
@ 8DDFD94
.incbin "base_emerald.gba", 0xddfd94, 0x8b0

258
data/graphics/berries/berry_graphics.s
View File

@ -1,429 +1,343 @@
.align 2, 0
.align 2
gBerryPic_Cheri:: @ 8D9C3A8
.incbin "graphics/berries/pics/cheri.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Oran:: @ 8D9C4FC
.incbin "graphics/berries/pics/oran.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Pecha:: @ 8D9C670
.incbin "graphics/berries/pics/pecha.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Rawst:: @ 8D9C7E4
.incbin "graphics/berries/pics/rawst.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Aspear:: @ 8D9C97C
.incbin "graphics/berries/pics/aspear.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Leppa:: @ 8D9CB24
.incbin "graphics/berries/pics/leppa.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Chesto:: @ 8D9CC94
.incbin "graphics/berries/pics/chesto.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Persim:: @ 8D9CE78
.incbin "graphics/berries/pics/persim.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Lum:: @ 8D9CFC8
.incbin "graphics/berries/pics/lum.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Sitrus:: @ 8D9D0E4
.incbin "graphics/berries/pics/sitrus.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Figy:: @ 8D9D288
.incbin "graphics/berries/pics/figy.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Wiki:: @ 8D9D434
.incbin "graphics/berries/pics/wiki.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Mago:: @ 8D9D628
.incbin "graphics/berries/pics/mago.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Aguav:: @ 8D9D7DC
.incbin "graphics/berries/pics/aguav.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Iapapa:: @ 8D9D950
.incbin "graphics/berries/pics/iapapa.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Razz:: @ 8D9DC08
.incbin "graphics/berries/pics/razz.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Bluk:: @ 8D9DE38
.incbin "graphics/berries/pics/bluk.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Nanab:: @ 8D9E020
.incbin "graphics/berries/pics/nanab.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Wepear:: @ 8D9E194
.incbin "graphics/berries/pics/wepear.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Pinap:: @ 8D9E35C
.incbin "graphics/berries/pics/pinap.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Pomeg:: @ 8D9E570
.incbin "graphics/berries/pics/pomeg.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Kelpsy:: @ 8D9E718
.incbin "graphics/berries/pics/kelpsy.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Qualot:: @ 8D9E8C0
.incbin "graphics/berries/pics/qualot.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Hondew:: @ 8D9EA8C
.incbin "graphics/berries/pics/hondew.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Grepa:: @ 8D9ECE4
.incbin "graphics/berries/pics/grepa.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Tamato:: @ 8D9EE74
.incbin "graphics/berries/pics/tamato.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Cornn:: @ 8D9F138
.incbin "graphics/berries/pics/cornn.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Magost:: @ 8D9F33C
.incbin "graphics/berries/pics/magost.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Rabuta:: @ 8D9F4E0
.incbin "graphics/berries/pics/rabuta.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Nomel:: @ 8D9F7D4
.incbin "graphics/berries/pics/nomel.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Spelon:: @ 8D9F9B0
.incbin "graphics/berries/pics/spelon.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Pamtre:: @ 8D9FBA0
.incbin "graphics/berries/pics/pamtre.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Watmel:: @ 8D9FDF0
.incbin "graphics/berries/pics/watmel.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Durin:: @ 8DA00D4
.incbin "graphics/berries/pics/durin.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Belue:: @ 8DA04A0
.incbin "graphics/berries/pics/belue.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Liechi:: @ 8DA0778
.incbin "graphics/berries/pics/liechi.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Ganlon:: @ 8DA09D0
.incbin "graphics/berries/pics/ganlon.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Salac:: @ 8DA0B68
.incbin "graphics/berries/pics/salac.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Petaya:: @ 8DA0DAC
.incbin "graphics/berries/pics/petaya.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Apicot:: @ 8DA1054
.incbin "graphics/berries/pics/apicot.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Lansat:: @ 8DA11E4
.incbin "graphics/berries/pics/lansat.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Starf:: @ 8DA13D8
.incbin "graphics/berries/pics/starf.4bpp.lz"
.align 2, 0
.align 2
gBerryPic_Enigma:: @ 8DA15A8
.incbin "graphics/berries/pics/enigma.4bpp.lz"
.align 2, 0
.align 2
gBerryPalette_Cheri:: @ 8DA17C0
.incbin "graphics/berries/palettes/cheri.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Oran:: @ 8DA17E8
.incbin "graphics/berries/palettes/oran.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Pecha:: @ 8DA1810
.incbin "graphics/berries/palettes/pecha.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Rawst:: @ 8DA1838
.incbin "graphics/berries/palettes/rawst.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Aspear:: @ 8DA1860
.incbin "graphics/berries/palettes/aspear.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Leppa:: @ 8DA1888
.incbin "graphics/berries/palettes/leppa.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Chesto:: @ 8DA18B0
.incbin "graphics/berries/palettes/chesto.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Persim:: @ 8DA18D8
.incbin "graphics/berries/palettes/persim.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Lum:: @ 8DA1900
.incbin "graphics/berries/palettes/lum.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Sitrus:: @ 8DA1928
.incbin "graphics/berries/palettes/sitrus.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Figy:: @ 8DA1950
.incbin "graphics/berries/palettes/figy.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Wiki:: @ 8DA1978
.incbin "graphics/berries/palettes/wiki.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Mago:: @ 8DA19A0
.incbin "graphics/berries/palettes/mago.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Aguav:: @ 8DA19C8
.incbin "graphics/berries/palettes/aguav.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Iapapa:: @ 8DA19F0
.incbin "graphics/berries/palettes/iapapa.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Razz:: @ 8DA1A18
.incbin "graphics/berries/palettes/razz.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Bluk:: @ 8DA1A40
.incbin "graphics/berries/palettes/bluk.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Nanab:: @ 8DA1A68
.incbin "graphics/berries/palettes/nanab.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Wepear:: @ 8DA1A90
.incbin "graphics/berries/palettes/wepear.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Pinap:: @ 8DA1AB8
.incbin "graphics/berries/palettes/pinap.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Pomeg:: @ 8DA1AE0
.incbin "graphics/berries/palettes/pomeg.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Kelpsy:: @ 8DA1B08
.incbin "graphics/berries/palettes/kelpsy.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Qualot:: @ 8DA1B30
.incbin "graphics/berries/palettes/qualot.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Hondew:: @ 8DA1B58
.incbin "graphics/berries/palettes/hondew.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Grepa:: @ 8DA1B80
.incbin "graphics/berries/palettes/grepa.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Tamato:: @ 8DA1BA8
.incbin "graphics/berries/palettes/tamato.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Cornn:: @ 8DA1BD0
.incbin "graphics/berries/palettes/cornn.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Magost:: @ 8DA1BF8
.incbin "graphics/berries/palettes/magost.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Rabuta:: @ 8DA1C20
.incbin "graphics/berries/palettes/rabuta.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Nomel:: @ 8DA1C48
.incbin "graphics/berries/palettes/nomel.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Spelon:: @ 8DA1C70
.incbin "graphics/berries/palettes/spelon.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Pamtre:: @ 8DA1C98
.incbin "graphics/berries/palettes/pamtre.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Watmel:: @ 8DA1CC0
.incbin "graphics/berries/palettes/watmel.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Durin:: @ 8DA1CE8
.incbin "graphics/berries/palettes/durin.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Belue:: @ 8DA1D10
.incbin "graphics/berries/palettes/belue.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Liechi:: @ 8DA1D38
.incbin "graphics/berries/palettes/liechi.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Ganlon:: @ 8DA1D60
.incbin "graphics/berries/palettes/ganlon.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Salac:: @ 8DA1D88
.incbin "graphics/berries/palettes/salac.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Petaya:: @ 8DA1DB0
.incbin "graphics/berries/palettes/petaya.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Apicot:: @ 8DA1DD8
.incbin "graphics/berries/palettes/apicot.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Lansat:: @ 8DA1E00
.incbin "graphics/berries/palettes/lansat.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Starf:: @ 8DA1E28
.incbin "graphics/berries/palettes/starf.gbapal.lz"
.align 2, 0
.align 2
gBerryPalette_Enigma:: @ 8DA1E50
.incbin "graphics/berries/palettes/enigma.gbapal.lz"

3
data/graphics/berries/berry_pic_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gBerryPicTable:: @ 857FC94
.4byte gBerryPic_Cheri, gBerryPalette_Cheri
.4byte gBerryPic_Chesto, gBerryPalette_Chesto

189
data/graphics/field_objects/berry_tree_graphics_tables.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gFieldObjectPicTable_PechaBerryTree:: @ 850BE48
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -11,13 +10,11 @@ gFieldObjectPicTable_PechaBerryTree:: @ 850BE48
obj_tiles gFieldObjectPic_PechaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Pecha:: @ 850BE90
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_KelpsyBerryTree:: @ 850BE98
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -29,13 +26,11 @@ gFieldObjectPicTable_KelpsyBerryTree:: @ 850BE98
obj_tiles gFieldObjectPic_KelpsyBerryTree_4, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Kelpsy:: @ 850BEE0
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_WepearBerryTree:: @ 850BEE8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -47,13 +42,11 @@ gFieldObjectPicTable_WepearBerryTree:: @ 850BEE8
obj_tiles gFieldObjectPic_WepearBerryTree_4, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Wepear:: @ 850BF30
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_IapapaBerryTree:: @ 850BF38
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -65,13 +58,11 @@ gFieldObjectPicTable_IapapaBerryTree:: @ 850BF38
obj_tiles gFieldObjectPic_IapapaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Iapapa:: @ 850BF80
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_CheriBerryTree:: @ 850BF88
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -83,13 +74,11 @@ gFieldObjectPicTable_CheriBerryTree:: @ 850BF88
obj_tiles gFieldObjectPic_CheriBerryTree_4, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Cheri:: @ 850BFD0
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_FigyBerryTree:: @ 850BFD8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -101,13 +90,11 @@ gFieldObjectPicTable_FigyBerryTree:: @ 850BFD8
obj_tiles gFieldObjectPic_FigyBerryTree_4, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Figy:: @ 850C020
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_MagoBerryTree:: @ 850C028
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -119,13 +106,11 @@ gFieldObjectPicTable_MagoBerryTree:: @ 850C028
obj_tiles gFieldObjectPic_MagoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Mago:: @ 850C070
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_LumBerryTree:: @ 850C078
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -137,13 +122,11 @@ gFieldObjectPicTable_LumBerryTree:: @ 850C078
obj_tiles gFieldObjectPic_LumBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Lum:: @ 850C0C0
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_RazzBerryTree:: @ 850C0C8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -155,13 +138,11 @@ gFieldObjectPicTable_RazzBerryTree:: @ 850C0C8
obj_tiles gFieldObjectPic_RazzBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Razz:: @ 850C110
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_GrepaBerryTree:: @ 850C118
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -173,13 +154,11 @@ gFieldObjectPicTable_GrepaBerryTree:: @ 850C118
obj_tiles gFieldObjectPic_GrepaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Grepa:: @ 850C160
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_RabutaBerryTree:: @ 850C168
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -191,13 +170,11 @@ gFieldObjectPicTable_RabutaBerryTree:: @ 850C168
obj_tiles gFieldObjectPic_RabutaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Rabuta:: @ 850C1B0
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_NomelBerryTree:: @ 850C1B8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -209,13 +186,11 @@ gFieldObjectPicTable_NomelBerryTree:: @ 850C1B8
obj_tiles gFieldObjectPic_NomelBerryTree_4, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Nomel:: @ 850C200
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_LeppaBerryTree:: @ 850C208
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -227,13 +202,11 @@ gFieldObjectPicTable_LeppaBerryTree:: @ 850C208
obj_tiles gFieldObjectPic_LeppaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Leppa:: @ 850C250
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_LiechiBerryTree:: @ 850C258
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -245,13 +218,11 @@ gFieldObjectPicTable_LiechiBerryTree:: @ 850C258
obj_tiles gFieldObjectPic_LiechiBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Liechi:: @ 850C2A0
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_HondewBerryTree:: @ 850C2A8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -263,13 +234,11 @@ gFieldObjectPicTable_HondewBerryTree:: @ 850C2A8
obj_tiles gFieldObjectPic_HondewBerryTree_4, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Hondew:: @ 850C2F0
berry_tree_palette_slot_table 5
.align 2, 0
.align 2
gFieldObjectPicTable_AguavBerryTree:: @ 850C2F8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -281,13 +250,11 @@ gFieldObjectPicTable_AguavBerryTree:: @ 850C2F8
obj_tiles gFieldObjectPic_AguavBerryTree_4, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Aguav:: @ 850C340
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_WikiBerryTree:: @ 850C348
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -299,13 +266,11 @@ gFieldObjectPicTable_WikiBerryTree:: @ 850C348
obj_tiles gFieldObjectPic_WikiBerryTree_4, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Wiki:: @ 850C390
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_PomegBerryTree:: @ 850C398
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -317,13 +282,11 @@ gFieldObjectPicTable_PomegBerryTree:: @ 850C398
obj_tiles gFieldObjectPic_PomegBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Pomeg:: @ 850C3E0
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_RawstBerryTree:: @ 850C3E8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -335,13 +298,11 @@ gFieldObjectPicTable_RawstBerryTree:: @ 850C3E8
obj_tiles gFieldObjectPic_RawstBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Rawst:: @ 850C430
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_SpelonBerryTree:: @ 850C438
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -353,13 +314,11 @@ gFieldObjectPicTable_SpelonBerryTree:: @ 850C438
obj_tiles gFieldObjectPic_SpelonBerryTree_4, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Spelon:: @ 850C480
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_ChestoBerryTree:: @ 850C488
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -371,13 +330,11 @@ gFieldObjectPicTable_ChestoBerryTree:: @ 850C488
obj_tiles gFieldObjectPic_ChestoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Chesto:: @ 850C4D0
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_OranBerryTree:: @ 850C4D8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -389,13 +346,11 @@ gFieldObjectPicTable_OranBerryTree:: @ 850C4D8
obj_tiles gFieldObjectPic_OranBerryTree_4, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Oran:: @ 850C520
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_PersimBerryTree:: @ 850C528
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -407,13 +362,11 @@ gFieldObjectPicTable_PersimBerryTree:: @ 850C528
obj_tiles gFieldObjectPic_PersimBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Persim:: @ 850C570
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_SitrusBerryTree:: @ 850C578
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -425,13 +378,11 @@ gFieldObjectPicTable_SitrusBerryTree:: @ 850C578
obj_tiles gFieldObjectPic_SitrusBerryTree_4, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Sitrus:: @ 850C5C0
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_AspearBerryTree:: @ 850C5C8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -443,13 +394,11 @@ gFieldObjectPicTable_AspearBerryTree:: @ 850C5C8
obj_tiles gFieldObjectPic_AspearBerryTree_4, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Aspear:: @ 850C610
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_PamtreBerryTree:: @ 850C618
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -461,13 +410,11 @@ gFieldObjectPicTable_PamtreBerryTree:: @ 850C618
obj_tiles gFieldObjectPic_PamtreBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Pamtre:: @ 850C660
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_CornnBerryTree:: @ 850C668
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -479,13 +426,11 @@ gFieldObjectPicTable_CornnBerryTree:: @ 850C668
obj_tiles gFieldObjectPic_CornnBerryTree_4, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Cornn:: @ 850C6B0
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_LansatBerryTree:: @ 850C6B8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -497,13 +442,11 @@ gFieldObjectPicTable_LansatBerryTree:: @ 850C6B8
obj_tiles gFieldObjectPic_LansatBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Lansat:: @ 850C700
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_DurinBerryTree:: @ 850C708
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -515,13 +458,11 @@ gFieldObjectPicTable_DurinBerryTree:: @ 850C708
obj_tiles gFieldObjectPic_DurinBerryTree_4, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Durin:: @ 850C750
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_TamatoBerryTree:: @ 850C758
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@ -533,8 +474,7 @@ gFieldObjectPicTable_TamatoBerryTree:: @ 850C758
obj_tiles gFieldObjectPic_TamatoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0
berry_tree_palette_slot_table 2
@ -551,8 +491,7 @@ gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA
.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES
.align 2, 0
.align 2
gBerryTreePicTablePointers:: @ 850C7B0
.4byte gFieldObjectPicTable_CheriBerryTree @ Cheri
.4byte gFieldObjectPicTable_ChestoBerryTree @ Chesto
@ -598,8 +537,7 @@ gBerryTreePicTablePointers:: @ 850C7B0
.4byte gFieldObjectPicTable_CornnBerryTree @ Starf
.4byte gFieldObjectPicTable_DurinBerryTree @ Enigma
.align 2, 0
.align 2
gBerryTreePaletteSlotTablePointers:: @ 850C85C
.4byte gBerryTreePaletteSlotTable_Cheri @ Cheri
.4byte gBerryTreePaletteSlotTable_Chesto @ Chesto
@ -645,8 +583,7 @@ gBerryTreePaletteSlotTablePointers:: @ 850C85C
.4byte gBerryTreePaletteSlotTable_Cornn @ Starf
.4byte gBerryTreePaletteSlotTable_Durin @ Enigma
.align 2, 0
.align 2
gBerryTreeFieldObjectGraphicsIdTablePointers:: @ 850C908
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cheri
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Chesto

3
data/graphics/field_objects/field_effect_object_template_pointers.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gFieldEffectObjectTemplatePointers:: @ 85059F8
.4byte gFieldEffectObjectTemplate_ShadowSmall
.4byte gFieldEffectObjectTemplate_ShadowMedium

498
data/graphics/field_objects/field_effect_objects.s
View File

File diff suppressed because it is too large Load Diff

369
data/graphics/field_objects/field_object_anims.s
View File

File diff suppressed because it is too large Load Diff

4881
data/graphics/field_objects/field_object_graphics.s
View File

File diff suppressed because it is too large Load Diff

735
data/graphics/field_objects/field_object_graphics_info.s
View File

File diff suppressed because it is too large Load Diff

6
data/graphics/field_objects/field_object_graphics_info_pointers.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gFieldObjectGraphicsInfoPointers:: @ 8505620
.4byte gFieldObjectGraphicsInfo_BrendanNormal
.4byte gFieldObjectGraphicsInfo_BrendanMachBike
@ -241,8 +240,7 @@ gFieldObjectGraphicsInfoPointers:: @ 8505620
.4byte gFieldObjectGraphicsInfo_Lugia
.4byte gFieldObjectGraphicsInfo_HoOh
.align 2, 0
.align 2
gMauvilleOldManGraphicsInfoPointers:: @ 85059DC
.4byte gFieldObjectGraphicsInfo_Bard
.4byte gFieldObjectGraphicsInfo_Hipster

144
data/graphics/field_objects/field_object_oam.s
View File

@ -1,81 +1,67 @@
.align 2, 0
.align 2
gFieldObjectBaseOam_8x8:: @ 85094EC
.4byte OAM_SIZE_8x8
.2byte 2 << 10 @ priority
.align 2, 0
.align 2
gFieldObjectBaseOam_16x8:: @ 85094F4
.4byte OAM_SIZE_16x8
.2byte 2 << 10 @ priority
.align 2, 0
.align 2
gFieldObjectBaseOam_16x16:: @ 85094FC
.4byte OAM_SIZE_16x16
.2byte 2 << 10 @ priority
.align 2, 0
.align 2
gFieldObjectBaseOam_32x8:: @ 8509504
.4byte OAM_SIZE_32x8
.2byte 2 << 10 @ priority
.align 2, 0
.align 2
gFieldObjectBaseOam_64x32:: @ 850950C
.4byte OAM_SIZE_64x32
.2byte 2 << 10 @ priority
.align 2, 0
.align 2
gFieldObjectBaseOam_16x32:: @ 8509514
.4byte OAM_SIZE_16x32
.2byte 2 << 10 @ priority
.align 2, 0
.align 2
gFieldObjectBaseOam_32x32:: @ 850951C
.4byte OAM_SIZE_32x32
.2byte 2 << 10 @ priority
.align 2, 0
.align 2
gFieldObjectBaseOam_64x64:: @ 8509524
.4byte OAM_SIZE_64x64
.2byte 2 << 10 @ priority
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_16x16_0:: @ 850952C
sprite_oam -8, -8, 2, 0, 16x16
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_16x16_1:: @ 8509530
sprite_oam -8, -8, 1, 0, 16x16
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_16x16_2:: @ 8509534
sprite_oam -8, -8, 2, 0, 16x8
sprite_oam -8, 0, 3, 2, 16x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_16x16_3:: @ 850953C
sprite_oam -8, -8, 2, 0, 16x16
sprite_oam -8, -8, 3, 0, 16x16
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_16x16_4:: @ 8509544
sprite_oam -8, -8, 1, 0, 16x16
sprite_oam -8, -8, 3, 0, 16x16
.align 2, 0
.align 2
gFieldObjectSpriteOamTables_16x16:: @ 850954C
.4byte 0 @ number of sprites
.4byte NULL @ unknown
@ -95,37 +81,31 @@ gFieldObjectSpriteOamTables_16x16:: @ 850954C
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_4 @ long grass above high bridge
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_16x32_0:: @ 850957C
sprite_oam -8, -16, 2, 0, 16x32
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_16x32_1:: @ 8509580
sprite_oam -8, -16, 1, 0, 16x32
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_16x32_2:: @ 8509584
sprite_oam -8, -16, 2, 0, 16x16
sprite_oam -8, 0, 2, 4, 16x8
sprite_oam -8, 8, 3, 6, 16x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_16x32_3:: @ 8509590
sprite_oam -8, -16, 2, 0, 16x16
sprite_oam -8, 0, 3, 4, 16x16
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_16x32_4:: @ 8509598
sprite_oam -8, -16, 1, 0, 16x16
sprite_oam -8, 0, 3, 4, 16x16
.align 2, 0
.align 2
gFieldObjectSpriteOamTables_16x32:: @ 85095A0
.4byte 0 @ number of sprites
.4byte NULL @ unknown
@ -145,37 +125,31 @@ gFieldObjectSpriteOamTables_16x32:: @ 85095A0
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_4 @ long grass above high bridge
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_32x32_0:: @ 85095D0
sprite_oam -16, -16, 2, 0, 32x32
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_32x32_1:: @ 85095D4
sprite_oam -16, -16, 1, 0, 32x32
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_32x32_2:: @ 85095D8
sprite_oam -16, -16, 2, 0, 32x16
sprite_oam -16, 0, 2, 8, 32x8
sprite_oam -16, 8, 3, 12, 32x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_32x32_3:: @ 85095E4
sprite_oam -16, -16, 2, 0, 32x16
sprite_oam -16, 0, 3, 8, 32x16
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_32x32_4:: @ 85095EC
sprite_oam -16, -16, 1, 0, 32x16
sprite_oam -16, 0, 3, 8, 32x16
.align 2, 0
.align 2
gFieldObjectSpriteOamTables_32x32:: @ 85095F4
.4byte 0 @ number of sprites
.4byte NULL @ unknown
@ -195,8 +169,7 @@ gFieldObjectSpriteOamTables_32x32:: @ 85095F4
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_4 @ long grass above high bridge
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_Truck_0:: @ 8509624
sprite_oam -24, -24, 2, 0, 32x8
sprite_oam 8, -24, 2, 4, 16x8
@ -211,8 +184,7 @@ gFieldObjectSpriteOamTable_Truck_0:: @ 8509624
sprite_oam -24, 16, 2, 30, 32x8
sprite_oam 8, 16, 2, 34, 16x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTables_Truck:: @ 8509654
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
@ -232,28 +204,23 @@ gFieldObjectSpriteOamTables_Truck:: @ 8509654
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass above high bridge
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_Unused_0:: @ 8509684
sprite_oam -32, -16, 2, 0, 64x32
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_Unused_1:: @ 8509688
sprite_oam -32, -16, 1, 0, 64x32
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_Unused_2:: @ 850968C
sprite_oam -32, -16, 2, 0, 64x32
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_Unused_3:: @ 8509690
sprite_oam -32, -16, 2, 0, 64x32
.align 2, 0
.align 2
gFieldObjectSpriteOamTables_Unused:: @ 8509694
.4byte 0 @ number of sprites
.4byte NULL @ unknown
@ -273,28 +240,23 @@ gFieldObjectSpriteOamTables_Unused:: @ 8509694
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass above high bridge
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_64x64_0:: @ 85096C4
sprite_oam -32, -32, 2, 0, 64x64
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_64x64_1:: @ 85096C8
sprite_oam -32, -32, 1, 0, 64x64
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_64x64_2:: @ 85096CC
sprite_oam -32, -32, 2, 0, 64x64
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_64x64_3:: @ 85096D0
sprite_oam -32, -32, 2, 0, 64x64
.align 2, 0
.align 2
gFieldObjectSpriteOamTables_64x64:: @ 85096D4
.4byte 0 @ number of sprites
.4byte NULL @ unknown
@ -314,8 +276,7 @@ gFieldObjectSpriteOamTables_64x64:: @ 85096D4
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass above high bridge
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
@ -333,8 +294,7 @@ gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704
sprite_oam -16, 12, 2, 52, 32x8
sprite_oam 16, 12, 2, 56, 32x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_SSTidal_1:: @ 8509740
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
@ -352,8 +312,7 @@ gFieldObjectSpriteOamTable_SSTidal_1:: @ 8509740
sprite_oam -16, 12, 1, 52, 32x8
sprite_oam 16, 12, 1, 56, 32x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_SSTidal_2:: @ 850977C
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
@ -371,8 +330,7 @@ gFieldObjectSpriteOamTable_SSTidal_2:: @ 850977C
sprite_oam -16, 12, 2, 52, 32x8
sprite_oam 16, 12, 2, 56, 32x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_SSTidal_3:: @ 85097B8
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
@ -390,8 +348,7 @@ gFieldObjectSpriteOamTable_SSTidal_3:: @ 85097B8
sprite_oam -16, 12, 2, 52, 32x8
sprite_oam 16, 12, 2, 56, 32x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_0 @ unknown
@ -411,8 +368,7 @@ gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass above high bridge
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
@ -431,8 +387,7 @@ gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824
sprite_oam 16, 4, 2, 41, 16x8
sprite_oam 32, 4, 2, 43, 8x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_1:: @ 8509864
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
@ -451,8 +406,7 @@ gFieldObjectSpriteOamTable_SubmarineShadow_1:: @ 8509864
sprite_oam 16, 4, 1, 41, 16x8
sprite_oam 32, 4, 1, 43, 8x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_2:: @ 85098A4
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
@ -471,8 +425,7 @@ gFieldObjectSpriteOamTable_SubmarineShadow_2:: @ 85098A4
sprite_oam 16, 4, 2, 41, 16x8
sprite_oam 32, 4, 2, 43, 8x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_3:: @ 85098E4
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
@ -491,8 +444,7 @@ gFieldObjectSpriteOamTable_SubmarineShadow_3:: @ 85098E4
sprite_oam 16, 4, 2, 41, 16x8
sprite_oam 32, 4, 2, 43, 8x8
.align 2, 0
.align 2
gFieldObjectSpriteOamTables_SubmarineShadow:: @ 8509924
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ unknown

657
data/graphics/field_objects/field_object_pic_tables.s
View File

File diff suppressed because it is too large Load Diff

1413
data/graphics/items/item_graphics.s
View File

File diff suppressed because it is too large Load Diff

3
data/graphics/items/item_icon_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gItemIconTable:: @ 8614410
@ ????????
.4byte gItemIcon_QuestionMark

12
data/graphics/pokemon/circled_question_mark_graphics.s
View File

@ -1,19 +1,15 @@
.align 2, 0
.align 2
gMonStillFrontPic_CircledQuestionMark:: @ 8C00750
.incbin "graphics/pokemon/front_pics/circled_question_mark_still_front_pic.4bpp.lz"
.align 2, 0
.align 2
gMonBackPic_CircledQuestionMark:: @ 8C00998
.incbin "graphics/pokemon/back_pics/circled_question_mark_back_pic.4bpp.lz"
.align 2, 0
.align 2
gMonPalette_CircledQuestionMark:: @ 8C00BE0
.incbin "graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz"
.align 2, 0
.align 2
gMonShinyPalette_CircledQuestionMark:: @ 8C00BF8
.incbin "graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz"

3
data/graphics/pokemon/mon_back_pic_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gMonBackPicTable:: @ 83028B8
obj_tiles gMonBackPic_CircledQuestionMark, 0x800, 0
obj_tiles gMonBackPic_Bulbasaur, 0x800, 1

3
data/graphics/pokemon/mon_footprint_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gMonFootprintTable:: @ 856E694
.4byte gMonFootprint_Bulbasaur
.4byte gMonFootprint_Bulbasaur

3
data/graphics/pokemon/mon_front_pic_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gMonFrontPicTable:: @ 830A18C
obj_tiles gMonFrontPic_CircledQuestionMark, 0x800, 0
obj_tiles gMonFrontPic_Bulbasaur, 0x800, 1

7209
data/graphics/pokemon/mon_graphics.s
View File

File diff suppressed because it is too large Load Diff

3
data/graphics/pokemon/mon_icon_palette_indices.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gMonIconPaletteIndices:: @ 857C388
.byte 0 @ ??????????
.byte 1 @ Bulbasaur

3
data/graphics/pokemon/mon_icon_palette_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gMonIconPaletteTable:: @ 857C540
obj_pal gMonIconPalettes + 0 * 32, 56000
obj_pal gMonIconPalettes + 1 * 32, 56001

3
data/graphics/pokemon/mon_icon_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gMonIconTable:: @ 857BCA8
.4byte gMonIcon_Bulbasaur
.4byte gMonIcon_Bulbasaur

3
data/graphics/pokemon/mon_palette_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gMonPaletteTable:: @ 8303678
obj_pal gMonPalette_CircledQuestionMark, 0
obj_pal gMonPalette_Bulbasaur, 1

3
data/graphics/pokemon/mon_shiny_palette_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gMonShinyPaletteTable:: @ 8304438
obj_pal gMonShinyPalette_CircledQuestionMark, 500
obj_pal gMonShinyPalette_Bulbasaur, 501

3
data/graphics/pokemon/mon_still_front_pic_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gMonStillFrontPicTable:: @ 8301418
obj_tiles gMonStillFrontPic_CircledQuestionMark, 0x800, 0
obj_tiles gMonStillFrontPic_Bulbasaur, 0x800, 1

3
data/graphics/trainers/trainer_back_pic_palette_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gTrainerBackPicPaletteTable:: @ 8305D8C
obj_pal gTrainerPalette_Brendan, 0
obj_pal gTrainerPalette_May, 1

3
data/graphics/trainers/trainer_back_pic_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gTrainerBackPicTable:: @ 8305D4C
obj_tiles gTrainerBackPic_Brendan, 0x2000, 0
obj_tiles gTrainerBackPic_May, 0x2000, 1

3
data/graphics/trainers/trainer_front_pic_palette_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gTrainerFrontPicPaletteTable:: @ 830593C
obj_pal gTrainerPalette_Hiker, 0
obj_pal gTrainerPalette_AquaGruntM, 1

3
data/graphics/trainers/trainer_front_pic_table.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gTrainerFrontPicTable:: @ 8305654
obj_tiles gTrainerFrontPic_Hiker, 0x800, 0
obj_tiles gTrainerFrontPic_AquaGruntM, 0x800, 1

588
data/graphics/trainers/trainer_graphics.s
View File

File diff suppressed because it is too large Load Diff

3
data/item_effect_info.s
View File

@ -657,8 +657,7 @@ gTamatoBerryItemEffectInfo:: @ 831E57F
.byte 0x05
.byte 0x02
.align 2, 0
.align 2
gItemEffectInfoPointers:: @ 831E58C
.4byte gPotionItemEffectInfo
.4byte gAntidoteItemEffectInfo

3
data/items.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gItems:: @ 85839A0
.string "????????$", 14
.2byte ITEM_NONE

3
data/level_up_learnset_pointers.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gLevelUpLearnsetPointers:: @ 832937C
.4byte gBulbasaurLevelUpLearnset
.4byte gBulbasaurLevelUpLearnset

6
data/pickup_items.s
View File

@ -1,5 +1,4 @@
.align 1, 0
.align 1
gPickupItems:: @ 831C440
.2byte ITEM_POTION
.2byte ITEM_ANTIDOTE
@ -20,8 +19,7 @@ gPickupItems:: @ 831C440
.2byte ITEM_PP_UP
.2byte ITEM_MAX_ELIXIR
.align 1, 0
.align 1
gRarePickupItems:: @ 831C464
.2byte ITEM_HYPER_POTION
.2byte ITEM_NUGGET

3
data/pokedex_entries.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gPokedexEntries:: @ 856B5B0
.string "UNKNOWN$", 12
pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0

3
data/region_map_entries.s
View File

@ -592,8 +592,7 @@ gMapName_DesertUnderpass:: @ 85A145C
gMapName_TrainerHill:: @ 85A146D
.string "TRAINER HILL$"
.align 2, 0
.align 2
gRegionMapEntries:: @ 85A147C
region_map_entry 4, 11, 1, 1, LittlerootTown
region_map_entry 4, 9, 1, 1, OldaleTown

6
data/rtc.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gDefaultRTCInfo:: @ 82FECC0
.byte 0 @ year
.byte 1 @ month
@ -13,8 +12,7 @@ gDefaultRTCInfo:: @ 82FECC0
.byte 0 @ unknown 2
.2byte 0 @ padding
.align 2, 0
.align 2
gDaysInEachMonth:: @ 82FECCC
.4byte 31 @ January
.4byte 28 @ February

3
data/spinda_spot_graphics.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gSpindaSpotGraphics:: @ 831E2F0
.byte 16 @ X
.byte 7 @ Y

6
data/string_util.s
View File

@ -1,8 +1,7 @@
gDigits:: @ 82EC7D4
.string "0123456789ABCDEF"
.align 2, 0
.align 2
gPowersOfTen:: @ 82EC7E4
.4byte 1
.4byte 10
@ -21,8 +20,7 @@ gUnknown_082EC80C:: @ 82EC80C
gUnknown_082EC810:: @ 82EC810
.incbin "base_emerald.gba", 0x2ec810, 0x8
.align 2, 0
.align 2
gStringRefFunctionTable:: @ 82EC818
.4byte StringRef_GetPossiblyUnusedStringVar
.4byte StringRef_GetPlayerName

3
data/text/ability_description_pointers.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gAbilityDescriptionPointers:: @ 831BAD4
.4byte gNoneAbilityDescription
.4byte gStenchAbilityDescription

8
data/text/contest_text_pointers.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gContestEffectDescriptionPointers:: @ 8587C50
.4byte gContestEffect00hDescription
.4byte gContestEffect01hDescription
@ -54,7 +53,7 @@ gContestEffectDescriptionPointers:: @ 8587C50
@ Unreferenced array of pointers to move names.
@ All of the moves except Conversion are combo starters, so this may have
@ been an early list of combo starters.
.align 2, 0
.align 2
.4byte gUnusedContestMoveName0
.4byte gUnusedContestMoveName0
.4byte gUnusedContestMoveName1
@ -70,8 +69,7 @@ gContestEffectDescriptionPointers:: @ 8587C50
.4byte gUnusedContestMoveName11
.4byte gUnusedContestMoveName12
.align 2, 0
.align 2
gContestMoveTypeTextPointers:: @ 8587D48
.4byte gContestMoveTypeCoolText
.4byte gContestMoveTypeBeautyText

3
data/text/easy_chat/easy_chat_group_actions.s
View File

@ -232,8 +232,7 @@ gEasyChatWord_Faint:: @ 859B243
gEasyChatWord_Fainted:: @ 859B249
.string "FAINTED$"
.align 2, 0
.align 2
gEasyChatGroup_Actions:: @ 859B254
.4byte gEasyChatWord_Meets
.4byte 72 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_adjectives.s
View File

@ -106,8 +106,7 @@ gEasyChatWord_Happily:: @ 859C4C3
gEasyChatWord_Anticipation:: @ 859C4CB
.string "ANTICIPATION$"
.align 2, 0
.align 2
gEasyChatGroup_Adjectives:: @ 859C4D8
.4byte gEasyChatWord_Wandering
.4byte 35 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_battle.s
View File

@ -187,8 +187,7 @@ gEasyChatWord_Rule:: @ 8598D04
gEasyChatWord_Move:: @ 8598D09
.string "MOVE$"
.align 2, 0
.align 2
gEasyChatGroup_Battle:: @ 8598D10
.4byte gEasyChatWord_MatchUp
.4byte 53 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_conditions.s
View File

@ -205,8 +205,7 @@ gEasyChatWord_Seems:: @ 859AD10
gEasyChatWord_Badly:: @ 859AD16
.string "BADLY$"
.align 2, 0
.align 2
gEasyChatGroup_Conditions:: @ 859AD1C
.4byte gEasyChatWord_Hot
.4byte 13 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_endings.s
View File

@ -205,8 +205,7 @@ gEasyChatWord_Once:: @ 859A2C1
gEasyChatWord_Anywhere:: @ 859A2C6
.string "ANYWHERE$"
.align 2, 0
.align 2
gEasyChatGroup_Endings:: @ 859A2D0
.4byte gEasyChatWord_Will
.4byte 32 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_events.s
View File

@ -85,8 +85,7 @@ gEasyChatWord_Wireless:: @ 859C754
gEasyChatWord_Frontier:: @ 859C75D
.string "FRONTIER$"
.align 2, 0
.align 2
gEasyChatGroup_Events:: @ 859C768
.4byte gEasyChatWord_Appeal
.4byte 0 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_feelings.s
View File

@ -205,8 +205,7 @@ gEasyChatWord_Understand:: @ 859A7D6
gEasyChatWord_Understands:: @ 859A7E1
.string "UNDERSTANDS$"
.align 2, 0
.align 2
gEasyChatGroup_Feelings:: @ 859A7F0
.4byte gEasyChatWord_Meet
.4byte 40 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_greetings.s
View File

@ -124,8 +124,7 @@ gEasyChatWord_ComeOver:: @ 859913B
gEasyChatWord_CountOn:: @ 8599145
.string "COUNT ON$"
.align 2, 0
.align 2
gEasyChatGroup_Greetings:: @ 8599150
.4byte gEasyChatWord_Thanks
.4byte 12 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_hobbies.s
View File

@ -160,8 +160,7 @@ gEasyChatWord_Vacation:: @ 859BACD
gEasyChatWord_Look:: @ 859BAD6
.string "LOOK$"
.align 2, 0
.align 2
gEasyChatGroup_Hobbies:: @ 859BADC
.4byte gEasyChatWord_Idol
.4byte 43 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_lifestyle.s
View File

@ -133,8 +133,7 @@ gEasyChatWord_Rental:: @ 859B737
gEasyChatWord_World:: @ 859B73E
.string "WORLD$"
.align 2, 0
.align 2
gEasyChatGroup_Lifestyle:: @ 859B744
.4byte gEasyChatWord_Chores
.4byte 3 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_misc.s
View File

@ -124,8 +124,7 @@ gEasyChatWord_Left:: @ 859C1B4
gEasyChatWord_Right:: @ 859C1B9
.string "RIGHT$"
.align 2, 0
.align 2
gEasyChatGroup_Misc:: @ 859C1C0
.4byte gEasyChatWord_Highs
.4byte 7 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_move_1.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gEasyChatGroup_Move1:: @ 859C8C4
.2byte MOVE_ABSORB
.2byte MOVE_AEROBLAST

3
data/text/easy_chat/easy_chat_group_move_2.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gEasyChatGroup_Move2:: @ 859C9F8
.2byte MOVE_ACID
.2byte MOVE_ACID_ARMOR

3
data/text/easy_chat/easy_chat_group_name_pointers.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gEasyChatGroupNamePointers:: @ 859E5D4
.4byte gEasyChatGroupName_Pokemon
.4byte gEasyChatGroupName_Trainer

3
data/text/easy_chat/easy_chat_group_people.s
View File

@ -223,8 +223,7 @@ gEasyChatWord_SheIs:: @ 8599500
gEasyChatWord_Some:: @ 8599507
.string "SOME$"
.align 2, 0
.align 2
gEasyChatGroup_People:: @ 859950C
.4byte gEasyChatWord_Opponent
.4byte 13 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_pokemon.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gEasyChatGroup_Pokemon:: @ 8597E9C
.2byte SPECIES_ABRA
.2byte SPECIES_ABSOL

3
data/text/easy_chat/easy_chat_group_pokemon2.s
View File

@ -1,5 +1,4 @@
.align 2, 0
.align 2
gEasyChatGroup_Pokemon2:: @ 859CE0C
.2byte SPECIES_ABRA
.2byte SPECIES_AERODACTYL

3
data/text/easy_chat/easy_chat_group_speech.s
View File

@ -178,8 +178,7 @@ gEasyChatWord_Instead:: @ 8599E76
gEasyChatWord_Fantastic:: @ 8599E7E
.string "FANTASTIC$"
.align 2, 0
.align 2
gEasyChatGroup_Speech:: @ 8599E88
.4byte gEasyChatWord_Listen
.4byte 19 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_status.s
View File

@ -325,8 +325,7 @@ gEasyChatWord_PurePower:: @ 8598607
gEasyChatWord_ShieldDust:: @ 8598612
.string "SHIELD DUST$"
.align 2, 0
.align 2
gEasyChatGroup_Status:: @ 8598620
.4byte gEasyChatWord_Dark
.4byte 13 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_time.s
View File

@ -133,8 +133,7 @@ gEasyChatWord_Night:: @ 859BE8B
gEasyChatWord_Week:: @ 859BE91
.string "WEEK$"
.align 2, 0
.align 2
gEasyChatGroup_Time:: @ 859BE98
.4byte gEasyChatWord_Fall
.4byte 29 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_trainer.s
View File

@ -79,8 +79,7 @@ gEasyChatWord_Silver:: @ 85980DF
gEasyChatWord_Emerald:: @ 85980E6
.string "EMERALD$"
.align 2, 0
.align 2
gEasyChatGroup_Trainer:: @ 85980F0
.4byte gEasyChatWord_IChooseYou
.4byte 21 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_trendy_saying.s
View File

@ -97,8 +97,7 @@ gEasyChatWord_Young:: @ 859CC72
gEasyChatWord_Ugly:: @ 859CC78
.string "UGLY$"
.align 2, 0
.align 2
gEasyChatGroup_TrendySaying:: @ 859CC80
.4byte gEasyChatWord_KthxBye
.4byte 7 @ alphabetical order

3
data/text/easy_chat/easy_chat_group_voices.s
View File

@ -187,8 +187,7 @@ gEasyChatWord_Gwah:: @ 85999E3
gEasyChatWord_Wahahaha:: @ 85999E8
.string "WAHAHAHA$"
.align 2, 0
.align 2
gEasyChatGroup_Voices:: @ 85999F4
.4byte gEasyChatWord_Excl
.4byte 0 @ alphabetical order

3
data/text/easy_chat/easy_chat_groups.s
View File

@ -21,8 +21,7 @@
.include "data/text/easy_chat/easy_chat_group_trendy_saying.s"
.include "data/text/easy_chat/easy_chat_group_pokemon2.s"
.align 2, 0
.align 2
gEasyChatGroups:: @ 859D004
.4byte gEasyChatGroup_Pokemon
.2byte 202 @ total number of entries

3
data/text/easy_chat/easy_chat_words_by_letter.s
View File

@ -2518,8 +2518,7 @@ gEasyChatWordsByLetter_UnusedJapaneseWa:: @ 859E428
ec_pokemon2 MACHOP
ec_pokemon1 MACHOP
.align 2, 0
.align 2
gEasyChatWordsByLetterPointers:: @ 859E46C
.4byte gEasyChatWordsByLetter_Others
.4byte 10 @ number of entries

3
data/text/gift_ribbon_descriptions.s
View File

@ -139,8 +139,7 @@ gGiftRibbonDescriptionPart1_LoveForPokemon:: @ 8623DD4
gGiftRibbonDescriptionPart2_LoveForPokemon:: @ 8623DE6
.string "love for POKéMON.$"
.align 2, 0
.align 2
gGiftRibbonDescriptionPointers:: @ 8623DF8
.4byte gGiftRibbonDescriptionPart1_2003RegionalTourney, gGiftRibbonDescriptionPart2_Champion
.4byte gGiftRibbonDescriptionPart1_2003NationalTourney, gGiftRibbonDescriptionPart2_Champion

3
data/text/move_descriptions.s
View File

@ -1060,8 +1060,7 @@ gDoomDesireMoveDescription:: @ 861C4BA
gPsychoBoostMoveDescription:: @ 861C4EB
.string "Allows a full-power attack,\nbut sharply lowers SP. ATK.$"
.align 2, 0
.align 2
gMoveDescriptionPointers:: @ 861C524
.4byte gPoundMoveDescription
.4byte gKarateChopMoveDescription

3
data/text/nature_names.s
View File

@ -73,8 +73,7 @@ gCarefulNatureName:: @ 861CB3F
gQuirkyNatureName:: @ 861CB47
.string "QUIRKY$"
.align 2, 0
.align 2
gNatureNamePointers:: @ 861CB50
.4byte gHardyNatureName
.4byte gLonelyNatureName

3
data/text/ribbon_descriptions.s
View File

@ -55,8 +55,7 @@ gRibbonDescriptionPart1_Effort:: @ 8623981
gRibbonDescriptionPart2_Effort:: @ 8623994
.string "being a hard worker.$"
.align 2, 0
.align 2
gRibbonDescriptionPointers:: @ 86239AC
.4byte gRibbonDescriptionPart1_Champion, gRibbonDescriptionPart2_Champion
.4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_NormalRank

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