Add aiLabel to setup's command_pointers array

This commit is contained in:
Ryan Dwyer 2019-10-04 23:43:42 +10:00
parent 4c1b603d15
commit 3ef569abfd
5 changed files with 24 additions and 2 deletions

View File

@ -167,6 +167,8 @@ $(B_DIR)/setup.elf: $(B_DIR)/setup.o
$(B_DIR)/ucode/setup.bin: $(B_DIR)/setup.elf
mkdir -p $(B_DIR)/ucode
$(TOOLCHAIN)-objcopy $< $@ -O binary
dd if="$@" of="$@.tmp" bs=200256 count=1
mv "$@.tmp" "$@"
################################################################################
# Rarezip

View File

@ -3,10 +3,20 @@ OUTPUT_ARCH (mips)
SECTIONS
{
.data 0x80059fe0 : AT(0x0000) {
.setup 0x80059fe0 : AT(0x0000) {
build/ntsc-final/setup.o (.data);
}
.game 0x7f000000 : AT(SIZEOF(.setup)) {
build/ntsc-final/game.o (.text);
build/ntsc-final/game.o (.data);
}
.gvars 0x80099fc0 : AT(SIZEOF(.setup) + SIZEOF(.game)) {
build/ntsc-final/gvars.o (.text);
build/ntsc-final/gvars.o (.data);
}
/DISCARD/ : {
* (.MIPS.abiflags);
* (.options);

View File

@ -1,6 +1,7 @@
#include "ultra64.h"
#include "src/include/constants.h"
#include "src/include/gvars.h"
#include "src/include/game.h"
GLOBAL_ASM(
glabel func0f000000

8
src/include/game.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef _IN_GAME_H
#define _IN_GAME_H
#include <ultra64.h>
#include "src/include/constants.h"
bool aiLabel(void);
#endif

View File

@ -1,4 +1,5 @@
#include <ultra64.h>
#include "src/include/game.h"
#include "src/include/setup.h"
#include "src/include/stagesetup.h"
#include "src/include/types.h"
@ -13948,7 +13949,7 @@ u32 var0000e4ac = 0x00000000;
u32 command_pointers[] = {
/*0x0000*/ 0x7f04dbc0,
/*0x0001*/ 0x7f04dbfc,
/*0x0002*/ 0x7f04dc3c,
/*0x0002*/ aiLabel,
/*0x0003*/ 0x7f04dc58,
/*0x0004*/ 0x7f04e0a8,
/*0x0005*/ 0x7f04dd08,