diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/code/m_npc.c | 2 | ||||
| -rw-r--r-- | src/code/m_private.c | 2 | ||||
| -rw-r--r-- | src/code/m_scene.c | 2 | ||||
| -rw-r--r-- | src/code/m_scene_ftr.c | 44 | ||||
| -rw-r--r-- | src/code/m_start_data_init.c | 2 | ||||
| -rw-r--r-- | src/overlays/gamestates/ovl_play/m_play.c | 2 |
6 files changed, 49 insertions, 5 deletions
diff --git a/src/code/m_npc.c b/src/code/m_npc.c index f9e8fcd..1c85824 100644 --- a/src/code/m_npc.c +++ b/src/code/m_npc.c @@ -5,7 +5,7 @@ #include "m_time.h" #include "m_field_info.h" #include "m_mail_check.h" -#include "6E30B0.h" +#include "6E3240.h" #include "m_string.h" #include "m_handbill.h" #include "m_std_dma.h" diff --git a/src/code/m_private.c b/src/code/m_private.c index b799f9a..7560a8d 100644 --- a/src/code/m_private.c +++ b/src/code/m_private.c @@ -6,7 +6,7 @@ #include "m_player_lib.h" #include "6E2300.h" #include "m_field_info.h" -#include "6E30B0.h" +#include "6E3240.h" #include "69CB30.h" #include "m_handbill.h" #include "m_house.h" diff --git a/src/code/m_scene.c b/src/code/m_scene.c index 8c5ba7a..3f27d44 100644 --- a/src/code/m_scene.c +++ b/src/code/m_scene.c @@ -13,7 +13,7 @@ #include "m_player_lib.h" #include "m_std_dma.h" #include "m_scene_table.h" -#include "6E30B0.h" +#include "m_scene_ftr.h" #include "m_player_lib.h" #include "overlays/actors/player_actor/m_player.h" diff --git a/src/code/m_scene_ftr.c b/src/code/m_scene_ftr.c new file mode 100644 index 0000000..7e54fc0 --- /dev/null +++ b/src/code/m_scene_ftr.c @@ -0,0 +1,44 @@ +#include "m_scene_ftr.h" +#include "overlays/gamestates/ovl_play/m_play.h" + +void mScn_Dma2Bank(ObjectExchangeBank* exchange, s32 id, RomOffset vrom, size_t size) { + + if (vrom != NULL) { + DmaMgr_RequestSyncDebug(exchange->status[id + 3].unk14.vram, vrom, size, "../m_scene_ftr.c", 52); + } +} + +void mScn_KeepMyRoomBankNew(ObjectExchangeBank* exchange, s16 id, size_t size) { + ObjectStatus* bank = exchange->status + exchange->num; + + bank->id = id; + bank->vram = (void*)exchange->unk1800; + bank->segment = (void*)exchange->unk1800; + bank->size = size; + + if (exchange->num < (OBJECT_EXCHANGE_BANK_MAX - 1)) { + exchange->unk1800 = ALIGN16(exchange->unk1800 + size); + exchange->num++; + } +} + +void mScn_ObtainCarpetBank(Game_Play* play) { + ObjectExchangeBank* exchange = &play->objectExchangeBank; + s32 i; + + for (i = 0; i < 2; i++) { + mScn_KeepMyRoomBankNew(exchange, 18, 0x2020); + } + + for (i = 0; i < 2; i++) { + mScn_KeepMyRoomBankNew(exchange, 19, 0x1020); + } +} + +s32 mScn_ObtainFurnitureBank(UNUSED Game_Play* play, s32 bank) { + common_data.clip.unk_020 = bank; +} + +void mScn_ObtainMyRoomBank(Game_Play* play) { + mScn_ObtainCarpetBank(play); +} diff --git a/src/code/m_start_data_init.c b/src/code/m_start_data_init.c index 115182b..b936e89 100644 --- a/src/code/m_start_data_init.c +++ b/src/code/m_start_data_init.c @@ -7,7 +7,7 @@ #include "6C97F0.h" #include "6D9D80.h" #include "6DA460.h" -#include "6E30B0.h" +#include "6E3240.h" #include "m_string.h" #include "6ECD90.h" #include "6EDD10.h" diff --git a/src/overlays/gamestates/ovl_play/m_play.c b/src/overlays/gamestates/ovl_play/m_play.c index 33b75c4..0f5f6a2 100644 --- a/src/overlays/gamestates/ovl_play/m_play.c +++ b/src/overlays/gamestates/ovl_play/m_play.c @@ -13,7 +13,7 @@ #include "6EDD10.h" #include "69E2C0.h" #include "683030.h" -#include "6E30B0.h" +#include "6E3240.h" #include "6C97F0.h" #include "6EFC20.h" #include "67D890.h" |
