diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-31 02:12:41 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-31 02:12:41 +0100 |
| commit | 109b1020dcbfa17e80d28c522b5d792f7b3c6d46 (patch) | |
| tree | cf23c1134de2891d0eed3b55549e70b29eb1997f /linker.ld | |
| parent | 957da774e4c34100e0bd352b1570af02bb7f7521 (diff) | |
| parent | 9c87bcca8ea4b52199ed908c0ea28ab08b1d0747 (diff) | |
Merge branch 'master' into tilemap-docs
Diffstat (limited to 'linker.ld')
| -rw-r--r-- | linker.ld | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -128,8 +128,8 @@ SECTIONS { . = 0x000010A0; gRoomTransition = .; . = 0x00001150; gRand = .; . = 0x00001160; gPlayerEntity = .; - . = 0x000011E8; gItemGetEntities = .; - . = 0x000015A0; gUnk_030015A0 = .; + . = 0x000011E8; gAuxPlayerEntities = .; + . = 0x000015A0; gEntities = .; . = 0x00003BE0; gCarriedEntity = .; . = 0x00003C70; gUnk_03003C70 = .; . = 0x00003D70; gEntityLists = .; |