diff options
37 files changed, 1640 insertions, 193 deletions
diff --git a/INSTALL.md b/INSTALL.md index 5882a6e45..bced4e182 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,3 +1,5 @@ +First, you must put a Pokémon Ruby 1.0 (US) ROM in the root directory of the repository and name it `baserom.gba`. It should have a SHA1 checksum of `f28b6ffc97847e94a6c21a63cacf633ee5c8df1e`. Then, follow the OS-specific instructions below. + # Linux Install [**devkitARM**](http://devkitpro.org/wiki/Getting_Started/devkitARM). diff --git a/asm/rom4.s b/asm/rom4.s index 4bd319a49..5dfecb2a1 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -2198,9 +2198,17 @@ sub_8053D9C: @ 8053D9C lsrs r0, 16 cmp r0, 0x1 bne _08053DB2 + .ifdef SAPPHIRE + ldr r0, _sub_8053D9C_LegendaryMusic + .else movs r0, 0xDE lsls r0, 1 + .endif b _08053DDC + .ifdef SAPPHIRE + .align 2, 0 +_sub_8053D9C_LegendaryMusic: .4byte 443 @ OOAME (Kyogre's Heavy Rain theme) + .endif _08053DB2: adds r0, r4, 0 bl sub_8053D6C @@ -2327,8 +2335,12 @@ sub_8053E90: @ 8053E90 bl sav1_map_get_music lsls r0, 16 lsrs r4, r0, 16 + .ifdef SAPPHIRE + ldr r0, _sub_8053E90_LegendaryMusic + .else movs r0, 0xDE lsls r0, 1 + .endif cmp r4, r0 beq _08053ED6 ldr r1, _08053EB0 @@ -2338,6 +2350,9 @@ sub_8053E90: @ 8053E90 adds r4, r0, 0 b _08053ED6 .align 2, 0 + .ifdef SAPPHIRE +_sub_8053E90_LegendaryMusic: .4byte 443 @ OOAME (Kyogre's Heavy Rain theme) + .endif _08053EB0: .4byte 0x02025734 _08053EB4: bl sav1_map_get_light_level @@ -2406,8 +2421,12 @@ sub_8053F0C: @ 8053F0C bl current_map_music_get lsls r0, 16 lsrs r4, r0, 16 + .ifdef SAPPHIRE + ldr r0, _sub_8053F0C_LegendaryMusic + .else movs r0, 0xDE lsls r0, 1 + .endif cmp r5, r0 beq _08053F4E subs r0, 0x21 @@ -2437,6 +2456,9 @@ _08053F4E: b _08053F7C .align 2, 0 _08053F6C: .4byte 0x00004001 + .ifdef SAPPHIRE +_sub_8053F0C_LegendaryMusic: .4byte 443 @ OOAME (Kyogre's Heavy Rain theme) + .endif _08053F70: .4byte 0x0000016d _08053F74: adds r0, r5, 0 @@ -2481,8 +2503,12 @@ sub_8053FB0: @ 8053FB0 lsrs r1, r0, 16 cmp r1, r4 beq _08053FD2 + .ifdef SAPPHIRE + ldr r0, _sub_8053FB0_LegendaryMusic + .else movs r0, 0xDE lsls r0, 1 + .endif cmp r1, r0 beq _08053FD2 adds r0, r4, 0 @@ -2492,6 +2518,10 @@ _08053FD2: pop {r4} pop {r0} bx r0 + .ifdef SAPPHIRE + .align 2, 0 +_sub_8053FB0_LegendaryMusic: .4byte 443 @ OOAME (Kyogre's Heavy Rain theme) + .endif thumb_func_end sub_8053FB0 thumb_func_start is_warp1_light_level_8_or_9 @@ -47870,7 +47900,7 @@ _080684AA: .align 2, 0 _080684CC: .4byte 0x0202e8cc _080684D0: .4byte 0x0202e8ce -_080684D4: .4byte gUnknown_0819FF7B +_080684D4: .4byte HiddenItemScript _080684D8: cmp r5, 0x2 bne _08068494 @@ -47999,7 +48029,7 @@ _080685CC: ldr r0, _080685E0 b _080686EE .align 2, 0 -_080685E0: .4byte gUnknown_081A085B +_080685E0: .4byte PictureBookShelfScript _080685E4: adds r0, r5, 0 bl sub_8057944 @@ -48010,7 +48040,7 @@ _080685E4: ldr r0, _080685F8 b _080686EE .align 2, 0 -_080685F8: .4byte gUnknown_081A0864 +_080685F8: .4byte BookshelfScript _080685FC: adds r0, r5, 0 bl sub_8057958 @@ -48021,7 +48051,7 @@ _080685FC: ldr r0, _08068610 b _080686EE .align 2, 0 -_08068610: .4byte gUnknown_081A086D +_08068610: .4byte PokemonCenterBookshelfScript _08068614: adds r0, r5, 0 bl sub_805796C @@ -48032,7 +48062,7 @@ _08068614: ldr r0, _08068628 b _080686EE .align 2, 0 -_08068628: .4byte gUnknown_081A0876 +_08068628: .4byte VaseScript _0806862C: adds r0, r5, 0 bl sub_8057980 @@ -48043,7 +48073,7 @@ _0806862C: ldr r0, _08068640 b _080686EE .align 2, 0 -_08068640: .4byte gUnknown_081A087F +_08068640: .4byte TrashCanScript _08068644: adds r0, r5, 0 bl sub_8057994 @@ -48054,7 +48084,7 @@ _08068644: ldr r0, _08068658 b _080686EE .align 2, 0 -_08068658: .4byte gUnknown_081A0888 +_08068658: .4byte ShopShelfScript _0806865C: adds r0, r5, 0 bl sub_80579A8 @@ -48065,7 +48095,7 @@ _0806865C: ldr r0, _08068670 b _080686EE .align 2, 0 -_08068670: .4byte gUnknown_081A0891 +_08068670: .4byte BlueprintScript _08068674: movs r4, 0x4 ldrsb r4, [r6, r4] diff --git a/asm/rom5.s b/asm/rom5.s index e1d7c1da0..e33cc2fca 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -3268,14 +3268,21 @@ sub_807C7E4: @ 807C7E4 ands r0, r1 cmp r0, 0 bne _0807C80C + .ifdef SAPPHIRE + mov r0, sp + strh r2, [r0] + .else lsls r1, r2, 10 mov r0, sp strh r1, [r0] + .endif b _0807C816 _0807C80C: movs r0, 0x1F subs r0, r2 + .ifndef SAPPHIRE lsls r0, 10 + .endif mov r1, sp strh r0, [r1] _0807C816: @@ -308261,8 +308268,13 @@ sub_8110908: @ 8110908 push {r6,r7} lsls r0, 16 lsrs r7, r0, 16 + .ifdef SAPPHIRE + ldr r0, _sub_8110908_Latias + .else + @ Latios movs r0, 0xCC lsls r0, 1 + .endif cmp r7, r0 bne _0811091E b _08110A44 @@ -308323,6 +308335,9 @@ _08110960: beq _0811099A b _081109BA .align 2, 0 + .ifdef SAPPHIRE +_sub_8110908_Latias: .4byte 407 + .endif _08110988: .4byte 0x02000000 _0811098C: .4byte gUnknown_083F856C _08110990: .4byte gUnknown_083F856E @@ -351357,6 +351372,9 @@ sub_8126098: @ 8126098 cmp r2, 0 beq _081260C6 movs r0, 0x80 + .ifdef SAPPHIRE + lsls r0, 1 @ unknown difference + .endif ands r0, r4 cmp r0, 0 beq _081260C6 @@ -380940,8 +380958,12 @@ sub_8134240: @ 8134240 push {r6} sub sp, 0x10 ldr r5, _081342FC + .ifdef SAPPHIRE + ldr r6, _sub_8134240_Latias + .else movs r6, 0xCC lsls r6, 1 + .endif movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -381019,6 +381041,9 @@ sub_8134240: @ 8134240 bx r0 .align 2, 0 _081342FC: .4byte 0x030045c0 + .ifdef SAPPHIRE +_sub_8134240_Latias: .4byte 407 + .endif _08134300: .4byte 0x02028878 _08134304: .4byte 0x02039302 _08134308: .4byte gUnknown_08402E80 @@ -396619,9 +396644,14 @@ _0813BFDA: bl SetVBlankCallback movs r1, 0x80 lsls r1, 7 + .ifdef SAPPHIRE + movs r0, 0 + movs r2, 0x40 + .else movs r2, 0x80 lsls r2, 3 movs r0, 0x1 + .endif movs r3, 0x10 bl sub_8148EC0 lsls r0, 24 diff --git a/asm/rom_header.s b/asm/rom_header.s index 0e6112228..e49b4fbee 100644 --- a/asm/rom_header.s +++ b/asm/rom_header.s @@ -22,10 +22,18 @@ RomHeaderNintendoLogo: .byte 0x21,0xd4,0xf8,0x07 RomHeaderGameTitle: + .ifdef SAPPHIRE + .ascii "POKEMON SAPP" + .else .ascii "POKEMON RUBY" + .endif RomHeaderGameCode: + .ifdef SAPPHIRE + .ascii "AXPE" + .else .ascii "AXVE" + .endif RomHeaderMakerCode: .ascii "01" @@ -46,7 +54,11 @@ RomHeaderSoftwareVersion: .byte 0 RomHeaderChecksum: + .ifdef SAPPHIRE + .byte 0x55 + .else .byte 0x41 + .endif RomHeaderReserved2: .space 2 diff --git a/build_tools.sh b/build_tools.sh index 7d99d5d90..7d99d5d90 100644..100755 --- a/build_tools.sh +++ b/build_tools.sh diff --git a/data/data1.s b/data/data1.s index ea64d5fd3..b9a4e49ad 100644 --- a/data/data1.s +++ b/data/data1.s @@ -2938,15 +2938,191 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 step_12 step_end - .incbin "baserom.gba", 0x19fdf7, 0x184 +Std_ObtainItem: @ 819FDF7 + additem 0x8000, 0x8001 + copyvar 0x8007, RESULT + call Std_ObtainItem_ + return + +Std_ObtainItem_: @ 819FE07 + bufferitem 1, 0x8000 + checkitemtype 0x8000 + call GetItem_HandlePocket + compare 0x8007, 0x1 + callif 1, Std_ObtainItem_Success + compare 0x8007, 0x0 + callif 1, Std_ObtainItem_Fail + return + +GetItem_HandlePocket: + switch RESULT + case POCKET_ITEMS, GetItem_HandlePocket_Items + case POCKET_KEY_ITEMS, GetItem_HandlePocket_KeyItems + case POCKET_POKE_BALLS, GetItem_HandlePocket_PokeBalls + case POCKET_TM_HM, GetItem_HandlePocket_TMsHMs + case POCKET_BERRIES, GetItem_HandlePocket_Berries + end + +GetItem_HandlePocket_Items: + bufferstd 2, 0xE + compare 0x8007, 1 + callif 1, PlayGetItemFanfare + return + +GetItem_HandlePocket_KeyItems: + bufferstd 2, 0xF + compare 0x8007, 1 + callif 1, PlayGetItemFanfare + return + +GetItem_HandlePocket_PokeBalls: + bufferstd 2, 0x10 + compare 0x8007, 1 + callif 1, PlayGetItemFanfare + return + +GetItem_HandlePocket_TMsHMs: + bufferstd 2, 0x11 + compare 0x8007, 1 + callif 1, PlayGetTMHMFanfare + return + +GetItem_HandlePocket_Berries: + bufferstd 2, 0x12 + compare 0x8007, 1 + callif 1, PlayGetItemFanfare + return + +Std_ObtainItem_Success: @ 819FEB7 + message Message_ObtainedItem + waitfanfare + waittext + msgbox Message_PutAwayItem + setvar RESULT, 1 + return + +Std_ObtainItem_Fail: @ 819FECC + setvar RESULT, 0 + return + +PlayGetItemFanfare: + fanfare 0x172 + return + +PlayGetTMHMFanfare: + fanfare 0x174 + return + +Std_ObtainDecoration: @ 819FEDA + adddecor 0x8000 + copyvar 0x8007, RESULT + call Std_ObtainDecoration_ + return + +Std_ObtainDecoration_: @ 819FEE8 + bufferdecor 1, 0x8000 + compare 0x8007, 1 + callif 1, Std_ObtainDecoration_Success + compare 0x8007, 0 + callif 1, Std_ObtainDecoration_Fail + return + +Std_ObtainDecoration_Success: @ 819FF03 + fanfare 0x172 + message Message_ObtainedDecoration + waitfanfare + waittext + msgbox Message_TransferredToPC + setvar RESULT, 1 + return + +Std_ObtainDecoration_Fail: @ 819FF1B + setvar RESULT, 0 + return + +Std_FindItem: @ 819FF21 + lock + faceplayer + checksound + additem 0x8000, 0x8001 + copyvar 0x8007, RESULT + bufferitem 1, 0x8000 + checkitemtype 0x8000 + call GetItem_HandlePocket + compare 0x8007, 1 + callif 1, Std_FindItem_Success + compare 0x8007, 0 + callif 1, Std_FindItem_Fail + release + return + +Std_FindItem_Success: @ 819FF52 + disappear LAST_TALKED + message Message_FoundOneItem + waitfanfare + waittext + msgbox Message_PutAwayItem + return + +Std_FindItem_Fail: @ 819FF65 + msgbox Message_ObtainedItem + msgbox Message_BagFull + setvar RESULT, 0 + return + +HiddenItemScript:: @ 819FF7B + lockall + checksound + additem 0x8005, 1 + copyvar 0x8007, RESULT + bufferitem 0x1, 0x8005 + checkitemtype 0x8005 + call GetItem_HandlePocket + compare 0x8007, 1 + jumpeq HiddenItemScript_Success + compare 0x8007, 0 + jumpeq HiddenItemScript_Fail + end + +HiddenItemScript_Success: + message Message_FoundOneItem + waitfanfare + waittext + msgbox Message_PutAwayItem + special 0x96 + releaseall + end - .global gUnknown_0819FF7B -gUnknown_0819FF7B: @ 819FF7B - .incbin "baserom.gba", 0x0019ff7b, 0x8e +HiddenItemScript_Fail: + msgbox Message_FoundOneItem + msgbox Message_BagFull + setvar RESULT, 0 + releaseall + end + +UnusedMixRecordsScript: @ 819FFD5 + lock + faceplayer + msgbox UnusedMixRecordsPromptText, 5 + compare RESULT, 1 + jumpeq UnusedMixRecordsScript_Yes + compare RESULT, 0 + jumpeq UnusedMixRecordsScript_Done + jump UnusedMixRecordsScript_Done +UnusedMixRecordsScript_Yes: @ 819FFFA + special 0x1B + waitstate + lock + faceplayer +UnusedMixRecordsScript_Done: @ 81A0000 + message UnusedMixRecordsSeeYouAgainText + waittext + waitbutton + release + end .global gUnknown_081A0009 gUnknown_081A0009: @ 81A0009 - .incbin "baserom.gba", 0x1a0009, 0xd8 FallarborTown_EventScript_1A00E1:: @ 81A00E1 @@ -4060,33 +4236,60 @@ Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856 .incbin "baserom.gba", 0x1a0858, 0x3 - .global gUnknown_081A085B -gUnknown_081A085B: @ 81A085B - .incbin "baserom.gba", 0x001a085b, 0x9 +PictureBookShelfScript:: @ 81A085B + msgbox PictureBookShelfText, 3 + end - .global gUnknown_081A0864 -gUnknown_081A0864: @ 81A0864 - .incbin "baserom.gba", 0x001a0864, 0x9 +BookshelfScript:: @ 81A0864 + msgbox BookshelfText, 3 + end - .global gUnknown_081A086D -gUnknown_081A086D: @ 81A086D - .incbin "baserom.gba", 0x001a086d, 0x9 +PokemonCenterBookshelfScript:: @ 81A086D + msgbox PokemonCenterBookshelfText, 3 + end + +VaseScript:: @ 81A0876 + msgbox VaseText, 3 + end - .global gUnknown_081A0876 -gUnknown_081A0876: @ 81A0876 - .incbin "baserom.gba", 0x001a0876, 0x9 +TrashCanScript:: @ 81A087F + msgbox TrashCanText, 3 + end - .global gUnknown_081A087F -gUnknown_081A087F: @ 81A087F - .incbin "baserom.gba", 0x001a087f, 0x9 +ShopShelfScript:: @ 81A0888 + msgbox ShopShelfText, 3 + end - .global gUnknown_081A0888 -gUnknown_081A0888: @ 81A0888 - .incbin "baserom.gba", 0x001a0888, 0x9 +BlueprintScript:: @ 81A0891 + msgbox BlueprintText, 3 + end - .global gUnknown_081A0891 -gUnknown_081A0891: @ 81A0891 - .incbin "baserom.gba", 0x001a0891, 0x170 +SampleMessage1:: @ 81A089A + .string "This is sample message 1.\p" + .string "Welcome to the world of\n" + .string "POKéMON AGB!\l" + .string "We hope you enjoy this!$" + +SampleMessage2:: @ 81A08F1 + .string "This is sample message 2.\p" + .string "Welcome to the world of\n" + .string "POKéMON AGB!\l" + .string "We hope you enjoy this!$" + +SampleMessage3:: @ 81A0948 + .string "This is sample message 3.\p" + .string "Welcome to the world of\n" + .string "POKéMON AGB!\l" + .string "We hope you enjoy this!$" + +UnusedMixRecordsPromptText: @ 81A099F + .string "Would you like to mix records with other\n" + .string "TRAINERS?$" + +UnusedMixRecordsSeeYouAgainText: @ 81A09D2 + .string "We hope to see you again!$" + + .incbin "baserom.gba", 0x001a09ec, 0x15 .global gUnknown_081A0A01 gUnknown_081A0A01: @ 81A0A01 @@ -4161,26 +4364,31 @@ Route104_PrettyPetalFlowerShop_Text_1A0C42:: @ 81A0C42 .string "{PLAYER}{KUN}, welcome!\p" .string "What can I do for you?$" - .incbin "baserom.gba", 0x1a0c68, 0x11 +Message_ObtainedItem: @ 81A0C68 + .string "Obtained the {STR_VAR_2}.$" LilycoveCity_DepartmentStoreRooftop_Text_1A0C79:: @ 81A0C79 .string "The BAG is full...$" LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C:: @ 81A0C8C +Message_PutAwayItem: .string "{PLAYER} put away the {STR_VAR_2}\n" .string "in the {STR_VAR_3} POCKET.$" - .incbin "baserom.gba", 0x1a0cb1, 0x11 +Message_FoundOneItem: + .string "{PLAYER} found one {STR_VAR_2}!$" MauvilleCity_GameCorner_Text_1A0CC2:: @ 81A0CC2 MauvilleCity_Text_1A0CC2:: @ 81A0CC2 MtChimney_Text_1A0CC2:: @ 81A0CC2 OldaleTown_Text_1A0CC2:: @ 81A0CC2 Route109_SeashoreHouse_Text_1A0CC2:: @ 81A0CC2 +Message_BagFull: .string "Too bad!\n" .string "The BAG is full...$" - .incbin "baserom.gba", 0x1a0cde, 0x11 +Message_ObtainedDecoration: @ 81A0CDE + .string "Obtained the {STR_VAR_2}.$" BattleTower_Lobby_Text_1A0CEF:: @ 81A0CEF MauvilleCity_GameCorner_Text_1A0CEF:: @ 81A0CEF @@ -4189,7 +4397,9 @@ SootopolisCity_House6_Text_1A0CEF:: @ 81A0CEF .string "Too bad! There’s no room left for\n" .string "another {STR_VAR_2}...$" - .incbin "baserom.gba", 0x1a0d1f, 0x22 +Message_TransferredToPC: @ 81A0D1F + .string "The {STR_VAR_2} was transferred\n" + .string "to the PC.$" PetalburgCity_Text_1A0D41:: @ 81A0D41 .string "“Selected items for your convenience!”\n" @@ -15325,7 +15535,33 @@ ShoalCave_LowTideEntranceRoom_Text_1C69F5:: @ 81C69F5 .string "You should make room and come back\n" .string "for a SHELL BELL.$" - .incbin "baserom.gba", 0x1c6a69, 0x14c +PictureBookShelfText: @ 81C6A69 + .string "There’s a set of POKéMON picture books.$" + +BookshelfText: @ 81C6A91 + .string "It’s filled with all sorts of books.$" + +PokemonCenterBookshelfText: @ 81C6AB6 + .string "POKéMON magazines!\n" + .string "POKéMON PAL...\p" + .string "POKéMON HANDBOOK...\n" + .string "ADORABLE POKéMON...$" + +VaseText: @ 81C6B00 + .string "This vase looks expensive...\n" + .string "Peered inside...\p" + .string "But, it was empty.$" + +TrashCanText: @ 81C6B41 + .string "It’s empty.$" + +ShopShelfText: @ 81C6B4D + .string "The shelves brim with all sorts of\n" + .string "POKéMON merchandise.$" + +BlueprintText: @ 81C6B85 + .string "A blueprint of some sort?\n" + .string "It’s too complicated!$" GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5 diff --git a/data/data2.s b/data/data2.s index 7cee632df..d83c82127 100644 --- a/data/data2.s +++ b/data/data2.s @@ -23,7 +23,7 @@ gUnknown_081E795C: @ 81E795C .global gUnknown_081E796C gUnknown_081E796C: @ 81E796C - .incbin "baserom.gba", 0x001e796c, 0x10 + .space 16 .global gUnknown_081E797C gUnknown_081E797C: @ 81E797C @@ -449,7 +449,7 @@ gUnknown_081F958C: @ 81F958C .global gUnknown_081F95A4 gUnknown_081F95A4: @ 81F95A4 - .incbin "baserom.gba", 0x001f95a4, 0x8 + obj_tiles 0x08e5dc2c, 4096, 0x2710 .global gUnknown_081F95AC gUnknown_081F95AC: @ 81F95AC @@ -510,7 +510,7 @@ gUnknown_081F9674: @ 81F9674 .global gUnknown_081F9680 gUnknown_081F9680: @ 81F9680 - .incbin "baserom.gba", 0x001f9680, 0x8 + obj_tiles 0x030041d0, 32, 0x1013 .global gUnknown_081F9688 gUnknown_081F9688: @ 81F9688 @@ -1014,7 +1014,7 @@ gUnknown_081FAE91: @ 81FAE91 .global gUnknown_081FAEA4 gUnknown_081FAEA4: @ 81FAEA4 - .incbin "baserom.gba", 0x001faea4, 0x8 + obj_tiles 0x08d02410, 384, 0xd6eb .global gUnknown_081FAEAC gUnknown_081FAEAC: @ 81FAEAC @@ -1242,15 +1242,15 @@ gUnknown_08209AD4: @ 8209AD4 .global gUnknown_0820A3B0 gUnknown_0820A3B0: @ 820A3B0 - .incbin "baserom.gba", 0x0020a3b0, 0x8 + obj_tiles 0x08209af8, 2048, 0x3039 .global gUnknown_0820A3B8 gUnknown_0820A3B8: @ 820A3B8 - .incbin "baserom.gba", 0x0020a3b8, 0x8 + obj_tiles 0x0820a2f8, 128, 0x5ba0 .global gUnknown_0820A3C0 gUnknown_0820A3C0: @ 820A3C0 - .incbin "baserom.gba", 0x0020a3c0, 0x8 + obj_pal 0x08209ad8, 0xd431 .global gUnknown_0820A3C8 gUnknown_0820A3C8: @ 820A3C8 @@ -1266,35 +1266,38 @@ gUnknown_0820A430: @ 820A430 .global gUnknown_0820A47C gUnknown_0820A47C: @ 820A47C - .incbin "baserom.gba", 0x0020a47c, 0x8 + obj_tiles 0x08d1f52c, 4096, 0xd6ff .global gUnknown_0820A484 gUnknown_0820A484: @ 820A484 - .incbin "baserom.gba", 0x0020a484, 0x8 + obj_tiles 0x08d1f7e0, 4096, 0xd701 .global gUnknown_0820A48C gUnknown_0820A48C: @ 820A48C - .incbin "baserom.gba", 0x0020a48c, 0x8 + obj_tiles 0x08d1f96c, 2048, 0xd6ff .global gUnknown_0820A494 gUnknown_0820A494: @ 820A494 - .incbin "baserom.gba", 0x0020a494, 0x8 + obj_tiles 0x08d1f96c, 2048, 0xd700 .global gUnknown_0820A49C gUnknown_0820A49C: @ 820A49C - .incbin "baserom.gba", 0x0020a49c, 0x8 + obj_tiles 0x08d1fb04, 2048, 0xd701 .global gUnknown_0820A4A4 gUnknown_0820A4A4: @ 820A4A4 - .incbin "baserom.gba", 0x0020a4a4, 0x8 + obj_tiles 0x08d1fb04, 2048, 0xd702 .global gUnknown_0820A4AC gUnknown_0820A4AC: @ 820A4AC - .incbin "baserom.gba", 0x0020a4ac, 0x8 + obj_tiles 0x08d1fc94, 4096, 0xd70b .global gUnknown_0820A4B4 gUnknown_0820A4B4: @ 820A4B4 - .incbin "baserom.gba", 0x0020a4b4, 0x20 + obj_tiles 0x08d0314c, 256, 0xd704 + obj_tiles 0x08d0314c, 288, 0xd705 + obj_tiles 0x08d0314c, 256, 0xd706 + obj_tiles 0x08d0314c, 288, 0xd707 .global gUnknown_0820A4D4 gUnknown_0820A4D4: @ 820A4D4 @@ -1330,15 +1333,18 @@ gUnknown_0820A6EC: @ 820A6EC .global gUnknown_0820A754 gUnknown_0820A754: @ 820A754 - .incbin "baserom.gba", 0x0020a754, 0x10 + obj_tiles 0x08e6a758, 512, 0xd70c + obj_tiles 0x08e6a758, 512, 0xd70d .global gUnknown_0820A764 gUnknown_0820A764: @ 820A764 - .incbin "baserom.gba", 0x0020a764, 0x10 + obj_pal 0x08d1212c, 0xd710 + obj_pal 0x08d1212c, 0xd711 .global gUnknown_0820A774 gUnknown_0820A774: @ 820A774 - .incbin "baserom.gba", 0x0020a774, 0x10 + obj_pal 0x08d1214c, 0xd712 + obj_pal 0x08d1214c, 0xd713 .global gUnknown_0820A784 gUnknown_0820A784: @ 820A784 @@ -1469,11 +1475,23 @@ gUnknown_0820B7EC: @ 820B7EC .global gUnknown_0820C07C gUnknown_0820C07C: @ 820C07C - .incbin "baserom.gba", 0x0020c07c, 0x68 + obj_tiles 0x0201d000, 256, 0x00c8 + obj_tiles 0x0201d100, 256, 0x00c9 + obj_tiles 0x0201d200, 256, 0x00ca + obj_tiles 0x0201d300, 256, 0x00cb + obj_tiles 0x0201d400, 256, 0x00cc + obj_tiles 0x0201d500, 256, 0x00cd + obj_tiles 0x0201d600, 256, 0x00ce + obj_tiles 0x0201d700, 256, 0x00cf + obj_tiles 0x0201d800, 256, 0x00d0 + obj_tiles 0x0201d900, 256, 0x00d1 + obj_tiles 0x0201da00, 256, 0x00d2 + obj_tiles 0x0201db00, 256, 0x00d3 + obj_tiles 0x0201dc00, 256, 0x00d4 .global gUnknown_0820C0E4 gUnknown_0820C0E4: @ 820C0E4 - .incbin "baserom.gba", 0x0020c0e4, 0x8 + obj_pal 0x0820c03c, 0x133d .global gUnknown_0820C0EC gUnknown_0820C0EC: @ 820C0EC @@ -1481,11 +1499,11 @@ gUnknown_0820C0EC: @ 820C0EC .global gUnknown_0820C124 gUnknown_0820C124: @ 820C124 - .incbin "baserom.gba", 0x0020c124, 0x8 + obj_tiles 0x08ea1dec, 2048, 0x012c .global gUnknown_0820C12C gUnknown_0820C12C: @ 820C12C - .incbin "baserom.gba", 0x0020c12c, 0x8 + obj_pal 0x08ea0328, 0x0929 .global gUnknown_0820C134 gUnknown_0820C134: @ 820C134 @@ -1646,11 +1664,11 @@ gUnknown_08215778: @ 8215778 .global gUnknown_0821594C gUnknown_0821594C: @ 821594C - .incbin "baserom.gba", 0x0021594c, 0x8 + obj_tiles 0x0820c3f8, 1536, 0x15b5 .global gUnknown_08215954 gUnknown_08215954: @ 8215954 - .incbin "baserom.gba", 0x00215954, 0x8 + obj_pal 0x0820c3d8, 0x15b6 .global gUnknown_0821595C gUnknown_0821595C: @ 821595C @@ -1658,15 +1676,15 @@ gUnknown_0821595C: @ 821595C .global gUnknown_082159A4 gUnknown_082159A4: @ 82159A4 - .incbin "baserom.gba", 0x002159a4, 0x8 + obj_tiles 0x08212138, 512, 0x15ae .global gUnknown_082159AC gUnknown_082159AC: @ 82159AC - .incbin "baserom.gba", 0x002159ac, 0x8 + obj_pal 0x08212118, 0x15af .global gUnknown_082159B4 gUnknown_082159B4: @ 82159B4 - .incbin "baserom.gba", 0x002159b4, 0x8 + obj_pal 0x082120b8, 0x15b3 .global gUnknown_082159BC gUnknown_082159BC: @ 82159BC @@ -1674,7 +1692,7 @@ gUnknown_082159BC: @ 82159BC .global gUnknown_082159F4 gUnknown_082159F4: @ 82159F4 - .incbin "baserom.gba", 0x002159f4, 0x8 + obj_tiles 0x08212338, 768, 0x15b0 .global gUnknown_082159FC gUnknown_082159FC: @ 82159FC @@ -1682,7 +1700,7 @@ gUnknown_082159FC: @ 82159FC .global gUnknown_08215A28 gUnknown_08215A28: @ 8215A28 - .incbin "baserom.gba", 0x00215a28, 0x8 + obj_tiles 0x08212538, 256, 0x15b2 .global gUnknown_08215A30 gUnknown_08215A30: @ 8215A30 @@ -1690,7 +1708,7 @@ gUnknown_08215A30: @ 8215A30 .global gUnknown_08215A78 gUnknown_08215A78: @ 8215A78 - .incbin "baserom.gba", 0x00215a78, 0x8 + obj_tiles 0x08212738, 4096, 0x15b4 .global gUnknown_08215A80 gUnknown_08215A80: @ 8215A80 @@ -1816,15 +1834,15 @@ gUnknown_08216308: @ 8216308 .global gUnknown_082163DC gUnknown_082163DC: @ 82163DC - .incbin "baserom.gba", 0x002163dc, 0x8 + obj_tiles 0x08e91618, 2048, 0xb5d1 .global gUnknown_082163E4 gUnknown_082163E4: @ 82163E4 - .incbin "baserom.gba", 0x002163e4, 0x8 + obj_pal 0x08e920d8, 0xb5d2 .global gUnknown_082163EC gUnknown_082163EC: @ 82163EC - .incbin "baserom.gba", 0x002163ec, 0x8 + obj_pal 0x08e920f8, 0x3018 .global gUnknown_082163F4 gUnknown_082163F4: @ 82163F4 @@ -1832,7 +1850,7 @@ gUnknown_082163F4: @ 82163F4 .global gUnknown_08216454 gUnknown_08216454: @ 8216454 - .incbin "baserom.gba", 0x00216454, 0x8 + obj_tiles 0x08e90618, 512, 0xbef8 .global gUnknown_0821645C gUnknown_0821645C: @ 821645C @@ -1840,7 +1858,7 @@ gUnknown_0821645C: @ 821645C .global gUnknown_082164F4 gUnknown_082164F4: @ 82164F4 - .incbin "baserom.gba", 0x002164f4, 0x8 + obj_tiles 0x08e90818, 224, 0x5ba0 .global gUnknown_082164FC gUnknown_082164FC: @ 82164FC @@ -1848,7 +1866,7 @@ gUnknown_082164FC: @ 82164FC .global gUnknown_08216540 gUnknown_08216540: @ 8216540 - .incbin "baserom.gba", 0x00216540, 0x8 + obj_tiles 0x08e90a18, 1536, 0x3039 .global gUnknown_08216548 gUnknown_08216548: @ 8216548 @@ -1856,7 +1874,7 @@ gUnknown_08216548: @ 8216548 .global gUnknown_08216574 gUnknown_08216574: @ 8216574 - .incbin "baserom.gba", 0x00216574, 0x8 + obj_tiles 0x08e91018, 1024, 0x303a .global gUnknown_0821657C gUnknown_0821657C: @ 821657C @@ -3634,9 +3652,10 @@ gMapGroups:: @ 8308588 .include "data/maps/SafariZone_Northeast/connections.s" .include "data/maps/SafariZone_Southwest/connections.s" .include "data/maps/SafariZone_Southeast/connections.s" + .global gUnknown_08308E28 gUnknown_08308E28: @ 8308E28 - .incbin "baserom.gba", 0x00308e28, 0x4 + .space 4 .global gUnknown_08308E2C gUnknown_08308E2C: @ 8308E2C @@ -5362,7 +5381,7 @@ gUnknown_08376290: @ 8376290 .global gUnknown_083762D8 gUnknown_083762D8: @ 83762D8 - .incbin "baserom.gba", 0x003762d8, 0x4 + .space 4 .global gUnknown_083762DC gUnknown_083762DC: @ 83762DC @@ -5407,7 +5426,7 @@ gUnknown_083763E4: @ 83763E4 .global gUnknown_08376414 gUnknown_08376414: @ 8376414 - .incbin "baserom.gba", 0x00376414, 0x4 + .space 4 .global gUnknown_08376418 gUnknown_08376418: @ 8376418 @@ -5431,7 +5450,7 @@ gUnknown_08376504: @ 8376504 .global gUnknown_083765DC gUnknown_083765DC: @ 83765DC - .incbin "baserom.gba", 0x003765dc, 0x8 + obj_tiles 0x0837657c, 64, 0xd750 .global gUnknown_083765E4 gUnknown_083765E4: @ 83765E4 @@ -6092,7 +6111,295 @@ gBattleAnimPicTable: @ 837E164 .global gBattleAnimPaletteTable gBattleAnimPaletteTable: @ 837EA6C - .incbin "baserom.gba", 0x37EA6C, 0x908 + obj_pal 0x08d0369c, 0x2710 + obj_pal 0x08d1caf8, 0x2711 + obj_pal 0x08d20c14, 0x2712 + obj_pal 0x08d036c0, 0x2713 + obj_pal 0x08d036e8, 0x2714 + obj_pal 0x08d036fc, 0x2715 + obj_pal 0x08d03724, 0x2716 + obj_pal 0x08d03918, 0x2717 + obj_pal 0x08d03958, 0x2718 + obj_pal 0x08d0405c, 0x2719 + obj_pal 0x08d03974, 0x271a + obj_pal 0x08d040f4, 0x271b + obj_pal 0x08d04184, 0x271c + obj_pal 0x08d0423c, 0x271d + obj_pal 0x08d20014, 0x271e + obj_pal 0x08d042c0, 0x271f + obj_pal 0x08d04358, 0x2720 + obj_pal 0x08d04358, 0x2721 + obj_pal 0x08d25164, 0x2722 + obj_pal 0x08d043ac, 0x2723 + obj_pal 0x08d04554, 0x2724 + obj_pal 0x08d047d0, 0x2725 + obj_pal 0x08d04b30, 0x2726 + obj_pal 0x08d0457c, 0x2727 + obj_pal 0x08d04d3c, 0x2728 + obj_pal 0x08d04b58, 0x2729 + obj_pal 0x08d0559c, 0x272a + obj_pal 0x08d055c4, 0x272b + obj_pal 0x08d058e8, 0x272c + obj_pal 0x08d05f18, 0x272d + obj_pal 0x08d06300, 0x272e + obj_pal 0x08d05130, 0x272f + obj_pal 0x08d05150, 0x2730 + obj_pal 0x08d06324, 0x2731 + obj_pal 0x08d06324, 0x2732 + obj_pal 0x08d06324, 0x2733 + obj_pal 0x08d07420, 0x2734 + obj_pal 0x08d07420, 0x2735 + obj_pal 0x08d086e4, 0x2736 + obj_pal 0x08d0870c, 0x2737 + obj_pal 0x08d086e4, 0x2738 + obj_pal 0x08d086e4, 0x2739 + obj_pal 0x08d092d0, 0x273a + obj_pal 0x08d096f8, 0x273b + obj_pal 0x08d09720, 0x273c + obj_pal 0x08d099b4, 0x273d + obj_pal 0x08d0a23c, 0x273e + obj_pal 0x08d0a25c, 0x273e + obj_pal 0x08d0a518, 0x2740 + obj_pal 0x08d0a540, 0x2741 + obj_pal 0x08d0a568, 0x2742 + obj_pal 0x08d0a568, 0x2743 + obj_pal 0x08d0a568, 0x2744 + obj_pal 0x08d0559c, 0x2745 + obj_pal 0x08d0a964, 0x2746 + obj_pal 0x08d0a568, 0x2747 + obj_pal 0x08d0ae24, 0x2748 + obj_pal 0x08d0af98, 0x2749 + obj_pal 0x08d0b424, 0x274a + obj_pal 0x08d0b4ac, 0x274b + obj_pal 0x08d0b4f0, 0x274c + obj_pal 0x08d0b5bc, 0x274d + obj_pal 0x08d0b9ac, 0x274e + obj_pal 0x08d0bb90, 0x274f + obj_pal 0x08d235a0, 0x2750 + obj_pal 0x08d0bd60, 0x2751 + obj_pal 0x08d0bdcc, 0x2752 + obj_pal 0x08e69608, 0x2753 + obj_pal 0x08e69628, 0x2754 + obj_pal 0x08d0bd60, 0x2755 + obj_pal 0x08d0be74, 0x2756 + obj_pal 0x08d0be74, 0x2757 + obj_pal 0x08d0c198, 0x2758 + obj_pal 0x08d0c2cc, 0x2759 + obj_pal 0x08d1b668, 0x275a + obj_pal 0x08d0c568, 0x275b + obj_pal 0x08d150cc, 0x275c + obj_pal 0x08d150cc, 0x275d + obj_pal 0x08d0c724, 0x275e + obj_pal 0x08d0c724, 0x275f + obj_pal 0x08d0cee0, 0x2760 + obj_pal 0x08d0cf88, 0x2761 + obj_pal 0x08d0d144, 0x2762 + obj_pal 0x08d0d158, 0x2763 + obj_pal 0x08d0d180, 0x2764 + obj_pal 0x08d0d1a8, 0x2765 + obj_pal 0x08d0d1c0, 0x2766 + obj_pal 0x08d25100, 0x2767 + obj_pal 0x08d0d1e8, 0x2768 + obj_pal 0x08d0d204, 0x2769 + obj_pal 0x08d0d22c, 0x276a + obj_pal 0x08d0bc28, 0x276b + obj_pal 0x08d0d250, 0x276c + obj_pal 0x08d0d26c, 0x276d + obj_pal 0x08d0d294, 0x276e + obj_pal 0x08d0d2d4, 0x276f + obj_pal 0x08d0d2fc, 0x2770 + obj_pal 0x08d0d318, 0x2771 + obj_pal 0x08d0d294, 0x2772 + obj_pal 0x08d281b8, 0x2773 + obj_pal 0x08d0d340, 0x2774 + obj_pal 0x08d0d35c, 0x2775 + obj_pal 0x08d0d35c, 0x2776 + obj_pal 0x08d0d384, 0x2777 + obj_pal 0x08d0f6dc, 0x2778 + obj_pal 0x08d0fc88, 0x2779 + obj_pal 0x08d0fc88, 0x277a + obj_pal 0x08d1014c, 0x277b + obj_pal 0x08d1014c, 0x277c + obj_pal 0x08d10520, 0x277d + obj_pal 0x08d10520, 0x277e + obj_pal 0x08d10970, 0x277f + obj_pal 0x08d10cbc, 0x2780 + obj_pal 0x08d10f50, 0x2781 + obj_pal 0x08d1106c, 0x2782 + obj_pal 0x08d0367c, 0x2783 + obj_pal 0x08d132d8, 0x2784 + obj_pal 0x08d1353c, 0x2785 + obj_pal 0x08d136f0, 0x2786 + obj_pal 0x08d1399c, 0x2787 + obj_pal 0x08d13ab8, 0x2788 + obj_pal 0x08d13b0c, 0x2789 + obj_pal 0x08d13c2c, 0x278a + obj_pal 0x08d13c2c, 0x278b + obj_pal 0x08d1401c, 0x278c + obj_pal 0x08d14130, 0x278d + obj_pal 0x08d141c0, 0x278e + obj_pal 0x08d14380, 0x278f + obj_pal 0x08d14610, 0x2790 + obj_pal 0x08d14610, 0x2791 + obj_pal 0x08d14a64, 0x2792 + obj_pal 0x08d14a64, 0x2793 + obj_pal 0x08d14cfc, 0x2794 + obj_pal 0x08d14d98, 0x2795 + obj_pal 0x08d14d98, 0x2796 + obj_pal 0x08d1a7dc, 0x2797 + obj_pal 0x08d1a8c8, 0x2798 + obj_pal 0x08d1a7dc, 0x2799 + obj_pal 0x08d1a7dc, 0x279a + obj_pal 0x08d1ace4, 0x279b + obj_pal 0x08d1b070, 0x279c + obj_pal 0x08d1b198, 0x279d + obj_pal 0x08d1b198, 0x279e + obj_pal 0x08d2d188, 0x279f + obj_pal 0x08d1c040, 0x27a0 + obj_pal 0x08d1ace4, 0x27a1 + obj_pal 0x08d0367c, 0x27a2 + obj_pal 0x08d1b3e4, 0x27a3 + obj_pal 0x08d1b5c0, 0x27a4 + obj_pal 0x08d1b5c0, 0x27a5 + obj_pal 0x08d1b760, 0x27a6 + obj_pal 0x08d1b760, 0x27a7 + obj_pal 0x08d041e4, 0x27a8 + obj_pal 0x08d1b8e0, 0x27a9 + obj_pal 0x08d1b9a4, 0x27aa + obj_pal 0x08d1ba8c, 0x27ab + obj_pal 0x08d1bcc4, 0x27ac + obj_pal 0x08d1bd50, 0x27ad + obj_pal 0x08d1be30, 0x27ae + obj_pal 0x08d1bed0, 0x27af + obj_pal 0x08d1bfa0, 0x27b0 + obj_pal 0x08d03774, 0x27b1 + obj_pal 0x08d1c228, 0x27b2 + obj_pal 0x08d1c2a8, 0x27b3 + obj_pal 0x08d1c2d8, 0x27b4 + obj_pal 0x08d1c2f0, 0x27b5 + obj_pal 0x08d1c614, 0x27b6 + obj_pal 0x08d1c634, 0x27b7 + obj_pal 0x08d1c654, 0x27b8 + obj_pal 0x08d1c674, 0x27b9 + obj_pal 0x08d1c694, 0x27ba + obj_pal 0x08d1c700, 0x27bb + obj_pal 0x08d1c728, 0x27bc + obj_pal 0x08d1caf8, 0x27bd + obj_pal 0x08d1da00, 0x27be + obj_pal 0x08d1da8c, 0x27bf + obj_pal 0x08d1dc0c, 0x27c0 + obj_pal 0x08d1dcf8, 0x27c1 + obj_pal 0x08d1de78, 0x27c2 + obj_pal 0x08d1dea0, 0x27c3 + obj_pal 0x08d1dea0, 0x27c4 + obj_pal 0x08d1dea0, 0x27c5 + obj_pal 0x08d1e3f0, 0x27c6 + obj_pal 0x08d1e690, 0x27c7 + obj_pal 0x08d1e80c, 0x27c8 + obj_pal 0x08d1ec48, 0x27c9 + obj_pal 0x08d1f508, 0x27ca + obj_pal 0x08d1f11c, 0x27cb + obj_pal 0x08e7133c, 0x27cc + obj_pal 0x08d205c8, 0x27cd + obj_pal 0x08d2028c, 0x27ce + obj_pal 0x08d2051c, 0x27cf + obj_pal 0x08d20868, 0x27d0 + obj_pal 0x08d209ec, 0x27d1 + obj_pal 0x08d21330, 0x27d2 + obj_pal 0x08d21410, 0x27d3 + obj_pal 0x08d20fe0, 0x27d4 + obj_pal 0x08d215a0, 0x27d5 + obj_pal 0x08d219b8, 0x27d6 + obj_pal 0x08d21aa8, 0x27d7 + obj_pal 0x08d21c04, 0x27d8 + obj_pal 0x08d22290, 0x27d9 + obj_pal 0x08d225bc, 0x27da + obj_pal 0x08d2278c, 0x27db + obj_pal 0x08d2242c, 0x27dc + obj_pal 0x08d22c84, 0x27dd + obj_pal 0x08d229bc, 0x27de + obj_pal 0x08d22d74, 0x27df + obj_pal 0x08d1c634, 0x27e0 + obj_pal 0x08d23490, 0x27e1 + obj_pal 0x08d2364c, 0x27e2 + obj_pal 0x08d24918, 0x27e3 + obj_pal 0x08d24918, 0x27e4 + obj_pal 0x08d24918, 0x27e5 + obj_pal 0x08d235a0, 0x27e6 + obj_pal 0x08d24d58, 0x27e7 + obj_pal 0x08d2366c, 0x27e8 + obj_pal 0x08d24408, 0x27e9 + obj_pal 0x08d24fd4, 0x27ea + obj_pal 0x08d2362c, 0x27eb + obj_pal 0x08d25180, 0x27ec + obj_pal 0x08d252d4, 0x27ed + obj_pal 0x08d25844, 0x27ee + obj_pal 0x08d2586c, 0x27ef + obj_pal 0x08d25b20, 0x27f0 + obj_pal 0x08d27c94, 0x27f1 + obj_pal 0x08d27e90, 0x27f2 + obj_pal 0x08d27e90, 0x27f3 + obj_pal 0x08d25ea8, 0x27f4 + obj_pal 0x08d28070, 0x27f5 + obj_pal 0x08d25c3c, 0x27f6 + obj_pal 0x08d28718, 0x27f7 + obj_pal 0x08d28718, 0x27f8 + obj_pal 0x08d28994, 0x27f9 + obj_pal 0x08d28b7c, 0x27fa + obj_pal 0x08d28c7c, 0x27fb + obj_pal 0x08d28c98, 0x27fc + obj_pal 0x08d28cb4, 0x27fd + obj_pal 0x08d28c08, 0x27fe + obj_pal 0x08d2cf30, 0x27ff + obj_pal 0x08d2d240, 0x2800 + obj_pal 0x08d2d7b8, 0x2801 + obj_pal 0x08d2da58, 0x2802 + obj_pal 0x08d2daa4, 0x2803 + obj_pal 0x08d2e9dc, 0x2804 + obj_pal 0x08d2e28c, 0x2805 + obj_pal 0x08d2e28c, 0x2806 + obj_pal 0x08d235a0, 0x2807 + obj_pal 0x08d2ef68, 0x2808 + obj_pal 0x08d2efd0, 0x2809 + obj_pal 0x08d2efd0, 0x280a + obj_pal 0x08d2f248, 0x280b + obj_pal 0x08d2f378, 0x280c + obj_pal 0x08d2f578, 0x280d + obj_pal 0x08d2f6d8, 0x280e + obj_pal 0x08d2f778, 0x280f + obj_pal 0x08d2fc28, 0x2810 + obj_pal 0x08d2fd6c, 0x2811 + obj_pal 0x08d2f874, 0x2812 + obj_pal 0x08d1b5e0, 0x2813 + obj_pal 0x08e68764, 0x2814 + obj_pal 0x08e68580, 0x2815 + obj_pal 0x08e693dc, 0x2816 + obj_pal 0x08e6e6ec, 0x2817 + obj_pal 0x08e695d8, 0x2818 + obj_pal 0x08e695f0, 0x2819 + obj_pal 0x08e6e744, 0x281a + obj_pal 0x08e6e75c, 0x281b + obj_pal 0x08e6e774, 0x281c + obj_pal 0x08e69ae8, 0x281d + obj_pal 0x08e7e9e0, 0x281e + obj_pal 0x08e7eb24, 0x281f + obj_pal 0x08e69a48, 0x2820 + obj_pal 0x08e69a48, 0x2821 + obj_pal 0x08e69f54, 0x2822 + obj_pal 0x08e69f54, 0x2823 + obj_pal 0x08e69f54, 0x2824 + obj_pal 0x08e6da2c, 0x2825 + obj_pal 0x08e6e998, 0x2826 + obj_pal 0x08e6ea00, 0x2827 + obj_pal 0x08e6a6e4, 0x2828 + obj_pal 0x08e6eba4, 0x2829 + obj_pal 0x08e7e7d0, 0x282a + obj_pal 0x08e6dfc0, 0x282b + obj_pal 0x08e6f53c, 0x282c + obj_pal 0x08e6f5f8, 0x282d + obj_pal 0x08e71200, 0x282e + obj_pal 0x08e6bbb4, 0x282f + obj_pal 0x08d1c2c0, 0x2830 .global gUnknown_0837F374 gUnknown_0837F374: @ 837F374 @@ -6243,7 +6550,7 @@ gUnknown_0837F5A8: @ 837F5A8 .global gUnknown_0837F5AC gUnknown_0837F5AC: @ 837F5AC - .incbin "baserom.gba", 0x0037f5ac, 0x4 + .space 4 .global gUnknown_0837F5B0 gUnknown_0837F5B0: @ 837F5B0 @@ -6251,8 +6558,8 @@ gUnknown_0837F5B0: @ 837F5B0 .global gUnknown_0837F5E0 gUnknown_0837F5E0: @ 837F5E0 - - .incbin "baserom.gba", 0x37f5e0, 0x10 + obj_tiles 0x082089dc, 2048, 0xd755 + obj_tiles 0x082089dc, 2048, 0xd756 .include "data/maps/events/PetalburgCity.s" .include "data/maps/events/SlateportCity.s" @@ -6676,19 +6983,39 @@ gUnknown_083931F8: @ 83931F8 .global gUnknown_08393210 gUnknown_08393210: @ 8393210 - .incbin "baserom.gba", 0x00393210, 0x40 + .ifdef SAPPHIRE + .incbin "graphics/title_screen/kyogre_dark.gbapal" + .incbin "graphics/title_screen/kyogre_glow.gbapal" + .else + .incbin "graphics/title_screen/groudon_dark.gbapal" + .incbin "graphics/title_screen/groudon_glow.gbapal" + .endif .global gUnknown_08393250 gUnknown_08393250: @ 8393250 - .incbin "baserom.gba", 0x00393250, 0x79c + .ifdef SAPPHIRE + .incbin "graphics/title_screen/kyogre.4bpp.lz" + .else + .incbin "graphics/title_screen/groudon.4bpp.lz" + .endif .global gUnknown_083939EC gUnknown_083939EC: @ 83939EC - .incbin "baserom.gba", 0x003939ec, 0x20c + .ifdef SAPPHIRE + .incbin "graphics/title_screen/kyogre_map.bin.lz" + .else + .incbin "graphics/title_screen/groudon_map.bin.lz" + .endif .global gUnknown_08393BF8 gUnknown_08393BF8: @ 8393BF8 - .incbin "baserom.gba", 0x00393bf8, 0x26c + .ifdef SAPPHIRE + .incbin "graphics/title_screen/water_map.bin.lz" + .else + .incbin "graphics/title_screen/lava_map.bin.lz" + .endif + + .incbin "graphics/title_screen/logo_shine.4bpp.lz" .global gUnknown_08393E64 gUnknown_08393E64: @ 8393E64 @@ -6866,7 +7193,7 @@ gUnknown_0839AB90: @ 839AB90 .global gUnknown_0839ABA8 gUnknown_0839ABA8: @ 839ABA8 - .incbin "baserom.gba", 0x0039aba8, 0x8 + obj_tiles 0x08397948, 2048, 0x1201 .global gUnknown_0839ABB0 gUnknown_0839ABB0: @ 839ABB0 @@ -6890,7 +7217,7 @@ gUnknown_0839AC3C: @ 839AC3C .global gUnknown_0839AC54 gUnknown_0839AC54: @ 839AC54 - .incbin "baserom.gba", 0x0039ac54, 0x8 + obj_tiles 0x08399fc8, 2560, 0x1204 .global gUnknown_0839AC5C gUnknown_0839AC5C: @ 839AC5C @@ -6902,7 +7229,7 @@ gUnknown_0839AC68: @ 839AC68 .global gUnknown_0839AC70 gUnknown_0839AC70: @ 839AC70 - .incbin "baserom.gba", 0x0039ac70, 0x8 + obj_tiles 0x08398988, 64, 0x1205 .global gUnknown_0839AC78 gUnknown_0839AC78: @ 839AC78 @@ -7188,7 +7515,7 @@ gUnknown_0839F2C4: @ 839F2C4 .global gUnknown_0839F2C8 gUnknown_0839F2C8: @ 839F2C8 - .incbin "baserom.gba", 0x0039f2c8, 0x4 + .space 4 .global gUnknown_0839F2CC gUnknown_0839F2CC: @ 839F2CC @@ -7509,7 +7836,7 @@ gUnknown_083A05F8: @ 83A05F8 .global gUnknown_083B4EC4 gUnknown_083B4EC4: @ 83B4EC4 - .incbin "baserom.gba", 0x003b4ec4, 0x20 + .space 32 @ 83B4EE4 .include "data/graphics/pokemon/footprint_table.s" @@ -7734,19 +8061,19 @@ gUnknown_083B6DB8: @ 83B6DB8 .global gUnknown_083B6DBC gUnknown_083B6DBC: @ 83B6DBC - .incbin "baserom.gba", 0x003b6dbc, 0x8 + obj_pal 0x083b6b94, 0xdacd .global gUnknown_083B6DC4 gUnknown_083B6DC4: @ 83B6DC4 - .incbin "baserom.gba", 0x003b6dc4, 0x8 + obj_tiles 0x083b6bb4, 448, 0x0005 .global gUnknown_083B6DCC gUnknown_083B6DCC: @ 83B6DCC - .incbin "baserom.gba", 0x003b6dcc, 0x8 + obj_tiles 0x02002784, 2048, 0x0002 .global gUnknown_083B6DD4 gUnknown_083B6DD4: @ 83B6DD4 - .incbin "baserom.gba", 0x003b6dd4, 0x8 + obj_pal 0x02002704, 0xdac7 .global gUnknown_083B6DDC gUnknown_083B6DDC: @ 83B6DDC @@ -7778,7 +8105,7 @@ gUnknown_083BB0E8: @ 83BB0E8 .global gUnknown_083BB288 gUnknown_083BB288: @ 83BB288 - .incbin "baserom.gba", 0x003bb288, 0x8 + obj_tiles 0x083bb208, 128, 0x0006 .global gUnknown_083BB290 gUnknown_083BB290: @ 83BB290 @@ -7910,7 +8237,7 @@ gUnknown_083C1068: @ 83C1068 .global gUnknown_083C11B8 gUnknown_083C11B8: @ 83C11B8 - .incbin "baserom.gba", 0x003c11b8, 0x8 + obj_tiles 0x08e71d10, 5888, 0x7532 .global gUnknown_083C11C0 gUnknown_083C11C0: @ 83C11C0 @@ -7922,11 +8249,11 @@ gUnknown_083C11D8: @ 83C11D8 .global gUnknown_083C1270 gUnknown_083C1270: @ 83C1270 - .incbin "baserom.gba", 0x003c1270, 0x8 + obj_tiles 0x08e7274c, 1024, 0x7530 .global gUnknown_083C1278 gUnknown_083C1278: @ 83C1278 - .incbin "baserom.gba", 0x003c1278, 0x8 + obj_pal 0x08e72848, 0x7530 .global gUnknown_083C1280 gUnknown_083C1280: @ 83C1280 @@ -7934,11 +8261,11 @@ gUnknown_083C1280: @ 83C1280 .global gUnknown_083C12F4 gUnknown_083C12F4: @ 83C12F4 - .incbin "baserom.gba", 0x003c12f4, 0x8 + obj_tiles 0x08e72860, 896, 0x7531 .global gUnknown_083C12FC gUnknown_083C12FC: @ 83C12FC - .incbin "baserom.gba", 0x003c12fc, 0x8 + obj_pal 0x08e72a50, 0x7531 .global gUnknown_083C1304 gUnknown_083C1304: @ 83C1304 @@ -8076,15 +8403,15 @@ gUnknown_083C1CC4: @ 83C1CC4 .global gUnknown_083C1CC8 gUnknown_083C1CC8: @ 83C1CC8 - .incbin "baserom.gba", 0x003c1cc8, 0x8 + obj_tiles 0x08e75024, 12288, 0x7530 .global gUnknown_083C1CD0 gUnknown_083C1CD0: @ 83C1CD0 - .incbin "baserom.gba", 0x003c1cd0, 0x8 + obj_tiles 0x08e75ba0, 12288, 0x7530 .global gUnknown_083C1CD8 gUnknown_083C1CD8: @ 83C1CD8 - .incbin "baserom.gba", 0x003c1cd8, 0x8 + obj_pal 0x08e76700, 0x7530 .global gUnknown_083C1CE0 gUnknown_083C1CE0: @ 83C1CE0 @@ -8103,7 +8430,7 @@ gUnknown_083C1D24: @ 83C1D24 .global gUnknown_083C1D30 gUnknown_083C1D30: @ 83C1D30 - .incbin "baserom.gba", 0x003c1d30, 0x8 + obj_pal 0x083c170c, 0x0008 .global gUnknown_083C1D38 gUnknown_083C1D38: @ 83C1D38 @@ -8122,7 +8449,7 @@ gUnknown_083C1E04: @ 83C1E04 .global gUnknown_083C1F74 gUnknown_083C1F74: @ 83C1F74 - .incbin "baserom.gba", 0x003c1f74, 0x8 + obj_tiles 0x08e78bb4, 2048, 0x2710 .global gUnknown_083C1F7C gUnknown_083C1F7C: @ 83C1F7C @@ -8214,7 +8541,7 @@ gUnknown_083C92A8: @ 83C92A8 .global gUnknown_083C92B4 gUnknown_083C92B4: @ 83C92B4 - .incbin "baserom.gba", 0x003c92b4, 0x8 + obj_tiles 0x083c922d, 32, 0x04b0 .global gUnknown_083C92BC gUnknown_083C92BC: @ 83C92BC @@ -8330,7 +8657,7 @@ gUnknown_083CA33C: @ 83CA33C .global gUnknown_083CA340 gUnknown_083CA340: @ 83CA340 - .incbin "baserom.gba", 0x003ca340, 0x1 + .space 1 .global gUnknown_083CA341 gUnknown_083CA341: @ 83CA341 @@ -8346,7 +8673,10 @@ gUnknown_083CA3AC: @ 83CA3AC .global gUnknown_083CA3C4 gUnknown_083CA3C4: @ 83CA3C4 - .incbin "baserom.gba", 0x003ca3c4, 0x20 + obj_tiles 0x08e69404, 256, 0x4e26 + obj_tiles 0x08e69404, 256, 0x4e27 + obj_tiles 0x08e69404, 256, 0x4e28 + obj_tiles 0x08e69404, 256, 0x4e29 .global gUnknown_083CA3E4 gUnknown_083CA3E4: @ 83CA3E4 @@ -8362,7 +8692,7 @@ gUnknown_083CA464: @ 83CA464 .global gUnknown_083CA46C gUnknown_083CA46C: @ 83CA46C - .incbin "baserom.gba", 0x003ca46c, 0x8 + obj_tiles 0x08e69648, 1024, 0xabe2 .global gUnknown_083CA474 gUnknown_083CA474: @ 83CA474 @@ -8378,15 +8708,15 @@ gUnknown_083CA4A4: @ 83CA4A4 .global gUnknown_083CA4BC gUnknown_083CA4BC: @ 83CA4BC - .incbin "baserom.gba", 0x003ca4bc, 0x8 + obj_tiles 0x08d1c748, 2048, 0x4e25 .global gUnknown_083CA4C4 gUnknown_083CA4C4: @ 83CA4C4 - .incbin "baserom.gba", 0x003ca4c4, 0x8 + obj_tiles 0x08d19590, 896, 0xabe0 .global gUnknown_083CA4CC gUnknown_083CA4CC: @ 83CA4CC - .incbin "baserom.gba", 0x003ca4cc, 0x8 + obj_pal 0x08d19734, 0xabe0 .include "data/text/contest_strings.s" @@ -8424,7 +8754,7 @@ UnknownText_UnknownFormatting3: .align 2 .global gUnknown_083CC3AC gUnknown_083CC3AC: @ 83CC3AC - .incbin "baserom.gba", 0x003cc3ac, 0x8 + obj_tiles 0x08d16024, 512, 0x4e20 .global gUnknown_083CC3B4 gUnknown_083CC3B4: @ 83CC3B4 @@ -8436,7 +8766,10 @@ gUnknown_083CC454: @ 83CC454 .global gUnknown_083CC4B4 gUnknown_083CC4B4: @ 83CC4B4 - .incbin "baserom.gba", 0x003cc4b4, 0x20 + obj_tiles 0x08d0314c, 4096, 0x80e8 + obj_tiles 0x08d0314c, 4096, 0x80e9 + obj_tiles 0x08d0314c, 4096, 0x80ea + obj_tiles 0x08d0314c, 4096, 0x80eb .global gUnknown_083CC4D4 gUnknown_083CC4D4: @ 83CC4D4 @@ -8793,11 +9126,11 @@ gUnknown_083CF56C: @ 83CF56C .global gUnknown_083CF584 gUnknown_083CF584: @ 83CF584 - .incbin "baserom.gba", 0x003cf584, 0x8 + obj_tiles 0x08e77a5c, 256, 0x2722 .global gUnknown_083CF58C gUnknown_083CF58C: @ 83CF58C - .incbin "baserom.gba", 0x003cf58c, 0x8 + obj_pal 0x08e77900, 0x2722 @ 83CF594 .include "data/contest_moves.s" @@ -9218,7 +9551,14 @@ gUnknown_083D174C: @ 83D174C .global gUnknown_083D1764 gUnknown_083D1764: @ 83D1764 - .incbin "baserom.gba", 0x003d1764, 0x40 + obj_tiles 0x082089dc, 1024, 0x0bc1 + obj_tiles 0x082089dc, 1024, 0x0bc2 + obj_tiles 0x082089dc, 1024, 0x0bc3 + obj_tiles 0x082089dc, 1024, 0x0bc4 + obj_tiles 0x082089dc, 1024, 0x0bc5 + obj_tiles 0x082089dc, 1024, 0x0bc6 + obj_tiles 0x082089dc, 1024, 0x0bc7 + obj_tiles 0x082089dc, 1024, 0x0bc8 .global gUnknown_083D17A4 gUnknown_083D17A4: @ 83D17A4 @@ -9230,11 +9570,11 @@ gUnknown_083D17B4: @ 83D17B4 .global gUnknown_083D17CC gUnknown_083D17CC: @ 83D17CC - .incbin "baserom.gba", 0x003d17cc, 0x8 + obj_tiles 0x08d2d7d4, 544, 0x0bc9 .global gUnknown_083D17D4 gUnknown_083D17D4: @ 83D17D4 - .incbin "baserom.gba", 0x003d17d4, 0x8 + obj_pal 0x08d2d8f4, 0x0bc9 .global gUnknown_083D17DC gUnknown_083D17DC: @ 83D17DC @@ -9262,11 +9602,11 @@ gUnknown_083D188E: @ 83D188E .global gUnknown_083D1898 gUnknown_083D1898: @ 83D1898 - .incbin "baserom.gba", 0x003d1898, 0x8 + obj_pal 0x083d190c, 0x0080 .global gUnknown_083D18A0 gUnknown_083D18A0: @ 83D18A0 - .incbin "baserom.gba", 0x003d18a0, 0x8 + obj_pal 0x083d18ec, 0x0000 .global gUnknown_083D18A8 gUnknown_083D18A8: @ 83D18A8 @@ -9818,7 +10158,7 @@ gUnknown_083DBD18: @ 83DBD18 .global gUnknown_083DBD30 gUnknown_083DBD30: @ 83DBD30 - .incbin "baserom.gba", 0x003dbd30, 0x8 + obj_tiles 0x083dba60, 2048, 0x0006 .global gUnknown_083DBD38 gUnknown_083DBD38: @ 83DBD38 @@ -9830,7 +10170,7 @@ gUnknown_083DBD48: @ 83DBD48 .global gUnknown_083DBD60 gUnknown_083DBD60: @ 83DBD60 - .incbin "baserom.gba", 0x003dbd60, 0x8 + obj_tiles 0x08e8ea98, 4096, 0x0007 .global gUnknown_083DBD68 gUnknown_083DBD68: @ 83DBD68 @@ -10050,7 +10390,7 @@ gUnknown_083E4454: @ 83E4454 .global gUnknown_083E446C gUnknown_083E446C: @ 83E446C - .incbin "baserom.gba", 0x003e446c, 0x8 + obj_tiles 0x083e41d8, 256, 0x0019 .global gUnknown_083E4474 gUnknown_083E4474: @ 83E4474 @@ -10134,11 +10474,11 @@ gUnknown_083E476C: @ 83E476C .global gUnknown_083E4784 gUnknown_083E4784: @ 83E4784 - .incbin "baserom.gba", 0x003e4784, 0x8 + obj_tiles 0x083e37c0, 896, 0x0017 .global gUnknown_083E478C gUnknown_083E478C: @ 83E478C - .incbin "baserom.gba", 0x003e478c, 0x8 + obj_pal 0x083e37a0, 0x000f .global gUnknown_083E4794 gUnknown_083E4794: @ 83E4794 @@ -10194,7 +10534,7 @@ gUnknown_083E5214: @ 83E5214 .global gUnknown_083E521C gUnknown_083E521C: @ 83E521C - .incbin "baserom.gba", 0x3E521C, 0x8 + .space 8 Unknown_83E5224: .incbin "baserom.gba", 0x3E5224, 0x8 Unknown_83E522C: @@ -10429,7 +10769,7 @@ gUnknown_083E7684: @ 83E7684 .global gUnknown_083E76E8 gUnknown_083E76E8: @ 83E76E8 - .incbin "baserom.gba", 0x003e76e8, 0x8 + obj_pal 0x083e5ad0, 0x0000 .global gUnknown_083E76F0 gUnknown_083E76F0: @ 83E76F0 @@ -10472,7 +10812,7 @@ gUnknown_083E79C0: @ 83E79C0 .global gUnknown_083E79CC gUnknown_083E79CC: @ 83E79CC - .incbin "baserom.gba", 0x003e79cc, 0x8 + obj_pal 0x083e782c, 0x0002 .global gUnknown_083E79D4 gUnknown_083E79D4: @ 83E79D4 @@ -10488,7 +10828,7 @@ gUnknown_083E7A50: @ 83E7A50 .global gUnknown_083EB6C4 gUnknown_083EB6C4: @ 83EB6C4 - .incbin "baserom.gba", 0x003eb6c4, 0x1 + .space 1 .global gUnknown_083EB6C5 gUnknown_083EB6C5: @ 83EB6C5 @@ -10560,7 +10900,7 @@ gUnknown_083EC93C: @ 83EC93C .global gUnknown_083EC954 gUnknown_083EC954: @ 83EC954 - .incbin "baserom.gba", 0x003ec954, 0x8 + obj_pal 0x02039184, 0x0bb8 .global gUnknown_083EC95C gUnknown_083EC95C: @ 83EC95C @@ -10598,7 +10938,7 @@ gUnknown_083EC9D4: @ 83EC9D4 .global gUnknown_083ECA5C gUnknown_083ECA5C: @ 83ECA5C - .incbin "baserom.gba", 0x003eca5c, 0x8 + obj_pal 0x083ec98c, 0x0008 .global gUnknown_083ECA64 gUnknown_083ECA64: @ 83ECA64 @@ -10857,7 +11197,7 @@ gUnknown_083ECE30: @ 83ECE30 .global gUnknown_083ECE3A gUnknown_083ECE3A: @ 83ECE3A - .incbin "baserom.gba", 0x003ece3a, 0x8 + obj_pal 0x02030406, 0x0005 .global gUnknown_083ECE42 gUnknown_083ECE42: @ 83ECE42 @@ -11070,29 +11410,27 @@ gUnknown_083EDC2C: @ 83EDC2C .global gUnknown_083EDCDC gUnknown_083EDCDC: @ 83EDCDC - .incbin "baserom.gba", 0x003edcdc, 0x8 + obj_tiles 0x02010000, 2048, 0x0011 .global gUnknown_083EDCE4 gUnknown_083EDCE4: @ 83EDCE4 - .incbin "baserom.gba", 0x3EDCE4, 0x18 -Unknown_83EDCFC: - .incbin "baserom.gba", 0x3EDCFC, 0x2 -Unknown_83EDCFE: - .incbin "baserom.gba", 0x3EDCFE, 0x2 -Unknown_83EDD00: - .incbin "baserom.gba", 0x3EDD00, 0x2 -Unknown_83EDD02: - .incbin "baserom.gba", 0x3EDD02, 0x2 -Unknown_83EDD04: - .incbin "baserom.gba", 0x3EDD04, 0x4 + .4byte 0x08E997E8 +UnknownPalette_83EDCE8: + .ifdef SAPPHIRE + .incbin "graphics/unknown/sapphire_83EDD40.gbapal" + .else + .incbin "graphics/unknown/ruby_83EDCE8.gbapal" + .endif + + .align 2 .global gUnknown_083EDD08 gUnknown_083EDD08: @ 83EDD08 - .4byte Unknown_83EDCFC - .4byte Unknown_83EDCFE - .4byte Unknown_83EDD00 - .4byte Unknown_83EDD02 - .4byte Unknown_83EDD04 + .4byte UnknownPalette_83EDCE8 + 10 * 2 + .4byte UnknownPalette_83EDCE8 + 11 * 2 + .4byte UnknownPalette_83EDCE8 + 12 * 2 + .4byte UnknownPalette_83EDCE8 + 13 * 2 + .4byte UnknownPalette_83EDCE8 + 14 * 2 .global gUnknown_083EDD1C gUnknown_083EDD1C: @ 83EDD1C @@ -11264,7 +11602,7 @@ gUnknown_083F6138: @ 83F6138 .global gUnknown_083F6140 gUnknown_083F6140: @ 83F6140 - .incbin "baserom.gba", 0x003f6140, 0x4 + .space 4 .global gUnknown_083F6144 gUnknown_083F6144: @ 83F6144 @@ -11529,11 +11867,11 @@ gUnknown_083F7F70: @ 83F7F70 .global gUnknown_083F7F74 gUnknown_083F7F74: @ 83F7F74 - .incbin "baserom.gba", 0x003f7f74, 0x8 + obj_tiles 0x08e77d90, 2048, 0x39d0 .global gUnknown_083F7F7C gUnknown_083F7F7C: @ 83F7F7C - .incbin "baserom.gba", 0x003f7f7c, 0x8 + obj_pal 0x08e78050, 0x39d0 .global gUnknown_083F7F84 gUnknown_083F7F84: @ 83F7F84 @@ -11553,7 +11891,7 @@ gUnknown_083F804C: @ 83F804C .global gUnknown_083F806C gUnknown_083F806C: @ 83F806C - .incbin "baserom.gba", 0x003f806c, 0x20 + .space 32 .global gUnknown_083F808C gUnknown_083F808C: @ 83F808C @@ -11671,7 +12009,7 @@ gUnknown_083F857A: @ 83F857A .global gUnknown_083F858C gUnknown_083F858C: @ 83F858C - .incbin "baserom.gba", 0x003f858c, 0x8 + obj_tiles 0x083f85dc, 128, 0x0002 .global gUnknown_083F8594 gUnknown_083F8594: @ 83F8594 @@ -11683,7 +12021,7 @@ gUnknown_083F85A4: @ 83F85A4 .global gUnknown_083F865C gUnknown_083F865C: @ 83F865C - .incbin "baserom.gba", 0x003f865c, 0x8 + obj_pal 0x08e87d90, 0x0003 .global gUnknown_083F8664 gUnknown_083F8664: @ 83F8664 @@ -11797,7 +12135,7 @@ gUnknown_083F9EE8: @ 83F9EE8 .global gUnknown_083F9F54 gUnknown_083F9F54: @ 83F9F54 - .incbin "baserom.gba", 0x003f9f54, 0x8 + obj_tiles 0x08e824bc, 5632, 0x0004 .global gUnknown_083F9F5C gUnknown_083F9F5C: @ 83F9F5C @@ -11849,7 +12187,7 @@ gUnknown_083FA40C: @ 83FA40C .global gUnknown_083FA42C gUnknown_083FA42C: @ 83FA42C - .incbin "baserom.gba", 0x003fa42c, 0x8 + obj_tiles 0x08e82140, 2048, 0x0006 .global gUnknown_083FA434 gUnknown_083FA434: @ 83FA434 @@ -12590,11 +12928,11 @@ gUnknown_08402D08: @ 8402D08 .global gUnknown_08402D80 gUnknown_08402D80: @ 8402D80 - .incbin "baserom.gba", 0x00402d80, 0x8 + obj_tiles 0x08402b78, 384, 0x1595 .global gUnknown_08402D88 gUnknown_08402D88: @ 8402D88 - .incbin "baserom.gba", 0x00402d88, 0x8 + obj_pal 0x08402b58, 0x1596 .global gUnknown_08402D90 gUnknown_08402D90: @ 8402D90 @@ -12674,7 +13012,7 @@ gUnknown_08406118: @ 8406118 .global gUnknown_0840612C gUnknown_0840612C: @ 840612C - .incbin "baserom.gba", 0x0040612c, 0x8 + obj_pal 0x02030400, 0x0001 .global gUnknown_08406134 gUnknown_08406134: @ 8406134 @@ -12686,11 +13024,11 @@ gUnknown_08406134: @ 8406134 .global gUnknown_08406148 gUnknown_08406148: @ 8406148 - .incbin "baserom.gba", 0x00406148, 0x8 + obj_pal 0x08405f18, 0x0200 .global gUnknown_08406150 gUnknown_08406150: @ 8406150 - .incbin "baserom.gba", 0x00406150, 0x8 + obj_pal 0x08405ef8, 0x0000 .global gUnknown_08406158 gUnknown_08406158: @ 8406158 @@ -13012,7 +13350,18 @@ gUnknown_0840B23C: @ 840B23C .global gUnknown_0840B258 gUnknown_0840B258: @ 840B258 - .incbin "baserom.gba", 0x0040b258, 0x60 + obj_tiles 0x08d1a7f4, 256, 0xd6ec + obj_tiles 0x08d1a7f4, 256, 0xd6ed + obj_tiles 0x08d1a7f4, 256, 0xd6ee + obj_tiles 0x08d1a7f4, 256, 0xd6ef + obj_tiles 0x08d1a7f4, 256, 0xd6f0 + obj_tiles 0x08d1a7f4, 256, 0xd6f1 + obj_tiles 0x08d1a7f4, 256, 0xd6f2 + obj_tiles 0x08d1a7f4, 256, 0xd6f3 + obj_tiles 0x08d1a7f4, 256, 0xd6f4 + obj_tiles 0x08d1a7f4, 256, 0xd6f5 + obj_tiles 0x08d1a7f4, 256, 0xd6f6 + obj_tiles 0x08d1a7f4, 256, 0xd6f7 .global gUnknown_0840B2B8 gUnknown_0840B2B8: @ 840B2B8 @@ -13340,22 +13689,33 @@ SystemText_IntroGirl: .string "GIRL$" SystemText_IntroNewName: .string "NEW NAME$" -SystemText_IntroBoyNameLandon: + +gDefaultBoyName1:: + .ifdef SAPPHIRE + .string "SEAN$" + .else .string "LANDON$" -SystemText_IntroBoyNameTerry: + .endif +gDefaultBoyName2:: .string "TERRY$" -SystemText_IntroBoyNameSeth: +gDefaultBoyName3:: .string "SETH$" -SystemText_IntroBoyNameTom: +gDefaultBoyName4:: .string "TOM$" -SystemText_IntroGirlNameTerra: + +gDefaultGirlName1:: + .ifdef SAPPHIRE + .string "MARINA$" + .else .string "TERRA$" -SystemText_IntroGirlNameKimmy: + .endif +gDefaultGirlName2:: .string "KIMMY$" -SystemText_IntroGirlNameNicola: +gDefaultGirlName3:: .string "NICOLA$" -SystemText_IntroGirlNameSara: +gDefaultGirlName4:: .string "SARA$" + SystemText_IntroWeCall: .string "This is what we call\na POKéMON.$" @@ -13726,7 +14086,7 @@ OtherText_TheField2: OtherText_ThePC: .string "the PC.$" - .align 1 + .align 2 .global gUnknown_0840E740 gUnknown_0840E740: @ 840E740 .4byte OtherText_TheField3 @@ -15961,7 +16321,7 @@ gUnknown_084121A8: @ 84121A8 .global gUnknown_084121DC gUnknown_084121DC: @ 84121DC - .incbin "baserom.gba", 0x004121dc, 0x8 + obj_tiles 0x08e781c8, 32, 0x39e2 .global gUnknown_084121E4 gUnknown_084121E4: @ 84121E4 @@ -16208,9 +16568,9 @@ Unknown_8416F3A: Unknown_8416F42: .incbin "baserom.gba", 0x00416f42, 0x8 Unknown_8416F4A: - .incbin "baserom.gba", 0x00416f4a, 0x8 + obj_tiles 0x08000900, 1536, 0x1800 Unknown_8416F52: - .incbin "baserom.gba", 0x00416f52, 0x8 + obj_tiles 0x02000100, 1024, 0x1800 Unknown_8416F5A: .incbin "baserom.gba", 0x00416f5a, 0x8 Unknown_8416F62: @@ -17443,11 +17803,11 @@ gUnknown_0842F1C0: @ 842F1C0 .global gUnknown_0842F240 gUnknown_0842F240: @ 842F240 - .incbin "baserom.gba", 0x0042f240, 0x8 + obj_pal 0x0203a360, 0xfff0 .global gUnknown_0842F248 gUnknown_0842F248: @ 842F248 - .incbin "baserom.gba", 0x0042f248, 0x8 + obj_pal 0x0203a360, 0xfff1 .global gUnknown_0842F250 gUnknown_0842F250: @ 842F250 diff --git a/data/graphics.s b/data/graphics.s index 571721a1b..717007b9b 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -122,8 +122,7 @@ gInterfacePal_PremierBall: .global gUnknown_08D030D0 gUnknown_08D030D0: @ 8D030D0 - .incbin "graphics/interface/ball_open.4bpp.lz" - .incbin "baserom.gba", 0x00d0314c, 0x6AFC + .incbin "baserom.gba", 0xD030D0, 0x6B78 .global gUnknown_08D09C48 gUnknown_08D09C48: @ 8D09C48 @@ -946,7 +945,11 @@ gUnknown_08E95774: @ 8E95774 .global gUnknown_08E95A18 gUnknown_08E95A18: @ 8E95A18 - .incbin "baserom.gba", 0x00e95a18, 0xa0 + .ifdef SAPPHIRE + .incbin "graphics/slot_machine/sapphire.gbapal" + .else + .incbin "graphics/slot_machine/ruby.gbapal" + .endif .global gUnknown_08E95AB8 gUnknown_08E95AB8: @ 8E95AB8 @@ -1056,15 +1059,26 @@ gUnknown_08E9CA24: @ 8E9CA24 .global gUnknown_08E9CA44 gUnknown_08E9CA44: @ 8E9CA44 - .incbin "baserom.gba", 0x00e9ca44, 0xe88 + .incbin "baserom.gba", 0x00e9ca44, 0xe68 + + .incbin "graphics/title_screen/logo_shine.gbapal" .global gUnknown_08E9D8CC gUnknown_08E9D8CC: @ 8E9D8CC - .incbin "baserom.gba", 0x00e9d8cc, 0x1d58 + .incbin "graphics/title_screen/pokemon.8bpp.lz" + .ifdef SAPPHIRE + .incbin "graphics/title_screen/sapphireversion.8bpp.lz" + .else + .incbin "graphics/title_screen/rubyversion.8bpp.lz" + .endif .global gUnknown_08E9F624 gUnknown_08E9F624: @ 8E9F624 - .incbin "baserom.gba", 0x00e9f624, 0x1c0 + .ifdef SAPPHIRE + .incbin "graphics/title_screen/logo_sapphire.gbapal" @ for some reason, the sapphire palette is different even though the visible colors for the logo and version are not, weird + .else + .incbin "graphics/title_screen/logo_ruby.gbapal" + .endif .global gUnknown_08E9F7E4 gUnknown_08E9F7E4: @ 8E9F7E4 diff --git a/data/maps/scripts/LilycoveCity.s b/data/maps/scripts/LilycoveCity.s index a8d1653c1..55e1f2a79 100644 --- a/data/maps/scripts/LilycoveCity.s +++ b/data/maps/scripts/LilycoveCity.s @@ -14,6 +14,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 end LilycoveCity_MapScript1_14CA3F:: @ 814CA3F + .ifndef SAPPHIRE setmaptile 69, 4, 169, 1 setmaptile 70, 4, 680, 1 setmaptile 71, 4, 681, 1 @@ -26,6 +27,7 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F setmaptile 70, 6, 447, 0 setmaptile 71, 6, 368, 0 setmaptile 72, 6, 445, 0 + .endif checkflag 112 callif 0, LilycoveCity_EventScript_14CABE checkflag 2061 diff --git a/data/maps/scripts/Route128.s b/data/maps/scripts/Route128.s index 30109a9ae..00fc7c863 100644 --- a/data/maps/scripts/Route128.s +++ b/data/maps/scripts/Route128.s @@ -16,8 +16,10 @@ Route128_MapScript2_152135:: @ 8152135 Route128_EventScript_15213F:: @ 815213F lockall pause 20 + .ifndef SAPPHIRE special 317 waitstate + .endif move 4, Route128_Movement_152271 waitmove 0 msgbox Route128_Text_171EE0, 4 diff --git a/data/text/credits.s b/data/text/credits.s index b9473a170..a871858fc 100644 --- a/data/text/credits.s +++ b/data/text/credits.s @@ -271,7 +271,11 @@ Text_RNZFotB: Text_CreditsTerminator: .string "$" Text_Version: + .ifdef SAPPHIRE + .string "{PALETTE 9}POKéMON SAPPHIRE VERSION$" + .else .string "{PALETTE 9}POKéMON RUBY VERSION$" + .endif @ pointer table diff --git a/graphics/interface/menu.lz b/graphics/interface/menu.lz Binary files differdeleted file mode 100755 index fb0e427ef..000000000 --- a/graphics/interface/menu.lz +++ /dev/null diff --git a/graphics/slot_machine/ruby.pal b/graphics/slot_machine/ruby.pal new file mode 100644 index 000000000..fdda7e667 --- /dev/null +++ b/graphics/slot_machine/ruby.pal @@ -0,0 +1,83 @@ +JASC-PAL +0100 +80 +0 0 0 +57 57 49 +230 230 230 +255 255 255 +222 41 0 +246 90 0 +255 164 0 +255 0 255 +222 41 0 +255 164 41 +57 148 255 +164 222 255 +0 49 123 +139 0 0 +98 98 90 +0 0 0 +222 222 222 +255 255 255 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 0 255 +156 0 0 +0 0 0 +0 0 0 +255 255 255 +74 74 213 +115 172 255 +115 164 74 +156 238 74 +255 90 0 +255 164 41 +255 238 32 +222 41 0 +189 189 189 +156 156 156 +123 123 123 +90 90 90 +65 65 65 +0 0 0 +255 0 255 +255 255 255 +222 82 82 +255 131 123 +255 139 131 +255 156 148 +255 164 156 +255 180 172 +255 189 189 +255 205 205 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 +222 222 222 +246 90 0 +246 139 0 +255 255 255 +222 41 0 +0 0 197 +180 65 0 +180 65 0 +0 106 0 +0 106 0 +82 123 255 +246 156 0 +246 156 0 +41 180 82 +41 180 82 +0 0 0 diff --git a/graphics/slot_machine/sapphire.pal b/graphics/slot_machine/sapphire.pal new file mode 100644 index 000000000..68d7f5b56 --- /dev/null +++ b/graphics/slot_machine/sapphire.pal @@ -0,0 +1,83 @@ +JASC-PAL +0100 +80 +0 0 0 +57 57 49 +230 230 230 +255 255 255 +115 172 255 +49 74 213 +57 115 238 +255 0 255 +57 115 238 +255 164 41 +238 148 0 +255 205 65 +172 82 0 +0 0 106 +98 98 90 +0 0 0 +222 222 222 +255 255 255 +115 172 255 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 0 255 +156 0 0 +0 0 0 +0 0 0 +255 255 255 +74 74 213 +115 172 255 +115 164 74 +156 238 74 +230 65 24 +255 164 41 +255 238 32 +115 172 255 +189 189 189 +156 156 156 +123 123 123 +90 90 90 +65 65 65 +0 0 0 +255 0 255 +255 255 255 +82 82 222 +131 131 255 +131 139 255 +148 156 255 +156 164 255 +172 180 255 +189 189 255 +205 205 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 +222 222 222 +65 90 213 +57 115 238 +255 255 255 +115 172 255 +0 0 197 +180 65 0 +180 65 0 +0 106 0 +0 106 0 +82 123 255 +246 156 0 +246 156 0 +41 180 82 +41 180 82 +0 0 0 diff --git a/graphics/title_screen/groudon.png b/graphics/title_screen/groudon.png Binary files differnew file mode 100755 index 000000000..6e4b5cc20 --- /dev/null +++ b/graphics/title_screen/groudon.png diff --git a/graphics/title_screen/groudon_dark.pal b/graphics/title_screen/groudon_dark.pal new file mode 100755 index 000000000..12f8dc3f2 --- /dev/null +++ b/graphics/title_screen/groudon_dark.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 148 98 +0 0 0 +49 0 0 +49 0 0 +57 0 0 +65 0 0 +74 0 0 +82 0 0 +82 0 0 +90 0 0 +98 0 0 +106 0 0 +115 0 0 +123 0 0 +255 255 255 +0 0 0 diff --git a/graphics/title_screen/groudon_glow.pal b/graphics/title_screen/groudon_glow.pal new file mode 100755 index 000000000..43f83d357 --- /dev/null +++ b/graphics/title_screen/groudon_glow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 148 98 +65 0 0 +255 255 255 +82 0 0 +32 0 0 +0 0 0 +0 0 0 +0 0 0 +255 123 0 +172 82 57 +164 65 49 +156 57 41 +148 41 32 +139 32 24 +115 0 0 +0 32 205 diff --git a/graphics/title_screen/groudon_map.bin b/graphics/title_screen/groudon_map.bin Binary files differnew file mode 100644 index 000000000..521a38c13 --- /dev/null +++ b/graphics/title_screen/groudon_map.bin diff --git a/graphics/title_screen/kyogre.png b/graphics/title_screen/kyogre.png Binary files differnew file mode 100755 index 000000000..81dc829c8 --- /dev/null +++ b/graphics/title_screen/kyogre.png diff --git a/graphics/title_screen/kyogre_dark.pal b/graphics/title_screen/kyogre_dark.pal new file mode 100755 index 000000000..05e7c5270 --- /dev/null +++ b/graphics/title_screen/kyogre_dark.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 148 98 +0 0 0 +0 0 65 +0 0 74 +0 0 82 +0 0 90 +0 0 98 +0 0 106 +0 0 115 +0 0 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 diff --git a/graphics/title_screen/kyogre_glow.pal b/graphics/title_screen/kyogre_glow.pal new file mode 100755 index 000000000..85c483666 --- /dev/null +++ b/graphics/title_screen/kyogre_glow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 148 98 +0 41 82 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 172 255 +106 148 222 +82 123 189 +49 98 156 +24 74 123 +0 49 98 +180 0 0 diff --git a/graphics/title_screen/kyogre_map.bin b/graphics/title_screen/kyogre_map.bin Binary files differnew file mode 100644 index 000000000..be48f9dac --- /dev/null +++ b/graphics/title_screen/kyogre_map.bin diff --git a/graphics/title_screen/lava_map.bin b/graphics/title_screen/lava_map.bin new file mode 100644 index 000000000..aec4b50b0 --- /dev/null +++ b/graphics/title_screen/lava_map.bin @@ -0,0 +1 @@ +!"#$!"#$!"#$!"#$!"#$!"#$!"#$!"#$12341234123412341234123412341234!"#$!"#$!"#$!"#$!"#$!"#$!"#$!"#$12341234123412341234123412341234!"#$!"#$!"#$!"#$!"#$!"#$!"#$!"#$12341234123412341234123412341234!"#$!"#$!"#$!"#$!"#$!"#$!"#$!"#$12341234123412341234123412341234!"#$!"#$!"#$!"#$!"#$!"#$!"#$!"#$12341234123412341234123412341234!"#$!"#$!"#$!"#$!"#$!"#$!"#$!"#$12341234123412341234123412341234!"#$!"#$!"#$!"#$!"#$!"#$!"#$!"#$12341234123412341234123412341234!"#$!"#$!"#$!"#$!"#$!"#$!"#$!"#$12341234123412341234123412341234
\ No newline at end of file diff --git a/graphics/title_screen/logo_ruby.pal b/graphics/title_screen/logo_ruby.pal new file mode 100755 index 000000000..ea9820a4a --- /dev/null +++ b/graphics/title_screen/logo_ruby.pal @@ -0,0 +1,227 @@ +JASC-PAL +0100 +224 +0 0 0 +0 0 0 +255 238 16 +246 222 41 +246 238 246 +255 246 24 +246 246 41 +246 246 246 +246 255 255 +255 246 255 +0 0 255 +8 0 255 +24 0 238 +246 222 24 +246 222 32 +255 238 41 +255 238 49 +255 255 16 +255 255 24 +255 255 246 +255 255 255 +0 0 0 +24 41 32 +32 32 74 +32 0 230 +32 0 238 +32 0 246 +32 0 255 +246 238 32 +255 230 24 +246 230 41 +246 238 41 +246 230 49 +246 238 49 +255 246 32 +255 246 41 +255 255 32 +255 255 41 +32 24 32 +32 32 41 +197 156 41 +197 164 41 +16 0 246 +16 0 255 +24 0 246 +24 0 255 +41 0 230 +41 0 238 +57 0 238 +41 0 246 +41 0 255 +8 8 197 +246 230 24 +246 230 32 +255 238 24 +255 238 32 +32 32 32 +32 41 32 +41 32 32 +41 41 32 +49 32 32 +49 41 32 +41 32 41 +49 32 41 +24 41 41 +32 32 90 +16 24 106 +24 32 98 +41 32 82 +41 32 98 +41 41 82 +41 41 98 +0 0 115 +8 8 131 +32 24 115 +32 24 131 +32 41 115 +41 41 115 +32 41 131 +41 41 131 +57 41 41 +57 41 49 +57 49 41 +57 57 57 +65 41 41 +74 41 41 +65 57 57 +74 57 57 +57 74 74 +65 65 74 +82 74 82 +82 57 131 +82 90 82 +90 90 90 +90 98 98 +98 98 106 +115 106 106 +131 98 115 +139 98 106 +139 115 98 +180 139 57 +172 131 65 +156 115 90 +156 131 82 +115 82 139 +123 82 131 +115 98 131 +131 98 123 +115 123 123 +123 123 131 +139 131 139 +148 123 131 +205 172 24 +213 172 16 +205 164 32 +213 172 32 +222 189 24 +230 189 16 +213 189 32 +222 189 32 +230 205 24 +230 205 32 +230 213 32 +238 222 32 +180 148 57 +189 156 49 +180 148 74 +180 172 90 +156 148 123 +139 148 139 +164 148 115 +172 156 106 +197 156 49 +205 180 49 +197 172 90 +205 189 82 +222 205 49 +230 222 49 +205 205 74 +222 213 65 +49 0 230 +49 0 238 +49 0 246 +49 0 255 +57 0 246 +57 0 255 +16 8 197 +16 16 189 +32 16 164 +41 16 164 +32 16 180 +41 16 189 +8 8 205 +8 16 205 +24 8 213 +24 16 205 +41 8 213 +41 16 213 +49 8 213 +57 16 213 +16 8 230 +24 8 230 +24 16 230 +24 24 230 +8 8 246 +8 16 246 +16 8 246 +16 16 246 +32 8 230 +32 16 230 +32 8 238 +32 8 246 +41 8 230 +41 16 230 +49 16 230 +49 8 238 +32 32 156 +24 32 172 +41 41 156 +41 32 164 +74 49 180 +82 49 172 +82 65 164 +90 74 164 +24 32 189 +57 41 189 +41 32 213 +57 32 213 +74 41 189 +90 57 189 +74 49 197 +74 41 205 +106 65 156 +123 106 156 +115 82 164 +106 82 172 +148 148 156 +156 156 156 +164 164 156 +172 172 172 +180 189 180 +189 189 189 +197 189 189 +197 197 197 +205 205 213 +213 213 213 +222 230 230 +230 230 230 +32 41 41 +32 49 41 +41 41 41 +49 41 41 +41 49 41 +49 49 41 +32 41 57 +41 41 49 +32 41 65 +41 41 65 +32 49 49 +41 49 49 +32 57 57 +41 49 57 +32 41 82 +32 41 90 diff --git a/graphics/title_screen/logo_sapphire.pal b/graphics/title_screen/logo_sapphire.pal new file mode 100755 index 000000000..e733c6d2c --- /dev/null +++ b/graphics/title_screen/logo_sapphire.pal @@ -0,0 +1,227 @@ +JASC-PAL +0100 +224 +0 0 0 +0 0 0 +255 238 16 +246 222 41 +246 238 246 +255 246 24 +0 0 255 +8 0 255 +24 0 238 +246 222 24 +246 222 32 +255 238 41 +255 238 49 +255 255 16 +255 255 24 +255 246 32 +255 255 32 +246 246 238 +246 246 246 +246 246 255 +246 255 246 +246 255 255 +255 246 246 +255 246 255 +255 255 246 +255 255 255 +0 0 0 +32 32 41 +32 0 230 +32 0 238 +32 0 246 +32 0 255 +246 238 32 +255 230 24 +246 230 41 +246 238 41 +246 230 49 +246 238 49 +246 246 41 +32 41 32 +41 41 32 +49 32 32 +49 32 41 +197 156 41 +197 164 41 +16 0 246 +16 0 255 +24 0 246 +24 0 255 +41 0 230 +41 0 238 +57 0 238 +41 0 246 +41 0 255 +246 230 24 +246 230 32 +255 238 24 +255 238 32 +255 246 41 +255 255 41 +32 32 24 +32 32 32 +41 32 24 +41 32 32 +49 41 24 +49 41 32 +24 41 41 +32 41 41 +41 32 41 +41 32 49 +41 41 41 +41 41 49 +41 49 41 +41 49 49 +8 16 115 +16 24 106 +32 32 90 +32 32 106 +0 0 123 +8 8 131 +24 24 123 +41 24 131 +32 41 65 +32 41 82 +41 49 74 +41 57 65 +32 41 98 +41 41 98 +32 41 123 +41 41 123 +57 41 41 +57 49 41 +57 41 49 +65 49 49 +57 57 49 +57 65 57 +65 57 57 +74 57 57 +65 65 74 +74 74 74 +82 74 82 +65 49 115 +90 90 82 +98 90 90 +98 98 98 +98 98 106 +115 98 98 +115 115 106 +131 98 106 +139 115 98 +180 139 57 +172 131 65 +156 115 90 +156 131 82 +115 82 131 +115 90 131 +115 115 131 +115 123 123 +131 90 123 +139 115 131 +131 131 123 +139 131 131 +205 172 24 +213 172 16 +205 164 32 +213 172 32 +222 189 24 +230 189 16 +213 189 32 +222 189 32 +230 205 24 +230 205 32 +230 213 32 +238 222 32 +180 148 57 +172 148 65 +189 156 57 +189 164 57 +164 148 106 +156 148 123 +180 156 98 +189 172 90 +205 172 49 +213 197 49 +205 180 82 +205 197 74 +222 213 57 +213 213 65 +230 213 57 +230 222 57 +49 0 230 +49 0 238 +49 0 246 +49 0 255 +57 0 246 +57 0 255 +16 24 148 +24 16 180 +8 8 197 +16 16 189 +41 24 148 +32 16 164 +32 16 180 +41 16 189 +8 8 205 +8 16 205 +24 8 213 +24 16 205 +41 8 213 +41 16 213 +49 8 213 +57 16 213 +16 8 230 +24 8 230 +24 16 230 +24 24 230 +8 8 246 +8 16 246 +16 8 246 +16 16 246 +32 8 230 +32 16 230 +32 8 238 +32 8 246 +41 8 230 +41 16 230 +49 16 230 +49 8 238 +24 32 164 +24 49 172 +41 41 148 +41 32 156 +82 57 172 +90 57 164 +90 74 156 +106 82 156 +24 32 180 +57 41 189 +41 32 213 +57 32 213 +82 49 180 +98 74 180 +74 32 197 +82 49 197 +123 90 156 +131 115 148 +139 148 148 +148 148 148 +156 156 148 +148 156 156 +164 156 156 +172 172 172 +180 189 180 +180 189 189 +197 189 197 +205 205 197 +205 213 213 +213 213 213 +230 222 213 +230 230 230 +32 41 49 +32 41 57 +32 49 49 +32 49 57 diff --git a/graphics/title_screen/logo_shine.pal b/graphics/title_screen/logo_shine.pal new file mode 100644 index 000000000..561ab8f8f --- /dev/null +++ b/graphics/title_screen/logo_shine.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 156 98 +0 0 0 +148 156 164 +180 189 189 +222 222 238 +255 255 255 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 +255 0 0 diff --git a/graphics/title_screen/logo_shine.png b/graphics/title_screen/logo_shine.png Binary files differnew file mode 100644 index 000000000..4e17d2877 --- /dev/null +++ b/graphics/title_screen/logo_shine.png diff --git a/graphics/title_screen/pokemon.png b/graphics/title_screen/pokemon.png Binary files differnew file mode 100755 index 000000000..7d141ad67 --- /dev/null +++ b/graphics/title_screen/pokemon.png diff --git a/graphics/title_screen/rubyversion.png b/graphics/title_screen/rubyversion.png Binary files differnew file mode 100755 index 000000000..d12eb7bfa --- /dev/null +++ b/graphics/title_screen/rubyversion.png diff --git a/graphics/title_screen/sapphireversion.png b/graphics/title_screen/sapphireversion.png Binary files differnew file mode 100755 index 000000000..53b494d5e --- /dev/null +++ b/graphics/title_screen/sapphireversion.png diff --git a/graphics/title_screen/water_map.bin b/graphics/title_screen/water_map.bin new file mode 100644 index 000000000..5fda069b9 --- /dev/null +++ b/graphics/title_screen/water_map.bin @@ -0,0 +1 @@ +!"#$!"#$12341234!"#$!"#$1234!"#$12341234!"#$1234!"#$!"#$12341234!"#$!"#$12341234!"#$1234!"#$!"#$1234!"#$12341234!"#$1234!"#$!"#$12341234!"#$!"#$1234!"#$12341234
\ No newline at end of file diff --git a/graphics/unknown/ruby_83EDCE8.pal b/graphics/unknown/ruby_83EDCE8.pal new file mode 100644 index 000000000..16bd59843 --- /dev/null +++ b/graphics/unknown/ruby_83EDCE8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +246 90 0 +246 139 0 +255 255 255 +222 41 0 +0 164 238 +238 131 0 +238 131 0 +0 222 0 +0 222 0 +139 255 255 +255 238 106 +255 238 106 +148 255 148 +148 255 148 +0 0 0 diff --git a/graphics/unknown/sapphire_83EDD40.pal b/graphics/unknown/sapphire_83EDD40.pal new file mode 100644 index 000000000..87fa9925b --- /dev/null +++ b/graphics/unknown/sapphire_83EDD40.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +65 90 213 +57 115 238 +255 255 255 +115 172 255 +0 180 255 +255 148 0 +255 148 0 +0 238 0 +0 238 0 +139 255 255 +255 238 106 +255 238 106 +148 255 148 +148 255 148 +0 0 0 diff --git a/tools/gbagfx/Makefile b/tools/gbagfx/Makefile index e7f089445..3eb7f0b22 100644 --- a/tools/gbagfx/Makefile +++ b/tools/gbagfx/Makefile @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -Wall -Wextra -std=c11 -O2 +CFLAGS = -Wall -Wextra -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK LIBS = -lz -lpng diff --git a/tools/gbagfx/jasc_pal.c b/tools/gbagfx/jasc_pal.c index 02b6ed915..d003b7649 100644 --- a/tools/gbagfx/jasc_pal.c +++ b/tools/gbagfx/jasc_pal.c @@ -13,7 +13,7 @@ // "0100\r\n" (version; seems to always be "0100") // "<NUMBER_OF_COLORS>\r\n" (number of colors in decimal) // -// 16 or 256 times (depending on above line): +// <NUMBER_OF_COLORS> times: // "<RED> <GREEN> <BLUE>\r\n" (color entry) // // Each color component is a decimal number from 0 to 255. @@ -82,8 +82,8 @@ void ReadJascPalette(char *path, struct Palette *palette) if (!ParseNumber(line, NULL, 10, &palette->numColors)) FATAL_ERROR("Failed to parse number of colors.\n"); - if (palette->numColors != 16 && palette->numColors != 256) - FATAL_ERROR("%d is an invalid number of colors. The number of colors must be 16 or 256.\n", palette->numColors); + if (palette->numColors < 1 || palette->numColors > 256) + FATAL_ERROR("%d is an invalid number of colors. The number of colors must be in the range [1, 256].\n", palette->numColors); for (int i = 0; i < palette->numColors; i++) { ReadJascPaletteLine(fp, line); diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile index 24f60e3f6..2d577c79f 100644 --- a/tools/preproc/Makefile +++ b/tools/preproc/Makefile @@ -1,6 +1,6 @@ CXX := g++ -CXXFLAGS := -std=c++14 -O2 -Wall -Wno-switch +CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \ utf8.cpp diff --git a/tools/rsfont/Makefile b/tools/rsfont/Makefile index 78e0cab3a..9ad47cfcf 100644 --- a/tools/rsfont/Makefile +++ b/tools/rsfont/Makefile @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -Wall -Wextra -std=c11 -O2 +CFLAGS = -Wall -Wextra -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK LIBS = -lz -lpng |
