1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-25 22:26:12 +00:00

Move last 3 functions in z_message_PAL.c to a separate file (#158)

There is padding in 1.0 here, and rodata is also 16 bytes aligned at this point.
This commit is contained in:
Roman971 2020-05-26 16:32:18 +02:00 committed by GitHub
parent 2c5ad24c3f
commit 1bb3e006cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 46 additions and 33 deletions

View file

@ -0,0 +1,36 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .rodata
.align 4
glabel jtbl_80154CF0
.word L80110520
.word L80110960
.word L80110748
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L8011079C
.word L801107D8
.word L801108A4
.word L801108E8
.word L8011092C

View file

@ -788,30 +788,3 @@ glabel jtbl_80154CC4
.word L8010FDB0
.word L8010FE10
.word L8010FE58
.balign 16
glabel jtbl_80154CF0
.word L80110520
.word L80110960
.word L80110748
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L80110960
.word L8011079C
.word L801107D8
.word L801108A4
.word L801108E8
.word L8011092C

2
spec
View file

@ -550,6 +550,8 @@ beginseg
include "build/src/code/z_message_PAL.o"
include "build/data/z_message_PAL.rodata.o"
include "build/data/z_message_PAL.bss.o"
include "build/src/code/code_80110450.o"
include "build/data/code_80110450.rodata.o"
include "build/src/code/z_construct.o"
include "build/data/rsp.text.o"
include "build/data/rsp.rodata.o"

8
src/code/code_80110450.c Normal file
View file

@ -0,0 +1,8 @@
#include <ultra64.h>
#include <global.h>
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80110450/func_80110450.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80110450/func_80110460.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80110450/func_801104C8.s")

View file

@ -64,9 +64,3 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_8010F6F0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_8011040C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_80110450.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_80110460.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_801104C8.s")