From 4ea0ce4f32b3255c2e91ccf36b8b36db80a03f87 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Wed, 20 Sep 2023 09:26:50 -0700 Subject: [PATCH] Small Cleanup (#100) * libultra bss cleanup * badges --- README.md | 8 +++++++- linker_scripts/jp/symbol_addrs_libultra.txt | 2 +- yamls/jp/boot.yaml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3516667e..a5e62f5a 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 2ba674ad..0c9b58e8 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 9ee2f6e3..48412b05 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 }