pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shiftability, naming of things (#930)

Browse Source 
* Naming, shiftability fixes, etc

* follows_vram fixes

* more goods

* tweesterz

* agh

* warnings

* agh
This commit is contained in:
Ethan Roseman 2023-02-02 20:23:17 +09:00 committed by GitHub
parent 76438a7198
commit 625d7874c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
79 changed files with 439 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/entity.h
View File

@ -291,7 +291,7 @@ typedef struct BombableRockData {
/* 0x88 */ f32 fragmentFallSpeed[6]; /* 0x88 */ f32 fragmentFallSpeed[6];
} BombableRockData; // size = 0xA0 } BombableRockData; // size = 0xA0
typedef s32 TweesterPath[0]; typedef s32 TweesterPath[];
typedef struct TweesterData { typedef struct TweesterData {
/* 0x00 */ s8 unk_00; /* 0x00 */ s8 unk_00;

10
include/functions.h
View File

@ -23,7 +23,7 @@ void is_debug_init(void);
f32 signF(f32 val); f32 signF(f32 val);
s32 func_8002ACDC(void); s32 func_8002ACDC(void);
void func_8002D160(void); void load_obfuscation_shims(void);
void* heap_malloc(s32 size); void* heap_malloc(s32 size);
void* _heap_malloc(HeapNode* head, u32 size); void* _heap_malloc(HeapNode* head, u32 size);
@ -748,10 +748,10 @@ void game_mode_set_fpDrawAuxUI(s32 i, void (*fn)(void));
void func_80260A60(void); void func_80260A60(void);
void func_802B2000(void); void shim_create_audio_system_obfuscated(void);
void func_802B203C(void); void shim_load_engine_data_obfuscated(void);
void func_802B2078(void); void shim_general_heap_create_obfuscated(void);
void func_802B20B4(void); void shim_battle_heap_create_obfuscated(void);
void func_802B7000_E225B0(void); void func_802B7000_E225B0(void);
void func_802B70B4_E201C4(void); void func_802B70B4_E201C4(void);
void func_802B7140(void); void func_802B7140(void);

4
src/1AF230.c
View File

@ -126,3 +126,7 @@ ApiStatus LoadStarPowerScript(Evt* script, s32 isInitialCall) {
script->varTable[0] = (s32) (&D_8029C7D0[starPowerIdx])->init; script->varTable[0] = (s32) (&D_8029C7D0[starPowerIdx])->init;
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
#ifndef SHIFT
static BSS u8 bss_padding[0x1390];
#endif

27
src/316f30.c
View File

@ -1,27 +0,0 @@
#include "common.h"
#include "ld_addrs.h"
void func_80200000(void);
void func_80200080(void);
void func_802AE000_316C00(void);
void func_802AE000(void);
void func_802B2000(void) {
dma_copy(_3169F0_ROM_START, _3169F0_ROM_END, _3169F0_VRAM);
func_80200000();
}
void func_802B203C(void) {
dma_copy(_316A70_ROM_START, _316A70_ROM_END, _316A70_VRAM);
func_80200080();
}
void func_802B2078(void) {
dma_copy(_316C00_ROM_START, _316C00_ROM_END, _316C00_VRAM);
func_802AE000_316C00();
}
void func_802B20B4(void) {
dma_copy(_316D90_ROM_START, _316D90_ROM_END, _316D90_VRAM);
func_802AE000();
}

24
src/77480.c
View File

@ -3,11 +3,17 @@
#include "world/actions.h" #include "world/actions.h"
#include "sprite.h" #include "sprite.h"
// TODO shiftability fix #ifdef SHIFT
#define E20110_VRAM_DEF (void*)0x802B7000 #define inspect_icon_VRAM_DEF inspect_icon_VRAM
#define E20EB0_VRAM_DEF (void*)0x802B7000 #define speech_bubble_VRAM_DEF speech_bubble_VRAM
#define E21870_VRAM_DEF (void*)0x802B7000 #define pulse_stone_VRAM_DEF pulse_stone_VRAM
#define E225B0_VRAM_DEF (void*)0x802B7000 #define i_spy_VRAM_DEF i_spy_VRAM
#else
#define inspect_icon_VRAM_DEF (void*)0x802B7000
#define speech_bubble_VRAM_DEF (void*)0x802B7000
#define pulse_stone_VRAM_DEF (void*)0x802B7000
#define i_spy_VRAM_DEF (void*)0x802B7000
#endif
extern f32 D_800F7B48; extern f32 D_800F7B48;
extern s32 D_800F7B4C; extern s32 D_800F7B4C;
@ -989,7 +995,7 @@ void check_for_ispy(void) {
if (D_8015A57A != 0 && ISpyNotificationCallback == NULL) { if (D_8015A57A != 0 && ISpyNotificationCallback == NULL) {
if (!(playerStatus->animFlags & if (!(playerStatus->animFlags &
(PA_FLAG_SPEECH_PROMPT_AVAILABLE | PA_FLAG_INTERACT_PROMPT_AVAILABLE))) { (PA_FLAG_SPEECH_PROMPT_AVAILABLE | PA_FLAG_INTERACT_PROMPT_AVAILABLE))) {
dma_copy(E225B0_ROM_START, E225B0_ROM_END, E225B0_VRAM_DEF); dma_copy(i_spy_ROM_START, i_spy_ROM_END, i_spy_VRAM_DEF);
ISpyNotificationCallback = func_802B72C0_E22870; ISpyNotificationCallback = func_802B72C0_E22870;
} }
} }
@ -1038,7 +1044,7 @@ void check_for_pulse_stone(void) {
} }
if (!(gPlayerStatus.animFlags & (PA_FLAG_SPEECH_PROMPT_AVAILABLE | PA_FLAG_INTERACT_PROMPT_AVAILABLE))) { if (!(gPlayerStatus.animFlags & (PA_FLAG_SPEECH_PROMPT_AVAILABLE | PA_FLAG_INTERACT_PROMPT_AVAILABLE))) {
dma_copy(E21870_ROM_START, E21870_ROM_END, E21870_VRAM_DEF); dma_copy(pulse_stone_ROM_START, pulse_stone_ROM_END, pulse_stone_VRAM_DEF);
PulseStoneNotificationCallback = func_802B7140; PulseStoneNotificationCallback = func_802B7140;
} }
} }
@ -1085,7 +1091,7 @@ void check_for_conversation_prompt(void) {
if (has_valid_conversation_npc()) { if (has_valid_conversation_npc()) {
TalkNotificationCallback = NULL; TalkNotificationCallback = NULL;
dma_copy(E20EB0_ROM_START, E20EB0_ROM_END, E20EB0_VRAM_DEF); dma_copy(speech_bubble_ROM_START, speech_bubble_ROM_END, speech_bubble_VRAM_DEF);
TalkNotificationCallback = func_802B70B4_E201C4; TalkNotificationCallback = func_802B70B4_E201C4;
} else { } else {
TalkNotificationCallback = NULL; TalkNotificationCallback = NULL;
@ -1253,7 +1259,7 @@ void check_for_interactables(void) {
} }
if (InteractNotificationCallback == NULL) { if (InteractNotificationCallback == NULL) {
dma_copy(E20110_ROM_START, E20110_ROM_END, E20110_VRAM_DEF); dma_copy(inspect_icon_ROM_START, inspect_icon_ROM_END, inspect_icon_VRAM_DEF);
InteractNotificationCallback = func_802B70B4_E201C4; InteractNotificationCallback = func_802B70B4_E201C4;
} }

13
src/7E9D0.c
View File

@ -5,6 +5,14 @@
#include "world/actions.h" #include "world/actions.h"
#include "npc.h" #include "npc.h"
#include "effects.h" #include "effects.h"
#include "ld_addrs.h"
#ifdef SHIFT
// TODO same address as all world actions - picked the first one
#define PLAYER_ACTION_VRAM_DEF world_action_idle_VRAM
#else
#define PLAYER_ACTION_VRAM_DEF (void*) 0x802B6000
#endif
extern void* D_8010C924; extern void* D_8010C924;
extern s32 D_8010C964; extern s32 D_8010C964;
@ -270,7 +278,7 @@ void phys_update_action_state(void) {
if (dmaStart != NULL && dmaStart != D_8010C924) { if (dmaStart != NULL && dmaStart != D_8010C924) {
D_8010C924 = dmaStart; D_8010C924 = dmaStart;
dma_copy(dmaStart, PlayerActionsTable[playerStatus->actionState].dmaEnd, (void* )0x802B6000); // TODO shiftability fix dma_copy(dmaStart, PlayerActionsTable[playerStatus->actionState].dmaEnd, PLAYER_ACTION_VRAM_DEF);
} }
} }
PlayerActionsTable[playerStatus->actionState].update(); PlayerActionsTable[playerStatus->actionState].update();
@ -294,8 +302,7 @@ void phys_peach_update(void) {
if (action->dmaStart != NULL && action->dmaStart != D_8010C924) { if (action->dmaStart != NULL && action->dmaStart != D_8010C924) {
D_8010C924 = action->dmaStart; D_8010C924 = action->dmaStart;
// TODO: This needs to be a defined linker define for full shiftability dma_copy(D_8010C924, PlayerActionsTable[playerStatus->actionState].dmaEnd, PLAYER_ACTION_VRAM_DEF);
dma_copy(D_8010C924, PlayerActionsTable[playerStatus->actionState].dmaEnd, (void* )0x802B6000); // TODO shiftability fix
} }
if (PlayerActionsTable[playerStatus->actionState].flag) { if (PlayerActionsTable[playerStatus->actionState].flag) {

11
src/a5dd0_len_114e0.c
View File

@ -7,13 +7,16 @@
#include "effects.h" #include "effects.h"
#include "nu/nusys.h" #include "nu/nusys.h"
#ifdef SHIFT_VRAM #ifdef SHIFT
#define MODEL_TEXTURE_BASE_ADDRESS 0x8028E000 // TODO shiftability
#define BATTLE_ENTITY_HEAP_BASE 0x80267FF0 // TODO shiftability
#define AREA_SPECIFIC_ENTITY_VRAM entity_default_VRAM #define AREA_SPECIFIC_ENTITY_VRAM entity_default_VRAM
#define BATTLE_ENTITY_HEAP_BOTTOM 0x80250000 // TODO shiftability
#else #else
#define MODEL_TEXTURE_BASE_ADDRESS 0x8028E000 // TODO shiftability fix #define MODEL_TEXTURE_BASE_ADDRESS 0x8028E000
#define BATTLE_ENTITY_HEAP_BASE 0x80267FF0 // TODO shiftability fix #define BATTLE_ENTITY_HEAP_BASE 0x80267FF0
#define AREA_SPECIFIC_ENTITY_VRAM 0x802BAE00 #define AREA_SPECIFIC_ENTITY_VRAM 0x802BAE00
#define BATTLE_ENTITY_HEAP_BOTTOM 0x80250000 // TODO shiftability fix #define BATTLE_ENTITY_HEAP_BOTTOM 0x80250000
#endif #endif
typedef struct Fog { typedef struct Fog {

8
src/battle/area_kzn2/actor/lava_bud.c
View File

@ -4,6 +4,7 @@
#include "sprite/npc/LavaBud.h" #include "sprite/npc/LavaBud.h"
#include "sprite/npc/PetitPiranha.h" #include "sprite/npc/PetitPiranha.h"
#include "effects.h" #include "effects.h"
#include "ld_addrs.h"
#define NAMESPACE b_area_kzn2_lava_bud #define NAMESPACE b_area_kzn2_lava_bud
@ -35,11 +36,8 @@ enum {
VINE_2 = 2, VINE_2 = 2,
}; };
// TODO shiftability fix #define VINE_1_BASE AUX_DATA_ADDR_1
enum { #define VINE_2_BASE AUX_DATA_ADDR_2
VINE_1_BASE = 0x80231000,
VINE_2_BASE = 0x8022E000,
};
s32 N(idleAnimations)[] = { s32 N(idleAnimations)[] = {
STATUS_NORMAL, ANIM_LavaBud_Anim03, STATUS_NORMAL, ANIM_LavaBud_Anim03,

12
src/battle/area_kzn2/actor/lava_piranha.c
View File

@ -8,6 +8,7 @@
#include "effects.h" #include "effects.h"
#include "animation_script.h" #include "animation_script.h"
#include "entity.h" #include "entity.h"
#include "ld_addrs.h"
#define NAMESPACE b_area_kzn2_lava_piranha #define NAMESPACE b_area_kzn2_lava_piranha
@ -278,13 +279,10 @@ enum {
VINE_4 = 4, VINE_4 = 4,
}; };
// TODO shiftability fix #define VINE_0_BASE AUX_DATA_ADDR_0
enum { #define VINE_1_BASE AUX_DATA_ADDR_1
VINE_0_BASE = 0x80234000, #define VINE_2_BASE AUX_DATA_ADDR_2
VINE_1_BASE = 0x80231000, #define VINE_3_BASE AUX_DATA_ADDR_3
VINE_2_BASE = 0x8022E000,
VINE_3_BASE = 0x8022C000,
};
BSS LavaPiranhaVine N(VineData)[NUM_VINES]; BSS LavaPiranhaVine N(VineData)[NUM_VINES];
BSS s32 N(VineRenderState); BSS s32 N(VineRenderState);

12
src/battle/battle.h
View File

@ -408,4 +408,16 @@ void func_80072BCC(s32 arg0);
void load_demo_battle(u32 index); void load_demo_battle(u32 index);
Actor* create_actor(Formation formation); Actor* create_actor(Formation formation);
#ifdef SHIFT
#define AUX_DATA_ADDR_0 world_model_anim_kzn_01_VRAM // (picked the first overlay among those with this address)
#define AUX_DATA_ADDR_1 battle_area_omo2_1_VRAM // (picked the first overlay among those with this address)
#define AUX_DATA_ADDR_2 0x8022E000 // TODO shiftability
#define AUX_DATA_ADDR_3 0x8022C000 // TODO shiftability
#else
#define AUX_DATA_ADDR_0 0x80234000
#define AUX_DATA_ADDR_1 0x80231000
#define AUX_DATA_ADDR_2 0x8022E000
#define AUX_DATA_ADDR_3 0x8022C000
#endif
#endif #endif

6
src/316d90.c → src/battle_heap_create_obfuscated.c
View File

@ -6,11 +6,11 @@
extern s32 obfuscated_battle_heap_create[]; extern s32 obfuscated_battle_heap_create[];
#ifdef SHIFT #ifdef SHIFT
void func_802AE000(void) { void battle_heap_create_obfuscated(void) {
battle_heap_create(); battle_heap_create();
} }
#else #else
void func_802AE000(void) { void battle_heap_create_obfuscated(void) {
s32(*readFunc)(OSPiHandle*, u32, u32*) = osEPiReadIo; s32(*readFunc)(OSPiHandle*, u32, u32*) = osEPiReadIo;
s32 seed = 0x33F50000; s32 seed = 0x33F50000;
s32 (*battle_heap_create)(void) = (s32 (*) (void)) obfuscated_battle_heap_create; s32 (*battle_heap_create)(void) = (s32 (*) (void)) obfuscated_battle_heap_create;
@ -24,7 +24,7 @@ void func_802AE000(void) {
prevInsn = 0; prevInsn = 0;
for (it = (u32*) _316C00_ROM_START; it < (u32*) _316C00_ROM_END; it++) { for (it = (u32*) general_heap_create_obfuscated_ROM_START; it < (u32*) general_heap_create_obfuscated_ROM_END; it++) {
readFunc(nuPiCartHandle, (u32) it, &thisInsn); readFunc(nuPiCartHandle, (u32) it, &thisInsn);
hash += LOWER(thisInsn) + UPPER(thisInsn); hash += LOWER(thisInsn) + UPPER(thisInsn);

4
src/3169f0.c → src/create_audio_system_obfuscated.c
View File

@ -4,11 +4,11 @@ extern u8 obfuscated_create_audio_system[];
#ifdef SHIFT #ifdef SHIFT
void create_audio_system(void); void create_audio_system(void);
void func_80200000(void) { void create_audio_system_obfuscated(void) {
create_audio_system(); create_audio_system();
} }
#else #else
void func_80200000(void) { void create_audio_system_obfuscated(void) {
u32 t0 = 0xAC29007B; u32 t0 = 0xAC29007B;
u32 t1 = 0xB00006A8; u32 t1 = 0xB00006A8;
void (*create_audio_system)(void) = (void (*)(void)) obfuscated_create_audio_system; void (*create_audio_system)(void) = (void (*)(void)) obfuscated_create_audio_system;

6
src/316C00.c → src/general_heap_create_obfuscated.c
View File

@ -6,11 +6,11 @@
extern u8 obfuscated_general_heap_create[]; extern u8 obfuscated_general_heap_create[];
#ifdef SHIFT #ifdef SHIFT
void func_802AE000_316C00(void) { void general_heap_create_obfuscated(void) {
general_heap_create(); general_heap_create();
} }
#else #else
void func_802AE000_316C00(void) { void general_heap_create_obfuscated(void) {
s32(*readFunc)(OSPiHandle*, u32, u32*) = osEPiReadIo; s32(*readFunc)(OSPiHandle*, u32, u32*) = osEPiReadIo;
s32 seed = 0x3C016C07 + 0xFEFEFEF; s32 seed = 0x3C016C07 + 0xFEFEFEF;
HeapNode*(*general_heap_create)(void) = (HeapNode* (*)(void)) obfuscated_general_heap_create; // general_heap_create - 0xFEFEFEF HeapNode*(*general_heap_create)(void) = (HeapNode* (*)(void)) obfuscated_general_heap_create; // general_heap_create - 0xFEFEFEF
@ -24,7 +24,7 @@ void func_802AE000_316C00(void) {
prevInsn = 0; prevInsn = 0;
for (it = (u32*) _316A70_ROM_START; it < (u32*) _316A70_ROM_END; it++) { for (it = (u32*) load_engine_data_obfuscated_ROM_START; it < (u32*) load_engine_data_obfuscated_ROM_END; it++) {
readFunc(nuPiCartHandle, (u32) it, &thisInsn); readFunc(nuPiCartHandle, (u32) it, &thisInsn);
hash += LOWER(thisInsn) + UPPER(thisInsn); hash += LOWER(thisInsn) + UPPER(thisInsn);

0
src/E225B0.c → src/i_spy.c
View File

14
src/E20110.c → src/inspect_icon.c
View File

@ -1,8 +1,8 @@
#include "common.h" #include "common.h"
#define NAMESPACE E20110 #define NAMESPACE inspect_icon
typedef struct TempE20110 { typedef struct InspectIconData {
/* 0x00 */ Vec3f pos; /* 0x00 */ Vec3f pos;
/* 0x0C */ f32 unk_0C; /* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 scale; /* 0x10 */ f32 scale;
@ -15,16 +15,16 @@ typedef struct TempE20110 {
/* 0x23 */ u8 unk_23; /* 0x23 */ u8 unk_23;
/* 0x24 */ u8 unk_24; /* 0x24 */ u8 unk_24;
/* 0x25 */ char unk_25[0x3]; /* 0x25 */ char unk_25[0x3];
} TempE20110; // size = 0x28 } InspectIconData; // size = 0x28
BSS TempE20110 D_802B7DA0; BSS InspectIconData D_802B7DA0;
#include "inspect_icon.png.h" #include "inspect_icon.png.h"
#include "inspect_icon.png.inc.c" #include "inspect_icon.png.inc.c"
#include "inspect_icon.pal.inc.c" #include "inspect_icon.pal.inc.c"
#include "inspect_icon_dlist.gfx.inc.c" #include "inspect_icon_dlist.gfx.inc.c"
TempE20110* D_802B7CB8_E20DC8 = &D_802B7DA0; InspectIconData* D_802B7CB8_E20DC8 = &D_802B7DA0;
#include "common/UnkAngleFunc1.inc.c" #include "common/UnkAngleFunc1.inc.c"
@ -212,7 +212,7 @@ void func_802B7728_E20838(void) {
scale -= 360.0f; scale -= 360.0f;
} }
D_802B7CB8_E20DC8->unk_0C = scale; D_802B7CB8_E20DC8->unk_0C = scale;
var_s0 = E20110_UnkAngleFunc1(scale); var_s0 = N(UnkAngleFunc1)(scale);
break; break;
case 3: case 3:
scale = D_802B7CB8_E20DC8->unk_0C; scale = D_802B7CB8_E20DC8->unk_0C;
@ -228,7 +228,7 @@ void func_802B7728_E20838(void) {
if ((scale >= 70.0f && scale <= 110.0f) || (scale >= 250.0f && scale <= 290.0f)) { if ((scale >= 70.0f && scale <= 110.0f) || (scale >= 250.0f && scale <= 290.0f)) {
InteractNotificationCallback = func_802B79C8_E20AD8; InteractNotificationCallback = func_802B79C8_E20AD8;
} }
var_s0 = E20110_UnkAngleFunc1(scale); var_s0 = N(UnkAngleFunc1)(scale);
break; break;
} }
D_802B7CB8_E20DC8->unk_24 = var_s0; D_802B7CB8_E20DC8->unk_24 = var_s0;

6
src/316a70.c → src/load_engine_data_obfuscated.c
View File

@ -6,11 +6,11 @@ extern u8 obfuscated_load_engine_data[];
#ifdef SHIFT #ifdef SHIFT
void load_engine_data(void); void load_engine_data(void);
void func_80200080(void) { void load_engine_data_obfuscated(void) {
load_engine_data(); load_engine_data();
} }
#else #else
void func_80200080(void) { void load_engine_data_obfuscated(void) {
s32 seed = 0x3C01A775; s32 seed = 0x3C01A775;
u32 thisInsn = 0xB0018FFC; u32 thisInsn = 0xB0018FFC;
HeapNode*(*load_engine_data)(void) = (HeapNode* (*)(void)) obfuscated_load_engine_data; // load_engine_data - ???????? HeapNode*(*load_engine_data)(void) = (HeapNode* (*)(void)) obfuscated_load_engine_data; // load_engine_data - ????????
@ -23,7 +23,7 @@ void func_80200080(void) {
prevInsn = 0; prevInsn = 0;
for (it = (u32*) _3169F0_ROM_START; it < (u32*) _3169F0_ROM_END; it++) { for (it = (u32*) create_audio_system_obfuscated_ROM_START; it < (u32*) create_audio_system_obfuscated_ROM_END; it++) {
while (IO_READ(PI_STATUS_REG) & (PI_STATUS_DMA_BUSY | PI_STATUS_IO_BUSY)); while (IO_READ(PI_STATUS_REG) & (PI_STATUS_DMA_BUSY | PI_STATUS_IO_BUSY));
thisInsn = IO_READ(it + 0x4000000); // ??? thisInsn = IO_READ(it + 0x4000000); // ???

20
src/8560.c → src/load_obfuscation_shims.c
View File

@ -3,19 +3,19 @@
#include "ld_addrs.h" #include "ld_addrs.h"
#include "mips.h" #include "mips.h"
extern s8 obfuscated__316F30_ROM_START[]; extern s8 obfuscated_obfuscation_shims_ROM_START[];
extern s8 obfuscated__316F30_VRAM[]; extern s8 obfuscated_obfuscation_shims_VRAM[];
#ifdef SHIFT #ifdef SHIFT
void func_8002D160(void) { void load_obfuscation_shims(void) {
dma_copy(_316F30_ROM_START, _316F30_ROM_END, _316F30_VRAM); dma_copy(obfuscation_shims_ROM_START, obfuscation_shims_ROM_END, obfuscation_shims_VRAM);
} }
#else #else
void func_8002D160(void) { void load_obfuscation_shims(void) {
s32 (*readFunc)(OSPiHandle*, u32, u32*); s32 (*readFunc)(OSPiHandle*, u32, u32*);
s32 (*readFunc2)(OSPiHandle*, u32, u32*); s32 (*readFunc2)(OSPiHandle*, u32, u32*);
s8* vramDest = obfuscated__316F30_VRAM; s8* vramDest = obfuscated_obfuscation_shims_VRAM;
s8* romStart = obfuscated__316F30_ROM_START; s8* romStart = obfuscated_obfuscation_shims_ROM_START;
s32 seed; s32 seed;
u32 hash; u32 hash;
u32 thisInsn; u32 thisInsn;
@ -31,7 +31,7 @@ void func_8002D160(void) {
seed -= thisInsn; seed -= thisInsn;
prevInsn = 0; prevInsn = 0;
for (it = _316D90_ROM_START; it < _316D90_ROM_END; it += 4) { for (it = battle_heap_create_obfuscated_ROM_START; it < battle_heap_create_obfuscated_ROM_END; it += 4) {
readFunc(nuPiCartHandle, (u32)it, &thisInsn); readFunc(nuPiCartHandle, (u32)it, &thisInsn);
hash += LOWER(thisInsn) + UPPER(thisInsn); hash += LOWER(thisInsn) + UPPER(thisInsn);
@ -58,7 +58,7 @@ void func_8002D160(void) {
seed -= thisInsn2; seed -= thisInsn2;
prevInsn = 0; prevInsn = 0;
for (it = _316F30_ROM_START; it < _316F30_ROM_END; it += 4) { for (it = obfuscation_shims_ROM_START; it < obfuscation_shims_ROM_END; it += 4) {
readFunc2(nuPiCartHandle, (u32)it, &thisInsn2); readFunc2(nuPiCartHandle, (u32)it, &thisInsn2);
hash += LOWER(thisInsn2) + UPPER(thisInsn2); hash += LOWER(thisInsn2) + UPPER(thisInsn2);
@ -76,6 +76,6 @@ void func_8002D160(void) {
} }
romStart += seed + 0xED41C - hash; romStart += seed + 0xED41C - hash;
dma_copy(romStart, _316F30_ROM_END, vramDest); dma_copy(romStart, obfuscation_shims_ROM_END, vramDest);
} }
#endif #endif

10
src/main.c
View File

@ -56,13 +56,13 @@ void boot_main(void* data) {
nuGfxInit(); nuGfxInit();
gGameStatusPtr->contBitPattern = nuContInit(); gGameStatusPtr->contBitPattern = nuContInit();
#ifdef VERSION_US #ifdef VERSION_US
func_8002D160(); load_obfuscation_shims();
func_802B2000(); shim_create_audio_system_obfuscated();
func_802B203C(); shim_load_engine_data_obfuscated();
#else #else
func_8002CA00(); func_8002CA00();
func_802B2000(); shim_create_audio_system_obfuscated();
func_802B203C(); shim_load_engine_data_obfuscated();
#endif #endif
nuGfxFuncSet((NUGfxFunc) gfxRetrace_Callback); nuGfxFuncSet((NUGfxFunc) gfxRetrace_Callback);
nuGfxPreNMIFuncSet(gfxPreNMI_Callback); nuGfxPreNMIFuncSet(gfxPreNMI_Callback);

118
src/msg.c
View File

@ -16,8 +16,6 @@ enum RewindArrowStates {
typedef MessageImageData* MessageImageDataList[1]; typedef MessageImageData* MessageImageDataList[1];
extern IMG_BIN D_802EF0D0;
s32 D_8014C280[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000, }; s32 D_8014C280[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000, };
u8 MessagePlural[] = { MSG_CHAR_LOWER_S, MSG_CHAR_READ_END }; u8 MessagePlural[] = { MSG_CHAR_LOWER_S, MSG_CHAR_READ_END };
@ -51,16 +49,72 @@ Gfx D_8014C2D8[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
// unsorted
extern s32 D_8015131C;
extern MessageDrawState D_80155D20;
extern IMG_BIN D_80159B50[];
extern PAL_BIN D_8015C7E0[];
// BSS
extern s32 gMsgBGScrollAmtX;
extern u16 gMsgGlobalWaveCounter;
extern MessageImageDataList gMsgVarImages;
extern s32 gMsgBGScrollAmtY;
extern Gfx* D_80151338;
extern char gMessageBuffers[][1024];
extern u8 gMessageMsgVars[3][32];
extern s16 D_80155C98;
extern Mtx gMessageWindowProjMatrix[2];
extern MessageDrawState* msg_drawState;
extern s16 D_802EB644[22];
extern IMG_BIN ui_msg_bubble_left_png[];
extern IMG_BIN ui_msg_bubble_mid_png[];
extern IMG_BIN ui_msg_bubble_right_png[];
extern IMG_BIN ui_msg_arrow_png[];
extern unsigned char ui_msg_palettes[16][32];
extern IMG_BIN ui_msg_sign_corner_topleft_png[];
extern IMG_BIN ui_msg_sign_corner_topright_png[];
extern IMG_BIN ui_msg_sign_corner_bottomleft_png[];
extern IMG_BIN ui_msg_sign_corner_bottomright_png[];
extern IMG_BIN ui_msg_lamppost_corner_bottomright_png[];
extern IMG_BIN ui_msg_sign_side_top_png[];
extern IMG_BIN ui_msg_sign_side_left_png[];
extern IMG_BIN ui_msg_sign_side_right_png[];
extern IMG_BIN ui_msg_sign_side_bottom_png[];
extern IMG_BIN ui_msg_sign_fill_png[];
extern PAL_BIN ui_msg_sign_pal[];
extern PAL_BIN ui_msg_lamppost_pal[];
extern IMG_BIN ui_msg_background_png[];
extern IMG_BIN ui_msg_rewind_arrow_png[];
extern PAL_BIN ui_msg_rewind_arrow_pal[];
extern IMG_BIN ui_msg_star_png[];
extern IMG_BIN ui_msg_star_silhouette_png[];
extern IMG_BIN D_802ED550[];
extern PAL_BIN D_802ED670[];
extern IMG_BIN D_802ED970[];
extern IMG_BIN D_802EE8D0[];
extern MessageCharset* gMsgCharsets[5];
extern IMG_BIN D_802F39D0[];
extern PAL_BIN D_802F4560[80][8];
extern s32 gMessageBoxFrameParts[2][16];
extern IMG_BIN ui_point_right_png[];
extern PAL_BIN ui_point_right_pal[];
MessageNumber gMsgNumbers[] = { MessageNumber gMsgNumbers[] = {
{ {
.rasters = &D_802EF0D0, .rasters = &D_802EE8D0[0x800],
.texSize = 128, .texSize = 128,
.texWidth = 16, .texWidth = 16,
.texHeight = 16, .texHeight = 16,
.digitWidth = {11, 8, 11, 11, 11, 11, 11, 11, 11, 11}, .digitWidth = {11, 8, 11, 11, 11, 11, 11, 11, 11, 11},
.fixedWidth = 11 .fixedWidth = 11
}, { }, {
.rasters = &D_802EF0D0, .rasters = &D_802EE8D0[0x800],
.texSize = 128, .texSize = 128,
.texWidth = 16, .texWidth = 16,
.texHeight = 16, .texHeight = 16,
@ -140,62 +194,6 @@ Gfx D_8014C500[] = {
u8 D_8014C580[] = { 50, 80, 100, 105, 100, 0, 0, 0 }; u8 D_8014C580[] = { 50, 80, 100, 105, 100, 0, 0, 0 };
u8 D_8014C588[] = { 105, 100, 77, 57, 40, 27, 16, 8, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; u8 D_8014C588[] = { 105, 100, 77, 57, 40, 27, 16, 8, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
// unsorted
extern s32 D_8015131C;
extern MessageDrawState D_80155D20;
extern IMG_BIN D_80159B50[];
extern PAL_BIN D_8015C7E0[];
// BSS
extern s32 gMsgBGScrollAmtX;
extern u16 gMsgGlobalWaveCounter;
extern MessageImageDataList gMsgVarImages;
extern s32 gMsgBGScrollAmtY;
extern Gfx* D_80151338;
extern char gMessageBuffers[][1024];
extern u8 gMessageMsgVars[3][32];
extern s16 D_80155C98;
extern Mtx gMessageWindowProjMatrix[2];
extern MessageDrawState* msg_drawState;
extern s16 D_802EB644[22];
extern IMG_BIN ui_msg_bubble_left_png[];
extern IMG_BIN ui_msg_bubble_mid_png[];
extern IMG_BIN ui_msg_bubble_right_png[];
extern IMG_BIN ui_msg_arrow_png[];
extern unsigned char ui_msg_palettes[16][32];
extern IMG_BIN ui_msg_sign_corner_topleft_png[];
extern IMG_BIN ui_msg_sign_corner_topright_png[];
extern IMG_BIN ui_msg_sign_corner_bottomleft_png[];
extern IMG_BIN ui_msg_sign_corner_bottomright_png[];
extern IMG_BIN ui_msg_lamppost_corner_bottomright_png[];
extern IMG_BIN ui_msg_sign_side_top_png[];
extern IMG_BIN ui_msg_sign_side_left_png[];
extern IMG_BIN ui_msg_sign_side_right_png[];
extern IMG_BIN ui_msg_sign_side_bottom_png[];
extern IMG_BIN ui_msg_sign_fill_png[];
extern PAL_BIN ui_msg_sign_pal[];
extern PAL_BIN ui_msg_lamppost_pal[];
extern IMG_BIN ui_msg_background_png[];
extern IMG_BIN ui_msg_rewind_arrow_png[];
extern PAL_BIN ui_msg_rewind_arrow_pal[];
extern IMG_BIN ui_msg_star_png[];
extern IMG_BIN ui_msg_star_silhouette_png[];
extern IMG_BIN D_802ED550[];
extern PAL_BIN D_802ED670[];
extern IMG_BIN D_802ED970[];
extern IMG_BIN D_802EE8D0[];
extern MessageCharset* gMsgCharsets[5];
extern IMG_BIN D_802F39D0[];
extern PAL_BIN D_802F4560[80][8];
extern s32 gMessageBoxFrameParts[2][16];
extern IMG_BIN ui_point_right_png[];
extern PAL_BIN ui_point_right_pal[];
s32 draw_image_with_clipping(IMG_PTR raster, s32 width, s32 height, s32 fmt, s32 bitDepth, s16 posX, s16 posY, u16 clipULx, s32 draw_image_with_clipping(IMG_PTR raster, s32 width, s32 height, s32 fmt, s32 bitDepth, s16 posX, s16 posY, u16 clipULx,
u16 clipULy, u16 clipLRx, u16 clipRLy); u16 clipULy, u16 clipLRx, u16 clipRLy);

43
src/obfuscation_shims.c Normal file
View File

@ -0,0 +1,43 @@
#include "common.h"
#include "ld_addrs.h"
void create_audio_system_obfuscated(void);
void load_engine_data_obfuscated(void);
void general_heap_create_obfuscated(void);
void battle_heap_create_obfuscated(void);
void shim_create_audio_system_obfuscated(void) {
dma_copy(
create_audio_system_obfuscated_ROM_START,
create_audio_system_obfuscated_ROM_END,
create_audio_system_obfuscated_VRAM
);
create_audio_system_obfuscated();
}
void shim_load_engine_data_obfuscated(void) {
dma_copy(
load_engine_data_obfuscated_ROM_START,
load_engine_data_obfuscated_ROM_END,
load_engine_data_obfuscated_VRAM
);
load_engine_data_obfuscated();
}
void shim_general_heap_create_obfuscated(void) {
dma_copy(
general_heap_create_obfuscated_ROM_START,
general_heap_create_obfuscated_ROM_END,
general_heap_create_obfuscated_VRAM
);
general_heap_create_obfuscated();
}
void shim_battle_heap_create_obfuscated(void) {
dma_copy(
battle_heap_create_obfuscated_ROM_START,
battle_heap_create_obfuscated_ROM_END,
battle_heap_create_obfuscated_VRAM
);
battle_heap_create_obfuscated();
}

8
src/E21870.c → src/pulse_stone.c
View File

@ -1,6 +1,6 @@
#include "common.h" #include "common.h"
typedef struct TempE21870 { typedef struct PulseStoneData {
/* 0x00 */ Vec3f pos; /* 0x00 */ Vec3f pos;
/* 0x0C */ f32 scale; /* 0x0C */ f32 scale;
/* 0x10 */ char unk_10[0x8]; /* 0x10 */ char unk_10[0x8];
@ -8,9 +8,9 @@ typedef struct TempE21870 {
/* 0x1C */ char unk_1C[0x4]; /* 0x1C */ char unk_1C[0x4];
/* 0x20 */ s32 unk_20; /* 0x20 */ s32 unk_20;
/* 0x24 */ s32 unk_24; /* 0x24 */ s32 unk_24;
} TempE21870; // size = 0x28 } PulseStoneData; // size = 0x28
BSS TempE21870 D_802B7D40; BSS PulseStoneData D_802B7D40;
#include "pulse_stone.png.h" #include "pulse_stone.png.h"
#include "pulse_stone.png.inc.c" #include "pulse_stone.png.inc.c"
@ -18,7 +18,7 @@ BSS TempE21870 D_802B7D40;
#include "pulse_stone.flash.pal.inc.c" #include "pulse_stone.flash.pal.inc.c"
#include "pulse_stone_dlist.gfx.inc.c" #include "pulse_stone_dlist.gfx.inc.c"
TempE21870* D_802B7D18_E22588 = &D_802B7D40; PulseStoneData* D_802B7D18_E22588 = &D_802B7D40;
void func_802B74F0(void); void func_802B74F0(void);

16
src/e20eb0.c → src/speech_bubble.c
View File

@ -1,12 +1,12 @@
#include "common.h" #include "common.h"
#define NAMESPACE e20eb0 #define NAMESPACE speech_bubble
#include "common/UnkAngleFunc1.inc.c" #include "common/UnkAngleFunc1.inc.c"
#include "speech_bubble.png.h" #include "speech_bubble.png.h"
typedef struct UnkE20EB0 { typedef struct SpeechBubbleData {
/* 0x00 */ Npc* unk_00; /* 0x00 */ Npc* unk_00;
/* 0x04 */ Vec3f pos; /* 0x04 */ Vec3f pos;
/* 0x10 */ f32 unk_10; /* 0x10 */ f32 unk_10;
@ -17,21 +17,21 @@ typedef struct UnkE20EB0 {
/* 0x24 */ char unk_24[6]; /* 0x24 */ char unk_24[6];
/* 0x2A */ u8 unk_2A; /* 0x2A */ u8 unk_2A;
/* 0x2B */ u8 unk_2B; /* 0x2B */ u8 unk_2B;
} UnkE20EB0; /* size = 0x2C */ } SpeechBubbleData; /* size = 0x2C */
BSS UnkE20EB0 D_802B79C0_E21870; BSS SpeechBubbleData D_802B79C0_E21870;
#include "speech_bubble.png.inc.c" #include "speech_bubble.png.inc.c"
#include "speech_bubble.pal.inc.c" #include "speech_bubble.pal.inc.c"
#include "speech_bubble_dlist.gfx.inc.c" #include "speech_bubble_dlist.gfx.inc.c"
UnkE20EB0* D_802B79A8_E21858 = &D_802B79C0_E21870; SpeechBubbleData* D_802B79A8_E21858 = &D_802B79C0_E21870;
void func_802B742C(void); void func_802B742C(void);
void func_802B70B4(void) { void func_802B70B4(void) {
PlayerStatus* playerStatus = &gPlayerStatus; PlayerStatus* playerStatus = &gPlayerStatus;
UnkE20EB0* temp; SpeechBubbleData* temp;
Npc* npc; Npc* npc;
mem_clear(D_802B79A8_E21858, sizeof(*D_802B79A8_E21858)); mem_clear(D_802B79A8_E21858, sizeof(*D_802B79A8_E21858));
@ -125,7 +125,7 @@ void func_802B742C(void) {
unk10 -= 360.0f; unk10 -= 360.0f;
} }
D_802B79A8_E21858->unk_10 = unk10; D_802B79A8_E21858->unk_10 = unk10;
var_a2 = e20eb0_UnkAngleFunc1(unk10); var_a2 = N(UnkAngleFunc1)(unk10);
break; break;
case 3: case 3:
unk10 = D_802B79A8_E21858->unk_10; unk10 = D_802B79A8_E21858->unk_10;
@ -140,7 +140,7 @@ void func_802B742C(void) {
playerStatus->animFlags &= ~PA_FLAG_SPEECH_PROMPT_AVAILABLE; playerStatus->animFlags &= ~PA_FLAG_SPEECH_PROMPT_AVAILABLE;
return; return;
} }
var_a2 = e20eb0_UnkAngleFunc1(unk10); var_a2 = N(UnkAngleFunc1)(unk10);
break; break;
} }

6
src/state_battle.c
View File

@ -47,8 +47,8 @@ void state_step_battle(void) {
func_8003B1A8(); func_8003B1A8();
gGameStatusPtr->isBattle = TRUE; gGameStatusPtr->isBattle = TRUE;
backup_map_collision_data(); backup_map_collision_data();
func_8002D160(); load_obfuscation_shims();
func_802B20B4(); shim_battle_heap_create_obfuscated();
sfx_clear_env_sounds(0); sfx_clear_env_sounds(0);
currentBattleSelection = UNPACK_BTL_AREA(gCurrentBattleID); currentBattleSelection = UNPACK_BTL_AREA(gCurrentBattleID);
@ -76,7 +76,7 @@ void state_step_battle(void) {
clear_npcs(); clear_npcs();
clear_entity_data(1); clear_entity_data(1);
clear_trigger_data(); clear_trigger_data();
dma_copy(_16C8E0_ROM_START, _16C8E0_ROM_END, _16C8E0_VRAM); dma_copy(battle_code_ROM_START, battle_code_ROM_END, battle_code_VRAM);
initialize_battle(); initialize_battle();
btl_save_world_cameras(); btl_save_world_cameras();
load_battle_section(); load_battle_section();

4
src/state_pause.c
View File

@ -28,6 +28,8 @@ void state_init_pause(void) {
set_windows_visible(WINDOW_GROUP_PAUSE_MENU); set_windows_visible(WINDOW_GROUP_PAUSE_MENU);
} }
extern Addr D_80200000;
void state_step_pause(void) { void state_step_pause(void) {
s32 oldIsBattle = D_800A0921; s32 oldIsBattle = D_800A0921;
@ -70,7 +72,7 @@ void state_step_pause(void) {
clear_entity_models(); clear_entity_models();
clear_animator_list(); clear_animator_list();
clear_worker_list(); clear_worker_list();
hud_element_set_aux_cache(_3169F0_VRAM, 0x38000); hud_element_set_aux_cache(D_80200000, 0x38000); // TODO shiftability (what should this symbol be?)
hud_element_clear_cache(); hud_element_clear_cache();
reset_status_menu(); reset_status_menu();
clear_item_entity_data(); clear_item_entity_data();

14
src/world/area_sbk/sbk_14/sbk_14_2_entity.c
View File

@ -1,16 +1,16 @@
#include "sbk_14.h" #include "sbk_14.h"
#include "entity.h" #include "entity.h"
TweesterPath N(D_80240440_936B20)[] = { TweesterPath N(D_80240440_936B20) = {
{ -65, 0, 217 }, -65, 0, 217,
{ -262, 0, -64 }, -262, 0, -64,
{ 57, 0, -286 }, 57, 0, -286,
{ 327, 0, 8 }, 327, 0, 8,
{ TWEESTER_PATH_LOOP } TWEESTER_PATH_LOOP
}; };
TweesterPath* N(D_80240474_936B54)[] = { TweesterPath* N(D_80240474_936B54)[] = {
N(D_80240440_936B20), &N(D_80240440_936B20),
PTR_LIST_END PTR_LIST_END
}; };

14
src/world/area_sbk/sbk_23/sbk_23_2_entity.c
View File

@ -1,16 +1,16 @@
#include "sbk_23.h" #include "sbk_23.h"
#include "entity.h" #include "entity.h"
TweesterPath N(D_802403C0_93AB20)[] = { TweesterPath N(D_802403C0_93AB20) = {
{ -65, 0, 217 }, -65, 0, 217,
{ -262, 0, -64 }, -262, 0, -64,
{ 57, 0, -286 }, 57, 0, -286,
{ 327, 0, 8 }, 327, 0, 8,
{ TWEESTER_PATH_LOOP } TWEESTER_PATH_LOOP
}; };
TweesterPath* N(D_802403F4_93AB54)[] = { TweesterPath* N(D_802403F4_93AB54)[] = {
N(D_802403C0_93AB20), &N(D_802403C0_93AB20),
PTR_LIST_END PTR_LIST_END
}; };

14
src/world/area_sbk/sbk_33/sbk_33_1_entity.c
View File

@ -1,16 +1,16 @@
#include "sbk_33.h" #include "sbk_33.h"
#include "entity.h" #include "entity.h"
TweesterPath N(DefaultTweesterPath)[] = { TweesterPath N(DefaultTweesterPath) = {
{ -65, 0, 217 }, -65, 0, 217,
{ -262, 0, -64 }, -262, 0, -64,
{ 57, 0, -286 }, 57, 0, -286,
{ 327, 0, 8 }, 327, 0, 8,
{ TWEESTER_PATH_LOOP } TWEESTER_PATH_LOOP
}; };
TweesterPath* N(TweesterPaths)[] = { TweesterPath* N(TweesterPaths)[] = {
N(DefaultTweesterPath), &N(DefaultTweesterPath),
PTR_LIST_END PTR_LIST_END
}; };

14
src/world/area_sbk/sbk_41/sbk_41_2_entity.c
View File

@ -1,16 +1,16 @@
#include "sbk_41.h" #include "sbk_41.h"
#include "entity.h" #include "entity.h"
TweesterPath N(DefaultTweesterPath)[] = { TweesterPath N(DefaultTweesterPath) = {
{ -65, 0, 217 }, -65, 0, 217,
{ -262, 0, -64 }, -262, 0, -64,
{ 57, 0, -286 }, 57, 0, -286,
{ 327, 0, 8 }, 327, 0, 8,
{ TWEESTER_PATH_LOOP } TWEESTER_PATH_LOOP
}; };
TweesterPath* N(TweesterPaths)[] = { TweesterPath* N(TweesterPaths)[] = {
N(DefaultTweesterPath), &N(DefaultTweesterPath),
PTR_LIST_END PTR_LIST_END
}; };

14
src/world/area_sbk/sbk_54/sbk_54_2_entity.c
View File

@ -1,16 +1,16 @@
#include "sbk_54.h" #include "sbk_54.h"
#include "entity.h" #include "entity.h"
TweesterPath N(TweesterPath1)[] = { TweesterPath N(TweesterPath1) = {
{ -65, 0, 217 }, -65, 0, 217,
{ -262, 0, -64 }, -262, 0, -64,
{ 57, 0, -286 }, 57, 0, -286,
{ 327, 0, 8 }, 327, 0, 8,
{ TWEESTER_PATH_LOOP } TWEESTER_PATH_LOOP
}; };
TweesterPath* N(TweesterPaths)[] = { TweesterPath* N(TweesterPaths)[] = {
N(TweesterPath1), &N(TweesterPath1),
PTR_LIST_END PTR_LIST_END
}; };

20
src/world/area_tst/tst_10/tst_10_1_main.c
View File

@ -103,19 +103,19 @@ EvtScript N(EVS_Main) = {
EVT_END EVT_END
}; };
TweesterPath N(DefaultTweesterPath)[] = { TweesterPath N(DefaultTweesterPath) = {
{ -65, 0, 217 }, -65, 0, 217,
{ -262, 0, -64 }, -262, 0, -64,
{ 57, 0, -286 }, 57, 0, -286,
{ 327, 0, 8 }, 327, 0, 8,
{ TWEESTER_PATH_LOOP } TWEESTER_PATH_LOOP
}; };
TweesterPath* N(UnusedTweesterPaths)[] = { TweesterPath* N(UnusedTweesterPaths)[] = {
N(DefaultTweesterPath), &N(DefaultTweesterPath),
N(DefaultTweesterPath), &N(DefaultTweesterPath),
N(DefaultTweesterPath), &N(DefaultTweesterPath),
N(DefaultTweesterPath), &N(DefaultTweesterPath),
PTR_LIST_END PTR_LIST_END
}; };

6
src/world/partner/goombario.c
View File

@ -5,7 +5,7 @@
#include "message_ids.h" #include "message_ids.h"
#include "entity.h" #include "entity.h"
typedef struct UnkE20EB0 { typedef struct SpeechBubbleData {
/* 0x00 */ Npc* unk_00; /* 0x00 */ Npc* unk_00;
/* 0x04 */ Vec3f pos; /* 0x04 */ Vec3f pos;
/* 0x10 */ f32 unk_10; /* 0x10 */ f32 unk_10;
@ -16,9 +16,9 @@ typedef struct UnkE20EB0 {
/* 0x24 */ char unk_24[6]; /* 0x24 */ char unk_24[6];
/* 0x2A */ u8 unk_2A; /* 0x2A */ u8 unk_2A;
/* 0x2B */ u8 unk_2B; /* 0x2B */ u8 unk_2B;
} UnkE20EB0; /* size = 0x2C */ } SpeechBubbleData; /* size = 0x2C */
extern UnkE20EB0* D_802B79A8_E21858; extern SpeechBubbleData* D_802B79A8_E21858;
BSS s32 D_802BDF30; BSS s32 D_802BDF30;
BSS s32 D_802BDF34; BSS s32 D_802BDF34;

6
src/world/partners.c
View File

@ -155,8 +155,8 @@ s32 D_800F7FF8 = 5;
s32 D_800F7FFC = 7; s32 D_800F7FFC = 7;
s32 D_800F8000[] = { 8, 0, 0, 0 }; s32 D_800F8000[] = { 8, 0, 0, 0 };
UseItemStruct UseItemDmaArgs = { UseItemStruct UseItemDmaArgs = {
_3251D0_ROM_START, world_use_item_ROM_START,
_3251D0_ROM_END, world_use_item_ROM_END,
&EVS_World_UseItem, &EVS_World_UseItem,
0 0
}; };
@ -488,7 +488,7 @@ s32 use_consumable(s32 invSlot) {
D_8010CD20 = invSlot; D_8010CD20 = invSlot;
invSlot = gPlayerData.invItems[invSlot]; invSlot = gPlayerData.invItems[invSlot];
dma_copy(UseItemDmaArgs.dmaStart, UseItemDmaArgs.dmaEnd, _3251D0_VRAM); dma_copy(UseItemDmaArgs.dmaStart, UseItemDmaArgs.dmaEnd, world_use_item_VRAM);
script = start_script(UseItemDmaArgs.script, EVT_PRIORITY_1, 0); script = start_script(UseItemDmaArgs.script, EVT_PRIORITY_1, 0);
script->varTable[10] = invSlot; script->varTable[10] = invSlot;
return script->id; return script->id;

8
src/world/world.c
View File

@ -47,8 +47,8 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) {
gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION;
gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_WORLD; gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_WORLD;
func_8002D160(); load_obfuscation_shims();
func_802B2078(); shim_general_heap_create_obfuscated();
clear_render_tasks(); clear_render_tasks();
clear_worker_list(); clear_worker_list();
clear_script_list(); clear_script_list();
@ -111,8 +111,8 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) {
load_map_bg(wMapBgName); load_map_bg(wMapBgName);
} }
func_8002D160(); load_obfuscation_shims();
func_802B2078(); shim_general_heap_create_obfuscated();
sfx_clear_env_sounds(0); sfx_clear_env_sounds(0);
clear_worker_list(); clear_worker_list();
clear_script_list(); clear_script_list();

1
tools/warnings_count/check_new_warnings.sh
View File

@ -21,6 +21,7 @@ then
rm -rf ver/*/build/src rm -rf ver/*/build/src
ninja | grep warning | sort > tools/warnings_count/warnings_new.txt ninja | grep warning | sort > tools/warnings_count/warnings_new.txt
else else
touch tools/warnings_count/warnings_new.txt
cat build_log.txt | grep warning || [[ $? == 1 ]] | sort > tools/warnings_count/warnings_new.txt cat build_log.txt | grep warning || [[ $? == 1 ]] | sort > tools/warnings_count/warnings_new.txt
fi fi

4
ver/jp/undefined_funcs_auto.txt
View File

@ -1,5 +1,5 @@
func_802B2000 = 0x802B2000; shim_create_audio_system_obfuscated = 0x802B2000;
func_802B203C = 0x802B203C; shim_load_engine_data_obfuscated = 0x802B203C;
func_80120CF8 = 0x80120CF8; func_80120CF8 = 0x80120CF8;
func_80128614 = 0x80128614; func_80128614 = 0x80128614;
func_8014A910 = 0x8014A910; func_8014A910 = 0x8014A910;

2
ver/us/asm/data/world/area_jan/jan_01/B29400.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_802413D0_B29400 dlabel D_802413D0_B29400
.word 0xC425C000, 0xC1600000, 0x42540000, 0x42B40000, 0x4425C000, 0xC1800000, 0x42200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024160C, D_802413D0_B29400, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900EC, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC425C000, 0xC1600000, 0x42540000, 0x42B40000, 0x4425C000, 0xC1800000, 0x42200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024160C, D_802413D0_B29400, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900EC, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_02/B2ED90.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80242920_B2ED90 dlabel D_80242920_B2ED90
.word 0xC3E10000, 0x00000000, 0xC3E10000, 0x43070000, 0x44200000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242BDC, D_80242920_B2ED90, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900ED, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x0000000E, 0x0000000F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000027, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000001, func_80240000_B2C470, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC3E10000, 0x00000000, 0xC3E10000, 0x43070000, 0x44200000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242BDC, D_80242920_B2ED90, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900ED, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x0000000E, 0x0000000F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000027, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000001, func_80240000_B2C470, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_80243290_B37E60 dlabel D_80243290_B37E60
.word 0xC411C000, 0x00000000, 0x00000000, 0x42B40000, 0xC3CA8000, 0x00000000, 0xC3CA8000, 0x43070000, 0x4411C000, 0x00000000, 0x00000000, 0x43870000, 0xC4070000, 0x420C0000, 0x43430000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802444F0_B390C0, D_80243290_B37E60, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900EE .word 0xC411C000, 0x00000000, 0x00000000, 0x42B40000, 0xC3CA8000, 0x00000000, 0xC3CA8000, 0x43070000, 0x4411C000, 0x00000000, 0x00000000, 0x43870000, 0xC4070000, 0x420C0000, 0x43430000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802444F0_B390C0, D_80243290_B37E60, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900EE
dlabel D_80243310_B37EE0 dlabel D_80243310_B37EE0
.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x0000000E, 0x0000000F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000027, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x0000000E, 0x0000000F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000027, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_04/B45860.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_802410F0_B45860 dlabel D_802410F0_B45860
.word 0xC3F18000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0xC2DC0000, 0xC1700000, 0x434C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802414C0, D_802410F0_B45860, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, jan_04_get_tattle, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000024, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 .word 0xC3F18000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0xC2DC0000, 0xC1700000, 0x434C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802414C0, D_802410F0_B45860, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, jan_04_get_tattle, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000024, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_05/B4D140.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_802426D0_B4D140 dlabel D_802426D0_B4D140
.word 0x43A50000, 0x00000000, 0x43A50000, 0x439D8000, 0xC3FA0000, 0xC1A00000, 0x00000000, 0x42B40000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3E10000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242A1C, D_802426D0_B4D140, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, jan_05_get_tattle, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0x43A50000, 0x00000000, 0x43A50000, 0x439D8000, 0xC3FA0000, 0xC1A00000, 0x00000000, 0x42B40000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3E10000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242A1C, D_802426D0_B4D140, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, jan_05_get_tattle, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_802425E0_B54E10 dlabel D_802425E0_B54E10
.word 0x00000000, 0x00000000, 0x43EB0000, 0x00000000, 0x43EB0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3EB0000, 0x43340000, 0xC3EB0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242C80_B554B0, D_802425E0_B54E10, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900F8 .word 0x00000000, 0x00000000, 0x43EB0000, 0x00000000, 0x43EB0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3EB0000, 0x43340000, 0xC3EB0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242C80_B554B0, D_802425E0_B54E10, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F8
dlabel D_80242660_B54E90 dlabel D_80242660_B54E90
.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_07/B5AA90.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80241220_B5AA90 dlabel D_80241220_B5AA90
.word 0xC35C0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241338, D_80241220_B5AA90, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900F7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC35C0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241338, D_80241220_B5AA90, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_08/B606E0.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80242430_B606E0 dlabel D_80242430_B606E0
.word 0xC3A50000, 0x00000000, 0x43A50000, 0x42340000, 0x43FA0000, 0xC1A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3E10000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802426F4, D_80242430_B606E0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900F4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC3A50000, 0x00000000, 0x43A50000, 0x42340000, 0x43FA0000, 0xC1A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3E10000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802426F4, D_80242430_B606E0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/world/area_jan/jan_10/B6DAD0.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80241740_B6DAD0 dlabel D_80241740_B6DAD0
.word 0x43BE0000, 0xC1A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802418F4, D_80241740_B6DAD0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900F6, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0x43BE0000, 0xC1A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802418F4, D_80241740_B6DAD0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F6, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_12/B74310.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_80241260_B74310 dlabel D_80241260_B74310
.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x437A0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802413C0_B74470, D_80241260_B74310, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900FA .word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x437A0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802413C0_B74470, D_80241260_B74310, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FA
dlabel D_802412C0_B74370 dlabel D_802412C0_B74370
.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802433A0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802433A0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_13/B76D80.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_802405D0_B76D80 dlabel D_802405D0_B76D80
.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x425C0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240730_B76EE0, D_802405D0_B76D80, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900FB .word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x425C0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240730_B76EE0, D_802405D0_B76D80, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FB
dlabel D_80240630_B76DE0 dlabel D_80240630_B76DE0
.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243870, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243870, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_14/B7B330.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_802412E0_B7B330 dlabel D_802412E0_B7B330
.word 0xC37A0000, 0x00000000, 0x42F00000, 0x00000000, 0x437A0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241440_B7B490, D_802412E0_B7B330, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900FC .word 0xC37A0000, 0x00000000, 0x42F00000, 0x00000000, 0x437A0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241440_B7B490, D_802412E0_B7B330, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FC
dlabel D_80241340_B7B390 dlabel D_80241340_B7B390
.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243860, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243860, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_15/B7DC20.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_80240300_B7DC20 dlabel D_80240300_B7DC20
.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x43BE0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240494_B7DDB4, D_80240300_B7DC20, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900FD .word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x43BE0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240494_B7DDB4, D_80240300_B7DC20, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FD
dlabel D_80240360_B7DC80 dlabel D_80240360_B7DC80
.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000014, 0x00000043, 0x00000003, GotoMap, 0x802426D0, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802426D0, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000014, 0x00000043, 0x00000003, GotoMap, 0x802426D0, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802426D0, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_16/B80540.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_80240540_B80540 dlabel D_80240540_B80540
.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0xC3770000, 0x00000000, 0x00000000, 0x43610000, 0xC3C30000, 0x00000000, 0x41A00000, 0x42C80000, 0x420C0000, 0x44160000, 0x43A50000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241074_B81074, D_80240540_B80540, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900FE .word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0xC3770000, 0x00000000, 0x00000000, 0x43610000, 0xC3C30000, 0x00000000, 0x41A00000, 0x42C80000, 0x420C0000, 0x44160000, 0x43A50000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241074_B81074, D_80240540_B80540, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FE
dlabel D_802405D0_B805D0 dlabel D_802405D0_B805D0
.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_18/B83B90.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_80240000_B83B90 dlabel D_80240000_B83B90
.word 0x41C80000, 0x43340000, 0x434D0000, 0x432C0000, 0x41A00000, 0x43AC8000, 0xC3520000, 0x40C00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240180_B83D10, D_80240000_B83B90, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190100 .word 0x41C80000, 0x43340000, 0x434D0000, 0x432C0000, 0x41A00000, 0x43AC8000, 0xC3520000, 0x40C00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240180_B83D10, D_80240000_B83B90, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190100
dlabel D_80240060_B83BF0 dlabel D_80240060_B83BF0
.word 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_80241960_B85AE0 dlabel D_80241960_B85AE0
.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0xC33E0000, 0x00000000, 0xC3020000, 0x43340000, 0x44960000, 0x42B40000, 0x00000000, 0x43870000, 0x44960000, 0x42B40000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802421B0_B86330, D_80241960_B85AE0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900EF .word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0xC33E0000, 0x00000000, 0xC3020000, 0x43340000, 0x44960000, 0x42B40000, 0x00000000, 0x43870000, 0x44960000, 0x42B40000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802421B0_B86330, D_80241960_B85AE0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900EF
dlabel D_802419E0_B85B60 dlabel D_802419E0_B85B60
.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000027, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x00000016, 0x00000017, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000057, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000027, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x00000016, 0x00000017, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000057, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_80240000_B8FCD0 dlabel D_80240000_B8FCD0
.word 0x43660000, 0x43200000, 0x42D40000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802405E0_B902B0, D_80240000_B8FCD0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190102 .word 0x43660000, 0x43200000, 0x42D40000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802405E0_B902B0, D_80240000_B8FCD0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190102
dlabel D_80240050_B8FD20 dlabel D_80240050_B8FD20
.word 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80240330_AC9A40 dlabel D_80240330_AC9A40
.word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802406D0, D_80240330_AC9A40, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006B, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802406D0, D_80240330_AC9A40, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006B, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_kkj/kkj_13/AD6630.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80240760_AD6630 dlabel D_80240760_AD6630
.word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x44A1E000, 0x00000000, 0x00000000, 0x43870000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240BF8, D_80240760_AD6630, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019000E, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x0000001B, 0x00000001, 0x0000005F, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 .word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x44A1E000, 0x00000000, 0x00000000, 0x43870000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240BF8, D_80240760_AD6630, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019000E, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x0000001B, 0x00000001, 0x0000005F, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_802404C0_ADB360 dlabel D_802404C0_ADB360
.word 0xC3BB8000, 0x00000000, 0xC1F00000, 0x42B40000, 0x43D98000, 0x41F00000, 0xC2040000, 0x43870000, 0xC2F40000, 0x41200000, 0xC2A40000, 0x43340000, 0xC1A00000, 0x00000000, 0x41F00000, 0x43870000, 0xC30C0000, 0x00000000, 0x00000000, 0x43870000, 0x42200000, 0x00000000, 0x41F00000, 0x43340000, 0xC1A00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x41F00000, 0x43340000, 0xC3020000, 0x00000000, 0x00000000, 0x43340000, 0xC2700000, 0x00000000, 0x00000000, 0x43870000, 0x43BE0000, 0x41F00000, 0x41200000, 0x43870000, 0x43160000, 0x00000000, 0xC1F00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DA4, D_802404C0_ADB360, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019000F, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0xFFFFFF97, 0x0000001D, 0x00000001, 0xFFFFFFB4, 0x0000001D, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0xFFFFFFCA, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x0000001D, 0x00000001, 0x0000003A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC3BB8000, 0x00000000, 0xC1F00000, 0x42B40000, 0x43D98000, 0x41F00000, 0xC2040000, 0x43870000, 0xC2F40000, 0x41200000, 0xC2A40000, 0x43340000, 0xC1A00000, 0x00000000, 0x41F00000, 0x43870000, 0xC30C0000, 0x00000000, 0x00000000, 0x43870000, 0x42200000, 0x00000000, 0x41F00000, 0x43340000, 0xC1A00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x41F00000, 0x43340000, 0xC3020000, 0x00000000, 0x00000000, 0x43340000, 0xC2700000, 0x00000000, 0x00000000, 0x43870000, 0x43BE0000, 0x41F00000, 0x41200000, 0x43870000, 0x43160000, 0x00000000, 0xC1F00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DA4, D_802404C0_ADB360, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019000F, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0xFFFFFF97, 0x0000001D, 0x00000001, 0xFFFFFFB4, 0x0000001D, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0xFFFFFFCA, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x0000001D, 0x00000001, 0x0000003A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_kkj/kkj_18/AF34C0.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80240820_AF34C0 dlabel D_80240820_AF34C0
.word 0xC33B0000, 0x00000000, 0xC20C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DF0, D_80240820_AF34C0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190013, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 .word 0xC33B0000, 0x00000000, 0xC20C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DF0, D_80240820_AF34C0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190013, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_kkj/kkj_22/B024F0.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80240000_B024F0 dlabel D_80240000_B024F0
.word 0xC3610000, 0x00000000, 0xC2340000, 0x42B40000, 0xC3C58000, 0x43960000, 0xC2E60000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024029C, D_80240000_B024F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190017, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 .word 0xC3610000, 0x00000000, 0xC2340000, 0x42B40000, 0xC3C58000, 0x43960000, 0xC2E60000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024029C, D_80240000_B024F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190017, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_kkj/kkj_23/B03250.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_802409D0_B03250 dlabel D_802409D0_B03250
.word 0x4437C000, 0x00000000, 0xC2700000, 0x43870000, 0x41200000, 0x00000000, 0xC2700000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240CF4, D_802409D0_B03250, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190018, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 .word 0x4437C000, 0x00000000, 0xC2700000, 0x43870000, 0x41200000, 0x00000000, 0xC2700000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240CF4, D_802409D0_B03250, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190018, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_kkj/kkj_24/B06590.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80240020_B06590 dlabel D_80240020_B06590
.word 0x43110000, 0x00000000, 0xC1200000, 0x43870000, 0x43110000, 0x43D20000, 0xC1A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240358, D_80240020_B06590, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190019, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 .word 0x43110000, 0x00000000, 0xC1200000, 0x43870000, 0x43110000, 0x43D20000, 0xC1A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240358, D_80240020_B06590, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190019, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_80240F40_B07940 dlabel D_80240F40_B07940
.word 0xC4174000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802414EC_B07EEC, D_80240F40_B07940, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019001A .word 0xC4174000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802414EC_B07EEC, D_80240F40_B07940, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019001A
dlabel D_80240F90_B07990 dlabel D_80240F90_B07990
.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024C700, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024C700, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_kkj/kkj_26/B13150.data.s
View File

@ -3,7 +3,7 @@
.section .data .section .data
dlabel D_80240030_B13150 dlabel D_80240030_B13150
.word 0x43EC0000, 0x41F00000, 0xC1D00000, 0x42B40000, 0x44070000, 0x41F00000, 0xC1A00000, 0x42B40000, 0x43C80000, 0x41F00000, 0xC1A00000, 0x42B40000, 0x43F18000, 0x41F00000, 0x41000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402B8_B133D8, D_80240030_B13150, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019001B, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_80240000_B13120, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80240C30, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000064 .word 0x43EC0000, 0x41F00000, 0xC1D00000, 0x42B40000, 0x44070000, 0x41F00000, 0xC1A00000, 0x42B40000, 0x43C80000, 0x41F00000, 0xC1A00000, 0x42B40000, 0x43F18000, 0x41F00000, 0x41000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402B8_B133D8, D_80240030_B13150, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019001B, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_80240000_B13120, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80240C30, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000064
dlabel D_80240100_B13220 dlabel D_80240100_B13220
.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000026, 0x00000024, 0x00000002, 0xFE363C83, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0x00000027, 0x00000024, 0x00000002, 0xFE363C85, 0x00000024, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240C38, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000026, 0x00000024, 0x00000002, 0xFE363C83, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0x00000027, 0x00000024, 0x00000002, 0xFE363C85, 0x00000024, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240C38, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000

2
ver/us/asm/data/world/area_nok/nok_01/9C7F50.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80242B70_9C7F50 dlabel D_80242B70_9C7F50
.word 0xC3A68000, 0x00000000, 0x43AF0000, 0x42340000, 0x43EB0000, 0x00000000, 0x41200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024332C, D_80242B70_9C7F50, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190048, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000007, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000007, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 .word 0xC3A68000, 0x00000000, 0x43AF0000, 0x42340000, 0x43EB0000, 0x00000000, 0x41200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024332C, D_80242B70_9C7F50, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190048, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000007, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000007, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_nok/nok_02/9DB5C0.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_802445A0_9DB5C0 dlabel D_802445A0_9DB5C0
.word 0xC3F20000, 0x00000000, 0x40A00000, 0x42B40000, 0x40000000, 0x00000000, 0xC3EF8000, 0x43340000, 0x43B68000, 0x420C0000, 0x42B40000, 0x43340000, 0x00000000, 0x00000000, 0xC2700000, 0x00000000, 0xC3B40000, 0x00000000, 0xC2480000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80245A14, D_802445A0_9DB5C0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190049, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 .word 0xC3F20000, 0x00000000, 0x40A00000, 0x42B40000, 0x40000000, 0x00000000, 0xC3EF8000, 0x43340000, 0x43B68000, 0x420C0000, 0x42B40000, 0x43340000, 0x00000000, 0x00000000, 0xC2700000, 0x00000000, 0xC3B40000, 0x00000000, 0xC2480000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80245A14, D_802445A0_9DB5C0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190049, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_nok/nok_03/9EC610.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80240E20_9EC610 dlabel D_80240E20_9EC610
.word 0xC4238000, 0x00000000, 0x40C00000, 0x42B40000, 0x4482C000, 0x00000000, 0xC1F80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024126C, D_80240E20_9EC610, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019004A, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x8000005B, 0x00000000, 0x00000377, 0x00000000, 0xFFFFFFD7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 .word 0xC4238000, 0x00000000, 0x40C00000, 0x42B40000, 0x4482C000, 0x00000000, 0xC1F80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024126C, D_80240E20_9EC610, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019004A, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x8000005B, 0x00000000, 0x00000377, 0x00000000, 0xFFFFFFD7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_nok/nok_04/9EEB20.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80240F30_9EEB20 dlabel D_80240F30_9EEB20
.word 0xC3A80000, 0x00000000, 0x43B20000, 0x42340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802410CC, D_80240F30_9EEB20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019004B, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 .word 0xC3A80000, 0x00000000, 0x43B20000, 0x42340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802410CC, D_80240F30_9EEB20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019004B, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_pra/pra_32/D87240.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/world/area_sam/sam_02/D072F0.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80241BC0_D072F0 dlabel D_80241BC0_D072F0
.word 0xC3F28000, 0x00000000, 0x42480000, 0x42B40000, 0x43F28000, 0x00000000, 0x42480000, 0x43870000, 0x00000000, 0x41F00000, 0x43870000, 0x43340000, 0x43EB0000, 0x00000000, 0x42480000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243B58, D_80241BC0_D072F0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019012A, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000003F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000039, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 .word 0xC3F28000, 0x00000000, 0x42480000, 0x42B40000, 0x43F28000, 0x00000000, 0x42480000, 0x43870000, 0x00000000, 0x41F00000, 0x43870000, 0x43340000, 0x43EB0000, 0x00000000, 0x42480000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243B58, D_80241BC0_D072F0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019012A, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000003F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000039, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_sam/sam_03/D119E0.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80240920_D119E0 dlabel D_80240920_D119E0
.word 0xC4368000, 0x00000000, 0x00000000, 0x42B40000, 0x44368000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240AB0, D_80240920_D119E0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019012D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC4368000, 0x00000000, 0x00000000, 0x42B40000, 0x44368000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240AB0, D_80240920_D119E0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019012D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_sam/sam_04/D13CD0.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80240700_D13CD0 dlabel D_80240700_D13CD0
.word 0xC3A50000, 0x00000000, 0x43AA0000, 0x42340000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC37A0000, 0x43340000, 0xC3B40000, 0x42A00000, 0xC2A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024171C, D_80240700_D13CD0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019012E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC3A50000, 0x00000000, 0x43AA0000, 0x42340000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC37A0000, 0x43340000, 0xC3B40000, 0x42A00000, 0xC2A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024171C, D_80240700_D13CD0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019012E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_sam/sam_05/D1A520.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80241D40_D1A520 dlabel D_80241D40_D1A520
.word 0xC4368000, 0x00000000, 0xC2340000, 0x42B40000, 0x4437C000, 0x42BE0000, 0xC2480000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241ED0, D_80241D40_D1A520, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019012F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC4368000, 0x00000000, 0xC2340000, 0x42B40000, 0x4437C000, 0x42BE0000, 0xC2480000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241ED0, D_80241D40_D1A520, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019012F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_sam/sam_07/D2DD30.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80242000_D2DD30 dlabel D_80242000_D2DD30
.word 0xC4BB8000, 0xC2F00000, 0xC2960000, 0x42B40000, 0x4487A000, 0x43870000, 0xC2A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242204, D_80242000_D2DD30, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190131, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC4BB8000, 0xC2F00000, 0xC2960000, 0x42B40000, 0x4487A000, 0x43870000, 0xC2A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242204, D_80242000_D2DD30, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190131, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_sam/sam_08/D31430.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_802417B0_D31430 dlabel D_802417B0_D31430
.word 0xC4BEE000, 0xC2F00000, 0x00000000, 0x42B40000, 0xC3160000, 0x00000000, 0xC2A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241940, D_802417B0_D31430, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190132, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC4BEE000, 0xC2F00000, 0x00000000, 0x42B40000, 0xC3160000, 0x00000000, 0xC2A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241940, D_802417B0_D31430, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190132, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_sam/sam_09/D366F0.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80240400_D366F0 dlabel D_80240400_D366F0
.word 0xC40D4000, 0x00000000, 0x00000000, 0x42B40000, 0x44110000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240590, D_80240400_D366F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190133, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC40D4000, 0x00000000, 0x00000000, 0x42B40000, 0x44110000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240590, D_80240400_D366F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190133, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_sam/sam_10/D384A0.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80240CA0_D384A0 dlabel D_80240CA0_D384A0
.word 0xC4368000, 0x00000000, 0x00000000, 0x42B40000, 0x44764000, 0x448E8000, 0xC3480000, 0x43870000, 0x43A88000, 0xC1A00000, 0xC2D00000, 0x43870000, 0xC37F0000, 0x44520000, 0xC3570000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240F6C, D_80240CA0_D384A0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190134, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC4368000, 0x00000000, 0x00000000, 0x42B40000, 0x44764000, 0x448E8000, 0xC3480000, 0x43870000, 0x43A88000, 0xC1A00000, 0xC2D00000, 0x43870000, 0xC37F0000, 0x44520000, 0xC3570000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240F6C, D_80240CA0_D384A0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190134, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

2
ver/us/asm/data/world/area_sam/sam_11/D3C740.data.s
View File

@ -3,4 +3,4 @@
.section .data .section .data
dlabel D_80242170_D3C740 dlabel D_80242170_D3C740
.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0x43E38000, 0x00000000, 0x00000000, 0x43870000, 0x43A28000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242F28, D_80242170_D3C740, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, sam_11_get_tattle, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000003F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000039, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0x43E38000, 0x00000000, 0x00000000, 0x43870000, 0x43A28000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242F28, D_80242170_D3C740, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, sam_11_get_tattle, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000003F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000039, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

120
ver/us/splat.yaml
View File

@ -57,7 +57,7 @@ segments:
- [0x7340, c, crash_screen] - [0x7340, c, crash_screen]
- [0x7E40, c, os/nusys/nugfxtaskmgr, -fforce-addr] - [0x7E40, c, os/nusys/nugfxtaskmgr, -fforce-addr]
- [0x8230, c, os/nusys/nusimgr] - [0x8230, c, os/nusys/nusimgr]
- [0x8560, c] - [0x8560, c, load_obfuscation_shims]
- [0x8800, c] - [0x8800, c]
- [0x9D10, c, 9d10_len_1080] - [0x9D10, c, 9d10_len_1080]
- [0xAD90, c, ad90_len_2880] - [0xAD90, c, ad90_len_2880]
@ -941,6 +941,7 @@ segments:
- [0x10C880] - [0x10C880]
- type: code - type: code
name: font_width name: font_width
follows_vram: entity
start: 0x10CC10 start: 0x10CC10
vram: 0x802EB3D0 vram: 0x802EB3D0
subsegments: subsegments:
@ -1314,6 +1315,7 @@ segments:
- [0x16C7D0] - [0x16C7D0]
- type: code - type: code
start: 0x16C8E0 start: 0x16C8E0
name: battle_code
vram: 0x8023E000 vram: 0x8023E000
subsegments: subsegments:
- [0x16C8E0, c, 16c8e0] - [0x16C8E0, c, 16c8e0]
@ -2548,30 +2550,35 @@ segments:
- [0x315B80, pm_sprite_shading_profiles, sprite_shading_profiles] - [0x315B80, pm_sprite_shading_profiles, sprite_shading_profiles]
- type: code - type: code
start: 0x3169F0 start: 0x3169F0
name: create_audio_system_obfuscated
vram: 0x80200000 vram: 0x80200000
subsegments: subsegments:
- [0x3169F0, c, 3169f0] - [0x3169F0, c, create_audio_system_obfuscated]
- type: code - type: code
start: 0x316A70 start: 0x316A70
vram: 0x80200080 vram: 0x80200080
follows_vram: 3169F0 name: load_engine_data_obfuscated
follows_vram: create_audio_system_obfuscated
subsegments: subsegments:
- [0x316A70, c, 316a70] - [0x316A70, c, load_engine_data_obfuscated]
- type: code - type: code
start: 0x316C00 start: 0x316C00
name: general_heap_create_obfuscated
vram: 0x802AE000 vram: 0x802AE000
subsegments: subsegments:
- [0x316C00, c] - [0x316C00, c, general_heap_create_obfuscated]
- type: code - type: code
start: 0x316D90 start: 0x316D90
name: battle_heap_create_obfuscated
vram: 0x802AE000 vram: 0x802AE000
subsegments: subsegments:
- [0x316D90, c, 316d90] - [0x316D90, c, battle_heap_create_obfuscated]
- type: code - type: code
start: 0x316F30 start: 0x316F30
name: obfuscation_shims
vram: 0x802B2000 vram: 0x802B2000
subsegments: subsegments:
- [0x316F30, c, 316f30] - [0x316F30, c, obfuscation_shims]
- type: code - type: code
dir: world/partner dir: world/partner
name: world_partner_goombario name: world_partner_goombario
@ -2662,6 +2669,7 @@ segments:
- [0x325160] - [0x325160]
- type: code - type: code
start: 0x3251D0 start: 0x3251D0
name: world_use_item
vram: 0x802C0000 vram: 0x802C0000
subsegments: subsegments:
- [0x3251D0, c, world_use_item] - [0x3251D0, c, world_use_item]
@ -6813,6 +6821,7 @@ segments:
- type: code - type: code
start: 0x415D90 start: 0x415D90
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x415D90, c, 415D90] - [0x415D90, c, 415D90]
- [0x4200D0] - [0x4200D0]
@ -7975,6 +7984,7 @@ segments:
type: code type: code
start: 0x715850 start: 0x715850
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x715850, c, mushroom] - [0x715850, c, mushroom]
- [0x715E50] - [0x715E50]
@ -7983,6 +7993,7 @@ segments:
type: code type: code
start: 0x716C60 start: 0x716C60
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x716C60, c, fire_flower] - [0x716C60, c, fire_flower]
- [0x717060] - [0x717060]
@ -7991,6 +8002,7 @@ segments:
type: code type: code
start: 0x7179D0 start: 0x7179D0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x7179D0, c, dusty_hammer] - [0x7179D0, c, dusty_hammer]
- start: 0x717C10 - start: 0x717C10
@ -8005,6 +8017,7 @@ segments:
type: code type: code
start: 0x718850 start: 0x718850
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x718850, c, pow_block] - [0x718850, c, pow_block]
- [0x718BF0] - [0x718BF0]
@ -8013,6 +8026,7 @@ segments:
type: code type: code
start: 0x719970 start: 0x719970
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x719970, c, pebble] - [0x719970, c, pebble]
- start: 0x719BB0 - start: 0x719BB0
@ -8027,6 +8041,7 @@ segments:
type: code type: code
start: 0x71A7F0 start: 0x71A7F0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x71A7F0, c, volt_shroom] - [0x71A7F0, c, volt_shroom]
- [0x71AA70] - [0x71AA70]
@ -8035,6 +8050,7 @@ segments:
type: code type: code
start: 0x71B1A0 start: 0x71B1A0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x71B1A0, c, thunder_rage] - [0x71B1A0, c, thunder_rage]
- [0x71B640] - [0x71B640]
@ -8043,6 +8059,7 @@ segments:
type: code type: code
start: 0x71BE30 start: 0x71BE30
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x71BE30, c, snowman_doll] - [0x71BE30, c, snowman_doll]
- [0x71C270] - [0x71C270]
@ -8051,6 +8068,7 @@ segments:
type: code type: code
start: 0x71CCE0 start: 0x71CCE0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x71CCE0, c, dried_shroom] - [0x71CCE0, c, dried_shroom]
- [0x71D010] - [0x71D010]
@ -8059,6 +8077,7 @@ segments:
type: code type: code
start: 0x71D770 start: 0x71D770
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x71D770, c, shooting_star] - [0x71D770, c, shooting_star]
- [0x71DCC0] - [0x71DCC0]
@ -8067,6 +8086,7 @@ segments:
type: code type: code
start: 0x71E650 start: 0x71E650
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x71E650, c, sleepy_sheep] - [0x71E650, c, sleepy_sheep]
- start: 0x71EFC0 - start: 0x71EFC0
@ -8086,6 +8106,7 @@ segments:
type: code type: code
start: 0x7215A0 start: 0x7215A0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x7215A0, c, stone_cap] - [0x7215A0, c, stone_cap]
- [0x721970] - [0x721970]
@ -8094,6 +8115,7 @@ segments:
type: code type: code
start: 0x722000 start: 0x722000
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x722000, c, tasty_tonic] - [0x722000, c, tasty_tonic]
- [0x7222D0] - [0x7222D0]
@ -8102,6 +8124,7 @@ segments:
type: code type: code
start: 0x722B40 start: 0x722B40
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x722B40, c, thunder_bolt] - [0x722B40, c, thunder_bolt]
- [0x722FE0] - [0x722FE0]
@ -8110,6 +8133,7 @@ segments:
type: code type: code
start: 0x723780 start: 0x723780
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x723780, c, ultra_shroom] - [0x723780, c, ultra_shroom]
- [0x723AB0] - [0x723AB0]
@ -8118,6 +8142,7 @@ segments:
type: code type: code
start: 0x724240 start: 0x724240
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x724240, c, unknown_item] - [0x724240, c, unknown_item]
- [0x724570] - [0x724570]
@ -8126,6 +8151,7 @@ segments:
type: code type: code
start: 0x724CE0 start: 0x724CE0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x724CE0, c, super_soda] - [0x724CE0, c, super_soda]
- [0x725210] - [0x725210]
@ -8134,6 +8160,7 @@ segments:
type: code type: code
start: 0x725F60 start: 0x725F60
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x725F60, c, hustle_drink] - [0x725F60, c, hustle_drink]
- [0x726240] - [0x726240]
@ -8142,6 +8169,7 @@ segments:
type: code type: code
start: 0x726DD0 start: 0x726DD0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x726DD0, c, stop_watch] - [0x726DD0, c, stop_watch]
- [0x727120] - [0x727120]
@ -8150,6 +8178,7 @@ segments:
type: code type: code
start: 0x727910 start: 0x727910
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x727910, c, dizzy_dial] - [0x727910, c, dizzy_dial]
- [0x727CE0] - [0x727CE0]
@ -8158,6 +8187,7 @@ segments:
type: code type: code
start: 0x7285E0 start: 0x7285E0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x7285E0, c, please_come_back] - [0x7285E0, c, please_come_back]
- [0x728820] - [0x728820]
@ -8166,6 +8196,7 @@ segments:
type: code type: code
start: 0x728EC0 start: 0x728EC0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x728EC0, c, egg_missile] - [0x728EC0, c, egg_missile]
- start: 0x7291D0 - start: 0x7291D0
@ -8187,6 +8218,7 @@ segments:
type: code type: code
start: 0x72A750 start: 0x72A750
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x72A750, c, insecticide_herb] - [0x72A750, c, insecticide_herb]
- start: 0x72AB70 - start: 0x72AB70
@ -8202,6 +8234,7 @@ segments:
type: code type: code
start: 0x72B910 start: 0x72B910
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x72B910, c, fright_jar] - [0x72B910, c, fright_jar]
- [0x72BC60] - [0x72BC60]
@ -8210,6 +8243,7 @@ segments:
type: code type: code
start: 0x72C5B0 start: 0x72C5B0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x72C5B0, c, mystery] - [0x72C5B0, c, mystery]
- start: 0x72CF00 - start: 0x72CF00
@ -8225,6 +8259,7 @@ segments:
type: code type: code
start: 0x72DB70 start: 0x72DB70
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x72DB70, c, repel_gel] - [0x72DB70, c, repel_gel]
- [0x72DE00] - [0x72DE00]
@ -8233,6 +8268,7 @@ segments:
type: code type: code
start: 0x72E530 start: 0x72E530
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x72E530, c, life_shroom] - [0x72E530, c, life_shroom]
- [0x72EA20] - [0x72EA20]
@ -8241,6 +8277,7 @@ segments:
type: code type: code
start: 0x72F720 start: 0x72F720
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x72F720, c, coconut] - [0x72F720, c, coconut]
- start: 0x72F960 - start: 0x72F960
@ -8256,6 +8293,7 @@ segments:
type: code type: code
start: 0x7305A0 start: 0x7305A0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x7305A0, c, electro_pop] - [0x7305A0, c, electro_pop]
- [0x730AE0] - [0x730AE0]
@ -8264,6 +8302,7 @@ segments:
type: code type: code
start: 0x731300 start: 0x731300
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x731300, c, strange_cake] - [0x731300, c, strange_cake]
- start: 0x731EA0 - start: 0x731EA0
@ -8283,6 +8322,7 @@ segments:
type: code type: code
start: 0x7330D0 start: 0x7330D0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x7330D0, c, food] - [0x7330D0, c, food]
- [0x733700] - [0x733700]
@ -8294,6 +8334,7 @@ segments:
type: code type: code
start: 0x7345A0 start: 0x7345A0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x7345A0, c, hammer] - [0x7345A0, c, hammer]
- [0x734650] - [0x734650]
@ -8301,6 +8342,7 @@ segments:
type: code type: code
start: 0x737890 start: 0x737890
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x737890, c, spin_smash] - [0x737890, c, spin_smash]
- [0x737A20] - [0x737A20]
@ -8308,6 +8350,7 @@ segments:
type: code type: code
start: 0x73AED0 start: 0x73AED0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x73AED0, c, quake_hammer] - [0x73AED0, c, quake_hammer]
- [0x73AF80] - [0x73AF80]
@ -8315,6 +8358,7 @@ segments:
type: code type: code
start: 0x73D860 start: 0x73D860
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x73D860, c, jump] - [0x73D860, c, jump]
- [0x73D9A0] - [0x73D9A0]
@ -8322,6 +8366,7 @@ segments:
type: code type: code
start: 0x740CC0 start: 0x740CC0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x740CC0, c] - [0x740CC0, c]
- [0x740DB0, data] - [0x740DB0, data]
@ -8329,6 +8374,7 @@ segments:
type: code type: code
start: 0x743DF0 start: 0x743DF0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x743DF0, c] - [0x743DF0, c]
- [0x743FF0, data] - [0x743FF0, data]
@ -8336,6 +8382,7 @@ segments:
type: code type: code
start: 0x746E10 start: 0x746E10
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x746E10, c] - [0x746E10, c]
- [0x746F00, data] - [0x746F00, data]
@ -8343,6 +8390,7 @@ segments:
type: code type: code
start: 0x748DD0 start: 0x748DD0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x748DD0, c] - [0x748DD0, c]
- [0x748EC0, data] - [0x748EC0, data]
@ -8350,6 +8398,7 @@ segments:
type: code type: code
start: 0x74AD90 start: 0x74AD90
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x74AD90, c] - [0x74AD90, c]
- [0x74AF40, data] - [0x74AF40, data]
@ -8357,6 +8406,7 @@ segments:
type: code type: code
start: 0x74D570 start: 0x74D570
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x74D570, c] - [0x74D570, c]
- [0x74D850, data] - [0x74D850, data]
@ -8364,6 +8414,7 @@ segments:
type: code type: code
start: 0x74F130 start: 0x74F130
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x74F130, c] - [0x74F130, c]
- [0x74F3D0, data] - [0x74F3D0, data]
@ -8371,6 +8422,7 @@ segments:
type: code type: code
start: 0x752450 start: 0x752450
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x752450, c] - [0x752450, c]
- [0x752500, data] - [0x752500, data]
@ -8378,6 +8430,7 @@ segments:
type: code type: code
start: 0x756780 start: 0x756780
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x756780, c] - [0x756780, c]
- [0x756900, data] - [0x756900, data]
@ -8385,6 +8438,7 @@ segments:
type: code type: code
start: 0x7595B0 start: 0x7595B0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x7595B0, c] - [0x7595B0, c]
- [0x7598D0, data] - [0x7598D0, data]
@ -8392,6 +8446,7 @@ segments:
type: code type: code
start: 0x75C980 start: 0x75C980
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x75C980, c] - [0x75C980, c]
- [0x75CCE0, data] - [0x75CCE0, data]
@ -8399,6 +8454,7 @@ segments:
type: code type: code
start: 0x75E5D0 start: 0x75E5D0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x75E5D0, c] - [0x75E5D0, c]
- [0x75E8F0, data] - [0x75E8F0, data]
@ -8406,6 +8462,7 @@ segments:
type: code type: code
start: 0x761920 start: 0x761920
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x761920, c] - [0x761920, c]
- [0x761C80, data] - [0x761C80, data]
@ -8413,6 +8470,7 @@ segments:
type: code type: code
start: 0x763540 start: 0x763540
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x763540, c] - [0x763540, c]
- [0x7635F0, data] - [0x7635F0, data]
@ -8420,6 +8478,7 @@ segments:
type: code type: code
start: 0x765C20 start: 0x765C20
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x765C20, c, auto_jump] - [0x765C20, c, auto_jump]
- [0x765D10] - [0x765D10]
@ -8427,6 +8486,7 @@ segments:
type: code type: code
start: 0x767C90 start: 0x767C90
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x767C90, c] - [0x767C90, c]
- [0x767D40, data] - [0x767D40, data]
@ -8434,6 +8494,7 @@ segments:
type: code type: code
start: 0x76A830 start: 0x76A830
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x76A830, c, auto_multibounce] - [0x76A830, c, auto_multibounce]
- [0x76A920] - [0x76A920]
@ -8441,6 +8502,7 @@ segments:
type: code type: code
start: 0x76D760 start: 0x76D760
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x76D760, c] - [0x76D760, c]
- [0x76D850, data] - [0x76D850, data]
@ -8448,6 +8510,7 @@ segments:
type: code type: code
start: 0x76F330 start: 0x76F330
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x76F330, c] - [0x76F330, c]
- [0x76F420, data] - [0x76F420, data]
@ -8455,6 +8518,7 @@ segments:
type: code type: code
start: 0x770F30 start: 0x770F30
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x770F30, c] - [0x770F30, c]
- [0x771020, data] - [0x771020, data]
@ -8462,6 +8526,7 @@ segments:
type: code type: code
start: 0x772BA0 start: 0x772BA0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x772BA0, c] - [0x772BA0, c]
- [0x772C50, data] - [0x772C50, data]
@ -8469,6 +8534,7 @@ segments:
type: code type: code
start: 0x775100 start: 0x775100
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x775100, c] - [0x775100, c]
- [0x7751B0, data] - [0x7751B0, data]
@ -8476,6 +8542,7 @@ segments:
type: code type: code
start: 0x777690 start: 0x777690
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x777690, c] - [0x777690, c]
- [0x777740, data] - [0x777740, data]
@ -8483,6 +8550,7 @@ segments:
type: code type: code
start: 0x779C90 start: 0x779C90
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x779C90, c] - [0x779C90, c]
- [0x779E30, data] - [0x779E30, data]
@ -8490,6 +8558,7 @@ segments:
type: code type: code
start: 0x77CB80 start: 0x77CB80
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x77CB80, c] - [0x77CB80, c]
- [0x77CC30, data] - [0x77CC30, data]
@ -8497,6 +8566,7 @@ segments:
type: code type: code
start: 0x77F240 start: 0x77F240
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x77F240, c] - [0x77F240, c]
- [0x77F3D0, data] - [0x77F3D0, data]
@ -8504,6 +8574,7 @@ segments:
type: code type: code
start: 0x781920 start: 0x781920
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x781920, c] - [0x781920, c]
- [0x781AF0, data] - [0x781AF0, data]
@ -8511,6 +8582,7 @@ segments:
type: code type: code
start: 0x783BA0 start: 0x783BA0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x783BA0, c] - [0x783BA0, c]
- [0x783C90, data] - [0x783C90, data]
@ -8518,6 +8590,7 @@ segments:
type: code type: code
start: 0x785B20 start: 0x785B20
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x785B20, c] - [0x785B20, c]
- [0x785C20, data] - [0x785C20, data]
@ -8525,6 +8598,7 @@ segments:
type: code type: code
start: 0x789E60 start: 0x789E60
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x789E60, c] - [0x789E60, c]
- [0x78A490] - [0x78A490]
@ -8532,6 +8606,7 @@ segments:
type: code type: code
start: 0x78B600 start: 0x78B600
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x78B600, c] - [0x78B600, c]
- [0x78C070] - [0x78C070]
@ -8539,6 +8614,7 @@ segments:
type: code type: code
start: 0x78D150 start: 0x78D150
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x78D150, c] - [0x78D150, c]
- [0x78D770] - [0x78D770]
@ -8546,6 +8622,7 @@ segments:
type: code type: code
start: 0x78E7D0 start: 0x78E7D0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x78E7D0, c] - [0x78E7D0, c]
- [0x78EEC0] - [0x78EEC0]
@ -8553,6 +8630,7 @@ segments:
type: code type: code
start: 0x7900D0 start: 0x7900D0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x7900D0, c] - [0x7900D0, c]
- [0x7909C0] - [0x7909C0]
@ -8560,6 +8638,7 @@ segments:
type: code type: code
start: 0x791D90 start: 0x791D90
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x791D90, c] - [0x791D90, c]
- [0x7923C0] - [0x7923C0]
@ -8567,6 +8646,7 @@ segments:
type: code type: code
start: 0x793D20 start: 0x793D20
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x793D20, c] - [0x793D20, c]
- [0x794240] - [0x794240]
@ -8574,6 +8654,7 @@ segments:
type: code type: code
start: 0x7952E0 start: 0x7952E0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x7952E0, c] - [0x7952E0, c]
- [0x7959B0] - [0x7959B0]
@ -8581,6 +8662,7 @@ segments:
type: code type: code
start: 0x796FC0 start: 0x796FC0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x796FC0, c] - [0x796FC0, c]
- [0x7984B0] - [0x7984B0]
@ -8588,6 +8670,7 @@ segments:
type: code type: code
start: 0x7997B0 start: 0x7997B0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x7997B0, c] - [0x7997B0, c]
- [0x79ACA0] - [0x79ACA0]
@ -8595,6 +8678,7 @@ segments:
type: code type: code
start: 0x79BFA0 start: 0x79BFA0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x79BFA0, c] - [0x79BFA0, c]
- [0x79C4D0] - [0x79C4D0]
@ -8602,6 +8686,7 @@ segments:
type: code type: code
start: 0x79D8A0 start: 0x79D8A0
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
subsegments: subsegments:
- [0x79D8A0, c] - [0x79D8A0, c]
- [0x79DE50] - [0x79DE50]
@ -8609,6 +8694,7 @@ segments:
name: level_up name: level_up
start: 0x79EF40 start: 0x79EF40
vram: 0x802A1000 vram: 0x802A1000
follows_vram: battle_code
symbol_name_format: $VRAM_$ROM symbol_name_format: $VRAM_$ROM
subsegments: subsegments:
- [0x79EF40, c, level_up] - [0x79EF40, c, level_up]
@ -14737,12 +14823,13 @@ segments:
- [0xE1EC20] - [0xE1EC20]
- type: code - type: code
start: 0xE20110 start: 0xE20110
name: inspect_icon
vram: 0x802B7000 vram: 0x802B7000
subsegments: subsegments:
- [0xE20110, c, E20110] - [0xE20110, c, inspect_icon]
- start: 0xE20B30 - start: 0xE20B30
type: .data type: .data
name: E20110 name: inspect_icon
subsegments: subsegments:
- [0xE20B30, ci4, inspect_icon, 32, 32] - [0xE20B30, ci4, inspect_icon, 32, 32]
- [0xE20D30, palette, inspect_icon] - [0xE20D30, palette, inspect_icon]
@ -14751,12 +14838,13 @@ segments:
- [0xE20DD0] - [0xE20DD0]
- type: code - type: code
start: 0xE20EB0 start: 0xE20EB0
name: speech_bubble
vram: 0x802B7000 vram: 0x802B7000
subsegments: subsegments:
- [0xE20EB0, c, e20eb0] - [0xE20EB0, c, speech_bubble]
- start: 0xE215C0 - start: 0xE215C0
type: .data type: .data
name: e20eb0 name: speech_bubble
subsegments: subsegments:
- [0xE215C0, ci4, speech_bubble, 32, 32] - [0xE215C0, ci4, speech_bubble, 32, 32]
- [0xE217C0, palette, speech_bubble] - [0xE217C0, palette, speech_bubble]
@ -14765,12 +14853,13 @@ segments:
- [0xE21860] - [0xE21860]
- type: code - type: code
start: 0xE21870 start: 0xE21870
name: pulse_stone
vram: 0x802B7000 vram: 0x802B7000
subsegments: subsegments:
- [0xE21870, c, E21870] - [0xE21870, c, pulse_stone]
- start: 0xE21EB0 - start: 0xE21EB0
type: .data type: .data
name: E21870 name: pulse_stone
subsegments: subsegments:
- [0xE21EB0, ci4, pulse_stone, 56, 56] - [0xE21EB0, ci4, pulse_stone, 56, 56]
- [0xE224D0, palette, pulse_stone] - [0xE224D0, palette, pulse_stone]
@ -14780,12 +14869,13 @@ segments:
- [0xE22590] - [0xE22590]
- type: code - type: code
start: 0xE225B0 start: 0xE225B0
name: i_spy
vram: 0x802B7000 vram: 0x802B7000
subsegments: subsegments:
- [0xE225B0, c, E225B0] - [0xE225B0, c, i_spy]
- start: 0xE22B30 - start: 0xE22B30
type: .data type: .data
name: E225B0 name: i_spy
subsegments: subsegments:
- [0xE22B30, ci4, i_spy, 56, 56] - [0xE22B30, ci4, i_spy, 56, 56]
- [0xE23150, palette, i_spy] - [0xE23150, palette, i_spy]

