From e376c52041b57b8536b65dfd4e1a5cbf13575583 Mon Sep 17 00:00:00 2001 From: Cuyler36 Date: Fri, 4 Apr 2025 09:09:46 -0400 Subject: [PATCH] Implement move actor lists for scenes --- config/GAFE01_00/foresta/splits.txt | 68 ++- configure.py | 36 ++ include/m_name_table.h | 491 ++++++++-------- src/data/field/field_data.c | 610 ++++++++++++++++++++ src/data/field/mvactor/broker_shop.c | 9 + src/data/field/mvactor/buggy.c | 8 + src/data/field/mvactor/event_notification.c | 7 + src/data/field/mvactor/fd0.c | 11 + src/data/field/mvactor/fd1.c | 17 + src/data/field/mvactor/fd2.c | 14 + src/data/field/mvactor/fd4.c | 10 + src/data/field/mvactor/fd_npc_land.c | 10 + src/data/field/mvactor/fgout.c | 7 + src/data/field/mvactor/kamakura.c | 8 + src/data/field/mvactor/npcRoom001.c | 7 + src/data/field/mvactor/playerRM.c | 8 + src/data/field/mvactor/playerRMM.c | 8 + src/data/field/mvactor/playerRMS.c | 8 + src/data/field/mvactor/player_select.c | 8 + src/data/field/mvactor/player_select2.c | 8 + src/data/field/mvactor/player_select3.c | 8 + src/data/field/mvactor/player_select4.c | 8 + src/data/field/mvactor/police_box.c | 8 + src/data/field/mvactor/post_office.c | 8 + src/data/field/mvactor/shop01.c | 9 + src/data/field/mvactor/shop02.c | 9 + src/data/field/mvactor/shop03.c | 9 + src/data/field/mvactor/shop04_1.c | 9 + src/data/field/mvactor/shop04_2.c | 10 + src/data/field/mvactor/start_demo1.c | 10 + src/data/field/mvactor/start_demo2.c | 10 + src/data/field/mvactor/start_demo3.c | 10 + src/data/field/mvactor/tent.c | 8 + src/data/field/mvactor/title_demo.c | 22 + src/data/field/mvactor/water_test.c | 7 + 35 files changed, 1257 insertions(+), 241 deletions(-) create mode 100644 src/data/field/field_data.c create mode 100644 src/data/field/mvactor/broker_shop.c create mode 100644 src/data/field/mvactor/buggy.c create mode 100644 src/data/field/mvactor/event_notification.c create mode 100644 src/data/field/mvactor/fd0.c create mode 100644 src/data/field/mvactor/fd1.c create mode 100644 src/data/field/mvactor/fd2.c create mode 100644 src/data/field/mvactor/fd4.c create mode 100644 src/data/field/mvactor/fd_npc_land.c create mode 100644 src/data/field/mvactor/fgout.c create mode 100644 src/data/field/mvactor/kamakura.c create mode 100644 src/data/field/mvactor/npcRoom001.c create mode 100644 src/data/field/mvactor/playerRM.c create mode 100644 src/data/field/mvactor/playerRMM.c create mode 100644 src/data/field/mvactor/playerRMS.c create mode 100644 src/data/field/mvactor/player_select.c create mode 100644 src/data/field/mvactor/player_select2.c create mode 100644 src/data/field/mvactor/player_select3.c create mode 100644 src/data/field/mvactor/player_select4.c create mode 100644 src/data/field/mvactor/police_box.c create mode 100644 src/data/field/mvactor/post_office.c create mode 100644 src/data/field/mvactor/shop01.c create mode 100644 src/data/field/mvactor/shop02.c create mode 100644 src/data/field/mvactor/shop03.c create mode 100644 src/data/field/mvactor/shop04_1.c create mode 100644 src/data/field/mvactor/shop04_2.c create mode 100644 src/data/field/mvactor/start_demo1.c create mode 100644 src/data/field/mvactor/start_demo2.c create mode 100644 src/data/field/mvactor/start_demo3.c create mode 100644 src/data/field/mvactor/tent.c create mode 100644 src/data/field/mvactor/title_demo.c create mode 100644 src/data/field/mvactor/water_test.c diff --git a/config/GAFE01_00/foresta/splits.txt b/config/GAFE01_00/foresta/splits.txt index e050362e..f7271c7a 100644 --- a/config/GAFE01_00/foresta/splits.txt +++ b/config/GAFE01_00/foresta/splits.txt @@ -4228,8 +4228,10 @@ data/scene/fg_tool_in.c: data/scene/field_tool_field.c: .data start:0x00202440 end:0x002024B0 -data/dataobject/dataobject_2024B0: +data/field/field_data.c: .data start:0x002024B0 end:0x00204600 + +data/dataobject/dataobject_204600: .data start:0x00204600 end:0x00204680 .data start:0x00204680 end:0x00204700 .data start:0x00204700 end:0x0020A700 @@ -5884,38 +5886,100 @@ data/npc/model/tex/wol_5.c: data/npc/model/tex/wol_6.c: .data start:0x00607E00 end:0x00608A20 -data/dataobject/dataobject_608A20: +data/field/mvactor/broker_shop.c: .data start:0x00608A20 end:0x00608A68 + +data/field/mvactor/buggy.c: .data start:0x00608A68 end:0x00608A98 + +data/field/mvactor/event_notification.c: .data start:0x00608A98 end:0x00608AB0 + +data/field/mvactor/fd0.c: .data start:0x00608AB0 end:0x00608B28 + +data/field/mvactor/fd1.c: .data start:0x00608B28 end:0x00608C30 + +data/field/mvactor/fd2.c: .data start:0x00608C30 end:0x00608CF0 + +data/field/mvactor/fd4.c: .data start:0x00608CF0 end:0x00608D50 + +data/field/mvactor/fd_npc_land.c: .data start:0x00608D50 end:0x00608DB0 + +data/field/mvactor/fgout.c: .data start:0x00608DB0 end:0x00608DC8 + +data/field/mvactor/kamakura.c: .data start:0x00608DC8 end:0x00608DF8 + +data/field/mvactor/npcRoom001.c: .data start:0x00608DF8 end:0x00608E10 + +data/field/mvactor/playerRM.c: .data start:0x00608E10 end:0x00608E40 + +data/field/mvactor/playerRMM.c: .data start:0x00608E40 end:0x00608E70 + +data/field/mvactor/playerRMS.c: .data start:0x00608E70 end:0x00608EA0 + +data/field/mvactor/player_select.c: .data start:0x00608EA0 end:0x00608ED0 + +data/field/mvactor/player_select2.c: .data start:0x00608ED0 end:0x00608F00 + +data/field/mvactor/player_select3.c: .data start:0x00608F00 end:0x00608F30 + +data/field/mvactor/player_select4.c: .data start:0x00608F30 end:0x00608F60 + +data/field/mvactor/police_box.c: .data start:0x00608F60 end:0x00608F90 + +data/field/mvactor/post_office.c: .data start:0x00608F90 end:0x00608FC0 + +data/field/mvactor/shop01.c: .data start:0x00608FC0 end:0x00609008 + +data/field/mvactor/shop02.c: .data start:0x00609008 end:0x00609050 + +data/field/mvactor/shop03.c: .data start:0x00609050 end:0x00609098 + +data/field/mvactor/shop04_1.c: .data start:0x00609098 end:0x006090E0 + +data/field/mvactor/shop04_2.c: .data start:0x006090E0 end:0x00609140 + +data/field/mvactor/start_demo1.c: .data start:0x00609140 end:0x006091A0 + +data/field/mvactor/start_demo2.c: .data start:0x006091A0 end:0x00609200 + +data/field/mvactor/start_demo3.c: .data start:0x00609200 end:0x00609260 + +data/field/mvactor/tent.c: .data start:0x00609260 end:0x00609290 + +data/field/mvactor/title_demo.c: .data start:0x00609290 end:0x00609410 + +data/field/mvactor/water_test.c: .data start:0x00609410 end:0x00609440 + +data/dataobject/dataobject_609440: .data start:0x00609440 end:0x00609FA0 .data start:0x00609FA0 end:0x0060AA40 .data start:0x0060AA40 end:0x0060B560 diff --git a/configure.py b/configure.py index 0cc2644b..0b6e2f26 100644 --- a/configure.py +++ b/configure.py @@ -2584,6 +2584,42 @@ config.libs = [ Object(Matching, "data/model/structure/palette/structure_pal_data.c"), Object(Matching, "data/model/structure/structure_pal.c"), + + # Field data + Object(Matching, "data/field/field_data.c"), + + # Move actor lists + Object(Matching, "data/field/mvactor/broker_shop.c"), + Object(Matching, "data/field/mvactor/buggy.c"), + Object(Matching, "data/field/mvactor/event_notification.c"), + Object(Matching, "data/field/mvactor/fd0.c"), + Object(Matching, "data/field/mvactor/fd1.c"), + Object(Matching, "data/field/mvactor/fd2.c"), + Object(Matching, "data/field/mvactor/fd4.c"), + Object(Matching, "data/field/mvactor/fd_npc_land.c"), + Object(Matching, "data/field/mvactor/fgout.c"), + Object(Matching, "data/field/mvactor/kamakura.c"), + Object(Matching, "data/field/mvactor/npcRoom001.c"), + Object(Matching, "data/field/mvactor/playerRM.c"), + Object(Matching, "data/field/mvactor/playerRMM.c"), + Object(Matching, "data/field/mvactor/playerRMS.c"), + Object(Matching, "data/field/mvactor/player_select.c"), + Object(Matching, "data/field/mvactor/player_select2.c"), + Object(Matching, "data/field/mvactor/player_select3.c"), + Object(Matching, "data/field/mvactor/player_select4.c"), + Object(Matching, "data/field/mvactor/police_box.c"), + Object(Matching, "data/field/mvactor/post_office.c"), + Object(Matching, "data/field/mvactor/shop01.c"), + Object(Matching, "data/field/mvactor/shop02.c"), + Object(Matching, "data/field/mvactor/shop03.c"), + Object(Matching, "data/field/mvactor/shop04_1.c"), + Object(Matching, "data/field/mvactor/shop04_2.c"), + Object(Matching, "data/field/mvactor/start_demo1.c"), + Object(Matching, "data/field/mvactor/start_demo2.c"), + Object(Matching, "data/field/mvactor/start_demo3.c"), + Object(Matching, "data/field/mvactor/tent.c"), + Object(Matching, "data/field/mvactor/title_demo.c"), + Object(Matching, "data/field/mvactor/water_test.c"), ], ), ] diff --git a/include/m_name_table.h b/include/m_name_table.h index c863fb89..b3721393 100644 --- a/include/m_name_table.h +++ b/include/m_name_table.h @@ -2655,10 +2655,20 @@ extern int mNT_check_unknown(mActor_name_t item_no); #define ETC_BOXMANAGER (ETC_START + 5) #define ETC_ARRANGE_ROOM (ETC_START + 6) #define ETC_ARRANGE_FURNITURE (ETC_START + 7) +#define ETC_EFFECT_CONTROL (ETC_START + 8) +#define ETC_SHOP_DESIGN (ETC_START + 9) +#define ETC_SHOP_MANEKIN (ETC_START + 10) +#define ETC_SHOP_INDOOR (ETC_START + 11) +#define ETC_SHOP_GOODS (ETC_START + 12) #define ETC_SNOWMAN_BALL_A (ETC_START + 13) #define ETC_SNOWMAN_BALL_B (ETC_START + 14) +#define ETC_BROKER_DESIGN (ETC_START + 15) +#define ETC_MY_INDOOR (ETC_START + 16) #define ETC_TRAIN_WINDOW (ETC_START + 17) #define ETC_UKI (ETC_START + 18) +#define ETC_SHOP_UMBRELLA (ETC_START + 19) +#define ETC_KAMAKURA_INDOOR (ETC_START + 20) +#define ETC_HOUSE_CLOCK (ETC_START + 21) #define MISC_ACTOR_START 0x9000 #define MISC_ACTOR_SAMPLE MISC_ACTOR_START @@ -2830,278 +2840,281 @@ extern int mNT_check_unknown(mActor_name_t item_no); #define SP_NPC_HEM (SP_NPC_START + 142) // D08E #define SP_NPC_EV_SUMMERCAMP_0 (SP_NPC_START + 143) // 0xD08F -#define NPC_START 0xE000 +#define NPC_START 0xE000 // 0xE000 // cats -#define NPC_BOB NPC_START -#define NPC_OLIVIA (NPC_START + 1) -#define NPC_MITZI (NPC_START + 2) -#define NPC_KIKI (NPC_START + 3) -#define NPC_TANGY (NPC_START + 4) -#define NPC_KABUKI (NPC_START + 5) -#define NPC_TABBY (NPC_START + 6) -#define NPC_MONIQUE (NPC_START + 7) -#define NPC_STINKY (NPC_START + 8) -#define NPC_PURRL (NPC_START + 9) -#define NPC_KITTY (NPC_START + 10) -#define NPC_TOM (NPC_START + 11) -#define NPC_ROSIE (NPC_START + 12) +#define NPC_BOB (NPC_START + 0) // 0xE000 +#define NPC_OLIVIA (NPC_START + 1) // 0xE001 +#define NPC_MITZI (NPC_START + 2) // 0xE002 +#define NPC_KIKI (NPC_START + 3) // 0xE003 +#define NPC_TANGY (NPC_START + 4) // 0xE004 +#define NPC_KABUKI (NPC_START + 5) // 0xE005 +#define NPC_TABBY (NPC_START + 6) // 0xE006 +#define NPC_MONIQUE (NPC_START + 7) // 0xE007 +#define NPC_STINKY (NPC_START + 8) // 0xE008 +#define NPC_PURRL (NPC_START + 9) // 0xE009 +#define NPC_KITTY (NPC_START + 10) // 0xE00A +#define NPC_TOM (NPC_START + 11) // 0xE00B +#define NPC_ROSIE (NPC_START + 12) // 0xE00C // anteaters -#define NPC_NOSEGAY (NPC_START + 13) -#define NPC_ZOE (NPC_START + 14) -#define NPC_PANGO (NPC_START + 15) -#define NPC_CYRANO (NPC_START + 16) -#define NPC_SNOOTY (NPC_START + 17) +#define NPC_NOSEGAY (NPC_START + 13) // 0xE00D +#define NPC_ZOE (NPC_START + 14) // 0xE00E +#define NPC_PANGO (NPC_START + 15) // 0xE00F +#define NPC_CYRANO (NPC_START + 16) // 0xE010 +#define NPC_SNOOTY (NPC_START + 17) // 0xE011 // bears -#define NPC_TEDDY (NPC_START + 18) -#define NPC_CHOW (NPC_START + 19) -#define NPC_DOZER (NPC_START + 20) -#define NPC_NATE (NPC_START + 21) -#define NPC_GROUCHO (NPC_START + 22) -#define NPC_TUTU (NPC_START + 23) -#define NPC_URSALA (NPC_START + 24) -#define NPC_GRIZZLY (NPC_START + 25) -#define NPC_PINKY (NPC_START + 26) +#define NPC_TEDDY (NPC_START + 18) // 0xE012 +#define NPC_CHOW (NPC_START + 19) // 0xE013 +#define NPC_DOZER (NPC_START + 20) // 0xE014 +#define NPC_NATE (NPC_START + 21) // 0xE015 +#define NPC_GROUCHO (NPC_START + 22) // 0xE016 +#define NPC_TUTU (NPC_START + 23) // 0xE017 +#define NPC_URSALA (NPC_START + 24) // 0xE018 +#define NPC_GRIZZLY (NPC_START + 25) // 0xE019 +#define NPC_PINKY (NPC_START + 26) // 0xE01A // birds -#define NPC_JAY (NPC_START + 27) -#define NPC_TWIGGY (NPC_START + 28) -#define NPC_ANCHOVY (NPC_START + 29) -#define NPC_PIPER (NPC_START + 30) -#define NPC_ADMIRAL (NPC_START + 31) -#define NPC_OTIS (NPC_START + 32) -#define NPC_ROBIN (NPC_START + 33) -#define NPC_MIDGE (NPC_START + 34) -#define NPC_ACE (NPC_START + 35) -#define NPC_TWIRP (NPC_START + 36) +#define NPC_JAY (NPC_START + 27) // 0xE01B +#define NPC_TWIGGY (NPC_START + 28) // 0xE01C +#define NPC_ANCHOVY (NPC_START + 29) // 0xE01D +#define NPC_PIPER (NPC_START + 30) // 0xE01E +#define NPC_ADMIRAL (NPC_START + 31) // 0xE01F +#define NPC_OTIS (NPC_START + 32) // 0xE020 +#define NPC_ROBIN (NPC_START + 33) // 0xE021 +#define NPC_MIDGE (NPC_START + 34) // 0xE022 +#define NPC_ACE (NPC_START + 35) // 0xE023 +#define NPC_TWIRP (NPC_START + 36) // 0xE024 // bulls) -#define NPC_CHUCK (NPC_START + 37) -#define NPC_STU (NPC_START + 38) +#define NPC_CHUCK (NPC_START + 37) // 0xE025 +#define NPC_STU (NPC_START + 38) // 0xE026 // chickens -#define NPC_GOOSE (NPC_START + 39) -#define NPC_BETTY (NPC_START + 40) -#define NPC_HECTOR (NPC_START + 41) -#define NPC_EGBERT (NPC_START + 42) -#define NPC_AVA (NPC_START + 43) -#define NPC_HANK (NPC_START + 44) -#define NPC_LEIGH (NPC_START + 45) -#define NPC_RHODA (NPC_START + 46) +#define NPC_GOOSE (NPC_START + 39) // 0xE027 +#define NPC_BETTY (NPC_START + 40) // 0xE028 +#define NPC_HECTOR (NPC_START + 41) // 0xE029 +#define NPC_EGBERT (NPC_START + 42) // 0xE02A +#define NPC_AVA (NPC_START + 43) // 0xE02B +#define NPC_HANK (NPC_START + 44) // 0xE02C +#define NPC_LEIGH (NPC_START + 45) // 0xE02D +#define NPC_RHODA (NPC_START + 46) // 0xE02E // cubs -#define NPC_VLADIMIR (NPC_START + 47) -#define NPC_MURPHY (NPC_START + 48) -#define NPC_CUPCAKE (NPC_START + 49) -#define NPC_KODY (NPC_START + 50) -#define NPC_MAPLE (NPC_START + 51) -#define NPC_PUDGE (NPC_START + 52) -#define NPC_OLIVE (NPC_START + 53) -#define NPC_PONCHO (NPC_START + 54) -#define NPC_BLUEBEAR (NPC_START + 55) +#define NPC_VLADIMIR (NPC_START + 47) // 0xE02F +#define NPC_MURPHY (NPC_START + 48) // 0xE030 +#define NPC_CUPCAKE (NPC_START + 49) // 0xE031 +#define NPC_KODY (NPC_START + 50) // 0xE032 +#define NPC_MAPLE (NPC_START + 51) // 0xE033 +#define NPC_PUDGE (NPC_START + 52) // 0xE034 +#define NPC_OLIVE (NPC_START + 53) // 0xE035 +#define NPC_PONCHO (NPC_START + 54) // 0xE036 +#define NPC_BLUEBEAR (NPC_START + 55) // 0xE037 // cows -#define NPC_PATTY (NPC_START + 56) -#define NPC_PETUNIA (NPC_START + 57) -#define NPC_BESSIE (NPC_START + 58) -#define NPC_BELLE (NPC_START + 59) +#define NPC_PATTY (NPC_START + 56) // 0xE038 +#define NPC_PETUNIA (NPC_START + 57) // 0xE039 +#define NPC_BESSIE (NPC_START + 58) // 0xE03A +#define NPC_BELLE (NPC_START + 59) // 0xE03B // crocodiles / alligators -#define NPC_ALFONSO (NPC_START + 60) -#define NPC_BOOTS (NPC_START + 61) -#define NPC_LIZ (NPC_START + 62) -#define NPC_BISKIT (NPC_START + 63) +#define NPC_ALFONSO (NPC_START + 60) // 0xE03C +#define NPC_BOOTS (NPC_START + 61) // 0xE03D +#define NPC_LIZ (NPC_START + 62) // 0xE03E +#define NPC_BISKIT (NPC_START + 63) // 0xE03F // dogs -#define NPC_GOLDIE (NPC_START + 64) -#define NPC_DAISY (NPC_START + 65) -#define NPC_LUCKY (NPC_START + 66) -#define NPC_PORTIA (NPC_START + 67) -#define NPC_MADDIE (NPC_START + 68) -#define NPC_BUTCH (NPC_START + 69) +#define NPC_GOLDIE (NPC_START + 64) // 0xE040 +#define NPC_DAISY (NPC_START + 65) // 0xE041 +#define NPC_LUCKY (NPC_START + 66) // 0xE042 +#define NPC_PORTIA (NPC_START + 67) // 0xE043 +#define NPC_MADDIE (NPC_START + 68) // 0xE044 +#define NPC_BUTCH (NPC_START + 69) // 0xE045 // ducks -#define NPC_BILL (NPC_START + 70) -#define NPC_POMPOM (NPC_START + 71) -#define NPC_JOEY (NPC_START + 72) -#define NPC_SCOOT (NPC_START + 73) -#define NPC_DERWIN (NPC_START + 74) -#define NPC_FRECKLES (NPC_START + 75) +#define NPC_BILL (NPC_START + 70) // 0xE046 +#define NPC_POMPOM (NPC_START + 71) // 0xE047 +#define NPC_JOEY (NPC_START + 72) // 0xE048 +#define NPC_SCOOT (NPC_START + 73) // 0xE049 +#define NPC_DERWIN (NPC_START + 74) // 0xE04A +#define NPC_FRECKLES (NPC_START + 75) // 0xE04B // elephants -#define NPC_PAOLO (NPC_START + 76) -#define NPC_DIZZY (NPC_START + 77) -#define NPC_AXEL (NPC_START + 78) +#define NPC_PAOLO (NPC_START + 76) // 0xE04C +#define NPC_DIZZY (NPC_START + 77) // 0xE04D +#define NPC_AXEL (NPC_START + 78) // 0xE04E // frogs -#define NPC_EMERALD (NPC_START + 79) -#define NPC_TAD (NPC_START + 80) -#define NPC_WART_JR (NPC_START + 81) -#define NPC_COUSTEAU (NPC_START + 82) -#define NPC_PUDDLES (NPC_START + 83) -#define NPC_LILY (NPC_START + 84) -#define NPC_JEREMIAH (NPC_START + 85) -#define NPC_HUCK (NPC_START + 86) -#define NPC_CAMOFROG (NPC_START + 87) -#define NPC_RIBBOT (NPC_START + 88) -#define NPC_PRINCE (NPC_START + 89) -#define NPC_JAMBETTE (NPC_START + 90) +#define NPC_EMERALD (NPC_START + 79) // 0xE04F +#define NPC_TAD (NPC_START + 80) // 0xE050 +#define NPC_WART_JR (NPC_START + 81) // 0xE051 +#define NPC_COUSTEAU (NPC_START + 82) // 0xE052 +#define NPC_PUDDLES (NPC_START + 83) // 0xE053 +#define NPC_LILY (NPC_START + 84) // 0xE054 +#define NPC_JEREMIAH (NPC_START + 85) // 0xE055 +#define NPC_HUCK (NPC_START + 86) // 0xE056 +#define NPC_CAMOFROG (NPC_START + 87) // 0xE057 +#define NPC_RIBBOT (NPC_START + 88) // 0xE058 +#define NPC_PRINCE (NPC_START + 89) // 0xE059 +#define NPC_JAMBETTE (NPC_START + 90) // 0xE05A // goats -#define NPC_BILLY (NPC_START + 91) -#define NPC_CHEVRE (NPC_START + 92) -#define NPC_IGGY (NPC_START + 93) -#define NPC_GRUFF (NPC_START + 94) -#define NPC_SVEN (NPC_START + 95) -#define NPC_VELMA (NPC_START + 96) +#define NPC_BILLY (NPC_START + 91) // 0xE05B +#define NPC_CHEVRE (NPC_START + 92) // 0xE05C +#define NPC_IGGY (NPC_START + 93) // 0xE05D +#define NPC_GRUFF (NPC_START + 94) // 0xE05E +#define NPC_SVEN (NPC_START + 95) // 0xE05F +#define NPC_VELMA (NPC_START + 96) // 0xE060 // gorillas -#define NPC_JANE (NPC_START + 97) -#define NPC_CESAR (NPC_START + 98) -#define NPC_LOUIE (NPC_START + 99) -#define NPC_PEEWEE (NPC_START + 100) +#define NPC_JANE (NPC_START + 97) // 0xE061 +#define NPC_CESAR (NPC_START + 98) // 0xE062 +#define NPC_LOUIE (NPC_START + 99) // 0xE063 +#define NPC_PEEWEE (NPC_START + 100) // 0xE064 // hippos -#define NPC_ROLLO (NPC_START + 101) -#define NPC_BUBBLES (NPC_START + 102) -#define NPC_BERTHA (NPC_START + 103) +#define NPC_ROLLO (NPC_START + 101) // 0xE065 +#define NPC_BUBBLES (NPC_START + 102) // 0xE066 +#define NPC_BERTHA (NPC_START + 103) // 0xE067 // horses -#define NPC_ELMER (NPC_START + 104) -#define NPC_WINNIE (NPC_START + 105) -#define NPC_SAVANNAH (NPC_START + 106) -#define NPC_ED (NPC_START + 107) -#define NPC_CLEO (NPC_START + 108) -#define NPC_PEACHES (NPC_START + 109) -#define NPC_BUCK (NPC_START + 110) +#define NPC_ELMER (NPC_START + 104) // 0xE068 +#define NPC_WINNIE (NPC_START + 105) // 0xE069 +#define NPC_SAVANNAH (NPC_START + 106) // 0xE06A +#define NPC_ED (NPC_START + 107) // 0xE06B +#define NPC_CLEO (NPC_START + 108) // 0xE06C +#define NPC_PEACHES (NPC_START + 109) // 0xE06D +#define NPC_BUCK (NPC_START + 110) // 0xE06E // kangaroos -#define NPC_CARRIE (NPC_START + 111) -#define NPC_MATHILDA (NPC_START + 112) -#define NPC_MARCY (NPC_START + 113) -#define NPC_KITT (NPC_START + 114) -#define NPC_VALISE (NPC_START + 115) -#define NPC_ASTRID (NPC_START + 116) +#define NPC_CARRIE (NPC_START + 111) // 0xE06F +#define NPC_MATHILDA (NPC_START + 112) // 0xE070 +#define NPC_MARCY (NPC_START + 113) // 0xE071 +#define NPC_KITT (NPC_START + 114) // 0xE072 +#define NPC_VALISE (NPC_START + 115) // 0xE073 +#define NPC_ASTRID (NPC_START + 116) // 0xE074 // koalas -#define NPC_SYDNEY (NPC_START + 117) -#define NPC_GONZO (NPC_START + 118) -#define NPC_OZZIE (NPC_START + 119) -#define NPC_YUKA (NPC_START + 120) -#define NPC_HUGGY (NPC_START + 121) +#define NPC_SYDNEY (NPC_START + 117) // 0xE075 +#define NPC_GONZO (NPC_START + 118) // 0xE076 +#define NPC_OZZIE (NPC_START + 119) // 0xE077 +#define NPC_YUKA (NPC_START + 120) // 0xE078 +#define NPC_HUGGY (NPC_START + 121) // 0xE079 // lions -#define NPC_REX (NPC_START + 122) -#define NPC_AZIZ (NPC_START + 123) -#define NPC_LEOPOLD (NPC_START + 124) +#define NPC_REX (NPC_START + 122) // 0xE07A +#define NPC_AZIZ (NPC_START + 123) // 0xE07B +#define NPC_LEOPOLD (NPC_START + 124) // 0xE07C // mice -#define NPC_SAMSON (NPC_START + 125) -#define NPC_PENNY (NPC_START + 126) -#define NPC_DORA (NPC_START + 127) -#define NPC_CHICO (NPC_START + 128) -#define NPC_CANDI (NPC_START + 129) -#define NPC_RIZZO (NPC_START + 130) -#define NPC_ANICOTTI (NPC_START + 131) -#define NPC_LIMBERG (NPC_START + 132) -#define NPC_CARMEN (NPC_START + 133) +#define NPC_SAMSON (NPC_START + 125) // 0xE07D +#define NPC_PENNY (NPC_START + 126) // 0xE07E +#define NPC_DORA (NPC_START + 127) // 0xE07F +#define NPC_CHICO (NPC_START + 128) // 0xE080 +#define NPC_CANDI (NPC_START + 129) // 0xE081 +#define NPC_RIZZO (NPC_START + 130) // 0xE082 +#define NPC_ANICOTTI (NPC_START + 131) // 0xE083 +#define NPC_LIMBERG (NPC_START + 132) // 0xE084 +#define NPC_CARMEN (NPC_START + 133) // 0xE085 // octopus -#define NPC_OCTAVIAN (NPC_START + 134) +#define NPC_OCTAVIAN (NPC_START + 134) // 0xE086 // ostriches -#define NPC_SANDY (NPC_START + 135) -#define NPC_SPROCKET (NPC_START + 136) -#define NPC_RIO (NPC_START + 137) -#define NPC_QUEENIE (NPC_START + 138) +#define NPC_SANDY (NPC_START + 135) // 0xE087 +#define NPC_SPROCKET (NPC_START + 136) // 0xE088 +#define NPC_RIO (NPC_START + 137) // 0xE089 +#define NPC_QUEENIE (NPC_START + 138) // 0xE08A // eagles -#define NPC_APOLLO (NPC_START + 139) -#define NPC_BUZZ (NPC_START + 140) -#define NPC_QUETZAL (NPC_START + 141) -#define NPC_AMELIA (NPC_START + 142) -#define NPC_PIERCE (NPC_START + 143) +#define NPC_APOLLO (NPC_START + 139) // 0xE08B +#define NPC_BUZZ (NPC_START + 140) // 0xE08C +#define NPC_QUETZAL (NPC_START + 141) // 0xE08D +#define NPC_AMELIA (NPC_START + 142) // 0xE08E +#define NPC_PIERCE (NPC_START + 143) // 0xE08F // penguins -#define NPC_ROALD (NPC_START + 144) -#define NPC_AURORA (NPC_START + 145) -#define NPC_HOPPER (NPC_START + 146) -#define NPC_CUBE (NPC_START + 147) -#define NPC_PUCK (NPC_START + 148) -#define NPC_GWEN (NPC_START + 149) -#define NPC_FRIGA (NPC_START + 150) +#define NPC_ROALD (NPC_START + 144) // 0xE090 +#define NPC_AURORA (NPC_START + 145) // 0xE091 +#define NPC_HOPPER (NPC_START + 146) // 0xE092 +#define NPC_CUBE (NPC_START + 147) // 0xE093 +#define NPC_PUCK (NPC_START + 148) // 0xE094 +#define NPC_GWEN (NPC_START + 149) // 0xE095 +#define NPC_FRIGA (NPC_START + 150) // 0xE096 // pigs -#define NPC_CURLY (NPC_START + 151) -#define NPC_TRUFFLES (NPC_START + 152) -#define NPC_SPORK (NPC_START + 153) -#define NPC_HUGH (NPC_START + 154) -#define NPC_RASHER (NPC_START + 155) -#define NPC_SUE_E (NPC_START + 156) -#define NPC_HAMBO (NPC_START + 157) -#define NPC_LUCY (NPC_START + 158) -#define NPC_COBB (NPC_START + 159) -#define NPC_BORIS (NPC_START + 160) +#define NPC_CURLY (NPC_START + 151) // 0xE097 +#define NPC_TRUFFLES (NPC_START + 152) // 0xE098 +#define NPC_SPORK (NPC_START + 153) // 0xE099 +#define NPC_HUGH (NPC_START + 154) // 0xE09A +#define NPC_RASHER (NPC_START + 155) // 0xE09B +#define NPC_SUE_E (NPC_START + 156) // 0xE09C +#define NPC_HAMBO (NPC_START + 157) // 0xE09D +#define NPC_LUCY (NPC_START + 158) // 0xE09E +#define NPC_COBB (NPC_START + 159) // 0xE09F +#define NPC_BORIS (NPC_START + 160) // 0xE0A0 // rabbits -#define NPC_BUNNIE (NPC_START + 161) -#define NPC_DOC (NPC_START + 162) -#define NPC_GASTON (NPC_START + 163) -#define NPC_COCO (NPC_START + 164) -#define NPC_GABI (NPC_START + 165) -#define NPC_DOTTY (NPC_START + 166) -#define NPC_GENJI (NPC_START + 167) -#define NPC_SNAKE (NPC_START + 168) -#define NPC_CLAUDE (NPC_START + 169) -// rhinos -#define NPC_TANK (NPC_START + 170) -#define NPC_SPIKE (NPC_START + 171) -#define NPC_TIARA (NPC_START + 172) +#define NPC_BUNNIE (NPC_START + 161) // 0xE0A1 +#define NPC_DOC (NPC_START + 162) // 0xE0A2 +#define NPC_GASTON (NPC_START + 163) // 0xE0A3 +#define NPC_COCO (NPC_START + 164) // 0xE0A4 +#define NPC_GABI (NPC_START + 165) // 0xE0A5 +#define NPC_DOTTY (NPC_START + 166) // 0xE0A6 +#define NPC_GENJI (NPC_START + 167) // 0xE0A7 +#define NPC_SNAKE (NPC_START + 168) // 0xE0A8 +#define NPC_CLAUDE (NPC_START + 169) // 0xE0A9 +// rhinos +#define NPC_TANK (NPC_START + 170) // 0xE0AA +#define NPC_SPIKE (NPC_START + 171) // 0xE0AB +#define NPC_TIARA (NPC_START + 172) // 0xE0AC // sheep -#define NPC_VESTA (NPC_START + 173) +#define NPC_VESTA (NPC_START + 173) // 0xE0AD // squirrels -#define NPC_FILBERT (NPC_START + 174) -#define NPC_HAZEL (NPC_START + 175) -#define NPC_PEANUT (NPC_START + 176) -#define NPC_PECAN (NPC_START + 177) -#define NPC_RICKY (NPC_START + 178) -#define NPC_STATIC (NPC_START + 179) -#define NPC_MINT (NPC_START + 180) -#define NPC_NIBBLES (NPC_START + 181) +#define NPC_FILBERT (NPC_START + 174) // 0xE0AE +#define NPC_HAZEL (NPC_START + 175) // 0xE0AF +#define NPC_PEANUT (NPC_START + 176) // 0xE0B0 +#define NPC_PECAN (NPC_START + 177) // 0xE0B1 +#define NPC_RICKY (NPC_START + 178) // 0xE0B2 +#define NPC_STATIC (NPC_START + 179) // 0xE0B3 +#define NPC_MINT (NPC_START + 180) // 0xE0B4 +#define NPC_NIBBLES (NPC_START + 181) // 0xE0B5 // tigers -#define NPC_TYBALT (NPC_START + 182) -#define NPC_ROLF (NPC_START + 183) -#define NPC_BANGLE (NPC_START + 184) +#define NPC_TYBALT (NPC_START + 182) // 0xE0B6 +#define NPC_ROLF (NPC_START + 183) // 0xE0B7 +#define NPC_BANGLE (NPC_START + 184) // 0xE0B8 // wolves -#define NPC_LOBO (NPC_START + 185) -#define NPC_FREYA (NPC_START + 186) -#define NPC_CHIEF (NPC_START + 187) +#define NPC_LOBO (NPC_START + 185) // 0xE0B9 +#define NPC_FREYA (NPC_START + 186) // 0xE0BA +#define NPC_CHIEF (NPC_START + 187) // 0xE0BB // late additions -#define NPC_WEBER (NPC_START + 188) -#define NPC_MALLARY (NPC_START + 189) -#define NPC_WOLFGANG (NPC_START + 190) -#define NPC_HORNSBY (NPC_START + 191) -#define NPC_OXFORD (NPC_START + 192) -#define NPC_T_BONE (NPC_START + 193) -#define NPC_BIFF (NPC_START + 194) -#define NPC_OPAL (NPC_START + 195) -#define NPC_BONES (NPC_START + 196) -#define NPC_BEA (NPC_START + 197) -#define NPC_BITTY (NPC_START + 198) -#define NPC_ROCCO (NPC_START + 199) -#define NPC_LULU (NPC_START + 200) -#define NPC_BLAIRE (NPC_START + 201) -#define NPC_SALLY (NPC_START + 202) -#define NPC_ELLIE (NPC_START + 203) -#define NPC_ELOISE (NPC_START + 204) -#define NPC_ALLI (NPC_START + 205) -#define NPC_PIPPY (NPC_START + 206) -#define NPC_EUNICE (NPC_START + 207) -#define NPC_BAABARA (NPC_START + 208) -#define NPC_FANG (NPC_START + 209) -#define NPC_DEENA (NPC_START + 210) -#define NPC_PATE (NPC_START + 211) -#define NPC_STELLA (NPC_START + 212) -#define NPC_CASHMERE (NPC_START + 213) -#define NPC_WOOLIO (NPC_START + 214) -#define NPC_COOKIE (NPC_START + 215) +#define NPC_WEBER (NPC_START + 188) // 0xE0BC +#define NPC_MALLARY (NPC_START + 189) // 0xE0BD +#define NPC_WOLFGANG (NPC_START + 190) // 0xE0BE +#define NPC_HORNSBY (NPC_START + 191) // 0xE0BF +#define NPC_OXFORD (NPC_START + 192) // 0xE0C0 +#define NPC_T_BONE (NPC_START + 193) // 0xE0C1 +#define NPC_BIFF (NPC_START + 194) // 0xE0C2 +#define NPC_OPAL (NPC_START + 195) // 0xE0C3 +#define NPC_BONES (NPC_START + 196) // 0xE0C4 +#define NPC_BEA (NPC_START + 197) // 0xE0C5 +#define NPC_BITTY (NPC_START + 198) // 0xE0C6 +#define NPC_ROCCO (NPC_START + 199) // 0xE0C7 +#define NPC_LULU (NPC_START + 200) // 0xE0C8 +#define NPC_BLAIRE (NPC_START + 201) // 0xE0C9 +#define NPC_SALLY (NPC_START + 202) // 0xE0CA +#define NPC_ELLIE (NPC_START + 203) // 0xE0CB +#define NPC_ELOISE (NPC_START + 204) // 0xE0CC +#define NPC_ALLI (NPC_START + 205) // 0xE0CD +#define NPC_PIPPY (NPC_START + 206) // 0xE0CE +#define NPC_EUNICE (NPC_START + 207) // 0xE0CF +#define NPC_BAABARA (NPC_START + 208) // 0xE0D0 +#define NPC_FANG (NPC_START + 209) // 0xE0D1 +#define NPC_DEENA (NPC_START + 210) // 0xE0D2 +#define NPC_PATE (NPC_START + 211) // 0xE0D3 +#define NPC_STELLA (NPC_START + 212) // 0xE0D4 +#define NPC_CASHMERE (NPC_START + 213) // 0xE0D5 +#define NPC_WOOLIO (NPC_START + 214) // 0xE0D6 +#define NPC_COOKIE (NPC_START + 215) // 0xE0D7 // gamecube additions -#define NPC_MAELLE (NPC_START + 216) -#define NPC_OHARE (NPC_START + 217) -#define NPC_BLISS (NPC_START + 218) -#define NPC_DRIFT (NPC_START + 219) -#define NPC_BUD (NPC_START + 220) -#define NPC_BOOMER (NPC_START + 221) -#define NPC_ELINA (NPC_START + 222) -#define NPC_FLASH (NPC_START + 223) -#define NPC_DOBIE (NPC_START + 224) -#define NPC_FLOSSIE (NPC_START + 225) -#define NPC_ANNALISE (NPC_START + 226) -#define NPC_PLUCKY (NPC_START + 227) -#define NPC_FAITH (NPC_START + 228) -#define NPC_YODEL (NPC_START + 229) -#define NPC_ROWAN (NPC_START + 230) -#define NPC_JUNE (NPC_START + 231) -#define NPC_CHERI (NPC_START + 232) -#define NPC_PIGLEG (NPC_START + 233) -#define NPC_ANKHA (NPC_START + 234) -#define NPC_PUNCHY (NPC_START + 235) -#define NPC_END (NPC_START + 236) +#define NPC_MAELLE (NPC_START + 216) // 0xE0D8 +#define NPC_OHARE (NPC_START + 217) // 0xE0D9 +#define NPC_BLISS (NPC_START + 218) // 0xE0DA +#define NPC_DRIFT (NPC_START + 219) // 0xE0DB +#define NPC_BUD (NPC_START + 220) // 0xE0DC +#define NPC_BOOMER (NPC_START + 221) // 0xE0DD +#define NPC_ELINA (NPC_START + 222) // 0xE0DE +#define NPC_FLASH (NPC_START + 223) // 0xE0DF +#define NPC_DOBIE (NPC_START + 224) // 0xE0E0 +#define NPC_FLOSSIE (NPC_START + 225) // 0xE0E1 +#define NPC_ANNALISE (NPC_START + 226) // 0xE0E2 +#define NPC_PLUCKY (NPC_START + 227) // 0xE0E3 +#define NPC_FAITH (NPC_START + 228) // 0xE0E4 +#define NPC_YODEL (NPC_START + 229) // 0xE0E5 +#define NPC_ROWAN (NPC_START + 230) // 0xE0E6 +#define NPC_JUNE (NPC_START + 231) // 0xE0E7 +#define NPC_CHERI (NPC_START + 232) // 0xE0E8 +#define NPC_PIGLEG (NPC_START + 233) // 0xE0E9 +#define NPC_ANKHA (NPC_START + 234) // 0xE0EA +#define NPC_PUNCHY (NPC_START + 235) // 0xE0EB +#define NPC_END (NPC_START + 236) // 0xE0EC +#define NPC_TEST0 (NPC_START + 236) // 0xE0EC +#define NPC_TEST1 (NPC_START + 237) // 0xE0ED +#define NPC_ALL_END (NPC_START + 238) // 0xE0EE #define DUMMY_START 0xF000 #define DUMMY_MAILBOX0 (DUMMY_START + 1) // 0xF001 diff --git a/src/data/field/field_data.c b/src/data/field/field_data.c new file mode 100644 index 00000000..36daaee5 --- /dev/null +++ b/src/data/field/field_data.c @@ -0,0 +1,610 @@ +#include "m_field_make.h" +#include "m_field_info.h" +#include "m_scene.h" + +extern mFM_move_actor_data_c broker_shop_actable[]; +extern mFM_move_actor_data_c buggy_actable[]; +extern mFM_move_actor_data_c event_notification_actable[]; +extern mFM_move_actor_data_c fd0_actable[]; +extern mFM_move_actor_data_c fd1_actable[]; +extern mFM_move_actor_data_c fd2_actable[]; +extern mFM_move_actor_data_c fd4_actable[]; +extern mFM_move_actor_data_c fd_npc_land_actable[]; +extern mFM_move_actor_data_c fgout_actable[]; +extern mFM_move_actor_data_c kamakura_actable[]; +extern mFM_move_actor_data_c museum_entrance_actable[]; +extern mFM_move_actor_data_c museum_fish_actable[]; +extern mFM_move_actor_data_c museum_fossil_actable[]; +extern mFM_move_actor_data_c museum_insect_actable[]; +extern mFM_move_actor_data_c museum_picture_actable[]; +extern mFM_move_actor_data_c needlework_actable[]; +extern mFM_move_actor_data_c npcRoom001_actable[]; +extern mFM_move_actor_data_c playerRMM_actable[]; +extern mFM_move_actor_data_c playerRMS_actable[]; +extern mFM_move_actor_data_c playerRM_actable[]; +extern mFM_move_actor_data_c player_select2_actable[]; +extern mFM_move_actor_data_c player_select3_actable[]; +extern mFM_move_actor_data_c player_select4_actable[]; +extern mFM_move_actor_data_c player_select_actable[]; +extern mFM_move_actor_data_c police_box_actable[]; +extern mFM_move_actor_data_c post_office_actable[]; +extern mFM_move_actor_data_c shop01_actable[]; +extern mFM_move_actor_data_c shop02_actable[]; +extern mFM_move_actor_data_c shop03_actable[]; +extern mFM_move_actor_data_c shop04_1_actable[]; +extern mFM_move_actor_data_c shop04_2_actable[]; +extern mFM_move_actor_data_c start_demo1_actable[]; +extern mFM_move_actor_data_c start_demo2_actable[]; +extern mFM_move_actor_data_c start_demo3_actable[]; +extern mFM_move_actor_data_c tent_actable[]; +extern mFM_move_actor_data_c title_demo_actable[]; +extern mFM_move_actor_data_c water_test_actable[]; + +mFM_field_data_c data_fdd[SCENE_NUM] = { + { mFI_FIELD_FG, + 4, 2, + { + { 0x0001, 0 }, { 0x0056, 0 }, { 0x00E7, 0 }, { 0x000B, 0 }, + { 0x00F1, 0 }, { 0x00F1, 0 }, { 0x00F5, 0 }, { 0x00F6, 0 }, + }, + fd0_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 5, 6, + { + { 0x0002, 0 }, { 0x0002, 0 }, { 0x0002, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, + { 0x0003, 0 }, { 0x0040, 0 }, { 0x0003, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, + { 0x0004, 0 }, { 0x0004, 0 }, { 0x0004, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, + { 0x0000, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, + { 0x0000, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, + { 0x0000, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, { 0x0000, 0 }, + }, + fd1_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 5, 6, + { + { 0x0054, 0 }, { 0x011C, 0 }, { 0x011D, 0 }, { 0x0006, 0 }, { 0x0006, 0 }, + { 0x0007, 0 }, { 0x000C, 0 }, { 0x0005, 0 }, { 0x0109, 0 }, { 0x0006, 1 }, + { 0x0006, 0 }, { 0x0017, 0 }, { 0x0108, 0 }, { 0x000D, 0 }, { 0x0006, 0 }, + { 0x0054, 0 }, { 0x00F3, 0 }, { 0x0005, 0 }, { 0x0005, 0 }, { 0x0006, 0 }, + { 0x0115, 0 }, { 0x0005, 0 }, { 0x0005, 0 }, { 0x0005, 0 }, { 0x0006, 0 }, + { 0x0006, 0 }, { 0x0006, 0 }, { 0x0006, 0 }, { 0x0006, 0 }, { 0x0006, 0 }, + }, + fd2_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 4, 3, + { + { 0x015E, 0 }, { 0x015E, 0 }, { 0x015E, 0 }, { 0x015E, 0 }, + { 0x015E, 0 }, { 0x0129, 0 }, { 0x0128, 0 }, { 0x015E, 0 }, + { 0x015E, 0 }, { 0x015E, 0 }, { 0x015E, 0 }, { 0x015E, 0 }, + }, + water_test_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 1, 1, + { + { 0x0009, 0 }, + }, + NULL, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 5, 6, + { + { 0x0025, 0 }, { 0x0025, 0 }, { 0x0025, 1 }, { 0x0025, 1 }, { 0x0025, 1 }, + { 0x0025, 0 }, { 0x0025, 0 }, { 0x0028, 0 }, { 0x0031, 0 }, { 0x0025, 1 }, + { 0x0025, 0 }, { 0x0025, 0 }, { 0x0025, 0 }, { 0x0033, 0 }, { 0x0025, 1 }, + { 0x0025, 1 }, { 0x0067, 0 }, { 0x0025, 0 }, { 0x0066, 0 }, { 0x0025, 1 }, + { 0x0025, 1 }, { 0x002C, 0 }, { 0x0025, 0 }, { 0x0034, 0 }, { 0x0025, 1 }, + { 0x0025, 1 }, { 0x0067, 0 }, { 0x0025, 0 }, { 0x0066, 0 }, { 0x0025, 1 }, + }, + fd4_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_NPCROOM0, + 1, 1, + { + { 0x0015, 0 }, + }, + npcRoom001_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 7, 10, + { + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + { 0x0016, 0 }, { 0x0017, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + }, + fd_npc_land_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 2, 2, + { + { 0x0002, 0 }, { 0x0002, 0 }, + { 0x0002, 0 }, { 0x0002, 0 }, + }, + fgout_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_SHOP0, + 1, 1, + { + { 0x0019, 0 }, + }, + shop01_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 1, 1, + { + { 0x001D, 0 }, + }, + NULL, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 1, 1, + { + { 0x001F, 0 }, + }, + NULL, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_BROKER_SHOP, + 1, 1, + { + { 0x0050, 0 }, + }, + broker_shop_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_NPCROOM_FIELD_TOOL_INSIDE, + 1, 1, + { + { 0x0015, 0 }, + }, + npcRoom001_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_POST_OFFICE, + 1, 1, + { + { 0x0051, 0 }, + }, + post_office_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_DEMO_STARTDEMO, + 1, 1, + { + { 0x0052, 0 }, + }, + start_demo1_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_DEMO_STARTDEMO2, + 1, 1, + { + { 0x0053, 0 }, + }, + start_demo2_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_POLICE_BOX, + 1, 1, + { + { 0x007E, 0 }, + }, + police_box_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_BUGGY, + 1, 1, + { + { 0x00C0, 0 }, + }, + buggy_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_DEMO_PLAYERSELECT, + 1, 1, + { + { 0x00C1, 0 }, + }, + player_select_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_PLAYER0_ROOM, + 1, 1, + { + { 0x00C2, 0 }, + }, + playerRMS_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_PLAYER0_ROOM, + 1, 1, + { + { 0x00C3, 0 }, + }, + playerRMM_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_PLAYER0_ROOM, + 1, 1, + { + { 0x0012, 0 }, + }, + playerRM_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_SHOP1, + 1, 1, + { + { 0x00E3, 0 }, + }, + shop02_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_SHOP2, + 1, 1, + { + { 0x00E6, 0 }, + }, + shop03_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_SHOP3_1, + 1, 1, + { + { 0x00E4, 0 }, + }, + shop04_1_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 3, 3, + { + { 0x00E2, 0 }, { 0x00E2, 0 }, { 0x00E2, 0 }, + { 0x00E2, 0 }, { 0x00E2, 0 }, { 0x00E2, 0 }, + { 0x00E2, 0 }, { 0x00E2, 0 }, { 0x00E2, 0 }, + }, + NULL, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_DEMO_PLAYERSELECT, + 1, 1, + { + { 0x00C1, 0 }, + }, + player_select2_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_DEMO_PLAYERSELECT, + 1, 1, + { + { 0x00C1, 0 }, + }, + player_select3_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_SHOP3_2, + 1, 1, + { + { 0x00E5, 0 }, + }, + shop04_2_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 3, 3, + { + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + { 0x0016, 0 }, { 0x0016, 0 }, { 0x0016, 0 }, + }, + event_notification_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_KAMAKURA, + 1, 1, + { + { 0x00EF, 0 }, + }, + kamakura_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 7, 8, + { + { 0x00D1, 1 }, { 0x00C9, 1 }, { 0x00C9, 1 }, { 0x00C9, 1 }, { 0x00C9, 1 }, { 0x00CA, 1 }, { 0x00D2, 1 }, + { 0x00CD, 1 }, { 0x00DC, 1 }, { 0x00A8, 1 }, { 0x0055, 1 }, { 0x00DD, 1 }, { 0x001C, 1 }, { 0x00D0, 1 }, + { 0x00CB, 1 }, { 0x0025, 1 }, { 0x0026, 1 }, { 0x00D6, 1 }, { 0x009D, 1 }, { 0x0040, 1 }, { 0x00CE, 1 }, + { 0x00CB, 1 }, { 0x004A, 0 }, { 0x0030, 0 }, { 0x003C, 1 }, { 0x0038, 1 }, { 0x003B, 1 }, { 0x00CE, 1 }, + { 0x00CC, 0 }, { 0x002A, 0 }, { 0x0035, 0 }, { 0x0021, 0 }, { 0x0022, 0 }, { 0x0030, 0 }, { 0x00CE, 1 }, + { 0x00CB, 0 }, { 0x00D9, 0 }, { 0x00BB, 0 }, { 0x003B, 0 }, { 0x00D3, 0 }, { 0x0035, 0 }, { 0x00CF, 0 }, + { 0x00ED, 0 }, { 0x00E8, 0 }, { 0x00F5, 0 }, { 0x00E9, 0 }, { 0x00FC, 0 }, { 0x00FD, 0 }, { 0x00EE, 0 }, + { 0x00C9, 0 }, { 0x00C9, 0 }, { 0x00C9, 0 }, { 0x00C9, 0 }, { 0x00C9, 0 }, { 0x00C9, 0 }, { 0x00C9, 0 }, + }, + title_demo_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_FG, + 7, 8, + { + { 0x00D1, 1 }, { 0x00C9, 1 }, { 0x00C9, 1 }, { 0x00C9, 1 }, { 0x00C9, 1 }, { 0x00CA, 1 }, { 0x00D2, 1 }, + { 0x00CD, 1 }, { 0x00DC, 1 }, { 0x00A8, 1 }, { 0x0055, 1 }, { 0x00DD, 1 }, { 0x001C, 1 }, { 0x00D0, 1 }, + { 0x00CB, 1 }, { 0x0025, 1 }, { 0x0026, 1 }, { 0x00D6, 1 }, { 0x009D, 1 }, { 0x0040, 1 }, { 0x00CE, 1 }, + { 0x00CB, 1 }, { 0x004A, 0 }, { 0x0030, 0 }, { 0x003C, 1 }, { 0x0038, 1 }, { 0x003B, 1 }, { 0x00CE, 1 }, + { 0x00CC, 0 }, { 0x002A, 0 }, { 0x0035, 0 }, { 0x0021, 0 }, { 0x0022, 0 }, { 0x0030, 0 }, { 0x00CE, 1 }, + { 0x00CB, 0 }, { 0x00D9, 0 }, { 0x00BB, 0 }, { 0x003B, 0 }, { 0x00D3, 0 }, { 0x0035, 0 }, { 0x00CF, 0 }, + { 0x00ED, 0 }, { 0x00E8, 0 }, { 0x00F5, 0 }, { 0x00E9, 0 }, { 0x00FC, 0 }, { 0x00FD, 0 }, { 0x00EE, 0 }, + { 0x00C9, 0 }, { 0x00C9, 0 }, { 0x00C9, 0 }, { 0x00C9, 0 }, { 0x00C9, 0 }, { 0x00C9, 0 }, { 0x00C9, 0 }, + }, + title_demo_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_DEMO_PLAYERSELECT, + 1, 1, + { + { 0x00C1, 0 }, + }, + player_select4_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_MUSEUM_ENTRANCE, + 1, 1, + { + { 0x0116, 0 }, + }, + museum_entrance_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_MUSEUM_PAINTING, + 1, 1, + { + { 0x0117, 0 }, + }, + museum_picture_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_MUSEUM_FOSSIL, + 1, 1, + { + { 0x0118, 0 }, + }, + museum_fossil_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_MUSEUM_INSECT, + 1, 1, + { + { 0x0119, 0 }, + }, + museum_insect_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_MUSEUM_FISH, + 1, 1, + { + { 0x011A, 0 }, + }, + museum_fish_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_PLAYER0_ROOM, + 1, 1, + { + { 0x0012, 0 }, + }, + playerRM_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_PLAYER0_ROOM, + 1, 1, + { + { 0x00C3, 0 }, + }, + playerRMM_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_PLAYER0_ROOM, + 1, 1, + { + { 0x00C3, 0 }, + }, + playerRMM_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_PLAYER0_ROOM, + 1, 1, + { + { 0x00C3, 0 }, + }, + playerRMM_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_PLAYER0_ROOM, + 1, 1, + { + { 0x00C3, 0 }, + }, + playerRMM_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_PLAYER0_ROOM, + 1, 1, + { + { 0x00C3, 0 }, + }, + playerRMM_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_NEEDLEWORK, + 1, 1, + { + { 0x011F, 0 }, + }, + needlework_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_PLAYER0_ROOM, + 1, 1, + { + { 0x0012, 0 }, + }, + playerRMM_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_NPCROOM0, + 1, 1, + { + { 0x0015, 0 }, + }, + npcRoom001_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_DEMO_STARTDEMO3, + 1, 1, + { + { 0x0052, 0 }, + }, + start_demo3_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_LIGHTHOUSE, + 1, 1, + { + { 0x0164, 0 }, + }, + npcRoom001_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, + { mFI_FIELD_ROOM_TENT, + 1, 1, + { + { 0x016F, 0 }, + }, + tent_actable, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000 }, +}; diff --git a/src/data/field/mvactor/broker_shop.c b/src/data/field/mvactor/broker_shop.c new file mode 100644 index 00000000..812180e3 --- /dev/null +++ b/src/data/field/mvactor/broker_shop.c @@ -0,0 +1,9 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c broker_shop_actable[3] = { + {ETC_SHOP_GOODS, 0, 0, 1, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {SP_NPC_EV_BROKER2, 0, 0, 4, 4, -1, -1, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/buggy.c b/src/data/field/mvactor/buggy.c new file mode 100644 index 00000000..15f5e1e0 --- /dev/null +++ b/src/data/field/mvactor/buggy.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c buggy_actable[2] = { + {SP_NPC_GYPSY, 0, 0, 3, 3, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/event_notification.c b/src/data/field/mvactor/event_notification.c new file mode 100644 index 00000000..321d6fa9 --- /dev/null +++ b/src/data/field/mvactor/event_notification.c @@ -0,0 +1,7 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c event_notification_actable[1] = { + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/fd0.c b/src/data/field/mvactor/fd0.c new file mode 100644 index 00000000..d8c0b783 --- /dev/null +++ b/src/data/field/mvactor/fd0.c @@ -0,0 +1,11 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c fd0_actable[5] = { + {MISC_ACTOR_SAMPLE, 0, 0, 3, 8, -1, -1, mRF_BLOCKKIND_NONE}, + {NPC_BOB, 0, 0, 5, 7, 10, -1, mRF_BLOCKKIND_NONE}, + {NPC_ELMER, 0, 0, 7, 7, 11, -1, mRF_BLOCKKIND_NONE}, + {NPC_TEST1, 0, 0, 10, 7, 14, -1, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/fd1.c b/src/data/field/mvactor/fd1.c new file mode 100644 index 00000000..5fb2c1c6 --- /dev/null +++ b/src/data/field/mvactor/fd1.c @@ -0,0 +1,17 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c fd1_actable[11] = { + {ETC_AIRPLANE, 1, 0, 8, 14, -1, -1, mRF_BLOCKKIND_NONE}, + {ETC_MBG, 1, 2, 6, 9, -1, -1, mRF_BLOCKKIND_NONE}, + {ETC_MBG, 1, 2, 4, 10, -1, -1, mRF_BLOCKKIND_NONE}, + {ETC_MBG, 1, 2, 6, 11, -1, -1, mRF_BLOCKKIND_NONE}, + {ETC_MBG, 1, 2, 9, 6, -1, -1, mRF_BLOCKKIND_NONE}, + {NPC_CURLY, 0, 2, 7, 7, 10, -1, mRF_BLOCKKIND_NONE}, + {NPC_BETTY, 0, 2, 9, 7, 11, -1, mRF_BLOCKKIND_NONE}, + {NPC_SAMSON, 1, 1, 2, 5, 12, -1, mRF_BLOCKKIND_NONE}, + {NPC_LOBO, 1, 1, 3, 5, 13, -1, mRF_BLOCKKIND_NONE}, + {NPC_FREYA, 1, 1, 4, 5, 14, -1, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/fd2.c b/src/data/field/mvactor/fd2.c new file mode 100644 index 00000000..cbdf8014 --- /dev/null +++ b/src/data/field/mvactor/fd2.c @@ -0,0 +1,14 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c fd2_actable[8] = { + {ETC_AIRPLANE, 1, 0, 8, 14, -1, -1, mRF_BLOCKKIND_NONE}, + {ETC_SNOWMAN_BALL_A, 3, 1, 10, 1, -1, -1, mRF_BLOCKKIND_NONE}, + {ETC_SNOWMAN_BALL_B, 3, 1, 9, 1, -1, -1, mRF_BLOCKKIND_NONE}, + {ETC_SNOWMAN_BALL_A, 0, 4, 5, 12, -1, -1, mRF_BLOCKKIND_NONE}, + {SP_NPC_POLICE, 0, 2, 6, 6, -1, -1, mRF_BLOCKKIND_NONE}, + {MISC_ACTOR_SAMPLE, 0, 2, 10, 10, -1, -1, mRF_BLOCKKIND_NONE}, + {NPC_ELMER, 1, 3, 3, 3, 11, 10, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/fd4.c b/src/data/field/mvactor/fd4.c new file mode 100644 index 00000000..d8addcfe --- /dev/null +++ b/src/data/field/mvactor/fd4.c @@ -0,0 +1,10 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c fd4_actable[4] = { + {NPC_BOB, 0, 0, 8, 8, 10, -1, mRF_BLOCKKIND_NONE}, + {NPC_OLIVIA, 0, 0, 10, 8, 11, -1, mRF_BLOCKKIND_NONE}, + {NPC_VESTA, 0, 0, 9, 11, 12, -1, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/fd_npc_land.c b/src/data/field/mvactor/fd_npc_land.c new file mode 100644 index 00000000..6c2c7e07 --- /dev/null +++ b/src/data/field/mvactor/fd_npc_land.c @@ -0,0 +1,10 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c fd_npc_land_actable[4] = { + {SP_NPC_POLICE, 0, 0, 8, 11, -1, -1, mRF_BLOCKKIND_POLICE}, + {SP_NPC_STATION_MASTER, 0, 0, 5, 4, -1, -1, mRF_BLOCKKIND_STATION}, + {SP_NPC_SONCHO, 0, 0, 10, 10, -1, -1, mRF_BLOCKKIND_SHRINE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/fgout.c b/src/data/field/mvactor/fgout.c new file mode 100644 index 00000000..f48968d6 --- /dev/null +++ b/src/data/field/mvactor/fgout.c @@ -0,0 +1,7 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c fgout_actable[1] = { + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/kamakura.c b/src/data/field/mvactor/kamakura.c new file mode 100644 index 00000000..884780c1 --- /dev/null +++ b/src/data/field/mvactor/kamakura.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c kamakura_actable[2] = { + {ETC_KAMAKURA_INDOOR, 0, 0, 0, 0, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/npcRoom001.c b/src/data/field/mvactor/npcRoom001.c new file mode 100644 index 00000000..e8abdd15 --- /dev/null +++ b/src/data/field/mvactor/npcRoom001.c @@ -0,0 +1,7 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c npcRoom001_actable[1] = { + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/playerRM.c b/src/data/field/mvactor/playerRM.c new file mode 100644 index 00000000..534082e7 --- /dev/null +++ b/src/data/field/mvactor/playerRM.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c playerRM_actable[2] = { + {ETC_SHOP_GOODS, 0, 0, 1, 1, -1, 1, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/playerRMM.c b/src/data/field/mvactor/playerRMM.c new file mode 100644 index 00000000..44999096 --- /dev/null +++ b/src/data/field/mvactor/playerRMM.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c playerRMM_actable[2] = { + {ETC_SHOP_GOODS, 0, 0, 1, 1, -1, 1, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/playerRMS.c b/src/data/field/mvactor/playerRMS.c new file mode 100644 index 00000000..7ff8c8a8 --- /dev/null +++ b/src/data/field/mvactor/playerRMS.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c playerRMS_actable[2] = { + {ETC_SHOP_GOODS, 0, 0, 1, 1, -1, 1, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/player_select.c b/src/data/field/mvactor/player_select.c new file mode 100644 index 00000000..ae246ef6 --- /dev/null +++ b/src/data/field/mvactor/player_select.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c player_select_actable[2] = { + {SP_NPC_P_SEL, 0, 0, 2, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/player_select2.c b/src/data/field/mvactor/player_select2.c new file mode 100644 index 00000000..a1ce0456 --- /dev/null +++ b/src/data/field/mvactor/player_select2.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c player_select2_actable[2] = { + {SP_NPC_P_SEL2, 0, 0, 2, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/player_select3.c b/src/data/field/mvactor/player_select3.c new file mode 100644 index 00000000..99902d3e --- /dev/null +++ b/src/data/field/mvactor/player_select3.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c player_select3_actable[2] = { + {SP_NPC_RTC, 0, 0, 2, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/player_select4.c b/src/data/field/mvactor/player_select4.c new file mode 100644 index 00000000..919c8315 --- /dev/null +++ b/src/data/field/mvactor/player_select4.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c player_select4_actable[2] = { + {SP_NPC_RESTART, 0, 0, 2, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/police_box.c b/src/data/field/mvactor/police_box.c new file mode 100644 index 00000000..e2721c6b --- /dev/null +++ b/src/data/field/mvactor/police_box.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c police_box_actable[2] = { + {SP_NPC_POLICE2, 0, 0, 4, 6, -1, -1, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/post_office.c b/src/data/field/mvactor/post_office.c new file mode 100644 index 00000000..80a6c3e1 --- /dev/null +++ b/src/data/field/mvactor/post_office.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c post_office_actable[2] = { + {SP_NPC_POST_GIRL, 0, 0, 4, 2, -1, -1, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/shop01.c b/src/data/field/mvactor/shop01.c new file mode 100644 index 00000000..8061ad83 --- /dev/null +++ b/src/data/field/mvactor/shop01.c @@ -0,0 +1,9 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c shop01_actable[3] = { + {SP_NPC_SHOP_MASTER, 0, 0, 3, 5, -1, 0, mRF_BLOCKKIND_NONE}, + {ETC_SHOP_GOODS, 0, 0, 1, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/shop02.c b/src/data/field/mvactor/shop02.c new file mode 100644 index 00000000..f8cab25d --- /dev/null +++ b/src/data/field/mvactor/shop02.c @@ -0,0 +1,9 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c shop02_actable[3] = { + {SP_NPC_CONV_MASTER, 0, 0, 7, 5, -1, 0, mRF_BLOCKKIND_NONE}, + {ETC_SHOP_GOODS, 0, 0, 1, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/shop03.c b/src/data/field/mvactor/shop03.c new file mode 100644 index 00000000..12b6bcf3 --- /dev/null +++ b/src/data/field/mvactor/shop03.c @@ -0,0 +1,9 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c shop03_actable[3] = { + {SP_NPC_SUPER_MASTER, 0, 0, 8, 9, -1, 0, mRF_BLOCKKIND_NONE}, + {ETC_SHOP_GOODS, 0, 0, 1, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/shop04_1.c b/src/data/field/mvactor/shop04_1.c new file mode 100644 index 00000000..fcce80b4 --- /dev/null +++ b/src/data/field/mvactor/shop04_1.c @@ -0,0 +1,9 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c shop04_1_actable[3] = { + {SP_NPC_DEPART_MASTER, 0, 0, 7, 11, -1, 0, mRF_BLOCKKIND_NONE}, + {ETC_SHOP_GOODS, 0, 0, 1, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/shop04_2.c b/src/data/field/mvactor/shop04_2.c new file mode 100644 index 00000000..d8d22904 --- /dev/null +++ b/src/data/field/mvactor/shop04_2.c @@ -0,0 +1,10 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c shop04_2_actable[4] = { + {SP_NPC_MAMEDANUKI0, 0, 0, 7, 4, -1, 0, mRF_BLOCKKIND_NONE}, + {SP_NPC_MAMEDANUKI1, 0, 0, 8, 4, -1, 0, mRF_BLOCKKIND_NONE}, + {ETC_SHOP_GOODS, 0, 0, 1, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/start_demo1.c b/src/data/field/mvactor/start_demo1.c new file mode 100644 index 00000000..c169fff7 --- /dev/null +++ b/src/data/field/mvactor/start_demo1.c @@ -0,0 +1,10 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c start_demo1_actable[4] = { + {SP_NPC_GUIDE, 0, 0, 3, 3, -1, 0, mRF_BLOCKKIND_NONE}, + {SP_NPC_SLEEP_OBABA, 0, 0, 4, 4, -1, 0, mRF_BLOCKKIND_NONE}, + {ETC_TRAIN_WINDOW, 0, 0, 1, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/start_demo2.c b/src/data/field/mvactor/start_demo2.c new file mode 100644 index 00000000..bc1d34ae --- /dev/null +++ b/src/data/field/mvactor/start_demo2.c @@ -0,0 +1,10 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c start_demo2_actable[4] = { + {ETC_TRAIN_WINDOW, 0, 0, 1, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {SP_NPC_GUIDE2, 0, 0, 3, 3, -1, 0, mRF_BLOCKKIND_NONE}, + {SP_NPC_SLEEP_OBABA, 0, 0, 4, 4, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/start_demo3.c b/src/data/field/mvactor/start_demo3.c new file mode 100644 index 00000000..2eb61a96 --- /dev/null +++ b/src/data/field/mvactor/start_demo3.c @@ -0,0 +1,10 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c start_demo3_actable[4] = { + {SP_NPC_MASK_CAT2, 0, 0, 3, 3, -1, 0, mRF_BLOCKKIND_NONE}, + {SP_NPC_SLEEP_OBABA, 0, 0, 4, 4, -1, 0, mRF_BLOCKKIND_NONE}, + {ETC_TRAIN_WINDOW, 0, 0, 1, 1, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/tent.c b/src/data/field/mvactor/tent.c new file mode 100644 index 00000000..b6abe3b6 --- /dev/null +++ b/src/data/field/mvactor/tent.c @@ -0,0 +1,8 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c tent_actable[2] = { + {SP_NPC_EV_SUMMERCAMP_0, 0, 0, 3, 3, -1, 0, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/title_demo.c b/src/data/field/mvactor/title_demo.c new file mode 100644 index 00000000..5118bd9a --- /dev/null +++ b/src/data/field/mvactor/title_demo.c @@ -0,0 +1,22 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c title_demo_actable[16] = { + {SP_NPC_STATION_MASTER, 3, 1, 5, 4, -1, -1, mRF_BLOCKKIND_NONE}, + {NPC_BOB, 1, 2, 3, 9, 0, -1, mRF_BLOCKKIND_NONE}, + {NPC_PAOLO, 1, 2, 5, 13, 1, -1, mRF_BLOCKKIND_NONE}, + {NPC_VESTA, 1, 4, 11, 14, 2, -1, mRF_BLOCKKIND_NONE}, + {NPC_JOEY, 2, 3, 7, 7, 3, -1, mRF_BLOCKKIND_NONE}, + {NPC_LOBO, 2, 3, 2, 14, 4, -1, mRF_BLOCKKIND_NONE}, + {NPC_CARRIE, 3, 5, 8, 7, 5, -1, mRF_BLOCKKIND_NONE}, + {NPC_TANK, 4, 3, 6, 13, 6, -1, mRF_BLOCKKIND_NONE}, + {NPC_BUZZ, 4, 4, 6, 5, 7, -1, mRF_BLOCKKIND_NONE}, + {NPC_RASHER, 4, 4, 12, 14, 8, -1, mRF_BLOCKKIND_NONE}, + {NPC_BIFF, 4, 6, 3, 8, 9, -1, mRF_BLOCKKIND_NONE}, + {NPC_SAMSON, 5, 2, 9, 2, 10, -1, mRF_BLOCKKIND_NONE}, + {NPC_JANE, 5, 2, 11, 13, 11, -1, mRF_BLOCKKIND_NONE}, + {NPC_TYBALT, 5, 4, 7, 3, 12, -1, mRF_BLOCKKIND_NONE}, + {NPC_CUBE, 5, 5, 5, 5, 13, -1, mRF_BLOCKKIND_NONE}, + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +}; diff --git a/src/data/field/mvactor/water_test.c b/src/data/field/mvactor/water_test.c new file mode 100644 index 00000000..f80dc377 --- /dev/null +++ b/src/data/field/mvactor/water_test.c @@ -0,0 +1,7 @@ +#include "m_field_make.h" +#include "m_random_field_h.h" +#include "m_name_table.h" + +mFM_move_actor_data_c water_test_actable[1] = { + {RSV_NO, 0, 0, 0, 0, 0, 0, mRF_BLOCKKIND_NONE} +};