mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-06-10 12:22:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #138 from Cuyler36/m_random_field_ovl

Browse Source 
Implement & link m_random_field_ovl.c
This commit is contained in:
Cuyler36
2023-11-05 14:20:00 -05:00
committed by GitHub
parent 172a3460bc 9a85399cf8
commit fc4982861e
7 changed files with 2294 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/rel_slices.yml
+8 -5
View File
@@ -477,10 +477,11 @@ m_mark_room_ovl.c:
.rodata: [0x806465C8, 0x806465D0]
.data: [0x8069CAF0, 0x8069E580]
.bss: [0x81300BD8, 0x813010D0]
m_random_field/mRF_MakePerfectBit.c:
.text: [0x8050B1AC, 0x8050B1D4]
m_random_field/mRF_GetRandomStepMode.c:
.text: [0x8050B284, 0x8050B2C0]
m_random_field_ovl.c:
.text: [0x80508E58, 0x8050B3D0]
.rodata: [0x80648ED0, 0x80648ED8]
.data: [0x8069E918, 0x8069F070]
.bss: [0x813010D0, 0x813013E0]
m_mail_check_ovl.c:
.text: [0x8050F06C, 0x8050F838]
.data: [0x8069F320, 0x8069FA40]
@@ -616,4 +617,6 @@ data/field/bg/cliff_pal.c:
data/field/bg/earth_pal.c:
.data: [0x80C90100, 0x80C90280]
data/field/bg/rail_pal.c:
.data: [0x80F8C2C8, 0x80F8C460]
.data: [0x80F8C2C8, 0x80F8C460]
data/combi/data_combi.c:
.data: [0x8080DD80, 0x8080E628]
include/m_field_make.h
+115
View File
@@ -52,6 +52,121 @@ extern "C" {
#define mFM_FIELD_PAL_NUM 12
#define mFM_FIELD_TEX_NUM 27
enum {
mFM_BLOCK_TYPE_BORDER_CLIFF_TOP,
mFM_BLOCK_TYPE_BORDER_CLIFF_RIVER,
mFM_BLOCK_TYPE_BORDER_CLIFF_LEFT,
mFM_BLOCK_TYPE_3,
mFM_BLOCK_TYPE_BORDER_CLIFF_RIGHT,
mFM_BLOCK_TYPE_BORDER_CLIFF_CORNER_TOP_LEFT,
mFM_BLOCK_TYPE_6,
mFM_BLOCK_TYPE_7,
mFM_BLOCK_TYPE_BORDER_CLIFF_CORNER_TOP_RIGHT,
mFM_BLOCK_TYPE_BORDER_CLIFF_LEFT_TUNNEL,
mFM_BLOCK_TYPE_BORDER_CLIFF_RIGHT_TUNNEL,
mFM_BLOCK_TYPE_TRACKS_STATION,
mFM_BLOCK_TYPE_TRACKS_DUMP,
mFM_BLOCK_TYPE_TRACKS_RIVER,
mFM_BLOCK_TYPE_PLAYER_HOUSE,
mFM_BLOCK_TYPE_CLIFF_HORIZONTAL,
mFM_BLOCK_TYPE_CLIFF_BOTTOM_RIGHT_CORNER,
mFM_BLOCK_TYPE_CLIFF_VERTICAL_RIGHT,
mFM_BLOCK_TYPE_CLIFF_TOP_RIGHT_CORNER,
mFM_BLOCK_TYPE_CLIFF_TOP_LEFT_CORNER,
mFM_BLOCK_TYPE_CLIFF_VERTICAL_LEFT,
mFM_BLOCK_TYPE_CLIFF_BOTTOM_LEFT_CORNER,
mFM_BLOCK_TYPE_WATERFALL_STRAIGHT_CLIFF_HORIZONTAL,
mFM_BLOCK_TYPE_WATERFALL_STRAIGHT_CLIFF_BOTTOM_RIGHT_CORNER,
mFM_BLOCK_TYPE_RIVER_STRAIGHT_CLIFF_VERTICAL_RIGHT,
mFM_BLOCK_TYPE_RIVER_STRAIGHT_CLIFF_TOP_RIGHT_CORNER,
mFM_BLOCK_TYPE_WATERFALL_STRAIGHT_CLIFF_TOP_LEFT_CORNER,
mFM_BLOCK_TYPE_RIVER_STRAIGHT_CLIFF_VERTICAL_LEFT,
mFM_BLOCK_TYPE_RIVER_STRAIGHT_CLIFF_BOTTOM_LEFT_CORNER,
mFM_BLOCK_TYPE_RIVER_STRAIGHT_CLIFF_HORIZONTAL,
mFM_BLOCK_TYPE_WATERFALL_EAST_CLIFF_BOTTOM_RIGHT_CORNER,
mFM_BLOCK_TYPE_WATERFALL_EAST_CLIFF_VERTICAL_RIGHT,
mFM_BLOCK_TYPE_RIVER_EAST_CLIFF_TOP_RIGHT_CORNER,
mFM_BLOCK_TYPE_RIVER_EAST_CLIFF_TOP_LEFT_CORNER,
mFM_BLOCK_TYPE_RIVER_WEST_CLIFF_HORIZONTAL,
mFM_BLOCK_TYPE_RIVER_WEST_CLIFF_TOP_RIGHT_CORNER,
mFM_BLOCK_TYPE_RIVER_WEST_CLIFF_TOP_LEFT_CORNER,
mFM_BLOCK_TYPE_WATERFALL_WEST_CLIFF_VERTICAL_LEFT,
mFM_BLOCK_TYPE_WATERFALL_WEST_CLIFF_BOTTOM_LEFT_CORNER,
mFM_BLOCK_TYPE_FLAT, // grass
mFM_BLOCK_TYPE_RIVER_SOUTH,
mFM_BLOCK_TYPE_RIVER_EAST,
mFM_BLOCK_TYPE_RIVER_WEST,
mFM_BLOCK_TYPE_RIVER_SOUTH_EAST,
mFM_BLOCK_TYPE_RIVER_EAST_SOUTH,
mFM_BLOCK_TYPE_RIVER_SOUTH_WEST,
mFM_BLOCK_TYPE_RIVER_WEST_SOUTH,
mFM_BLOCK_TYPE_RIVER_SOUTH_BRIDGE,
mFM_BLOCK_TYPE_RIVER_EAST_BRIDGE,
mFM_BLOCK_TYPE_RIVER_WEST_BRIDGE,
mFM_BLOCK_TYPE_RIVER_SOUTH_EAST_BRIDGE,
mFM_BLOCK_TYPE_RIVER_EAST_SOUTH_BRIDGE,
mFM_BLOCK_TYPE_RIVER_SOUTH_WEST_BRIDGE,
mFM_BLOCK_TYPE_RIVER_WEST_SOUTH_BRIDGE,
mFM_BLOCK_TYPE_SLOPE_HORIZONTAL,
mFM_BLOCK_TYPE_SLOPE_BOTTOM_RIGHT_CORNER,
mFM_BLOCK_TYPE_SLOPE_VERTICAL_RIGHT,
mFM_BLOCK_TYPE_SLOPE_TOP_RIGHT_CORNER,
mFM_BLOCK_TYPE_SLOPE_TOP_LEFT_CORNER,
mFM_BLOCK_TYPE_SLOPE_VERTICAL_LEFT,
mFM_BLOCK_TYPE_SLOPE_BOTTOM_LEFT_CORNER,
mFM_BLOCK_TYPE_BORDER_CLIFF_LEFT_TRANSITION,
mFM_BLOCK_TYPE_BORDER_CLIFF_RIGHT_TRANSITION,
mFM_BLOCK_TYPE_BEACH,
mFM_BLOCK_TYPE_BEACH_RIVER,
mFM_BLOCK_TYPE_TRACKS_SHOP,
mFM_BLOCK_TYPE_SHRINE,
mFM_BLOCK_TYPE_TRACKS_POST_OFFICE,
mFM_BLOCK_TYPE_POLICE_BOX,
mFM_BLOCK_TYPE_POOL_SOUTH,
mFM_BLOCK_TYPE_POOL_EAST,
mFM_BLOCK_TYPE_POOL_WEST,
mFM_BLOCK_TYPE_POOL_SOUTH_EAST,
mFM_BLOCK_TYPE_POOL_EAST_SOUTH,
mFM_BLOCK_TYPE_POOL_SOUTH_WEST,
mFM_BLOCK_TYPE_POOL_WEST_SOUTH,
mFM_BLOCK_TYPE_76,
mFM_BLOCK_TYPE_77,
mFM_BLOCK_TYPE_78,
mFM_BLOCK_TYPE_79,
mFM_BLOCK_TYPE_BORDER_CLIFF_OCEAN_LEFT,
mFM_BLOCK_TYPE_BORDER_CLIFF_OCEAN_RIGHT,
mFM_BLOCK_TYPE_BEACH_RIVER_BRIDGE,
mFM_BLOCK_TYPE_OCEAN,
mFM_BLOCK_TYPE_MUSEUM,
mFM_BLOCK_TYPE_NEEDLEWORK,
mFM_BLOCK_TYPE_86,
mFM_BLOCK_TYPE_87,
mFM_BLOCK_TYPE_88,
mFM_BLOCK_TYPE_89,
mFM_BLOCK_TYPE_90,
mFM_BLOCK_TYPE_91,
mFM_BLOCK_TYPE_92,
mFM_BLOCK_TYPE_93,
mFM_BLOCK_TYPE_OCEAN_2,
mFM_BLOCK_TYPE_OCEAN_3,
mFM_BLOCK_TYPE_OCEAN_4,
mFM_BLOCK_TYPE_OCEAN_5,
mFM_BLOCK_TYPE_ISLAND_LEFT,
mFM_BLOCK_TYPE_ISLAND_RIGHT,
mFM_BLOCK_TYPE_PORT,
mFM_BLOCK_TYPE_SEA_EXCEPTIONAL,
mFM_BLOCK_TYPE_OCEAN_6,
mFM_BLOCK_TYPE_OCEAN_7,
mFM_BLOCK_TYPE_OCEAN_8,
mFM_BLOCK_TYPE_105,
mFM_BLOCK_TYPE_106,
mFM_BLOCK_TYPE_107,
mFM_BLOCK_TYPE_NUM,
mFM_BLOCK_TYPE_NONE = 255
};
/* sizeof(mFM_combination_c) == 2 */
typedef struct block_combination_s {
/* 0x00 */ u16 combination_type:14; /* acre type index */
include/m_random_field.h
-1
View File
@@ -10,7 +10,6 @@
extern "C" {
#endif
#define mRF_BLOCK_TYPE_MAX 108 // TODO: this is likely a giant enum lol
#define mRF_DIRECT_ERROR 100
enum {
rel/data/combi/data_combi.c
+375
View File
@@ -0,0 +1,375 @@
#include "m_field_make.h"
#include "m_random_field.h"
mFM_combo_info_c data_combi_table[] = {
{ 0x0124, 0x00cb, 0xff },
{ 0x003c, 0x0000, 0xff },
{ 0x005a, 0x00cb, 0xff },
{ 0x005a, 0x0004, 0xff },
{ 0x005a, 0x0005, 0xff },
{ 0x005a, 0x000c, 0xff },
{ 0x005a, 0x0009, 0xff },
{ 0x005a, 0x000b, 0xff },
{ 0x00f4, 0x000d, 0xff },
{ 0x005a, 0x000e, 0xff },
{ 0x005a, 0x00cb, 0xff },
{ 0x005a, 0x000f, 0xff },
{ 0x005a, 0x0010, 0xff },
{ 0x005a, 0x0011, 0xff },
{ 0x005a, 0x0012, 0xff },
{ 0x005a, 0x0013, 0xff },
{ 0x005a, 0x0014, 0xff },
{ 0x005a, 0x0015, 0xff },
{ 0x00f2, 0x0016, 0xff },
{ 0x005a, 0x0017, 0xff },
{ 0x005a, 0x001b, 0xff },
{ 0x00f6, 0x001a, 0xff },
{ 0x005a, 0x001b, 0xff },
{ 0x005a, 0x0069, 0xff },
{ 0x00cb, 0x004e, 0x33 },
{ 0x00f8, 0x0022, 0xff },
{ 0x005a, 0x0027, 0xff },
{ 0x0033, 0x002d, 0x1a },
{ 0x00da, 0x002e, 0x0d },
{ 0x010d, 0x0001, 0xff },
{ 0x010e, 0x0001, 0xff },
{ 0x010f, 0x0001, 0xff },
{ 0x0110, 0x0001, 0xff },
{ 0x0006, 0x0029, 0x16 },
{ 0x000f, 0x002a, 0x36 },
{ 0x0016, 0x002b, 0x17 },
{ 0x0018, 0x002c, 0x1e },
{ 0x005a, 0x002f, 0x27 },
{ 0x005b, 0x0030, 0x27 },
{ 0x0001, 0x0031, 0x0f },
{ 0x0009, 0x0032, 0x1d },
{ 0x000c, 0x0033, 0x22 },
{ 0x0013, 0x0034, 0x10 },
{ 0x001d, 0x0035, 0x11 },
{ 0x0020, 0x0036, 0x18 },
{ 0x0025, 0x0037, 0x12 },
{ 0x0028, 0x0038, 0x19 },
{ 0x002a, 0x0039, 0x20 },
{ 0x0030, 0x003a, 0x13 },
{ 0x0035, 0x003b, 0x21 },
{ 0x0037, 0x003c, 0x24 },
{ 0x003b, 0x003d, 0x14 },
{ 0x003e, 0x003e, 0x1b },
{ 0x0042, 0x003f, 0x15 },
{ 0x00aa, 0x0040, 0x28 },
{ 0x00b2, 0x0041, 0x29 },
{ 0x00ba, 0x0042, 0x2a },
{ 0x00c2, 0x0043, 0x2b },
{ 0x00c8, 0x0044, 0x2c },
{ 0x00ce, 0x0045, 0x2d },
{ 0x00d4, 0x0046, 0x2e },
{ 0x0022, 0x0047, 0x1f },
{ 0x0047, 0x0048, 0x26 },
{ 0x0040, 0x0049, 0x25 },
{ 0x00ae, 0x004a, 0x2f },
{ 0x00b6, 0x004b, 0x30 },
{ 0x00be, 0x004c, 0x31 },
{ 0x00c5, 0x004d, 0x32 },
{ 0x00d1, 0x004f, 0x34 },
{ 0x00d7, 0x0050, 0x35 },
{ 0x00db, 0x0051, 0x0c },
{ 0x0010, 0x0052, 0x36 },
{ 0x001a, 0x0053, 0x37 },
{ 0x0024, 0x0054, 0x38 },
{ 0x002e, 0x0055, 0x39 },
{ 0x0039, 0x0056, 0x3a },
{ 0x0041, 0x0057, 0x3b },
{ 0x0049, 0x0058, 0x3c },
{ 0x0045, 0x005a, 0x1c },
{ 0x002c, 0x0059, 0x23 },
{ 0x0115, 0x0028, 0xff },
{ 0x010b, 0x00c8, 0xff },
{ 0x0105, 0x00c9, 0xff },
{ 0x0105, 0x00ca, 0xff },
{ 0x005a, 0x0006, 0xff },
{ 0x00ef, 0x00cc, 0x0b },
{ 0x005a, 0x00cd, 0xff },
{ 0x0002, 0x00c0, 0x0f },
{ 0x0003, 0x006b, 0x0f },
{ 0x0004, 0x006c, 0x0f },
{ 0x0005, 0x00bf, 0x0f },
{ 0x0014, 0x0072, 0x10 },
{ 0x00ab, 0x0090, 0x28 },
{ 0x00ac, 0x0091, 0x28 },
{ 0x00c3, 0x009e, 0x2b },
{ 0x00c9, 0x00a1, 0x2c },
{ 0x00d5, 0x00a7, 0x2e },
{ 0x00d6, 0x00a8, 0x2e },
{ 0x001b, 0x0074, 0x37 },
{ 0x0011, 0x0071, 0x36 },
{ 0x002f, 0x007d, 0x39 },
{ 0x003a, 0x0081, 0x3a },
{ 0x003f, 0x0084, 0x1b },
{ 0x0021, 0x0077, 0x18 },
{ 0x001e, 0x0075, 0x11 },
{ 0x0044, 0x0086, 0x15 },
{ 0x000a, 0x006d, 0x1d },
{ 0x000d, 0x006f, 0x22 },
{ 0x0026, 0x0078, 0x12 },
{ 0x0031, 0x007e, 0x13 },
{ 0x003c, 0x0082, 0x14 },
{ 0x00b3, 0x0095, 0x29 },
{ 0x00bb, 0x0099, 0x2a },
{ 0x0029, 0x007a, 0x19 },
{ 0x002b, 0x007b, 0x20 },
{ 0x0046, 0x0087, 0x1c },
{ 0x00cf, 0x00a4, 0x2d },
{ 0x0036, 0x00b2, 0x21 },
{ 0x002d, 0x007c, 0x23 },
{ 0x00b4, 0x0096, 0x29 },
{ 0x00bc, 0x009a, 0x2a },
{ 0x0038, 0x0080, 0x24 },
{ 0x0032, 0x007f, 0x13 },
{ 0x0027, 0x0079, 0x12 },
{ 0x001f, 0x0076, 0x11 },
{ 0x0015, 0x0073, 0x10 },
{ 0x010c, 0x00ce, 0xff },
{ 0x00b1, 0x00c1, 0x45 },
{ 0x0007, 0x005b, 0x16 },
{ 0x0008, 0x005c, 0x16 },
{ 0x000b, 0x006e, 0x1d },
{ 0x000e, 0x0070, 0x22 },
{ 0x0017, 0x005e, 0x17 },
{ 0x0034, 0x005d, 0x1a },
{ 0x003d, 0x0083, 0x14 },
{ 0x0043, 0x0085, 0x15 },
{ 0x00ad, 0x0092, 0x28 },
{ 0x00b5, 0x00b3, 0x29 },
{ 0x00bd, 0x009b, 0x2a },
{ 0x00c4, 0x009f, 0x2b },
{ 0x00ca, 0x00a2, 0x2c },
{ 0x00d0, 0x00a5, 0x2d },
{ 0x00e4, 0x0067, 0xff },
{ 0x00e4, 0x0066, 0xff },
{ 0x005a, 0x0068, 0xff },
{ 0x0019, 0x005f, 0x1e },
{ 0x0023, 0x0060, 0x1f },
{ 0x00af, 0x0093, 0x2f },
{ 0x00b7, 0x0097, 0x30 },
{ 0x00c6, 0x00a0, 0x32 },
{ 0x00bf, 0x009c, 0x31 },
{ 0x00cc, 0x00a3, 0x33 },
{ 0x00d2, 0x00a6, 0x34 },
{ 0x00d8, 0x00a9, 0x35 },
{ 0x00b0, 0x0094, 0x2f },
{ 0x00b8, 0x0098, 0x30 },
{ 0x00c0, 0x009d, 0x31 },
{ 0x005c, 0x0088, 0x27 },
{ 0x005d, 0x0089, 0x27 },
{ 0x005e, 0x008a, 0x27 },
{ 0x005f, 0x008b, 0x27 },
{ 0x0060, 0x008c, 0x27 },
{ 0x0061, 0x008d, 0x27 },
{ 0x0062, 0x008e, 0x27 },
{ 0x0063, 0x008f, 0x27 },
{ 0x00dc, 0x00aa, 0x0c },
{ 0x00dd, 0x00b6, 0x0c },
{ 0x00de, 0x00b7, 0xff },
{ 0x00df, 0x00ab, 0xff },
{ 0x00e0, 0x00ae, 0xff },
{ 0x00e1, 0x00b8, 0xff },
{ 0x00e2, 0x00af, 0xff },
{ 0x00e3, 0x00b9, 0xff },
{ 0x00e4, 0x00ad, 0xff },
{ 0x00e8, 0x00b0, 0x0d },
{ 0x00e9, 0x00ba, 0x0d },
{ 0x00ea, 0x00bb, 0x0d },
{ 0x00eb, 0x00b1, 0x0d },
{ 0x00b9, 0x00b4, 0x46 },
{ 0x00c1, 0x00c2, 0x47 },
{ 0x005a, 0x006a, 0xff },
{ 0x005a, 0x0061, 0xff },
{ 0x005a, 0x0062, 0xff },
{ 0x005a, 0x0063, 0xff },
{ 0x005a, 0x0064, 0xff },
{ 0x00aa, 0x0065, 0xff },
{ 0x00d3, 0x00b5, 0x4a },
{ 0x00d9, 0x00ac, 0x4b },
{ 0x00f0, 0x00bc, 0x0b },
{ 0x00f1, 0x00bd, 0x0b },
{ 0x00c7, 0x00c3, 0x48 },
{ 0x00cd, 0x00be, 0x49 },
{ 0x00ff, 0x00cf, 0xff },
{ 0x010a, 0x00d0, 0xff },
{ 0x0103, 0x0016, 0xff },
{ 0x0104, 0x0016, 0xff },
{ 0x0106, 0x00cb, 0x4c },
{ 0x0107, 0x00cb, 0x4d },
{ 0x0108, 0x00cb, 0x4e },
{ 0x0109, 0x00cb, 0x4f },
{ 0x0012, 0x00e8, 0x36 },
{ 0x004c, 0x00cb, 0x00 },
{ 0x004d, 0x00cb, 0x01 },
{ 0x004e, 0x00cb, 0x02 },
{ 0x004f, 0x00cb, 0x3d },
{ 0x0052, 0x00cb, 0x09 },
{ 0x0053, 0x00cb, 0x04 },
{ 0x0054, 0x00cb, 0x3e },
{ 0x0057, 0x00cb, 0x0a },
{ 0x0058, 0x00cb, 0x05 },
{ 0x0059, 0x00cb, 0x08 },
{ 0x0064, 0x0068, 0x44 },
{ 0x0065, 0x00dc, 0x44 },
{ 0x0066, 0x00e4, 0x44 },
{ 0x0067, 0x0069, 0x0e },
{ 0x0068, 0x00e2, 0x0e },
{ 0x0069, 0x00e3, 0x0e },
{ 0x006d, 0x006a, 0x42 },
{ 0x006e, 0x00e0, 0x42 },
{ 0x006f, 0x00e1, 0x42 },
{ 0x00e5, 0x00dd, 0x43 },
{ 0x00ec, 0x00e5, 0x41 },
{ 0x00ed, 0x00e6, 0x41 },
{ 0x00ee, 0x00e7, 0x41 },
{ 0x00e6, 0x00de, 0x43 },
{ 0x00e7, 0x00df, 0x43 },
{ 0x005d, 0x0002, 0xff },
{ 0x00fe, 0x0023, 0xff },
{ 0x0100, 0x0025, 0xff },
{ 0x0101, 0x0026, 0xff },
{ 0x0102, 0x0024, 0xff },
{ 0x0000, 0x00d1, 0xff },
{ 0x0078, 0x0061, 0x3f },
{ 0x0079, 0x0062, 0x3f },
{ 0x0078, 0x0061, 0xff },
{ 0x0079, 0x0062, 0xff },
{ 0x0082, 0x0065, 0x40 },
{ 0x0050, 0x00cb, 0x50 },
{ 0x0055, 0x00cb, 0x51 },
{ 0x00f9, 0x0151, 0xff },
{ 0x0083, 0x0152, 0x40 },
{ 0x0084, 0x0153, 0x40 },
{ 0x0085, 0x0154, 0x40 },
{ 0x0086, 0x0155, 0x40 },
{ 0x0087, 0x0156, 0x52 },
{ 0x0088, 0x0157, 0x52 },
{ 0x0089, 0x0158, 0x52 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x007a, 0x0063, 0x3f },
{ 0x007b, 0x0064, 0x3f },
{ 0x007c, 0x0159, 0x3f },
{ 0x007d, 0x015a, 0x3f },
{ 0x007e, 0x015b, 0x3f },
{ 0x007f, 0x015c, 0x3f },
{ 0x0080, 0x015d, 0x3f },
{ 0x0081, 0x015e, 0x3f },
{ 0x001c, 0x0160, 0x37 },
{ 0x0048, 0x0162, 0x26 },
{ 0x004a, 0x015f, 0x3c },
{ 0x004b, 0x0161, 0x3c },
{ 0x00b1, 0x0007, 0xff },
{ 0x004b, 0x0011, 0xff },
{ 0x005a, 0x0174, 0xff },
{ 0x0013, 0x0175, 0xff },
{ 0x0030, 0x0176, 0xff },
{ 0x0088, 0x0177, 0xff },
{ 0x00ce, 0x0178, 0xff },
{ 0x00ba, 0x0179, 0xff },
{ 0x000f, 0x017a, 0xff },
{ 0x007a, 0x017b, 0xff },
{ 0x00ae, 0x017c, 0xff },
{ 0x0030, 0x017d, 0xff },
{ 0x0042, 0x017e, 0xff },
{ 0x005a, 0x0008, 0xff },
{ 0x0116, 0x017f, 0xff },
{ 0x0118, 0x0180, 0xff },
{ 0x0117, 0x0181, 0xff },
{ 0x011a, 0x0182, 0xff },
{ 0x0119, 0x0183, 0xff },
{ 0x005a, 0x0184, 0xff },
{ 0x005a, 0x0185, 0xff },
{ 0x0006, 0x0020, 0xff },
{ 0x00ab, 0x0021, 0xff },
{ 0x0122, 0x0186, 0xff },
{ 0x006a, 0x0187, 0x54 },
{ 0x006b, 0x0188, 0x54 },
{ 0x006c, 0x0189, 0x54 },
{ 0x008a, 0x018a, 0x55 },
{ 0x008b, 0x018b, 0x55 },
{ 0x008c, 0x018c, 0x55 },
{ 0x008d, 0x018d, 0x64 },
{ 0x0090, 0x00cb, 0x5e },
{ 0x0070, 0x018f, 0x63 },
{ 0x0074, 0x018e, 0x62 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x00fe, 0x00cb, 0x53 },
{ 0x0090, 0x00cb, 0x5e },
{ 0x0090, 0x00cb, 0x5e },
{ 0x0091, 0x00cb, 0x5f },
{ 0x0091, 0x00cb, 0x5f },
{ 0x0091, 0x00cb, 0x5f },
{ 0x0091, 0x00cb, 0x5f },
{ 0x0092, 0x00cb, 0x60 },
{ 0x0092, 0x00cb, 0x60 },
{ 0x0092, 0x00cb, 0x60 },
{ 0x0093, 0x00cb, 0x61 },
{ 0x0093, 0x00cb, 0x61 },
{ 0x0093, 0x00cb, 0x61 },
{ 0x0093, 0x00cb, 0x61 },
{ 0x0093, 0x00cb, 0x61 },
{ 0x0051, 0x00cb, 0x68 },
{ 0x0056, 0x00cb, 0x68 },
{ 0x0090, 0x00cb, 0x68 },
{ 0x0091, 0x00cb, 0x68 },
{ 0x0092, 0x00cb, 0x68 },
{ 0x0093, 0x00cb, 0x68 },
{ 0x0094, 0x00cb, 0x68 },
{ 0x0095, 0x00cb, 0x68 },
{ 0x0096, 0x00cb, 0x68 },
{ 0x0097, 0x00cb, 0x68 },
{ 0x0098, 0x00cb, 0x68 },
{ 0x0099, 0x00cb, 0x68 },
{ 0x009c, 0x00cb, 0x68 },
{ 0x009d, 0x00cb, 0x68 },
{ 0x009e, 0x00cb, 0x68 },
{ 0x009f, 0x00cb, 0x68 },
{ 0x00a0, 0x00cb, 0x68 },
{ 0x00a1, 0x00cb, 0x68 },
{ 0x00a2, 0x00cb, 0x68 },
{ 0x00a3, 0x00cb, 0x68 },
{ 0x00a4, 0x00cb, 0x68 },
{ 0x00a5, 0x00cb, 0x68 },
{ 0x00a6, 0x00cb, 0x68 },
{ 0x00a7, 0x00cb, 0x68 },
{ 0x009a, 0x00cb, 0x66 },
{ 0x009a, 0x00cb, 0x66 },
{ 0x009b, 0x00cb, 0x67 },
{ 0x009b, 0x00cb, 0x67 },
{ 0x009b, 0x00cb, 0x67 },
{ 0x009b, 0x00cb, 0x67 },
{ 0x0123, 0x0190, 0xff },
{ 0x0071, 0x0192, 0x63 },
{ 0x0075, 0x0191, 0x62 },
{ 0x0072, 0x0194, 0x63 },
{ 0x0076, 0x0193, 0x62 },
{ 0x0073, 0x0196, 0x63 },
{ 0x0077, 0x0195, 0x62 },
{ 0x008e, 0x0197, 0x64 },
{ 0x008f, 0x0198, 0x64 },
{ 0x00a8, 0x00cb, 0x68 },
{ 0x00a9, 0x00cb, 0x68 },
{ 0x00f3, 0x0199, 0xff }
};
int data_combi_table_number = ARRAY_COUNT(data_combi_table);
rel/m_map_ovl.c
+3 -3
View File
@@ -88,7 +88,7 @@ extern u8 kan_tizu_c6r1b_TA_tex_txt[];
extern u8 kan_tizu_c7r1b_TA_tex_txt[];
extern u8 kan_tizu_mwf_TA_tex_txt[];
static u8* l_map_texture[108] = {
static u8* l_map_texture[mFM_BLOCK_TYPE_NUM] = {
kan_tizu_f_TA_tex_txt,
kan_tizu_f_TA_tex_txt,
kan_tizu_f_TA_tex_txt,
@@ -199,7 +199,7 @@ static u8* l_map_texture[108] = {
kan_tizu_c5r2b_TA_tex_txt
};
static u8 l_map_pal[108] = {
static u8 l_map_pal[mFM_BLOCK_TYPE_NUM] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -209,7 +209,7 @@ static u8 l_map_pal[108] = {
0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0
};
static u8 pluss_bridge[108] = {
static u8 pluss_bridge[mFM_BLOCK_TYPE_NUM] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x56, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x58, 0x59, 0xff, 0x5c, 0x5d, 0x57, 0xff, 0xff,
0x5a, 0x5b, 0x69, 0x6a, 0x6b, 0xff, 0xff, 0xff, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0xff,
rel/m_random_field.c
+3 -3
View File
@@ -10,7 +10,7 @@ extern void mRF_MakeRandomField(mFM_combination_c* combi_table, mFM_combo_info_c
mRF_MakeRandomField_ovl(combi_table, combo_info, combo_count, game);
}
static u32 mRF_block_info[mRF_BLOCK_TYPE_MAX] = {
static u32 mRF_block_info[mFM_BLOCK_TYPE_NUM] = {
mRF_BLOCKKIND_BORDER,
mRF_BLOCKKIND_BORDER | mRF_BLOCKKIND_RIVER0,
mRF_BLOCKKIND_BORDER,
@@ -122,7 +122,7 @@ static u32 mRF_block_info[mRF_BLOCK_TYPE_MAX] = {
};
extern u32 mRF_Type2BlockInfo(u8 type) {
if (type < mRF_BLOCK_TYPE_MAX) {
if (type < mFM_BLOCK_TYPE_NUM) {
return mRF_block_info[type];
}
@@ -211,7 +211,7 @@ static mRF_gate_c* mRF_gate_correct_info[mRF_GATE_TYPE_NUM][mRF_DIRECT_NUM] = {
{ gate3_type0_up, gate3_type0_lt, gate3_type0_dn, gate3_type0_rt },
};
static u8 mRF_gate_info2[mRF_BLOCK_TYPE_MAX][mRF_DIRECT_NUM] = {
static u8 mRF_gate_info2[mFM_BLOCK_TYPE_NUM][mRF_DIRECT_NUM] = {
{
mRF_GATE_NONE, // north
mRF_GATE_NONE, // west
rel/m_random_field_ovl.c
+1790
View File
File diff suppressed because it is too large Load Diff