dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into data_dump

Browse Source
This commit is contained in:
ultima-soul
2019-12-04 11:44:52 -08:00
parent b116608e12 67f48e5f28
commit 58cf331340
135 changed files with 3960 additions and 6923 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_anim_special.s
+4 -4
View File
@@ -1219,7 +1219,7 @@ sub_80EF5AC: @ 80EF5AC
lsls r0, r1, 1
adds r0, r1
lsls r0, 3
ldr r1, _080EF678 @ =gUnknown_82606F4
ldr r1, _080EF678 @ =gBallSpriteTemplates
adds r0, r1
movs r1, 0x20
movs r2, 0x50
@@ -1298,7 +1298,7 @@ sub_80EF5AC: @ 80EF5AC
bx r0
.align 2, 0
_080EF674: .4byte gLastUsedItem
_080EF678: .4byte gUnknown_82606F4
_080EF678: .4byte gBallSpriteTemplates
_080EF67C: .4byte gSprites
_080EF680: .4byte gBattleAnimTarget
_080EF684: .4byte sub_80EF8C0
@@ -1387,7 +1387,7 @@ _080EF708:
lsls r0, r4, 1
adds r0, r4
lsls r0, 3
ldr r1, _080EF7CC @ =gUnknown_82606F4
ldr r1, _080EF7CC @ =gBallSpriteTemplates
adds r0, r1
movs r1, 0x20
orrs r5, r1
@@ -1458,7 +1458,7 @@ _080EF708:
.align 2, 0
_080EF7C4: .4byte gSaveBlock2Ptr
_080EF7C8: .4byte gLastUsedItem
_080EF7CC: .4byte gUnknown_82606F4
_080EF7CC: .4byte gBallSpriteTemplates
_080EF7D0: .4byte gSprites
_080EF7D4: .4byte gBattleAnimTarget
_080EF7D8: .4byte SpriteCallbackDummy
asm/battle_interface.s
+2 -2
View File
@@ -709,11 +709,11 @@ _080480A4: .4byte sub_8048128
GetHealthboxElementGfxPtr: @ 80480A8
lsls r0, 24
lsrs r0, 19
ldr r1, _080480B4 @ =gUnknown_8D11BC4
ldr r1, _080480B4 @ =gHealthboxElementsGfxTable
adds r0, r1
bx lr
.align 2, 0
_080480B4: .4byte gUnknown_8D11BC4
_080480B4: .4byte gHealthboxElementsGfxTable
thumb_func_end GetHealthboxElementGfxPtr
thumb_func_start sub_80480B8
asm/item_menu.s
+1 -1
View File
@@ -5484,7 +5484,7 @@ sub_810A9D4: @ 810A9D4
mov r2, r8
ldrh r1, [r2, 0x10]
movs r2, 0x2
bl sub_809C09C
bl RecordItemPurchase
mov r3, r8
ldrb r0, [r3]
ldr r4, _0810AAE4 @ =gUnknown_203ACFC
asm/pokeball.s
-2896
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_summary_screen.s
+2 -2
View File
@@ -10638,7 +10638,7 @@ _08139CDA:
lsls r0, r4, 1
adds r0, r4
lsls r0, 3
ldr r1, _08139D40 @ =gUnknown_82606F4
ldr r1, _08139D40 @ =gBallSpriteTemplates
adds r0, r1
movs r1, 0x6A
movs r2, 0x58
@@ -10677,7 +10677,7 @@ _08139CDA:
pop {r0}
bx r0
.align 2, 0
_08139D40: .4byte gUnknown_82606F4
_08139D40: .4byte gBallSpriteTemplates
_08139D44: .4byte gUnknown_203B140
_08139D48: .4byte 0x0000300c
_08139D4C: .4byte gSprites
asm/shop.s
-3563
View File
File diff suppressed because it is too large Load Diff
baserom.ips
BIN
View File
Binary file not shown.
data/garbage_8DD2290.bin
BIN
View File
Binary file not shown.
data/graphics.s
+189 -125
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 @@ gFile_graphics_battle_anims_sprites_186_palette:: @ 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 @@ gFile_graphics_battle_anims_sprites_262_palette:: @ 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
gFile_graphics_battle_anims_sprites_264_sheet:: @ 8E7A97C
@@ -13620,8 +13670,8 @@ gFile_graphics_battle_anims_sprites_068_palette:: @ 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
gFile_graphics_battle_anims_sprites_272_sheet:: @ 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
gFile_graphics_battle_anims_backgrounds_02_sheet:: @ 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 @@ gFile_graphics_battle_anims_sprites_271_sheet:: @ 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,16 +16132,16 @@ 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, 0x20 @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"
@@ -16110,19 +16165,19 @@ 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 "graphics/interface/naming_screen_8E985D8.4bpp"
@@ -16164,16 +16219,16 @@ 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"
@@ -16194,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"
@@ -16299,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
@@ -16433,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"
@@ -16497,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
data/pokeball.s
-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
gUnknown_82606F4:: @ 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
data/shop.s
-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
data/strings.s
+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
data/trainer_card.s
+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
graphics/battle_interface/ball_display_unused_extra.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 102 B

