dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql

Browse Source
This commit is contained in:
GriffinR
2023-08-18 11:26:22 -04:00
parent 45e4c30d38 e72a26a6c1
commit 10c1e1298f
221 changed files with 3371 additions and 3779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/battle_script_commands.h
+25 -28
View File
@@ -1,34 +1,31 @@
#ifndef GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H
#define GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H
// Battle Scripting and BattleCommunication addresses
#define sPAINSPLIT_HP gBattleScripting
#define sBIDE_DMG gBattleScripting + 4
#define sMULTIHIT_STRING gBattleScripting + 8
#define sDMG_MULTIPLIER gBattleScripting + 0xE
#define sTWOTURN_STRINGID gBattleScripting + 0xF
#define sB_ANIM_ARG1 gBattleScripting + 0x10
#define sB_ANIM_ARG2 gBattleScripting + 0x11
#define sTRIPLE_KICK_POWER gBattleScripting + 0x12
#define sMOVEEND_STATE gBattleScripting + 0x14
#define sBATTLER_WITH_ABILITY gBattleScripting + 0x15
#define sMULTIHIT_EFFECT gBattleScripting + 0x16
#define sBATTLER gBattleScripting + 0x17
#define sB_ANIM_TURN gBattleScripting + 0x18
#define sB_ANIM_TARGETS_HIT gBattleScripting + 0x19
#define sSTATCHANGER gBattleScripting + 0x1A
#define sSTAT_ANIM_PLAYED gBattleScripting + 0x1B
#define sGIVEEXP_STATE gBattleScripting + 0x1C
#define sBATTLE_STYLE gBattleScripting + 0x1D
#define sLVLBOX_STATE gBattleScripting + 0x1E
#define sLEARNMOVE_STATE gBattleScripting + 0x1F
#define sFIELD_20 gBattleScripting + 0x20
#define sRESHOW_MAIN_STATE gBattleScripting + 0x21
#define sRESHOW_HELPER_STATE gBattleScripting + 0x22
#define sFIELD_23 gBattleScripting + 0x23
#define sWINDOWS_TYPE gBattleScripting + 0x24
#define sMULTIPLAYER_ID gBattleScripting + 0x25
#define sSPECIAL_TRAINER_BATTLE_TYPE gBattleScripting + 0x26
// The following correspond to the struct members of BattleScripting by adding their offset
#define sPAINSPLIT_HP gBattleScripting + 0x00 // painSplitHp
#define sBIDE_DMG gBattleScripting + 0x04 // bideDmg
#define sMULTIHIT_STRING gBattleScripting + 0x08 // multihitString
#define sDMG_MULTIPLIER gBattleScripting + 0x0E // dmgMultiplier
#define sTWOTURN_STRINGID gBattleScripting + 0x0F // twoTurnsMoveStringId
#define sB_ANIM_ARG1 gBattleScripting + 0x10 // animArg1
#define sB_ANIM_ARG2 gBattleScripting + 0x11 // animArg2
#define sTRIPLE_KICK_POWER gBattleScripting + 0x12 // tripleKickPower
#define sMOVEEND_STATE gBattleScripting + 0x14 // moveendState
#define sBATTLER_WITH_ABILITY gBattleScripting + 0x15 // battlerWithAbility
#define sMULTIHIT_EFFECT gBattleScripting + 0x16 // multihitMoveEffect
#define sBATTLER gBattleScripting + 0x17 // battler
#define sB_ANIM_TURN gBattleScripting + 0x18 // animTurn
#define sB_ANIM_TARGETS_HIT gBattleScripting + 0x19 // animTargetsHit
#define sSTATCHANGER gBattleScripting + 0x1A // statChanger
#define sSTAT_ANIM_PLAYED gBattleScripting + 0x1B // statAnimPlayed
#define sGIVEEXP_STATE gBattleScripting + 0x1C // getexpState
#define sBATTLE_STYLE gBattleScripting + 0x1D // battleStyle
#define sLVLBOX_STATE gBattleScripting + 0x1E // drawlvlupboxState
#define sLEARNMOVE_STATE gBattleScripting + 0x1F // learnMoveState
#define sPURSUIT_DOUBLES_ATTACKER gBattleScripting + 0x20 // pursuitDoublesAttacker
#define sRESHOW_MAIN_STATE gBattleScripting + 0x21 // reshowMainState
#define sRESHOW_HELPER_STATE gBattleScripting + 0x22 // reshowHelperState
#define sLVLUP_HP gBattleScripting + 0x23 // levelUpHP
// Array entries for battle communication
#define MULTIUSE_STATE 0
include/constants/items.h
+11 -6
View File
@@ -177,9 +177,16 @@
#define ITEM_LANSAT_BERRY 173
#define ITEM_STARF_BERRY 174
#define ITEM_ENIGMA_BERRY 175
#define ITEM_0B0 176
#define ITEM_0B1 177
#define ITEM_0B2 178
#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY
#define ITEM_UNUSED_BERRY_1 176
#define ITEM_UNUSED_BERRY_2 177
#define ITEM_UNUSED_BERRY_3 178
#define MAX_BERRY_INDEX ITEM_UNUSED_BERRY_3
#define ITEM_BRIGHT_POWDER 179
#define ITEM_WHITE_HERB 180
#define ITEM_MACHO_BRACE 181
@@ -440,8 +447,6 @@
#define ITEMS_COUNT 375
#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY
#define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
#define MAIL_NONE 0xFF
@@ -454,6 +459,6 @@
#define SUPER_ROD 2
// Check if the item is one that can be used on a Pokemon.
#define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
#define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= MAX_BERRY_INDEX)
#endif // GUARD_CONSTANTS_ITEMS_H
include/constants/metatile_labels.h
+14
View File
@@ -35,6 +35,10 @@
// gTileset_DepartmentStore
#define METATILE_DepartmentStore_ElevatorDoor 0x28D
// gTileset_Fallarbor
#define METATILE_Fallarbor_AshGrass 0x20A
#define METATILE_Fallarbor_NormalGrass 0x212
// gTileset_FuchsiaCity
#define METATILE_FuchsiaCity_Door 0x2BF
#define METATILE_FuchsiaCity_SafariZoneDoor 0x2D2
@@ -74,6 +78,9 @@
#define METATILE_GenericBuilding1_PlayersPCOff 0x28F
#define METATILE_GenericBuilding1_PlayersPCOn 0x28A
// gTileset_Lavaridge
#define METATILE_Lavaridge_NormalGrass 0x206
// gTileset_LavenderTown
#define METATILE_LavenderTown_Door 0x2A2
@@ -84,6 +91,9 @@
// gTileset_MtEmber
#define METATILE_MtEmber_CaveEntrance 0x346
// gTileset_Pacifidlog
#define METATILE_Pacifidlog_SkyPillar_CrackedFloor_Hole 0x237
// gTileset_PalletTown
#define METATILE_PalletTown_Door 0x2A3
#define METATILE_PalletTown_OaksLabDoor 0x2AC
@@ -165,6 +175,10 @@
#define METATILE_PokemonMansion_Wall_EndPost_Bottom 0x2AD
#define METATILE_PokemonMansion_Wall_EndPost_Mid 0x2A5
// gTileset_RSCave
#define METATILE_RSCave_CrackedFloor 0x22F
#define METATILE_RSCave_CrackedFloor_Hole 0x206
// gTileset_SSAnne
#define METATILE_SSAnne_Door 0x281