diff options
| -rw-r--r-- | data/decoration.s | 1 | ||||
| -rw-r--r-- | data/evolution_graphics.s | 30 | ||||
| -rw-r--r-- | data/mail.s | 3 | ||||
| -rw-r--r-- | data/menu_helpers.s | 2 | ||||
| -rw-r--r-- | data/naming_screen.s | 1 | ||||
| -rw-r--r-- | data/pokedex_area_screen.s | 9 | ||||
| -rw-r--r-- | data/pokemon_menu.s | 17 | ||||
| -rw-r--r-- | data/pokemon_summary_screen.s | 2 | ||||
| -rw-r--r-- | data/rom_8077ABC.s | 10 | ||||
| -rw-r--r-- | data/rom_8080874.s | 5 | ||||
| -rw-r--r-- | data/title_screen.s | 34 | ||||
| -rw-r--r-- | data/trainer_card.s | 3 | ||||
| -rw-r--r-- | graphics/interface/83E5948.pal | 19 |
13 files changed, 125 insertions, 11 deletions
diff --git a/data/decoration.s b/data/decoration.s index 6bbe52703..0ca44c847 100644 --- a/data/decoration.s +++ b/data/decoration.s @@ -261,4 +261,5 @@ gUnknown_083ECAA0:: @ 83ECAA0 .4byte sub_80FED3C @ XXX: what is this? + .align 2 .4byte 0x2000000 diff --git a/data/evolution_graphics.s b/data/evolution_graphics.s index 1704e4fdb..e362b4dba 100644 --- a/data/evolution_graphics.s +++ b/data/evolution_graphics.s @@ -38,5 +38,33 @@ gSpriteAnimTable_8416EB4:: @ 8416EB4 gSpriteTemplate_8416EB8:: @ 8416EB8 spr_template 1001, 1001, gOamData_8416EA4, gSpriteAnimTable_8416EB4, NULL, gDummySpriteAffineAnimTable, nullsub_84 + .align 1 gUnknown_08416ED0:: @ 8416ED0 - .incbin "baserom.gba", 0x00416ed0, 0x38 + .2byte 0x3C0 + .2byte 0x380 + .2byte 0x340 + .2byte 0x300 + .2byte 0x2C0 + .2byte 0x280 + .2byte 0x240 + .2byte 0x200 + .2byte 0x1C0 + .2byte 0x180 + .2byte 0x140 + .2byte 0x100 + .2byte 0xFFFC + .2byte 0x10 + .2byte 0xFFFD + .2byte 0x30 + .2byte 0xFFFE + .2byte 0x50 + .2byte 0xFFFF + .2byte 0x70 + .2byte 0x1 + .2byte 0x70 + .2byte 0x2 + .2byte 0x50 + .2byte 0x3 + .2byte 0x30 + .2byte 0x4 + .2byte 0x10 diff --git a/data/mail.s b/data/mail.s index 6bfc29c49..f5ae7f102 100644 --- a/data/mail.s +++ b/data/mail.s @@ -173,5 +173,6 @@ gUnknown_083E57A4:: @ 83E57A4 .byte 5, 15, 15, 52 .4byte Unknown_3E5790 +@ XXX: what is this? .align 2 - .incbin "baserom.gba", 0x3e5804, 0x4 + .4byte 0x2000000 diff --git a/data/menu_helpers.s b/data/menu_helpers.s index b4665af1f..29d42cb4b 100644 --- a/data/menu_helpers.s +++ b/data/menu_helpers.s @@ -29,7 +29,7 @@ gSpriteImage_83E5928:: @ 83E5928 .align 2 Palette_3E5948: @ 83E5948 - .incbin "baserom.gba", 0x3e5948, 0x20 + .incbin "graphics/interface/83E5948.gbapal" .align 2 gUnknown_083E5968:: @ 83E5968 diff --git a/data/naming_screen.s b/data/naming_screen.s index 22998e7d7..4e477f4b9 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -12,6 +12,7 @@ gSpriteImage_83CE154:: @ 83CE154 .incbin "graphics/naming_screen/pc_icon/1.4bpp" @ XXX: what is this? + .align 2 .4byte 0x2000000 .align 2 diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index ac24f8653..9c23f8e89 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -18,8 +18,15 @@ gUnknown_083F856E:: @ 83F856E .2byte 328, 0, 34 .2byte 412, 0, 0 + .align 1 gUnknown_083F857A:: @ 83F857A - .incbin "baserom.gba", 0x003f857a, 0x12 + .2byte 85, 2142 + .2byte 68, 2119 + .2byte 88, 0 + +@ XXX: what is this? + .align 2 + .4byte 0x2000000 .align 2 gUnknown_083F858C:: @ 83F858C diff --git a/data/pokemon_menu.s b/data/pokemon_menu.s index 1781e8df7..9e2ce2864 100644 --- a/data/pokemon_menu.s +++ b/data/pokemon_menu.s @@ -30,8 +30,23 @@ gPokemonMenuActions:: @ 839F494 .4byte gMoveNames + 13 * MOVE_SOFT_BOILED, PokemonMenu_FieldMove .4byte gMoveNames + 13 * MOVE_SWEET_SCENT, PokemonMenu_FieldMove + .align 1 gUnknown_0839F554:: @ 839F554 - .incbin "baserom.gba", 0x39f554, 0x1e + .2byte MOVE_CUT + .2byte MOVE_FLASH + .2byte MOVE_ROCK_SMASH + .2byte MOVE_STRENGTH + .2byte MOVE_SURF + .2byte MOVE_FLY + .2byte MOVE_DIVE + .2byte MOVE_WATERFALL + .2byte MOVE_TELEPORT + .2byte MOVE_DIG + .2byte MOVE_SECRET_POWER + .2byte MOVE_MILK_DRINK + .2byte MOVE_SOFT_BOILED + .2byte MOVE_SWEET_SCENT + .2byte 0xFF Unknown_39F572: @ 839F572 .byte 4, 5, 9, 0 diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index 31457e382..f66a28e56 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -185,7 +185,7 @@ gSpriteTemplate_83C11C0:: @ 83C11C0 spr_template 30002, 30002, gOamData_83C109C, gSpriteAnimTable_83C115C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_083C11D8:: @ 83C11D8 - .incbin "baserom.gba", 0x003c11d8, 0x18 + .byte 0xD,0xD,0xE,0xE,0xD,0xD,0xF,0xE,0xD,0xF,0xD,0xE,0xF,0xD,0xE,0xE,0xF,0xD,0xD,0xE,0xE,0xF,0xD .align 2 gOamData_83C11F0:: @ 83C11F0 diff --git a/data/rom_8077ABC.s b/data/rom_8077ABC.s index dc9074cee..81b61228b 100644 --- a/data/rom_8077ABC.s +++ b/data/rom_8077ABC.s @@ -3,8 +3,16 @@ .section .rodata + .align 2 gUnknown_0837F578:: @ 837F578 - .incbin "baserom.gba", 0x0037f578, 0x20 + .byte 72, 80, 0, 0 + .byte 176, 40, 0, 0 + .byte 48, 40, 0, 0 + .byte 112, 80, 0, 0 + .byte 32, 80, 0, 0 + .byte 200, 40, 0, 0 + .byte 90, 88, 0, 0 + .byte 152, 32, 0, 0 @ One entry for each of the four Castform forms. @ Coords are probably front pic coords or back pic coords, but this data does not seem to be diff --git a/data/rom_8080874.s b/data/rom_8080874.s index f91dd02fc..220ec5f96 100644 --- a/data/rom_8080874.s +++ b/data/rom_8080874.s @@ -3,12 +3,13 @@ .section .rodata + .align 1 gUnknown_0839ACDC:: @ 839ACDC - .incbin "baserom.gba", 0x0039acdc, 0xc + .2byte 0xC8, 0x48, 0x38, 0x28, 0x18, 0x0 .align 2 gUnknown_0839ACE8:: @ 839ACE8 - .byte 4 + .4byte 4 .align 2 gUnknown_0839ACEC:: @ 839ACEC diff --git a/data/title_screen.s b/data/title_screen.s index b5e791273..7c818eeb2 100644 --- a/data/title_screen.s +++ b/data/title_screen.s @@ -41,8 +41,40 @@ gUnknown_08393BF8:: @ 8393BF8 LogoShineTiles: @ 8393D14 .incbin "graphics/title_screen/logo_shine.4bpp.lz" + .align 1 gUnknown_08393E64:: @ 8393E64 - .incbin "baserom.gba", 0x00393e64, 0x40 + .2byte 0x10 + .2byte 0x110 + .2byte 0x210 + .2byte 0x310 + .2byte 0x410 + .2byte 0x510 + .2byte 0x610 + .2byte 0x710 + .2byte 0x810 + .2byte 0x910 + .2byte 0xA10 + .2byte 0xB10 + .2byte 0xC10 + .2byte 0xD10 + .2byte 0xE10 + .2byte 0xF10 + .2byte 0x100F + .2byte 0x100E + .2byte 0x100D + .2byte 0x100C + .2byte 0x100B + .2byte 0x100A + .2byte 0x1009 + .2byte 0x1008 + .2byte 0x1007 + .2byte 0x1006 + .2byte 0x1005 + .2byte 0x1004 + .2byte 0x1003 + .2byte 0x1002 + .2byte 0x1001 + .2byte 0x1000 .align 2 gOamData_8393EA4:: @ 8393EA4 diff --git a/data/trainer_card.s b/data/trainer_card.s index d7d71fb68..e73af87a2 100644 --- a/data/trainer_card.s +++ b/data/trainer_card.s @@ -7,8 +7,9 @@ gBadgesTiles:: @ 83B5AB8 .incbin "graphics/trainer_card/badges.4bpp" +@ XXX: what is this? .align 2 - .4byte 0x02000000 @ XXX + .4byte 0x2000000 .align 2 gUnknown_083B5EBC:: @ 83B5EBC diff --git a/graphics/interface/83E5948.pal b/graphics/interface/83E5948.pal new file mode 100644 index 000000000..570af0a23 --- /dev/null +++ b/graphics/interface/83E5948.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 197 131 +255 123 90 +131 0 0 +0 0 0 +238 238 238 +197 197 197 +148 148 148 +255 0 0 +180 0 0 +255 197 197 +82 82 255 +49 49 180 +197 197 255 +90 90 98 +0 0 0 +0 0 0 |