graphics/battle_interface/exp_bar.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 109 B

graphics/battle_interface/healthbox_doubles_opponent.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 270 B

graphics/battle_interface/healthbox_doubles_player.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 277 B

graphics/battle_interface/healthbox_singles_opponent.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 282 B

graphics/battle_interface/healthbox_singles_player.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 369 B

graphics/battle_interface/hp_bar.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 161 B

graphics/battle_interface/hp_bar_anim.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 149 B

graphics/battle_interface/misc.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 96 B

graphics/battle_interface/misc_frame_end.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 82 B

graphics/battle_interface/status2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 196 B

graphics/battle_interface/status3.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 198 B

graphics/battle_interface/status4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 B

graphics/battle_interface/status_brn.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 116 B

graphics/battle_interface/status_frz.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 116 B

graphics/battle_interface/status_par.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 B

graphics/battle_interface/status_psn.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 116 B

graphics/battle_interface/status_slp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 117 B

graphics/battle_interface/window.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 455 B

graphics/battle_interface/window1.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
255 0 0
82 98 156
106 139 189
255 255 255
106 90 115
213 205 213
65 74 123
41 49 49
255 0 255
230 222 230
255 0 255
156 123 24
205 172 74
41 82 106
graphics/battle_interface/window2.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
74 57 115
82 98 156
106 139 189
41 49 49
255 255 255
106 90 115
222 213 222
90 82 82
180 189 180
139 156 213
90 74 131
0 0 0
0 0 0
0 0 0
0 0 0
graphics/berry_crush/berry_crush.pal
+99
View File
@@ -0,0 +1,99 @@
JASC-PAL
0100
96
98 172 180
255 213 156
255 197 139
255 164 106
238 131 82
222 123 74
213 98 49
197 82 41
156 213 189
123 180 156
222 156 255
172 123 222
255 0 255
255 0 255
230 230 255
65 74 90
156 148 172
255 213 156
255 197 139
255 164 106
238 131 82
222 123 74
213 98 49
197 82 41
255 238 0
230 189 0
180 180 180
139 139 139
255 0 255
255 0 255
230 230 255
65 74 90
156 148 172
255 213 156
255 197 139
255 164 106
238 131 82
222 123 74
213 98 49
197 82 41
197 213 246
255 255 255
238 238 246
205 205 213
255 0 255
255 0 255
230 230 255
65 74 90
255 180 255
164 172 172
98 106 115
123 131 139
139 148 156
148 222 164
156 189 222
197 213 246
180 164 115
205 189 148
213 205 172
230 222 189
246 238 205
139 123 74
74 131 189
65 74 90
0 0 0
148 222 164
164 230 172
180 238 189
197 246 205
213 255 222
238 255 238
255 255 255
65 180 238
255 255 255
0 197 57
255 255 255
246 213 0
255 0 255
246 238 205
139 123 74
255 164 106
164 172 172
98 106 115
123 131 139
139 148 156
115 156 189
156 189 222
197 213 246
180 164 115
205 189 148
213 205 172
230 222 189
246 238 205
139 123 74
74 131 189
65 74 90
graphics/berry_crush/berry_crush.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

