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

Merge pull request #1721 from AsparagusEduardo/pret_clean2

Browse Source 
Companion PR to pokefirered #525
This commit is contained in:
GriffinR
2022-08-01 16:57:40 -04:00
committed by GitHub
parent 5101811407 b49f8c10ad
commit 79c5a5983e
61 changed files with 280 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
INSTALL.md
+10 -10
View File
@@ -44,15 +44,15 @@ WSL1 is the preferred terminal to build **pokeemerald**. The following instructi
3. The next step is to choose and install a Linux distribution from the Microsoft Store. The following instructions will assume Ubuntu as the Linux distribution of choice. 3. The next step is to choose and install a Linux distribution from the Microsoft Store. The following instructions will assume Ubuntu as the Linux distribution of choice.
<details> <details>
<summary><i>Note for advanced users...</i></summary> <summary><i>Note for advanced users...</i></summary>
> You can pick a preferred Linux distribution, but setup instructions may differ. Debian should work with the given instructions, but has not been tested. > You can pick a preferred Linux distribution, but setup instructions may differ. Debian should work with the given instructions, but has not been tested.
</details> </details>
4. Open the [Microsoft Store Linux Selection](https://aka.ms/wslstore), click Ubuntu, then click Get, which will install the Ubuntu distribution. 4. Open the [Microsoft Store Linux Selection](https://aka.ms/wslstore), click Ubuntu, then click Get, which will install the Ubuntu distribution.
<details> <details>
<summary><i>Notes...</i></summary> <summary><i>Notes...</i></summary>
> Note 1: If a dialog pops up asking for you to sign into a Microsoft Account, then just close the dialog. > Note 1: If a dialog pops up asking for you to sign into a Microsoft Account, then just close the dialog.
> Note 2: If the link does not work, then open the Microsoft Store manually, and search for the Ubuntu app (choose the one with no version number). > Note 2: If the link does not work, then open the Microsoft Store manually, and search for the Ubuntu app (choose the one with no version number).
</details> </details>
@@ -102,8 +102,8 @@ cd /mnt/c/Users/<user>/Desktop/decomps
<details> <details>
<summary><i>Notes...</i></summary> <summary><i>Notes...</i></summary>
> Note 1: The Windows C:\ drive is called /mnt/c/ in WSL. > Note 1: The Windows C:\ drive is called /mnt/c/ in WSL.
> Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "/mnt/c/users/<user>/Desktop/decomp folder"`. > Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "/mnt/c/users/<user>/Desktop/decomp folder"`.
> Note 3: Windows path names are case-insensitive so adhering to capitalization isn't needed > Note 3: Windows path names are case-insensitive so adhering to capitalization isn't needed
</details> </details>
@@ -213,8 +213,8 @@ Note that the directory **must exist** in Windows. If you want to store pokeemer
<details> <details>
<summary><i>Notes...</i></summary> <summary><i>Notes...</i></summary>
> Note 1: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "c:/users/<user>/Desktop/decomp folder"`. > Note 1: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "c:/users/<user>/Desktop/decomp folder"`.
> Note 2: Windows path names are case-insensitive so adhering to capitalization isn't needed > Note 2: Windows path names are case-insensitive so adhering to capitalization isn't needed
</details> </details>
If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)). If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)).
@@ -283,8 +283,8 @@ Note that the directory **must exist** in the folder system. If you want to stor
<details> <details>
<summary><i>Note..</i>.</summary> <summary><i>Note..</i>.</summary>
> Note: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Desktop/decomp folder"` > Note: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Desktop/decomp folder"`
</details> </details>
If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)). If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)).
@@ -305,7 +305,7 @@ Then proceed to [Choosing where to store pokeemerald (Linux)](#choosing-where-to
> then you will have to install devkitARM. Install all the above packages except binutils-arm-none-eabi, and follow the instructions to > then you will have to install devkitARM. Install all the above packages except binutils-arm-none-eabi, and follow the instructions to
> [install devkitARM on Debian/Ubuntu-based distributions](#installing-devkitarm-on-debianubuntu-based-distributions). > [install devkitARM on Debian/Ubuntu-based distributions](#installing-devkitarm-on-debianubuntu-based-distributions).
</details> </details>
### Arch Linux ### Arch Linux
Run this command as root to install the necessary packages: Run this command as root to install the necessary packages:
```bash ```bash
gflib/sprite.c
+1 -1
View File
@@ -105,7 +105,7 @@ typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *);
.y = DISPLAY_HEIGHT, \ .y = DISPLAY_HEIGHT, \
.affineMode = 0, \ .affineMode = 0, \
.objMode = 0, \ .objMode = 0, \
.mosaic = 0, \ .mosaic = FALSE, \
.bpp = 0, \ .bpp = 0, \
.shape = SPRITE_SHAPE(8x8), \ .shape = SPRITE_SHAPE(8x8), \
.x = DISPLAY_WIDTH + 64, \ .x = DISPLAY_WIDTH + 64, \
include/link_rfu.h
+1 -1
View File
@@ -98,7 +98,7 @@ struct RfuGameCompatibilityData
// anything the developers want. This struct is what GF decided to use it for. // anything the developers want. This struct is what GF decided to use it for.
// It can be up to 13 bytes in size (RFU_GAME_NAME_LENGTH). // It can be up to 13 bytes in size (RFU_GAME_NAME_LENGTH).
// The player's name is sent separately as the username ("uname"), and does not // The player's name is sent separately as the username ("uname"), and does not
// use a struct (gHostRfuUsername). // use a struct (gHostRfuUsername).
struct __attribute__((packed, aligned(2))) RfuGameData struct __attribute__((packed, aligned(2))) RfuGameData
{ {
struct RfuGameCompatibilityData compatibility; struct RfuGameCompatibilityData compatibility;
src/battle_anim_smokescreen.c
+2 -2
View File
@@ -61,7 +61,7 @@ static const struct OamData sOamData_SmokescreenImpact =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -134,7 +134,7 @@ static const struct OamData sOamData_EnemyShadow =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8), .shape = SPRITE_SHAPE(32x8),
.x = 0, .x = 0,
src/battle_arena.c
+1 -1
View File
@@ -404,7 +404,7 @@ static const struct OamData sJudgementIconOamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
src/battle_bg.c
+2 -2
View File
@@ -41,7 +41,7 @@ static const struct OamData sVsLetter_V_OamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE, .affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -58,7 +58,7 @@ static const struct OamData sVsLetter_S_OamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE, .affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/battle_dome.c
+4 -4
View File
@@ -894,7 +894,7 @@ static const struct OamData sOamData_TourneyTreePokeball =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -912,7 +912,7 @@ static const struct OamData sOamData_TourneyTreeCloseButton =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16), .shape = SPRITE_SHAPE(32x16),
.x = 0, .x = 0,
@@ -929,7 +929,7 @@ static const struct OamData sOamData_VerticalScrollArrow =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x8), .shape = SPRITE_SHAPE(16x8),
.x = 0, .x = 0,
@@ -946,7 +946,7 @@ static const struct OamData sOamData_HorizontalScrollArrow =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x16), .shape = SPRITE_SHAPE(8x16),
.x = 0, .x = 0,
src/battle_factory_screen.c
+8 -8
View File
@@ -410,7 +410,7 @@ static const struct OamData sOam_Select_Pokeball =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -427,7 +427,7 @@ static const struct OamData sOam_Select_Arrow =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -444,7 +444,7 @@ static const struct OamData sOam_Select_MenuHighlight =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16), .shape = SPRITE_SHAPE(32x16),
.x = 0, .x = 0,
@@ -461,7 +461,7 @@ static const struct OamData sOam_Select_MonPicBgAnim =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE, .affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_BLEND, .objMode = ST_OAM_OBJ_BLEND,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -661,7 +661,7 @@ static const struct OamData sOam_Swap_Pokeball =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -678,7 +678,7 @@ static const struct OamData sOam_Swap_Arrow =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -695,7 +695,7 @@ static const struct OamData sOam_Swap_MenuHighlight =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16), .shape = SPRITE_SHAPE(32x16),
.x = 0, .x = 0,
@@ -712,7 +712,7 @@ static const struct OamData sOam_Swap_MonPicBgAnim =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE, .affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_BLEND, .objMode = ST_OAM_OBJ_BLEND,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/battle_interface.c
+4 -4
View File
@@ -194,7 +194,7 @@ static const struct OamData sOamData_64x32 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -266,7 +266,7 @@ static const struct OamData sOamData_Healthbar =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8), .shape = SPRITE_SHAPE(32x8),
.x = 0, .x = 0,
@@ -635,7 +635,7 @@ static const struct OamData sOamData_Unused64x32 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -652,7 +652,7 @@ static const struct OamData sOamData_StatusSummaryBalls =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
src/battle_pyramid_bag.c
+1 -1
View File
@@ -309,7 +309,7 @@ static const struct OamData sOamData_PyramidBag =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL, .affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/battle_script_commands.c
+1 -1
View File
@@ -693,7 +693,7 @@ static const struct OamData sOamData_MonIconOnLvlUpBanner =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
src/battle_transition.c
+1 -1
View File
@@ -827,7 +827,7 @@ static const struct OamData sOam_UnusedBrendanLass =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/battle_transition_frontier.c
+1 -1
View File
@@ -58,7 +58,7 @@ static const struct OamData sOamData_LogoCircles =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/berry_blender.c
+5 -5
View File
@@ -456,7 +456,7 @@ static const struct OamData sOam_PlayerArrow =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -599,7 +599,7 @@ static const struct OamData sOam_ScoreSymbols =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -668,7 +668,7 @@ static const struct OamData sOam_Particles =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -755,7 +755,7 @@ static const struct OamData sOam_CountdownNumbers =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -813,7 +813,7 @@ static const struct OamData sOam_Start =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
src/berry_crush.c
+5 -5
View File
@@ -2258,11 +2258,11 @@ static u32 Cmd_PrintMessage(struct BerryCrushGame *game, u8 *args)
if (args[1] & F_MSG_EXPAND) if (args[1] & F_MSG_EXPAND)
{ {
StringExpandPlaceholders(gStringVar4, sMessages[args[0]]); StringExpandPlaceholders(gStringVar4, sMessages[args[0]]);
AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, game->textSpeed, 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
else else
{ {
AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[args[0]], game->textSpeed, 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[args[0]], game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
break; break;
@@ -3242,7 +3242,7 @@ static u32 Cmd_SaveGame(struct BerryCrushGame *game, u8 *args)
if (!IsLinkTaskFinished()) if (!IsLinkTaskFinished())
return 0; return 0;
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
CreateTask(Task_LinkFullSave, 0); CreateTask(Task_LinkFullSave, 0);
break; break;
@@ -3391,9 +3391,9 @@ static u32 Cmd_StopGame(struct BerryCrushGame *game, u8 *args)
case 0: case 0:
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
if (game->playAgainState == PLAY_AGAIN_NO_BERRIES) if (game->playAgainState == PLAY_AGAIN_NO_BERRIES)
AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_NO_BERRIES], game->textSpeed, 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_NO_BERRIES], game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
else else
AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_DROPPED], game->textSpeed, 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_DROPPED], game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
break; break;
case 1: case 1:
src/contest.c
+2 -2
View File
@@ -388,7 +388,7 @@ static const struct OamData sOam_SliderHeart =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -473,7 +473,7 @@ static const struct OamData sOam_NextTurn =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8), .shape = SPRITE_SHAPE(32x8),
.x = 0, .x = 0,
src/contest_util.c
+3 -3
View File
@@ -196,7 +196,7 @@ static const struct OamData sOamData_ResultsTextWindow =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -242,7 +242,7 @@ static const struct OamData sOamData_Confetti =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -365,7 +365,7 @@ static const struct OamData sOamData_WirelessIndicatorWindow =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
src/credits.c
+1 -1
View File
@@ -286,7 +286,7 @@ static const struct OamData sOamData_MonBg =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/data/party_menu.h
+4 -4
View File
@@ -867,7 +867,7 @@ static const struct OamData sOamData_HeldItem =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -923,7 +923,7 @@ static const struct OamData sOamData_MenuPokeball =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -980,7 +980,7 @@ static const struct OamData sOamData_MenuPokeballSmall =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -1061,7 +1061,7 @@ static const struct OamData sOamData_StatusCondition =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8), .shape = SPRITE_SHAPE(32x8),
.x = 0, .x = 0,
src/decoration.c
+2 -2
View File
@@ -615,7 +615,7 @@ static void HandleDecorationActionsMenuInput(u8 taskId)
static void PrintCurMainMenuDescription(void) static void PrintCurMainMenuDescription(void)
{ {
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sSecretBasePCMenuItemDescriptions[sDecorationActionsCursorPos], 0, 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sSecretBasePCMenuItemDescriptions[sDecorationActionsCursorPos], 0, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
static void DecorationMenuAction_Decorate(u8 taskId) static void DecorationMenuAction_Decorate(u8 taskId)
@@ -1985,7 +1985,7 @@ static void SetDecorSelectionBoxOamAttributes(u8 decorShape)
sDecorSelectorOam.y = 0; sDecorSelectorOam.y = 0;
sDecorSelectorOam.affineMode = ST_OAM_AFFINE_OFF; sDecorSelectorOam.affineMode = ST_OAM_AFFINE_OFF;
sDecorSelectorOam.objMode = ST_OAM_OBJ_NORMAL; sDecorSelectorOam.objMode = ST_OAM_OBJ_NORMAL;
sDecorSelectorOam.mosaic = 0; sDecorSelectorOam.mosaic = FALSE;
sDecorSelectorOam.bpp = ST_OAM_4BPP; sDecorSelectorOam.bpp = ST_OAM_4BPP;
sDecorSelectorOam.shape = sDecorationMovementInfo[decorShape].shape; sDecorSelectorOam.shape = sDecorationMovementInfo[decorShape].shape;
sDecorSelectorOam.x = 0; sDecorSelectorOam.x = 0;
src/dodrio_berry_picking.c
+5 -5
View File
@@ -3608,7 +3608,7 @@ static const struct OamData sOamData_Dodrio =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -3626,7 +3626,7 @@ static const struct OamData sOamData_16x16_Priority0 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -3643,7 +3643,7 @@ static const struct OamData sOamData_Berry =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -3660,7 +3660,7 @@ static const struct OamData sOamData_Cloud =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -5025,7 +5025,7 @@ static void Msg_SavingDontTurnOff(void)
{ {
case 0: case 0:
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
sGfx->state++; sGfx->state++;
break; break;
case 1: case 1:
src/easy_chat.c
+6 -6
View File
@@ -932,7 +932,7 @@ static const struct OamData sOamData_TriangleCursor = {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -958,7 +958,7 @@ static const struct OamData sOamData_RectangleCursor = {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -1019,7 +1019,7 @@ static const struct OamData sOamData_ModeWindow = {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -1089,7 +1089,7 @@ static const struct OamData sOamData_ButtonWindow = {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -1115,7 +1115,7 @@ static const struct OamData sOamData_StartSelectButton = {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8), .shape = SPRITE_SHAPE(32x8),
.x = 0, .x = 0,
@@ -1131,7 +1131,7 @@ static const struct OamData sOamData_ScrollIndicator = {
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
src/egg_hatch.c
+2 -2
View File
@@ -91,7 +91,7 @@ static const struct OamData sOamData_Egg =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -178,7 +178,7 @@ static const struct OamData sOamData_EggShard =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
src/evolution_graphics.c
+1 -1
View File
@@ -58,7 +58,7 @@ static const struct OamData sOamData_EvoSparkle =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
src/field_player_avatar.c
+3 -3
View File
@@ -1911,7 +1911,7 @@ static bool8 Fishing_MonOnHook(struct Task *task)
{ {
AlignFishingAnimationFrames(); AlignFishingAnimationFrames();
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_PokemonOnHook, 1, 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_PokemonOnHook, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep++; task->tStep++;
task->tFrameCounter = 0; task->tFrameCounter = 0;
return FALSE; return FALSE;
@@ -1958,7 +1958,7 @@ static bool8 Fishing_NotEvenNibble(struct Task *task)
AlignFishingAnimationFrames(); AlignFishingAnimationFrames();
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_NotEvenANibble, 1, 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_NotEvenANibble, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep = FISHING_SHOW_RESULT; task->tStep = FISHING_SHOW_RESULT;
return TRUE; return TRUE;
} }
@@ -1968,7 +1968,7 @@ static bool8 Fishing_GotAway(struct Task *task)
AlignFishingAnimationFrames(); AlignFishingAnimationFrames();
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_ItGotAway, 1, 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_ItGotAway, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep++; task->tStep++;
return TRUE; return TRUE;
} }
src/field_specials.c
+4 -4
View File
@@ -2918,7 +2918,7 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
switch (menu) switch (menu)
{ {
case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1: case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1:
AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor1Descriptions[selection], 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor1Descriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
if (sFrontierExchangeCorner_Decor1[selection] == 0xFFFF) if (sFrontierExchangeCorner_Decor1[selection] == 0xFFFF)
{ {
ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor1[selection]); ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor1[selection]);
@@ -2931,7 +2931,7 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
} }
break; break;
case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2: case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2:
AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor2Descriptions[selection], 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor2Descriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
if (sFrontierExchangeCorner_Decor2[selection] == 0xFFFF) if (sFrontierExchangeCorner_Decor2[selection] == 0xFFFF)
{ {
ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor2[selection]); ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor2[selection]);
@@ -2944,11 +2944,11 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
} }
break; break;
case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR: case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR:
AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_VitaminsDescriptions[selection], 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_VitaminsDescriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Vitamins[selection]); ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Vitamins[selection]);
break; break;
case SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR: case SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR:
AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_HoldItemsDescriptions[selection], 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_HoldItemsDescriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_HoldItems[selection]); ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_HoldItems[selection]);
break; break;
} }
src/field_weather_effect.c
+4 -4
View File
@@ -58,7 +58,7 @@ static const struct OamData sCloudSpriteOamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_BLEND, .objMode = ST_OAM_OBJ_BLEND,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -393,7 +393,7 @@ static const struct OamData sRainSpriteOamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x32), .shape = SPRITE_SHAPE(16x32),
.x = 0, .x = 0,
@@ -839,7 +839,7 @@ static const struct OamData sSnowflakeSpriteOamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -1272,7 +1272,7 @@ static const struct OamData sOamData_FogH =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_BLEND, .objMode = ST_OAM_OBJ_BLEND,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/fldeff_cut.c
+1 -1
View File
@@ -93,7 +93,7 @@ static const struct OamData sOamData_CutGrass =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
src/hall_of_fame.c
+4 -4
View File
@@ -182,7 +182,7 @@ static const struct OamData sOamData_Confetti =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -515,7 +515,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
*lastSavedTeam = *sHofMonPtr; *lastSavedTeam = *sHofMonPtr;
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_Hof_TrySaveData; gTasks[taskId].func = Task_Hof_TrySaveData;
} }
@@ -723,7 +723,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
HallOfFame_PrintPlayerInfo(1, 2); HallOfFame_PrintPlayerInfo(1, 2);
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_LeagueChamp, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_LeagueChamp, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_Hof_ExitOnKeyPressed; gTasks[taskId].func = Task_Hof_ExitOnKeyPressed;
} }
@@ -1088,7 +1088,7 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
{ {
HofPCTopBar_Print(gText_AButtonExit, 8, TRUE); HofPCTopBar_Print(gText_AButtonExit, 8, TRUE);
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_HOFCorrupted, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_HOFCorrupted, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_HofPC_ExitOnButtonPress; gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;
} }
src/intro.c
+12 -12
View File
@@ -216,7 +216,7 @@ static const struct OamData sOamData_Sparkle =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -284,7 +284,7 @@ static const struct OamData sOamData_Volbeat =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -320,7 +320,7 @@ static const struct OamData sOamData_Torchic =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -380,7 +380,7 @@ static const struct OamData sOamData_Manectric =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -428,7 +428,7 @@ static const struct OamData sOamData_Lightning =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -519,7 +519,7 @@ static const struct OamData sOamData_Bubbles =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x32), .shape = SPRITE_SHAPE(16x32),
.x = 0, .x = 0,
@@ -558,7 +558,7 @@ static const struct OamData sOamData_WaterDrop =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -660,7 +660,7 @@ static const struct OamData sOamData_GameFreakLetter =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_DOUBLE, .affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -676,7 +676,7 @@ static const struct OamData sOamData_PresentsLetter =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -692,7 +692,7 @@ static const struct OamData sOamData_GameFreakLogo =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_DOUBLE, .affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_BLEND, .objMode = ST_OAM_OBJ_BLEND,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x64), .shape = SPRITE_SHAPE(32x64),
.x = 0, .x = 0,
@@ -931,7 +931,7 @@ static const struct OamData sOamData_FlygonSilhouette =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -983,7 +983,7 @@ static const struct OamData sOamData_RayquazaOrb =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/item_icon.c
+1 -1
View File
@@ -18,7 +18,7 @@ static const struct OamData sOamData_ItemIcon =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
src/item_menu_icons.c
+5 -5
View File
@@ -43,7 +43,7 @@ static const struct OamData sBagOamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL, .affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -158,7 +158,7 @@ static const struct OamData sRotatingBallOamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -229,7 +229,7 @@ static const struct OamData sBerryPicOamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -246,7 +246,7 @@ static const struct OamData sBerryPicRotatingOamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE, .affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -386,7 +386,7 @@ static const struct OamData sBerryCheckCircleOamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/list_menu.c
+2 -2
View File
@@ -127,7 +127,7 @@ static const struct OamData sOamData_ScrollArrowIndicator =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -267,7 +267,7 @@ static const struct OamData sOamData_RedArrowCursor =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
src/menu.c
+4 -4
View File
@@ -191,19 +191,19 @@ void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress)
{ {
void (*callback)(struct TextPrinterTemplate *, u16) = NULL; void (*callback)(struct TextPrinterTemplate *, u16) = NULL;
gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress;
AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), callback, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), callback, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress) void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress)
{ {
gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress;
AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed) void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed)
{ {
gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress;
AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, speed, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
void LoadMessageBoxAndBorderGfx(void) void LoadMessageBoxAndBorderGfx(void)
@@ -545,7 +545,7 @@ void RemoveMapNamePopUpWindow(void)
void AddTextPrinterWithCallbackForMessage(bool8 canSpeedUp, void (*callback)(struct TextPrinterTemplate *, u16)) void AddTextPrinterWithCallbackForMessage(bool8 canSpeedUp, void (*callback)(struct TextPrinterTemplate *, u16))
{ {
gTextFlags.canABSpeedUpPrint = canSpeedUp; gTextFlags.canABSpeedUpPrint = canSpeedUp;
AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), callback, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), callback, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
void EraseFieldMessageBox(bool8 copyToVram) void EraseFieldMessageBox(bool8 copyToVram)
src/menu_helpers.c
+2 -2
View File
@@ -32,7 +32,7 @@ static const struct OamData sOamData_SwapLine =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -130,7 +130,7 @@ void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 palet
StringExpandPlaceholders(gStringVar4, string); StringExpandPlaceholders(gStringVar4, string);
gTextFlags.canABSpeedUpPrint = 1; gTextFlags.canABSpeedUpPrint = 1;
AddTextPrinterParameterized2(windowId, fontId, gStringVar4, textSpeed, NULL, 2, 1, 3); AddTextPrinterParameterized2(windowId, fontId, gStringVar4, textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
sMessageNextTask = taskFunc; sMessageNextTask = taskFunc;
gTasks[taskId].func = Task_ContinueTaskAfterMessagePrints; gTasks[taskId].func = Task_ContinueTaskAfterMessagePrints;
} }
src/menu_specialized.c
+2 -2
View File
@@ -1124,7 +1124,7 @@ static const struct OamData sOam_ConditionMonPic =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -1141,7 +1141,7 @@ static const struct OamData sOam_ConditionSelectionIcon =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
src/minigame_countdown.c
+2 -2
View File
@@ -618,7 +618,7 @@ static const struct OamData sOamData_Numbers =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE, .affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -635,7 +635,7 @@ static const struct OamData sOamData_Start =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
src/mirage_tower.c
+3 -3
View File
@@ -133,7 +133,7 @@ static const struct OamData sOamData_FallingFossil =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -189,7 +189,7 @@ static const struct OamData sOamData_CeilingCrumbleSmall =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -227,7 +227,7 @@ static const struct OamData sOamData_CeilingCrumbleLarge =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
src/mon_markings.c
+6 -12
View File
@@ -30,7 +30,7 @@ static const struct OamData sOamData_MenuWindow =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -48,7 +48,7 @@ static const struct OamData sOamData_8x8 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -157,7 +157,7 @@ static const struct OamData sOamData_MarkingCombo =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8), .shape = SPRITE_SHAPE(32x8),
.x = 0, .x = 0,
@@ -396,20 +396,16 @@ bool8 HandleMonMarkingsMenuInput(void)
if (JOY_NEW(DPAD_UP)) if (JOY_NEW(DPAD_UP))
{ {
s8 pos;
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
pos = --sMenu->cursorPos; if (--sMenu->cursorPos < 0)
if (pos < 0)
sMenu->cursorPos = SELECTION_CANCEL; sMenu->cursorPos = SELECTION_CANCEL;
return TRUE; return TRUE;
} }
if (JOY_NEW(DPAD_DOWN)) if (JOY_NEW(DPAD_DOWN))
{ {
s8 pos;
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
pos = ++sMenu->cursorPos; if (++sMenu->cursorPos > SELECTION_CANCEL)
if (pos > SELECTION_CANCEL)
sMenu->cursorPos = 0; sMenu->cursorPos = 0;
return TRUE; return TRUE;
} }
@@ -495,7 +491,6 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 base
} }
sMenu->windowSprites[1]->y = y + 96; sMenu->windowSprites[1]->y = y + 96;
// Create marking sprites // Create marking sprites
template.tileTag++; template.tileTag++;
template.paletteTag++; template.paletteTag++;
@@ -548,7 +543,6 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 base
{ {
sMenu->cursorSprite = NULL; sMenu->cursorSprite = NULL;
} }
} }
static void SpriteCB_Dummy(struct Sprite *sprite) static void SpriteCB_Dummy(struct Sprite *sprite)
@@ -610,7 +604,7 @@ static struct Sprite *CreateMarkingComboSprite(u16 tileTag, u16 paletteTag, cons
spriteId = CreateSprite(&template, 0, 0, 0); spriteId = CreateSprite(&template, 0, 0, 0);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES)
return &gSprites[spriteId]; return &gSprites[spriteId];
else else
return NULL; return NULL;
} }
src/money.c
+1 -1
View File
@@ -22,7 +22,7 @@ static const struct OamData sOamData_MoneyLabel =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16), .shape = SPRITE_SHAPE(32x16),
.x = 0, .x = 0,
src/move_relearner.c
+3 -3
View File
@@ -185,7 +185,7 @@ static const struct OamData sHeartSpriteOamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -202,7 +202,7 @@ static const struct OamData sUnusedOam1 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x16), .shape = SPRITE_SHAPE(8x16),
.x = 0, .x = 0,
@@ -219,7 +219,7 @@ static const struct OamData sUnusedOam2 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x8), .shape = SPRITE_SHAPE(16x8),
.x = 0, .x = 0,
src/naming_screen.c
+1 -1
View File
@@ -740,7 +740,7 @@ static void DisplaySentToPCMessage(void)
StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]); StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]);
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
gTextFlags.canABSpeedUpPrint = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
} }
src/party_menu.c
+1 -1
View File
@@ -2489,7 +2489,7 @@ static void PartyMenuPrintText(const u8 *text)
{ {
DrawStdFrameWithCustomTileAndPalette(6, FALSE, 0x4F, 13); DrawStdFrameWithCustomTileAndPalette(6, FALSE, 0x4F, 13);
gTextFlags.canABSpeedUpPrint = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
AddTextPrinterParameterized2(6, FONT_NORMAL, text, GetPlayerTextSpeedDelay(), 0, 2, 1, 3); AddTextPrinterParameterized2(6, FONT_NORMAL, text, GetPlayerTextSpeedDelay(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
static void PartyMenuDisplayYesNoMenu(void) static void PartyMenuDisplayYesNoMenu(void)
src/pokeball.c
+72 -69
View File
@@ -44,49 +44,49 @@ static u16 GetBattlerPokeballItemId(u8 battlerId);
// rom const data // rom const data
#define GFX_TAG_POKEBALL 55000 #define GFX_TAG_POKE_BALL 55000
#define GFX_TAG_GREATBALL 55001 #define GFX_TAG_GREAT_BALL 55001
#define GFX_TAG_SAFARIBALL 55002 #define GFX_TAG_SAFARI_BALL 55002
#define GFX_TAG_ULTRABALL 55003 #define GFX_TAG_ULTRA_BALL 55003
#define GFX_TAG_MASTERBALL 55004 #define GFX_TAG_MASTER_BALL 55004
#define GFX_TAG_NETBALL 55005 #define GFX_TAG_NET_BALL 55005
#define GFX_TAG_DIVEBALL 55006 #define GFX_TAG_DIVE_BALL 55006
#define GFX_TAG_NESTBALL 55007 #define GFX_TAG_NEST_BALL 55007
#define GFX_TAG_REPEATBALL 55008 #define GFX_TAG_REPEAT_BALL 55008
#define GFX_TAG_TIMERBALL 55009 #define GFX_TAG_TIMER_BALL 55009
#define GFX_TAG_LUXURYBALL 55010 #define GFX_TAG_LUXURY_BALL 55010
#define GFX_TAG_PREMIERBALL 55011 #define GFX_TAG_PREMIER_BALL 55011
const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] = const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] =
{ {
[BALL_POKE] = {gBallGfx_Poke, 384, GFX_TAG_POKEBALL}, [BALL_POKE] = {gBallGfx_Poke, 384, GFX_TAG_POKE_BALL},
[BALL_GREAT] = {gBallGfx_Great, 384, GFX_TAG_GREATBALL}, [BALL_GREAT] = {gBallGfx_Great, 384, GFX_TAG_GREAT_BALL},
[BALL_SAFARI] = {gBallGfx_Safari, 384, GFX_TAG_SAFARIBALL}, [BALL_SAFARI] = {gBallGfx_Safari, 384, GFX_TAG_SAFARI_BALL},
[BALL_ULTRA] = {gBallGfx_Ultra, 384, GFX_TAG_ULTRABALL}, [BALL_ULTRA] = {gBallGfx_Ultra, 384, GFX_TAG_ULTRA_BALL},
[BALL_MASTER] = {gBallGfx_Master, 384, GFX_TAG_MASTERBALL}, [BALL_MASTER] = {gBallGfx_Master, 384, GFX_TAG_MASTER_BALL},
[BALL_NET] = {gBallGfx_Net, 384, GFX_TAG_NETBALL}, [BALL_NET] = {gBallGfx_Net, 384, GFX_TAG_NET_BALL},
[BALL_DIVE] = {gBallGfx_Dive, 384, GFX_TAG_DIVEBALL}, [BALL_DIVE] = {gBallGfx_Dive, 384, GFX_TAG_DIVE_BALL},
[BALL_NEST] = {gBallGfx_Nest, 384, GFX_TAG_NESTBALL}, [BALL_NEST] = {gBallGfx_Nest, 384, GFX_TAG_NEST_BALL},
[BALL_REPEAT] = {gBallGfx_Repeat, 384, GFX_TAG_REPEATBALL}, [BALL_REPEAT] = {gBallGfx_Repeat, 384, GFX_TAG_REPEAT_BALL},
[BALL_TIMER] = {gBallGfx_Timer, 384, GFX_TAG_TIMERBALL}, [BALL_TIMER] = {gBallGfx_Timer, 384, GFX_TAG_TIMER_BALL},
[BALL_LUXURY] = {gBallGfx_Luxury, 384, GFX_TAG_LUXURYBALL}, [BALL_LUXURY] = {gBallGfx_Luxury, 384, GFX_TAG_LUXURY_BALL},
[BALL_PREMIER] = {gBallGfx_Premier, 384, GFX_TAG_PREMIERBALL}, [BALL_PREMIER] = {gBallGfx_Premier, 384, GFX_TAG_PREMIER_BALL},
}; };
const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] = const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] =
{ {
[BALL_POKE] = {gBallPal_Poke, GFX_TAG_POKEBALL}, [BALL_POKE] = {gBallPal_Poke, GFX_TAG_POKE_BALL},
[BALL_GREAT] = {gBallPal_Great, GFX_TAG_GREATBALL}, [BALL_GREAT] = {gBallPal_Great, GFX_TAG_GREAT_BALL},
[BALL_SAFARI] = {gBallPal_Safari, GFX_TAG_SAFARIBALL}, [BALL_SAFARI] = {gBallPal_Safari, GFX_TAG_SAFARI_BALL},
[BALL_ULTRA] = {gBallPal_Ultra, GFX_TAG_ULTRABALL}, [BALL_ULTRA] = {gBallPal_Ultra, GFX_TAG_ULTRA_BALL},
[BALL_MASTER] = {gBallPal_Master, GFX_TAG_MASTERBALL}, [BALL_MASTER] = {gBallPal_Master, GFX_TAG_MASTER_BALL},
[BALL_NET] = {gBallPal_Net, GFX_TAG_NETBALL}, [BALL_NET] = {gBallPal_Net, GFX_TAG_NET_BALL},
[BALL_DIVE] = {gBallPal_Dive, GFX_TAG_DIVEBALL}, [BALL_DIVE] = {gBallPal_Dive, GFX_TAG_DIVE_BALL},
[BALL_NEST] = {gBallPal_Nest, GFX_TAG_NESTBALL}, [BALL_NEST] = {gBallPal_Nest, GFX_TAG_NEST_BALL},
[BALL_REPEAT] = {gBallPal_Repeat, GFX_TAG_REPEATBALL}, [BALL_REPEAT] = {gBallPal_Repeat, GFX_TAG_REPEAT_BALL},
[BALL_TIMER] = {gBallPal_Timer, GFX_TAG_TIMERBALL}, [BALL_TIMER] = {gBallPal_Timer, GFX_TAG_TIMER_BALL},
[BALL_LUXURY] = {gBallPal_Luxury, GFX_TAG_LUXURYBALL}, [BALL_LUXURY] = {gBallPal_Luxury, GFX_TAG_LUXURY_BALL},
[BALL_PREMIER] = {gBallPal_Premier, GFX_TAG_PREMIERBALL}, [BALL_PREMIER] = {gBallPal_Premier, GFX_TAG_PREMIER_BALL},
}; };
static const struct OamData sBallOamData = static const struct OamData sBallOamData =
@@ -94,7 +94,7 @@ static const struct OamData sBallOamData =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE, .affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -206,8 +206,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
{ {
[BALL_POKE] = [BALL_POKE] =
{ {
.tileTag = GFX_TAG_POKEBALL, .tileTag = GFX_TAG_POKE_BALL,
.paletteTag = GFX_TAG_POKEBALL, .paletteTag = GFX_TAG_POKE_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -216,8 +216,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
}, },
[BALL_GREAT] = [BALL_GREAT] =
{ {
.tileTag = GFX_TAG_GREATBALL, .tileTag = GFX_TAG_GREAT_BALL,
.paletteTag = GFX_TAG_GREATBALL, .paletteTag = GFX_TAG_GREAT_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -226,8 +226,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
}, },
[BALL_SAFARI] = [BALL_SAFARI] =
{ {
.tileTag = GFX_TAG_SAFARIBALL, .tileTag = GFX_TAG_SAFARI_BALL,
.paletteTag = GFX_TAG_SAFARIBALL, .paletteTag = GFX_TAG_SAFARI_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -236,8 +236,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
}, },
[BALL_ULTRA] = [BALL_ULTRA] =
{ {
.tileTag = GFX_TAG_ULTRABALL, .tileTag = GFX_TAG_ULTRA_BALL,
.paletteTag = GFX_TAG_ULTRABALL, .paletteTag = GFX_TAG_ULTRA_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -246,8 +246,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
}, },
[BALL_MASTER] = [BALL_MASTER] =
{ {
.tileTag = GFX_TAG_MASTERBALL, .tileTag = GFX_TAG_MASTER_BALL,
.paletteTag = GFX_TAG_MASTERBALL, .paletteTag = GFX_TAG_MASTER_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -256,8 +256,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
}, },
[BALL_NET] = [BALL_NET] =
{ {
.tileTag = GFX_TAG_NETBALL, .tileTag = GFX_TAG_NET_BALL,
.paletteTag = GFX_TAG_NETBALL, .paletteTag = GFX_TAG_NET_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -266,8 +266,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
}, },
[BALL_DIVE] = [BALL_DIVE] =
{ {
.tileTag = GFX_TAG_DIVEBALL, .tileTag = GFX_TAG_DIVE_BALL,
.paletteTag = GFX_TAG_DIVEBALL, .paletteTag = GFX_TAG_DIVE_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -276,8 +276,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
}, },
[BALL_NEST] = [BALL_NEST] =
{ {
.tileTag = GFX_TAG_NESTBALL, .tileTag = GFX_TAG_NEST_BALL,
.paletteTag = GFX_TAG_NESTBALL, .paletteTag = GFX_TAG_NEST_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -286,8 +286,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
}, },
[BALL_REPEAT] = [BALL_REPEAT] =
{ {
.tileTag = GFX_TAG_REPEATBALL, .tileTag = GFX_TAG_REPEAT_BALL,
.paletteTag = GFX_TAG_REPEATBALL, .paletteTag = GFX_TAG_REPEAT_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -296,8 +296,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
}, },
[BALL_TIMER] = [BALL_TIMER] =
{ {
.tileTag = GFX_TAG_TIMERBALL, .tileTag = GFX_TAG_TIMER_BALL,
.paletteTag = GFX_TAG_TIMERBALL, .paletteTag = GFX_TAG_TIMER_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -306,8 +306,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
}, },
[BALL_LUXURY] = [BALL_LUXURY] =
{ {
.tileTag = GFX_TAG_LUXURYBALL, .tileTag = GFX_TAG_LUXURY_BALL,
.paletteTag = GFX_TAG_LUXURYBALL, .paletteTag = GFX_TAG_LUXURY_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -316,8 +316,8 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
}, },
[BALL_PREMIER] = [BALL_PREMIER] =
{ {
.tileTag = GFX_TAG_PREMIERBALL, .tileTag = GFX_TAG_PREMIER_BALL,
.paletteTag = GFX_TAG_PREMIERBALL, .paletteTag = GFX_TAG_PREMIER_BALL,
.oam = &sBallOamData, .oam = &sBallOamData,
.anims = sBallAnimSequences, .anims = sBallAnimSequences,
.images = NULL, .images = NULL,
@@ -337,7 +337,7 @@ u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow)
u8 taskId; u8 taskId;
gDoingBattleAnim = TRUE; gDoingBattleAnim = TRUE;
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive = 1; gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive = TRUE;
taskId = CreateTask(Task_DoPokeballSendOutAnim, 5); taskId = CreateTask(Task_DoPokeballSendOutAnim, 5);
gTasks[taskId].tPan = pan; gTasks[taskId].tPan = pan;
@@ -407,7 +407,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
} }
// this will perform an unused ball throw animation // this will perform an unused ball throw animation
gSprites[ballSpriteId].data[0] = 0x22; gSprites[ballSpriteId].data[0] = 34;
gSprites[ballSpriteId].data[2] = GetBattlerSpriteCoord(gBattlerTarget, BATTLER_COORD_X); gSprites[ballSpriteId].data[2] = GetBattlerSpriteCoord(gBattlerTarget, BATTLER_COORD_X);
gSprites[ballSpriteId].data[4] = GetBattlerSpriteCoord(gBattlerTarget, BATTLER_COORD_Y) - 16; gSprites[ballSpriteId].data[4] = GetBattlerSpriteCoord(gBattlerTarget, BATTLER_COORD_Y) - 16;
gSprites[ballSpriteId].data[5] = -40; gSprites[ballSpriteId].data[5] = -40;
@@ -431,7 +431,7 @@ static void SpriteCB_BallThrow(struct Sprite *sprite)
u8 noOfShakes = gTasks[taskId].tThrowId; u8 noOfShakes = gTasks[taskId].tThrowId;
StartSpriteAnim(sprite, 1); StartSpriteAnim(sprite, 1);
sprite->affineAnimPaused = 1; sprite->affineAnimPaused = TRUE;
sprite->x += sprite->x2; sprite->x += sprite->x2;
sprite->y += sprite->y2; sprite->y += sprite->y2;
sprite->x2 = 0; sprite->x2 = 0;
@@ -475,6 +475,7 @@ static void SpriteCB_BallThrow_ShrinkMon(struct Sprite *sprite)
sprite->data[5]++; sprite->data[5]++;
if (sprite->data[5] == 11) if (sprite->data[5] == 11)
PlaySE(SE_BALL_TRADE); PlaySE(SE_BALL_TRADE);
if (gSprites[gBattlerSpriteIds[sprite->sBattler]].affineAnimEnded) if (gSprites[gBattlerSpriteIds[sprite->sBattler]].affineAnimEnded)
{ {
StartSpriteAnim(sprite, 2); StartSpriteAnim(sprite, 2);
@@ -644,6 +645,7 @@ static void SpriteCB_BallThrow_Shake(struct Sprite *sprite)
StartSpriteAffineAnim(sprite, 2); StartSpriteAffineAnim(sprite, 2);
else else
StartSpriteAffineAnim(sprite, 1); StartSpriteAffineAnim(sprite, 1);
PlaySE(SE_BALL); PlaySE(SE_BALL);
} }
break; break;
@@ -864,13 +866,13 @@ static void HandleBallAnimEnd(struct Sprite *sprite)
gSprites[gBattlerSpriteIds[battlerId]].y2 = 0; gSprites[gBattlerSpriteIds[battlerId]].y2 = 0;
gDoingBattleAnim = FALSE; gDoingBattleAnim = FALSE;
gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = 0; gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = FALSE;
FreeSpriteOamMatrix(sprite); FreeSpriteOamMatrix(sprite);
DestroySprite(sprite); DestroySprite(sprite);
for (doneBattlers = 0, i = 0; i < MAX_BATTLERS_COUNT; i++) for (doneBattlers = 0, i = 0; i < MAX_BATTLERS_COUNT; i++)
{ {
if (gBattleSpritesDataPtr->healthBoxesData[i].ballAnimActive == 0) if (gBattleSpritesDataPtr->healthBoxesData[i].ballAnimActive == FALSE)
doneBattlers++; doneBattlers++;
} }
if (doneBattlers == MAX_BATTLERS_COUNT) if (doneBattlers == MAX_BATTLERS_COUNT)
@@ -902,7 +904,7 @@ static void SpriteCB_BallThrow_CaptureMon(struct Sprite *sprite)
DestroySprite(&gSprites[gBattlerSpriteIds[sprite->sBattler]]); DestroySprite(&gSprites[gBattlerSpriteIds[sprite->sBattler]]);
DestroySpriteAndFreeResources(sprite); DestroySpriteAndFreeResources(sprite);
if (gMain.inBattle) if (gMain.inBattle)
gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = 0; gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = FALSE;
} }
} }
@@ -1134,7 +1136,6 @@ static void SpriteCB_ReleasedMonFlyOut(struct Sprite *sprite)
#undef sFinalMonY #undef sFinalMonY
#undef sTrigIdx #undef sTrigIdx
#define sTimer data[5] #define sTimer data[5]
u8 CreateTradePokeballSprite(u8 monSpriteId, u8 monPalNum, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 delay, u32 fadePalettes) u8 CreateTradePokeballSprite(u8 monSpriteId, u8 monPalNum, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 delay, u32 fadePalettes)
@@ -1224,7 +1225,8 @@ static void SpriteCB_TradePokeballEnd(struct Sprite *sprite)
#undef sFadePalsHi #undef sFadePalsHi
#undef sTimer #undef sTimer
static void Unref_DestroySpriteAndFreeResources(struct Sprite *sprite) // Unreferenced here and in RS, but used in FRLG, possibly by mistake.
static void DestroySpriteAndFreeResources_Ball(struct Sprite *sprite)
{ {
DestroySpriteAndFreeResources(sprite); DestroySpriteAndFreeResources(sprite);
} }
@@ -1311,6 +1313,7 @@ void LoadBallGfx(u8 ballId)
LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[ballId]); LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[ballId]);
LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[ballId]); LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[ballId]);
} }
switch (ballId) switch (ballId)
{ {
case BALL_DIVE: case BALL_DIVE:
src/pokeblock.c
+1 -1
View File
@@ -237,7 +237,7 @@ static const struct OamData sOamData_PokeblockCase =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/pokeblock_feed.c
+2 -2
View File
@@ -545,7 +545,7 @@ static const struct OamData sOamData_Pokeblock =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE, .affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -872,7 +872,7 @@ static void Task_PrintAtePokeblockMessage(u8 taskId)
StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2); StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2);
gTextFlags.canABSpeedUpPrint = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
gTasks[taskId].func = Task_WaitForAtePokeblockMessage; gTasks[taskId].func = Task_WaitForAtePokeblockMessage;
} }
src/pokedex.c
+6 -6
View File
@@ -308,7 +308,7 @@ static const struct OamData sOamData_ScrollBar =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -325,7 +325,7 @@ static const struct OamData sOamData_ScrollArrow =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x8), .shape = SPRITE_SHAPE(16x8),
.x = 0, .x = 0,
@@ -342,7 +342,7 @@ static const struct OamData sOamData_InterfaceText =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16), .shape = SPRITE_SHAPE(32x16),
.x = 0, .x = 0,
@@ -359,7 +359,7 @@ static const struct OamData sOamData_RotatingPokeBall =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_WINDOW, .objMode = ST_OAM_OBJ_WINDOW,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -376,7 +376,7 @@ static const struct OamData sOamData_SeenOwnText =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -393,7 +393,7 @@ static const struct OamData sOamData_Dex8x16 =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x16), .shape = SPRITE_SHAPE(8x16),
.x = 0, .x = 0,
src/pokemon.c
+1 -1
View File
@@ -2119,7 +2119,7 @@ static const struct OamData sOamData_64x64 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/pokemon_jump.c
+5 -5
View File
@@ -2431,7 +2431,7 @@ static const struct OamData sOamData_JumpMon =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -2448,7 +2448,7 @@ static const struct OamData sOamData_Vine16x32 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x32), .shape = SPRITE_SHAPE(16x32),
.x = 0, .x = 0,
@@ -2465,7 +2465,7 @@ static const struct OamData sOamData_Vine32x32 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -2482,7 +2482,7 @@ static const struct OamData sOamData_Vine32x16 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16), .shape = SPRITE_SHAPE(32x16),
.x = 0, .x = 0,
@@ -2636,7 +2636,7 @@ static const struct OamData sOamData_Star =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
src/pokemon_storage_system.c
+20 -20
View File
@@ -472,7 +472,7 @@ struct PokemonStorageSystemData
u8 iconScrollCurColumn; u8 iconScrollCurColumn;
s8 iconScrollDirection; // Unnecessary duplicate of scrollDirection s8 iconScrollDirection; // Unnecessary duplicate of scrollDirection
u8 iconScrollState; u8 iconScrollState;
u8 iconScrollToBoxId; // Unnecessary duplicate of scrollToBoxId u8 iconScrollToBoxId; // Unused duplicate of scrollToBoxId
struct WindowTemplate menuWindow; struct WindowTemplate menuWindow;
struct StorageMenu menuItems[7]; struct StorageMenu menuItems[7];
u8 menuItemsCount; u8 menuItemsCount;
@@ -1113,7 +1113,7 @@ static const struct OamData sOamData_DisplayMon =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -1130,7 +1130,7 @@ static const struct OamData sOamData_Waveform =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x8), .shape = SPRITE_SHAPE(16x8),
.x = 0, .x = 0,
@@ -1206,7 +1206,7 @@ static const struct OamData sOamData_MonIcon =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -1549,7 +1549,7 @@ static void Task_PCMainMenu(u8 taskId)
LoadMessageBoxAndBorderGfx(); LoadMessageBoxAndBorderGfx();
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, TEXT_SKIP_DRAW, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, TEXT_SKIP_DRAW, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
CopyWindowToVram(task->tWindowId, COPYWIN_FULL); CopyWindowToVram(task->tWindowId, COPYWIN_FULL);
task->tState++; task->tState++;
@@ -1573,7 +1573,7 @@ static void Task_PCMainMenu(u8 taskId)
{ {
task->tSelectedOption = task->tNextOption; task->tSelectedOption = task->tNextOption;
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
break; break;
case MENU_B_PRESSED: case MENU_B_PRESSED:
@@ -1589,14 +1589,14 @@ static void Task_PCMainMenu(u8 taskId)
{ {
// Can't withdraw // Can't withdraw
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_PartyFull, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_PartyFull, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_ERROR_MSG; task->tState = STATE_ERROR_MSG;
} }
else if (task->tInput == OPTION_DEPOSIT && CountPartyMons() == 1) else if (task->tInput == OPTION_DEPOSIT && CountPartyMons() == 1)
{ {
// Can't deposit // Can't deposit
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_JustOnePkmn, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_JustOnePkmn, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_ERROR_MSG; task->tState = STATE_ERROR_MSG;
} }
else else
@@ -1614,7 +1614,7 @@ static void Task_PCMainMenu(u8 taskId)
if (JOY_NEW(A_BUTTON | B_BUTTON)) if (JOY_NEW(A_BUTTON | B_BUTTON))
{ {
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_HANDLE_INPUT; task->tState = STATE_HANDLE_INPUT;
} }
else if (JOY_NEW(DPAD_UP)) else if (JOY_NEW(DPAD_UP))
@@ -1624,7 +1624,7 @@ static void Task_PCMainMenu(u8 taskId)
Menu_MoveCursor(-1); Menu_MoveCursor(-1);
task->tSelectedOption = Menu_GetCursorPos(); task->tSelectedOption = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_HANDLE_INPUT; task->tState = STATE_HANDLE_INPUT;
} }
else if (JOY_NEW(DPAD_DOWN)) else if (JOY_NEW(DPAD_DOWN))
@@ -1634,7 +1634,7 @@ static void Task_PCMainMenu(u8 taskId)
Menu_MoveCursor(1); Menu_MoveCursor(1);
task->tSelectedOption = Menu_GetCursorPos(); task->tSelectedOption = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_HANDLE_INPUT; task->tState = STATE_HANDLE_INPUT;
} }
break; break;
@@ -8643,7 +8643,7 @@ static const struct OamData sOamData_ItemIcon =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL, .affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -9241,16 +9241,16 @@ static bool8 UpdateItemInfoWindowSlideOut(void)
return TRUE; return TRUE;
} }
static void DrawItemInfoWindow(u32 pos) static void DrawItemInfoWindow(u32 x)
{ {
if (pos != 0) if (x != 0)
{ {
FillBgTilemapBufferRect(0, 0x13A, 0, 0xC, pos, 1, 0xFu); FillBgTilemapBufferRect(0, 0x13A, 0, 0xC, x, 1, 0xFu);
FillBgTilemapBufferRect(0, 0x93A, 0, 0x14, pos, 1, 0xFu); FillBgTilemapBufferRect(0, 0x93A, 0, 0x14, x, 1, 0xFu);
} }
FillBgTilemapBufferRect(0, 0x13B, pos, 0xD, 1, 7, 0xFu); FillBgTilemapBufferRect(0, 0x13B, x, 0xD, 1, 7, 0xFu);
FillBgTilemapBufferRect(0, 0x13C, pos, 0xC, 1, 1, 0xFu); FillBgTilemapBufferRect(0, 0x13C, x, 0xC, 1, 1, 0xFu);
FillBgTilemapBufferRect(0, 0x13D, pos, 0x14, 1, 1, 0xFu); FillBgTilemapBufferRect(0, 0x13D, x, 0x14, 1, 1, 0xFu);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
} }
@@ -10032,7 +10032,7 @@ static void UnkUtil_CpuRun(struct UnkUtilData *data)
for (i = 0; i < data->height; i++) for (i = 0; i < data->height; i++)
{ {
CpuSet(data->src, data->dest, data->size / 2); CpuCopy16(data->src, data->dest, data->size);
data->dest += 64; data->dest += 64;
data->src += data->unk * 2; data->src += data->unk * 2;
} }
src/pokemon_summary_screen.c
+3 -3
View File
@@ -736,7 +736,7 @@ static const struct OamData sOamData_MoveTypes =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16), .shape = SPRITE_SHAPE(32x16),
.x = 0, .x = 0,
@@ -912,7 +912,7 @@ static const struct OamData sOamData_MoveSelector =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -1002,7 +1002,7 @@ static const struct OamData sOamData_StatusCondition =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8), .shape = SPRITE_SHAPE(32x8),
.x = 0, .x = 0,
src/pokenav_ribbons_summary.c
+1 -1
View File
@@ -1154,7 +1154,7 @@ static const struct OamData sOamData_RibbonIconBig =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL, .affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
src/rayquaza_scene.c
+8 -8
View File
@@ -154,7 +154,7 @@ static const struct OamData sOam_64x64 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -171,7 +171,7 @@ static const struct OamData sOam_32x32 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -188,7 +188,7 @@ static const struct OamData sOam_64x32 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -205,7 +205,7 @@ static const struct OamData sOam_32x16 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x16), .shape = SPRITE_SHAPE(32x16),
.x = 0, .x = 0,
@@ -222,7 +222,7 @@ static const struct OamData sOam_16x8 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x8), .shape = SPRITE_SHAPE(16x8),
.x = 0, .x = 0,
@@ -239,7 +239,7 @@ static const struct OamData sOam_16x32 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x32), .shape = SPRITE_SHAPE(16x32),
.x = 0, .x = 0,
@@ -256,7 +256,7 @@ static const struct OamData sOam_16x16 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -273,7 +273,7 @@ static const struct OamData sOam_32x8 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8), .shape = SPRITE_SHAPE(32x8),
.x = 0, .x = 0,
src/reset_rtc_screen.c
+1 -1
View File
@@ -159,7 +159,7 @@ static const struct OamData sOamData_Arrow =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
src/rotating_gate.c
+2 -2
View File
@@ -233,7 +233,7 @@ static const struct OamData sOamData_RotatingGateLarge =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL, .affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
@@ -250,7 +250,7 @@ static const struct OamData sOamData_RotatingGateRegular =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL, .affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
src/save_failed_screen.c
+1 -1
View File
@@ -50,7 +50,7 @@ static const struct OamData sClockOamData =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
src/script_menu.c
+7 -7
View File
@@ -380,7 +380,7 @@ static void CreatePCMultichoice(void)
void ScriptMenu_DisplayPCStartupPrompt(void) void ScriptMenu_DisplayPCStartupPrompt(void)
{ {
LoadMessageBoxAndFrameGfx(0, TRUE); LoadMessageBoxAndFrameGfx(0, TRUE);
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_WhichPCShouldBeAccessed, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_WhichPCShouldBeAccessed, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
bool8 ScriptMenu_CreateLilycoveSSTidalMultichoice(void) bool8 ScriptMenu_CreateLilycoveSSTidalMultichoice(void)
@@ -646,27 +646,27 @@ static void DrawLinkServicesMultichoiceMenu(u8 multichoiceId)
{ {
case MULTI_WIRELESS_NO_BERRY: case MULTI_WIRELESS_NO_BERRY:
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptionsNoBerryCrush[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptionsNoBerryCrush[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break; break;
case MULTI_CABLE_CLUB_WITH_RECORD_MIX: case MULTI_CABLE_CLUB_WITH_RECORD_MIX:
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sCableClubOptions_WithRecordMix[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sCableClubOptions_WithRecordMix[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break; break;
case MULTI_WIRELESS_NO_RECORD: case MULTI_WIRELESS_NO_RECORD:
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_NoRecordMix[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_NoRecordMix[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break; break;
case MULTI_WIRELESS_ALL_SERVICES: case MULTI_WIRELESS_ALL_SERVICES:
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_AllServices[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_AllServices[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break; break;
case MULTI_WIRELESS_NO_RECORD_BERRY: case MULTI_WIRELESS_NO_RECORD_BERRY:
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_NoRecordMixBerryCrush[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sWirelessOptions_NoRecordMixBerryCrush[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break; break;
case MULTI_CABLE_CLUB_NO_RECORD_MIX: case MULTI_CABLE_CLUB_NO_RECORD_MIX:
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_NORMAL, sCableClubOptions_NoRecordMix[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sCableClubOptions_NoRecordMix[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break; break;
} }
} }
src/slot_machine.c
+8 -8
View File
@@ -5672,7 +5672,7 @@ static const struct OamData sOam_8x8 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x8), .shape = SPRITE_SHAPE(8x8),
.x = 0, .x = 0,
@@ -5689,7 +5689,7 @@ static const struct OamData sOam_8x16 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(8x16), .shape = SPRITE_SHAPE(8x16),
.x = 0, .x = 0,
@@ -5706,7 +5706,7 @@ static const struct OamData sOam_16x16 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
@@ -5723,7 +5723,7 @@ static const struct OamData sOam_16x32 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x32), .shape = SPRITE_SHAPE(16x32),
.x = 0, .x = 0,
@@ -5740,7 +5740,7 @@ static const struct OamData sOam_32x32 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -5757,7 +5757,7 @@ static const struct OamData sOam_32x64 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x64), .shape = SPRITE_SHAPE(32x64),
.x = 0, .x = 0,
@@ -5774,7 +5774,7 @@ static const struct OamData sOam_64x32 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -5791,7 +5791,7 @@ static const struct OamData sOam_64x64 =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/starter_choose.c
+3 -3
View File
@@ -160,7 +160,7 @@ static const struct OamData sOam_Hand =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -177,7 +177,7 @@ static const struct OamData sOam_Pokeball =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32), .shape = SPRITE_SHAPE(32x32),
.x = 0, .x = 0,
@@ -194,7 +194,7 @@ static const struct OamData sOam_StarterCircle =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_DOUBLE, .affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/title_screen.c
+4 -4
View File
@@ -105,7 +105,7 @@ static const struct OamData sVersionBannerLeftOamData =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_8BPP, .bpp = ST_OAM_8BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -122,7 +122,7 @@ static const struct OamData sVersionBannerRightOamData =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_8BPP, .bpp = ST_OAM_8BPP,
.shape = SPRITE_SHAPE(64x32), .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
@@ -193,7 +193,7 @@ static const struct OamData sOamData_CopyrightBanner =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8), .shape = SPRITE_SHAPE(32x8),
.x = 0, .x = 0,
@@ -305,7 +305,7 @@ static const struct OamData sPokemonLogoShineOamData =
.y = DISPLAY_HEIGHT, .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64), .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
src/trainer_see.c
+1 -1
View File
@@ -115,7 +115,7 @@ static const struct OamData sOamData_Icons =
.y = 0, .y = 0,
.affineMode = ST_OAM_AFFINE_OFF, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16), .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,