merge with pret
This commit is contained in:
ghoulslash
commit
3c4bf808f1
6
Makefile
6
Makefile
@ -67,12 +67,14 @@ override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-
|
||||
ROM := pokeemerald.gba
|
||||
OBJ_DIR := build/emerald
|
||||
LIBPATH := -L ../../tools/agbcc/lib
|
||||
LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
|
||||
else
|
||||
CC1 = $(shell $(CC) --print-prog-name=cc1) -quiet
|
||||
override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -g
|
||||
ROM := pokeemerald_modern.gba
|
||||
OBJ_DIR := build/modern
|
||||
LIBPATH := -L "$(dir $(shell $(CC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(CC) -mthumb -print-file-name=libc.a))"
|
||||
LIBPATH := -L "$(dir $(shell $(CC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(CC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(CC) -mthumb -print-file-name=libc.a))"
|
||||
LIB := $(LIBPATH) -lc -lnosys -lgcc -L../../libagbsyscall -lagbsyscall
|
||||
endif
|
||||
|
||||
CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN)
|
||||
@ -82,8 +84,6 @@ endif
|
||||
|
||||
LDFLAGS = -Map ../../$(MAP)
|
||||
|
||||
LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
|
||||
|
||||
SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
|
||||
GFX := tools/gbagfx/gbagfx$(EXE)
|
||||
AIF := tools/aif2pcm/aif2pcm$(EXE)
|
||||
|
||||
@ -1,10 +1,5 @@
|
||||
# Pokémon Emerald
|
||||
|
||||
[![Build Status][travis-badge]][travis]
|
||||
|
||||
[travis]: https://travis-ci.org/pret/pokeemerald
|
||||
[travis-badge]: https://travis-ci.org/pret/pokeemerald.svg?branch=master
|
||||
|
||||
This is a decompilation of Pokémon Emerald.
|
||||
|
||||
It builds the following ROM:
|
||||
|
||||
@ -1311,7 +1311,7 @@
|
||||
various \battler, 15
|
||||
.endm
|
||||
|
||||
.macro arenajudmengtstring id:req
|
||||
.macro arenajudgmentstring id:req
|
||||
various \id, VARIOUS_ARENA_JUDGMENT_STRING
|
||||
.endm
|
||||
|
||||
|
||||
@ -918,10 +918,10 @@
|
||||
.byte 0x76
|
||||
.endm
|
||||
|
||||
@ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.)
|
||||
.macro showcontestwinner a:req
|
||||
@ Draws an image of the winner of the contest. winnerId is any CONTEST_WINNER_* constant.
|
||||
.macro showcontestpainting winnerId:req
|
||||
.byte 0x77
|
||||
.byte \a
|
||||
.byte \winnerId
|
||||
.endm
|
||||
|
||||
@ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille
|
||||
|
||||
@ -434,8 +434,8 @@ RESUME_MUSIC = FC 18
|
||||
|
||||
TRANSPARENT = 00
|
||||
WHITE = 01
|
||||
DARK_GREY = 02
|
||||
LIGHT_GREY = 03
|
||||
DARK_GRAY = 02
|
||||
LIGHT_GRAY = 03
|
||||
RED = 04
|
||||
LIGHT_RED = 05
|
||||
GREEN = 06
|
||||
|
||||
@ -434,8 +434,8 @@ RESUME_MUSIC = FC 18
|
||||
|
||||
TRANSPARENT = 00
|
||||
WHITE = 01
|
||||
DARK_GREY = 02
|
||||
LIGHT_GREY = 03
|
||||
DARK_GRAY = 02
|
||||
LIGHT_GRAY = 03
|
||||
RED = 04
|
||||
LIGHT_RED = 05
|
||||
GREEN = 06
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef GUARD_GBA_DEFINES
|
||||
#define GUARD_GBA_DEFINES
|
||||
#ifndef GUARD_GBA_DEFINES_H
|
||||
#define GUARD_GBA_DEFINES_H
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
@ -84,4 +84,4 @@
|
||||
#define RGB_CYAN RGB(0, 31, 31)
|
||||
#define RGB_WHITEALPHA (RGB_WHITE | 0x8000)
|
||||
|
||||
#endif // GUARD_GBA_DEFINES
|
||||
#endif // GUARD_GBA_DEFINES_H
|
||||
|
||||
@ -419,7 +419,7 @@ void SetPokemonCryPitch(s16 val);
|
||||
void SetPokemonCryLength(u16 val);
|
||||
void SetPokemonCryRelease(u8 val);
|
||||
void SetPokemonCryProgress(u32 val);
|
||||
int IsPokemonCryPlaying(struct MusicPlayerInfo *mplayInfo);
|
||||
bool32 IsPokemonCryPlaying(struct MusicPlayerInfo *mplayInfo);
|
||||
void SetPokemonCryChorus(s8 val);
|
||||
void SetPokemonCryStereo(u32 val);
|
||||
void SetPokemonCryPriority(u8 val);
|
||||
|
||||
@ -438,8 +438,8 @@ RESUME_MUSIC = FC 18
|
||||
|
||||
TRANSPARENT = 00
|
||||
WHITE = 01
|
||||
DARK_GREY = 02
|
||||
LIGHT_GREY = 03
|
||||
DARK_GRAY = 02
|
||||
LIGHT_GRAY = 03
|
||||
RED = 04
|
||||
LIGHT_RED = 05
|
||||
GREEN = 06
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -34,7 +34,7 @@ gBattlescriptsForUsingItem:: @ 82DBD3C
|
||||
.4byte BattleScript_OpponentUsesHealItem @ AI_ITEM_HEAL_HP
|
||||
.4byte BattleScript_OpponentUsesStatusCureItem @ AI_ITEM_CURE_CONDITION
|
||||
.4byte BattleScript_OpponentUsesXItem @ AI_ITEM_X_STAT
|
||||
.4byte BattleScript_OpponentUsesGuardSpecs @ AI_ITEM_GUARD_SPECS
|
||||
.4byte BattleScript_OpponentUsesGuardSpec @ AI_ITEM_GUARD_SPEC
|
||||
|
||||
.align 2
|
||||
gBattlescriptsForRunningByItem:: @ 82DBD54
|
||||
@ -69,16 +69,16 @@ BattleScript_PrintCaughtMonInfo::
|
||||
trysetcaughtmondexflags BattleScript_TryNicknameCaughtMon
|
||||
printstring STRINGID_PKMNDATAADDEDTODEX
|
||||
waitstate
|
||||
setbyte gBattleCommunication, 0x0
|
||||
setbyte gBattleCommunication, 0
|
||||
displaydexinfo
|
||||
BattleScript_TryNicknameCaughtMon::
|
||||
printstring STRINGID_GIVENICKNAMECAPTURED
|
||||
waitstate
|
||||
setbyte gBattleCommunication, 0x0
|
||||
setbyte gBattleCommunication, 0
|
||||
trygivecaughtmonnick BattleScript_GiveCaughtMonEnd
|
||||
givecaughtmon
|
||||
printfromtable gCaughtMonStringIds
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
goto BattleScript_SuccessBallThrowEnd
|
||||
BattleScript_GiveCaughtMonEnd::
|
||||
givecaughtmon
|
||||
@ -93,83 +93,78 @@ BattleScript_WallyBallThrow::
|
||||
|
||||
BattleScript_ShakeBallThrow::
|
||||
printfromtable gBallEscapeStringIds
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
|
||||
jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0x0, BattleScript_ShakeBallThrowEnd
|
||||
jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0, BattleScript_ShakeBallThrowEnd
|
||||
printstring STRINGID_OUTOFSAFARIBALLS
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
setbyte gBattleOutcome, B_OUTCOME_NO_SAFARI_BALLS
|
||||
BattleScript_ShakeBallThrowEnd::
|
||||
finishaction
|
||||
|
||||
BattleScript_TrainerBallBlock::
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
printstring STRINGID_TRAINERBLOCKEDBALL
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
printstring STRINGID_DONTBEATHIEF
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
finishaction
|
||||
|
||||
BattleScript_PlayerUsesItem::
|
||||
setbyte sMOVEEND_STATE, 0xF
|
||||
moveend 0x1, 0x0
|
||||
moveendcase MOVEEND_MIRROR_MOVE
|
||||
end
|
||||
|
||||
BattleScript_OpponentUsesHealItem::
|
||||
printstring STRINGID_EMPTYSTRING3
|
||||
pause 0x30
|
||||
pause B_WAIT_TIME_MED
|
||||
playse SE_USE_ITEM
|
||||
printstring STRINGID_TRAINER1USEDITEM
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
useitemonopponent
|
||||
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
|
||||
healthbarupdate BS_ATTACKER
|
||||
datahpupdate BS_ATTACKER
|
||||
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
updatestatusicon BS_ATTACKER
|
||||
setbyte sMOVEEND_STATE, 0xF
|
||||
moveend 0x1, 0x0
|
||||
moveendcase MOVEEND_MIRROR_MOVE
|
||||
finishaction
|
||||
|
||||
BattleScript_OpponentUsesStatusCureItem::
|
||||
printstring STRINGID_EMPTYSTRING3
|
||||
pause 0x30
|
||||
pause B_WAIT_TIME_MED
|
||||
playse SE_USE_ITEM
|
||||
printstring STRINGID_TRAINER1USEDITEM
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
useitemonopponent
|
||||
printfromtable gTrainerItemCuredStatusStringIds
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
updatestatusicon BS_ATTACKER
|
||||
setbyte sMOVEEND_STATE, 0xF
|
||||
moveend 0x1, 0x0
|
||||
moveendcase MOVEEND_MIRROR_MOVE
|
||||
finishaction
|
||||
|
||||
BattleScript_OpponentUsesXItem::
|
||||
printstring STRINGID_EMPTYSTRING3
|
||||
pause 0x30
|
||||
pause B_WAIT_TIME_MED
|
||||
playse SE_USE_ITEM
|
||||
printstring STRINGID_TRAINER1USEDITEM
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
useitemonopponent
|
||||
printfromtable gStatUpStringIds
|
||||
waitmessage 0x40
|
||||
setbyte sMOVEEND_STATE, 0xF
|
||||
moveend 0x1, 0x0
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
moveendcase MOVEEND_MIRROR_MOVE
|
||||
finishaction
|
||||
|
||||
BattleScript_OpponentUsesGuardSpecs::
|
||||
BattleScript_OpponentUsesGuardSpec::
|
||||
printstring STRINGID_EMPTYSTRING3
|
||||
pause 0x30
|
||||
pause B_WAIT_TIME_MED
|
||||
playse SE_USE_ITEM
|
||||
printstring STRINGID_TRAINER1USEDITEM
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
useitemonopponent
|
||||
printfromtable gMistUsedStringIds
|
||||
waitmessage 0x40
|
||||
setbyte sMOVEEND_STATE, 0xF
|
||||
moveend 0x1, 0x0
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
moveendcase MOVEEND_MIRROR_MOVE
|
||||
finishaction
|
||||
|
||||
BattleScript_RunByUsingItem::
|
||||
@ -179,29 +174,29 @@ BattleScript_RunByUsingItem::
|
||||
|
||||
BattleScript_ActionWatchesCarefully:
|
||||
printstring STRINGID_PKMNWATCHINGCAREFULLY
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
end2
|
||||
|
||||
BattleScript_ActionGetNear:
|
||||
printfromtable gSafariGetNearStringIds
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
end2
|
||||
|
||||
BattleScript_ActionThrowPokeblock:
|
||||
printstring STRINGID_THREWPOKEBLOCKATPKMN
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
playanimation BS_ATTACKER, B_ANIM_POKEBLOCK_THROW, NULL
|
||||
printfromtable gSafariPokeblockResultStringIds
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
end2
|
||||
|
||||
BattleScript_ActionWallyThrow:
|
||||
printstring STRINGID_RETURNMON
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
returnatktoball
|
||||
waitstate
|
||||
trainerslidein BS_TARGET
|
||||
waitstate
|
||||
printstring STRINGID_YOUTHROWABALLNOWRIGHT
|
||||
waitmessage 0x40
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
end2
|
||||
|
||||
@ -160,7 +160,7 @@ LilycoveCity_EventScript_MotelSign:: @ 81E2D11
|
||||
|
||||
LilycoveCity_EventScript_MuseumSign:: @ 81E2D1A
|
||||
lockall
|
||||
specialvar VAR_0x8004, CountPlayerContestPaintings
|
||||
specialvar VAR_0x8004, CountPlayerMuseumPaintings
|
||||
switch VAR_0x8004
|
||||
case 0, LilycoveCity_EventScript_MuseumSignNoPaintings
|
||||
msgbox LilycoveCity_Text_MuseumSignPlayersExhibit, MSGBOX_DEFAULT
|
||||
|
||||
@ -49,7 +49,7 @@ LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264
|
||||
msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
|
||||
lockall
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_ARTIST
|
||||
showcontestpainting CONTEST_WINNER_ARTIST
|
||||
lockall
|
||||
msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
|
||||
compare VAR_RESULT, YES
|
||||
@ -108,7 +108,7 @@ LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon:: @ 821A314
|
||||
return
|
||||
|
||||
LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons:: @ 821A360
|
||||
specialvar VAR_0x8004, CountPlayerContestPaintings
|
||||
specialvar VAR_0x8004, CountPlayerMuseumPaintings
|
||||
switch VAR_0x8004
|
||||
case 1, LilycoveCity_ContestLobby_EventScript_ShowPatron1
|
||||
case 2, LilycoveCity_ContestLobby_EventScript_ShowPatron2
|
||||
@ -223,7 +223,7 @@ LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436
|
||||
msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
|
||||
lockall
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_ARTIST
|
||||
showcontestpainting CONTEST_WINNER_ARTIST
|
||||
msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
|
||||
compare VAR_RESULT, YES
|
||||
goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink
|
||||
@ -511,42 +511,42 @@ LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735
|
||||
LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E
|
||||
lockall
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_HALL_1
|
||||
showcontestpainting CONTEST_WINNER_HALL_1
|
||||
releaseall
|
||||
end
|
||||
|
||||
LilycoveCity_ContestLobby_EventScript_ContestWinner2:: @ 821A745
|
||||
lockall
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_HALL_2
|
||||
showcontestpainting CONTEST_WINNER_HALL_2
|
||||
releaseall
|
||||
end
|
||||
|
||||
LilycoveCity_ContestLobby_EventScript_ContestWinner3:: @ 821A74C
|
||||
lockall
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_HALL_3
|
||||
showcontestpainting CONTEST_WINNER_HALL_3
|
||||
releaseall
|
||||
end
|
||||
|
||||
LilycoveCity_ContestLobby_EventScript_ContestWinner4:: @ 821A753
|
||||
lockall
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_HALL_4
|
||||
showcontestpainting CONTEST_WINNER_HALL_4
|
||||
releaseall
|
||||
end
|
||||
|
||||
LilycoveCity_ContestLobby_EventScript_ContestWinner5:: @ 821A75A
|
||||
lockall
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_HALL_5
|
||||
showcontestpainting CONTEST_WINNER_HALL_5
|
||||
releaseall
|
||||
end
|
||||
|
||||
LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761
|
||||
lockall
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_HALL_6
|
||||
showcontestpainting CONTEST_WINNER_HALL_6
|
||||
releaseall
|
||||
end
|
||||
|
||||
|
||||
@ -94,7 +94,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall: @ 8219863
|
||||
LilycoveCity_LilycoveMuseum_2F_EventScript_Curator:: @ 8219866
|
||||
lockall
|
||||
goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament
|
||||
specialvar VAR_0x8004, CountPlayerContestPaintings
|
||||
specialvar VAR_0x8004, CountPlayerMuseumPaintings
|
||||
switch VAR_0x8004
|
||||
case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
|
||||
case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
|
||||
@ -185,35 +185,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy:: @ 821999C
|
||||
LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting:: @ 82199A5
|
||||
msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_MUSEUM_COOL
|
||||
showcontestpainting CONTEST_WINNER_MUSEUM_COOL
|
||||
releaseall
|
||||
end
|
||||
|
||||
LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting:: @ 82199B3
|
||||
msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_MUSEUM_BEAUTY
|
||||
showcontestpainting CONTEST_WINNER_MUSEUM_BEAUTY
|
||||
releaseall
|
||||
end
|
||||
|
||||
LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting:: @ 82199C1
|
||||
msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_MUSEUM_CUTE
|
||||
showcontestpainting CONTEST_WINNER_MUSEUM_CUTE
|
||||
releaseall
|
||||
end
|
||||
|
||||
LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting:: @ 82199CF
|
||||
msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_MUSEUM_SMART
|
||||
showcontestpainting CONTEST_WINNER_MUSEUM_SMART
|
||||
releaseall
|
||||
end
|
||||
|
||||
LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting:: @ 82199DD
|
||||
msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
|
||||
fadescreen FADE_TO_BLACK
|
||||
showcontestwinner CONTEST_WINNER_MUSEUM_TOUGH
|
||||
showcontestpainting CONTEST_WINNER_MUSEUM_TOUGH
|
||||
releaseall
|
||||
end
|
||||
|
||||
|
||||
@ -173,7 +173,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan:: @ 821C9AE
|
||||
return
|
||||
|
||||
LilycoveCity_PokemonTrainerFanClub_EventScript_TrySetUpTVShow:: @ 821C9B4
|
||||
special TrySetUpTrainerFanClubSpecial
|
||||
special TryPutTrainerFanClubOnAir
|
||||
return
|
||||
|
||||
LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 821C9B8
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
"connections": null,
|
||||
"object_events": [
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_GROUDON_1",
|
||||
"graphics_id": "OBJ_EVENT_GFX_GROUDON_FRONT",
|
||||
"x": 16,
|
||||
"y": 17,
|
||||
"elevation": 0,
|
||||
@ -25,7 +25,7 @@
|
||||
"trainer_type": "TRAINER_TYPE_NONE",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "0x0",
|
||||
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1"
|
||||
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON"
|
||||
},
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
|
||||
@ -93,7 +93,7 @@
|
||||
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
|
||||
},
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_GROUDON_2",
|
||||
"graphics_id": "OBJ_EVENT_GFX_GROUDON_ASLEEP",
|
||||
"x": 16,
|
||||
"y": 17,
|
||||
"elevation": 3,
|
||||
@ -103,7 +103,7 @@
|
||||
"trainer_type": "TRAINER_TYPE_NONE",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "0x0",
|
||||
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2"
|
||||
"flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_ASLEEP"
|
||||
},
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
"connections": null,
|
||||
"object_events": [
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_KYOGRE_1",
|
||||
"graphics_id": "OBJ_EVENT_GFX_KYOGRE_FRONT",
|
||||
"x": 9,
|
||||
"y": 22,
|
||||
"elevation": 1,
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
"connections": null,
|
||||
"object_events": [
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_KYOGRE_1",
|
||||
"graphics_id": "OBJ_EVENT_GFX_KYOGRE_FRONT",
|
||||
"x": 17,
|
||||
"y": 38,
|
||||
"elevation": 3,
|
||||
@ -25,7 +25,7 @@
|
||||
"trainer_type": "TRAINER_TYPE_NONE",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "0x0",
|
||||
"flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1"
|
||||
"flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE"
|
||||
},
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_ARCHIE",
|
||||
@ -93,7 +93,7 @@
|
||||
"flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26"
|
||||
},
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_KYOGRE_2",
|
||||
"graphics_id": "OBJ_EVENT_GFX_KYOGRE_ASLEEP",
|
||||
"x": 17,
|
||||
"y": 38,
|
||||
"elevation": 3,
|
||||
@ -103,7 +103,7 @@
|
||||
"trainer_type": "TRAINER_TYPE_NONE",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "0x0",
|
||||
"flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2"
|
||||
"flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_ASLEEP"
|
||||
}
|
||||
],
|
||||
"warp_events": [
|
||||
|
||||
@ -142,7 +142,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
|
||||
setflag FLAG_HIDE_MAP_NAME_POPUP
|
||||
warp MAP_ROUTE128, 255, 38, 22
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
"connections": null,
|
||||
"object_events": [
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_2",
|
||||
"graphics_id": "OBJ_EVENT_GFX_RAYQUAZA",
|
||||
"x": 14,
|
||||
"y": 7,
|
||||
"elevation": 3,
|
||||
@ -25,10 +25,10 @@
|
||||
"trainer_type": "TRAINER_TYPE_NONE",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "0x0",
|
||||
"flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2"
|
||||
"flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA"
|
||||
},
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_1",
|
||||
"graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_STILL",
|
||||
"x": 14,
|
||||
"y": 6,
|
||||
"elevation": 3,
|
||||
@ -38,7 +38,7 @@
|
||||
"trainer_type": "TRAINER_TYPE_NONE",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "SkyPillar_Top_EventScript_Rayquaza",
|
||||
"flag": "FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT"
|
||||
"flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_STILL"
|
||||
}
|
||||
],
|
||||
"warp_events": [
|
||||
|
||||
@ -34,7 +34,7 @@ SkyPillar_Top_EventScript_TryShowRayquaza:: @ 8239705
|
||||
return
|
||||
|
||||
SkyPillar_Top_EventScript_ShowRayquaza:: @ 823970F
|
||||
clearflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT
|
||||
clearflag FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_STILL
|
||||
return
|
||||
|
||||
SkyPillar_Top_OnWarp: @ 8239713
|
||||
@ -138,17 +138,19 @@ SkyPillar_Top_EventScript_AwakenRayquaza:: @ 823979A
|
||||
releaseall
|
||||
end
|
||||
|
||||
@ Rayquaza has unusual movement frames
|
||||
@ See comments, or sAnimTable_Rayquaza
|
||||
SkyPillar_Top_Movement_RayquazaStir: @ 823983A
|
||||
delay_16
|
||||
walk_in_place_fast_left
|
||||
walk_in_place_fast_left @ Coiled, awake
|
||||
delay_16
|
||||
delay_16
|
||||
delay_16
|
||||
delay_16
|
||||
delay_16
|
||||
walk_in_place_left
|
||||
walk_in_place_left @ Coiled, mouth open
|
||||
delay_16
|
||||
walk_in_place_right
|
||||
walk_in_place_right @ Normal, awake
|
||||
delay_16
|
||||
delay_16
|
||||
delay_16
|
||||
@ -159,11 +161,11 @@ SkyPillar_Top_Movement_RayquazaStir: @ 823983A
|
||||
|
||||
SkyPillar_Top_Movement_RayquazaFlyOff: @ 823984B
|
||||
delay_16
|
||||
walk_in_place_down
|
||||
walk_in_place_down @ Coiled, asleep
|
||||
delay_8
|
||||
walk_in_place_right
|
||||
walk_in_place_right @ Normal, awake
|
||||
delay_8
|
||||
walk_fastest_up
|
||||
walk_fastest_up @ Fly up
|
||||
slide_up
|
||||
slide_up
|
||||
slide_up
|
||||
|
||||
@ -119,7 +119,7 @@
|
||||
"flag": "0"
|
||||
},
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_GROUDON_3",
|
||||
"graphics_id": "OBJ_EVENT_GFX_GROUDON_SIDE",
|
||||
"x": 28,
|
||||
"y": 44,
|
||||
"elevation": 0,
|
||||
@ -132,7 +132,7 @@
|
||||
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON"
|
||||
},
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_KYOGRE_3",
|
||||
"graphics_id": "OBJ_EVENT_GFX_KYOGRE_SIDE",
|
||||
"x": 34,
|
||||
"y": 44,
|
||||
"elevation": 1,
|
||||
@ -145,7 +145,7 @@
|
||||
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE"
|
||||
},
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_2",
|
||||
"graphics_id": "OBJ_EVENT_GFX_RAYQUAZA",
|
||||
"x": 31,
|
||||
"y": 41,
|
||||
"elevation": 1,
|
||||
|
||||
@ -258,8 +258,8 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
|
||||
waitmovement 0
|
||||
waitse
|
||||
playmoncry SPECIES_GROUDON, 2
|
||||
applymovement LOCALID_KYOGRE, SootopolisCity_Movement_GroudonAttack
|
||||
applymovement LOCALID_GROUDON, SootopolisCity_Movement_KyogreDefend
|
||||
applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreDefend
|
||||
applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonAttack
|
||||
waitmovement 0
|
||||
setvar VAR_0x8004, 1 @ vertical pan
|
||||
setvar VAR_0x8005, 1 @ horizontal pan
|
||||
@ -358,8 +358,8 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
|
||||
waitmovement 0
|
||||
waitse
|
||||
playmoncry SPECIES_GROUDON, 2
|
||||
applymovement LOCALID_KYOGRE, SootopolisCity_Movement_GroudonAttack
|
||||
applymovement LOCALID_GROUDON, SootopolisCity_Movement_KyogreDefend
|
||||
applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreDefend
|
||||
applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonAttack
|
||||
waitmovement 0
|
||||
setvar VAR_0x8004, 1 @ vertical pan
|
||||
setvar VAR_0x8005, 1 @ horizontal pan
|
||||
@ -431,7 +431,7 @@ SootopolisCity_Movement_KyogreAttack: @ 81E5BB8
|
||||
clear_affine_anim
|
||||
step_end
|
||||
|
||||
SootopolisCity_Movement_GroudonAttack: @ 81E5BC2
|
||||
SootopolisCity_Movement_KyogreDefend: @ 81E5BC2
|
||||
delay_16
|
||||
delay_16
|
||||
delay_16
|
||||
@ -464,7 +464,7 @@ SootopolisCity_Movement_KyogreIdle: @ 81E5BD6
|
||||
walk_in_place_slow_left
|
||||
step_end
|
||||
|
||||
SootopolisCity_Movement_KyogreDefend: @ 81E5BDD
|
||||
SootopolisCity_Movement_GroudonAttack: @ 81E5BDD
|
||||
walk_in_place_slow_right
|
||||
walk_in_place_slow_right
|
||||
walk_in_place_slow_right
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
"connections": null,
|
||||
"object_events": [
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_GROUDON_1",
|
||||
"graphics_id": "OBJ_EVENT_GFX_GROUDON_FRONT",
|
||||
"x": 17,
|
||||
"y": 22,
|
||||
"elevation": 1,
|
||||
|
||||
@ -1,41 +1,41 @@
|
||||
{
|
||||
"group_order": [
|
||||
"gMapGroup0",
|
||||
"gMapGroup1",
|
||||
"gMapGroup2",
|
||||
"gMapGroup3",
|
||||
"gMapGroup4",
|
||||
"gMapGroup5",
|
||||
"gMapGroup6",
|
||||
"gMapGroup7",
|
||||
"gMapGroup8",
|
||||
"gMapGroup9",
|
||||
"gMapGroup10",
|
||||
"gMapGroup11",
|
||||
"gMapGroup12",
|
||||
"gMapGroup13",
|
||||
"gMapGroup14",
|
||||
"gMapGroup15",
|
||||
"gMapGroup16",
|
||||
"gMapGroup17",
|
||||
"gMapGroup18",
|
||||
"gMapGroup19",
|
||||
"gMapGroup20",
|
||||
"gMapGroup21",
|
||||
"gMapGroup22",
|
||||
"gMapGroup23",
|
||||
"gMapGroup24",
|
||||
"gMapGroup25",
|
||||
"gMapGroup26",
|
||||
"gMapGroup27",
|
||||
"gMapGroup28",
|
||||
"gMapGroup29",
|
||||
"gMapGroup30",
|
||||
"gMapGroup31",
|
||||
"gMapGroup32",
|
||||
"gMapGroup33"
|
||||
"gMapGroup_TownsAndRoutes",
|
||||
"gMapGroup_IndoorLittleroot",
|
||||
"gMapGroup_IndoorOldale",
|
||||
"gMapGroup_IndoorDewford",
|
||||
"gMapGroup_IndoorLavaridge",
|
||||
"gMapGroup_IndoorFallarbor",
|
||||
"gMapGroup_IndoorVerdanturf",
|
||||
"gMapGroup_IndoorPacifidlog",
|
||||
"gMapGroup_IndoorPetalburg",
|
||||
"gMapGroup_IndoorSlateport",
|
||||
"gMapGroup_IndoorMauville",
|
||||
"gMapGroup_IndoorRustboro",
|
||||
"gMapGroup_IndoorFortree",
|
||||
"gMapGroup_IndoorLilycove",
|
||||
"gMapGroup_IndoorMossdeep",
|
||||
"gMapGroup_IndoorSootopolis",
|
||||
"gMapGroup_IndoorEverGrande",
|
||||
"gMapGroup_IndoorRoute104",
|
||||
"gMapGroup_IndoorRoute111",
|
||||
"gMapGroup_IndoorRoute112",
|
||||
"gMapGroup_IndoorRoute114",
|
||||
"gMapGroup_IndoorRoute116",
|
||||
"gMapGroup_IndoorRoute117",
|
||||
"gMapGroup_IndoorRoute121",
|
||||
"gMapGroup_Dungeons",
|
||||
"gMapGroup_IndoorDynamic",
|
||||
"gMapGroup_SpecialArea",
|
||||
"gMapGroup_IndoorRoute104Prototype",
|
||||
"gMapGroup_IndoorRoute109",
|
||||
"gMapGroup_IndoorRoute110",
|
||||
"gMapGroup_IndoorRoute113",
|
||||
"gMapGroup_IndoorRoute123",
|
||||
"gMapGroup_IndoorRoute119",
|
||||
"gMapGroup_IndoorRoute124"
|
||||
],
|
||||
"gMapGroup0": [
|
||||
"gMapGroup_TownsAndRoutes": [
|
||||
"PetalburgCity",
|
||||
"SlateportCity",
|
||||
"MauvilleCity",
|
||||
@ -94,21 +94,21 @@
|
||||
"Underwater_Route105",
|
||||
"Underwater_Route125"
|
||||
],
|
||||
"gMapGroup1": [
|
||||
"gMapGroup_IndoorLittleroot": [
|
||||
"LittlerootTown_BrendansHouse_1F",
|
||||
"LittlerootTown_BrendansHouse_2F",
|
||||
"LittlerootTown_MaysHouse_1F",
|
||||
"LittlerootTown_MaysHouse_2F",
|
||||
"LittlerootTown_ProfessorBirchsLab"
|
||||
],
|
||||
"gMapGroup2": [
|
||||
"gMapGroup_IndoorOldale": [
|
||||
"OldaleTown_House1",
|
||||
"OldaleTown_House2",
|
||||
"OldaleTown_PokemonCenter_1F",
|
||||
"OldaleTown_PokemonCenter_2F",
|
||||
"OldaleTown_Mart"
|
||||
],
|
||||
"gMapGroup3": [
|
||||
"gMapGroup_IndoorDewford": [
|
||||
"DewfordTown_House1",
|
||||
"DewfordTown_PokemonCenter_1F",
|
||||
"DewfordTown_PokemonCenter_2F",
|
||||
@ -116,7 +116,7 @@
|
||||
"DewfordTown_Hall",
|
||||
"DewfordTown_House2"
|
||||
],
|
||||
"gMapGroup4": [
|
||||
"gMapGroup_IndoorLavaridge": [
|
||||
"LavaridgeTown_HerbShop",
|
||||
"LavaridgeTown_Gym_1F",
|
||||
"LavaridgeTown_Gym_B1F",
|
||||
@ -125,7 +125,7 @@
|
||||
"LavaridgeTown_PokemonCenter_1F",
|
||||
"LavaridgeTown_PokemonCenter_2F"
|
||||
],
|
||||
"gMapGroup5": [
|
||||
"gMapGroup_IndoorFallarbor": [
|
||||
"FallarborTown_Mart",
|
||||
"FallarborTown_BattleTentLobby",
|
||||
"FallarborTown_BattleTentCorridor",
|
||||
@ -135,7 +135,7 @@
|
||||
"FallarborTown_CozmosHouse",
|
||||
"FallarborTown_MoveRelearnersHouse"
|
||||
],
|
||||
"gMapGroup6": [
|
||||
"gMapGroup_IndoorVerdanturf": [
|
||||
"VerdanturfTown_BattleTentLobby",
|
||||
"VerdanturfTown_BattleTentCorridor",
|
||||
"VerdanturfTown_BattleTentBattleRoom",
|
||||
@ -146,7 +146,7 @@
|
||||
"VerdanturfTown_FriendshipRatersHouse",
|
||||
"VerdanturfTown_House"
|
||||
],
|
||||
"gMapGroup7": [
|
||||
"gMapGroup_IndoorPacifidlog": [
|
||||
"PacifidlogTown_PokemonCenter_1F",
|
||||
"PacifidlogTown_PokemonCenter_2F",
|
||||
"PacifidlogTown_House1",
|
||||
@ -155,7 +155,7 @@
|
||||
"PacifidlogTown_House4",
|
||||
"PacifidlogTown_House5"
|
||||
],
|
||||
"gMapGroup8": [
|
||||
"gMapGroup_IndoorPetalburg": [
|
||||
"PetalburgCity_WallysHouse",
|
||||
"PetalburgCity_Gym",
|
||||
"PetalburgCity_House1",
|
||||
@ -164,7 +164,7 @@
|
||||
"PetalburgCity_PokemonCenter_2F",
|
||||
"PetalburgCity_Mart"
|
||||
],
|
||||
"gMapGroup9": [
|
||||
"gMapGroup_IndoorSlateport": [
|
||||
"SlateportCity_SternsShipyard_1F",
|
||||
"SlateportCity_SternsShipyard_2F",
|
||||
"SlateportCity_BattleTentLobby",
|
||||
@ -180,7 +180,7 @@
|
||||
"SlateportCity_PokemonCenter_2F",
|
||||
"SlateportCity_Mart"
|
||||
],
|
||||
"gMapGroup10": [
|
||||
"gMapGroup_IndoorMauville": [
|
||||
"MauvilleCity_Gym",
|
||||
"MauvilleCity_BikeShop",
|
||||
"MauvilleCity_House1",
|
||||
@ -190,7 +190,7 @@
|
||||
"MauvilleCity_PokemonCenter_2F",
|
||||
"MauvilleCity_Mart"
|
||||
],
|
||||
"gMapGroup11": [
|
||||
"gMapGroup_IndoorRustboro": [
|
||||
"RustboroCity_DevonCorp_1F",
|
||||
"RustboroCity_DevonCorp_2F",
|
||||
"RustboroCity_DevonCorp_3F",
|
||||
@ -209,7 +209,7 @@
|
||||
"RustboroCity_Flat2_3F",
|
||||
"RustboroCity_House3"
|
||||
],
|
||||
"gMapGroup12": [
|
||||
"gMapGroup_IndoorFortree": [
|
||||
"FortreeCity_House1",
|
||||
"FortreeCity_Gym",
|
||||
"FortreeCity_PokemonCenter_1F",
|
||||
@ -221,7 +221,7 @@
|
||||
"FortreeCity_House5",
|
||||
"FortreeCity_DecorationShop"
|
||||
],
|
||||
"gMapGroup13": [
|
||||
"gMapGroup_IndoorLilycove": [
|
||||
"LilycoveCity_CoveLilyMotel_1F",
|
||||
"LilycoveCity_CoveLilyMotel_2F",
|
||||
"LilycoveCity_LilycoveMuseum_1F",
|
||||
@ -246,7 +246,7 @@
|
||||
"LilycoveCity_DepartmentStoreRooftop",
|
||||
"LilycoveCity_DepartmentStoreElevator"
|
||||
],
|
||||
"gMapGroup14": [
|
||||
"gMapGroup_IndoorMossdeep": [
|
||||
"MossdeepCity_Gym",
|
||||
"MossdeepCity_House1",
|
||||
"MossdeepCity_House2",
|
||||
@ -261,7 +261,7 @@
|
||||
"MossdeepCity_GameCorner_1F",
|
||||
"MossdeepCity_GameCorner_B1F"
|
||||
],
|
||||
"gMapGroup15": [
|
||||
"gMapGroup_IndoorSootopolis": [
|
||||
"SootopolisCity_Gym_1F",
|
||||
"SootopolisCity_Gym_B1F",
|
||||
"SootopolisCity_PokemonCenter_1F",
|
||||
@ -278,7 +278,7 @@
|
||||
"SootopolisCity_MysteryEventsHouse_1F",
|
||||
"SootopolisCity_MysteryEventsHouse_B1F"
|
||||
],
|
||||
"gMapGroup16": [
|
||||
"gMapGroup_IndoorEverGrande": [
|
||||
"EverGrandeCity_SidneysRoom",
|
||||
"EverGrandeCity_PhoebesRoom",
|
||||
"EverGrandeCity_GlaciasRoom",
|
||||
@ -295,33 +295,33 @@
|
||||
"EverGrandeCity_PokemonCenter_2F",
|
||||
"EverGrandeCity_PokemonLeague_2F"
|
||||
],
|
||||
"gMapGroup17": [
|
||||
"gMapGroup_IndoorRoute104": [
|
||||
"Route104_MrBrineysHouse",
|
||||
"Route104_PrettyPetalFlowerShop"
|
||||
],
|
||||
"gMapGroup18": [
|
||||
"gMapGroup_IndoorRoute111": [
|
||||
"Route111_WinstrateFamilysHouse",
|
||||
"Route111_OldLadysRestStop"
|
||||
],
|
||||
"gMapGroup19": [
|
||||
"gMapGroup_IndoorRoute112": [
|
||||
"Route112_CableCarStation",
|
||||
"MtChimney_CableCarStation"
|
||||
],
|
||||
"gMapGroup20": [
|
||||
"gMapGroup_IndoorRoute114": [
|
||||
"Route114_FossilManiacsHouse",
|
||||
"Route114_FossilManiacsTunnel",
|
||||
"Route114_LanettesHouse"
|
||||
],
|
||||
"gMapGroup21": [
|
||||
"gMapGroup_IndoorRoute116": [
|
||||
"Route116_TunnelersRestHouse"
|
||||
],
|
||||
"gMapGroup22": [
|
||||
"gMapGroup_IndoorRoute117": [
|
||||
"Route117_PokemonDayCare"
|
||||
],
|
||||
"gMapGroup23": [
|
||||
"gMapGroup_IndoorRoute121": [
|
||||
"Route121_SafariZoneEntrance"
|
||||
],
|
||||
"gMapGroup24": [
|
||||
"gMapGroup_Dungeons": [
|
||||
"MeteorFalls_1F_1R",
|
||||
"MeteorFalls_1F_2R",
|
||||
"MeteorFalls_B1F_1R",
|
||||
@ -431,7 +431,7 @@
|
||||
"AlteringCave",
|
||||
"MeteorFalls_StevensCave"
|
||||
],
|
||||
"gMapGroup25": [
|
||||
"gMapGroup_IndoorDynamic": [
|
||||
"SecretBase_RedCave1",
|
||||
"SecretBase_BrownCave1",
|
||||
"SecretBase_BlueCave1",
|
||||
@ -494,7 +494,7 @@
|
||||
"BattlePyramidSquare16",
|
||||
"UnionRoom"
|
||||
],
|
||||
"gMapGroup26": [
|
||||
"gMapGroup_SpecialArea": [
|
||||
"SafariZone_Northwest",
|
||||
"SafariZone_North",
|
||||
"SafariZone_Southwest",
|
||||
@ -585,14 +585,14 @@
|
||||
"NavelRock_Bottom",
|
||||
"TrainerHill_Elevator"
|
||||
],
|
||||
"gMapGroup27": [
|
||||
"gMapGroup_IndoorRoute104Prototype": [
|
||||
"Route104_Prototype",
|
||||
"Route104_PrototypePrettyPetalFlowerShop"
|
||||
],
|
||||
"gMapGroup28": [
|
||||
"gMapGroup_IndoorRoute109": [
|
||||
"Route109_SeashoreHouse"
|
||||
],
|
||||
"gMapGroup29": [
|
||||
"gMapGroup_IndoorRoute110": [
|
||||
"Route110_TrickHouseEntrance",
|
||||
"Route110_TrickHouseEnd",
|
||||
"Route110_TrickHouseCorridor",
|
||||
@ -607,18 +607,18 @@
|
||||
"Route110_SeasideCyclingRoadNorthEntrance",
|
||||
"Route110_SeasideCyclingRoadSouthEntrance"
|
||||
],
|
||||
"gMapGroup30": [
|
||||
"gMapGroup_IndoorRoute113": [
|
||||
"Route113_GlassWorkshop"
|
||||
],
|
||||
"gMapGroup31": [
|
||||
"gMapGroup_IndoorRoute123": [
|
||||
"Route123_BerryMastersHouse"
|
||||
],
|
||||
"gMapGroup32": [
|
||||
"gMapGroup_IndoorRoute119": [
|
||||
"Route119_WeatherInstitute_1F",
|
||||
"Route119_WeatherInstitute_2F",
|
||||
"Route119_House"
|
||||
],
|
||||
"gMapGroup33": [
|
||||
"gMapGroup_IndoorRoute124": [
|
||||
"Route124_DivingTreasureHuntersHouse"
|
||||
],
|
||||
"connections_include_order": [
|
||||
|
||||
@ -119,7 +119,7 @@ gScriptCmdTable:: @ 81DB67C
|
||||
.4byte ScrCmd_drawboxtext @ 0x74
|
||||
.4byte ScrCmd_showmonpic @ 0x75
|
||||
.4byte ScrCmd_hidemonpic @ 0x76
|
||||
.4byte ScrCmd_showcontestwinner @ 0x77
|
||||
.4byte ScrCmd_showcontestpainting @ 0x77
|
||||
.4byte ScrCmd_braillemessage @ 0x78
|
||||
.4byte ScrCmd_givemon @ 0x79
|
||||
.4byte ScrCmd_giveegg @ 0x7a
|
||||
|
||||
@ -889,7 +889,7 @@ RecordCorner_EventScript_AlreadyMixed:: @ 82774E0
|
||||
closemessage
|
||||
end
|
||||
|
||||
EventScript_ConfirmLeaveTradeRoom:: @ 82774EF
|
||||
EventScript_ConfirmLeaveCableClubRoom:: @ 82774EF
|
||||
msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO
|
||||
compare VAR_RESULT, YES
|
||||
goto_if_eq EventScript_TerminateLink
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
@ Gabby and Ty always move to the same spots for the first 5 battles
|
||||
@ From the 6th battle onwards, they move randomly between locations 6-8
|
||||
@ Note: The local IDs of Gabby and Ty are hard-coded in GabbyAndTySetScriptVarsToObjectEventLocalIds
|
||||
@ Note: The local IDs of Gabby and Ty are hard-coded in GetGabbyAndTyLocalIds
|
||||
GabbyAndTy_EventScript_UpdateLocation:: @ 828CCC7
|
||||
cleartrainerflag TRAINER_GABBY_AND_TY_6
|
||||
specialvar VAR_RESULT, GabbyAndTyGetBattleNum
|
||||
@ -198,7 +198,7 @@ GabbyAndTy_EventScript_TyBattle6:: @ 828CF36
|
||||
|
||||
GabbyAndTy_EventScript_FirstInterview:: @ 828CF56
|
||||
special GabbyAndTyBeforeInterview
|
||||
special GabbyAndTySetScriptVarsToObjectEventLocalIds
|
||||
special GetGabbyAndTyLocalIds
|
||||
compare VAR_FACING, DIR_NORTH
|
||||
call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
|
||||
compare VAR_FACING, DIR_SOUTH
|
||||
@ -229,7 +229,7 @@ GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1
|
||||
|
||||
GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3
|
||||
special GabbyAndTyBeforeInterview
|
||||
special GabbyAndTySetScriptVarsToObjectEventLocalIds
|
||||
special GetGabbyAndTyLocalIds
|
||||
compare VAR_FACING, DIR_NORTH
|
||||
call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
|
||||
compare VAR_FACING, DIR_SOUTH
|
||||
|
||||
@ -179,8 +179,8 @@ EventScript_ResetAllMapFlags:: @ 82715DE
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
|
||||
setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE
|
||||
setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON
|
||||
setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
|
||||
setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
|
||||
setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE
|
||||
@ -271,6 +271,6 @@ EventScript_ResetAllMapFlags:: @ 82715DE
|
||||
setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
|
||||
setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
|
||||
setflag FLAG_HIDE_SKY_PILLAR_WALLACE
|
||||
setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT
|
||||
setflag FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_STILL
|
||||
call EventScript_ResetAllBerries
|
||||
end
|
||||
|
||||
@ -2,14 +2,14 @@ EventScript_TV:: @ 827EE0B
|
||||
lockall
|
||||
incrementgamestat GAME_STAT_WATCHED_TV
|
||||
special ResetTVShowState
|
||||
specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV
|
||||
compare VAR_RESULT, 2
|
||||
specialvar VAR_RESULT, CheckForPlayersHouseNews
|
||||
compare VAR_RESULT, PLAYERS_HOUSE_TV_MOVIE
|
||||
goto_if_eq EventScript_PlayersHouseMovie
|
||||
compare VAR_RESULT, 1
|
||||
compare VAR_RESULT, PLAYERS_HOUSE_TV_LATI
|
||||
goto_if_eq EventScript_PlayersHouseLatiNewsFlash
|
||||
goto_if_unset FLAG_SYS_TV_START, EventScript_MomDadMightLikeThis1
|
||||
goto_if_set FLAG_SYS_TV_WATCH, EventScript_MomDadMightLikeThis1
|
||||
specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring
|
||||
specialvar VAR_RESULT, IsGabbyAndTyShowOnTheAir
|
||||
compare VAR_RESULT, TRUE
|
||||
goto_if_eq EventScript_DoInSearchOfTrainers
|
||||
goto EventScript_TryDoPokeNews
|
||||
|
||||
@ -83,20 +83,20 @@ gSpecials:: @ 81DBA64
|
||||
def_special IsLeadMonNicknamedOrNotEnglish
|
||||
def_special SetContestCategoryStringVarForInterview
|
||||
def_special GetNextActiveShowIfMassOutbreak
|
||||
def_special TV_IsScriptShowKindAlreadyInQueue
|
||||
def_special CheckForBigMovieOrEmergencyNewsOnTV
|
||||
def_special IsTVShowAlreadyInQueue
|
||||
def_special CheckForPlayersHouseNews
|
||||
def_special GetMomOrDadStringForTVMessage
|
||||
def_special ResetTVShowState
|
||||
def_special GetContestWinnerId
|
||||
def_special GetContestPlayerId
|
||||
def_special sub_80F8814
|
||||
def_special GetNpcContestantLocalId
|
||||
def_special BufferContestWinnerTrainerName
|
||||
def_special BufferContestWinnerMonName
|
||||
def_special BufferContestTrainerAndMonNames
|
||||
def_special GetContestMonConditionRanking
|
||||
def_special SetContestTrainerGfxIds
|
||||
def_special TryEnterContestMon
|
||||
def_special sub_80F8970
|
||||
def_special GetContestantNamesAtRank
|
||||
def_special SetLinkContestPlayerGfx
|
||||
def_special GetContestMonCondition
|
||||
def_special HasMonWonThisContestBefore
|
||||
@ -147,9 +147,9 @@ gSpecials:: @ 81DBA64
|
||||
def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
|
||||
def_special ShouldReadyContestArtist
|
||||
def_special SaveMuseumContestPainting
|
||||
def_special DoesContestCategoryHaveWinner
|
||||
def_special CountPlayerContestPaintings
|
||||
def_special ShowContestWinnerPainting
|
||||
def_special DoesContestCategoryHaveMuseumPainting
|
||||
def_special CountPlayerMuseumPaintings
|
||||
def_special ShowContestPainting @ Unused, redundant with showcontestpainting command
|
||||
def_special MauvilleGymSetDefaultBarriers
|
||||
def_special MauvilleGymPressSwitch
|
||||
def_special ShowFieldMessageStringVar4
|
||||
@ -187,10 +187,10 @@ gSpecials:: @ 81DBA64
|
||||
def_special GabbyAndTyAfterInterview
|
||||
def_special GabbyAndTyBeforeInterview
|
||||
def_special DoTVShowInSearchOfTrainers
|
||||
def_special IsTVShowInSearchOfTrainersAiring
|
||||
def_special IsGabbyAndTyShowOnTheAir
|
||||
def_special GabbyAndTyGetLastQuote
|
||||
def_special GabbyAndTyGetLastBattleTrivia
|
||||
def_special GabbyAndTySetScriptVarsToObjectEventLocalIds
|
||||
def_special GetGabbyAndTyLocalIds
|
||||
def_special GetBattleOutcome
|
||||
def_special GetDaycareMonNicknames
|
||||
def_special GetDaycareState
|
||||
@ -354,7 +354,7 @@ gSpecials:: @ 81DBA64
|
||||
def_special SetChampionSaveWarp
|
||||
def_special TryPutTreasureInvestigatorsOnAir
|
||||
def_special TryPutLotteryWinnerReportOnAir
|
||||
def_special TrySetUpTrainerFanClubSpecial
|
||||
def_special TryPutTrainerFanClubOnAir
|
||||
def_special ShouldHideFanClubInterviewer
|
||||
def_special ShowGlassWorkshopMenu
|
||||
def_special PutFanClubSpecialOnTheAir
|
||||
|
||||
@ -1,258 +0,0 @@
|
||||
gBerryDescriptionPart1_Cheri:: @ 8589AE4
|
||||
.string "Blooms with delicate pretty flowers.$"
|
||||
|
||||
gBerryDescriptionPart2_Cheri:: @ 8589B09
|
||||
.string "The bright red BERRY is very spicy.$"
|
||||
|
||||
gBerryDescriptionPart1_Chesto:: @ 8589B2D
|
||||
.string "The BERRY's thick skin and fruit are$"
|
||||
|
||||
gBerryDescriptionPart2_Chesto:: @ 8589B52
|
||||
.string "very tough. It is dry-tasting all over.$"
|
||||
|
||||
gBerryDescriptionPart1_Pecha:: @ 8589B7A
|
||||
.string "Very sweet and delicious.$"
|
||||
|
||||
gBerryDescriptionPart2_Pecha:: @ 8589B94
|
||||
.string "Also very tender - handle with care.$"
|
||||
|
||||
gBerryDescriptionPart1_Rawst:: @ 8589BB9
|
||||
.string "If the leaves grow long and curly,$"
|
||||
|
||||
gBerryDescriptionPart2_Rawst:: @ 8589BDC
|
||||
.string "the BERRY seems to grow very bitter.$"
|
||||
|
||||
gBerryDescriptionPart1_Aspear:: @ 8589C01
|
||||
.string "The hard BERRY is dense with a rich$"
|
||||
|
||||
gBerryDescriptionPart2_Aspear:: @ 8589C25
|
||||
.string "juice. It is quite sour.$"
|
||||
|
||||
gBerryDescriptionPart1_Leppa:: @ 8589C3E
|
||||
.string "Grows slower than CHERI and others.$"
|
||||
|
||||
gBerryDescriptionPart2_Leppa:: @ 8589C62
|
||||
.string "The smaller the BERRY, the tastier.$"
|
||||
|
||||
gBerryDescriptionPart1_Oran:: @ 8589C86
|
||||
.string "A peculiar BERRY with a mix of flavors.$"
|
||||
|
||||
gBerryDescriptionPart2_Oran:: @ 8589CAE
|
||||
.string "BERRIES grow in half a day.$"
|
||||
|
||||
gBerryDescriptionPart1_Persim:: @ 8589CCA
|
||||
.string "Loves sunlight. The BERRY's color$"
|
||||
|
||||
gBerryDescriptionPart2_Persim:: @ 8589CEC
|
||||
.string "grows vivid when exposed to the sun.$"
|
||||
|
||||
gBerryDescriptionPart1_Lum:: @ 8589D11
|
||||
.string "Slow to grow. If raised with loving$"
|
||||
|
||||
gBerryDescriptionPart2_Lum:: @ 8589D35
|
||||
.string "care, it may grow two BERRIES.$"
|
||||
|
||||
gBerryDescriptionPart1_Sitrus:: @ 8589D54
|
||||
.string "Closely related to ORAN. The large$"
|
||||
|
||||
gBerryDescriptionPart2_Sitrus:: @ 8589D77
|
||||
.string "BERRY has a well-rounded flavor.$"
|
||||
|
||||
gBerryDescriptionPart1_Figy:: @ 8589D98
|
||||
.string "The BERRY, which looks chewed up,$"
|
||||
|
||||
gBerryDescriptionPart2_Figy:: @ 8589DBA
|
||||
.string "brims with spicy substances.$"
|
||||
|
||||
gBerryDescriptionPart1_Wiki:: @ 8589DD7
|
||||
.string "The BERRY is said to have grown lumpy$"
|
||||
|
||||
gBerryDescriptionPart2_Wiki:: @ 8589DFD
|
||||
.string "to help POKéMON grip it.$"
|
||||
|
||||
gBerryDescriptionPart1_Mago:: @ 8589E16
|
||||
.string "The BERRY turns curvy as it grows.$"
|
||||
|
||||
gBerryDescriptionPart2_Mago:: @ 8589E39
|
||||
.string "The curvier, the sweeter and tastier.$"
|
||||
|
||||
gBerryDescriptionPart1_Aguav:: @ 8589E5F
|
||||
.string "The flower is dainty. It is rare in its$"
|
||||
|
||||
gBerryDescriptionPart2_Aguav:: @ 8589E87
|
||||
.string "ability to grow without light.$"
|
||||
|
||||
gBerryDescriptionPart1_Iapapa:: @ 8589EA6
|
||||
.string "The BERRY is very big and sour.$"
|
||||
|
||||
gBerryDescriptionPart2_Iapapa:: @ 8589EC6
|
||||
.string "It takes at least a day to grow.$"
|
||||
|
||||
gBerryDescriptionPart1_Razz:: @ 8589EE7
|
||||
.string "The red BERRY tastes slightly spicy.$"
|
||||
|
||||
gBerryDescriptionPart2_Razz:: @ 8589F0C
|
||||
.string "It grows quickly in just four hours.$"
|
||||
|
||||
gBerryDescriptionPart1_Bluk:: @ 8589F31
|
||||
.string "The BERRY is blue on the outside, but$"
|
||||
|
||||
gBerryDescriptionPart2_Bluk:: @ 8589F57
|
||||
.string "it blackens the mouth when eaten.$"
|
||||
|
||||
gBerryDescriptionPart1_Nanab:: @ 8589F79
|
||||
.string "This BERRY was the seventh$"
|
||||
|
||||
gBerryDescriptionPart2_Nanab:: @ 8589F94
|
||||
.string "discovered in the world. It is sweet.$"
|
||||
|
||||
gBerryDescriptionPart1_Wepear:: @ 8589FBA
|
||||
.string "The flower is small and white. It has a$"
|
||||
|
||||
gBerryDescriptionPart2_Wepear:: @ 8589FE2
|
||||
.string "delicate balance of bitter and sour.$"
|
||||
|
||||
gBerryDescriptionPart1_Pinap:: @ 858A007
|
||||
.string "Weak against wind and cold.$"
|
||||
|
||||
gBerryDescriptionPart2_Pinap:: @ 858A023
|
||||
.string "The fruit is spicy and the skin, sour.$"
|
||||
|
||||
gBerryDescriptionPart1_Pomeg:: @ 858A04A
|
||||
.string "However much it is watered,$"
|
||||
|
||||
gBerryDescriptionPart2_Pomeg:: @ 858A066
|
||||
.string "it only grows up to six BERRIES.$"
|
||||
|
||||
gBerryDescriptionPart1_Kelpsy:: @ 858A087
|
||||
.string "A rare variety shaped like a root.$"
|
||||
|
||||
gBerryDescriptionPart2_Kelpsy:: @ 858A0AA
|
||||
.string "Grows a very large flower.$"
|
||||
|
||||
gBerryDescriptionPart1_Qualot:: @ 858A0C5
|
||||
.string "Loves water. Grows strong even in$"
|
||||
|
||||
gBerryDescriptionPart2_Qualot:: @ 858A0E7
|
||||
.string "locations with constant rainfall.$"
|
||||
|
||||
gBerryDescriptionPart1_Hondew:: @ 858A109
|
||||
.string "A BERRY that is very valuable and$"
|
||||
|
||||
gBerryDescriptionPart2_Hondew:: @ 858A12B
|
||||
.string "rarely seen. It is very delicious.$"
|
||||
|
||||
gBerryDescriptionPart1_Grepa:: @ 858A14E
|
||||
.string "Despite its tenderness and round$"
|
||||
|
||||
gBerryDescriptionPart2_Grepa:: @ 858A16F
|
||||
.string "shape, the BERRY is unimaginably sour.$"
|
||||
|
||||
gBerryDescriptionPart1_Tamato:: @ 858A196
|
||||
.string "The BERRY is lip-bendingly spicy.$"
|
||||
|
||||
gBerryDescriptionPart2_Tamato:: @ 858A1B8
|
||||
.string "It takes time to grow.$"
|
||||
|
||||
gBerryDescriptionPart1_Cornn:: @ 858A1CF
|
||||
.string "A BERRY from an ancient era. May not$"
|
||||
|
||||
gBerryDescriptionPart2_Cornn:: @ 858A1F4
|
||||
.string "grow unless planted in quantity.$"
|
||||
|
||||
gBerryDescriptionPart1_Magost:: @ 858A215
|
||||
.string "A BERRY that is widely said to have$"
|
||||
|
||||
gBerryDescriptionPart2_Magost:: @ 858A239
|
||||
.string "a finely balanced flavor.$"
|
||||
|
||||
gBerryDescriptionPart1_Rabuta:: @ 858A253
|
||||
.string "A rare variety that is overgrown with$"
|
||||
|
||||
gBerryDescriptionPart2_Rabuta:: @ 858A279
|
||||
.string "hair. It is quite bitter.$"
|
||||
|
||||
gBerryDescriptionPart1_Nomel:: @ 858A293
|
||||
.string "Quite sour. Just one bite makes it$"
|
||||
|
||||
gBerryDescriptionPart2_Nomel:: @ 858A2B6
|
||||
.string "impossible to taste for three days.$"
|
||||
|
||||
gBerryDescriptionPart1_Spelon:: @ 858A2DA
|
||||
.string "The vividly red BERRY is very spicy.$"
|
||||
|
||||
gBerryDescriptionPart2_Spelon:: @ 858A2FF
|
||||
.string "Its warts secrete a spicy substance.$"
|
||||
|
||||
gBerryDescriptionPart1_Pamtre:: @ 858A324
|
||||
.string "Drifts on the sea from somewhere.$"
|
||||
|
||||
gBerryDescriptionPart2_Pamtre:: @ 858A346
|
||||
.string "It is thought to grow elsewhere.$"
|
||||
|
||||
gBerryDescriptionPart1_Watmel:: @ 858A367
|
||||
.string "A huge BERRY, with some over 20$"
|
||||
|
||||
gBerryDescriptionPart2_Watmel:: @ 858A387
|
||||
.string "inches discovered. Exceedingly sweet.$"
|
||||
|
||||
gBerryDescriptionPart1_Durin:: @ 858A3AD
|
||||
.string "Bitter to even look at. It is so$"
|
||||
|
||||
gBerryDescriptionPart2_Durin:: @ 858A3CE
|
||||
.string "bitter, no one has ever eaten it as is.$"
|
||||
|
||||
gBerryDescriptionPart1_Belue:: @ 858A3F6
|
||||
.string "It is glossy and looks delicious, but$"
|
||||
|
||||
gBerryDescriptionPart2_Belue:: @ 858A41C
|
||||
.string "it is awfully sour. Takes time to grow.$"
|
||||
|
||||
gBerryDescriptionPart1_Liechi:: @ 858A444
|
||||
.string "A mysterious BERRY. It is rumored to$"
|
||||
|
||||
gBerryDescriptionPart2_Liechi:: @ 858A469
|
||||
.string "contain the power of the sea.$"
|
||||
|
||||
gBerryDescriptionPart1_Ganlon:: @ 858A487
|
||||
.string "A mysterious BERRY. It is rumored to$"
|
||||
|
||||
gBerryDescriptionPart2_Ganlon:: @ 858A4AC
|
||||
.string "contain the power of the land.$"
|
||||
|
||||
gBerryDescriptionPart1_Salac:: @ 858A4CB
|
||||
.string "A mysterious BERRY. It is rumored to$"
|
||||
|
||||
gBerryDescriptionPart2_Salac:: @ 858A4F0
|
||||
.string "contain the power of the sky.$"
|
||||
|
||||
gBerryDescriptionPart1_Petaya:: @ 858A50E
|
||||
.string "A mysterious BERRY. It is rumored to$"
|
||||
|
||||
gBerryDescriptionPart2_Petaya:: @ 858A533
|
||||
.string "contain the power of all living things.$"
|
||||
|
||||
gBerryDescriptionPart1_Apicot:: @ 858A55B
|
||||
.string "A very mystifying BERRY. No telling$"
|
||||
|
||||
gBerryDescriptionPart2_Apicot:: @ 858A57F
|
||||
.string "what may happen or how it can be used.$"
|
||||
|
||||
gBerryDescriptionPart1_Lansat:: @ 858A5A6
|
||||
.string "Said to be a legendary BERRY.$"
|
||||
|
||||
gBerryDescriptionPart2_Lansat:: @ 858A5C4
|
||||
.string "Holding it supposedly brings joy.$"
|
||||
|
||||
gBerryDescriptionPart1_Starf:: @ 858A5E6
|
||||
.string "So strong, it was abandoned at the$"
|
||||
|
||||
gBerryDescriptionPart2_Starf:: @ 858A609
|
||||
.string "world's edge. Considered a mirage.$"
|
||||
|
||||
gBerryDescriptionPart1_Enigma:: @ 858A62C
|
||||
.string "A completely enigmatic BERRY.$"
|
||||
|
||||
gBerryDescriptionPart2_Enigma:: @ 858A64A
|
||||
.string "Appears to have the power of stars.$"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
gContestPaintingCaption:: @ 827EA0C
|
||||
gContestHallPaintingCaption:: @ 827EA0C
|
||||
.string "{STR_VAR_1}\n"
|
||||
.string "{STR_VAR_2}'s {STR_VAR_3}$"
|
||||
|
||||
|
||||
@ -2925,7 +2925,7 @@ gTVInSearchOfTrainersText08:: @ 0828C011
|
||||
.string "That's all for today!\n"
|
||||
.string "See you again on our next broadcast!$"
|
||||
|
||||
gTVPokemonContestLiveUpdates2Text00:: @ 0828C137
|
||||
ContestLadyShow_Text_Intro:: @ 0828C137
|
||||
.string "“POKéMON CONTEST LIVE UPDATES!”\p"
|
||||
.string "MC: Sorry to interrupt the regular\n"
|
||||
.string "programming, and thanks for joining us!\p"
|
||||
@ -2940,7 +2940,7 @@ gTVPokemonContestLiveUpdates2Text00:: @ 0828C137
|
||||
.string "Spectators: ?!!!!\n"
|
||||
.string "?!!!!$"
|
||||
|
||||
gTVPokemonContestLiveUpdates2Text01:: @ 0828C28C
|
||||
ContestLadyShow_Text_Won:: @ 0828C28C
|
||||
.string "MC: Excuse me!\n"
|
||||
.string "Thanks for joining us on live TV!\p"
|
||||
.string "May I congratulate you on your win?\p"
|
||||
@ -2959,7 +2959,7 @@ gTVPokemonContestLiveUpdates2Text01:: @ 0828C28C
|
||||
.string "We did it!\l"
|
||||
.string "Thank you!$"
|
||||
|
||||
gTVPokemonContestLiveUpdates2Text02:: @ 0828C45B
|
||||
ContestLadyShow_Text_Lost:: @ 0828C45B
|
||||
.string "MC: Excuse me!\n"
|
||||
.string "Thanks for joining us on live TV!\p"
|
||||
.string "You must be disappointed by that turn\n"
|
||||
@ -2979,7 +2979,7 @@ gTVPokemonContestLiveUpdates2Text02:: @ 0828C45B
|
||||
.string "Uh… That's all the time we have today!\n"
|
||||
.string "Thanks for tuning in!$"
|
||||
|
||||
gTVPokemonContestLiveUpdates2Text03:: @ 0828C662
|
||||
ContestLadyShow_Text_LostBadly:: @ 0828C662
|
||||
.string "MC: Excuse me!\n"
|
||||
.string "Thanks for joining us on live TV!\p"
|
||||
.string "How did your CONTEST appearance go?\p"
|
||||
|
||||
10
gflib/text.c
10
gflib/text.c
@ -1416,9 +1416,9 @@ u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str)
|
||||
|
||||
fgColor = TEXT_COLOR_WHITE;
|
||||
bgColor = TEXT_COLOR_TRANSPARENT;
|
||||
shadowColor = TEXT_COLOR_LIGHT_GREY;
|
||||
shadowColor = TEXT_COLOR_LIGHT_GRAY;
|
||||
|
||||
GenerateFontHalfRowLookupTable(TEXT_COLOR_WHITE, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY);
|
||||
GenerateFontHalfRowLookupTable(TEXT_COLOR_WHITE, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GRAY);
|
||||
strLocal = str;
|
||||
strPos = 0;
|
||||
|
||||
@ -1632,8 +1632,7 @@ void DecompressGlyphFont7(u16 glyphId, bool32 isJapanese)
|
||||
|
||||
if (isJapanese == TRUE)
|
||||
{
|
||||
int eff;
|
||||
glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now
|
||||
glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId % 0x10));
|
||||
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
|
||||
DecompressGlyphTile(glyphs + 0x80, gCurGlyph.gfxBufferBottom);
|
||||
gCurGlyph.width = 8;
|
||||
@ -1761,8 +1760,7 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
|
||||
|
||||
if (isJapanese == TRUE)
|
||||
{
|
||||
int eff;
|
||||
glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now
|
||||
glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId % 0x10));
|
||||
DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop);
|
||||
DecompressGlyphTile(glyphs + 0x80, gCurGlyph.gfxBufferBottom);
|
||||
gCurGlyph.width = 8;
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
//
|
||||
#define CHAR_i_ACUTE 0x6F
|
||||
//
|
||||
#define CHAR_UNK_SPACER 0x77
|
||||
#define CHAR_GENDERLESS 0x77 // Empty space for lack of gender icon
|
||||
//
|
||||
#define CHAR_UP_ARROW 0x79
|
||||
#define CHAR_DOWN_ARROW 0x7A
|
||||
@ -233,8 +233,8 @@
|
||||
|
||||
#define TEXT_COLOR_TRANSPARENT 0x0
|
||||
#define TEXT_COLOR_WHITE 0x1
|
||||
#define TEXT_COLOR_DARK_GREY 0x2
|
||||
#define TEXT_COLOR_LIGHT_GREY 0x3
|
||||
#define TEXT_COLOR_DARK_GRAY 0x2
|
||||
#define TEXT_COLOR_LIGHT_GRAY 0x3
|
||||
#define TEXT_COLOR_RED 0x4
|
||||
#define TEXT_COLOR_LIGHT_RED 0x5
|
||||
#define TEXT_COLOR_GREEN 0x6
|
||||
|
||||
|
Before Width: | Height: | Size: 223 B After Width: | Height: | Size: 223 B |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 666 B After Width: | Height: | Size: 666 B |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 170 B After Width: | Height: | Size: 170 B |
|
Before Width: | Height: | Size: 216 B After Width: | Height: | Size: 216 B |
|
Before Width: | Height: | Size: 377 B After Width: | Height: | Size: 377 B |
|
Before Width: | Height: | Size: 642 B After Width: | Height: | Size: 642 B |
|
Before Width: | Height: | Size: 152 B After Width: | Height: | Size: 152 B |
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 197 B |
|
Before Width: | Height: | Size: 207 B After Width: | Height: | Size: 207 B |
|
Before Width: | Height: | Size: 764 B After Width: | Height: | Size: 764 B |
|
Before Width: | Height: | Size: 262 B After Width: | Height: | Size: 262 B |
|
Before Width: | Height: | Size: 217 B After Width: | Height: | Size: 217 B |
|
Before Width: | Height: | Size: 635 B After Width: | Height: | Size: 635 B |
|
Before Width: | Height: | Size: 345 B After Width: | Height: | Size: 345 B |
|
Before Width: | Height: | Size: 601 B After Width: | Height: | Size: 601 B |
|
Before Width: | Height: | Size: 286 B After Width: | Height: | Size: 286 B |
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user