From e51f50f0ff9d79cd4c19fb6519183fd00445719c Mon Sep 17 00:00:00 2001 From: petrie911 <69443847+petrie911@users.noreply.github.com> Date: Mon, 20 Sep 2021 11:51:35 -0500 Subject: Decompile z_kankyo (#956) * working * start color switch * progress * progress * progress on bgm func * progress * game over matched (except the rodata meme) * start update * progress * lightning docs done * progress * progress * progress * progress * progress * can compile at least * suns state, progress on kankyo_update * some new names * progress * progress * progress * new functions * cleanup * more matches * another match * now functional * format * better match * hugely improved update * cleanup/review * remove old changes * review2 * review3 * missed one * review4 * change asm filenames * update doorwarp1 * review5 * Kankyo_ -> Environment_ * format * merge master and format functions.h Co-authored-by: Jacob Young Co-authored-by: fig Co-authored-by: petrie911 --- data/z_kankyo.bss.s | 61 --------------------------- data/z_kankyo.data.s | 117 --------------------------------------------------- 2 files changed, 178 deletions(-) delete mode 100644 data/z_kankyo.bss.s delete mode 100644 data/z_kankyo.data.s (limited to 'data') diff --git a/data/z_kankyo.bss.s b/data/z_kankyo.bss.s deleted file mode 100644 index 37c15ab9b..000000000 --- a/data/z_kankyo.bss.s +++ /dev/null @@ -1,61 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .bss - -.balign 16 - -glabel D_8015FCF0 - .space 0x8 - -glabel D_8015FCF8 - .space 0xC - -glabel D_8015FD04 - .space 0x2 - -glabel D_8015FD06 - .space 0x2 - -glabel D_8015FD08 - .space 0x4 - -glabel D_8015FD0C - .space 0x4 - -glabel D_8015FD10 - .space 0x60 - -glabel D_8015FD70 - .space 0xC - -glabel D_8015FD7C - .space 0x2 - -glabel D_8015FD7E - .space 0x2 - -glabel D_8015FD80 - .space 0x4 - -glabel D_8015FD84 - .space 0x4 - -glabel D_8015FD88 - .space 0x10 - -glabel D_8015FD98 - .space 0x8 - -glabel D_8015FDA0 - .space 0xE - -glabel D_8015FDAE - .space 0x2 - -glabel D_8015FDB0 - .space 0x10 diff --git a/data/z_kankyo.data.s b/data/z_kankyo.data.s deleted file mode 100644 index 27a94266e..000000000 --- a/data/z_kankyo.data.s +++ /dev/null @@ -1,117 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_8011FAF0 - .incbin "baserom.z64", 0xB96C90, 0x40 - -glabel D_8011FB30 - .incbin "baserom.z64", 0xB96CD0, 0x4 - -glabel D_8011FB34 - .incbin "baserom.z64", 0xB96CD4, 0x4 - -glabel D_8011FB38 - .incbin "baserom.z64", 0xB96CD8, 0x4 - -glabel D_8011FB3C - .incbin "baserom.z64", 0xB96CDC, 0x4 - -glabel D_8011FB40 - .incbin "baserom.z64", 0xB96CE0, 0x4 - -glabel D_8011FB44 - .incbin "baserom.z64", 0xB96CE4, 0x4 - -glabel D_8011FB48 - .incbin "baserom.z64", 0xB96CE8, 0xD4 - -glabel D_8011FC1C - .incbin "baserom.z64", 0xB96DBC, 0x120 - -glabel D_8011FD3C - .word _vr_fine0_staticSegmentRomStart - .word _vr_fine0_staticSegmentRomEnd - .word _vr_fine0_pal_staticSegmentRomStart - .word _vr_fine0_pal_staticSegmentRomEnd - .word _vr_fine1_staticSegmentRomStart - .word _vr_fine1_staticSegmentRomEnd - .word _vr_fine1_pal_staticSegmentRomStart - .word _vr_fine1_pal_staticSegmentRomEnd - .word _vr_fine2_staticSegmentRomStart - .word _vr_fine2_staticSegmentRomEnd - .word _vr_fine2_pal_staticSegmentRomStart - .word _vr_fine2_pal_staticSegmentRomEnd - .word _vr_fine3_staticSegmentRomStart - .word _vr_fine3_staticSegmentRomEnd - .word _vr_fine3_pal_staticSegmentRomStart - .word _vr_fine3_pal_staticSegmentRomEnd - .word _vr_cloud0_staticSegmentRomStart - .word _vr_cloud0_staticSegmentRomEnd - .word _vr_cloud0_pal_staticSegmentRomStart - .word _vr_cloud0_pal_staticSegmentRomEnd - .word _vr_cloud1_staticSegmentRomStart - .word _vr_cloud1_staticSegmentRomEnd - .word _vr_cloud1_pal_staticSegmentRomStart - .word _vr_cloud1_pal_staticSegmentRomEnd - .word _vr_cloud2_staticSegmentRomStart - .word _vr_cloud2_staticSegmentRomEnd - .word _vr_cloud2_pal_staticSegmentRomStart - .word _vr_cloud2_pal_staticSegmentRomEnd - .word _vr_cloud3_staticSegmentRomStart - .word _vr_cloud3_staticSegmentRomEnd - .word _vr_cloud3_pal_staticSegmentRomStart - .word _vr_cloud3_pal_staticSegmentRomEnd - .word _vr_holy0_staticSegmentRomStart - .word _vr_holy0_staticSegmentRomEnd - .word _vr_holy0_pal_staticSegmentRomStart - .word _vr_holy0_pal_staticSegmentRomEnd - -glabel D_8011FDCC - .incbin "baserom.z64", 0xB96F6C, 0x4 - -glabel D_8011FDD0 - .incbin "baserom.z64", 0xB96F70, 0x4 - -glabel D_8011FDD4 - .incbin "baserom.z64", 0xB96F74, 0x4 - -glabel D_8011FDD8 - .incbin "baserom.z64", 0xB96F78, 0x28 - -glabel D_8011FE00 - .incbin "baserom.z64", 0xB96FA0, 0x20 - -glabel D_8011FE20 - .incbin "baserom.z64", 0xB96FC0, 0x28 - -glabel D_8011FE48 - .incbin "baserom.z64", 0xB96FE8, 0x28 - -glabel D_8011FE70 - .incbin "baserom.z64", 0xB97010, 0xC - -glabel D_8011FE7C - .incbin "baserom.z64", 0xB9701C, 0xC - -glabel D_8011FE88 - .incbin "baserom.z64", 0xB97028, 0xC - -glabel D_8011FE94 - .incbin "baserom.z64", 0xB97034, 0xC - -glabel D_8011FEA0 - .incbin "baserom.z64", 0xB97040, 0x24 - -glabel D_8011FEC4 - .incbin "baserom.z64", 0xB97064, 0xC - -glabel D_8011FED0 - .incbin "baserom.z64", 0xB97070, 0x10 -- cgit v1.2.3