fix merge conflicts

This commit is contained in:
Evan
2019-12-04 21:35:31 -07:00
156 changed files with 4490 additions and 6970 deletions
Binary file not shown.
+242 -127
View File
@@ -1,10 +1,12 @@
.section gfx_data, "aw", %progbits
.align 2
gBattleTextboxTiles:: @ 8D00000
.incbin "baserom.gba", 0xD00000, 0x4D8
.incbin "graphics/battle_interface/window.4bpp.lz"
.align 2
gBattleTextboxPalette:: @ 8D004D8
.incbin "baserom.gba", 0xD004D8, 0x44
.incbin "graphics/battle_interface/window.gbapal.lz"
.align 2
gFile_graphics_interface_menu_map_tilemap:: @ 8D0051C
@@ -12,18 +14,19 @@ gFile_graphics_interface_menu_map_tilemap:: @ 8D0051C
.align 2
gMonFrontPic_CircledQuestionMark:: @ 8D00748
.incbin "baserom.gba", 0xD00748, 0x244
.incbin "graphics/pokemon/circled_question_mark/circled/front.4bpp.lz"
.align 2
gMonBackPic_CircledQuestionMark:: @ 8D0098C
.incbin "baserom.gba", 0xD0098C, 0x244
.incbin "graphics/pokemon/circled_question_mark/circled/back.4bpp.lz"
.align 2
gMonPalette_CircledQuestionMark:: @ 8D00BD0
.incbin "graphics/pokemon/question_mark/circled/normal.gbapal.lz"
.incbin "graphics/pokemon/circled_question_mark/circled/normal.gbapal.lz"
.align 2
gMonShinyPalette_CircledQuestionMark:: @ 8D00BE8
.incbin "graphics/pokemon/question_mark/circled/shiny.gbapal.lz"
.incbin "graphics/pokemon/circled_question_mark/circled/shiny.gbapal.lz"
.align 2
gFile_graphics_unused_old_charmap_sheet:: @ 8D00C00
@@ -46,103 +49,103 @@ gFile_graphics_battle_anims_sprites_smokescreen_impact_palette:: @ 8D0170C
.incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Poke_sheet:: @ 8D01724
gInterfaceGfx_PokeBall:: @ 8D01724
.incbin "graphics/interface/ball/poke.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Poke_palette:: @ 8D017E0
gInterfacePal_PokeBall:: @ 8D017E0
.incbin "graphics/interface/ball/poke.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Great_sheet:: @ 8D01800
gInterfaceGfx_GreatBall:: @ 8D01800
.incbin "graphics/interface/ball/great.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Great_palette:: @ 8D018BC
gInterfacePal_GreatBall:: @ 8D018BC
.incbin "graphics/interface/ball/great.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Safari_sheet:: @ 8D018E0
gInterfaceGfx_SafariBall:: @ 8D018E0
.incbin "graphics/interface/ball/safari.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Safari_palette:: @ 8D019A4
gInterfacePal_SafariBall:: @ 8D019A4
.incbin "graphics/interface/ball/safari.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Ultra_sheet:: @ 8D019C8
gInterfaceGfx_UltraBall:: @ 8D019C8
.incbin "graphics/interface/ball/ultra.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Ultra_palette:: @ 8D01A7C
gInterfacePal_UltraBall:: @ 8D01A7C
.incbin "graphics/interface/ball/ultra.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Master_sheet:: @ 8D01A9C
gInterfaceGfx_MasterBall:: @ 8D01A9C
.incbin "graphics/interface/ball/master.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Master_palette:: @ 8D01B5C
gInterfacePal_MasterBall:: @ 8D01B5C
.incbin "graphics/interface/ball/master.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Net_sheet:: @ 8D01B80
gInterfaceGfx_NetBall:: @ 8D01B80
.incbin "graphics/interface/ball/net.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Net_palette:: @ 8D01C40
gInterfacePal_NetBall:: @ 8D01C40
.incbin "graphics/interface/ball/net.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Dive_sheet:: @ 8D01C60
gInterfaceGfx_DiveBall:: @ 8D01C60
.incbin "graphics/interface/ball/dive.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Dive_palette:: @ 8D01D74
gInterfacePal_DiveBall:: @ 8D01D74
.incbin "graphics/interface/ball/dive.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Nest_sheet:: @ 8D01D9C
gInterfaceGfx_NestBall:: @ 8D01D9C
.incbin "graphics/interface/ball/nest.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Nest_palette:: @ 8D01E60
gInterfacePal_NestBall:: @ 8D01E60
.incbin "graphics/interface/ball/nest.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Repeat_sheet:: @ 8D01E84
gInterfaceGfx_RepeatBall:: @ 8D01E84
.incbin "graphics/interface/ball/repeat.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Repeat_palette:: @ 8D01F44
gInterfacePal_RepeatBall:: @ 8D01F44
.incbin "graphics/interface/ball/repeat.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Timer_sheet:: @ 8D01F68
gInterfaceGfx_TimerBall:: @ 8D01F68
.incbin "graphics/interface/ball/timer.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Timer_palette:: @ 8D02060
gInterfacePal_TimerBall:: @ 8D02060
.incbin "graphics/interface/ball/timer.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Luxury_sheet:: @ 8D02084
gInterfaceGfx_LuxuryBall:: @ 8D02084
.incbin "graphics/interface/ball/luxury.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Luxury_palette:: @ 8D021B0
gInterfacePal_LuxuryBall:: @ 8D021B0
.incbin "graphics/interface/ball/luxury.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Premier_sheet:: @ 8D021D8
gInterfaceGfx_PremierBall:: @ 8D021D8
.incbin "graphics/interface/ball/premier.4bpp.lz"
.align 2
gFile_graphics_interface_ball_Premier_palette:: @ 8D022C8
gInterfacePal_PremierBall:: @ 8D022C8
.incbin "graphics/interface/ball/premier.gbapal.lz"
.align 2
gFile_graphics_interface_ball_Open_sheet:: @ 8D022E8
gOpenPokeballGfx:: @ 8D022E8
.incbin "graphics/interface/ball_open.4bpp.lz"
.align 2
@@ -1068,12 +1071,57 @@ gBattleInterface_BallStatusBarPal:: @ 8D11B84
gBattleInterface_BallDisplayPal:: @ 8D11BA4
.incbin "graphics/battle_interface/ball_display.gbapal"
gUnknown_8D11BC4:: @ 8D11BC4
.incbin "baserom.gba", 0xD11BC4, 0x840
@ Originally an array?
gHealthboxElementsGfxTable:: @ 8D11BC4
.incbin "graphics/battle_interface/hp_bar.4bpp"
gHealthboxElementsGfxTable_ExpBar::
.incbin "graphics/battle_interface/exp_bar.4bpp"
gHealthboxElementsGfxTable_StatusPsn::
.incbin "graphics/battle_interface/status_psn.4bpp"
gHealthboxElementsGfxTable_StatusPar::
.incbin "graphics/battle_interface/status_par.4bpp"
gHealthboxElementsGfxTable_StatusSlp::
.incbin "graphics/battle_interface/status_slp.4bpp"
gHealthboxElementsGfxTable_StatusFrz::
.incbin "graphics/battle_interface/status_frz.4bpp"
gHealthboxElementsGfxTable_StatusBrn::
.incbin "graphics/battle_interface/status_brn.4bpp"
gHealthboxElementsGfxTable_Misc::
.incbin "graphics/battle_interface/misc.4bpp"
gHealthboxElementsGfxTable_HpBarAnim::
.incbin "graphics/battle_interface/hp_bar_anim.4bpp"
gHealthboxElementsGfxTable_MiscFrameEnd::
.incbin "graphics/battle_interface/misc_frame_end.4bpp"
gUnknown_8D12404::
.incbin "graphics/battle_interface/ball_display.4bpp"
.incbin "baserom.gba", 0xD12484, 0x640
gUnknown_8D12484::
.incbin "graphics/battle_interface/ball_display_unused_extra.4bpp"
gBattleInterfaceGfx_Status2::
.incbin "graphics/battle_interface/status2.4bpp"
gBattleInterfaceGfx_Status3::
.incbin "graphics/battle_interface/status3.4bpp"
gBattleInterfaceGfx_Status4::
.incbin "graphics/battle_interface/status4.4bpp"
gUnknown_8D12A44::
.incbin "graphics/unknown/unknown_D12A44.4bpp"
gUnknown_8D12A64::
.incbin "graphics/unknown/unknown_D12A64.4bpp"
.align 2
gFile_graphics_battle_interface_unused_window3_sheet:: @ 8D12AC4
@@ -1284,8 +1332,8 @@ gFile_graphics_unknown_unknown_D17AB8_tilemap:: @ 8D17AB8
.incbin "graphics/unknown/unknown_D17AB8.bin.lz"
.align 2
gUnknown_8D17BE8:: @ 8D17BE8
.incbin "baserom.gba", 0xD17BE8, 0xB98
gContestMiscGfx:: @ 8D17BE8
.incbin "graphics/contest/misc.4bpp.lz" @ huh? this is the JP one...
.align 2
gFile_graphics_contest_audience_sheet:: @ 8D18780
@@ -1317,7 +1365,7 @@ gFile_graphics_unknown_unknown_D196E4_palette:: @ 8D197D4
.align 2
gUnknown_8D197FC:: @ 8D197FC
.incbin "baserom.gba", 0xD197FC, 0x868
.incbin "graphics/contest/misc_2.4bpp.lz" @ still in JP...
.align 2
gFile_graphics_contest_misc_2_tilemap_1_tilemap:: @ 8D1A064
@@ -1769,19 +1817,19 @@ gBattleAnimSpritePal_Tendrils:: @ 8D1F31C
.align 2
gHealthboxSinglesPlayerGfx:: @ 8D1F340
.incbin "baserom.gba", 0xD1F340, 0x2C4
.incbin "graphics/battle_interface/healthbox_singles_player.4bpp.lz"
.align 2
gHealthboxSinglesOpponentGfx:: @ 8D1F604
.incbin "baserom.gba", 0xD1F604, 0x190
.incbin "graphics/battle_interface/healthbox_singles_opponent.4bpp.lz"
.align 2
gHealthboxDoublesPlayerGfx:: @ 8D1F794
.incbin "baserom.gba", 0xD1F794, 0x194
.incbin "graphics/battle_interface/healthbox_doubles_player.4bpp.lz"
.align 2
gHealthboxDoublesOpponentGfx:: @ 8D1F928
.incbin "baserom.gba", 0xD1F928, 0x194
.incbin "graphics/battle_interface/healthbox_doubles_opponent.4bpp.lz"
.align 2
gHealthboxSafariGfx:: @ 8D1FABC
@@ -8282,8 +8330,10 @@ gMonShinyPalette_Hitmontop:: @ 8DD1E68
gMonIcon_Hitmontop:: @ 8DD1E90
.incbin "graphics/pokemon/hitmontop/icon.4bpp"
gUnknown_hitmontop_unknown_data:: @ 8DD2290
.incbin "baserom.gba", 0xDD2290, 0x200
@ this might be undefined memory garbage. Its all 00s except for 1 0F. Its also not referenced.
.align 2
gUndefined_8DD1E90:: @ 8DD2290
.incbin "data/garbage_8DD2290.bin"
.align 2
gMonFootprint_Hitmontop:: @ 8DD2490
@@ -8627,19 +8677,19 @@ gMonFootprint_Celebi:: @ 8DDCC2C
.align 2
gMonFrontPic_DoubleQuestionMark:: @ 8DDCC4C
.incbin "graphics/pokemon/question_mark/double/front.4bpp.lz"
.incbin "graphics/pokemon/circled_question_mark/double/front.4bpp.lz"
.align 2
gMonPalette_DoubleQuestionMark:: @ 8DDCDD0
.incbin "graphics/pokemon/question_mark/double/normal.gbapal.lz"
.incbin "graphics/pokemon/circled_question_mark/double/normal.gbapal.lz"
.align 2
gMonBackPic_DoubleQuestionMark:: @ 8DDCDE4
.incbin "graphics/pokemon/question_mark/double/back.4bpp.lz"
.incbin "graphics/pokemon/circled_question_mark/double/back.4bpp.lz"
.align 2
gMonShinyPalette_DoubleQuestionMark:: @ 8DDCF68
.incbin "graphics/pokemon/question_mark/double/shiny.gbapal.lz"
.incbin "graphics/pokemon/circled_question_mark/double/shiny.gbapal.lz"
.align 2
gMonFrontPic_Treecko:: @ 8DDCF7C
@@ -13441,11 +13491,11 @@ gTrainerPalette_OldManBackPic:: @ 8E76F34
.align 2
gMonIcon_QuestionMark:: @ 8E76F5C
.incbin "graphics/pokemon/question_mark/icon.4bpp"
.incbin "graphics/pokemon/circled_question_mark/icon.4bpp"
.align 2
gMonFootprint_QuestionMark:: @ 8E7735C
.incbin "graphics/pokemon/question_mark/footprint.1bpp"
.incbin "graphics/pokemon/circled_question_mark/footprint.1bpp"
.align 2
gFile_graphics_battle_transitions_vs_frame_sheet:: @ 8E7737C
@@ -13588,16 +13638,16 @@ gBattleAnimSpritePal_IcicleSpear:: @ 8E7A858
.incbin "graphics/battle_anims/sprites/262.gbapal.lz"
.align 2
gUnknown_8E7A880:: @ 8E7A880
.incbin "baserom.gba", 0xE7A880, 0x5C
gContestNextTurnGfx:: @ 8E7A880
.incbin "graphics/contest/next_turn.4bpp.lz"
.align 2
gFile_graphics_contest_nextturn_numbers:: @ 8E7A8DC
.incbin "graphics/contest/nextturn_numbers.4bpp"
.incbin "graphics/contest/next_turn_numbers.4bpp"
.align 2
gFile_graphics_contest_nextturn_random:: @ 8E7A95C
.incbin "graphics/contest/nextturn_random.4bpp"
.incbin "graphics/contest/next_turn_random.4bpp"
.align 2
gBattleAnimSpriteGfx_GlowyRedOrb:: @ 8E7A97C
@@ -13620,8 +13670,8 @@ gBattleAnimSpritePal_StunSpore:: @ 8E7A9EC
.incbin "graphics/battle_anims/sprites/068.gbapal.lz"
.align 2
gUnknown_8E7AA0C:: @ 8E7AA0C
.incbin "baserom.gba", 0xE7AA0C, 0x12C
gContestApplauseGfx:: @ 8E7AA0C
.incbin "graphics/contest/applause.4bpp.lz"
.align 2
gFile_graphics_contest_applause_meter:: @ 8E7AB38
@@ -13629,7 +13679,7 @@ gFile_graphics_contest_applause_meter:: @ 8E7AB38
.align 2
gFile_graphics_contest_nextturn:: @ 8E7ABB8
.incbin "graphics/contest/nextturn.gbapal"
.incbin "graphics/contest/next_turn.gbapal"
.align 2
gBattleAnimSpriteGfx_Splash:: @ 8E7ABD8
@@ -13701,7 +13751,7 @@ gFile_graphics_battle_interface_ball_status_bar_sheet:: @ 8E7BB04
.align 2
gMonIcon_Egg:: @ 8E7BB88
.incbin "baserom.gba", 0xE7BB88, 0x400 @UNKNOWN
.incbin "graphics/pokemon/egg/icon.4bpp"
.align 2
gBattleAnimBgImage_Ghost:: @ 8E7BF88
@@ -13897,7 +13947,7 @@ gPartyMenuBg_Gfx:: @ 8E82700
.align 2
gPartyMenuBg_Pal:: @ 8E829C8
.incbin "baserom.gba", 0xE829C8, 0xE8
.incbin "graphics/interface/party_menu_misc.gbapal.lz"
.align 2
gPartyMenuBg_Tilemap:: @ 8E82AB0
@@ -13917,7 +13967,7 @@ gPartyMenuPokeball_Pal:: @ 8E82E7C
.align 2
gStatusGfx_Icons:: @ 8E82EA0
.incbin "baserom.gba", 0xE82EA0, 0x204
.incbin "graphics/interface/status_icons.4bpp.lz"
.align 2
gStatusPal_Icons:: @ 8E830A4
@@ -13925,19 +13975,23 @@ gStatusPal_Icons:: @ 8E830A4
.align 2
gUnknown_8E830CC:: @ 8E830CC
.incbin "baserom.gba", 0xE830CC, 0x1F4
.incbin "graphics/item_menu/bag_tiles.4bpp.lz" @ bag tiles
.align 2
gUnknown_8E832C0:: @ 8E832C0
.incbin "baserom.gba", 0xE832C0, 0x184
.incbin "graphics/item_menu/bag_tilemap1.bin.lz" @ bag menu
.align 2
gUnknown_8E83444:: @ 8E83444
.incbin "baserom.gba", 0xE83444, 0x170
.incbin "graphics/item_menu/bag_tilemap2.bin.lz" @ PC deposit items
.align 2
gUnknown_8E835B4:: @ 8E835B4
.incbin "baserom.gba", 0xE835B4, 0x50
.incbin "graphics/item_menu/bag_pal1.gbapal.lz" @ palette 1 (Boy + misc Pal)
.align 2
gUnknown_8E83604:: @ 8E83604
.incbin "baserom.gba", 0xE83604, 0x28
.incbin "graphics/item_menu/bag_pal2.gbapal.lz" @ palette 2 (Girl)
gUnknown_8E8362C:: @ 8E8362C
.incbin "graphics/interface/unk_8E8362C.4bpp.lz"
@@ -14008,20 +14062,20 @@ gBerryPouchSpritePalette:: @ 8E85C1C
gBerryPouchBg1Tilemap:: @ 8E85C44
.incbin "graphics/berry_pouch/unk_8E85C44.bin.lz"
gUnknown_8E85DC8:: @ 8E85DC8
.incbin "baserom.gba", 0xE85DC8, 0x134
gBuyMenuFrame_Gfx:: @ 8E85DC8
.incbin "graphics/shop_menu/shop_menu.4bpp.lz"
gUnknown_8E85EFC:: @ 8E85EFC
.incbin "baserom.gba", 0xE85EFC, 0x13C
gBuyMenuFrame_Tilemap:: @ 8E85EFC
.incbin "graphics/shop_menu/shop_tilemap.bin"
gUnknown_8E86038:: @ 8E86038
.incbin "baserom.gba", 0xE86038, 0x138
gBuyMenuFrame_TmHmTilemap:: @ 8E86038
.incbin "graphics/shop_menu/shop_tm_hm_tilemap.bin"
gUnknown_8E86170:: @ 8E86170
.incbin "baserom.gba", 0xE86170, 0x38
gBuyMenuFrame_Pal:: @ 8E86170
.incbin "graphics/shop_menu/shop_menu.gbapal.lz"
gUnknown_8E861A8:: @ 8E861A8
.incbin "baserom.gba", 0xE861A8, 0x98
.incbin "graphics/unknown/unknown_E861A8.bin.lz" @ hmm what is this.
gUnknown_8E86240:: @ 8E86240
.incbin "graphics/teachy_tv/tiles.4bpp.lz"
@@ -14036,7 +14090,7 @@ gUnknown_8E86F98:: @ 8E86F98
.incbin "graphics/teachy_tv/palettes.gbapal.lz"
gUnknown_8E87010:: @ 8E87010
.incbin "baserom.gba", 0xE87010, 0x18
.incbin "graphics/unknown/unknown_E87010.gbapal.lz"
@ THIS IS ITEM ICONS
.align 2
@@ -15929,10 +15983,11 @@ gBattleAnimSpriteGfx_Sparkle6:: @ 8E93AB4
.align 2
gGhostPalette:: @ 8E93B14
.incbin "baserom.gba", 0xE93B14, 0x24
.incbin "graphics/pokemon/ghost/front.gbapal.lz"
.align 2
gGhostFrontPic:: @ 8E93B38
.incbin "baserom.gba", 0xE93B38, 0x368
.incbin "graphics/pokemon/ghost/front.4bpp.lz"
gFile_graphics_mail_orange_palette_pal:: @ 8E93EA0
.incbin "graphics/mail/orange/palette.gbapal"
@@ -16077,52 +16132,103 @@ gFireRedMenuElements_Gfx:: @ 8E95DDC
.incbin "graphics/interface/dex_caught_pokeball_and_pokemon_types.4bpp"
gUnknown_8E97DDC:: @ 8E97DDC
.incbin "baserom.gba", 0xE97DDC, 0x20 @UNKNOWN
.incbin "graphics/interface/learn_move.gbapal"
gUnknown_8E97DFC:: @ 8E97DFC
.incbin "baserom.gba", 0xE97DFC, 0xC8
.incbin "graphics/interface/learn_move.4bpp.lz"
gUnknown_8E97EC4:: @ 8E97EC4
.incbin "baserom.gba", 0xE97EC4, 0x120
.incbin "graphics/interface/learn_move.bin.lz"
gUnknown_8E97FE4:: @ 8E97FE4
.incbin "baserom.gba", 0xE97FE4, 0x40 @UNKNOWN
.incbin "graphics/interface/naming_screen_8E97FE4.gbapal" @ TODO: Find the image this goes with
gUnknown_8E98004:: @ 8E98004
.incbin "graphics/interface/naming_screen_8E98004.gbapal"
gUnknown_8E98024:: @ 8E98024
.incbin "baserom.gba", 0xE98024, 0xC0 @UNKNOWN
.incbin "graphics/interface/naming_screen_8E98024.gbapal"
gUnknown_8E98044:: @ 8E98044
.incbin "graphics/interface/naming_screen_8E98044.gbapal"
gUnknown_8E98064:: @ 8E98064
.incbin "graphics/interface/naming_screen_8E98064.gbapal"
gUnknown_8E98084:: @ 8E98084
.incbin "graphics/interface/naming_screen_8E98084.gbapal"
gUnknown_8E980A4:: @ 8E980A4
.incbin "graphics/interface/naming_screen_8E980A4.gbapal"
gUnknown_8E980C4:: @ 8E980C4
.incbin "graphics/interface/naming_screen_8E980C4.gbapal"
gUnknown_8E980E4:: @ 8E980E4
.incbin "baserom.gba", 0xE980E4, 0x1D8
.incbin "graphics/interface/naming_screen_menu.4bpp.lz"
gUnknown_8E982BC:: @ 8E982BC
.incbin "baserom.gba", 0xE982BC, 0xDC
.incbin "graphics/interface/naming_screen_menu.bin.lz"
gUnknown_8E98398:: @ 8E98398
.incbin "baserom.gba", 0xE98398, 0xC0
.incbin "graphics/interface/naming_screen_E98398.bin.lz"
gUnknown_8E98458:: @ 8E98458
.incbin "baserom.gba", 0xE98458, 0xC0
.incbin "graphics/interface/naming_screen_E98458.bin.lz"
gUnknown_8E98518:: @ 8E98518
.incbin "baserom.gba", 0xE98518, 0xC0
.incbin "graphics/interface/naming_screen_E98518.bin.lz"
gUnknown_8E985D8:: @ 8E985D8
.incbin "baserom.gba", 0xE985D8, 0xB40 @UNKNOWN, FALSEPOSITIVE?
.incbin "graphics/interface/naming_screen_8E985D8.4bpp"
gUnknown_8E98858:: @ 8E98858
.incbin "graphics/interface/naming_screen_8E98858.4bpp"
gUnknown_8E98A38:: @ 8E98A38
.incbin "graphics/interface/naming_screen_8E98A38.4bpp"
gUnknown_8E98C18:: @ 8E98C18
.incbin "graphics/interface/naming_screen_8E98C18.4bpp"
gUnknown_8E98CB8:: @ 8E98CB8
.incbin "graphics/interface/naming_screen_8E98CB8.4bpp"
gUnknown_8E98D58:: @ 8E98D58
.incbin "graphics/interface/naming_screen_8E98D58.4bpp"
gUnknown_8E98DF8:: @ 8E98DF8
.incbin "graphics/interface/naming_screen_8E98DF8.4bpp"
gUnknown_8E98E98:: @ 8E98E98
.incbin "graphics/interface/naming_screen_8E98E98.4bpp"
gUnknown_8E98F38:: @ 8E98F38
.incbin "graphics/interface/naming_screen_8E98F38.4bpp"
gUnknown_8E98FD8:: @ 8E98FD8
.incbin "graphics/interface/naming_screen_8E98FD8.4bpp"
gUnknown_8E990D8:: @ 8E990D8
.incbin "graphics/interface/naming_screen_8E990D8.4bpp"
gUnknown_8E990F8:: @ 8E990F8
.incbin "graphics/interface/naming_screen_8E990F8.4bpp"
gUnknown_8E99118:: @ 8E99118
.incbin "graphics/tm_case/unk_8E99118.4bpp"
gUnknown_8E99198::
.incbin "baserom.gba", 0xE99198, 0x60 @UNKNOWN
.incbin "graphics/trainer_card/0star.gbapal"
gUnknown_8E991F8:: @ 8E991F8
.incbin "baserom.gba", 0xE991F8, 0x674
.incbin "graphics/trainer_card/card.4bpp.lz"
gUnknown_8E9986C:: @ 8E9986C
.incbin "baserom.gba", 0xE9986C, 0x60 @UNKNOWN
.incbin "graphics/trainer_card/0star_em.gbapal"
gUnknown_8E998CC:: @ 8E998CC
.incbin "baserom.gba", 0xE998CC, 0x4C0
.incbin "graphics/trainer_card/card_em.4bpp.lz"
gUnknown_8E99D8C:: @ 8E99D8C
.incbin "graphics/link_rfu/unk_8E99DAC.gbapal"
@@ -16143,70 +16249,73 @@ gUnknown_8E9A168:: @ 8E9A168
.incbin "graphics/link_rfu/unk_8E9A168.4bpp.lz"
gUnknown_8E9A460:: @ 8E9A460
.incbin "baserom.gba", 0xE9A460, 0xEB0
.incbin "graphics/interface/trainer_memo.4bpp.lz"
gUnknown_8E9B310:: @ 8E9B310
.incbin "baserom.gba", 0xE9B310, 0xC0 @UNKNOWN
.incbin "graphics/interface/trainer_memo_pal1.gbapal"
gUnknown_8E9B3B0:: @ 8E9B3B0
.incbin "graphics/interface/trainer_memo_pal2.gbapal"
gUnknown_8E9B3D0:: @ 8E9B3D0
.incbin "baserom.gba", 0xE9B3D0, 0x20 @UNKNOWN
.incbin "graphics/interface/trainer_memo_pal3.gbapal"
gUnknown_8E9B3F0:: @ 8E9B3F0
.incbin "baserom.gba", 0xE9B3F0, 0xC8
.incbin "graphics/interface/summary_exp_bar.4bpp.lz"
gUnknown_8E9B4B8:: @ 8E9B4B8
.incbin "baserom.gba", 0xE9B4B8, 0xC0
.incbin "graphics/interface/summary_hp_bar.4bpp.lz"
gUnknown_8E9B578:: @ 8E9B578
.incbin "baserom.gba", 0xE9B578, 0x20 @UNKNOWN
.incbin "graphics/interface/summary_exp_bar.gbapal" @ hp bar uses this too
gUnknown_8E9B598:: @ 8E9B598
.incbin "baserom.gba", 0xE9B598, 0x1B8
.incbin "graphics/interface/trainer_memo.bin.lz"
gUnknown_8E9B750:: @ 8E9B750
.incbin "baserom.gba", 0xE9B750, 0x200
.incbin "graphics/interface/trainer_memo_2.bin.lz"
gUnknown_8E9B950:: @ 8E9B950
.incbin "baserom.gba", 0xE9B950, 0x14C
.incbin "graphics/interface/trainer_memo_3.bin.lz"
gUnknown_8E9BA9C:: @ 8E9BA9C
.incbin "baserom.gba", 0xE9BA9C, 0x130
.incbin "graphics/interface/trainer_memo_4.bin.lz"
gUnknown_8E9BBCC:: @ 8E9BBCC
.incbin "baserom.gba", 0xE9BBCC, 0x13C
.incbin "graphics/interface/trainer_memo_5.bin.lz"
gUnknown_8E9BD08:: @ 8E9BD08
.incbin "baserom.gba", 0xE9BD08, 0x20 @UNKNOWN
.incbin "graphics/unknown/unknown_E9BD08.gbapal" @ might be an alternate unused palette of the link_rfu gfx below.
gUnknown_8E9BD28:: @ 8E9BD28
.incbin "baserom.gba", 0xE9BD28, 0x200
.incbin "graphics/interface/link_rfu_frame.4bpp.lz"
gUnknown_8E9BF28:: @ 8E9BF28
.incbin "baserom.gba", 0xE9BF28, 0x20 @UNKNOWN
.incbin "graphics/interface/link_rfu_frame.gbapal"
gUnknown_8E9BF48:: @ 8E9BF48
.incbin "baserom.gba", 0xE9BF48, 0x204
.incbin "graphics/interface/link_rfu_status.4bpp.lz"
gUnknown_8E9C14C:: @ 8E9C14C
.incbin "baserom.gba", 0xE9C14C, 0x20 @UNKNOWN
.incbin "graphics/interface/pokedex_abc.gbapal"
gUnknown_8E9C16C:: @ 8E9C16C
.incbin "baserom.gba", 0xE9C16C, 0x26C
.incbin "graphics/interface/pokedex_abc.4bpp.lz"
gUnknown_8E9C3D8:: @ 8E9C3D8
.incbin "baserom.gba", 0xE9C3D8, 0x20 @UNKNOWN
.incbin "graphics/interface/box_tiles_pal1.gbapal"
gUnknown_8E9C3F8:: @ 8E9C3F8
.incbin "baserom.gba", 0xE9C3F8, 0x20 @UNKNOWN
.incbin "graphics/interface/box_tiles_pal2.gbapal"
gUnknown_8E9C418:: @ 8E9C418
.incbin "baserom.gba", 0xE9C418, 0x20 @UNKNOWN
.incbin "graphics/interface/box_tiles_pal3.gbapal"
gUnknown_8E9C438:: @ 8E9C438
.incbin "baserom.gba", 0xE9C438, 0x6B4
.incbin "graphics/interface/box_tiles.4bpp.lz"
gUnknown_8E9CAEC:: @ 8E9CAEC
.incbin "baserom.gba", 0xE9CAEC, 0xB0
.incbin "graphics/unknown/unknown_E9CAEC.bin.lz"
gUnknown_8E9CB9C:: @ 8E9CB9C
.incbin "graphics/misc/markings2.gbapal"
@@ -16248,16 +16357,16 @@ gFameCheckerBg2Tilemap:: @ 8EA0F00
.incbin "data/graphics/fame_checker_tilemap2.bin"
gUnknown_8EA1700:: @ 8EA1700
.incbin "baserom.gba", 0xEA1700, 0x20 @UNKNOWN
.incbin "graphics/interface/union_room_chat.gbapal"
gUnknown_8EA1720:: @ 8EA1720
.incbin "baserom.gba", 0xEA1720, 0x238
.incbin "graphics/interface/union_room_chat.4bpp.lz"
gUnknown_8EA1958:: @ 8EA1958
.incbin "baserom.gba", 0xEA1958, 0xF8
.incbin "graphics/interface/union_room_chat.bin.lz"
gUnknown_8EA1A50:: @ 8EA1A50
.incbin "baserom.gba", 0xEA1A50, 0x118
.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"
.align 2
gTilesetPalettes_8EA1B68:: @ 8EA1B68
@@ -16382,13 +16491,13 @@ gTilesetTiles_8EA9F88:: @ 8EA9F88
.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
gUnknown_8EAA9F0:: @ 8EAA9F0
.incbin "baserom.gba", 0xEAA9F0, 0x20 @UNKNOWN
.incbin "graphics/interface/union_room_chat_panel.gbapal"
gUnknown_8EAAA10:: @ 8EAAA10
.incbin "baserom.gba", 0xEAAA10, 0x5C
.incbin "graphics/interface/union_room_chat_panel.4bpp.lz"
gUnknown_8EAAA6C:: @ 8EAAA6C
.incbin "baserom.gba", 0xEAAA6C, 0xAC
.incbin "graphics/interface/union_room_chat_panel.bin.lz"
gCreditsMonBackdropPals:: @ 8EAAB18
.incbin "graphics/credits/charizard.gbapal"
@@ -16446,21 +16555,27 @@ gCreditsAllRightsReservedGfxMap:: @ 8EAE900
.incbin "graphics/credits/unk_8EAE548.bin.lz"
gUnknown_8EAEA00:: @ 8EAEA00
.incbin "baserom.gba", 0xEAEA00, 0x20 @UNKNOWN
.incbin "graphics/link/gba.gbapal"
gTradeGba2_Pal:: @ 8EAEA20
.incbin "baserom.gba", 0xEAEA20, 0x60 @UNKNOWN
.incbin "graphics/link/gba_pal2.gbapal"
gTradeGba_Gfx:: @ 8EAEA80
.incbin "baserom.gba", 0xEAEA80, 0x1420 @UNKNOWN
.incbin "graphics/link/gba.4bpp"
gUnknown_8EAFE80:: @ 8EAFE80
.incbin "graphics/interface/blank2.gbapal"
gUnknown_8EAFEA0:: @ 8EAFEA0
.incbin "baserom.gba", 0xEAFEA0, 0x120 @UNKNOWN
.incbin "graphics/berry_crush/berry_crush.gbapal"
gUnknown_8EAFF60:: @ 8EAFF60
.incbin "graphics/unknown/unknown_EAFF60.gbapal" @ seems to be unused. Loaded palette for above is 0xC0 so this is unused.
gUnknown_8EAFFC0:: @ 8EAFFC0
.incbin "baserom.gba", 0xEAFFC0, 0xB1C
.incbin "graphics/berry_crush/berry_crush.4bpp.lz"
gUnknown_8EB0ADC:: @ 8EB0ADC
.incbin "baserom.gba", 0xEB0ADC, 0x44
.incbin "graphics/berry_crush/data_EB0ADC.bin.lz" @ TODO: What is this?
@ EOF
+350 -51
View File
@@ -6,154 +6,453 @@
.section .rodata
.align 2
.incbin "baserom.gba", 0x3E1800, 0xA80
gUnknown_83E1800:: @ 83E1800
.incbin "graphics/interface/naming_screen_83E1800.4bpp"
gUnknown_83E18C0:: @ 83E18C0
.incbin "graphics/interface/naming_screen_83E18C0.4bpp"
gUnknown_83E1980:: @ 83E1980
.incbin "graphics/interface/naming_screen_83E1980.4bpp"
gUnknown_83E2280:: @ 83E2280
.incbin "baserom.gba", 0x3E2280, 0x10
.4byte Text_1A5CF1
.4byte Text_1A5D31
.4byte Text_1A5D6E
.4byte Text_1A5DB1
gUnknown_83E2290:: @ 83E2290
.incbin "baserom.gba", 0x3E2290, 0x10
.4byte 0x000001e0
@ {
@ .bg = 0,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 30,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 0,
@ .baseTile = 0x0000
@ }
.4byte 0x000011d9
@ {
@ .bg = 1,
@ .charBaseIndex = 2,
@ .mapBaseIndex = 29,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 1,
@ .baseTile = 0x0000
@ }
.4byte 0x000021ca
@ {
@ .bg = 2,
@ .charBaseIndex = 2,
@ .mapBaseIndex = 28,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 2,
@ .baseTile = 0x0000
@ }
.4byte 0x000031ff
@ {
@ .bg = 3,
@ .charBaseIndex = 3,
@ .mapBaseIndex = 31,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 3,
@ .baseTile = 0x0000
@ }
gUnknown_83E22A0:: @ 83E22A0
.incbin "baserom.gba", 0x3E22A0, 0x30
.byte 1, 3, 10, 19, 8, 10
.2byte 0x0030
@ {
@ .bg = 1,
@ .tilemapLeft = 3,
@ .tilemapTop = 10,
@ .width = 19,
@ .height = 8,
@ .paletteNum = 10,
@ .baseBlock = 0x0030
@ }
.byte 2, 3, 10, 19, 8, 10
.2byte 0x00c8
@ {
@ .bg = 2,
@ .tilemapLeft = 3,
@ .tilemapTop = 10,
@ .width = 19,
@ .height = 8,
@ .paletteNum = 10,
@ .baseBlock = 0x00c8
@ }
.byte 3, 8, 6, 14, 2, 10
.2byte 0x0030
@ {
@ .bg = 3,
@ .tilemapLeft = 8,
@ .tilemapTop = 6,
@ .width = 14,
@ .height = 2,
@ .paletteNum = 10,
@ .baseBlock = 0x0030
@ }
.byte 3, 9, 4, 16, 2, 10
.2byte 0x004c
@ {
@ .bg = 3,
@ .tilemapLeft = 9,
@ .tilemapTop = 4,
@ .width = 16,
@ .height = 2,
@ .paletteNum = 10,
@ .baseBlock = 0x004c
@ }
.byte 0, 0, 0, 30, 2, 11
.2byte 0x006c
@ {
@ .bg = 0,
@ .tilemapLeft = 0,
@ .tilemapTop = 0,
@ .width = 30,
@ .height = 2,
@ .paletteNum = 11,
@ .baseBlock = 0x006c
@ }
.byte 255, 0, 0, 0, 0, 0
.2byte 0x0000
@ {
@ .bg = 255,
@ .tilemapLeft = 0,
@ .tilemapTop = 0,
@ .width = 0,
@ .height = 0,
@ .paletteNum = 0,
@ .baseBlock = 0x0000
@ }
gUnknown_83E22D0:: @ 83E22D0
.incbin "baserom.gba", 0x3E22D0, 0x60
.string "abcdef .", 8
.string "ghijkl ,", 8
.string "mnopqrs", 8
.string "tuvwxyz", 8
.string "ABCDEF .", 8
.string "GHIJKL ,", 8
.string "MNOPQRS", 8
.string "TUVWXYZ", 8
.string "01234", 8
.string "56789", 8
.string "!?/-", 8
.string "'", 8
gUnknown_83E2330:: @ 83E2330
.incbin "baserom.gba", 0x3E2330, 0x3
.byte 0x08, 0x08, 0x06
gUnknown_83E2333:: @ 83E2333
.incbin "baserom.gba", 0x3E2333, 0x18
.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x16, 0x2c, 0x42, 0x58, 0x6e, 0x00, 0x00
gUnknown_83E234B:: @ 83E234B
.incbin "baserom.gba", 0x3E234B, 0x3
.byte 0x00, 0x02, 0x01
gUnknown_83E234E:: @ 83E234E
.incbin "baserom.gba", 0x3E234E, 0x3
.byte 0x01, 0x00, 0x02
gUnknown_83E2351:: @ 83E2351
.incbin "baserom.gba", 0x3E2351, 0x3
.byte 0x02, 0x01, 0x00
gUnknown_83E2354:: @ 83E2354
.incbin "baserom.gba", 0x3E2354, 0x10
.4byte sub_809E384
.4byte sub_809E3AC
.4byte sub_809E440
.4byte sub_809E4D4
gUnknown_83E2364:: @ 83E2364
.incbin "baserom.gba", 0x3E2364, 0x8
.2byte 0x0000, 0xfffc, 0xfffe, 0xffff
gUnknown_83E236C:: @ 83E236C
.incbin "baserom.gba", 0x3E236C, 0x8
.2byte 0x0002, 0x0003, 0x0002, 0x0001
gUnknown_83E2374:: @ 83E2374
.incbin "baserom.gba", 0x3E2374, 0x4
.byte 0x01, 0x02, 0x03, 0x00
gUnknown_83E2378:: @ 83E2378
.incbin "baserom.gba", 0x3E2378, 0x10
.4byte sub_809EC7C
.4byte sub_809ECD0
.4byte sub_809ECD4
.4byte sub_809ED48
gUnknown_83E2388:: @ 83E2388
.incbin "baserom.gba", 0x3E2388, 0x6
.2byte 0x0001, 0x0003, 0x0002
gUnknown_83E238E:: @ 83E238E
.incbin "baserom.gba", 0x3E238E, 0x6
.2byte 0x0004, 0x0006, 0x0005
gUnknown_83E2394:: @ 83E2394
.incbin "baserom.gba", 0x3E2394, 0x28
.4byte nullsub_54
.4byte sub_809EF54
.4byte sub_809EFB0
.4byte sub_809EFF0
.4byte sub_809F04C
gUnknown_83E23A8:: @ 83E23A8
obj_image_anim_frame 0, 10
obj_image_anim_frame 24, 10
obj_image_anim_frame 0, 10
obj_image_anim_frame 32, 10
obj_image_anim_jump 0
gUnknown_83E23BC:: @ 83E23BC
.incbin "baserom.gba", 0x3E23BC, 0x4
.4byte gUnknown_83E23A8
gUnknown_83E23C0:: @ 83E23C0
.incbin "baserom.gba", 0x3E23C0, 0x8
obj_tiles gUnknown_83E1980, 0x0900, 255
gUnknown_83E23C8:: @ 83E23C8
.incbin "baserom.gba", 0x3E23C8, 0x8
obj_pal gUnknown_8E98004, 255
gUnknown_83E23D0:: @ 83E23D0
.incbin "baserom.gba", 0x3E23D0, 0x10
.4byte sub_809F11C
.4byte KeyboardKeyHandler_Page
.4byte KeyboardKeyHandler_Backspace
.4byte KeyboardKeyHandler_OK
gUnknown_83E23E0:: @ 83E23E0
.incbin "baserom.gba", 0x3E23E0, 0x8
.4byte InputState_Disabled
.4byte InputState_Enabled
gUnknown_83E23E8:: @ 83E23E8
.incbin "baserom.gba", 0x3E23E8, 0xA
.2byte 0x0000, 0x0000, 0x0000, 0xffff, 0x0001
gUnknown_83E23F2:: @ 83E23F2
.incbin "baserom.gba", 0x3E23F2, 0xA
.2byte 0x0000, 0xffff, 0x0001, 0x0000, 0x0000
gUnknown_83E23FC:: @ 83E23FC
.incbin "baserom.gba", 0x3E23FC, 0x8
.2byte 0x0000, 0x0001, 0x0001, 0x0002
gUnknown_83E2404:: @ 83E2404
.incbin "baserom.gba", 0x3E2404, 0x8
.2byte 0x0000, 0x0000, 0x0003, 0x0000
gUnknown_83E240C:: @ 83E240C
.incbin "baserom.gba", 0x3E240C, 0x14
.4byte sub_809F49C
.4byte sub_809F49C
.4byte sub_809F4F0
.4byte sub_809F4F0
.4byte sub_809F49C
gUnknown_83E2420:: @ 83E2420
.incbin "baserom.gba", 0x3E2420, 0x8
.4byte nullsub_55
.4byte sub_809F5C4
gUnknown_83E2428:: @ 83E2428
.incbin "baserom.gba", 0x3E2428, 0x14
.byte 0x00, 0x09, 0x08, 0x00
.byte 0x05, 0x04, 0x00, 0x00
gUnknown_83E2430:: @ 83E2430
.byte 0x0d, 0x01, 0x02, 0x00
gUnknown_83E2434:: @ 83E2434
.byte 0x0e, 0x01, 0x02, 0x00
gUnknown_83E2438:: @ 83E2438
.byte 0x0f, 0x01, 0x02, 0x00
gUnknown_83E243C:: @ 83E243C
.incbin "baserom.gba", 0x3E243C, 0x4
.byte 0xee, 0xdd, 0xff, 0x00
gUnknown_83E2440:: @ 83E2440
.incbin "baserom.gba", 0x3E2440, 0xC
.4byte gUnknown_83E2434
.4byte gUnknown_83E2430
.4byte gUnknown_83E2438
gUnknown_83E244C:: @ 83E244C
.incbin "baserom.gba", 0x3E244C, 0xC
.4byte gUnknown_8E98398
.4byte gUnknown_8E98458
.4byte gUnknown_8E98518
gUnknown_83E2458:: @ 83E2458
.incbin "baserom.gba", 0x3E2458, 0x34
.byte 0x0f, 0x01, 0x02
.align 2
gUnknown_83E245C:: @ 83E245C
.byte 0x00, 0x07, 0x01, 0x00, 0x01
.align 2
.4byte gUnknown_8418E47
gUnknown_83E2468:: @ 83E2468
.byte 0x00, 0x08, 0x02, 0x00, 0x01
.align 2
.4byte gUnknown_8418E52
gUnknown_83E2474:: @ 83E2474
.byte 0x00, 0x0a, 0x03, 0x01, 0x01
.align 2
.4byte gUnknown_8418E5C
gUnknown_83E2480:: @ 83E2480
.byte 0x00, 0x07, 0x04, 0x00, 0x01
.align 2
.4byte gUnknown_8418E69
gUnknown_83E248C:: @ 83E248C
.incbin "baserom.gba", 0x3E248C, 0x78
.4byte gUnknown_83E245C
.4byte gUnknown_83E2468
.4byte gUnknown_83E2474
.4byte gUnknown_83E2474
.4byte gUnknown_83E2480
gUnknown_83E24A0:: @ 83E24A0
.4byte 0x00000000, 0x00000000
gUnknown_83E24A8:: @ 3E24A8
.4byte 0x40000000, 0x00000000
gUnknown_83E24B0:: @ 3E24B0
.4byte 0x80004000, 0x00000000
gUnknown_83E24B8:: @ 83E24B8
subsprite 236, 240, 1, 0x0000, 32x8
subsprite 12, 240, 1, 0x0004, 8x8
subsprite 236, 248, 1, 0x0005, 32x8
subsprite 12, 248, 1, 0x0009, 8x8
subsprite 236, 0, 1, 0x000a, 32x8
subsprite 12, 0, 1, 0x000e, 8x8
subsprite 236, 8, 1, 0x000f, 32x8
subsprite 12, 8, 1, 0x0013, 8x8
gUnknown_83E24D8:: @ 83E24D8
subsprite 244, 252, 1, 0x0000, 16x8
subsprite 4, 252, 1, 0x0002, 8x8
gUnknown_83E24E0:: @ 83E24E0
subsprite 236, 244, 1, 0x0000, 32x8
subsprite 12, 244, 1, 0x0004, 8x8
subsprite 236, 252, 1, 0x0005, 32x8
subsprite 12, 252, 1, 0x0009, 8x8
subsprite 236, 4, 1, 0x000a, 32x8
subsprite 12, 4, 1, 0x000e, 8x8
gUnknown_83E24F8::
subsprite 248, 244, 3, 0x0000, 16x8
subsprite 248, 252, 3, 0x0002, 16x8
subsprite 248, 4, 3, 0x0004, 16x8
gUnknown_83E2504:: @ 83E2504
.incbin "baserom.gba", 0x3E2504, 0x8
.byte 0x08
.align 2
.4byte gUnknown_83E24B8
gUnknown_83E250C:: @ 83E250C
.incbin "baserom.gba", 0x3E250C, 0x18
.byte 0x02
.align 2
.4byte gUnknown_83E24D8
.byte 0x02
.align 2
.4byte gUnknown_83E24D8
.byte 0x02
.align 2
.4byte gUnknown_83E24D8
gUnknown_83E2524:: @ 83E2524
.incbin "baserom.gba", 0x3E2524, 0x8
.byte 0x06
.align 2
.4byte gUnknown_83E24E0
gUnknown_83E252C:: @ 83E252C
.incbin "baserom.gba", 0x3E252C, 0x48
.byte 0x03
.align 2
.4byte gUnknown_83E24F8
gUnknown_83E2534:: @ 83E2534
obj_frame_tiles gUnknown_83E1800, 0x00c0
obj_frame_tiles gUnknown_83E18C0, 0x00c0
gUnknown_83E2544:: @ 83E2544
obj_image_anim_frame 0, 1
obj_image_anim_jump 0
gUnknown_83E254C:: @ 83E254C
obj_image_anim_frame 4, 8
obj_image_anim_frame 8, 8
obj_image_anim_end
gUnknown_83E2558:: @ 83E2558
obj_image_anim_frame 0, 2
obj_image_anim_frame 1, 2
obj_image_anim_jump 0
gUnknown_83E2564:: @ 83E2564
.4byte gUnknown_83E2544
gUnknown_83E2568:: @ 83E2568
.4byte gUnknown_83E2544
.4byte gUnknown_83E254C
gUnknown_83E2570:: @ 83E2570
.4byte gUnknown_83E2558
gUnknown_83E2574:: @ 83E2574
.incbin "baserom.gba", 0x3E2574, 0x18
spr_template 2, 4, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809EC54
gUnknown_83E258C:: @ 83E258C
.incbin "baserom.gba", 0x3E258C, 0x18
spr_template 3, 1, gUnknown_83E24B0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83E25A4:: @ 83E25A4
.incbin "baserom.gba", 0x3E25A4, 0x18
spr_template 4, 4, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83E25BC:: @ 83E25BC
.incbin "baserom.gba", 0x3E25BC, 0x18
spr_template 0, 6, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83E25D4:: @ 83E25D4
.incbin "baserom.gba", 0x3E25D4, 0x18
spr_template 1, 7, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83E25EC:: @ 83E25EC
.incbin "baserom.gba", 0x3E25EC, 0x18
spr_template 7, 5, gUnknown_83E24A8, gUnknown_83E2568, NULL, gDummySpriteAffineAnimTable, sub_809E700
gUnknown_83E2604:: @ 83E2604
.incbin "baserom.gba", 0x3E2604, 0x18
spr_template 10, 3, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809E7F0
gUnknown_83E261C:: @ 83E261C
.incbin "baserom.gba", 0x3E261C, 0x18
spr_template 11, 3, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809E83C
gUnknown_83E2634:: @ 83E2634
.incbin "baserom.gba", 0x3E2634, 0x18
spr_template 65535, 0, gUnknown_83E24A0, gUnknown_83E2570, gUnknown_83E2534, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83E264C:: @ 83E264C
.incbin "baserom.gba", 0x3E264C, 0x30
.4byte gUnknown_847A955
.4byte gUnknown_847A976
.4byte gUnknown_847A997
.4byte gUnknown_847A9B8
.4byte gUnknown_847A9D9
.4byte gUnknown_847A9FA
.4byte gUnknown_847AA1B
.4byte gUnknown_847AA3C
.4byte gUnknown_847AA5D
.4byte gUnknown_847AA76
.4byte gUnknown_847AA8F
.4byte gUnknown_847AAA8
gUnknown_83E267C:: @ 83E267C
.incbin "baserom.gba", 0x3E267C, 0x68
obj_tiles gUnknown_8E98858, 0x01e0, 0
obj_tiles gUnknown_8E98A38, 0x01e0, 1
obj_tiles gUnknown_8E985D8, 0x0280, 2
obj_tiles gUnknown_8E98FD8, 0x0100, 3
obj_tiles gUnknown_8E98C18, 0x0060, 4
obj_tiles gUnknown_8E98CB8, 0x0060, 5
obj_tiles gUnknown_8E98D58, 0x0060, 6
obj_tiles gUnknown_8E98DF8, 0x0080, 7
obj_tiles gUnknown_8E98E98, 0x0080, 8
obj_tiles gUnknown_8E98F38, 0x0080, 9
obj_tiles gUnknown_8E990D8, 0x0020, 10
obj_tiles gUnknown_8E990F8, 0x0020, 11
null_obj_tiles
gUnknown_83E26E4:: @ 83E26E4
.incbin "baserom.gba", 0x3E26E4, 0x48
obj_pal gUnknown_8E98024, 0
obj_pal gUnknown_8E98044, 1
obj_pal gUnknown_8E98064, 2
obj_pal gUnknown_8E98084, 3
obj_pal gUnknown_8E980A4, 4
obj_pal gUnknown_8E980C4, 5
obj_pal gUnknown_8E980A4, 6
obj_pal gUnknown_8E980A4, 7
null_obj_pal
-116
View File
@@ -1,116 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_826056C:: @ 826056C
obj_tiles gFile_graphics_interface_ball_Poke_sheet, 0x180, 55000
obj_tiles gFile_graphics_interface_ball_Great_sheet, 0x180, 55001
obj_tiles gFile_graphics_interface_ball_Safari_sheet, 0x180, 55002
obj_tiles gFile_graphics_interface_ball_Ultra_sheet, 0x180, 55003
obj_tiles gFile_graphics_interface_ball_Master_sheet, 0x180, 55004
obj_tiles gFile_graphics_interface_ball_Net_sheet, 0x180, 55005
obj_tiles gFile_graphics_interface_ball_Dive_sheet, 0x180, 55006
obj_tiles gFile_graphics_interface_ball_Nest_sheet, 0x180, 55007
obj_tiles gFile_graphics_interface_ball_Repeat_sheet, 0x180, 55008
obj_tiles gFile_graphics_interface_ball_Timer_sheet, 0x180, 55009
obj_tiles gFile_graphics_interface_ball_Luxury_sheet, 0x180, 55010
obj_tiles gFile_graphics_interface_ball_Premier_sheet, 0x180, 55011
gUnknown_82605CC:: @ 82605CC
obj_pal gFile_graphics_interface_ball_Poke_palette, 55000
obj_pal gFile_graphics_interface_ball_Great_palette, 55001
obj_pal gFile_graphics_interface_ball_Safari_palette, 55002
obj_pal gFile_graphics_interface_ball_Ultra_palette, 55003
obj_pal gFile_graphics_interface_ball_Master_palette, 55004
obj_pal gFile_graphics_interface_ball_Net_palette, 55005
obj_pal gFile_graphics_interface_ball_Dive_palette, 55006
obj_pal gFile_graphics_interface_ball_Nest_palette, 55007
obj_pal gFile_graphics_interface_ball_Repeat_palette, 55008
obj_pal gFile_graphics_interface_ball_Timer_palette, 55009
obj_pal gFile_graphics_interface_ball_Luxury_palette, 55010
obj_pal gFile_graphics_interface_ball_Premier_palette, 55011
gOamData_826062C:: @ 826062C
.4byte 0x40000300, 0x00000800
gSpriteAnim_8260634:: @ 8260634
obj_image_anim_frame 0x0, 0x5
obj_image_anim_jump 0
gSpriteAnim_826063C:: @ 826063C
obj_image_anim_frame 0x4, 0x1
obj_image_anim_jump 0
gSpriteAnim_8260644:: @ 8260644
obj_image_anim_frame 0x8, 0x5
obj_image_anim_jump 0
gSpriteAnim_826064C:: @ 826064C
obj_image_anim_frame 0xc, 0x1
obj_image_anim_jump 0
gSpriteAnim_8260654:: @ 8260654
obj_image_anim_frame 0x0, 0x1
obj_image_anim_end
gSpriteAnim_826065C:: @ 826065C
obj_image_anim_frame 0x4, 0x5
obj_image_anim_frame 0x8, 0x5
obj_image_anim_end
gSpriteAnim_8260668:: @ 8260668
obj_image_anim_frame 0x4, 0x5
obj_image_anim_frame 0x0, 0x5
obj_image_anim_end
gSpriteAnimTable_8260674::
.4byte gSpriteAnim_8260654
.4byte gSpriteAnim_826065C
.4byte gSpriteAnim_8260668
.4byte gSpriteAnim_8260634
.4byte gSpriteAnim_8260644
.4byte gSpriteAnim_826063C
.4byte gSpriteAnim_826064C
gSpriteAffineAnims_8260690::
obj_rot_scal_anim_frame 0x0, 0x0, 0x0, 0x1
obj_rot_scal_anim_jump 0
gSpriteAffineAnims_82606A0::
obj_rot_scal_anim_frame 0x0, 0x0, 0xfd, 0x1
obj_rot_scal_anim_jump 0
gSpriteAffineAnims_82606B0::
obj_rot_scal_anim_frame 0x0, 0x0, 0x3, 0x1
obj_rot_scal_anim_jump 0
gSpriteAffineAnims_82606C0::
obj_rot_scal_anim_frame 0x100, 0x100, 0x0, 0x0
obj_rot_scal_anim_end
gSpriteAffineAnims_82606D0::
obj_rot_scal_anim_frame 0x0, 0x0, 0x19, 0x1
obj_rot_scal_anim_jump 0
gSpriteAffineAnimTable_82606E0::
.4byte gSpriteAffineAnims_8260690
.4byte gSpriteAffineAnims_82606A0
.4byte gSpriteAffineAnims_82606B0
.4byte gSpriteAffineAnims_82606C0
.4byte gSpriteAffineAnims_82606D0
gBallSpriteTemplates:: @ 82606F4
spr_template 55000, 55000, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55001, 55001, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55002, 55002, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55003, 55003, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55004, 55004, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55005, 55005, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55006, 55006, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55007, 55007, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55008, 55008, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55009, 55009, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55010, 55010, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
spr_template 55011, 55011, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
-92
View File
@@ -1,92 +0,0 @@
#include "constants/maps.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83DF09C:: @ 83DF09C
.4byte gUnknown_8416738, sub_809AC5C
.4byte gUnknown_841673C, sub_809AC98
.4byte gUnknown_8416741, sub_809ACF8
gUnknown_83DF0B4:: @ 83DF0B4
.4byte sub_809BEA4
.4byte sub_809BF98
gUnknown_83DF0BC:: @ 83DF0BC
.byte 0, 2, 1, 12, 6, 15
.2byte 0x0008
@ {
@ .bg = 0,
@ .tilemapLeft = 2,
@ .tilemapTop = 1,
@ .width = 12,
@ .height = 6,
@ .paletteNum = 15,
@ .baseBlock = 0x0008
@ }
gUnknown_83DF0C4:: @ 83DF0C4
.4byte 0x000001f8
@ {
@ .bg = 0,
@ .charBaseIndex = 2,
@ .mapBaseIndex = 31,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 0,
@ .baseTile = 0x0000
@ }
.4byte 0x000011e1
@ {
@ .bg = 1,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 30,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 1,
@ .baseTile = 0x0000
@ }
.4byte 0x000021d2
@ {
@ .bg = 2,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 29,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 2,
@ .baseTile = 0x0000
@ }
.4byte 0x000031c3
@ {
@ .bg = 3,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 28,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 3,
@ .baseTile = 0x0000
@ }
gUnknown_83DF0D4:: @ 83DF0D4
.2byte 0x0308, 0x030a, 0x02d0
gUnknown_83DF0DA:: @ 83DF0DA
.2byte 0x0309, 0x030b, 0x02d1
gUnknown_83DF0E0:: @ 83DF0E0
.2byte 0x0310, 0x0312, 0x02d8
gUnknown_83DF0E6:: @ 83DF0E6
.2byte 0x0311, 0x0313, 0x02d9
gUnknown_83DF0EC:: @ 83DF0EC
.2byte 0x02e3, 0x0316, 0x0314
gUnknown_83DF0F2:: @ 83DF0F2
.2byte 0x02e4, 0x0317, 0x0315
gUnknown_83DF0F8:: @ 83DF0F8
.2byte 0x02eb, 0x031e, 0x031c
+12 -12
View File
@@ -475,7 +475,7 @@ gUnknown_8416210:: @ 8416210
gText_ThreeHyphens:: @ 8416213
.string "---$"
gUnknown_8416217:: @ 8416217
gText_SevenHyphens:: @ 8416217
.string "-------$"
gText_MaleSymbol:: @ 841621F
@@ -720,26 +720,26 @@ gText_TheBerryPouchWillBePutAway:: @ 8416716
.string "The BERRY POUCH will be\n"
.string "put away.$"
gUnknown_8416738:: @ 0x8416738
gText_ShopBuy:: @ 0x8416738
.string "BUY$"
gUnknown_841673C:: @ 0x841673C
gText_ShopSell:: @ 0x841673C
.string "SELL$"
gUnknown_8416741:: @ 0x8416741
gText_ShopQuit:: @ 0x8416741
.string "SEE YA!$"
gUnknown_8416749:: @ 8416749
gText_InBagVar1:: @ 8416749
.string "IN BAG:{SMALL} {STR_VAR_1}$"
gUnknown_8416757:: @ 8416757
gText_QuitShopping:: @ 8416757
.string "Quit shopping.$"
gUnknown_8416766:: @ 8416766
gText_Var1CertainlyHowMany:: @ 8416766
.string "{STR_VAR_1}? Certainly.\n"
.string "How many would you like?$"
gUnknown_841678E:: @ 841678E
gText_Var1AndYouWantedVar2:: @ 841678E
.string "{STR_VAR_1}, and you want {STR_VAR_2}.\n"
.string "That will be ¥{STR_VAR_3}. Okay?$"
@@ -751,7 +751,7 @@ gUnknown_84167D0:: @ 0x84167D0
.string "{STR_VAR_1} !\n"
.string "{STR_VAR_2}¥ ?$"
gUnknown_84167E7:: @ 84167E7
gText_HereYouGoThankYou:: @ 84167E7
.string "Here you are!\n"
.string "Thank you!$"
@@ -763,10 +763,10 @@ gUnknown_8416822:: @ 0x8416822
.string " !\n"
.string " !$"
gUnknown_8416842:: @ 8416842
gText_YouDontHaveMoney:: @ 8416842
.string "You don't have enough money.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416861:: @ 8416861
gText_NoMoreRoomForThis:: @ 8416861
.string "You have no more room for this\n"
.string "item.{PAUSE_UNTIL_PRESS}$"
@@ -774,7 +774,7 @@ gUnknown_8416888:: @ 0x8416888
.string "{STR_VAR_1}\n"
.string " {PAUSE_UNTIL_PRESS}$"
gUnknown_841689E:: @ 841689E
gText_CanIHelpWithAnythingElse:: @ 841689E
.string "Is there anything else I can do?$"
gUnknown_84168BF:: @ 0x84168BF
+35 -3
View File
@@ -31,7 +31,31 @@ gUnknown_83CCE30:: @ 83CCE30
.incbin "baserom.gba", 0x3CCE30, 0x98
gUnknown_83CCEC8:: @ 83CCEC8
.incbin "baserom.gba", 0x3CCEC8, 0x3B8
.incbin "baserom.gba", 0x3CCEC8, 0xB8
gUnknown_83CCF80:: @ 83CCF80
.incbin "baserom.gba", 0x3CCF80, 0x60
gUnknown_83CCFE0:: @ 83CCFE0
.incbin "baserom.gba", 0x3CCFE0, 0x60
gUnknown_83CD040:: @ 83CD040
.incbin "baserom.gba", 0x3CD040, 0x60
gUnknown_83CD0A0:: @ 83CD0A0
.incbin "baserom.gba", 0x3CD0A0, 0x60
gUnknown_83CD100:: @ 83CD100
.incbin "baserom.gba", 0x3CD100, 0x60
gUnknown_83CD160:: @ 83CD160
.incbin "baserom.gba", 0x3CD160, 0x60
gUnknown_83CD1C0:: @ 83CD1C0
.incbin "baserom.gba", 0x3CD1C0, 0x60
gUnknown_83CD220:: @ 83CD220
.incbin "baserom.gba", 0x3CD220, 0x60
gUnknown_83CD280:: @ 83CD280
.incbin "baserom.gba", 0x3CD280, 0x20
@@ -70,10 +94,18 @@ gUnknown_83CD898:: @ 83CD898
.incbin "baserom.gba", 0x3CD898, 0x20
gUnknown_83CD8B8:: @ 83CD8B8
.incbin "baserom.gba", 0x3CD8B8, 0x14
.word gUnknown_8E9986C
.word gUnknown_83CCF80
.word gUnknown_83CD040
.word gUnknown_83CD100
.word gUnknown_83CD1C0
gUnknown_83CD8CC:: @ 83CD8CC
.incbin "baserom.gba", 0x3CD8CC, 0x14
.word gUnknown_8E99198
.word gUnknown_83CCFE0
.word gUnknown_83CD0A0
.word gUnknown_83CD160
.word gUnknown_83CD220
gUnknown_83CD8E0:: @ 83CD8E0
.incbin "baserom.gba", 0x3CD8E0, 0x3