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

All area rodata migrated (#299)

Browse Source 
* splat disasm update

* a little

* splat jtbl robustness

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "150dcdebfd"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "150dcdebfd"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* some rodata stuff

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "21bf3a381c"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "21bf3a381c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* progress

* All area rodata migrated
This commit is contained in:
Ethan Roseman 2021-07-03 20:22:53 +09:00 committed by GitHub
parent 647db26552
commit 41417f4d70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1570 changed files with 7322 additions and 6534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -128,7 +128,7 @@ s32 get_map_IDs_by_name(const char* mapName, s16* areaID, s16* mapID);
void get_dpad_input_radial(f32* angle, f32* magnitude);
void transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outS);
void btl_create_popup_menu(void*);
void create_popup_menu(void*);
s32 npc_test_move_simple_without_slipping(s32, f32*, f32*, f32*, f32, f32, f32, f32);
void update_collider_transform(s16 colliderID);

4
src/EA8AE0.c
View File

@ -12,6 +12,10 @@ INCLUDE_ASM(s32, "EA8AE0", func_80240358_EA8E38);
INCLUDE_ASM(s32, "EA8AE0", func_802404B8_EA8F98);
static char* N(exit_str_0) = "kmr_23";
static char* N(exit_str_1) = "kzn_18";
static char* N(exit_str_2) = "kzn_20";
INCLUDE_ASM(s32, "EA8AE0", func_802408C8_EA93A8);
INCLUDE_ASM(s32, "EA8AE0", func_80240908_EA93E8);

5
src/EB9D90.c
View File

@ -1,5 +1,10 @@
#include "common.h"
static char* N(exit_str_0) = "flo_07";
static char* N(exit_str_1) = "\0\0\0\0";
static char* N(exit_str_2) = "sam_11";
static char* N(exit_str_3) = "flo_19";
INCLUDE_ASM(s32, "EB9D90", func_80240F40_EB9D90);
INCLUDE_ASM(s32, "EB9D90", func_80240FB0_EB9E00);

4
src/EC2200.c
View File

@ -2,8 +2,4 @@
#define NAMESPACE EC2200
const char* ascii_EC7170 = "flo_09";
const char* ascii_EC7178 = "flo_22";
const char* ascii_EC7180 = "flo_18";
#include "common/DeadUnk1.inc.c"

4
src/EC2240.c
View File

@ -1,5 +1,9 @@
#include "common.h"
const char* ascii_EC7170 = "flo_09";
const char* ascii_EC7178 = "flo_22";
const char* ascii_EC7180 = "flo_18\0";
INCLUDE_ASM(s32, "EC2240", func_80240040_EC2240);
INCLUDE_ASM(s32, "EC2240", func_802400F4_EC22F4);

289
src/a5dd0_len_114e0.c
View File

