1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-17 13:24:45 +00:00

Migrated rodata (#199)

This commit is contained in:
Lucas Shaw 2020-06-09 09:06:23 -07:00 committed by GitHub
parent 8afab54c23
commit a0ef48e987
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 995 additions and 890 deletions

View file

@ -40,8 +40,6 @@
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s")
extern const char D_8082FD78[], D_8082FD94[];
void KaleidoScope_Draw(GlobalContext* globalCtx) {
Input* input = &globalCtx->state.input[0];
PauseContext* pauseCtx = &globalCtx->pauseCtx;
@ -49,7 +47,7 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[4];
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, D_8082FD78, 3188);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3188);
pauseCtx->inputX = input->rel.in.x;
pauseCtx->inputY = input->rel.in.y;
@ -84,7 +82,7 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) {
func_808161AC(globalCtx);
}
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, D_8082FD94, 3254);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3254);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082650C.s")