mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-12 19:04:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '87a6e75242' into doc_pause_menu

Browse source
This commit is contained in:
Dragorn421 2024-08-01 21:23:12 +02:00
commit 2b24b8a07a
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
60 changed files with 4352 additions and 15732 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Jenkinsfile vendored
View file

@ -24,13 +24,13 @@ pipeline {
sh 'python3 tools/check_format.py --verbose --compare-to origin/main' sh 'python3 tools/check_format.py --verbose --compare-to origin/main'
} }
} }
stage('Setup') { stage('Setup gc-eu-mq-dbg') {
steps { steps {
sh 'cp /usr/local/etc/roms/baserom_oot.z64 baseroms/gc-eu-mq-dbg/baserom.z64' sh 'cp /usr/local/etc/roms/oot-gc-eu-mq-dbg.z64 baseroms/gc-eu-mq-dbg/baserom.z64'
sh 'make -j setup' sh 'make -j setup'
} }
} }
stage('Build (qemu-irix)') { stage('Build gc-eu-mq-dbg (qemu-irix)') {
when { when {
branch 'main' branch 'main'
} }
@ -38,7 +38,7 @@ pipeline {
sh 'make -j ORIG_COMPILER=1' sh 'make -j ORIG_COMPILER=1'
} }
} }
stage('Build') { stage('Build gc-eu-mq-dbg') {
when { when {
not { not {
branch 'main' branch 'main'
@ -48,6 +48,30 @@ pipeline {
sh 'make -j RUN_CC_CHECK=0' sh 'make -j RUN_CC_CHECK=0'
} }
} }
stage('Setup gc-eu-mq') {
steps {
sh 'cp /usr/local/etc/roms/oot-gc-eu-mq.z64 baseroms/gc-eu-mq/baserom.z64'
sh 'make -j setup VERSION=gc-eu-mq'
}
}
stage('Build gc-eu-mq (qemu-irix)') {
when {
branch 'main'
}
steps {
sh 'make -j VERSION=gc-eu-mq ORIG_COMPILER=1'
}
}
stage('Build gc-eu-mq') {
when {
not {
branch 'main'
}
}
steps {
sh 'make -j VERSION=gc-eu-mq RUN_CC_CHECK=0'
}
}
stage('Report Progress') { stage('Report Progress') {
when { when {
branch 'main' branch 'main'

14
Makefile
View file

@ -14,10 +14,11 @@ NON_MATCHING := 0
ORIG_COMPILER := 0 ORIG_COMPILER := 0
# If COMPILER is "gcc", compile with GCC instead of IDO. # If COMPILER is "gcc", compile with GCC instead of IDO.
COMPILER := ido COMPILER := ido
# Target game version. Currently only the following version is supported: # Target game version. Currently the following versions are supported:
# gc-eu-mq GameCube Europe/PAL Master Quest
# gc-eu-mq-dbg GameCube Europe/PAL Master Quest Debug (default) # gc-eu-mq-dbg GameCube Europe/PAL Master Quest Debug (default)
# The following versions are work-in-progress and not yet matching: # The following versions are work-in-progress and not yet matching:
# gc-eu-mq GameCube Europe/PAL Master Quest # gc-eu GameCube Europe/PAL
VERSION := gc-eu-mq-dbg VERSION := gc-eu-mq-dbg
# Number of threads to extract and compress with # Number of threads to extract and compress with
N_THREADS := $(shell nproc) N_THREADS := $(shell nproc)
@ -51,10 +52,17 @@ ifeq ($(NON_MATCHING),1)
endif endif
# Version-specific settings # Version-specific settings
ifeq ($(VERSION),gc-eu-mq) ifeq ($(VERSION),gc-eu)
DEBUG := 0 DEBUG := 0
COMPARE := 0
else ifeq ($(VERSION),gc-eu-mq)
DEBUG := 0
CFLAGS += -DOOT_MQ
CPPFLAGS += -DOOT_MQ
else ifeq ($(VERSION),gc-eu-mq-dbg) else ifeq ($(VERSION),gc-eu-mq-dbg)
DEBUG := 1 DEBUG := 1
CFLAGS += -DOOT_MQ
CPPFLAGS += -DOOT_MQ
else else
$(error Unsupported version $(VERSION)) $(error Unsupported version $(VERSION))
endif endif

2
README.md
View file

@ -55,7 +55,7 @@ For Windows 10 or 11, install WSL and a distribution by following this
[WSL Installation Guide](https://docs.microsoft.com/en-us/windows/wsl/install). [WSL Installation Guide](https://docs.microsoft.com/en-us/windows/wsl/install).
We recommend using Ubuntu 20.04 as the Linux distribution. We recommend using Ubuntu 20.04 as the Linux distribution.
For older versions of Windows, install a Linux VM or refer to either [Cygwin](docs/BUILDING_CYGWIN.md) or [Docker](docs/BUILDING_DOCKER.md) instructions. For older versions of Windows, install a Linux VM or refer to [Docker](docs/BUILDING_DOCKER.md) instructions.
### Linux (Native or under WSL / VM) ### Linux (Native or under WSL / VM)

0
assets/xml/scenes/overworld/souko.xml → assets/xml/scenes/indoors/souko.xml
View file

0
assets/xml/scenes/overworld/entra.xml → assets/xml/scenes/misc/entra.xml
View file

0
assets/xml/scenes/dungeons/ganon_tou.xml → assets/xml/scenes/overworld/ganon_tou.xml
View file

1
baseroms/gc-eu/checksum-compressed.md5 Normal file
View file

@ -0,0 +1 @@
2c27b4e000e85fd78dbca551f1b1c965 build/gc-eu/oot-gc-eu-compressed.z64

1
baseroms/gc-eu/checksum.md5 Normal file
View file

@ -0,0 +1 @@
05d6c0a3528d6de7472e5a98520d9f46 build/gc-eu/oot-gc-eu.z64

1510
baseroms/gc-eu/dmadata_names.txt Normal file
View file

File diff suppressed because it is too large Load diff

1
baseroms/gc-eu/dmadata_start.txt Normal file
View file

@ -0,0 +1 @@
0x07170

79
docs/BUILDING_CYGWIN.md
View file

@ -1,79 +0,0 @@
# Building with Cygwin
If you want to use Cygwin, you will need to:
## 1. Install Cygwin (and required packages)
* Download and install [Cygwin](https://cygwin.com).
Run the installer and follow the steps to install a cygwin terminal.
After the "choose a download site" step, a window will pop up which will allow you to select packages.
Unlike a normal linux distribution, you must install packages from this interface within the setup program.
To install a package you can change View from "Pending" to "Full".
Then you can enter a package name to search. After finding the package you want, change the "Skip" drop down
to the version you want to install.
Use this interface to select the latest version for all of the following packages:
* make
* gcc-g++
* bison
* flex
* texinfo
* git
* libiconv
* dos2unix
* python3
* libpng-devel
* binutils (Make sure to check the "Src?" checkbox since we're interested in the source code)
## 2. Build mips-linux-binutils on Windows using Cygwin
For the following instructions, wherever you see `binutils-[...]`, the [...] represents the version number.
You can use tab auto-complete to fill this in.
Create destination dir for binutils
```bash
mkdir -p /opt/cross
```
Extract binutils source
```bash
cd /usr/src/binutils-[...].src/
tar -xf binutils-[...].tar.xz
```
Create and enter build dir
```bash
mkdir build-binutils
cd build-binutils
```
Configure the build
```bash
../binutils-[...]/configure --target=mips-linux-gnu --prefix=/opt/cross --disable-gprof --disable-nls --disable-werror --disable-gdb --disable-libdecnumber --disable-readline --disable-sim
```
Make and install binutils
```bash
make -j
make install -j
```
Add the new binutils binaries to your system PATH:
- Go to your home directory `cd`
- Open windows explorer in your current location `explorer.exe .`
- Open the `.bashrc` file in a text editor
- Scroll to the bottom and add `PATH=$PATH:/opt/cross/bin` to a new line and save the file
- Run `source .bashrc` or close and reopen cygwin
## 3. Continue with Linux instructions
You should be able to continue from step [step 2](../README.md#2-clone-the-repository) of the Linux instructions.
**N.B.** Before building anything, you will need to run the following commands to fix line endings:
```bash
dos2unix fixle.sh
./fixle.sh
```

2
include/z64actor.h
View file

@ -276,7 +276,7 @@ typedef struct Actor {
/* 0x07D */ u8 floorBgId; // Bg ID of the floor polygon directly below the actor /* 0x07D */ u8 floorBgId; // Bg ID of the floor polygon directly below the actor
/* 0x07E */ s16 wallYaw; // Y rotation of the wall polygon the actor is touching /* 0x07E */ s16 wallYaw; // Y rotation of the wall polygon the actor is touching
/* 0x080 */ f32 floorHeight; // Y position of the floor polygon directly below the actor /* 0x080 */ f32 floorHeight; // Y position of the floor polygon directly below the actor
/* 0x084 */ f32 yDistToWater; // Distance to the surface of active waterbox. Negative value means above water /* 0x084 */ f32 depthInWater; // Distance below the surface of active waterbox. Positive value means under water, negative value means above water
/* 0x088 */ u16 bgCheckFlags; // Flags indicating how the actor is interacting with collision /* 0x088 */ u16 bgCheckFlags; // Flags indicating how the actor is interacting with collision
/* 0x08A */ s16 yawTowardsPlayer; // Y rotation difference between the actor and the player /* 0x08A */ s16 yawTowardsPlayer; // Y rotation difference between the actor and the player
/* 0x08C */ f32 xyzDistToPlayerSq; // Squared distance between the actor and the player /* 0x08C */ f32 xyzDistToPlayerSq; // Squared distance between the actor and the player

20
include/z64player.h
View file

@ -596,6 +596,14 @@ typedef enum {
/* 4 */ PLAYER_LEDGE_CLIMB_4 /* 4 */ PLAYER_LEDGE_CLIMB_4
} PlayerLedgeClimbType; } PlayerLedgeClimbType;
typedef enum {
/* -1 */ PLAYER_STICK_DIR_NONE = -1,
/* 0 */ PLAYER_STICK_DIR_FORWARD,
/* 1 */ PLAYER_STICK_DIR_LEFT,
/* 2 */ PLAYER_STICK_DIR_BACKWARD,
/* 3 */ PLAYER_STICK_DIR_RIGHT
} PlayerStickDirection;
typedef struct { typedef struct {
/* 0x00 */ f32 ceilingCheckHeight; /* 0x00 */ f32 ceilingCheckHeight;
/* 0x04 */ f32 unk_04; /* 0x04 */ f32 unk_04;
@ -717,7 +725,7 @@ typedef struct {
typedef void (*PlayerActionFunc)(struct Player*, struct PlayState*); typedef void (*PlayerActionFunc)(struct Player*, struct PlayState*);
typedef s32 (*UpperActionFunc)(struct Player*, struct PlayState*); typedef s32 (*UpperActionFunc)(struct Player*, struct PlayState*);
typedef void (*PlayerFuncA74)(struct PlayState*, struct Player*); typedef void (*AfterPutAwayFunc)(struct PlayState*, struct Player*);
typedef struct Player { typedef struct Player {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
@ -824,7 +832,7 @@ typedef struct Player {
/* 0x070C */ Vec3s upperJointTable[PLAYER_LIMB_BUF_COUNT]; /* 0x070C */ Vec3s upperJointTable[PLAYER_LIMB_BUF_COUNT];
/* 0x079C */ Vec3s upperMorphTable[PLAYER_LIMB_BUF_COUNT]; /* 0x079C */ Vec3s upperMorphTable[PLAYER_LIMB_BUF_COUNT];
/* 0x082C */ UpperActionFunc upperActionFunc; /* 0x082C */ UpperActionFunc upperActionFunc;
/* 0x0830 */ f32 upperAnimBlendWeight; /* 0x0830 */ f32 upperAnimInterpWeight;
/* 0x0834 */ s16 unk_834; /* 0x0834 */ s16 unk_834;
/* 0x0836 */ s8 unk_836; /* 0x0836 */ s8 unk_836;
/* 0x0837 */ u8 unk_837; /* 0x0837 */ u8 unk_837;
@ -836,9 +844,9 @@ typedef struct Player {
/* 0x0843 */ s8 meleeWeaponState; /* 0x0843 */ s8 meleeWeaponState;
/* 0x0844 */ s8 unk_844; /* 0x0844 */ s8 unk_844;
/* 0x0845 */ u8 unk_845; /* 0x0845 */ u8 unk_845;
/* 0x0846 */ u8 unk_846; /* 0x0846 */ u8 controlStickDataIndex; // cycles between 0 - 3. Used to index `controlStickSpinAngles` and `controlStickDirections`
/* 0x0847 */ s8 unk_847[4]; /* 0x0847 */ s8 controlStickSpinAngles[4]; // Stores a modified version of the control stick angle for the last 4 frames. Used for checking spins.
/* 0x084B */ s8 unk_84B[4]; /* 0x084B */ s8 controlStickDirections[4]; // Stores the control stick direction (relative to shape yaw) for the last 4 frames. See `PlayerStickDirection`.
/* 0x084F */ union { /* 0x084F */ union {
s8 actionVar1; s8 actionVar1;
@ -892,7 +900,7 @@ typedef struct Player {
/* 0x0A60 */ u8 bodyIsBurning; /* 0x0A60 */ u8 bodyIsBurning;
/* 0x0A61 */ u8 bodyFlameTimers[PLAYER_BODYPART_MAX]; // one flame per body part /* 0x0A61 */ u8 bodyFlameTimers[PLAYER_BODYPART_MAX]; // one flame per body part
/* 0x0A73 */ u8 unk_A73; /* 0x0A73 */ u8 unk_A73;
/* 0x0A74 */ PlayerFuncA74 func_A74; /* 0x0A74 */ AfterPutAwayFunc afterPutAwayFunc; // See `Player_SetupWaitForPutAway` and `Player_Action_WaitForPutAway`
/* 0x0A78 */ s8 invincibilityTimer; // prevents damage when nonzero (positive = visible, counts towards zero each frame) /* 0x0A78 */ s8 invincibilityTimer; // prevents damage when nonzero (positive = visible, counts towards zero each frame)
/* 0x0A79 */ u8 floorTypeTimer; // counts up every frame the current floor type is the same as the last frame /* 0x0A79 */ u8 floorTypeTimer; // counts up every frame the current floor type is the same as the last frame
/* 0x0A7A */ u8 floorProperty; /* 0x0A7A */ u8 floorProperty;

28
spec
View file

@ -66,7 +66,7 @@ beginseg
#endif #endif
include "$(BUILD_DIR)/src/libultra/os/unmaptlball.o" include "$(BUILD_DIR)/src/libultra/os/unmaptlball.o"
include "$(BUILD_DIR)/src/libultra/io/epidma.o" include "$(BUILD_DIR)/src/libultra/io/epidma.o"
#if OOT_DEBUG #if OOT_DEBUG || COMPILER_GCC
include "$(BUILD_DIR)/src/libultra/libc/string.o" include "$(BUILD_DIR)/src/libultra/libc/string.o"
#endif #endif
include "$(BUILD_DIR)/src/libultra/os/invalicache.o" include "$(BUILD_DIR)/src/libultra/os/invalicache.o"
@ -532,6 +532,8 @@ beginseg
include "$(BUILD_DIR)/src/libultra/gu/lookathil.o" include "$(BUILD_DIR)/src/libultra/gu/lookathil.o"
#if !OOT_DEBUG #if !OOT_DEBUG
include "$(BUILD_DIR)/src/libultra/libc/xprintf.o" include "$(BUILD_DIR)/src/libultra/libc/xprintf.o"
#endif
#if !OOT_DEBUG && !COMPILER_GCC
include "$(BUILD_DIR)/src/libultra/libc/string.o" include "$(BUILD_DIR)/src/libultra/libc/string.o"
#endif #endif
include "$(BUILD_DIR)/src/libultra/io/sp.o" include "$(BUILD_DIR)/src/libultra/io/sp.o"
@ -655,7 +657,11 @@ beginseg
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.o" include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.o"
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.o" include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.o"
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.o" include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.o"
#if !OOT_MQ
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.o" include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.o"
#else
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data_mq.o"
#endif
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc.o" include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc.o"
endseg endseg
@ -669,7 +675,11 @@ endseg
beginseg beginseg
name "ovl_map_mark_data" name "ovl_map_mark_data"
compress compress
#if !OOT_MQ
include "$(BUILD_DIR)/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.o" include "$(BUILD_DIR)/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.o"
#else
include "$(BUILD_DIR)/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.o"
#endif
include "$(BUILD_DIR)/src/overlays/misc/ovl_map_mark_data/ovl_map_mark_data_reloc.o" include "$(BUILD_DIR)/src/overlays/misc/ovl_map_mark_data/ovl_map_mark_data_reloc.o"
endseg endseg
@ -10491,7 +10501,7 @@ beginseg
name "entra_scene" name "entra_scene"
compress compress
romalign 0x1000 romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/entra/entra_scene.o" include "$(BUILD_DIR)/assets/scenes/misc/entra/entra_scene.o"
number 2 number 2
endseg endseg
@ -10499,7 +10509,7 @@ beginseg
name "entra_room_0" name "entra_room_0"
compress compress
romalign 0x1000 romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/entra/entra_room_0.o" include "$(BUILD_DIR)/assets/scenes/misc/entra/entra_room_0.o"
number 3 number 3
endseg endseg
@ -10579,7 +10589,7 @@ beginseg
name "ganon_tou_scene" name "ganon_tou_scene"
compress compress
romalign 0x1000 romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.o" include "$(BUILD_DIR)/assets/scenes/overworld/ganon_tou/ganon_tou_scene.o"
number 2 number 2
endseg endseg
@ -10587,7 +10597,7 @@ beginseg
name "ganon_tou_room_0" name "ganon_tou_room_0"
compress compress
romalign 0x1000 romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.o" include "$(BUILD_DIR)/assets/scenes/overworld/ganon_tou/ganon_tou_room_0.o"
number 3 number 3
endseg endseg
@ -11643,7 +11653,7 @@ beginseg
name "souko_scene" name "souko_scene"
compress compress
romalign 0x1000 romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_scene.o" include "$(BUILD_DIR)/assets/scenes/indoors/souko/souko_scene.o"
number 2 number 2
endseg endseg
@ -11651,7 +11661,7 @@ beginseg
name "souko_room_0" name "souko_room_0"
compress compress
romalign 0x1000 romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_room_0.o" include "$(BUILD_DIR)/assets/scenes/indoors/souko/souko_room_0.o"
number 3 number 3
endseg endseg
@ -11659,7 +11669,7 @@ beginseg
name "souko_room_1" name "souko_room_1"
compress compress
romalign 0x1000 romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_room_1.o" include "$(BUILD_DIR)/assets/scenes/indoors/souko/souko_room_1.o"
number 3 number 3
endseg endseg
@ -11667,7 +11677,7 @@ beginseg
name "souko_room_2" name "souko_room_2"
compress compress
romalign 0x1000 romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_room_2.o" include "$(BUILD_DIR)/assets/scenes/indoors/souko/souko_room_2.o"
number 3 number 3
endseg endseg

4
src/boot/build.c
View file

@ -3,7 +3,9 @@ const char gBuildTeam[] = "zelda@srd022j";
// TODO: Use per-version preprocessor defines // TODO: Use per-version preprocessor defines
#if OOT_DEBUG // gc-eu-mq-dbg #if OOT_DEBUG // gc-eu-mq-dbg
const char gBuildDate[] = "03-02-21 00:16:31"; const char gBuildDate[] = "03-02-21 00:16:31";
#else // gc-eu-mq #elif !OOT_MQ // gc-eu
const char gBuildDate[] = "03-02-21 20:12:23";
#else // gc-eu-mq
const char gBuildDate[] = "03-02-21 20:37:19"; const char gBuildDate[] = "03-02-21 20:37:19";
#endif #endif

2
src/code/sys_math3d.c
View file

@ -3,7 +3,7 @@
// For retail BSS ordering, the block number of cbf in Math3D_CylVsCylOverlapCenterDist // For retail BSS ordering, the block number of cbf in Math3D_CylVsCylOverlapCenterDist
// must be 0. // must be 0.
#pragma increment_block_number 190 #pragma increment_block_number 187
s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB,
Vec3f* lineAClosestToB, Vec3f* lineBClosestToA); Vec3f* lineAClosestToB, Vec3f* lineBClosestToA);

11
src/code/z_actor.c
View file

@ -433,7 +433,8 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Pl
unkActor = NULL; unkActor = NULL;
if ((player->unk_664 != NULL) && (player->unk_84B[player->unk_846] == 2)) { if ((player->unk_664 != NULL) &&
(player->controlStickDirections[player->controlStickDataIndex] == PLAYER_STICK_DIR_BACKWARD)) {
targetCtx->unk_94 = NULL; targetCtx->unk_94 = NULL;
} else { } else {
func_80032AF0(play, &play->actorCtx, &unkActor, player); func_80032AF0(play, &play->actorCtx, &unkActor, player);
@ -1357,8 +1358,8 @@ void Actor_UpdateBgCheckInfo(PlayState* play, Actor* actor, f32 wallCheckHeight,
waterBoxYSurface = actor->world.pos.y; waterBoxYSurface = actor->world.pos.y;
if (WaterBox_GetSurface1(play, &play->colCtx, actor->world.pos.x, actor->world.pos.z, &waterBoxYSurface, if (WaterBox_GetSurface1(play, &play->colCtx, actor->world.pos.x, actor->world.pos.z, &waterBoxYSurface,
&waterBox)) { &waterBox)) {
actor->yDistToWater = waterBoxYSurface - actor->world.pos.y; actor->depthInWater = waterBoxYSurface - actor->world.pos.y;
if (actor->yDistToWater < 0.0f) { if (actor->depthInWater < 0.0f) {
actor->bgCheckFlags &= ~(BGCHECKFLAG_WATER | BGCHECKFLAG_WATER_TOUCH); actor->bgCheckFlags &= ~(BGCHECKFLAG_WATER | BGCHECKFLAG_WATER_TOUCH);
} else { } else {
if (!(actor->bgCheckFlags & BGCHECKFLAG_WATER)) { if (!(actor->bgCheckFlags & BGCHECKFLAG_WATER)) {
@ -1378,7 +1379,7 @@ void Actor_UpdateBgCheckInfo(PlayState* play, Actor* actor, f32 wallCheckHeight,
} }
} else { } else {
actor->bgCheckFlags &= ~(BGCHECKFLAG_WATER | BGCHECKFLAG_WATER_TOUCH); actor->bgCheckFlags &= ~(BGCHECKFLAG_WATER | BGCHECKFLAG_WATER_TOUCH);
actor->yDistToWater = BGCHECK_Y_MIN; actor->depthInWater = BGCHECK_Y_MIN;
} }
} }
} }
@ -1834,7 +1835,7 @@ void func_8002F850(PlayState* play, Actor* actor) {
s32 surfaceSfxOffset; s32 surfaceSfxOffset;
if (actor->bgCheckFlags & BGCHECKFLAG_WATER) { if (actor->bgCheckFlags & BGCHECKFLAG_WATER) {
if (actor->yDistToWater < 20.0f) { if (actor->depthInWater < 20.0f) {
surfaceSfxOffset = SURFACE_SFX_OFFSET_WATER_SHALLOW; surfaceSfxOffset = SURFACE_SFX_OFFSET_WATER_SHALLOW;
} else { } else {
surfaceSfxOffset = SURFACE_SFX_OFFSET_WATER_DEEP; surfaceSfxOffset = SURFACE_SFX_OFFSET_WATER_DEEP;

3
src/code/z_demo.c
View file

@ -3,6 +3,8 @@
#include "z64camera.h" #include "z64camera.h"
#include "assets/scenes/indoors/tokinoma/tokinoma_scene.h" #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h"
#include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h"
#include "assets/scenes/overworld/spot00/spot00_scene.h" #include "assets/scenes/overworld/spot00/spot00_scene.h"
#include "assets/scenes/overworld/spot01/spot01_scene.h" #include "assets/scenes/overworld/spot01/spot01_scene.h"
#include "assets/scenes/overworld/spot02/spot02_scene.h" #include "assets/scenes/overworld/spot02/spot02_scene.h"
@ -24,7 +26,6 @@
#include "assets/scenes/dungeons/ddan/ddan_scene.h" #include "assets/scenes/dungeons/ddan/ddan_scene.h"
#include "assets/scenes/dungeons/ydan/ydan_scene.h" #include "assets/scenes/dungeons/ydan/ydan_scene.h"
#include "assets/scenes/dungeons/ganontika/ganontika_scene.h" #include "assets/scenes/dungeons/ganontika/ganontika_scene.h"
#include "assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h"
#include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h" #include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h"
#include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h" #include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"

17
src/code/z_scene_table.c
View file

@ -1,6 +1,9 @@
#include "global.h" #include "global.h"
#include "quake.h" #include "quake.h"
#include "assets/scenes/indoors/miharigoya/miharigoya_scene.h"
#include "assets/scenes/indoors/souko/souko_scene.h"
#include "assets/scenes/overworld/spot00/spot00_scene.h" #include "assets/scenes/overworld/spot00/spot00_scene.h"
#include "assets/scenes/overworld/spot00/spot00_room_0.h" #include "assets/scenes/overworld/spot00/spot00_room_0.h"
#include "assets/scenes/overworld/spot01/spot01_scene.h" #include "assets/scenes/overworld/spot01/spot01_scene.h"
@ -10,17 +13,15 @@
#include "assets/scenes/overworld/spot16/spot16_room_0.h" #include "assets/scenes/overworld/spot16/spot16_room_0.h"
#include "assets/scenes/overworld/spot18/spot18_scene.h" #include "assets/scenes/overworld/spot18/spot18_scene.h"
#include "assets/scenes/overworld/spot20/spot20_scene.h" #include "assets/scenes/overworld/spot20/spot20_scene.h"
#include "assets/scenes/overworld/souko/souko_scene.h"
#include "assets/scenes/dungeons/men/men_scene.h"
#include "assets/scenes/dungeons/ddan/ddan_scene.h"
#include "assets/scenes/dungeons/ydan/ydan_scene.h"
#include "assets/scenes/dungeons/Bmori1/Bmori1_scene.h" #include "assets/scenes/dungeons/Bmori1/Bmori1_scene.h"
#include "assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h" #include "assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h"
#include "assets/scenes/dungeons/ddan/ddan_scene.h"
#include "assets/scenes/dungeons/gerudoway/gerudoway_scene.h" #include "assets/scenes/dungeons/gerudoway/gerudoway_scene.h"
#include "assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h"
#include "assets/scenes/indoors/miharigoya/miharigoya_scene.h"
#include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h" #include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"
#include "assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h"
#include "assets/scenes/dungeons/men/men_scene.h"
#include "assets/scenes/dungeons/ydan/ydan_scene.h"
#include "overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h" #include "overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h"
@ -418,7 +419,11 @@ void Scene_DrawConfigWaterTemple(PlayState* play) {
spAC = play->roomCtx.unk_74[1] & 0xFF; spAC = play->roomCtx.unk_74[1] & 0xFF;
gameplayFrames = play->gameplayFrames; gameplayFrames = play->gameplayFrames;
#if !OOT_MQ
gSPSegment(POLY_XLU_DISP++, 0x06, SEGMENTED_TO_VIRTUAL(D_8012A330[((void)0, gSaveContext.save.nightFlag)]));
#else
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A330[((void)0, gSaveContext.save.nightFlag)])); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A330[((void)0, gSaveContext.save.nightFlag)]));
#endif
if (spB0 == 1) { if (spB0 == 1) {
gSPSegment(POLY_OPA_DISP++, 0x08, gSPSegment(POLY_OPA_DISP++, 0x08,

2
src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
View file

@ -6,7 +6,7 @@
#include "z_bg_gjyo_bridge.h" #include "z_bg_gjyo_bridge.h"
#include "assets/objects/object_gjyo_objects/object_gjyo_objects.h" #include "assets/objects/object_gjyo_objects/object_gjyo_objects.h"
#include "assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h" #include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h"
#define FLAGS 0 #define FLAGS 0

2
src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c
View file

@ -345,7 +345,7 @@ void EnAttackNiw_Update(Actor* thisx, PlayState* play) {
s32 pad; s32 pad;
Math_Vec3f_Copy(&sp30, &this->actor.world.pos); Math_Vec3f_Copy(&sp30, &this->actor.world.pos);
sp30.y += this->actor.yDistToWater; sp30.y += this->actor.depthInWater;
EffectSsGSplash_Spawn(play, &sp30, NULL, NULL, 0, 0x190); EffectSsGSplash_Spawn(play, &sp30, NULL, NULL, 0, 0x190);
this->unk_2DC = 0.0f; this->unk_2DC = 0.0f;
this->actor.gravity = 0.0f; this->actor.gravity = 0.0f;

2
src/overlays/actors/ovl_En_Bom/z_en_bom.c
View file

@ -342,7 +342,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) {
} }
if ((thisx->scale.x >= 0.01f) && (thisx->params != BOMB_EXPLOSION)) { if ((thisx->scale.x >= 0.01f) && (thisx->params != BOMB_EXPLOSION)) {
if (thisx->yDistToWater >= 20.0f) { if (thisx->depthInWater >= 20.0f) {
EffectSsDeadSound_SpawnStationary(play, &thisx->projectedPos, NA_SE_IT_BOMB_UNEXPLOSION, true, EffectSsDeadSound_SpawnStationary(play, &thisx->projectedPos, NA_SE_IT_BOMB_UNEXPLOSION, true,
DEADSOUND_REPEAT_MODE_OFF, 10); DEADSOUND_REPEAT_MODE_OFF, 10);
Actor_Kill(thisx); Actor_Kill(thisx);

8
src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
View file

@ -114,7 +114,7 @@ void EnBomChu_Explode(EnBomChu* this, PlayState* play) {
this->timer = 1; this->timer = 1;
this->actor.speed = 0.0f; this->actor.speed = 0.0f;
if (this->actor.yDistToWater > 0.0f) { if (this->actor.depthInWater > 0.0f) {
for (i = 0; i < 40; i++) { for (i = 0; i < 40; i++) {
EffectSsBubble_Spawn(play, &this->actor.world.pos, 1.0f, 5.0f, 30.0f, 0.25f); EffectSsBubble_Spawn(play, &this->actor.world.pos, 1.0f, 5.0f, 30.0f, 0.25f);
} }
@ -452,9 +452,9 @@ void EnBomChu_Update(Actor* thisx, PlayState* play2) {
if (WaterBox_GetSurface1(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterY, if (WaterBox_GetSurface1(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterY,
&waterBox)) { &waterBox)) {
this->actor.yDistToWater = waterY - this->actor.world.pos.y; this->actor.depthInWater = waterY - this->actor.world.pos.y;
if (this->actor.yDistToWater < 0.0f) { if (this->actor.depthInWater < 0.0f) {
if (this->actor.bgCheckFlags & BGCHECKFLAG_WATER) { if (this->actor.bgCheckFlags & BGCHECKFLAG_WATER) {
EnBomChu_SpawnRipples(this, play, waterY); EnBomChu_SpawnRipples(this, play, waterY);
} }
@ -471,7 +471,7 @@ void EnBomChu_Update(Actor* thisx, PlayState* play2) {
} }
} else { } else {
this->actor.bgCheckFlags &= ~BGCHECKFLAG_WATER; this->actor.bgCheckFlags &= ~BGCHECKFLAG_WATER;
this->actor.yDistToWater = BGCHECK_Y_MIN; this->actor.depthInWater = BGCHECK_Y_MIN;
} }
} }
} }

2
src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
View file

@ -452,7 +452,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) {
} }
if ((thisx->scale.x >= 0.01f) && (thisx->params != BOMBFLOWER_EXPLOSION)) { if ((thisx->scale.x >= 0.01f) && (thisx->params != BOMBFLOWER_EXPLOSION)) {
if (thisx->yDistToWater >= 20.0f) { if (thisx->depthInWater >= 20.0f) {
EffectSsDeadSound_SpawnStationary(play, &thisx->projectedPos, NA_SE_IT_BOMB_UNEXPLOSION, true, EffectSsDeadSound_SpawnStationary(play, &thisx->projectedPos, NA_SE_IT_BOMB_UNEXPLOSION, true,
DEADSOUND_REPEAT_MODE_OFF, 10); DEADSOUND_REPEAT_MODE_OFF, 10);
Actor_Kill(thisx); Actor_Kill(thisx);

6
src/overlays/actors/ovl_En_Crow/z_en_crow.c
View file

@ -251,7 +251,7 @@ void EnCrow_FlyIdle(EnCrow* this, PlayState* play) {
Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_CRY); Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_CRY);
} }
if (this->actor.yDistToWater > -40.0f) { if (this->actor.depthInWater > -40.0f) {
this->aimRotX = -0x1000; this->aimRotX = -0x1000;
} else if (this->actor.world.pos.y < (this->actor.home.pos.y - 50.0f)) { } else if (this->actor.world.pos.y < (this->actor.home.pos.y - 50.0f)) {
this->aimRotX = -0x800 - (Rand_ZeroOne() * 0x800); this->aimRotX = -0x800 - (Rand_ZeroOne() * 0x800);
@ -277,7 +277,7 @@ void EnCrow_FlyIdle(EnCrow* this, PlayState* play) {
this->timer--; this->timer--;
} }
if ((this->timer == 0) && (this->actor.xzDistToPlayer < 300.0f) && !(player->stateFlags1 & PLAYER_STATE1_23) && if ((this->timer == 0) && (this->actor.xzDistToPlayer < 300.0f) && !(player->stateFlags1 & PLAYER_STATE1_23) &&
(this->actor.yDistToWater < -40.0f) && (Player_GetMask(play) != PLAYER_MASK_SKULL)) { (this->actor.depthInWater < -40.0f) && (Player_GetMask(play) != PLAYER_MASK_SKULL)) {
EnCrow_SetupDiveAttack(this); EnCrow_SetupDiveAttack(this);
} }
} }
@ -315,7 +315,7 @@ void EnCrow_DiveAttack(EnCrow* this, PlayState* play) {
if ((this->timer == 0) || (Player_GetMask(play) == PLAYER_MASK_SKULL) || (this->collider.base.atFlags & AT_HIT) || if ((this->timer == 0) || (Player_GetMask(play) == PLAYER_MASK_SKULL) || (this->collider.base.atFlags & AT_HIT) ||
(this->actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_WALL)) || (this->actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_WALL)) ||
(player->stateFlags1 & PLAYER_STATE1_23) || (this->actor.yDistToWater > -40.0f)) { (player->stateFlags1 & PLAYER_STATE1_23) || (this->actor.depthInWater > -40.0f)) {
if (this->collider.base.atFlags & AT_HIT) { if (this->collider.base.atFlags & AT_HIT) {
this->collider.base.atFlags &= ~AT_HIT; this->collider.base.atFlags &= ~AT_HIT;
Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_ATTACK); Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_ATTACK);

4
src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
View file

@ -272,8 +272,8 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, PlayState* play) {
if (floorY <= BGCHECK_Y_MIN) { if (floorY <= BGCHECK_Y_MIN) {
break; break;
} }
if ((player->actor.yDistToWater != BGCHECK_Y_MIN) && if ((player->actor.depthInWater != BGCHECK_Y_MIN) &&
(floorY < (player->actor.world.pos.y - player->actor.yDistToWater))) { (floorY < (player->actor.world.pos.y - player->actor.depthInWater))) {
break; break;
} }
spawnPos.y = floorY; spawnPos.y = floorY;

4
src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
View file

@ -249,9 +249,9 @@ void EnExRuppy_Sink(EnExRuppy* this, PlayState* play) {
Vec3f pos; Vec3f pos;
s32 pad; s32 pad;
if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && (this->actor.yDistToWater > 15.0f)) { if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && (this->actor.depthInWater > 15.0f)) {
pos = this->actor.world.pos; pos = this->actor.world.pos;
pos.y += this->actor.yDistToWater; pos.y += this->actor.depthInWater;
this->actor.velocity.y = -1.0f; this->actor.velocity.y = -1.0f;
this->actor.gravity = -0.2f; this->actor.gravity = -0.2f;
EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 800); EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 800);

6
src/overlays/actors/ovl_En_Insect/z_en_insect.c
View file

@ -477,7 +477,7 @@ void EnInsect_WalkOnWater(EnInsect* this, PlayState* play) {
Math_StepToF(&this->actor.speed, 0.0f, 0.02f); Math_StepToF(&this->actor.speed, 0.0f, 0.02f);
} }
this->actor.velocity.y = 0.0f; this->actor.velocity.y = 0.0f;
this->actor.world.pos.y += this->actor.yDistToWater; this->actor.world.pos.y += this->actor.depthInWater;
this->skelAnime.playSpeed = CLAMP(this->actionTimer * 0.018f, 0.1f, 1.9f); this->skelAnime.playSpeed = CLAMP(this->actionTimer * 0.018f, 0.1f, 1.9f);
SkelAnime_Update(&this->skelAnime); SkelAnime_Update(&this->skelAnime);
@ -500,7 +500,7 @@ void EnInsect_WalkOnWater(EnInsect* this, PlayState* play) {
if (Rand_ZeroOne() < 0.03f) { if (Rand_ZeroOne() < 0.03f) {
ripplePoint.x = this->actor.world.pos.x; ripplePoint.x = this->actor.world.pos.x;
ripplePoint.y = this->actor.world.pos.y + this->actor.yDistToWater; ripplePoint.y = this->actor.world.pos.y + this->actor.depthInWater;
ripplePoint.z = this->actor.world.pos.z; ripplePoint.z = this->actor.world.pos.z;
EffectSsGRipple_Spawn(play, &ripplePoint, 20, 100, 4); EffectSsGRipple_Spawn(play, &ripplePoint, 20, 100, 4);
EffectSsGRipple_Spawn(play, &ripplePoint, 40, 200, 8); EffectSsGRipple_Spawn(play, &ripplePoint, 40, 200, 8);
@ -537,7 +537,7 @@ void EnInsect_Drown(EnInsect* this, PlayState* play) {
this->actor.shape.rot.y += 200; this->actor.shape.rot.y += 200;
Actor_SetScale(&this->actor, CLAMP_MIN(this->actor.scale.x - 0.00005f, 0.001f)); Actor_SetScale(&this->actor, CLAMP_MIN(this->actor.scale.x - 0.00005f, 0.001f));
if (this->actor.yDistToWater > 5.0f && this->actor.yDistToWater < 30.0f && Rand_ZeroOne() < 0.3f) { if (this->actor.depthInWater > 5.0f && this->actor.depthInWater < 30.0f && Rand_ZeroOne() < 0.3f) {
EffectSsBubble_Spawn(play, &this->actor.world.pos, -5.0f, 5.0f, 5.0f, (Rand_ZeroOne() * 0.04f) + 0.02f); EffectSsBubble_Spawn(play, &this->actor.world.pos, -5.0f, 5.0f, 5.0f, (Rand_ZeroOne() * 0.04f) + 0.02f);
} }

2
src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
View file

@ -443,7 +443,7 @@ void EnIshi_Fly(EnIshi* this, PlayState* play) {
} }
if (this->actor.bgCheckFlags & BGCHECKFLAG_WATER_TOUCH) { if (this->actor.bgCheckFlags & BGCHECKFLAG_WATER_TOUCH) {
contactPos.x = this->actor.world.pos.x; contactPos.x = this->actor.world.pos.x;
contactPos.y = this->actor.world.pos.y + this->actor.yDistToWater; contactPos.y = this->actor.world.pos.y + this->actor.depthInWater;
contactPos.z = this->actor.world.pos.z; contactPos.z = this->actor.world.pos.z;
EffectSsGSplash_Spawn(play, &contactPos, NULL, NULL, 0, 350); EffectSsGSplash_Spawn(play, &contactPos, NULL, NULL, 0, 350);
if (type == ROCK_SMALL) { if (type == ROCK_SMALL) {

10
src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
View file

@ -440,7 +440,7 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) {
f32 tempX; f32 tempX;
f32 tempY; f32 tempY;
f32 tempZ; f32 tempZ;
f32 tempYDistToWater; f32 tempDepthInWater;
Actor_MoveXZGravity(&this->actor); Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 30.0f, 50.0f, Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 30.0f, 50.0f,
@ -450,7 +450,7 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) {
tempY = this->actor.world.pos.y; tempY = this->actor.world.pos.y;
tempZ = this->actor.world.pos.z; tempZ = this->actor.world.pos.z;
tempBgFlags = this->actor.bgCheckFlags; tempBgFlags = this->actor.bgCheckFlags;
tempYDistToWater = this->actor.yDistToWater; tempDepthInWater = this->actor.depthInWater;
this->actor.world.pos.z += ((this->actor.world.pos.y - this->actor.floorHeight) * -50.0f) / 100.0f; this->actor.world.pos.z += ((this->actor.world.pos.y - this->actor.floorHeight) * -50.0f) / 100.0f;
Actor_UpdateBgCheckInfo(play, &this->actor, 10.0f, 10.0f, 50.0f, UPDBGCHECKINFO_FLAG_2); Actor_UpdateBgCheckInfo(play, &this->actor, 10.0f, 10.0f, 50.0f, UPDBGCHECKINFO_FLAG_2);
@ -460,7 +460,7 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) {
this->actor.world.pos.y = tempY; this->actor.world.pos.y = tempY;
this->actor.world.pos.z = tempZ; this->actor.world.pos.z = tempZ;
this->actor.bgCheckFlags = tempBgFlags; this->actor.bgCheckFlags = tempBgFlags;
this->actor.yDistToWater = tempYDistToWater; this->actor.depthInWater = tempDepthInWater;
PRINTF(VT_RST); PRINTF(VT_RST);
@ -511,13 +511,13 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) {
this->actionState = ENKANBAN_WATER; this->actionState = ENKANBAN_WATER;
Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_DROP_WATER); Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_DROP_WATER);
this->bounceX = this->bounceZ = 0; this->bounceX = this->bounceZ = 0;
this->actor.world.pos.y += this->actor.yDistToWater; this->actor.world.pos.y += this->actor.depthInWater;
EffectSsGSplash_Spawn(play, &this->actor.world.pos, NULL, NULL, 0, (this->partCount * 20) + 300); EffectSsGSplash_Spawn(play, &this->actor.world.pos, NULL, NULL, 0, (this->partCount * 20) + 300);
EffectSsGRipple_Spawn(play, &this->actor.world.pos, 150, 650, 0); EffectSsGRipple_Spawn(play, &this->actor.world.pos, 150, 650, 0);
EffectSsGRipple_Spawn(play, &this->actor.world.pos, 300, 800, 5); EffectSsGRipple_Spawn(play, &this->actor.world.pos, 300, 800, 5);
this->actor.velocity.y = 0.0f; this->actor.velocity.y = 0.0f;
this->actor.gravity = 0.0f; this->actor.gravity = 0.0f;
PRINTF(" WAT Y = %f\n", this->actor.yDistToWater); PRINTF(" WAT Y = %f\n", this->actor.depthInWater);
PRINTF(" POS Y = %f\n", this->actor.world.pos.y); PRINTF(" POS Y = %f\n", this->actor.world.pos.y);
PRINTF(" GROUND Y = %f\n", this->actor.floorHeight); PRINTF(" GROUND Y = %f\n", this->actor.floorHeight);
break; break;

2
src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
View file

@ -394,7 +394,7 @@ void EnKusa_Fall(EnKusa* this, PlayState* play) {
if (this->actor.bgCheckFlags & BGCHECKFLAG_WATER_TOUCH) { if (this->actor.bgCheckFlags & BGCHECKFLAG_WATER_TOUCH) {
contactPos.x = this->actor.world.pos.x; contactPos.x = this->actor.world.pos.x;
contactPos.y = this->actor.world.pos.y + this->actor.yDistToWater; contactPos.y = this->actor.world.pos.y + this->actor.depthInWater;
contactPos.z = this->actor.world.pos.z; contactPos.z = this->actor.world.pos.z;
EffectSsGSplash_Spawn(play, &contactPos, NULL, NULL, 0, 400); EffectSsGSplash_Spawn(play, &contactPos, NULL, NULL, 0, 400);
EffectSsGRipple_Spawn(play, &contactPos, 150, 650, 0); EffectSsGRipple_Spawn(play, &contactPos, 150, 650, 0);

57
src/overlays/actors/ovl_En_Mag/z_en_mag.c
View file

@ -76,12 +76,20 @@ void EnMag_Init(Actor* thisx, PlayState* play) {
this->effectPrimLodFrac = 128.0f; this->effectPrimLodFrac = 128.0f;
this->effectAlpha = 255.0f; this->effectAlpha = 255.0f;
#if !OOT_MQ
this->effectPrimColor[0] = 255.0f;
this->effectPrimColor[1] = 255.0f;
this->effectPrimColor[2] = 170;
this->effectEnvColor[0] = 255.0f;
this->effectEnvColor[1] = 100;
#else
this->effectPrimColor[0] = 170; this->effectPrimColor[0] = 170;
this->effectPrimColor[1] = 255.0f; this->effectPrimColor[1] = 255.0f;
this->effectPrimColor[2] = 255.0f; this->effectPrimColor[2] = 255.0f;
this->effectEnvColor[0] = 200.0f; this->effectEnvColor[0] = 200.0f;
this->effectEnvColor[1] = 255.0f; this->effectEnvColor[1] = 255.0f;
this->effectEnvColor[2] = 0; this->effectEnvColor[2] = 0;
#endif
gSaveContext.forceRisingButtonAlphas = false; gSaveContext.forceRisingButtonAlphas = false;
this->globalState = MAG_STATE_DISPLAY; this->globalState = MAG_STATE_DISPLAY;
@ -121,12 +129,20 @@ void EnMag_Update(Actor* thisx, PlayState* play) {
this->effectPrimLodFrac = 128.0f; this->effectPrimLodFrac = 128.0f;
this->effectAlpha = 255.0f; this->effectAlpha = 255.0f;
#if !OOT_MQ
this->effectPrimColor[0] = 255.0f;
this->effectPrimColor[1] = 255.0f;
this->effectPrimColor[2] = 170;
this->effectEnvColor[0] = 255.0f;
this->effectEnvColor[1] = 100;
#else
this->effectPrimColor[0] = 170; this->effectPrimColor[0] = 170;
this->effectPrimColor[1] = 255.0f; this->effectPrimColor[1] = 255.0f;
this->effectPrimColor[2] = 255.0f; this->effectPrimColor[2] = 255.0f;
this->effectEnvColor[0] = 200.0f; this->effectEnvColor[0] = 200.0f;
this->effectEnvColor[1] = 255.0f; this->effectEnvColor[1] = 255.0f;
this->effectEnvColor[2] = 0; this->effectEnvColor[2] = 0;
#endif
this->globalState = MAG_STATE_DISPLAY; this->globalState = MAG_STATE_DISPLAY;
sDelayTimer = 20; sDelayTimer = 20;
@ -187,8 +203,13 @@ void EnMag_Update(Actor* thisx, PlayState* play) {
this->effectFadeInState = 1; this->effectFadeInState = 1;
} }
} else if (this->effectFadeInState == 1) { } else if (this->effectFadeInState == 1) {
#if !OOT_MQ
this->effectPrimColor[2] += -2.125f;
this->effectEnvColor[1] += -3.875f;
#else
this->effectPrimColor[0] += -2.125f; this->effectPrimColor[0] += -2.125f;
this->effectEnvColor[0] += -1.375f; this->effectEnvColor[0] += -1.375f;
#endif
this->effectPrimLodFrac += 2.4f; this->effectPrimLodFrac += 2.4f;
@ -197,8 +218,13 @@ void EnMag_Update(Actor* thisx, PlayState* play) {
if (this->effectFadeInTimer == 0) { if (this->effectFadeInTimer == 0) {
this->effectPrimLodFrac = 128.0f; this->effectPrimLodFrac = 128.0f;
#if !OOT_MQ
this->effectPrimColor[2] = 170.0f;
this->effectEnvColor[1] = 100.0f;
#else
this->effectPrimColor[0] = 170.0f; this->effectPrimColor[0] = 170.0f;
this->effectEnvColor[0] = 200.0f; this->effectEnvColor[0] = 200.0f;
#endif
this->effectFadeInTimer = 32; this->effectFadeInTimer = 32;
this->effectFadeInState = 2; this->effectFadeInState = 2;
@ -371,6 +397,13 @@ void EnMag_DrawCharTexture(Gfx** gfxP, u8* texture, s32 rectLeft, s32 rectTop) {
*gfxP = gfx; *gfxP = gfx;
} }
// Title logo is shifted to the left in Master Quest
#if !OOT_MQ
#define LOGO_X_SHIFT 0
#else
#define LOGO_X_SHIFT (-8)
#endif
void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) { void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) {
static s16 textAlpha = 0; static s16 textAlpha = 0;
static s16 textFadeDirection = 0; static s16 textFadeDirection = 0;
@ -413,7 +446,7 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) {
if ((s16)this->effectPrimLodFrac != 0) { if ((s16)this->effectPrimLodFrac != 0) {
for (k = 0, i = 0, rectTop = 0; i < 3; i++, rectTop += 64) { for (k = 0, i = 0, rectTop = 0; i < 3; i++, rectTop += 64) {
for (j = 0, rectLeft = 56; j < 3; j++, k++, rectLeft += 64) { for (j = 0, rectLeft = 64 + LOGO_X_SHIFT; j < 3; j++, k++, rectLeft += 64) {
EnMag_DrawEffectTextures(&gfx, effectMaskTextures[k], gTitleFlameEffectTex, 64, 64, 32, 32, rectLeft, EnMag_DrawEffectTextures(&gfx, effectMaskTextures[k], gTitleFlameEffectTex, 64, 64, 32, 32, rectLeft,
rectTop, 64, 64, 1024, 1024, 1, 1, k, this); rectTop, 64, 64, 1024, 1024, 1, 1, k, this);
} }
@ -423,7 +456,7 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) {
gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->mainAlpha); gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->mainAlpha);
if ((s16)this->mainAlpha != 0) { if ((s16)this->mainAlpha != 0) {
EnMag_DrawImageRGBA32(&gfx, 152, 100, (u8*)gTitleZeldaShieldLogoMQTex, 160, 160); EnMag_DrawImageRGBA32(&gfx, 160 + LOGO_X_SHIFT, 100, (u8*)gTitleZeldaShieldLogoMQTex, 160, 160);
} }
Gfx_SetupDL_39Ptr(&gfx); Gfx_SetupDL_39Ptr(&gfx);
@ -440,23 +473,35 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) {
} }
gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, (s16)this->mainAlpha); gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, (s16)this->mainAlpha);
#if !OOT_MQ
gDPSetEnvColor(gfx++, 100, 0, 100, 255);
#else
gDPSetEnvColor(gfx++, 0, 0, 100, 255); gDPSetEnvColor(gfx++, 0, 0, 100, 255);
#endif
if ((s16)this->mainAlpha != 0) { if ((s16)this->mainAlpha != 0) {
EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 146, 73, 72, 8, 1024, 1024); EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 154 + LOGO_X_SHIFT, 73, 72, 8, 1024, 1024);
EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 144, 127, 96, 8, 1024, 1024); EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 152 + LOGO_X_SHIFT, 127, 96, 8, 1024, 1024);
gDPPipeSync(gfx++); gDPPipeSync(gfx++);
#if !OOT_MQ
gDPSetPrimColor(gfx++, 0, 0, 200, 200, 150, (s16)this->mainAlpha);
gDPSetEnvColor(gfx++, 100, 100, 50, 255);
#else
gDPSetPrimColor(gfx++, 0, 0, 100, 150, 255, (s16)this->mainAlpha); gDPSetPrimColor(gfx++, 0, 0, 100, 150, 255, (s16)this->mainAlpha);
gDPSetEnvColor(gfx++, 20, 80, 160, 255); gDPSetEnvColor(gfx++, 20, 80, 160, 255);
#endif
EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 145, 72, 72, 8, 1024, 1024); EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 153 + LOGO_X_SHIFT, 72, 72, 8, 1024, 1024);
EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 143, 126, 96, 8, 1024, 1024); EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 151 + LOGO_X_SHIFT, 126, 96, 8, 1024, 1024);
#if OOT_MQ
gDPPipeSync(gfx++); gDPPipeSync(gfx++);
gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->subAlpha); gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->subAlpha);
EnMag_DrawImageRGBA32(&gfx, 174, 145, (u8*)gTitleMasterQuestSubtitleTex, 128, 32); EnMag_DrawImageRGBA32(&gfx, 174, 145, (u8*)gTitleMasterQuestSubtitleTex, 128, 32);
#endif
} }
Gfx_SetupDL_39Ptr(&gfx); Gfx_SetupDL_39Ptr(&gfx);

2
src/overlays/actors/ovl_En_Mk/z_en_mk.c
View file

@ -314,7 +314,7 @@ void EnMk_Update(Actor* thisx, PlayState* play) {
if (player->currentBoots == PLAYER_BOOTS_IRON) { if (player->currentBoots == PLAYER_BOOTS_IRON) {
this->flags |= 8; this->flags |= 8;
} else if (player->stateFlags2 & PLAYER_STATE2_10) { } else if (player->stateFlags2 & PLAYER_STATE2_10) {
swimFlag = player->actor.yDistToWater; swimFlag = player->actor.depthInWater;
if (swimFlag > 0) { if (swimFlag > 0) {
if (swimFlag >= 320) { if (swimFlag >= 320) {

8
src/overlays/actors/ovl_En_Niw/z_en_niw.c
View file

@ -723,13 +723,13 @@ void func_80AB6F04(EnNiw* this, PlayState* play) {
if (this->actor.bgCheckFlags & BGCHECKFLAG_WATER) { if (this->actor.bgCheckFlags & BGCHECKFLAG_WATER) {
this->actor.gravity = 0.0f; this->actor.gravity = 0.0f;
if (this->actor.yDistToWater > 15.0f) { if (this->actor.depthInWater > 15.0f) {
this->actor.world.pos.y += 2.0f; this->actor.world.pos.y += 2.0f;
} }
if (this->timer4 == 0) { if (this->timer4 == 0) {
this->timer4 = 30; this->timer4 = 30;
Math_Vec3f_Copy(&pos, &this->actor.world.pos); Math_Vec3f_Copy(&pos, &this->actor.world.pos);
pos.y += this->actor.yDistToWater; pos.y += this->actor.depthInWater;
EffectSsGRipple_Spawn(play, &pos, 100, 500, 30); EffectSsGRipple_Spawn(play, &pos, 100, 500, 30);
} }
if (this->actor.bgCheckFlags & BGCHECKFLAG_WALL) { if (this->actor.bgCheckFlags & BGCHECKFLAG_WALL) {
@ -1014,12 +1014,12 @@ void EnNiw_Update(Actor* thisx, PlayState* play) {
return; return;
} }
if ((thisx->bgCheckFlags & BGCHECKFLAG_WATER) && thisx->yDistToWater > 15.0f && this->actionFunc != func_80AB6F04 && if ((thisx->bgCheckFlags & BGCHECKFLAG_WATER) && thisx->depthInWater > 15.0f && this->actionFunc != func_80AB6F04 &&
thisx->params != 0xD && thisx->params != 0xE && thisx->params != 0xA) { thisx->params != 0xD && thisx->params != 0xE && thisx->params != 0xA) {
thisx->velocity.y = 0.0f; thisx->velocity.y = 0.0f;
thisx->gravity = 0.0f; thisx->gravity = 0.0f;
Math_Vec3f_Copy(&pos, &thisx->world.pos); Math_Vec3f_Copy(&pos, &thisx->world.pos);
pos.y += thisx->yDistToWater; pos.y += thisx->depthInWater;
this->timer4 = 30; this->timer4 = 30;
EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 400); EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 400);
this->timer5 = 0; this->timer5 = 0;

16
src/overlays/actors/ovl_En_Ny/z_en_ny.c
View file

@ -152,7 +152,7 @@ void EnNy_Destroy(Actor* thisx, PlayState* play) {
void func_80ABCD40(EnNy* this) { void func_80ABCD40(EnNy* this) {
f32 temp; f32 temp;
temp = (this->actor.yDistToWater > 0.0f) ? 0.7f : 1.0f; temp = (this->actor.depthInWater > 0.0f) ? 0.7f : 1.0f;
this->unk_1E8 = 2.8f * temp; this->unk_1E8 = 2.8f * temp;
} }
@ -224,7 +224,7 @@ void EnNy_Move(EnNy* this, PlayState* play) {
f32 yawDiff; f32 yawDiff;
s32 stoneTimer; s32 stoneTimer;
if (!(this->unk_1F0 < this->actor.yDistToWater)) { if (!(this->unk_1F0 < this->actor.depthInWater)) {
func_8002F974(&this->actor, NA_SE_EN_NYU_MOVE - SFX_FLAG); func_8002F974(&this->actor, NA_SE_EN_NYU_MOVE - SFX_FLAG);
} }
func_80ABCD40(this); func_80ABCD40(this);
@ -238,7 +238,7 @@ void EnNy_Move(EnNy* this, PlayState* play) {
this->actor.world.rot.y = this->actor.shape.rot.y; this->actor.world.rot.y = this->actor.shape.rot.y;
yawDiff = Math_FAtan2F(this->actor.yDistToPlayer, this->actor.xzDistToPlayer); yawDiff = Math_FAtan2F(this->actor.yDistToPlayer, this->actor.xzDistToPlayer);
this->actor.speed = fabsf(cosf(yawDiff) * this->unk_1E8); this->actor.speed = fabsf(cosf(yawDiff) * this->unk_1E8);
if (this->unk_1F0 < this->actor.yDistToWater) { if (this->unk_1F0 < this->actor.depthInWater) {
this->unk_1EC = sinf(yawDiff) * this->unk_1E8; this->unk_1EC = sinf(yawDiff) * this->unk_1E8;
} }
} }
@ -252,7 +252,7 @@ void EnNy_TurnToStone(EnNy* this, PlayState* play) {
if (phi_f0 <= 0.25f) { if (phi_f0 <= 0.25f) {
phi_f0 = 0.25f; phi_f0 = 0.25f;
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) {
if (!(this->unk_1F0 < this->actor.yDistToWater)) { if (!(this->unk_1F0 < this->actor.depthInWater)) {
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_M_GND); Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_M_GND);
} }
this->actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND_TOUCH; this->actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND_TOUCH;
@ -346,9 +346,9 @@ s32 EnNy_CollisionCheck(EnNy* this, PlayState* play) {
void func_80ABD3B8(EnNy* this, f32 arg1, f32 arg2) { void func_80ABD3B8(EnNy* this, f32 arg1, f32 arg2) {
if (this->unk_1E8 == 0.0f) { if (this->unk_1E8 == 0.0f) {
this->actor.gravity = -0.4f; this->actor.gravity = -0.4f;
} else if (!(arg1 < this->actor.yDistToWater)) { } else if (!(arg1 < this->actor.depthInWater)) {
this->actor.gravity = -0.4f; this->actor.gravity = -0.4f;
} else if (arg2 < this->actor.yDistToWater) { } else if (arg2 < this->actor.depthInWater) {
this->actor.gravity = 0.0; this->actor.gravity = 0.0;
if (this->unk_1EC < this->actor.velocity.y) { if (this->unk_1EC < this->actor.velocity.y) {
this->actor.velocity.y -= 0.4f; this->actor.velocity.y -= 0.4f;
@ -418,7 +418,7 @@ void EnNy_SetupDie(EnNy* this, PlayState* play) {
Vec3f effectAccel = { 0.0f, 0.1f, 0.0f }; Vec3f effectAccel = { 0.0f, 0.1f, 0.0f };
if (this->timer >= 2) { if (this->timer >= 2) {
if (this->actor.yDistToWater > 0.0f) { if (this->actor.depthInWater > 0.0f) {
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
effectPos.x = Rand_CenteredFloat(30.0f) + this->actor.world.pos.x; effectPos.x = Rand_CenteredFloat(30.0f) + this->actor.world.pos.x;
effectPos.y = Rand_CenteredFloat(30.0f) + this->actor.world.pos.y; effectPos.y = Rand_CenteredFloat(30.0f) + this->actor.world.pos.y;
@ -453,7 +453,7 @@ void EnNy_SetupDie(EnNy* this, PlayState* play) {
void EnNy_Die(EnNy* this, PlayState* play) { void EnNy_Die(EnNy* this, PlayState* play) {
s32 i; s32 i;
if (this->actor.yDistToWater > 0.0f) { if (this->actor.depthInWater > 0.0f) {
for (i = 0; i < 8; i += 1) { for (i = 0; i < 8; i += 1) {
this->unk_1F8[i].x += this->unk_1F8[i + 8].x; this->unk_1F8[i].x += this->unk_1F8[i + 8].x;
this->unk_1F8[i].y += this->unk_1F8[i + 8].y; this->unk_1F8[i].y += this->unk_1F8[i + 8].y;

10
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -429,7 +429,7 @@ void EnRu1_SpawnRipple(EnRu1* this, PlayState* play, s16 radiusMax, s16 life) {
Actor* thisx = &this->actor; Actor* thisx = &this->actor;
pos.x = this->actor.world.pos.x; pos.x = this->actor.world.pos.x;
pos.y = this->actor.world.pos.y + this->actor.yDistToWater; pos.y = this->actor.world.pos.y + this->actor.depthInWater;
pos.z = this->actor.world.pos.z; pos.z = this->actor.world.pos.z;
EffectSsGRipple_Spawn(play, &pos, 100, radiusMax, life); EffectSsGRipple_Spawn(play, &pos, 100, radiusMax, life);
} }
@ -452,7 +452,7 @@ void EnRu1_SpawnSplash(EnRu1* this, PlayState* play) {
Vec3f pos; Vec3f pos;
pos.x = this->actor.world.pos.x; pos.x = this->actor.world.pos.x;
pos.y = this->actor.world.pos.y + this->actor.yDistToWater; pos.y = this->actor.world.pos.y + this->actor.depthInWater;
pos.z = this->actor.world.pos.z; pos.z = this->actor.world.pos.z;
EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 1, 0); EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 1, 0);
@ -1230,7 +1230,7 @@ s32 func_80AED624(EnRu1* this, PlayState* play) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
return false; return false;
} else if (((this->roomNum1 != curRoomNum) || (this->roomNum2 != curRoomNum)) && } else if (((this->roomNum1 != curRoomNum) || (this->roomNum2 != curRoomNum)) &&
(this->actor.yDistToWater > kREG(16) + 50.0f) && (this->action != 33)) { (this->actor.depthInWater > kREG(16) + 50.0f) && (this->action != 33)) {
this->action = 33; this->action = 33;
this->drawConfig = 2; this->drawConfig = 2;
this->alpha = 0xFF; this->alpha = 0xFF;
@ -1460,7 +1460,7 @@ void func_80AEE050(EnRu1* this) {
this->unk_350 = 1; this->unk_350 = 1;
func_80AEE02C(this); func_80AEE02C(this);
this->unk_35C = 0; this->unk_35C = 0;
this->unk_358 = (this->actor.yDistToWater - 10.0f) * 0.5f; this->unk_358 = (this->actor.depthInWater - 10.0f) * 0.5f;
this->unk_354 = this->actor.world.pos.y + thisx->unk_358; // thisx only used here this->unk_354 = this->actor.world.pos.y + thisx->unk_358; // thisx only used here
} else { } else {
this->actor.gravity = 0.0f; this->actor.gravity = 0.0f;
@ -1593,7 +1593,7 @@ void func_80AEE568(EnRu1* this, PlayState* play) {
return; return;
} }
if (this->actor.yDistToWater > 0.0f) { if (this->actor.depthInWater > 0.0f) {
this->action = 29; this->action = 29;
this->unk_350 = 0; this->unk_350 = 0;
} }

14
src/overlays/actors/ovl_En_Sb/z_en_sb.c
View file

@ -135,7 +135,7 @@ void EnSb_Destroy(Actor* thisx, PlayState* play) {
void EnSb_SpawnBubbles(PlayState* play, EnSb* this) { void EnSb_SpawnBubbles(PlayState* play, EnSb* this) {
s32 i; s32 i;
if (this->actor.yDistToWater > 0) { if (this->actor.depthInWater > 0) {
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
EffectSsBubble_Spawn(play, &this->actor.world.pos, 10.0f, 10.0f, 30.0f, 0.25f); EffectSsBubble_Spawn(play, &this->actor.world.pos, 10.0f, 10.0f, 30.0f, 0.25f);
} }
@ -166,7 +166,7 @@ void EnSb_SetupWaitOpen(EnSb* this) {
void EnSb_SetupLunge(EnSb* this) { void EnSb_SetupLunge(EnSb* this) {
f32 frameCount = Animation_GetLastFrame(&object_sb_Anim_000124); f32 frameCount = Animation_GetLastFrame(&object_sb_Anim_000124);
f32 playbackSpeed = this->actor.yDistToWater > 0.0f ? 1.0f : 0.0f; f32 playbackSpeed = this->actor.depthInWater > 0.0f ? 1.0f : 0.0f;
Animation_Change(&this->skelAnime, &object_sb_Anim_000124, playbackSpeed, 0.0f, frameCount, ANIMMODE_ONCE, 0); Animation_Change(&this->skelAnime, &object_sb_Anim_000124, playbackSpeed, 0.0f, frameCount, ANIMMODE_ONCE, 0);
this->behavior = SHELLBLADE_LUNGE; this->behavior = SHELLBLADE_LUNGE;
@ -189,7 +189,7 @@ void EnSb_SetupCooldown(EnSb* this, s32 changeSpeed) {
} }
this->behavior = SHELLBLADE_WAIT_CLOSED; this->behavior = SHELLBLADE_WAIT_CLOSED;
if (changeSpeed) { if (changeSpeed) {
if (this->actor.yDistToWater > 0.0f) { if (this->actor.depthInWater > 0.0f) {
this->actor.speed = -5.0f; this->actor.speed = -5.0f;
if (this->actor.velocity.y < 0.0f) { if (this->actor.velocity.y < 0.0f) {
this->actor.velocity.y = 2.1f; this->actor.velocity.y = 2.1f;
@ -254,7 +254,7 @@ void EnSb_TurnAround(EnSb* this, PlayState* play) {
if (this->actor.shape.rot.y == invertedYaw) { if (this->actor.shape.rot.y == invertedYaw) {
this->actor.world.rot.y = this->attackYaw; this->actor.world.rot.y = this->attackYaw;
if (this->actor.yDistToWater > 0.0f) { if (this->actor.depthInWater > 0.0f) {
this->actor.velocity.y = 3.0f; this->actor.velocity.y = 3.0f;
this->actor.speed = 5.0f; this->actor.speed = 5.0f;
this->actor.gravity = -0.35f; this->actor.gravity = -0.35f;
@ -274,7 +274,7 @@ void EnSb_TurnAround(EnSb* this, PlayState* play) {
void EnSb_Lunge(EnSb* this, PlayState* play) { void EnSb_Lunge(EnSb* this, PlayState* play) {
Math_StepToF(&this->actor.speed, 0.0f, 0.2f); Math_StepToF(&this->actor.speed, 0.0f, 0.2f);
if ((this->actor.velocity.y <= -0.1f) || (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH)) { if ((this->actor.velocity.y <= -0.1f) || (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH)) {
if (!(this->actor.yDistToWater > 0.0f)) { if (!(this->actor.depthInWater > 0.0f)) {
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_M_GND); Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_M_GND);
} }
this->actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND_TOUCH; this->actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND_TOUCH;
@ -295,7 +295,7 @@ void EnSb_Bounce(EnSb* this, PlayState* play) {
if (this->bouncesLeft != 0) { if (this->bouncesLeft != 0) {
this->bouncesLeft--; this->bouncesLeft--;
this->timer = 1; this->timer = 1;
if (this->actor.yDistToWater > 0.0f) { if (this->actor.depthInWater > 0.0f) {
this->actor.velocity.y = 3.0f; this->actor.velocity.y = 3.0f;
this->actor.speed = 5.0f; this->actor.speed = 5.0f;
this->actor.gravity = -0.35f; this->actor.gravity = -0.35f;
@ -445,7 +445,7 @@ void EnSb_Update(Actor* thisx, PlayState* play) {
s32 pad; s32 pad;
if (this->isDead) { if (this->isDead) {
if (this->actor.yDistToWater > 0.0f) { if (this->actor.depthInWater > 0.0f) {
this->actor.params = 4; this->actor.params = 4;
} else { } else {
this->actor.params = 1; this->actor.params = 1;

2
src/overlays/actors/ovl_En_Skb/z_en_skb.c
View file

@ -450,7 +450,7 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) {
if ((this->actionState != SKB_BEHAVIOR_DYING) && if ((this->actionState != SKB_BEHAVIOR_DYING) &&
(this->actor.bgCheckFlags & (BGCHECKFLAG_WATER | BGCHECKFLAG_WATER_TOUCH)) && (this->actor.bgCheckFlags & (BGCHECKFLAG_WATER | BGCHECKFLAG_WATER_TOUCH)) &&
(this->actor.yDistToWater >= 40.0f)) { (this->actor.depthInWater >= 40.0f)) {
this->actor.colChkInfo.health = 0; this->actor.colChkInfo.health = 0;
this->setColliderAT = false; this->setColliderAT = false;
EnSkb_SetupDeath(this, play); EnSkb_SetupDeath(this, play);

22
src/overlays/actors/ovl_En_Tite/z_en_tite.c
View file

@ -234,7 +234,7 @@ void EnTite_Idle(EnTite* this, PlayState* play) {
// Float on water surface // Float on water surface
this->actor.gravity = 0.0f; this->actor.gravity = 0.0f;
Math_SmoothStepToF(&this->actor.velocity.y, 0.0f, 1.0f, 2.0f, 0.0f); Math_SmoothStepToF(&this->actor.velocity.y, 0.0f, 1.0f, 2.0f, 0.0f);
Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.world.pos.y + this->actor.yDistToWater, 1.0f, 2.0f, Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.world.pos.y + this->actor.depthInWater, 1.0f, 2.0f,
0.0f); 0.0f);
} else { } else {
this->actor.gravity = -1.0f; this->actor.gravity = -1.0f;
@ -278,7 +278,7 @@ void EnTite_Attack(EnTite* this, PlayState* play) {
} }
Actor_PlaySfx(&this->actor, NA_SE_EN_STAL_JUMP); Actor_PlaySfx(&this->actor, NA_SE_EN_STAL_JUMP);
} else { } else {
this->actor.world.pos.y += this->actor.yDistToWater; this->actor.world.pos.y += this->actor.depthInWater;
Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_JUMP_WATER); Actor_PlaySfx(&this->actor, NA_SE_EN_TEKU_JUMP_WATER);
} }
this->actor.velocity.y = 8.0f; this->actor.velocity.y = 8.0f;
@ -304,7 +304,7 @@ void EnTite_Attack(EnTite* this, PlayState* play) {
if (this->actor.velocity.y < -8.0f) { if (this->actor.velocity.y < -8.0f) {
Vec3f ripplePos = this->actor.world.pos; Vec3f ripplePos = this->actor.world.pos;
ripplePos.y += this->actor.yDistToWater; ripplePos.y += this->actor.depthInWater;
this->vAttackState++; // TEKTITE_SUBMERGED this->vAttackState++; // TEKTITE_SUBMERGED
this->actor.velocity.y *= 0.75f; this->actor.velocity.y *= 0.75f;
attackState = this->vAttackState; attackState = this->vAttackState;
@ -330,7 +330,7 @@ void EnTite_Attack(EnTite* this, PlayState* play) {
break; break;
case TEKTITE_SUBMERGED: case TEKTITE_SUBMERGED:
// Check if floated to surface // Check if floated to surface
if (this->actor.yDistToWater == 0.0f) { if (this->actor.depthInWater == 0.0f) {
this->vAttackState = TEKTITE_LANDED; this->vAttackState = TEKTITE_LANDED;
attackState = this->vAttackState; attackState = this->vAttackState;
} }
@ -388,7 +388,7 @@ void EnTite_Attack(EnTite* this, PlayState* play) {
// Float up to water surface // Float up to water surface
Math_SmoothStepToF(&this->actor.velocity.y, 0.0f, 1.0f, 2.0f, 0.0f); Math_SmoothStepToF(&this->actor.velocity.y, 0.0f, 1.0f, 2.0f, 0.0f);
Math_SmoothStepToF(&this->actor.speed, 0.0f, 1.0f, 0.5f, 0.0f); Math_SmoothStepToF(&this->actor.speed, 0.0f, 1.0f, 0.5f, 0.0f);
Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.world.pos.y + this->actor.yDistToWater, 1.0f, 2.0f, Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.world.pos.y + this->actor.depthInWater, 1.0f, 2.0f,
0.0f); 0.0f);
break; break;
} }
@ -447,7 +447,7 @@ void EnTite_TurnTowardPlayer(EnTite* this, PlayState* play) {
} }
// Calculate turn velocity and animation speed based on angle to player // Calculate turn velocity and animation speed based on angle to player
if ((this->actor.params == TEKTITE_BLUE) && (this->actor.bgCheckFlags & BGCHECKFLAG_WATER)) { if ((this->actor.params == TEKTITE_BLUE) && (this->actor.bgCheckFlags & BGCHECKFLAG_WATER)) {
this->actor.world.pos.y += this->actor.yDistToWater; this->actor.world.pos.y += this->actor.depthInWater;
} }
angleToPlayer = Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor) - this->actor.world.rot.y; angleToPlayer = Actor_WorldYawTowardActor(&this->actor, &GET_PLAYER(play)->actor) - this->actor.world.rot.y;
if (angleToPlayer > 0) { if (angleToPlayer > 0) {
@ -546,7 +546,7 @@ void EnTite_MoveTowardPlayer(EnTite* this, PlayState* play) {
} else if (this->actor.bgCheckFlags & BGCHECKFLAG_WATER_TOUCH) { } else if (this->actor.bgCheckFlags & BGCHECKFLAG_WATER_TOUCH) {
Vec3f ripplePos = this->actor.world.pos; Vec3f ripplePos = this->actor.world.pos;
this->actor.bgCheckFlags &= ~BGCHECKFLAG_WATER_TOUCH; this->actor.bgCheckFlags &= ~BGCHECKFLAG_WATER_TOUCH;
ripplePos.y += this->actor.yDistToWater; ripplePos.y += this->actor.depthInWater;
this->actor.gravity = 0.0f; this->actor.gravity = 0.0f;
this->actor.velocity.y *= 0.75f; this->actor.velocity.y *= 0.75f;
EffectSsGRipple_Spawn(play, &ripplePos, 0, 500, 0); EffectSsGRipple_Spawn(play, &ripplePos, 0, 500, 0);
@ -554,9 +554,9 @@ void EnTite_MoveTowardPlayer(EnTite* this, PlayState* play) {
} else { } else {
// If submerged, float to surface // If submerged, float to surface
Math_SmoothStepToF(&this->actor.velocity.y, 0.0f, 1.0f, 2.0f, 0.0f); Math_SmoothStepToF(&this->actor.velocity.y, 0.0f, 1.0f, 2.0f, 0.0f);
Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.world.pos.y + this->actor.yDistToWater, 1.0f, 2.0f, Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.world.pos.y + this->actor.depthInWater, 1.0f, 2.0f,
0.0f); 0.0f);
if (this->actor.yDistToWater != 0.0f) { if (this->actor.depthInWater != 0.0f) {
// Do not change state until tekite has floated to surface // Do not change state until tekite has floated to surface
return; return;
} }
@ -633,7 +633,7 @@ void EnTite_Recoil(EnTite* this, PlayState* play) {
} else { } else {
this->actor.velocity.y = 0.0f; this->actor.velocity.y = 0.0f;
this->actor.gravity = 0.0f; this->actor.gravity = 0.0f;
this->actor.world.pos.y += this->actor.yDistToWater; this->actor.world.pos.y += this->actor.depthInWater;
} }
} }
@ -704,7 +704,7 @@ void EnTite_Stunned(EnTite* this, PlayState* play) {
} else { } else {
this->actor.velocity.y = 0.0f; this->actor.velocity.y = 0.0f;
this->actor.gravity = 0.0f; this->actor.gravity = 0.0f;
this->actor.world.pos.y += this->actor.yDistToWater; this->actor.world.pos.y += this->actor.depthInWater;
} }
} }
// Play sound effect and spawn dirt effects upon landing // Play sound effect and spawn dirt effects upon landing

4
src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
View file

@ -133,7 +133,7 @@ void EnTuboTrap_SpawnEffectsInWater(EnTuboTrap* this, PlayState* play) {
Vec3f* actorPos = &this->actor.world.pos; Vec3f* actorPos = &this->actor.world.pos;
pos = *actorPos; pos = *actorPos;
pos.y += this->actor.yDistToWater; pos.y += this->actor.depthInWater;
EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 400); EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 400);
@ -168,7 +168,7 @@ void EnTuboTrap_HandleImpact(EnTuboTrap* this, PlayState* play) {
Player* player = GET_PLAYER(play); Player* player = GET_PLAYER(play);
Player* player2 = GET_PLAYER(play); Player* player2 = GET_PLAYER(play);
if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && (this->actor.yDistToWater > 15.0f)) { if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && (this->actor.depthInWater > 15.0f)) {
EnTuboTrap_SpawnEffectsInWater(this, play); EnTuboTrap_SpawnEffectsInWater(this, play);
SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40, NA_SE_EV_BOMB_DROP_WATER); SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40, NA_SE_EV_BOMB_DROP_WATER);
EnTuboTrap_DropCollectible(this, play); EnTuboTrap_DropCollectible(this, play);

6
src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c
View file

@ -388,7 +388,7 @@ void func_80B32E34(EnWeiyer* this, PlayState* play) {
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 2, 0x200, 0x80); Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 2, 0x200, 0x80);
if ((player->actor.yDistToWater < 50.0f) && (this->actor.yDistToWater < 20.0f) && if ((player->actor.depthInWater < 50.0f) && (this->actor.depthInWater < 20.0f) &&
Actor_IsFacingPlayer(&this->actor, 0x2000)) { Actor_IsFacingPlayer(&this->actor, 0x2000)) {
func_80B327D8(this); func_80B327D8(this);
} }
@ -523,7 +523,7 @@ void func_80B3349C(EnWeiyer* this, PlayState* play) {
if (this->unk_194 == -1) { if (this->unk_194 == -1) {
if (phi_a0 || (this->collider.base.atFlags & AT_HIT)) { if (phi_a0 || (this->collider.base.atFlags & AT_HIT)) {
func_80B32538(this); func_80B32538(this);
} else if (this->actor.yDistToWater < 0.0f) { } else if (this->actor.depthInWater < 0.0f) {
this->unk_194 = 10; this->unk_194 = 10;
EffectSsGSplash_Spawn(play, &this->actor.world.pos, NULL, NULL, 1, 400); EffectSsGSplash_Spawn(play, &this->actor.world.pos, NULL, NULL, 1, 400);
Actor_PlaySfx(&this->actor, NA_SE_EN_OCTAROCK_JUMP); Actor_PlaySfx(&this->actor, NA_SE_EN_OCTAROCK_JUMP);
@ -584,7 +584,7 @@ void EnWeiyer_Update(Actor* thisx, PlayState* play) {
EnWeiyer* this = (EnWeiyer*)thisx; EnWeiyer* this = (EnWeiyer*)thisx;
s32 pad; s32 pad;
this->actor.home.pos.y = this->actor.yDistToWater + this->actor.world.pos.y - 5.0f; this->actor.home.pos.y = this->actor.depthInWater + this->actor.world.pos.y - 5.0f;
func_80B3368C(this, play); func_80B3368C(this, play);
this->actionFunc(this, play); this->actionFunc(this, play);
this->actor.world.rot.y = this->actor.shape.rot.y; this->actor.world.rot.y = this->actor.shape.rot.y;

22
src/overlays/actors/ovl_En_Zo/z_en_zo.c
View file

@ -60,7 +60,7 @@ void EnZo_SpawnBubble(EnZo* this, Vec3f* pos) {
continue; continue;
} }
waterSurface = this->actor.world.pos.y + this->actor.yDistToWater; waterSurface = this->actor.world.pos.y + this->actor.depthInWater;
if (!(waterSurface <= pos->y)) { if (!(waterSurface <= pos->y)) {
effect->type = ENZO_EFFECT_BUBBLE; effect->type = ENZO_EFFECT_BUBBLE;
@ -127,7 +127,7 @@ void EnZo_UpdateEffectsBubbles(EnZo* this) {
effect->pos.y += effect->vel.y; effect->pos.y += effect->vel.y;
// Bubbles turn into ripples when they reach the surface // Bubbles turn into ripples when they reach the surface
waterSurface = this->actor.world.pos.y + this->actor.yDistToWater; waterSurface = this->actor.world.pos.y + this->actor.depthInWater;
if (waterSurface <= effect->pos.y) { if (waterSurface <= effect->pos.y) {
effect->type = ENZO_EFFECT_NONE; effect->type = ENZO_EFFECT_NONE;
effect->pos.y = waterSurface; effect->pos.y = waterSurface;
@ -158,7 +158,7 @@ void EnZo_UpdateEffectsSplashes(EnZo* this) {
} }
// Splash particles turn into ripples when they hit the surface // Splash particles turn into ripples when they hit the surface
waterSurface = this->actor.world.pos.y + this->actor.yDistToWater; waterSurface = this->actor.world.pos.y + this->actor.depthInWater;
if (effect->pos.y < waterSurface) { if (effect->pos.y < waterSurface) {
effect->type = ENZO_EFFECT_NONE; effect->type = ENZO_EFFECT_NONE;
effect->pos.y = waterSurface; effect->pos.y = waterSurface;
@ -272,7 +272,7 @@ void EnZo_TreadWaterRipples(EnZo* this, f32 scale, f32 targetScale, u8 alpha) {
Vec3f pos = { 0.0f, 0.0f, 0.0f }; Vec3f pos = { 0.0f, 0.0f, 0.0f };
pos.x = this->actor.world.pos.x; pos.x = this->actor.world.pos.x;
pos.y = this->actor.world.pos.y + this->actor.yDistToWater; pos.y = this->actor.world.pos.y + this->actor.depthInWater;
pos.z = this->actor.world.pos.z; pos.z = this->actor.world.pos.z;
EnZo_SpawnRipple(this, &pos, scale, targetScale, alpha); EnZo_SpawnRipple(this, &pos, scale, targetScale, alpha);
} }
@ -351,7 +351,7 @@ void EnZo_SpawnSplashes(EnZo* this) {
pos = this->actor.world.pos; pos = this->actor.world.pos;
pos.x += vel.x * 6.0f; pos.x += vel.x * 6.0f;
pos.z += vel.z * 6.0f; pos.z += vel.z * 6.0f;
pos.y += this->actor.yDistToWater; pos.y += this->actor.depthInWater;
EnZo_SpawnSplash(this, &pos, &vel, 0.08f); EnZo_SpawnSplash(this, &pos, &vel, 0.08f);
} }
} }
@ -527,7 +527,7 @@ s32 EnZo_PlayerInProximity(EnZo* this, PlayState* play) {
f32 hDist; f32 hDist;
surfacePos.x = this->actor.world.pos.x; surfacePos.x = this->actor.world.pos.x;
surfacePos.y = this->actor.world.pos.y + this->actor.yDistToWater; surfacePos.y = this->actor.world.pos.y + this->actor.depthInWater;
surfacePos.z = this->actor.world.pos.z; surfacePos.z = this->actor.world.pos.z;
hDist = Math_Vec3f_DistXZ(&surfacePos, &player->actor.world.pos); hDist = Math_Vec3f_DistXZ(&surfacePos, &player->actor.world.pos);
@ -596,7 +596,7 @@ void EnZo_Init(Actor* thisx, PlayState* play) {
Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.height * 0.5f, this->collider.dim.radius, 0.0f, Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.height * 0.5f, this->collider.dim.radius, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2); UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
if (this->actor.yDistToWater < 54.0f || (this->actor.params & 0x3F) == 8) { if (this->actor.depthInWater < 54.0f || (this->actor.params & 0x3F) == 8) {
this->actor.shape.shadowDraw = ActorShadow_DrawCircle; this->actor.shape.shadowDraw = ActorShadow_DrawCircle;
this->actor.shape.shadowScale = 24.0f; this->actor.shape.shadowScale = 24.0f;
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENZO_ANIM_1); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENZO_ANIM_1);
@ -642,7 +642,7 @@ void EnZo_Submerged(EnZo* this, PlayState* play) {
} }
void EnZo_Surface(EnZo* this, PlayState* play) { void EnZo_Surface(EnZo* this, PlayState* play) {
if (this->actor.yDistToWater < 54.0f) { if (this->actor.depthInWater < 54.0f) {
Actor_PlaySfx(&this->actor, NA_SE_EV_OUT_OF_WATER); Actor_PlaySfx(&this->actor, NA_SE_EV_OUT_OF_WATER);
EnZo_SpawnSplashes(this); EnZo_SpawnSplashes(this);
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENZO_ANIM_3); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENZO_ANIM_3);
@ -650,7 +650,7 @@ void EnZo_Surface(EnZo* this, PlayState* play) {
this->actionFunc = EnZo_TreadWater; this->actionFunc = EnZo_TreadWater;
this->actor.velocity.y = 0.0f; this->actor.velocity.y = 0.0f;
this->alpha = 255.0f; this->alpha = 255.0f;
} else if (this->actor.yDistToWater < 80.0f) { } else if (this->actor.depthInWater < 80.0f) {
Math_ApproachF(&this->actor.velocity.y, 2.0f, 0.4f, 0.6f); Math_ApproachF(&this->actor.velocity.y, 2.0f, 0.4f, 0.6f);
Math_ApproachF(&this->alpha, 255.0f, 0.3f, 10.0f); Math_ApproachF(&this->alpha, 255.0f, 0.3f, 10.0f);
} }
@ -665,7 +665,7 @@ void EnZo_TreadWater(EnZo* this, PlayState* play) {
} }
EnZo_SetAnimation(this); EnZo_SetAnimation(this);
Math_ApproachF(&this->actor.velocity.y, this->actor.yDistToWater < 54.0f ? -0.6f : 0.6f, 0.3f, 0.2f); Math_ApproachF(&this->actor.velocity.y, this->actor.depthInWater < 54.0f ? -0.6f : 0.6f, 0.3f, 0.2f);
if (this->rippleTimer != 0) { if (this->rippleTimer != 0) {
this->rippleTimer--; this->rippleTimer--;
if ((this->rippleTimer == 3) || (this->rippleTimer == 6)) { if ((this->rippleTimer == 3) || (this->rippleTimer == 6)) {
@ -705,7 +705,7 @@ void EnZo_Dive(EnZo* this, PlayState* play) {
return; return;
} }
if (this->actor.yDistToWater > 80.0f || this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { if (this->actor.depthInWater > 80.0f || this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
Math_ApproachF(&this->actor.velocity.y, -1.0f, 0.4f, 0.6f); Math_ApproachF(&this->actor.velocity.y, -1.0f, 0.4f, 0.6f);
Math_ApproachF(&this->alpha, 0.0f, 0.3f, 10.0f); Math_ApproachF(&this->alpha, 0.0f, 0.3f, 10.0f);
} }

2
src/overlays/actors/ovl_Fishing/z_fishing.c
View file

@ -11,7 +11,7 @@
#include "terminal.h" #include "terminal.h"
// For retail BSS ordering, the block number of sStreamSfxProjectedPos must be 0. // For retail BSS ordering, the block number of sStreamSfxProjectedPos must be 0.
#pragma increment_block_number 201 #pragma increment_block_number 198
#define FLAGS ACTOR_FLAG_4 #define FLAGS ACTOR_FLAG_4

4
src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
View file

@ -152,7 +152,7 @@ void ObjKibako_WaterBreak(ObjKibako* this, PlayState* play) {
Vec3f velocity; Vec3f velocity;
pos = *breakPos; pos = *breakPos;
pos.y += this->actor.yDistToWater; pos.y += this->actor.depthInWater;
EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 500); EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 500);
for (i = 0, angle = 0; i < 12; i++, angle += 0x4E20) { for (i = 0, angle = 0; i < 12; i++, angle += 0x4E20) {
@ -187,7 +187,7 @@ void ObjKibako_Idle(ObjKibako* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) { if (Actor_HasParent(&this->actor, play)) {
ObjKibako_SetupHeld(this); ObjKibako_SetupHeld(this);
} else if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && (this->actor.yDistToWater > 19.0f)) { } else if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && (this->actor.depthInWater > 19.0f)) {
ObjKibako_WaterBreak(this, play); ObjKibako_WaterBreak(this, play);
SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 20, NA_SE_EV_WOODBOX_BREAK); SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 20, NA_SE_EV_WOODBOX_BREAK);
ObjKibako_SpawnCollectible(this, play); ObjKibako_SpawnCollectible(this, play);

4
src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
View file

@ -196,7 +196,7 @@ void ObjTsubo_WaterBreak(ObjTsubo* this, PlayState* play) {
s32 phi_s0; s32 phi_s0;
s32 i; s32 i;
pos.y += this->actor.yDistToWater; pos.y += this->actor.depthInWater;
EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 400); EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 400);
for (i = 0, angle = 0; i < 15; i++, angle += 0x4E20) { for (i = 0, angle = 0; i < 15; i++, angle += 0x4E20) {
f32 sins = Math_SinS(angle); f32 sins = Math_SinS(angle);
@ -240,7 +240,7 @@ void ObjTsubo_Idle(ObjTsubo* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) { if (Actor_HasParent(&this->actor, play)) {
ObjTsubo_SetupLiftedUp(this); ObjTsubo_SetupLiftedUp(this);
} else if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && (this->actor.yDistToWater > 15.0f)) { } else if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && (this->actor.depthInWater > 15.0f)) {
ObjTsubo_WaterBreak(this, play); ObjTsubo_WaterBreak(this, play);
SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 20, NA_SE_EV_POT_BROKEN); SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 20, NA_SE_EV_POT_BROKEN);
ObjTsubo_SpawnCollectible(this, play); ObjTsubo_SpawnCollectible(this, play);

514
src/overlays/actors/ovl_player_actor/z_player.c
View file

File diff suppressed because it is too large Load diff

182
src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
View file

@ -34,9 +34,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
1, 2,
{ {
{ 1, 48.0f, -63.0f }, { 1, 48.0f, -63.0f },
{ 5, 52.0f, -68.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -58,11 +59,9 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
3, 1,
{ {
{ 0, 46.0f, -59.0f },
{ 4, 77.0f, -26.0f }, { 4, 77.0f, -26.0f },
{ 5, 65.0f, -61.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -86,9 +85,9 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4, 4,
3, 3,
{ {
{ 2, 55.0f, -36.0f }, { 10, 25.0f, -41.0f },
{ 3, 54.0f, -51.0f }, { 4, 53.0f, -47.0f },
{ 5, 13.0f, -61.0f }, { 6, 58.0f, -59.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -98,11 +97,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
3, 2,
{ {
{ 0, 47.0f, -40.0f }, { 5, 13.0f, -60.0f },
{ 1, 51.0f, -3.0f }, { 8, 20.0f, -49.0f },
{ 4, 47.0f, -47.0f },
} }, } },
{ PAUSE_MAP_MARK_BOSS, { PAUSE_MAP_MARK_BOSS,
23, 23,
@ -120,13 +118,11 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
5, 3,
{ {
{ 3, 48.0f, -68.0f }, { 1, 67.0f, -13.0f },
{ 5, 50.0f, -66.0f }, { 2, 28.0f, -13.0f },
{ 7, 55.0f, -50.0f }, { 4, 38.0f, 0.0f },
{ 9, 58.0f, 1.0f },
{ 10, 62.0f, -45.0f },
} }, } },
{ PAUSE_MAP_MARK_BOSS, { PAUSE_MAP_MARK_BOSS,
23, 23,
@ -140,19 +136,6 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
}, },
// Jabu-Jabu's Belly map 1 // Jabu-Jabu's Belly map 1
{ {
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
6,
{
{ 0, 37.0f, -49.0f },
{ 1, 65.0f, -38.0f },
{ 2, 52.0f, -48.0f },
{ 4, 46.0f, -36.0f },
{ 6, 59.0f, -41.0f },
{ 8, 52.0f, -26.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
// Forest Temple map 0 // Forest Temple map 0
@ -161,12 +144,13 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
6, 7,
{ {
{ 3, 53.0f, -64.0f }, { 1, 50.0f, -12.0f },
{ 5, 65.0f, -9.0f }, { 3, 46.0f, -66.0f },
{ 12, 49.0f, -1.0f }, { 4, 20.0f, -38.0f },
{ 13, 40.0f, 0.0f }, { 12, 49.0f, -3.0f },
{ 13, 39.0f, 0.0f },
{ 14, 18.0f, -2.0f }, { 14, 18.0f, -2.0f },
{ 15, 59.0f, 0.0f }, { 15, 59.0f, 0.0f },
} }, } },
@ -180,10 +164,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4, 4,
4, 4,
{ {
{ 0, 49.0f, -1.0f }, { 0, 49.0f, -3.0f },
{ 1, 71.0f, -13.0f }, { 2, 12.0f, -26.0f },
{ 2, 11.0f, -25.0f }, { 5, 74.0f, -13.0f },
{ 6, 84.0f, -16.0f }, { 7, 82.0f, -22.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -195,7 +179,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4, 4,
1, 1,
{ {
{ 9, 65.0f, -30.0f }, { 9, 31.0f, -29.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -207,7 +191,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4, 4,
1, 1,
{ {
{ 11, 41.0f, -24.0f }, { 11, 40.0f, -41.0f },
} }, } },
{ PAUSE_MAP_MARK_BOSS, { PAUSE_MAP_MARK_BOSS,
23, 23,
@ -225,9 +209,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
1, 2,
{ {
{ 5, 24.0f, -40.0f }, { 5, 22.0f, -41.0f },
{ 13, 74.0f, -29.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -241,11 +226,14 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
3, 6,
{ {
{ 3, 75.0f, -47.0f }, { 3, 76.0f, -48.0f },
{ 6, 72.0f, -51.0f }, { 6, 72.0f, -50.0f },
{ 8, 65.0f, -12.0f }, { 7, 44.0f, -17.0f },
{ 8, 63.0f, -12.0f },
{ 9, 30.0f, -34.0f },
{ 10, 61.0f, -31.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -257,7 +245,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4, 4,
1, 1,
{ {
{ 11, 78.0f, -35.0f }, { 11, 78.0f, -34.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -269,11 +257,11 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4, 4,
5, 5,
{ {
{ 1, 67.0f, -58.0f }, { 0, 48.0f, -17.0f },
{ 2, 48.0f, -30.0f }, { 1, 35.0f, -45.0f },
{ 4, 63.0f, -14.0f }, { 2, 67.0f, -58.0f },
{ 7, 36.0f, -45.0f }, { 4, 74.0f, -15.0f },
{ 12, 47.0f, -26.0f }, { 12, 47.0f, -27.0f },
} }, } },
{ PAUSE_MAP_MARK_BOSS, { PAUSE_MAP_MARK_BOSS,
23, 23,
@ -291,9 +279,11 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
1, 3,
{ {
{ 2, 88.0f, -60.0f }, { 2, 88.0f, -60.0f },
{ 7, 23.0f, -2.0f },
{ 9, 84.0f, -45.0f },
} }, } },
{ PAUSE_MAP_MARK_BOSS, { PAUSE_MAP_MARK_BOSS,
23, 23,
@ -311,9 +301,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
1, 2,
{ {
{ 0, 88.0f, -60.0f }, { 0, 86.0f, -60.0f },
{ 8, 76.0f, -72.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -323,10 +314,12 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
2, 4,
{ {
{ 1, 88.0f, -60.0f }, { 1, 88.0f, -60.0f },
{ 5, 49.0f, -43.0f }, { 3, 42.0f, -21.0f },
{ 5, 47.0f, -15.0f },
{ 10, 33.0f, -31.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -338,7 +331,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4, 4,
1, 1,
{ {
{ 6, 75.0f, -65.0f }, { 6, 77.0f, -66.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -348,9 +341,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
1, 2,
{ {
{ 18, 46.0f, -30.0f }, { 10, 59.0f, -9.0f },
{ 18, 32.0f, -20.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -362,11 +356,11 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4, 4,
5, 5,
{ {
{ 1, 23.0f, -33.0f }, { 1, 20.0f, -43.0f },
{ 2, 56.0f, -11.0f }, { 5, 83.0f, -26.0f },
{ 5, 83.0f, -25.0f }, { 15, 57.0f, -14.0f },
{ 24, 84.0f, -39.0f }, { 20, 81.0f, -55.0f },
{ 25, 74.0f, -37.0f }, { 21, 87.0f, -55.0f },
} }, } },
{ PAUSE_MAP_MARK_BOSS, { PAUSE_MAP_MARK_BOSS,
23, 23,
@ -384,13 +378,14 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
5, 6,
{ {
{ 3, 46.0f, -20.0f }, { 2, 41.0f, -16.0f },
{ 6, 28.0f, -19.0f }, { 3, 47.0f, -17.0f },
{ 12, 25.0f, -25.0f }, { 6, 27.0f, -16.0f },
{ 15, 50.0f, -13.0f }, { 12, 29.0f, -20.0f },
{ 28, 48.0f, -29.0f }, { 13, 70.0f, -22.0f },
{ 14, 70.0f, -25.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -400,17 +395,12 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
9, 4,
{ {
{ 0, 14.0f, -24.0f }, { 0, 38.0f, -17.0f },
{ 4, 55.0f, -14.0f }, { 4, 55.0f, -14.0f },
{ 7, 78.0f, -2.0f }, { 8, 15.0f, -14.0f },
{ 8, 14.0f, -16.0f }, { 7, 78.0f, -3.0f },
{ 26, 42.0f, -43.0f },
{ 27, 50.0f, -43.0f },
{ 29, 25.0f, -35.0f },
{ 30, 42.0f, -36.0f },
{ 31, 50.0f, -36.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
@ -449,7 +439,6 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
2, 2,
{ {
{ 12, 96.0f, -51.0f }, { 12, 96.0f, -51.0f },
{ 16, 46.0f, -42.0f },
{ 22, 96.0f, -55.0f }, { 22, 96.0f, -55.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
@ -460,7 +449,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
12, 10,
{ {
{ 4, 43.0f, -66.0f }, { 4, 43.0f, -66.0f },
{ 5, 37.0f, -66.0f }, { 5, 37.0f, -66.0f },
@ -470,8 +459,6 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
{ 10, 15.0f, -4.0f }, { 10, 15.0f, -4.0f },
{ 11, 25.0f, -4.0f }, { 11, 25.0f, -4.0f },
{ 13, 19.0f, -29.0f }, { 13, 19.0f, -29.0f },
{ 14, 78.0f, -15.0f },
{ 15, 60.0f, -70.0f },
{ 21, 92.0f, -29.0f }, { 21, 92.0f, -29.0f },
{ 20, 87.0f, -20.0f }, { 20, 87.0f, -20.0f },
} }, } },
@ -491,15 +478,32 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23, 23,
sMarkChestVtx, sMarkChestVtx,
4, 4,
2, 9,
{ {
{ 2, 84.0f, -38.0f }, { 1, 51.0f, -24.0f },
{ 3, 57.0f, -18.0f }, { 3, 84.0f, -38.0f },
{ 4, 31.0f, -2.0f },
{ 5, 67.0f, -27.0f },
{ 8, 46.0f, -27.0f },
{ 10, 82.0f, -12.0f },
{ 12, 80.0f, -16.0f },
{ 14, 62.0f, -24.0f },
{ 20, 89.0f, -38.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
// Bottom of the Well map 1 // Bottom of the Well map 1
{ {
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 2, 54.0f, -27.0f },
{ 9, 28.0f, -17.0f },
{ 16, 56.0f, -38.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },
// Bottom of the Well map 2 // Bottom of the Well map 2
@ -510,7 +514,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4, 4,
1, 1,
{ {
{ 1, 72.0f, -32.0f }, { 7, 71.0f, -33.0f },
} }, } },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } }, { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
}, },

531
src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data_mq.c Normal file
View file

@ -0,0 +1,531 @@
#include "z_kaleido_scope.h"
static const Vtx sMarkBossVtx[] = {
VTX(-4, 4, 0, 0, 0, 255, 255, 255, 255),
VTX(-4, -4, 0, 0, 256, 255, 255, 255, 255),
VTX(4, 4, 0, 256, 0, 255, 255, 255, 255),
VTX(4, -4, 0, 256, 256, 255, 255, 255, 255),
};
static const Vtx sMarkChestVtx[] = {
VTX(-4, 4, 0, 0, 0, 255, 255, 255, 255),
VTX(-4, -4, 0, 0, 256, 255, 255, 255, 255),
VTX(4, 4, 0, 256, 0, 255, 255, 255, 255),
VTX(4, -4, 0, 256, 256, 255, 255, 255, 255),
};
PauseMapMarksData gPauseMapMarkDataTable[] = {
// Deku Tree map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 2, 40.0f, -33.0f },
{ 6, 49.0f, -42.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Deku Tree map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 1, 48.0f, -63.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Deku Tree map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 3, 84.0f, -39.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Deku Tree map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 0, 46.0f, -59.0f },
{ 4, 77.0f, -26.0f },
{ 5, 65.0f, -61.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Deku Tree map 4
{
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 55.0f, 0.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Dodongo's Cavern map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 2, 55.0f, -36.0f },
{ 3, 54.0f, -51.0f },
{ 5, 13.0f, -61.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Dodongo's Cavern map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 0, 47.0f, -40.0f },
{ 1, 51.0f, -3.0f },
{ 4, 47.0f, -47.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 23.0f, -25.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Jabu-Jabu's Belly map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
5,
{
{ 3, 48.0f, -68.0f },
{ 5, 50.0f, -66.0f },
{ 7, 55.0f, -50.0f },
{ 9, 58.0f, 1.0f },
{ 10, 62.0f, -45.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 65.0f, -37.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Jabu-Jabu's Belly map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
6,
{
{ 0, 37.0f, -49.0f },
{ 1, 65.0f, -38.0f },
{ 2, 52.0f, -48.0f },
{ 4, 46.0f, -36.0f },
{ 6, 59.0f, -41.0f },
{ 8, 52.0f, -26.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Forest Temple map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
6,
{
{ 3, 53.0f, -64.0f },
{ 5, 65.0f, -9.0f },
{ 12, 49.0f, -1.0f },
{ 13, 40.0f, 0.0f },
{ 14, 18.0f, -2.0f },
{ 15, 59.0f, 0.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Forest Temple map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
4,
{
{ 0, 49.0f, -1.0f },
{ 1, 71.0f, -13.0f },
{ 2, 11.0f, -25.0f },
{ 6, 84.0f, -16.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Forest Temple map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 9, 65.0f, -30.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Forest Temple map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 11, 41.0f, -24.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 50.0f, -11.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Fire Temple map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 5, 24.0f, -40.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Fire Temple map 1
{
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Fire Temple map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 3, 75.0f, -47.0f },
{ 6, 72.0f, -51.0f },
{ 8, 65.0f, -12.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Fire Temple map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 11, 78.0f, -35.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Fire Temple map 4
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
5,
{
{ 1, 67.0f, -58.0f },
{ 2, 48.0f, -30.0f },
{ 4, 63.0f, -14.0f },
{ 7, 36.0f, -45.0f },
{ 12, 47.0f, -26.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 26.0f, -34.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Water Temple map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 2, 88.0f, -60.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 62.0f, -23.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Water Temple map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 0, 88.0f, -60.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Water Temple map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 1, 88.0f, -60.0f },
{ 5, 49.0f, -43.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Water Temple map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 6, 75.0f, -65.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Spirit Temple map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 18, 46.0f, -30.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Spirit Temple map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
5,
{
{ 1, 23.0f, -33.0f },
{ 2, 56.0f, -11.0f },
{ 5, 83.0f, -25.0f },
{ 24, 84.0f, -39.0f },
{ 25, 74.0f, -37.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 47.0f, 0.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Spirit Temple map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
5,
{
{ 3, 46.0f, -20.0f },
{ 6, 28.0f, -19.0f },
{ 12, 25.0f, -25.0f },
{ 15, 50.0f, -13.0f },
{ 28, 48.0f, -29.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Spirit Temple map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
9,
{
{ 0, 14.0f, -24.0f },
{ 4, 55.0f, -14.0f },
{ 7, 78.0f, -2.0f },
{ 8, 14.0f, -16.0f },
{ 26, 42.0f, -43.0f },
{ 27, 50.0f, -43.0f },
{ 29, 25.0f, -35.0f },
{ 30, 42.0f, -36.0f },
{ 31, 50.0f, -36.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Shadow Temple map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 1, 41.0f, -17.0f },
{ 7, 27.0f, -24.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Shadow Temple map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 2, 81.0f, -20.0f },
{ 3, 74.0f, -37.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Shadow Temple map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 12, 96.0f, -51.0f },
{ 16, 46.0f, -42.0f },
{ 22, 96.0f, -55.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Shadow Temple map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
12,
{
{ 4, 43.0f, -66.0f },
{ 5, 37.0f, -66.0f },
{ 6, 33.0f, -72.0f },
{ 8, 85.0f, -18.0f },
{ 9, 61.0f, -42.0f },
{ 10, 15.0f, -4.0f },
{ 11, 25.0f, -4.0f },
{ 13, 19.0f, -29.0f },
{ 14, 78.0f, -15.0f },
{ 15, 60.0f, -70.0f },
{ 21, 92.0f, -29.0f },
{ 20, 87.0f, -20.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 31.0f, -45.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Bottom of the Well map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 2, 84.0f, -38.0f },
{ 3, 57.0f, -18.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Bottom of the Well map 1
{
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Bottom of the Well map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 1, 72.0f, -32.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Ice Cavern map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 0, 66.0f, -2.0f },
{ 1, 77.0f, -46.0f },
{ 2, 27.0f, -45.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
};

361
src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c
View file

@ -17,9 +17,10 @@ static MapMarkData sMapMarkDekuTree[] = {
// Deku Tree minimap 2 // Deku Tree minimap 2
{ {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 2,
{ {
{ 1, 64, 62 }, { 1, 64, 62 },
{ 5, 71, 69 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -38,12 +39,6 @@ static MapMarkData sMapMarkDekuTree[] = {
}, },
// Deku Tree minimap 5 // Deku Tree minimap 5
{ {
{ MAP_MARK_CHEST,
2,
{
{ 0, 46, 50 },
{ 5, 76, 52 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Deku Tree minimap 6 // Deku Tree minimap 6
@ -91,10 +86,9 @@ static MapMarkData sMapMarkDodongosCavern[] = {
// Dodongo's Cavern minimap 0 // Dodongo's Cavern minimap 0
{ {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
2, 1,
{ {
{ 0, 69, 14 }, { 8, 22, 32 },
{ 4, 69, 30 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -116,20 +110,10 @@ static MapMarkData sMapMarkDodongosCavern[] = {
}, },
// Dodongo's Cavern minimap 5 // Dodongo's Cavern minimap 5
{ {
{ MAP_MARK_CHEST,
1,
{
{ 5, 54, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Dodongo's Cavern minimap 6 // Dodongo's Cavern minimap 6
{ {
{ MAP_MARK_CHEST,
1,
{
{ 2, 69, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Dodongo's Cavern minimap 7 // Dodongo's Cavern minimap 7
@ -148,9 +132,10 @@ static MapMarkData sMapMarkDodongosCavern[] = {
// Dodongo's Cavern minimap 9 // Dodongo's Cavern minimap 9
{ {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 2,
{ {
{ 3, 59, 53 }, { 4, 58, 40 },
{ 6, 65, 64 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -172,19 +157,24 @@ static MapMarkData sMapMarkDodongosCavern[] = {
}, },
// Dodongo's Cavern minimap 14 // Dodongo's Cavern minimap 14
{ {
{ MAP_MARK_CHEST,
1,
{
{ 1, 68, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Dodongo's Cavern minimap 15 // Dodongo's Cavern minimap 15
{ {
{ MAP_MARK_CHEST,
1,
{
{ 5, 68, 64 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Dodongo's Cavern minimap 16 // Dodongo's Cavern minimap 16
{ {
{ MAP_MARK_CHEST,
1,
{
{ 10, 31, 27 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Dodongo's Cavern minimap 17 // Dodongo's Cavern minimap 17
@ -200,21 +190,10 @@ static MapMarkData sMapMarkDodongosCavern[] = {
static MapMarkData sMapMarkJabuJabuBelly[] = { static MapMarkData sMapMarkJabuJabuBelly[] = {
// Jabu-Jabu's Belly minimap 0 // Jabu-Jabu's Belly minimap 0
{ {
{ MAP_MARK_CHEST,
2,
{
{ 3, 66, 50 },
{ 5, 72, 47 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Jabu-Jabu's Belly minimap 1 // Jabu-Jabu's Belly minimap 1
{ {
{ MAP_MARK_CHEST,
1,
{
{ 7, 72, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Jabu-Jabu's Belly minimap 2 // Jabu-Jabu's Belly minimap 2
@ -223,12 +202,6 @@ static MapMarkData sMapMarkJabuJabuBelly[] = {
}, },
// Jabu-Jabu's Belly minimap 3 // Jabu-Jabu's Belly minimap 3
{ {
{ MAP_MARK_CHEST,
2,
{
{ 4, 64, 62 },
{ 8, 79, 38 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Jabu-Jabu's Belly minimap 4 // Jabu-Jabu's Belly minimap 4
@ -237,11 +210,6 @@ static MapMarkData sMapMarkJabuJabuBelly[] = {
}, },
// Jabu-Jabu's Belly minimap 5 // Jabu-Jabu's Belly minimap 5
{ {
{ MAP_MARK_CHEST,
1,
{
{ 10, 64, 45 },
} },
{ MAP_MARK_BOSS, { MAP_MARK_BOSS,
1, 1,
{ {
@ -263,23 +231,33 @@ static MapMarkData sMapMarkJabuJabuBelly[] = {
}, },
// Jabu-Jabu's Belly minimap 9 // Jabu-Jabu's Belly minimap 9
{ {
{ MAP_MARK_CHEST,
1,
{
{ 1, 74, 57 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Jabu-Jabu's Belly minimap 10 // Jabu-Jabu's Belly minimap 10
{ {
{ MAP_MARK_CHEST,
1,
{
{ 2, 59, 57 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Jabu-Jabu's Belly minimap 11 // Jabu-Jabu's Belly minimap 11
{ {
{ MAP_MARK_CHEST,
1,
{
{ 9, 68, 45 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Jabu-Jabu's Belly minimap 12 // Jabu-Jabu's Belly minimap 12
{ {
{ MAP_MARK_CHEST,
1,
{
{ 4, 68, 51 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Jabu-Jabu's Belly minimap 13 // Jabu-Jabu's Belly minimap 13
@ -288,22 +266,14 @@ static MapMarkData sMapMarkJabuJabuBelly[] = {
}, },
// Jabu-Jabu's Belly minimap 14 // Jabu-Jabu's Belly minimap 14
{ {
{ MAP_MARK_CHEST,
2,
{
{ 1, 79, 33 },
{ 6, 61, 41 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Jabu-Jabu's Belly minimap 15 // Jabu-Jabu's Belly minimap 15
{ {
{ MAP_MARK_CHEST, { MAP_MARK_NONE, 0, { 0 } },
2, },
{ // Jabu-Jabu's Belly minimap 16
{ 0, 48, 57 }, {
{ 2, 77, 55 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
}; };
@ -338,22 +308,26 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 0, 72, 57 }, { 0, 72, 60 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Forest Temple minimap 7 // Forest Temple minimap 7
{ {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
2, 1,
{ {
{ 1, 69, 39 }, { 5, 76, 38 },
{ 9, 62, 65 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Forest Temple minimap 8 // Forest Temple minimap 8
{ {
{ MAP_MARK_CHEST,
1,
{
{ 9, 59, 66 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Forest Temple minimap 9 // Forest Temple minimap 9
@ -361,12 +335,17 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 9, 71, 59 }, { 9, 15, 58 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Forest Temple minimap 10 // Forest Temple minimap 10
{ {
{ MAP_MARK_CHEST,
1,
{
{ 1, 69, 56 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Forest Temple minimap 11 // Forest Temple minimap 11
@ -378,7 +357,7 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 13, 80, 53 }, { 13, 80, 54 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -400,7 +379,7 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 6, 65, 53 }, { 7, 61, 61 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -413,7 +392,7 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 11, 39, 35 }, { 11, 39, 63 },
} }, } },
{ MAP_MARK_BOSS, { MAP_MARK_BOSS,
1, 1,
@ -427,7 +406,7 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 2, 65, 54 }, { 2, 66, 57 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -453,7 +432,7 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 3, 75, 53 }, { 3, 63, 56 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -462,17 +441,12 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 12, 69, 52 }, { 12, 69, 59 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Forest Temple minimap 24 // Forest Temple minimap 24
{ {
{ MAP_MARK_CHEST,
1,
{
{ 5, 58, 27 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Forest Temple minimap 25 // Forest Temple minimap 25
@ -481,6 +455,11 @@ static MapMarkData sMapMarkForestTemple[] = {
}, },
// Forest Temple minimap 26 // Forest Temple minimap 26
{ {
{ MAP_MARK_CHEST,
1,
{
{ 4, 73, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
}; };
@ -499,7 +478,7 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 7, 53, 70 }, { 1, 53, 70 },
} }, } },
{ MAP_MARK_BOSS, { MAP_MARK_BOSS,
1, 1,
@ -510,6 +489,11 @@ static MapMarkData sMapMarkFireTemple[] = {
}, },
// Fire Temple minimap 3 // Fire Temple minimap 3
{ {
{ MAP_MARK_CHEST,
1,
{
{ 0, 71, 60 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Fire Temple minimap 4 // Fire Temple minimap 4
@ -517,7 +501,7 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 11, 57, 48 }, { 11, 59, 46 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -526,8 +510,8 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
2, 2,
{ {
{ 3, 67, 73 }, { 6, 57, 73 },
{ 6, 58, 76 }, { 3, 66, 71 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -541,6 +525,11 @@ static MapMarkData sMapMarkFireTemple[] = {
}, },
// Fire Temple minimap 8 // Fire Temple minimap 8
{ {
{ MAP_MARK_CHEST,
1,
{
{ 13, 72, 38 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Fire Temple minimap 9 // Fire Temple minimap 9
@ -553,6 +542,11 @@ static MapMarkData sMapMarkFireTemple[] = {
}, },
// Fire Temple minimap 11 // Fire Temple minimap 11
{ {
{ MAP_MARK_CHEST,
1,
{
{ 9, 80, 61 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Fire Temple minimap 12 // Fire Temple minimap 12
@ -573,14 +567,18 @@ static MapMarkData sMapMarkFireTemple[] = {
}, },
// Fire Temple minimap 16 // Fire Temple minimap 16
{ {
{ MAP_MARK_CHEST,
1,
{
{ 10, 71, 36 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Fire Temple minimap 17 // Fire Temple minimap 17
{ {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
2, 1,
{ {
{ 2, 78, 62 },
{ 12, 77, 58 }, { 12, 77, 58 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
@ -591,15 +589,15 @@ static MapMarkData sMapMarkFireTemple[] = {
}, },
// Fire Temple minimap 19 // Fire Temple minimap 19
{ {
{ MAP_MARK_CHEST,
1,
{
{ 4, 60, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Fire Temple minimap 20 // Fire Temple minimap 20
{ {
{ MAP_MARK_CHEST,
1,
{
{ 4, 78, 59 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Fire Temple minimap 21 // Fire Temple minimap 21
@ -611,7 +609,7 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 1, 72, 68 }, { 2, 71, 68 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -620,7 +618,7 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 8, 66, 57 }, { 8, 66, 58 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -630,6 +628,11 @@ static MapMarkData sMapMarkFireTemple[] = {
}, },
// Fire Temple minimap 25 // Fire Temple minimap 25
{ {
{ MAP_MARK_CHEST,
1,
{
{ 7, 77, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Fire Temple minimap 26 // Fire Temple minimap 26
@ -673,7 +676,7 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 5, 51, 61 }, { 5, 49, 62 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -701,7 +704,7 @@ static MapMarkData sMapMarkWaterTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 6, 81, 68 }, { 6, 79, 68 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -711,6 +714,11 @@ static MapMarkData sMapMarkWaterTemple[] = {
}, },
// Water Temple minimap 4 // Water Temple minimap 4
{ {
{ MAP_MARK_CHEST,
1,
{
{ 9, 81, 62 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Water Temple minimap 5 // Water Temple minimap 5
@ -723,19 +731,24 @@ static MapMarkData sMapMarkWaterTemple[] = {
}, },
// Water Temple minimap 7 // Water Temple minimap 7
{ {
{ MAP_MARK_CHEST,
1,
{
{ 7, 74, 62 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Water Temple minimap 8 // Water Temple minimap 8
{ {
{ MAP_MARK_CHEST,
1,
{
{ 10, 57, 66 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Water Temple minimap 9 // Water Temple minimap 9
{ {
{ MAP_MARK_CHEST,
1,
{
{ 5, 75, 55 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Water Temple minimap 10 // Water Temple minimap 10
@ -769,6 +782,11 @@ static MapMarkData sMapMarkWaterTemple[] = {
}, },
// Water Temple minimap 16 // Water Temple minimap 16
{ {
{ MAP_MARK_CHEST,
1,
{
{ 5, 76, 64 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Water Temple minimap 17 // Water Temple minimap 17
@ -789,7 +807,7 @@ static MapMarkData sMapMarkWaterTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 2, 73, 65 }, { 2, 74, 63 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -874,7 +892,7 @@ static MapMarkData sMapMarkWaterTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 0, 73, 63 }, { 0, 74, 64 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -884,10 +902,20 @@ static MapMarkData sMapMarkWaterTemple[] = {
}, },
// Water Temple minimap 41 // Water Temple minimap 41
{ {
{ MAP_MARK_CHEST,
1,
{
{ 8, 75, 67 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Water Temple minimap 42 // Water Temple minimap 42
{ {
{ MAP_MARK_CHEST,
1,
{
{ 3, 82, 65 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Water Temple minimap 43 // Water Temple minimap 43
@ -899,36 +927,27 @@ static MapMarkData sMapMarkWaterTemple[] = {
static MapMarkData sMapMarkSpiritTemple[] = { static MapMarkData sMapMarkSpiritTemple[] = {
// Spirit Temple minimap 0 // Spirit Temple minimap 0
{ {
{ MAP_MARK_CHEST,
4,
{
{ 26, 27, 35 },
{ 27, 36, 35 },
{ 30, 27, 28 },
{ 31, 36, 28 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Spirit Temple minimap 1 // Spirit Temple minimap 1
{ {
{ MAP_MARK_CHEST,
1,
{
{ 29, 67, 63 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Spirit Temple minimap 2 // Spirit Temple minimap 2
{ {
{ MAP_MARK_CHEST,
1,
{
{ 0, 78, 43 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Spirit Temple minimap 3 // Spirit Temple minimap 3
{ {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
2, 1,
{ {
{ 0, 71, 62 }, { 8, 69, 40 },
{ 8, 71, 48 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -941,18 +960,13 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
2, 2,
{ {
{ 2, 43, 50 },
{ 3, 56, 54 }, { 3, 56, 54 },
{ 15, 69, 42 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Spirit Temple minimap 6 // Spirit Temple minimap 6
{ {
{ MAP_MARK_CHEST,
1,
{
{ 28, 60, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Spirit Temple minimap 7 // Spirit Temple minimap 7
@ -964,7 +978,7 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 1, 76, 40 }, { 1, 70, 67 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -985,7 +999,7 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 7, 70, 53 }, { 7, 70, 58 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -1012,24 +1026,20 @@ static MapMarkData sMapMarkSpiritTemple[] = {
}, },
// Spirit Temple minimap 17 // Spirit Temple minimap 17
{ {
{ MAP_MARK_CHEST,
1,
{
{ 25, 78, 58 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Spirit Temple minimap 18 // Spirit Temple minimap 18
{ {
{ MAP_MARK_CHEST,
1,
{
{ 24, 78, 58 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Spirit Temple minimap 19 // Spirit Temple minimap 19
{ {
{ MAP_MARK_CHEST,
2,
{
{ 20, 75, 58 },
{ 21, 83, 58 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Spirit Temple minimap 20 // Spirit Temple minimap 20
@ -1047,6 +1057,11 @@ static MapMarkData sMapMarkSpiritTemple[] = {
}, },
// Spirit Temple minimap 22 // Spirit Temple minimap 22
{ {
{ MAP_MARK_CHEST,
1,
{
{ 10, 72, 49 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Spirit Temple minimap 23 // Spirit Temple minimap 23
@ -1066,7 +1081,7 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 18, 75, 54 }, { 18, 50, 41 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -1079,8 +1094,8 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
2, 2,
{ {
{ 6, 78, 55 }, { 6, 73, 49 },
{ 12, 70, 70 }, { 12, 79, 55 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -1089,7 +1104,7 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 2, 76, 37 }, { 15, 77, 42 },
} }, } },
{ MAP_MARK_BOSS, { MAP_MARK_BOSS,
1, 1,
@ -1100,6 +1115,12 @@ static MapMarkData sMapMarkSpiritTemple[] = {
}, },
// Spirit Temple minimap 30 // Spirit Temple minimap 30
{ {
{ MAP_MARK_CHEST,
2,
{
{ 13, 77, 63 },
{ 14, 77, 68 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Spirit Temple minimap 31 // Spirit Temple minimap 31
@ -1155,10 +1176,9 @@ static MapMarkData sMapMarkShadowTemple[] = {
// Shadow Temple minimap 6 // Shadow Temple minimap 6
{ {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
2, 1,
{ {
{ 2, 83, 67 }, { 2, 83, 67 },
{ 14, 84, 59 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -1215,11 +1235,6 @@ static MapMarkData sMapMarkShadowTemple[] = {
}, },
// Shadow Temple minimap 14 // Shadow Temple minimap 14
{ {
{ MAP_MARK_CHEST,
1,
{
{ 16, 73, 64 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Shadow Temple minimap 15 // Shadow Temple minimap 15
@ -1270,11 +1285,6 @@ static MapMarkData sMapMarkShadowTemple[] = {
}, },
// Shadow Temple minimap 21 // Shadow Temple minimap 21
{ {
{ MAP_MARK_CHEST,
1,
{
{ 14, 77, 62 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Shadow Temple minimap 22 // Shadow Temple minimap 22
@ -1283,11 +1293,6 @@ static MapMarkData sMapMarkShadowTemple[] = {
}, },
// Shadow Temple minimap 23 // Shadow Temple minimap 23
{ {
{ MAP_MARK_CHEST,
1,
{
{ 15, 56, 67 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Shadow Temple minimap 24 // Shadow Temple minimap 24
@ -1296,20 +1301,10 @@ static MapMarkData sMapMarkShadowTemple[] = {
}, },
// Shadow Temple minimap 25 // Shadow Temple minimap 25
{ {
{ MAP_MARK_CHEST,
1,
{
{ 16, 73, 64 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Shadow Temple minimap 26 // Shadow Temple minimap 26
{ {
{ MAP_MARK_CHEST,
1,
{
{ 14, 77, 62 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
}; };
@ -1318,9 +1313,14 @@ static MapMarkData sMapMarkBottomWell[] = {
// Bottom of the Well minimap 0 // Bottom of the Well minimap 0
{ {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 6,
{ {
{ 3, 60, 18 }, { 1, 56, 26 },
{ 4, 39, 3 },
{ 5, 69, 30 },
{ 8, 53, 30 },
{ 12, 83, 16 },
{ 14, 67, 26 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -1334,14 +1334,20 @@ static MapMarkData sMapMarkBottomWell[] = {
}, },
// Bottom of the Well minimap 3 // Bottom of the Well minimap 3
{ {
{ MAP_MARK_CHEST,
1,
{
{ 10, 79, 67 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Bottom of the Well minimap 4 // Bottom of the Well minimap 4
{ {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 2,
{ {
{ 2, 73, 61 }, { 3, 73, 62 },
{ 20, 81, 62 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
@ -1355,6 +1361,13 @@ static MapMarkData sMapMarkBottomWell[] = {
}, },
// Bottom of the Well minimap 7 // Bottom of the Well minimap 7
{ {
{ MAP_MARK_CHEST,
3,
{
{ 2, 59, 28 },
{ 9, 36, 19 },
{ 16, 62, 38 },
} },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },
// Bottom of the Well minimap 8 // Bottom of the Well minimap 8
@ -1366,7 +1379,7 @@ static MapMarkData sMapMarkBottomWell[] = {
{ MAP_MARK_CHEST, { MAP_MARK_CHEST,
1, 1,
{ {
{ 1, 74, 66 }, { 7, 75, 66 },
} }, } },
{ MAP_MARK_NONE, 0, { 0 } }, { MAP_MARK_NONE, 0, { 0 } },
}, },

1444
src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c Normal file
View file

File diff suppressed because it is too large Load diff

35
tools/decompress_baserom.py
View file

@ -173,9 +173,10 @@ def main():
uncompressed_path = baserom_dir / "baserom-decompressed.z64" uncompressed_path = baserom_dir / "baserom-decompressed.z64"
dmadata_start = int((baserom_dir / "dmadata_start.txt").read_text(), 16) dmadata_start = int((baserom_dir / "dmadata_start.txt").read_text(), 16)
correct_str_hash = (baserom_dir / "checksum.md5").read_text().split()[0] compressed_str_hash = (baserom_dir / "checksum-compressed.md5").read_text().split()[0]
decompressed_str_hash = (baserom_dir / "checksum.md5").read_text().split()[0]
if check_existing_rom(uncompressed_path, correct_str_hash): if check_existing_rom(uncompressed_path, decompressed_str_hash):
print("Found valid baserom - exiting early") print("Found valid baserom - exiting early")
return return
@ -211,17 +212,12 @@ def main():
file_content = per_version_fixes(file_content, version) file_content = per_version_fixes(file_content, version)
dma_entries = dmadata.read_dmadata(file_content, dmadata_start)
# Decompress
if any(dma_entry.is_compressed() for dma_entry in dma_entries):
print("Decompressing rom...")
is_zlib_compressed = version in {"ique-cn", "ique-zh"}
file_content = decompress_rom(
file_content, dmadata_start, dma_entries, is_zlib_compressed
)
# Check to see if the ROM is a "vanilla" ROM # Check to see if the ROM is a "vanilla" ROM
str_hash = get_str_hash(file_content) str_hash = get_str_hash(file_content)
if version == "gc-eu-mq-dbg":
correct_str_hash = decompressed_str_hash
else:
correct_str_hash = compressed_str_hash
if str_hash != correct_str_hash: if str_hash != correct_str_hash:
print( print(
f"Error: Expected a hash of {correct_str_hash} but got {str_hash}. The baserom has probably been tampered, find a new one" f"Error: Expected a hash of {correct_str_hash} but got {str_hash}. The baserom has probably been tampered, find a new one"
@ -235,6 +231,23 @@ def main():
exit(1) exit(1)
dma_entries = dmadata.read_dmadata(file_content, dmadata_start)
# Decompress
if any(dma_entry.is_compressed() for dma_entry in dma_entries):
print("Decompressing rom...")
is_zlib_compressed = version in {"ique-cn", "ique-zh"}
file_content = decompress_rom(
file_content, dmadata_start, dma_entries, is_zlib_compressed
)
# Double check the hash
str_hash = get_str_hash(file_content)
if str_hash != decompressed_str_hash:
print(
f"Error: Expected a hash of {decompressed_str_hash} after decompression but got {str_hash}!"
)
exit(1)
# Write out our new ROM # Write out our new ROM
print(f"Writing new ROM {uncompressed_path}...") print(f"Writing new ROM {uncompressed_path}...")
uncompressed_path.write_bytes(file_content) uncompressed_path.write_bytes(file_content)

1
tools/disasm/disasm.py
View file

@ -91,7 +91,6 @@ def main():
context.addBannedSymbolRange(0x0000F000, 0x00010100) context.addBannedSymbolRange(0x0000F000, 0x00010100)
context.addBannedSymbolRange(0x10000000, 0x80000300) context.addBannedSymbolRange(0x10000000, 0x80000300)
context.addBannedSymbolRange(0xA0000000, 0xFFFFFFFF) context.addBannedSymbolRange(0xA0000000, 0xFFFFFFFF)
context.addBannedSymbolRange(0x80B50000, 0x80B51000) # Hack for z_fishing.c
spimdisasm.mips.InstructionConfig.parseArgs(args) spimdisasm.mips.InstructionConfig.parseArgs(args)
spimdisasm.common.GlobalConfig.parseArgs(args) spimdisasm.common.GlobalConfig.parseArgs(args)

472
tools/disasm/gc-eu-mq/file_addresses.csv
View file

@ -1,472 +0,0 @@
name,vrom_start,vrom_end,rom_start,rom_end,vram_start,overlay_dir
boot,1060,7170,1060,0,80000460,
code,A88000,B8A230,A580D0,AF27E0,80010F00,
ovl_title,B8A230,B8AA80,AF27E0,AF2E20,80800000,gamestates
ovl_select,B8AA80,B8D700,AF2E20,AF4900,80800850,gamestates
ovl_opening,B8D700,B8D860,AF4900,AF4A30,808034D0,gamestates
ovl_file_choose,B8D860,B9C470,AF4A30,AFCFD0,80803630,gamestates
ovl_kaleido_scope,B9C470,BB8E30,AFCFD0,B0BEC0,80812260,misc
ovl_player_actor,BB8E30,BDF540,B0BEC0,B25210,8082EC90,actors
ovl_map_mark_data,BDF540,BE6020,B25210,B255C0,80855470,misc
ovl_En_Test,BE6020,BEB8D0,B255C0,B28A90,8085BF50,actors
ovl_Arms_Hook,BEB8D0,BEC640,B28A90,B29520,80861800,actors
ovl_Arrow_Fire,BEC640,BEE520,B29520,B2AFE0,80862570,actors
ovl_Arrow_Ice,BEE520,BF0420,B2AFE0,B2C850,80864450,actors
ovl_Arrow_Light,BF0420,BF2330,B2C850,B2E150,80866350,actors
ovl_Bg_Bdan_Objects,BF2330,BF3600,B2E150,B2EE80,80868260,actors
ovl_Bg_Bdan_Switch,BF3600,BF4A30,B2EE80,B2FA30,80869530,actors
ovl_Bg_Bom_Guard,BF4A30,BF4C50,B2FA30,B2FC20,8086A960,actors
ovl_Bg_Bombwall,BF4C50,BF5510,B2FC20,B30300,8086AB80,actors
ovl_Bg_Bowl_Wall,BF5510,BF5E90,B30300,B30B20,8086B440,actors
ovl_Bg_Breakwall,BF5E90,BF6D00,B30B20,B31680,8086BDC0,actors
ovl_Bg_Ddan_Jd,BF6D00,BF7350,B31680,B31B80,8086CC30,actors
ovl_Bg_Ddan_Kd,BF7350,BF7C40,B31B80,B32260,8086D280,actors
ovl_Bg_Dodoago,BF7C40,BF8980,B32260,B32CC0,8086DB70,actors
ovl_Bg_Dy_Yoseizo,BF8980,BFB770,B32CC0,B34C00,8086E920,actors
ovl_Bg_Ganon_Otyuka,BFB770,BFDDB0,B34C00,B36920,80871710,actors
ovl_Bg_Gate_Shutter,BFDDB0,BFE240,B36920,B36CA0,80873D50,actors
ovl_Bg_Gjyo_Bridge,BFE240,BFE730,B36CA0,B370D0,808741E0,actors
ovl_Bg_Gnd_Darkmeiro,BFE730,BFEEF0,B370D0,B37690,808746D0,actors
ovl_Bg_Gnd_Firemeiro,BFEEF0,BFF440,B37690,B37AF0,80874E90,actors
ovl_Bg_Gnd_Iceblock,BFF440,C00530,B37AF0,B38630,808753E0,actors
ovl_Bg_Gnd_Nisekabe,C00530,C006A0,B38630,B38780,808764E0,actors
ovl_Bg_Gnd_Soulmeiro,C006A0,C00F00,B38780,B38E80,80876650,actors
ovl_Bg_Haka,C00F00,C015C0,B38E80,B39430,80876EB0,actors
ovl_Bg_Haka_Gate,C015C0,C02650,B39430,B3A110,80877570,actors
ovl_Bg_Haka_Huta,C02650,C030F0,B3A110,B3A970,80878610,actors
ovl_Bg_Haka_Megane,C030F0,C034F0,B3A970,B3ACC0,808790B0,actors
ovl_Bg_Haka_MeganeBG,C034F0,C03BB0,B3ACC0,B3B210,808794B0,actors
ovl_Bg_Haka_Sgami,C03BB0,C047D0,B3B210,B3BB90,80879B70,actors
ovl_Bg_Haka_Ship,C047D0,C05220,B3BB90,B3C3C0,8087A790,actors
ovl_Bg_Haka_Trap,C05220,C067F0,B3C3C0,B3D3D0,8087B1E0,actors
ovl_Bg_Haka_Tubo,C067F0,C07210,B3D3D0,B3DC10,8087C7B0,actors
ovl_Bg_Haka_Water,C07210,C07A10,B3DC10,B3E1D0,8087D1D0,actors
ovl_Bg_Haka_Zou,C07A10,C08C00,B3E1D0,B3EF50,8087D9D0,actors
ovl_Bg_Heavy_Block,C08C00,C0A4F0,B3EF50,B40190,8087EBC0,actors
ovl_Bg_Hidan_Curtain,C0A4F0,C0AF90,B40190,B409C0,808804B0,actors
ovl_Bg_Hidan_Dalm,C0AF90,C0B7E0,B409C0,B41020,80880F50,actors
ovl_Bg_Hidan_Firewall,C0B7E0,C0BF40,B41020,B41660,808817A0,actors
ovl_Bg_Hidan_Fslift,C0BF40,C0C410,B41660,B41A10,80881F00,actors
ovl_Bg_Hidan_Fwbig,C0C410,C0D0F0,B41A10,B42470,808823D0,actors
ovl_Bg_Hidan_Hamstep,C0D0F0,C0DFA0,B42470,B42FA0,808830B0,actors
ovl_Bg_Hidan_Hrock,C0DFA0,C0E7D0,B42FA0,B43610,80883F60,actors
ovl_Bg_Hidan_Kousi,C0E7D0,C0ED60,B43610,B43A50,80884790,actors
ovl_Bg_Hidan_Kowarerukabe,C0ED60,C0FC40,B43A50,B44420,80884D20,actors
ovl_Bg_Hidan_Rock,C0FC40,C10D40,B44420,B45100,80885C00,actors
ovl_Bg_Hidan_Rsekizou,C10D40,C11920,B45100,B459E0,80886D00,actors
ovl_Bg_Hidan_Sekizou,C11920,C12D70,B459E0,B46950,808878E0,actors
ovl_Bg_Hidan_Sima,C12D70,C13C70,B46950,B47520,80888D30,actors
ovl_Bg_Hidan_Syoku,C13C70,C140D0,B47520,B47830,80889C30,actors
ovl_Bg_Ice_Objects,C140D0,C15010,B47830,B48270,8088A090,actors
ovl_Bg_Ice_Shelter,C15010,C16250,B48270,B49060,8088AFD0,actors
ovl_Bg_Ice_Shutter,C16250,C166C0,B49060,B493C0,8088C210,actors
ovl_Bg_Ice_Turara,C166C0,C16EF0,B493C0,B49A80,8088C680,actors
ovl_Bg_Ingate,C16EF0,C17280,B49A80,B49DA0,8088CEB0,actors
ovl_Bg_Jya_1flift,C17280,C17910,B49DA0,B4A2A0,8088D240,actors
ovl_Bg_Jya_Amishutter,C17910,C17CA0,B4A2A0,B4A4F0,8088D8D0,actors
ovl_Bg_Jya_Bigmirror,C17CA0,C184F0,B4A4F0,B4AC00,8088DC60,actors
ovl_Bg_Jya_Block,C184F0,C18760,B4AC00,B4AE60,8088E4B0,actors
ovl_Bg_Jya_Bombchuiwa,C18760,C192A0,B4AE60,B4B710,8088E720,actors
ovl_Bg_Jya_Bombiwa,C192A0,C19860,B4B710,B4BBF0,8088F260,actors
ovl_Bg_Jya_Cobra,C19860,C1B5A0,B4BBF0,B4D170,8088F820,actors
ovl_Bg_Jya_Goroiwa,C1B5A0,C1BD20,B4D170,B4D7D0,80891560,actors
ovl_Bg_Jya_Haheniron,C1BD20,C1C510,B4D7D0,B4DE50,80891CE0,actors
ovl_Bg_Jya_Ironobj,C1C510,C1D2C0,B4DE50,B4E7B0,808924D0,actors
ovl_Bg_Jya_Kanaami,C1D2C0,C1D670,B4E7B0,B4EAA0,80893280,actors
ovl_Bg_Jya_Lift,C1D670,C1DBC0,B4EAA0,B4EEF0,80893630,actors
ovl_Bg_Jya_Megami,C1DBC0,C1EDB0,B4EEF0,B4FDD0,80893B80,actors
ovl_Bg_Jya_Zurerukabe,C1EDB0,C1F460,B4FDD0,B50320,80894D70,actors
ovl_Bg_Menkuri_Eye,C1F460,C1F8F0,B50320,B50710,80895420,actors
ovl_Bg_Menkuri_Kaiten,C1F8F0,C1FA80,B50710,B50870,808958C0,actors
ovl_Bg_Menkuri_Nisekabe,C1FA80,C1FBD0,B50870,B50990,80895A50,actors
ovl_Bg_Mizu_Bwall,C1FBD0,C210A0,B50990,B51760,80895BA0,actors
ovl_Bg_Mizu_Movebg,C210A0,C22220,B51760,B52440,80897070,actors
ovl_Bg_Mizu_Shutter,C22220,C22A20,B52440,B52A80,80898200,actors
ovl_Bg_Mizu_Uzu,C22A20,C22BF0,B52A80,B52C00,80898A00,actors
ovl_Bg_Mizu_Water,C22BF0,C238C0,B52C00,B53500,80898BD0,actors
ovl_Bg_Mjin,C238C0,C23CB0,B53500,B53860,808998A0,actors
ovl_Bg_Mori_Bigst,C23CB0,C245E0,B53860,B53ED0,80899C90,actors
ovl_Bg_Mori_Elevator,C245E0,C250D0,B53ED0,B54620,8089A5C0,actors
ovl_Bg_Mori_Hashigo,C250D0,C25990,B54620,B54CA0,8089B0B0,actors
ovl_Bg_Mori_Hashira4,C25990,C25F10,B54CA0,B550F0,8089B970,actors
ovl_Bg_Mori_Hineri,C25F10,C26C60,B550F0,B55AD0,8089BF00,actors
ovl_Bg_Mori_Idomizu,C26C60,C272A0,B55AD0,B55FC0,8089CC50,actors
ovl_Bg_Mori_Kaitenkabe,C272A0,C27910,B55FC0,B56510,8089D290,actors
ovl_Bg_Mori_Rakkatenjo,C27910,C28290,B56510,B56BD0,8089D900,actors
ovl_Bg_Po_Event,C28290,C2A0C0,B56BD0,B58220,8089E280,actors
ovl_Bg_Po_Syokudai,C2A0C0,C2AA30,B58220,B589D0,808A00C0,actors
ovl_Bg_Pushbox,C2AA30,C2AD30,B589D0,B58C60,808A0A30,actors
ovl_Bg_Relay_Objects,C2AD30,C2B4E0,B58C60,B59280,808A0D30,actors
ovl_Bg_Spot00_Break,C2B4E0,C2B680,B59280,B593F0,808A14E0,actors
ovl_Bg_Spot00_Hanebasi,C2B680,C2C790,B593F0,B5A1B0,808A1680,actors
ovl_Bg_Spot01_Fusya,C2C790,C2CA30,B5A1B0,B5A400,808A2790,actors
ovl_Bg_Spot01_Idohashira,C2CA30,C2D630,B5A400,B5AD30,808A2A30,actors
ovl_Bg_Spot01_Idomizu,C2D630,C2D950,B5AD30,B5B000,808A3630,actors
ovl_Bg_Spot01_Idosoko,C2D950,C2DB60,B5B000,B5B1C0,808A3950,actors
ovl_Bg_Spot01_Objects2,C2DB60,C2E020,B5B1C0,B5B5D0,808A3B60,actors
ovl_Bg_Spot02_Objects,C2E020,C2F380,B5B5D0,B5C3B0,808A4020,actors
ovl_Bg_Spot03_Taki,C2F380,C2FCA0,B5C3B0,B5CA90,808A5380,actors
ovl_Bg_Spot05_Soko,C2FCA0,C2FFC0,B5CA90,B5CD20,808A5CA0,actors
ovl_Bg_Spot06_Objects,C2FFC0,C313C0,B5CD20,B5DC30,808A5FC0,actors
ovl_Bg_Spot07_Taki,C313C0,C319B0,B5DC30,B5E0A0,808A73C0,actors
ovl_Bg_Spot08_Bakudankabe,C319B0,C32050,B5E0A0,B5E650,808A79B0,actors
ovl_Bg_Spot08_Iceblock,C32050,C33090,B5E650,B5F1F0,808A8050,actors
ovl_Bg_Spot09_Obj,C33090,C335B0,B5F1F0,B5F5C0,808A9090,actors
ovl_Bg_Spot11_Bakudankabe,C335B0,C33BF0,B5F5C0,B5FB20,808A95B0,actors
ovl_Bg_Spot11_Oasis,C33BF0,C34320,B5FB20,B60150,808A9BF0,actors
ovl_Bg_Spot12_Gate,C34320,C34730,B60150,B60460,808AA320,actors
ovl_Bg_Spot12_Saku,C34730,C34BF0,B60460,B60820,808AA730,actors
ovl_Bg_Spot15_Rrbox,C34BF0,C359D0,B60820,B61230,808AABF0,actors
ovl_Bg_Spot15_Saku,C359D0,C35D10,B61230,B61500,808AB9D0,actors
ovl_Bg_Spot16_Bombstone,C35D10,C37260,B61500,B625E0,808ABD10,actors
ovl_Bg_Spot16_Doughnut,C37260,C37820,B625E0,B62AB0,808AD260,actors
ovl_Bg_Spot17_Bakudankabe,C37820,C37F10,B62AB0,B63090,808AD820,actors
ovl_Bg_Spot17_Funen,C37F10,C38160,B63090,B632A0,808ADF10,actors
ovl_Bg_Spot18_Basket,C38160,C39150,B632A0,B63EB0,808AE160,actors
ovl_Bg_Spot18_Futa,C39150,C392F0,B63EB0,B64010,808AF150,actors
ovl_Bg_Spot18_Obj,C392F0,C39BC0,B64010,B64660,808AF2F0,actors
ovl_Bg_Spot18_Shutter,C39BC0,C3A110,B64660,B64A80,808AFBC0,actors
ovl_Bg_Sst_Floor,C3A110,C3A670,B64A80,B64F70,808B0110,actors
ovl_Bg_Toki_Hikari,C3A670,C3B410,B64F70,B657A0,808B0670,actors
ovl_Bg_Toki_Swd,C3B410,C3CA60,B657A0,B661E0,808B1410,actors
ovl_Bg_Treemouth,C3CA60,C3E0C0,B661E0,B66DE0,808B2A60,actors
ovl_Bg_Umajump,C3E0C0,C3E250,B66DE0,B66F50,808B40C0,actors
ovl_Bg_Vb_Sima,C3E250,C3E970,B66F50,B675A0,808B4250,actors
ovl_Bg_Ydan_Hasi,C3E970,C3F120,B675A0,B67BC0,808B4970,actors
ovl_Bg_Ydan_Maruta,C3F120,C3F800,B67BC0,B68140,808B5120,actors
ovl_Bg_Ydan_Sp,C3F800,C40F20,B68140,B69220,808B5800,actors
ovl_Bg_Zg,C40F20,C41370,B69220,B695A0,808B6F20,actors
ovl_Boss_Dodongo,C41370,C4AE70,B695A0,B6F870,808B7370,actors
ovl_Boss_Fd,C4AE70,C521D0,B6F870,B74570,808C0E70,actors
ovl_Boss_Fd2,C521D0,C55F00,B74570,B770D0,808C81D0,actors
ovl_Boss_Ganon,C55F00,C781B0,B770D0,B8C800,808CBF00,actors
ovl_Boss_Ganon2,C781B0,C89500,B8C800,B96DB0,808F1D30,actors
ovl_Boss_Ganondrof,C89500,C8E290,B96DB0,B9A120,80904BA0,actors
ovl_Boss_Goma,C8E290,C94230,B9A120,B9DB30,80909930,actors
ovl_Boss_Mo,C94230,C9FD00,B9DB30,BA5D50,8090F8D0,actors
ovl_Boss_Sst,C9FD00,CAC290,BA5D50,BAD8B0,8091FEB0,actors
ovl_Boss_Tw,CAC290,CBF3E0,BAD8B0,BB9EA0,8092C480,actors
ovl_Boss_Va,CBF3E0,CCDC70,BB9EA0,BC34D0,80942050,actors
ovl_Demo_6K,CCDC70,CD09D0,BC34D0,BC5620,809592E0,actors
ovl_Demo_Du,CD09D0,CD41B0,BC5620,BC71C0,8095C040,actors
ovl_Demo_Ec,CD41B0,CD7A10,BC71C0,BC88E0,8095F820,actors
ovl_Demo_Effect,CD7A10,CDD5B0,BC88E0,BCC450,80963080,actors
ovl_Demo_Ext,CDD5B0,CDDF00,BCC450,BCCB80,80968C20,actors
ovl_Demo_Geff,CDDF00,CDE720,BCCB80,BCD170,80969570,actors
ovl_Demo_Gj,CDE720,CE23D0,BCD170,BCEDE0,80969D90,actors
ovl_Demo_Go,CE23D0,CE3120,BCEDE0,BCF720,8096DA40,actors
ovl_Demo_Gt,CE3120,CE8730,BCF720,BD22A0,8096E790,actors
ovl_Demo_Ik,CE8730,CE9C40,BD22A0,BD2FB0,80973DA0,actors
ovl_Demo_Im,CE9C40,CEDBB0,BD2FB0,BD4F50,809752B0,actors
ovl_Demo_Kankyo,CEDBB0,CF1850,BD4F50,BD7360,80979220,actors
ovl_Demo_Kekkai,CF1850,CF2B40,BD7360,BD81F0,8097CF10,actors
ovl_Demo_Sa,CF2B40,CF5660,BD81F0,BD9750,8097E200,actors
ovl_Demo_Shd,CF5660,CF7A70,BD9750,BDAF70,80980D20,actors
ovl_Demo_Tre_Lgt,CF7A70,CF8180,BDAF70,BDB560,80983130,actors
ovl_Door_Ana,CF8180,CF87F0,BDB560,BDBAC0,80983840,actors
ovl_Door_Gerudo,CF87F0,CF8DE0,BDBAC0,BDBFC0,80983EB0,actors
ovl_Door_Killer,CF8DE0,CFA350,BDBFC0,BDD040,809844A0,actors
ovl_Door_Shutter,CFA350,CFC610,BDD040,BDE930,80985A10,actors
ovl_Door_Toki,CFC610,CFC770,BDE930,BDEA50,80987CD0,actors
ovl_Door_Warp1,CFC770,D00A70,BDEA50,BE10D0,80987E30,actors
ovl_Efc_Erupc,D00A70,D01560,BE10D0,BE19C0,8098C140,actors
ovl_Eff_Dust,D01560,D02930,BE19C0,BE25B0,8098CC30,actors
ovl_Effect_Ss_Blast,D02930,D02CC0,BE25B0,BE2920,8098E000,effects
ovl_Effect_Ss_Bomb,D02CC0,D030F0,BE2920,BE2D00,8098E390,effects
ovl_Effect_Ss_Bomb2,D030F0,D039F0,BE2D00,BE33B0,8098E7C0,effects
ovl_Effect_Ss_Bubble,D039F0,D03E70,BE33B0,BE37B0,8098F0C0,effects
ovl_Effect_Ss_D_Fire,D03E70,D04360,BE37B0,BE3C50,8098F540,effects
ovl_Effect_Ss_Dead_Db,D04360,D04840,BE3C50,BE4100,8098FA30,effects
ovl_Effect_Ss_Dead_Dd,D04840,D04DD0,BE4100,BE4620,8098FF10,effects
ovl_Effect_Ss_Dead_Ds,D04DD0,D05250,BE4620,BE4A50,809904A0,effects
ovl_Effect_Ss_Dead_Sound,D05250,D05390,BE4A50,BE4B90,80990920,effects
ovl_Effect_Ss_Dt_Bubble,D05390,D05920,BE4B90,BE5070,80990A60,effects
ovl_Effect_Ss_Dust,D05920,D06160,BE5070,BE5720,80990FF0,effects
ovl_Effect_Ss_En_Fire,D06160,D068B0,BE5720,BE5DB0,80991830,effects
ovl_Effect_Ss_En_Ice,D068B0,D07170,BE5DB0,BE6560,80991F80,effects
ovl_Effect_Ss_Extra,D07170,D07530,BE6560,BE6900,80992840,effects
ovl_Effect_Ss_Fcircle,D07530,D079E0,BE6900,BE6D70,80992C00,effects
ovl_Effect_Ss_Fhg_Flash,D079E0,D08960,BE6D70,BE7780,809930B0,effects
ovl_Effect_Ss_Fire_Tail,D08960,D09060,BE7780,BE7DD0,80994030,effects
ovl_Effect_Ss_G_Fire,D09060,D092F0,BE7DD0,BE8030,80994730,effects
ovl_Effect_Ss_G_Magma,D092F0,D09550,BE8030,BE8270,809949C0,effects
ovl_Effect_Ss_G_Magma2,D09550,D09A60,BE8270,BE8730,80994C20,effects
ovl_Effect_Ss_G_Ripple,D09A60,D09FC0,BE8730,BE8C10,80995130,effects
ovl_Effect_Ss_G_Spk,D09FC0,D0A570,BE8C10,BE9130,80995690,effects
ovl_Effect_Ss_G_Splash,D0A570,D0AA20,BE9130,BE94F0,80995C40,effects
ovl_Effect_Ss_Hahen,D0AA20,D0B060,BE94F0,BE99E0,809960F0,effects
ovl_Effect_Ss_HitMark,D0B060,D0B5B0,BE99E0,BE9E90,80996730,effects
ovl_Effect_Ss_Ice_Piece,D0B5B0,D0B9F0,BE9E90,BEA290,80996C80,effects
ovl_Effect_Ss_Ice_Smoke,D0B9F0,D0BED0,BEA290,BEA6D0,809970C0,effects
ovl_Effect_Ss_K_Fire,D0BED0,D0C310,BEA6D0,BEAAD0,809975A0,effects
ovl_Effect_Ss_Kakera,D0C310,D0D3A0,BEAAD0,BEB710,809979E0,effects
ovl_Effect_Ss_KiraKira,D0D3A0,D0DA10,BEB710,BEBCB0,80998A70,effects
ovl_Effect_Ss_Lightning,D0DA10,D0E0E0,BEBCB0,BEC300,809990E0,effects
ovl_Effect_Ss_Sibuki,D0E0E0,D0E7B0,BEC300,BEC900,809997B0,effects
ovl_Effect_Ss_Sibuki2,D0E7B0,D0EAE0,BEC900,BECC00,80999E80,effects
ovl_Effect_Ss_Solder_Srch_Ball,D0EAE0,D0EC90,BECC00,BECDA0,8099A1B0,effects
ovl_Effect_Ss_Stick,D0EC90,D0F030,BECDA0,BED0F0,8099A360,effects
ovl_Effect_Ss_Stone1,D0F030,D0F3B0,BED0F0,BED440,8099A700,effects
ovl_Elf_Msg,D0F3B0,D0F9A0,BED440,BED8A0,8099AA80,actors
ovl_Elf_Msg2,D0F9A0,D0FE10,BED8A0,BEDBA0,8099B070,actors
ovl_En_Am,D0FE10,D12210,BEDBA0,BEF3E0,8099B4E0,actors
ovl_En_Ani,D12210,D12F80,BEF3E0,BEFD70,8099D8E0,actors
ovl_En_Anubice,D12F80,D14230,BEFD70,BF0B40,8099E650,actors
ovl_En_Anubice_Fire,D14230,D14FF0,BF0B40,BF16A0,8099F900,actors
ovl_En_Anubice_Tag,D14FF0,D152C0,BF16A0,BF1910,809A06C0,actors
ovl_En_Arow_Trap,D152C0,D15410,BF1910,BF1A50,809A0990,actors
ovl_En_Arrow,D15410,D16B10,BF1A50,BF2AC0,809A0AE0,actors
ovl_En_Attack_Niw,D16B10,D17D70,BF2AC0,BF3820,809A21E0,actors
ovl_En_Ba,D17D70,D19C40,BF3820,BF4C50,809A3440,actors
ovl_En_Bb,D19C40,D1D920,BF4C50,BF7810,809A5310,actors
ovl_En_Bdfire,D1D920,D1E4C0,BF7810,BF8120,809A8FF0,actors
ovl_En_Bigokuta,D1E4C0,D20FC0,BF8120,BF9E50,809A9B90,actors
ovl_En_Bili,D20FC0,D23290,BF9E50,BFB680,809AC690,actors
ovl_En_Bird,D23290,D23750,BFB680,BFBA60,809AE960,actors
ovl_En_Blkobj,D23750,D23CB0,BFBA60,BFBEE0,809AEE20,actors
ovl_En_Bom,D23CB0,D24B80,BFBEE0,BFCA90,809AF380,actors
ovl_En_Bom_Bowl_Man,D24B80,D260C0,BFCA90,BFDA30,809B0250,actors
ovl_En_Bom_Bowl_Pit,D260C0,D26A30,BFDA30,BFE190,809B1790,actors
ovl_En_Bom_Chu,D26A30,D280D0,BFE190,BFF380,809B2100,actors
ovl_En_Bombf,D280D0,D29560,BFF380,C00370,809B37A0,actors
ovl_En_Boom,D29560,D29E30,C00370,C00AB0,809B4C30,actors
ovl_En_Box,D29E30,D2B980,C00AB0,C01DA0,809B5500,actors
ovl_En_Brob,D2B980,D2CA70,C01DA0,C029E0,809B7060,actors
ovl_En_Bubble,D2CA70,D2DE90,C029E0,C03940,809B8150,actors
ovl_En_Butte,D2DE90,D2F460,C03940,C04910,809B9570,actors
ovl_En_Bw,D2F460,D327F0,C04910,C06BC0,809BAB40,actors
ovl_En_Bx,D327F0,D332F0,C06BC0,C07560,809BDED0,actors
ovl_En_Changer,D332F0,D33CD0,C07560,C07CB0,809BE9D0,actors
ovl_En_Clear_Tag,D33CD0,D3C840,C07CB0,C0C090,809BF3B0,actors
ovl_En_Cow,D3C840,D3DCA0,C0C090,C0CDB0,809CA950,actors
ovl_En_Crow,D3DCA0,D3F340,C0CDB0,C0DE80,809CBDB0,actors
ovl_En_Cs,D3F340,D40570,C0DE80,C0EC70,809CD450,actors
ovl_En_Daiku,D40570,D41CB0,C0EC70,C0FE50,809CE680,actors
ovl_En_Daiku_Kakariko,D41CB0,D43070,C0FE50,C10D30,809CFDC0,actors
ovl_En_Dekubaba,D43070,D46B20,C10D30,C132F0,809D1180,actors
ovl_En_Dekunuts,D46B20,D48320,C132F0,C142A0,809D4C30,actors
ovl_En_Dh,D48320,D49E00,C142A0,C15620,809D6430,actors
ovl_En_Dha,D49E00,D4AE00,C15620,C16200,809D7F10,actors
ovl_En_Diving_Game,D4AE00,D4C7B0,C16200,C17400,809D8F10,actors
ovl_En_Dns,D4C7B0,D4DB40,C17400,C180D0,809DA8C0,actors
ovl_En_Dnt_Demo,D4DB40,D4E860,C180D0,C18B20,809DBC50,actors
ovl_En_Dnt_Jiji,D4E860,D4FD80,C18B20,C197E0,809DC970,actors
ovl_En_Dnt_Nomal,D4FD80,D52B80,C197E0,C1B390,809DDE90,actors
ovl_En_Dodojr,D52B80,D54A20,C1B390,C1C8E0,809E0C90,actors
ovl_En_Dodongo,D54A20,D577C0,C1C8E0,C1E820,809E2B30,actors
ovl_En_Dog,D577C0,D58970,C1E820,C1F4A0,809E58D0,actors
ovl_En_Door,D58970,D597B0,C1F4A0,C20070,809E6A80,actors
ovl_En_Ds,D597B0,D5A3D0,C20070,C208E0,809E78C0,actors
ovl_En_Du,D5A3D0,D5BE60,C208E0,C21B30,809E84E0,actors
ovl_En_Dy_Extra,D5BE60,D5C400,C21B30,C22020,809E9F70,actors
ovl_En_Eg,D5C400,D5C5B0,C22020,C22180,809EA510,actors
ovl_En_Eiyer,D5C5B0,D5E210,C22180,C235B0,809EA6C0,actors
ovl_En_Elf,D5E210,D62BD0,C235B0,C265B0,809EC320,actors
ovl_En_Encount1,D62BD0,D63730,C265B0,C26F10,809F0CE0,actors
ovl_En_Encount2,D63730,D64960,C26F10,C27D20,809F1840,actors
ovl_En_Ex_Item,D64960,D65AE0,C27D20,C289E0,809F2A70,actors
ovl_En_Ex_Ruppy,D65AE0,D66BA0,C289E0,C296B0,809F3BF0,actors
ovl_En_Fd,D66BA0,D69840,C296B0,C2B7A0,809F4CB0,actors
ovl_En_Fd_Fire,D69840,D6A550,C2B7A0,C2C2A0,809F7950,actors
ovl_En_Fhg_Fire,D6A550,D6CBF0,C2C2A0,C2DE40,809F8660,actors
ovl_En_Fire_Rock,D6CBF0,D6DD00,C2DE40,C2EAB0,809FAD00,actors
ovl_En_Firefly,D6DD00,D6FE70,C2EAB0,C30130,809FBE10,actors
ovl_En_Fish,D6FE70,D71F80,C30130,C315F0,809FDF80,actors
ovl_En_Floormas,D71F80,D75360,C315F0,C335E0,80A00090,actors
ovl_En_Fr,D75360,D77DF0,C335E0,C35420,80A03470,actors
ovl_En_Fu,D77DF0,D78B30,C35420,C35E90,80A05F00,actors
ovl_En_Fw,D78B30,D7A2F0,C35E90,C371C0,80A06C50,actors
ovl_En_Fz,D7A2F0,D7C300,C371C0,C38870,80A08410,actors
ovl_En_G_Switch,D7C300,D7DB20,C38870,C39B00,80A0A420,actors
ovl_En_Ganon_Mant,D7DB20,D81D50,C39B00,C3B850,80A0BC40,actors
ovl_En_Ganon_Organ,D81D50,D88D90,C3B850,C3EEE0,80A0FE70,actors
ovl_En_Gb,D88D90,D8A4C0,C3EEE0,C40010,80A16EB0,actors
ovl_En_Ge1,D8A4C0,D8C4F0,C40010,C41440,80A185E0,actors
ovl_En_Ge2,D8C4F0,D8DE90,C41440,C425D0,80A1A610,actors
ovl_En_Ge3,D8DE90,D8EAD0,C425D0,C42EF0,80A1BFB0,actors
ovl_En_GeldB,D8EAD0,D93E80,C42EF0,C462C0,80A1CBF0,actors
ovl_En_GirlA,D93E80,D967A0,C462C0,C47730,80A21FA0,actors
ovl_En_Gm,D967A0,D974D0,C47730,C48140,80A248C0,actors
ovl_En_Go,D974D0,D9BB10,C48140,C4AEC0,80A255F0,actors
ovl_En_Go2,D9BB10,DA1B50,C4AEC0,C4ECE0,80A29C30,actors
ovl_En_Goma,DA1B50,DA4800,C4ECE0,C50A80,80A2FC70,actors
ovl_En_Goroiwa,DA4800,DA6BC0,C50A80,C523A0,80A32920,actors
ovl_En_Gs,DA6BC0,DA8A30,C523A0,C53A00,80A34CE0,actors
ovl_En_Guest,DA8A30,DA93D0,C53A00,C54210,80A36B50,actors
ovl_En_Hata,DA93D0,DA9960,C54210,C54710,80A374F0,actors
ovl_En_Heishi1,DA9960,DAAE70,C54710,C55570,80A37A80,actors
ovl_En_Heishi2,DAAE70,DAD070,C55570,C56A20,80A38F90,actors
ovl_En_Heishi3,DAD070,DADA40,C56A20,C57150,80A3B190,actors
ovl_En_Heishi4,DADA40,DAE940,C57150,C57BE0,80A3BB60,actors
ovl_En_Hintnuts,DAE940,DB0370,C57BE0,C58D90,80A3CA60,actors
ovl_En_Holl,DB0370,DB1340,C58D90,C59930,80A3E490,actors
ovl_En_Honotrap,DB1340,DB28A0,C59930,C5A900,80A3F460,actors
ovl_En_Horse,DB28A0,DBEB00,C5A900,C62100,80A409C0,actors
ovl_En_Horse_Game_Check,DBEB00,DBFBD0,C62100,C62D20,80A4CC20,actors
ovl_En_Horse_Ganon,DBFBD0,DC0950,C62D20,C63790,80A4DCF0,actors
ovl_En_Horse_Link_Child,DC0950,DC2750,C63790,C64990,80A4EA70,actors
ovl_En_Horse_Normal,DC2750,DC4D70,C64990,C661E0,80A50870,actors
ovl_En_Horse_Zelda,DC4D70,DC5860,C661E0,C66AB0,80A52E90,actors
ovl_En_Hs,DC5860,DC6400,C66AB0,C672F0,80A53980,actors
ovl_En_Hs2,DC6400,DC69E0,C672F0,C677D0,80A54520,actors
ovl_En_Hy,DC69E0,DCA320,C677D0,C69C00,80A54B00,actors
ovl_En_Ice_Hono,DCA320,DCB510,C69C00,C6A8D0,80A58440,actors
ovl_En_Ik,DCB510,DCFB60,C6A8D0,C6D1C0,80A59630,actors
ovl_En_In,DCFB60,DD2900,C6D1C0,C6F290,80A5DC90,actors
ovl_En_Insect,DD2900,DD4E20,C6F290,C70B30,80A60A30,actors
ovl_En_Ishi,DD4E20,DDDF70,C70B30,C71E90,80A62F50,actors
ovl_En_It,DDDF70,DDE100,C71E90,C71FC0,80A6C0A0,actors
ovl_En_Jj,DDE100,DDF6D0,C71FC0,C72C10,80A6C230,actors
ovl_En_Js,DDF6D0,DE00A0,C72C10,C73330,80A6D800,actors
ovl_En_Jsjutan,DE00A0,DE4E70,C73330,C750A0,80A6E1D0,actors
ovl_En_Kakasi,DE4E70,DE5BB0,C750A0,C75AC0,80A73B00,actors
ovl_En_Kakasi2,DE5BB0,DE62D0,C75AC0,C76060,80A74840,actors
ovl_En_Kakasi3,DE62D0,DE73B0,C76060,C76CA0,80A74F60,actors
ovl_En_Kanban,DE73B0,DEA500,C76CA0,C78AB0,80A76040,actors
ovl_En_Karebaba,DEA500,DEBDF0,C78AB0,C79C30,80A79190,actors
ovl_En_Ko,DEBDF0,DEFF30,C79C30,C7C1D0,80A7AA80,actors
ovl_En_Kusa,DEFF30,DF1410,C7C1D0,C7D120,80A7EBC0,actors
ovl_En_Kz,DF1410,DF29B0,C7D120,C7E120,80A800A0,actors
ovl_En_Light,DF29B0,DF37B0,C7E120,C7EB00,80A81640,actors
ovl_En_Lightbox,DF37B0,DF3C30,C7EB00,C7EED0,80A82440,actors
ovl_En_M_Fire1,DF3C30,DF3DD0,C7EED0,C7F020,80A828C0,actors
ovl_En_M_Thunder,DF3DD0,DF53D0,C7F020,C80020,80A82A60,actors
ovl_En_Ma1,DF53D0,DF66B0,C80020,C80E30,80A84060,actors
ovl_En_Ma2,DF66B0,DF7710,C80E30,C81AB0,80A85340,actors
ovl_En_Ma3,DF7710,DF86C0,C81AB0,C826D0,80A863A0,actors
ovl_En_Mag,DF86C0,DFABE0,C826D0,C84120,80A87350,actors
ovl_En_Mb,DFABE0,DFEE10,C84120,C86C10,80A89870,actors
ovl_En_Md,DFEE10,E01480,C86C10,C88310,80A8DAA0,actors
ovl_En_Mk,E01480,E02310,C88310,C88CF0,80A90110,actors
ovl_En_Mm,E02310,E03970,C88CF0,C89DF0,80A90FA0,actors
ovl_En_Mm2,E03970,E04730,C89DF0,C8A860,80A92600,actors
ovl_En_Ms,E04730,E04E20,C8A860,C8AE10,80A933C0,actors
ovl_En_Mu,E04E20,E05740,C8AE10,C8B5D0,80A93AB0,actors
ovl_En_Nb,E05740,E09D10,C8B5D0,C8DA50,80A943D0,actors
ovl_En_Niw,E09D10,E0D040,C8DA50,C8FF30,80A989A0,actors
ovl_En_Niw_Girl,E0D040,E0DB10,C8FF30,C90880,80A9BCD0,actors
ovl_En_Niw_Lady,E0DB10,E0F410,C90880,C91A70,80A9C7A0,actors
ovl_En_Nutsball,E0F410,E0FA30,C91A70,C91FF0,80A9E0A0,actors
ovl_En_Nwc,E0FA30,E10450,C91FF0,C92880,80A9E6C0,actors
ovl_En_Ny,E10450,E11D90,C92880,C93B00,80A9F0E0,actors
ovl_En_OE2,E11D90,E11E70,C93B00,C93B90,80AA0A20,actors
ovl_En_Okarina_Effect,E11E70,E12230,C93B90,C93E80,80AA0B00,actors
ovl_En_Okarina_Tag,E12230,E13730,C93E80,C94A80,80AA0EC0,actors
ovl_En_Okuta,E13730,E15D10,C94A80,C964C0,80AA23C0,actors
ovl_En_Ossan,E15D10,E1C2F0,C964C0,C99CA0,80AA49A0,actors
ovl_En_Owl,E1C2F0,E1FE90,C99CA0,C9BF20,80AAAF80,actors
ovl_En_Part,E1FE90,E214F0,C9BF20,C9CF90,80AAEB20,actors
ovl_En_Peehat,E214F0,E24BF0,C9CF90,C9F260,80AB0180,actors
ovl_En_Po_Desert,E24BF0,E259B0,C9F260,C9FDB0,80AB3880,actors
ovl_En_Po_Field,E259B0,E293B0,C9FDB0,CA2620,80AB4640,actors
ovl_En_Po_Relay,E293B0,E2AAC0,CA2620,CA37A0,80AB80D0,actors
ovl_En_Po_Sisters,E2AAC0,E2F7B0,CA37A0,CA69E0,80AB97E0,actors
ovl_En_Poh,E2F7B0,E339A0,CA69E0,CA9420,80ABE4D0,actors
ovl_En_Pu_box,E339A0,E33CE0,CA9420,CA9700,80AC26C0,actors
ovl_En_Rd,E33CE0,E365A0,CA9700,CAB110,80AC2A00,actors
ovl_En_Reeba,E365A0,E38010,CAB110,CAC410,80AC52C0,actors
ovl_En_River_Sound,E38010,E389A0,CAC410,CACBE0,80AC6D30,actors
ovl_En_Rl,E389A0,E39880,CACBE0,CAD500,80AC76C0,actors
ovl_En_Rr,E39880,E3BDB0,CAD500,CAF010,80AC85A0,actors
ovl_En_Ru1,E3BDB0,E43450,CAF010,CB2E60,80ACAAD0,actors
ovl_En_Ru2,E43450,E461D0,CB2E60,CB44A0,80AD2170,actors
ovl_En_Sa,E461D0,E48440,CB44A0,CB5B00,80AD4EF0,actors
ovl_En_Sb,E48440,E49880,CB5B00,CB6880,80AD7160,actors
ovl_En_Scene_Change,E49880,E499B0,CB6880,CB6970,80AD85A0,actors
ovl_En_Sda,E499B0,E4AFE0,CB6970,CB7840,80AD86D0,actors
ovl_En_Shopnuts,E4AFE0,E4BEF0,CB7840,CB82A0,80AD9DC0,actors
ovl_En_Si,E4BEF0,E4C3F0,CB82A0,CB86C0,80ADACD0,actors
ovl_En_Siofuki,E4C3F0,E4D1A0,CB86C0,CB9100,80ADB1D0,actors
ovl_En_Skb,E4D1A0,E4EA90,CB9100,CBA320,80ADBF80,actors
ovl_En_Skj,E4EA90,E523D0,CBA320,CBC6E0,80ADD870,actors
ovl_En_Skjneedle,E523D0,E526E0,CBC6E0,CBC990,80AE11C0,actors
ovl_En_Ssh,E526E0,E54CD0,CBC990,CBE3E0,80AE14D0,actors
ovl_En_St,E54CD0,E57940,CBE3E0,CC02C0,80AE3AC0,actors
ovl_En_Sth,E57940,E5BA00,CC02C0,CC2E90,80AE6730,actors
ovl_En_Stream,E5BA00,E5BF90,CC2E90,CC3360,80AEA7F0,actors
ovl_En_Sw,E5BF90,E5F700,CC3360,CC5BA0,80AEAD80,actors
ovl_En_Syateki_Itm,E5F700,E604A0,CC5BA0,CC6610,80AEE570,actors
ovl_En_Syateki_Man,E604A0,E61260,CC6610,CC7040,80AEF310,actors
ovl_En_Syateki_Niw,E61260,E632F0,CC7040,CC8810,80AF00D0,actors
ovl_En_Ta,E632F0,E66CB0,CC8810,CCAB60,80AF2160,actors
ovl_En_Takara_Man,E66CB0,E67570,CCAB60,CCB2E0,80AF5B20,actors
ovl_En_Tana,E67570,E67820,CCB2E0,CCB520,80AF63E0,actors
ovl_En_Tg,E67820,E67F00,CCB520,CCBAF0,80AF6690,actors
ovl_En_Tite,E67F00,E6ACA0,CCBAF0,CCD6A0,80AF6D70,actors
ovl_En_Tk,E6ACA0,E6CAD0,CCD6A0,CCECD0,80AF9B10,actors
ovl_En_Torch,E6CAD0,E6CBC0,CCECD0,CCEDB0,80AFB940,actors
ovl_En_Torch2,E6CBC0,E6F320,CCEDB0,CD0A50,80AFBA30,actors
ovl_En_Toryo,E6F320,E6FFB0,CD0A50,CD1380,80AFE1D0,actors
ovl_En_Tp,E6FFB0,E71E20,CD1380,CD29B0,80AFEE60,actors
ovl_En_Tr,E71E20,E73720,CD29B0,CD3BB0,80B00CD0,actors
ovl_En_Trap,E73720,E749C0,CD3BB0,CD47F0,80B025D0,actors
ovl_En_Tubo_Trap,E749C0,E75660,CD47F0,CD5100,80B03870,actors
ovl_En_Vali,E75660,E77D20,CD5100,CD6BB0,80B04510,actors
ovl_En_Vase,E77D20,E77E20,CD6BB0,CD6C90,80B06BD0,actors
ovl_En_Vb_Ball,E77E20,E78FD0,CD6C90,CD79E0,80B06CD0,actors
ovl_En_Viewer,E78FD0,E7BE70,CD79E0,CD9950,80B07E80,actors
ovl_En_Vm,E7BE70,E7D730,CD9950,CDAAF0,80B0AD40,actors
ovl_En_Wall_Tubo,E7D730,E7DC20,CDAAF0,CDAF10,80B0C600,actors
ovl_En_Wallmas,E7DC20,E7F630,CDAF10,CDC0B0,80B0CAF0,actors
ovl_En_Weather_Tag,E7F630,E80520,CDC0B0,CDC7F0,80B0E500,actors
ovl_En_Weiyer,E80520,E81F20,CDC7F0,CDD910,80B0F3F0,actors
ovl_En_Wf,E81F20,E86230,CDD910,CE0460,80B10DF0,actors
ovl_En_Wonder_Item,E86230,E86E80,CE0460,CE0D20,80B15100,actors
ovl_En_Wonder_Talk,E86E80,E87510,CE0D20,CE1270,80B15E30,actors
ovl_En_Wonder_Talk2,E87510,E87BB0,CE1270,CE1810,80B164C0,actors
ovl_En_Wood02,E87BB0,E88D80,CE1810,CE2650,80B16B60,actors
ovl_En_Xc,E88D80,E8F4E0,CE2650,CE5B10,80B17D40,actors
ovl_En_Yabusame_Mark,E8F4E0,E8FBB0,CE5B10,CE6070,80B1E4D0,actors
ovl_En_Yukabyun,E8FBB0,E901C0,CE6070,CE65C0,80B1EBA0,actors
ovl_En_Zf,E901C0,E96CA0,CE65C0,CEAA50,80B1F1B0,actors
ovl_En_Zl1,E96CA0,E9AAB0,CEAA50,CEC9C0,80B25CA0,actors
ovl_En_Zl2,E9AAB0,E9F1B0,CEC9C0,CEEDB0,80B29AB0,actors
ovl_En_Zl3,E9F1B0,EA7000,CEEDB0,CF2E70,80B2E1B0,actors
ovl_En_Zl4,EA7000,EABA30,CF2E70,CF5440,80B36000,actors
ovl_En_Zo,EABA30,EADFF0,CF5440,CF6E60,80B3AA30,actors
ovl_En_fHG,EADFF0,EB0920,CF6E60,CF89A0,80B3CFF0,actors
ovl_End_Title,EB0920,EB4A40,CF89A0,CFA410,80B3F920,actors
ovl_Fishing,EB4A40,EC84E0,CFA410,D078E0,80B43A40,actors
ovl_Item_B_Heart,EC84E0,EC88F0,D078E0,D07C50,80B5E5B0,actors
ovl_Item_Etcetera,EC88F0,EC91C0,D07C50,D082F0,80B5E9C0,actors
ovl_Item_Inbox,EC91C0,EC9320,D082F0,D08400,80B5F290,actors
ovl_Item_Ocarina,EC9320,EC9AF0,D08400,D089C0,80B5F3F0,actors
ovl_Item_Shield,EC9AF0,ECA500,D089C0,D091C0,80B5FBC0,actors
ovl_Magic_Dark,ECA500,ECBD50,D091C0,D0A500,80B605D0,actors
ovl_Magic_Fire,ECBD50,ECE050,D0A500,D0C440,80B61E20,actors
ovl_Magic_Wind,ECE050,ECFD50,D0C440,D0DDD0,80B64120,actors
ovl_Mir_Ray,ECFD50,ED1600,D0DDD0,D0F1C0,80B65E20,actors
ovl_Obj_Bean,ED1600,ED3D90,D0F1C0,D10A90,80B676D0,actors
ovl_Obj_Blockstop,ED3D90,ED3F30,D10A90,D10C10,80B69E60,actors
ovl_Obj_Bombiwa,ED3F30,ED44A0,D10C10,D110D0,80B6A000,actors
ovl_Obj_Comb,ED44A0,ED4D00,D110D0,D11810,80B6A570,actors
ovl_Obj_Dekujr,ED4D00,ED5340,D11810,D11D50,80B6ADD0,actors
ovl_Obj_Elevator,ED5340,ED5700,D11D50,D12040,80B6B410,actors
ovl_Obj_Hamishi,ED5700,ED5F50,D12040,D12750,80B6B7D0,actors
ovl_Obj_Hana,ED5F50,ED6260,D12750,D129C0,80B6C020,actors
ovl_Obj_Hsblock,ED6260,ED6830,D129C0,D12E70,80B6C330,actors
ovl_Obj_Ice_Poly,ED6830,ED71E0,D12E70,D13660,80B6C900,actors
ovl_Obj_Kibako,ED71E0,ED7EE0,D13660,D13F40,80B6D2B0,actors
ovl_Obj_Kibako2,ED7EE0,ED85A0,D13F40,D14500,80B6DFB0,actors
ovl_Obj_Lift,ED85A0,ED8FC0,D14500,D14D40,80B6E670,actors
ovl_Obj_Lightswitch,ED8FC0,EDA3F0,D14D40,D15B10,80B6F090,actors
ovl_Obj_Makekinsuta,EDA3F0,EDA540,D15B10,D15C50,80B704C0,actors
ovl_Obj_Makeoshihiki,EDA540,EDA9D0,D15C50,D16030,80B70610,actors
ovl_Obj_Mure,EDA9D0,EDB9E0,D16030,D16B60,80B70AA0,actors
ovl_Obj_Mure2,EDB9E0,EDC400,D16B60,D172E0,80B71AB0,actors
ovl_Obj_Mure3,EDC400,EDCBD0,D172E0,D17910,80B724D0,actors
ovl_Obj_Oshihiki,EDCBD0,EDE680,D17910,D18BB0,80B72CA0,actors
ovl_Obj_Roomtimer,EDE680,EDE8D0,D18BB0,D18DB0,80B74750,actors
ovl_Obj_Switch,EDE8D0,EE06B0,D18DB0,D1A080,80B749A0,actors
ovl_Obj_Syokudai,EE06B0,EE12F0,D1A080,D1AAB0,80B76780,actors
ovl_Obj_Timeblock,EE12F0,EE1F40,D1AAB0,D1B3B0,80B773D0,actors
ovl_Obj_Tsubo,EE1F40,EE2F30,D1B3B0,D1BF10,80B78020,actors
ovl_Obj_Warp2block,EE2F30,EE3A60,D1BF10,D1C7E0,80B79010,actors
ovl_Object_Kankyo,EE3A60,EE6CE0,D1C7E0,D1EB40,80B79B40,actors
ovl_Oceff_Spot,EE6CE0,EE7C10,D1EB40,D1F830,80B7CDC0,actors
ovl_Oceff_Storm,EE7C10,EE97C0,D1F830,D212B0,80B7DCF0,actors
ovl_Oceff_Wipe,EE97C0,EEA540,D212B0,D21E70,80B7F8A0,actors
ovl_Oceff_Wipe2,EEA540,EEBCB0,D21E70,D22CB0,80B80620,actors
ovl_Oceff_Wipe3,EEBCB0,EED400,D22CB0,D23F30,80B81D90,actors
ovl_Oceff_Wipe4,EED400,EEE3E0,D23F30,D24B10,80B834E0,actors
ovl_Shot_Sun,EEE3E0,EEEAA0,D24B10,D250B0,80B844C0,actors
1 name vrom_start vrom_end rom_start rom_end vram_start overlay_dir
2 boot 1060 7170 1060 0 80000460
3 code A88000 B8A230 A580D0 AF27E0 80010F00
4 ovl_title B8A230 B8AA80 AF27E0 AF2E20 80800000 gamestates
5 ovl_select B8AA80 B8D700 AF2E20 AF4900 80800850 gamestates
6 ovl_opening B8D700 B8D860 AF4900 AF4A30 808034D0 gamestates
7 ovl_file_choose B8D860 B9C470 AF4A30 AFCFD0 80803630 gamestates
8 ovl_kaleido_scope B9C470 BB8E30 AFCFD0 B0BEC0 80812260 misc
9 ovl_player_actor BB8E30 BDF540 B0BEC0 B25210 8082EC90 actors
10 ovl_map_mark_data BDF540 BE6020 B25210 B255C0 80855470 misc
11 ovl_En_Test BE6020 BEB8D0 B255C0 B28A90 8085BF50 actors
12 ovl_Arms_Hook BEB8D0 BEC640 B28A90 B29520 80861800 actors
13 ovl_Arrow_Fire BEC640 BEE520 B29520 B2AFE0 80862570 actors
14 ovl_Arrow_Ice BEE520 BF0420 B2AFE0 B2C850 80864450 actors
15 ovl_Arrow_Light BF0420 BF2330 B2C850 B2E150 80866350 actors
16 ovl_Bg_Bdan_Objects BF2330 BF3600 B2E150 B2EE80 80868260 actors
17 ovl_Bg_Bdan_Switch BF3600 BF4A30 B2EE80 B2FA30 80869530 actors
18 ovl_Bg_Bom_Guard BF4A30 BF4C50 B2FA30 B2FC20 8086A960 actors
19 ovl_Bg_Bombwall BF4C50 BF5510 B2FC20 B30300 8086AB80 actors
20 ovl_Bg_Bowl_Wall BF5510 BF5E90 B30300 B30B20 8086B440 actors
21 ovl_Bg_Breakwall BF5E90 BF6D00 B30B20 B31680 8086BDC0 actors
22 ovl_Bg_Ddan_Jd BF6D00 BF7350 B31680 B31B80 8086CC30 actors
23 ovl_Bg_Ddan_Kd BF7350 BF7C40 B31B80 B32260 8086D280 actors
24 ovl_Bg_Dodoago BF7C40 BF8980 B32260 B32CC0 8086DB70 actors
25 ovl_Bg_Dy_Yoseizo BF8980 BFB770 B32CC0 B34C00 8086E920 actors
26 ovl_Bg_Ganon_Otyuka BFB770 BFDDB0 B34C00 B36920 80871710 actors
27 ovl_Bg_Gate_Shutter BFDDB0 BFE240 B36920 B36CA0 80873D50 actors
28 ovl_Bg_Gjyo_Bridge BFE240 BFE730 B36CA0 B370D0 808741E0 actors
29 ovl_Bg_Gnd_Darkmeiro BFE730 BFEEF0 B370D0 B37690 808746D0 actors
30 ovl_Bg_Gnd_Firemeiro BFEEF0 BFF440 B37690 B37AF0 80874E90 actors
31 ovl_Bg_Gnd_Iceblock BFF440 C00530 B37AF0 B38630 808753E0 actors
32 ovl_Bg_Gnd_Nisekabe C00530 C006A0 B38630 B38780 808764E0 actors
33 ovl_Bg_Gnd_Soulmeiro C006A0 C00F00 B38780 B38E80 80876650 actors
34 ovl_Bg_Haka C00F00 C015C0 B38E80 B39430 80876EB0 actors
35 ovl_Bg_Haka_Gate C015C0 C02650 B39430 B3A110 80877570 actors
36 ovl_Bg_Haka_Huta C02650 C030F0 B3A110 B3A970 80878610 actors
37 ovl_Bg_Haka_Megane C030F0 C034F0 B3A970 B3ACC0 808790B0 actors
38 ovl_Bg_Haka_MeganeBG C034F0 C03BB0 B3ACC0 B3B210 808794B0 actors
39 ovl_Bg_Haka_Sgami C03BB0 C047D0 B3B210 B3BB90 80879B70 actors
40 ovl_Bg_Haka_Ship C047D0 C05220 B3BB90 B3C3C0 8087A790 actors
41 ovl_Bg_Haka_Trap C05220 C067F0 B3C3C0 B3D3D0 8087B1E0 actors
42 ovl_Bg_Haka_Tubo C067F0 C07210 B3D3D0 B3DC10 8087C7B0 actors
43 ovl_Bg_Haka_Water C07210 C07A10 B3DC10 B3E1D0 8087D1D0 actors
44 ovl_Bg_Haka_Zou C07A10 C08C00 B3E1D0 B3EF50 8087D9D0 actors
45 ovl_Bg_Heavy_Block C08C00 C0A4F0 B3EF50 B40190 8087EBC0 actors
46 ovl_Bg_Hidan_Curtain C0A4F0 C0AF90 B40190 B409C0 808804B0 actors
47 ovl_Bg_Hidan_Dalm C0AF90 C0B7E0 B409C0 B41020 80880F50 actors
48 ovl_Bg_Hidan_Firewall C0B7E0 C0BF40 B41020 B41660 808817A0 actors
49 ovl_Bg_Hidan_Fslift C0BF40 C0C410 B41660 B41A10 80881F00 actors
50 ovl_Bg_Hidan_Fwbig C0C410 C0D0F0 B41A10 B42470 808823D0 actors
51 ovl_Bg_Hidan_Hamstep C0D0F0 C0DFA0 B42470 B42FA0 808830B0 actors
52 ovl_Bg_Hidan_Hrock C0DFA0 C0E7D0 B42FA0 B43610 80883F60 actors
53 ovl_Bg_Hidan_Kousi C0E7D0 C0ED60 B43610 B43A50 80884790 actors
54 ovl_Bg_Hidan_Kowarerukabe C0ED60 C0FC40 B43A50 B44420 80884D20 actors
55 ovl_Bg_Hidan_Rock C0FC40 C10D40 B44420 B45100 80885C00 actors
56 ovl_Bg_Hidan_Rsekizou C10D40 C11920 B45100 B459E0 80886D00 actors
57 ovl_Bg_Hidan_Sekizou C11920 C12D70 B459E0 B46950 808878E0 actors
58 ovl_Bg_Hidan_Sima C12D70 C13C70 B46950 B47520 80888D30 actors
59 ovl_Bg_Hidan_Syoku C13C70 C140D0 B47520 B47830 80889C30 actors
60 ovl_Bg_Ice_Objects C140D0 C15010 B47830 B48270 8088A090 actors
61 ovl_Bg_Ice_Shelter C15010 C16250 B48270 B49060 8088AFD0 actors
62 ovl_Bg_Ice_Shutter C16250 C166C0 B49060 B493C0 8088C210 actors
63 ovl_Bg_Ice_Turara C166C0 C16EF0 B493C0 B49A80 8088C680 actors
64 ovl_Bg_Ingate C16EF0 C17280 B49A80 B49DA0 8088CEB0 actors
65 ovl_Bg_Jya_1flift C17280 C17910 B49DA0 B4A2A0 8088D240 actors
66 ovl_Bg_Jya_Amishutter C17910 C17CA0 B4A2A0 B4A4F0 8088D8D0 actors
67 ovl_Bg_Jya_Bigmirror C17CA0 C184F0 B4A4F0 B4AC00 8088DC60 actors
68 ovl_Bg_Jya_Block C184F0 C18760 B4AC00 B4AE60 8088E4B0 actors
69 ovl_Bg_Jya_Bombchuiwa C18760 C192A0 B4AE60 B4B710 8088E720 actors
70 ovl_Bg_Jya_Bombiwa C192A0 C19860 B4B710 B4BBF0 8088F260 actors
71 ovl_Bg_Jya_Cobra C19860 C1B5A0 B4BBF0 B4D170 8088F820 actors
72 ovl_Bg_Jya_Goroiwa C1B5A0 C1BD20 B4D170 B4D7D0 80891560 actors
73 ovl_Bg_Jya_Haheniron C1BD20 C1C510 B4D7D0 B4DE50 80891CE0 actors
74 ovl_Bg_Jya_Ironobj C1C510 C1D2C0 B4DE50 B4E7B0 808924D0 actors
75 ovl_Bg_Jya_Kanaami C1D2C0 C1D670 B4E7B0 B4EAA0 80893280 actors
76 ovl_Bg_Jya_Lift C1D670 C1DBC0 B4EAA0 B4EEF0 80893630 actors
77 ovl_Bg_Jya_Megami C1DBC0 C1EDB0 B4EEF0 B4FDD0 80893B80 actors
78 ovl_Bg_Jya_Zurerukabe C1EDB0 C1F460 B4FDD0 B50320 80894D70 actors
79 ovl_Bg_Menkuri_Eye C1F460 C1F8F0 B50320 B50710 80895420 actors
80 ovl_Bg_Menkuri_Kaiten C1F8F0 C1FA80 B50710 B50870 808958C0 actors
81 ovl_Bg_Menkuri_Nisekabe C1FA80 C1FBD0 B50870 B50990 80895A50 actors
82 ovl_Bg_Mizu_Bwall C1FBD0 C210A0 B50990 B51760 80895BA0 actors
83 ovl_Bg_Mizu_Movebg C210A0 C22220 B51760 B52440 80897070 actors
84 ovl_Bg_Mizu_Shutter C22220 C22A20 B52440 B52A80 80898200 actors
85 ovl_Bg_Mizu_Uzu C22A20 C22BF0 B52A80 B52C00 80898A00 actors
86 ovl_Bg_Mizu_Water C22BF0 C238C0 B52C00 B53500 80898BD0 actors
87 ovl_Bg_Mjin C238C0 C23CB0 B53500 B53860 808998A0 actors
88 ovl_Bg_Mori_Bigst C23CB0 C245E0 B53860 B53ED0 80899C90 actors
89 ovl_Bg_Mori_Elevator C245E0 C250D0 B53ED0 B54620 8089A5C0 actors
90 ovl_Bg_Mori_Hashigo C250D0 C25990 B54620 B54CA0 8089B0B0 actors
91 ovl_Bg_Mori_Hashira4 C25990 C25F10 B54CA0 B550F0 8089B970 actors
92 ovl_Bg_Mori_Hineri C25F10 C26C60 B550F0 B55AD0 8089BF00 actors
93 ovl_Bg_Mori_Idomizu C26C60 C272A0 B55AD0 B55FC0 8089CC50 actors
94 ovl_Bg_Mori_Kaitenkabe C272A0 C27910 B55FC0 B56510 8089D290 actors
95 ovl_Bg_Mori_Rakkatenjo C27910 C28290 B56510 B56BD0 8089D900 actors
96 ovl_Bg_Po_Event C28290 C2A0C0 B56BD0 B58220 8089E280 actors
97 ovl_Bg_Po_Syokudai C2A0C0 C2AA30 B58220 B589D0 808A00C0 actors
98 ovl_Bg_Pushbox C2AA30 C2AD30 B589D0 B58C60 808A0A30 actors
99 ovl_Bg_Relay_Objects C2AD30 C2B4E0 B58C60 B59280 808A0D30 actors
100 ovl_Bg_Spot00_Break C2B4E0 C2B680 B59280 B593F0 808A14E0 actors
101 ovl_Bg_Spot00_Hanebasi C2B680 C2C790 B593F0 B5A1B0 808A1680 actors
102 ovl_Bg_Spot01_Fusya C2C790 C2CA30 B5A1B0 B5A400 808A2790 actors
103 ovl_Bg_Spot01_Idohashira C2CA30 C2D630 B5A400 B5AD30 808A2A30 actors
104 ovl_Bg_Spot01_Idomizu C2D630 C2D950 B5AD30 B5B000 808A3630 actors
105 ovl_Bg_Spot01_Idosoko C2D950 C2DB60 B5B000 B5B1C0 808A3950 actors
106 ovl_Bg_Spot01_Objects2 C2DB60 C2E020 B5B1C0 B5B5D0 808A3B60 actors
107 ovl_Bg_Spot02_Objects C2E020 C2F380 B5B5D0 B5C3B0 808A4020 actors
108 ovl_Bg_Spot03_Taki C2F380 C2FCA0 B5C3B0 B5CA90 808A5380 actors
109 ovl_Bg_Spot05_Soko C2FCA0 C2FFC0 B5CA90 B5CD20 808A5CA0 actors
110 ovl_Bg_Spot06_Objects C2FFC0 C313C0 B5CD20 B5DC30 808A5FC0 actors
111 ovl_Bg_Spot07_Taki C313C0 C319B0 B5DC30 B5E0A0 808A73C0 actors
112 ovl_Bg_Spot08_Bakudankabe C319B0 C32050 B5E0A0 B5E650 808A79B0 actors
113 ovl_Bg_Spot08_Iceblock C32050 C33090 B5E650 B5F1F0 808A8050 actors
114 ovl_Bg_Spot09_Obj C33090 C335B0 B5F1F0 B5F5C0 808A9090 actors
115 ovl_Bg_Spot11_Bakudankabe C335B0 C33BF0 B5F5C0 B5FB20 808A95B0 actors
116 ovl_Bg_Spot11_Oasis C33BF0 C34320 B5FB20 B60150 808A9BF0 actors
117 ovl_Bg_Spot12_Gate C34320 C34730 B60150 B60460 808AA320 actors
118 ovl_Bg_Spot12_Saku C34730 C34BF0 B60460 B60820 808AA730 actors
119 ovl_Bg_Spot15_Rrbox C34BF0 C359D0 B60820 B61230 808AABF0 actors
120 ovl_Bg_Spot15_Saku C359D0 C35D10 B61230 B61500 808AB9D0 actors
121 ovl_Bg_Spot16_Bombstone C35D10 C37260 B61500 B625E0 808ABD10 actors
122 ovl_Bg_Spot16_Doughnut C37260 C37820 B625E0 B62AB0 808AD260 actors
123 ovl_Bg_Spot17_Bakudankabe C37820 C37F10 B62AB0 B63090 808AD820 actors
124 ovl_Bg_Spot17_Funen C37F10 C38160 B63090 B632A0 808ADF10 actors
125 ovl_Bg_Spot18_Basket C38160 C39150 B632A0 B63EB0 808AE160 actors
126 ovl_Bg_Spot18_Futa C39150 C392F0 B63EB0 B64010 808AF150 actors
127 ovl_Bg_Spot18_Obj C392F0 C39BC0 B64010 B64660 808AF2F0 actors
128 ovl_Bg_Spot18_Shutter C39BC0 C3A110 B64660 B64A80 808AFBC0 actors
129 ovl_Bg_Sst_Floor C3A110 C3A670 B64A80 B64F70 808B0110 actors
130 ovl_Bg_Toki_Hikari C3A670 C3B410 B64F70 B657A0 808B0670 actors
131 ovl_Bg_Toki_Swd C3B410 C3CA60 B657A0 B661E0 808B1410 actors
132 ovl_Bg_Treemouth C3CA60 C3E0C0 B661E0 B66DE0 808B2A60 actors
133 ovl_Bg_Umajump C3E0C0 C3E250 B66DE0 B66F50 808B40C0 actors
134 ovl_Bg_Vb_Sima C3E250 C3E970 B66F50 B675A0 808B4250 actors
135 ovl_Bg_Ydan_Hasi C3E970 C3F120 B675A0 B67BC0 808B4970 actors
136 ovl_Bg_Ydan_Maruta C3F120 C3F800 B67BC0 B68140 808B5120 actors
137 ovl_Bg_Ydan_Sp C3F800 C40F20 B68140 B69220 808B5800 actors
138 ovl_Bg_Zg C40F20 C41370 B69220 B695A0 808B6F20 actors
139 ovl_Boss_Dodongo C41370 C4AE70 B695A0 B6F870 808B7370 actors
140 ovl_Boss_Fd C4AE70 C521D0 B6F870 B74570 808C0E70 actors
141 ovl_Boss_Fd2 C521D0 C55F00 B74570 B770D0 808C81D0 actors
142 ovl_Boss_Ganon C55F00 C781B0 B770D0 B8C800 808CBF00 actors
143 ovl_Boss_Ganon2 C781B0 C89500 B8C800 B96DB0 808F1D30 actors
144 ovl_Boss_Ganondrof C89500 C8E290 B96DB0 B9A120 80904BA0 actors
145 ovl_Boss_Goma C8E290 C94230 B9A120 B9DB30 80909930 actors
146 ovl_Boss_Mo C94230 C9FD00 B9DB30 BA5D50 8090F8D0 actors
147 ovl_Boss_Sst C9FD00 CAC290 BA5D50 BAD8B0 8091FEB0 actors
148 ovl_Boss_Tw CAC290 CBF3E0 BAD8B0 BB9EA0 8092C480 actors
149 ovl_Boss_Va CBF3E0 CCDC70 BB9EA0 BC34D0 80942050 actors
150 ovl_Demo_6K CCDC70 CD09D0 BC34D0 BC5620 809592E0 actors
151 ovl_Demo_Du CD09D0 CD41B0 BC5620 BC71C0 8095C040 actors
152 ovl_Demo_Ec CD41B0 CD7A10 BC71C0 BC88E0 8095F820 actors
153 ovl_Demo_Effect CD7A10 CDD5B0 BC88E0 BCC450 80963080 actors
154 ovl_Demo_Ext CDD5B0 CDDF00 BCC450 BCCB80 80968C20 actors
155 ovl_Demo_Geff CDDF00 CDE720 BCCB80 BCD170 80969570 actors
156 ovl_Demo_Gj CDE720 CE23D0 BCD170 BCEDE0 80969D90 actors
157 ovl_Demo_Go CE23D0 CE3120 BCEDE0 BCF720 8096DA40 actors
158 ovl_Demo_Gt CE3120 CE8730 BCF720 BD22A0 8096E790 actors
159 ovl_Demo_Ik CE8730 CE9C40 BD22A0 BD2FB0 80973DA0 actors
160 ovl_Demo_Im CE9C40 CEDBB0 BD2FB0 BD4F50 809752B0 actors
161 ovl_Demo_Kankyo CEDBB0 CF1850 BD4F50 BD7360 80979220 actors
162 ovl_Demo_Kekkai CF1850 CF2B40 BD7360 BD81F0 8097CF10 actors
163 ovl_Demo_Sa CF2B40 CF5660 BD81F0 BD9750 8097E200 actors
164 ovl_Demo_Shd CF5660 CF7A70 BD9750 BDAF70 80980D20 actors
165 ovl_Demo_Tre_Lgt CF7A70 CF8180 BDAF70 BDB560 80983130 actors
166 ovl_Door_Ana CF8180 CF87F0 BDB560 BDBAC0 80983840 actors
167 ovl_Door_Gerudo CF87F0 CF8DE0 BDBAC0 BDBFC0 80983EB0 actors
168 ovl_Door_Killer CF8DE0 CFA350 BDBFC0 BDD040 809844A0 actors
169 ovl_Door_Shutter CFA350 CFC610 BDD040 BDE930 80985A10 actors
170 ovl_Door_Toki CFC610 CFC770 BDE930 BDEA50 80987CD0 actors
171 ovl_Door_Warp1 CFC770 D00A70 BDEA50 BE10D0 80987E30 actors
172 ovl_Efc_Erupc D00A70 D01560 BE10D0 BE19C0 8098C140 actors
173 ovl_Eff_Dust D01560 D02930 BE19C0 BE25B0 8098CC30 actors
174 ovl_Effect_Ss_Blast D02930 D02CC0 BE25B0 BE2920 8098E000 effects
175 ovl_Effect_Ss_Bomb D02CC0 D030F0 BE2920 BE2D00 8098E390 effects
176 ovl_Effect_Ss_Bomb2 D030F0 D039F0 BE2D00 BE33B0 8098E7C0 effects
177 ovl_Effect_Ss_Bubble D039F0 D03E70 BE33B0 BE37B0 8098F0C0 effects
178 ovl_Effect_Ss_D_Fire D03E70 D04360 BE37B0 BE3C50 8098F540 effects
179 ovl_Effect_Ss_Dead_Db D04360 D04840 BE3C50 BE4100 8098FA30 effects
180 ovl_Effect_Ss_Dead_Dd D04840 D04DD0 BE4100 BE4620 8098FF10 effects
181 ovl_Effect_Ss_Dead_Ds D04DD0 D05250 BE4620 BE4A50 809904A0 effects
182 ovl_Effect_Ss_Dead_Sound D05250 D05390 BE4A50 BE4B90 80990920 effects
183 ovl_Effect_Ss_Dt_Bubble D05390 D05920 BE4B90 BE5070 80990A60 effects
184 ovl_Effect_Ss_Dust D05920 D06160 BE5070 BE5720 80990FF0 effects
185 ovl_Effect_Ss_En_Fire D06160 D068B0 BE5720 BE5DB0 80991830 effects
186 ovl_Effect_Ss_En_Ice D068B0 D07170 BE5DB0 BE6560 80991F80 effects
187 ovl_Effect_Ss_Extra D07170 D07530 BE6560 BE6900 80992840 effects
188 ovl_Effect_Ss_Fcircle D07530 D079E0 BE6900 BE6D70 80992C00 effects
189 ovl_Effect_Ss_Fhg_Flash D079E0 D08960 BE6D70 BE7780 809930B0 effects
190 ovl_Effect_Ss_Fire_Tail D08960 D09060 BE7780 BE7DD0 80994030 effects
191 ovl_Effect_Ss_G_Fire D09060 D092F0 BE7DD0 BE8030 80994730 effects
192 ovl_Effect_Ss_G_Magma D092F0 D09550 BE8030 BE8270 809949C0 effects
193 ovl_Effect_Ss_G_Magma2 D09550 D09A60 BE8270 BE8730 80994C20 effects
194 ovl_Effect_Ss_G_Ripple D09A60 D09FC0 BE8730 BE8C10 80995130 effects
195 ovl_Effect_Ss_G_Spk D09FC0 D0A570 BE8C10 BE9130 80995690 effects
196 ovl_Effect_Ss_G_Splash D0A570 D0AA20 BE9130 BE94F0 80995C40 effects
197 ovl_Effect_Ss_Hahen D0AA20 D0B060 BE94F0 BE99E0 809960F0 effects
198 ovl_Effect_Ss_HitMark D0B060 D0B5B0 BE99E0 BE9E90 80996730 effects
199 ovl_Effect_Ss_Ice_Piece D0B5B0 D0B9F0 BE9E90 BEA290 80996C80 effects
200 ovl_Effect_Ss_Ice_Smoke D0B9F0 D0BED0 BEA290 BEA6D0 809970C0 effects
201 ovl_Effect_Ss_K_Fire D0BED0 D0C310 BEA6D0 BEAAD0 809975A0 effects
202 ovl_Effect_Ss_Kakera D0C310 D0D3A0 BEAAD0 BEB710 809979E0 effects
203 ovl_Effect_Ss_KiraKira D0D3A0 D0DA10 BEB710 BEBCB0 80998A70 effects
204 ovl_Effect_Ss_Lightning D0DA10 D0E0E0 BEBCB0 BEC300 809990E0 effects
205 ovl_Effect_Ss_Sibuki D0E0E0 D0E7B0 BEC300 BEC900 809997B0 effects
206 ovl_Effect_Ss_Sibuki2 D0E7B0 D0EAE0 BEC900 BECC00 80999E80 effects
207 ovl_Effect_Ss_Solder_Srch_Ball D0EAE0 D0EC90 BECC00 BECDA0 8099A1B0 effects
208 ovl_Effect_Ss_Stick D0EC90 D0F030 BECDA0 BED0F0 8099A360 effects
209 ovl_Effect_Ss_Stone1 D0F030 D0F3B0 BED0F0 BED440 8099A700 effects
210 ovl_Elf_Msg D0F3B0 D0F9A0 BED440 BED8A0 8099AA80 actors
211 ovl_Elf_Msg2 D0F9A0 D0FE10 BED8A0 BEDBA0 8099B070 actors
212 ovl_En_Am D0FE10 D12210 BEDBA0 BEF3E0 8099B4E0 actors
213 ovl_En_Ani D12210 D12F80 BEF3E0 BEFD70 8099D8E0 actors
214 ovl_En_Anubice D12F80 D14230 BEFD70 BF0B40 8099E650 actors
215 ovl_En_Anubice_Fire D14230 D14FF0 BF0B40 BF16A0 8099F900 actors
216 ovl_En_Anubice_Tag D14FF0 D152C0 BF16A0 BF1910 809A06C0 actors
217 ovl_En_Arow_Trap D152C0 D15410 BF1910 BF1A50 809A0990 actors
218 ovl_En_Arrow D15410 D16B10 BF1A50 BF2AC0 809A0AE0 actors
219 ovl_En_Attack_Niw D16B10 D17D70 BF2AC0 BF3820 809A21E0 actors
220 ovl_En_Ba D17D70 D19C40 BF3820 BF4C50 809A3440 actors
221 ovl_En_Bb D19C40 D1D920 BF4C50 BF7810 809A5310 actors
222 ovl_En_Bdfire D1D920 D1E4C0 BF7810 BF8120 809A8FF0 actors
223 ovl_En_Bigokuta D1E4C0 D20FC0 BF8120 BF9E50 809A9B90 actors
224 ovl_En_Bili D20FC0 D23290 BF9E50 BFB680 809AC690 actors
225 ovl_En_Bird D23290 D23750 BFB680 BFBA60 809AE960 actors
226 ovl_En_Blkobj D23750 D23CB0 BFBA60 BFBEE0 809AEE20 actors
227 ovl_En_Bom D23CB0 D24B80 BFBEE0 BFCA90 809AF380 actors
228 ovl_En_Bom_Bowl_Man D24B80 D260C0 BFCA90 BFDA30 809B0250 actors
229 ovl_En_Bom_Bowl_Pit D260C0 D26A30 BFDA30 BFE190 809B1790 actors
230 ovl_En_Bom_Chu D26A30 D280D0 BFE190 BFF380 809B2100 actors
231 ovl_En_Bombf D280D0 D29560 BFF380 C00370 809B37A0 actors
232 ovl_En_Boom D29560 D29E30 C00370 C00AB0 809B4C30 actors
233 ovl_En_Box D29E30 D2B980 C00AB0 C01DA0 809B5500 actors
234 ovl_En_Brob D2B980 D2CA70 C01DA0 C029E0 809B7060 actors
235 ovl_En_Bubble D2CA70 D2DE90 C029E0 C03940 809B8150 actors
236 ovl_En_Butte D2DE90 D2F460 C03940 C04910 809B9570 actors
237 ovl_En_Bw D2F460 D327F0 C04910 C06BC0 809BAB40 actors
238 ovl_En_Bx D327F0 D332F0 C06BC0 C07560 809BDED0 actors
239 ovl_En_Changer D332F0 D33CD0 C07560 C07CB0 809BE9D0 actors
240 ovl_En_Clear_Tag D33CD0 D3C840 C07CB0 C0C090 809BF3B0 actors
241 ovl_En_Cow D3C840 D3DCA0 C0C090 C0CDB0 809CA950 actors
242 ovl_En_Crow D3DCA0 D3F340 C0CDB0 C0DE80 809CBDB0 actors
243 ovl_En_Cs D3F340 D40570 C0DE80 C0EC70 809CD450 actors
244 ovl_En_Daiku D40570 D41CB0 C0EC70 C0FE50 809CE680 actors
245 ovl_En_Daiku_Kakariko D41CB0 D43070 C0FE50 C10D30 809CFDC0 actors
246 ovl_En_Dekubaba D43070 D46B20 C10D30 C132F0 809D1180 actors
247 ovl_En_Dekunuts D46B20 D48320 C132F0 C142A0 809D4C30 actors
248 ovl_En_Dh D48320 D49E00 C142A0 C15620 809D6430 actors
249 ovl_En_Dha D49E00 D4AE00 C15620 C16200 809D7F10 actors
250 ovl_En_Diving_Game D4AE00 D4C7B0 C16200 C17400 809D8F10 actors
251 ovl_En_Dns D4C7B0 D4DB40 C17400 C180D0 809DA8C0 actors
252 ovl_En_Dnt_Demo D4DB40 D4E860 C180D0 C18B20 809DBC50 actors
253 ovl_En_Dnt_Jiji D4E860 D4FD80 C18B20 C197E0 809DC970 actors
254 ovl_En_Dnt_Nomal D4FD80 D52B80 C197E0 C1B390 809DDE90 actors
255 ovl_En_Dodojr D52B80 D54A20 C1B390 C1C8E0 809E0C90 actors
256 ovl_En_Dodongo D54A20 D577C0 C1C8E0 C1E820 809E2B30 actors
257 ovl_En_Dog D577C0 D58970 C1E820 C1F4A0 809E58D0 actors
258 ovl_En_Door D58970 D597B0 C1F4A0 C20070 809E6A80 actors
259 ovl_En_Ds D597B0 D5A3D0 C20070 C208E0 809E78C0 actors
260 ovl_En_Du D5A3D0 D5BE60 C208E0 C21B30 809E84E0 actors
261 ovl_En_Dy_Extra D5BE60 D5C400 C21B30 C22020 809E9F70 actors
262 ovl_En_Eg D5C400 D5C5B0 C22020 C22180 809EA510 actors
263 ovl_En_Eiyer D5C5B0 D5E210 C22180 C235B0 809EA6C0 actors
264 ovl_En_Elf D5E210 D62BD0 C235B0 C265B0 809EC320 actors
265 ovl_En_Encount1 D62BD0 D63730 C265B0 C26F10 809F0CE0 actors
266 ovl_En_Encount2 D63730 D64960 C26F10 C27D20 809F1840 actors
267 ovl_En_Ex_Item D64960 D65AE0 C27D20 C289E0 809F2A70 actors
268 ovl_En_Ex_Ruppy D65AE0 D66BA0 C289E0 C296B0 809F3BF0 actors
269 ovl_En_Fd D66BA0 D69840 C296B0 C2B7A0 809F4CB0 actors
270 ovl_En_Fd_Fire D69840 D6A550 C2B7A0 C2C2A0 809F7950 actors
271 ovl_En_Fhg_Fire D6A550 D6CBF0 C2C2A0 C2DE40 809F8660 actors
272 ovl_En_Fire_Rock D6CBF0 D6DD00 C2DE40 C2EAB0 809FAD00 actors
273 ovl_En_Firefly D6DD00 D6FE70 C2EAB0 C30130 809FBE10 actors
274 ovl_En_Fish D6FE70 D71F80 C30130 C315F0 809FDF80 actors
275 ovl_En_Floormas D71F80 D75360 C315F0 C335E0 80A00090 actors
276 ovl_En_Fr D75360 D77DF0 C335E0 C35420 80A03470 actors
277 ovl_En_Fu D77DF0 D78B30 C35420 C35E90 80A05F00 actors
278 ovl_En_Fw D78B30 D7A2F0 C35E90 C371C0 80A06C50 actors
279 ovl_En_Fz D7A2F0 D7C300 C371C0 C38870 80A08410 actors
280 ovl_En_G_Switch D7C300 D7DB20 C38870 C39B00 80A0A420 actors
281 ovl_En_Ganon_Mant D7DB20 D81D50 C39B00 C3B850 80A0BC40 actors
282 ovl_En_Ganon_Organ D81D50 D88D90 C3B850 C3EEE0 80A0FE70 actors
283 ovl_En_Gb D88D90 D8A4C0 C3EEE0 C40010 80A16EB0 actors
284 ovl_En_Ge1 D8A4C0 D8C4F0 C40010 C41440 80A185E0 actors
285 ovl_En_Ge2 D8C4F0 D8DE90 C41440 C425D0 80A1A610 actors
286 ovl_En_Ge3 D8DE90 D8EAD0 C425D0 C42EF0 80A1BFB0 actors
287 ovl_En_GeldB D8EAD0 D93E80 C42EF0 C462C0 80A1CBF0 actors
288 ovl_En_GirlA D93E80 D967A0 C462C0 C47730 80A21FA0 actors
289 ovl_En_Gm D967A0 D974D0 C47730 C48140 80A248C0 actors
290 ovl_En_Go D974D0 D9BB10 C48140 C4AEC0 80A255F0 actors
291 ovl_En_Go2 D9BB10 DA1B50 C4AEC0 C4ECE0 80A29C30 actors
292 ovl_En_Goma DA1B50 DA4800 C4ECE0 C50A80 80A2FC70 actors
293 ovl_En_Goroiwa DA4800 DA6BC0 C50A80 C523A0 80A32920 actors
294 ovl_En_Gs DA6BC0 DA8A30 C523A0 C53A00 80A34CE0 actors
295 ovl_En_Guest DA8A30 DA93D0 C53A00 C54210 80A36B50 actors
296 ovl_En_Hata DA93D0 DA9960 C54210 C54710 80A374F0 actors
297 ovl_En_Heishi1 DA9960 DAAE70 C54710 C55570 80A37A80 actors
298 ovl_En_Heishi2 DAAE70 DAD070 C55570 C56A20 80A38F90 actors
299 ovl_En_Heishi3 DAD070 DADA40 C56A20 C57150 80A3B190 actors
300 ovl_En_Heishi4 DADA40 DAE940 C57150 C57BE0 80A3BB60 actors
301 ovl_En_Hintnuts DAE940 DB0370 C57BE0 C58D90 80A3CA60 actors
302 ovl_En_Holl DB0370 DB1340 C58D90 C59930 80A3E490 actors
303 ovl_En_Honotrap DB1340 DB28A0 C59930 C5A900 80A3F460 actors
304 ovl_En_Horse DB28A0 DBEB00 C5A900 C62100 80A409C0 actors
305 ovl_En_Horse_Game_Check DBEB00 DBFBD0 C62100 C62D20 80A4CC20 actors
306 ovl_En_Horse_Ganon DBFBD0 DC0950 C62D20 C63790 80A4DCF0 actors
307 ovl_En_Horse_Link_Child DC0950 DC2750 C63790 C64990 80A4EA70 actors
308 ovl_En_Horse_Normal DC2750 DC4D70 C64990 C661E0 80A50870 actors
309 ovl_En_Horse_Zelda DC4D70 DC5860 C661E0 C66AB0 80A52E90 actors
310 ovl_En_Hs DC5860 DC6400 C66AB0 C672F0 80A53980 actors
311 ovl_En_Hs2 DC6400 DC69E0 C672F0 C677D0 80A54520 actors
312 ovl_En_Hy DC69E0 DCA320 C677D0 C69C00 80A54B00 actors
313 ovl_En_Ice_Hono DCA320 DCB510 C69C00 C6A8D0 80A58440 actors
314 ovl_En_Ik DCB510 DCFB60 C6A8D0 C6D1C0 80A59630 actors
315 ovl_En_In DCFB60 DD2900 C6D1C0 C6F290 80A5DC90 actors
316 ovl_En_Insect DD2900 DD4E20 C6F290 C70B30 80A60A30 actors
317 ovl_En_Ishi DD4E20 DDDF70 C70B30 C71E90 80A62F50 actors
318 ovl_En_It DDDF70 DDE100 C71E90 C71FC0 80A6C0A0 actors
319 ovl_En_Jj DDE100 DDF6D0 C71FC0 C72C10 80A6C230 actors
320 ovl_En_Js DDF6D0 DE00A0 C72C10 C73330 80A6D800 actors
321 ovl_En_Jsjutan DE00A0 DE4E70 C73330 C750A0 80A6E1D0 actors
322 ovl_En_Kakasi DE4E70 DE5BB0 C750A0 C75AC0 80A73B00 actors
323 ovl_En_Kakasi2 DE5BB0 DE62D0 C75AC0 C76060 80A74840 actors
324 ovl_En_Kakasi3 DE62D0 DE73B0 C76060 C76CA0 80A74F60 actors
325 ovl_En_Kanban DE73B0 DEA500 C76CA0 C78AB0 80A76040 actors
326 ovl_En_Karebaba DEA500 DEBDF0 C78AB0 C79C30 80A79190 actors
327 ovl_En_Ko DEBDF0 DEFF30 C79C30 C7C1D0 80A7AA80 actors
328 ovl_En_Kusa DEFF30 DF1410 C7C1D0 C7D120 80A7EBC0 actors
329 ovl_En_Kz DF1410 DF29B0 C7D120 C7E120 80A800A0 actors
330 ovl_En_Light DF29B0 DF37B0 C7E120 C7EB00 80A81640 actors
331 ovl_En_Lightbox DF37B0 DF3C30 C7EB00 C7EED0 80A82440 actors
332 ovl_En_M_Fire1 DF3C30 DF3DD0 C7EED0 C7F020 80A828C0 actors
333 ovl_En_M_Thunder DF3DD0 DF53D0 C7F020 C80020 80A82A60 actors
334 ovl_En_Ma1 DF53D0 DF66B0 C80020 C80E30 80A84060 actors
335 ovl_En_Ma2 DF66B0 DF7710 C80E30 C81AB0 80A85340 actors
336 ovl_En_Ma3 DF7710 DF86C0 C81AB0 C826D0 80A863A0 actors
337 ovl_En_Mag DF86C0 DFABE0 C826D0 C84120 80A87350 actors
338 ovl_En_Mb DFABE0 DFEE10 C84120 C86C10 80A89870 actors
339 ovl_En_Md DFEE10 E01480 C86C10 C88310 80A8DAA0 actors
340 ovl_En_Mk E01480 E02310 C88310 C88CF0 80A90110 actors
341 ovl_En_Mm E02310 E03970 C88CF0 C89DF0 80A90FA0 actors
342 ovl_En_Mm2 E03970 E04730 C89DF0 C8A860 80A92600 actors
343 ovl_En_Ms E04730 E04E20 C8A860 C8AE10 80A933C0 actors
344 ovl_En_Mu E04E20 E05740 C8AE10 C8B5D0 80A93AB0 actors
345 ovl_En_Nb E05740 E09D10 C8B5D0 C8DA50 80A943D0 actors
346 ovl_En_Niw E09D10 E0D040 C8DA50 C8FF30 80A989A0 actors
347 ovl_En_Niw_Girl E0D040 E0DB10 C8FF30 C90880 80A9BCD0 actors
348 ovl_En_Niw_Lady E0DB10 E0F410 C90880 C91A70 80A9C7A0 actors
349 ovl_En_Nutsball E0F410 E0FA30 C91A70 C91FF0 80A9E0A0 actors
350 ovl_En_Nwc E0FA30 E10450 C91FF0 C92880 80A9E6C0 actors
351 ovl_En_Ny E10450 E11D90 C92880 C93B00 80A9F0E0 actors
352 ovl_En_OE2 E11D90 E11E70 C93B00 C93B90 80AA0A20 actors
353 ovl_En_Okarina_Effect E11E70 E12230 C93B90 C93E80 80AA0B00 actors
354 ovl_En_Okarina_Tag E12230 E13730 C93E80 C94A80 80AA0EC0 actors
355 ovl_En_Okuta E13730 E15D10 C94A80 C964C0 80AA23C0 actors
356 ovl_En_Ossan E15D10 E1C2F0 C964C0 C99CA0 80AA49A0 actors
357 ovl_En_Owl E1C2F0 E1FE90 C99CA0 C9BF20 80AAAF80 actors
358 ovl_En_Part E1FE90 E214F0 C9BF20 C9CF90 80AAEB20 actors
359 ovl_En_Peehat E214F0 E24BF0 C9CF90 C9F260 80AB0180 actors
360 ovl_En_Po_Desert E24BF0 E259B0 C9F260 C9FDB0 80AB3880 actors
361 ovl_En_Po_Field E259B0 E293B0 C9FDB0 CA2620 80AB4640 actors
362 ovl_En_Po_Relay E293B0 E2AAC0 CA2620 CA37A0 80AB80D0 actors
363 ovl_En_Po_Sisters E2AAC0 E2F7B0 CA37A0 CA69E0 80AB97E0 actors
364 ovl_En_Poh E2F7B0 E339A0 CA69E0 CA9420 80ABE4D0 actors
365 ovl_En_Pu_box E339A0 E33CE0 CA9420 CA9700 80AC26C0 actors
366 ovl_En_Rd E33CE0 E365A0 CA9700 CAB110 80AC2A00 actors
367 ovl_En_Reeba E365A0 E38010 CAB110 CAC410 80AC52C0 actors
368 ovl_En_River_Sound E38010 E389A0 CAC410 CACBE0 80AC6D30 actors
369 ovl_En_Rl E389A0 E39880 CACBE0 CAD500 80AC76C0 actors
370 ovl_En_Rr E39880 E3BDB0 CAD500 CAF010 80AC85A0 actors
371 ovl_En_Ru1 E3BDB0 E43450 CAF010 CB2E60 80ACAAD0 actors
372 ovl_En_Ru2 E43450 E461D0 CB2E60 CB44A0 80AD2170 actors
373 ovl_En_Sa E461D0 E48440 CB44A0 CB5B00 80AD4EF0 actors
374 ovl_En_Sb E48440 E49880 CB5B00 CB6880 80AD7160 actors
375 ovl_En_Scene_Change E49880 E499B0 CB6880 CB6970 80AD85A0 actors
376 ovl_En_Sda E499B0 E4AFE0 CB6970 CB7840 80AD86D0 actors
377 ovl_En_Shopnuts E4AFE0 E4BEF0 CB7840 CB82A0 80AD9DC0 actors
378 ovl_En_Si E4BEF0 E4C3F0 CB82A0 CB86C0 80ADACD0 actors
379 ovl_En_Siofuki E4C3F0 E4D1A0 CB86C0 CB9100 80ADB1D0 actors
380 ovl_En_Skb E4D1A0 E4EA90 CB9100 CBA320 80ADBF80 actors
381 ovl_En_Skj E4EA90 E523D0 CBA320 CBC6E0 80ADD870 actors
382 ovl_En_Skjneedle E523D0 E526E0 CBC6E0 CBC990 80AE11C0 actors
383 ovl_En_Ssh E526E0 E54CD0 CBC990 CBE3E0 80AE14D0 actors
384 ovl_En_St E54CD0 E57940 CBE3E0 CC02C0 80AE3AC0 actors
385 ovl_En_Sth E57940 E5BA00 CC02C0 CC2E90 80AE6730 actors
386 ovl_En_Stream E5BA00 E5BF90 CC2E90 CC3360 80AEA7F0 actors
387 ovl_En_Sw E5BF90 E5F700 CC3360 CC5BA0 80AEAD80 actors
388 ovl_En_Syateki_Itm E5F700 E604A0 CC5BA0 CC6610 80AEE570 actors
389 ovl_En_Syateki_Man E604A0 E61260 CC6610 CC7040 80AEF310 actors
390 ovl_En_Syateki_Niw E61260 E632F0 CC7040 CC8810 80AF00D0 actors
391 ovl_En_Ta E632F0 E66CB0 CC8810 CCAB60 80AF2160 actors
392 ovl_En_Takara_Man E66CB0 E67570 CCAB60 CCB2E0 80AF5B20 actors
393 ovl_En_Tana E67570 E67820 CCB2E0 CCB520 80AF63E0 actors
394 ovl_En_Tg E67820 E67F00 CCB520 CCBAF0 80AF6690 actors
395 ovl_En_Tite E67F00 E6ACA0 CCBAF0 CCD6A0 80AF6D70 actors
396 ovl_En_Tk E6ACA0 E6CAD0 CCD6A0 CCECD0 80AF9B10 actors
397 ovl_En_Torch E6CAD0 E6CBC0 CCECD0 CCEDB0 80AFB940 actors
398 ovl_En_Torch2 E6CBC0 E6F320 CCEDB0 CD0A50 80AFBA30 actors
399 ovl_En_Toryo E6F320 E6FFB0 CD0A50 CD1380 80AFE1D0 actors
400 ovl_En_Tp E6FFB0 E71E20 CD1380 CD29B0 80AFEE60 actors
401 ovl_En_Tr E71E20 E73720 CD29B0 CD3BB0 80B00CD0 actors
402 ovl_En_Trap E73720 E749C0 CD3BB0 CD47F0 80B025D0 actors
403 ovl_En_Tubo_Trap E749C0 E75660 CD47F0 CD5100 80B03870 actors
404 ovl_En_Vali E75660 E77D20 CD5100 CD6BB0 80B04510 actors
405 ovl_En_Vase E77D20 E77E20 CD6BB0 CD6C90 80B06BD0 actors
406 ovl_En_Vb_Ball E77E20 E78FD0 CD6C90 CD79E0 80B06CD0 actors
407 ovl_En_Viewer E78FD0 E7BE70 CD79E0 CD9950 80B07E80 actors
408 ovl_En_Vm E7BE70 E7D730 CD9950 CDAAF0 80B0AD40 actors
409 ovl_En_Wall_Tubo E7D730 E7DC20 CDAAF0 CDAF10 80B0C600 actors
410 ovl_En_Wallmas E7DC20 E7F630 CDAF10 CDC0B0 80B0CAF0 actors
411 ovl_En_Weather_Tag E7F630 E80520 CDC0B0 CDC7F0 80B0E500 actors
412 ovl_En_Weiyer E80520 E81F20 CDC7F0 CDD910 80B0F3F0 actors
413 ovl_En_Wf E81F20 E86230 CDD910 CE0460 80B10DF0 actors
414 ovl_En_Wonder_Item E86230 E86E80 CE0460 CE0D20 80B15100 actors
415 ovl_En_Wonder_Talk E86E80 E87510 CE0D20 CE1270 80B15E30 actors
416 ovl_En_Wonder_Talk2 E87510 E87BB0 CE1270 CE1810 80B164C0 actors
417 ovl_En_Wood02 E87BB0 E88D80 CE1810 CE2650 80B16B60 actors
418 ovl_En_Xc E88D80 E8F4E0 CE2650 CE5B10 80B17D40 actors
419 ovl_En_Yabusame_Mark E8F4E0 E8FBB0 CE5B10 CE6070 80B1E4D0 actors
420 ovl_En_Yukabyun E8FBB0 E901C0 CE6070 CE65C0 80B1EBA0 actors
421 ovl_En_Zf E901C0 E96CA0 CE65C0 CEAA50 80B1F1B0 actors
422 ovl_En_Zl1 E96CA0 E9AAB0 CEAA50 CEC9C0 80B25CA0 actors
423 ovl_En_Zl2 E9AAB0 E9F1B0 CEC9C0 CEEDB0 80B29AB0 actors
424 ovl_En_Zl3 E9F1B0 EA7000 CEEDB0 CF2E70 80B2E1B0 actors
425 ovl_En_Zl4 EA7000 EABA30 CF2E70 CF5440 80B36000 actors
426 ovl_En_Zo EABA30 EADFF0 CF5440 CF6E60 80B3AA30 actors
427 ovl_En_fHG EADFF0 EB0920 CF6E60 CF89A0 80B3CFF0 actors
428 ovl_End_Title EB0920 EB4A40 CF89A0 CFA410 80B3F920 actors
429 ovl_Fishing EB4A40 EC84E0 CFA410 D078E0 80B43A40 actors
430 ovl_Item_B_Heart EC84E0 EC88F0 D078E0 D07C50 80B5E5B0 actors
431 ovl_Item_Etcetera EC88F0 EC91C0 D07C50 D082F0 80B5E9C0 actors
432 ovl_Item_Inbox EC91C0 EC9320 D082F0 D08400 80B5F290 actors
433 ovl_Item_Ocarina EC9320 EC9AF0 D08400 D089C0 80B5F3F0 actors
434 ovl_Item_Shield EC9AF0 ECA500 D089C0 D091C0 80B5FBC0 actors
435 ovl_Magic_Dark ECA500 ECBD50 D091C0 D0A500 80B605D0 actors
436 ovl_Magic_Fire ECBD50 ECE050 D0A500 D0C440 80B61E20 actors
437 ovl_Magic_Wind ECE050 ECFD50 D0C440 D0DDD0 80B64120 actors
438 ovl_Mir_Ray ECFD50 ED1600 D0DDD0 D0F1C0 80B65E20 actors
439 ovl_Obj_Bean ED1600 ED3D90 D0F1C0 D10A90 80B676D0 actors
440 ovl_Obj_Blockstop ED3D90 ED3F30 D10A90 D10C10 80B69E60 actors
441 ovl_Obj_Bombiwa ED3F30 ED44A0 D10C10 D110D0 80B6A000 actors
442 ovl_Obj_Comb ED44A0 ED4D00 D110D0 D11810 80B6A570 actors
443 ovl_Obj_Dekujr ED4D00 ED5340 D11810 D11D50 80B6ADD0 actors
444 ovl_Obj_Elevator ED5340 ED5700 D11D50 D12040 80B6B410 actors
445 ovl_Obj_Hamishi ED5700 ED5F50 D12040 D12750 80B6B7D0 actors
446 ovl_Obj_Hana ED5F50 ED6260 D12750 D129C0 80B6C020 actors
447 ovl_Obj_Hsblock ED6260 ED6830 D129C0 D12E70 80B6C330 actors
448 ovl_Obj_Ice_Poly ED6830 ED71E0 D12E70 D13660 80B6C900 actors
449 ovl_Obj_Kibako ED71E0 ED7EE0 D13660 D13F40 80B6D2B0 actors
450 ovl_Obj_Kibako2 ED7EE0 ED85A0 D13F40 D14500 80B6DFB0 actors
451 ovl_Obj_Lift ED85A0 ED8FC0 D14500 D14D40 80B6E670 actors
452 ovl_Obj_Lightswitch ED8FC0 EDA3F0 D14D40 D15B10 80B6F090 actors
453 ovl_Obj_Makekinsuta EDA3F0 EDA540 D15B10 D15C50 80B704C0 actors
454 ovl_Obj_Makeoshihiki EDA540 EDA9D0 D15C50 D16030 80B70610 actors
455 ovl_Obj_Mure EDA9D0 EDB9E0 D16030 D16B60 80B70AA0 actors
456 ovl_Obj_Mure2 EDB9E0 EDC400 D16B60 D172E0 80B71AB0 actors
457 ovl_Obj_Mure3 EDC400 EDCBD0 D172E0 D17910 80B724D0 actors
458 ovl_Obj_Oshihiki EDCBD0 EDE680 D17910 D18BB0 80B72CA0 actors
459 ovl_Obj_Roomtimer EDE680 EDE8D0 D18BB0 D18DB0 80B74750 actors
460 ovl_Obj_Switch EDE8D0 EE06B0 D18DB0 D1A080 80B749A0 actors
461 ovl_Obj_Syokudai EE06B0 EE12F0 D1A080 D1AAB0 80B76780 actors
462 ovl_Obj_Timeblock EE12F0 EE1F40 D1AAB0 D1B3B0 80B773D0 actors
463 ovl_Obj_Tsubo EE1F40 EE2F30 D1B3B0 D1BF10 80B78020 actors
464 ovl_Obj_Warp2block EE2F30 EE3A60 D1BF10 D1C7E0 80B79010 actors
465 ovl_Object_Kankyo EE3A60 EE6CE0 D1C7E0 D1EB40 80B79B40 actors
466 ovl_Oceff_Spot EE6CE0 EE7C10 D1EB40 D1F830 80B7CDC0 actors
467 ovl_Oceff_Storm EE7C10 EE97C0 D1F830 D212B0 80B7DCF0 actors
468 ovl_Oceff_Wipe EE97C0 EEA540 D212B0 D21E70 80B7F8A0 actors
469 ovl_Oceff_Wipe2 EEA540 EEBCB0 D21E70 D22CB0 80B80620 actors
470 ovl_Oceff_Wipe3 EEBCB0 EED400 D22CB0 D23F30 80B81D90 actors
471 ovl_Oceff_Wipe4 EED400 EEE3E0 D23F30 D24B10 80B834E0 actors
472 ovl_Shot_Sun EEE3E0 EEEAA0 D24B10 D250B0 80B844C0 actors

135
tools/disasm/gc-eu-mq/files_boot.csv
View file

@ -1,135 +0,0 @@
offset,vram,.text
0,80000460,src/boot/boot_main
140,800005A0,src/boot/idle
3D0,80000830,src/boot/viconfig
520,80000980,src/boot/z_std_dma
B60,80000FC0,src/boot/yaz0
EA0,80001300,src/boot/z_locale
F60,800013C0,src/boot/is_debug
FC0,80001420,src/libultra/io/driverominit
11A0,80001600,src/boot/mio0
1250,800016B0,src/boot/stackcheck
14A0,80001900,src/boot/logutils
1500,80001960,src/libultra/io/piacs
15C0,80001A20,src/libultra/os/sendmesg
1710,80001B70,src/libultra/os/stopthread
17D0,80001C30,src/libultra/io/viextendvstart
17E0,80001C40,src/libultra/os/recvmesg
1920,80001D80,src/libultra/os/initialize
1C70,800020D0,src/libultra/libc/ll
1F30,80002390,src/libultra/os/exceptasm
2860,80002CC0,src/libultra/os/thread
28A0,80002D00,src/libultra/os/destroythread
29B0,80002E10,src/libultra/libc/bzero
2A50,80002EB0,src/libultra/os/parameters
2AB0,80002F10,src/libultra/os/createthread
2C00,80003060,src/libultra/os/setsr
2C10,80003070,src/libultra/os/getsr
2C20,80003080,src/libultra/os/writebackdcache
2CA0,80003100,src/libultra/io/vigetnextframebuf
2CE0,80003140,src/libultra/io/pimgr
2E60,800032C0,src/libultra/io/devmgr
3270,800036D0,src/libultra/io/pirawdma
3340,800037A0,src/libultra/os/virtualtophysical
33C0,80003820,src/libultra/io/viblack
3430,80003890,src/libultra/io/sirawread
3480,800038E0,src/libultra/os/getthreadid
34A0,80003900,src/libultra/os/setintmask
3540,800039A0,src/libultra/io/visetmode
35A0,80003A00,src/libultra/os/probetlb
3660,80003AC0,src/libultra/os/getmemsize
3780,80003BE0,src/libultra/os/seteventmesg
3840,80003CA0,src/libultra/os/unmaptlball
3890,80003CF0,src/libultra/io/epidma
3930,80003D90,src/libultra/os/invalicache
39B0,80003E10,src/libultra/os/createmesgqueue
39E0,80003E40,src/libultra/os/invaldcache
3A90,80003EF0,src/libultra/io/si
3AC0,80003F20,src/libultra/os/jammesg
3C10,80004070,src/libultra/os/setthreadpri
3CF0,80004150,src/libultra/os/getthreadpri
3D10,80004170,src/libultra/io/epirawread
3E70,800042D0,src/libultra/io/viswapbuf
3EC0,80004320,src/libultra/io/epirawdma
40A0,80004500,src/libultra/libc/bcmp
41C0,80004620,src/libultra/os/gettime
4250,800046B0,src/libultra/os/timerintr
4680,80004AE0,src/libultra/os/getcount
4690,80004AF0,src/libultra/os/setglobalintmask
46E0,80004B40,src/libultra/os/setcompare
46F0,80004B50,src/libultra/libc/bcopy
4A00,80004E60,src/libultra/os/resetglobalintmask
4A60,80004EC0,src/libultra/os/interrupt
4AF0,80004F50,src/libultra/io/vi
4C10,80005070,src/libultra/io/viswapcontext
4F10,80005370,src/libultra/io/pigetcmdq
4F40,800053A0,src/libultra/io/epiread
4F90,800053F0,src/libultra/io/visetspecial
50F0,80005550,src/libultra/io/cartrominit
5250,800056B0,src/libultra/os/setfpccsr
5260,800056C0,src/libultra/os/getfpccsr
5270,800056D0,src/libultra/os/maptlbrdb
52D0,80005730,src/libultra/os/yieldthread
5320,80005780,src/libultra/os/getcause
5330,80005790,src/libultra/io/epirawwrite
5490,800058F0,src/libultra/io/sirawwrite
54E0,80005940,src/libultra/io/vimgr
57F0,80005C50,src/libultra/io/vigetcurrcontext
5800,80005C60,src/libultra/os/startthread
5950,80005DB0,src/libultra/io/visetyscale
59A0,80005E00,src/libultra/io/visetxscale
5AB0,80005F10,src/libultra/os/sethwintrroutine
5B20,80005F80,src/libultra/os/gethwintrroutine
5B50,80005FB0,src/libultra/os/setwatchlo
5B60,80005FC0,data/rsp_boot.text
offset,vram,.data
5C30,80006090,data/unk_800093F0.data
5C50,800060B0,data/unk_80009410.data
5C70,800060D0,src/boot/idle
5C90,800060F0,src/boot/viconfig
5CA0,80006100,src/boot/z_std_dma
5CB0,80006110,src/boot/z_locale
5CC0,80006120,src/libultra/io/driverominit
5CD0,80006130,src/boot/stackcheck
5CE0,80006140,src/libultra/io/piacs
5CF0,80006150,src/libultra/io/vimodepallan1
5D40,800061A0,src/libultra/os/initialize
5D60,800061C0,src/libultra/os/exceptasm
5D90,800061F0,src/libultra/os/thread
5DB0,80006210,src/libultra/io/pimgr
5DE0,80006240,src/libultra/os/seteventmesg
5DF0,80006250,src/libultra/os/timerintr
5E00,80006260,src/libultra/io/vimodentsclan1
5E50,800062B0,src/libultra/io/vimodempallan1
5EA0,80006300,src/libultra/io/vi
5F10,80006370,src/libultra/io/cartrominit
5F20,80006380,src/libultra/io/vimgr
offset,vram,.rodata
5F40,800063A0,src/boot/boot_main
5F50,800063B0,src/boot/idle
5F60,800063C0,src/boot/z_std_dma
5FC0,80006420,src/boot/z_locale
5FD0,80006430,src/boot/stackcheck
5FE0,80006440,src/boot/logutils
5FF0,80006450,src/libultra/os/exceptasm
6040,800064A0,src/libultra/io/devmgr
6060,800064C0,src/libultra/os/setintmask
60E0,80006540,src/boot/build
offset,vram,.bss
6110,80006570,src/boot/boot_main
6B00,80006F60,src/boot/idle
7710,80007B70,src/boot/z_std_dma
7E80,800082E0,src/boot/yaz0
8290,800086F0,src/boot/z_locale
82B0,80008710,src/libultra/io/driverominit
8330,80008790,src/libultra/io/piacs
8350,800087B0,src/libultra/os/initialize
8360,800087C0,src/libultra/io/pimgr
97D0,80009C30,src/libultra/os/seteventmesg
9850,80009CB0,src/libultra/os/timerintr
9890,80009CF0,src/libultra/io/cartrominit
9910,80009D70,src/libultra/io/vimgr
AB30,8000AF90,.end
1 offset vram .text
2 0 80000460 src/boot/boot_main
3 140 800005A0 src/boot/idle
4 3D0 80000830 src/boot/viconfig
5 520 80000980 src/boot/z_std_dma
6 B60 80000FC0 src/boot/yaz0
7 EA0 80001300 src/boot/z_locale
8 F60 800013C0 src/boot/is_debug
9 FC0 80001420 src/libultra/io/driverominit
10 11A0 80001600 src/boot/mio0
11 1250 800016B0 src/boot/stackcheck
12 14A0 80001900 src/boot/logutils
13 1500 80001960 src/libultra/io/piacs
14 15C0 80001A20 src/libultra/os/sendmesg
15 1710 80001B70 src/libultra/os/stopthread
16 17D0 80001C30 src/libultra/io/viextendvstart
17 17E0 80001C40 src/libultra/os/recvmesg
18 1920 80001D80 src/libultra/os/initialize
19 1C70 800020D0 src/libultra/libc/ll
20 1F30 80002390 src/libultra/os/exceptasm
21 2860 80002CC0 src/libultra/os/thread
22 28A0 80002D00 src/libultra/os/destroythread
23 29B0 80002E10 src/libultra/libc/bzero
24 2A50 80002EB0 src/libultra/os/parameters
25 2AB0 80002F10 src/libultra/os/createthread
26 2C00 80003060 src/libultra/os/setsr
27 2C10 80003070 src/libultra/os/getsr
28 2C20 80003080 src/libultra/os/writebackdcache
29 2CA0 80003100 src/libultra/io/vigetnextframebuf
30 2CE0 80003140 src/libultra/io/pimgr
31 2E60 800032C0 src/libultra/io/devmgr
32 3270 800036D0 src/libultra/io/pirawdma
33 3340 800037A0 src/libultra/os/virtualtophysical
34 33C0 80003820 src/libultra/io/viblack
35 3430 80003890 src/libultra/io/sirawread
36 3480 800038E0 src/libultra/os/getthreadid
37 34A0 80003900 src/libultra/os/setintmask
38 3540 800039A0 src/libultra/io/visetmode
39 35A0 80003A00 src/libultra/os/probetlb
40 3660 80003AC0 src/libultra/os/getmemsize
41 3780 80003BE0 src/libultra/os/seteventmesg
42 3840 80003CA0 src/libultra/os/unmaptlball
43 3890 80003CF0 src/libultra/io/epidma
44 3930 80003D90 src/libultra/os/invalicache
45 39B0 80003E10 src/libultra/os/createmesgqueue
46 39E0 80003E40 src/libultra/os/invaldcache
47 3A90 80003EF0 src/libultra/io/si
48 3AC0 80003F20 src/libultra/os/jammesg
49 3C10 80004070 src/libultra/os/setthreadpri
50 3CF0 80004150 src/libultra/os/getthreadpri
51 3D10 80004170 src/libultra/io/epirawread
52 3E70 800042D0 src/libultra/io/viswapbuf
53 3EC0 80004320 src/libultra/io/epirawdma
54 40A0 80004500 src/libultra/libc/bcmp
55 41C0 80004620 src/libultra/os/gettime
56 4250 800046B0 src/libultra/os/timerintr
57 4680 80004AE0 src/libultra/os/getcount
58 4690 80004AF0 src/libultra/os/setglobalintmask
59 46E0 80004B40 src/libultra/os/setcompare
60 46F0 80004B50 src/libultra/libc/bcopy
61 4A00 80004E60 src/libultra/os/resetglobalintmask
62 4A60 80004EC0 src/libultra/os/interrupt
63 4AF0 80004F50 src/libultra/io/vi
64 4C10 80005070 src/libultra/io/viswapcontext
65 4F10 80005370 src/libultra/io/pigetcmdq
66 4F40 800053A0 src/libultra/io/epiread
67 4F90 800053F0 src/libultra/io/visetspecial
68 50F0 80005550 src/libultra/io/cartrominit
69 5250 800056B0 src/libultra/os/setfpccsr
70 5260 800056C0 src/libultra/os/getfpccsr
71 5270 800056D0 src/libultra/os/maptlbrdb
72 52D0 80005730 src/libultra/os/yieldthread
73 5320 80005780 src/libultra/os/getcause
74 5330 80005790 src/libultra/io/epirawwrite
75 5490 800058F0 src/libultra/io/sirawwrite
76 54E0 80005940 src/libultra/io/vimgr
77 57F0 80005C50 src/libultra/io/vigetcurrcontext
78 5800 80005C60 src/libultra/os/startthread
79 5950 80005DB0 src/libultra/io/visetyscale
80 59A0 80005E00 src/libultra/io/visetxscale
81 5AB0 80005F10 src/libultra/os/sethwintrroutine
82 5B20 80005F80 src/libultra/os/gethwintrroutine
83 5B50 80005FB0 src/libultra/os/setwatchlo
84 5B60 80005FC0 data/rsp_boot.text
85 offset vram .data
86 5C30 80006090 data/unk_800093F0.data
87 5C50 800060B0 data/unk_80009410.data
88 5C70 800060D0 src/boot/idle
89 5C90 800060F0 src/boot/viconfig
90 5CA0 80006100 src/boot/z_std_dma
91 5CB0 80006110 src/boot/z_locale
92 5CC0 80006120 src/libultra/io/driverominit
93 5CD0 80006130 src/boot/stackcheck
94 5CE0 80006140 src/libultra/io/piacs
95 5CF0 80006150 src/libultra/io/vimodepallan1
96 5D40 800061A0 src/libultra/os/initialize
97 5D60 800061C0 src/libultra/os/exceptasm
98 5D90 800061F0 src/libultra/os/thread
99 5DB0 80006210 src/libultra/io/pimgr
100 5DE0 80006240 src/libultra/os/seteventmesg
101 5DF0 80006250 src/libultra/os/timerintr
102 5E00 80006260 src/libultra/io/vimodentsclan1
103 5E50 800062B0 src/libultra/io/vimodempallan1
104 5EA0 80006300 src/libultra/io/vi
105 5F10 80006370 src/libultra/io/cartrominit
106 5F20 80006380 src/libultra/io/vimgr
107 offset vram .rodata
108 5F40 800063A0 src/boot/boot_main
109 5F50 800063B0 src/boot/idle
110 5F60 800063C0 src/boot/z_std_dma
111 5FC0 80006420 src/boot/z_locale
112 5FD0 80006430 src/boot/stackcheck
113 5FE0 80006440 src/boot/logutils
114 5FF0 80006450 src/libultra/os/exceptasm
115 6040 800064A0 src/libultra/io/devmgr
116 6060 800064C0 src/libultra/os/setintmask
117 60E0 80006540 src/boot/build
118 offset vram .bss
119 6110 80006570 src/boot/boot_main
120 6B00 80006F60 src/boot/idle
121 7710 80007B70 src/boot/z_std_dma
122 7E80 800082E0 src/boot/yaz0
123 8290 800086F0 src/boot/z_locale
124 82B0 80008710 src/libultra/io/driverominit
125 8330 80008790 src/libultra/io/piacs
126 8350 800087B0 src/libultra/os/initialize
127 8360 800087C0 src/libultra/io/pimgr
128 97D0 80009C30 src/libultra/os/seteventmesg
129 9850 80009CB0 src/libultra/os/timerintr
130 9890 80009CF0 src/libultra/io/cartrominit
131 9910 80009D70 src/libultra/io/vimgr
132 AB30 8000AF90 .end

464
tools/disasm/gc-eu-mq/files_code.csv
View file

@ -1,464 +0,0 @@
offset,vram,.text
0,80010F00,src/code/z_en_a_keep
AA0,800119A0,src/code/z_en_item00
2EA0,80013DA0,src/code/z_eff_blure
62D0,800171D0,src/code/z_eff_shield_particle
7930,80018830,src/code/z_eff_spark
8FE0,80019EE0,src/code/z_eff_ss_dead
9790,8001A690,src/code/z_effect
9F10,8001AE10,src/code/z_effect_soft_sprite
A9B0,8001B8B0,src/code/z_effect_soft_sprite_old_init
D4D0,8001E3D0,src/code/flg_set
D8F0,8001E7F0,src/code/z_DLF
DB40,8001EA40,src/code/z_actor
1A0C0,8002AFC0,src/code/z_actor_dlftbls
1A210,8002B110,src/code/z_bgcheck
23DF0,80034CF0,src/code/code_800430A0
24110,80035010,src/code/code_80043480
244A0,800353A0,src/code/z_camera
38AD0,800499D0,src/code/z_collision_btltbls
38B30,80049A30,src/code/z_collision_check
407B0,800516B0,src/code/z_common_data
40830,80051730,src/code/z_debug
40B40,80051A40,src/code/z_debug_display
41000,80051F00,src/code/z_demo
45CE0,80056BE0,src/code/code_80069420
45D70,80056C70,src/code/z_draw
47C70,80058B70,src/code/z_sfx_source
47E30,80058D30,src/code/z_elf_message
48510,80059410,src/code/z_face_reaction
48560,80059460,src/code/code_8006C3A0
486E0,800595E0,src/code/z_fcurve_data
48920,80059820,src/code/z_fcurve_data_skelanime
49130,8005A030,src/code/z_horse
49E10,8005AD10,src/code/z_jpeg
4A5D0,8005B4D0,src/code/z_kaleido_setup
4A9A0,8005B8A0,src/code/z_kanfont
4AB70,8005BA70,src/code/z_kankyo
52380,80063280,src/code/z_lib
53520,80064420,src/code/z_lifemeter
548C0,800657C0,src/code/z_lights
55960,80066860,src/code/z_malloc
55B40,80066A40,src/code/z_map_mark
56140,80067040,src/code/z_prenmi_buff
56200,80067100,src/code/z_nulltask
56280,80067180,src/code/z_olib
56970,80067870,src/code/z_onepointdemo
5A910,8006B810,src/code/z_map_exp
5C4B0,8006D3B0,src/code/z_parameter
67BA0,80078AA0,src/code/z_path
67D70,80078C70,src/code/z_frame_advance
67E20,80078D20,src/code/z_player_lib
6B890,8007C790,src/code/z_prenmi
6BA30,8007C930,src/code/z_quake
6C8A0,8007D7A0,src/code/z_rcp
6E160,8007F060,src/code/z_room
6F950,80080850,src/code/z_sample
6FD50,80080C50,src/code/code_80097A00
6FF10,80080E10,src/code/z_scene
713C0,800822C0,src/code/z_scene_table
77BA0,80088AA0,src/code/z_skelanime
7C590,8008D490,src/code/z_skin
7D130,8008E030,src/code/z_skin_awb
7DA40,8008E940,src/code/z_skin_matrix
7EDE0,8008FCE0,src/code/z_sram
80220,80091120,src/code/z_ss_sram
803F0,800912F0,src/code/z_rumble
80670,80091570,src/code/z_view
81D70,80092C70,src/code/z_vimode
828E0,800937E0,src/code/z_viscvg
82A80,80093980,src/code/z_vismono
832A0,800941A0,src/code/z_viszbuf
83530,80094430,src/code/z_vr_box
85E00,80096D00,src/code/z_vr_box_draw
864E0,800973E0,src/code/z_player_call
86650,80097550,src/code/z_fbdemo
87070,80097F70,src/code/z_fbdemo_triforce
87630,80098530,src/code/z_fbdemo_wipe1
87AA0,800989A0,src/code/z_fbdemo_circle
88160,80099060,src/code/z_fbdemo_fade
884C0,800993C0,src/code/shrink_window
88630,80099530,src/code/code_800BB0A0
88B00,80099A00,src/code/z_kaleido_manager
88D30,80099C30,src/code/z_kaleido_scope_call
89010,80099F10,src/code/z_play
8CA70,8009D970,src/code/PreRender
8EB60,8009FA60,src/code/TwoHeadGfxArena
8ED70,8009FC70,src/code/TwoHeadArena
8EF30,8009FE30,src/code/audio_stop_all_sfx
8EF80,8009FE80,src/code/audio_thread_manager
8F390,800A0290,src/code/title_setup
8F400,800A0300,src/code/game
8FB80,800A0A80,src/code/gamealloc
8FCC0,800A0BC0,src/code/graph
90660,800A1560,src/code/gfxalloc
906C0,800A15C0,src/code/listalloc
90810,800A1710,src/code/main
90B70,800A1A70,src/code/padmgr
91680,800A2580,src/code/sched
92300,800A3200,src/code/speed_meter
92D40,800A3C40,src/code/sys_cfb
92E60,800A3D60,src/code/sys_math
93100,800A4000,src/code/sys_math3d
98ED0,800A9DD0,src/code/sys_math_atan
99100,800AA000,src/code/sys_matrix
9B500,800AC400,src/code/sys_ucode
9B550,800AC450,src/code/sys_rumble
9B8B0,800AC7B0,src/code/code_800D31A0
9B8E0,800AC7E0,src/code/irqmgr
9BF00,800ACE00,src/code/fault
9E750,800AF650,src/code/fault_drawer
9F1D0,800B00D0,src/code/kanread
9FCC0,800B0BC0,src/audio/lib/synthesis
A2E20,800B3D20,src/audio/lib/heap
A61F0,800B70F0,src/audio/lib/load
A9FE0,800BAEE0,src/audio/lib/thread
AB840,800BC740,src/audio/lib/dcache
AB8C0,800BC7C0,src/audio/lib/aisetnextbuf
AB940,800BC840,src/audio/lib/playback
AD8C0,800BE7C0,src/audio/lib/effects
AE340,800BF240,src/audio/lib/seqplayer
B1960,800C2860,src/audio/general
B7AF0,800C89F0,src/audio/sfx
B9950,800CA850,src/audio/sequence
BB570,800CC470,src/code/gfxprint
BC2E0,800CD1E0,src/code/rcp_utils
BC340,800CD240,src/code/loadfragment2
BC3A0,800CD2A0,src/code/relocation
BC5E0,800CD4E0,src/code/load
BC6B0,800CD5B0,src/code/code_800FC620
BC9F0,800CD8F0,src/code/padutils
BCBE0,800CDAE0,src/code/padsetup
BCD20,800CDC20,src/code/code_800FCE80
BD230,800CE130,src/code/fp
BD390,800CE290,src/code/system_malloc
BD560,800CE460,src/code/rand
BD720,800CE620,src/code/__osMalloc
BE4D0,800CF3D0,src/libultra/libc/sprintf
BE5A0,800CF4A0,src/code/printutils
BE600,800CF500,src/code/sleep
BE7A0,800CF6A0,src/code/jpegutils
BECB0,800CFBB0,src/code/jpegdecoder
BF2A0,800D01A0,src/libultra/mgu/scale
BF350,800D0250,src/libultra/gu/sinf
BF510,800D0410,src/libultra/gu/sins
BF580,800D0480,src/libultra/io/sptask
BF840,800D0740,src/libultra/io/motor
BFC10,800D0B10,src/libultra/io/siacs
BFCD0,800D0BD0,src/libultra/io/controller
BFFB0,800D0EB0,src/libultra/io/contreaddata
C0190,800D1090,src/libultra/gu/perspective
C0420,800D1320,src/libultra/io/sprawdma
C04B0,800D13B0,src/libultra/io/sirawdma
C0560,800D1460,src/libultra/io/sptaskyield
C0580,800D1480,src/libultra/mgu/mtxidentf
C05D0,800D14D0,src/libultra/gu/lookat
C08F0,800D17F0,src/libultra/os/stoptimer
C09E0,800D18E0,src/libultra/gu/sqrtf
C09F0,800D18F0,src/libultra/os/afterprenmi
C0A10,800D1910,src/libultra/io/contquery
C0AB0,800D19B0,src/libultra/gu/lookathil
C1330,800D2230,src/libultra/libc/xprintf
C2010,800D2F10,src/libultra/libc/string
C20B0,800D2FB0,src/libultra/io/sp
C20E0,800D2FE0,src/libultra/mgu/mtxident
C2130,800D3030,src/libultra/gu/position
C2340,800D3240,src/libultra/io/sptaskyielded
C23A0,800D32A0,src/libultra/gu/rotate
C2570,800D3470,src/libultra/io/aisetfreq
C26C0,800D35C0,src/libultra/os/getactivequeue
C26E0,800D35E0,src/libultra/mgu/normalize
C2740,800D3640,src/libultra/io/dpgetstat
C2750,800D3650,src/libultra/io/dpsetstat
C2760,800D3660,src/libultra/gu/ortho
C2920,800D3820,src/libultra/gu/cosf
C2A90,800D3990,src/libultra/gu/coss
C2AC0,800D39C0,src/libultra/io/visetevent
C2B20,800D3A20,src/libultra/gu/us2dex
C2CA0,800D3BA0,src/libultra/io/pfsselectbank
C2D20,800D3C20,src/libultra/io/contsetch
C2D80,800D3C80,src/libultra/io/aigetlen
C2DA0,800D3CA0,src/libultra/mgu/translate
C2E70,800D3D70,src/libultra/io/contramwrite
C30C0,800D3FC0,src/libultra/io/pfsgetstatus
C32F0,800D41F0,src/libultra/io/contpfs
C3E70,800D4D70,src/libultra/io/contramread
C40A0,800D4FA0,src/libultra/io/crc
C4210,800D5110,src/libultra/io/pfsisplug
C4500,800D5400,src/libultra/os/settimer
C4690,800D5590,src/libultra/libc/xldtob
C51A0,800D60A0,src/libultra/libc/ldiv
C5330,800D6230,src/libultra/libc/xlitob
C55D0,800D64D0,src/libultra/io/spgetstat
C55E0,800D64E0,src/libultra/io/spsetstat
C55F0,800D64F0,src/libultra/os/writebackdcacheall
C5620,800D6520,src/libultra/os/getcurrfaultedthread
C5640,800D6540,src/libultra/mgu/mtxf2l
C56B0,800D65B0,src/libultra/libc/llcvt
C58C0,800D67C0,src/libultra/io/vigetcurrframebuf
C5900,800D6800,src/libultra/io/spsetpc
C5930,800D6830,src/libultra/libc/sqrt
C5940,800D6840,src/libultra/libc/absf
C5950,800D6850,src/code/fmodf
C59A0,800D68A0,src/code/__osMemset
C59D0,800D68D0,src/code/__osMemmove
C5A60,800D6960,src/code/z_message_PAL
CE820,800DF720,src/code/z_game_over
CED60,800DFC60,src/code/z_construct
D02A0,800E11A0,data/rsp.text
offset,vram,.data
D3600,800E4500,src/code/z_en_a_keep
D36A0,800E45A0,src/code/z_en_item00
D3940,800E4840,src/code/z_eff_blure
D39F0,800E48F0,src/code/z_eff_shield_particle
D3A40,800E4940,src/code/z_effect
D3A90,800E4990,src/code/z_effect_soft_sprite
D3AA0,800E49A0,src/code/z_effect_soft_sprite_old_init
D3B90,800E4A90,src/code/z_effect_soft_sprite_dlftbls
D3FA0,800E4EA0,src/code/flg_set
D4160,800E5060,src/code/z_actor
D4480,800E5380,src/code/z_actor_dlftbls
D7F70,800E8E70,src/code/z_bgcheck
D80C0,800E8FC0,src/code/z_camera
DB610,800EC510,src/code/z_collision_btltbls
DB8F0,800EC7F0,src/code/z_collision_check
DBBA0,800ECAA0,src/code/z_debug
DBBD0,800ECAD0,src/code/z_debug_display
DBC20,800ECB20,src/code/z_demo
DBD80,800ECC80,src/code/z_draw
DCE00,800EDD00,src/code/z_elf_message
DCE50,800EDD50,src/code/z_face_reaction
DD290,800EE190,src/code/z_game_dlftbls
DD3B0,800EE2B0,src/code/z_horse
DD4C0,800EE3C0,src/code/z_jpeg
DD500,800EE400,src/code/z_kaleido_setup
DD550,800EE450,src/code/z_kankyo
DD940,800EE840,src/code/z_lib
DD970,800EE870,src/code/z_lifemeter
DDA90,800EE990,src/code/z_lights
DDAA0,800EE9A0,src/code/z_map_mark
DDB60,800EEA60,src/code/z_onepointdemo
E1480,800F2380,src/code/z_map_exp
E14A0,800F23A0,src/code/z_map_data
E32A0,800F41A0,src/code/z_parameter
E35A0,800F44A0,src/code/z_player_lib
E3C80,800F4B80,src/code/z_quake
E3CB0,800F4BB0,src/code/z_rcp
E4AD0,800F59D0,src/code/z_room
E4B50,800F5A50,src/code/code_80097A00
E4ED0,800F5DD0,src/code/z_scene
E4F50,800F5E50,src/code/object_table
E5BF0,800F6AF0,src/code/z_scene_table
E7E00,800F8D00,src/code/z_skelanime
E7E20,800F8D20,src/code/z_skin_matrix
E7E60,800F8D60,src/code/z_sram
E8010,800F8F10,src/code/z_ss_sram
E80C0,800F8FC0,data/unk_8012ABC0.data
E80F0,800F8FF0,src/code/z_view
E8100,800F9000,src/code/z_viscvg
E8190,800F9090,src/code/z_vr_box
E8490,800F9390,src/code/z_player_call
E84B0,800F93B0,src/code/z_fbdemo
E8530,800F9430,src/code/z_fbdemo_triforce
E8600,800F9500,src/code/z_fbdemo_wipe1
E90A0,800F9FA0,src/code/z_fbdemo_circle
EA3A0,800FB2A0,src/code/z_fbdemo_fade
EA3D0,800FB2D0,src/code/shrink_window
EA3E0,800FB2E0,src/code/z_kaleido_manager
EA430,800FB330,src/code/z_play
EA440,800FB340,src/code/audio_stop_all_sfx
EA450,800FB350,src/code/graph
EA460,800FB360,src/code/main
EA470,800FB370,src/code/padmgr
EA480,800FB380,src/code/speed_meter
EA4B0,800FB3B0,src/code/sys_math
EA4F0,800FB3F0,src/code/sys_math_atan
EAD00,800FBC00,src/code/sys_matrix
EAD80,800FBC80,src/code/sys_ucode
EAD90,800FBC90,src/code/sys_rumble
EADA0,800FBCA0,src/code/irqmgr
EADC0,800FBCC0,src/code/fault
EAE20,800FBD20,src/code/fault_drawer
EAE60,800FBD60,src/audio/lib/data
ED270,800FE170,src/audio/lib/synthesis
ED2A0,800FE1A0,src/audio/lib/load
ED2B0,800FE1B0,src/audio/lib/thread
ED2D0,800FE1D0,src/audio/lib/aisetnextbuf
ED2E0,800FE1E0,src/audio/lib/effects
ED2F0,800FE1F0,src/audio/lib/seqplayer
ED340,800FE240,src/audio/general
EEA60,800FF960,src/audio/sfx_params
EFE30,80100D30,src/audio/data
EFEA0,80100DA0,src/audio/session_config
F0640,80101540,src/code/logseverity
F0650,80101550,src/code/gfxprint
F0F00,80101E00,src/code/code_800FC620
F0F20,80101E20,src/code/fp
F0F30,80101E30,src/code/rand
F0F40,80101E40,src/code/__osMalloc
F0F50,80101E50,src/libultra/gu/sins
F1750,80102650,src/libultra/io/siacs
F1760,80102660,src/libultra/io/controller
F1770,80102670,src/libultra/libc/xprintf
F17C0,801026C0,src/libultra/gu/position
F17D0,801026D0,src/libultra/gu/rotate
F17E0,801026E0,src/libultra/io/vimodefpallan1
F1830,80102730,src/libultra/io/contpfs
F1840,80102740,src/libultra/io/contramread
F1850,80102750,src/libultra/libc/xlitob
offset,vram,.rodata
F1880,80102780,src/code/z_en_a_keep
F18D0,801027D0,src/code/z_en_item00
F1B40,80102A40,src/code/z_eff_blure
F1B70,80102A70,src/code/z_eff_shield_particle
F1B80,80102A80,src/code/z_eff_spark
F1B90,80102A90,src/code/z_eff_ss_dead
F1BA0,80102AA0,src/code/z_effect_soft_sprite_old_init
F1BC0,80102AC0,src/code/flg_set
F1F50,80102E50,src/code/z_actor
F2500,80103400,src/code/z_actor_dlftbls
F2550,80103450,src/code/z_bgcheck
F25F0,801034F0,src/code/code_80043480
F2600,80103500,src/code/z_camera
F2D80,80103C80,src/code/z_collision_check
F2DD0,80103CD0,src/code/z_debug
F2DE0,80103CE0,src/code/z_demo
F32C0,801041C0,src/code/z_draw
F32D0,801041D0,src/code/z_elf_message
F33F0,801042F0,src/code/z_fcurve_data
F3400,80104300,src/code/z_fcurve_data_skelanime
F3410,80104310,src/code/z_horse
F3420,80104320,src/code/z_jpeg
F34B0,801043B0,src/code/z_kankyo
F3560,80104460,src/code/z_lib
F3570,80104470,src/code/z_lifemeter
F3590,80104490,src/code/z_lights
F35A0,801044A0,src/code/z_map_mark
F3600,80104500,src/code/z_olib
F3620,80104520,src/code/z_onepointdemo
F3EE0,80104DE0,src/code/z_map_exp
F4200,80105100,src/code/z_parameter
F4410,80105310,src/code/z_path
F4420,80105320,src/code/z_player_lib
F4480,80105380,src/code/z_quake
F4510,80105410,src/code/z_room
F4550,80105450,src/code/z_sample
F4560,80105460,src/code/z_scene_table
F45A0,801054A0,src/code/z_skelanime
F45C0,801054C0,src/code/z_skin
F45D0,801054D0,src/code/z_skin_matrix
F45E0,801054E0,src/code/z_sram
F4650,80105550,src/code/z_rumble
F4660,80105560,src/code/z_view
F4670,80105570,src/code/z_vr_box
F4760,80105660,src/code/z_fbdemo_triforce
F4770,80105670,src/code/z_fbdemo_wipe1
F4780,80105680,src/code/z_fbdemo_circle
F4790,80105690,src/code/code_800BB0A0
F47A0,801056A0,src/code/z_kaleido_manager
F47C0,801056C0,src/code/z_play
F4880,80105780,src/code/game
F48A0,801057A0,src/code/graph
F48F0,801057F0,src/code/main
F4920,80105820,src/code/padmgr
F4930,80105830,src/code/sys_cfb
F4940,80105840,src/code/sys_math
F4950,80105850,src/code/sys_math3d
F49E0,801058E0,src/code/sys_math_atan
F49F0,801058F0,src/code/sys_matrix
F4A20,80105920,src/code/irqmgr
F4A40,80105940,src/code/fault
F5450,80106350,src/code/fault_drawer
F5880,80106780,src/audio/lib/synthesis
F58A0,801067A0,src/audio/lib/heap
F58D0,801067D0,src/audio/lib/load
F5940,80106840,src/audio/lib/thread
F5A70,80106970,src/audio/lib/playback
F5AA0,801069A0,src/audio/lib/effects
F5AD0,801069D0,src/audio/lib/seqplayer
F6110,80107010,src/audio/general
F62A0,801071A0,src/audio/sfx
F62C0,801071C0,src/audio/sequence
F6340,80107240,src/audio/session_config
F6350,80107250,src/code/gfxprint
F6370,80107270,src/code/code_800FCE80
F63C0,801072C0,src/code/__osMalloc
F6680,80107580,src/libultra/gu/sinf
F66D0,801075D0,src/libultra/gu/perspective
F66E0,801075E0,src/libultra/gu/lookathil
F66F0,801075F0,src/libultra/libc/xprintf
F67F0,801076F0,src/libultra/gu/cosf
F6840,80107740,src/libultra/gu/libm_vals
F6850,80107750,src/libultra/libc/xldtob
F68B0,801077B0,src/libultra/libc/llcvt
offset,vram,.data
F68C0,801077C0,src/code/z_message_PAL
offset,vram,.rodata
FF350,80110250,src/code/z_message_PAL
FF510,80110410,src/code/z_game_over
FF570,80110470,data/audio_tables.rodata
100110,80111010,data/rsp.rodata
offset,vram,.bss
102230,80113130,src/code/z_en_item00
102240,80113140,src/code/z_effect
106030,80116F30,src/code/flg_set
106040,80116F40,src/code/z_actor
1060C0,80116FC0,src/code/z_actor_dlftbls
1060D0,80116FD0,src/code/z_bgcheck
1061F0,801170F0,src/code/z_camera
1062D0,801171D0,src/code/z_collision_check
107A30,80118930,src/code/z_common_data
108E60,80119D60,src/code/z_debug
109080,80119F80,src/code/z_debug_display
109090,80119F90,src/code/z_demo
1090C0,80119FC0,src/code/z_kankyo
109190,8011A090,src/code/z_lifemeter
1091C0,8011A0C0,src/code/z_lights
109350,8011A250,src/code/z_malloc
109380,8011A280,src/code/z_map_mark
109390,8011A290,src/code/z_map_exp
1093A0,8011A2A0,src/code/z_parameter
1093C0,8011A2C0,src/code/z_player_lib
1093E0,8011A2E0,src/code/z_quake
109470,8011A370,src/code/z_skelanime
109480,8011A380,src/code/z_skin
10A390,8011B290,src/code/z_rumble
10A4A0,8011B3A0,src/code/z_vr_box_draw
10A4B0,8011B3B0,src/code/z_player_call
10A4C0,8011B3C0,src/code/z_kaleido_scope_call
10A4E0,8011B3E0,src/code/z_play
10A5F0,8011B4F0,src/code/game
10A6D0,8011B5D0,src/code/graph
10A740,8011B640,src/code/main
10E5D0,8011F4D0,src/code/padmgr
10E5E0,8011F4E0,src/code/sched
10E600,8011F500,src/code/speed_meter
10E670,8011F570,src/code/sys_cfb
10E680,8011F580,src/code/sys_math3d
10E8A0,8011F7A0,src/code/sys_matrix
10E8B0,8011F7B0,src/code/fault
10F730,80120630,src/code/fault_drawer
10F790,80120690,src/audio/lib/load
10F850,80120750,src/audio/general
10FA50,80120950,src/audio/sfx
112260,80123160,src/audio/sequence
113020,80123F20,src/audio/session_config
119530,8012A430,src/code/gfxprint
119540,8012A440,src/code/code_800FCE80
119550,8012A450,src/code/system_malloc
119580,8012A480,src/code/rand
119590,8012A490,src/code/__osMalloc
1195A0,8012A4A0,src/code/jpegdecoder
1195B0,8012A4B0,src/libultra/io/sptask
1195F0,8012A4F0,src/libultra/io/motor
1196F0,8012A5F0,src/libultra/io/siacs
119710,8012A610,src/libultra/io/controller
1197A0,8012A6A0,src/libultra/io/contpfs
1198A0,8012A7A0,src/libultra/io/pfsisplug
1198E0,8012A7E0,src/code/z_message_PAL
119900,8012A800,.end
1 offset vram .text
2 0 80010F00 src/code/z_en_a_keep
3 AA0 800119A0 src/code/z_en_item00
4 2EA0 80013DA0 src/code/z_eff_blure
5 62D0 800171D0 src/code/z_eff_shield_particle
6 7930 80018830 src/code/z_eff_spark
7 8FE0 80019EE0 src/code/z_eff_ss_dead
8 9790 8001A690 src/code/z_effect
9 9F10 8001AE10 src/code/z_effect_soft_sprite
10 A9B0 8001B8B0 src/code/z_effect_soft_sprite_old_init
11 D4D0 8001E3D0 src/code/flg_set
12 D8F0 8001E7F0 src/code/z_DLF
13 DB40 8001EA40 src/code/z_actor
14 1A0C0 8002AFC0 src/code/z_actor_dlftbls
15 1A210 8002B110 src/code/z_bgcheck
16 23DF0 80034CF0 src/code/code_800430A0
17 24110 80035010 src/code/code_80043480
18 244A0 800353A0 src/code/z_camera
19 38AD0 800499D0 src/code/z_collision_btltbls
20 38B30 80049A30 src/code/z_collision_check
21 407B0 800516B0 src/code/z_common_data
22 40830 80051730 src/code/z_debug
23 40B40 80051A40 src/code/z_debug_display
24 41000 80051F00 src/code/z_demo
25 45CE0 80056BE0 src/code/code_80069420
26 45D70 80056C70 src/code/z_draw
27 47C70 80058B70 src/code/z_sfx_source
28 47E30 80058D30 src/code/z_elf_message
29 48510 80059410 src/code/z_face_reaction
30 48560 80059460 src/code/code_8006C3A0
31 486E0 800595E0 src/code/z_fcurve_data
32 48920 80059820 src/code/z_fcurve_data_skelanime
33 49130 8005A030 src/code/z_horse
34 49E10 8005AD10 src/code/z_jpeg
35 4A5D0 8005B4D0 src/code/z_kaleido_setup
36 4A9A0 8005B8A0 src/code/z_kanfont
37 4AB70 8005BA70 src/code/z_kankyo
38 52380 80063280 src/code/z_lib
39 53520 80064420 src/code/z_lifemeter
40 548C0 800657C0 src/code/z_lights
41 55960 80066860 src/code/z_malloc
42 55B40 80066A40 src/code/z_map_mark
43 56140 80067040 src/code/z_prenmi_buff
44 56200 80067100 src/code/z_nulltask
45 56280 80067180 src/code/z_olib
46 56970 80067870 src/code/z_onepointdemo
47 5A910 8006B810 src/code/z_map_exp
48 5C4B0 8006D3B0 src/code/z_parameter
49 67BA0 80078AA0 src/code/z_path
50 67D70 80078C70 src/code/z_frame_advance
51 67E20 80078D20 src/code/z_player_lib
52 6B890 8007C790 src/code/z_prenmi
53 6BA30 8007C930 src/code/z_quake
54 6C8A0 8007D7A0 src/code/z_rcp
55 6E160 8007F060 src/code/z_room
56 6F950 80080850 src/code/z_sample
57 6FD50 80080C50 src/code/code_80097A00
58 6FF10 80080E10 src/code/z_scene
59 713C0 800822C0 src/code/z_scene_table
60 77BA0 80088AA0 src/code/z_skelanime
61 7C590 8008D490 src/code/z_skin
62 7D130 8008E030 src/code/z_skin_awb
63 7DA40 8008E940 src/code/z_skin_matrix
64 7EDE0 8008FCE0 src/code/z_sram
65 80220 80091120 src/code/z_ss_sram
66 803F0 800912F0 src/code/z_rumble
67 80670 80091570 src/code/z_view
68 81D70 80092C70 src/code/z_vimode
69 828E0 800937E0 src/code/z_viscvg
70 82A80 80093980 src/code/z_vismono
71 832A0 800941A0 src/code/z_viszbuf
72 83530 80094430 src/code/z_vr_box
73 85E00 80096D00 src/code/z_vr_box_draw
74 864E0 800973E0 src/code/z_player_call
75 86650 80097550 src/code/z_fbdemo
76 87070 80097F70 src/code/z_fbdemo_triforce
77 87630 80098530 src/code/z_fbdemo_wipe1
78 87AA0 800989A0 src/code/z_fbdemo_circle
79 88160 80099060 src/code/z_fbdemo_fade
80 884C0 800993C0 src/code/shrink_window
81 88630 80099530 src/code/code_800BB0A0
82 88B00 80099A00 src/code/z_kaleido_manager
83 88D30 80099C30 src/code/z_kaleido_scope_call
84 89010 80099F10 src/code/z_play
85 8CA70 8009D970 src/code/PreRender
86 8EB60 8009FA60 src/code/TwoHeadGfxArena
87 8ED70 8009FC70 src/code/TwoHeadArena
88 8EF30 8009FE30 src/code/audio_stop_all_sfx
89 8EF80 8009FE80 src/code/audio_thread_manager
90 8F390 800A0290 src/code/title_setup
91 8F400 800A0300 src/code/game
92 8FB80 800A0A80 src/code/gamealloc
93 8FCC0 800A0BC0 src/code/graph
94 90660 800A1560 src/code/gfxalloc
95 906C0 800A15C0 src/code/listalloc
96 90810 800A1710 src/code/main
97 90B70 800A1A70 src/code/padmgr
98 91680 800A2580 src/code/sched
99 92300 800A3200 src/code/speed_meter
100 92D40 800A3C40 src/code/sys_cfb
101 92E60 800A3D60 src/code/sys_math
102 93100 800A4000 src/code/sys_math3d
103 98ED0 800A9DD0 src/code/sys_math_atan
104 99100 800AA000 src/code/sys_matrix
105 9B500 800AC400 src/code/sys_ucode
106 9B550 800AC450 src/code/sys_rumble
107 9B8B0 800AC7B0 src/code/code_800D31A0
108 9B8E0 800AC7E0 src/code/irqmgr
109 9BF00 800ACE00 src/code/fault
110 9E750 800AF650 src/code/fault_drawer
111 9F1D0 800B00D0 src/code/kanread
112 9FCC0 800B0BC0 src/audio/lib/synthesis
113 A2E20 800B3D20 src/audio/lib/heap
114 A61F0 800B70F0 src/audio/lib/load
115 A9FE0 800BAEE0 src/audio/lib/thread
116 AB840 800BC740 src/audio/lib/dcache
117 AB8C0 800BC7C0 src/audio/lib/aisetnextbuf
118 AB940 800BC840 src/audio/lib/playback
119 AD8C0 800BE7C0 src/audio/lib/effects
120 AE340 800BF240 src/audio/lib/seqplayer
121 B1960 800C2860 src/audio/general
122 B7AF0 800C89F0 src/audio/sfx
123 B9950 800CA850 src/audio/sequence
124 BB570 800CC470 src/code/gfxprint
125 BC2E0 800CD1E0 src/code/rcp_utils
126 BC340 800CD240 src/code/loadfragment2
127 BC3A0 800CD2A0 src/code/relocation
128 BC5E0 800CD4E0 src/code/load
129 BC6B0 800CD5B0 src/code/code_800FC620
130 BC9F0 800CD8F0 src/code/padutils
131 BCBE0 800CDAE0 src/code/padsetup
132 BCD20 800CDC20 src/code/code_800FCE80
133 BD230 800CE130 src/code/fp
134 BD390 800CE290 src/code/system_malloc
135 BD560 800CE460 src/code/rand
136 BD720 800CE620 src/code/__osMalloc
137 BE4D0 800CF3D0 src/libultra/libc/sprintf
138 BE5A0 800CF4A0 src/code/printutils
139 BE600 800CF500 src/code/sleep
140 BE7A0 800CF6A0 src/code/jpegutils
141 BECB0 800CFBB0 src/code/jpegdecoder
142 BF2A0 800D01A0 src/libultra/mgu/scale
143 BF350 800D0250 src/libultra/gu/sinf
144 BF510 800D0410 src/libultra/gu/sins
145 BF580 800D0480 src/libultra/io/sptask
146 BF840 800D0740 src/libultra/io/motor
147 BFC10 800D0B10 src/libultra/io/siacs
148 BFCD0 800D0BD0 src/libultra/io/controller
149 BFFB0 800D0EB0 src/libultra/io/contreaddata
150 C0190 800D1090 src/libultra/gu/perspective
151 C0420 800D1320 src/libultra/io/sprawdma
152 C04B0 800D13B0 src/libultra/io/sirawdma
153 C0560 800D1460 src/libultra/io/sptaskyield
154 C0580 800D1480 src/libultra/mgu/mtxidentf
155 C05D0 800D14D0 src/libultra/gu/lookat
156 C08F0 800D17F0 src/libultra/os/stoptimer
157 C09E0 800D18E0 src/libultra/gu/sqrtf
158 C09F0 800D18F0 src/libultra/os/afterprenmi
159 C0A10 800D1910 src/libultra/io/contquery
160 C0AB0 800D19B0 src/libultra/gu/lookathil
161 C1330 800D2230 src/libultra/libc/xprintf
162 C2010 800D2F10 src/libultra/libc/string
163 C20B0 800D2FB0 src/libultra/io/sp
164 C20E0 800D2FE0 src/libultra/mgu/mtxident
165 C2130 800D3030 src/libultra/gu/position
166 C2340 800D3240 src/libultra/io/sptaskyielded
167 C23A0 800D32A0 src/libultra/gu/rotate
168 C2570 800D3470 src/libultra/io/aisetfreq
169 C26C0 800D35C0 src/libultra/os/getactivequeue
170 C26E0 800D35E0 src/libultra/mgu/normalize
171 C2740 800D3640 src/libultra/io/dpgetstat
172 C2750 800D3650 src/libultra/io/dpsetstat
173 C2760 800D3660 src/libultra/gu/ortho
174 C2920 800D3820 src/libultra/gu/cosf
175 C2A90 800D3990 src/libultra/gu/coss
176 C2AC0 800D39C0 src/libultra/io/visetevent
177 C2B20 800D3A20 src/libultra/gu/us2dex
178 C2CA0 800D3BA0 src/libultra/io/pfsselectbank
179 C2D20 800D3C20 src/libultra/io/contsetch
180 C2D80 800D3C80 src/libultra/io/aigetlen
181 C2DA0 800D3CA0 src/libultra/mgu/translate
182 C2E70 800D3D70 src/libultra/io/contramwrite
183 C30C0 800D3FC0 src/libultra/io/pfsgetstatus
184 C32F0 800D41F0 src/libultra/io/contpfs
185 C3E70 800D4D70 src/libultra/io/contramread
186 C40A0 800D4FA0 src/libultra/io/crc
187 C4210 800D5110 src/libultra/io/pfsisplug
188 C4500 800D5400 src/libultra/os/settimer
189 C4690 800D5590 src/libultra/libc/xldtob
190 C51A0 800D60A0 src/libultra/libc/ldiv
191 C5330 800D6230 src/libultra/libc/xlitob
192 C55D0 800D64D0 src/libultra/io/spgetstat
193 C55E0 800D64E0 src/libultra/io/spsetstat
194 C55F0 800D64F0 src/libultra/os/writebackdcacheall
195 C5620 800D6520 src/libultra/os/getcurrfaultedthread
196 C5640 800D6540 src/libultra/mgu/mtxf2l
197 C56B0 800D65B0 src/libultra/libc/llcvt
198 C58C0 800D67C0 src/libultra/io/vigetcurrframebuf
199 C5900 800D6800 src/libultra/io/spsetpc
200 C5930 800D6830 src/libultra/libc/sqrt
201 C5940 800D6840 src/libultra/libc/absf
202 C5950 800D6850 src/code/fmodf
203 C59A0 800D68A0 src/code/__osMemset
204 C59D0 800D68D0 src/code/__osMemmove
205 C5A60 800D6960 src/code/z_message_PAL
206 CE820 800DF720 src/code/z_game_over
207 CED60 800DFC60 src/code/z_construct
208 D02A0 800E11A0 data/rsp.text
209 offset vram .data
210 D3600 800E4500 src/code/z_en_a_keep
211 D36A0 800E45A0 src/code/z_en_item00
212 D3940 800E4840 src/code/z_eff_blure
213 D39F0 800E48F0 src/code/z_eff_shield_particle
214 D3A40 800E4940 src/code/z_effect
215 D3A90 800E4990 src/code/z_effect_soft_sprite
216 D3AA0 800E49A0 src/code/z_effect_soft_sprite_old_init
217 D3B90 800E4A90 src/code/z_effect_soft_sprite_dlftbls
218 D3FA0 800E4EA0 src/code/flg_set
219 D4160 800E5060 src/code/z_actor
220 D4480 800E5380 src/code/z_actor_dlftbls
221 D7F70 800E8E70 src/code/z_bgcheck
222 D80C0 800E8FC0 src/code/z_camera
223 DB610 800EC510 src/code/z_collision_btltbls
224 DB8F0 800EC7F0 src/code/z_collision_check
225 DBBA0 800ECAA0 src/code/z_debug
226 DBBD0 800ECAD0 src/code/z_debug_display
227 DBC20 800ECB20 src/code/z_demo
228 DBD80 800ECC80 src/code/z_draw
229 DCE00 800EDD00 src/code/z_elf_message
230 DCE50 800EDD50 src/code/z_face_reaction
231 DD290 800EE190 src/code/z_game_dlftbls
232 DD3B0 800EE2B0 src/code/z_horse
233 DD4C0 800EE3C0 src/code/z_jpeg
234 DD500 800EE400 src/code/z_kaleido_setup
235 DD550 800EE450 src/code/z_kankyo
236 DD940 800EE840 src/code/z_lib
237 DD970 800EE870 src/code/z_lifemeter
238 DDA90 800EE990 src/code/z_lights
239 DDAA0 800EE9A0 src/code/z_map_mark
240 DDB60 800EEA60 src/code/z_onepointdemo
241 E1480 800F2380 src/code/z_map_exp
242 E14A0 800F23A0 src/code/z_map_data
243 E32A0 800F41A0 src/code/z_parameter
244 E35A0 800F44A0 src/code/z_player_lib
245 E3C80 800F4B80 src/code/z_quake
246 E3CB0 800F4BB0 src/code/z_rcp
247 E4AD0 800F59D0 src/code/z_room
248 E4B50 800F5A50 src/code/code_80097A00
249 E4ED0 800F5DD0 src/code/z_scene
250 E4F50 800F5E50 src/code/object_table
251 E5BF0 800F6AF0 src/code/z_scene_table
252 E7E00 800F8D00 src/code/z_skelanime
253 E7E20 800F8D20 src/code/z_skin_matrix
254 E7E60 800F8D60 src/code/z_sram
255 E8010 800F8F10 src/code/z_ss_sram
256 E80C0 800F8FC0 data/unk_8012ABC0.data
257 E80F0 800F8FF0 src/code/z_view
258 E8100 800F9000 src/code/z_viscvg
259 E8190 800F9090 src/code/z_vr_box
260 E8490 800F9390 src/code/z_player_call
261 E84B0 800F93B0 src/code/z_fbdemo
262 E8530 800F9430 src/code/z_fbdemo_triforce
263 E8600 800F9500 src/code/z_fbdemo_wipe1
264 E90A0 800F9FA0 src/code/z_fbdemo_circle
265 EA3A0 800FB2A0 src/code/z_fbdemo_fade
266 EA3D0 800FB2D0 src/code/shrink_window
267 EA3E0 800FB2E0 src/code/z_kaleido_manager
268 EA430 800FB330 src/code/z_play
269 EA440 800FB340 src/code/audio_stop_all_sfx
270 EA450 800FB350 src/code/graph
271 EA460 800FB360 src/code/main
272 EA470 800FB370 src/code/padmgr
273 EA480 800FB380 src/code/speed_meter
274 EA4B0 800FB3B0 src/code/sys_math
275 EA4F0 800FB3F0 src/code/sys_math_atan
276 EAD00 800FBC00 src/code/sys_matrix
277 EAD80 800FBC80 src/code/sys_ucode
278 EAD90 800FBC90 src/code/sys_rumble
279 EADA0 800FBCA0 src/code/irqmgr
280 EADC0 800FBCC0 src/code/fault
281 EAE20 800FBD20 src/code/fault_drawer
282 EAE60 800FBD60 src/audio/lib/data
283 ED270 800FE170 src/audio/lib/synthesis
284 ED2A0 800FE1A0 src/audio/lib/load
285 ED2B0 800FE1B0 src/audio/lib/thread
286 ED2D0 800FE1D0 src/audio/lib/aisetnextbuf
287 ED2E0 800FE1E0 src/audio/lib/effects
288 ED2F0 800FE1F0 src/audio/lib/seqplayer
289 ED340 800FE240 src/audio/general
290 EEA60 800FF960 src/audio/sfx_params
291 EFE30 80100D30 src/audio/data
292 EFEA0 80100DA0 src/audio/session_config
293 F0640 80101540 src/code/logseverity
294 F0650 80101550 src/code/gfxprint
295 F0F00 80101E00 src/code/code_800FC620
296 F0F20 80101E20 src/code/fp
297 F0F30 80101E30 src/code/rand
298 F0F40 80101E40 src/code/__osMalloc
299 F0F50 80101E50 src/libultra/gu/sins
300 F1750 80102650 src/libultra/io/siacs
301 F1760 80102660 src/libultra/io/controller
302 F1770 80102670 src/libultra/libc/xprintf
303 F17C0 801026C0 src/libultra/gu/position
304 F17D0 801026D0 src/libultra/gu/rotate
305 F17E0 801026E0 src/libultra/io/vimodefpallan1
306 F1830 80102730 src/libultra/io/contpfs
307 F1840 80102740 src/libultra/io/contramread
308 F1850 80102750 src/libultra/libc/xlitob
309 offset vram .rodata
310 F1880 80102780 src/code/z_en_a_keep
311 F18D0 801027D0 src/code/z_en_item00
312 F1B40 80102A40 src/code/z_eff_blure
313 F1B70 80102A70 src/code/z_eff_shield_particle
314 F1B80 80102A80 src/code/z_eff_spark
315 F1B90 80102A90 src/code/z_eff_ss_dead
316 F1BA0 80102AA0 src/code/z_effect_soft_sprite_old_init
317 F1BC0 80102AC0 src/code/flg_set
318 F1F50 80102E50 src/code/z_actor
319 F2500 80103400 src/code/z_actor_dlftbls
320 F2550 80103450 src/code/z_bgcheck
321 F25F0 801034F0 src/code/code_80043480
322 F2600 80103500 src/code/z_camera
323 F2D80 80103C80 src/code/z_collision_check
324 F2DD0 80103CD0 src/code/z_debug
325 F2DE0 80103CE0 src/code/z_demo
326 F32C0 801041C0 src/code/z_draw
327 F32D0 801041D0 src/code/z_elf_message
328 F33F0 801042F0 src/code/z_fcurve_data
329 F3400 80104300 src/code/z_fcurve_data_skelanime
330 F3410 80104310 src/code/z_horse
331 F3420 80104320 src/code/z_jpeg
332 F34B0 801043B0 src/code/z_kankyo
333 F3560 80104460 src/code/z_lib
334 F3570 80104470 src/code/z_lifemeter
335 F3590 80104490 src/code/z_lights
336 F35A0 801044A0 src/code/z_map_mark
337 F3600 80104500 src/code/z_olib
338 F3620 80104520 src/code/z_onepointdemo
339 F3EE0 80104DE0 src/code/z_map_exp
340 F4200 80105100 src/code/z_parameter
341 F4410 80105310 src/code/z_path
342 F4420 80105320 src/code/z_player_lib
343 F4480 80105380 src/code/z_quake
344 F4510 80105410 src/code/z_room
345 F4550 80105450 src/code/z_sample
346 F4560 80105460 src/code/z_scene_table
347 F45A0 801054A0 src/code/z_skelanime
348 F45C0 801054C0 src/code/z_skin
349 F45D0 801054D0 src/code/z_skin_matrix
350 F45E0 801054E0 src/code/z_sram
351 F4650 80105550 src/code/z_rumble
352 F4660 80105560 src/code/z_view
353 F4670 80105570 src/code/z_vr_box
354 F4760 80105660 src/code/z_fbdemo_triforce
355 F4770 80105670 src/code/z_fbdemo_wipe1
356 F4780 80105680 src/code/z_fbdemo_circle
357 F4790 80105690 src/code/code_800BB0A0
358 F47A0 801056A0 src/code/z_kaleido_manager
359 F47C0 801056C0 src/code/z_play
360 F4880 80105780 src/code/game
361 F48A0 801057A0 src/code/graph
362 F48F0 801057F0 src/code/main
363 F4920 80105820 src/code/padmgr
364 F4930 80105830 src/code/sys_cfb
365 F4940 80105840 src/code/sys_math
366 F4950 80105850 src/code/sys_math3d
367 F49E0 801058E0 src/code/sys_math_atan
368 F49F0 801058F0 src/code/sys_matrix
369 F4A20 80105920 src/code/irqmgr
370 F4A40 80105940 src/code/fault
371 F5450 80106350 src/code/fault_drawer
372 F5880 80106780 src/audio/lib/synthesis
373 F58A0 801067A0 src/audio/lib/heap
374 F58D0 801067D0 src/audio/lib/load
375 F5940 80106840 src/audio/lib/thread
376 F5A70 80106970 src/audio/lib/playback
377 F5AA0 801069A0 src/audio/lib/effects
378 F5AD0 801069D0 src/audio/lib/seqplayer
379 F6110 80107010 src/audio/general
380 F62A0 801071A0 src/audio/sfx
381 F62C0 801071C0 src/audio/sequence
382 F6340 80107240 src/audio/session_config
383 F6350 80107250 src/code/gfxprint
384 F6370 80107270 src/code/code_800FCE80
385 F63C0 801072C0 src/code/__osMalloc
386 F6680 80107580 src/libultra/gu/sinf
387 F66D0 801075D0 src/libultra/gu/perspective
388 F66E0 801075E0 src/libultra/gu/lookathil
389 F66F0 801075F0 src/libultra/libc/xprintf
390 F67F0 801076F0 src/libultra/gu/cosf
391 F6840 80107740 src/libultra/gu/libm_vals
392 F6850 80107750 src/libultra/libc/xldtob
393 F68B0 801077B0 src/libultra/libc/llcvt
394 offset vram .data
395 F68C0 801077C0 src/code/z_message_PAL
396 offset vram .rodata
397 FF350 80110250 src/code/z_message_PAL
398 FF510 80110410 src/code/z_game_over
399 FF570 80110470 data/audio_tables.rodata
400 100110 80111010 data/rsp.rodata
401 offset vram .bss
402 102230 80113130 src/code/z_en_item00
403 102240 80113140 src/code/z_effect
404 106030 80116F30 src/code/flg_set
405 106040 80116F40 src/code/z_actor
406 1060C0 80116FC0 src/code/z_actor_dlftbls
407 1060D0 80116FD0 src/code/z_bgcheck
408 1061F0 801170F0 src/code/z_camera
409 1062D0 801171D0 src/code/z_collision_check
410 107A30 80118930 src/code/z_common_data
411 108E60 80119D60 src/code/z_debug
412 109080 80119F80 src/code/z_debug_display
413 109090 80119F90 src/code/z_demo
414 1090C0 80119FC0 src/code/z_kankyo
415 109190 8011A090 src/code/z_lifemeter
416 1091C0 8011A0C0 src/code/z_lights
417 109350 8011A250 src/code/z_malloc
418 109380 8011A280 src/code/z_map_mark
419 109390 8011A290 src/code/z_map_exp
420 1093A0 8011A2A0 src/code/z_parameter
421 1093C0 8011A2C0 src/code/z_player_lib
422 1093E0 8011A2E0 src/code/z_quake
423 109470 8011A370 src/code/z_skelanime
424 109480 8011A380 src/code/z_skin
425 10A390 8011B290 src/code/z_rumble
426 10A4A0 8011B3A0 src/code/z_vr_box_draw
427 10A4B0 8011B3B0 src/code/z_player_call
428 10A4C0 8011B3C0 src/code/z_kaleido_scope_call
429 10A4E0 8011B3E0 src/code/z_play
430 10A5F0 8011B4F0 src/code/game
431 10A6D0 8011B5D0 src/code/graph
432 10A740 8011B640 src/code/main
433 10E5D0 8011F4D0 src/code/padmgr
434 10E5E0 8011F4E0 src/code/sched
435 10E600 8011F500 src/code/speed_meter
436 10E670 8011F570 src/code/sys_cfb
437 10E680 8011F580 src/code/sys_math3d
438 10E8A0 8011F7A0 src/code/sys_matrix
439 10E8B0 8011F7B0 src/code/fault
440 10F730 80120630 src/code/fault_drawer
441 10F790 80120690 src/audio/lib/load
442 10F850 80120750 src/audio/general
443 10FA50 80120950 src/audio/sfx
444 112260 80123160 src/audio/sequence
445 113020 80123F20 src/audio/session_config
446 119530 8012A430 src/code/gfxprint
447 119540 8012A440 src/code/code_800FCE80
448 119550 8012A450 src/code/system_malloc
449 119580 8012A480 src/code/rand
450 119590 8012A490 src/code/__osMalloc
451 1195A0 8012A4A0 src/code/jpegdecoder
452 1195B0 8012A4B0 src/libultra/io/sptask
453 1195F0 8012A4F0 src/libultra/io/motor
454 1196F0 8012A5F0 src/libultra/io/siacs
455 119710 8012A610 src/libultra/io/controller
456 1197A0 8012A6A0 src/libultra/io/contpfs
457 1198A0 8012A7A0 src/libultra/io/pfsisplug
458 1198E0 8012A7E0 src/code/z_message_PAL
459 119900 8012A800 .end

22
tools/disasm/gc-eu-mq/files_ovl_file_choose.csv
View file

@ -1,22 +0,0 @@
offset,vram,.text
0,80803630,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
3040,80806670,src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL
6F60,8080A590,src/overlays/gamestates/ovl_file_choose/z_file_choose
offset,vram,.data
D740,80810D70,src/overlays/gamestates/ovl_file_choose/z_file_nameset_data
E010,80811640,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
E050,80811680,src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL
E2B0,808118E0,src/overlays/gamestates/ovl_file_choose/z_file_choose
offset,vram,.rodata
E5F0,80811C20,src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL
E600,80811C30,src/overlays/gamestates/ovl_file_choose/z_file_choose
offset,vram,.ovl
E620,80811C50,src/overlays/gamestates/ovl_file_choose/ovl_file_choose_reloc
offset,vram,.bss
EC10,80812240,src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
EC20,80812250,src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL
EC30,80812260,.end
1 offset vram .text
2 0 80803630 src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
3 3040 80806670 src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL
4 6F60 8080A590 src/overlays/gamestates/ovl_file_choose/z_file_choose
5 offset vram .data
6 D740 80810D70 src/overlays/gamestates/ovl_file_choose/z_file_nameset_data
7 E010 80811640 src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
8 E050 80811680 src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL
9 E2B0 808118E0 src/overlays/gamestates/ovl_file_choose/z_file_choose
10 offset vram .rodata
11 E5F0 80811C20 src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL
12 E600 80811C30 src/overlays/gamestates/ovl_file_choose/z_file_choose
13 offset vram .ovl
14 E620 80811C50 src/overlays/gamestates/ovl_file_choose/ovl_file_choose_reloc
15 offset vram .bss
16 EC10 80812240 src/overlays/gamestates/ovl_file_choose/z_file_copy_erase
17 EC20 80812250 src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL
18 EC30 80812260 .end

34
tools/disasm/gc-eu-mq/files_ovl_kaleido_scope.csv
View file

@ -1,34 +0,0 @@
offset,vram,.text
0,80812260,src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect
2400,80814660,src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug
43B0,80816610,src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment
5E30,80818090,src/overlays/misc/ovl_kaleido_scope/z_kaleido_item
7E20,8081A080,src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL
B100,8081D360,src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt
B300,8081D560,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL
15350,808275B0,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark
offset,vram,.data
15A10,80827C70,src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect
15BC0,80827E20,src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug
15D90,80827FF0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment
15DC0,80828020,src/overlays/misc/ovl_kaleido_scope/z_kaleido_item
15E30,80828090,src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL
16080,808282E0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt
16090,808282F0,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL
16C10,80828E70,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark
16C60,80828EC0,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data
offset,vram,.rodata
1ADC0,8082D020,src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug
1AEA0,8082D100,src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment
1AEB0,8082D110,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL
1B190,8082D3F0,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark
1B240,8082D4A0,src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data
offset,vram,.ovl
1B2C0,8082D560,src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc
offset,vram,.bss
1C9C0,8082EC20,src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL
1CA30,8082EC90,.end
1 offset vram .text
2 0 80812260 src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect
3 2400 80814660 src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug
4 43B0 80816610 src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment
5 5E30 80818090 src/overlays/misc/ovl_kaleido_scope/z_kaleido_item
6 7E20 8081A080 src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL
7 B100 8081D360 src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt
8 B300 8081D560 src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL
9 15350 808275B0 src/overlays/misc/ovl_kaleido_scope/z_lmap_mark
10 offset vram .data
11 15A10 80827C70 src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect
12 15BC0 80827E20 src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug
13 15D90 80827FF0 src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment
14 15DC0 80828020 src/overlays/misc/ovl_kaleido_scope/z_kaleido_item
15 15E30 80828090 src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL
16 16080 808282E0 src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt
17 16090 808282F0 src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL
18 16C10 80828E70 src/overlays/misc/ovl_kaleido_scope/z_lmap_mark
19 16C60 80828EC0 src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data
20 offset vram .rodata
21 1ADC0 8082D020 src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug
22 1AEA0 8082D100 src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment
23 1AEB0 8082D110 src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL
24 1B190 8082D3F0 src/overlays/misc/ovl_kaleido_scope/z_lmap_mark
25 1B240 8082D4A0 src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data
26 offset vram .ovl
27 1B2C0 8082D560 src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc
28 offset vram .bss
29 1C9C0 8082EC20 src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL
30 1CA30 8082EC90 .end

13146
tools/disasm/gc-eu-mq/functions.txt
View file

File diff suppressed because it is too large Load diff

785
tools/disasm/gc-eu-mq/variables.txt
View file

@ -1,785 +0,0 @@
D_80009430 = 0x800060D0; // size:0x1
gViConfigBlack = 0x800060D4; // size:0x1
gViConfigAdditionalScanLines = 0x800060D8; // size:0x1
gViConfigFeatures = 0x800060DC; // size:0x4
gViConfigXScale = 0x800060E0; // size:0x4
gViConfigYScale = 0x800060E4; // size:0x4
gCartHandle = 0x800060F0; // size:0x4 type:OSPiHandle*
gDmaMgrDmaBuffSize = 0x80006104; // size:0x4
sDmaMgrIsRomCompressed = 0x80006108; // size:0x4
gCurrentRegion = 0x80006110; // size:0x4 type:u32
sStackInfoListStart = 0x80006130; // size:0x4
sStackInfoListEnd = 0x80006134; // size:0x4
__osPiAccessQueueEnabled = 0x80006140; // size:0x4
osViModePalLan1 = 0x80006150; // size:0x50
osClockRate = 0x800061A0; // size:0x8
osViClock = 0x800061A8; // size:0x4
__osShutdown = 0x800061AC; // size:0x4 type:u32
__OSGlobalIntMask = 0x800061B0; // size:0x4 type:OSHWIntr
__osHwIntTable = 0x800061C0; // size:0x28 type:__osHwInt
__osPiIntTable = 0x800061E8; // size:0x8 type:__osHwInt
__osThreadTail = 0x800061F0; // size:0x8
__osRunQueue = 0x800061F8; // size:0x4 type:OSThread*
__osActiveQueue = 0x800061FC; // size:0x4
__osRunningThread = 0x80006200; // size:0x4 type:OSThread*
__osFaultedThread = 0x80006204; // size:0x4 type:OSThread*
__osPiDevMgr = 0x80006210; // size:0x1C
__osPiTable = 0x8000622C; // size:0x4 type:OSPiHandle*
__osCurrentHandle = 0x80006230; // size:0x8
__osPreNMI = 0x80006240; // size:0x4
__osTimerList = 0x80006250; // size:0x4
osViModeNtscLan1 = 0x80006260; // size:0x50
osViModeMpalLan1 = 0x800062B0; // size:0x50
vi = 0x80006300; // size:0x60
__osViCurr = 0x80006360; // size:0x4
__osViNext = 0x80006364; // size:0x4
__osViDevMgr = 0x80006380; // size:0x1C
__additional_scanline = 0x8000639C; // size:0x4
__osRcpImTable = 0x800064C0; // size:0x80 type:u16
sBootThreadInfo = 0x80006570; // size:0x1C
sIdleThread = 0x80006590; // size:0x1B0
sIdleThreadStack = 0x80006740; // size:0x400
sIdleThreadInfo = 0x80006B40; // size:0x1C
sBootThreadStack = 0x80006B60; // size:0x400
sMainThread = 0x80006F60; // size:0x1B0
sMainStack = 0x80007110; // size:0x900
sMainStackInfo = 0x80007A10; // size:0x1C
sPiMgrCmdBuff = 0x80007A30; // size:0xC8
gPiMgrCmdQueue = 0x80007AF8; // size:0x18
gViConfigMode = 0x80007B10; // size:0x50
gViConfigModeType = 0x80007B60; // size:0x1 type:u8
sDmaMgrStackInfo = 0x80007B70; // size:0x1C
sDmaMgrMsgQueue = 0x80007B90; // size:0x18
sDmaMgrMsgBuf = 0x80007BA8; // size:0x80
sDmaMgrThread = 0x80007C28; // size:0x1B0
sDmaMgrStack = 0x80007DD8; // size:0x500
sYaz0DataBuffer = 0x800082E0; // size:0x400
sYaz0DataBufferEnd = 0x800086E0; // size:0x4
sYaz0CurRomStart = 0x800086E4; // size:0x4
sYaz0CurSize = 0x800086E8; // size:0x4
sYaz0MaxPtr = 0x800086EC; // size:0x4
sCartInfo = 0x800086F0; // size:0x20
__DriveRomHandle = 0x80008710; // size:0x74 type:OSPiHandle
piAccessBuf = 0x80008790; // size:0x4
__osPiAccessQueue = 0x80008798; // size:0x18
__osFinalrom = 0x800087B0; // size:0x4
__Dom1SpeedParam = 0x800087C0; // size:0x74
__Dom2SpeedParam = 0x80008838; // size:0x74
piThread = 0x800088B0; // size:0x1B0
piStackThread = 0x80008A60; // size:0x1000
piEventQueue = 0x80009A60; // size:0x18
piEventBuf = 0x80009A78; // size:0x8
__osThreadSave = 0x80009A80; // size:0x1B0 type:OSThread
__osEventStateTab = 0x80009C30; // size:0x78 type:__OSEventState
__osCurrentTime = 0x80009CD0; // size:0x8
__osBaseCounter = 0x80009CD8; // size:0x4
__osViIntrCount = 0x80009CDC; // size:0x4
__osTimerCounter = 0x80009CE0; // size:0x4
__CartRomHandle = 0x80009CF0; // size:0x74
viThread = 0x80009D70; // size:0x1B0
viThreadStack = 0x80009F20; // size:0x1000
viEventQueue = 0x8000AF20; // size:0x18
viEventBuf = 0x8000AF38; // size:0x14
viRetraceMsg = 0x8000AF50; // size:0x18
viCounterMsg = 0x8000AF68; // size:0x18
gDmaDataTable = 0x8000AF90; //
sSetupHandlers = 0x800E4860; // size:0x8
D_8011578C = 0x800E486C; // size:0x40
D_801157CC = 0x800E48AC; // size:0x40
sEffectInfoTable = 0x800E4940; // size:0x50
sEffectSsInfo = 0x800E4990; // size:0xC
gEffectSsOverlayTable = 0x800E4A90; // size:0x40C
sNaviColorList = 0x800E5064; // size:0x68
D_80115FF8 = 0x800E50D8; // size:0x50
sEnemyActorCategories = 0x800E517C; // size:0x2
D_801160A0 = 0x800E5180; // size:0xC
D_80116268 = 0x800E5348; // size:0xC
D_80116274 = 0x800E5354; // size:0xC
D_80116280 = 0x800E5360; // size:0x18
gActorOverlayTable = 0x800E5380; // size:0x3AE0
gMaxActorId = 0x800E8E60; // size:0x4
D_80119D90 = 0x800E8E70; // size:0x80
sSurfaceMaterialToSfxOffset = 0x800E8EF0; // size:0x1C
sZorasDomainWaterBox = 0x800E8F8C; // size:0x10
sZorasDomainWaterBoxMinX = 0x800E8F9C; // size:0x4
sZorasDomainWaterBoxMinY = 0x800E8FA0; // size:0x4
sZorasDomainWaterBoxMinZ = 0x800E8FA4; // size:0x4
sZorasDomainWaterBoxMaxX = 0x800E8FA8; // size:0x4
sZorasDomainWaterBoxMaxY = 0x800E8FAC; // size:0x4
sZorasDomainWaterBoxMaxZ = 0x800E8FB0; // size:0x4
sCameraSettings = 0x800EBCC0; // size:0x210
sCameraFunctions = 0x800EBED0; // size:0x11C
sInitRegs = 0x800EBFEC; // size:0x4
gDebugCamEnabled = 0x800EBFF0; // size:0x4
sCameraInterfaceField = 0x800EBFF8; // size:0x4
sCameraHudVisibilityMode = 0x800EBFFC; // size:0x4
sCameraLetterboxSize = 0x800EC000; // size:0x4
D_8011D3AC = 0x800EC004; // size:0x4
D_8011D3B0 = 0x800EC008; // size:0x1C
D_8011D3CC = 0x800EC024; // size:0x1C
sUpdateCameraDirection = 0x800EC040; // size:0x4
D_8011D3EC = 0x800EC044; // size:0x4
D_8011D3F0 = 0x800EC048; // size:0x4
sDemo5PrevAction12Frame = 0x800EC04C; // size:0x4
D_8011D658 = 0x800EC050; // size:0x20
D_8011D678 = 0x800EC070; // size:0x30
sDemo5PrevSfxFrame = 0x800EC0A0; // size:0x4
D_8011D6AC = 0x800EC0A4; // size:0x78
D_8011D954 = 0x800EC34C; // size:0xA0
D_8011D9F4 = 0x800EC3EC; // size:0x78
sCamElevatorPlatformLowerEyePoints = 0x800EC464; // size:0x30
sCamElevatorPlatformUpperEyePoints = 0x800EC494; // size:0x30
sCamElevatorPlatformTogglePosY = 0x800EC4C4; // size:0x10
sCamElevatorPlatformFovRollParam = 0x800EC4D4; // size:0x10
sCamElevatorPlatformRolls = 0x800EC4E4; // size:0x8
sDebugCamTextEntryCount = 0x800ECAA0; // size:0x2
sDebugCamTextColors = 0x800ECAA4; // size:0x20
sCurTextId = 0x800ECB20; // size:0x2
sCurOcarinaAction = 0x800ECB24; // size:0x2
sManualCutsceneHandlers = 0x800ECB28; // size:0x14
sScriptedCutsceneHandlers = 0x800ECB3C; // size:0x14
sTitleDemoDestination = 0x800ECB50; // size:0x1
sEntranceCutsceneTable = 0x800ECB54; // size:0x110
sDrawItemTable = 0x800ECC80; // size:0x1074
sChildSariaQuestHints = 0x800EDD00; // size:0x34
sAdultSariaQuestHints = 0x800EDD34; // size:0x18
sReactionTextIds = 0x800EDD50; // size:0x438
gGameStateOverlayTable = 0x800EE190; // size:0x120 type:GameStateOverlay
sKaleidoSetupKscpPos0 = 0x800EE400; // size:0x8
sKaleidoSetupEyeX0 = 0x800EE408; // size:0x10
sKaleidoSetupEyeZ0 = 0x800EE418; // size:0x10
sKaleidoSetupKscpPos1 = 0x800EE428; // size:0x8
sKaleidoSetupEyeX1 = 0x800EE430; // size:0x10
sKaleidoSetupEyeZ1 = 0x800EE440; // size:0x10
sZBufValConversionTable = 0x800EE450; // size:0x40
gWeatherMode = 0x800EE490; // size:0x1
gLightConfigAfterUnderwater = 0x800EE494; // size:0x1
gInterruptSongOfStorms = 0x800EE498; // size:0x1
gSkyboxIsChanging = 0x800EE49C; // size:0x1
gTimeSpeed = 0x800EE4A0; // size:0x2
sSunScreenDepth = 0x800EE4A4; // size:0x2
sTimeBasedLightConfigs = 0x800EE4A8; // size:0xD2
gTimeBasedSkyboxConfigs = 0x800EE57C; // size:0x120
gNormalSkyFiles = 0x800EE69C; // size:0x90
sSandstormColorIndex = 0x800EE72C; // size:0x1
sNextSandstormColorIndex = 0x800EE730; // size:0x1
sSandstormLerpScale = 0x800EE734; // size:0x4
sLensFlareScales = 0x800EE738; // size:0x28
sSandstormPrimColors = 0x800EE824; // size:0xC
sSandstormEnvColors = 0x800EE830; // size:0xC
sInitChainHandlers = 0x800EE840; // size:0x2C
sPlayerInitialPosX = 0x800F2380; // size:0x2
sPlayerInitialPosZ = 0x800F2384; // size:0x2
sPlayerInitialDirection = 0x800F2388; // size:0x2
sEntranceIconMapIndex = 0x800F238C; // size:0x2
gMapDataTable = 0x800F4128; // size:0x70
gSpoilingItems = 0x800F4348; // size:0x6
gSpoilingItemReverts = 0x800F4350; // size:0x6
gPlayerSkelHeaders = 0x800F44A0; // size:0x8
sBootData = 0x800F44A8; // size:0xCC
sActionModelGroups = 0x800F4574; // size:0x43
sEnvHazardTextTriggers = 0x800F45B8; // size:0x10
gPlayerModelTypes = 0x800F45C8; // size:0x50
D_80125D28 = 0x800F4658; // size:0x60
gPlayerLeftHandBgsDLs = 0x800F4718; // size:0x20
gPlayerLeftHandOpenDLs = 0x800F4738; // size:0x10
gPlayerLeftHandClosedDLs = 0x800F4748; // size:0x10
sPlayerRightHandClosedDLs = 0x800F4788; // size:0x10
gPlayerLeftHandBoomerangDLs = 0x800F4828; // size:0x10
sFirstPersonLeftForearmDLs = 0x800F4848; // size:0x8
sFirstPersonLeftHandDLs = 0x800F4850; // size:0x8
sFirstPersonRightShoulderDLs = 0x800F4858; // size:0x8
sFirstPersonForearmDLs = 0x800F4860; // size:0x8
sFirstPersonRightHandHoldingWeaponDLs = 0x800F4868; // size:0x8
sPlayerDListGroups = 0x800F4870; // size:0x54
gCullBackDList = 0x800F48C8; // size:0x10
gCullFrontDList = 0x800F48D8; // size:0x10
sEyeMouthIndices = 0x800F48E8; // size:0x20
sEyeTextures = 0x800F4908; // size:0x40
sMouthTextures = 0x800F4928; // size:0x20
sTunicColors = 0x800F4938; // size:0x9
sGauntletColors = 0x800F4944; // size:0x6
sBootDListGroups = 0x800F494C; // size:0x10
sZeroVec = 0x800F495C; // size:0xC
D_80126038 = 0x800F4968; // size:0x18
D_80126050 = 0x800F4980; // size:0x8
D_80126058 = 0x800F4988; // size:0x8
D_80126060 = 0x800F4990; // size:0x8
D_80126068 = 0x800F4998; // size:0x8
D_80126070 = 0x800F49A0; // size:0xC
D_80126080 = 0x800F49B0; // size:0xC
D_8012608C = 0x800F49BC; // size:0xC
D_80126098 = 0x800F49C8; // size:0xC
D_801260A4 = 0x800F49D4; // size:0x24
sPlayerFocusHeadLimbModelPos = 0x800F4A04; // size:0xC
sMeleeWeaponLengths = 0x800F4A10; // size:0x18
sBottleDLists = 0x800F4A28; // size:0x8
sBottleColors = 0x800F4A30; // size:0x27
D_80126128 = 0x800F4A58; // size:0xC
sBowSlingshotStringData = 0x800F4A64; // size:0x20
sRightHandLimbModelShieldQuadVertices = 0x800F4A84; // size:0x30
D_80126184 = 0x800F4AB4; // size:0xC
D_80126190 = 0x800F4AC0; // size:0xC
sSheathLimbModelShieldQuadVertices = 0x800F4ACC; // size:0x30
sSheathLimbModelShieldOnBackPos = 0x800F4AFC; // size:0xC
sSheathLimbModelShieldOnBackZyxRot = 0x800F4B08; // size:0x6
sLeftRightFootLimbModelFootPos = 0x800F4B10; // size:0x18
sPauseModelGroupBySword = 0x800F4B28; // size:0x3
sQuakeUnused = 0x800F4B80; // size:0x2
sQuakeRequestCount = 0x800F4B84; // size:0x2
sQuakeCallbacks = 0x800F4B88; // size:0x1C
sSetupDL = 0x800F4BB0; // size:0xD50
sFillSetupDL = 0x800F5900; // size:0x60
D_801270A0 = 0x800F59D0; // size:0xC
sRoomDrawHandlers = 0x800F5A40; // size:0xC
gBitFlags = 0x800F5A50; // size:0x80
gEquipMasks = 0x800F5AD0; // size:0x8
gEquipNegMasks = 0x800F5AD8; // size:0x8
gUpgradeMasks = 0x800F5AE0; // size:0x20
gUpgradeNegMasks = 0x800F5B00; // size:0x20
gEquipShifts = 0x800F5B20; // size:0x4
gUpgradeShifts = 0x800F5B24; // size:0x8
gUpgradeCapacities = 0x800F5B2C; // size:0x40 type:u16
gGsFlagsMasks = 0x800F5B6C; // size:0x10
gGsFlagsShifts = 0x800F5B7C; // size:0x10
gItemIcons = 0x800F5B8C; // size:0x208
gItemSlots = 0x800F5D94; // size:0x38
sNaviQuestHintFiles = 0x800F5E38; // size:0x10
gLinkObjectIds = 0x800F5E50; // size:0x4
gObjectTableSize = 0x800F5E54; // size:0x4
gObjectTable = 0x800F5E58; // size:0xC90
gEntranceTable = 0x800F6AF0; // size:0x1850
gSceneTable = 0x800F8340; //
sDefaultDisplayList = 0x800F8B28; // size:0x50
D_8012A2F8 = 0x800F8B78; // size:0x8
gDCEntranceTextures = 0x800F8B80; // size:0x8
sDCLavaFloorTextures = 0x800F8B88; // size:0x20
sThievesHideoutEntranceTextures = 0x800F8BA8; // size:0x8
D_8012A330 = 0x800F8BB0; // size:0x8
sIceCavernEntranceTextures = 0x800F8BB8; // size:0x8
sGTGEntranceTextures = 0x800F8BC0; // size:0x8
sLonLonHouseEntranceTextures = 0x800F8BC8; // size:0x8
sGuardHouseView2Textures = 0x800F8BD0; // size:0x8
sGuardHouseView1Textures = 0x800F8BD8; // size:0x8
sForestTempleEntranceTextures = 0x800F8BE0; // size:0x8
sSpiritTempleEntranceTextures = 0x800F8BE8; // size:0x8
sKakarikoWindowTextures = 0x800F8BF0; // size:0x8
sZorasDomainEntranceTextures = 0x800F8BF8; // size:0x8
D_8012A380 = 0x800F8C00; // size:0x8
sGoronCityEntranceTextures = 0x800F8C08; // size:0x8
sLonLonRanchWindowTextures = 0x800F8C10; // size:0x8
D_8012A398 = 0x800F8C18; // size:0x4
sSceneDrawConfigs = 0x800F8C24; // size:0xD4
sMtxFClear = 0x800F8D20; // size:0x40
gSramSlotOffsets = 0x800F8D60; // size:0xC type:u16
sSsSramContext = 0x800F8F10; // size:0xA4
sLogOnNextViewInit = 0x800F8FF0; // size:0x4
sCoverageOnlyDL = 0x800F9000; // size:0x28
sCoverageRGBFogDL = 0x800F9028; // size:0x18
sCoverageRGBDL = 0x800F9040; // size:0x18
sCoverageRGBUniformDL = 0x800F9058; // size:0x30
sSkybox256TexOffsets = 0x800F9090; // size:0x10
sSkybox256VtxBufIndices = 0x800F90A0; // size:0x80
sSkybox256TexSCoords = 0x800F9120; // size:0xA
sSkybox256TexTCoords = 0x800F912C; // size:0x12
sSkybox256VtxIndices = 0x800F9140; // size:0x80
sSkybox128TexOffsets = 0x800F91C0; // size:0x18
sSkybox128VtxBufIndices = 0x800F91D8; // size:0x40
sSkybox128TexSCoords = 0x800F9218; // size:0xA
sSkybox128TexTCoordsXZ = 0x800F9224; // size:0xA
sSkybox128TexTCoords = 0x800F9230; // size:0xA
sSkybox128VtxIndices = 0x800F923C; // size:0x80
sSkybox256FaceParams = 0x800F92BC; // size:0x50
sSkybox128FaceParams = 0x800F930C; // size:0x78
sTransTileSetupDL = 0x800F9400; // size:0x30
sTransTriforceDL = 0x800F9430; // size:0x30
sTransWipeDL = 0x800F9E90; // size:0x190
sTransCircleNormalTex = 0x800F9FA8; // size:0x400
sTransCircleWaveTex = 0x800FA3A8; // size:0x400
sTransCircleRippleTex = 0x800FA7A8; // size:0x400
sTransCircleStarburstTex = 0x800FABA8; // size:0x400
sTransCircleDL = 0x800FB1C8; // size:0xD0
sLetterboxState = 0x800FB2D0; // size:0x4
sLetterboxSizeTarget = 0x800FB2D4; // size:0x4
sLetterboxSize = 0x800FB2D8; // size:0x4
gKaleidoMgrOverlayTable = 0x800FB2E0; // size:0x38 type:KaleidoMgrOverlay
sKaleidoAreaPtr = 0x800FB318; // size:0x4 type:void*
gKaleidoMgrCurOvl = 0x800FB31C; // size:0x4 type:KaleidoMgrOverlay*
gBossMarkState = 0x800FB320; // size:0x1 type:u8
D_8012D1F8 = 0x800FB330; // size:0x4
sSfxBankIds = 0x800FB340; // size:0x7
gScreenWidth = 0x800FB360; // size:0x4 type:s32
gScreenHeight = 0x800FB364; // size:0x4 type:s32
gSystemHeapSize = 0x800FB368; // size:0x4 type:u32
gPadMgrLogSeverity = 0x800FB370; // size:0x4
sSpeedMeterTimeEntryArray = 0x800FB380; // size:0x30
sFactorialTbl = 0x800FB3B0; // size:0x34
gMtxClear = 0x800FBC00; // size:0x40
gMtxFClear = 0x800FBC40; // size:0x40
sDefaultGSPUCodeText = 0x800FBC80; // size:0x4
sDefaultGSPUCodeData = 0x800FBC84; // size:0x4
gIrqMgrResetStatus = 0x800FBCA0; // size:0x4
sIrqMgrResetTime = 0x800FBCA8; // size:0x8
gIrqMgrRetraceTime = 0x800FBCB0; // size:0x8
sIrqMgrRetraceCount = 0x800FBCB8; // size:0x4
sExceptionNames = 0x800FBCC0; // size:0x48
sFpExceptionNames = 0x800FBD08; // size:0x18
sFaultDrawerDefault = 0x800FBD20; // size:0x3C
gWaveSamples = 0x800FCD60; // size:0x24
gBendPitchOneOctaveFrequencies = 0x800FCD84; // size:0x400
gBendPitchTwoSemitonesFrequencies = 0x800FD184; // size:0x400
gPitchFrequencies = 0x800FD584; // size:0x200
gDefaultShortNoteVelocityTable = 0x800FD784; // size:0x10
gDefaultShortNoteGateTimeTable = 0x800FD794; // size:0x10
gDefaultEnvelope = 0x800FD7A4; // size:0x10
gZeroNoteSub = 0x800FD7B4; // size:0x20
gDefaultNoteSub = 0x800FD7D4; // size:0x20
gHaasEffectDelaySizes = 0x800FD7F4; // size:0x80
D_8012FBA8 = 0x800FD878; // size:0x80
gHeadsetPanVolume = 0x800FD8F8; // size:0x200
gStereoPanVolume = 0x800FDAF8; // size:0x200
gDefaultPanVolume = 0x800FDCF8; // size:0x200
gLowPassFilterData = 0x800FDEF8; // size:0x100
gHighPassFilterData = 0x800FDFF8; // size:0xF0
sEnvMixerOp = 0x800FE170; // size:0x4
sEnvMixerLeftHaasDmemDests = 0x800FE174; // size:0x4
sEnvMixerRightHaasDmemDests = 0x800FE178; // size:0x4
sEnvMixerDefaultDmemDests = 0x800FE17C; // size:0x4
sNumSamplesPerWavePeriod = 0x800FE190; // size:0x4
sDmaHandler = 0x800FE1A0; // size:0x4
sUnusedHandler = 0x800FE1A4; // size:0x4
gAudioContextInitialized = 0x800FE1A8; // size:0x4
sSeqInstructionArgsTable = 0x800FE1F0; // size:0x50
gIsLargeSfxBank = 0x800FE240; // size:0x7
gChannelsPerBank = 0x800FE248; // size:0x1C
gUsedChannelsPerBank = 0x800FE264; // size:0x1C
D_801305B0 = 0x800FE280; // size:0x4
D_801305B4 = 0x800FE284; // size:0x1
D_801305B8 = 0x800FE288; // size:0x1
D_801305BC = 0x800FE28C; // size:0x1
D_801305C0 = 0x800FE290; // size:0x1
sBehindScreenZ = 0x800FE294; // size:0x8
sAudioIncreasingTranspose = 0x800FE29C; // size:0x1
gMorphaTransposeTable = 0x800FE2A0; // size:0x10
sPrevChargeLevel = 0x800FE2B0; // size:0x1
D_801305E4 = 0x800FE2B4; // size:0x10
D_801305F4 = 0x800FE2C4; // size:0x4
sGanonsTowerLevelsVol = 0x800FE2C8; // size:0x8
sEnterGanonsTowerTimer = 0x800FE2D0; // size:0x1
sSoundMode = 0x800FE2D4; // size:0x1
D_80130608 = 0x800FE2D8; // size:0x1
sAudioCutsceneFlag = 0x800FE2DC; // size:0x1
sSpecReverb = 0x800FE2E0; // size:0x1
sAudioEnvReverb = 0x800FE2E4; // size:0x1
sAudioCodeReverb = 0x800FE2E8; // size:0x1
sPrevSeqMode = 0x800FE2EC; // size:0x1
sAudioEnemyDist = 0x800FE2F0; // size:0x4
sAudioEnemyVol = 0x800FE2F4; // size:0x1
sPrevMainBgmSeqId = 0x800FE2F8; // size:0x2
sSeqResumePoint = 0x800FE2FC; // size:0x1
sPrevSceneSeqId = 0x800FE300; // size:0x1
sNumFramesStill = 0x800FE304; // size:0x4
sNumFramesMoving = 0x800FE308; // size:0x4
sAudioBaseFilter = 0x800FE30C; // size:0x1
sAudioExtraFilter = 0x800FE310; // size:0x1
sAudioBaseFilter2 = 0x800FE314; // size:0x1
sAudioExtraFilter2 = 0x800FE318; // size:0x1
sSariaBgmPtr = 0x800FE31C; // size:0x4
D_80130650 = 0x800FE320; // size:0x4
sSeqFlags = 0x800FE324; // size:0x6E
sSpecReverbs = 0x800FE394; // size:0x14
sNatureAmbienceDataIO = 0x800FE3A8; // size:0x820
sOcarinaAllowedButtonMask = 0x800FEBC8; // size:0x4
sOcarinaAButtonMap = 0x800FEBCC; // size:0x4
sOcarinaCUpButtonMap = 0x800FEBD0; // size:0x4
sOcarinaCDownButtonMap = 0x800FEBD4; // size:0x4
sIsOcarinaInputEnabled = 0x800FEBD8; // size:0x1
sOcarinaInstrumentId = 0x800FEBDC; // size:0x1
sCurOcarinaPitch = 0x800FEBE0; // size:0x1
sPrevOcarinaPitch = 0x800FEBE4; // size:0x1
sCurOcarinaButtonIndex = 0x800FEBE8; // size:0x1
sMusicStaffPrevPitch = 0x800FEBEC; // size:0x1
sCurOcarinaBendFreq = 0x800FEBF0; // size:0x4
sRelativeOcarinaVolume = 0x800FEBF4; // size:0x4
sCurOcarinaBendIndex = 0x800FEBF8; // size:0x1
sCurOcarinaVolume = 0x800FEBFC; // size:0x1
sCurOcarinaVibrato = 0x800FEC00; // size:0x1
sPlaybackState = 0x800FEC04; // size:0x1
sOcarinaFlags = 0x800FEC08; // size:0x4
sPlaybackNoteTimer = 0x800FEC0C; // size:0x4
sPlaybackNotePos = 0x800FEC10; // size:0x2
sPlaybackStaffPos = 0x800FEC14; // size:0x2
sPrevOcarinaWithMusicStaffFlags = 0x800FEC18; // size:0x2
sPlaybackPitch = 0x800FEC1C; // size:0x1
sNotePlaybackVolume = 0x800FEC20; // size:0x1
sNotePlaybackVibrato = 0x800FEC24; // size:0x1
sNotePlaybackBend = 0x800FEC28; // size:0x1
sRelativeNotePlaybackBend = 0x800FEC2C; // size:0x4
sRelativeNotePlaybackVolume = 0x800FEC30; // size:0x4
sOcarinaPlaybackTaskStart = 0x800FEC34; // size:0x4
sButtonToPitchMap = 0x800FEC38; // size:0x5
sOcaMemoryGameAppendPos = 0x800FEC40; // size:0x1
sOcaMemoryGameEndPos = 0x800FEC44; // size:0x1
sOcaMemoryGameNumNotes = 0x800FEC48; // size:0x3
sOcarinaSongNotes = 0x800FEC4C; // size:0x8C0
sPlaybackSong = 0x800FF50C; // size:0x4
sFrogsSongNotes = 0x800FF510; // size:0xE
gFrogsSongPtr = 0x800FF520; // size:0x4
sRecordingState = 0x800FF524; // size:0x1
sRecordSongPos = 0x800FF528; // size:0x1
sOcarinaRecordTaskStart = 0x800FF52C; // size:0x4
sRecordOcarinaPitch = 0x800FF530; // size:0x1
sRecordOcarinaVolume = 0x800FF534; // size:0x1
sRecordOcarinaVibrato = 0x800FF538; // size:0x1
sRecordOcarinaBendIndex = 0x800FF53C; // size:0x1
sRecordOcarinaButtonIndex = 0x800FF540; // size:0x1
sPlayedOcarinaSongIndexPlusOne = 0x800FF544; // size:0x1
sMusicStaffNumNotesPerTest = 0x800FF548; // size:0x1
sOcarinaDropInputTimer = 0x800FF54C; // size:0x1
sScarecrowsLongSongNotes = 0x800FF550; // size:0x360
gScarecrowLongSongPtr = 0x800FF8B0; // size:0x4
gScarecrowSpawnSongPtr = 0x800FF8B4; // size:0x4
sMemoryGameSongPtr = 0x800FF8B8; // size:0x4
sPitchToButtonMap = 0x800FF8BC; // size:0x10
gOcarinaSongButtons = 0x800FF8CC; // size:0x7E
gSfxParams = 0x80100D0C; // size:0x1C
gSfxRequestWriteIndex = 0x80100D30; // size:0x1
gSfxRequestReadIndex = 0x80100D34; // size:0x1
gSfxBanks = 0x80100D38; // size:0x1C
gSfxBankSizes = 0x80100D54; // size:0x7
gSfxChannelLayout = 0x80100D5C; // size:0x1
D_801333D0 = 0x80100D60; // size:0x2
gSfxDefaultPos = 0x80100D64; // size:0xC
gSfxDefaultFreqAndVolScale = 0x80100D70; // size:0x4
gSfxDefaultReverb = 0x80100D78; // size:0x1
gSeqCmdWritePos = 0x80100D80; // size:0x1
gSeqCmdReadPos = 0x80100D84; // size:0x1
gStartSeqDisabled = 0x80100D88; // size:0x1
gSoundModeList = 0x80100D8C; // size:0x4
gAudioSpecId = 0x80100D90; // size:0x1
D_80133418 = 0x80100D94; // size:0x1
gAudioSpecs = 0x80101148; // size:0x3F0
sGfxPrintFontTLUT = 0x80101550; // size:0x80
sGfxPrintRainbowTLUT = 0x801015D0; // size:0x20
sGfxPrintRainbowData = 0x801015F0; // size:0x8
sGfxPrintFontData = 0x801015F8; // size:0x800
sInitFuncs = 0x80101E00; // size:0x4
qNaN0x10000 = 0x80101E24; // size:0x4
__osSiAccessQueueEnabled = 0x80102650; // size:0x4
__osContInitialized = 0x80102660; // size:0x4
spaces = 0x80102670; // size:0x21
zeroes = 0x80102694; // size:0x21
__osPfsInodeCacheChannel = 0x80102730; // size:0x4
__osPfsInodeCacheBank = 0x80102734; // size:0x1
__osPfsLastChannel = 0x80102740; // size:0x4
gTempoData = 0x80107240; // size:0x4
gAudioHeapInitSizes = 0x80107244; // size:0xC
__libm_qnan_f = 0x80107740; // size:0x4
sTextFade = 0x801077C0; // size:0x2
D_8014B2F4 = 0x801077C4; // size:0x1
sOcarinaButtonIndexBufPos = 0x801077C8; // size:0x2
sOcarinaButtonIndexBufLen = 0x801077CC; // size:0x2
sTextboxSkipped = 0x801077D0; // size:0x1
sNextTextId = 0x801077D4; // size:0x2
sTextIsCredits = 0x801077D8; // size:0x2
sLastPlayedSong = 0x801077E0; // size:0x2
sHasSunsSong = 0x801077E4; // size:0x2
sMessageHasSetSfx = 0x801077E8; // size:0x2
sOcarinaSongBitFlags = 0x801077EC; // size:0x2
sNesMessageEntryTable = 0x801077F0; // size:0x4228
sGerMessageEntryTable = 0x8010BA18; // size:0x2110
sFraMessageEntryTable = 0x8010DB28; // size:0x2110
sStaffMessageEntryTable = 0x8010FC38; // size:0x188
sNesMessageEntryTablePtr = 0x8010FDC0; // size:0x4
sGerMessageEntryTablePtr = 0x8010FDC4; // size:0x4
sFraMessageEntryTablePtr = 0x8010FDC8; // size:0x4
sStaffMessageEntryTablePtr = 0x8010FDCC; // size:0x4
sTextboxBackgroundForePrimColors = 0x8010FDD0; // size:0x30
sTextboxBackgroundBackPrimColors = 0x8010FE00; // size:0x18
sTextboxBackgroundYOffsets = 0x8010FE18; // size:0x4
sOcarinaButtonIndexBuf = 0x8010FE1C; // size:0xC
sOcarinaButtonAlphaValues = 0x8010FE28; // size:0x12
gOcarinaSongItemMap = 0x8010FE3C; // size:0x18
sFontWidths = 0x8010FED0; // size:0x240
gGameOverTimer = 0x80110240; // size:0x2 type:s16
gSoundFontTable = 0x80110470; //
gSequenceFontTable = 0x801106E0; //
gSequenceTable = 0x801108A0; //
gSampleBankTable = 0x80110F90; //
aspMainDataStart = 0x80111010; //
sEffectContext = 0x80113140; // size:0x3DF0
D_8015BC00 = 0x80116F40; // size:0xE
D_8015BC10 = 0x80116F50; // size:0x4
D_8015BC14 = 0x80116F58; // size:0x4
D_8015BC18 = 0x80116F60; // size:0x4
D_8015BBE8 = 0x80116F64; // size:0x4
D_8015BBEC = 0x80116F68; // size:0x4
D_8015BBF0 = 0x80116F6C; // size:0x4
sbgmEnemyDistSq = 0x80116F70; // size:0x4
D_8015BBF8 = 0x80116F74; // size:0x4
D_8015BBFC = 0x80116F78; // size:0x2
D_8015BD7C = 0x80117198; // size:0x4
playerFloorPoly = 0x8011719C; // size:0x4
D_8015FA88 = 0x80118930; // size:0x4
D_8015FA8C = 0x80118934; // size:0x4
gSaveContext = 0x80118938; // size:0x1428 type:SaveContext
gRegEditor = 0x80119D60; // size:0x4 type:RegEditor*
sDebugCamTextBuffer = 0x80119D68; // size:0x210
gCamAtSplinePointsAppliedFrame = 0x80119FAE; // size:0x2
gCamEyePointAppliedFrame = 0x80119FB0; // size:0x2
gCamAtPointAppliedFrame = 0x80119FB2; // size:0x2
sReturnToCamId = 0x80119FB4; // size:0x2
sQuakeIndex = 0x80119FB6; // size:0x2
sLightningBolts = 0x80119FC8; // size:0x60
gLightningStrike = 0x8011A028; // size:0xC
sLightningFlashAlpha = 0x8011A034; // size:0x2
sSunDepthTestX = 0x8011A036; // size:0x2
sSunDepthTestY = 0x8011A038; // size:0x2
gCustomLensFlareOn = 0x8011A03A; // size:0x1
gCustomLensFlarePos = 0x8011A040; // size:0xC
gLensFlareScale = 0x8011A04C; // size:0x2
gLensFlareColorIntensity = 0x8011A050; // size:0x4
gLensFlareGlareStrength = 0x8011A054; // size:0x2
sNGameOverLightNode = 0x8011A058; // size:0x4
sNGameOverLightInfo = 0x8011A060; // size:0xE
sSGameOverLightNode = 0x8011A070; // size:0x4
sSGameOverLightInfo = 0x8011A078; // size:0xE
sGameOverLightsIntensity = 0x8011A086; // size:0x1
sSandstormScroll = 0x8011A088; // size:0x2
sBeatingHeartsDDPrim = 0x8011A090; // size:0x6
sBeatingHeartsDDEnv = 0x8011A098; // size:0x6
sHeartsDDPrim = 0x8011A0A0; // size:0xC
sHeartsDDEnv = 0x8011A0B0; // size:0xC
sLightsBuffer = 0x8011A0C0; // size:0x188
sZeldaArena = 0x8011A250; // size:0x24 type:Arena
gMapData = 0x8011A290; // size:0x4
sCurBodyPartPos = 0x8011A2C0; // size:0x4
sDListsLodOffset = 0x8011A2C4; // size:0x4
sGetItemRefPos = 0x8011A2C8; // size:0xC
sLeftHandType = 0x8011A2D4; // size:0x4
sRightHandType = 0x8011A2D8; // size:0x4
sQuakeRequests = 0x8011A2E0; // size:0x90
gSkinLimbMatrices = 0x8011A380; // size:0xF00
sRumbleMgr = 0x8011B290; // size:0x10E
sSkyboxDrawMatrix = 0x8011B3A0; // size:0x4
sPlayerCallInitFunc = 0x8011B3B0; // size:0x4
sPlayerCallDestroyFunc = 0x8011B3B4; // size:0x4
sPlayerCallUpdateFunc = 0x8011B3B8; // size:0x4
sPlayerCallDrawFunc = 0x8011B3BC; // size:0x4
sKaleidoScopeUpdateFunc = 0x8011B3C0; // size:0x4
sKaleidoScopeDrawFunc = 0x8011B3C4; // size:0x4
gBossMarkScale = 0x8011B3C8; // size:0x4
gLoadedPauseMarkDataTable = 0x8011B3D0; // size:0x4
gTransitionTile = 0x8011B3E0; // size:0xE0
gTransitionTileState = 0x8011B4C0; // size:0x4
gPlayVisMono = 0x8011B4C8; // size:0x18
gVisMonoColor = 0x8011B4E0; // size:0x4
D_801664D0 = 0x8011B4F0; // size:0x20
sVisCvg = 0x8011B510; // size:0x10
sVisZBuf = 0x8011B520; // size:0x10
sVisMono = 0x8011B530; // size:0x18
sViMode = 0x8011B548; // size:0x88
sGraphPrevUpdateEndTime = 0x8011B5D0; // size:0x8
sGraphPrevTaskTimeStart = 0x8011B5D8; // size:0x8
gSegments = 0x8011B648; // size:0x40 type:uintptr_t[16]
gScheduler = 0x8011B688; // size:0x258
gPadMgr = 0x8011B8E0; // size:0x468
gIrqMgr = 0x8011BD48; // size:0x280
sGraphThread = 0x8011BFC8; // size:0x1B0
sGraphStack = 0x8011C178; // size:0x1800
sSchedStack = 0x8011D978; // size:0x600
sAudioStack = 0x8011DF78; // size:0x800
sPadMgrStack = 0x8011E778; // size:0x500
sIrqMgrStack = 0x8011EC78; // size:0x500
sGraphStackInfo = 0x8011F178; // size:0x1C
sSchedStackInfo = 0x8011F198; // size:0x1C
sAudioStackInfo = 0x8011F1B8; // size:0x1C
sPadMgrStackInfo = 0x8011F1D8; // size:0x1C
sIrqMgrStackInfo = 0x8011F1F8; // size:0x1C
gAudioMgr = 0x8011F218; // size:0x298
sSerialEventQueue = 0x8011F4B0; // size:0x18
sSerialMsgBuf = 0x8011F4C8; // size:0x4
sRSPGfxTimeStart = 0x8011F4E0; // size:0x8
sRSPAudioTimeStart = 0x8011F4E8; // size:0x8
sRSPOtherTimeStart = 0x8011F4F0; // size:0x8
sRDPTimeStart = 0x8011F4F8; // size:0x8
gAudioThreadUpdateTimeTotalPerGfxTask = 0x8011F500; // size:0x8
gGfxTaskSentToNextReadyMinusAudioThreadUpdateTime = 0x8011F508; // size:0x8
gRSPAudioTimeTotal = 0x8011F510; // size:0x8
gRSPGfxTimeTotal = 0x8011F518; // size:0x8
gRDPTimeTotal = 0x8011F520; // size:0x8
gGraphUpdatePeriod = 0x8011F528; // size:0x8
gAudioThreadUpdateTimeStart = 0x8011F530; // size:0x8
gAudioThreadUpdateTimeAcc = 0x8011F538; // size:0x8
gRSPAudioTimeAcc = 0x8011F540; // size:0x8
gRSPGfxTimeAcc = 0x8011F548; // size:0x8
gRSPOtherTimeAcc = 0x8011F550; // size:0x8
gRDPTimeAcc = 0x8011F560; // size:0x8
sSpeedMeterTimeEntryPtr = 0x8011F568; // size:0x4
sSysCfbFbPtr = 0x8011F570; // size:0x8
sSysCfbEnd = 0x8011F578; // size:0x4
sMatrixStack = 0x8011F7A0; // size:0x4 type:MtxF*
sCurrentMatrix = 0x8011F7A4; // size:0x4 type:MtxF*
sFaultInstance = 0x8011F7B0; // size:0x4
sFaultAwaitingInput = 0x8011F7B4; // size:0x1
sFaultStack = 0x8011F7B8; // size:0x600
sFaultThreadInfo = 0x8011FDB8; // size:0x1C
gFaultMgr = 0x8011FDD8; // size:0x850
sFaultDrawer = 0x80120630; // size:0x3C type:FaultDrawer
sScriptLoadQueue = 0x80120690; // size:0x18
sScriptLoadMsgBuf = 0x801206A8; // size:0x40
sScriptLoadDonePointers = 0x801206E8; // size:0x40
D_8016B780 = 0x80120730; // size:0x4
D_8016B7A8 = 0x80120750; // size:0x4
D_8016B7AC = 0x80120754; // size:0x4
D_8016B7B0 = 0x80120758; // size:0x4
sRiverFreqScaleLerp = 0x80120760; // size:0x10
sWaterfallFreqScaleLerp = 0x80120770; // size:0x10
D_8016B7D8 = 0x80120780; // size:0x4
D_8016B7DC = 0x80120784; // size:0x1
D_8016B7E0 = 0x80120788; // size:0x4
sRiverSoundMainBgmVol = 0x8012078C; // size:0x1
sRiverSoundMainBgmCurrentVol = 0x8012078D; // size:0x1
sRiverSoundMainBgmLower = 0x8012078E; // size:0x1
sRiverSoundMainBgmRestore = 0x8012078F; // size:0x1
sGanonsTowerVol = 0x80120790; // size:0x1
sSfxChannelState = 0x80120798; // size:0x100
sMalonSingingTimer = 0x80120898; // size:0x1
sMalonSingingDisabled = 0x80120899; // size:0x1
D_8016B9F3 = 0x8012089A; // size:0x1
sFanfareStartTimer = 0x8012089B; // size:0x1
sFanfareSeqId = 0x8012089C; // size:0x2
sPlayingStaff = 0x8012089E; // size:0x3
sPlaybackStaff = 0x801208A2; // size:0x3
sRecordingStaff = 0x801208A6; // size:0x3
sOcarinaUpdateTaskStart = 0x801208AC; // size:0x4
sOcarinaInputStickAdj = 0x801208B0; // size:0x2
sOcarinaInputButtonCur = 0x801208B4; // size:0x4
sOcarinaInputButtonStart = 0x801208B8; // size:0x4
sOcarinaInputButtonPrev = 0x801208BC; // size:0x4
sOcarinaInputButtonPress = 0x801208C0; // size:0x4
sCurOcarinaSongWithoutMusicStaff = 0x801208C8; // size:0x8
sOcarinaWithoutMusicStaffPos = 0x801208D0; // size:0x1
sOcarinaHasStartedSong = 0x801208D1; // size:0x1
sFirstOcarinaSongIndex = 0x801208D2; // size:0x1
sLastOcarinaSongIndex = 0x801208D3; // size:0x1
sAvailOcarinaSongFlags = 0x801208D4; // size:0x2
sStaffOcarinaPlayingPos = 0x801208D6; // size:0x1
sMusicStaffPos = 0x801208D8; // size:0x1C
sMusicStaffCurHeldLength = 0x801208F8; // size:0x1C
sMusicStaffExpectedLength = 0x80120918; // size:0x1C
sMusicStaffExpectedPitch = 0x80120938; // size:0xE
sScarecrowsLongSongSecondNote = 0x80120948; // size:0x8
sSfxRequests = 0x80121820; // size:0x1800
sSfxBankListEnd = 0x80123020; // size:0x7
sSfxBankFreeListStart = 0x80123028; // size:0x7
sSfxBankUnused = 0x80123030; // size:0x7
gActiveSfx = 0x80123038; // size:0xA8
sCurSfxPlayerChannelIndex = 0x801230E0; // size:0x1
gSfxBankMuted = 0x801230E4; // size:0x7
sUnusedBankLerp = 0x801230F0; // size:0x70
sSeqRequests = 0x80123160; // size:0x28
sNumSeqRequests = 0x80123188; // size:0x4
sAudioSeqCmds = 0x80123190; // size:0x400
gActiveSeqs = 0x80123590; // size:0x990
gAudioCtx = 0x80123FC0; // size:0x6450
gAudioCustomUpdateFunction = 0x8012A410; // size:0x4
gUseAtanContFrac = 0x8012A440; // size:0x4
gSystemArena = 0x8012A450; // size:0x24 type:Arena
sArenaLockMsg = 0x8012A490; // size:0x4 type:OSMesg
sJpegBitStreamPtr = 0x8012A4A0; // size:0x4
sJpegBitStreamByteIdx = 0x8012A4A4; // size:0x4
sJpegBitStreamBitIdx = 0x8012A4A8; // size:0x1
sJpegBitStreamDontSkip = 0x8012A4A9; // size:0x1
sJpegBitStreamCurWord = 0x8012A4AC; // size:0x4
__MotorDataBuf = 0x8012A4F0; // size:0x100
siAccessBuf = 0x8012A5F0; // size:0x4
__osSiAccessQueue = 0x8012A5F8; // size:0x18
__osContPifRam = 0x8012A610; // size:0x40
__osContLastCmd = 0x8012A650; // size:0x1
__osMaxControllers = 0x8012A651; // size:0x1
__osEepromTimerMsgQueue = 0x8012A678; // size:0x18
__osEepromTimerMsg = 0x8012A690; // size:0x4
__osPfsInodeCache = 0x8012A6A0; // size:0x100
__osPfsPifRam = 0x8012A7A0; // size:0x40
sCharTexSize = 0x8012A7E0; // size:0x4
sCharTexScale = 0x8012A7E4; // size:0x4
sOcarinaButtonAPrimR = 0x8012A7E8; // size:0x2
sOcarinaButtonAPrimB = 0x8012A7EA; // size:0x2
sOcarinaButtonAPrimG = 0x8012A7EC; // size:0x2
sOcarinaButtonAEnvR = 0x8012A7EE; // size:0x2
sOcarinaButtonAEnvB = 0x8012A7F0; // size:0x2
sOcarinaButtonAEnvG = 0x8012A7F2; // size:0x2
sOcarinaButtonCPrimR = 0x8012A7F4; // size:0x2
sOcarinaButtonCPrimB = 0x8012A7F6; // size:0x2
sOcarinaButtonCPrimG = 0x8012A7F8; // size:0x2
sOcarinaButtonCEnvR = 0x8012A7FA; // size:0x2
sOcarinaButtonCEnvB = 0x8012A7FC; // size:0x2
sOcarinaButtonCEnvG = 0x8012A7FE; // size:0x2
gZBuffer = 0x8012A800; // size:0x25800 type:u16
gGfxSPTaskOutputBuffer = 0x80150000; // size:0x18000
gGfxSPTaskYieldBuffer = 0x80168000; // size:0xC00
gGfxSPTaskStack = 0x80168C00; // size:0x400
gGfxPools = 0x80169000; // size:0x24820
gAudioHeap = 0x8018D820; // size:0x38000
_buffersSegmentEnd = 0x801C5820; //
D_80811BB0 = 0x80810D70; // size:0x180
D_80811D30 = 0x80810EF0; // size:0x100
D_80811E30 = 0x80810FF0; // size:0x100
D_80811F30 = 0x808110F0; // size:0x200
D_80812130 = 0x808112F0; // size:0x200
gOptionsDividerTopVtx = 0x808114F0; // size:0x40
gOptionsDividerMiddleVtx = 0x80811530; // size:0x40
gOptionsDividerBottomVtx = 0x80811570; // size:0x40
D_808123F0 = 0x808115B0; // size:0x82
gAmmoItems = 0x80828020; // size:0x10
D_8082AAEC = 0x808286EC; // size:0x40
D_8082AB2C = 0x8082872C; // size:0x40
gSlotAgeReqs = 0x808287FC; // size:0x18
gEquipAgeReqs = 0x80828814; // size:0x10
gItemAgeReqs = 0x80828824; // size:0x56
gAreaGsFlags = 0x8082887C; // size:0x16
gPauseMapMarkDataTable = 0x80828EC0; // size:0x4158
sReturnEntranceGroupData = 0x80850FD8; // size:0x1C
sReturnEntranceGroupIndices = 0x80850FF4; // size:0x6
gMapMarkDataTable = 0x8085BEE8; // size:0x28
D_808BB2F0 = 0x808B18A0; // size:0x4A8
D_808BB7A0 = 0x808B1D50; // size:0x5E8
D_808BBD90 = 0x808B2340; // size:0x628
D_808BCE20 = 0x808B3350; // size:0x480
D_808BD2A0 = 0x808B37D0; // size:0x280
D_808BD520 = 0x808B3A50; // size:0x270
D_808BD790 = 0x808B3CC0; // size:0x200
gGanondorfShadowSetupDL = 0x808DA308; // size:0x20
gGanondorfShadowModelDL = 0x808DA328; // size:0x30
gGanondorfTriforceDL = 0x808DB398; // size:0x80
gGanondorfWindowShardMaterialDL = 0x808DB888; // size:0xA8
gGanondorfWindowShardModelDL = 0x808DB930; // size:0x18
gGanondorfWindowShatterTemplateTex = 0x808DB948; // size:0x800
gGanondorfLightBallMaterialDL = 0x808DD188; // size:0x70
gGanondorfSquareDL = 0x808DD1F8; // size:0x18
gGanondorfLightningDL = 0x808E6250; // size:0x80
gGanondorfLightRayTriDL = 0x808E6378; // size:0x48
gGanondorfLightFlecksDL = 0x808E7DD0; // size:0xF0
gGanondorfBigMagicBGCircleDL = 0x808E7EC0; // size:0xA8
gGanondorfDotDL = 0x808E7F68; // size:0xC8
gGanondorfShockwaveDL = 0x808E89D0; // size:0xF8
gGanondorfImpactDarkDL = 0x808E9868; // size:0x118
gGanondorfImpactLightDL = 0x808E9980; // size:0x118
gGanondorfShockGlowDL = 0x808EAAD8; // size:0xC8
gGanondorfLightCoreDL = 0x808EBE38; // size:0x88
gGanondorfShockDL = 0x808EBF00; // size:0x80
gGanondorfVortexDL = 0x808ECCE0; // size:0x108
sEffects = 0x808EE1B8; // size:0x3B60
sTwinrovaEyeTextures = 0x8093DDA0; // size:0xC
gAdultWarpInCS = 0x8097BAF0; // size:0x108
gAdultWarpOutCS = 0x8097BC00; // size:0x180
gAdultWarpInToTCS = 0x8097BD80; // size:0x108
gAdultWarpOutToTCS = 0x8097BE90; // size:0x120
gChildWarpInCS = 0x8097BFB0; // size:0x128
gChildWarpOutCS = 0x8097C0E0; // size:0x180
gChildWarpInToTCS = 0x8097C260; // size:0x128
gChildWarpOutToTCS = 0x8097C390; // size:0x120
D_80ABF9D0 = 0x80AA19A0; // size:0x170
D_80ABFB40 = 0x80AA1B10; // size:0x798
D_80B4C5D0 = 0x80B27720; // size:0xFF0

8
tools/msgdis.py
View file

@ -426,7 +426,7 @@ def main():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description="Extract text from the baserom into .h files" description="Extract text from the baserom into .h files"
) )
parser.add_argument("--oot-version", help="OOT version", default="gc-eu-mq-dbg", choices=["gc-eu-mq", "gc-eu-mq-dbg"]) parser.add_argument("--oot-version", help="OOT version", default="gc-eu-mq-dbg")
parser.add_argument("--text-out", help="Path to output .h file for text") parser.add_argument("--text-out", help="Path to output .h file for text")
parser.add_argument( parser.add_argument(
"--staff-text-out", help="Path to output .h file for staff text" "--staff-text-out", help="Path to output .h file for staff text"
@ -449,6 +449,12 @@ def main():
fra_message_entry_table_addr = 0x00B84C28 fra_message_entry_table_addr = 0x00B84C28
staff_message_entry_table_addr = 0x00B86D38 staff_message_entry_table_addr = 0x00B86D38
staff_message_entry_table_addr_end = 0x00B86EC0 staff_message_entry_table_addr_end = 0x00B86EC0
elif version == "gc-eu":
nes_message_entry_table_addr = 0x00B7E910
ger_message_entry_table_addr = 0x00B82B38
fra_message_entry_table_addr = 0x00B84C48
staff_message_entry_table_addr = 0x00B86D58
staff_message_entry_table_addr_end = 0x00B86EE0
else: else:
parser.error("Unsupported OOT version") parser.error("Unsupported OOT version")