@ -1084,295 +1084,6 @@ void appendGfx_model_group(Model*);
void appendGfx_model(Model*);
void render_transform_group(Model*);
// void render_models(void) {
// Camera* camera = &gCameras[gCurrentCameraID];
// f32 cam00 = camera->perspectiveMatrix[0][0];
// f32 cam01 = camera->perspectiveMatrix[0][1];
// f32 cam02 = camera->perspectiveMatrix[0][2];
// f32 cam03 = camera->perspectiveMatrix[0][3];
// f32 cam10 = camera->perspectiveMatrix[1][0];
// f32 cam11 = camera->perspectiveMatrix[1][1];
// f32 cam12 = camera->perspectiveMatrix[1][2];
// f32 cam13 = camera->perspectiveMatrix[1][3];
// f32 cam20 = camera->perspectiveMatrix[2][0];
// f32 cam21 = camera->perspectiveMatrix[2][1];
// f32 cam22 = camera->perspectiveMatrix[2][2];
// f32 cam23 = camera->perspectiveMatrix[2][3];
// f32 cam30 = camera->perspectiveMatrix[3][0];
// f32 cam31 = camera->perspectiveMatrix[3][1];
// f32 cam32 = camera->perspectiveMatrix[3][2];
// f32 cam33 = camera->perspectiveMatrix[3][3];
// f32 modelCenterX;
// f32 modelCenterY;
// f32 modelCenterZ;
// f32 someX;
// f32 someY;
// f32 someZ;
// Model* model;
// s32 i;
// s32 skip;
// ModelNodeProperty* propertyList;
// s32 distance;
// f32 xDelta;
// f32 yDelta;
// f32 zDelta;
// f32 row0;
// f32 row1;
// f32 row2;
// f32 row3;
// f32 row0x3;
// f32 row1x3;
// RenderTask renderTask;
// RenderTask* renderTaskPtr;
// ModelTransformGroup* modelTransformGroup;
// renderTaskPtr = &renderTask;
// for (i = 0; i < ARRAY_COUNT(*gCurrentModelListPtr); i++) {
// model = (*gCurrentModelListPtr)[i];
// if (model != NULL) {
// s32 mflags = model->flags; // todo this is needed to trick the compiler :/ ugly
// if (model->flags == 0 || mflags & 0x4 || model->flags & 0x2 || mflags & 0x20 || model->flags & 0x8) {
// continue;
// }
// modelCenterX = model->center.x;
// modelCenterY = model->center.y;
// modelCenterZ = model->center.z;
// if (model->flags & 0x200) {
// skip = 0;
// propertyList = model->modelNode->propertyList;
// someX = propertyList[0].dataType;
// someY = propertyList[1].dataType;
// someZ = propertyList[2].dataType;
// xDelta = modelCenterX - someX;
// yDelta = modelCenterY - someY;
// zDelta = modelCenterZ - someZ;
// row0 = (cam00 * xDelta) + (cam10 * yDelta) + (cam20 * zDelta) + cam30;
// row1 = (cam01 * xDelta) + (cam11 * yDelta) + (cam21 * zDelta) + cam31;
// row2 = (cam02 * xDelta) + (cam12 * yDelta) + (cam22 * zDelta) + cam32;
// row3 = (cam03 * xDelta) + (cam13 * yDelta) + (cam23 * zDelta) + cam33;
// if (row3 != 0.0f) {
// row3 = 1.0f / row3;
// row0x3 = row0 * row3;
// row1x3 = row1 * row3;
// if (!((row2 * row3) > -1.0f) || !(row0x3 >= -1.0f) || !(row0x3 <= 1.0f) || !(row1x3 >= -1.0f) || !(row1x3 <= 1.0f)) {
// if (someX == 0.0f) {
// goto block_21;
// }
// xDelta = modelCenterX + someX;
// yDelta = modelCenterY - someY;
// zDelta = modelCenterZ - someZ;
// row0 = (cam00 * xDelta) + (cam10 * yDelta) + (cam20 * zDelta) + cam30;
// row1 = (cam01 * xDelta) + (cam11 * yDelta) + (cam21 * zDelta) + cam31;
// row2 = (cam02 * xDelta) + (cam12 * yDelta) + (cam22 * zDelta) + cam32;
// row3 = (cam03 * xDelta) + (cam13 * yDelta) + (cam23 * zDelta) + cam33;
// if (row3 != 0.0f) {
// row3 = 1.0f / row3;
// row0x3 = row0 * row3;
// row1x3 = row1 * row3;
// if (!((row2 * row3) > -1.0f) || !(row0x3 >= -1.0f) || !(row0x3 <= 1.0f) || !(row1x3 >= -1.0f) || !(row1x3 <= 1.0f)) {
// block_21:
// if (someY == 0.0f) {
// goto block_28;
// }
// xDelta = modelCenterX - someX;
// yDelta = modelCenterY + someY;
// zDelta = modelCenterZ - someZ;
// row0 = (cam00 * xDelta) + (cam10 * yDelta) + (cam20 * zDelta) + cam30;
// row1 = (cam01 * xDelta) + (cam11 * yDelta) + (cam21 * zDelta) + cam31;
// row2 = (cam02 * xDelta) + (cam12 * yDelta) + (cam22 * zDelta) + cam32;
// row3 = (cam03 * xDelta) + (cam13 * yDelta) + (cam23 * zDelta) + cam33;
// if (row3 != 0.0f) {
// row3 = 1.0f / row3;
// row0x3 = row0 * row3;
// row1x3 = row1 * row3;
// if (!((row2 * row3) > -1.0f) || !(row0x3 >= -1.0f) || !(row0x3 <= 1.0f) || !(row1x3 >= -1.0f) || !(row1x3 <= 1.0f)) {
// block_28:
// if (!((someX != 0.0f) && (someY != 0.0f))) {
// goto block_36;
// }
// xDelta = modelCenterX + someX;
// yDelta = modelCenterY + someY;
// zDelta = modelCenterZ - someZ;
// row0 = (cam00 * xDelta) + (cam10 * yDelta) + (cam20 * zDelta) + cam30;
// row1 = (cam01 * xDelta) + (cam11 * yDelta) + (cam21 * zDelta) + cam31;
// row2 = (cam02 * xDelta) + (cam12 * yDelta) + (cam22 * zDelta) + cam32;
// row3 = (cam03 * xDelta) + (cam13 * yDelta) + (cam23 * zDelta) + cam33;
// if (row3 != 0.0f) {
// row3 = 1.0f / row3;
// row0x3 = row0 * row3;
// row1x3 = row1 * row3;
// if (!(((row2 * row3) > -1.0f) && (row0x3 >= -1.0f) && (row0x3 <= 1.0f) && (row1x3 >= -1.0f))) {
// goto block_37;
// }
// if (!(row1x3 <= 1.0f)) {
// block_36:
// block_37:
// if (someZ == 0.0f) {
// goto block_44;
// }
// xDelta = modelCenterX - someX;
// yDelta = modelCenterY - someY;
// zDelta = modelCenterZ + someZ;
// row0 = (cam00 * xDelta) + (cam10 * yDelta) + (cam20 * zDelta) + cam30;
// row1 = (cam01 * xDelta) + (cam11 * yDelta) + (cam21 * zDelta) + cam31;
// row2 = (cam02 * xDelta) + (cam12 * yDelta) + (cam22 * zDelta) + cam32;
// row3 = (cam03 * xDelta) + (cam13 * yDelta) + (cam23 * zDelta) + cam33;
// if (row3 != 0.0f) {
// row3 = 1.0f / row3;
// row0x3 = row0 * row3;
// row1x3 = row1 * row3;
// if (!((row2 * row3) > -1.0f) || !(row0x3 >= -1.0f) || !(row0x3 <= 1.0f) || !(row1x3 >= -1.0f) || !(row1x3 <= 1.0f)) {
// block_44:
// if (!((someX != 0.0f) && (someZ != 0.0f))) {
// goto block_52;
// }
// xDelta = modelCenterX + someX;
// yDelta = modelCenterY - someY;
// zDelta = modelCenterZ + someZ;
// row0 = (cam00 * xDelta) + (cam10 * yDelta) + (cam20 * zDelta) + cam30;
// row1 = (cam01 * xDelta) + (cam11 * yDelta) + (cam21 * zDelta) + cam31;
// row2 = (cam02 * xDelta) + (cam12 * yDelta) + (cam22 * zDelta) + cam32;
// row3 = (cam03 * xDelta) + (cam13 * yDelta) + (cam23 * zDelta) + cam33;
// if (row3 != 0.0f) {
// row3 = 1.0f / row3;
// row0x3 = row0 * row3;
// row1x3 = row1 * row3;
// if (!((row2 * row3) > -1.0f) || !(row0x3 >= -1.0f) || !(row0x3 <= 1.0f) || !(row1x3 >= -1.0f) || !(row1x3 <= 1.0f)) {
// block_52:
// if (((someY == 0.0f) || (someZ == 0.0f))) {
// goto block_60;
// }
// xDelta = modelCenterX - someX;
// yDelta = modelCenterY + someY;
// zDelta = modelCenterZ + someZ;
// row0 = (cam00 * xDelta) + (cam10 * yDelta) + (cam20 * zDelta) + cam30;
// row1 = (cam01 * xDelta) + (cam11 * yDelta) + (cam21 * zDelta) + cam31;
// row2 = (cam02 * xDelta) + (cam12 * yDelta) + (cam22 * zDelta) + cam32;
// row3 = (cam03 * xDelta) + (cam13 * yDelta) + (cam23 * zDelta) + cam33;
// if (row3 != 0.0f) {
// row3 = 1.0f / row3;
// row0x3 = row0 * row3;
// row1x3 = row1 * row3;
// if (!((row2 * row3) > -1.0f) || !(row0x3 >= -1.0f) || !(row0x3 <= 1.0f) || !(row1x3 >= -1.0f) || !(row1x3 <= 1.0f)) {
// block_60:
// if (!((someX != 0.0f) && (someY != 0.0f) && (someZ != 0.0f))) {
// goto block_69;
// } else {
// xDelta = modelCenterX + someX;
// yDelta = modelCenterY + someY;
// zDelta = modelCenterZ + someZ;
// row0 = (cam00 * xDelta) + (cam10 * yDelta) + (cam20 * zDelta) + cam30;
// row1 = (cam01 * xDelta) + (cam11 * yDelta) + (cam21 * zDelta) + cam31;
// row2 = (cam02 * xDelta) + (cam12 * yDelta) + (cam22 * zDelta) + cam32;
// row3 = (cam03 * xDelta) + (cam13 * yDelta) + (cam23 * zDelta) + cam33;
// if (row3 != 0.0f) {
// row3 = 1.0f / row3;
// row0x3 = row0 * row3;
// row1x3 = row1 * row3;
// if (!((row2 * row3) > -1.0f) || !(row0x3 >= -1.0f) || !(row0x3 <= 1.0f) || !(row1x3 >= -1.0f) || !(row1x3 <= 1.0f)) {
// block_69:
// skip = 1;
// }
// }
// }
// }
// }
// }
// }
// }
// }
// }
// }
// }
// }
// }
// }
// }
// }
// if (skip) {
// continue;
// }
// }
// transform_point(camera->perspectiveMatrix, modelCenterX, modelCenterY, modelCenterZ, 1.0f, &row0, &row1, &row2, &row3);
// distance = row2 + 5000.0f;
// if (distance < 0) {
// distance = 0;
// } else if (distance > 10000) {
// distance = 10000;
// }
// renderTaskPtr->appendGfxArg = model;
// if (model->modelNode->type == 5) { // todo create type enum, 5 being group
// renderTaskPtr->appendGfx = appendGfx_model_group;
// } else {
// renderTaskPtr->appendGfx = appendGfx_model;
// }
// renderTaskPtr->distance = -distance;
// renderTaskPtr->renderMode = model->renderMode;
// queue_render_task(renderTaskPtr);
// }
// }
// for (i = 0; i < ARRAY_COUNT(*gCurrentTransformGroups); i++) {
// modelTransformGroup = (*gCurrentTransformGroups)[i];
// if (modelTransformGroup != NULL && modelTransformGroup->flags != 0 && !(modelTransformGroup->flags & 4)) {
// f32 cx = modelTransformGroup->center.x;
// f32 cy = modelTransformGroup->center.y;
// f32 cz = modelTransformGroup->center.z;
// transform_point(camera->perspectiveMatrix, cx, cy, cz, 1.0f, &row0, &row1, &row2, &row3);
// if (row3 == 0.0f) {
// row3 = 1.0f;
// }
// distance = (row2 / row3) * 10000.0f;
// if (!(modelTransformGroup->flags & 2)) {
// renderTaskPtr->appendGfx = render_transform_group;
// renderTaskPtr->appendGfxArg = modelTransformGroup;
// renderTaskPtr->distance = -distance;
// renderTaskPtr->renderMode = modelTransformGroup->renderMode;
// queue_render_task(renderTaskPtr);
// }
// }
// }
// }
INCLUDE_ASM(void, "a5dd0_len_114e0", appendGfx_model_group, Model*);
INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80117D00);

