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

Merge branch 'master' into rme-update

Browse Source
This commit is contained in:
GriffinR
2022-09-25 11:56:57 -04:00
committed by GitHub
parent 277750b088 4579efe4c7
commit 7223dbd62f
578 changed files with 8891 additions and 15170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -31,6 +31,7 @@ build/
*.ddump *.ddump
.idea/ .idea/
porymap.project.cfg porymap.project.cfg
prefabs.json
.vscode/ .vscode/
*.a *.a
.fuse_hidden* .fuse_hidden*
INSTALL.md
+19 -8
View File
@@ -418,21 +418,16 @@ If you aren't in the pokeemerald directory already, then **change directory** to
```bash ```bash
cd pokeemerald cd pokeemerald
``` ```
To build **pokeemerald.gba** for the first time and confirm it matches the official ROM image (Note: to speed up builds, see [Parallel builds](#parallel-builds)): To build **pokeemerald.gba** (Note: to speed up builds, see [Parallel builds](#parallel-builds)):
```bash ```bash
make compare make
``` ```
If an OK is returned, then the installation went smoothly. If it has built successfully you will have the output file **pokeemerald.gba** in your project folder.
<details> <details>
<summary>Note for Windows...</summary> <summary>Note for Windows...</summary>
> If you switched terminals since the last build (e.g. from msys2 to WSL1), you must run `make clean-tools` once before any subsequent `make` commands. > If you switched terminals since the last build (e.g. from msys2 to WSL1), you must run `make clean-tools` once before any subsequent `make` commands.
</details> </details>
To build **pokeemerald.gba** with your changes:
```bash
make
```
# Building guidance # Building guidance
## Parallel builds ## Parallel builds
@@ -451,6 +446,22 @@ Replace `<output of nproc>` with the number that the `nproc` command returned.
`nproc` is not available on macOS. The alternative is `sysctl -n hw.ncpu` ([relevant Stack Overflow thread](https://stackoverflow.com/questions/1715580)). `nproc` is not available on macOS. The alternative is `sysctl -n hw.ncpu` ([relevant Stack Overflow thread](https://stackoverflow.com/questions/1715580)).
## Compare ROM to the original
For contributing, or if you'd simply like to verify that your ROM is identical to the original game, run:
```bash
make compare
```
If it matches, you will see the following at the end of the output:
```bash
pokeemerald.gba: OK
```
If there are any changes from the original game, you will instead see:
```bash
pokeemerald.gba: FAILED
shasum: WARNING: 1 computed checksum did NOT match
```
## devkitARM's C compiler ## devkitARM's C compiler
This project supports the `arm-none-eabi-gcc` compiler included with devkitARM. If devkitARM (a.k.a. gba-dev) has already been installed as part of the platform-specific instructions, simply run: This project supports the `arm-none-eabi-gcc` compiler included with devkitARM. If devkitARM (a.k.a. gba-dev) has already been installed as part of the platform-specific instructions, simply run:
asm/macros/battle_script.inc
+2 -2
View File
@@ -668,7 +668,7 @@
.byte 0x77 .byte 0x77
.endm .endm
.macro faintifabilitynotdamp .macro tryexplosion
.byte 0x78 .byte 0x78
.endm .endm
@@ -1031,7 +1031,7 @@
.byte 0xc8 .byte 0xc8
.endm .endm
.macro jumpifattackandspecialattackcannotfall ptr:req .macro trymemento ptr:req
.byte 0xc9 .byte 0xc9
.4byte \ptr .4byte \ptr
.endm .endm
asm/macros/event.inc
+1 -1
View File
@@ -277,7 +277,7 @@
.endm .endm
@ Blocks script execution until a command or C code manually unblocks it. Generally used with specific @ Blocks script execution until a command or C code manually unblocks it. Generally used with specific
@ commands and specials. Calling EnableBothScriptContexts for instance will allow execution to continue. @ commands and specials. Calling ScriptContext_Enable for instance will allow execution to continue.
.macro waitstate .macro waitstate
.byte 0x27 .byte 0x27
.endm .endm
asm/macros/movement.inc
+2 -2
View File
@@ -152,8 +152,8 @@
create_movement_action walk_slow_diag_northeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT create_movement_action walk_slow_diag_northeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT
create_movement_action walk_slow_diag_southwest, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT create_movement_action walk_slow_diag_southwest, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT
create_movement_action walk_slow_diag_southeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT create_movement_action walk_slow_diag_southeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT
create_movement_action store_lock_anim, MOVEMENT_ACTION_STORE_AND_LOCK_ANIM create_movement_action lock_anim, MOVEMENT_ACTION_LOCK_ANIM
create_movement_action free_unlock_anim, MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM create_movement_action unlock_anim, MOVEMENT_ACTION_UNLOCK_ANIM
create_movement_action walk_left_affine, MOVEMENT_ACTION_WALK_LEFT_AFFINE create_movement_action walk_left_affine, MOVEMENT_ACTION_WALK_LEFT_AFFINE
create_movement_action walk_right_affine, MOVEMENT_ACTION_WALK_RIGHT_AFFINE create_movement_action walk_right_affine, MOVEMENT_ACTION_WALK_RIGHT_AFFINE
create_movement_action levitate, MOVEMENT_ACTION_LEVITATE create_movement_action levitate, MOVEMENT_ACTION_LEVITATE
data/battle_ai_scripts.s
+505 -505
View File
File diff suppressed because it is too large Load Diff
data/battle_anim_scripts.s
+10 -10
View File
@@ -798,14 +798,14 @@ Move_DOUBLE_EDGE:
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 0, 0 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 0
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 1, 0 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 0
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 16, 0, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 16, 0, RGB_WHITE
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 0, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 1, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1
waitforvisualfinish waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
delay 3 delay 3
@@ -2441,7 +2441,7 @@ Move_HORN_ATTACK:
Move_FURY_ATTACK: Move_FURY_ATTACK:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_HORN_HIT loadspritegfx ANIM_TAG_HORN_HIT
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 4, 256, 0, 2 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 4, 256, ANIM_ATTACKER, 2
choosetwoturnanim FuryAttackRight, FuryAttackLeft choosetwoturnanim FuryAttackRight, FuryAttackLeft
FuryAttackContinue: FuryAttackContinue:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
@@ -2590,7 +2590,7 @@ Move_LOW_KICK:
createsprite gSlidingKickSpriteTemplate, ANIM_TARGET, 2, -24, 28, 40, 8, 160, 0 createsprite gSlidingKickSpriteTemplate, ANIM_TARGET, 2, -24, 28, 40, 8, 160, 0
delay 4 delay 4
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, ANIM_TARGET, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, ANIM_TARGET, 2
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, 1, 2 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, ANIM_TARGET, 2
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4
@@ -2835,7 +2835,7 @@ SkullBashSetUpHeadDown:
createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -24, 0, 0, 10, 0 createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -24, 0, 0, 10, 0
playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, 0, 2 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, ANIM_ATTACKER, 2
waitforvisualfinish waitforvisualfinish
createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 24, 0, 0, 10, 1 createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 24, 0, 0, 10, 1
waitforvisualfinish waitforvisualfinish
@@ -3958,7 +3958,7 @@ Move_MIST_BALL:
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_BG, 1, 1, RGB(23, 16, 31), 16, RGB_WHITE, 16 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_BG, 1, 1, RGB(23, 16, 31), 16, RGB_WHITE, 16
delay 0 delay 0
playsewithpan SE_M_HAZE, 0 playsewithpan SE_M_HAZE, 0
createvisualtask AnimTask_LoadMistTiles, 5 createvisualtask AnimTask_MistBallFog, 5
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 3, 0, 16, RGB_WHITE createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 3, 0, 16, RGB_WHITE
delay 8 delay 8
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0
@@ -8570,14 +8570,14 @@ Move_ARM_THRUST:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
splitbgprio ANIM_TARGET splitbgprio ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 0 createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, ANIM_ATTACKER, 0
delay 6 delay 6
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3
delay 4 delay 4
playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
createsprite gArmThrustHandSpriteTemplate, ANIM_TARGET, 2, 10, -8, 14, 3 createsprite gArmThrustHandSpriteTemplate, ANIM_TARGET, 2, 10, -8, 14, 3
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, ANIM_ATTACKER, 1
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
choosetwoturnanim ArmThrustRight, ArmThrustLeft choosetwoturnanim ArmThrustRight, ArmThrustLeft
ArmThrustContinue: ArmThrustContinue:
data/battle_scripts_1.s
+48 -44
View File
@@ -1,6 +1,7 @@
#include "constants/global.h" #include "constants/global.h"
#include "constants/battle.h" #include "constants/battle.h"
#include "constants/pokemon.h" #include "constants/pokemon.h"
#include "constants/battle_arena.h"
#include "constants/battle_script_commands.h" #include "constants/battle_script_commands.h"
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "constants/battle_string_ids.h" #include "constants/battle_string_ids.h"
@@ -374,7 +375,8 @@ BattleScript_EffectExplosion::
attackcanceler attackcanceler
attackstring attackstring
ppreduce ppreduce
faintifabilitynotdamp @ Below jumps to BattleScript_DampStopsExplosion if it fails (only way it can)
tryexplosion
setatkhptozero setatkhptozero
waitstate waitstate
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop
@@ -489,7 +491,7 @@ BattleScript_EffectStatUp::
BattleScript_EffectStatUpAfterAtkCanceler:: BattleScript_EffectStatUpAfterAtkCanceler::
attackstring attackstring
ppreduce ppreduce
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_StatUpEnd statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_StatUpEnd
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpAttackAnim jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpAttackAnim
pause B_WAIT_TIME_SHORT pause B_WAIT_TIME_SHORT
goto BattleScript_StatUpPrintString goto BattleScript_StatUpPrintString
@@ -535,7 +537,7 @@ BattleScript_EffectStatDown::
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring attackstring
ppreduce ppreduce
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_StatDownEnd statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_StatDownEnd
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_StatDownDoAnim jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_StatDownDoAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StatDownEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StatDownEnd
pause B_WAIT_TIME_SHORT pause B_WAIT_TIME_SHORT
@@ -1491,17 +1493,17 @@ BattleScript_CurseTrySpeed::
attackanimation attackanimation
waitanimation waitanimation
setstatchanger STAT_SPEED, 1, TRUE setstatchanger STAT_SPEED, 1, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryAttack statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryAttack
printfromtable gStatDownStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_CurseTryAttack:: BattleScript_CurseTryAttack::
setstatchanger STAT_ATK, 1, FALSE setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryDefense statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryDefense
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_CurseTryDefense:: BattleScript_CurseTryDefense::
setstatchanger STAT_DEF, 1, FALSE setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseEnd statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseEnd
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_CurseEnd:: BattleScript_CurseEnd::
@@ -1613,7 +1615,7 @@ BattleScript_EffectSwagger::
attackanimation attackanimation
waitanimation waitanimation
setstatchanger STAT_ATK, 2, FALSE setstatchanger STAT_ATK, 2, FALSE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_SwaggerTryConfuse statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_SwaggerTryConfuse
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SwaggerTryConfuse jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SwaggerTryConfuse
setgraphicalstatchangevalues setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -1812,7 +1814,7 @@ BattleScript_EffectSkullBash::
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SKULL_BASH setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SKULL_BASH
call BattleScriptFirstChargingTurn call BattleScriptFirstChargingTurn
setstatchanger STAT_DEF, 1, FALSE setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_SkullBashEnd statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_SkullBashEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SkullBashEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SkullBashEnd
setgraphicalstatchangevalues setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -1926,8 +1928,8 @@ BattleScript_EffectTeleport::
ppreduce ppreduce
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed
getifcantrunfrombattle BS_ATTACKER getifcantrunfrombattle BS_ATTACKER
jumpifbyte CMP_EQUAL, gBattleCommunication, 1, BattleScript_ButItFailed jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FORBIDDEN, BattleScript_ButItFailed
jumpifbyte CMP_EQUAL, gBattleCommunication, 2, BattleScript_PrintAbilityMadeIneffective jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FAILURE, BattleScript_PrintAbilityMadeIneffective
attackanimation attackanimation
waitanimation waitanimation
printstring STRINGID_PKMNFLEDFROMBATTLE printstring STRINGID_PKMNFLEDFROMBATTLE
@@ -2015,7 +2017,7 @@ BattleScript_EffectDefenseCurl::
ppreduce ppreduce
setdefensecurlbit setdefensecurlbit
setstatchanger STAT_DEF, 1, FALSE setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DefenseCurlDoStatUpAnim statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DefenseCurlDoStatUpAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpPrintString jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpPrintString
attackanimation attackanimation
waitanimation waitanimation
@@ -2156,7 +2158,7 @@ BattleScript_EffectFlatter::
attackanimation attackanimation
waitanimation waitanimation
setstatchanger STAT_SPATK, 1, FALSE setstatchanger STAT_SPATK, 1, FALSE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_FlatterTryConfuse statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_FlatterTryConfuse
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_FlatterTryConfuse jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_FlatterTryConfuse
setgraphicalstatchangevalues setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -2201,10 +2203,10 @@ BattleScript_AlreadyBurned::
BattleScript_EffectMemento:: BattleScript_EffectMemento::
attackcanceler attackcanceler
jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_MementoFailProtect jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_MementoTargetProtect
attackstring attackstring
ppreduce ppreduce
jumpifattackandspecialattackcannotfall BattleScript_ButItFailed trymemento BattleScript_ButItFailed
setatkhptozero setatkhptozero
attackanimation attackanimation
waitanimation waitanimation
@@ -2213,16 +2215,16 @@ BattleScript_EffectMemento::
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_MULTIPLE_STATS playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_ATK, 2, TRUE setstatchanger STAT_ATK, 2, TRUE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk
@ Greater than STAT_FELL is checking if the stat cannot decrease @ Greater than B_MSG_DEFENDER_STAT_FELL is checking if the stat cannot decrease
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTrySpAtk jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTrySpAtk
printfromtable gStatDownStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_EffectMementoTrySpAtk: BattleScript_EffectMementoTrySpAtk:
playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_SPATK, 2, TRUE setstatchanger STAT_SPATK, 2, TRUE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTryFaint statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTryFaint
@ Greater than STAT_FELL is checking if the stat cannot decrease @ Greater than B_MSG_DEFENDER_STAT_FELL is checking if the stat cannot decrease
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTryFaint jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTryFaint
printfromtable gStatDownStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@@ -2233,11 +2235,12 @@ BattleScript_EffectMementoPrintNoEffect:
printstring STRINGID_BUTNOEFFECT printstring STRINGID_BUTNOEFFECT
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_EffectMementoTryFaint goto BattleScript_EffectMementoTryFaint
BattleScript_MementoFailProtect: @ If the target is protected there's no need to check the target's stats or animate, the user will just faint
BattleScript_MementoTargetProtect:
attackstring attackstring
ppreduce ppreduce
jumpifattackandspecialattackcannotfall BattleScript_MementoFailEnd trymemento BattleScript_MementoTargetProtectEnd
BattleScript_MementoFailEnd: BattleScript_MementoTargetProtectEnd:
setatkhptozero setatkhptozero
pause B_WAIT_TIME_LONG pause B_WAIT_TIME_LONG
effectivenesssound effectivenesssound
@@ -2660,14 +2663,14 @@ BattleScript_TickleDoMoveAnim::
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE setstatchanger STAT_ATK, 1, TRUE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleTryLowerDef statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleTryLowerDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleTryLowerDef jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleTryLowerDef
printfromtable gStatDownStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_TickleTryLowerDef:: BattleScript_TickleTryLowerDef::
playstatchangeanimation BS_TARGET, BIT_DEF, STAT_CHANGE_NEGATIVE playstatchangeanimation BS_TARGET, BIT_DEF, STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE setstatchanger STAT_DEF, 1, TRUE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleEnd statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleEnd
printfromtable gStatDownStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@@ -2693,13 +2696,13 @@ BattleScript_CosmicPowerDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0 playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0
setstatchanger STAT_DEF, 1, FALSE setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerTrySpDef jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerTrySpDef
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_CosmicPowerTrySpDef:: BattleScript_CosmicPowerTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerEnd statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerEnd
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@@ -2722,13 +2725,13 @@ BattleScript_BulkUpDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0 playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0
setstatchanger STAT_ATK, 1, FALSE setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpTryDef statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpTryDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpTryDef jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpTryDef
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_BulkUpTryDef:: BattleScript_BulkUpTryDef::
setstatchanger STAT_DEF, 1, FALSE setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpEnd statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpEnd
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@@ -2747,13 +2750,13 @@ BattleScript_CalmMindDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0 playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0
setstatchanger STAT_SPATK, 1, FALSE setstatchanger STAT_SPATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindTrySpDef statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindTrySpDef jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindTrySpDef
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_CalmMindTrySpDef:: BattleScript_CalmMindTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindEnd statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindEnd
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@@ -2779,13 +2782,13 @@ BattleScript_DragonDanceDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0 playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0
setstatchanger STAT_ATK, 1, FALSE setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceTrySpeed statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceTrySpeed
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceTrySpeed jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceTrySpeed
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_DragonDanceTrySpeed:: BattleScript_DragonDanceTrySpeed::
setstatchanger STAT_SPEED, 1, FALSE setstatchanger STAT_SPEED, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceEnd statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceEnd
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@@ -3456,27 +3459,27 @@ BattleScript_AllStatsUpAtk::
setbyte sSTAT_ANIM_PLAYED, FALSE setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0 playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0
setstatchanger STAT_ATK, 1, FALSE setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpDef statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpDef
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpDef:: BattleScript_AllStatsUpDef::
setstatchanger STAT_DEF, 1, FALSE setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpeed statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpeed
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpeed:: BattleScript_AllStatsUpSpeed::
setstatchanger STAT_SPEED, 1, FALSE setstatchanger STAT_SPEED, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpAtk statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpAtk
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpAtk:: BattleScript_AllStatsUpSpAtk::
setstatchanger STAT_SPATK, 1, FALSE setstatchanger STAT_SPATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpDef statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpDef
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpDef:: BattleScript_AllStatsUpSpDef::
setstatchanger STAT_SPDEF, 1, FALSE setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpRet statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpRet
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpRet:: BattleScript_AllStatsUpRet::
@@ -3623,14 +3626,14 @@ BattleScript_AtkDefDown::
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE setstatchanger STAT_ATK, 1, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDown_TryDef statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefDown_TryDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDown_TryDef jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDown_TryDef
printfromtable gStatDownStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_AtkDefDown_TryDef:: BattleScript_AtkDefDown_TryDef::
playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE setstatchanger STAT_DEF, 1, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDown_End statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefDown_End
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDown_End jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDown_End
printfromtable gStatDownStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@@ -3696,7 +3699,7 @@ BattleScript_SAtkDown2::
setbyte sSTAT_ANIM_PLAYED, FALSE setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO playstatchangeanimation BS_ATTACKER, BIT_SPATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_SPATK, 2, TRUE setstatchanger STAT_SPATK, 2, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_SAtkDown2End statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_SAtkDown2End
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_SAtkDown2End jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_SAtkDown2End
printfromtable gStatDownStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@@ -4027,7 +4030,7 @@ BattleScript_IntimidateActivatesLoop:
jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidatePrevented jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidatePrevented
statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | STAT_BUFF_ALLOW_PTR, BattleScript_IntimidateActivatesLoopIncrement statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_IntimidateActivatesLoopIncrement
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_IntimidateActivatesLoopIncrement jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_IntimidateActivatesLoopIncrement
setgraphicalstatchangevalues setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -4406,7 +4409,7 @@ BattleScript_BerryConfuseHealEnd2::
BattleScript_BerryStatRaiseEnd2:: BattleScript_BerryStatRaiseEnd2::
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BerryStatRaiseDoStatUp statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BerryStatRaiseDoStatUp
BattleScript_BerryStatRaiseDoStatUp:: BattleScript_BerryStatRaiseDoStatUp::
setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_ITEM setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_ITEM
call BattleScript_StatUp call BattleScript_StatUp
@@ -4480,7 +4483,7 @@ BattleScript_ArenaDoJudgment::
arenajudgmentstring B_MSG_REF_THATS_IT arenajudgmentstring B_MSG_REF_THATS_IT
arenawaitmessage B_MSG_REF_THATS_IT arenawaitmessage B_MSG_REF_THATS_IT
pause B_WAIT_TIME_LONG pause B_WAIT_TIME_LONG
setbyte gBattleCommunication, 0 setbyte gBattleCommunication, 0 @ Reset state for arenajudgmentwindow
arenajudgmentwindow arenajudgmentwindow
pause B_WAIT_TIME_LONG pause B_WAIT_TIME_LONG
arenajudgmentwindow arenajudgmentwindow
@@ -4493,8 +4496,9 @@ BattleScript_ArenaDoJudgment::
arenajudgmentstring B_MSG_REF_JUDGE_BODY arenajudgmentstring B_MSG_REF_JUDGE_BODY
arenawaitmessage B_MSG_REF_JUDGE_BODY arenawaitmessage B_MSG_REF_JUDGE_BODY
arenajudgmentwindow arenajudgmentwindow
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 3, BattleScript_ArenaJudgmentPlayerLoses jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_PLAYER_LOST, BattleScript_ArenaJudgmentPlayerLoses
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 4, BattleScript_ArenaJudgmentDraw jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_TIE, BattleScript_ArenaJudgmentDraw
@ ARENA_RESULT_PLAYER_WON
arenajudgmentstring B_MSG_REF_PLAYER_WON arenajudgmentstring B_MSG_REF_PLAYER_WON
arenawaitmessage B_MSG_REF_PLAYER_WON arenawaitmessage B_MSG_REF_PLAYER_WON
arenajudgmentwindow arenajudgmentwindow
data/contest_ai_scripts.s
+18 -2
View File
@@ -435,11 +435,15 @@ AI_CGM_BetterWhenAudienceExcited:
AI_CGM_BetterWhenAudienceExcited_1stUp: AI_CGM_BetterWhenAudienceExcited_1stUp:
@ BUG: Should be if_appeal_num_eq 0 @ BUG: Should be if_appeal_num_eq 0
@ 1st up on 1st appeal excitement will always be 0 @ 1st up on 1st appeal excitement will always be 0
if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_Not1stAppeal .ifdef BUGFIX
if_appeal_num_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
.else
if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
.endif
if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax
if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax
end end
AI_CGM_BetterWhenAudienceExcited_Not1stAppeal: AI_CGM_BetterWhenAudienceExcited_1stAppeal:
if_random_less_than 125, AI_CGM_End if_random_less_than 125, AI_CGM_End
score -15 score -15
end end
@@ -542,7 +546,11 @@ AI_CGM_TargetMonWithJudgesAttention:
end end
AI_CGM_TargetMonWithJudgesAttention_CheckMon1: AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.ifdef BUGFIX
if_not_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.else
if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.endif
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
score +2 score +2
if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
@@ -551,7 +559,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
AI_CGM_TargetMonWithJudgesAttention_CheckMon2: AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
if_user_order_eq MON_2, AI_CGM_End if_user_order_eq MON_2, AI_CGM_End
if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.ifdef BUGFIX
if_not_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.else
if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.endif
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
score +2 score +2
if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
@@ -560,7 +572,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
AI_CGM_TargetMonWithJudgesAttention_CheckMon3: AI_CGM_TargetMonWithJudgesAttention_CheckMon3:
if_user_order_eq MON_3, AI_CGM_End if_user_order_eq MON_3, AI_CGM_End
if_cannot_participate MON_3, AI_CGM_End if_cannot_participate MON_3, AI_CGM_End
.ifdef BUGFIX
if_not_used_combo_starter MON_3, AI_CGM_End
.else
if_used_combo_starter MON_3, AI_CGM_End if_used_combo_starter MON_3, AI_CGM_End
.endif
if_random_less_than 125, AI_CGM_End if_random_less_than 125, AI_CGM_End
score +2 score +2
if_not_completed_combo MON_3, AI_CGM_End if_not_completed_combo MON_3, AI_CGM_End
data/maps/AbandonedShip_HiddenFloorRooms/map.json
+1 -1
View File
@@ -51,7 +51,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18", "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18" "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM18"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
data/maps/AbandonedShip_Room_B1F/map.json
+1 -1
View File
@@ -25,7 +25,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Room_B1F_EventScript_ItemTM13", "script": "AbandonedShip_Room_B1F_EventScript_ItemTM13",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13" "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM13"
} }
], ],
"warp_events": [ "warp_events": [
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+2 -2
View File
@@ -472,8 +472,8 @@ BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded:
@ Unused @ Unused
BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak: BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak:
.string "For the feat of your 7-win streak,\n" .string "For the feat of your 7-win streak,\n"
.string "we present you with Battle Point(s).$" .string "we present you with Battle Point(s).$"
BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize: BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize:
.string "You seem to have no space for\n" .string "You seem to have no space for\n"
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+2 -2
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
data/maps/FortreeCity_DecorationShop/scripts.inc
+1 -1
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
data/maps/MeteorFalls_1F_1R/map.json
+1 -1
View File
@@ -25,7 +25,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_ItemTM23", "script": "MeteorFalls_1F_1R_EventScript_ItemTM23",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23" "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM23"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
data/maps/MeteorFalls_B1F_2R/map.json
+1 -1
View File
@@ -25,7 +25,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_B1F_2R_EventScript_ItemTM02", "script": "MeteorFalls_B1F_2R_EventScript_ItemTM02",
"flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02" "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM02"
} }
], ],
"warp_events": [ "warp_events": [
data/maps/MtPyre_6F/map.json
+1 -1
View File
@@ -38,7 +38,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_6F_EventScript_ItemTM30", "script": "MtPyre_6F_EventScript_ItemTM30",
"flag": "FLAG_ITEM_MT_PYRE_6F_TM_30" "flag": "FLAG_ITEM_MT_PYRE_6F_TM30"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M",
data/maps/MtPyre_Exterior/map.json
+1 -1
View File
@@ -38,7 +38,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_Exterior_EventScript_ItemTM48", "script": "MtPyre_Exterior_EventScript_ItemTM48",
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48" "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM48"
} }
], ],
"warp_events": [ "warp_events": [
data/maps/OldaleTown/map.json
+1 -1
View File
@@ -158,7 +158,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "OldaleTown_EventScript_CitySign" "script": "OldaleTown_EventScript_TownSign"
}, },
{ {
"type": "sign", "type": "sign",
data/maps/OldaleTown/scripts.inc
+3 -3
View File
@@ -29,8 +29,8 @@ OldaleTown_EventScript_MoveMartEmployee::
setobjectmovementtype LOCALID_MART_EMPLOYEE, MOVEMENT_TYPE_FACE_DOWN setobjectmovementtype LOCALID_MART_EMPLOYEE, MOVEMENT_TYPE_FACE_DOWN
return return
OldaleTown_EventScript_CitySign:: OldaleTown_EventScript_TownSign::
msgbox OldaleTown_Text_CitySign, MSGBOX_SIGN msgbox OldaleTown_Text_TownSign, MSGBOX_SIGN
end end
OldaleTown_EventScript_Girl:: OldaleTown_EventScript_Girl::
@@ -395,7 +395,7 @@ OldaleTown_Text_BrendanLetsGoBack:
.string "LAB now.\l" .string "LAB now.\l"
.string "{PLAYER}, you should hustle back, too.$" .string "{PLAYER}, you should hustle back, too.$"
OldaleTown_Text_CitySign: OldaleTown_Text_TownSign:
.string "OLDALE TOWN\n" .string "OLDALE TOWN\n"
.string "“Where things start off scarce.”$" .string "“Where things start off scarce.”$"
data/maps/PacifidlogTown_House2/scripts.inc
+2 -2
View File
@@ -11,9 +11,9 @@ PacifidlogTown_House2_EventScript_FanClubYoungerBrother::
call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_FirstMonAssessment call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_FirstMonAssessment
setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
specialvar VAR_RESULT, GetLeadMonFriendshipScore specialvar VAR_RESULT, GetLeadMonFriendshipScore
goto_if_ge VAR_RESULT, 4, PacifidlogTown_House2_EventScript_GiveReturn goto_if_ge VAR_RESULT, FRIENDSHIP_150_TO_199, PacifidlogTown_House2_EventScript_GiveReturn
specialvar VAR_RESULT, GetLeadMonFriendshipScore specialvar VAR_RESULT, GetLeadMonFriendshipScore
goto_if_ge VAR_RESULT, 2, PacifidlogTown_House2_EventScript_PutInEffort goto_if_ge VAR_RESULT, FRIENDSHIP_50_TO_99, PacifidlogTown_House2_EventScript_PutInEffort
goto PacifidlogTown_House2_EventScript_GiveFrustration goto PacifidlogTown_House2_EventScript_GiveFrustration
end end
data/maps/Route111/map.json
+1 -1
View File
@@ -262,7 +262,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_ItemTM37", "script": "Route111_EventScript_ItemTM37",
"flag": "FLAG_ITEM_ROUTE_111_TM_37" "flag": "FLAG_ITEM_ROUTE_111_TM37"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
data/maps/Route111/scripts.inc
+1 -1
View File
@@ -144,7 +144,7 @@ Route111_EventScript_RootFossilDisappeared::
@ Unused @ Unused
Route111_Movement_PlayerFall:: Route111_Movement_PlayerFall::
store_lock_anim lock_anim
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
data/maps/Route113/map.json
+1 -1
View File
@@ -451,7 +451,7 @@
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
"item": "ITEM_TM32", "item": "ITEM_TM32",
"flag": "FLAG_HIDDEN_ITEM_ROUTE_113_TM_32" "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_TM32"
}, },
{ {
"type": "hidden_item", "type": "hidden_item",
data/maps/Route115/map.json
+1 -1
View File
@@ -166,7 +166,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemTM01", "script": "Route115_EventScript_ItemTM01",
"flag": "FLAG_ITEM_ROUTE_115_TM_01" "flag": "FLAG_ITEM_ROUTE_115_TM01"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
data/maps/SafariZone_Northwest/map.json
+1 -1
View File
@@ -49,7 +49,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northwest_EventScript_ItemTM22", "script": "SafariZone_Northwest_EventScript_ItemTM22",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22" "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM22"
} }
], ],
"warp_events": [], "warp_events": [],
data/maps/ScorchedSlab/map.json
+1 -1
View File
@@ -25,7 +25,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "ScorchedSlab_EventScript_ItemTM11", "script": "ScorchedSlab_EventScript_ItemTM11",
"flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11" "flag": "FLAG_ITEM_SCORCHED_SLAB_TM11"
} }
], ],
"warp_events": [ "warp_events": [
data/maps/SeafloorCavern_Room9/map.json
+1 -1
View File
@@ -90,7 +90,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room9_EventScript_ItemTM26", "script": "SeafloorCavern_Room9_EventScript_ItemTM26",
"flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26" "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM26"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_KYOGRE_ASLEEP", "graphics_id": "OBJ_EVENT_GFX_KYOGRE_ASLEEP",
data/maps/ShoalCave_LowTideIceRoom/map.json
+1 -1
View File
@@ -25,7 +25,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideIceRoom_EventScript_ItemTM07", "script": "ShoalCave_LowTideIceRoom_EventScript_ItemTM07",
"flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07" "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM07"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
data/maps/SkyPillar_Top/map.json
+1 -1
View File
@@ -56,7 +56,7 @@
"x": 14, "x": 14,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"var": "VAR_SKY_PILLAR_RAQUAZA_CRY_DONE", "var": "VAR_SKY_PILLAR_RAYQUAZA_CRY_DONE",
"var_value": "0", "var_value": "0",
"script": "SkyPillar_Top_EventScript_AwakenRayquaza" "script": "SkyPillar_Top_EventScript_AwakenRayquaza"
} }
data/maps/SkyPillar_Top/scripts.inc
+1 -1
View File
@@ -128,7 +128,7 @@ SkyPillar_Top_EventScript_AwakenRayquaza::
special RemoveCameraObject special RemoveCameraObject
setvar VAR_SOOTOPOLIS_CITY_STATE, 5 setvar VAR_SOOTOPOLIS_CITY_STATE, 5
setvar VAR_SKY_PILLAR_STATE, 1 setvar VAR_SKY_PILLAR_STATE, 1
setvar VAR_SKY_PILLAR_RAQUAZA_CRY_DONE, 1 setvar VAR_SKY_PILLAR_RAYQUAZA_CRY_DONE, 1
releaseall releaseall
end end
data/maps/SlateportCity_PokemonFanClub/scripts.inc
+1 -1
View File
@@ -192,7 +192,7 @@ SlateportCity_PokemonFanClub_EventScript_SootheBellWoman::
goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell
msgbox SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou, MSGBOX_DEFAULT
specialvar VAR_RESULT, GetLeadMonFriendshipScore specialvar VAR_RESULT, GetLeadMonFriendshipScore
goto_if_ge VAR_RESULT, 4, SlateportCity_PokemonFanClub_EventScript_GiveSootheBell goto_if_ge VAR_RESULT, FRIENDSHIP_150_TO_199, SlateportCity_PokemonFanClub_EventScript_GiveSootheBell
release release
end end
data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
+7 -7
View File
@@ -7,13 +7,13 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater::
msgbox VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou, MSGBOX_DEFAULT msgbox VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou, MSGBOX_DEFAULT
specialvar VAR_RESULT, GetLeadMonFriendshipScore specialvar VAR_RESULT, GetLeadMonFriendshipScore
switch VAR_RESULT switch VAR_RESULT
case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou case FRIENDSHIP_NONE, VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou
case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary case FRIENDSHIP_1_TO_49, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary
case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou case FRIENDSHIP_50_TO_99, VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou
case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou case FRIENDSHIP_100_TO_149, VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou
case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot case FRIENDSHIP_150_TO_199, VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot
case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy case FRIENDSHIP_200_TO_254, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy
case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou case FRIENDSHIP_MAX, VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou
release release
end end
data/maps/VictoryRoad_B1F/map.json
+1 -1
View File
@@ -246,7 +246,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_ItemTM29", "script": "VictoryRoad_B1F_EventScript_ItemTM29",
"flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29" "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM29"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
data/scripts/mauville_man.inc
+1 -1
View File
@@ -315,7 +315,7 @@ MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory::
.string "the HOENN region!$" .string "the HOENN region!$"
MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle:: MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle::
.string "The BERRY-Planting TRAINER$" .string "The BERRY-Planting TRAINER$"
MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction:: MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction::
.string "Planted BERRIES$" .string "Planted BERRIES$"
data/text/event_ticket_2.inc
+52 -52
View File
@@ -1,71 +1,71 @@
EventTicket_Text_OldSeaMapTooFar: EventTicket_Text_OldSeaMapTooFar:
.string "What's up, youngster?\p" .string "What's up, youngster?\p"
.string "What, it's you who's supposed to have\n" .string "What, it's you who's supposed to have\n"
.string "a tattered old map?\p" .string "a tattered old map?\p"
.string "Let's have a look.\n" .string "Let's have a look.\n"
.string "… … … … … …\p" .string "… … … … … …\p"
.string "Boy, this is quite a ways away.\n" .string "Boy, this is quite a ways away.\n"
.string "I'm afraid I can't help you…$" .string "I'm afraid I can't help you…$"
EventTicket_Text_BrineyHoldOnASecond: EventTicket_Text_BrineyHoldOnASecond:
.string "BRINEY: Hold on a second!\p" .string "BRINEY: Hold on a second!\p"
.string "What's the idea of turning down\n" .string "What's the idea of turning down\n"
.string "someone that I owe so much to?$" .string "someone that I owe so much to?$"
EventTicket_Text_BrineyLetsSail: EventTicket_Text_BrineyLetsSail:
.string "{PLAYER}{KUN}, I'm terribly sorry.\p" .string "{PLAYER}{KUN}, I'm terribly sorry.\p"
.string "You came to me seeking my help,\n" .string "You came to me seeking my help,\n"
.string "and we almost turned you away.\p" .string "and we almost turned you away.\p"
.string "Well, let me make things right.\p" .string "Well, let me make things right.\p"
.string "We'll sail right away, of course!\p" .string "We'll sail right away, of course!\p"
.string "Let's find this island on\n" .string "Let's find this island on\n"
.string "this OLD SEA MAP!$" .string "this OLD SEA MAP!$"
EventTicket_Text_OddTicketGetOnBoard: EventTicket_Text_OddTicketGetOnBoard:
.string "Is it you who brought that odd\n" .string "Is it you who brought that odd\n"
.string "ticket?\p" .string "ticket?\p"
.string "Where you're trying to go is an island\n" .string "Where you're trying to go is an island\n"
.string "that's far, far away.\p" .string "that's far, far away.\p"
.string "No one knows what awaits there…\p" .string "No one knows what awaits there…\p"
.string "The very thought excites my blood\n" .string "The very thought excites my blood\n"
.string "as a sailing man!\p" .string "as a sailing man!\p"
.string "Get on board, youngster!$" .string "Get on board, youngster!$"
FarawayIsland_Entrance_Text_SailorReturn: FarawayIsland_Entrance_Text_SailorReturn:
.string "CAPT. BRINEY can be so maddeningly\n" .string "CAPT. BRINEY can be so maddeningly\n"
.string "fickle…\p" .string "fickle…\p"
.string "Do you want to return to LILYCOVE?$" .string "Do you want to return to LILYCOVE?$"
BirthIsland_Harbor_Text_SailorReturn: BirthIsland_Harbor_Text_SailorReturn:
.string "What an oddly shaped island, eh?\n" .string "What an oddly shaped island, eh?\n"
.string "Do you want to return to LILYCOVE?$" .string "Do you want to return to LILYCOVE?$"
EventTicket_Text_OddTicketsWhereTo: EventTicket_Text_OddTicketsWhereTo:
.string "Is it you who brought those\n" .string "Is it you who brought those\n"
.string "odd tickets?\p" .string "odd tickets?\p"
.string "… … …Hm.\p" .string "… … …Hm.\p"
.string "These tickets will get you to islands\n" .string "These tickets will get you to islands\n"
.string "that are far, far away.\p" .string "that are far, far away.\p"
.string "No one knows what awaits there,\n" .string "No one knows what awaits there,\n"
.string "or what may happen there.\p" .string "or what may happen there.\p"
.string "The very thought excites my blood\n" .string "The very thought excites my blood\n"
.string "as a sailing man!\p" .string "as a sailing man!\p"
.string "Get on board, youngster!\n" .string "Get on board, youngster!\n"
.string "Where shall we sail first?$" .string "Where shall we sail first?$"
NavelRock_Harbor_Text_SailorReturn: NavelRock_Harbor_Text_SailorReturn:
.string "Did… Did you hear that?\n" .string "Did… Did you hear that?\n"
.string "That low growling from deep in there.\p" .string "That low growling from deep in there.\p"
.string "Are you sure it's safe?\n" .string "Are you sure it's safe?\n"
.string "Do you think we should leave?$" .string "Do you think we should leave?$"
FarawayIsland_Entrance_Text_Sign: FarawayIsland_Entrance_Text_Sign:
.string "The writing is fading as if it was\n" .string "The writing is fading as if it was\n"
.string "written a long time ago…\p" .string "written a long time ago…\p"
.string "“…ber, 6th day\n" .string "“…ber, 6th day\n"
.string "If any human…sets foot here…\l" .string "If any human…sets foot here…\l"
.string "again…et it be a kindhearted pers…\l" .string "again…et it be a kindhearted pers…\l"
.string "…ith that hope, I depar…”$" .string "…ith that hope, I depar…”$"
FarawayIsland_Interior_Text_Mew: FarawayIsland_Interior_Text_Mew:
.string "Myuu…$" .string "Myuu…$"
data/text/pkmn_center_nurse.inc
+32 -32
View File
@@ -1,51 +1,51 @@
gText_WouldYouLikeToRestYourPkmn:: gText_WouldYouLikeToRestYourPkmn::
.string "Hello, and welcome to\n" .string "Hello, and welcome to\n"
.string "the POKéMON CENTER.\p" .string "the POKéMON CENTER.\p"
.string "We restore your tired POKéMON\n" .string "We restore your tired POKéMON\n"
.string "to full health.\p" .string "to full health.\p"
.string "Would you like to rest your POKéMON?$" .string "Would you like to rest your POKéMON?$"
gText_IllTakeYourPkmn:: gText_IllTakeYourPkmn::
.string "Okay, I'll take your POKéMON\n" .string "Okay, I'll take your POKéMON\n"
.string "for a few seconds.$" .string "for a few seconds.$"
gText_RestoredPkmnToFullHealth:: gText_RestoredPkmnToFullHealth::
.string "Thank you for waiting.\p" .string "Thank you for waiting.\p"
.string "We've restored your POKéMON\n" .string "We've restored your POKéMON\n"
.string "to full health.$" .string "to full health.$"
gText_WeHopeToSeeYouAgain:: gText_WeHopeToSeeYouAgain::
.string "We hope to see you again!$" .string "We hope to see you again!$"
gText_WelcomeCutShort:: gText_WelcomeCutShort::
.string "Hello, and welcome to\n" .string "Hello, and welcome to\n"
.string "the POKéMON CENTER.\p" .string "the POKéMON CENTER.\p"
.string "We restore your tired POKéMON\n" .string "We restore your tired POKéMON\n"
.string "to full health.\p" .string "to full health.\p"
.string "Would you like to…$" .string "Would you like to…$"
gText_NoticesGoldCard:: gText_NoticesGoldCard::
.string "Th-that card…\n" .string "Th-that card…\n"
.string "Could it be… The GOLD CARD?!\p" .string "Could it be… The GOLD CARD?!\p"
.string "Oh, the gold color is brilliant!\n" .string "Oh, the gold color is brilliant!\n"
.string "The four stars seem to sparkle!\p" .string "The four stars seem to sparkle!\p"
.string "I've seen several TRAINERS with\n" .string "I've seen several TRAINERS with\n"
.string "a SILVER CARD before, but, {PLAYER},\l" .string "a SILVER CARD before, but, {PLAYER},\l"
.string "you're the first TRAINER I've ever\l" .string "you're the first TRAINER I've ever\l"
.string "seen with a GOLD CARD!\p" .string "seen with a GOLD CARD!\p"
.string "Okay, {PLAYER}, please allow me\n" .string "Okay, {PLAYER}, please allow me\n"
.string "the honor of resting your POKéMON!$" .string "the honor of resting your POKéMON!$"
gText_YouWantTheUsual:: gText_YouWantTheUsual::
.string "I'm delighted to see you, {PLAYER}!\n" .string "I'm delighted to see you, {PLAYER}!\n"
.string "You want the usual, am I right?$" .string "You want the usual, am I right?$"
gText_IllTakeYourPkmn2:: gText_IllTakeYourPkmn2::
.string "Okay, I'll take your POKéMON\n" .string "Okay, I'll take your POKéMON\n"
.string "for a few seconds.$" .string "for a few seconds.$"
gText_ThankYouForWaiting:: gText_ThankYouForWaiting::
.string "Thank you for waiting.$" .string "Thank you for waiting.$"
gText_WeHopeToSeeYouAgain2:: gText_WeHopeToSeeYouAgain2::
.string "We hope to see you again!$" .string "We hope to see you again!$"
data/text/secret_base_trainers.inc
+167 -167
View File
@@ -1,286 +1,286 @@
SecretBase_Text_Trainer0Intro: SecretBase_Text_Trainer0Intro:
.string "Have you made a SECRET BASE already?\p" .string "Have you made a SECRET BASE already?\p"
.string "I went here, there, everywhere before\n" .string "I went here, there, everywhere before\n"
.string "choosing this place.\p" .string "choosing this place.\p"
.string "Since you're already here, how would\n" .string "Since you're already here, how would\n"
.string "you like to battle?$" .string "you like to battle?$"
SecretBase_Text_Trainer0AcceptBattle: SecretBase_Text_Trainer0AcceptBattle:
.string "Okay!\n" .string "Okay!\n"
.string "Here we come!$" .string "Here we come!$"
SecretBase_Text_Trainer0DeclineBattle: SecretBase_Text_Trainer0DeclineBattle:
.string "Hunh?\n" .string "Hunh?\n"
.string "Oh, you can't now…$" .string "Oh, you can't now…$"
SecretBase_Text_Trainer0Defeated:: SecretBase_Text_Trainer0Defeated::
.string "Waaargh! You're too strong!\n" .string "Waaargh! You're too strong!\n"
.string "About me losing… Please keep it secret!$" .string "About me losing… Please keep it secret!$"
SecretBase_Text_Trainer0PostBattle: SecretBase_Text_Trainer0PostBattle:
.string "What do you think of my SECRET BASE?\n" .string "What do you think of my SECRET BASE?\n"
.string "Come visit me again tomorrow.$" .string "Come visit me again tomorrow.$"
SecretBase_Text_Trainer0PreChampion: SecretBase_Text_Trainer0PreChampion:
.string "Have you made a SECRET BASE already?\p" .string "Have you made a SECRET BASE already?\p"
.string "I went here, there, everywhere before\n" .string "I went here, there, everywhere before\n"
.string "choosing this place.\p" .string "choosing this place.\p"
.string "Feel free to hang out!$" .string "Feel free to hang out!$"
SecretBase_Text_Trainer5Intro: SecretBase_Text_Trainer5Intro:
.string "There're a lot of places where\n" .string "There're a lot of places where\n"
.string "you can make a SECRET BASE.\p" .string "you can make a SECRET BASE.\p"
.string "But I like this spot best.\n" .string "But I like this spot best.\n"
.string "Don't you think it's nice?\p" .string "Don't you think it's nice?\p"
.string "Oh, would you like to have a battle?$" .string "Oh, would you like to have a battle?$"
SecretBase_Text_Trainer5AcceptBattle: SecretBase_Text_Trainer5AcceptBattle:
.string "Okay, here goes!$" .string "Okay, here goes!$"
SecretBase_Text_Trainer5DeclineBattle: SecretBase_Text_Trainer5DeclineBattle:
.string "Oh…\n" .string "Oh…\n"
.string "You can't now, okay.$" .string "You can't now, okay.$"
SecretBase_Text_Trainer5Defeated:: SecretBase_Text_Trainer5Defeated::
.string "Hmmm… It's our loss…\n" .string "Hmmm… It's our loss…\n"
.string "But don't tell anyone!\l" .string "But don't tell anyone!\l"
.string "It's a confidential secret!$" .string "It's a confidential secret!$"
SecretBase_Text_Trainer5PostBattle: SecretBase_Text_Trainer5PostBattle:
.string "If you're in this area again,\n" .string "If you're in this area again,\n"
.string "I hope you'll visit me.$" .string "I hope you'll visit me.$"
SecretBase_Text_Trainer5PreChampion: SecretBase_Text_Trainer5PreChampion:
.string "There're a lot of places where you can\n" .string "There're a lot of places where you can\n"
.string "make a SECRET BASE.\p" .string "make a SECRET BASE.\p"
.string "But I like this spot best.\n" .string "But I like this spot best.\n"
.string "Don't you think it's nice?$" .string "Don't you think it's nice?$"
SecretBase_Text_Trainer1Intro: SecretBase_Text_Trainer1Intro:
.string "This is a popular spot.\n" .string "This is a popular spot.\n"
.string "It's always taken.\p" .string "It's always taken.\p"
.string "Oh! Were you thinking about\n" .string "Oh! Were you thinking about\n"
.string "taking this spot, too?\p" .string "taking this spot, too?\p"
.string "I'll tell you what, you can have this\n" .string "I'll tell you what, you can have this\n"
.string "spot if you can beat me.$" .string "spot if you can beat me.$"
SecretBase_Text_Trainer1AcceptBattle: SecretBase_Text_Trainer1AcceptBattle:
.string "Okay!\n" .string "Okay!\n"
.string "I'm going to defend my SECRET BASE!$" .string "I'm going to defend my SECRET BASE!$"
SecretBase_Text_Trainer1DeclineBattle: SecretBase_Text_Trainer1DeclineBattle:
.string "Hunh? Is that right?\n" .string "Hunh? Is that right?\n"
.string "You're not interested in this spot?$" .string "You're not interested in this spot?$"
SecretBase_Text_Trainer1Defeated:: SecretBase_Text_Trainer1Defeated::
.string "I can't keep going!\n" .string "I can't keep going!\n"
.string "I surrender!$" .string "I surrender!$"
SecretBase_Text_Trainer1PostBattle: SecretBase_Text_Trainer1PostBattle:
.string "Okay, when I move one day,\n" .string "Okay, when I move one day,\n"
.string "this place will be yours!$" .string "this place will be yours!$"
SecretBase_Text_Trainer1PreChampion: SecretBase_Text_Trainer1PreChampion:
.string "This is a popular spot.\n" .string "This is a popular spot.\n"
.string "It's always taken.\p" .string "It's always taken.\p"
.string "I waited a long time for it to open.\n" .string "I waited a long time for it to open.\n"
.string "I finally got to use it!$" .string "I finally got to use it!$"
SecretBase_Text_Trainer6Intro: SecretBase_Text_Trainer6Intro:
.string "Welcome to my POKéMON LAB.\p" .string "Welcome to my POKéMON LAB.\p"
.string "I carry out research on battling in\n" .string "I carry out research on battling in\n"
.string "secrecy.\p" .string "secrecy.\p"
.string "Would you like to see how strong I am?$" .string "Would you like to see how strong I am?$"
SecretBase_Text_Trainer6AcceptBattle: SecretBase_Text_Trainer6AcceptBattle:
.string "I'm going to go all out!$" .string "I'm going to go all out!$"
SecretBase_Text_Trainer6DeclineBattle: SecretBase_Text_Trainer6DeclineBattle:
.string "Oh.\n" .string "Oh.\n"
.string "Some other time, then!$" .string "Some other time, then!$"
SecretBase_Text_Trainer6Defeated:: SecretBase_Text_Trainer6Defeated::
.string "Hmm… I've still got lots to learn.\n" .string "Hmm… I've still got lots to learn.\n"
.string "I have to study some more.$" .string "I have to study some more.$"
SecretBase_Text_Trainer6PostBattle: SecretBase_Text_Trainer6PostBattle:
.string "Thanks for battling with me.\n" .string "Thanks for battling with me.\n"
.string "Please come back again tomorrow.$" .string "Please come back again tomorrow.$"
SecretBase_Text_Trainer6PreChampion: SecretBase_Text_Trainer6PreChampion:
.string "Welcome to my POKéMON LAB.\p" .string "Welcome to my POKéMON LAB.\p"
.string "I carry out research on battling in\n" .string "I carry out research on battling in\n"
.string "secrecy.$" .string "secrecy.$"
SecretBase_Text_Trainer2Intro: SecretBase_Text_Trainer2Intro:
.string "A big mansion is nice, but I like this\n" .string "A big mansion is nice, but I like this\n"
.string "sort of place more.\p" .string "sort of place more.\p"
.string "I like it because all kinds of people\n" .string "I like it because all kinds of people\n"
.string "come visit me.\p" .string "come visit me.\p"
.string "So, how would you like a battle?$" .string "So, how would you like a battle?$"
SecretBase_Text_Trainer2AcceptBattle: SecretBase_Text_Trainer2AcceptBattle:
.string "That's the way!$" .string "That's the way!$"
SecretBase_Text_Trainer2DeclineBattle: SecretBase_Text_Trainer2DeclineBattle:
.string "When you're ready, give me a shout!$" .string "When you're ready, give me a shout!$"
SecretBase_Text_Trainer2Defeated:: SecretBase_Text_Trainer2Defeated::
.string "Aww! Done in!\n" .string "Aww! Done in!\n"
.string "But it's still fun to battle!$" .string "But it's still fun to battle!$"
SecretBase_Text_Trainer2PostBattle: SecretBase_Text_Trainer2PostBattle:
.string "Well, anyway, I should go buy some\n" .string "Well, anyway, I should go buy some\n"
.string "decorations and furniture.\p" .string "decorations and furniture.\p"
.string "I want my SECRET BASE to be a place\n" .string "I want my SECRET BASE to be a place\n"
.string "other people can enjoy.$" .string "other people can enjoy.$"
SecretBase_Text_Trainer2PreChampion: SecretBase_Text_Trainer2PreChampion:
.string "A big mansion is nice, but I like this\n" .string "A big mansion is nice, but I like this\n"
.string "sort of place more.\p" .string "sort of place more.\p"
.string "I like it because all kinds of people\n" .string "I like it because all kinds of people\n"
.string "come visit me.$" .string "come visit me.$"
SecretBase_Text_Trainer7Intro: SecretBase_Text_Trainer7Intro:
.string "I simply adore shopping for decorations\n" .string "I simply adore shopping for decorations\n"
.string "and furniture.\p" .string "and furniture.\p"
.string "I also love raising POKéMON just\n" .string "I also love raising POKéMON just\n"
.string "as much.\p" .string "as much.\p"
.string "If you would be so kind, will you battle\n" .string "If you would be so kind, will you battle\n"
.string "with my POKéMON?$" .string "with my POKéMON?$"
SecretBase_Text_Trainer7AcceptBattle: SecretBase_Text_Trainer7AcceptBattle:
.string "Thank you.\n" .string "Thank you.\n"
.string "Shall we begin?$" .string "Shall we begin?$"
SecretBase_Text_Trainer7DeclineBattle: SecretBase_Text_Trainer7DeclineBattle:
.string "Oh.\n" .string "Oh.\n"
.string "How disappointing…$" .string "How disappointing…$"
SecretBase_Text_Trainer7Defeated:: SecretBase_Text_Trainer7Defeated::
.string "I concede…$" .string "I concede…$"
SecretBase_Text_Trainer7PostBattle: SecretBase_Text_Trainer7PostBattle:
.string "That was all in good fun!\n" .string "That was all in good fun!\n"
.string "I should go enjoy shopping now.$" .string "I should go enjoy shopping now.$"
SecretBase_Text_Trainer7PreChampion: SecretBase_Text_Trainer7PreChampion:
.string "I simply adore shopping for decorations\n" .string "I simply adore shopping for decorations\n"
.string "and furniture.\p" .string "and furniture.\p"
.string "I also love raising POKéMON just\n" .string "I also love raising POKéMON just\n"
.string "as much.$" .string "as much.$"
SecretBase_Text_Trainer3Intro: SecretBase_Text_Trainer3Intro:
.string "Some people make their SECRET BASES in\n" .string "Some people make their SECRET BASES in\n"
.string "hard-to-find places.\l" .string "hard-to-find places.\l"
.string "Do they want to just lie low?\p" .string "Do they want to just lie low?\p"
.string "But since you found me, how about we\n" .string "But since you found me, how about we\n"
.string "have a battle?$" .string "have a battle?$"
SecretBase_Text_Trainer3AcceptBattle: SecretBase_Text_Trainer3AcceptBattle:
.string "I'm not going down easily!$" .string "I'm not going down easily!$"
SecretBase_Text_Trainer3DeclineBattle: SecretBase_Text_Trainer3DeclineBattle:
.string "Oh… Are you maybe tired from searching\n" .string "Oh… Are you maybe tired from searching\n"
.string "for this place?$" .string "for this place?$"
SecretBase_Text_Trainer3Defeated:: SecretBase_Text_Trainer3Defeated::
.string "I went down…$" .string "I went down…$"
SecretBase_Text_Trainer3PostBattle: SecretBase_Text_Trainer3PostBattle:
.string "Where's your SECRET BASE?\n" .string "Where's your SECRET BASE?\n"
.string "I should go visit you there.$" .string "I should go visit you there.$"
SecretBase_Text_Trainer3PreChampion: SecretBase_Text_Trainer3PreChampion:
.string "Some people make their SECRET BASES in\n" .string "Some people make their SECRET BASES in\n"
.string "hard-to-find places.\l" .string "hard-to-find places.\l"
.string "Do they want to just lie low?$" .string "Do they want to just lie low?$"
SecretBase_Text_Trainer8Intro: SecretBase_Text_Trainer8Intro:
.string "People have told me that you can get\n" .string "People have told me that you can get\n"
.string "decorations in several ways.\p" .string "decorations in several ways.\p"
.string "We should have a race to see who can\n" .string "We should have a race to see who can\n"
.string "get nicer decorations and furniture!\p" .string "get nicer decorations and furniture!\p"
.string "In the meantime, want to battle?$" .string "In the meantime, want to battle?$"
SecretBase_Text_Trainer8AcceptBattle: SecretBase_Text_Trainer8AcceptBattle:
.string "This is my SECRET BASE.\n" .string "This is my SECRET BASE.\n"
.string "I can't lose!$" .string "I can't lose!$"
SecretBase_Text_Trainer8DeclineBattle: SecretBase_Text_Trainer8DeclineBattle:
.string "I'll battle with you anytime.$" .string "I'll battle with you anytime.$"
SecretBase_Text_Trainer8Defeated:: SecretBase_Text_Trainer8Defeated::
.string "Huh?\n" .string "Huh?\n"
.string "Did I just lose?$" .string "Did I just lose?$"
SecretBase_Text_Trainer8PostBattle: SecretBase_Text_Trainer8PostBattle:
.string "I won't lose at collecting decorations.\n" .string "I won't lose at collecting decorations.\n"
.string "Come visit again!$" .string "Come visit again!$"
SecretBase_Text_Trainer8PreChampion: SecretBase_Text_Trainer8PreChampion:
.string "People have told me that you can get\n" .string "People have told me that you can get\n"
.string "decorations in several ways.\p" .string "decorations in several ways.\p"
.string "We should have a race to see who can\n" .string "We should have a race to see who can\n"
.string "get nicer decorations and furniture!$" .string "get nicer decorations and furniture!$"
SecretBase_Text_Trainer4Intro: SecretBase_Text_Trainer4Intro:
.string "I found a spot I liked, and I did it up\n" .string "I found a spot I liked, and I did it up\n"
.string "with my favorite decorations.\p" .string "with my favorite decorations.\p"
.string "I raise my favorite POKéMON and grow\n" .string "I raise my favorite POKéMON and grow\n"
.string "stronger with it.\p" .string "stronger with it.\p"
.string "That's what I do.\n" .string "That's what I do.\n"
.string "Want to battle with me?$" .string "Want to battle with me?$"
SecretBase_Text_Trainer4AcceptBattle: SecretBase_Text_Trainer4AcceptBattle:
.string "Show me what you're made of!$" .string "Show me what you're made of!$"
SecretBase_Text_Trainer4DeclineBattle: SecretBase_Text_Trainer4DeclineBattle:
.string "I guess there are times when you're not\n" .string "I guess there are times when you're not\n"
.string "into it.$" .string "into it.$"
SecretBase_Text_Trainer4Defeated:: SecretBase_Text_Trainer4Defeated::
.string "I know exactly what you're made of now.$" .string "I know exactly what you're made of now.$"
SecretBase_Text_Trainer4PostBattle: SecretBase_Text_Trainer4PostBattle:
.string "We can both become stronger.\n" .string "We can both become stronger.\n"
.string "Let's keep at it!$" .string "Let's keep at it!$"
SecretBase_Text_Trainer4PreChampion: SecretBase_Text_Trainer4PreChampion:
.string "I found a spot I liked, and I did it up\n" .string "I found a spot I liked, and I did it up\n"
.string "with my favorite decorations.\p" .string "with my favorite decorations.\p"
.string "I raise my favorite POKéMON and grow\n" .string "I raise my favorite POKéMON and grow\n"
.string "stronger with it.\p" .string "stronger with it.\p"
.string "Every day is a great day.$" .string "Every day is a great day.$"
SecretBase_Text_Trainer9Intro: SecretBase_Text_Trainer9Intro:
.string "You can learn a lot about the taste\n" .string "You can learn a lot about the taste\n"
.string "and sense of people by the kinds of\l" .string "and sense of people by the kinds of\l"
.string "decorations they have, and how they\l" .string "decorations they have, and how they\l"
.string "display them.\p" .string "display them.\p"
.string "What do you think of my taste?\n" .string "What do you think of my taste?\n"
.string "Are you speechless?\p" .string "Are you speechless?\p"
.string "Want to see my taste in battling?$" .string "Want to see my taste in battling?$"
SecretBase_Text_Trainer9AcceptBattle: SecretBase_Text_Trainer9AcceptBattle:
.string "There's no holding back!$" .string "There's no holding back!$"
SecretBase_Text_Trainer9DeclineBattle: SecretBase_Text_Trainer9DeclineBattle:
.string "I'll be happy to demonstrate my style\n" .string "I'll be happy to demonstrate my style\n"
.string "anytime.$" .string "anytime.$"
SecretBase_Text_Trainer9Defeated:: SecretBase_Text_Trainer9Defeated::
.string "You're supremely talented!\n" .string "You're supremely talented!\n"
.string "Your power seems to be limitless…$" .string "Your power seems to be limitless…$"
SecretBase_Text_Trainer9PostBattle: SecretBase_Text_Trainer9PostBattle:
.string "What did you think of my style?\n" .string "What did you think of my style?\n"
.string "I'll keep on polishing it!$" .string "I'll keep on polishing it!$"
SecretBase_Text_Trainer9PreChampion: SecretBase_Text_Trainer9PreChampion:
.string "You can learn a lot about the taste\n" .string "You can learn a lot about the taste\n"
.string "and sense of people by the kinds of\l" .string "and sense of people by the kinds of\l"
.string "decorations they have, and how they\l" .string "decorations they have, and how they\l"
.string "display them.\p" .string "display them.\p"
.string "What do you think of my taste?\n" .string "What do you think of my taste?\n"
.string "Are you speechless?$" .string "Are you speechless?$"
gflib/bg.c
+15 -15
View File
@@ -33,7 +33,7 @@ struct BgConfig2
u32 basePalette:4; u32 basePalette:4;
u32 unk_3:18; u32 unk_3:18;
void* tilemap; void *tilemap;
s32 bg_x; s32 bg_x;
s32 bg_y; s32 bg_y;
}; };
@@ -183,14 +183,14 @@ u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode)
case 0x1: case 0x1:
offset = sGpuBgConfigs.configs[bg].charBaseIndex * BG_CHAR_SIZE; offset = sGpuBgConfigs.configs[bg].charBaseIndex * BG_CHAR_SIZE;
offset = destOffset + offset; offset = destOffset + offset;
cursor = RequestDma3Copy(src, (void*)(offset + BG_VRAM), size, 0); cursor = RequestDma3Copy(src, (void *)(offset + BG_VRAM), size, 0);
if (cursor == -1) if (cursor == -1)
return -1; return -1;
break; break;
case 0x2: case 0x2:
offset = sGpuBgConfigs.configs[bg].mapBaseIndex * BG_SCREEN_SIZE; offset = sGpuBgConfigs.configs[bg].mapBaseIndex * BG_SCREEN_SIZE;
offset = destOffset + offset; offset = destOffset + offset;
cursor = RequestDma3Copy(src, (void*)(offset + BG_VRAM), size, 0); cursor = RequestDma3Copy(src, (void *)(offset + BG_VRAM), size, 0);
if (cursor == -1) if (cursor == -1)
return -1; return -1;
break; break;
@@ -372,7 +372,7 @@ void SetBgMode(u8 bgMode)
SetBgModeInternal(bgMode); SetBgModeInternal(bgMode);
} }
u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset) u16 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset)
{ {
u16 tileOffset; u16 tileOffset;
u8 cursor; u8 cursor;
@@ -422,7 +422,7 @@ u16 Unused_LoadBgPalette(u8 bg, const void *src, u16 size, u16 destOffset)
if (!IsInvalidBg32(bg)) if (!IsInvalidBg32(bg))
{ {
u16 paletteOffset = (sGpuBgConfigs2[bg].basePalette * 0x20) + (destOffset * 2); u16 paletteOffset = (sGpuBgConfigs2[bg].basePalette * 0x20) + (destOffset * 2);
cursor = RequestDma3Copy(src, (void*)(paletteOffset + BG_PLTT), size, 0); cursor = RequestDma3Copy(src, (void *)(paletteOffset + BG_PLTT), size, 0);
if (cursor == -1) if (cursor == -1)
{ {
@@ -863,7 +863,7 @@ void UnsetBgTilemapBuffer(u8 bg)
} }
} }
void* GetBgTilemapBuffer(u8 bg) void *GetBgTilemapBuffer(u8 bg)
{ {
if (IsInvalidBg32(bg)) if (IsInvalidBg32(bg))
return NULL; return NULL;
@@ -906,7 +906,7 @@ void CopyBgTilemapBufferToVram(u8 bg)
} }
} }
void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height) void CopyToBgTilemapBufferRect(u8 bg, const void *src, u8 destX, u8 destY, u8 width, u8 height)
{ {
u16 destX16; u16 destX16;
u16 destY16; u16 destY16;
@@ -923,7 +923,7 @@ void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 wi
{ {
for (destX16 = destX; destX16 < (destX + width); destX16++) for (destX16 = destX; destX16 < (destX + width); destX16++)
{ {
((u16*)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *srcCopy++; ((u16 *)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *srcCopy++;
} }
} }
break; break;
@@ -936,7 +936,7 @@ void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 wi
{ {
for (destX16 = destX; destX16 < (destX + width); destX16++) for (destX16 = destX; destX16 < (destX + width); destX16++)
{ {
((u8*)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *srcCopy++; ((u8 *)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *srcCopy++;
} }
} }
break; break;
@@ -984,7 +984,7 @@ void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8
{ {
for (j = destX; j < (destX + rectWidth); j++) for (j = destX; j < (destX + rectWidth); j++)
{ {
*(u8*)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8*)(srcPtr) + tileOffset; *(u8 *)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8 *)(srcPtr) + tileOffset;
srcPtr++; srcPtr++;
} }
srcPtr += (srcWidth - rectWidth); srcPtr += (srcWidth - rectWidth);
@@ -1009,7 +1009,7 @@ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width,
{ {
for (x16 = x; x16 < (x + width); x16++) for (x16 = x; x16 < (x + width); x16++)
{ {
((u16*)sGpuBgConfigs2[bg].tilemap)[((y16 * 0x20) + x16)] = tileNum; ((u16 *)sGpuBgConfigs2[bg].tilemap)[((y16 * 0x20) + x16)] = tileNum;
} }
} }
break; break;
@@ -1019,7 +1019,7 @@ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width,
{ {
for (x16 = x; x16 < (x + width); x16++) for (x16 = x; x16 < (x + width); x16++)
{ {
((u8*)sGpuBgConfigs2[bg].tilemap)[((y16 * mode) + x16)] = tileNum; ((u8 *)sGpuBgConfigs2[bg].tilemap)[((y16 * mode) + x16)] = tileNum;
} }
} }
break; break;
@@ -1052,7 +1052,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
{ {
for (x16 = x; x16 < (x + width); x16++) for (x16 = x; x16 < (x + width); x16++)
{ {
CopyTileMapEntry(&firstTileNum, &((u16*)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0); CopyTileMapEntry(&firstTileNum, &((u16 *)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0);
firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK); firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK);
} }
} }
@@ -1063,7 +1063,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
{ {
for (x16 = x; x16 < (x + width); x16++) for (x16 = x; x16 < (x + width); x16++)
{ {
((u8*)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum; ((u8 *)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum;
firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK); firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK);
} }
} }
@@ -1240,7 +1240,7 @@ bool32 IsInvalidBg32(u8 bg)
bool32 IsTileMapOutsideWram(u8 bg) bool32 IsTileMapOutsideWram(u8 bg)
{ {
if (sGpuBgConfigs2[bg].tilemap > (void*)IWRAM_END) if (sGpuBgConfigs2[bg].tilemap > (void *)IWRAM_END)
return TRUE; return TRUE;
else if (sGpuBgConfigs2[bg].tilemap == NULL) else if (sGpuBgConfigs2[bg].tilemap == NULL)
return TRUE; return TRUE;
gflib/bg.h
+19 -19
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
@@ -62,7 +62,7 @@ void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable);
void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numTemplates); void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numTemplates);
void InitBgFromTemplate(const struct BgTemplate *template); void InitBgFromTemplate(const struct BgTemplate *template);
void SetBgMode(u8 bgMode); void SetBgMode(u8 bgMode);
u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset); u16 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset);
u16 LoadBgTilemap(u8 bg, const void *src, u16 size, u16 destOffset); u16 LoadBgTilemap(u8 bg, const void *src, u16 size, u16 destOffset);
u16 Unused_LoadBgPalette(u8 bg, const void *src, u16 size, u16 destOffset); u16 Unused_LoadBgPalette(u8 bg, const void *src, u16 size, u16 destOffset);
bool8 IsDma3ManagerBusyWithBgCopy(void); bool8 IsDma3ManagerBusyWithBgCopy(void);
@@ -79,10 +79,10 @@ void SetBgAffine(u8 bg, s32 srcCenterX, s32 srcCenterY, s16 dispCenterX, s16 dis
u8 Unused_AdjustBgMosaic(u8 val, u8 mode); u8 Unused_AdjustBgMosaic(u8 val, u8 mode);
void SetBgTilemapBuffer(u8 bg, void *tilemap); void SetBgTilemapBuffer(u8 bg, void *tilemap);
void UnsetBgTilemapBuffer(u8 bg); void UnsetBgTilemapBuffer(u8 bg);
void* GetBgTilemapBuffer(u8 bg); void *GetBgTilemapBuffer(u8 bg);
void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset); void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset);
void CopyBgTilemapBufferToVram(u8 bg); void CopyBgTilemapBufferToVram(u8 bg);
void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height); void CopyToBgTilemapBufferRect(u8 bg, const void *src, u8 destX, u8 destY, u8 width, u8 height);
void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette);
void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, s16 tileOffset, s16 palette2); void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, s16 tileOffset, s16 palette2);
void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height); void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height);
gflib/malloc.h
+1 -4
View File
@@ -2,13 +2,10 @@
#define GUARD_ALLOC_H #define GUARD_ALLOC_H
#define HEAP_SIZE 0x1C000 #define HEAP_SIZE 0x1C000
#define malloc Alloc
#define calloc(ct, sz) AllocZeroed((ct) * (sz))
#define free Free
#define FREE_AND_SET_NULL(ptr) \ #define FREE_AND_SET_NULL(ptr) \
{ \ { \
free(ptr); \ Free(ptr); \
ptr = NULL; \ ptr = NULL; \
} }
gflib/sprite.c
+4 -4
View File
@@ -94,7 +94,7 @@ static void ApplyAffineAnimFrame(u8 matrixNum, struct AffineAnimFrameCmd *frameC
static u8 IndexOfSpriteTileTag(u16 tag); static u8 IndexOfSpriteTileTag(u16 tag);
static void AllocSpriteTileRange(u16 tag, u16 start, u16 count); static void AllocSpriteTileRange(u16 tag, u16 start, u16 count);
static void DoLoadSpritePalette(const u16 *src, u16 paletteOffset); static void DoLoadSpritePalette(const u16 *src, u16 paletteOffset);
static void UpdateSpriteMatrixAnchorPos(struct Sprite*, s32, s32); static void UpdateSpriteMatrixAnchorPos(struct Sprite *, s32, s32);
typedef void (*AnimFunc)(struct Sprite *); typedef void (*AnimFunc)(struct Sprite *);
typedef void (*AnimCmdFunc)(struct Sprite *); typedef void (*AnimCmdFunc)(struct Sprite *);
@@ -103,9 +103,9 @@ typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *);
#define DUMMY_OAM_DATA \ #define DUMMY_OAM_DATA \
{ \ { \
.y = DISPLAY_HEIGHT, \ .y = DISPLAY_HEIGHT, \
.affineMode = 0, \ .affineMode = ST_OAM_AFFINE_OFF, \
.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, \
@@ -1201,7 +1201,7 @@ u8 GetSpriteMatrixNum(struct Sprite *sprite)
// Used to shift a sprite's position as it scales. // Used to shift a sprite's position as it scales.
// Only used by the minigame countdown, so that for instance the numbers don't slide up as they squish down before jumping. // Only used by the minigame countdown, so that for instance the numbers don't slide up as they squish down before jumping.
void SetSpriteMatrixAnchor(struct Sprite* sprite, s16 x, s16 y) void SetSpriteMatrixAnchor(struct Sprite *sprite, s16 x, s16 y)
{ {
sprite->sAnchorX = x; sprite->sAnchorX = x;
sprite->sAnchorY = y; sprite->sAnchorY = y;
gflib/sprite.h
+1 -1
View File
@@ -282,7 +282,7 @@ void FreeSpritePalette(struct Sprite *sprite);
void FreeSpriteOamMatrix(struct Sprite *sprite); void FreeSpriteOamMatrix(struct Sprite *sprite);
void DestroySpriteAndFreeResources(struct Sprite *sprite); void DestroySpriteAndFreeResources(struct Sprite *sprite);
void AnimateSprite(struct Sprite *sprite); void AnimateSprite(struct Sprite *sprite);
void SetSpriteMatrixAnchor(struct Sprite* sprite, s16 x, s16 y); void SetSpriteMatrixAnchor(struct Sprite *sprite, s16 x, s16 y);
void StartSpriteAnim(struct Sprite *sprite, u8 animNum); void StartSpriteAnim(struct Sprite *sprite, u8 animNum);
void StartSpriteAnimIfDifferent(struct Sprite *sprite, u8 animNum); void StartSpriteAnimIfDifferent(struct Sprite *sprite, u8 animNum);
void SeekSpriteAnim(struct Sprite *sprite, u8 animCmdIndex); void SeekSpriteAnim(struct Sprite *sprite, u8 animCmdIndex);
gflib/string_util.c
+1 -1
View File
@@ -387,7 +387,7 @@ u8 *StringBraille(u8 *dest, const u8 *src)
const u8 setBrailleFont[] = { const u8 setBrailleFont[] = {
EXT_CTRL_CODE_BEGIN, EXT_CTRL_CODE_BEGIN,
EXT_CTRL_CODE_FONT, EXT_CTRL_CODE_FONT,
6, FONT_BRAILLE,
EOS EOS
}; };
const u8 gotoLine2[] = { const u8 gotoLine2[] = {
gflib/text.c
+7 -7
View File
@@ -652,7 +652,7 @@ void ClearTextSpan(struct TextPrinter *textPrinter, u32 width)
struct Window *window; struct Window *window;
struct Bitmap pixels_data; struct Bitmap pixels_data;
struct TextGlyph *glyph; struct TextGlyph *glyph;
u8* glyphHeight; u8 *glyphHeight;
if (sLastTextBgColor != TEXT_COLOR_TRANSPARENT) if (sLastTextBgColor != TEXT_COLOR_TRANSPARENT)
{ {
@@ -1684,7 +1684,7 @@ u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension)
static void DecompressGlyph_Small(u16 glyphId, bool32 isJapanese) static void DecompressGlyph_Small(u16 glyphId, bool32 isJapanese)
{ {
const u16* glyphs; const u16 *glyphs;
if (isJapanese == 1) if (isJapanese == 1)
{ {
@@ -1726,7 +1726,7 @@ static u32 GetGlyphWidth_Small(u16 glyphId, bool32 isJapanese)
static void DecompressGlyph_Narrow(u16 glyphId, bool32 isJapanese) static void DecompressGlyph_Narrow(u16 glyphId, bool32 isJapanese)
{ {
const u16* glyphs; const u16 *glyphs;
if (isJapanese == TRUE) if (isJapanese == TRUE)
{ {
@@ -1768,7 +1768,7 @@ static u32 GetGlyphWidth_Narrow(u16 glyphId, bool32 isJapanese)
static void DecompressGlyph_SmallNarrow(u16 glyphId, bool32 isJapanese) static void DecompressGlyph_SmallNarrow(u16 glyphId, bool32 isJapanese)
{ {
const u16* glyphs; const u16 *glyphs;
if (isJapanese == TRUE) if (isJapanese == TRUE)
{ {
@@ -1810,7 +1810,7 @@ static u32 GetGlyphWidth_SmallNarrow(u16 glyphId, bool32 isJapanese)
static void DecompressGlyph_Short(u16 glyphId, bool32 isJapanese) static void DecompressGlyph_Short(u16 glyphId, bool32 isJapanese)
{ {
const u16* glyphs; const u16 *glyphs;
if (isJapanese == TRUE) if (isJapanese == TRUE)
{ {
@@ -1854,7 +1854,7 @@ static u32 GetGlyphWidth_Short(u16 glyphId, bool32 isJapanese)
static void DecompressGlyph_Normal(u16 glyphId, bool32 isJapanese) static void DecompressGlyph_Normal(u16 glyphId, bool32 isJapanese)
{ {
const u16* glyphs; const u16 *glyphs;
if (isJapanese == TRUE) if (isJapanese == TRUE)
{ {
@@ -1896,7 +1896,7 @@ static u32 GetGlyphWidth_Normal(u16 glyphId, bool32 isJapanese)
static void DecompressGlyph_Bold(u16 glyphId) static void DecompressGlyph_Bold(u16 glyphId)
{ {
const u16* glyphs; const u16 *glyphs;
glyphs = sFontBoldJapaneseGlyphs + (0x100 * (glyphId >> 4)) + (0x8 * (glyphId & 0xF)); glyphs = sFontBoldJapaneseGlyphs + (0x100 * (glyphId >> 4)) + (0x8 * (glyphId & 0xF));
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop); DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
gflib/text.h
+1 -2
View File
@@ -65,7 +65,7 @@ struct TextPrinterSubStruct
struct TextPrinterTemplate struct TextPrinterTemplate
{ {
const u8* currentChar; const u8 *currentChar;
u8 windowId; u8 windowId;
u8 fontId; u8 fontId;
u8 x; u8 x;
@@ -148,7 +148,6 @@ void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
void DecompressGlyphTile(const void *src_, void *dest_); void DecompressGlyphTile(const void *src_, void *dest_);
void CopyGlyphToWindow(struct TextPrinter *x); void CopyGlyphToWindow(struct TextPrinter *x);
void ClearTextSpan(struct TextPrinter *textPrinter, u32 width); void ClearTextSpan(struct TextPrinter *textPrinter, u32 width);
u8 GetMenuCursorDimensionByFont(u8, u8);
void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter); void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter);
void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter); void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter);
gflib/window.c
+10 -10
View File
@@ -35,7 +35,7 @@ bool16 InitWindows(const struct WindowTemplate *templates)
int j; int j;
u8 bgLayer; u8 bgLayer;
u16 attrib; u16 attrib;
u8* allocatedTilemapBuffer; u8 *allocatedTilemapBuffer;
int allocatedBaseBlock; int allocatedBaseBlock;
for (i = 0; i < NUM_BACKGROUNDS; ++i) for (i = 0; i < NUM_BACKGROUNDS; ++i)
@@ -405,7 +405,7 @@ void BlitBitmapRectToWindow(u8 windowId, const u8 *pixels, u16 srcX, u16 srcY, u
struct Bitmap sourceRect; struct Bitmap sourceRect;
struct Bitmap destRect; struct Bitmap destRect;
sourceRect.pixels = (u8*)pixels; sourceRect.pixels = (u8 *)pixels;
sourceRect.width = srcWidth; sourceRect.width = srcWidth;
sourceRect.height = srcHeight; sourceRect.height = srcHeight;
@@ -421,7 +421,7 @@ static void BlitBitmapRectToWindowWithColorKey(u8 windowId, const u8 *pixels, u1
struct Bitmap sourceRect; struct Bitmap sourceRect;
struct Bitmap destRect; struct Bitmap destRect;
sourceRect.pixels = (u8*)pixels; sourceRect.pixels = (u8 *)pixels;
sourceRect.width = srcWidth; sourceRect.width = srcWidth;
sourceRect.height = srcHeight; sourceRect.height = srcHeight;
@@ -463,9 +463,9 @@ void FillWindowPixelBuffer(u8 windowId, u8 fillValue)
destOffset = i + (a); \ destOffset = i + (a); \
srcOffset = i + (((width * (distanceLoop & ~7)) | (distanceLoop & 7)) * 4); \ srcOffset = i + (((width * (distanceLoop & ~7)) | (distanceLoop & 7)) * 4); \
if (srcOffset < size) \ if (srcOffset < size) \
*(u32*)(tileData + destOffset) = *(u32*)(tileData + srcOffset); \ *(u32 *)(tileData + destOffset) = *(u32 *)(tileData + srcOffset); \
else \ else \
*(u32*)(tileData + destOffset) = fillValue32; \ *(u32 *)(tileData + destOffset) = fillValue32; \
distanceLoop++; \ distanceLoop++; \
} }
@@ -474,9 +474,9 @@ void FillWindowPixelBuffer(u8 windowId, u8 fillValue)
destOffset = i + (a); \ destOffset = i + (a); \
srcOffset = i + (((width * (distanceLoop & ~7)) | (distanceLoop & 7)) * 4); \ srcOffset = i + (((width * (distanceLoop & ~7)) | (distanceLoop & 7)) * 4); \
if (srcOffset < size) \ if (srcOffset < size) \
*(u32*)(tileData - destOffset) = *(u32*)(tileData - srcOffset); \ *(u32 *)(tileData - destOffset) = *(u32 *)(tileData - srcOffset); \
else \ else \
*(u32*)(tileData - destOffset) = fillValue32; \ *(u32 *)(tileData - destOffset) = fillValue32; \
distanceLoop++; \ distanceLoop++; \
} }
@@ -550,7 +550,7 @@ bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value)
gWindows[windowId].window.baseBlock = value; gWindows[windowId].window.baseBlock = value;
return FALSE; return FALSE;
case WINDOW_TILE_DATA: case WINDOW_TILE_DATA:
gWindows[windowId].tileData = (u8*)(value); gWindows[windowId].tileData = (u8 *)(value);
return TRUE; return TRUE;
case WINDOW_BG: case WINDOW_BG:
case WINDOW_WIDTH: case WINDOW_WIDTH:
@@ -605,7 +605,7 @@ static void DummyWindowBgTilemap8Bit(void)
u16 AddWindow8Bit(const struct WindowTemplate *template) u16 AddWindow8Bit(const struct WindowTemplate *template)
{ {
u16 windowId; u16 windowId;
u8* memAddress; u8 *memAddress;
u8 bgLayer; u8 bgLayer;
for (windowId = 0; windowId < WINDOWS_MAX; windowId++) for (windowId = 0; windowId < WINDOWS_MAX; windowId++)
@@ -675,7 +675,7 @@ void BlitBitmapRectToWindow4BitTo8Bit(u8 windowId, const u8 *pixels, u16 srcX, u
struct Bitmap sourceRect; struct Bitmap sourceRect;
struct Bitmap destRect; struct Bitmap destRect;
sourceRect.pixels = (u8*) pixels; sourceRect.pixels = (u8 *) pixels;
sourceRect.width = srcWidth; sourceRect.width = srcWidth;
sourceRect.height = srcHeight; sourceRect.height = srcHeight;
gflib/window.h
+1 -1
View File
@@ -73,7 +73,7 @@ void BlitBitmapRectToWindow4BitTo8Bit(u8 windowId, const u8 *pixels, u16 srcX, u
void CopyWindowToVram8Bit(u8 windowId, u8 mode); void CopyWindowToVram8Bit(u8 windowId, u8 mode);
extern struct Window gWindows[]; extern struct Window gWindows[];
extern void* gWindowBgTilemapBuffers[]; extern void *gWindowBgTilemapBuffers[];
extern u32 gUnusedWindowVar1; extern u32 gUnusedWindowVar1;
extern u32 gUnusedWindowVar2; extern u32 gUnusedWindowVar2;
extern u32 gUnusedWindowVar3; extern u32 gUnusedWindowVar3;
graphics/battle_frontier/arena_judgement_symbols.png → graphics/battle_frontier/arena_judgment_symbols.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 277 B

graphics/battle_transitions/rayquaza.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

graphics/battle_transitions/regis.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 256 B

graphics/naming_screen/back_button.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 285 B

graphics/naming_screen/buttons.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
106 156 213
255 255 255
57 57 57
139 139 131
197 189 180
230 222 213
74 115 139
123 172 197
172 115 74
213 156 115
98 156 57
148 189 106
189 164 32
230 222 90
57 57 57
57 57 57
graphics/naming_screen/cursor.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
106 156 213
255 8 8
222 57 74
180 65 82
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
230 222 213
0 0 0
230 222 213
0 0 0
graphics/naming_screen/cursor.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 223 B

After

Width:  |  Height:  |  Size: 159 B

graphics/naming_screen/cursor_filled.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 166 B

graphics/naming_screen/cursor_squished.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 164 B

graphics/naming_screen/input_arrow.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 95 B

After

Width:  |  Height:  |  Size: 153 B

graphics/naming_screen/menu.pal
+1 -81
View File
@@ -1,6 +1,6 @@
JASC-PAL JASC-PAL
0100 0100
96 16
106 156 213 106 156 213
255 255 255 255 255 255
115 115 115 115 115 115
@@ -17,83 +17,3 @@ JASC-PAL
230 222 90 230 222 90
238 230 139 238 230 139
246 238 197 246 238 197
106 156 213
255 255 255
57 57 57
115 115 115
0 0 0
0 0 0
0 0 0
0 0 255
0 0 255
0 0 255
0 0 255
74 115 139
98 139 164
123 172 197
156 205 230
180 222 246
106 156 213
255 255 255
57 57 57
115 115 115
0 0 0
0 0 0
0 0 0
0 0 255
0 0 255
0 0 255
0 0 255
172 115 74
189 131 90
213 156 115
246 205 164
255 230 197
106 156 213
255 255 255
57 57 57
115 115 115
0 0 0
0 0 0
0 0 0
0 0 255
0 0 255
0 0 255
0 0 255
98 156 57
123 172 82
148 189 106
197 230 156
213 238 189
106 156 213
255 255 255
57 57 57
139 139 131
197 189 180
230 222 213
74 115 139
123 172 197
172 115 74
213 156 115
98 156 57
148 189 106
189 164 32
230 222 90
57 57 57
57 57 57
106 156 213
255 8 8
222 57 74
180 65 82
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
230 222 213
0 0 0
230 222 213
0 0 0
graphics/naming_screen/ok_button.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 271 B

graphics/naming_screen/page_button.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 89 B

graphics/naming_screen/page_swap_button.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 145 B

graphics/naming_screen/page_swap_frame.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 253 B

graphics/naming_screen/page_swap_lower.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
106 156 213
255 255 255
57 57 57
115 115 115
0 0 0
0 0 0
0 0 0
0 0 255
0 0 255
0 0 255
0 0 255
172 115 74
189 131 90
213 156 115
246 205 164
255 230 197
graphics/naming_screen/page_swap_lower.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 186 B

graphics/naming_screen/page_swap_others.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
106 156 213
255 255 255
57 57 57
115 115 115
0 0 0
0 0 0
0 0 0
0 0 255
0 0 255
0 0 255
0 0 255
98 156 57
123 172 82
148 189 106
197 230 156
213 238 189
graphics/naming_screen/page_swap_others.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 192 B

graphics/naming_screen/page_swap_upper.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
106 156 213
255 255 255
57 57 57
115 115 115
0 0 0
0 0 0
0 0 0
0 0 255
0 0 255
0 0 255
0 0 255
74 115 139
98 139 164
123 172 197
156 205 230
180 222 246
graphics/naming_screen/page_swap_upper.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 194 B

graphics/naming_screen/pc_icon/off.png → graphics/naming_screen/pc_icon_off.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 192 B

graphics/naming_screen/pc_icon/on.png → graphics/naming_screen/pc_icon_on.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 203 B

graphics/naming_screen/unused.pal → graphics/naming_screen/rival.pal
View File
graphics/naming_screen/roptions.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 309 B

graphics/naming_screen/rwindow.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 480 B

graphics/naming_screen/underscore.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 81 B

After

Width:  |  Height:  |  Size: 137 B

graphics/picture_frame/lobby.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 666 B

After

Width:  |  Height:  |  Size: 719 B

graphics/trainers/back_pics/brendan_back_pic.png → graphics/trainers/back_pics/brendan.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.png → graphics/trainers/back_pics/brendan_rs.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

graphics/trainers/back_pics/leaf_back_pic.png → graphics/trainers/back_pics/leaf.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

graphics/trainers/back_pics/may_back_pic.png → graphics/trainers/back_pics/may.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

graphics/trainers/back_pics/ruby_sapphire_may_back_pic.png → graphics/trainers/back_pics/may_rs.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

graphics/trainers/back_pics/red_back_pic.png → graphics/trainers/back_pics/red.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

graphics/trainers/back_pics/steven_back_pic.png → graphics/trainers/back_pics/steven.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

graphics/trainers/back_pics/wally_back_pic.png → graphics/trainers/back_pics/wally.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

graphics/trainers/front_pics/aqua_admin_f_front_pic.png → graphics/trainers/front_pics/aqua_admin_f.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 838 B

After

Width:  |  Height:  |  Size: 838 B

graphics/trainers/front_pics/aqua_admin_m_front_pic.png → graphics/trainers/front_pics/aqua_admin_m.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 800 B

After

Width:  |  Height:  |  Size: 800 B

graphics/trainers/front_pics/aqua_grunt_f_front_pic.png → graphics/trainers/front_pics/aqua_grunt_f.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 722 B

After

Width:  |  Height:  |  Size: 722 B

graphics/trainers/front_pics/aqua_grunt_m_front_pic.png → graphics/trainers/front_pics/aqua_grunt_m.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 726 B

After

Width:  |  Height:  |  Size: 726 B

graphics/trainers/front_pics/aqua_leader_archie_front_pic.png → graphics/trainers/front_pics/aqua_leader_archie.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 684 B

After

Width:  |  Height:  |  Size: 684 B

graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png → graphics/trainers/front_pics/arena_tycoon_greta.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 702 B

After

Width:  |  Height:  |  Size: 702 B

graphics/trainers/front_pics/aroma_lady_front_pic.png → graphics/trainers/front_pics/aroma_lady.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 619 B

After

Width:  |  Height:  |  Size: 619 B

graphics/trainers/front_pics/battle_girl_front_pic.png → graphics/trainers/front_pics/battle_girl.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 702 B

After

Width:  |  Height:  |  Size: 702 B

graphics/trainers/front_pics/beauty_front_pic.png → graphics/trainers/front_pics/beauty.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 662 B

After

Width:  |  Height:  |  Size: 662 B

graphics/trainers/front_pics/bird_keeper_front_pic.png → graphics/trainers/front_pics/bird_keeper.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 698 B

After

Width:  |  Height:  |  Size: 698 B

graphics/trainers/front_pics/black_belt_front_pic.png → graphics/trainers/front_pics/black_belt.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 735 B

After

Width:  |  Height:  |  Size: 735 B

graphics/trainers/front_pics/brendan_front_pic.png → graphics/trainers/front_pics/brendan.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 698 B

After

Width:  |  Height:  |  Size: 698 B

graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.png → graphics/trainers/front_pics/brendan_rs.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

graphics/trainers/front_pics/bug_catcher_front_pic.png → graphics/trainers/front_pics/bug_catcher.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 682 B

After

Width:  |  Height:  |  Size: 682 B

graphics/trainers/front_pics/bug_maniac_front_pic.png → graphics/trainers/front_pics/bug_maniac.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 932 B

After

Width:  |  Height:  |  Size: 932 B

graphics/trainers/front_pics/camper_front_pic.png → graphics/trainers/front_pics/camper.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 629 B

After

Width:  |  Height:  |  Size: 629 B

Some files were not shown because too many files have changed in this diff Show More