mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-06-11 21:19:23 -04:00
load course dl textures from otr and move objects
This commit is contained in:
@@ -4,9 +4,8 @@
|
||||
#include <memory>
|
||||
|
||||
#include "Skyscraper.h"
|
||||
#include "GameObject.h"
|
||||
#include "World.h"
|
||||
#include "engine/vehicles/OBombKart.h"
|
||||
#include "engine/objects/OBombKart.h"
|
||||
#include "assets/skyscraper_data.h"
|
||||
|
||||
extern "C" {
|
||||
@@ -33,11 +32,38 @@ extern "C" {
|
||||
extern s16 currentScreenSection;
|
||||
}
|
||||
|
||||
const course_texture skyscraper_textures[] = {
|
||||
{ gTexture6457D8, 0x0160, 0x0800, 0x0 },
|
||||
{ gTexture6462C0, 0x01B9, 0x0800, 0x0 },
|
||||
{ gTexture6864E8, 0x0807, 0x1000, 0x0 },
|
||||
{ gTexture686CF0, 0x08B7, 0x1000, 0x0 },
|
||||
{ gTexture6875A8, 0x093F, 0x1000, 0x0 },
|
||||
{ gTexture687EE8, 0x0883, 0x1000, 0x0 },
|
||||
{ gTexture68876C, 0x0AC2, 0x1000, 0x0 },
|
||||
{ gTexture689230, 0x09CE, 0x1000, 0x0 },
|
||||
{ gTexture689C00, 0x0884, 0x1000, 0x0 },
|
||||
{ gTexture68A484, 0x07D6, 0x1000, 0x0 },
|
||||
{ gTexture68AC5C, 0x0A47, 0x1000, 0x0 },
|
||||
{ gTexture68B6A4, 0x07C5, 0x1000, 0x0 },
|
||||
{ gTexture68BE6C, 0x04A1, 0x1000, 0x0 },
|
||||
{ gTexture68C310, 0x030D, 0x1000, 0x0 },
|
||||
{ gTexture64B8D8, 0x0177, 0x0800, 0x0 },
|
||||
{ gTexture645660, 0x0176, 0x0800, 0x0 },
|
||||
{ gTextureNumberYellowBlue1, 0x01AE, 0x0800, 0x0 },
|
||||
{ gTextureNumberYellowBlue2, 0x01C6, 0x0800, 0x0 },
|
||||
{ gTextureNumberYellowBlue3, 0x01CC, 0x0800, 0x0 },
|
||||
{ gTextureNumberYellowBlue4, 0x01E4, 0x0800, 0x0 },
|
||||
{ gTexture668608, 0x0120, 0x0800, 0x0 },
|
||||
{ gTexture67B75C, 0x0108, 0x0800, 0x0 },
|
||||
{ gTexture6835F0, 0x0252, 0x1000, 0x0 },
|
||||
{ 0x00000000, 0x0000, 0x0000, 0x0 },
|
||||
};
|
||||
|
||||
Skyscraper::Skyscraper() {
|
||||
this->vtx = d_course_skyscraper_vertex;
|
||||
this->gfx = d_course_skyscraper_packed_dls;
|
||||
this->gfxSize = 548;
|
||||
this->textures = skyscraper_textures;
|
||||
Props.textures = skyscraper_textures;
|
||||
Props.MinimapTexture = gTextureCourseOutlineSkyscraper;
|
||||
Props.D_800E5548[0] = 64;
|
||||
Props.D_800E5548[1] = 64;
|
||||
|
||||
Reference in New Issue
Block a user