graphics/berry_crush/data_EB0ADC.bin
+1
View File
@@ -0,0 +1 @@
L@L@L@L@L@L@L@L@L@M@\@\@\@\@\@\@\@\@\@]@N@N@N@N@N@N@N@N@N@O@^@^@^@^@^@^@^@^@^@_@ы`ы`ы`ы`ы`ы`ы`ы`ы`з`И`И`И`И`И`И`И`И`И`Й`nDm@m@m@m@m@m@m@m@m@~D}@}@}@}@}@}@}@}@}@эdш`ш`ш`ш`ш`ш`ш`ш`ш`ЛdК`К`К`К`К`К`К`К`К`
graphics/contest/applause.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 294 B

graphics/contest/misc.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

graphics/contest/misc_2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

graphics/contest/next_turn.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 B

graphics/contest/nextturn_numbers.png → graphics/contest/next_turn_numbers.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 181 B

After

Width:  |  Height:  |  Size: 181 B

graphics/contest/nextturn_random.png → graphics/contest/next_turn_random.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 158 B

After

Width:  |  Height:  |  Size: 158 B

graphics/contest/nextturn.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 195 B

graphics/interface/blank2.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/interface/box_tiles.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

graphics/interface/box_tiles_pal1.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
131 172 180
41 106 98
82 98 115
74 172 164
57 139 139
164 213 246
115 189 98
255 255 255
123 189 255
0 123 255
41 90 164
123 205 180
8 74 65
164 238 148
65 82 90
graphics/interface/box_tiles_pal2.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
148 148 172
115 115 123
82 82 90
148 148 172
246 172 82
164 164 180
0 0 0
164 205 246
123 180 213
255 222 148
213 230 255
180 213 246
156 205 238
255 255 255
90 255 238
graphics/interface/box_tiles_pal3.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 246 148
148 148 172
115 115 123
82 82 90
139 139 164
164 123 0
164 164 180
0 0 0
164 205 246
123 180 213
197 189 24
213 230 255
180 213 246
156 205 238
180 180 180
90 255 238
graphics/interface/hpbar_anim.png → graphics/interface/hp_bar_anim.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 192 B

graphics/interface/learn_move.bin
BIN
View File
Binary file not shown.
graphics/interface/learn_move.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 239 B

graphics/interface/link_rfu_frame.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 199 B

graphics/interface/link_rfu_status.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 450 B

graphics/interface/naming_screen_8E97FE4.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 255 255
255 255 255
98 98 98
213 213 205
230 8 8
255 189 115
32 156 8
148 246 148
49 82 205
164 197 246
0 0 0
0 0 0
0 0 0
123 172 197
213 156 115
148 189 106
graphics/interface/naming_screen_E98398.bin
BIN
View File
Binary file not shown.
graphics/interface/naming_screen_E98458.bin
BIN
View File
Binary file not shown.
graphics/interface/naming_screen_E98518.bin
BIN
View File
Binary file not shown.
graphics/interface/naming_screen_menu.bin
BIN
View File
Binary file not shown.
graphics/interface/naming_screen_menu.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 438 B

