diff options
| author | Leonid Kapitonov <Feacur@gmail.com> | 2024-12-07 20:27:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-07 12:27:42 -0700 |
| commit | 8e5451997741a70edf39d7840074f262005b0988 (patch) | |
| tree | 4c6aaf584d484897d91777e2be7d1e07a19dc540 /linker_scripts/jp | |
| parent | 7c055329a7a71f8652587cb7dc779ac3eb69f5d4 (diff) | |
`ac_house_goki` OK (#229)
* prepare unknown size
* move `.data` to the C side
* remove redundant headers
* aHG_actor_ct OK
* func_80A83770_jp OK (rename to `aHG_actor_dt`)
* aHG_actor_move OK
- fix `mCoBG_CheckResult` description and comments
- extend `MyRoomClip` and fix offsets in comments
* func_80A83780_jp OK
* func_80A83930_jp OK
* func_80A83994_jp OK
* func_80A83A00_jp OK
* func_80A8401C_jp OK
* func_80A8409C_jp OK (rename to `aHG_setup_action`)
* aHG_actor_draw OK
* func_80A83D4C_jp OK
* func_80A83A24_jp OK
* name HG models
* put static HG data into the functions
* func_80A837C4_jp OK
* add notes and clean up a bit
* apply a suggestion by @hensldm
* remove ASM pragmas
* extract assets
Diffstat (limited to 'linker_scripts/jp')
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_assets.txt | 7 | ||||
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_overlays.txt | 10 | ||||
| -rw-r--r-- | linker_scripts/jp/undefined_syms.ld | 3 |
3 files changed, 14 insertions, 6 deletions
diff --git a/linker_scripts/jp/symbol_addrs_assets.txt b/linker_scripts/jp/symbol_addrs_assets.txt index 4ad3bd9..16a412b 100644 --- a/linker_scripts/jp/symbol_addrs_assets.txt +++ b/linker_scripts/jp/symbol_addrs_assets.txt @@ -1263,6 +1263,13 @@ tol_hata_01_evw_anime = 0x60003F0; // segment:tol_hata_01 rom:0x11303F0 glider_v = 0x6000000; // segment:glider rom:0x113C000 size:0xB0 glider_model = 0x60000B0; // segment:glider rom:0x113C0B0 +act_house_goki_vtx_1 = 0x6000000; // segment:act_house_goki rom:0x1147000 size:0x60 +act_house_goki_vtx_2 = 0x6000060; // segment:act_house_goki rom:0x1147060 size:0x60 +act_house_goki_model_1 = 0x60000C0; // segment:act_house_goki rom:0x11470C0 +act_house_goki_model_2 = 0x6000188; // segment:act_house_goki rom:0x1147188 +act_house_goki_pal = 0x6000250; // segment:act_house_goki rom:0x1147250 +act_house_goki_tex = 0x6000270; // segment:act_house_goki rom:0x1147270 + act_bee_v = 0x6000000; // segment:act_bee rom:0x11F4000 size:0x3A0 act_bee_C_model = 0x60003A0; // segment:act_bee rom:0x11F43A0 act_bee_B_model = 0x60004B8; // segment:act_bee rom:0x11F44B8 diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt index 493db2a..1277f88 100644 --- a/linker_scripts/jp/symbol_addrs_overlays.txt +++ b/linker_scripts/jp/symbol_addrs_overlays.txt @@ -19474,7 +19474,7 @@ D_80A8365C_jp = 0x80A8365C; // // .text aHG_actor_ct = 0x80A836C0; // type:func -func_80A83770_jp = 0x80A83770; // type:func +aHG_actor_dt = 0x80A83770; // type:func func_80A83780_jp = 0x80A83780; // type:func func_80A837C4_jp = 0x80A837C4; // type:func func_80A83930_jp = 0x80A83930; // type:func @@ -19483,16 +19483,16 @@ func_80A83A00_jp = 0x80A83A00; // type:func func_80A83A24_jp = 0x80A83A24; // type:func func_80A83D4C_jp = 0x80A83D4C; // type:func func_80A8401C_jp = 0x80A8401C; // type:func -func_80A8409C_jp = 0x80A8409C; // type:func +aHG_setup_action = 0x80A8409C; // type:func aHG_actor_move = 0x80A840E8; // type:func aHG_actor_draw = 0x80A84480; // type:func // .data House_Goki_Profile = 0x80A845A0; // -D_80A845C4_jp = 0x80A845C4; // -D_80A845D0_jp = 0x80A845D0; // -D_80A845DC_jp = 0x80A845DC; // +init_process = 0x80A845C4; // +process = 0x80A845D0; // allow_duplicated:true +aHG_models = 0x80A845DC; // // .rodata diff --git a/linker_scripts/jp/undefined_syms.ld b/linker_scripts/jp/undefined_syms.ld index e07480f..61812c4 100644 --- a/linker_scripts/jp/undefined_syms.ld +++ b/linker_scripts/jp/undefined_syms.ld @@ -4739,7 +4739,8 @@ D_6000E60 = 0x06000E60; // ovl_House_Goki -D_60000C0 = 0x060000C0; +aHG_model_1 = 0x060000C0; +aHG_model_2 = 0x06000188; // ovl__00944930 |