86
src/battle/battle.c
View File

@ -5,82 +5,6 @@
extern BattleList area_kmr_part_1_battles;
extern StageList area_kmr_part_1_stages;
const s32 D_80099E40[] = {
/* 0x75240 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
/* 0x75250 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
/* 0x75260 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75270 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75280 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x75290 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x752A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x752B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x752C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x752D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x752E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x752F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75300 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75310 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75320 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75330 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
};
const s32 D_80099F40[] = {
/* 0x75340 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
/* 0x75350 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
/* 0x75360 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75370 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75380 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x75390 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x753A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x753B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x753C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x753D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x753E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x753F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75400 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75410 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75420 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75430 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
};
const s32 D_8009A040[] = {
/* 0x75440 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
/* 0x75450 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
/* 0x75460 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75470 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75480 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x75490 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x754A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x754B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x754C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x754D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x754E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x754F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75500 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75510 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75520 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75530 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
};
const s32 D_8009A140[] = {
/* 0x75540 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
/* 0x75550 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
/* 0x75560 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75570 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75580 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x75590 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x755A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x755B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x755C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x755D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x755E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x755F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75600 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75610 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75620 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75630 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
};
BattleArea gBattleAreas[0x30] = {
{
AREA(area_kmr_part_1),
@ -350,13 +274,3 @@ BattleArea gBattleAreas[0x30] = {
},
{},
};
// possibly a jump table
const s32 jtbl_8009A578[] = {
0x80072F38, 0x80072F4C, 0x80072F64, 0x80072F90, 0x80072FA8, 0x00000000,
};
// possibly a jump table
const s32 jtbl_8009A590[] = {
0x8007301C, 0x80073070, 0x80073094, 0x800730CC, 0x800730F8,
};

2
src/world/area_dgb/dgb_04/C36530.c
View File

@ -1025,7 +1025,7 @@ ApiStatus N(func_8024259C_C38ACC)(ScriptInstance* script, s32 isInitialCall) {
ptr->unk_318 = 4;
ptr->unk_324 = partnerActiveCount;
ptr->unk_328 = 0;
btl_create_popup_menu(ptr);
create_popup_menu(ptr);
script->functionTemp[0].s = 0;
}

8
src/world/area_dro/dro_02/9694C0.c
View File

@ -3446,7 +3446,7 @@ ApiStatus N(func_80241874_96AA34)(ScriptInstance* script, s32 isInitialCall) {
//#define NON_MATCHING
#ifdef NON_MATCHING
s32 func_8024190C_96AACC(D_8024F010_Struct* ptr, Matrix4f matrix) {
s32 dro_02_func_8024190C_96AACC(D_8024F010_Struct* ptr, Matrix4f matrix) {
Matrix4f subroutine_arg6;
Matrix4f subroutine_arg16;
s32 subroutine_arg26;
@ -3907,9 +3907,9 @@ void N(func_80242EAC_96C06C)(ScriptInstance* script, s32 isInitialCall) {
guPositionF(&sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 0.71428573f, get_variable(N(D_8024EFCC),
SI_ARRAY(4)), get_variable(N(D_8024EFCC), SI_ARRAY(5)), get_variable(N(D_8024EFCC), SI_ARRAY(6)));
temp_s1 = func_8024190C_96AACC(&N(D_8024F010)[0], &sp20);
func_8024190C_96AACC(&N(D_8024F010)[1], &sp20);
func_8024190C_96AACC(&N(D_8024F010)[2], &sp20);
temp_s1 = N(func_8024190C_96AACC)(&N(D_8024F010)[0], &sp20);
N(func_8024190C_96AACC)(&N(D_8024F010)[1], &sp20);
N(func_8024190C_96AACC)(&N(D_8024F010)[2], &sp20);
if ((N(D_8024F010)[0].unk_00 == 2) && ((temp_s1 - 1) < 2)) {
set_variable(N(D_8024EFCC), SI_ARRAY(9), 3);
}

2
src/world/area_end/end_00/DF6A20.c
View File

@ -26,6 +26,8 @@ INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802419F8_DF83F8);
INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80241B34_DF8534);
static char* N(exit_str_0) = "end_01";
INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802421D8_DF8BD8);
INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242358_DF8D58);

2
src/world/area_end/end_01/E05390.c
View File

@ -26,6 +26,8 @@ INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80241A08_E06D68);
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80241B44_E06EA4);
static char* N(exit_str_0) = "kmr_30";
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802421E8_E07548);
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242368_E076C8);

2
src/world/area_flo/flo_08/CAED40.c
View File

@ -75,7 +75,7 @@ ApiStatus N(func_802401CC_CAEF0C)(ScriptInstance* script, s32 isInitialCall) {
ptr->unk_318 = 4;
ptr->unk_324 = partnerActiveCount;
ptr->unk_328 = 0;
btl_create_popup_menu(ptr);
create_popup_menu(ptr);
script->functionTemp[0].s = 0;
}

2
src/world/area_flo/flo_16/CD1F10.c
View File

@ -482,7 +482,7 @@ ApiStatus N(func_802402AC_CD20DC)(ScriptInstance* script, s32 isInitialCall) {
ptr->unk_318 = 4;
ptr->unk_324 = partnerActiveCount;
ptr->unk_328 = 0;
btl_create_popup_menu(ptr);
create_popup_menu(ptr);
script->functionTemp[0].s = 0;
}

5
src/world/area_hos/hos_00/A0BD40.c
View File

@ -7,3 +7,8 @@ INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_80240170_A0BE60);
INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_8024036C_A0C05C);
INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_80240584_A0C274);
static char* N(exit_str_0) = "osr_00";
static char* N(exit_str_1) = "osr_01";
static char* N(exit_str_2) = "hos_01";
static char* N(exit_str_3) = "hos_06";

2
src/world/area_hos/hos_00/A0C4B0.c
View File

@ -1,3 +1,5 @@
#include "hos_00.h"
static char* N(exit_str_4) = "osr_01";
INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4B0", func_802407C0_A0C4B0);

3
src/world/area_hos/hos_02/A16220.c
View File

@ -1,5 +1,8 @@
#include "hos_02.h"
static char* N(exit_str_0) = "hos_01";
static char* N(exit_str_1) = "hos_03";
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

3
src/world/area_hos/hos_03/A1B100.c
View File

@ -1,3 +1,6 @@
#include "hos_03.h"
static char* N(exit_str_0) = "hos_02";
static char* N(exit_str_1) = "hos_04";
#include "world/common/GetFloorCollider.inc.c"

3
src/world/area_hos/hos_04/A26ED0.c
View File

@ -1,5 +1,8 @@
#include "hos_04.h"
static char* N(exit_str_0) = "hos_03";
static char* N(exit_str_1) = "hos_05";
INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240000_A26ED0);
INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240154_A27024);

3
src/world/area_hos/hos_05/A2A240.c
View File

@ -1,5 +1,8 @@
#include "hos_05.h"
static char* N(exit_str_0) = "hos_04";
static char* N(exit_str_1) = "";
#include "world/common/UnkFunc27.inc.c"
#include "world/common/UnkFunc26.inc.c"

3
src/world/area_hos/hos_06/A394E0.c
View File

@ -1,5 +1,8 @@
#include "hos_06.h"
static char* N(exit_str_0) = "hos_00";
static char* N(exit_str_1) = "";
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

5
src/world/area_hos/hos_10/A3F740.c
View File

@ -1,3 +1,8 @@
#include "hos_10.h"
static char* N(exit_str_0) = "kmr_21";
static char* N(exit_str_1) = "osr_02";
static char* N(exit_str_2) = "kmr_20";
static char* N(exit_str_3) = "";
#include "world/common/SetPlayerSpriteSet2.inc.c"

5
src/world/area_hos/hos_20/A45930.c
View File

@ -1,5 +1,10 @@
#include "hos_20.h"
static char* N(exit_str_0) = "kpa_60";
static char* N(exit_str_1) = "hos_00";
static char* N(exit_str_2) = "osr_03";
static char* N(exit_str_3) = "hos_05";
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

5
src/world/area_isk/isk_01/978140.c Normal file
View File

@ -0,0 +1,5 @@
#include "isk_01.h"
static char* N(exit_str_0) = "sbk_02";
static char* N(exit_str_1) = "isk_02";

4
src/world/area_isk/isk_01/isk_01.h Normal file
View File

@ -0,0 +1,4 @@
#include "common.h"
#include "map.h"
#define NAMESPACE isk_01

3
src/world/area_isk/isk_02/978710.c
View File

@ -1,3 +1,6 @@
#include "isk_02.h"
static char* N(exit_str_0) = "isk_01";
static char* N(exit_str_1) = "isk_03";
#include "world/common/SetEntityFlags100000.inc.c"

5
src/world/area_isk/isk_03/979E50.c Normal file
View File

@ -0,0 +1,5 @@
#include "isk_03.h"
static char* N(exit_str_0) = "isk_02";
static char* N(exit_str_1) = "isk_04";

4
src/world/area_isk/isk_03/isk_03.h Normal file
View File

@ -0,0 +1,4 @@
#include "common.h"
#include "map.h"
#define NAMESPACE isk_03

5
src/world/area_isk/isk_04/97B630.c
View File

@ -1,3 +1,8 @@
#include "isk_04.h"
static char* N(exit_str_0) = "isk_03";
static char* N(exit_str_1) = "isk_07";
static char* N(exit_str_2) = "isk_06";
static char* N(exit_str_3) = "isk_05";
#include "world/common/SetEntityFlags100000.inc.c"

2
src/world/area_isk/isk_04/97B670.c
View File

@ -32,4 +32,6 @@ void N(func_802400BC_97B6EC)(ScriptInstance *script, NpcAISettings *aiSettings,
INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802403D4_97BA04);
static char* N(exit_str_0) = "isk_04";
#include "world/common/AwaitPlayerNearNpc.inc.c"

3
src/world/area_isk/isk_05/97DAD0.c
View File

@ -1,5 +1,8 @@
#include "isk_05.h"
static char* N(exit_str_0) = "isk_04";
static char* N(exit_str_1) = "";
INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240000_97DAD0);
INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240230_97DD00);

4
src/world/area_isk/isk_06/980A20.c Normal file
View File

@ -0,0 +1,4 @@
#include "isk_06.h"
static char* N(exit_str_0) = "isk_04";

4
src/world/area_isk/isk_06/isk_06.h Normal file
View File

@ -0,0 +1,4 @@
#include "common.h"
#include "map.h"
#define NAMESPACE isk_06

3
src/world/area_isk/isk_07/982440.c
View File

@ -1,5 +1,8 @@
#include "isk_07.h"
static char* N(exit_str_0) = "isk_08";
static char* N(exit_str_1) = "isk_04";
INCLUDE_ASM(s32, "world/area_isk/isk_07/982440", func_80240000_982440);
INCLUDE_ASM(s32, "world/area_isk/isk_07/982440", func_80240014_982454);

5
src/world/area_isk/isk_08/984E30.c
View File

@ -1,5 +1,10 @@
#include "isk_08.h"
static char* N(exit_str_0) = "isk_09";
static char* N(exit_str_1) = "isk_10";
static char* N(exit_str_2) = "isk_07";
static char* N(exit_str_3) = "isk_11";
#include "world/common/set_script_owner_npc_anim.inc.c"
INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_8024007C_984EAC);

3
src/world/area_isk/isk_09/9864E0.c
View File

@ -1,5 +1,8 @@
#include "isk_09.h"
static char* N(exit_str_0) = "isk_08";
static char* N(exit_str_1) = "";
INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240000_9864E0);
/*
ApiStatus N(func_80240000_9864E0)(ScriptInstance* script, s32 isInitialCall) {

5
src/world/area_isk/isk_10/988B60.c
View File

@ -1,5 +1,10 @@
#include "isk_10.h"
static char* N(exit_str_0) = "isk_08";
static char* N(exit_str_1) = "isk_14";
static char* N(exit_str_2) = "isk_18";
static char* N(exit_str_3) = "";
#include "world/common/SetOverrideFlags_40.inc.c"
#include "world/common/UnkFunc17.inc.c"

5
src/world/area_isk/isk_11/98AA10.c
View File

@ -1,3 +1,8 @@
#include "isk_11.h"
static char* N(exit_str_0) = "isk_08";
static char* N(exit_str_1) = "isk_12";
static char* N(exit_str_2) = "isk_19";
static char* N(exit_str_3) = "";
INCLUDE_ASM(s32, "world/area_isk/isk_11/98AA10", func_80240000_98AA10);

6
src/world/area_isk/isk_12/98D640.c Normal file
View File

@ -0,0 +1,6 @@
#include "isk_12.h"
static char* N(exit_str_0) = "isk_11";
static char* N(exit_str_1) = "isk_18";
static char* N(exit_str_2) = "isk_13";

4
src/world/area_isk/isk_12/isk_12.h Normal file
View File

@ -0,0 +1,4 @@
#include "common.h"
#include "map.h"
#define NAMESPACE isk_12

3
src/world/area_isk/isk_13/98F7E0.c
View File

@ -1,5 +1,8 @@
#include "isk_13.h"
static char* N(exit_str_0) = "isk_12";
static char* N(exit_str_1) = "";
INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240000_98F7E0);
INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240230_98FA10);

3
src/world/area_isk/isk_14/992730.c
View File

@ -1,5 +1,8 @@
#include "isk_14.h"
static char* N(exit_str_0) = "isk_10";
static char* N(exit_str_1) = "";
INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240000_992730);
INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240230_992960);

3
src/world/area_isk/isk_16/9951F0.c
View File

@ -43,6 +43,9 @@ ApiStatus N(func_8024004C_99523C)(ScriptInstance* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_802401AC_99539C);
static char* N(exit_str_0) = "kmr_23";
static char* N(exit_str_1) = "isk_19";
INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_802405BC_9957AC);
/*
ApiStatus N(func_802405BC_9957AC)(ScriptInstance* script, s32 isInitialCall) {

3
src/world/area_isk/isk_18/997F70.c
View File

@ -1,5 +1,8 @@
#include "isk_18.h"
static char* N(exit_str_0) = "isk_10";
static char* N(exit_str_1) = "isk_12";
#include "world/common/set_script_owner_npc_anim.inc.c"
INCLUDE_ASM(s32, "world/area_isk/isk_18/997F70", func_8024007C_997FEC);

5
src/world/area_isk/isk_19/999740.c Normal file
View File

@ -0,0 +1,5 @@
#include "isk_19.h"
static char* N(exit_str_0) = "isk_11";
static char* N(exit_str_1) = "isk_16";

4
src/world/area_isk/isk_19/isk_19.h Normal file
View File

@ -0,0 +1,4 @@
#include "common.h"
#include "map.h"
#define NAMESPACE isk_19

3
src/world/area_iwa/iwa_00/90CC40.c
View File

@ -1,5 +1,8 @@
#include "iwa_00.h"
static char* N(exit_str_0) = "iwa_10";
static char* N(exit_str_1) = "iwa_01";
INCLUDE_ASM(s32, "world/area_iwa/iwa_00/90CC40", func_80240000_90CC40);
/*
ApiStatus N(func_80240000_90CC40)(ScriptInstance* script, s32 isInitialCall) {

5
src/world/area_iwa/iwa_01/90F6B0.c
View File

@ -1,5 +1,10 @@
#include "iwa_01.h"
static char* N(exit_str_0) = "iwa_00";
static char* N(exit_str_1) = "iwa_03";
static char* N(exit_str_2) = "iwa_02";
static char* N(exit_str_3) = "";
INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90F6B0", func_80240000_90F6B0);
INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90F6B0", func_80240398_90FA48);

3
src/world/area_iwa/iwa_02/915D70.c
View File

@ -1,5 +1,8 @@
#include "iwa_02.h"
static char* N(exit_str_0) = "iwa_01";
static char* N(exit_str_1) = "iwa_04";
INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240000_915D70);
#include "world/common/UnkNpcAIFunc18.inc.c"

3
src/world/area_iwa/iwa_03/918BB0.c
View File

@ -1,5 +1,8 @@
#include "iwa_03.h"
static char* N(exit_str_0) = "iwa_01";
static char* N(exit_str_1) = "";
INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240000_918BB0);
/*
ApiStatus N(func_80240000_918BB0)(ScriptInstance* script, s32 isInitialCall) {

3
src/world/area_iwa/iwa_04/91B8E0.c
View File

@ -1,5 +1,8 @@
#include "iwa_04.h"
static char* N(exit_str_0) = "iwa_02";
static char* N(exit_str_1) = "sbk_99";
INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240000_91B8E0);
INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240080_91B960);

3
src/world/area_iwa/iwa_10/91E570.c
View File

@ -1,3 +1,6 @@
#include "iwa_10.h"
static char* N(exit_str_0) = "iwa_00";
static char* N(exit_str_1) = "iwa_11";
INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E570", func_80240000_91E570);

7
src/world/area_iwa/iwa_11/9269F0.c
View File

@ -1,3 +1,10 @@
#include "iwa_11.h"
static char* N(exit_str_0) = "mac_03";
static char* N(exit_str_1) = "iwa_10";
static char* N(exit_str_2) = "mac_03\0";
static char* N(exit_str_3) = "iwa_10\0";
static char* N(exit_str_4) = "kmr_22";
static char* N(exit_str_5) = "";
INCLUDE_ASM(s32, "world/area_iwa/iwa_11/9269F0", func_80240000_9269F0);

4
src/world/area_jan/jan_00/B216E0.c
View File

@ -1,5 +1,9 @@
#include "jan_00.h"
static char* N(exit_str_0) = "jan_01";
static char* N(exit_str_1) = "jan_08";
static char* N(exit_str_2) = "mac_06";
INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802411A0_B216E0);
INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802411EC_B2172C);

3
src/world/area_jan/jan_01/B28030.c
View File

@ -1,5 +1,8 @@
#include "jan_01.h"
static char* N(exit_str_0) = "jan_00";
static char* N(exit_str_1) = "jan_02";
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

3
src/world/area_jan/jan_02/B2C470.c
View File

@ -1,3 +1,6 @@
#include "jan_02.h"
static char* N(exit_str_0) = "jan_01";
static char* N(exit_str_1) = "jan_03";
INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C470", func_80240000_B2C470);

7
src/world/area_jan/jan_03/B34BD0.c
View File

@ -1,5 +1,10 @@
#include "jan_03.h"
static char* N(exit_str_0) = "jan_02";
static char* N(exit_str_1) = "jan_05";
static char* N(exit_str_2) = "jan_22";
static char* N(exit_str_3) = "";
#define UNK_ALPHA_FUNC_NPC 17
#include "world/common/SetPlayerStatusAnimFlags100000.inc.c"
@ -184,6 +189,8 @@ ApiStatus N(func_802411B4_B35D84)(ScriptInstance* script, s32 isInitialCall) {
}
*/
static char* N(exit_str_4) = "tik_08";
#include "world/common/Call800E9894.inc.c"
#include "world/common/Call800E98C4SyncStatusMenu.inc.c"

3
src/world/area_jan/jan_04/B44770.c
View File

@ -1,3 +1,6 @@
#include "jan_04.h"
static char* N(exit_str_0) = "kmr_24";
static char* N(exit_str_1) = "jan_05";
INCLUDE_ASM(s32, "world/area_jan/jan_04/B44770", func_80240000_B44770);

5
src/world/area_jan/jan_05/B4AA70.c
View File

@ -1,3 +1,8 @@
#include "jan_05.h"
static char* N(exit_str_0) = "jan_03";
static char* N(exit_str_1) = "jan_08";
static char* N(exit_str_2) = "jan_04";
static char* N(exit_str_3) = "jan_06";
INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AA70", func_80240000_B4AA70);

5
src/world/area_jan/jan_06/B52830.c
View File

@ -1,5 +1,10 @@
#include "jan_06.h"
static char* N(exit_str_0) = "jan_05";
static char* N(exit_str_1) = "jan_07";
static char* N(exit_str_2) = "jan_12";
static char* N(exit_str_3) = "jan_09";
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

3
src/world/area_jan/jan_07/B59870.c
View File

@ -1,5 +1,8 @@
#include "jan_07.h"
static char* N(exit_str_0) = "jan_06";
static char* N(exit_str_1) = "\0\0\0\0";
#include "world/common/UnkNpcAIFunc4.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240050_B598C0);

5
src/world/area_jan/jan_08/B5E2B0.c
View File

@ -1,5 +1,10 @@
#include "jan_08.h"
static char* N(exit_str_0) = "jan_00";
static char* N(exit_str_1) = "jan_05";
static char* N(exit_str_2) = "jan_09";
static char* N(exit_str_3) = "";
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

5
src/world/area_jan/jan_09/B65AB0.c
View File

@ -1,5 +1,10 @@
#include "jan_09.h"
static char* N(exit_str_0) = "jan_10";
static char* N(exit_str_1) = "jan_08";
static char* N(exit_str_2) = "jan_06";
static char* N(exit_str_3) = "jan_11";
#include "world/common/SetPlayerStatusAnimFlags100000.inc.c"
#include "world/common/GetCurrentFloor.inc.c"

3
src/world/area_jan/jan_10/B6C390.c
View File

@ -1,5 +1,8 @@
#include "jan_10.h"
static char* N(exit_str_0) = "jan_09";
static char* N(exit_str_1) = "";
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

3
src/world/area_jan/jan_11/B70860.c
View File

@ -1,5 +1,8 @@
#include "jan_11.h"
static char* N(exit_str_0) = "jan_09";
static char* N(exit_str_1) = "";
INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240000_B70860);
#include "world/common/SetPlayerStatusAnimFlags100000.inc.c"

