diff --git a/Graphics/TitleScreen/90CEE8_assembly0.bin b/Graphics/TitleScreen/90CEE8_assembly0.bin index 899a86c..820d1c3 100644 Binary files a/Graphics/TitleScreen/90CEE8_assembly0.bin and b/Graphics/TitleScreen/90CEE8_assembly0.bin differ diff --git a/Graphics/TitleScreen/90CEF6_assembly0.bin b/Graphics/TitleScreen/90CEF6_assembly0.bin index 6ecd224..68fe787 100644 Binary files a/Graphics/TitleScreen/90CEF6_assembly0.bin and b/Graphics/TitleScreen/90CEF6_assembly0.bin differ diff --git a/Graphics/TitleScreen/90CF0A_assembly0.bin b/Graphics/TitleScreen/90CF0A_assembly0.bin index 6992187..62d3a3e 100644 Binary files a/Graphics/TitleScreen/90CF0A_assembly0.bin and b/Graphics/TitleScreen/90CF0A_assembly0.bin differ diff --git a/Graphics/TitleScreen/90CF1E_assembly0.bin b/Graphics/TitleScreen/90CF1E_assembly0.bin index 9d18b31..95037fa 100644 Binary files a/Graphics/TitleScreen/90CF1E_assembly0.bin and b/Graphics/TitleScreen/90CF1E_assembly0.bin differ diff --git a/Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.bin b/Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.bin index 6c19042..989984a 100644 Binary files a/Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.bin and b/Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.bin differ diff --git a/Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.cdat b/Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.cdat index c99b64d..ba86a17 100644 Binary files a/Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.cdat and b/Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.cdat differ diff --git a/Graphics/TitleScreen/CrystalTile2 1 b/Graphics/TitleScreen/CrystalTile2 1 new file mode 100644 index 0000000..3490b74 Binary files /dev/null and b/Graphics/TitleScreen/CrystalTile2 1 differ diff --git a/Graphics/TitleScreen/CrystalTile2 1.bin b/Graphics/TitleScreen/CrystalTile2 1.bin new file mode 100644 index 0000000..2e70437 Binary files /dev/null and b/Graphics/TitleScreen/CrystalTile2 1.bin differ diff --git a/Graphics/TitleScreen/D37798_assembly0.bin b/Graphics/TitleScreen/D37798_assembly0.bin new file mode 100644 index 0000000..f1727e6 Binary files /dev/null and b/Graphics/TitleScreen/D37798_assembly0.bin differ diff --git a/Graphics/TitleScreen/D378F2_assembly0.bin b/Graphics/TitleScreen/D378F2_assembly0.bin new file mode 100644 index 0000000..77b7621 Binary files /dev/null and b/Graphics/TitleScreen/D378F2_assembly0.bin differ diff --git a/Graphics/TitleScreen/D37900_assembly0.bin b/Graphics/TitleScreen/D37900_assembly0.bin new file mode 100644 index 0000000..dfecacf Binary files /dev/null and b/Graphics/TitleScreen/D37900_assembly0.bin differ diff --git a/Graphics/TitleScreen/D37914_assembly0.bin b/Graphics/TitleScreen/D37914_assembly0.bin new file mode 100644 index 0000000..f074054 Binary files /dev/null and b/Graphics/TitleScreen/D37914_assembly0.bin differ diff --git a/Graphics/TitleScreen/D37928_assembly0.bin b/Graphics/TitleScreen/D37928_assembly0.bin new file mode 100644 index 0000000..4c755af Binary files /dev/null and b/Graphics/TitleScreen/D37928_assembly0.bin differ diff --git a/Graphics/TitleScreen/Horizontal Title/TitleScreen.asm b/Graphics/TitleScreen/Horizontal Title/TitleScreen.asm index 361bf7d..bd07425 100644 --- a/Graphics/TitleScreen/Horizontal Title/TitleScreen.asm +++ b/Graphics/TitleScreen/Horizontal Title/TitleScreen.asm @@ -1,25 +1,25 @@ -.org 0x08CD7948 -.dw CD7948_titlescreen_oam_tiles | 0x80000000 -//m H -.org 0x0890CEF6 -.import Graphics/TitleScreen/90CEF6_assembly0.bin -//th -.org 0x0890CEE8 -.import Graphics/TitleScreen/90CEE8_assembly0.bin -//Rhy -.org 0x0890d4a0 -.dw X90CEE0_assembly0 -//ea -.org 0x0890CF0A -.import Graphics/TitleScreen/90CF0A_assembly0.bin -//ven -.org 0x0890CF1E -.import Graphics/TitleScreen/90CF1E_assembly0.bin -//Boost and Silver -.org 0x0890CE28 -.import Graphics/TitleScreen/90CE28_assembly0.bin -.org 0x0890CE60 -.import Graphics/TitleScreen/90CE60_assembly1.bin -.org 0x0890CE98 -.import Graphics/TitleScreen/90CE98_assembly2.bin +.org 0x08CD7948 +.dw CD7948_titlescreen_oam_tiles | 0x80000000 +//m H +.org 0x0890CEF6 +.import Graphics/TitleScreen/90CEF6_assembly0.bin +//th +.org 0x0890CEE8 +.import Graphics/TitleScreen/90CEE8_assembly0.bin +//Rhy +.org 0x0890d4a0 +.dw X90CEE0_assembly0 +//ea +.org 0x0890CF0A +.import Graphics/TitleScreen/90CF0A_assembly0.bin +//ven +.org 0x0890CF1E +.import Graphics/TitleScreen/90CF1E_assembly0.bin +//Boost and Silver +.org 0x0890CE28 +.import Graphics/TitleScreen/90CE28_assembly0.bin +.org 0x0890CE60 +.import Graphics/TitleScreen/90CE60_assembly1.bin +.org 0x0890CE98 +.import Graphics/TitleScreen/90CE98_assembly2.bin ;eof \ No newline at end of file diff --git a/Graphics/TitleScreen/Horizontal Title/TitleScreen_relocate.asm b/Graphics/TitleScreen/Horizontal Title/TitleScreen_relocate.asm index 6b3b639..53c14a6 100644 --- a/Graphics/TitleScreen/Horizontal Title/TitleScreen_relocate.asm +++ b/Graphics/TitleScreen/Horizontal Title/TitleScreen_relocate.asm @@ -1,8 +1,8 @@ -.align 4 -CD7948_titlescreen_oam_tiles: -.import Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.cdat -//Rhy -.align 2 -X90CEE0_assembly0: -.import Graphics/TitleScreen/90CEE0_assembly0.bin +.align 4 +CD7948_titlescreen_oam_tiles: +.import Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.cdat +//Rhy +.align 2 +X90CEE0_assembly0: +.import Graphics/TitleScreen/90CEE0_assembly0.bin ;eof \ No newline at end of file diff --git a/Graphics/TitleScreen/RHDS Title/TitleScreen.asm b/Graphics/TitleScreen/RHDS Title/TitleScreen.asm index 0aeba37..ac58395 100644 --- a/Graphics/TitleScreen/RHDS Title/TitleScreen.asm +++ b/Graphics/TitleScreen/RHDS Title/TitleScreen.asm @@ -1,7 +1,7 @@ -.org 0x0890D4A0 -.dw TitleScreenOams -.org 0x08CD7948 -.dw CD7948_titlescreen_oam_tiles | 0x80000000 -.org 0x0801CC14 -.dw TitleScreenBubbles +.org 0x0890D4A0 +.dw TitleScreenOams +.org 0x08CD7948 +.dw CD7948_titlescreen_oam_tiles | 0x80000000 +.org 0x0801CC14 +.dw TitleScreenBubbles ;eof \ No newline at end of file diff --git a/Graphics/TitleScreen/RHDS Title/TitleScreen_relocate.asm b/Graphics/TitleScreen/RHDS Title/TitleScreen_relocate.asm index d945375..4eb3f58 100644 --- a/Graphics/TitleScreen/RHDS Title/TitleScreen_relocate.asm +++ b/Graphics/TitleScreen/RHDS Title/TitleScreen_relocate.asm @@ -1,13 +1,13 @@ -.align 4 -CD7948_titlescreen_oam_tiles: -.import Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.cdat - -.align 4 -TitleScreenOams: -.import Graphics/TitleScreen/titlescreen_oams.bin - -.align 4 -TitleScreenBubbles: -.import Graphics/TitleScreen/titlescreen_bubbles.bin - +.align 4 +CD7948_titlescreen_oam_tiles: +.import Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.cdat + +.align 4 +TitleScreenOams: +.import Graphics/TitleScreen/titlescreen_oams.bin + +.align 4 +TitleScreenBubbles: +.import Graphics/TitleScreen/titlescreen_bubbles.bin + ;eof \ No newline at end of file diff --git a/Graphics/TitleScreen/RHDS Title/titlescreen_bubbles.bin b/Graphics/TitleScreen/RHDS Title/titlescreen_bubbles.bin index f1097a7..85dfed6 100644 Binary files a/Graphics/TitleScreen/RHDS Title/titlescreen_bubbles.bin and b/Graphics/TitleScreen/RHDS Title/titlescreen_bubbles.bin differ diff --git a/Graphics/TitleScreen/RHDS Title/titlescreen_bubbles.bin.bak b/Graphics/TitleScreen/RHDS Title/titlescreen_bubbles.bin.bak new file mode 100644 index 0000000..eb6aada Binary files /dev/null and b/Graphics/TitleScreen/RHDS Title/titlescreen_bubbles.bin.bak differ diff --git a/Graphics/TitleScreen/TitleScreen.asm b/Graphics/TitleScreen/TitleScreen.asm index 361bf7d..0e96799 100644 --- a/Graphics/TitleScreen/TitleScreen.asm +++ b/Graphics/TitleScreen/TitleScreen.asm @@ -1,25 +1,36 @@ -.org 0x08CD7948 -.dw CD7948_titlescreen_oam_tiles | 0x80000000 -//m H -.org 0x0890CEF6 -.import Graphics/TitleScreen/90CEF6_assembly0.bin -//th -.org 0x0890CEE8 -.import Graphics/TitleScreen/90CEE8_assembly0.bin -//Rhy -.org 0x0890d4a0 -.dw X90CEE0_assembly0 -//ea -.org 0x0890CF0A -.import Graphics/TitleScreen/90CF0A_assembly0.bin -//ven -.org 0x0890CF1E -.import Graphics/TitleScreen/90CF1E_assembly0.bin -//Boost and Silver -.org 0x0890CE28 -.import Graphics/TitleScreen/90CE28_assembly0.bin -.org 0x0890CE60 -.import Graphics/TitleScreen/90CE60_assembly1.bin -.org 0x0890CE98 -.import Graphics/TitleScreen/90CE98_assembly2.bin -;eof \ No newline at end of file +.org 0x08CD7948 +.dw CD7948_titlescreen_oam_tiles | 0x80000000 + +;.orgrev 0x08CD663C,0x08CD6608 +;.dw CD663C_titlescreen_bg1_tiles | 0x80000000 + +//m H +.org 0x0890CEF6 +.import Graphics/TitleScreen/90CEF6_assembly0.bin +//th +.org 0x0890D4B0 +.dw X90CEE8_assembly0 + +//.orgrev 0x0890CEE8,-1 +//.import Graphics/TitleScreen/90CEE8_assembly0.bin +//Rhy +.org 0x0890d4a0 +.dw X90CEE0_assembly0 +//ea +.org 0x0890D4D0 +.dw X90CF0A_assembly0 +//ven +.org 0x0890D4E0 +.dw X90CF1E_assembly0 + +//Boost and Silver +.org 0x0890CE28 +.import Graphics/TitleScreen/90CE28_assembly0.bin +.org 0x0890CE60 +.import Graphics/TitleScreen/90CE60_assembly1.bin +.org 0x0890CE98 +.import Graphics/TitleScreen/90CE98_assembly2.bin +;eof + +.org 0x0801CC14 +.dw TitleScreenBubbles diff --git a/Graphics/TitleScreen/TitleScreen_relocate.asm b/Graphics/TitleScreen/TitleScreen_relocate.asm index 6b3b639..b11956b 100644 --- a/Graphics/TitleScreen/TitleScreen_relocate.asm +++ b/Graphics/TitleScreen/TitleScreen_relocate.asm @@ -1,8 +1,25 @@ -.align 4 -CD7948_titlescreen_oam_tiles: -.import Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.cdat -//Rhy -.align 2 -X90CEE0_assembly0: -.import Graphics/TitleScreen/90CEE0_assembly0.bin -;eof \ No newline at end of file +.align 4 +CD7948_titlescreen_oam_tiles: +.import Graphics/TitleScreen/CD7948_titlescreen_oam_tiles.cdat +//Rhy +.align 2 +X90CEE0_assembly0: +.import Graphics/TitleScreen/D378F2_assembly0.bin + +.align 2 +X90CEE8_assembly0: +.import Graphics/TitleScreen/D37900_assembly0.bin + +.align 2 +X90CF0A_assembly0: +.import Graphics/TitleScreen/D37914_assembly0.bin + +.align 2 +X90CF1E_assembly0: +.import Graphics/TitleScreen/D37928_assembly0.bin + +.align 4 +TitleScreenBubbles: +.import Graphics/TitleScreen/titlescreen_bubbles.bin +;eof + diff --git a/Graphics/TitleScreen/new 2s.txt b/Graphics/TitleScreen/new 2s.txt new file mode 100644 index 0000000..8e6c2db --- /dev/null +++ b/Graphics/TitleScreen/new 2s.txt @@ -0,0 +1,549 @@ +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069A48 +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000000 00000000 00000038 +00000003 08017381 08A5DD8C +00000304 0801738D 089DF6CC +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069A58 +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069A64 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069A70 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069A7C +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069A88 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069A94 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069A9C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069AA8 +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AB8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 08A5DDBC +00000304 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069AC0 +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AB8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069ACC +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AD8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AE0 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AE8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AF4 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069B00 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069B0C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069A70 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069A88 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069A94 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 08A5DDEC +00000304 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069B18 +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AB8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069B2C +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069B00 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069B0C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AF4 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069B38 +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069ACC +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 08A5DE1C +00000304 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069B48 +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AE0 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AB8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AE8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069B50 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069B5C +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AD8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069B6C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069B74 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069B80 +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069A64 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AD8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069B88 +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069B9C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069BA4 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069BB0 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069BB8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AD8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 08A5DE4C +00000304 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069BC4 +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069BD4 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AD8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069BB8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069BDC +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069BE4 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069BF0 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069BFC +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AD8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069BD4 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069ACC +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069B50 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069AE0 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C04 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C10 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 08A5DE7C +00000304 0801738D 089DF6CC +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069C1C +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C24 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C30 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C3C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C48 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C54 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C5C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C68 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C74 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C80 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C8C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069C98 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069CA0 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069CA8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069CB4 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069CC0 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069CC8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069CD0 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069CE0 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 08A5DEAC +00000304 0801738D 089DF6CC +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069CEC +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069CFC +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069D08 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069D14 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069D20 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069D2C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069D38 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069D40 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069D4C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069D5C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069D68 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069D74 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069D7C +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000000 +00000104 0801738D 089DF6CC +00000003 08017381 08069D88 +00000004 0801738D 089DF6CC +00000000 00000000 00000038 +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069D98 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000001 +00000104 0801738D 089DF6CC +00000003 08017381 08069DA0 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 00000038 +00000000 00000000 00000038 +00000000 00000000 00000038 +00000000 00000000 00000038 +00000000 00000000 00000038 +00000003 08017381 08A5DEDC +00000304 0801738D 089DF6CC +00000003 08017381 00000002 +00000104 0801738D 089DF6CC +00000003 08017381 08069DA8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000002 +00000104 0801738D 089DF6CC +00000003 08017381 08069DA8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000002 +00000104 0801738D 089DF6CC +00000003 08017381 08069DA8 +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000003 08017381 00000002 +00000104 0801738D 089DF6CC +00000003 08017381 08069DAC +00000004 0801738D 089DF6CC +00000000 00000000 0000001C +00000000 00000000 0000000C \ No newline at end of file diff --git a/Graphics/TitleScreen/obj - 복사본.pal b/Graphics/TitleScreen/obj - 복사본.pal new file mode 100644 index 0000000..21829d5 Binary files /dev/null and b/Graphics/TitleScreen/obj - 복사본.pal differ diff --git a/Graphics/TitleScreen/obj.dmp b/Graphics/TitleScreen/obj.dmp new file mode 100644 index 0000000..21829d5 Binary files /dev/null and b/Graphics/TitleScreen/obj.dmp differ diff --git a/Graphics/TitleScreen/titlescreen_bubbles.bin b/Graphics/TitleScreen/titlescreen_bubbles.bin index f1097a7..41ef067 100644 Binary files a/Graphics/TitleScreen/titlescreen_bubbles.bin and b/Graphics/TitleScreen/titlescreen_bubbles.bin differ diff --git a/Graphics/TitleScreen/titlescreen_bubbles.bin.bak b/Graphics/TitleScreen/titlescreen_bubbles.bin.bak new file mode 100644 index 0000000..1d222b7 Binary files /dev/null and b/Graphics/TitleScreen/titlescreen_bubbles.bin.bak differ diff --git a/Graphics/WarningScreen/D1AD4C_warningscreen_tile.bin b/Graphics/WarningScreen/D1AD4C_warningscreen_tile.bin new file mode 100644 index 0000000..66483b2 Binary files /dev/null and b/Graphics/WarningScreen/D1AD4C_warningscreen_tile.bin differ diff --git a/Graphics/WarningScreen/D1AD4C_warningscreen_tile.cdat b/Graphics/WarningScreen/D1AD4C_warningscreen_tile.cdat new file mode 100644 index 0000000..eb6974e Binary files /dev/null and b/Graphics/WarningScreen/D1AD4C_warningscreen_tile.cdat differ diff --git a/Graphics/WarningScreen/D1AD4C_warningscreen_tile.new.bin b/Graphics/WarningScreen/D1AD4C_warningscreen_tile.new.bin new file mode 100644 index 0000000..01ab761 Binary files /dev/null and b/Graphics/WarningScreen/D1AD4C_warningscreen_tile.new.bin differ diff --git a/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.bin b/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.bin new file mode 100644 index 0000000..55e7905 Binary files /dev/null and b/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.bin differ diff --git a/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.bin.bak b/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.bin.bak new file mode 100644 index 0000000..d2bfa32 Binary files /dev/null and b/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.bin.bak differ diff --git a/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.dat b/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.dat new file mode 100644 index 0000000..f31238b Binary files /dev/null and b/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.dat differ diff --git a/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.new.bin b/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.new.bin new file mode 100644 index 0000000..f2859e1 Binary files /dev/null and b/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.new.bin differ diff --git a/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.rle b/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.rle new file mode 100644 index 0000000..b555059 --- /dev/null +++ b/Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.rle @@ -0,0 +1 @@ +_C               \ No newline at end of file diff --git a/Graphics/WarningScreen/bg.pal b/Graphics/WarningScreen/bg.pal new file mode 100644 index 0000000..b4073c9 Binary files /dev/null and b/Graphics/WarningScreen/bg.pal differ diff --git a/Graphics/WarningScreen/nmap.exe b/Graphics/WarningScreen/nmap.exe new file mode 100644 index 0000000..9bfe0d3 Binary files /dev/null and b/Graphics/WarningScreen/nmap.exe differ diff --git a/Graphics/WarningScreen/warningscreen.asm b/Graphics/WarningScreen/warningscreen.asm new file mode 100644 index 0000000..0476396 --- /dev/null +++ b/Graphics/WarningScreen/warningscreen.asm @@ -0,0 +1,9 @@ +.org 0x08D1AD4C +.dw D1AD4C_warningscreen_tile |0x80000000 +.org 0x08D1B00C +.dw D1AD4C_warningscreen_tile_map_dat +.org 0x08D1B00C+4 +.dw D1AD4C_warningscreen_tile_map_rle +.org 0x08D1B00C+8 +.dh D1AD4C_warningscreen_tile_map_rle_end-D1AD4C_warningscreen_tile_map_rle +;eof \ No newline at end of file diff --git a/Graphics/WarningScreen/warningscreen_relocate.asm b/Graphics/WarningScreen/warningscreen_relocate.asm new file mode 100644 index 0000000..16bc702 --- /dev/null +++ b/Graphics/WarningScreen/warningscreen_relocate.asm @@ -0,0 +1,11 @@ +.align 4 +D1AD4C_warningscreen_tile: +.import Graphics/WarningScreen/D1AD4C_warningscreen_tile.cdat +.align 4 +D1AD4C_warningscreen_tile_map_dat: +.import Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.dat +.align 4 +D1AD4C_warningscreen_tile_map_rle: +.import Graphics/WarningScreen/D1AD4C_warningscreen_tile_map.rle +D1AD4C_warningscreen_tile_map_rle_end: +;eof \ No newline at end of file diff --git a/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile (2).bin b/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile (2).bin new file mode 100644 index 0000000..917085b Binary files /dev/null and b/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile (2).bin differ diff --git a/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile.bin b/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile.bin new file mode 100644 index 0000000..a8f2350 Binary files /dev/null and b/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile.bin differ diff --git a/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile_map (2).bin b/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile_map (2).bin new file mode 100644 index 0000000..6ba2651 Binary files /dev/null and b/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile_map (2).bin differ diff --git a/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile_map.bin b/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile_map.bin new file mode 100644 index 0000000..1597057 Binary files /dev/null and b/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile_map.bin differ diff --git a/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile_map.new.bin.bak b/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile_map.new.bin.bak new file mode 100644 index 0000000..b93a6a1 Binary files /dev/null and b/Graphics/WarningScreen/새 폴더/D1AD4C_warningscreen_tile_map.new.bin.bak differ diff --git a/compile.asm b/compile.asm index 71a45fd..1a565a8 100644 --- a/compile.asm +++ b/compile.asm @@ -75,6 +75,7 @@ _spriteluaconsolemessages equ 0 .include Graphics/RhythmGame/Toss2/toss2.asm .include Graphics/RhythmGame/Remix8/remix8.asm .include Graphics/ToysMenu/Toys/toys.asm +.include Graphics/WarningScreen/warningscreen.asm .include asm_relocate.asm .include asm.asm diff --git a/relocate.asm b/relocate.asm index 1db8ab1..1ffb8bc 100644 --- a/relocate.asm +++ b/relocate.asm @@ -53,4 +53,5 @@ .include Graphics/RhythmGame/Toss2/toss2_relocate.asm .include Graphics/RhythmGame/Remix8/remix8_relocate.asm .include Graphics/ToysMenu/Toys/toys_relocate.asm +.include Graphics/WarningScreen/warningscreen_relocate.asm ;eof \ No newline at end of file