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

Dump battle scripts 1

Browse Source
This commit is contained in:
PikalaxALT
2019-11-05 21:27:47 -05:00
parent 7fba8781c1
commit 91e305255c
6 changed files with 4489 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_script.inc
+2 -1
View File
@@ -515,8 +515,9 @@
.byte \bank .byte \bank
.endm .endm
.macro atk5d .macro atk5d addr
.byte 0x5d .byte 0x5d
.4byte \addr
.endm .endm
.macro atk5e bank .macro atk5e bank
baserom.ips
BIN
View File
Binary file not shown.
data/battle_message.s
+266 -43
View File
@@ -1,5 +1,6 @@
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/battle.h" #include "constants/battle.h"
#include "battle_string_ids.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
@@ -159,7 +160,7 @@ gUnknown_83FB534:: @ 83FB534
.string "{B_ATK_NAME_WITH_PREFIX} can't escape!$" .string "{B_ATK_NAME_WITH_PREFIX} can't escape!$"
gUnknown_83FB545:: @ 83FB545 gUnknown_83FB545:: @ 83FB545
.string "Hit {B_BUFF1} timeシsス!$" .string "Hit {B_BUFF1} time(s)!$"
gUnknown_83FB555:: @ 83FB555 gUnknown_83FB555:: @ 83FB555
.string "{B_EFF_NAME_WITH_PREFIX}\n" .string "{B_EFF_NAME_WITH_PREFIX}\n"
@@ -2173,48 +2174,270 @@ gUnknown_83FDF3C:: @ 83FDF3C
.4byte gUnknown_83FB248 .4byte gUnknown_83FB248
gMissStringIds:: @ 83FE514 gMissStringIds:: @ 83FE514
.2byte 0x0017, 0x0018, 0x0159, 0x001a .2byte STRINGID_ATTACKMISSED
.2byte 0x014c, 0x00e2, 0x00e3, 0x0021 .2byte STRINGID_PKMNPROTECTEDITSELF
.2byte 0x0112, 0x0165, 0x00e8, 0x00e9 .2byte STRINGID_PKMNAVOIDEDATTACK
.2byte 0x00e5, 0x00ed, 0x00f0, 0x00f3 .2byte STRINGID_AVOIDEDDAMAGE
.2byte 0x00ee, 0x00f4, 0x0066, 0x0067 .2byte STRINGID_PKMNMAKESGROUNDMISS
.2byte 0x00ef, 0x00f5, 0x00ea, 0x00eb
.2byte 0x00ec, 0x0065, 0x0098, 0x00e5 gNoEscapeStringIds::
.2byte 0x00e5, 0x004e, 0x0160, 0x004d .2byte STRINGID_CANTESCAPE
.2byte 0x0161, 0x004f, 0x0068, 0x0069 .2byte STRINGID_DONTLEAVEBIRCH
.2byte 0x001b, 0x006a, 0x0139, 0x0052 .2byte STRINGID_PREVENTSESCAPE
.2byte 0x0053, 0x0070, 0x0071, 0x0073 .2byte STRINGID_CANTESCAPE2
.2byte 0x0074, 0x006c, 0x006e, 0x00f7 .2byte STRINGID_ATTACKERCANTESCAPE
.2byte 0x004c, 0x0075, 0x0076, 0x0077
.2byte 0x00d5, 0x00d6, 0x003d, 0x0130 gMoveWeatherChangeStringIds::
.2byte 0x0145, 0x0146, 0x00d7, 0x00d8 .2byte STRINGID_STARTEDTORAIN
.2byte 0x003e, 0x0130, 0x0054, 0x0055 .2byte STRINGID_DOWNPOURSTARTED
.2byte 0x0056, 0x0057, 0x0058, 0x0059 .2byte STRINGID_BUTITFAILED
.2byte 0x013d, 0x013e, 0x005a, 0x005c .2byte STRINGID_SANDSTORMBREWED
.2byte 0x005b, 0x005d, 0x005b, 0x0148 .2byte STRINGID_SUNLIGHTGOTBRIGHT
.2byte 0x0061, 0x00e5, 0x0063, 0x00e5 .2byte STRINGID_STARTEDHAIL
.2byte 0x007d, 0x00e5, 0x007e, 0x00fb
.2byte 0x0028, 0x0029, 0x0037, 0x0038 gSandStormHailContinuesStringIds::
.2byte 0x0023, 0x0024, 0x002e, 0x002f .2byte STRINGID_SANDSTORMRAGES
.2byte 0x0031, 0x0032, 0x0035, 0x0036 .2byte STRINGID_HAILCONTINUES
.2byte 0x0017, 0x007c, 0x0045, 0x0136
.2byte 0x002d, 0x0139, 0x013b, 0x013c gSandStormHailDmgStringIds::
.2byte 0x00fd, 0x00fd, 0x00fd, 0x00fd .2byte STRINGID_PKMNBUFFETEDBYSANDSTORM
.2byte 0x0142, 0x00a1, 0x014f, 0x0107 .2byte STRINGID_PKMNPELTEDBYHAIL
.2byte 0x0108, 0x0109, 0x010a, 0x0110
.2byte 0x0110, 0x0110, 0x0110, 0x0110 gSandStormHailEndStringIds::
.2byte 0x0110, 0x0110, 0x0110, 0x0111 .2byte STRINGID_SANDSTORMSUBSIDED
.2byte 0x0110, 0x0110, 0x0110, 0x00f1 .2byte STRINGID_HAILSTOPPED
.2byte 0x0110, 0x0110, 0x0110, 0x0116
.2byte 0x0117, 0x0118, 0x0119, 0x011d gRainContinuesStringIds::
.2byte 0x011e, 0x011f, 0x0128, 0x0123 .2byte STRINGID_RAINCONTINUES
.2byte 0x0126, 0x0125, 0x0124, 0x0127 .2byte STRINGID_DOWNPOURCONTINUES
.2byte 0x0129, 0x0156, 0x0131, 0x0163 .2byte STRINGID_RAINSTOPPED
.2byte 0x016a, 0x00c7, 0x0163, 0x016a
.2byte 0x00c9, 0x0163, 0x016a, 0x0166 gProtectLikeUsedStringIds::
.2byte 0x0167, 0x0168, 0x00cb, 0x0137 .2byte STRINGID_PKMNPROTECTEDITSELF2
.2byte 0x016f, 0x0170, 0x0171, 0x0172 .2byte STRINGID_PKMNBRACEDITSELF
.2byte 0x017e, 0x017e, 0x0180, 0x0181 .2byte STRINGID_BUTITFAILED
gReflectLightScreenSafeguardStringIds::
.2byte STRINGID_BUTITFAILED
.2byte STRINGID_PKMNRAISEDDEF
.2byte STRINGID_PKMNRAISEDDEFALITTLE
.2byte STRINGID_PKMNRAISEDSPDEF
.2byte STRINGID_PKMNRAISEDSPDEFALITTLE
.2byte STRINGID_PKMNCOVEREDBYVEIL
gLeechSeedStringIds::
.2byte STRINGID_PKMNSEEDED
.2byte STRINGID_PKMNEVADEDATTACK
.2byte STRINGID_ITDOESNTAFFECT
.2byte STRINGID_PKMNSAPPEDBYLEECHSEED
.2byte STRINGID_ITSUCKEDLIQUIDOOZE
gRestUsedStringIds::
.2byte STRINGID_PKMNWENTTOSLEEP
.2byte STRINGID_PKMNSLEPTHEALTHY
gUproarOverTurnStringIds::
.2byte STRINGID_PKMNMAKINGUPROAR
.2byte STRINGID_PKMNCALMEDDOWN
gStockpileUsedStringIds::
.2byte STRINGID_PKMNSTOCKPILED
.2byte STRINGID_PKMNCANTSTOCKPILE
gWokeUpStringIds::
.2byte STRINGID_PKMNWOKEUP
.2byte STRINGID_PKMNWOKEUPINUPROAR
gSwallowFailStringIds::
.2byte STRINGID_FAILEDTOSWALLOW
.2byte STRINGID_PKMNHPFULL
gUproarAwakeStringIds::
.2byte STRINGID_PKMNCANTSLEEPINUPROAR2
.2byte STRINGID_UPROARKEPTPKMNAWAKE
.2byte STRINGID_PKMNSTAYEDAWAKEUSING
gStatUpStringIds::
.2byte STRINGID_PKMNSSTATCHANGED
.2byte STRINGID_PKMNSSTATCHANGED2
.2byte STRINGID_STATSWONTINCREASE
.2byte STRINGID_EMPTYSTRING3
.2byte STRINGID_USINGXTHEYOFZN
.2byte STRINGID_PKMNUSEDXTOGETPUMPED
gStatDownStringIds::
.2byte STRINGID_PKMNSSTATCHANGED3
.2byte STRINGID_PKMNSSTATCHANGED4
.2byte STRINGID_STATSWONTDECREASE
.2byte STRINGID_EMPTYSTRING3
gFirstTurnOfTwoStringIds::
.2byte STRINGID_PKMNWHIPPEDWHIRLWIND
.2byte STRINGID_PKMNTOOKSUNLIGHT
.2byte STRINGID_PKMNLOWEREDHEAD
.2byte STRINGID_PKMNISGLOWING
.2byte STRINGID_PKMNFLEWHIGH
.2byte STRINGID_PKMNDUGHOLE
.2byte STRINGID_PKMNHIDUNDERWATER
.2byte STRINGID_PKMNSPRANGUP
gWrappedStringIds::
.2byte STRINGID_PKMNSQUEEZEDBYBIND
.2byte STRINGID_PKMNWRAPPEDBY
.2byte STRINGID_PKMNTRAPPEDINVORTEX
.2byte STRINGID_PKMNCLAMPED
.2byte STRINGID_PKMNTRAPPEDINVORTEX
.2byte STRINGID_PKMNTRAPPEDBYSANDTOMB
gMistUsedStringIds::
.2byte STRINGID_PKMNSHROUDEDINMIST
.2byte STRINGID_BUTITFAILED
gFocusEnergyUsedStringIds::
.2byte STRINGID_PKMNGETTINGPUMPED
.2byte STRINGID_BUTITFAILED
gTransformUsedStringIds::
.2byte STRINGID_PKMNTRANSFORMEDINTO
.2byte STRINGID_BUTITFAILED
gSubsituteUsedStringIds::
.2byte STRINGID_PKMNMADESUBSTITUTE
.2byte STRINGID_TOOWEAKFORSUBSTITUTE
gGotPoisonedStringIds::
.2byte STRINGID_PKMNWASPOISONED
.2byte STRINGID_PKMNPOISONEDBY
gGotParalyzedStringIds::
.2byte STRINGID_PKMNWASPARALYZED
.2byte STRINGID_PKMNWASPARALYZEDBY
gFellAsleepStringIds::
.2byte STRINGID_PKMNFELLASLEEP
.2byte STRINGID_PKMNMADESLEEP
gGotBurnedStringIds::
.2byte STRINGID_PKMNWASBURNED
.2byte STRINGID_PKMNBURNEDBY
gGotFrozenStringIds::
.2byte STRINGID_PKMNWASFROZEN
.2byte STRINGID_PKMNFROZENBY
gGotDefrostedStringIds::
.2byte STRINGID_PKMNWASDEFROSTED2
.2byte STRINGID_PKMNWASDEFROSTEDBY
gKOFailedStringIds::
.2byte STRINGID_ATTACKMISSED
.2byte STRINGID_PKMNUNAFFECTED
gAttractUsedStringIds::
.2byte STRINGID_PKMNFELLINLOVE
.2byte STRINGID_PKMNSXINFATUATEDY
gLeechSeedDrainStringIds::
.2byte STRINGID_PKMNENERGYDRAINED
.2byte STRINGID_ITSUCKEDLIQUIDOOZE
gSportsUsedStringIds::
.2byte STRINGID_ELECTRICITYWEAKENED
.2byte STRINGID_FIREWEAKENED
gPartyStatusHealStringIds::
.2byte STRINGID_BELLCHIMED
.2byte STRINGID_BELLCHIMED
.2byte STRINGID_BELLCHIMED
.2byte STRINGID_BELLCHIMED
.2byte STRINGID_SOOTHINGAROMA
gFutureMoveUsedStringIds::
.2byte STRINGID_PKMNFORESAWATTACK
.2byte STRINGID_PKMNCHOSEXASDESTINY
gBallEscapeStringIds::
.2byte STRINGID_PKMNBROKEFREE
.2byte STRINGID_ITAPPEAREDCAUGHT
.2byte STRINGID_AARGHALMOSTHADIT
.2byte STRINGID_SHOOTSOCLOSE
gWeatherContinuesStringIds::
.2byte STRINGID_ITISRAINING
.2byte STRINGID_ITISRAINING
.2byte STRINGID_ITISRAINING
.2byte STRINGID_ITISRAINING
.2byte STRINGID_ITISRAINING
.2byte STRINGID_ITISRAINING
.2byte STRINGID_ITISRAINING
.2byte STRINGID_ITISRAINING
.2byte STRINGID_SANDSTORMISRAGING
.2byte STRINGID_ITISRAINING
.2byte STRINGID_ITISRAINING
.2byte STRINGID_ITISRAINING
.2byte STRINGID_SUNLIGHTSTRONG
.2byte STRINGID_ITISRAINING
.2byte STRINGID_ITISRAINING
.2byte STRINGID_ITISRAINING
gInobedientStringIds::
.2byte STRINGID_PKMNLOAFING
.2byte STRINGID_PKMNWONTOBEY
.2byte STRINGID_PKMNTURNEDAWAY
.2byte STRINGID_PKMNPRETENDNOTNOTICE
gSafariPokeblockResultStringIds::
.2byte STRINGID_PKMNWATCHINGCAREFULLY
.2byte STRINGID_PKMNCURIOUSABOUTX
.2byte STRINGID_PKMNENTHRALLEDBYX
gTrainerItemCuredStatusStringIds::
.2byte STRINGID_PKMNSITEMSNAPPEDOUT
.2byte STRINGID_PKMNSITEMCUREDPARALYSIS
.2byte STRINGID_PKMNSITEMDEFROSTEDIT
.2byte STRINGID_PKMNSITEMHEALEDBURN
.2byte STRINGID_PKMNSITEMCUREDPOISON
.2byte STRINGID_PKMNSITEMWOKEIT
gBerryEffectStringIds::
.2byte STRINGID_PKMNSITEMCUREDPROBLEM
.2byte STRINGID_PKMNSITEMNORMALIZEDSTATUS
gBRNPreventionStringIds::
.2byte STRINGID_PKMNSXPREVENTSBURNS
.2byte STRINGID_PKMNSXPREVENTSYSZ
.2byte STRINGID_PKMNSXHADNOEFFECTONY
gPRLZPreventionStringIds::
.2byte STRINGID_PKMNPREVENTSPARALYSISWITH
.2byte STRINGID_PKMNSXPREVENTSYSZ
.2byte STRINGID_PKMNSXHADNOEFFECTONY
gPSNPreventionStringIds::
.2byte STRINGID_PKMNPREVENTSPOISONINGWITH
.2byte STRINGID_PKMNSXPREVENTSYSZ
.2byte STRINGID_PKMNSXHADNOEFFECTONY
gItemSwapStringIds::
.2byte STRINGID_PKMNOBTAINEDX
.2byte STRINGID_PKMNOBTAINEDX2
.2byte STRINGID_PKMNOBTAINEDXYOBTAINEDZ
gFlashFireStringIds::
.2byte STRINGID_PKMNRAISEDFIREPOWERWITH
.2byte STRINGID_PKMNSXMADEYINEFFECTIVE
gCaughtMonStringIds::
.2byte STRINGID_PKMNTRANSFERREDSOMEONESPC
.2byte STRINGID_PKMNTRANSFERREDBILLSPC
.2byte STRINGID_PKMNBOXSOMEONESPCFULL
.2byte STRINGID_PKMNBOXBILLSPCFULL
gDoubleBattleRecallStrings::
.2byte STRINGID_TRAINER1MON1COMEBACK
.2byte STRINGID_TRAINER1MON1COMEBACK
.2byte STRINGID_TRAINER1MON2COMEBACK
.2byte STRINGID_TRAINER1MON1AND2COMEBACK
gTrappingMoves:: @ 83FE664 gTrappingMoves:: @ 83FE664
.2byte MOVE_BIND .2byte MOVE_BIND
data/battle_scripts_1.s
+4195 -187
View File
File diff suppressed because it is too large Load Diff
include/battle_string_ids.h
+25 -22
View File
@@ -1,10 +1,6 @@
#ifndef GUARD_BATTLE_STRING_IDS_H #ifndef GUARD_BATTLE_STRING_IDS_H
#define GUARD_BATTLE_STRING_IDS_H #define GUARD_BATTLE_STRING_IDS_H
#include "global.h"
#define BATTLESTRINGS_COUNT 369
#define BATTLESTRINGS_ID_ADDER 12 // all battlestrings have its ID + 12, because first 5 are reserved #define BATTLESTRINGS_ID_ADDER 12 // all battlestrings have its ID + 12, because first 5 are reserved
#define STRINGID_INTROMSG 0 #define STRINGID_INTROMSG 0
@@ -367,23 +363,30 @@
#define STRINGID_PKMNOBTAINEDXYOBTAINEDZ 360 #define STRINGID_PKMNOBTAINEDXYOBTAINEDZ 360
#define STRINGID_BUTNOEFFECT 361 #define STRINGID_BUTNOEFFECT 361
#define STRINGID_PKMNSXHADNOEFFECTONY 362 #define STRINGID_PKMNSXHADNOEFFECTONY 362
#define STRINGID_TWOENEMIESDEFEATED 363 #define STRINGID_OAKPLAYERWON 363
#define STRINGID_TRAINER2LOSETEXT 364 #define STRINGID_OAKPLAYERLOST 364
#define STRINGID_PKMNINCAPABLEOFPOWER 365 #define STRINGID_PLAYERLOSTAGAINSTENEMYTRAINER 365
#define STRINGID_GLINTAPPEARSINEYE 366 #define STRINGID_PLAYERPAIDPRIZEMONEY 366
#define STRINGID_PKMNGETTINGINTOPOSITION 367 #define STRINGID_PKMNTRANSFERREDSOMEONESPC 367
#define STRINGID_PKMNBEGANGROWLINGDEEPLY 368 #define STRINGID_PKMNTRANSFERREDBILLSPC 368
#define STRINGID_PKMNEAGERFORMORE 369 #define STRINGID_PKMNBOXSOMEONESPCFULL 369
#define STRINGID_DEFEATEDOPPONENTBYREFEREE 370 #define STRINGID_PKMNBOXBILLSPCFULL 370
#define STRINGID_LOSTTOOPPONENTBYREFEREE 371 #define STRINGID_POKEDUDEUSED 371
#define STRINGID_TIEDOPPONENTBYREFEREE 372 #define STRINGID_POKEFLUTECATCHY 372
#define STRINGID_QUESTIONFORFEITMATCH 373 #define STRINGID_POKEFLUTE 373
#define STRINGID_FORFEITEDMATCH 374 #define STRINGID_MONHEARINGFLUTEAWOKE 374
#define STRINGID_PKMNTRANSFERREDSOMEONESPC 375 #define STRINGID_TRAINER2CLASS 375
#define STRINGID_PKMNTRANSFERREDLANETTESPC 376 #define STRINGID_TRAINER2NAME 376
#define STRINGID_PKMNBOXSOMEONESPCFULL 377 #define STRINGID_PLAYERWHITEDOUT 377
#define STRINGID_PKMNBOXLANETTESPCFULL 378 #define STRINGID_MONTOOSCAREDTOMOVE 378
#define STRINGID_TRAINER1WINTEXT 379 #define STRINGID_GHOSTGETOUTGETOUT 379
#define STRINGID_TRAINER2WINTEXT 380 #define STRINGID_SILPHSCOPEUNVEILED 380
#define STRINGID_GHOSTWASMAROWAK 381
#define STRINGID_TRAINER1MON1COMEBACK 382
#define STRINGID_TRAINER1WINTEXT 383
#define STRINGID_TRAINER1MON2COMEBACK 384
#define STRINGID_TRAINER1MON1AND2COMEBACK 385
#define BATTLESTRINGS_COUNT 386
#endif // GUARD_BATTLE_STRING_IDS_H #endif // GUARD_BATTLE_STRING_IDS_H
include/constants/battle_script_commands.h
+1 -1
View File
@@ -38,8 +38,8 @@
#define BS_ATTACKER 1 #define BS_ATTACKER 1
#define BS_EFFECT_BATTLER 2 #define BS_EFFECT_BATTLER 2
#define BS_FAINTED 3 #define BS_FAINTED 3
#define BS_BATTLER_0 7
#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_updatestatusicon #define BS_ATTACKER_WITH_PARTNER 4 // for atk98_updatestatusicon
#define BS_BATTLER_0 7
#define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability #define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability
#define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability #define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability
#define BS_SCRIPTING 10 #define BS_SCRIPTING 10