Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms

This commit is contained in:
golem galvanize 2018-01-20 15:56:36 -05:00
commit 646aa19e87
20 changed files with 677 additions and 103 deletions

View File

@ -4824,27 +4824,27 @@ gNamingScreenMenu_Gfx:: @ 8DD3838
.incbin "graphics/naming_screen/menu.4bpp.lz"
.align 2
gNamingScreenRWindow_Gfx::
gNamingScreenRWindow_Gfx:: @ 8DD3A04
.incbin "graphics/naming_screen/rwindow.4bpp"
.align 2
gNamingScreenROptions_Gfx::
gNamingScreenROptions_Gfx:: @ 8DD4044
.incbin "graphics/naming_screen/roptions.4bpp"
.align 2
gNamingScreenCursor_Gfx::
gNamingScreenCursor_Gfx:: @ 8DD4224
.incbin "graphics/naming_screen/cursor.4bpp"
.align 2
gNamingScreenKeyboardButton_Gfx::
gNamingScreenKeyboardButton_Gfx:: @ 8DD43E4
.incbin "graphics/naming_screen/keyboard_button.4bpp"
.align 2
gNamingScreenRightPointingTriangleTiles::
gNamingScreenRightPointingTriangleTiles:: @ 8DD4504
.incbin "graphics/naming_screen/right_pointing_triangle.4bpp"
.align 2
gNamingScreenUnderscoreTiles::
gNamingScreenUnderscoreTiles:: @ 8DD4524
.incbin "graphics/naming_screen/underscore.4bpp"
.align 2

View File

@ -3,9 +3,20 @@
.section .rodata
gUnknown_0858BD78:: @ 858BD78
.incbin "baserom.gba", 0x58bd78, 0x40
.align 2
gUnknown_0858BBF8:: @ 858BBF8
.incbin "graphics/naming_screen/pc_icon/0.4bpp"
.align 2
gUnknown_0858BCB8:: @ 858BCB8
.incbin "graphics/naming_screen/pc_icon/1.4bpp"
.align 2
gUnknown_0858BD78:: @ 858BD78
.incbin "graphics/naming_screen/0.gbapal"
.incbin "graphics/naming_screen/1.gbapal"
.align 2
gUnknown_0858BDB8:: @ 858BDB8
.4byte gText_PkmnTransferredSomeonesPC
.4byte gText_PkmnTransferredLanettesPC
@ -14,13 +25,19 @@ gUnknown_0858BDB8:: @ 858BDB8
gUnknown_0858BDC8:: @ 858BDC8
.string "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!$"
.align 2
gUnknown_0858BE00:: @ 858BE00
.incbin "baserom.gba", 0x58be00, 0x10
.4byte 0x000001e0, 0x000011d9, 0x000021ca, 0x000031ff
.align 2
gUnknown_0858BE10:: @ 858BE10
.incbin "baserom.gba", 0x58be10, 0x30
window_template 0x01, 0x03, 0x0a, 0x13, 0x08, 0x0a, 0x0030
window_template 0x02, 0x03, 0x0a, 0x13, 0x08, 0x0a, 0x00c8
window_template 0x03, 0x08, 0x06, 0x11, 0x02, 0x0a, 0x0030
window_template 0x03, 0x08, 0x04, 0x11, 0x02, 0x0a, 0x0052
window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0b, 0x0074
null_window_template
gUnknown_0858BE40:: @ 858BE40
.string "abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?/- "
@ -86,17 +103,18 @@ gUnknown_0858BF28:: @ 858BF28
.4byte sub_80E46E8
gUnknown_0858BF34:: @ 858BF34
.incbin "baserom.gba", 0x58bf34, 0xa
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00
gUnknown_0858BF3E:: @ 858BF3E
.incbin "baserom.gba", 0x58bf3e, 0xa
.byte 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_0858BF48:: @ 858BF48
.incbin "baserom.gba", 0x58bf48, 0x8
.byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00
gUnknown_0858BF50:: @ 858BF50
.incbin "baserom.gba", 0x58bf50, 0x8
.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.align 2
gUnknown_0858BF58:: @ 858BF58
.4byte sub_80E4894
.4byte sub_80E4894
@ -104,12 +122,14 @@ gUnknown_0858BF58:: @ 858BF58
.4byte sub_80E48E8
.4byte sub_80E4894
.align 2
gUnknown_0858BF6C:: @ 858BF6C
.4byte TaskDummy3
.4byte sub_80E49BC
.align 2
gUnknown_0858BF74:: @ 858BF74
.incbin "baserom.gba", 0x58bf74, 0x8
window_template 0x00, 0x09, 0x08, 0x00, 0x05, 0x04, 0x0000
gUnknown_0858BF7C:: @ 858BF7C
.4byte 0x0002010D
@ -134,20 +154,29 @@ gUnknown_0858BF98:: @ 858BF98
.4byte gUnknown_08DD47A0
gUnknown_0858BFA4:: @ 858BFA4
.incbin "baserom.gba", 0x58bfa4, 0x4
.byte 0x0f, 0x01, 0x02
.align 2
gUnknown_0858BFA8:: @ 858BFA8
.incbin "baserom.gba", 0x58bfa8, 0xc
.byte 0x00, 0x07, 0x01, 0x00, 0x01, 0x23, 0x00, 0x00
.4byte gText_YourName
.align 2
gUnknown_0858BFB4:: @ 858BFB4
.incbin "baserom.gba", 0x58bfb4, 0xc
.byte 0x00, 0x08, 0x02, 0x00, 0x01, 0x13, 0x00, 0x00
.4byte gText_BoxName
.align 2
gUnknown_0858BFC0:: @ 858BFC0
.incbin "baserom.gba", 0x58bfc0, 0xc
.byte 0x00, 0x0a, 0x03, 0x01, 0x01, 0x23, 0x00, 0x00
.4byte gText_PkmnsNickname
.align 2
gUnknown_0858BFCC:: @ 858BFCC
.incbin "baserom.gba", 0x58bfcc, 0xc
.byte 0x01, 0x0f, 0x04, 0x00, 0x01, 0x0b, 0x00, 0x00
.4byte gText_TellHimTheWords
.align 2
gUnknown_0858BFD8:: @ 858BFD8
.4byte gUnknown_0858BFA8
.4byte gUnknown_0858BFB4
@ -155,48 +184,125 @@ gUnknown_0858BFD8:: @ 858BFD8
.4byte gUnknown_0858BFC0
.4byte gUnknown_0858BFCC
gUnknown_0858BFEC:: @ 858BFEC
.incbin "baserom.gba", 0x58bfec, 0x64
.align 2
gOamData_858BFEC:: @ 858BFEC
.2byte 0x0000, 0x0000, 0x0000, 0x0000
.align 2
gOamData_858BFF4:: @ 858BFF4
.2byte 0x0000, 0x4000, 0x0000, 0x0000
.align 2
gOamData_858BFFC:: @ 858BFFC
.2byte 0x4000, 0x8000, 0x0000, 0x0000
.align 2
gUnknown_0858C004:: @ 858C004
.byte 0xec, 0xf0, 0x05, 0x40, 0x0c, 0xf0, 0x40, 0x40, 0xec, 0xf8, 0x55, 0x40, 0x0c, 0xf8, 0x90, 0x40, 0xec, 0x00, 0xa5, 0x40, 0x0c, 0x00, 0xe0, 0x40, 0xec, 0x08, 0xf5, 0x40, 0x0c, 0x08, 0x30, 0x41
.align 2
gUnknown_0858C024:: @ 858C024
.byte 0xf4, 0xfc, 0x01, 0x40, 0x04, 0xfc, 0x20, 0x40
.align 2
gUnknown_0858C02C:: @ 858C02C
.byte 0xec, 0xf4, 0x05, 0x40, 0x0c, 0xf4, 0x40, 0x40, 0xec, 0xfc, 0x55, 0x40, 0x0c, 0xfc, 0x90, 0x40, 0xec, 0x04, 0xa5, 0x40, 0x0c, 0x04, 0xe0, 0x40
.align 2
gUnknown_0858C044:: @ 858C044
.byte 0xf8, 0xf4, 0x01, 0xc0, 0xf8, 0xfc, 0x21, 0xc0, 0xf8, 0x04, 0x41, 0xc0
.align 2
gUnknown_0858C050:: @ 858C050
.incbin "baserom.gba", 0x58c050, 0x8
.byte 0x08, 0x00, 0x00, 0x00
.4byte gUnknown_0858C004
.align 2
gUnknown_0858C058:: @ 858C058
.incbin "baserom.gba", 0x58c058, 0x18
.4byte 0x02
.4byte gUnknown_0858C024
.4byte 0x02
.4byte gUnknown_0858C024
.4byte 0x02
.4byte gUnknown_0858C024
.align 2
gUnknown_0858C070:: @ 858C070
.incbin "baserom.gba", 0x58c070, 0x8
.4byte 0x06
.4byte gUnknown_0858C02C
.align 2
gUnknown_0858C078:: @ 858C078
.incbin "baserom.gba", 0x58c078, 0x48
.4byte 0x03
.4byte gUnknown_0858C044
.align 2
gUnknown_0858C080:: @ 858C080
obj_frame_tiles gUnknown_0858BBF8, 0x00c0
obj_frame_tiles gUnknown_0858BCB8, 0x00c0
.align 2
gSpriteAnim_858C090:: @ 858C090
.2byte 0x0000, 0x0001, 0xfffe, 0x0000
.align 2
gSpriteAnim_858C098:: @ 858C098
.2byte 0x0004, 0x0008, 0x0008, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858C0A4:: @ 858C0A4
.2byte 0x0000, 0x0002, 0x0001, 0x0002, 0xfffe, 0x0000
.align 2
gSpriteAnimTable_858C0B0:: @ 858C0B0
.4byte gSpriteAnim_858C090
.align 2
gSpriteAnimTable_858C0B4:: @ 858C0B4
.4byte gSpriteAnim_858C090
.4byte gSpriteAnim_858C098
.align 2
gSpriteAnimTable_858C0BC:: @ 858C0BC
.4byte gSpriteAnim_858C0A4
.align 2
gUnknown_0858C0C0:: @ 858C0C0
.incbin "baserom.gba", 0x58c0c0, 0x18
spr_template 0x0002, 0x0004, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E4084
.align 2
gUnknown_0858C0D8:: @ 858C0D8
.incbin "baserom.gba", 0x58c0d8, 0x18
spr_template 0x0003, 0x0001, gOamData_858BFFC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C0F0:: @ 858C0F0
.incbin "baserom.gba", 0x58c0f0, 0x18
spr_template 0x0004, 0x0004, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C108:: @ 858C108
.incbin "baserom.gba", 0x58c108, 0x18
spr_template 0x0000, 0x0006, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C120:: @ 858C120
.incbin "baserom.gba", 0x58c120, 0x18
spr_template 0x0001, 0x0007, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C138:: @ 858C138
.incbin "baserom.gba", 0x58c138, 0x18
spr_template 0x0007, 0x0005, gOamData_858BFF4, gSpriteAnimTable_858C0B4, NULL, gDummySpriteAffineAnimTable, sub_80E3B30
.align 2
gUnknown_0858C150:: @ 858C150
.incbin "baserom.gba", 0x58c150, 0x18
spr_template 0x000a, 0x0003, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E3C20
.align 2
gUnknown_0858C168:: @ 858C168
.incbin "baserom.gba", 0x58c168, 0x18
spr_template 0x000b, 0x0003, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E3C6C
.align 2
gUnknown_0858C180:: @ 858C180
.incbin "baserom.gba", 0x58c180, 0x18
spr_template 0xffff, 0x0000, gOamData_858BFEC, gSpriteAnimTable_858C0BC, gUnknown_0858C080, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C198:: @ 858C198
.4byte gUnknown_0862B88D
.4byte gUnknown_0862B8AE
@ -211,8 +317,30 @@ gUnknown_0858C198:: @ 858C198
.4byte gUnknown_0862B9C7
.4byte gUnknown_0862B9E0
.align 2
gUnknown_0858C1C8:: @ 858C1C8
.incbin "baserom.gba", 0x58c1c8, 0x68
obj_tiles gNamingScreenRWindow_Gfx+0x280, 0x01e0, 0x0000
obj_tiles gNamingScreenRWindow_Gfx+0x460, 0x01e0, 0x0001
obj_tiles gNamingScreenRWindow_Gfx, 0x0280, 0x0002
obj_tiles gNamingScreenKeyboardButton_Gfx+0x20, 0x0100, 0x0003
obj_tiles gNamingScreenROptions_Gfx, 0x0060, 0x0004
obj_tiles gNamingScreenROptions_Gfx+0xA0, 0x0060, 0x0005
obj_tiles gNamingScreenROptions_Gfx+0x140, 0x0060, 0x0006
obj_tiles gNamingScreenCursor_Gfx, 0x0080, 0x0007
obj_tiles gNamingScreenCursor_Gfx+0xA0, 0x0080, 0x0008
obj_tiles gNamingScreenCursor_Gfx+0x140, 0x0080, 0x0009
obj_tiles gNamingScreenRightPointingTriangleTiles, 0x0020, 0x000a
obj_tiles gNamingScreenUnderscoreTiles, 0x0020, 0x000b
null_obj_tiles
.align 2
gUnknown_0858C230:: @ 858C230
.incbin "baserom.gba", 0x58c230, 0x48
obj_pal gNamingScreenMenu_Pal, 0x0000
obj_pal gNamingScreenMenu_Pal+0x20, 0x0001
obj_pal gNamingScreenMenu_Pal+0x40, 0x0002
obj_pal gNamingScreenMenu_Pal+0x60, 0x0003
obj_pal gNamingScreenMenu_Pal+0x80, 0x0004
obj_pal gNamingScreenMenu_Pal+0xA0, 0x0005
obj_pal gNamingScreenMenu_Pal+0x80, 0x0006
obj_pal gNamingScreenMenu_Pal+0x80, 0x0007
null_obj_pal

View File

@ -9,14 +9,23 @@
@ 861CAAC
.include "data/text/nature_names.inc"
.align 2
gUnknown_0861CBB4:: @ 861CBB4
.incbin "baserom.gba", 0x61cbb4, 0x38
.4byte 0x000001f0, 0x000013b9, 0x0000239a, 0x000033db
.align 2
gUnknown_0861CBC4:: @ 861CBC4
.incbin "graphics/interface/unk_tilemap2.bin"
.align 2
gUnknown_0861CBEC:: @ 861CBEC
.incbin "baserom.gba", 0x61cbec, 0xc
.4byte gUnknown_0861CBC4
.byte 0x01, 0x00, 0x0a, 0x02, 0x00, 0x12
.align 2
gUnknown_0861CBF8:: @ 861CBF8
.incbin "baserom.gba", 0x61cbf8, 0xc
.4byte gUnknown_0861CBC4
.byte 0x01, 0x00, 0x0a, 0x02, 0x00, 0x32
.align 2
gUnknown_0861CC04:: @ 861CC04
@ -40,101 +49,385 @@ gUnknown_0861CC10:: @ 861CC10
.align 2
gUnknown_0861CC1C:: @ 861CC1C
.incbin "baserom.gba", 0x61cc1c, 0x8
.byte 0x00, 0x02, 0x03, 0x01, 0x04, 0x05, 0x00, 0x00
.align 2
gUnknown_0861CC24:: @ 861CC24
.incbin "baserom.gba", 0x61cc24, 0xa8
window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0001
window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0017
window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x002d
window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0043
window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0059
window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0069
window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0079
window_template 0x00, 0x0b, 0x04, 0x00, 0x02, 0x06, 0x0089
window_template 0x00, 0x0b, 0x04, 0x12, 0x02, 0x06, 0x0089
window_template 0x00, 0x0b, 0x06, 0x12, 0x02, 0x06, 0x00ad
window_template 0x00, 0x0a, 0x07, 0x06, 0x06, 0x06, 0x00d1
window_template 0x00, 0x16, 0x07, 0x05, 0x06, 0x06, 0x00f5
window_template 0x00, 0x0a, 0x0e, 0x0b, 0x04, 0x06, 0x0113
window_template 0x00, 0x00, 0x12, 0x06, 0x02, 0x06, 0x013f
window_template 0x00, 0x01, 0x0f, 0x09, 0x04, 0x06, 0x014b
window_template 0x00, 0x01, 0x0f, 0x05, 0x04, 0x06, 0x016f
window_template 0x00, 0x16, 0x04, 0x00, 0x02, 0x06, 0x0183
window_template 0x00, 0x01, 0x02, 0x04, 0x02, 0x07, 0x0183
window_template 0x00, 0x01, 0x0c, 0x09, 0x02, 0x06, 0x018b
window_template 0x00, 0x01, 0x0e, 0x09, 0x04, 0x06, 0x019d
null_window_template
.align 2
gUnknown_0861CCCC:: @ 861CCCC
.incbin "baserom.gba", 0x61cccc, 0x20
window_template 0x00, 0x0b, 0x04, 0x0b, 0x02, 0x06, 0x01c1
window_template 0x00, 0x16, 0x04, 0x07, 0x02, 0x06, 0x01d7
window_template 0x00, 0x0b, 0x09, 0x12, 0x04, 0x06, 0x01e5
window_template 0x00, 0x0b, 0x0e, 0x12, 0x06, 0x06, 0x022d
.align 2
gUnknown_0861CCEC:: @ 861CCEC
.incbin "baserom.gba", 0x61ccec, 0x28
window_template 0x00, 0x0a, 0x04, 0x0a, 0x02, 0x06, 0x01c1
window_template 0x00, 0x14, 0x04, 0x0a, 0x02, 0x06, 0x01d5
window_template 0x00, 0x10, 0x07, 0x06, 0x06, 0x06, 0x01e9
window_template 0x00, 0x1b, 0x07, 0x03, 0x06, 0x06, 0x020d
window_template 0x00, 0x18, 0x0e, 0x06, 0x04, 0x06, 0x021f
.align 2
gUnknown_0861CD14:: @ 861CD14
.incbin "baserom.gba", 0x61cd14, 0x18
window_template 0x00, 0x0f, 0x04, 0x09, 0x0a, 0x06, 0x01c1
window_template 0x00, 0x18, 0x04, 0x06, 0x0a, 0x08, 0x021b
window_template 0x00, 0x0a, 0x0f, 0x14, 0x04, 0x06, 0x0257
gUnknown_0861CD2C:: @ 861CD2C
.incbin "baserom.gba", 0x61cd2c, 0x27
.byte 0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x00, 0x05, 0x06, 0x00, 0x07, 0x08, 0x00, 0x09, 0x0a, 0x00, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x00, 0x07, 0x08, 0x0d, 0x0f, 0x0e, 0x00, 0x01, 0x02, 0x00, 0x03
.byte 0x04, 0x00, 0x05, 0x06, 0x00, 0x07, 0x08
gUnknown_0861CD53:: @ 861CD53
.incbin "baserom.gba", 0x61cd53, 0x80
.incbin "graphics/interface/summary_a_button.4bpp"
gUnknown_0861CDD3:: @ 861CDD3
.incbin "baserom.gba", 0x61cdd3, 0x81
.incbin "graphics/interface/summary_b_button.4bpp"
.align 2
gUnknown_0861CE54:: @ 861CE54
.incbin "baserom.gba", 0x61ce54, 0x10
.4byte sub_81C2E00
.4byte sub_81C3530
.4byte sub_81C3984
.4byte sub_81C3D08
.align 2
gUnknown_0861CE64:: @ 861CE64
.incbin "baserom.gba", 0x61ce64, 0x10
.4byte sub_81C2E40
.4byte sub_81C3554
.4byte sub_81C39F0
.4byte sub_81C3D54
gUnknown_0861CE74:: @ 861CE74
.incbin "baserom.gba", 0x61ce74, 0x7
.string "{COLOR LIGHT_RED}{SHADOW GREEN}$"
gUnknown_0861CE7B:: @ 861CE7B
.incbin "baserom.gba", 0x61ce7b, 0x7
.string "{COLOR WHITE}{SHADOW DARK_GREY}$"
gUnknown_0861CE82:: @ 861CE82
.incbin "baserom.gba", 0x61ce82, 0xc
.string "{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n"
.string "{SPECIAL_F7 0x02}\n"
.string "{SPECIAL_F7 0x03}$"
gUnknown_0861CE8E:: @ 861CE8E
.incbin "baserom.gba", 0x61ce8e, 0x9
.string "{SPECIAL_F7 0x00}\n"
.string "{SPECIAL_F7 0x01}\n"
.string "{SPECIAL_F7 0x02}$"
gUnknown_0861CE97:: @ 861CE97
.incbin "baserom.gba", 0x61ce97, 0x125
.string "{UNK_CTRL_F9 0x06}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}$"
.align 2
gOamData_861CEA0:: @ 861CEA0
.2byte 0x4000, 0x8000, 0x0400, 0x0000
.align 2
gSpriteAnim_861CEA8:: @ 861CEA8
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEB0:: @ 861CEB0
.2byte 0x0008, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEB8:: @ 861CEB8
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEC0:: @ 861CEC0
.2byte 0x0018, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEC8:: @ 861CEC8
.2byte 0x0020, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CED0:: @ 861CED0
.2byte 0x0028, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CED8:: @ 861CED8
.2byte 0x0030, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEE0:: @ 861CEE0
.2byte 0x0038, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEE8:: @ 861CEE8
.2byte 0x0040, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEF0:: @ 861CEF0
.2byte 0x0048, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEF8:: @ 861CEF8
.2byte 0x0050, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF00:: @ 861CF00
.2byte 0x0058, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF08:: @ 861CF08
.2byte 0x0060, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF10:: @ 861CF10
.2byte 0x0068, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF18:: @ 861CF18
.2byte 0x0070, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF20:: @ 861CF20
.2byte 0x0078, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF28:: @ 861CF28
.2byte 0x0080, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF30:: @ 861CF30
.2byte 0x0088, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF38:: @ 861CF38
.2byte 0x0090, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF40:: @ 861CF40
.2byte 0x0098, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF48:: @ 861CF48
.2byte 0x00a0, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF50:: @ 861CF50
.2byte 0x00a8, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF58:: @ 861CF58
.2byte 0x00b0, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_861CF60:: @ 861CF60
.4byte gSpriteAnim_861CEA8
.4byte gSpriteAnim_861CEB0
.4byte gSpriteAnim_861CEB8
.4byte gSpriteAnim_861CEC0
.4byte gSpriteAnim_861CEC8
.4byte gSpriteAnim_861CED0
.4byte gSpriteAnim_861CED8
.4byte gSpriteAnim_861CEE0
.4byte gSpriteAnim_861CEE8
.4byte gSpriteAnim_861CEF0
.4byte gSpriteAnim_861CEF8
.4byte gSpriteAnim_861CF00
.4byte gSpriteAnim_861CF08
.4byte gSpriteAnim_861CF10
.4byte gSpriteAnim_861CF18
.4byte gSpriteAnim_861CF20
.4byte gSpriteAnim_861CF28
.4byte gSpriteAnim_861CF30
.4byte gSpriteAnim_861CF38
.4byte gSpriteAnim_861CF40
.4byte gSpriteAnim_861CF48
.4byte gSpriteAnim_861CF50
.4byte gSpriteAnim_861CF58
.align 2
gUnknown_0861CFBC:: @ 861CFBC
.incbin "baserom.gba", 0x61cfbc, 0x8
obj_tiles 0x08d971b0, 0x1700, 0x7532
.align 2
gUnknown_0861CFC4:: @ 861CFC4
.incbin "baserom.gba", 0x61cfc4, 0x18
spr_template 0x7532, 0x7532, gOamData_861CEA0, gSpriteAnimTable_861CF60, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0861CFDC:: @ 861CFDC
.incbin "baserom.gba", 0x61cfdc, 0x98
.byte 0x0d, 0x0d, 0x0e, 0x0e, 0x0d, 0x0d, 0x0f, 0x0e, 0x0d, 0x0f, 0x0d, 0x0e, 0x0f, 0x0d, 0x0e, 0x0e, 0x0f, 0x0d, 0x0d, 0x0e, 0x0e, 0x0f, 0x0d, 0x00
.align 2
gOamData_861CFF4:: @ 861CFF4
.2byte 0x0000, 0x4000, 0x0400, 0x0000
.align 2
gSpriteAnim_861CFFC:: @ 861CFFC
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D004:: @ 861D004
.2byte 0x0004, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D00C:: @ 861D00C
.2byte 0x0008, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D014:: @ 861D014
.2byte 0x000c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D01C:: @ 861D01C
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D024:: @ 861D024
.2byte 0x0010, 0x0040, 0xffff, 0x0000
.align 2
gSpriteAnim_861D02C:: @ 861D02C
.2byte 0x0014, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D034:: @ 861D034
.2byte 0x0018, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D03C:: @ 861D03C
.2byte 0x0018, 0x0040, 0xffff, 0x0000
.align 2
gSpriteAnim_861D044:: @ 861D044
.2byte 0x001c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_861D04C:: @ 861D04C
.4byte gSpriteAnim_861CFFC
.4byte gSpriteAnim_861D004
.4byte gSpriteAnim_861D00C
.4byte gSpriteAnim_861D014
.4byte gSpriteAnim_861D01C
.4byte gSpriteAnim_861D024
.4byte gSpriteAnim_861D02C
.4byte gSpriteAnim_861D034
.4byte gSpriteAnim_861D03C
.4byte gSpriteAnim_861D044
.align 2
gUnknown_0861D074:: @ 861D074
.incbin "baserom.gba", 0x61d074, 0x8
obj_tiles gUnknown_08D97BEC, 0x0400, 0x7530
.align 2
gUnknown_0861D07C:: @ 861D07C
.incbin "baserom.gba", 0x61d07c, 0x8
obj_pal gUnknown_08D97CF4, 0x7530
.align 2
gUnknown_0861D084:: @ 861D084
.incbin "baserom.gba", 0x61d084, 0x74
spr_template 0x7530, 0x7530, gOamData_861CFF4, gSpriteAnimTable_861D04C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_861D09C:: @ 861D09C
.2byte 0x4000, 0x4000, 0x0c00, 0x0000
.align 2
gSpriteAnim_861D0A4:: @ 861D0A4
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0AC:: @ 861D0AC
.2byte 0x0004, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0B4:: @ 861D0B4
.2byte 0x0008, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0BC:: @ 861D0BC
.2byte 0x000c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0C4:: @ 861D0C4
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0CC:: @ 861D0CC
.2byte 0x0014, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0D4:: @ 861D0D4
.2byte 0x0018, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_861D0DC:: @ 861D0DC
.4byte gSpriteAnim_861D0A4
.4byte gSpriteAnim_861D0AC
.4byte gSpriteAnim_861D0B4
.4byte gSpriteAnim_861D0BC
.4byte gSpriteAnim_861D0C4
.4byte gSpriteAnim_861D0CC
.4byte gSpriteAnim_861D0D4
.align 2
gUnknown_0861D0F8:: @ 861D0F8
.incbin "baserom.gba", 0x61d0f8, 0x8
obj_tiles gStatusGfx_Icons, 0x0380, 0x7531
.align 2
gUnknown_0861D100:: @ 861D100
.incbin "baserom.gba", 0x61d100, 0x8
obj_pal gStatusPal_Icons, 0x7531
.align 2
gUnknown_0861D108:: @ 861D108
.incbin "baserom.gba", 0x61d108, 0x18
spr_template 0x7531, 0x7531, gOamData_861D09C, gSpriteAnimTable_861D0DC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0861D120:: @ 861D120
.incbin "baserom.gba", 0x61d120, 0x20
.incbin "graphics/interface/summary_markings.gbapal"
.align 2
gUnknown_0861D140:: @ 861D140
.incbin "baserom.gba", 0x61d140, 0x60
.incbin "graphics/interface/region_map.gbapal"
.align 2
gUnknown_0861D1A0:: @ 861D1A0
.incbin "baserom.gba", 0x61d1a0, 0xd54
.incbin "graphics/interface/region_map.8bpp.lz"
.align 2
gUnknown_0861DEF4:: @ 861DEF4
.incbin "baserom.gba", 0x61def4, 0x314
.incbin "graphics/interface/region_map.bin.lz"
.align 2
gUnknown_0861E208:: @ 861E208
.incbin "baserom.gba", 0x61e208, 0xd5c
.incbin "graphics/interface/region_map_affine.8bpp.lz"
.align 2
gUnknown_0861EF64:: @ 861EF64
.incbin "baserom.gba", 0x61ef64, 0x350
.incbin "graphics/interface/region_map_affine.bin.lz"
.align 2
gUnknown_0861F2B4:: @ 861F2B4
.incbin "baserom.gba", 0x61f2b4, 0xc
.4byte 0x000011f0, 0x000001e1, 0x000021de
.align 2
gUnknown_0861F2C0:: @ 861F2C0
.incbin "baserom.gba", 0x61f2c0, 0x18
.4byte 0x00000000, sub_81C5460, sub_81C5518, 0x00000000, 0x00080000, 0x07003021
.align 2
gUnknown_0861F2D8:: @ 861F2D8
.4byte gMenuText_Use, sub_81C61E0
.4byte gMenuText_Toss, sub_81C62C4
@ -144,35 +437,74 @@ gUnknown_0861F2D8:: @ 861F2D8
.4byte gText_EmptyString2, NULL
gUnknown_0861F308:: @ 861F308
.incbin "baserom.gba", 0x61f308, 0x4
.byte 0x00, 0x02, 0x01, 0x03
gUnknown_0861F30C:: @ 861F30C
.incbin "baserom.gba", 0x61f30c, 0x2
.byte 0x01, 0x03
gUnknown_0861F30E:: @ 861F30E
.incbin "baserom.gba", 0x61f30e, 0x2
.byte 0x04, 0x03
gUnknown_0861F310:: @ 861F310
.incbin "baserom.gba", 0x61f310, 0x4
.byte 0x03, 0x00, 0x00, 0x00
gUnknown_0861F314:: @ 861F314
.4byte sub_81C654C
.4byte sub_81C63D0
gUnknown_0861F31C:: @ 861F31C
.incbin "baserom.gba", 0x61f31c, 0xc
.byte 0x00, 0x02, 0x03, 0x00, 0x03, 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00
.align 2
gUnknown_0861F328:: @ 861F328
.incbin "baserom.gba", 0x61f328, 0x28
window_template 0x00, 0x0e, 0x02, 0x0f, 0x10, 0x0f, 0x001e
window_template 0x00, 0x00, 0x0d, 0x0e, 0x06, 0x0f, 0x010e
window_template 0x01, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0162
window_template 0x01, 0x18, 0x11, 0x05, 0x02, 0x0f, 0x01ce
null_window_template
.align 2
gUnknown_0861F350:: @ 861F350
.incbin "baserom.gba", 0x61f350, 0x20
window_template 0x01, 0x16, 0x11, 0x07, 0x02, 0x0f, 0x01d8
window_template 0x01, 0x16, 0x0f, 0x07, 0x04, 0x0f, 0x01d8
window_template 0x01, 0x0f, 0x0f, 0x0e, 0x04, 0x0f, 0x01d8
window_template 0x01, 0x0f, 0x0d, 0x0e, 0x06, 0x0f, 0x01d8
.align 2
gUnknown_0861F370:: @ 861F370
.incbin "baserom.gba", 0x61f370, 0x5c
window_template 0x01, 0x18, 0x0f, 0x05, 0x04, 0x0f, 0x01d8
.align 2
gOamData_861F378:: @ 861F378
.2byte 0x0100, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_861F380:: @ 861F380
.2byte 0x0000, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnimTable_861F388:: @ 861F388
.4byte gSpriteAnim_861F380
.align 2
gSpriteAffineAnim_861F38C:: @ 861F38C
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_861F39C:: @ 861F39C
.2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_861F3C4:: @ 861F3C4
.4byte gSpriteAffineAnim_861F38C
.4byte gSpriteAffineAnim_861F39C
.align 2
gUnknown_0861F3CC:: @ 861F3CC
.incbin "baserom.gba", 0x61f3cc, 0x8
obj_tiles gBattleFrontierGfx_PyramidBag, 0x0800, 0x1024
.align 2
gUnknown_0861F3D4:: @ 861F3D4
.incbin "baserom.gba", 0x61f3d4, 0x18
spr_template 0x1024, 0x1024, gOamData_861F378, gSpriteAnimTable_861F388, NULL, gSpriteAffineAnimTable_861F3C4, SpriteCallbackDummy

View File

@ -760,4 +760,4 @@ gUnknown_0858BBE0:: @ 858BBE0
.incbin "baserom.gba", 0x58bbe0, 0xc
gUnknown_0858BBEC:: @ 858BBEC
.incbin "baserom.gba", 0x58bbec, 0x18c
.incbin "baserom.gba", 0x58bbec, 0xc

View File

@ -4645,16 +4645,16 @@ gText_MixingRecords:: @ 85EEA7E
gText_RecordMixingComplete:: @ 85EEA8E
.string "Record mixing completed.\nThank you for waiting.$"
gUnknown_085EEABE:: @ 85EEABE
gText_YourName:: @ 85EEABE
.string "YOUR NAME?$"
gUnknown_085EEAC9:: @ 85EEAC9
gText_BoxName:: @ 85EEAC9
.string "BOX NAME?$"
gUnknown_085EEAD3:: @ 85EEAD3
gText_PkmnsNickname:: @ 85EEAD3
.string "{STR_VAR_1}s nickname?$"
gUnknown_085EEAE2:: @ 85EEAE2
gText_TellHimTheWords:: @ 85EEAE2
.string "Tell him the words.$"
gText_MoveOkBack:: @ 85EEAF6

Binary file not shown.

View File

@ -0,0 +1,51 @@
JASC-PAL
0100
48
0 0 0
156 213 255
0 115 0
164 180 255
57 172 8
189 0 49
255 106 139
164 0 8
246 0 0
255 189 205
255 164 49
238 230 172
230 164 0
238 189 57
205 205 148
98 213 0
0 0 0
172 238 49
213 255 123
238 230 115
74 156 230
41 131 230
24 65 197
57 131 197
246 213 82
32 74 197
65 106 205
0 0 0
255 230 131
255 156 0
180 0 0
255 255 255
0 0 0
205 238 255
197 213 255
98 98 98
205 205 205
189 123 0
0 0 0
123 180 213
0 115 172
0 57 139
255 172 16
255 57 16
148 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
164 148 222
172 156 238
255 255 255
205 205 205
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

Binary file not shown.

Binary file not shown.

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

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 213 180
255 197 148
222 148 115
123 65 65
213 172 65
156 106 32
106 74 32
115 189 0
65 123 0
32 65 16
213 115 164
164 65 115
82 32 65
230 230 49
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 B

View File

@ -4,7 +4,7 @@ MONFRONTGFXDIR := graphics/pokemon/anim_front_pics
MONPALDIR := graphics/pokemon/palettes
TILESETGFXDIR := data/tilesets
FONTGFXDIR := data/graphics/fonts
MENUGFXDIR := graphics/interface
INTERFACEGFXDIR := graphics/interface
BTLANMSPRGFXDIR := graphics/battle_anims/sprites
UNUSEDGFXDIR := graphics/unused
UNKNOWNGFXDIR := graphics/unknown
@ -310,8 +310,8 @@ graphics/pokenav/region_map.8bpp: %.8bpp: %.png
graphics/misc/japanese_hof.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 29
$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal \
$(MENUGFXDIR)/menu_1.gbapal
$(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \
$(INTERFACEGFXDIR)/menu_1.gbapal
@cat $^ >$@
$(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \
@ -340,9 +340,9 @@ $(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \
$(UNUSEDGFXDIR)/old_battle_interface_3.4bpp
@cat $^ >$@
$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp \
$(MENUGFXDIR)/numbers1.4bpp \
$(MENUGFXDIR)/numbers2.4bpp
$(INTERFACEGFXDIR)/hp_numbers.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \
$(INTERFACEGFXDIR)/numbers1.4bpp \
$(INTERFACEGFXDIR)/numbers2.4bpp
@cat $^ >$@
$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
@ -398,7 +398,7 @@ $(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png
$(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 16
$(MENUGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png
$(INTERFACEGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 62
$(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp)
@ -409,7 +409,7 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \
$(TYPESGFXDIR)/move_types_3.gbapal
@cat $^ >$@
$(MENUGFXDIR)/bag_screen.4bpp: %.4bpp: %.png
$(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 53
$(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png
@ -652,3 +652,9 @@ $(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png
$(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 13
$(INTERFACEGFXDIR)/region_map.8bpp: %.8bpp: %.png
$(GFX) $< $@ -num_tiles 232
$(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
$(GFX) $< $@ -num_tiles 233