graphics/interface/party_menu_misc.pal
+179
View File
@@ -0,0 +1,179 @@
JASC-PAL
0100
176
123 156 115
255 255 255
106 106 106
0 0 0
65 205 255
0 139 189
49 189 238
255 156 148
189 90 82
222 123 115
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
139 148 123
74 74 98
65 156 148
32 106 98
74 172 164
57 139 139
82 65 74
32 16 24
255 0 255
255 0 255
255 255 255
123 205 180
57 148 123
255 0 255
255 0 255
115 90 180
139 148 123
255 115 49
65 156 148
32 106 98
74 172 164
57 139 139
82 65 74
82 82 90
255 0 255
255 0 255
255 255 255
123 205 180
57 148 123
255 0 255
255 0 255
164 115 246
123 156 115
74 74 98
115 115 115
255 255 255
131 197 222
57 148 222
41 123 180
131 197 222
41 123 180
115 255 172
90 213 131
65 205 255
0 98 148
82 82 82
255 213 82
255 180 65
123 156 115
74 74 98
115 115 115
255 255 255
213 197 90
197 164 24
156 156 32
213 197 90
156 156 32
255 230 57
205 172 8
255 156 148
156 65 57
82 82 82
255 213 82
255 180 65
123 156 115
74 74 98
115 115 115
255 255 255
213 164 32
197 106 16
164 74 0
213 164 32
164 74 0
255 115 49
197 57 0
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
123 156 115
255 115 49
115 115 115
255 255 255
180 255 164
123 222 131
123 156 98
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 115 49
115 115 115
255 255 255
172 238 255
123 213 238
74 172 205
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 115 49
115 115 115
255 255 255
246 246 148
246 230 98
222 197 32
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 115 49
115 115 115
255 255 255
255 213 222
255 189 148
238 164 131
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 255 115
115 115 115
255 255 255
180 255 164
123 222 131
131 172 106
255 255 115
255 255 115
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
graphics/interface/pokedex_abc.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 525 B

graphics/interface/status_icons.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 455 B

After

Width:  |  Height:  |  Size: 452 B

graphics/interface/summary_exp_bar.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 230 B

graphics/interface/summary_hp_bar.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 227 B

graphics/interface/trainer_memo.bin
BIN
View File
Binary file not shown.
graphics/interface/trainer_memo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

graphics/interface/trainer_memo_2.bin
BIN
View File
Binary file not shown.
graphics/interface/trainer_memo_3.bin
BIN
View File
Binary file not shown.
graphics/interface/trainer_memo_4.bin
BIN
View File
Binary file not shown.
graphics/interface/trainer_memo_5.bin
BIN
View File
Binary file not shown.
graphics/interface/trainer_memo_pal1.pal
+83
View File
@@ -0,0 +1,83 @@
JASC-PAL
0100
80
255 0 255
0 123 197
230 222 156
230 205 255
0 74 148
123 156 156
197 189 115
106 197 205
205 172 238
180 139 213
205 172 238
180 139 213
255 180 0
123 131 148
255 255 255
98 106 123
255 0 255
255 255 255
230 230 238
205 172 238
98 106 123
180 139 213
230 205 255
205 172 238
255 0 255
255 0 255
255 255 255
213 213 213
222 222 222
230 230 230
238 238 238
246 246 246
255 0 255
255 172 148
255 213 172
255 238 213
230 139 106
255 246 238
255 246 238
238 238 197
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
123 131 148
255 255 255
98 106 123
255 0 255
255 213 90
255 238 123
255 246 197
246 189 82
255 255 222
255 255 222
246 238 180
255 255 164
123 131 148
98 106 123
255 213 82
255 180 65
123 131 148
255 255 255
98 106 123
255 0 255
156 238 213
172 246 222
230 255 255
106 197 156
246 255 255
246 255 255
205 238 238
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
123 131 148
255 255 255
98 106 123
graphics/interface/trainer_memo_pal2.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 0 255
255 255 255
230 230 238
106 230 230
98 106 123
90 213 213
230 205 255
205 172 238
255 0 255
255 0 255
255 255 255
213 213 213
222 222 222
230 230 230
246 246 246
246 246 246
graphics/interface/trainer_memo_pal3.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 0 255
0 123 197
230 222 156
230 205 255
0 74 148
123 156 156
197 189 115
106 197 205
106 230 230
90 213 213
205 172 238
180 139 213
255 180 0
123 131 148
255 255 255
98 106 123
graphics/interface/union_room_chat.bin
BIN
View File
Binary file not shown.
graphics/interface/union_room_chat.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 513 B