3
src/world/area_jan/jan_12/B730B0.c
View File

@ -1,5 +1,8 @@
#include "jan_12.h"
static char* N(exit_str_0) = "jan_13";
static char* N(exit_str_1) = "jan_06";
INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_80240000_B730B0);
INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_802400F8_B731A8);

3
src/world/area_jan/jan_13/B767B0.c
View File

@ -1,5 +1,8 @@
#include "jan_13.h"
static char* N(exit_str_0) = "jan_14";
static char* N(exit_str_1) = "jan_12";
INCLUDE_ASM(s32, "world/area_jan/jan_13/B767B0", func_80240000_B767B0);
INCLUDE_ASM(s32, "world/area_jan/jan_13/B767B0", func_802401AC_B7695C);

3
src/world/area_jan/jan_14/B7A050.c
View File

@ -1,5 +1,8 @@
#include "jan_14.h"
static char* N(exit_str_0) = "jan_15";
static char* N(exit_str_1) = "jan_13";
INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A050", func_80240000_B7A050);
INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A050", func_802400F8_B7A148);

3
src/world/area_jan/jan_15/B7D920.c
View File

@ -1,3 +1,6 @@
#include "jan_15.h"
static char* N(exit_str_0) = "jan_16";
static char* N(exit_str_1) = "jan_14";
INCLUDE_ASM(s32, "world/area_jan/jan_15/B7D920", func_80240000_B7D920);

