dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1903 from GriffinRichards/frontier-gfx

Browse Source 
Fix some frontier gfx, adjacent cleanup
This commit is contained in:
GriffinR
2023-08-10 14:49:44 -04:00
committed by GitHub
parent d1c2a30149 079f2da0f6
commit 60a6c9d160
21 changed files with 435 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/trainer_hill.h
View File

@@ -55,7 +55,7 @@
#define TRAINER_HILL_OTID 0x10000000
// The full map of each Trainer Hill floor is 16x21.
// The first 5x21 at the top is the entrance/exit area,
// The first 16x5 at the top is the entrance/exit area,
// and the remaining 16x16 is the randomized portion of
// the room where the trainers are.
#define HILL_FLOOR_WIDTH 16

6
include/graphics.h
View File

@@ -5018,9 +5018,9 @@ extern const u32 gPokenavOptions_Gfx[];
extern const u16 gPokenavOptions_Pal[];
// Battle Factory Screen
extern const u16 gFrontierFactorySelectMenu_Gfx[];
extern const u16 gFrontierFactorySelectMenu_Tilemap[];
extern const u16 gFrontierFactorySelectMenu_Pal[];
extern const u16 gFrontierFactoryMenu_Gfx[34 * TILE_SIZE_4BPP / 2];
extern const u16 gFrontierFactoryMenu_Tilemap[];
extern const u16 gFrontierFactoryMenu_Pal[];
// Object event pals
extern const u16 gObjectEventPal_Brendan[];

2
include/script_menu.h
View File

@@ -1,6 +1,8 @@
#ifndef GUARD_SCRIPT_MENU_H
#define GUARD_SCRIPT_MENU_H
#include "constants/script_menu.h"
extern const u8 *const gStdStrings[];
bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress);