ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Corrected additional inconsistent uses of whitespace

Browse Source
This commit is contained in:
Eduardo Quezada 2022-08-15 17:04:34 -04:00
parent 63e4a8adcd
commit e8a05e92e4
11 changed files with 898 additions and 898 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1010
data/battle_ai_scripts.s
View File

File diff suppressed because it is too large Load Diff

4
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
View File

@ -33,8 +33,8 @@ EverGrandeCity_ChampionsRoom_EventScript_EnterRoom::
waitmovement 0 waitmovement 0
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
goto EverGrandeCity_ChampionsRoom_EventScript_Wallace goto EverGrandeCity_ChampionsRoom_EventScript_Wallace
releaseall releaseall
end end
EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace:
walk_up walk_up

2
data/maps/FortreeCity_DecorationShop/scripts.inc
View File

@ -19,7 +19,7 @@ FortreeCity_DecorationShop_EventScript_ClerkDesks::
release release
end end
.align 2 .align 2
FortreeCity_DecorationShop_PokemartDecor_Desks: FortreeCity_DecorationShop_PokemartDecor_Desks:
.2byte DECOR_SMALL_DESK .2byte DECOR_SMALL_DESK
.2byte DECOR_POKEMON_DESK .2byte DECOR_POKEMON_DESK

32
gflib/bg.h
View File

@ -3,29 +3,29 @@
enum enum
{ {
BG_ATTR_CHARBASEINDEX = 1, BG_ATTR_CHARBASEINDEX = 1,
BG_ATTR_MAPBASEINDEX, BG_ATTR_MAPBASEINDEX,
BG_ATTR_SCREENSIZE, BG_ATTR_SCREENSIZE,
BG_ATTR_PALETTEMODE, BG_ATTR_PALETTEMODE,
BG_ATTR_MOSAIC, BG_ATTR_MOSAIC,
BG_ATTR_WRAPAROUND, BG_ATTR_WRAPAROUND,
BG_ATTR_PRIORITY, BG_ATTR_PRIORITY,
BG_ATTR_METRIC, BG_ATTR_METRIC,
BG_ATTR_TYPE, BG_ATTR_TYPE,
BG_ATTR_BASETILE, BG_ATTR_BASETILE,
}; };
enum { enum {
BG_TYPE_NORMAL, BG_TYPE_NORMAL,
BG_TYPE_AFFINE, BG_TYPE_AFFINE,
BG_TYPE_NONE = 0xFFFF BG_TYPE_NONE = 0xFFFF
}; };
// Modes for ChangeBgX / ChangeBgY // Modes for ChangeBgX / ChangeBgY
enum { enum {
BG_COORD_SET, BG_COORD_SET,
BG_COORD_ADD, BG_COORD_ADD,
BG_COORD_SUB, BG_COORD_SUB,
}; };
// Modes for Unused_AdjustBgMosaic // Modes for Unused_AdjustBgMosaic

74
include/pokenav.h
View File