26
ver/us/symbol_addrs.txt
View File

@ -136,7 +136,7 @@ nuSiSendMesg = 0x8002CF28; // type:func rom:0x8328
nuSiMgrStop = 0x8002CF8C; // type:func rom:0x838C nuSiMgrStop = 0x8002CF8C; // type:func rom:0x838C
nuSiMgrRestart = 0x8002CFAC; // type:func rom:0x83AC nuSiMgrRestart = 0x8002CFAC; // type:func rom:0x83AC
nuSiMgrThread = 0x8002CFD0; // type:func rom:0x83D0 nuSiMgrThread = 0x8002CFD0; // type:func rom:0x83D0
func_8002D160 = 0x8002D160; // type:func rom:0x8560 load_obfuscation_shims = 0x8002D160; // type:func rom:0x8560
update_cameras = 0x8002D400; // type:func rom:0x8800 update_cameras = 0x8002D400; // type:func rom:0x8800
render_frame = 0x8002D73C; // type:func rom:0x8B3C render_frame = 0x8002D73C; // type:func rom:0x8B3C
create_cameras_a = 0x8002DEF4; // type:func rom:0x92F4 create_cameras_a = 0x8002DEF4; // type:func rom:0x92F4
@ -7673,14 +7673,14 @@ D_8029DA08 = 0x8029DA08; // type:data rom:0x1CC2E8
D_8029DA10 = 0x8029DA10; // type:data rom:0x1CC2F0 D_8029DA10 = 0x8029DA10; // type:data rom:0x1CC2F0
D_8029DA18 = 0x8029DA18; // type:data rom:0x1CC2F8 D_8029DA18 = 0x8029DA18; // type:data rom:0x1CC2F8
D_8029DA20 = 0x8029DA20; // type:data rom:0x1CC300 D_8029DA20 = 0x8029DA20; // type:data rom:0x1CC300
func_80200000 = 0x80200000; // type:func rom:0x3169F0 create_audio_system_obfuscated = 0x80200000; // type:func rom:0x3169F0
func_80200080 = 0x80200080; // type:func rom:0x316A70 shim_load_engine_data_obfuscated = 0x80200080; // type:func rom:0x316A70
func_802AE000_316C00 = 0x802AE000; // type:func rom:0x316C00 general_heap_create_obfuscated = 0x802AE000; // type:func rom:0x316C00
func_802AE000 = 0x802AE000; // type:func rom:0x316D90 battle_heap_create_obfuscated = 0x802AE000; // type:func rom:0x316D90
func_802B2000 = 0x802B2000; // type:func rom:0x316F30 shim_create_audio_system_obfuscated = 0x802B2000; // type:func rom:0x316F30
func_802B203C = 0x802B203C; // type:func rom:0x316F6C shim_load_engine_data_obfuscated = 0x802B203C; // type:func rom:0x316F6C
func_802B2078 = 0x802B2078; // type:func rom:0x316FA8 shim_general_heap_create_obfuscated = 0x802B2078; // type:func rom:0x316FA8
func_802B20B4 = 0x802B20B4; // type:func rom:0x316FE4 shim_battle_heap_create_obfuscated = 0x802B20B4; // type:func rom:0x316FE4
func_802BD100_317020 = 0x802BD100; // type:func rom:0x317020 func_802BD100_317020 = 0x802BD100; // type:func rom:0x317020
world_goombario_init = 0x802BD174; // type:func rom:0x317094 world_goombario_init = 0x802BD174; // type:func rom:0x317094
func_802BD188_3170A8 = 0x802BD188; // type:func rom:0x3170A8 func_802BD188_3170A8 = 0x802BD188; // type:func rom:0x3170A8
@ -25135,7 +25135,7 @@ gv_01_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xE1E740
gv_01_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xE1E864 gv_01_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xE1E864
gv_01_FadeToTitleScreen = 0x802405EC; // type:func rom:0xE1EA4C gv_01_FadeToTitleScreen = 0x802405EC; // type:func rom:0xE1EA4C
gv_01_ChangeStateToTitleScreen = 0x80240688; // type:func rom:0xE1EAE8 gv_01_ChangeStateToTitleScreen = 0x80240688; // type:func rom:0xE1EAE8
E20110_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20110 inspect_icon_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20110
func_802B70B4_E201C4 = 0x802B70B4; // type:func rom:0xE201C4 func_802B70B4_E201C4 = 0x802B70B4; // type:func rom:0xE201C4
func_802B71E8_E202F8 = 0x802B71E8; // type:func rom:0xE202F8 func_802B71E8_E202F8 = 0x802B71E8; // type:func rom:0xE202F8
func_802B7450_E20560 = 0x802B7450; // type:func rom:0xE20560 func_802B7450_E20560 = 0x802B7450; // type:func rom:0xE20560
@ -25148,7 +25148,7 @@ D_802B7C40_E20D50 = 0x802B7C40; // type:data rom:0xE20D50
D_802B7CB8_E20DC8 = 0x802B7CB8; // type:data rom:0xE20DC8 D_802B7CB8_E20DC8 = 0x802B7CB8; // type:data rom:0xE20DC8
D_802B7D88_E20E98 = 0x802B7D88; // type:data rom:0xE20E98 D_802B7D88_E20E98 = 0x802B7D88; // type:data rom:0xE20E98
D_802B7D90_E20EA0 = 0x802B7D90; // type:data rom:0xE20EA0 D_802B7D90_E20EA0 = 0x802B7D90; // type:data rom:0xE20EA0
e20eb0_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20EB0 speech_bubble_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20EB0
func_802B70B4 = 0x802B70B4; // type:func rom:0xE20F64 func_802B70B4 = 0x802B70B4; // type:func rom:0xE20F64
func_802B71C8 = 0x802B71C8; // type:func rom:0xE21078 func_802B71C8 = 0x802B71C8; // type:func rom:0xE21078
func_802B742C = 0x802B742C; // type:func rom:0xE212DC func_802B742C = 0x802B742C; // type:func rom:0xE212DC
@ -25842,9 +25842,6 @@ kmr_20_settings = 0x2800380; // type:data
battle_item_insecticide_herb_temp = 0x28003C0; // type:data battle_item_insecticide_herb_temp = 0x28003C0; // type:data
battle_item_insecticide_herb_temp2 = 0x28003D0; // type:data battle_item_insecticide_herb_temp2 = 0x28003D0; // type:data
battle_item_mystery_tempStc = 0x2800410; // type:data battle_item_mystery_tempStc = 0x2800410; // type:data
obfuscated_battle_heap_create = 0x7012ACA1; // type:data
obfuscated_general_heap_create = 0x7012BC11; // type:data
obfuscated__316F30_VRAM = 0x7599F6D8; // type:data
osTvType = 0x80000300; // osTvType = 0x80000300; //
osRomBase = 0x80000308; // type:data osRomBase = 0x80000308; // type:data
osResetType = 0x8000030C; // type:data osResetType = 0x8000030C; // type:data
@ -27209,7 +27206,6 @@ D_802EB620 = 0x802EB620; // type:data
D_802EB644 = 0x802EB644; // type:data D_802EB644 = 0x802EB644; // type:data
D_802ED970 = 0x802ED970; // type:data D_802ED970 = 0x802ED970; // type:data
D_802EE8D0 = 0x802EE8D0; // type:data D_802EE8D0 = 0x802EE8D0; // type:data
D_802EF0D0 = 0x802EF0D0; // type:data
D_802F39D0 = 0x802F39D0; // type:data D_802F39D0 = 0x802F39D0; // type:data
D_802F4560 = 0x802F4560; // type:data D_802F4560 = 0x802F4560; // type:data
heap_generalHead = 0x802FB800; // type:data heap_generalHead = 0x802FB800; // type:data

