diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-07-04 12:21:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-04 21:21:57 +0200 |
| commit | 929c5cfa5a18effef4ef76e61282dd774b3deb1b (patch) | |
| tree | 902fba539d9a30cc7aae3761f4ba5d2c34af83e8 /asm/d/map/d_map_path_dmap | |
| parent | b68cfbc0e6a66e9ef46ab01264dbe9e92b65bf8e (diff) | |
d_menu_save / pane_class / rename some data (#205)
* work on fop actor / actor mng, daalink, d_a_obj_item
* d_a_title mostly decompiled
* daalink / d_event / JMessage / dmsg_out_font work
* msg_scrn_base / msg_scrn_boss
* some work on mDo machine, d_menu_save, d_tresure, and various
* remove asm
* progress
* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data
* rename more data
* remove asm / progress
* match all of d_pane_class
* fixes / some dKankyo doc
Diffstat (limited to 'asm/d/map/d_map_path_dmap')
3 files changed, 3 insertions, 3 deletions
diff --git a/asm/d/map/d_map_path_dmap/drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib.s b/asm/d/map/d_map_path_dmap/drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib.s index 46853e8c84..230f1175b4 100644 --- a/asm/d/map/d_map_path_dmap/drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib.s +++ b/asm/d/map/d_map_path_dmap/drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib.s @@ -7,7 +7,7 @@ lbl_80040838: /* 8004084C 7C 9D 23 78 */ mr r29, r4 /* 80040850 7C BE 2B 78 */ mr r30, r5 /* 80040854 7C FF 3B 78 */ mr r31, r7 -/* 80040858 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80040858 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8004085C 7C 00 07 74 */ extsb r0, r0 /* 80040860 7C 1E 00 00 */ cmpw r30, r0 /* 80040864 41 82 00 0C */ beq lbl_80040870 diff --git a/asm/d/map/d_map_path_dmap/getMapPlayerAngleY__10dMapInfo_nFv.s b/asm/d/map/d_map_path_dmap/getMapPlayerAngleY__10dMapInfo_nFv.s index 18372893d0..93c09b1965 100644 --- a/asm/d/map/d_map_path_dmap/getMapPlayerAngleY__10dMapInfo_nFv.s +++ b/asm/d/map/d_map_path_dmap/getMapPlayerAngleY__10dMapInfo_nFv.s @@ -1,5 +1,5 @@ lbl_8003EF20: -/* 8003EF20 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8003EF20 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8003EF24 7C 00 07 74 */ extsb r0, r0 /* 8003EF28 38 60 00 00 */ li r3, 0 /* 8003EF2C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ diff --git a/asm/d/map/d_map_path_dmap/getMapPlayerPos__10dMapInfo_nFv.s b/asm/d/map/d_map_path_dmap/getMapPlayerPos__10dMapInfo_nFv.s index 54a49654b0..c03c664b50 100644 --- a/asm/d/map/d_map_path_dmap/getMapPlayerPos__10dMapInfo_nFv.s +++ b/asm/d/map/d_map_path_dmap/getMapPlayerPos__10dMapInfo_nFv.s @@ -23,7 +23,7 @@ lbl_8003EEA4: /* 8003EEAC D0 01 00 0C */ stfs f0, 0xc(r1) /* 8003EEB0 D0 01 00 10 */ stfs f0, 0x10(r1) lbl_8003EEB4: -/* 8003EEB4 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8003EEB4 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8003EEB8 7C 00 07 74 */ extsb r0, r0 /* 8003EEBC 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ /* 8003EEC0 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ |