diff options
| author | Treeki <treeki@gmail.com> | 2012-10-01 05:42:48 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-10-01 05:42:48 +0200 |
| commit | b8b7c83fc30e8436de4138809d5691187c74887e (patch) | |
| tree | 5bc9e0c2beb592e87a5f3304414214d1cbcf4a8e | |
| parent | 5c846f6c4e8600b84d7c2971e4d467cda2d7d521 (diff) | |
| download | kamek-b8b7c83fc30e8436de4138809d5691187c74887e.tar.gz kamek-b8b7c83fc30e8436de4138809d5691187c74887e.zip | |
textwriter font is now preserved
| -rw-r--r-- | bugfixes.yaml | 5 | ||||
| -rw-r--r-- | kamek_pal.x | 1 | ||||
| -rw-r--r-- | src/randomcrap.S | 20 |
3 files changed, 22 insertions, 4 deletions
diff --git a/bugfixes.yaml b/bugfixes.yaml index 3af6148..2d7721b 100644 --- a/bugfixes.yaml +++ b/bugfixes.yaml @@ -155,8 +155,5 @@ hooks: target_func: 'ReturnNone'
- - {name: AlwaysDrawPictureFontWhite1, type: patch, addr_pal: 0x800E596C, data: '3800FFFF'}
- - {name: AlwaysDrawPictureFontWhite2, type: patch, addr_pal: 0x800E5974, data: '3800FFFF'}
- - {name: AlwaysDrawPictureFontWhite3, type: patch, addr_pal: 0x800E597C, data: '3800FFFF'}
- - {name: AlwaysDrawPictureFontWhite4, type: patch, addr_pal: 0x800E5984, data: '3800FFFF'}
+ - {name: AlwaysDrawPictureFontWhite, type: branch_insn, branch_type: b, src_addr_pal: 0x800E596C, target_func: 'TextWriterCrap'}
diff --git a/kamek_pal.x b/kamek_pal.x index 9dbc49a..fa1273b 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -1,6 +1,7 @@ SECTIONS { /* Scrolling is annoying, clown car goes here! */ + TextWriterCrapContinue = 0x800E598C; StockWMInit_LoadEffects__FPv = 0x80926B10; CleanUpEffectThings__Fv = 0x80093520; diff --git a/src/randomcrap.S b/src/randomcrap.S index 36bbde7..ea2b301 100644 --- a/src/randomcrap.S +++ b/src/randomcrap.S @@ -1,4 +1,24 @@ .text +.global TextWriterCrap +.extern TextWriterCrapContinue +TextWriterCrap: + lis r6, 0xFFFF + ori r6, r6, 0xFF00 + lwz r0, 8(r5) + or r0, r0, r6 + stw r0, 0x18(r1) + lwz r0, 0xC(r5) + or r0, r0, r6 + stw r0, 0x1C(r1) + lwz r0, 0x10(r5) + or r0, r0, r6 + stw r0, 0x20(r1) + lwz r0, 0x14(r5) + or r0, r0, r6 + stw r0, 0x24(r1) + + b TextWriterCrapContinue + .global HeapChangeAttempt HeapChangeAttempt: lis 4, 0x8037 |