summaryrefslogtreecommitdiff
path: root/src/libultra_boot_O2
diff options
context:
space:
mode:
authorfig02 <fig02srl@gmail.com>2020-09-29 20:18:46 -0400
committerGitHub <noreply@github.com>2020-09-29 20:18:46 -0400
commit82968a7381dc9e851487175174ea19750f060beb (patch)
tree6e60b15191080441f89f80ff5b2417fce6f94925 /src/libultra_boot_O2
parenta506801cd73d0aa6a071d61ab95f0c427e458000 (diff)
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396)
* fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
Diffstat (limited to 'src/libultra_boot_O2')
-rw-r--r--src/libultra_boot_O2/osViModeFpalLan1.c18
-rw-r--r--src/libultra_boot_O2/osViModeMpalLan1.c18
-rw-r--r--src/libultra_boot_O2/osViModeNtscLan1.c18
3 files changed, 27 insertions, 27 deletions
diff --git a/src/libultra_boot_O2/osViModeFpalLan1.c b/src/libultra_boot_O2/osViModeFpalLan1.c
index d7f97d8f0..357b5837a 100644
--- a/src/libultra_boot_O2/osViModeFpalLan1.c
+++ b/src/libultra_boot_O2/osViModeFpalLan1.c
@@ -4,15 +4,15 @@ OSViMode osViModeFpalLan1 = {
0x2C, // type
{
// comRegs
- 0x311E, // ctrl
- SCREEN_WIDTH, // width
- 0x4541E3A, // burst
- 0x271, // vSync
- 0x170C69, // hSync
- 0xC6F0C6D, // leap
- 0x800300, // hStart
- 0x200, // xScale
- 0 // vCurrent
+ 0x311E, // ctrl
+ SCREEN_WIDTH, // width
+ 0x4541E3A, // burst
+ 0x271, // vSync
+ 0x170C69, // hSync
+ 0xC6F0C6D, // leap
+ 0x800300, // hStart
+ 0x200, // xScale
+ 0 // vCurrent
},
{ // fldRegs
{
diff --git a/src/libultra_boot_O2/osViModeMpalLan1.c b/src/libultra_boot_O2/osViModeMpalLan1.c
index 09b482c1c..5e75ea39a 100644
--- a/src/libultra_boot_O2/osViModeMpalLan1.c
+++ b/src/libultra_boot_O2/osViModeMpalLan1.c
@@ -4,15 +4,15 @@ OSViMode osViModeMpalLan1 = {
0x1E, // type
{
// comRegs
- 0x311E, // ctrl
- SCREEN_WIDTH, // width
- 0x4651E39, // burst
- 0x20D, // vSync
- 0x40C11, // hSync
- 0xC190C1A, // leap
- 0x6C02EC, // hStart
- 0x200, // xScale
- 0, // vCurrent
+ 0x311E, // ctrl
+ SCREEN_WIDTH, // width
+ 0x4651E39, // burst
+ 0x20D, // vSync
+ 0x40C11, // hSync
+ 0xC190C1A, // leap
+ 0x6C02EC, // hStart
+ 0x200, // xScale
+ 0, // vCurrent
},
{ // fldRegs
{
diff --git a/src/libultra_boot_O2/osViModeNtscLan1.c b/src/libultra_boot_O2/osViModeNtscLan1.c
index f0ed3c6cd..267c5eaf0 100644
--- a/src/libultra_boot_O2/osViModeNtscLan1.c
+++ b/src/libultra_boot_O2/osViModeNtscLan1.c
@@ -4,15 +4,15 @@ OSViMode osViModeNtscLan1 = {
2, // type
{
// comRegs
- 0x311E, // ctrl
- SCREEN_WIDTH, // width
- 0x3E52239, // burst
- 0x20D, // vSync
- 0xC15, // hSync
- 0xC150C15, // leap
- 0x6C02EC, // hStart
- 0x200, // xScale
- 0, // vCurrent
+ 0x311E, // ctrl
+ SCREEN_WIDTH, // width
+ 0x3E52239, // burst
+ 0x20D, // vSync
+ 0xC15, // hSync
+ 0xC150C15, // leap
+ 0x6C02EC, // hStart
+ 0x200, // xScale
+ 0, // vCurrent
},
{ // fldRegs
{