diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 8 | ||||
| -rw-r--r-- | include/graphics.h | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/global.h b/include/global.h index 83eb93eec..33a31bf4d 100644 --- a/include/global.h +++ b/include/global.h @@ -79,6 +79,14 @@ #define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) #define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr) +#define S16TOPOSFLOAT(val) \ +({ \ + s16 v = (val); \ + float f = (float)v; \ + if(v < 0) f += 65536.0f; \ + f; \ +}) + // Invalid Versions show as "----------" in Gen 4 and Gen 5's summary screen. // In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen. // In Gen 4 only, migrated Pokemon with Diamond, Pearl, or Platinum's ID show as "----------". diff --git a/include/graphics.h b/include/graphics.h index b51926b8d..e2889ed86 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4740,4 +4740,12 @@ extern const u32 gUnknown_08D8D58C[]; extern const u32 gPokedexAreaScreenAreaUnknown_Gfx[]; extern const u16 gPokedexAreaScreenAreaUnknown_Pal[]; +// Cable Car +extern const u32 gUnknown_08DBA5B8[]; +extern const u16 gUnknown_08DBA518[]; +extern const u32 gCableCar_Gfx[]; +extern const u32 gCableCarDoor_Gfx[]; +extern const u32 gCableCarCord_Gfx[]; +extern const u16 gCableCar_Pal[]; + #endif //GUARD_GRAPHICS_H |