diff options
| author | Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> | 2024-07-06 09:47:49 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-06 09:47:49 -0300 |
| commit | c348962cab034335f5eb1ee4bc2ed4851f40542e (patch) | |
| tree | d3fffe889776bc638195982b3f16852c09cd834d /linker_scripts | |
| parent | 24e316a2b26ff768f15ec217798898b4b0a7b8f9 (diff) | |
Sector Z, Fortuna & General Docs (#261)
* Sector Z Docs initial
* Sector Z docs
* some other things
* correction
* Space Junk
* SectorZ_SetLevelObjects
* rename assets with correct prefix
* aSzBackgroundTex
* details
* pr review
* Sector X initials
* Meteo Initials
* Sector X things I forgot
* fox_tr360 & fox_ve1 & fox_so initials
* fox_so details
* Zones initials
* More Zones initials
* more zones initials
* area 6 initials
* fortuna inits
* fortuna actors
* some more docs
* more docs for Fortuna
* fix mistake in data incorrectly imported
* Fortuna Radars
* BossFO
* Sector Y Initials
* Venom 2 general Docs
* Some Corneria Docs
* Actor, Scenery and Boss IDs in update and draw functions of gObjectInfo
* more docs and this usage
* fox_360 this usage
* more actor types and this usages
* fox_effect type usage
* training docs
* some Sector X docs
* fix incorrect usage of "this"
* fix comment
* more docs
* funcNames
* fox_bg spacing
* boolean
* scenery corneria bumbs
* terrain bumps
* corneria arch
* more corneria objects
* hitboxes
* more corneria objects
* more corneria level objects
* more corneria objects
* aCoWaterfallDL
* corneria docs
* more corneria docs
* Granga swork start
* corneria swork
* Corneria
* Corneria Granga docs
* more granga docs
* granga work buffer enum
* CarrierParts enum use
* option
* Corneria Docs
* GRANGA_FWK
* fox_co.h header
* fix Fault_FillRectangle typo
* PR reviews
* sCsTeamInitialPos
* Doodad
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/us/rev1/symbol_addrs.txt | 2 | ||||
| -rw-r--r-- | linker_scripts/us/rev1/symbol_addrs_engine.txt | 32 | ||||
| -rw-r--r-- | linker_scripts/us/rev1/symbol_addrs_overlays.txt | 22 |
3 files changed, 28 insertions, 28 deletions
diff --git a/linker_scripts/us/rev1/symbol_addrs.txt b/linker_scripts/us/rev1/symbol_addrs.txt index 3e708ccf..9b9dbbec 100644 --- a/linker_scripts/us/rev1/symbol_addrs.txt +++ b/linker_scripts/us/rev1/symbol_addrs.txt @@ -153,7 +153,7 @@ D_800D8594 = 0x800D8594; // force_migration:True D_800C93EC = 0x800C93EC; // force_migration:True D_i1_8019B1EC = 0x8019B1EC; // force_migration:True segment:ovl_i1 -D_i1_8019B6D8 = 0x8019B6D8; // size:0x110 segment:ovl_i1 +sCoGrangaWork = 0x8019B6D8; // size:0x110 segment:ovl_i1 D_i3_801C171C = 0x801C171C; // force_migration:True segment:ovl_i3 D_i3_801C1728 = 0x801C1728; // force_migration:True segment:ovl_i3 D_i3_801C1730 = 0x801C1730; // force_migration:True segment:ovl_i3 diff --git a/linker_scripts/us/rev1/symbol_addrs_engine.txt b/linker_scripts/us/rev1/symbol_addrs_engine.txt index 08b68111..d3f16df6 100644 --- a/linker_scripts/us/rev1/symbol_addrs_engine.txt +++ b/linker_scripts/us/rev1/symbol_addrs_engine.txt @@ -176,13 +176,13 @@ Actor202_Draw = 0x80059A24; MeteoTunnel_Draw = 0x80059AEC; Scenery_DrawTitaniaBones = 0x80059B20; func_edisplay_80059BB0 = 0x80059BB0; -Scenery42_Draw = 0x80059BBC; +CoIBeam_Draw = 0x80059BBC; Actor196_Draw = 0x80059BF0; func_edisplay_80059C28 = 0x80059C28; Sprite167_Draw = 0x80059C34; FogShadow_Draw = 0x80059C40; -func_edisplay_80059F68 = 0x80059F68; -func_edisplay_80059FDC = 0x80059FDC; +CoBuilding9_Draw = 0x80059F68; +CoBuilding10_Draw = 0x80059FDC; func_edisplay_8005A010 = 0x8005A010; func_edisplay_8005A07C = 0x8005A07C; func_edisplay_8005A088 = 0x8005A088; @@ -190,12 +190,12 @@ ActorDebris_Draw = 0x8005A094; Actor_DrawEngineAndContrails = 0x8005ADAC; Actor_DrawEngineGlow = 0x8005B1E8; func_edisplay_8005B388 = 0x8005B388; -func_edisplay_8005B6A4 = 0x8005B6A4; -func_edisplay_8005B71C = 0x8005B71C; -func_edisplay_8005B7CC = 0x8005B7CC; -func_edisplay_8005B848 = 0x8005B848; -func_edisplay_8005B9A4 = 0x8005B9A4; -func_edisplay_8005BA30 = 0x8005BA30; +Actor180_Draw = 0x8005B6A4; +Actor182_Draw = 0x8005B71C; +Actor186_Draw = 0x8005B7CC; +Actor190_191_Draw = 0x8005B848; +Actor192_Draw = 0x8005B9A4; +Actor193_Draw = 0x8005BA30; func_edisplay_8005BAAC = 0x8005BAAC; Object_SetShadowDL = 0x8005BAB4; ItemCheckpoint_Draw = 0x8005C5F0; @@ -237,7 +237,7 @@ BonusText_Display = 0x80077240; func_effect_8007783C = 0x8007783C; func_effect_80079618 = 0x80079618; func_effect_8007A568 = 0x8007A568; -func_effect_8007A6F0 = 0x8007A6F0; +Effect_SpawnTimedSfxAtPos = 0x8007A6F0; func_effect_8007A900 = 0x8007A900; func_effect_8007AFD0 = 0x8007AFD0; func_effect_8007B8F8 = 0x8007B8F8; @@ -297,19 +297,19 @@ func_enmy_8006546C = 0x8006546C; func_enmy_800654E4 = 0x800654E4; func_enmy_800655C8 = 0x800655C8; func_enmy_8006566C = 0x8006566C; -func_enmy_800656D4 = 0x800656D4; +Actors190_191_Update = 0x800656D4; func_enmy_800660F0 = 0x800660F0; Actor_Despawn = 0x80066254; -func_enmy_8006654C = 0x8006654C; +Actor192_Update = 0x8006654C; func_enmy_8006684C = 0x8006684C; -func_enmy_800669A0 = 0x800669A0; -func_enmy_80066A80 = 0x80066A80; +Actor193_Update = 0x800669A0; +Actor180_Update = 0x80066A80; func_enmy_80066A8C = 0x80066A8C; func_enmy_80066C00 = 0x80066C00; -func_enmy_80066D5C = 0x80066D5C; +CoBuilding9_Update = 0x80066D5C; func_enmy_80066E80 = 0x80066E80; Sprite167_Update = 0x80066E8C; -func_enmy_80066EA8 = 0x80066EA8; +SceneryRotateTowardsCamera = 0x80066EA8; func_enmy_80066EE4 = 0x80066EE4; Item_CheckBounds = 0x80066EF0; Item_SpinPickup = 0x800671D0; diff --git a/linker_scripts/us/rev1/symbol_addrs_overlays.txt b/linker_scripts/us/rev1/symbol_addrs_overlays.txt index 9a1bc028..1ceb0b8e 100644 --- a/linker_scripts/us/rev1/symbol_addrs_overlays.txt +++ b/linker_scripts/us/rev1/symbol_addrs_overlays.txt @@ -1,8 +1,8 @@ -Corneria_8018ED78 = 0x8018ED78;//segment:ovl_i1 -Corneria_8018EE84 = 0x8018EE84;//segment:ovl_i1 -Corneria_8018B0B4 = 0x8018B0B4;//segment:ovl_i1 -Corneria_Boss292_Init = 0x801878D8;//segment:ovl_i1 -Corneria_Boss293_Init = 0x8018BE7C;//segment:ovl_i1 +Corneria_Boss294_Draw = 0x8018ED78;//segment:ovl_i1 +Corneria_Boss295_Draw = 0x8018EE84;//segment:ovl_i1 +Corneria_IBeam_Init = 0x8018B0B4;//segment:ovl_i1 +Corneria_Granga_Init = 0x801878D8;//segment:ovl_i1 +Corneria_Carrier_Init = 0x8018BE7C;//segment:ovl_i1 Venom1_8019250C = 0x8019250C;//segment:ovl_i1 Venom1_80192CB0 = 0x80192CB0;//segment:ovl_i1 Venom1_80192EA4 = 0x80192EA4;//segment:ovl_i1 @@ -97,16 +97,16 @@ Aquas_801AC8A8 = 0x801AC8A8;//segment:ovl_i3 Aquas_801AD688 = 0x801AD688;//segment:ovl_i3 Aquas_801AE3AC = 0x801AE3AC;//segment:ovl_i3 Aquas_801AF9FC = 0x801AF9FC;//segment:ovl_i3 -Aquas_801AFA5C = 0x801AFA5C;//segment:ovl_i3 +Aquas_Actor257_Update = 0x801AFA5C;//segment:ovl_i3 Aquas_801B0F88 = 0x801B0F88;//segment:ovl_i3 Aquas_801B0FCC = 0x801B0FCC;//segment:ovl_i3 Aquas_801B1008 = 0x801B1008;//segment:ovl_i3 Aquas_BossAq_Init = 0x801B10F8;//segment:ovl_i3 Aquas_Boss_Update = 0x801B134C;//segment:ovl_i3 Aquas_801B6344 = 0x801B6344;//segment:ovl_i3 -Aquas_801B638C = 0x801B638C;//segment:ovl_i3 +Aquas_Actor259_Update = 0x801B638C;//segment:ovl_i3 Aquas_801B6E54 = 0x801B6E54;//segment:ovl_i3 -Aquas_801B6FF8 = 0x801B6FF8;//segment:ovl_i3 +Aquas_Actor262_Update = 0x801B6FF8;//segment:ovl_i3 Aquas_801B7AF0 = 0x801B7AF0;//segment:ovl_i3 Aquas_801BA57C = 0x801BA57C;//segment:ovl_i3 Aquas_801BB26C = 0x801BB26C;//segment:ovl_i3 @@ -157,7 +157,7 @@ D_i3_801C27A0 = 0x801C27A0; //segment:ovl_i3 size:0x20 Katina_UpdateEvents = 0x80198594;//segment:ovl_i4 Katina_BossSetup = 0x80193CA4;//segment:ovl_i4 SectorZ_Missile_Update = 0x80199C60;//segment:ovl_i4 -SectorZ_80199900 = 0x80199900;//segment:ovl_i4 +SectorZ_MissileExplode = 0x80199900;//segment:ovl_i4 D_i4_801A03C0 = 0x801A03C0;//segment:ovl_i4 D_BO_8019EE80 = 0x8019EE80;//segment:ovl_i4 D_BO_801A03DC = 0x801A03DC;//segment:ovl_i4 @@ -213,8 +213,8 @@ D_i5_801B7630 = 0x801B7630;//size:0x24 segment:ovl_i5 Andross_801888F4 = 0x801888F4; //segment:ovl_i6 SectorY_Boss314_Init = 0x80197CC4; //segment:ovl_i6 Andross_Boss320_Init = 0x8018D16C; //segment:ovl_i6 -D_i6_801A68B0 = 0x801A68B0;//size:0x48 type:Vec3f segment:ovl_i6 -D_i6_801A68F8 = 0x801A68F8;//size:0xC type:f32 segment:ovl_i6 +sTeamInitPos = 0x801A68B0;//size:0x48 type:Vec3f segment:ovl_i6 +sTeamInitRot = 0x801A68F8;//size:0xC type:f32 segment:ovl_i6 D_i6_801A7F30 = 0x801A7F30; //segment:ovl_i6 D_Andross_801A7F58 = 0x801A7F58; //segment:ovl_i6 D_Andross_801A7F60 = 0x801A7F60; //segment:ovl_i6 |
