summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2023-09-20 09:26:50 -0700
committerGitHub <noreply@github.com>2023-09-20 09:26:50 -0700
commit4ea0ce4f32b3255c2e91ccf36b8b36db80a03f87 (patch)
treef3f801a403e4b4a8fae31e266335379f57f27766
parent09f54432c9dcd7521ecec72db917b38fdb404abf (diff)
Small Cleanup (#100)
* libultra bss cleanup * badges
-rw-r--r--README.md8
-rw-r--r--linker_scripts/jp/symbol_addrs_libultra.txt2
-rw-r--r--yamls/jp/boot.yaml2
3 files changed, 9 insertions, 3 deletions
diff --git a/README.md b/README.md
index 3516667..a5e62f5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,13 @@
-# Animal Forest ![Code jp Progress]
+# Animal Forest [![Build Status][jenkins-badge]][jenkins] ![Code jp Progress] [![Discord Channel][discord-badge]][discord]
+
+[jenkins]: https://jenkins.deco.mp/job/AF/job/main
+[jenkins-badge]: https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins.deco.mp%2Fjob%2FAF%2Fjob%2Fmain
[Code jp Progress]: https://img.shields.io/endpoint?label=Code%20jp&url=https%3A%2F%2Fprogress.deco.mp%2Fdata%2Fanimalforest%2Fjp%2Fcode%2F%3Fmode%3Dshield%26measure%3Dall
+[discord]: https://discord.zelda64.dev
+[discord-badge]: https://img.shields.io/discord/688807550715560050?color=%237289DA&logo=discord&logoColor=%23FFFFFF
+
This is a work-in-progress decompilation project for the Nintendo 64 game *Animal Forest*, also known as どうぶつの森 (*Doubutsu no Mori*).
There is a decompilation project for the GameCube versions (*Animal Crossing*, etc.) [here](https://github.com/Prakxo/ac-decomp/).
diff --git a/linker_scripts/jp/symbol_addrs_libultra.txt b/linker_scripts/jp/symbol_addrs_libultra.txt
index 2ba674a..0c9b58e 100644
--- a/linker_scripts/jp/symbol_addrs_libultra.txt
+++ b/linker_scripts/jp/symbol_addrs_libultra.txt
@@ -430,7 +430,7 @@ __CartRomHandle = 0x800433A0; // size:0x74 (cartrominit, true)
viThread = 0x80043420; // size:0x1B0 (vimgr, false)
-viThreadStack = 0x800345D0
+viThreadStack = 0x800435D0; //
viEventQueue = 0x800445D0; //
viEventBuf = 0x800445E8; //
viRetraceMsg = 0x80044600; //
diff --git a/yamls/jp/boot.yaml b/yamls/jp/boot.yaml
index 9ee2f6e..48412b0 100644
--- a/yamls/jp/boot.yaml
+++ b/yamls/jp/boot.yaml
@@ -315,7 +315,7 @@
- { start: 0x019D40, type: .bss, vram: 0x80041AE0, name: ../lib/ultralib/src/io/siacs }
- { start: 0x019D40, type: .bss, vram: 0x80041B00, name: ../lib/ultralib/src/os/initialize }
- { start: 0x019D40, type: .bss, vram: 0x80041B10, name: ../lib/ultralib/src/debug/kdebugserver }
- - { start: 0x019D40, type: .bss, vram: 0x80041B10, name: ../lib/ultralib/src/flash/flashinit }
+ - { start: 0x019D40, type: .bss, vram: 0x80041CC0, name: ../lib/ultralib/src/flash/flashinit }
- { start: 0x019D40, type: .bss, vram: 0x80041D80, name: ../lib/ultralib/src/io/motor }
- { start: 0x019D40, type: .bss, vram: 0x80041E80, name: ../lib/ultralib/src/io/pimgr }
- { start: 0x019D40, type: .bss, vram: 0x80043140, name: ../lib/ultralib/src/io/piacs }