5
src/world/area_jan/jan_16/B80000.c
View File

@ -1,5 +1,10 @@
#include "jan_16.h"
static char* N(exit_str_0) = "jan_15";
static char* N(exit_str_1) = "jan_22";
static char* N(exit_str_2) = "jan_17";
static char* N(exit_str_3) = "";
#include "world/common/UnkFunc27.inc.c"
#include "world/common/UnkFunc26.inc.c"

3
src/world/area_jan/jan_17/B837C0.c
View File

@ -1,3 +1,6 @@
#include "jan_17.h"
static char* N(exit_str_0) = "jan_16";
static char* N(exit_str_1) = "jan_18";
INCLUDE_ASM(s32, "world/area_jan/jan_17/B837C0", func_80240000_B837C0);

4
src/world/area_jan/jan_18/B83B90.c Normal file
View File

@ -0,0 +1,4 @@
#include "jan_18.h"
static char* N(exit_str_0) = "jan_17";
static char* N(exit_str_1) = "jan_19";

4
src/world/area_jan/jan_18/jan_18.h Normal file
View File

@ -0,0 +1,4 @@
#include "common.h"
#include "map.h"
#define NAMESPACE jan_18

3
src/world/area_jan/jan_19/B83E60.c
View File

@ -1,3 +1,6 @@
#include "jan_19.h"
static char* N(exit_str_0) = "jan_18";
static char* N(exit_str_1) = "jan_23";
INCLUDE_ASM(s32, "world/area_jan/jan_19/B83E60", func_80240000_B83E60);