graphics/interface/union_room_chat_icons.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 244 B

graphics/interface/union_room_chat_panel.bin
BIN
View File
Binary file not shown.
graphics/interface/union_room_chat_panel.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 189 B

graphics/item_menu/bag_pal1.pal
+51
View File
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
0 65 90
255 0 255
41 57 82
65 180 164
255 0 255
255 0 255
106 205 197
246 205 115
238 230 172
255 255 205
222 139 74
148 148 148
238 230 172
106 106 106
213 180 82
205 65 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
189 213 213
238 255 255
222 246 255
255 255 255
164 222 255
16 172 222
0 82 115
0 115 139
0 123 197
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
189 213 213
238 255 255
222 246 255
255 255 255
164 222 255
24 82 180
0 90 131
24 82 180
24 82 180
graphics/item_menu/bag_pal2.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 65 90
255 0 255
41 57 82
213 139 115
255 0 255
255 0 255
255 172 148
246 205 115
238 230 172
255 255 205
222 139 74
148 148 148
238 230 172
106 106 106
213 180 82
205 65 0
graphics/item_menu/bag_tilemap1.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bag_tilemap2.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bag_tiles.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 539 B

graphics/link/gba.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
222 230 238
189 205 230
156 180 222
131 131 139
98 98 123
65 74 106
41 49 90
230 230 230
205 205 205
180 180 180
156 156 156
213 180 106
205 156 82
49 255 106
graphics/link/gba.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

graphics/link/gba_pal2.pal
+51
View File
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
0 0 0
255 57 8
255 90 8
255 131 8
255 172 8
255 213 8
255 255 8
255 255 131
255 255 255
255 255 0
65 0 0
115 16 0
172 32 0
230 57 8
0 0 0
0 0 0
0 0 0
255 255 255
222 230 238
189 205 230
156 180 222
131 131 139
98 98 123
65 74 106
41 49 90
230 230 230
205 205 205
180 180 180
156 156 156
213 180 106
205 156 82
49 255 106
0 0 0
255 255 255
222 230 238
189 205 230
156 180 222
0 16 172
32 32 106
16 16 90
0 0 74
255 255 189
230 230 164
205 205 148
189 180 115
139 139 90
74 74 57
8 32 32
graphics/pokemon/circled_question_mark/circled/back.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 383 B

graphics/pokemon/circled_question_mark/circled/front.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 383 B

graphics/pokemon/question_mark/circled/normal.pal → graphics/pokemon/circled_question_mark/circled/normal.pal
View File
graphics/pokemon/question_mark/circled/shiny.pal → graphics/pokemon/circled_question_mark/circled/shiny.pal
View File
graphics/pokemon/question_mark/double/back.png → graphics/pokemon/circled_question_mark/double/back.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 307 B

graphics/pokemon/question_mark/double/front.png → graphics/pokemon/circled_question_mark/double/front.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 308 B

graphics/pokemon/question_mark/double/normal.pal → graphics/pokemon/circled_question_mark/double/normal.pal
View File
graphics/pokemon/question_mark/double/shiny.pal → graphics/pokemon/circled_question_mark/double/shiny.pal
View File
graphics/pokemon/question_mark/footprint.png → graphics/pokemon/circled_question_mark/footprint.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 B

After

Width:  |  Height:  |  Size: 110 B

graphics/pokemon/question_mark/icon.png → graphics/pokemon/circled_question_mark/icon.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 271 B

graphics/pokemon/egg/icon.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 297 B

graphics/pokemon/ghost/front.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 701 B

graphics/pokemon/question_mark/circled/back.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 397 B

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