@ -116,21 +116,21 @@ enum
#define POKENAV_MENU_IDS_START 100000 #define POKENAV_MENU_IDS_START 100000
enum enum
{ {
POKENAV_MAIN_MENU = POKENAV_MENU_IDS_START, // The main menu where the player selects Hoenn Map/Condition/Match Call/Ribbons POKENAV_MAIN_MENU = POKENAV_MENU_IDS_START, // The main menu where the player selects Hoenn Map/Condition/Match Call/Ribbons
POKENAV_MAIN_MENU_CURSOR_ON_MAP, POKENAV_MAIN_MENU_CURSOR_ON_MAP,
POKENAV_CONDITION_MENU, // The first Condition screen where the player selects Party or Search POKENAV_CONDITION_MENU, // The first Condition screen where the player selects Party or Search
POKENAV_CONDITION_SEARCH_MENU, // The Condition search menu where the player selects a search parameter POKENAV_CONDITION_SEARCH_MENU, // The Condition search menu where the player selects a search parameter
POKENAV_MAIN_MENU_CURSOR_ON_MATCH_CALL, POKENAV_MAIN_MENU_CURSOR_ON_MATCH_CALL,
POKENAV_MAIN_MENU_CURSOR_ON_RIBBONS, POKENAV_MAIN_MENU_CURSOR_ON_RIBBONS,
POKENAV_REGION_MAP, POKENAV_REGION_MAP,
POKENAV_CONDITION_GRAPH_PARTY, // The Condition graph screen when Party has been selected POKENAV_CONDITION_GRAPH_PARTY, // The Condition graph screen when Party has been selected
POKENAV_CONDITION_SEARCH_RESULTS, // The list of results from a Condition search POKENAV_CONDITION_SEARCH_RESULTS, // The list of results from a Condition search
POKENAV_CONDITION_GRAPH_SEARCH, // The Condition graph screen when a search result has been selected POKENAV_CONDITION_GRAPH_SEARCH, // The Condition graph screen when a search result has been selected
POKENAV_RETURN_CONDITION_SEARCH, // Exited the graph screen back to the list of Condition search results POKENAV_RETURN_CONDITION_SEARCH, // Exited the graph screen back to the list of Condition search results
POKENAV_MATCH_CALL, POKENAV_MATCH_CALL,
POKENAV_RIBBONS_MON_LIST, // The list of Pokémon with ribbons POKENAV_RIBBONS_MON_LIST, // The list of Pokémon with ribbons
POKENAV_RIBBONS_SUMMARY_SCREEN, // The ribbon summary screen shown when a Pokémon has been selected POKENAV_RIBBONS_SUMMARY_SCREEN, // The ribbon summary screen shown when a Pokémon has been selected
POKENAV_RIBBONS_RETURN_TO_MON_LIST, // Exited the summary screen back to the ribbon list POKENAV_RIBBONS_RETURN_TO_MON_LIST, // Exited the summary screen back to the ribbon list
}; };
enum enum
@ -185,28 +185,28 @@ enum
enum enum
{ {
MC_HEADER_MR_STONE, MC_HEADER_MR_STONE,
MC_HEADER_PROF_BIRCH, MC_HEADER_PROF_BIRCH,
MC_HEADER_BRENDAN, MC_HEADER_BRENDAN,
MC_HEADER_MAY, MC_HEADER_MAY,
MC_HEADER_WALLY, MC_HEADER_WALLY,
MC_HEADER_NORMAN, MC_HEADER_NORMAN,
MC_HEADER_MOM, MC_HEADER_MOM,
MC_HEADER_STEVEN, MC_HEADER_STEVEN,
MC_HEADER_SCOTT, MC_HEADER_SCOTT,
MC_HEADER_ROXANNE, MC_HEADER_ROXANNE,
MC_HEADER_BRAWLY, MC_HEADER_BRAWLY,
MC_HEADER_WATTSON, MC_HEADER_WATTSON,
MC_HEADER_FLANNERY, MC_HEADER_FLANNERY,
MC_HEADER_WINONA, MC_HEADER_WINONA,
MC_HEADER_TATE_LIZA, MC_HEADER_TATE_LIZA,
MC_HEADER_JUAN, MC_HEADER_JUAN,
MC_HEADER_SIDNEY, MC_HEADER_SIDNEY,
MC_HEADER_PHOEBE, MC_HEADER_PHOEBE,
MC_HEADER_GLACIA, MC_HEADER_GLACIA,
MC_HEADER_DRAKE, MC_HEADER_DRAKE,
MC_HEADER_WALLACE, MC_HEADER_WALLACE,
MC_HEADER_COUNT MC_HEADER_COUNT
}; };
enum enum

502
src/data/easy_chat/easy_chat_group_pokemon2.h
View File

@ -1,253 +1,253 @@
const u16 gEasyChatGroup_Pokemon2[] = { const u16 gEasyChatGroup_Pokemon2[] = {
SPECIES_ABRA, SPECIES_ABRA,
SPECIES_AERODACTYL, SPECIES_AERODACTYL,
SPECIES_AIPOM, SPECIES_AIPOM,
SPECIES_ALAKAZAM, SPECIES_ALAKAZAM,
SPECIES_AMPHAROS, SPECIES_AMPHAROS,
SPECIES_ARBOK, SPECIES_ARBOK,
SPECIES_ARCANINE, SPECIES_ARCANINE,
SPECIES_ARIADOS, SPECIES_ARIADOS,
SPECIES_ARTICUNO, SPECIES_ARTICUNO,
SPECIES_AZUMARILL, SPECIES_AZUMARILL,
SPECIES_BAYLEEF, SPECIES_BAYLEEF,
SPECIES_BEEDRILL, SPECIES_BEEDRILL,
SPECIES_BELLOSSOM, SPECIES_BELLOSSOM,
SPECIES_BELLSPROUT, SPECIES_BELLSPROUT,
SPECIES_BLASTOISE, SPECIES_BLASTOISE,
SPECIES_BLISSEY, SPECIES_BLISSEY,
SPECIES_BULBASAUR, SPECIES_BULBASAUR,
SPECIES_BUTTERFREE, SPECIES_BUTTERFREE,
SPECIES_CATERPIE, SPECIES_CATERPIE,
SPECIES_CELEBI, SPECIES_CELEBI,
SPECIES_CHANSEY, SPECIES_CHANSEY,
SPECIES_CHARIZARD, SPECIES_CHARIZARD,
SPECIES_CHARMANDER, SPECIES_CHARMANDER,
SPECIES_CHARMELEON, SPECIES_CHARMELEON,
SPECIES_CHIKORITA, SPECIES_CHIKORITA,
SPECIES_CHINCHOU, SPECIES_CHINCHOU,
SPECIES_CLEFABLE, SPECIES_CLEFABLE,
SPECIES_CLEFAIRY, SPECIES_CLEFAIRY,
SPECIES_CLEFFA, SPECIES_CLEFFA,
SPECIES_CLOYSTER, SPECIES_CLOYSTER,
SPECIES_CORSOLA, SPECIES_CORSOLA,
SPECIES_CROBAT, SPECIES_CROBAT,
SPECIES_CROCONAW, SPECIES_CROCONAW,
SPECIES_CUBONE, SPECIES_CUBONE,
SPECIES_CYNDAQUIL, SPECIES_CYNDAQUIL,
SPECIES_DELIBIRD, SPECIES_DELIBIRD,
SPECIES_DEWGONG, SPECIES_DEWGONG,
SPECIES_DIGLETT, SPECIES_DIGLETT,
SPECIES_DITTO, SPECIES_DITTO,
SPECIES_DODRIO, SPECIES_DODRIO,
SPECIES_DODUO, SPECIES_DODUO,
SPECIES_DONPHAN, SPECIES_DONPHAN,
SPECIES_DRAGONAIR, SPECIES_DRAGONAIR,
SPECIES_DRAGONITE, SPECIES_DRAGONITE,
SPECIES_DRATINI, SPECIES_DRATINI,
SPECIES_DROWZEE, SPECIES_DROWZEE,
SPECIES_DUGTRIO, SPECIES_DUGTRIO,
SPECIES_DUNSPARCE, SPECIES_DUNSPARCE,
SPECIES_EEVEE, SPECIES_EEVEE,
SPECIES_EKANS, SPECIES_EKANS,
SPECIES_ELECTABUZZ, SPECIES_ELECTABUZZ,
SPECIES_ELECTRODE, SPECIES_ELECTRODE,
SPECIES_ELEKID, SPECIES_ELEKID,
SPECIES_ENTEI, SPECIES_ENTEI,
SPECIES_ESPEON, SPECIES_ESPEON,
SPECIES_EXEGGCUTE, SPECIES_EXEGGCUTE,
SPECIES_EXEGGUTOR, SPECIES_EXEGGUTOR,
SPECIES_FARFETCHD, SPECIES_FARFETCHD,
SPECIES_FEAROW, SPECIES_FEAROW,
SPECIES_FERALIGATR, SPECIES_FERALIGATR,
SPECIES_FLAAFFY, SPECIES_FLAAFFY,
SPECIES_FLAREON, SPECIES_FLAREON,
SPECIES_FORRETRESS, SPECIES_FORRETRESS,
SPECIES_FURRET, SPECIES_FURRET,
SPECIES_GASTLY, SPECIES_GASTLY,
SPECIES_GENGAR, SPECIES_GENGAR,
SPECIES_GEODUDE, SPECIES_GEODUDE,
SPECIES_GIRAFARIG, SPECIES_GIRAFARIG,
SPECIES_GLIGAR, SPECIES_GLIGAR,
SPECIES_GLOOM, SPECIES_GLOOM,
SPECIES_GOLBAT, SPECIES_GOLBAT,
SPECIES_GOLDEEN, SPECIES_GOLDEEN,
SPECIES_GOLDUCK, SPECIES_GOLDUCK,
SPECIES_GOLEM, SPECIES_GOLEM,
SPECIES_GRANBULL, SPECIES_GRANBULL,
SPECIES_GRAVELER, SPECIES_GRAVELER,
SPECIES_GRIMER, SPECIES_GRIMER,
SPECIES_GROWLITHE, SPECIES_GROWLITHE,
SPECIES_GYARADOS, SPECIES_GYARADOS,
SPECIES_HAUNTER, SPECIES_HAUNTER,
SPECIES_HERACROSS, SPECIES_HERACROSS,
SPECIES_HITMONCHAN, SPECIES_HITMONCHAN,
SPECIES_HITMONLEE, SPECIES_HITMONLEE,
SPECIES_HITMONTOP, SPECIES_HITMONTOP,
SPECIES_HO_OH, SPECIES_HO_OH,
SPECIES_HOOTHOOT, SPECIES_HOOTHOOT,
SPECIES_HOPPIP, SPECIES_HOPPIP,
SPECIES_HORSEA, SPECIES_HORSEA,
SPECIES_HOUNDOOM, SPECIES_HOUNDOOM,
SPECIES_HOUNDOUR, SPECIES_HOUNDOUR,
SPECIES_HYPNO, SPECIES_HYPNO,
SPECIES_IGGLYBUFF, SPECIES_IGGLYBUFF,
SPECIES_IVYSAUR, SPECIES_IVYSAUR,
SPECIES_JIGGLYPUFF, SPECIES_JIGGLYPUFF,
SPECIES_JOLTEON, SPECIES_JOLTEON,
SPECIES_JUMPLUFF, SPECIES_JUMPLUFF,
SPECIES_JYNX, SPECIES_JYNX,
SPECIES_KABUTO, SPECIES_KABUTO,
SPECIES_KABUTOPS, SPECIES_KABUTOPS,
SPECIES_KADABRA, SPECIES_KADABRA,
SPECIES_KAKUNA, SPECIES_KAKUNA,
SPECIES_KANGASKHAN, SPECIES_KANGASKHAN,
SPECIES_KINGDRA, SPECIES_KINGDRA,
SPECIES_KINGLER, SPECIES_KINGLER,
SPECIES_KOFFING, SPECIES_KOFFING,
SPECIES_KRABBY, SPECIES_KRABBY,
SPECIES_LANTURN, SPECIES_LANTURN,
SPECIES_LAPRAS, SPECIES_LAPRAS,
SPECIES_LARVITAR, SPECIES_LARVITAR,
SPECIES_LEDIAN, SPECIES_LEDIAN,
SPECIES_LEDYBA, SPECIES_LEDYBA,
SPECIES_LICKITUNG, SPECIES_LICKITUNG,
SPECIES_LUGIA, SPECIES_LUGIA,
SPECIES_MACHAMP, SPECIES_MACHAMP,
SPECIES_MACHOKE, SPECIES_MACHOKE,
SPECIES_MACHOP, SPECIES_MACHOP,
SPECIES_MAGBY, SPECIES_MAGBY,
SPECIES_MAGCARGO, SPECIES_MAGCARGO,
SPECIES_MAGIKARP, SPECIES_MAGIKARP,
SPECIES_MAGMAR, SPECIES_MAGMAR,
SPECIES_MAGNEMITE, SPECIES_MAGNEMITE,
SPECIES_MAGNETON, SPECIES_MAGNETON,
SPECIES_MANKEY, SPECIES_MANKEY,
SPECIES_MANTINE, SPECIES_MANTINE,
SPECIES_MAREEP, SPECIES_MAREEP,
SPECIES_MARILL, SPECIES_MARILL,
SPECIES_MAROWAK, SPECIES_MAROWAK,
SPECIES_MEGANIUM, SPECIES_MEGANIUM,
SPECIES_MEOWTH, SPECIES_MEOWTH,
SPECIES_METAPOD, SPECIES_METAPOD,
SPECIES_MEW, SPECIES_MEW,
SPECIES_MEWTWO, SPECIES_MEWTWO,
SPECIES_MILTANK, SPECIES_MILTANK,
SPECIES_MISDREAVUS, SPECIES_MISDREAVUS,
SPECIES_MOLTRES, SPECIES_MOLTRES,
SPECIES_MR_MIME, SPECIES_MR_MIME,
SPECIES_MUK, SPECIES_MUK,
SPECIES_MURKROW, SPECIES_MURKROW,
SPECIES_NATU, SPECIES_NATU,
SPECIES_NIDOKING, SPECIES_NIDOKING,
SPECIES_NIDOQUEEN, SPECIES_NIDOQUEEN,
SPECIES_NIDORAN_F, SPECIES_NIDORAN_F,
SPECIES_NIDORAN_M, SPECIES_NIDORAN_M,
SPECIES_NIDORINA, SPECIES_NIDORINA,
SPECIES_NIDORINO, SPECIES_NIDORINO,
SPECIES_NINETALES, SPECIES_NINETALES,
SPECIES_NOCTOWL, SPECIES_NOCTOWL,
SPECIES_OCTILLERY, SPECIES_OCTILLERY,
SPECIES_ODDISH, SPECIES_ODDISH,
SPECIES_OMANYTE, SPECIES_OMANYTE,
SPECIES_OMASTAR, SPECIES_OMASTAR,
SPECIES_ONIX, SPECIES_ONIX,
SPECIES_PARAS, SPECIES_PARAS,
SPECIES_PARASECT, SPECIES_PARASECT,
SPECIES_PERSIAN, SPECIES_PERSIAN,
SPECIES_PHANPY, SPECIES_PHANPY,
SPECIES_PICHU, SPECIES_PICHU,
SPECIES_PIDGEOT, SPECIES_PIDGEOT,
SPECIES_PIDGEOTTO, SPECIES_PIDGEOTTO,
SPECIES_PIDGEY, SPECIES_PIDGEY,
SPECIES_PIKACHU, SPECIES_PIKACHU,
SPECIES_PILOSWINE, SPECIES_PILOSWINE,
SPECIES_PINECO, SPECIES_PINECO,
SPECIES_PINSIR, SPECIES_PINSIR,
SPECIES_POLITOED, SPECIES_POLITOED,
SPECIES_POLIWAG, SPECIES_POLIWAG,
SPECIES_POLIWHIRL, SPECIES_POLIWHIRL,
SPECIES_POLIWRATH, SPECIES_POLIWRATH,
SPECIES_PONYTA, SPECIES_PONYTA,
SPECIES_PORYGON, SPECIES_PORYGON,
SPECIES_PORYGON2, SPECIES_PORYGON2,
SPECIES_PRIMEAPE, SPECIES_PRIMEAPE,
SPECIES_PSYDUCK, SPECIES_PSYDUCK,
SPECIES_PUPITAR, SPECIES_PUPITAR,
SPECIES_QUAGSIRE, SPECIES_QUAGSIRE,
SPECIES_QUILAVA, SPECIES_QUILAVA,
SPECIES_QWILFISH, SPECIES_QWILFISH,
SPECIES_RAICHU, SPECIES_RAICHU,
SPECIES_RAIKOU, SPECIES_RAIKOU,
SPECIES_RAPIDASH, SPECIES_RAPIDASH,
SPECIES_RATICATE, SPECIES_RATICATE,
SPECIES_RATTATA, SPECIES_RATTATA,
SPECIES_REMORAID, SPECIES_REMORAID,
SPECIES_RHYDON, SPECIES_RHYDON,
SPECIES_RHYHORN, SPECIES_RHYHORN,
SPECIES_SANDSHREW, SPECIES_SANDSHREW,
SPECIES_SANDSLASH, SPECIES_SANDSLASH,
SPECIES_SCIZOR, SPECIES_SCIZOR,
SPECIES_SCYTHER, SPECIES_SCYTHER,
SPECIES_SEADRA, SPECIES_SEADRA,
SPECIES_SEAKING, SPECIES_SEAKING,
SPECIES_SEEL, SPECIES_SEEL,
SPECIES_SENTRET, SPECIES_SENTRET,
SPECIES_SHELLDER, SPECIES_SHELLDER,
SPECIES_SHUCKLE, SPECIES_SHUCKLE,
SPECIES_SKARMORY, SPECIES_SKARMORY,
SPECIES_SKIPLOOM, SPECIES_SKIPLOOM,
SPECIES_SLOWBRO, SPECIES_SLOWBRO,
SPECIES_SLOWKING, SPECIES_SLOWKING,
SPECIES_SLOWPOKE, SPECIES_SLOWPOKE,
SPECIES_SLUGMA, SPECIES_SLUGMA,
SPECIES_SMEARGLE, SPECIES_SMEARGLE,
SPECIES_SMOOCHUM, SPECIES_SMOOCHUM,
SPECIES_SNEASEL, SPECIES_SNEASEL,
SPECIES_SNORLAX, SPECIES_SNORLAX,
SPECIES_SNUBBULL, SPECIES_SNUBBULL,
SPECIES_SPEAROW, SPECIES_SPEAROW,
SPECIES_SPINARAK, SPECIES_SPINARAK,
SPECIES_SQUIRTLE, SPECIES_SQUIRTLE,
SPECIES_STANTLER, SPECIES_STANTLER,
SPECIES_STARMIE, SPECIES_STARMIE,
SPECIES_STARYU, SPECIES_STARYU,
SPECIES_STEELIX, SPECIES_STEELIX,
SPECIES_SUDOWOODO, SPECIES_SUDOWOODO,
SPECIES_SUICUNE, SPECIES_SUICUNE,
SPECIES_SUNFLORA, SPECIES_SUNFLORA,
SPECIES_SUNKERN, SPECIES_SUNKERN,
SPECIES_SWINUB, SPECIES_SWINUB,
SPECIES_TANGELA, SPECIES_TANGELA,
SPECIES_TAUROS, SPECIES_TAUROS,
SPECIES_TEDDIURSA, SPECIES_TEDDIURSA,
SPECIES_TENTACOOL, SPECIES_TENTACOOL,
SPECIES_TENTACRUEL, SPECIES_TENTACRUEL,
SPECIES_TOGEPI, SPECIES_TOGEPI,
SPECIES_TOGETIC, SPECIES_TOGETIC,
SPECIES_TOTODILE, SPECIES_TOTODILE,
SPECIES_TYPHLOSION, SPECIES_TYPHLOSION,
SPECIES_TYRANITAR, SPECIES_TYRANITAR,
SPECIES_TYROGUE, SPECIES_TYROGUE,
SPECIES_UMBREON, SPECIES_UMBREON,
SPECIES_UNOWN, SPECIES_UNOWN,
SPECIES_URSARING, SPECIES_URSARING,
SPECIES_VAPOREON, SPECIES_VAPOREON,
SPECIES_VENOMOTH, SPECIES_VENOMOTH,
SPECIES_VENONAT, SPECIES_VENONAT,
SPECIES_VENUSAUR, SPECIES_VENUSAUR,
SPECIES_VICTREEBEL, SPECIES_VICTREEBEL,
SPECIES_VILEPLUME, SPECIES_VILEPLUME,
SPECIES_VOLTORB, SPECIES_VOLTORB,
SPECIES_VULPIX, SPECIES_VULPIX,
SPECIES_WARTORTLE, SPECIES_WARTORTLE,
SPECIES_WEEDLE, SPECIES_WEEDLE,
SPECIES_WEEPINBELL, SPECIES_WEEPINBELL,
SPECIES_WEEZING, SPECIES_WEEZING,
SPECIES_WIGGLYTUFF, SPECIES_WIGGLYTUFF,
SPECIES_WOBBUFFET, SPECIES_WOBBUFFET,
SPECIES_WOOPER, SPECIES_WOOPER,
SPECIES_XATU, SPECIES_XATU,
SPECIES_YANMA, SPECIES_YANMA,
SPECIES_ZAPDOS, SPECIES_ZAPDOS,
SPECIES_ZUBAT, SPECIES_ZUBAT,
}; };