5
src/world/area_jan/jan_22/B84180.c
View File

@ -1,5 +1,10 @@
#include "jan_22.h"
static char* N(exit_str_0) = "jan_03";
static char* N(exit_str_1) = "jan_16";
static char* N(exit_str_2) = "kzn_01";
static char* N(exit_str_3) = "";
INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240000_B84180);
/*
ApiStatus N(func_80240000_B84180)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {

4
src/world/area_jan/jan_23/B8FCD0.c Normal file
View File

@ -0,0 +1,4 @@
#include "jan_23.h"
static char* N(exit_str_0) = "jan_19";
static char* N(exit_str_1) = "jan_16";

4
src/world/area_jan/jan_23/jan_23.h Normal file
View File

@ -0,0 +1,4 @@
#include "common.h"
#include "map.h"
#define NAMESPACE jan_23

3
src/world/area_kgr/kgr_01/8A9A10.c
View File

@ -1,3 +1,6 @@
#include "kgr_01.h"
static char* N(exit_str_0) = "kgr_02";
static char* N(exit_str_1) = "mac_05";
INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9A10", func_80240000_8A9A10);

3
src/world/area_kgr/kgr_02/8AA450.c
View File

@ -1,3 +1,6 @@
#include "kgr_02.h"
static char* N(exit_str_0) = "kgr_01";
static char* N(exit_str_1) = "mac_05";
INCLUDE_ASM(s32, "world/area_kgr/kgr_02/8AA450", func_80240000_8AA450);

3
src/world/area_kkj/kkj_00/ABB290.c
View File

@ -1,5 +1,8 @@
#include "kkj_00.h"
static char* N(exit_str_0) = "kkj_01";
static char* N(exit_str_1) = "kkj_19";
INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB290", func_80240000_ABB290);
INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB290", func_80240040_ABB2D0);

2
src/world/area_kkj/kkj_00/ABB340.c
View File

@ -164,4 +164,6 @@ ApiStatus N(func_80240C44_ABBED4)(ScriptInstance* script, s32 isInitialCall) {
}
*/
static char* N(exit_str) = "end_00";
INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240F40_ABC1D0);

5
src/world/area_kkj/kkj_01/AC5170.c
View File

@ -1,5 +1,10 @@
#include "kkj_01.h"
static char* N(exit_str_0) = "kkj_00";
static char* N(exit_str_1) = "kkj_02";
static char* N(exit_str_2) = "kkj_14";
static char* N(exit_str_3) = "";
INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240000_AC5170);
/*
ApiStatus N(func_80240000_AC5170)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {

4
src/world/area_kkj/kkj_02/AC8D20.c Normal file
View File

@ -0,0 +1,4 @@
#include "kkj_02.h"
static char* N(exit_str_0) = "kkj_01";
static char* N(exit_str_1) = "kkj_03";

4
src/world/area_kkj/kkj_02/kkj_02.h Normal file
View File

@ -0,0 +1,4 @@
#include "common.h"
#include "map.h"
#define NAMESPACE kkj_02

5
src/world/area_kkj/kkj_03/AC9710.c
View File

@ -1,3 +1,8 @@
#include "kkj_03.h"
static char* N(exit_str_0) = "kkj_02";
static char* N(exit_str_1) = "osr_04";
static char* N(exit_str_2) = "osr_03";
static char* N(exit_str_3) = "";
#include "world/common/SetPlayerSpriteSet2.inc.c"

7
src/world/area_kkj/kkj_10/ACAB20.c
View File

@ -1,5 +1,12 @@
#include "kkj_10.h"
static char* N(exit_str_0) = "osr_02";
static char* N(exit_str_1) = "kkj_11";
static char* N(exit_str_2) = "kkj_21";
static char* N(exit_str_3) = "kkj_19";
static char* N(exit_str_4) = "kkj_20";
static char* N(exit_str_5) = "kkj_29";
INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACAB20", func_80240000_ACAB20);
INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACAB20", func_80240034_ACAB54);

9
src/world/area_kkj/kkj_11/ACE140.c
View File

@ -1,5 +1,14 @@
#include "kkj_11.h"
static char* N(exit_str_0) = "kkj_10";
static char* N(exit_str_1) = "kkj_12";
static char* N(exit_str_2) = "kkj_14";
static char* N(exit_str_3) = "kkj_16";
static char* N(exit_str_4) = "kkj_15";
static char* N(exit_str_5) = "kkj_17";
static char* N(exit_str_6) = "kkj_18";
static char* N(exit_str_7) = "kkj_11";
INCLUDE_ASM(s32, "world/area_kkj/kkj_11/ACE140", func_80240000_ACE140);
INCLUDE_ASM(s32, "world/area_kkj/kkj_11/ACE140", func_80240034_ACE174);

3
src/world/area_kkj/kkj_12/AD4090.c
View File

@ -1,5 +1,8 @@
#include "kkj_12.h"
static char* N(exit_str_0) = "kkj_11";
static char* N(exit_str_1) = "kkj_13";
INCLUDE_ASM(s32, "world/area_kkj/kkj_12/AD4090", func_80240000_AD4090);
INCLUDE_ASM(s32, "world/area_kkj/kkj_12/AD4090", func_80240034_AD40C4);

3
src/world/area_kkj/kkj_13/AD5ED0.c
View File

@ -1,3 +1,6 @@
#include "kkj_13.h"
static char* N(exit_str_0) = "kkj_12";
static char* N(exit_str_1) = "kkj_22";
#include "world/common/SetPlayerSpriteSet2.inc.c"

7
src/world/area_kkj/kkj_15/AE5590.c
View File

@ -1,5 +1,12 @@
#include "kkj_15.h"
static char* N(exit_str_0) = "kmr_10";
static char* N(exit_str_1) = "trd_00";
static char* N(exit_str_2) = "arn_07";
static char* N(exit_str_3) = "kkj_11";
static char* N(exit_str_4) = "kkj_11\0";
static char* N(exit_str_5) = "";
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

3
src/world/area_kkj/kkj_16/AED410.c
View File

@ -1,5 +1,8 @@
#include "kkj_16.h"
static char* N(exit_str_0) = "sbk_02";
static char* N(exit_str_1) = "kkj_11";
INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_80240000_AED410);
INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_80240028_AED438);

3
src/world/area_kkj/kkj_17/AF1C60.c
View File

@ -1,5 +1,8 @@
#include "kkj_17.h"
static char* N(exit_str_0) = "kkj_11";
static char* N(exit_str_1) = "";
INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240000_AF1C60);
/*
ApiStatus N(func_80240000_AF1C60)(ScriptInstance* script, s32 isInitialCall) {

5
src/world/area_kkj/kkj_18/AF2CA0.c
View File

@ -1,5 +1,10 @@
#include "kkj_18.h"
static char* N(exit_str_0) = "mac_04";
static char* N(exit_str_1) = "kkj_19";
static char* N(exit_str_2) = "kkj_11";
static char* N(exit_str_3) = "";
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

3
src/world/area_kkj/kkj_19/AF7950.c
View File

@ -1,5 +1,8 @@
#include "kkj_19.h"
static char* N(exit_str_0) = "kkj_10";
static char* N(exit_str_1) = "kkj_00";
INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7950", func_80240000_AF7950);
INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7950", func_80240068_AF79B8);

2
src/world/area_kkj/kkj_19/AF7C00.c
View File

@ -82,6 +82,8 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802406A0_AF7FF0);
INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802406C4_AF8014);
static char* N(exit_str_0) = "kkj_18";
INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240B4C_AF849C);
INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240B8C_AF84DC);

3
src/world/area_kkj/kkj_20/AFDB40.c
View File

@ -1,5 +1,8 @@
#include "kkj_20.h"
static char* N(exit_str_0) = "kkj_10";
static char* N(exit_str_1) = "";
INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240000_AFDB40);
/*
ApiStatus N(func_80240000_AFDB40)(ScriptInstance* script, s32 isInitialCall) {

3
src/world/area_kkj/kkj_21/B022A0.c Normal file
View File

@ -0,0 +1,3 @@
#include "kkj_21.h"
static char* N(exit_str_0) = "kkj_10";

4
src/world/area_kkj/kkj_21/kkj_21.h Normal file
View File

@ -0,0 +1,4 @@
#include "common.h"
#include "map.h"
#define NAMESPACE kkj_21

4
src/world/area_kkj/kkj_22/B024F0.c Normal file
View File

@ -0,0 +1,4 @@
#include "kkj_22.h"
static char* N(exit_str_0) = "kkj_13";
static char* N(exit_str_1) = "kkj_23";

4
src/world/area_kkj/kkj_22/kkj_22.h Normal file
View File

@ -0,0 +1,4 @@
#include "common.h"
#include "map.h"
#define NAMESPACE kkj_22

5
src/world/area_kkj/kkj_23/B02880.c
View File

@ -1,3 +1,8 @@
#include "kkj_23.h"
static char* N(exit_str_0) = "flo_00";
static char* N(exit_str_1) = "kkj_22";
static char* N(exit_str_2) = "kkj_24";
static char* N(exit_str_3) = "";
#include "world/common/SetPlayerSpriteSet2.inc.c"

Some files were not shown because too many files have changed in this diff Show More