From aacde3764f6981b54567725161790b2643bd2bf5 Mon Sep 17 00:00:00 2001 From: Lorenzooone Date: Thu, 12 Sep 2019 22:10:43 +0200 Subject: [PATCH] Revert "Merge branch 'thewip' into window-text-buffering" This reverts commit d5a7ce8d988352c93fc7e653ae46c4742fe93940, reversing changes made to 75826520712f653624b39847e1e13a67cc6b6588. --- notes/m2-sub111D0.txt | 233 ------------------ src/data/m2-title-background-map.bin | Bin 817 -> 0 bytes .../m2-title-background-pal-copyright.bin | Bin 256 -> 0 bytes src/data/m2-title-background-pal-glow.bin | 18 -- src/data/m2-title-background.bin | Bin 6667 -> 0 bytes src/data/m2-title-text-pal-animated.bin | Bin 448 -> 0 bytes src/data/m2-title-text-pal-static.bin | Bin 32 -> 0 bytes src/m2-hack.asm | 67 +---- 8 files changed, 1 insertion(+), 317 deletions(-) delete mode 100644 notes/m2-sub111D0.txt delete mode 100644 src/data/m2-title-background-map.bin delete mode 100644 src/data/m2-title-background-pal-copyright.bin delete mode 100644 src/data/m2-title-background-pal-glow.bin delete mode 100644 src/data/m2-title-background.bin delete mode 100644 src/data/m2-title-text-pal-animated.bin delete mode 100644 src/data/m2-title-text-pal-static.bin diff --git a/notes/m2-sub111D0.txt b/notes/m2-sub111D0.txt deleted file mode 100644 index 58c7892..0000000 --- a/notes/m2-sub111D0.txt +++ /dev/null @@ -1,233 +0,0 @@ -// Load intro screen - -// 82D6AA8: structs of size 0x38 -// Offset Length Description -// ------------------------------------ -// 0 4 BG0 graphics pointer (compressed) -// 4 4 Sprite graphics pointer (compressed) -// 8 4 BG palette pointer (compressed) -// C 4 Sprite palette pointer (compressed) -// 10 4 BG0 tilemap pointer (compressed) -// 14 2 BG0 attributes -// 16 2 Unused? -// 18 4 BG1 tilemap pointer (compressed) -// 1C 2 BG1 attributes -// 1E 2 Unused? -// 20 2 DISPCNT -// 22 2 Some kind of index into a jump table (negative values are special) -// 24 4 Unused? -// 28 16 Four-entry jump table -// [0]: called at the start of the animation -// [1,2]: called for each frame -// [3]: called at the end of the animation - -// r0: screen key -// 0 = Nintendo -// 1 = APE -// 2 = HALKEN -// 3 = Title screen (full) -// 5 = Title screen (quick) - 080111D0 (T) push r4-r7,r14 - 080111D2 (T) mov r7,r9 - 080111D4 (T) mov r6,r8 - 080111D6 (T) push r6,r7 - 080111D8 (T) add sp,-4h - 080111DA (T) mov r5,r0 - 080111DC (T) ldr r4,=3000370h - 080111DE (T) mov r0,18h - 080111E0 (T) bl 8005B9Ch // malloc 0x18 bytes for some struct - 080111E4 (T) str r0,[r4] - 080111E6 (T) str r5,[r0] - 080111E8 (T) mov r7,0h - 080111EA (T) str r7,[r0,14h] - 080111EC (T) str r7,[r0,4h] - 080111EE (T) str r7,[r0,10h] // zero out the struct - 080111F0 (T) ldr r6,=82D6AA8h - 080111F2 (T) lsl r0,r5,3h - 080111F4 (T) sub r0,r0,r5 - 080111F6 (T) lsl r4,r0,3h // r4 = r5 * 0x38 - 080111F8 (T) add r0,r4,r6 - 080111FA (T) ldr r0,[r0] - 080111FC (T) cmp r0,0h - 080111FE (T) beq 801120Ch - 08011200 (T) mov r1,80h - 08011202 (T) lsl r1,r1,12h - 08011204 (T) mov r2,40h - 08011206 (T) lsl r2,r2,8h - 08011208 (T) bl 8005D34h - 0801120C (T) add r0,r6,4 - 0801120E (T) add r0,r4,r0 - 08011210 (T) ldr r0,[r0] - 08011212 (T) cmp r0,0h - 08011214 (T) beq 8011220h - 08011216 (T) ldr r1,=2008000h - 08011218 (T) mov r2,80h - 0801121A (T) lsl r2,r2,8h - 0801121C (T) bl 8005D34h - 08011220 (T) mov r0,r6 - 08011222 (T) add r0,8h - 08011224 (T) add r0,r4,r0 - 08011226 (T) ldr r3,[r0] - 08011228 (T) cmp r3,0h - 0801122A (T) beq 801126Ch - 0801122C (T) mov r0,1h - 0801122E (T) neg r0,r0 - 08011230 (T) cmp r3,r0 - 08011232 (T) bne 8011260h - 08011234 (T) str r7,[sp] - 08011236 (T) ldr r1,=40000D4h - 08011238 (T) mov r0,r13 - 0801123A (T) str r0,[r1] - 0801123C (T) ldr r0,=2010000h - 0801123E (T) str r0,[r1,4h] - 08011240 (T) ldr r0,=85000080h - 08011242 (T) str r0,[r1,8h] - 08011244 (T) ldr r0,[r1,8h] - 08011246 (T) b 801126Ch - 08011248 (T) lsl r0,r6,0Dh - 0801124A (T) lsl r0,r0,0Ch - 0801124C (T) ldr r0,[r5,28h] - 0801124E (T) lsr r5,r5,20h - 08011250 (T) strh r0,[r0] - 08011252 (T) lsl r0,r0,8h - 08011254 (T) lsl r4,r2,3h - 08011256 (T) lsl r0,r0,10h - 08011258 (T) lsl r0,r0,0h - 0801125A (T) lsl r1,r0,8h - 0801125C (T) lsl r0,r0,2h - 0801125E (T) strh r0,[r0,28h] - 08011260 (T) ldr r1,=2010000h - 08011262 (T) mov r2,80h - 08011264 (T) lsl r2,r2,2h - 08011266 (T) mov r0,r3 - 08011268 (T) bl 8005D34h - 0801126C (T) ldr r1,=82D6AA8h - 0801126E (T) mov r9,r1 - 08011270 (T) lsl r0,r5,3h - 08011272 (T) sub r0,r0,r5 - 08011274 (T) lsl r7,r0,3h - 08011276 (T) mov r0,r9 - 08011278 (T) add r0,0Ch - 0801127A (T) add r0,r7,r0 - 0801127C (T) ldr r0,[r0] - 0801127E (T) cmp r0,0h - 08011280 (T) beq 801128Ch - 08011282 (T) ldr r1,=2010200h - 08011284 (T) mov r2,80h - 08011286 (T) lsl r2,r2,2h - 08011288 (T) bl 8005D34h - 0801128C (T) mov r0,r9 - 0801128E (T) add r0,10h - 08011290 (T) add r0,r7,r0 - 08011292 (T) ldr r0,[r0] - 08011294 (T) cmp r0,0h - 08011296 (T) beq 80112A2h - 08011298 (T) ldr r1,=2010400h - 0801129A (T) mov r2,80h - 0801129C (T) lsl r2,r2,4h - 0801129E (T) bl 8005D34h - 080112A2 (T) mov r0,r9 - 080112A4 (T) add r0,18h - 080112A6 (T) add r0,r7,r0 - 080112A8 (T) ldr r0,[r0] - 080112AA (T) cmp r0,0h - 080112AC (T) beq 80112B8h - 080112AE (T) ldr r1,=2010C00h - 080112B0 (T) mov r2,80h - 080112B2 (T) lsl r2,r2,4h - 080112B4 (T) bl 8005D34h - 080112B8 (T) ldr r0,=2010000h - 080112BA (T) mov r8,r0 - 080112BC (T) mov r0,0h - 080112BE (T) mov r1,r8 - 080112C0 (T) strh r0,[r1] - 080112C2 (T) bl 80F47E4h - 080112C6 (T) bl 800E5E4h - 080112CA (T) ldr r4,=40000D4h - 080112CC (T) mov r0,80h - 080112CE (T) lsl r0,r0,12h - 080112D0 (T) str r0,[r4] - 080112D2 (T) ldr r0,=6008000h - 080112D4 (T) str r0,[r4,4h] - 080112D6 (T) ldr r5,=84001000h - 080112D8 (T) str r5,[r4,8h] - 080112DA (T) ldr r0,[r4,8h] - 080112DC (T) ldr r6,=4000006h - 080112DE (T) ldrh r0,[r6] - 080112E0 (T) bl 80F47E4h - 080112E4 (T) bl 800E5E4h - 080112E8 (T) ldr r0,=2004000h - 080112EA (T) str r0,[r4] - 080112EC (T) ldr r0,=600C000h - 080112EE (T) str r0,[r4,4h] - 080112F0 (T) str r5,[r4,8h] - 080112F2 (T) ldr r0,[r4,8h] - 080112F4 (T) ldrh r0,[r6] - 080112F6 (T) bl 80F47E4h - 080112FA (T) bl 800E5E4h - 080112FE (T) ldr r1,=4000008h - 08011300 (T) mov r0,r9 - 08011302 (T) add r5,r7,r0 - 08011304 (T) ldrh r0,[r5,14h] - 08011306 (T) strh r0,[r1] - 08011308 (T) add r1,2h - 0801130A (T) ldrh r0,[r5,1Ch] - 0801130C (T) strh r0,[r1] - 0801130E (T) mov r1,r8 - 08011310 (T) str r1,[r4] - 08011312 (T) mov r0,0A0h - 08011314 (T) lsl r0,r0,13h - 08011316 (T) str r0,[r4,4h] - 08011318 (T) ldr r0,=84000080h - 0801131A (T) mov r9,r0 - 0801131C (T) str r0,[r4,8h] - 0801131E (T) ldr r0,[r4,8h] - 08011320 (T) ldr r0,=2010400h - 08011322 (T) str r0,[r4] - 08011324 (T) mov r0,0C0h - 08011326 (T) lsl r0,r0,13h - 08011328 (T) str r0,[r4,4h] - 0801132A (T) ldr r1,=84000200h - 0801132C (T) mov r8,r1 - 0801132E (T) str r1,[r4,8h] - 08011330 (T) ldr r0,[r4,8h] - 08011332 (T) ldrh r0,[r6] - 08011334 (T) bl 80F47E4h - 08011338 (T) bl 800E5E4h - 0801133C (T) ldr r0,=2008000h - 0801133E (T) str r0,[r4] - 08011340 (T) ldr r0,=6010000h - 08011342 (T) str r0,[r4,4h] - 08011344 (T) ldr r0,=84002000h - 08011346 (T) str r0,[r4,8h] - 08011348 (T) ldr r0,[r4,8h] - 0801134A (T) ldrh r0,[r6] - 0801134C (T) bl 80F47E4h - 08011350 (T) bl 800E5E4h - 08011354 (T) mov r1,80h - 08011356 (T) lsl r1,r1,13h - 08011358 (T) ldrh r0,[r5,20h] - 0801135A (T) strh r0,[r1] - 0801135C (T) ldr r0,=2010200h - 0801135E (T) str r0,[r4] - 08011360 (T) ldr r0,=5000200h - 08011362 (T) str r0,[r4,4h] - 08011364 (T) mov r0,r9 - 08011366 (T) str r0,[r4,8h] - 08011368 (T) ldr r0,[r4,8h] - 0801136A (T) ldr r0,=2010C00h - 0801136C (T) str r0,[r4] - 0801136E (T) ldr r0,=6000800h - 08011370 (T) str r0,[r4,4h] - 08011372 (T) mov r1,r8 - 08011374 (T) str r1,[r4,8h] - 08011376 (T) ldr r0,[r4,8h] - 08011378 (T) ldrh r0,[r6] - 0801137A (T) add sp,4h - 0801137C (T) pop r3,r4 - 0801137E (T) mov r8,r3 - 08011380 (T) mov r9,r4 - 08011382 (T) pop r4-r7 - 08011384 (T) pop r0 - 08011386 (T) bx r0 - \ No newline at end of file diff --git a/src/data/m2-title-background-map.bin b/src/data/m2-title-background-map.bin deleted file mode 100644 index 87ffc3190482dedc44fa1560ec874e5a5ed830e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 817 zcmZY7*K<{M7=__yAAiT}kQ0f8pfSNM8fl7MvBVuL*dSs@R0wvlcdXfnN)&q+1!L?5 z#1^|A6nn!i*kbRx^$#$@ctK_|@6DQTU99iWIDr*XB_< zkCLXKXl1Pxd0j^otJE)1rC3sJl|+Bl{nS{M)vRs}1E^ISDh*^!m7yxE6{`+)S<~9; zV+{r=t|N)9Yq07D>#@E@8yLb+!wd`c3^zi37$j^c2^$%iHK!Zf#HKc5b6eQbR%~sQ zZEVYSw%23_%U*3ZdKqCyJK5PTjIpcT>>k_0o=G~^I9lvwyuI1SzV@>}2RP6K2QksX z4sj@xOe#&*%H+}%hdG=h9O)=WXGwaDV@-8j!SPOTqVyzAc8XJ-mN;E{hBKWtD@&(2 zTY8Qm<5OefadAt0F6TMl1=>WJ=`J**rcFH2MJ{$pdzQ}BF1^%c?XBr7mutAfm0aa& z*SNOeI@h~FdSj;TCO5mq?1I_hR<}u8lF}UMT(|2;+>xXer2(Z*?sS*C-IFQa>pq>~ zejf0khsp7M0!8O3Kkr%QO=3tm)ap_jaD zQNg0{idRKlRiVpk8ejisOm}2t=?!ms%e1%iy5)K$qu=pv&vKJ`(?_|iJ9^Jz@B4rc zedJ@G@Tt!%v9z2IEk~dG!k2vIYu&!#Ti^NK5B%sSKl_DW{pNRnnEGcvsvP~*TA6nY U{JSR~-g`HX`Yiw3yKj#E1Iq&6_5c6? diff --git a/src/data/m2-title-background-pal-copyright.bin b/src/data/m2-title-background-pal-copyright.bin deleted file mode 100644 index 6b8fc8ccc974a1bf16ccb8196e70cbab4b40f7c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 wcmZRUVU|hLSfTUMfZNj7w$E{c=SN@TpwOskaW|5FW?APm3~|5=^dCM507C%{?EnA( diff --git a/src/data/m2-title-background-pal-glow.bin b/src/data/m2-title-background-pal-glow.bin deleted file mode 100644 index d74496d..0000000 --- a/src/data/m2-title-background-pal-glow.bin +++ /dev/null @@ -1,18 +0,0 @@ -E E ‡ E ‡ É$E ‡ É$ -%E ‡ É$ -%L)E ‡ É$ -%L)Ž-E ‡ É$ -%L)Ž-Ð-E ‡ É$ -%L)Ž-Ð-22E ‡ É$ -%L)Ž-Ð-22t2E ‡ É$ -%L)Ž-Ð-22t2¶6E ‡ É$ -%L)Ž-Ð-22t2¶6ø:E ‡ É$ -%L)Ž-Ð-22t2¶6ø:9;E ‡ É$ -%L)Ž-Ð-22t2¶6ø:9;{?E ‡ É$ -%L)Ž-Ð-22t2¶6ø:9;{?½?E ‡ É$ -%L)Ž-Ð-22t2¶6ø:9;{?½?ÿCE ‡ É$ -%L)Ž-Ð-22t2¶6ø:9;{?½?E ‡ É$ -%L)Ž-Ð-22t2¶6ø:9;{?E ‡ É$ -%L)Ž-Ð-22t2¶6ø:9;E ‡ É$ -%L)Ž-Ð-22t2¶6ø:9;E ‡ É$ -%L)Ž-Ð-22t2¶6ø:9; \ No newline at end of file diff --git a/src/data/m2-title-background.bin b/src/data/m2-title-background.bin deleted file mode 100644 index a0304cad56d4852b4c6f71dc6b5ee8cc88c92a05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6667 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 diff --git a/src/data/m2-title-text-pal-animated.bin b/src/data/m2-title-text-pal-animated.bin deleted file mode 100644 index 977316bdee00cc65f6673e4179107c3616bde7c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmZQzAO!9+|F8cZ7aCaZTJAc-ai--i)7^%5H1BBsQ~WRcUy_00KC^M`_c)Lm-0~rz zp@9%J*!6?tLFPl$V44q;2iXr%gK9srJji_zH3;{i%Y)nxQ3G*5HhGx;2!{`T6`=6L O4MFyYgyM#T+y?;iDxm!U diff --git a/src/data/m2-title-text-pal-static.bin b/src/data/m2-title-text-pal-static.bin deleted file mode 100644 index b0a55159bb044f9b333fbd32ccbfc07efd01c7b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 NcmZQz_+O6?0svm#7GnSa diff --git a/src/m2-hack.asm b/src/m2-hack.asm index 5937b22..fc952b4 100644 --- a/src/m2-hack.asm +++ b/src/m2-hack.asm @@ -1499,60 +1499,6 @@ nop //Choose character table based on alphabet loaded in .org 0x80C7578 :: bl c7578_load_letters -//============================================================================== -// Title screen hacks -//============================================================================== - -// m2_title_background_pal_copyright: File has two palettes separates by six palettes -// worth of nullspace. First palette is the copyright palette, -// last palette is a placeholder for the glow palette -// m2_title_background_pal_glow: 20 frames, glow effect -// m2_title_text_pal_animated: 14 frames, white horizontal line scrolling top to bottom -// m2_title_text_pal_static: 1 frame, white text on black background - -// BG0 will be used for the B, the glow, and copyright info -// OAM will be used for the other letters - -// Background palette RAM layout: -// [0]: copyright -// [1-6]: (blank) -// [7]: glow -// [8]: B -// [9-15]: (blank) - -// Frame states (BG0), from EarthBound: -// Start Duration State -// -------------------------- -// 0 g Black -// g 1 1/32 grey B -// g+1 2 2/32 grey B -// g+3 2 3/32 grey B -// g+5 2 4/32 grey B -// g+7 2 5/32 grey B -// g+9 2 6/32 grey B -// g+11 2 7/32 grey B -// g+13 2 8/32 grey B -// g+15 2 9/32 grey B -// g+17 2 10/32 grey B -// g+19 2 11/32 grey B -// g+21 2 12/32 grey B -// g+23 2 13/32 grey B -// g+25 2 14/32 grey B -// g+27 2 15/32 grey B -// g+29 1 16/32 grey B -// g+30 2 17/32 grey B - -// Animation 3 (full title screen) -.org 0x82D6B64 :: dh 0x008A // Enable 8-bit BG0 -.org 0x80119C6 :: mov r0,0x88 // Disable BG1 - -// Animation 5 (quick title screen) -.org 0x82D6BD4 :: dh 0x008A // Enable 8-bit BG0 -.org 0x82D6BE0 :: dh 0x1100 // Disable BG1 - -.org 0x870F580 :: .incbin "data/m2-title-background.bin" -.org 0x87128EC :: .incbin "data/m2-title-background-map.bin" - //============================================================================== // Move stuff around in order to make space for the code //============================================================================== @@ -1669,17 +1615,6 @@ flyovertextLater: m2_coord_table_file: .incbin "data/m2-coord-table-file-select.bin" -m2_title_background_pal_copyright: -.incbin "data/m2-title-background-pal-copyright.bin" - -m2_title_background_pal_glow: -.incbin "data/m2-title-background-pal-glow.bin" - -m2_title_text_pal_animated: -.incbin "data/m2-title-text-pal-animated.bin" - -m2_title_text_pal_static: -.incbin "data/m2-title-text-pal-static.bin" //============================================================================== // Existing subroutines/data @@ -1743,7 +1678,7 @@ m2_title_text_pal_static: .definelabel m2_curhpwindow_down ,0x80D41D8 .definelabel m2_sub_d6844 ,0x80D6844 .definelabel m2_setupbattlename ,0x80DCD00 -.definelabel m2_stat_symb_checker ,0x8B0EDA4 +.definelabel m2_stat_symb_checker ,0x8B0EDA4 .definelabel m2_div ,0x80F49D8 .definelabel m2_remainder ,0x80F4A70 .definelabel m2_items ,0x8B1D62C