64
src/fonts.c
View File

@ -110,38 +110,38 @@ ALIGNED(4) const u8 gFontNarrowLatinGlyphWidths[] = {
ALIGNED(4) const u16 gFontShortLatinGlyphs[] = INCBIN_U16("graphics/fonts/short.latfont"); ALIGNED(4) const u16 gFontShortLatinGlyphs[] = INCBIN_U16("graphics/fonts/short.latfont");
ALIGNED(4) const u8 gFontShortLatinGlyphWidths[] = { ALIGNED(4) const u8 gFontShortLatinGlyphWidths[] = {
3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6,
8, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 3, 8, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 3,
6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 9, 8, 8, 3, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 9, 8, 8, 3,
3, 3, 3, 3, 10, 8, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 10, 8, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
6, 6, 6, 8, 8, 8, 8, 8, 8, 4, 6, 8, 5, 5, 3, 3, 6, 6, 6, 8, 8, 8, 8, 8, 8, 4, 6, 8, 5, 5, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 6,
3, 3, 3, 3, 3, 3, 3, 6, 3, 12, 12, 12, 12, 1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 12, 12, 12, 12, 1, 2, 3,
4, 5, 6, 7, 8, 8, 8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 5, 6, 7, 8, 8, 8, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 5, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 5,
6, 6, 6, 3, 3, 6, 6, 8, 5, 9, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 6, 6, 8, 5, 9, 6, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 4, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 4, 6, 5,
5, 6, 5, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, 6, 8, 5, 6, 5, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, 6, 8,
5, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3,
12, 12, 12, 12, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 12, 12, 12, 12, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
10, 10, 10, 10, 10, 10, 10, 10, 3, 3, 3, 3, 3, 3, 3, 3, 10, 10, 10, 10, 10, 10, 10, 10, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3,
}; };
ALIGNED(4) const u16 gFontNormalLatinGlyphs[] = INCBIN_U16("graphics/fonts/normal.latfont"); ALIGNED(4) const u16 gFontNormalLatinGlyphs[] = INCBIN_U16("graphics/fonts/normal.latfont");

20
src/rom_header.s
View File

@ -1,5 +1,5 @@
@ Note: ROM header data is empty space here. @ Note: ROM header data is empty space here.
@ It's populated by gbafix using data provided in the Makefile. @ It's populated by gbafix using data provided in the Makefile.
.global Start .global Start
Start: Start:
@ -41,20 +41,20 @@ RomHeaderChecksum:
RomHeaderReserved2: RomHeaderReserved2:
.space 2 .space 2
.word 0 .word 0
.global GPIOPortData .global GPIOPortData
GPIOPortData: GPIOPortData:
.2byte 0 .2byte 0
.global GPIOPortDirection .global GPIOPortDirection
GPIOPortDirection: GPIOPortDirection:
.2byte 0 .2byte 0
.global GPIOPortReadEnable .global GPIOPortReadEnable
GPIOPortReadEnable: GPIOPortReadEnable:
.2byte 0 .2byte 0
.2byte 0 .2byte 0
.space 0x34 .space 0x34

12
src/roulette.c
View File

@ -1040,11 +1040,11 @@ static const struct YesNoFuncTable sYesNoTable_KeepPlaying =
static void CB2_Roulette(void) static void CB2_Roulette(void)
{ {
RunTasks(); RunTasks();
AnimateSprites(); AnimateSprites();
BuildOamBuffer(); BuildOamBuffer();
if (sRoulette->flashUtil.enabled) if (sRoulette->flashUtil.enabled)
RouletteFlash_Run(&sRoulette->flashUtil); RouletteFlash_Run(&sRoulette->flashUtil);
} }
static void VBlankCB_Roulette(void) static void VBlankCB_Roulette(void)
@ -4516,7 +4516,7 @@ static void SpriteCB_ShroomishExit(struct Sprite *sprite)
// Delay for screen shaking, then exit left // Delay for screen shaking, then exit left
if (sprite->data[1]++ >= sprite->data[3]) if (sprite->data[1]++ >= sprite->data[3])
{ {
sprite->x -= 2; sprite->x -= 2;
if (sprite->x < -16) if (sprite->x < -16)
{ {
if (!sRoulette->ballUnstuck) if (!sRoulette->ballUnstuck)

40
src/trainer_hill.c
View File

@ -165,30 +165,30 @@ static const u16 sPrizeListAttract[] = {ITEM_TM45_ATTRACT, ITEM_ETHER, I
static const u16 *const sPrizeLists1[NUM_TRAINER_HILL_PRIZE_LISTS] = static const u16 *const sPrizeLists1[NUM_TRAINER_HILL_PRIZE_LISTS] =
{ {
sPrizeListRareCandy1, sPrizeListRareCandy1,
sPrizeListLuxuryBall1, sPrizeListLuxuryBall1,
sPrizeListMaxRevive1, sPrizeListMaxRevive1,
sPrizeListMaxEther1, sPrizeListMaxEther1,
sPrizeListElixir1, sPrizeListElixir1,
sPrizeListRoar, sPrizeListRoar,
sPrizeListSludgeBomb, sPrizeListSludgeBomb,
sPrizeListToxic, sPrizeListToxic,
sPrizeListSunnyDay, sPrizeListSunnyDay,
sPrizeListEarthQuake sPrizeListEarthQuake
}; };
static const u16 *const sPrizeLists2[NUM_TRAINER_HILL_PRIZE_LISTS] = static const u16 *const sPrizeLists2[NUM_TRAINER_HILL_PRIZE_LISTS] =
{ {
sPrizeListRareCandy2, sPrizeListRareCandy2,
sPrizeListLuxuryBall2, sPrizeListLuxuryBall2,
sPrizeListMaxRevive2, sPrizeListMaxRevive2,
sPrizeListMaxEther2, sPrizeListMaxEther2,
sPrizeListElixir2, sPrizeListElixir2,
sPrizeListBrickBreak, sPrizeListBrickBreak,
sPrizeListTorment, sPrizeListTorment,
sPrizeListSkillSwap, sPrizeListSkillSwap,
sPrizeListGigaDrain, sPrizeListGigaDrain,
sPrizeListAttract sPrizeListAttract
}; };
static const u16 *const *const sPrizeListSets[] = static const u16 *const *const sPrizeListSets[] =

36
sym_common.txt
View File

@ -3,35 +3,35 @@
@ ../gflib/bg.o @ ../gflib/bg.o
.align 2 .align 2
gWindowTileAutoAllocEnabled: gWindowTileAutoAllocEnabled:
.space 4 .space 4
@ ../gflib/window.o @ ../gflib/window.o
.align 4 .align 4
gTransparentTileNumber: gTransparentTileNumber:
.space 1 .space 1
.align 4 .align 4
gWindowBgTilemapBuffers: gWindowBgTilemapBuffers:
.space 16 .space 16
@ ../gflib/text.o @ ../gflib/text.o
.align 4 .align 4
gFonts: gFonts:
.space 4 .space 4
.align 2 .align 2
gDisableTextPrinters: gDisableTextPrinters:
.space 1 .space 1
.align 4 .align 4
gCurGlyph: gCurGlyph:
.space 132 .space 132
.align 2 .align 2
gTextFlags: gTextFlags:
.space 4 .space 4
@ ../gflib/sprite.o @ ../gflib/sprite.o
.align 2 .align 2
gOamMatrixAllocBitmap: gOamMatrixAllocBitmap:
.space 4 .space 4
.align 2 .align 2
gReservedSpritePaletteCount: gReservedSpritePaletteCount:
.space 1 .space 1
.align 4 .align 4
.include "link.o" .include "link.o"
.include "AgbRfu_LinkManager.o" .include "AgbRfu_LinkManager.o"
.include "link_rfu_2.o" .include "link_rfu_2.o"