14
ver/us/undefined_syms.txt
View File

@ -3,13 +3,21 @@ obfuscated_battle_heap_create = battle_heap_create - 0xFEFFFFF;
obfuscated_general_heap_create = general_heap_create - 0xFEFEFEF; obfuscated_general_heap_create = general_heap_create - 0xFEFEFEF;
obfuscated_load_engine_data = load_engine_data - 0x315; obfuscated_load_engine_data = load_engine_data - 0x315;
obfuscated_create_audio_system = create_audio_system - 0x7B; obfuscated_create_audio_system = create_audio_system - 0x7B;
obfuscated__316F30_VRAM = _316F30_VRAM - 0xA912928; obfuscated_obfuscation_shims_VRAM = obfuscation_shims_VRAM - 0xA912928;
obfuscated__316F30_ROM_START = _316F30_ROM_START - 0x8939221; obfuscated_obfuscation_shims_ROM_START = obfuscation_shims_ROM_START - 0x8939221;
// hacks for various things // hacks for various things
fx_sun_undeclared = fx_sun; fx_sun_undeclared = fx_sun;
D_802AD673 = 0x802AD673; // remove when func_802A45D8 is decompiled with D_802AD670 instead of D_802AD673 D_802AD673 = 0x802AD673; // remove when func_802A45D8 is decompiled with D_802AD670 instead of D_802AD673
#ifdef SHIFT
mdl_clearRenderTasks = MAX(inspect_icon_VRAM_END, speech_bubble_VRAM_END);
mdl_clearRenderTasks = MAX(mdl_clearRenderTasks, pulse_stone_VRAM_END);
mdl_clearRenderTasks = MAX(mdl_clearRenderTasks, i_spy_VRAM_END);
#else
mdl_clearRenderTasks = 0x802B7E00;
#endif
// hard-coded heapy things // hard-coded heapy things
D_80197000 = 0x80197000; // effect tlb stuff D_80197000 = 0x80197000; // effect tlb stuff
D_801A6000 = 0x801A6000; // effect tlb stuff D_801A6000 = 0x801A6000; // effect tlb stuff
@ -19,8 +27,6 @@ D_80200000 = 0x80200000;
gBackgroundImage = 0x80200000; gBackgroundImage = 0x80200000;
D_80210000 = 0x80210000; D_80210000 = 0x80210000;
heap_collisionHead = 0x80268000; heap_collisionHead = 0x80268000;
mdl_clearRenderTasks = 0x802B7E00; // is this hard-coded?
D_802EF0D0 = 0x802EF0D0; // is this hard-coded?
heap_generalHead = 0x802FB800; heap_generalHead = 0x802FB800;
gSpriteHeapPtr = 0x8034F800; gSpriteHeapPtr = 0x8034F800;
D_8038F800 = 0x8038F800; D_8038F800 = 0x8038F800;