Merge branch 'rc' into release

# Conflicts:
#	README.md

Author: fenhl

.github/workflows/python.yml

@@ -15,9 +15,9 @@ jobs:
         python-version: ["3.8"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run checks
@@ -31,9 +31,9 @@ jobs:
         python-version: ["3.x"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run checks
@@ -47,9 +47,9 @@ jobs:
         python-version: ["3.x"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run checks

ASM/Makefile

@@ -34,7 +34,7 @@ $(OBJDIR):
 	mkdir -p $@
 
 $(OBJDIR)/%_bin.o: $(RESOURCEDIR)/%.bin
-	$(OBJCOPY) -I binary -O elf32-bigmips --rename-section .data=.rodata,alloc,load,readonly,data,contents $< $@
+	$(OBJCOPY) -I binary -O elf32-bigmips --set-section-alignment .data=8 --rename-section .data=.rodata,alloc,load,readonly,data,contents $< $@
 	$(OBJCOPY) --redefine-sym _binary_resources_$*_bin_start=$(call UC,$*)_RESOURCE $@
 	$(OBJCOPY) --redefine-sym _binary_resources_$*_bin_end=$(call UC,$*)_RESOURCE_END $@
 	$(OBJCOPY) --redefine-sym _binary_resources_$*_bin_size=$(call UC,$*)_RESOURCE_SIZE $@

ASM/README.md

@@ -58,14 +58,16 @@ You'll need to disable `Unique Game Save Directory` in Project64 for these to wo
 
 How to use the Debug mode: 
 - First put the DEBUG_MODE variable at 1 in debug.h.
-- You will then have access to a hidden menu with the following options:
+- Now the N64 logo sequence at the start of the game will be skipped, the L button will allow you to levitate and you will then have access to a hidden menu with the following options:
   - Instant warps to Dungeons, Bosses or Overworld locations
   - Item inventory edits
   - Instant age switch with the current location kept
-  - Bunny Hood applied on
-The menu will appear if you press either L+R or Dpad-Up according to what you set for the menu_not_on_dup variable in debug.c.
+  - Bunny Hood
+  - In-game clock
+  - Actor and overlay list
+  - Scene flags setters
+The menu will appear if you press R + either L or Dpad Up.
 Use Dpad-Left/Dpad-Right and A/B to navigate it.
-The L Button will also allow you to levitate.
 The warps and items are easily customizable with the code at the top of debug.c.
 - Additionally, you can call functions to print numbers on screen, to help you debug new features.
 Call either draw_debug_int or draw_debug_float in your code, with the first argument being the number wanted to be displayed, and the 

ASM/build.py

@@ -124,20 +124,25 @@
 PAYLOAD_START = int(symbols['PAYLOAD_START']['address'], 16)
 PAYLOAD_END = int(symbols['PAYLOAD_END']['address'], 16)
 data_symbols = {}
+patch_symbols = {}
 for (name, sym) in symbols.items():
     if sym['type'] == 'data':
         addr = int(sym['address'], 16)
         if PAYLOAD_START <= addr < PAYLOAD_END:
             addr = addr - 0x80400000 + 0x03480000
+            data_symbols[name] = {
+                'address': f'{addr:08X}',
+                'length': sym.get('length', 0),
+            }
         else:
-            continue
-        data_symbols[name] = {
-            'address': f'{addr:08X}',
-            'length': sym.get('length', 0),
-        }
+            patch_symbols[name] = addr
+
 with open('../data/generated/symbols.json', 'w') as f:
     json.dump(data_symbols, f, indent=4, sort_keys=True)
 
+with open('../data/generated/patch_symbols.json', 'w') as f:
+    json.dump(patch_symbols, f, indent=4, sort_keys=True)
+
 if pj64_sym_path:
     pj64_sym_path = os.path.realpath(pj64_sym_path)
     with open(pj64_sym_path, 'w') as f: